nodes in progress

wax-prosemirror-schema/index.js

 /*
 LIST OF SUPPORTED NODES
 */
-export { default as authorNode } from './src/nodes/authorNode';
-export { default as epigraphPoetryNode } from './src/nodes/epigraphPoetryNode';
-export { default as epigraphProseNode } from './src/nodes/epigraphProseNode';
-export { default as sourceNoteNode } from './src/nodes/sourceNoteNode';
-export { default as paragraphContNode } from './src/nodes/paragraphContNode';
-export { default as extractProseNode } from './src/nodes/extractProseNode';
-export { default as extractPoetryNode } from './src/nodes/extractPoetryNode';
-export { default as titleNode } from './src/nodes/titleNode';
 export { default as orderedListNode } from './src/nodes/orderedListNode';
 export { default as bulletListNode } from './src/nodes/bulletListNode';
 export { default as listItemNode } from './src/nodes/listItemNode';
-export { default as subTitleNode } from './src/nodes/subTitleNode';
 export { default as figureNode } from './src/nodes/figureNode';
 export { default as figureCaptionNode } from './src/nodes/figureCaptionNode';
 export { default as imageNode } from './src/nodes/imageNode';
-export { default as headingNode } from './src/nodes/headingNode';
-export { default as blockQuoteNode } from './src/nodes/blockQuoteNode';
 export { default as footNoteNode } from './src/nodes/footNoteNode';
 export { default as codeBlockNode } from './src/nodes/codeBlockNode';
 export { default as mathInlineNode } from './src/nodes/mathInlineNode';
 export { default as mathDisplayNode } from './src/nodes/mathDisplayNode';
 export { default as customBlockNode } from './src/nodes/customBlockNode';
+
 export { default as OenNodes } from './src/nodes/oenNodes';

wax-prosemirror-schema/src/nodes/headingNode.js

-/* eslint-disable no-param-reassign */
-const heading = {
-  attrs: {
-    level: { default: 2 },
-  },
-  content: 'inline*',
-  group: 'block',
-  defining: true,
-  parseDOM: [
-    {
-      tag: 'h2',
-      attrs: { level: 2 },
-    },
-    {
-      tag: 'h3',
-      attrs: { level: 3 },
-    },
-    {
-      tag: 'h4',
-      attrs: { level: 4 },
-    },
-  ],
-  toDOM(hook, next) {
-    const attrs = {};
-    hook.value = [`h${hook.node.attrs.level}`, attrs, 0];
-    next();
-  },
-};
-
-export default heading;

wax-prosemirror-schema/src/nodes/authorNode.js → wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/schema/authorNode.js

