diff --git a/editors/demo/src/Editoria/layout/EditorElements.js b/editors/demo/src/Editoria/layout/EditorElements.js
index dda5ab306b3dfe4079e3971f93ee0f748a459dfb..7aa3866787d6ad64c7d9aaa06ac3785299998adc 100644
--- a/editors/demo/src/Editoria/layout/EditorElements.js
+++ b/editors/demo/src/Editoria/layout/EditorElements.js
@@ -349,7 +349,7 @@ export default css`
}
.math-node.ProseMirror-selectednode .math-src {
- display: flex;
+ display: inline-flex;
}
.math-node.ProseMirror-selectednode .math-render {
display: none;
diff --git a/editors/demo/src/Editors.js b/editors/demo/src/Editors.js
index d19991a2ed8613a7f85ed0fed95a7dc6ef294736..abd0628fb70695fdd171c22a2956784070ef3345 100644
--- a/editors/demo/src/Editors.js
+++ b/editors/demo/src/Editors.js
@@ -70,7 +70,7 @@ const Editors = () => {
case 'ncbi':
return <NCBI />;
default:
- return <HHMI />;
+ return <Editoria />;
}
};
diff --git a/editors/demo/src/HHMI/FillTheGapQuestionService/FillTheGapQuestion.js b/editors/demo/src/HHMI/FillTheGapQuestionService/FillTheGapQuestion.js
deleted file mode 100644
index 4208c9187c0f0200c1290b9f24cad44e6551f007..0000000000000000000000000000000000000000
--- a/editors/demo/src/HHMI/FillTheGapQuestionService/FillTheGapQuestion.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { injectable } from 'inversify';
-import { Tools } from 'wax-prosemirror-services';
-
-@injectable()
-class FillTheGapQuestion extends Tools {
- title = 'Add Fill The Gap Question';
- label = 'Fill The Gap';
- name = 'Fill The Gap';
-
- get run() {
- return (view, context) => {};
- }
-
- get active() {
- return state => {};
- }
-
- select = (state, activeViewId) => {};
-
- get enable() {
- return state => {};
- }
-}
-
-export default FillTheGapQuestion;
diff --git a/editors/demo/src/HHMI/FillTheGapQuestionService/FillTheGapQuestionService.js b/editors/demo/src/HHMI/FillTheGapQuestionService/FillTheGapQuestionService.js
deleted file mode 100644
index 950093760da8cd0deb547d5bdcbfdc96dcdff3a0..0000000000000000000000000000000000000000
--- a/editors/demo/src/HHMI/FillTheGapQuestionService/FillTheGapQuestionService.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Service } from 'wax-prosemirror-services';
-import FillTheGapQuestion from './FillTheGapQuestion';
-
-class FillTheGapQuestionService extends Service {
- register() {
- this.container.bind('FillTheGapQuestion').to(FillTheGapQuestion);
- const createNode = this.container.get('CreateNode');
- const addPortal = this.container.get('AddPortal');
- }
-}
-
-export default FillTheGapQuestionService;
diff --git a/editors/demo/src/HHMI/FillTheGapQuestionService/schema/fillTheGapNode.js b/editors/demo/src/HHMI/FillTheGapQuestionService/schema/fillTheGapNode.js
deleted file mode 100644
index 5443c358ec6da04248a585a388f346a7ce879d92..0000000000000000000000000000000000000000
--- a/editors/demo/src/HHMI/FillTheGapQuestionService/schema/fillTheGapNode.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const fillTheGapNode = {};
-
-export default fillTheGapNode;
diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js
index 6c25d26054957c4261cc9cf6b20a7b0be37a0104..015150cc778d5c88b02b1e52e0a4e04e8bd661c4 100644
--- a/editors/demo/src/HHMI/HHMI.js
+++ b/editors/demo/src/HHMI/HHMI.js
@@ -15,7 +15,7 @@ const renderImage = file => {
});
};
-const t = `<p class="paragraph">Based on the equation below</p><math-display class="math-node">x + y = 5</math-display><p class="paragraph">Which ones are correct?</p><p class="paragraph"></p><div id="" class="mutiple-choice"><div class="mutiple-choice-option" id="d7b65415-ff82-446f-afa4-accaa3837f4a" correct="false" feedback=""><p class="paragraph">answer 1</p><p class="paragraph"><math-inline class="math-node">x+y=1</math-inline></p></div><div class="mutiple-choice-option" id="e7d6bb2f-7cd7-44f1-92a0-281e72157538" correct="true" feedback=""><p class="paragraph">answer 2</p></div><div class="mutiple-choice-option" id="d6fc749f-afae-4203-9562-d68c380a86e5" correct="false" feedback=""><p class="paragraph">answer 3</p></div></div>`;
+const t = `<p class="paragraph">Based on the equation below</p><math-display class="math-node">x + y = 5</math-display><p class="paragraph">Which ones are correct?</p><p class="paragraph"></p><div id="" class="mutiple-choice"><div class="mutiple-choice-option" id="d7b65415-ff82-446f-afa4-accaa3837f4a" correct="false" feedback=""><p class="paragraph">answer 1</p><p class="paragraph"><math-inline class="math-node">x+y=1</math-inline></p></div><div class="mutiple-choice-option" id="e7d6bb2f-7cd7-44f1-92a0-281e72157538" correct="true" feedback=""><p class="paragraph">answer 2</p></div><div class="mutiple-choice-option" id="d6fc749f-afae-4203-9562-d68c380a86e5" correct="false" feedback=""><p class="paragraph">answer 3</p></div></div><div id="" class="fill-the-gap"><p class="paragraph">A <span id="bfd4376c-4424-455e-9187-f53282fa1024" class="fill-the-gap">DNA</span> molecule is very long and usually consists of hundreds or thousands of genes.</p><p class="paragraph">An electron having a certain discrete amount of <span id="14dedf44-728f-4384-835f-e3af82b25623" class="fill-the-gap">energy</span> is something like a ball on a staircase.</p></div><p class="paragraph"></p>`;
const Hhmi = () => {
return (
@@ -24,7 +24,7 @@ const Hhmi = () => {
config={config}
autoFocus
fileUpload={file => renderImage(file)}
- value=""
+ value={t}
// readonly
layout={HhmiLayout}
// onChange={source => console.log(source)}
diff --git a/editors/demo/src/HHMI/config/config.js b/editors/demo/src/HHMI/config/config.js
index 95fe5eeed5a9d213b3379acd4924ccf1abd152a4..930b1815f8bef0cfc5391a665aceddda479ca202 100644
--- a/editors/demo/src/HHMI/config/config.js
+++ b/editors/demo/src/HHMI/config/config.js
@@ -21,17 +21,15 @@ import {
EditorInfoToolGroupServices,
BottomInfoService,
MultipleChoiceQuestionService,
- QuestionsToolGroupService,
+ MultipleChoiceToolGroupService,
+ FillTheGapQuestionService,
+ FillTheGapToolGroupService,
} from 'wax-prosemirror-services';
import { DefaultSchema } from 'wax-prosemirror-utilities';
import { WaxSelectionPlugin } from 'wax-prosemirror-plugins';
import invisibles, { hardBreak } from '@guardian/prosemirror-invisibles';
-/* Questions Services */
-// import MultipleChoiceQuestionService from '../MultipleChoiceQuestionService/MultipleChoiceQuestionService';
-// import QuestionsToolGroupService from '../QuestionsToolGroupService/QuestionsToolGroupService';
-
export default {
MenuService: [
{
@@ -51,7 +49,8 @@ export default {
'Lists',
'Images',
'Tables',
- 'Questions',
+ 'MultipleChoice',
+ 'FillTheGap',
'FullScreen',
],
},
@@ -68,8 +67,10 @@ export default {
],
services: [
+ new FillTheGapQuestionService(),
+ new FillTheGapToolGroupService(),
new MultipleChoiceQuestionService(),
- new QuestionsToolGroupService(),
+ new MultipleChoiceToolGroupService(),
new ListsService(),
new LinkService(),
new InlineAnnotationsService(),
diff --git a/editors/demo/src/HHMI/layout/EditorElements.js b/editors/demo/src/HHMI/layout/EditorElements.js
index 87ac8cb9855caf77cb8673d3890d7c1c781a7878..7b9defffbb5d4723420939b806b9059632fc35d5 100644
--- a/editors/demo/src/HHMI/layout/EditorElements.js
+++ b/editors/demo/src/HHMI/layout/EditorElements.js
@@ -345,4 +345,24 @@ export default css`
padding: 5px 5px 0 5px;
}
}
+
+ /* -- Fill The Gap ---------------------------------- */
+
+ .fill-the-gap {
+ border: 3px solid #f5f5f7;
+ margin-bottom: 30px;
+ margin-top: 30px;
+ padding: 3px;
+
+ &:before {
+ background-color: #fff;
+ bottom: 22px;
+ color: #535e76;
+ content: 'Fill The Gap';
+ height: 10px;
+ left: -1px;
+ position: relative;
+ width: 30px;
+ }
+ }
`;
diff --git a/editors/demo/src/HHMI/layout/HhmiLayout.js b/editors/demo/src/HHMI/layout/HhmiLayout.js
index e56b32578586556e233df1b0185df0093646ccfa..d01b2740b5b68860b187ab3367e63ea036c68b69 100644
--- a/editors/demo/src/HHMI/layout/HhmiLayout.js
+++ b/editors/demo/src/HHMI/layout/HhmiLayout.js
@@ -44,16 +44,14 @@ const TopMenu = styled.div`
${th('colorFurniture')};
}
- > div:nth-last-of-type(-n + 2) {
- margin-left: auto;
- }
-
> div:last-child {
- margin-left: 0;
+ border-left: ${th('borderWidth')} ${th('borderStyle')}
+ ${th('colorFurniture')};
+ margin-left: auto;
margin-right: ${grid(5)};
}
- > div[data-name='Tables'] {
+ > div[data-name='FillTheGap'] {
border-right: none;
}
`;
diff --git a/wax-prosemirror-components/package.json b/wax-prosemirror-components/package.json
index fa8b171ba4eb843561e41bed7f9f362cfe650d34..ca1ae99f408e787c9de4dfeb7ce72dbe1701ab4b 100644
--- a/wax-prosemirror-components/package.json
+++ b/wax-prosemirror-components/package.json
@@ -19,7 +19,7 @@
"moment": "^2.29.0",
"prop-types": "^15.7.2",
"prosemirror-model": "1.14.3",
- "prosemirror-state": "1.3.4",
+ "prosemirror-state": "1.3.3",
"prosemirror-tables": "^1.1.1",
"prosemirror-transform": "1.2.6",
"react-dropdown": "^1.6.2",
diff --git a/wax-prosemirror-components/src/components/comments/CommentBubbleComponent.js b/wax-prosemirror-components/src/components/comments/CommentBubbleComponent.js
index 4dce8b2db5390262770c03b70ea99106a8611299..c4f66573b6a4213e0642a1af935a8c9baf7ae13f 100644
--- a/wax-prosemirror-components/src/components/comments/CommentBubbleComponent.js
+++ b/wax-prosemirror-components/src/components/comments/CommentBubbleComponent.js
@@ -32,7 +32,7 @@ const CommentBubbleComponent = ({
const isCommentAllowed = () => {
const commentMark = activeView.state.schema.marks.comment;
- const mark = DocumentHelpers.findMark(state, commentMark, true);
+ const marks = DocumentHelpers.findMark(state, commentMark, true);
let allowed = true;
state.doc.nodesBetween(
@@ -48,9 +48,13 @@ const CommentBubbleComponent = ({
}
},
);
-
// TODO Overlapping comments . for now don't allow
- if (mark.length >= 1) allowed = false;
+ marks.forEach(mark => {
+ if (mark.attrs.group === 'main') allowed = false;
+ });
+
+ // TO DO this is because of a bug and overlay doesn't rerender. Fix in properly in Notes, and remove
+ if (activeViewId !== 'main' && marks.length >= 1) allowed = false;
return allowed;
};
diff --git a/wax-prosemirror-components/src/icons/icons.js b/wax-prosemirror-components/src/icons/icons.js
index 73859b955688228813c71e8cc5d56120389008bd..203152a11d55a63e4c5b2775e822289437da86df 100644
--- a/wax-prosemirror-components/src/icons/icons.js
+++ b/wax-prosemirror-components/src/icons/icons.js
@@ -418,4 +418,24 @@ export default {
/>
</Svg>
),
+ multipleChoice: ({ className }) => (
+ <Svg className={className} fill="none" viewBox="0 0 24 24">
+ <title> Add Multiple Choice </title>
+ <path d="M16.54,11L13,7.46l1.41-1.41l2.12,2.12l4.24-4.24l1.41,1.41L16.54,11z M11,7H2v2h9V7z M21,13.41L19.59,12L17,14.59 L14.41,12L13,13.41L15.59,16L13,18.59L14.41,20L17,17.41L19.59,20L21,18.59L18.41,16L21,13.41z M11,15H2v2h9V15z" />
+ </Svg>
+ ),
+ gapQuestion: ({ className }) => (
+ <Svg className={className} fill="none" viewBox="0 0 24 24">
+ <title> Add Fill The Gap Question </title>
+ <path d="M0 0h24v24H0V0z" fill="none" />
+ <path d="M21 3H3c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h18c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H3V5h18v14zM5 15h14v3H5z" />
+ </Svg>
+ ),
+ insertGap: ({ className }) => (
+ <Svg className={className} fill="none" viewBox="0 0 24 24">
+ <title> Add Gap </title>
+ <path d="M0 0h24v24H0V0z" fill="none" />
+ <path d="M18 9v4H6V9H4v6h16V9h-2z" />
+ </Svg>
+ ),
};
diff --git a/wax-prosemirror-core/package.json b/wax-prosemirror-core/package.json
index ccd29f33d3026a3951d7567eb7ff8c84fcf12c6a..60af391daac6b660387b28d0612677f1a7e75409 100644
--- a/wax-prosemirror-core/package.json
+++ b/wax-prosemirror-core/package.json
@@ -25,7 +25,7 @@
"prosemirror-inputrules": "1.1.3",
"prosemirror-keymap": "1.1.4",
"prosemirror-model": "1.14.3",
- "prosemirror-state": "1.3.4",
+ "prosemirror-state": "1.3.3",
"prosemirror-transform": "1.2.6",
"prosemirror-view": "1.20.1",
"reflect-metadata": "^0.1.13",
diff --git a/wax-prosemirror-core/src/WaxView.js b/wax-prosemirror-core/src/WaxView.js
index 45bb91c6fe331e8adf704fea3d7856536be76bb4..840ff61273fa0a88efc2b87ef869a4a909a4a22d 100644
--- a/wax-prosemirror-core/src/WaxView.js
+++ b/wax-prosemirror-core/src/WaxView.js
@@ -22,6 +22,10 @@ const WaxPortals = ComponentPlugin('waxPortals');
let previousDoc;
+const PMstyleWrapper = styled.span`
+ ${styles};
+`;
+
export default props => {
const {
browserSpellCheck,
@@ -146,15 +150,11 @@ export default props => {
}
};
- const WaxEditor = styled.span`
- ${styles};
- `;
-
const editor = (
- <WaxEditor>
+ <PMstyleWrapper>
<div ref={setEditorRef} />
<WaxPortals />
- </WaxEditor>
+ </PMstyleWrapper>
);
return useMemo(
diff --git a/wax-prosemirror-plugins/package.json b/wax-prosemirror-plugins/package.json
index 296aec6e75c95799c48c69866f228e1fd03c1769..497f05a05e3bc43ee4733a236276815fe5ab96c7 100644
--- a/wax-prosemirror-plugins/package.json
+++ b/wax-prosemirror-plugins/package.json
@@ -19,7 +19,7 @@
"prosemirror-commands": "1.1.10",
"prosemirror-highlightjs": "^0.2.0",
"prosemirror-keymap": "1.1.4",
- "prosemirror-state": "1.3.4",
+ "prosemirror-state": "1.3.3",
"prosemirror-transform": "1.2.6",
"prosemirror-view": "1.20.1",
"wax-prosemirror-components": "^0.1.3",
diff --git a/wax-prosemirror-plugins/src/highlightPlugin.js b/wax-prosemirror-plugins/src/highlightPlugin.js
index d18b22cc8a5b2e510a6725dffb6df0c54f24c2dd..760487247bed3bec19af9d6c24f208b1b300e6ac 100644
--- a/wax-prosemirror-plugins/src/highlightPlugin.js
+++ b/wax-prosemirror-plugins/src/highlightPlugin.js
@@ -3,7 +3,7 @@ import { getHighlightDecorations } from 'prosemirror-highlightjs';
import { DecorationSet } from 'prosemirror-view';
import { Plugin, PluginKey } from 'prosemirror-state';
-const key = new PluginKey('codeHigh;ight');
+const key = new PluginKey('codeHighlight');
const highlightPlugin = (nodeTypes = ['code_block']) => {
return new Plugin({
diff --git a/wax-prosemirror-schema/src/nodes/blockQuoteNode.js b/wax-prosemirror-schema/src/nodes/blockQuoteNode.js
index 719d281e91ef2dad4e39ffb4c797895be95f7f18..9ffb0e76ebaca850745cdf18a24017be6883b158 100644
--- a/wax-prosemirror-schema/src/nodes/blockQuoteNode.js
+++ b/wax-prosemirror-schema/src/nodes/blockQuoteNode.js
@@ -1,11 +1,11 @@
const blockquote = {
- content: "block+",
- group: "block",
+ content: 'block+',
+ group: 'block',
defining: true,
- parseDOM: [{ tag: "blockquote" }],
+ parseDOM: [{ tag: 'blockquote' }],
toDOM() {
- return ["blockquote", 0];
- }
+ return ['blockquote', 0];
+ },
};
export default blockquote;
diff --git a/wax-prosemirror-services/index.js b/wax-prosemirror-services/index.js
index 0ea0ee27c545724d96c6ff5edc46a48556521b24..6c7521803bd681e05cfa66f27b96eb55bd9cf89c 100644
--- a/wax-prosemirror-services/index.js
+++ b/wax-prosemirror-services/index.js
@@ -45,6 +45,7 @@ export { default as CustomTagInlineService } from './src/CustomTagService/Custom
export { default as CustomTagBlockService } from './src/CustomTagService/CustomTagBlockService/CustomTagBlockService';
export { default as CustomTagService } from './src/CustomTagService/CustomTagService';
export { default as MultipleChoiceQuestionService } from './src/MultipleChoiceQuestionService/MultipleChoiceQuestionService';
+export { default as FillTheGapQuestionService } from './src/FillTheGapQuestionService/FillTheGapQuestionService';
/*
ToolGroups
@@ -70,4 +71,5 @@ export { default as TrackOptionsToolGroupService } from './src/WaxToolGroups/Tra
export { default as TrackCommentOptionsToolGroupService } from './src/WaxToolGroups/TrackCommentOptionsToolGroupService/TrackCommentOptionsToolGroupService';
export { default as CustomTagInlineToolGroupService } from './src/WaxToolGroups/CustomTagToolGroupService/CustomTagInlineToolGroupService/CustomTagInlineToolGroupService';
export { default as CustomTagBlockToolGroupService } from './src/WaxToolGroups/CustomTagToolGroupService/CustomTagBlockToolGroupService/CustomTagBlockToolGroupService';
-export { default as QuestionsToolGroupService } from './src/WaxToolGroups/QuestionsToolGroupService/QuestionsToolGroupService';
+export { default as MultipleChoiceToolGroupService } from './src/WaxToolGroups/MultipleChoiceToolGroupService/MultipleChoiceToolGroupService';
+export { default as FillTheGapToolGroupService } from './src/WaxToolGroups/FillTheGapToolGroupService/FillTheGapToolGroupService';
diff --git a/wax-prosemirror-services/package.json b/wax-prosemirror-services/package.json
index c1d363af5128fac8d2985cb3aa6537e9c1d761ab..4a863b8a2b597517d89ab08e754fb29e8b69fb41 100644
--- a/wax-prosemirror-services/package.json
+++ b/wax-prosemirror-services/package.json
@@ -22,7 +22,7 @@
"prosemirror-keymap": "1.1.4",
"prosemirror-model": "1.14.3",
"prosemirror-schema-list": "1.1.4",
- "prosemirror-state": "1.3.4",
+ "prosemirror-state": "1.3.3",
"prosemirror-transform": "1.2.6",
"prosemirror-view": "1.20.1",
"styled-components": "^5.3.0",
diff --git a/wax-prosemirror-services/src/BaseService/BaseService.js b/wax-prosemirror-services/src/BaseService/BaseService.js
index f1918417203545ebdf724304ef165fbbaa1c5440..83525bb3e3d7feb9249cf38c510d4c8972f028c1 100644
--- a/wax-prosemirror-services/src/BaseService/BaseService.js
+++ b/wax-prosemirror-services/src/BaseService/BaseService.js
@@ -1,5 +1,5 @@
-import Service from "../Service";
-import BaseServices from "./index";
+import Service from '../Service';
+import BaseServices from './index';
class BaseService extends Service {
dependencies = BaseServices;
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/CreateGapService/CreateGap.js b/wax-prosemirror-services/src/FillTheGapQuestionService/CreateGapService/CreateGap.js
new file mode 100644
index 0000000000000000000000000000000000000000..ba353bf6c827c90fd77f4c4485b0a29835cbcfc6
--- /dev/null
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/CreateGapService/CreateGap.js
@@ -0,0 +1,49 @@
+import { injectable } from 'inversify';
+import { Fragment } from 'prosemirror-model';
+import { v4 as uuidv4 } from 'uuid';
+import Tools from '../../lib/Tools';
+
+@injectable()
+class CreateGap extends Tools {
+ title = 'Create Gap Option';
+ icon = 'insertGap';
+ name = 'Create Gap';
+
+ get run() {
+ return (state, dispatch) => {
+ const { empty, $from, $to } = state.selection;
+ let content = Fragment.empty;
+ if (!empty && $from.sameParent($to) && $from.parent.inlineContent)
+ content = $from.parent.content.cut(
+ $from.parentOffset,
+ $to.parentOffset,
+ );
+ const createGap = state.config.schema.nodes.fill_the_gap.create(
+ { id: uuidv4() },
+ content,
+ );
+ dispatch(state.tr.replaceSelectionWith(createGap));
+ };
+ }
+
+ select = (state, activeViewId) => {
+ let status = false;
+ const { from, to } = state.selection;
+ state.doc.nodesBetween(from, to, (node, pos) => {
+ if (node.type.name === 'fill_the_gap_container') {
+ status = true;
+ }
+ });
+ return status;
+ };
+
+ get active() {
+ return state => {};
+ }
+
+ get enable() {
+ return state => {};
+ }
+}
+
+export default CreateGap;
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/CreateGapService/CreateGapService.js b/wax-prosemirror-services/src/FillTheGapQuestionService/CreateGapService/CreateGapService.js
new file mode 100644
index 0000000000000000000000000000000000000000..6194a63fa67e18d4fd7b036cc94070371591b43e
--- /dev/null
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/CreateGapService/CreateGapService.js
@@ -0,0 +1,10 @@
+import Service from '../../Service';
+import CreateGap from './CreateGap';
+
+class FillTheGapQuestionService extends Service {
+ register() {
+ this.container.bind('CreateGap').to(CreateGap);
+ }
+}
+
+export default FillTheGapQuestionService;
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapNodeView.js b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapNodeView.js
new file mode 100644
index 0000000000000000000000000000000000000000..59b626c9ee42bb8793e788f28f9e2a0198308178
--- /dev/null
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapNodeView.js
@@ -0,0 +1,64 @@
+import AbstractNodeView from '../PortalService/AbstractNodeView';
+
+export default class MultipleChoiceNodeView extends AbstractNodeView {
+ constructor(
+ node,
+ view,
+ getPos,
+ decorations,
+ createPortal,
+ Component,
+ context,
+ ) {
+ super(node, view, getPos, decorations, createPortal, Component, context);
+
+ this.node = node;
+ this.outerView = view;
+ this.getPos = getPos;
+ this.context = context;
+ }
+
+ static name() {
+ return 'fill_the_gap';
+ }
+
+ update(node) {
+ // if (!node.sameMarkup(this.node)) return false;
+ this.node = node;
+ if (this.context.view[node.attrs.id]) {
+ const { state } = this.context.view[node.attrs.id];
+ const start = node.content.findDiffStart(state.doc.content);
+ if (start != null) {
+ let { a: endA, b: endB } = node.content.findDiffEnd(state.doc.content);
+ const overlap = start - Math.min(endA, endB);
+ if (overlap > 0) {
+ endA += overlap;
+ endB += overlap;
+ }
+ this.context.view[node.attrs.id].dispatch(
+ state.tr
+ .replace(start, endB, node.slice(start, endA))
+ .setMeta('fromOutside', true),
+ );
+ }
+ }
+
+ return true;
+ }
+
+ selectNode() {
+ this.context.view[this.node.attrs.id].focus();
+ }
+
+ stopEvent(event) {
+ return (
+ this.context.view[this.node.attrs.id] !== undefined &&
+ event.target !== undefined &&
+ this.context.view[this.node.attrs.id].dom.contains(event.target)
+ );
+ }
+
+ ignoreMutation() {
+ return true;
+ }
+}
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapQuestion.js b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapQuestion.js
new file mode 100644
index 0000000000000000000000000000000000000000..07caddf5b9703b20d766a4cadac0bd9c70e6e4ef
--- /dev/null
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapQuestion.js
@@ -0,0 +1,37 @@
+import { injectable } from 'inversify';
+import { wrapIn } from 'prosemirror-commands';
+import Tools from '../lib/Tools';
+
+@injectable()
+class FillTheGapQuestion extends Tools {
+ title = 'Add Fill The Gap Question';
+ icon = 'gapQuestion';
+ name = 'Fill The Gap';
+
+ get run() {
+ return (state, dispatch) => {
+ wrapIn(state.config.schema.nodes.fill_the_gap_container)(state, dispatch);
+ };
+ }
+
+ get active() {
+ return state => {};
+ }
+
+ select = (state, activeViewId) => {
+ let status = true;
+ const { from, to } = state.selection;
+ state.doc.nodesBetween(from, to, (node, pos) => {
+ if (node.type.groups.includes('questions')) {
+ status = false;
+ }
+ });
+ return status;
+ };
+
+ get enable() {
+ return state => {};
+ }
+}
+
+export default FillTheGapQuestion;
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapQuestionService.js b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapQuestionService.js
new file mode 100644
index 0000000000000000000000000000000000000000..4c378b7d81906831564039a854b2936649efa149
--- /dev/null
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapQuestionService.js
@@ -0,0 +1,33 @@
+import Service from '../Service';
+import FillTheGapQuestion from './FillTheGapQuestion';
+import fillTheGapContainerNode from './schema/fillTheGapContainerNode';
+import fillTheGapNode from './schema/fillTheGapNode';
+import CreateGapService from './CreateGapService/CreateGapService';
+import FillTheGapNodeView from './FillTheGapNodeView';
+import GapComponent from './components/GapComponent';
+
+class FillTheGapQuestionService extends Service {
+ register() {
+ this.container.bind('FillTheGapQuestion').to(FillTheGapQuestion);
+ const createNode = this.container.get('CreateNode');
+ const addPortal = this.container.get('AddPortal');
+
+ createNode({
+ fill_the_gap_container: fillTheGapContainerNode,
+ });
+
+ createNode({
+ fill_the_gap: fillTheGapNode,
+ });
+
+ addPortal({
+ nodeView: FillTheGapNodeView,
+ component: GapComponent,
+ context: this.app,
+ });
+ }
+
+ dependencies = [new CreateGapService()];
+}
+
+export default FillTheGapQuestionService;
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/components/EditorComponent.js b/wax-prosemirror-services/src/FillTheGapQuestionService/components/EditorComponent.js
new file mode 100644
index 0000000000000000000000000000000000000000..c22ffae92098193a2a7e45c79a2fbceeff09b2eb
--- /dev/null
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/components/EditorComponent.js
@@ -0,0 +1,154 @@
+/* eslint-disable react/destructuring-assignment */
+/* eslint-disable react/prop-types */
+
+import React, { useContext, useRef, useEffect } from 'react';
+import styled from 'styled-components';
+import { EditorView } from 'prosemirror-view';
+import { EditorState, TextSelection } from 'prosemirror-state';
+import { StepMap } from 'prosemirror-transform';
+import { keymap } from 'prosemirror-keymap';
+import { baseKeymap } from 'prosemirror-commands';
+import { undo, redo } from 'prosemirror-history';
+import { WaxContext } from 'wax-prosemirror-core';
+
+const EditorWrapper = styled.span`
+ display: inline-flex;
+
+ > .ProseMirror {
+ background: #a6a6a6 !important;
+ border: 1px solid #a6a6a6;
+ border-radius: 4px;
+ box-shadow: none;
+ color: #fff !important;
+ display: inline;
+ min-width: 50px;
+ padding: 0px 2px 0px 2px !important;
+ white-space: break-spaces;
+ width: auto;
+ word-wrap: break-word;
+
+ &:focus {
+ outline: none;
+ }
+
+ p.empty-node:first-child::before {
+ content: attr(data-content);
+ }
+
+ .empty-node::before {
+ color: rgb(170, 170, 170);
+ float: left;
+ font-style: italic;
+ height: 0px;
+ pointer-events: none;
+ }
+ }
+`;
+
+const EditorComponent = ({ node, view, getPos }) => {
+ const editorRef = useRef();
+
+ const context = useContext(WaxContext);
+ let gapView;
+ const questionId = node.attrs.id;
+ const isEditable = context.view.main.props.editable(editable => {
+ return editable;
+ });
+
+ let finalPlugins = [];
+
+ const createKeyBindings = () => {
+ const keys = getKeys();
+ Object.keys(baseKeymap).forEach(key => {
+ keys[key] = baseKeymap[key];
+ });
+ return keys;
+ };
+
+ const getKeys = () => {
+ return {
+ 'Mod-z': () => undo(view.state, view.dispatch),
+ 'Mod-y': () => redo(view.state, view.dispatch),
+ };
+ };
+
+ const plugins = [keymap(createKeyBindings()), ...context.app.getPlugins()];
+
+ finalPlugins = finalPlugins.concat([...plugins]);
+
+ const { activeViewId } = context;
+
+ useEffect(() => {
+ gapView = new EditorView(
+ {
+ mount: editorRef.current,
+ },
+ {
+ editable: () => isEditable,
+ state: EditorState.create({
+ doc: node,
+ plugins: finalPlugins,
+ }),
+ // This is the magic part
+ dispatchTransaction,
+ disallowedTools: ['images', 'lists', 'lift'],
+ handleDOMEvents: {
+ mousedown: () => {
+ context.view[activeViewId].dispatch(
+ context.view[activeViewId].state.tr.setSelection(
+ TextSelection.between(
+ context.view[activeViewId].state.selection.$anchor,
+ context.view[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.
+ if (gapView.hasFocus()) gapView.focus();
+ },
+ },
+
+ attributes: {
+ spellcheck: 'false',
+ },
+ },
+ );
+
+ // Set Each note into Wax's Context
+ context.updateView(
+ {
+ [questionId]: gapView,
+ },
+ questionId,
+ );
+ gapView.focus();
+ }, []);
+
+ const dispatchTransaction = tr => {
+ const { state, transactions } = gapView.state.applyTransaction(tr);
+ gapView.updateState(state);
+ context.updateView({}, questionId);
+
+ if (!tr.getMeta('fromOutside')) {
+ const outerTr = view.state.tr;
+ const offsetMap = StepMap.offset(getPos() + 1);
+ for (let i = 0; i < transactions.length; i++) {
+ const { steps } = transactions[i];
+ for (let j = 0; j < steps.length; j++)
+ outerTr.step(steps[j].map(offsetMap));
+ }
+ if (outerTr.docChanged)
+ view.dispatch(outerTr.setMeta('outsideView', questionId));
+ }
+ };
+
+ return (
+ <EditorWrapper>
+ <div ref={editorRef} />
+ </EditorWrapper>
+ );
+};
+
+export default EditorComponent;
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/components/GapComponent.js b/wax-prosemirror-services/src/FillTheGapQuestionService/components/GapComponent.js
new file mode 100644
index 0000000000000000000000000000000000000000..efc17d00e85d22f08872143943820c9a7851260f
--- /dev/null
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/components/GapComponent.js
@@ -0,0 +1,7 @@
+/* eslint-disable react/prop-types */
+import React from 'react';
+import EditorComponent from './EditorComponent';
+
+export default ({ node, view, getPos }) => {
+ return <EditorComponent getPos={getPos} node={node} view={view} />;
+};
diff --git a/editors/demo/src/HHMI/FillTheGapQuestionService/schema/fillTheGapContainerNode.js b/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js
similarity index 88%
rename from editors/demo/src/HHMI/FillTheGapQuestionService/schema/fillTheGapContainerNode.js
rename to wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js
index 6f1a76ec2fec74c445b33e5fe7daf92b8544ec7a..129fb2856ea97200faa6538b04fbdadd3f6ba96e 100644
--- a/editors/demo/src/HHMI/FillTheGapQuestionService/schema/fillTheGapContainerNode.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js
@@ -3,9 +3,8 @@ const fillTheGapContainerNode = {
id: { default: '' },
class: { default: 'fill-the-gap' },
},
- group: 'block',
- selectable: true,
- draggable: true,
+ group: 'block questions',
+ defining: true,
content: 'block+',
parseDOM: [
{
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js b/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js
new file mode 100644
index 0000000000000000000000000000000000000000..2f6ddcf858aa2eddbb80462beee136198a3bae7e
--- /dev/null
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js
@@ -0,0 +1,26 @@
+const fillTheGapNode = {
+ group: 'inline',
+ content: 'text*',
+ inline: true,
+ // atom: true,
+ attrs: {
+ id: { default: '' },
+ class: { default: 'fill-the-gap' },
+ },
+ parseDOM: [
+ {
+ tag: 'span',
+ getAttrs(dom) {
+ return {
+ id: dom.getAttribute('id'),
+ class: dom.getAttribute('class'),
+ };
+ },
+ },
+ ],
+ toDOM: node => {
+ return ['span', node.attrs, 0];
+ },
+};
+
+export default fillTheGapNode;
diff --git a/wax-prosemirror-services/src/InlineAnnotations/InlineAnnotationsService.js b/wax-prosemirror-services/src/InlineAnnotations/InlineAnnotationsService.js
index 76e753be9fcf8b4d68633b149ace953a713c6eda..ddf4f112bba3b43d1f3cb2b36907eb0ec146f88d 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/InlineAnnotationsService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/InlineAnnotationsService.js
@@ -1,5 +1,5 @@
-import Service from "../Service";
-import InlineServices from "./index";
+import Service from '../Service';
+import InlineServices from './index';
class InlineAnnotationsService extends Service {
dependencies = InlineServices;
diff --git a/wax-prosemirror-services/src/ListsService/ListsService.js b/wax-prosemirror-services/src/ListsService/ListsService.js
index 3e1fd350729b7457a2a805b77e9cef76d9961ad0..4a87bf91042c542062e13331daddb0afa6458797 100644
--- a/wax-prosemirror-services/src/ListsService/ListsService.js
+++ b/wax-prosemirror-services/src/ListsService/ListsService.js
@@ -1,5 +1,5 @@
-import Service from "../Service";
-import ListsServices from "./index";
+import Service from '../Service';
+import ListsServices from './index';
class ListsService extends Service {
dependencies = ListsServices;
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
index 6ffe599ba02feb580f125d2217e67025235e3c8c..804302a44528f9c3ed1dfd609c0ce1ee12812a4a 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
@@ -17,38 +17,12 @@ const checkifEmpty = view => {
@injectable()
class MultipleChoiceQuestion extends Tools {
title = 'Add Multiple Choice Question';
- label = 'Multiple Choice';
+ icon = 'multipleChoice';
name = 'Multiple Choice';
get run() {
return (view, context) => {
checkifEmpty(view);
-
- // const { state, dispatch } = view;
- // const { tr } = state;
- // /* Create Wrapping */
- // let { $from, $to } = state.selection;
- // let range = $from.blockRange($to),
- // wrapping =
- // range &&
- // findWrapping(
- // range,
- // state.config.schema.nodes.multiple_choice_container,
- // {},
- // );
- // if (!wrapping) return false;
- // tr.wrap(range, wrapping).scrollIntoView();
-
- // /* create First Option */
- // const newAnswerId = uuidv4();
- // const answerOption = state.config.schema.nodes.multiple_choice.create(
- // { id: newAnswerId },
- // Fragment.empty,
- // );
- // dispatch(tr.replaceSelectionWith(answerOption));
- // setTimeout(() => {
- // helpers.createEmptyParagraph(context, newAnswerId);
- // }, 100);
};
}
@@ -60,7 +34,7 @@ class MultipleChoiceQuestion extends Tools {
let status = true;
const { from, to } = state.selection;
state.doc.nodesBetween(from, to, (node, pos) => {
- if (node.type.name === 'multiple_choice_container') {
+ if (node.type.groups.includes('questions')) {
status = false;
}
});
@@ -73,8 +47,9 @@ class MultipleChoiceQuestion extends Tools {
renderTool(view) {
if (isEmpty(view)) return null;
+ // eslint-disable-next-line no-underscore-dangle
return this._isDisplayed ? (
- <ToolBarBtn key={uuidv4()} item={this.toJSON()} view={view} />
+ <ToolBarBtn item={this.toJSON()} key={uuidv4()} view={view} />
) : null;
}
}
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/EditorComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/EditorComponent.js
index 4f6f721873790aab1d88fd8c082801f672ad5a79..ee1b48dea14279210a1a4f3ba803c7c3c15b08da 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/EditorComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/EditorComponent.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, useEffect } from 'react';
import styled from 'styled-components';
import { EditorView } from 'prosemirror-view';
@@ -15,7 +17,6 @@ const EditorWrapper = styled.div`
display: flex;
flex: 2 1 auto;
justify-content: left;
- margin-right: 15px;
.ProseMirror {
white-space: break-spaces;
@@ -81,13 +82,7 @@ const EditorComponent = ({ node, view, getPos }) => {
...plugins,
]);
- const {
- view: { main },
- activeViewId,
- } = context;
-
- if (activeViewId === node.attrs.id && context.view[activeViewId].focused) {
- }
+ const { activeViewId } = context;
useEffect(() => {
questionView = new EditorView(
@@ -127,7 +122,7 @@ const EditorComponent = ({ node, view, getPos }) => {
},
);
- //Set Each note into Wax's Context
+ // Set Each note into Wax's Context
context.updateView(
{
[questionId]: questionView,
@@ -138,15 +133,15 @@ const EditorComponent = ({ node, view, getPos }) => {
}, []);
const dispatchTransaction = tr => {
- let { state, transactions } = questionView.state.applyTransaction(tr);
+ const { state, transactions } = questionView.state.applyTransaction(tr);
questionView.updateState(state);
context.updateView({}, questionId);
if (!tr.getMeta('fromOutside')) {
- let outerTr = view.state.tr,
- offsetMap = StepMap.offset(getPos() + 1);
+ const outerTr = view.state.tr;
+ const offsetMap = StepMap.offset(getPos() + 1);
for (let i = 0; i < transactions.length; i++) {
- let steps = transactions[i].steps;
+ const { steps } = transactions[i];
for (let j = 0; j < steps.length; j++)
outerTr.step(steps[j].map(offsetMap));
}
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionComponent.js
index 1171dac4ea35ce9edc569b500c37cf75a740676e..3a3e2068a4b43a4adbd79a46d7017fcc6504a0a8 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionComponent.js
@@ -1,3 +1,4 @@
+/* eslint-disable react/prop-types */
import React, { useContext } from 'react';
import styled from 'styled-components';
import { TextSelection } from 'prosemirror-state';
@@ -13,7 +14,7 @@ import Button from './Button';
const Wrapper = styled.div`
display: flex;
- flex-direction: column;
+ flex-direction: row;
width: 100%;
`;
@@ -33,7 +34,8 @@ const QuestionNunber = styled.span`
const QuestionControlsWrapper = styled.div`
display: flex;
- flex-direction: row;
+ flex-direction: column;
+ width: 100%;
`;
const QuestionWrapper = styled.div`
@@ -123,34 +125,33 @@ export default ({ node, view, getPos }) => {
return (
<Wrapper>
- <InfoRow>
- <QuestionNunber></QuestionNunber>
- </InfoRow>
<QuestionControlsWrapper>
+ <InfoRow>
+ <QuestionNunber />
+ <SwitchComponent getPos={getPos} node={node} />
+ </InfoRow>
<QuestionWrapper>
<QuestionData>
- <EditorComponent node={node} view={view} getPos={getPos} />
-
- <SwitchComponent node={node} getPos={getPos} />
+ <EditorComponent getPos={getPos} node={node} view={view} />
</QuestionData>
- <FeedbackComponent node={node} view={view} getPos={getPos} />
+ <FeedbackComponent getPos={getPos} node={node} view={view} />
</QuestionWrapper>
- <IconsWrapper>
- {showAddIcon && !readOnly && (
- <Button
- onClick={() => addOption(node.attrs.id)}
- icon={<PlusSquareOutlined title="Add Option" />}
- />
- )}
- {showRemoveIcon && !readOnly && (
- <Button
- icon={
- <DeleteOutlined onClick={removeOption} title="Delete Option" />
- }
- />
- )}
- </IconsWrapper>
</QuestionControlsWrapper>
+ <IconsWrapper>
+ {showAddIcon && !readOnly && (
+ <Button
+ icon={<PlusSquareOutlined title="Add Option" />}
+ onClick={() => addOption(node.attrs.id)}
+ />
+ )}
+ {showRemoveIcon && !readOnly && (
+ <Button
+ icon={
+ <DeleteOutlined onClick={removeOption} title="Delete Option" />
+ }
+ />
+ )}
+ </IconsWrapper>
</Wrapper>
);
};
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/SwitchComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/SwitchComponent.js
index 6231f290cf63212639f4bb08a40a77d5f947cbe0..0d2b5c97b286e17f9ece73fef804a5c17397934c 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/SwitchComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/SwitchComponent.js
@@ -1,3 +1,4 @@
+/* eslint-disable react/prop-types */
/* eslint-disable react-hooks/exhaustive-deps */
import React, { useState, useContext, useEffect } from 'react';
import { WaxContext } from 'wax-prosemirror-core';
@@ -10,11 +11,11 @@ const StyledSwitch = styled(Switch)`
margin-left: auto;
span:nth-child(1) {
- bottom: 36px;
- display: flex;
- left: 4px;
- position: relative;
- width: 0px;
+ // bottom: 36px;
+ // display: flex;
+ // left: 4px;
+ // position: relative;
+ // width: 0px;
}
.ant-switch-checked {
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
index 2b0fd0081ba47ff3f4b6d056e5db02d6880e7186..ce3db8f418cad60e95cfe3e31a2b9435deca2e95 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
@@ -3,7 +3,7 @@ const multipleChoiceContainerNode = {
id: { default: '' },
class: { default: 'mutiple-choice' },
},
- group: 'block',
+ group: 'block questions',
atom: true,
selectable: true,
draggable: true,
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
index 4617a88cabe27563aafb8e3171da3070b82dbe3e..c52e3d9b824571b60dcc693b6902ed6171176600 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
@@ -7,7 +7,7 @@ const multipleChoiceNode = {
correct: { default: false },
feedback: { default: '' },
},
- group: 'block',
+ group: 'block questions',
content: 'block*',
defining: true,
diff --git a/wax-prosemirror-services/src/NoteService/Note.js b/wax-prosemirror-services/src/NoteService/Note.js
index 17e97dc216e7ddde4f7025d8b36889553a9835a2..76395e692b15f1b384e8b8dbd83e1660e988b928 100644
--- a/wax-prosemirror-services/src/NoteService/Note.js
+++ b/wax-prosemirror-services/src/NoteService/Note.js
@@ -1,7 +1,7 @@
-import Tools from '../lib/Tools';
import { injectable } from 'inversify';
import { Fragment } from 'prosemirror-model';
import { v4 as uuidv4 } from 'uuid';
+import Tools from '../lib/Tools';
export default
@injectable()
diff --git a/wax-prosemirror-services/src/TablesService/TablesService.js b/wax-prosemirror-services/src/TablesService/TablesService.js
index 1172660adaed87bd1b3d8bfc67b4064528c25957..ceef94284bfef870d37c86b5d677156266450724 100644
--- a/wax-prosemirror-services/src/TablesService/TablesService.js
+++ b/wax-prosemirror-services/src/TablesService/TablesService.js
@@ -1,5 +1,5 @@
-import Service from "../Service";
-import TablesServices from "./index";
+import Service from '../Service';
+import TablesServices from './index';
class TablesService extends Service {
dependencies = TablesServices;
diff --git a/wax-prosemirror-services/src/TextBlockLevel/TextBlockLevelService.js b/wax-prosemirror-services/src/TextBlockLevel/TextBlockLevelService.js
index 756956f3c3a69f7576d5b1e89f7dd3fca42fc855..e19aa29a9e418725281a186e7bc8a15dd387fb76 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/TextBlockLevelService.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/TextBlockLevelService.js
@@ -1,5 +1,5 @@
-import Service from "../Service";
-import TextServices from "./index";
+import Service from '../Service';
+import TextServices from './index';
class TextBlockLevelService extends Service {
dependencies = TextServices;
diff --git a/editors/demo/src/HHMI/FillTheGapToolGroupService/FillTheGap.js b/wax-prosemirror-services/src/WaxToolGroups/FillTheGapToolGroupService/FillTheGap.js
similarity index 57%
rename from editors/demo/src/HHMI/FillTheGapToolGroupService/FillTheGap.js
rename to wax-prosemirror-services/src/WaxToolGroups/FillTheGapToolGroupService/FillTheGap.js
index 40220ac4c873abfe3c52d35bd044e2f8f52bd976..6318c164ea2f20196bc81991e6a700e5d6c4a8b0 100644
--- a/editors/demo/src/HHMI/FillTheGapToolGroupService/FillTheGap.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/FillTheGapToolGroupService/FillTheGap.js
@@ -4,9 +4,12 @@ import { ToolGroup } from 'wax-prosemirror-services';
@injectable()
class FillTheGap extends ToolGroup {
tools = [];
- constructor(@inject('FillTheGapQuestion') FillTheGapQuestion) {
+ constructor(
+ @inject('FillTheGapQuestion') FillTheGapQuestion,
+ @inject('CreateGap') CreateGap,
+ ) {
super();
- this.tools = [FillTheGapQuestion];
+ this.tools = [FillTheGapQuestion, CreateGap];
}
}
diff --git a/editors/demo/src/HHMI/FillTheGapToolGroupService/FillTheGapToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/FillTheGapToolGroupService/FillTheGapToolGroupService.js
similarity index 100%
rename from editors/demo/src/HHMI/FillTheGapToolGroupService/FillTheGapToolGroupService.js
rename to wax-prosemirror-services/src/WaxToolGroups/FillTheGapToolGroupService/FillTheGapToolGroupService.js
diff --git a/wax-prosemirror-services/src/WaxToolGroups/QuestionsToolGroupService/Questions.js b/wax-prosemirror-services/src/WaxToolGroups/MultipleChoiceToolGroupService/MultipleChoice.js
similarity index 78%
rename from wax-prosemirror-services/src/WaxToolGroups/QuestionsToolGroupService/Questions.js
rename to wax-prosemirror-services/src/WaxToolGroups/MultipleChoiceToolGroupService/MultipleChoice.js
index 8b9b9eada607a08c6bc9937f5257a696b57d98af..ec4920997bf8fcaa72037b70950b89e583ee3d30 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/QuestionsToolGroupService/Questions.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/MultipleChoiceToolGroupService/MultipleChoice.js
@@ -2,7 +2,7 @@ import { injectable, inject } from 'inversify';
import ToolGroup from '../../lib/ToolGroup';
@injectable()
-class Questions extends ToolGroup {
+class MultipleChoice extends ToolGroup {
tools = [];
constructor(@inject('MultipleChoiceQuestion') multipleChoiceQuestion) {
super();
@@ -10,4 +10,4 @@ class Questions extends ToolGroup {
}
}
-export default Questions;
+export default MultipleChoice;
diff --git a/wax-prosemirror-services/src/WaxToolGroups/MultipleChoiceToolGroupService/MultipleChoiceToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/MultipleChoiceToolGroupService/MultipleChoiceToolGroupService.js
new file mode 100644
index 0000000000000000000000000000000000000000..8f13fbedd31ed32ca52eda9920497e7466cfeab7
--- /dev/null
+++ b/wax-prosemirror-services/src/WaxToolGroups/MultipleChoiceToolGroupService/MultipleChoiceToolGroupService.js
@@ -0,0 +1,10 @@
+import Service from '../../Service';
+import MultipleChoice from './MultipleChoice';
+
+class MultipleChoiceToolGroupService extends Service {
+ register() {
+ this.container.bind('MultipleChoice').to(MultipleChoice);
+ }
+}
+
+export default MultipleChoiceToolGroupService;
diff --git a/wax-prosemirror-services/src/WaxToolGroups/QuestionsToolGroupService/QuestionsToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/QuestionsToolGroupService/QuestionsToolGroupService.js
deleted file mode 100644
index f5b68c449e652bc226bad710d132b21c55ec9277..0000000000000000000000000000000000000000
--- a/wax-prosemirror-services/src/WaxToolGroups/QuestionsToolGroupService/QuestionsToolGroupService.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import Service from '../../Service';
-import Questions from './Questions';
-
-class QuestionsToolGroupService extends Service {
- register() {
- this.container.bind('Questions').to(Questions);
- }
-}
-
-export default QuestionsToolGroupService;
diff --git a/yarn.lock b/yarn.lock
index 23b621cba92c0268478664bc11ed97b9b2ef8f62..1f0d4bf0e13f2afef25b477285d979c1c450ea22 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14795,15 +14795,7 @@ prosemirror-schema-list@^1.0.0:
prosemirror-model "^1.0.0"
prosemirror-transform "^1.0.0"
-prosemirror-state@1.3.4:
- version "1.3.4"
- resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.4.tgz#4c6b52628216e753fc901c6d2bfd84ce109e8952"
- integrity sha512-Xkkrpd1y/TQ6HKzN3agsQIGRcLckUMA9u3j207L04mt8ToRgpGeyhbVv0HI7omDORIBHjR29b7AwlATFFf2GLA==
- dependencies:
- prosemirror-model "^1.0.0"
- prosemirror-transform "^1.0.0"
-
-prosemirror-state@>=1.0.0, prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1:
+prosemirror-state@1.3.3, prosemirror-state@>=1.0.0, prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1:
version "1.3.3"
resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.3.tgz#b2862866b14dec2b3ae1ab18229f2bd337651a2c"
integrity sha512-PLXh2VJsIgvlgSTH6I2Yg6vk1CzPDp21DFreVpQtDMY2S6WaMmrQgDTLRcsrD8X38v8Yc873H7+ogdGzyIPn+w==