From ed8c499a81c02f0e5902f622db474fc8a7e58eb2 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Mon, 17 Jan 2022 04:39:37 +0200
Subject: [PATCH] fix activeView
---
wax-prosemirror-components/src/components/Button.js | 6 +++---
.../src/components/images/ImageUpload.js | 2 +-
.../src/EssayService/EssayQuestion.js | 8 ++++----
.../src/EssayService/components/EssayAnswerComponent.js | 2 +-
.../src/EssayService/components/EssayQuestionComponent.js | 5 ++++-
5 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/wax-prosemirror-components/src/components/Button.js b/wax-prosemirror-components/src/components/Button.js
index 1bf067ac0..4c4e8fab4 100644
--- a/wax-prosemirror-components/src/components/Button.js
+++ b/wax-prosemirror-components/src/components/Button.js
@@ -5,12 +5,12 @@ import MenuButton from '../ui/buttons/MenuButton';
const Button = ({ view = {}, item }) => {
const { active, icon, label, run, select, title } = item;
-
+ const context = useContext(WaxContext);
const {
view: { main },
activeViewId,
activeView,
- } = useContext(WaxContext);
+ } = context;
const isEditable = main.props.editable(editable => {
return editable;
@@ -44,7 +44,7 @@ const Button = ({ view = {}, item }) => {
title={title}
/>
),
- [isActive, isDisabled],
+ [isActive, isDisabled, activeViewId],
);
return MenuButtonComponent;
diff --git a/wax-prosemirror-components/src/components/images/ImageUpload.js b/wax-prosemirror-components/src/components/images/ImageUpload.js
index 2a17ebbb7..3b4edd6c1 100644
--- a/wax-prosemirror-components/src/components/images/ImageUpload.js
+++ b/wax-prosemirror-components/src/components/images/ImageUpload.js
@@ -93,7 +93,7 @@ const ImageUpload = ({ item, fileUpload, view }) => {
</label>
</Wrapper>
),
- [isDisabled],
+ [isDisabled, activeViewId],
);
return ImageUploadComponent;
diff --git a/wax-prosemirror-services/src/EssayService/EssayQuestion.js b/wax-prosemirror-services/src/EssayService/EssayQuestion.js
index dc85658ad..6b6073928 100644
--- a/wax-prosemirror-services/src/EssayService/EssayQuestion.js
+++ b/wax-prosemirror-services/src/EssayService/EssayQuestion.js
@@ -96,10 +96,10 @@ class EssayQuestion extends Tools {
tr.replaceSelectionWith(essayAnswer);
dispatch(tr);
- // setTimeout(() => {
- // createEmptyParagraph(context, essayQuestion.attrs.id);
- // createEmptyParagraph(context, essayAnswer.attrs.id);
- // }, 50);
+ setTimeout(() => {
+ createEmptyParagraph(context, essayAnswer.attrs.id);
+ createEmptyParagraph(context, essayQuestion.attrs.id);
+ }, 50);
};
}
diff --git a/wax-prosemirror-services/src/EssayService/components/EssayAnswerComponent.js b/wax-prosemirror-services/src/EssayService/components/EssayAnswerComponent.js
index 9792280a5..bc48c849f 100644
--- a/wax-prosemirror-services/src/EssayService/components/EssayAnswerComponent.js
+++ b/wax-prosemirror-services/src/EssayService/components/EssayAnswerComponent.js
@@ -15,7 +15,7 @@ import {
liftListItem,
sinkListItem,
} from 'prosemirror-schema-list';
-import Placeholder from '../plugins/placeholder';
+import Placeholder from '../../MultipleChoiceQuestionService/plugins/placeholder';
const EditorWrapper = styled.div`
border: none;
diff --git a/wax-prosemirror-services/src/EssayService/components/EssayQuestionComponent.js b/wax-prosemirror-services/src/EssayService/components/EssayQuestionComponent.js
index ea1b7b326..2337e0530 100644
--- a/wax-prosemirror-services/src/EssayService/components/EssayQuestionComponent.js
+++ b/wax-prosemirror-services/src/EssayService/components/EssayQuestionComponent.js
@@ -15,7 +15,7 @@ import {
liftListItem,
sinkListItem,
} from 'prosemirror-schema-list';
-import Placeholder from '../plugins/placeholder';
+import Placeholder from '../../MultipleChoiceQuestionService/plugins/placeholder';
const EditorWrapper = styled.div`
border: none;
@@ -150,6 +150,9 @@ const EssayQuestionComponent = ({ node, view, getPos }) => {
if (essayQuestionView.hasFocus()) essayQuestionView.focus();
},
},
+ handleClickOn: () => {
+ context.updateView({}, questionId);
+ },
attributes: {
spellcheck: 'false',
--
GitLab