-const author = {
+const authorNode = {
   content: 'inline*',
   group: 'block',
   priority: 0,
@@ -24,4 +24,4 @@ const author = {
   },
 };
 
-export default author;
+export default authorNode;

wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetryService.js

 import { Service } from 'wax-prosemirror-core';
-import { epigraphPoetryNode } from 'wax-prosemirror-schema';
+import epigraphPoetryNode from './schema/epigraphPoetryNode';
 import EpigraphPoetry from './EpigraphPoetry';
 
 class EpigraphPoetryService extends Service {

wax-prosemirror-schema/src/nodes/epigraphPoetryNode.js → wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/schema/epigraphPoetryNode.js

-const epigraphPoetry = {
+const epigraphPoetryNode = {
   content: 'inline*',
   group: 'block',
   priority: 0,
@@ -24,4 +24,4 @@ const epigraphPoetry = {
   },
 };
 
-export default epigraphPoetry;
+export default epigraphPoetryNode;

wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProseService.js

 import { Service } from 'wax-prosemirror-core';
-import { epigraphProseNode } from 'wax-prosemirror-schema';
+import epigraphProseNode from './schema/epigraphProseNode';
 import EpigraphProse from './EpigraphProse';
 
 class EpigraphProseService extends Service {

wax-prosemirror-schema/src/nodes/epigraphProseNode.js → wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/schema/epigraphProseNode.js

-const epigraphProse = {
+const epigraphProseNode = {
   content: 'inline*',
   group: 'block',
   priority: 0,
@@ -24,4 +24,4 @@ const epigraphProse = {
   },
 };
 
-export default epigraphProse;
+export default epigraphProseNode;

wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitleService.js

 import { Service } from 'wax-prosemirror-core';
-import { subTitleNode } from 'wax-prosemirror-schema';
+import subTitleNode from './schema/subTitleNode';
 import SubTitle from './SubTitle';
 
 class SubTitleService extends Service {

wax-prosemirror-schema/src/nodes/subTitleNode.js → wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/schema/subTitleNode.js

-const subtitle = {
+const subTitleNode = {
   content: 'inline*',
   group: 'block',
   priority: 0,
@@ -24,4 +24,4 @@ const subtitle = {
   },
 };
 
-export default subtitle;
+export default subTitleNode;

wax-prosemirror-services/src/DisplayBlockLevel/TitleService/TitleService.js

 import { Service } from 'wax-prosemirror-core';
-import { titleNode } from 'wax-prosemirror-schema';
+import titleNode from './schema/titleNode';
 import Title from './Title';
 
 class TitleService extends Service {

wax-prosemirror-schema/src/nodes/titleNode.js → wax-prosemirror-services/src/DisplayBlockLevel/TitleService/schema/titleNode.js

-const title = {
+const titleNode = {
   attrs: {
     level: { default: 1 },
   },
@@ -19,4 +19,4 @@ const title = {
   },
 };
 
-export default title;
+export default titleNode;

wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js

@@ -125,6 +125,7 @@ export default ({ node, view, getPos }) => {
   const [optionText, setOptionText] = useState('');
   const [addingOption, setAddingOption] = useState(false);
   const addOptionRef = useRef(null);
+  const addOptionBtnRef = useRef(null);
 
   const customProps = main.props.customValues;
 
@@ -134,6 +135,19 @@ export default ({ node, view, getPos }) => {
 
   const readOnly = !isEditable;
 
+  useEffect(() => {
+    const listener = event => {
+      if (event.code === 'Enter') {
+        event.preventDefault();
+        addOptionBtnRef.current.click();
+      }
+    };
+    addOptionBtnRef.current.addEventListener('keydown', listener);
+    return () => {
+      addOptionBtnRef.current.removeEventListener('keydown', listener);
+    };
+  }, []);
+
   useEffect(() => {
     const allNodes = getNodes(main);
 
@@ -246,7 +260,7 @@ export default ({ node, view, getPos }) => {
                   type="text"
                   value={optionText}
                 />
-                <button onClick={addOption} type="button">
+                <button onClick={addOption} ref={addOptionBtnRef} type="button">
                   Add Option
                 </button>
               </AddOption>

wax-prosemirror-services/src/TextBlockLevel/BlockQuoteService/BlockQuoteService.js

 import { Service } from 'wax-prosemirror-core';
-import { blockQuoteNode } from 'wax-prosemirror-schema';
+import blockQuoteNode from './schema/blockQuoteNode';
 import BlockQuote from './BlockQuote';
 import './blockQuote.css';
 

wax-prosemirror-schema/src/nodes/blockQuoteNode.js → wax-prosemirror-services/src/TextBlockLevel/BlockQuoteService/schema/blockQuoteNode.js

-const blockquote = {
+const blockQuoteNode = {
   content: 'block+',
   group: 'block',
   defining: true,
@@ -8,4 +8,4 @@ const blockquote = {
   },
 };
 
-export default blockquote;
+export default blockQuoteNode;

wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetryService.js

 import { Service } from 'wax-prosemirror-core';
-import { extractPoetryNode } from 'wax-prosemirror-schema';
+import extractPoetryNode from './schema/extractPoetryNode';
 import ExtractPoetry from './ExtractPoetry';
 
 class ExtractPoetryService extends Service {

wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/schema/extractPoetryNode.js

+const extractPoetryNode = {
+  content: 'inline*',
+  group: 'block',
+  priority: 0,
+  defining: true,
+  attrs: {
+    class: { default: 'extract-poetry' },
+  },
+  parseDOM: [
+    {
+      tag: 'p.extract-poetry',
+      getAttrs(hook, next) {
+        Object.assign(hook, {
+          class: hook.dom.getAttribute('class'),
+        });
+        next();
+      },
+    },
+  ],
+  toDOM(hook, next) {
+    const attrs = { class: hook.node.attrs.class };
+    hook.value = ['p', attrs, 0];
+    next();
+  },
+};
+
+export default extractPoetryNode;

wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProseService.js

 import { Service } from 'wax-prosemirror-core';
-import { extractProseNode } from 'wax-prosemirror-schema';
+import extractProseNode from './schema/extractProseNode';
 import ExtractProse from './ExtractProse';
 
 class ExtractProseService extends Service {

wax-prosemirror-schema/src/nodes/extractProseNode.js → wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/schema/extractProseNode.js

-const extractProse = {
+const extractProseNode = {
   content: 'inline*',
   group: 'block',
   priority: 0,
@@ -24,4 +24,4 @@ const extractProse = {
   },
 };
 
-export default extractProse;
+export default extractProseNode;

wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinuedService.js

 import { Service } from 'wax-prosemirror-core';
-import { paragraphContNode } from 'wax-prosemirror-schema';
+import paragraphContNode from './schema/paragraphContNode';
 import ParagraphContinued from './ParagraphContinued';
 
 class ParagraphContinuedService extends Service {

wax-prosemirror-schema/src/nodes/paragraphContNode.js → wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/schema/paragraphContNode.js

-const paragraphCont = {
-  content: "inline*",
-  group: "block",
+const paragraphContNode = {
+  content: 'inline*',
+  group: 'block',
   priority: 0,
   defining: true,
   attrs: {
-    class: { default: "paragraph-cont" }
+    class: { default: 'paragraph-cont' },
   },
   parseDOM: [
     {
-      tag: "p.paragraph-cont",
+      tag: 'p.paragraph-cont',
       getAttrs(hook, next) {
         Object.assign(hook, {
-          class: hook.dom.getAttribute("class")
+          class: hook.dom.getAttribute('class'),
         });
         next();
-      }
-    }
+      },
+    },
   ],
   toDOM(hook, next) {
     const attrs = { class: hook.node.attrs.class };
-    hook.value = ["p", attrs, 0];
+    hook.value = ['p', attrs, 0];
     next();
-  }
+  },
 };
 
-export default paragraphCont;
+export default paragraphContNode;