From 04f23ce52cc8bf1352a1d12e734d1f567cedd495 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Wed, 23 Feb 2022 00:47:03 +0200 Subject: [PATCH] add new file for readonly --- editors/demo/src/HHMI/HHMI.js | 19 ++++++++++++++++--- .../components/InputComponent.js | 6 ++++++ .../src/ListsService/JoinUpService/JoinUp.js | 3 +++ .../components/SwitchComponent.js | 2 +- .../components/SwitchComponent.js | 2 +- .../components/SwitchComponent.js | 2 +- .../components/SwitchComponent.js | 2 +- 7 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 wax-prosemirror-services/src/FillTheGapQuestionService/components/InputComponent.js diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js index 8f01580d9..287c402de 100644 --- a/editors/demo/src/HHMI/HHMI.js +++ b/editors/demo/src/HHMI/HHMI.js @@ -22,7 +22,20 @@ const SubmitButton = styled.button` top: 16px; `; -const t = `<p class="paragraph"></p><div id="" class="multiple-choice"><div class="multiple-choice-question" id="38de8538-647a-489d-8474-f92d0d256c32"><p class="paragraph">question </p></div><div class="multiple-choice-option" id="debb868e-bbfe-4ba2-bf93-c963153ff791" correct="false" answer="false" feedback="feedback 1"><p class="paragraph">answer 1</p></div><div class="multiple-choice-option" id="810bcf10-4fcb-4d1e-9dab-ce35cbd28527" correct="true" answer="false" feedback="feedback 2"><p class="paragraph">answer 2</p></div></div>`; +const t = `<p class="paragraph"></p> +<div id="" class="multiple-choice"> + <div class="multiple-choice-question" id="38de8538-647a-489d-8474-f92d0d256c32"> + <p class="paragraph">question </p> + </div> + <div class="multiple-choice-option" id="debb868e-bbfe-4ba2-bf93-c963153ff791" correct="false" answer="false" feedback="feedback 1"> + <p class="paragraph">answer 1</p> + </div> + <div class="multiple-choice-option" id="810bcf10-4fcb-4d1e-9dab-ce35cbd28527" correct="true" answer="false" feedback="feedback 2"> + <p class="paragraph">answer 2</p> + </div> +</div> +<div id="" class="fill-the-gap"><p class="paragraph">some text with a <span id="e88faa82-ff79-4b5a-9aa5-cb10b4236e98" class="fill-the-gap">gap</span> and </p></div> +`; const Hhmi = () => { const [submited, isSubmited] = useState(false); @@ -39,9 +52,9 @@ const Hhmi = () => { customValues={{ showFeedBack: submited }} fileUpload={file => renderImage(file)} value={t} - readonly + // readonly layout={HhmiLayout} - // onChange={source => console.log(source)} + onChange={source => console.log(source)} /> </> ); diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/components/InputComponent.js b/wax-prosemirror-services/src/FillTheGapQuestionService/components/InputComponent.js new file mode 100644 index 000000000..1f62d85b0 --- /dev/null +++ b/wax-prosemirror-services/src/FillTheGapQuestionService/components/InputComponent.js @@ -0,0 +1,6 @@ +import React, { useContext, useRef, useEffect } from 'react'; +import styled from 'styled-components'; + +const InputComponent = ({ node, view, getPos }) => {}; + +export default InputComponent; diff --git a/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUp.js b/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUp.js index 8760213b5..5714be53f 100644 --- a/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUp.js +++ b/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUp.js @@ -25,6 +25,9 @@ class JoinUp extends Tools { }); } + if (from === null) return false; + const { disallowedTools } = activeView.props; + if (disallowedTools.includes('Lists')) status = false; return status; }; diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js index bfafba920..a36386841 100644 --- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js +++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js @@ -69,7 +69,7 @@ const CustomSwitch = ({ node, getPos }) => { allNodes.forEach(singNode => { if (singNode.node.attrs.id === node.attrs.id) { setChecked(singNode.node.attrs.correct); - setCheckedAnswerMode(singNode.node.attrs.correct); + setCheckedAnswerMode(singNode.node.attrs.answer); } }); }, [getNodes(main)]); diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/SwitchComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/SwitchComponent.js index 8ccb53b92..6fecda812 100644 --- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/SwitchComponent.js +++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/SwitchComponent.js @@ -77,7 +77,7 @@ const CustomSwitch = ({ node, getPos }) => { allNodes.forEach(singNode => { if (singNode.node.attrs.id === node.attrs.id) { setChecked(singNode.node.attrs.correct); - setCheckedAnswerMode(singNode.node.attrs.correct); + setCheckedAnswerMode(singNode.node.attrs.answer); } }); }, [getNodes(main)]); diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js index 9b2b9531c..3abc61c40 100644 --- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js +++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js @@ -70,7 +70,7 @@ const CustomSwitch = ({ node, getPos }) => { allNodes.forEach(singNode => { if (singNode.node.attrs.id === node.attrs.id) { setChecked(singNode.node.attrs.correct); - setCheckedAnswerMode(singNode.node.attrs.correct); + setCheckedAnswerMode(singNode.node.attrs.answer); } }); }, [getNodes(main)]); diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/SwitchComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/SwitchComponent.js index 27d6f1cce..b5adeb9e1 100644 --- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/SwitchComponent.js +++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/SwitchComponent.js @@ -76,7 +76,7 @@ const CustomSwitch = ({ node, getPos }) => { allNodes.forEach(singNode => { if (singNode.node.attrs.id === node.attrs.id) { setChecked(singNode.node.attrs.correct); - setCheckedAnswerMode(singNode.node.attrs.correct); + setCheckedAnswerMode(singNode.node.attrs.answer); } }); }, [getNodes(main)]); -- GitLab