From f4f4458aac01e9bea216352cf71354204075d6a0 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Tue, 4 Jan 2022 15:15:24 +0200 Subject: [PATCH] fix --- wax-prosemirror-components/src/components/Button.js | 2 +- .../components/QuestionEditorComponent.js | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/wax-prosemirror-components/src/components/Button.js b/wax-prosemirror-components/src/components/Button.js index 992be55df..05cd50c55 100644 --- a/wax-prosemirror-components/src/components/Button.js +++ b/wax-prosemirror-components/src/components/Button.js @@ -20,7 +20,7 @@ const Button = ({ view = {}, item }) => { const handleMouseDown = (e, editorState, editorDispatch) => { e.preventDefault(); - run(editorState, dispatch); + run(editorState, editorDispatch); }; const isActive = !!( diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionEditorComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionEditorComponent.js index 2d5a16dab..60d1bce45 100644 --- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionEditorComponent.js +++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionEditorComponent.js @@ -113,14 +113,16 @@ const QuestionEditorComponent = ({ node, view, getPos }) => { disallowedTools: ['MultipleChoice'], handleDOMEvents: { mousedown: () => { - context.view.main.dispatch( - context.view.main.state.tr.setSelection( - new TextSelection( - context.view.main.state.tr.doc.resolve(getPos() + 2), + context.updateView({}, questionId); + context.view[context.activeViewId].dispatch( + context.view[context.activeViewId].state.tr.setSelection( + TextSelection.between( + context.view[context.activeViewId].state.selection.$anchor, + context.view[context.activeViewId].state.selection.$head, ), ), ); - context.updateView({}, questionId); + // Kludge to prevent issues due to the fact that the whole // footnote is node-selected (and thus DOM-selected) when // the parent editor is focused. -- GitLab