From 62a4a6ff3d22e6b0358b27fe3b190cd8304a7e29 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Thu, 6 Oct 2022 19:27:41 +0300
Subject: [PATCH] fix image being outside of question node
---
.../src/components/images/ImageUpload.js | 2 +-
.../schema/questionSingleNode.js | 2 +-
.../TrueFalseQuestionService/schema/questionTrueFalseNode.js | 3 ++-
.../schema/questionTrueFalseSingleNode.js | 2 +-
.../components/QuestionEditorComponent.js | 2 +-
.../schema/multipleChoiceContainerNode.js | 2 +-
.../MultipleChoiceQuestionService/schema/multipleChoiceNode.js | 2 +-
.../src/MultipleChoiceQuestionService/schema/questionNode.js | 2 +-
8 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/wax-prosemirror-components/src/components/images/ImageUpload.js b/wax-prosemirror-components/src/components/images/ImageUpload.js
index 146f4cb4f..9371fbd4d 100644
--- a/wax-prosemirror-components/src/components/images/ImageUpload.js
+++ b/wax-prosemirror-components/src/components/images/ImageUpload.js
@@ -42,7 +42,7 @@ const ImageUpload = ({ item, fileUpload, view }) => {
new TextSelection(
main.state.tr.doc.resolve(
nodeFound.pos +
- 2 +
+ 1 +
context.pmViews[activeViewId].state.selection.to,
),
),
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js
index 92912ce68..4c1231444 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js
@@ -4,7 +4,7 @@ const questionSingleNode = {
class: { default: 'multiple-choice-question-single' },
},
group: 'block questions',
- content: 'paragraph* bulletlist* orderedlist*',
+ content: 'block+',
defining: true,
// atom: true,
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js
index 992f9625f..fde65c6fd 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js
@@ -4,7 +4,8 @@ const questionTrueFalseNode = {
class: { default: 'true-false-question' },
},
group: 'block questions',
- content: 'paragraph* bulletlist* orderedlist*',
+ // content: 'paragraph* bulletlist* orderedlist*',
+ content: 'block+',
defining: true,
// atom: true,
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js
index f4c150366..ee82a9170 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js
@@ -4,7 +4,7 @@ const questionTrueFalseNode = {
class: { default: 'true-false-question-single' },
},
group: 'block questions',
- content: 'paragraph* bulletlist* orderedlist*',
+ content: 'block+',
defining: true,
// atom: true,
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionEditorComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionEditorComponent.js
index 6c57c169b..abbe5724a 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionEditorComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionEditorComponent.js
@@ -155,7 +155,7 @@ const QuestionEditorComponent = ({ node, view, getPos }) => {
new TextSelection(
main.state.tr.doc.resolve(
getPos() +
- 2 +
+ 1 +
context.pmViews[questionId].state.selection.to,
),
),
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
index 8e556bf26..35033cb0e 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
@@ -5,7 +5,7 @@ const multipleChoiceContainerNode = {
},
group: 'block questions',
atom: true,
- content: 'block*',
+ content: 'block+',
parseDOM: [
{
tag: 'div.multiple-choice',
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
index daf0168fa..5eea97cc0 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
@@ -7,7 +7,7 @@ const multipleChoiceNode = {
feedback: { default: '' },
},
group: 'block questions',
- content: 'block*',
+ content: 'block+',
defining: true,
parseDOM: [
{
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/questionNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/questionNode.js
index 99012468f..05dc969d5 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/questionNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/questionNode.js
@@ -4,7 +4,7 @@ const questionNode = {
id: { default: '' },
},
group: 'block questions',
- content: 'paragraph* bulletlist* orderedlist*',
+ content: 'block+',
defining: true,
parseDOM: [
--
GitLab