From 9b82dd88c50291d4ae6b246a2e2d8cde192c3108 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Tue, 18 May 2021 10:54:55 +0300
Subject: [PATCH] search for notes from group
---
.../MultipleChoiceQuestion.js | 8 ++++----
.../MultipleChoiceQuestionService.js | 2 +-
.../components/EditorInfo/CounterInfo/EditorInfoTool.js | 8 ++++----
wax-prosemirror-schema/src/nodes/footNoteNode.js | 2 +-
wax-prosemirror-utilities/src/commands/Commands.js | 4 ++--
wax-prosemirror-utilities/src/document/DocumentHelpers.js | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestion.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
index 8f34f7f0b..99c378f1b 100644
--- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
+++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
@@ -29,11 +29,11 @@ class MultipleChoiceQuestion extends Tools {
$to.parentOffset,
);
- const footnote = state.config.schema.nodes.multiple_choice.create(
+ const answerOption = state.config.schema.nodes.multiple_choice.create(
{ id: uuidv4() },
content,
);
- dispatch(tr.replaceSelectionWith(footnote));
+ dispatch(tr.replaceSelectionWith(answerOption));
} else {
tr.setBlockType(
from,
@@ -52,11 +52,11 @@ class MultipleChoiceQuestion extends Tools {
$to.parentOffset,
);
- const footnote = state.config.schema.nodes.multiple_choice.create(
+ const answerOption = state.config.schema.nodes.multiple_choice.create(
{ id: uuidv4() },
content,
);
- dispatch(tr.replaceSelectionWith(footnote));
+ dispatch(tr.replaceSelectionWith(answerOption));
// dispatch(state.tr.replaceSelectionWith(footnote));
}
});
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js
index af9f3bff6..589f9e4b7 100644
--- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js
+++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js
@@ -18,7 +18,7 @@ class MultipleChoiceQuestionService extends Service {
createNode({
question_wrapper: {
group: 'block',
- atom: true,
+ // atom: true,
content: 'inline*',
attrs: {
class: { default: 'paragraph' },
diff --git a/wax-prosemirror-components/src/components/EditorInfo/CounterInfo/EditorInfoTool.js b/wax-prosemirror-components/src/components/EditorInfo/CounterInfo/EditorInfoTool.js
index a29e7c0e7..1b2b6f6e6 100644
--- a/wax-prosemirror-components/src/components/EditorInfo/CounterInfo/EditorInfoTool.js
+++ b/wax-prosemirror-components/src/components/EditorInfo/CounterInfo/EditorInfoTool.js
@@ -175,12 +175,12 @@ const EditorInfoTool = ({ view: { state }, item }) => {
}
});
setBlockLevelNodes(blockLevelCount);
- allBlockNodes.forEach(value => {
- value.node.forEach(imgs => {
- if (imgs.type.name === 'image') {
+ allBlockNodes.forEach(nodes => {
+ nodes.node.forEach(node => {
+ if (node.type.name === 'image') {
imgCounts += 1;
}
- if (imgs.type.name === 'footnote') {
+ if (node.type.groups.includes('notes')) {
footNoteCount += 1;
}
});
diff --git a/wax-prosemirror-schema/src/nodes/footNoteNode.js b/wax-prosemirror-schema/src/nodes/footNoteNode.js
index 625f0b44c..38b81a211 100644
--- a/wax-prosemirror-schema/src/nodes/footNoteNode.js
+++ b/wax-prosemirror-schema/src/nodes/footNoteNode.js
@@ -1,5 +1,5 @@
const footnote = {
- group: 'inline',
+ group: 'notes, inline',
content: 'inline*',
inline: true,
atom: true,
diff --git a/wax-prosemirror-utilities/src/commands/Commands.js b/wax-prosemirror-utilities/src/commands/Commands.js
index d57270a90..533dd89cf 100644
--- a/wax-prosemirror-utilities/src/commands/Commands.js
+++ b/wax-prosemirror-utilities/src/commands/Commands.js
@@ -133,7 +133,7 @@ const createComment = (state, dispatch, group, viewid) => {
let footnote = false;
let footnoteNode;
state.doc.nodesBetween($from.pos, $to.pos, (node, from) => {
- if (node.type.name === 'footnote') {
+ if (node.type.groups.includes('notes')) {
footnote = true;
footnoteNode = node;
}
@@ -204,7 +204,7 @@ const createCommentOnFootnote = (state, dispatch, group, viewid) => {
ranges.push({
start,
end,
- footnote: contentNode.type.name === 'footnote',
+ footnote: contentNode.type.groups.includes('notes'),
});
});
diff --git a/wax-prosemirror-utilities/src/document/DocumentHelpers.js b/wax-prosemirror-utilities/src/document/DocumentHelpers.js
index 563f74f86..8014665be 100644
--- a/wax-prosemirror-utilities/src/document/DocumentHelpers.js
+++ b/wax-prosemirror-utilities/src/document/DocumentHelpers.js
@@ -208,7 +208,7 @@ export const findMatches = (doc, searchValue, matchCase) => {
});
eachRight(allNodes, (node, index) => {
- if (node.node.type.name === 'footnote') {
+ if (node.node.type.groups.includes('notes')) {
allNodes.splice(index + 1, node.node.childCount);
}
});
--
GitLab