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

package/dist/cjs/commands.js

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

package/dist/cjs/lib/context-menu.js

@@ -68,7 +68,11 @@ class ContextMenu {
                     const itemTitle = sectionTitle
                         ? `“${this.trimTitle(sectionTitle, 30)}”`
                         : 'This Section';
-                    if (types.has('section')) {
+                    if (types.has('section') &&
+                        !(0, utils_1.isChildOfNodeTypes)(this.view.state.doc, $pos.pos, [
+                            transform_1.schema.nodes.abstracts,
+                            transform_1.schema.nodes.backmatter,
+                        ])) {
                         const labelPosition = after ? 'After' : 'Before';
                         const level = (0, exports.sectionLevel)($pos.depth - 1);
                         const label = `New ${level} ${labelPosition} ${itemTitle}`;

package/dist/cjs/lib/utils.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findParentElement = exports.findParentSection = exports.findParentNodeWithIdValue = exports.findParentNodeWithId = exports.getChildOfType = exports.getMatchingDescendant = exports.getMatchingChild = exports.iterateChildren = void 0;
+exports.isChildOfNodeTypes = exports.findParentElement = exports.findParentSection = exports.findParentNodeWithIdValue = exports.findParentNodeWithId = exports.getChildOfType = exports.getMatchingDescendant = exports.getMatchingChild = exports.iterateChildren = void 0;
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_utils_1 = require("prosemirror-utils");
 function* iterateChildren(node, recurse = false) {
@@ -58,3 +58,13 @@ const findParentElement = (selection, validIds) => (0, prosemirror_utils_1.findP
     return (0, transform_1.isElementNodeType)(node.type) && node.attrs.id;
 })(selection);
 exports.findParentElement = findParentElement;
+const isChildOfNodeTypes = (doc, pos, parentNodeTypes) => {
+    const resolvedPos = doc.resolve(pos);
+    for (let depth = resolvedPos.depth - 1; depth >= 0; depth--) {
+        if (parentNodeTypes.includes(resolvedPos.node(depth).type)) {
+            return true;
+        }
+    }
+    return false;
+};
+exports.isChildOfNodeTypes = isChildOfNodeTypes;

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.26-LEAN-3884.0';
+exports.VERSION = '2.0.26';
 exports.MATHJAX_VERSION = '3.2.2';

package/dist/es/commands.js

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

package/dist/es/lib/context-menu.js

@@ -21,7 +21,7 @@ import { buildTableFootnoteLabels } from '../plugins/footnotes/footnotes-utils';
 import ReactSubView from '../views/ReactSubView';
 import { PopperManager } from './popper';
 import { getActualAttrs, isDeleted, isRejectedInsert, } from './track-changes-utils';
-import { getChildOfType } from './utils';
+import { getChildOfType, isChildOfNodeTypes } from './utils';
 const popper = new PopperManager();
 const readonlyTypes = [schema.nodes.keywords, schema.nodes.bibliography_element];
 export const sectionLevel = (depth) => {
@@ -61,7 +61,11 @@ export class ContextMenu {
                     const itemTitle = sectionTitle
                         ? `“${this.trimTitle(sectionTitle, 30)}”`
                         : 'This Section';
-                    if (types.has('section')) {
+                    if (types.has('section') &&
+                        !isChildOfNodeTypes(this.view.state.doc, $pos.pos, [
+                            schema.nodes.abstracts,
+                            schema.nodes.backmatter,
+                        ])) {
                         const labelPosition = after ? 'After' : 'Before';
                         const level = sectionLevel($pos.depth - 1);
                         const label = `New ${level} ${labelPosition} ${itemTitle}`;

package/dist/es/lib/utils.js

@@ -50,3 +50,12 @@ export const findParentElement = (selection, validIds) => findParentNode((node)
     }
     return isElementNodeType(node.type) && node.attrs.id;
 })(selection);
+export const isChildOfNodeTypes = (doc, pos, parentNodeTypes) => {
+    const resolvedPos = doc.resolve(pos);
+    for (let depth = resolvedPos.depth - 1; depth >= 0; depth--) {
+        if (parentNodeTypes.includes(resolvedPos.node(depth).type)) {
+            return true;
+        }
+    }
+    return false;
+};

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '2.0.26-LEAN-3884.0';
+export const VERSION = '2.0.26';
 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: (tableNode: ManuscriptNode, position: number, view: ManuscriptEditorView, tableElementFooter?: NodeWithPos[]) => void;
+export declare const insertGeneralFootnote: (tableElementNode: 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: (node: ManuscriptNode, position: number, view: EditorView, inlineFootnote?: NodeWithPosition) => void;
+export declare const insertTableFootnote: (tableElementNode: 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/lib/utils.d.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import { ManuscriptNode, ManuscriptNodeType } from '@manuscripts/transform';
+import { NodeType } from 'prosemirror-model';
 import { Selection } from 'prosemirror-state';
 export declare function iterateChildren(node: ManuscriptNode, recurse?: boolean): Iterable<ManuscriptNode>;
 export declare const getMatchingChild: (parent: ManuscriptNode, matcher: (node: ManuscriptNode) => boolean, deep?: boolean) => ManuscriptNode | undefined;
@@ -23,3 +24,4 @@ export declare const findParentNodeWithId: (selection: Selection) => import("pro
 export declare const findParentNodeWithIdValue: (selection: Selection) => import("prosemirror-utils").ContentNodeWithPos | undefined;
 export declare const findParentSection: (selection: Selection) => import("prosemirror-utils").ContentNodeWithPos | undefined;
 export declare const findParentElement: (selection: Selection, validIds?: string[]) => import("prosemirror-utils").ContentNodeWithPos | undefined;
+export declare const isChildOfNodeTypes: (doc: ManuscriptNode, pos: number, parentNodeTypes: NodeType[]) => boolean;

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.0.26-LEAN-3884.0";
+export declare const VERSION = "2.0.26";
 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.26-LEAN-3884.0",
+  "version": "2.0.26",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",