diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/components/EditorComponent.js b/wax-prosemirror-services/src/FillTheGapQuestionService/components/EditorComponent.js
index c22ffae92098193a2a7e45c79a2fbceeff09b2eb..be561aa3c0addcf5723cc4f00345a7b8bf2ff779 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/components/EditorComponent.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/components/EditorComponent.js
@@ -91,7 +91,7 @@ const EditorComponent = ({ node, view, getPos }) => {
}),
// This is the magic part
dispatchTransaction,
- disallowedTools: ['images', 'lists', 'lift'],
+ disallowedTools: ['Images', 'Lists', 'lift'],
handleDOMEvents: {
mousedown: () => {
context.view[activeViewId].dispatch(
diff --git a/wax-prosemirror-services/src/ImageService/Image.js b/wax-prosemirror-services/src/ImageService/Image.js
index a5e792d5d3007a1e2caf06a9c0281753a17d6fa5..e383e8be40cdd767e42744cf844db324169f5efa 100644
--- a/wax-prosemirror-services/src/ImageService/Image.js
+++ b/wax-prosemirror-services/src/ImageService/Image.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-underscore-dangle */
import React from 'react';
import { v4 as uuidv4 } from 'uuid';
import { isEmpty } from 'lodash';
@@ -20,7 +21,7 @@ class Image extends Tools {
select = activeView => {
const { disallowedTools } = activeView.props;
- if (disallowedTools.includes('images')) return false;
+ if (disallowedTools.includes('Images')) return false;
return true;
};
@@ -39,9 +40,9 @@ class Image extends Tools {
);
return this._isDisplayed ? (
<ImageUpload
- key={uuidv4()}
- item={this.toJSON()}
fileUpload={upload}
+ item={this.toJSON()}
+ key={uuidv4()}
view={view}
/>
) : null;
diff --git a/wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js b/wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js
index 36e60381576af5b81ece1ca53388f7b029368af2..4830df167696dbd00638a334b8c4856932214dfb 100644
--- a/wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js
+++ b/wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js
@@ -26,7 +26,7 @@ class BulletList extends Tools {
select = (state, activeViewId, activeView) => {
const { disallowedTools } = activeView.props;
- if (disallowedTools.includes('lists')) return false;
+ if (disallowedTools.includes('Lists')) return false;
return true;
};
diff --git a/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js b/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js
index d0b2119a51e8828f1ecd736e32f273ee145767cb..82731bacbe9eadf506d22ffa62a05359d2f48142 100644
--- a/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js
+++ b/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js
@@ -24,7 +24,7 @@ class OrderedList extends Tools {
select = (state, activeViewId, activeView) => {
const { disallowedTools } = activeView.props;
- if (disallowedTools.includes('lists')) return false;
+ if (disallowedTools.includes('Lists')) return false;
return true;
};
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
index 804302a44528f9c3ed1dfd609c0ce1ee12812a4a..a8e8821cae048b6ab6179d4e8c9b04609c8bfdb0 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
@@ -30,7 +30,9 @@ class MultipleChoiceQuestion extends Tools {
return state => {};
}
- select = (state, activeViewId) => {
+ select = (state, activeViewId, activeView) => {
+ const { disallowedTools } = activeView.props;
+ if (disallowedTools.includes('MultipleChoice')) return false;
let status = true;
const { from, to } = state.selection;
state.doc.nodesBetween(from, to, (node, pos) => {
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/EditorComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/EditorComponent.js
index ee1b48dea14279210a1a4f3ba803c7c3c15b08da..ca16b28ec6758d630d907ec81e6a93c08209cebe 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/EditorComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/EditorComponent.js
@@ -97,7 +97,7 @@ const EditorComponent = ({ node, view, getPos }) => {
}),
// This is the magic part
dispatchTransaction,
- disallowedTools: ['images', 'lists', 'lift'],
+ disallowedTools: ['Images', 'Lists', 'lift', 'MultipleChoice'],
handleDOMEvents: {
mousedown: () => {
context.view[activeViewId].dispatch(
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/FeedbackComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/FeedbackComponent.js
index bd5c9537f255c23e9956b0c4b057d2109b4cf963..b7e2a9d47a1b0c4d3a31e9f5b8fa76d1508614c5 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/FeedbackComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/FeedbackComponent.js
@@ -1,4 +1,6 @@
-/* eslint-disable react-hooks/exhaustive-deps */
+/* eslint-disable react/destructuring-assignment */
+/* eslint-disable react/prop-types */
+
import React, { useContext, useRef, useState, useEffect } from 'react';
import styled from 'styled-components';
import { TextSelection } from 'prosemirror-state';
@@ -44,7 +46,7 @@ export default ({ node, view, getPos }) => {
if (e.key === 'Backspace') {
context.view.main.dispatch(
context.view.main.state.tr.setSelection(
- new TextSelection(context.view.main.state.tr.doc.resolve(0)),
+ TextSelection.create(context.view.main.state.tr.doc, 0),
),
);
}
@@ -73,7 +75,7 @@ export default ({ node, view, getPos }) => {
const onFocus = () => {
context.view.main.dispatch(
context.view.main.state.tr.setSelection(
- new TextSelection(context.view.main.state.tr.doc.resolve(0)),
+ TextSelection.create(context.view.main.state.tr.doc, 0),
),
);
};
@@ -82,14 +84,14 @@ export default ({ node, view, getPos }) => {
<FeedBack>
<FeedBackLabel>Feedback</FeedBackLabel>
<FeedBackInput
- onKeyDown={handleKeyDown}
+ onBlur={saveFeedBack}
onChange={feedBackInput}
+ onFocus={onFocus}
+ onKeyDown={handleKeyDown}
placeholder="Insert feedback"
ref={feedBackRef}
type="text"
value={feedBack}
- onBlur={saveFeedBack}
- onFocus={onFocus}
/>
</FeedBack>
);
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/ToolBarBtn.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/ToolBarBtn.js
index 110af71c7cc5b899f678a36a1cf1ee61383e061c..4441a5e25d25abcc5b2c0290211c3a076ed7a996 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/ToolBarBtn.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/ToolBarBtn.js
@@ -44,8 +44,8 @@ const ToolBarBtn = ({ view = {}, item }) => {
const createOption = () => {
const { state, dispatch } = main;
/* Create Wrapping */
- let { $from, $to } = state.selection;
- let range = $from.blockRange($to);
+ const { $from, $to } = state.selection;
+ const range = $from.blockRange($to);
wrapIn(state.config.schema.nodes.multiple_choice_container, {
id: uuidv4(),
diff --git a/wax-prosemirror-services/src/NoteService/Editor.js b/wax-prosemirror-services/src/NoteService/Editor.js
index 42a65453dddd58ceedbea3edadefb4a729568ddd..5fffc0b55429113ffec7eccaa53bc2b66047c905 100644
--- a/wax-prosemirror-services/src/NoteService/Editor.js
+++ b/wax-prosemirror-services/src/NoteService/Editor.js
@@ -37,7 +37,7 @@ export default ({ node, view }) => {
}),
// This is the magic part
dispatchTransaction,
- disallowedTools: ['tables', 'images'],
+ disallowedTools: ['Tables', 'Images'],
handleDOMEvents: {
blur: () => {
if (context.view[noteId]) {
diff --git a/wax-prosemirror-services/src/TablesService/InsertTableService/Table.js b/wax-prosemirror-services/src/TablesService/InsertTableService/Table.js
index 2ac2d69abebdd94813fab04d316de7a511eda7fe..44dc5460403dd6a7b8d2d096739992e53329c563 100644
--- a/wax-prosemirror-services/src/TablesService/InsertTableService/Table.js
+++ b/wax-prosemirror-services/src/TablesService/InsertTableService/Table.js
@@ -21,7 +21,7 @@ class Table extends Tools {
select = activeView => {
const { disallowedTools } = activeView.props;
- if (disallowedTools.includes('tables')) return false;
+ if (disallowedTools.includes('Tables')) return false;
return true;
};