@manuscripts/body-editor 2.0.16 → 2.0.17

package/dist/cjs/commands.js

@@ -424,56 +424,53 @@ const insertGraphicalAbstract = (state, dispatch, view) => {
 };
 exports.insertGraphicalAbstract = insertGraphicalAbstract;
 const insertSection = (subsection = false) => (state, dispatch, view) => {
-    let pos = findPosAfterParentSection(state.selection.$from);
-    const body = (0, prosemirror_utils_1.findChildrenByType)(state.doc, transform_1.schema.nodes.body)[0];
-    if ((0, transform_1.isInBibliographySection)(state.selection.$from)) {
+    const selection = state.selection;
+    if ((0, prosemirror_utils_1.hasParentNodeOfType)(transform_1.schema.nodes.bibliography_section)(selection)) {
         return false;
     }
-    else if (pos === null && subsection) {
-        return false;
+    let pos;
+    if ((0, prosemirror_utils_1.hasParentNodeOfType)(transform_1.schema.nodes.body)(selection) || subsection) {
+        pos = findPosAfterParentSection(state.selection.$from);
     }
-    if (pos === null) {
+    else {
+        const body = (0, doc_1.findBody)(state.doc);
         pos = body.pos + body.node.content.size + 1;
     }
-    const resolvePos = state.doc.resolve(pos);
-    const isAbstract = (0, prosemirror_utils_1.findParentNodeOfTypeClosestToPos)(resolvePos, transform_1.schema.nodes.abstracts);
-    if (isAbstract && !subsection) {
+    if (!pos) {
         return false;
     }
-    const adjustment = subsection ? -1 : 0;
-    const tr = state.tr.insert(pos + adjustment, state.schema.nodes.section.createAndFill());
+    const section = transform_1.schema.nodes.section.createAndFill();
+    const diff = subsection ? -1 : 0;
+    const tr = state.tr.insert(pos + diff, section);
     if (dispatch) {
-        const selection = prosemirror_state_1.TextSelection.create(tr.doc, pos + adjustment + 2);
-        if (view) {
-            view.focus();
-        }
+        const selection = prosemirror_state_1.TextSelection.create(tr.doc, pos + diff + 2);
+        view === null || view === void 0 ? void 0 : view.focus();
         dispatch(tr.setSelection(selection).scrollIntoView());
     }
     return true;
 };
 exports.insertSection = insertSection;
 const insertBackMatterSection = (category) => (state, dispatch, view) => {
-    const bibliographySection = (0, prosemirror_utils_1.findChildrenByType)(state.doc, transform_1.schema.nodes.bibliography_section)[0];
-    const backmatter = (0, prosemirror_utils_1.findChildrenByType)(state.doc, transform_1.schema.nodes.backmatter)[0];
-    const backmatterSections = (0, prosemirror_utils_1.findChildrenByType)(backmatter.node, transform_1.schema.nodes.section, true);
-    if (backmatterSections.some((section) => section.node.attrs.category === category)) {
+    const backmatter = (0, doc_1.findBackmatter)(state.doc);
+    const sections = (0, prosemirror_utils_1.findChildrenByType)(backmatter.node, transform_1.schema.nodes.section);
+    if (sections.some((s) => s.node.attrs.category === category)) {
         return false;
     }
+    const bibliography = (0, doc_1.findBibliographySection)(state.doc);
     let pos;
-    if (bibliographySection) {
-        pos = bibliographySection.pos;
+    if (bibliography) {
+        pos = bibliography.pos;
     }
     else {
         pos = backmatter.pos + backmatter.node.content.size + 1;
     }
-    const tr = state.tr.insert(pos, state.schema.nodes.section.createAndFill({
-        category: category,
-    }));
+    const node = transform_1.schema.nodes.section.createAndFill({
+        category,
+    });
+    const tr = state.tr.insert(pos, node);
     if (dispatch) {
         const selection = prosemirror_state_1.TextSelection.create(tr.doc, pos);
-        if (view) {
-            view.focus();
-        }
+        view === null || view === void 0 ? void 0 : view.focus();
         dispatch(tr.setSelection(selection).scrollIntoView());
     }
     return true;

package/dist/cjs/lib/doc.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findGraphicalAbstractFigureElement = exports.findAbstractsNode = exports.insertSupplementsNode = void 0;
+exports.findGraphicalAbstractFigureElement = exports.findBibliographySection = exports.findBackmatter = exports.findBody = exports.findAbstractsNode = exports.insertSupplementsNode = void 0;
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_utils_1 = require("prosemirror-utils");
 const insertSupplementsNode = (tr) => {
@@ -22,6 +22,18 @@ const findAbstractsNode = (doc) => {
     return (0, prosemirror_utils_1.findChildrenByType)(doc, transform_1.schema.nodes.abstracts)[0];
 };
 exports.findAbstractsNode = findAbstractsNode;
+const findBody = (doc) => {
+    return (0, prosemirror_utils_1.findChildrenByType)(doc, transform_1.schema.nodes.body)[0];
+};
+exports.findBody = findBody;
+const findBackmatter = (doc) => {
+    return (0, prosemirror_utils_1.findChildrenByType)(doc, transform_1.schema.nodes.backmatter)[0];
+};
+exports.findBackmatter = findBackmatter;
+const findBibliographySection = (doc) => {
+    return (0, prosemirror_utils_1.findChildrenByType)(doc, transform_1.schema.nodes.bibliography_section)[0];
+};
+exports.findBibliographySection = findBibliographySection;
 const findGraphicalAbstractFigureElement = (doc) => {
     const ga = (0, prosemirror_utils_1.findChildrenByType)(doc, transform_1.schema.nodes.graphical_abstract_section)[0];
     if (!ga) {

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.16';
+exports.VERSION = '2.0.17';
 exports.MATHJAX_VERSION = '3.2.2';

package/dist/es/commands.js

@@ -15,15 +15,15 @@
  */
 import { buildContribution, ObjectTypes } from '@manuscripts/json-schema';
 import { skipTracking } from '@manuscripts/track-changes-plugin';
-import { generateID, generateNodeID, isElementNodeType, isFootnoteNode, isInBibliographySection, isListNode, isParagraphNode, isSectionNodeType, schema, } from '@manuscripts/transform';
+import { generateID, generateNodeID, isElementNodeType, isFootnoteNode, isListNode, isParagraphNode, isSectionNodeType, schema, } from '@manuscripts/transform';
 import { Fragment, NodeRange, } from 'prosemirror-model';
 import { wrapInList } from 'prosemirror-schema-list';
 import { NodeSelection, TextSelection, } from 'prosemirror-state';
 import { addColSpan, addColumnAfter, addColumnBefore, addRow, CellSelection, selectedRect, } from 'prosemirror-tables';
 import { findWrapping, liftTarget, ReplaceAroundStep, } from 'prosemirror-transform';
-import { findChildrenByType, findParentNodeOfType, findParentNodeOfTypeClosestToPos, } from 'prosemirror-utils';
+import { findChildrenByType, findParentNodeOfType, hasParentNodeOfType, } from 'prosemirror-utils';
 import { getCommentKey, getCommentRange } from './lib/comments';
-import { insertSupplementsNode } from './lib/doc';
+import { findBackmatter, findBibliographySection, findBody, insertSupplementsNode, } from './lib/doc';
 import { findWordBoundaries, isNodeOfType, nearestAncestor, } from './lib/helpers';
 import { isDeleted, isRejectedInsert } from './lib/track-changes-utils';
 import { findParentNodeWithId, getChildOfType, getMatchingChild, } from './lib/utils';
@@ -400,55 +400,52 @@ export const insertGraphicalAbstract = (state, dispatch, view) => {
     return true;
 };
 export const insertSection = (subsection = false) => (state, dispatch, view) => {
-    let pos = findPosAfterParentSection(state.selection.$from);
-    const body = findChildrenByType(state.doc, schema.nodes.body)[0];
-    if (isInBibliographySection(state.selection.$from)) {
+    const selection = state.selection;
+    if (hasParentNodeOfType(schema.nodes.bibliography_section)(selection)) {
         return false;
     }
-    else if (pos === null && subsection) {
-        return false;
+    let pos;
+    if (hasParentNodeOfType(schema.nodes.body)(selection) || subsection) {
+        pos = findPosAfterParentSection(state.selection.$from);
     }
-    if (pos === null) {
+    else {
+        const body = findBody(state.doc);
         pos = body.pos + body.node.content.size + 1;
     }
-    const resolvePos = state.doc.resolve(pos);
-    const isAbstract = findParentNodeOfTypeClosestToPos(resolvePos, schema.nodes.abstracts);
-    if (isAbstract && !subsection) {
+    if (!pos) {
         return false;
     }
-    const adjustment = subsection ? -1 : 0;
-    const tr = state.tr.insert(pos + adjustment, state.schema.nodes.section.createAndFill());
+    const section = schema.nodes.section.createAndFill();
+    const diff = subsection ? -1 : 0;
+    const tr = state.tr.insert(pos + diff, section);
     if (dispatch) {
-        const selection = TextSelection.create(tr.doc, pos + adjustment + 2);
-        if (view) {
-            view.focus();
-        }
+        const selection = TextSelection.create(tr.doc, pos + diff + 2);
+        view === null || view === void 0 ? void 0 : view.focus();
         dispatch(tr.setSelection(selection).scrollIntoView());
     }
     return true;
 };
 export const insertBackMatterSection = (category) => (state, dispatch, view) => {
-    const bibliographySection = findChildrenByType(state.doc, schema.nodes.bibliography_section)[0];
-    const backmatter = findChildrenByType(state.doc, schema.nodes.backmatter)[0];
-    const backmatterSections = findChildrenByType(backmatter.node, schema.nodes.section, true);
-    if (backmatterSections.some((section) => section.node.attrs.category === category)) {
+    const backmatter = findBackmatter(state.doc);
+    const sections = findChildrenByType(backmatter.node, schema.nodes.section);
+    if (sections.some((s) => s.node.attrs.category === category)) {
         return false;
     }
+    const bibliography = findBibliographySection(state.doc);
     let pos;
-    if (bibliographySection) {
-        pos = bibliographySection.pos;
+    if (bibliography) {
+        pos = bibliography.pos;
     }
     else {
         pos = backmatter.pos + backmatter.node.content.size + 1;
     }
-    const tr = state.tr.insert(pos, state.schema.nodes.section.createAndFill({
-        category: category,
-    }));
+    const node = schema.nodes.section.createAndFill({
+        category,
+    });
+    const tr = state.tr.insert(pos, node);
     if (dispatch) {
         const selection = TextSelection.create(tr.doc, pos);
-        if (view) {
-            view.focus();
-        }
+        view === null || view === void 0 ? void 0 : view.focus();
         dispatch(tr.setSelection(selection).scrollIntoView());
     }
     return true;

package/dist/es/lib/doc.js

@@ -17,6 +17,15 @@ export const insertSupplementsNode = (tr) => {
 export const findAbstractsNode = (doc) => {
     return findChildrenByType(doc, schema.nodes.abstracts)[0];
 };
+export const findBody = (doc) => {
+    return findChildrenByType(doc, schema.nodes.body)[0];
+};
+export const findBackmatter = (doc) => {
+    return findChildrenByType(doc, schema.nodes.backmatter)[0];
+};
+export const findBibliographySection = (doc) => {
+    return findChildrenByType(doc, schema.nodes.bibliography_section)[0];
+};
 export const findGraphicalAbstractFigureElement = (doc) => {
     const ga = findChildrenByType(doc, schema.nodes.graphical_abstract_section)[0];
     if (!ga) {

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '2.0.16';
+export const VERSION = '2.0.17';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/types/lib/doc.d.ts

@@ -1,6 +1,9 @@
 import { ManuscriptNode, ManuscriptTransaction } from '@manuscripts/transform';
 export declare const insertSupplementsNode: (tr: ManuscriptTransaction) => import("prosemirror-utils").NodeWithPos;
 export declare const findAbstractsNode: (doc: ManuscriptNode) => import("prosemirror-utils").NodeWithPos;
+export declare const findBody: (doc: ManuscriptNode) => import("prosemirror-utils").NodeWithPos;
+export declare const findBackmatter: (doc: ManuscriptNode) => import("prosemirror-utils").NodeWithPos;
+export declare const findBibliographySection: (doc: ManuscriptNode) => import("prosemirror-utils").NodeWithPos;
 export declare const findGraphicalAbstractFigureElement: (doc: ManuscriptNode) => {
     node: import("prosemirror-model").Node;
     pos: number;

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.0.16";
+export declare const VERSION = "2.0.17";
 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.16",
+  "version": "2.0.17",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -32,7 +32,7 @@
     "@iarna/word-count": "^1.1.2",
     "@manuscripts/json-schema": "2.2.10",
     "@manuscripts/library": "1.3.10",
-    "@manuscripts/style-guide": "2.0.3",
+    "@manuscripts/style-guide": "2.0.4",
     "@manuscripts/track-changes-plugin": "1.7.17",
     "@manuscripts/transform": "2.3.23",
     "@popperjs/core": "^2.11.8",
@@ -116,4 +116,4 @@
   "engines": {
     "node": ">=20.16.0"
   }
-}
+}