@manuscripts/body-editor 3.6.0 → 3.6.2

package/dist/cjs/commands.js

@@ -725,8 +725,7 @@ const insertContributors = (state, dispatch, view) => {
     if ((0, utils_1.getChildOfType)(state.doc, transform_1.schema.nodes.contributors, true)) {
         return false;
     }
-    const title = (0, utils_1.getLastTitleNode)(state);
-    const pos = title.pos + title.node.nodeSize;
+    const pos = (0, utils_1.findInsertionPosition)(transform_1.schema.nodes.contributors, state.doc);
     const contributors = state.schema.nodes.contributors.create({
         id: '',
     });
@@ -745,12 +744,7 @@ const insertAffiliation = (state, dispatch, view) => {
     if ((0, utils_1.getChildOfType)(state.doc, transform_1.schema.nodes.affiliations, true)) {
         return false;
     }
-    const title = (0, utils_1.getLastTitleNode)(state);
-    let pos = title.pos + title.node.nodeSize;
-    const contributors = (0, prosemirror_utils_1.findChildrenByType)(state.doc, state.schema.nodes.contributors)[0];
-    if (contributors) {
-        pos = contributors.pos + contributors.node.nodeSize;
-    }
+    const pos = (0, utils_1.findInsertionPosition)(transform_1.schema.nodes.affiliations, state.doc);
     const affiliations = state.schema.nodes.affiliations.create({
         id: '',
     });
@@ -783,8 +777,7 @@ const insertKeywords = (state, dispatch, view) => {
     if ((0, utils_1.getChildOfType)(state.doc, transform_1.schema.nodes.keywords, true)) {
         return false;
     }
-    const abstracts = (0, prosemirror_utils_1.findChildrenByType)(state.doc, state.schema.nodes.abstracts)[0];
-    const pos = abstracts.pos;
+    const pos = (0, utils_1.findInsertionPosition)(transform_1.schema.nodes.keywords, state.doc);
     const keywords = transform_1.schema.nodes.keywords.createAndFill({}, [
         transform_1.schema.nodes.section_title.create({}, transform_1.schema.text('Keywords')),
         transform_1.schema.nodes.keywords_element.create({}, [
@@ -1300,8 +1293,7 @@ const createHeroImage = (attrs) => transform_1.schema.nodes.hero_image.create({
     transform_1.schema.nodes.long_desc.create(),
 ]);
 const insertHeroImage = () => (state, dispatch, view) => {
-    const comments = (0, prosemirror_utils_1.findChildrenByType)(state.doc, transform_1.schema.nodes.comments)[0];
-    const position = comments.pos;
+    const position = (0, utils_1.findInsertionPosition)(transform_1.schema.nodes.hero_image, state.doc);
     view?.focus();
     (0, exports.createBlock)(transform_1.schema.nodes.hero_image, position, state, dispatch);
     return true;

package/dist/cjs/lib/doc.js

@@ -3,26 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findNodeByID = exports.findGraphicalAbstractFigureElement = exports.findFootnotesSection = exports.findBibliographySection = exports.findBackmatter = exports.findBody = exports.findAbstractsNode = exports.insertFootnotesSection = exports.insertAttachmentsNode = exports.insertSupplementsNode = exports.insertAwardsNode = void 0;
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_utils_1 = require("prosemirror-utils");
+const utils_1 = require("./utils");
 const insertAwardsNode = (tr) => {
     const doc = tr.doc;
     const awards = (0, prosemirror_utils_1.findChildrenByType)(doc, transform_1.schema.nodes.awards)[0];
     if (awards) {
         return awards;
     }
-    const positions = [];
-    const possibleNodesTypes = [
-        'doi',
-        'keywords',
-        'supplements',
-        'abstracts',
-        'body',
-    ];
-    doc.descendants((node, pos) => {
-        if (possibleNodesTypes.includes(node.type.name)) {
-            positions.push(pos);
-        }
-    });
-    const pos = positions.length === 0 ? 0 : Math.min(...positions);
+    const pos = (0, utils_1.findInsertionPosition)(transform_1.schema.nodes.awards, doc);
     const node = transform_1.schema.nodes.awards.createAndFill();
     tr.insert(pos, node);
     return {
@@ -37,8 +25,7 @@ const insertSupplementsNode = (tr) => {
     if (supplements) {
         return supplements;
     }
-    const backmatter = (0, exports.findBackmatter)(doc);
-    const pos = backmatter.pos + backmatter.node.content.size + 1;
+    const pos = (0, utils_1.findInsertionPosition)(transform_1.schema.nodes.supplements, doc);
     const node = transform_1.schema.nodes.supplements.createAndFill();
     tr.insert(pos, node);
     return {
@@ -55,8 +42,7 @@ const insertAttachmentsNode = (tr) => {
             pos: attachmentsNodes[0].pos,
         };
     }
-    const comments = (0, prosemirror_utils_1.findChildrenByType)(tr.doc, transform_1.schema.nodes.comments)[0];
-    const pos = comments.pos + comments.node.content.size;
+    const pos = (0, utils_1.findInsertionPosition)(transform_1.schema.nodes.attachments, tr.doc);
     const node = transform_1.schema.nodes.attachments.create({
         id: (0, transform_1.generateNodeID)(transform_1.schema.nodes.attachments),
     });

package/dist/cjs/lib/utils.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLastTitleNode = exports.filterBlockNodes = exports.getInsertPos = exports.createToggleButton = exports.isEditAllowed = exports.isBodyLocked = exports.cleanItemValues = exports.shouldRenderField = exports.hasParent = exports.isNotNull = exports.createHeader = exports.isSelectionInBody = exports.isSelectionInNode = exports.isChildOfNodeTypes = exports.findParentElement = exports.findParentSection = exports.findParentNodeWithIdValue = exports.findParentNodeWithId = exports.getChildOfType = exports.getMatchingDescendant = exports.getMatchingChild = void 0;
+exports.getLastTitleNode = exports.filterBlockNodes = exports.findInsertionPosition = exports.getInsertPos = exports.createToggleButton = exports.isEditAllowed = exports.isBodyLocked = exports.cleanItemValues = exports.shouldRenderField = exports.hasParent = exports.isNotNull = exports.createHeader = exports.isSelectionInBody = exports.isSelectionInNode = exports.isChildOfNodeTypes = exports.findParentElement = exports.findParentSection = exports.findParentNodeWithIdValue = exports.findParentNodeWithId = exports.getChildOfType = exports.getMatchingDescendant = exports.getMatchingChild = void 0;
 exports.iterateChildren = iterateChildren;
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_model_1 = require("prosemirror-model");
@@ -174,6 +174,16 @@ const getInsertPos = (type, parent, pos) => {
     return insertPos;
 };
 exports.getInsertPos = getInsertPos;
+const findInsertionPosition = (type, doc) => {
+    let insertPos = 0;
+    doc.forEach((child, offset, index) => {
+        if (doc.canReplaceWith(index, index, type)) {
+            insertPos = offset;
+        }
+    });
+    return insertPos;
+};
+exports.findInsertionPosition = findInsertionPosition;
 const filterBlockNodes = (fragment, predicate) => {
     const updatedNodes = [];
     fragment.forEach((child) => {

package/dist/cjs/plugins/add-subtitle.js

@@ -20,6 +20,7 @@ const prosemirror_state_1 = require("prosemirror-state");
 const prosemirror_view_1 = require("prosemirror-view");
 const uuid_1 = require("uuid");
 const icons_1 = require("../icons");
+const utils_1 = require("../lib/utils");
 const createAddSubtitleButton = (handler) => {
     const button = document.createElement('span');
     button.className = 'add-subtitle';
@@ -54,8 +55,9 @@ exports.default = () => new prosemirror_state_1.Plugin({
                         prosemirror_view_1.Decoration.widget(titleEndPos, (view) => {
                             return createAddSubtitleButton(() => {
                                 const subtitlesNode = transform_1.schema.nodes.subtitles.create({ id: (0, uuid_1.v4)() }, [transform_1.schema.nodes.subtitle.create({ id: (0, uuid_1.v4)() })]);
-                                const tr = view.state.tr.insert(titleEndPos, subtitlesNode);
-                                const subtitlePos = titleEndPos + 1;
+                                const pos = (0, utils_1.findInsertionPosition)(transform_1.schema.nodes.subtitles, state.doc);
+                                const tr = view.state.tr.insert(pos, subtitlesNode);
+                                const subtitlePos = pos + 1;
                                 tr.setSelection(prosemirror_state_1.TextSelection.create(tr.doc, subtitlePos));
                                 view.dispatch(tr);
                                 view.focus();

package/dist/cjs/plugins/alt-titles.js

@@ -79,21 +79,20 @@ exports.default = () => {
                 !exports.altTitlesKey.getState(newState)) {
                 return null;
             }
-            const { title, subtitles, runningTitle, shortTitle, altTitlesSection } = exports.altTitlesKey.getState(newState);
+            const { title, runningTitle, shortTitle, altTitlesSection } = exports.altTitlesKey.getState(newState);
             const schema = newState.schema;
             if (!title) {
                 return null;
             }
             if (!altTitlesSection) {
-                const prev = subtitles || title;
-                const titleEnd = prev[0].nodeSize + prev[1];
+                const pos = (0, utils_1.findInsertionPosition)(schema.nodes.alt_titles, tr.doc);
                 const section = schema.nodes.alt_titles.create({}, [
                     schema.nodes.alt_title.create({
                         type: 'running',
                     }),
                     schema.nodes.alt_title.create({ type: 'short' }),
                 ]);
-                tr.insert(titleEnd, section);
+                tr.insert(pos, section);
             }
             else {
                 const endPos = altTitlesSection[1] + altTitlesSection[0].nodeSize - 1;

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

package/dist/cjs/views/contributors.js

@@ -26,6 +26,7 @@ const AuthorsModal_1 = require("../components/authors/AuthorsModal");
 const authors_1 = require("../lib/authors");
 const comments_1 = require("../lib/comments");
 const track_changes_utils_1 = require("../lib/track-changes-utils");
+const utils_1 = require("../lib/utils");
 const view_1 = require("../lib/view");
 const affiliations_1 = require("../plugins/affiliations");
 const selected_suggestion_1 = require("../plugins/selected-suggestion");
@@ -235,22 +236,16 @@ class ContributorsView extends block_view_1.default {
             const { view } = this;
             const { dispatch } = view;
             const affiliationsNodeType = transform_1.schema.nodes.affiliations;
-            const contributorsNodeType = transform_1.schema.nodes.contributors;
-            const affiliationNodeType = transform_1.schema.nodes.affiliation;
             let affiliations = (0, view_1.findChildByType)(view, affiliationsNodeType);
             if (!affiliations) {
-                const contributors = (0, view_1.findChildByType)(view, contributorsNodeType);
-                if (contributors) {
-                    const { tr } = this.view.state;
-                    const affiliationsNode = affiliationsNodeType.create();
-                    const insertPos = contributors.pos + contributors.node.nodeSize;
-                    dispatch(tr.insert(insertPos, affiliationsNode));
-                    affiliations = (0, view_1.findChildByType)(view, affiliationsNodeType);
-                }
+                const { tr } = this.view.state;
+                const insertPos = (0, utils_1.findInsertionPosition)(transform_1.schema.nodes.affiliations, view.state.doc);
+                dispatch(tr.insert(insertPos, transform_1.schema.nodes.affiliations.create()));
+                affiliations = (0, view_1.findChildByType)(view, affiliationsNodeType);
             }
             if (affiliations) {
                 const { tr } = this.view.state;
-                const affiliationNode = affiliationNodeType.create(attrs);
+                const affiliationNode = transform_1.schema.nodes.affiliation.create(attrs);
                 dispatch(tr.insert(affiliations.pos + 1, affiliationNode));
             }
         };

package/dist/es/commands.js

@@ -28,7 +28,7 @@ import { createFootnote, findFootnotesContainerNode, getFootnotesElementState, }
 import { findWordBoundaries, isNodeOfType, nearestAncestor, } from './lib/helpers';
 import { templateAllows } from './lib/template';
 import { isDeleted } from './lib/track-changes-utils';
-import { findParentNodeWithId, getChildOfType, getInsertPos, getLastTitleNode, isBodyLocked, } from './lib/utils';
+import { findInsertionPosition, findParentNodeWithId, getChildOfType, getInsertPos, isBodyLocked, } from './lib/utils';
 import { expandAccessibilitySection } from './plugins/accessibility_element';
 import { setCommentSelection } from './plugins/comments';
 import { getEditorProps } from './plugins/editor-props';
@@ -690,8 +690,7 @@ export const insertContributors = (state, dispatch, view) => {
     if (getChildOfType(state.doc, schema.nodes.contributors, true)) {
         return false;
     }
-    const title = getLastTitleNode(state);
-    const pos = title.pos + title.node.nodeSize;
+    const pos = findInsertionPosition(schema.nodes.contributors, state.doc);
     const contributors = state.schema.nodes.contributors.create({
         id: '',
     });
@@ -709,12 +708,7 @@ export const insertAffiliation = (state, dispatch, view) => {
     if (getChildOfType(state.doc, schema.nodes.affiliations, true)) {
         return false;
     }
-    const title = getLastTitleNode(state);
-    let pos = title.pos + title.node.nodeSize;
-    const contributors = findChildrenByType(state.doc, state.schema.nodes.contributors)[0];
-    if (contributors) {
-        pos = contributors.pos + contributors.node.nodeSize;
-    }
+    const pos = findInsertionPosition(schema.nodes.affiliations, state.doc);
     const affiliations = state.schema.nodes.affiliations.create({
         id: '',
     });
@@ -745,8 +739,7 @@ export const insertKeywords = (state, dispatch, view) => {
     if (getChildOfType(state.doc, schema.nodes.keywords, true)) {
         return false;
     }
-    const abstracts = findChildrenByType(state.doc, state.schema.nodes.abstracts)[0];
-    const pos = abstracts.pos;
+    const pos = findInsertionPosition(schema.nodes.keywords, state.doc);
     const keywords = schema.nodes.keywords.createAndFill({}, [
         schema.nodes.section_title.create({}, schema.text('Keywords')),
         schema.nodes.keywords_element.create({}, [
@@ -1241,8 +1234,7 @@ const createHeroImage = (attrs) => schema.nodes.hero_image.create({
     schema.nodes.long_desc.create(),
 ]);
 export const insertHeroImage = () => (state, dispatch, view) => {
-    const comments = findChildrenByType(state.doc, schema.nodes.comments)[0];
-    const position = comments.pos;
+    const position = findInsertionPosition(schema.nodes.hero_image, state.doc);
     view?.focus();
     createBlock(schema.nodes.hero_image, position, state, dispatch);
     return true;

package/dist/es/lib/doc.js

@@ -1,25 +1,13 @@
 import { generateNodeID, schema, } from '@manuscripts/transform';
 import { findChildren, findChildrenByType } from 'prosemirror-utils';
+import { findInsertionPosition } from './utils';
 export const insertAwardsNode = (tr) => {
     const doc = tr.doc;
     const awards = findChildrenByType(doc, schema.nodes.awards)[0];
     if (awards) {
         return awards;
     }
-    const positions = [];
-    const possibleNodesTypes = [
-        'doi',
-        'keywords',
-        'supplements',
-        'abstracts',
-        'body',
-    ];
-    doc.descendants((node, pos) => {
-        if (possibleNodesTypes.includes(node.type.name)) {
-            positions.push(pos);
-        }
-    });
-    const pos = positions.length === 0 ? 0 : Math.min(...positions);
+    const pos = findInsertionPosition(schema.nodes.awards, doc);
     const node = schema.nodes.awards.createAndFill();
     tr.insert(pos, node);
     return {
@@ -33,8 +21,7 @@ export const insertSupplementsNode = (tr) => {
     if (supplements) {
         return supplements;
     }
-    const backmatter = findBackmatter(doc);
-    const pos = backmatter.pos + backmatter.node.content.size + 1;
+    const pos = findInsertionPosition(schema.nodes.supplements, doc);
     const node = schema.nodes.supplements.createAndFill();
     tr.insert(pos, node);
     return {
@@ -50,8 +37,7 @@ export const insertAttachmentsNode = (tr) => {
             pos: attachmentsNodes[0].pos,
         };
     }
-    const comments = findChildrenByType(tr.doc, schema.nodes.comments)[0];
-    const pos = comments.pos + comments.node.content.size;
+    const pos = findInsertionPosition(schema.nodes.attachments, tr.doc);
     const node = schema.nodes.attachments.create({
         id: generateNodeID(schema.nodes.attachments),
     });

package/dist/es/lib/utils.js

@@ -154,6 +154,15 @@ export const getInsertPos = (type, parent, pos) => {
     });
     return insertPos;
 };
+export const findInsertionPosition = (type, doc) => {
+    let insertPos = 0;
+    doc.forEach((child, offset, index) => {
+        if (doc.canReplaceWith(index, index, type)) {
+            insertPos = offset;
+        }
+    });
+    return insertPos;
+};
 export const filterBlockNodes = (fragment, predicate) => {
     const updatedNodes = [];
     fragment.forEach((child) => {

package/dist/es/plugins/add-subtitle.js

@@ -18,6 +18,7 @@ import { Plugin, TextSelection } from 'prosemirror-state';
 import { Decoration, DecorationSet } from 'prosemirror-view';
 import { v4 as uuidv4 } from 'uuid';
 import { addAuthorIcon } from '../icons';
+import { findInsertionPosition } from '../lib/utils';
 const createAddSubtitleButton = (handler) => {
     const button = document.createElement('span');
     button.className = 'add-subtitle';
@@ -52,8 +53,9 @@ export default () => new Plugin({
                         Decoration.widget(titleEndPos, (view) => {
                             return createAddSubtitleButton(() => {
                                 const subtitlesNode = schema.nodes.subtitles.create({ id: uuidv4() }, [schema.nodes.subtitle.create({ id: uuidv4() })]);
-                                const tr = view.state.tr.insert(titleEndPos, subtitlesNode);
-                                const subtitlePos = titleEndPos + 1;
+                                const pos = findInsertionPosition(schema.nodes.subtitles, state.doc);
+                                const tr = view.state.tr.insert(pos, subtitlesNode);
+                                const subtitlePos = pos + 1;
                                 tr.setSelection(TextSelection.create(tr.doc, subtitlePos));
                                 view.dispatch(tr);
                                 view.focus();

package/dist/es/plugins/alt-titles.js

@@ -2,7 +2,7 @@ import { skipTracking } from '@manuscripts/track-changes-plugin';
 import { schema, } from '@manuscripts/transform';
 import { Plugin, PluginKey } from 'prosemirror-state';
 import { Decoration, DecorationSet } from 'prosemirror-view';
-import { createToggleButton } from '../lib/utils';
+import { createToggleButton, findInsertionPosition } from '../lib/utils';
 function getTitlesData(doc) {
     let title;
     let subtitles;
@@ -76,21 +76,20 @@ export default () => {
                 !altTitlesKey.getState(newState)) {
                 return null;
             }
-            const { title, subtitles, runningTitle, shortTitle, altTitlesSection } = altTitlesKey.getState(newState);
+            const { title, runningTitle, shortTitle, altTitlesSection } = altTitlesKey.getState(newState);
             const schema = newState.schema;
             if (!title) {
                 return null;
             }
             if (!altTitlesSection) {
-                const prev = subtitles || title;
-                const titleEnd = prev[0].nodeSize + prev[1];
+                const pos = findInsertionPosition(schema.nodes.alt_titles, tr.doc);
                 const section = schema.nodes.alt_titles.create({}, [
                     schema.nodes.alt_title.create({
                         type: 'running',
                     }),
                     schema.nodes.alt_title.create({ type: 'short' }),
                 ]);
-                tr.insert(titleEnd, section);
+                tr.insert(pos, section);
             }
             else {
                 const endPos = altTitlesSection[1] + altTitlesSection[0].nodeSize - 1;

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '3.6.0';
+export const VERSION = '3.6.2';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/es/views/contributors.js

@@ -20,6 +20,7 @@ import { AuthorsModal, } from '../components/authors/AuthorsModal';
 import { authorComparator, authorLabel, } from '../lib/authors';
 import { handleComment } from '../lib/comments';
 import { addTrackChangesAttributes, isDeleted, } from '../lib/track-changes-utils';
+import { findInsertionPosition } from '../lib/utils';
 import { deleteNode, findChildByID, findChildByType, findChildrenAttrsByType, updateNodeAttrs, } from '../lib/view';
 import { affiliationsKey } from '../plugins/affiliations';
 import { selectedSuggestionKey } from '../plugins/selected-suggestion';
@@ -229,22 +230,16 @@ export class ContributorsView extends BlockView {
             const { view } = this;
             const { dispatch } = view;
             const affiliationsNodeType = schema.nodes.affiliations;
-            const contributorsNodeType = schema.nodes.contributors;
-            const affiliationNodeType = schema.nodes.affiliation;
             let affiliations = findChildByType(view, affiliationsNodeType);
             if (!affiliations) {
-                const contributors = findChildByType(view, contributorsNodeType);
-                if (contributors) {
-                    const { tr } = this.view.state;
-                    const affiliationsNode = affiliationsNodeType.create();
-                    const insertPos = contributors.pos + contributors.node.nodeSize;
-                    dispatch(tr.insert(insertPos, affiliationsNode));
-                    affiliations = findChildByType(view, affiliationsNodeType);
-                }
+                const { tr } = this.view.state;
+                const insertPos = findInsertionPosition(schema.nodes.affiliations, view.state.doc);
+                dispatch(tr.insert(insertPos, schema.nodes.affiliations.create()));
+                affiliations = findChildByType(view, affiliationsNodeType);
             }
             if (affiliations) {
                 const { tr } = this.view.state;
-                const affiliationNode = affiliationNodeType.create(attrs);
+                const affiliationNode = schema.nodes.affiliation.create(attrs);
                 dispatch(tr.insert(affiliations.pos + 1, affiliationNode));
             }
         };

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

@@ -36,6 +36,7 @@ export declare const isBodyLocked: (state: EditorState) => boolean;
 export declare const isEditAllowed: (state: EditorState) => boolean;
 export declare const createToggleButton: (listener: () => void) => HTMLButtonElement;
 export declare const getInsertPos: (type: ManuscriptNodeType, parent: ManuscriptNode, pos: number) => number;
+export declare const findInsertionPosition: (type: ManuscriptNodeType, doc: ManuscriptNode) => number;
 export declare const filterBlockNodes: (fragment: Fragment, predicate: (node: ProseMirrorNode) => boolean) => Fragment;
 export declare const getLastTitleNode: (state: ManuscriptEditorState) => {
     node: ProseMirrorNode;

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "3.6.0";
+export declare const VERSION = "3.6.2";
 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": "3.6.0",
+  "version": "3.6.2",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -41,7 +41,7 @@
     "@manuscripts/json-schema": "2.2.12",
     "@manuscripts/style-guide": "3.3.2",
     "@manuscripts/track-changes-plugin": "2.1.0",
-    "@manuscripts/transform": "4.3.0",
+    "@manuscripts/transform": "4.3.2",
     "@popperjs/core": "2.11.8",
     "citeproc": "2.4.63",
     "codemirror": "5.65.19",