From 7c082fe3dddf19502a2d811c31efd23ac0fb6b8e Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Fri, 5 Nov 2021 09:25:21 +0200
Subject: [PATCH] set disabled and found
---
.../MultipleChoiceQuestion.js | 3 ++-
.../MultipleDropDown.js | 26 ++++++++++++-------
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
index eab2a979c..e5b708061 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
@@ -52,6 +52,7 @@ class MultipleChoiceQuestion extends Tools {
title = 'Add Multiple Choice Question';
icon = 'multipleChoice';
name = 'Multiple Choice';
+ label = 'Multiple Choice';
get run() {
return (view, main, context) => {
@@ -64,7 +65,7 @@ class MultipleChoiceQuestion extends Tools {
return state => {};
}
- select = (state, activeViewId, activeView) => {
+ select = (state, activeView) => {
const { disallowedTools } = activeView.props;
if (disallowedTools.includes('MultipleChoice')) return false;
let status = true;
diff --git a/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js b/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js
index 0126f7cc7..ddee8bbbd 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js
@@ -18,12 +18,6 @@ class MultipleDropDown extends ToolGroup {
renderTools(view) {
if (isEmpty(view)) return null;
- const context = useContext(WaxContext);
-
- const {
- activeViewId,
- view: { main },
- } = context;
const Wrapper = styled.div`
${ReactDropDownStyles};
@@ -57,11 +51,18 @@ class MultipleDropDown extends ToolGroup {
}
`;
- const { dispatch, state } = view;
+ const context = useContext(WaxContext);
+
+ const {
+ activeView,
+ view: { main },
+ } = context;
+ const { state } = view;
+
const dropDownOptions = [
- { label: 'Multiple choice ', value: '0', item: this._tools[0] },
+ { label: 'Multiple Choice ', value: '0', item: this._tools[0] },
{
- label: 'Multiple choice (single correct) ',
+ label: 'Multiple Choice (single correct) ',
value: '1',
item: this._tools[0],
},
@@ -73,8 +74,13 @@ class MultipleDropDown extends ToolGroup {
},
];
- const isDisabled = true;
+ const isDisabled = this._tools[0].select(state, activeView);
let found = '';
+ dropDownOptions.forEach((item, i) => {
+ if (item.item.select(state, activeView) === false) {
+ found = item.item.label;
+ }
+ });
return (
<Wrapper key={uuidv4()}>
--
GitLab