move dependency and new helper methods

wax-prosemirror-components/package.json

@@ -17,7 +17,6 @@
     "react-dom": "^16.8.6",
     "react-dropdown": "^1.6.2",
     "styled-components": "^4.2.0",
-    "react-panelgroup": "^1.0.10",
     "uuid": "^3.3.2"
   }
 }

wax-prosemirror-layouts/package.json

@@ -9,6 +9,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@pubsweet/ui-toolkit": "^2.2.13"
+    "@pubsweet/ui-toolkit": "^2.2.13",
+    "react-panelgroup": "^1.0.10"
   }
 }

wax-prosemirror-layouts/src/layouts/EditoriaLayout.js

@@ -150,7 +150,7 @@ const onResizeEnd = arr => {
 };
 
 const hasNotes = main => {
-  const notes = DocumentHelpers.findBlockNodes(
+  const notes = DocumentHelpers.findChildrenByType(
     main.state.doc,
     main.state.schema.nodes.footnote,
     true
@@ -177,7 +177,7 @@ const EditoriaLayout = ({ editor }) => {
 
   if (main) {
     const notes = hasNotes(main);
-    if (notes.length) AreasWithNotes = withNotes(editor);
+    if (notes.length) AreasWithNotes = withNotes();
   }
 
   return (

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

@@ -2,7 +2,7 @@ const footnote = {
   group: "inline",
   content: "paragraph+",
   inline: true,
-  atom: true,
+  // atom: true,
   toDOM: () => ["footnote"],
   parseDOM: [{ tag: "footnote" }]
 };

wax-prosemirror-services/src/NoteService/NoteComponent.js

@@ -23,7 +23,7 @@ export default () => {
 };
 const updateNotes = view => {
   if (view) {
-    return DocumentHelpers.findBlockNodes(
+    return DocumentHelpers.findChildrenByType(
       view.state.doc,
       view.state.schema.nodes.footnote,
       true

wax-prosemirror-utilities/src/document/DocumentHelpers.js

@@ -34,18 +34,30 @@ export const flatten = (node, descend = true) => {
   return result;
 };
 
+const findBlockNodes = (node, descend) => {
+  return findChildren(node, child => child.isBlock, descend);
+};
+
+const findChildrenByType = (node, nodeType, descend) => {
+  return findChildren(node, child => child.type === nodeType, descend);
+};
+
 const findChildren = (node, predicate, descend) => {
   if (!node) {
     throw new Error('Invalid "node" parameter');
   } else if (!predicate) {
     throw new Error('Invalid "predicate" parameter');
   }
-  return flatten(node, descend).filter(child => {
-    return child.node.type.name === "footnote" ? child.node : false;
-  });
+  return flatten(node, descend).filter(child => predicate(child.node));
 };
 
-const findBlockNodes = (node, descend) => {
-  return findChildren(node, child => child.isBlock, descend);
+const findInlineNodes = (node, descend) => {
+  return findChildren(node, child => child.isInline, descend);
+};
+
+export default {
+  findMark,
+  findBlockNodes,
+  findChildrenByType,
+  findInlineNodes
 };
-export default { findMark, findBlockNodes };