From 2aa8855c987446786db79d8c4c1edb1cfe4c5822 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Sun, 23 Oct 2022 13:24:42 +0300 Subject: [PATCH] fix single correct answer mode --- editors/demo/src/HHMI/HHMI.js | 2 +- .../components/MatchingContainerComponent.js | 8 +++++--- .../components/SwitchComponent.js | 2 +- .../components/SwitchComponent.js | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js index a232017d2..2b562b313 100644 --- a/editors/demo/src/HHMI/HHMI.js +++ b/editors/demo/src/HHMI/HHMI.js @@ -170,7 +170,7 @@ const Hhmi = () => { value={content} readonly={readOnly} layout={HhmiLayout} - onChange={source => console.log(source)} + // onChange={source => console.log(source)} /> </> ); diff --git a/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js b/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js index 21e525157..bfffd485b 100644 --- a/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js +++ b/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js @@ -139,12 +139,14 @@ export default ({ node, view, getPos }) => { const listener = event => { if (event.code === 'Enter') { event.preventDefault(); - addOptionBtnRef.current.click(); + if (addOptionBtnRef.current) addOptionBtnRef.current.click(); } }; - addOptionBtnRef.current.addEventListener('keydown', listener); + if (addOptionBtnRef.current) + addOptionBtnRef.current.addEventListener('keydown', listener); return () => { - addOptionBtnRef.current.removeEventListener('keydown', listener); + if (addOptionBtnRef.current) + addOptionBtnRef.current.removeEventListener('keydown', listener); }; }, []); diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js index 5ba5ce37d..2fb008ce4 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 }) => { }); } else if ( element.type.name === 'multiple_choice_single_correct' && - element.attrs.correct + element.attrs[key] ) { tr.setNodeMarkup(parentPosition + position + 1, undefined, { ...element.attrs, diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js index 50e7360b7..73aeb1ac7 100644 --- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js +++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js @@ -69,7 +69,7 @@ const CustomSwitch = ({ node, getPos }) => { }); } else if ( element.type.name === 'true_false_single_correct' && - element.attrs.correct + element.attrs[key] ) { tr.setNodeMarkup(parentPosition + position + 1, undefined, { ...element.attrs, -- GitLab