Merge branch 'inline-node-view' into 'master'

Inline node view

See merge request !328

editors/demo/package.json

@@ -8,7 +8,6 @@
     "@pubsweet/ui-toolkit": "^2.3.1",
     "antd": "^4.15.4",
     "fontsource-merriweather": "^3.0.9",
-    "prosemirror-schema-basic": "^1.1.2",
     "prosemirror-tables": "^1.1.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",

editors/demo/src/Editors.js

@@ -70,7 +70,7 @@ const Editors = () => {
       case 'ncbi':
         return <NCBI />;
       default:
-        return <Editoria />;
+        return <HHMI />;
     }
   };
 

editors/demo/src/HHMI/FillTheGapQuestionService/schema/fillTheGapContainerNode.js

+const fillTheGapContainerNode = {
+  attrs: {
+    id: { default: '' },
+    class: { default: 'fill-the-gap' },
+  },
+  group: 'block',
+  selectable: true,
+  draggable: true,
+  content: 'block+',
+  parseDOM: [
+    {
+      tag: 'div.fill-the-gap',
+      getAttrs(dom) {
+        return {
+          id: dom.dataset.id,
+          class: dom.getAttribute('class'),
+        };
+      },
+    },
+  ],
+  toDOM(node) {
+    return ['div', node.attrs, 0];
+  },
+};
+
+export default fillTheGapContainerNode;

editors/demo/src/HHMI/FillTheGapQuestionService/schema/fillTheGapNode.js

+const fillTheGapNode = {};
+
+export default fillTheGapNode;

editors/demo/src/HHMI/HHMI.js

@@ -24,7 +24,7 @@ const Hhmi = () => {
         config={config}
         autoFocus
         fileUpload={file => renderImage(file)}
-        value={t}
+        value=""
         // readonly
         layout={HhmiLayout}
         // onChange={source => console.log(source)}

editors/demo/src/HHMI/config/config.js

@@ -20,6 +20,8 @@ import {
   SpecialCharactersToolGroupService,
   EditorInfoToolGroupServices,
   BottomInfoService,
+  MultipleChoiceQuestionService,
+  QuestionsToolGroupService,
 } from 'wax-prosemirror-services';
 
 import { DefaultSchema } from 'wax-prosemirror-utilities';
@@ -27,8 +29,8 @@ 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';
+// import MultipleChoiceQuestionService from '../MultipleChoiceQuestionService/MultipleChoiceQuestionService';
+// import QuestionsToolGroupService from '../QuestionsToolGroupService/QuestionsToolGroupService';
 
 export default {
   MenuService: [

wax-prosemirror-core/src/WaxView.js

@@ -44,7 +44,6 @@ export default props => {
 
   if (!mounted) {
     context.app.bootServices();
-    console.log(context);
   }
 
   const setEditorRef = useCallback(

wax-prosemirror-services/index.js

@@ -44,6 +44,7 @@ export { default as TrackOptionsService } from './src/TrackOptionsService/TrackO
 export { default as CustomTagInlineService } from './src/CustomTagService/CustomTagInlineService/CustomTagInlineService';
 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';
 
 /*
 ToolGroups
@@ -69,3 +70,4 @@ 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';

editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceNodeView.js → wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js

-import { nodes } from 'prosemirror-schema-basic';
-import { AbstractNodeView } from 'wax-prosemirror-services';
+import AbstractNodeView from '../PortalService/AbstractNodeView';
 
 export default class MultipleChoiceNodeView extends AbstractNodeView {
   constructor(
@@ -18,6 +17,7 @@ export default class MultipleChoiceNodeView extends AbstractNodeView {
     this.getPos = getPos;
     this.context = context;
   }
+
   static name() {
     return 'multiple_choice';
   }

editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestion.js → wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js

 import React from 'react';
 import { isEmpty } from 'lodash';
 import { injectable } from 'inversify';
-import { Tools } from 'wax-prosemirror-services';
 import { Commands } from 'wax-prosemirror-utilities';
-
 import { v4 as uuidv4 } from 'uuid';
+import Tools from '../lib/Tools';
 import ToolBarBtn from './components/ToolBarBtn';
 
 const checkifEmpty = view => {

editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js → wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js

-import { Service } from 'wax-prosemirror-services';
+import Service from '../Service';
 import MultipleChoiceQuestion from './MultipleChoiceQuestion';
 import multipleChoiceNode from './schema/multipleChoiceNode';
 import multipleChoiceContainerNode from './schema/multipleChoiceContainerNode';