@manuscripts/body-editor 2.0.25 → 2.0.26-LEAN-3884.0

package/dist/cjs/commands.js

@@ -132,7 +132,8 @@ const createBlock = (nodeType, position, state, dispatch, attrs, tableConfig) =>
     }
 };
 exports.createBlock = createBlock;
-const insertGeneralFootnote = (tableElementNode, position, view, tableElementFooter) => {
+const insertGeneralFootnote = (tableNode, position, view, tableElementFooter) => {
+    var _a;
     const { state, dispatch } = view;
     const paragraph = state.schema.nodes.paragraph.create({
         placeholder: 'Add general note here',
@@ -140,14 +141,13 @@ const insertGeneralFootnote = (tableElementNode, position, view, tableElementFoo
     const generalNote = state.schema.nodes.general_table_footnote.create({}, [
         paragraph,
     ]);
-    const tableColGroup = (0, prosemirror_utils_1.findChildrenByType)(tableElementNode, transform_1.schema.nodes.table_colgroup)[0];
-    const table = (0, prosemirror_utils_1.findChildrenByType)(tableElementNode, transform_1.schema.nodes.table)[0];
+    const tableColGroup = (0, prosemirror_utils_1.findChildrenByType)(tableNode, transform_1.schema.nodes.table_colgroup)[0];
     const tr = state.tr;
     const pos = (tableElementFooter === null || tableElementFooter === void 0 ? void 0 : tableElementFooter.length)
         ? position + tableElementFooter[0].pos + 2
         : position +
             (!tableColGroup
-                ? table.pos + table.node.nodeSize
+                ? ((_a = tableNode.content.firstChild) === null || _a === void 0 ? void 0 : _a.nodeSize) || 0
                 : tableColGroup.pos + tableColGroup.node.nodeSize);
     if (tableElementFooter === null || tableElementFooter === void 0 ? void 0 : tableElementFooter.length) {
         tr.insert(pos, generalNote);
@@ -236,6 +236,25 @@ const insertBreak = (state, dispatch) => {
 };
 exports.insertBreak = insertBreak;
 const selectedText = () => (window.getSelection() || '').toString();
+const findPosBeforeFirstSubsection = ($pos) => {
+    let posBeforeFirstSubsection = null;
+    for (let d = $pos.depth; d >= 0; d--) {
+        const parentNode = $pos.node(d);
+        if ((0, transform_1.isSectionNodeType)(parentNode.type)) {
+            const parentStartPos = $pos.start(d);
+            parentNode.descendants((node, pos) => {
+                if (node.type === transform_1.schema.nodes.section &&
+                    posBeforeFirstSubsection === null) {
+                    posBeforeFirstSubsection = parentStartPos + pos;
+                    return false;
+                }
+                return true;
+            });
+            break;
+        }
+    }
+    return posBeforeFirstSubsection;
+};
 const findPosAfterParentSection = ($pos) => {
     for (let d = $pos.depth; d >= 0; d--) {
         const node = $pos.node(d);
@@ -430,7 +449,10 @@ const insertSection = (subsection = false) => (state, dispatch, view) => {
     }
     let pos;
     if ((0, prosemirror_utils_1.hasParentNodeOfType)(transform_1.schema.nodes.body)(selection) || subsection) {
-        pos = findPosAfterParentSection(state.selection.$from);
+        pos = subsection
+            ? findPosBeforeFirstSubsection(state.selection.$from) ||
+                findPosAfterParentSection(state.selection.$from)
+            : findPosAfterParentSection(state.selection.$from);
     }
     else {
         const body = (0, doc_1.findBody)(state.doc);
@@ -933,7 +955,8 @@ const addInlineComment = (state, dispatch) => {
     return false;
 };
 exports.addInlineComment = addInlineComment;
-const insertTableFootnote = (tableElementNode, position, view, inlineFootnote) => {
+const insertTableFootnote = (node, position, view, inlineFootnote) => {
+    var _a;
     const { state, dispatch } = view;
     const tr = state.tr;
     const footnote = state.schema.nodes.footnote.createAndFill({
@@ -951,9 +974,9 @@ const insertTableFootnote = (tableElementNode, position, view, inlineFootnote) =
         });
     }
     else {
-        const inlineFootnotes = (0, prosemirror_utils_1.findChildrenByType)(tableElementNode, transform_1.schema.nodes.inline_footnote);
+        const inlineFootnotes = (0, prosemirror_utils_1.findChildrenByType)(node, transform_1.schema.nodes.inline_footnote);
         footnoteIndex =
-            inlineFootnotes.filter(({ pos }) => !(0, track_changes_utils_1.isRejectedInsert)(tableElementNode) && position + pos <= insertedAt).length + 1;
+            inlineFootnotes.filter(({ pos }) => !(0, track_changes_utils_1.isRejectedInsert)(node) && position + pos <= insertedAt).length + 1;
         const inlineFootnoteNode = state.schema.nodes.inline_footnote.create({
             rids: [footnote.attrs.id],
             contents: footnoteIndex === -1 ? inlineFootnotes.length : footnoteIndex,
@@ -961,7 +984,7 @@ const insertTableFootnote = (tableElementNode, position, view, inlineFootnote) =
         tr.insert(insertedAt, inlineFootnoteNode);
     }
     let insertionPos = position;
-    const footnotesElement = (0, prosemirror_utils_1.findChildrenByType)(tableElementNode, transform_1.schema.nodes.footnotes_element).pop();
+    const footnotesElement = (0, prosemirror_utils_1.findChildrenByType)(node, transform_1.schema.nodes.footnotes_element).pop();
     if (footnotesElement &&
         !(0, track_changes_utils_1.isDeleted)(footnotesElement.node) &&
         !(0, track_changes_utils_1.isRejectedInsert)(footnotesElement.node)) {
@@ -971,7 +994,7 @@ const insertTableFootnote = (tableElementNode, position, view, inlineFootnote) =
     }
     else {
         const footnoteElement = state.schema.nodes.footnotes_element.create({}, footnote);
-        const tableElementFooter = (0, prosemirror_utils_1.findChildrenByType)(tableElementNode, transform_1.schema.nodes.table_element_footer)[0];
+        const tableElementFooter = (0, prosemirror_utils_1.findChildrenByType)(node, transform_1.schema.nodes.table_element_footer)[0];
         if (tableElementFooter) {
             const pos = tableElementFooter.pos;
             insertionPos = position + pos + tableElementFooter.node.nodeSize;
@@ -981,16 +1004,18 @@ const insertTableFootnote = (tableElementNode, position, view, inlineFootnote) =
             const tableElementFooter = transform_1.schema.nodes.table_element_footer.create({
                 id: (0, transform_1.generateID)(json_schema_1.ObjectTypes.TableElementFooter),
             }, [footnoteElement]);
-            const tableColGroup = (0, prosemirror_utils_1.findChildrenByType)(tableElementNode, transform_1.schema.nodes.table_colgroup)[0];
-            const table = (0, prosemirror_utils_1.findChildrenByType)(tableElementNode, transform_1.schema.nodes.table)[0];
+            const tableColGroup = (0, prosemirror_utils_1.findChildrenByType)(node, transform_1.schema.nodes.table_colgroup)[0];
             if (tableColGroup) {
                 insertionPos =
                     position + tableColGroup.pos + tableColGroup.node.nodeSize;
                 tr.insert(tr.mapping.map(insertionPos), tableElementFooter);
             }
             else {
-                insertionPos = position + table.pos + table.node.nodeSize;
-                tr.insert(tr.mapping.map(insertionPos), tableElementFooter);
+                const tableSize = (_a = node.content.firstChild) === null || _a === void 0 ? void 0 : _a.nodeSize;
+                if (tableSize) {
+                    insertionPos = position + tableSize;
+                    tr.insert(tr.mapping.map(insertionPos), tableElementFooter);
+                }
             }
         }
     }

package/dist/cjs/versions.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MATHJAX_VERSION = exports.VERSION = void 0;
-exports.VERSION = '2.0.25';
+exports.VERSION = '2.0.26-LEAN-3884.0';
 exports.MATHJAX_VERSION = '3.2.2';

package/dist/es/commands.js

@@ -123,7 +123,8 @@ export const createBlock = (nodeType, position, state, dispatch, attrs, tableCon
         dispatch(tr.setSelection(selection).scrollIntoView());
     }
 };
-export const insertGeneralFootnote = (tableElementNode, position, view, tableElementFooter) => {
+export const insertGeneralFootnote = (tableNode, position, view, tableElementFooter) => {
+    var _a;
     const { state, dispatch } = view;
     const paragraph = state.schema.nodes.paragraph.create({
         placeholder: 'Add general note here',
@@ -131,14 +132,13 @@ export const insertGeneralFootnote = (tableElementNode, position, view, tableEle
     const generalNote = state.schema.nodes.general_table_footnote.create({}, [
         paragraph,
     ]);
-    const tableColGroup = findChildrenByType(tableElementNode, schema.nodes.table_colgroup)[0];
-    const table = findChildrenByType(tableElementNode, schema.nodes.table)[0];
+    const tableColGroup = findChildrenByType(tableNode, schema.nodes.table_colgroup)[0];
     const tr = state.tr;
     const pos = (tableElementFooter === null || tableElementFooter === void 0 ? void 0 : tableElementFooter.length)
         ? position + tableElementFooter[0].pos + 2
         : position +
             (!tableColGroup
-                ? table.pos + table.node.nodeSize
+                ? ((_a = tableNode.content.firstChild) === null || _a === void 0 ? void 0 : _a.nodeSize) || 0
                 : tableColGroup.pos + tableColGroup.node.nodeSize);
     if (tableElementFooter === null || tableElementFooter === void 0 ? void 0 : tableElementFooter.length) {
         tr.insert(pos, generalNote);
@@ -221,6 +221,25 @@ export const insertBreak = (state, dispatch) => {
     return true;
 };
 const selectedText = () => (window.getSelection() || '').toString();
+const findPosBeforeFirstSubsection = ($pos) => {
+    let posBeforeFirstSubsection = null;
+    for (let d = $pos.depth; d >= 0; d--) {
+        const parentNode = $pos.node(d);
+        if (isSectionNodeType(parentNode.type)) {
+            const parentStartPos = $pos.start(d);
+            parentNode.descendants((node, pos) => {
+                if (node.type === schema.nodes.section &&
+                    posBeforeFirstSubsection === null) {
+                    posBeforeFirstSubsection = parentStartPos + pos;
+                    return false;
+                }
+                return true;
+            });
+            break;
+        }
+    }
+    return posBeforeFirstSubsection;
+};
 const findPosAfterParentSection = ($pos) => {
     for (let d = $pos.depth; d >= 0; d--) {
         const node = $pos.node(d);
@@ -406,7 +425,10 @@ export const insertSection = (subsection = false) => (state, dispatch, view) =>
     }
     let pos;
     if (hasParentNodeOfType(schema.nodes.body)(selection) || subsection) {
-        pos = findPosAfterParentSection(state.selection.$from);
+        pos = subsection
+            ? findPosBeforeFirstSubsection(state.selection.$from) ||
+                findPosAfterParentSection(state.selection.$from)
+            : findPosAfterParentSection(state.selection.$from);
     }
     else {
         const body = findBody(state.doc);
@@ -891,7 +913,8 @@ export const addInlineComment = (state, dispatch) => {
     }
     return false;
 };
-export const insertTableFootnote = (tableElementNode, position, view, inlineFootnote) => {
+export const insertTableFootnote = (node, position, view, inlineFootnote) => {
+    var _a;
     const { state, dispatch } = view;
     const tr = state.tr;
     const footnote = state.schema.nodes.footnote.createAndFill({
@@ -909,9 +932,9 @@ export const insertTableFootnote = (tableElementNode, position, view, inlineFoot
         });
     }
     else {
-        const inlineFootnotes = findChildrenByType(tableElementNode, schema.nodes.inline_footnote);
+        const inlineFootnotes = findChildrenByType(node, schema.nodes.inline_footnote);
         footnoteIndex =
-            inlineFootnotes.filter(({ pos }) => !isRejectedInsert(tableElementNode) && position + pos <= insertedAt).length + 1;
+            inlineFootnotes.filter(({ pos }) => !isRejectedInsert(node) && position + pos <= insertedAt).length + 1;
         const inlineFootnoteNode = state.schema.nodes.inline_footnote.create({
             rids: [footnote.attrs.id],
             contents: footnoteIndex === -1 ? inlineFootnotes.length : footnoteIndex,
@@ -919,7 +942,7 @@ export const insertTableFootnote = (tableElementNode, position, view, inlineFoot
         tr.insert(insertedAt, inlineFootnoteNode);
     }
     let insertionPos = position;
-    const footnotesElement = findChildrenByType(tableElementNode, schema.nodes.footnotes_element).pop();
+    const footnotesElement = findChildrenByType(node, schema.nodes.footnotes_element).pop();
     if (footnotesElement &&
         !isDeleted(footnotesElement.node) &&
         !isRejectedInsert(footnotesElement.node)) {
@@ -929,7 +952,7 @@ export const insertTableFootnote = (tableElementNode, position, view, inlineFoot
     }
     else {
         const footnoteElement = state.schema.nodes.footnotes_element.create({}, footnote);
-        const tableElementFooter = findChildrenByType(tableElementNode, schema.nodes.table_element_footer)[0];
+        const tableElementFooter = findChildrenByType(node, schema.nodes.table_element_footer)[0];
         if (tableElementFooter) {
             const pos = tableElementFooter.pos;
             insertionPos = position + pos + tableElementFooter.node.nodeSize;
@@ -939,16 +962,18 @@ export const insertTableFootnote = (tableElementNode, position, view, inlineFoot
             const tableElementFooter = schema.nodes.table_element_footer.create({
                 id: generateID(ObjectTypes.TableElementFooter),
             }, [footnoteElement]);
-            const tableColGroup = findChildrenByType(tableElementNode, schema.nodes.table_colgroup)[0];
-            const table = findChildrenByType(tableElementNode, schema.nodes.table)[0];
+            const tableColGroup = findChildrenByType(node, schema.nodes.table_colgroup)[0];
             if (tableColGroup) {
                 insertionPos =
                     position + tableColGroup.pos + tableColGroup.node.nodeSize;
                 tr.insert(tr.mapping.map(insertionPos), tableElementFooter);
             }
             else {
-                insertionPos = position + table.pos + table.node.nodeSize;
-                tr.insert(tr.mapping.map(insertionPos), tableElementFooter);
+                const tableSize = (_a = node.content.firstChild) === null || _a === void 0 ? void 0 : _a.nodeSize;
+                if (tableSize) {
+                    insertionPos = position + tableSize;
+                    tr.insert(tr.mapping.map(insertionPos), tableElementFooter);
+                }
             }
         }
     }

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '2.0.25';
+export const VERSION = '2.0.26-LEAN-3884.0';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/types/commands.d.ts

@@ -28,7 +28,7 @@ export declare const blockActive: (type: ManuscriptNodeType) => (state: Manuscri
 export declare const canInsert: (type: ManuscriptNodeType) => (state: ManuscriptEditorState) => boolean;
 export declare const createSelection: (nodeType: ManuscriptNodeType, position: number, doc: ManuscriptNode) => Selection;
 export declare const createBlock: (nodeType: ManuscriptNodeType, position: number, state: ManuscriptEditorState, dispatch?: Dispatch, attrs?: Attrs, tableConfig?: TableConfig) => void;
-export declare const insertGeneralFootnote: (tableElementNode: ManuscriptNode, position: number, view: ManuscriptEditorView, tableElementFooter?: NodeWithPos[]) => void;
+export declare const insertGeneralFootnote: (tableNode: ManuscriptNode, position: number, view: ManuscriptEditorView, tableElementFooter?: NodeWithPos[]) => void;
 export declare const insertFigure: (file: FileAttachment, state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;
 export declare const insertSupplement: (file: FileAttachment, state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;
 export declare const insertBlock: (nodeType: ManuscriptNodeType) => (state: ManuscriptEditorState, dispatch?: Dispatch, view?: EditorView, tableConfig?: TableConfig) => boolean;
@@ -65,7 +65,7 @@ interface NodeWithPosition {
     node: InlineFootnoteNode;
     pos: number;
 }
-export declare const insertTableFootnote: (tableElementNode: ManuscriptNode, position: number, view: EditorView, inlineFootnote?: NodeWithPosition) => void;
+export declare const insertTableFootnote: (node: ManuscriptNode, position: number, view: EditorView, inlineFootnote?: NodeWithPosition) => void;
 export declare const addRows: (direction: 'top' | 'bottom') => (state: EditorState, dispatch?: ((tr: Transaction) => void) | undefined) => boolean;
 export declare const addColumns: (direction: 'right' | 'left') => (state: EditorState, dispatch?: ((tr: Transaction) => void) | undefined) => boolean;
 export declare function mergeCellsWithSpace(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.0.25";
+export declare const VERSION = "2.0.26-LEAN-3884.0";
 export declare const MATHJAX_VERSION = "3.2.2";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "2.0.25",
+  "version": "2.0.26-LEAN-3884.0",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",