@manuscripts/body-editor 3.6.4 → 3.6.6

package/dist/cjs/commands.js

@@ -722,16 +722,22 @@ const insertGraphicalAbstract = (category) => (state, dispatch, view) => {
 };
 exports.insertGraphicalAbstract = insertGraphicalAbstract;
 const insertContributors = (state, dispatch, view) => {
-    if ((0, utils_1.getChildOfType)(state.doc, transform_1.schema.nodes.contributors, true)) {
+    const tr = state.tr;
+    let contributors = (0, prosemirror_utils_1.findChildrenByType)(state.doc, transform_1.schema.nodes.contributors)[0];
+    if (contributors?.node.childCount) {
         return false;
     }
-    const pos = (0, utils_1.findInsertionPosition)(transform_1.schema.nodes.contributors, state.doc);
-    const contributors = state.schema.nodes.contributors.create({
-        id: '',
-    });
-    const tr = state.tr.insert(pos, contributors);
+    if (!contributors) {
+        const title = (0, utils_1.getLastTitleNode)(state);
+        const pos = title.pos + title.node.nodeSize;
+        const contributorsNode = state.schema.nodes.contributors.create({
+            id: '',
+        });
+        tr.insert(pos, contributorsNode);
+        contributors = { node: contributorsNode, pos };
+    }
     if (dispatch) {
-        const selection = prosemirror_state_1.NodeSelection.create(tr.doc, pos);
+        const selection = prosemirror_state_1.NodeSelection.create(tr.doc, contributors.pos);
         if (view) {
             view.focus();
         }
@@ -741,16 +747,22 @@ const insertContributors = (state, dispatch, view) => {
 };
 exports.insertContributors = insertContributors;
 const insertAffiliation = (state, dispatch, view) => {
-    if ((0, utils_1.getChildOfType)(state.doc, transform_1.schema.nodes.affiliations, true)) {
+    const tr = state.tr;
+    let affiliations = (0, prosemirror_utils_1.findChildrenByType)(state.doc, transform_1.schema.nodes.affiliations)[0];
+    if (affiliations?.node.childCount) {
         return false;
     }
-    const pos = (0, utils_1.findInsertionPosition)(transform_1.schema.nodes.affiliations, state.doc);
-    const affiliations = state.schema.nodes.affiliations.create({
-        id: '',
-    });
-    const tr = state.tr.insert(pos, affiliations);
+    if (!affiliations) {
+        const title = (0, utils_1.getLastTitleNode)(state);
+        const pos = title.pos + title.node.nodeSize;
+        const affiliationsNode = state.schema.nodes.affiliations.create({
+            id: '',
+        });
+        tr.insert(pos, affiliationsNode);
+        affiliations = { node: affiliationsNode, pos };
+    }
     if (dispatch) {
-        const selection = prosemirror_state_1.NodeSelection.create(tr.doc, pos);
+        const selection = prosemirror_state_1.NodeSelection.create(tr.doc, affiliations.pos);
         if (view) {
             view.focus();
         }

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

package/dist/cjs/views/affiliations.js

@@ -137,7 +137,11 @@ class AffiliationsView extends block_view_1.default {
             return contextMenu ? [contextMenu] : [];
         };
         this.selectNode = () => {
+            const selectedMarker = document.querySelector('.comment-marker.selected-comment');
             this.dom.classList.add('ProseMirror-selectednode');
+            if (!(0, track_changes_utils_1.isDeleted)(this.node) && !selectedMarker) {
+                this.handleEdit('', true);
+            }
         };
         this.handleUpdateAuthors = (authors) => {
             authors.forEach((author) => {

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 { findInsertionPosition, findParentNodeWithId, getChildOfType, getInsertPos, isBodyLocked, } from './lib/utils';
+import { findInsertionPosition, findParentNodeWithId, getChildOfType, getInsertPos, getLastTitleNode, isBodyLocked, } from './lib/utils';
 import { expandAccessibilitySection } from './plugins/accessibility_element';
 import { setCommentSelection } from './plugins/comments';
 import { getEditorProps } from './plugins/editor-props';
@@ -687,16 +687,22 @@ export const insertGraphicalAbstract = (category) => (state, dispatch, view) =>
     return true;
 };
 export const insertContributors = (state, dispatch, view) => {
-    if (getChildOfType(state.doc, schema.nodes.contributors, true)) {
+    const tr = state.tr;
+    let contributors = findChildrenByType(state.doc, schema.nodes.contributors)[0];
+    if (contributors?.node.childCount) {
         return false;
     }
-    const pos = findInsertionPosition(schema.nodes.contributors, state.doc);
-    const contributors = state.schema.nodes.contributors.create({
-        id: '',
-    });
-    const tr = state.tr.insert(pos, contributors);
+    if (!contributors) {
+        const title = getLastTitleNode(state);
+        const pos = title.pos + title.node.nodeSize;
+        const contributorsNode = state.schema.nodes.contributors.create({
+            id: '',
+        });
+        tr.insert(pos, contributorsNode);
+        contributors = { node: contributorsNode, pos };
+    }
     if (dispatch) {
-        const selection = NodeSelection.create(tr.doc, pos);
+        const selection = NodeSelection.create(tr.doc, contributors.pos);
         if (view) {
             view.focus();
         }
@@ -705,16 +711,22 @@ export const insertContributors = (state, dispatch, view) => {
     return true;
 };
 export const insertAffiliation = (state, dispatch, view) => {
-    if (getChildOfType(state.doc, schema.nodes.affiliations, true)) {
+    const tr = state.tr;
+    let affiliations = findChildrenByType(state.doc, schema.nodes.affiliations)[0];
+    if (affiliations?.node.childCount) {
         return false;
     }
-    const pos = findInsertionPosition(schema.nodes.affiliations, state.doc);
-    const affiliations = state.schema.nodes.affiliations.create({
-        id: '',
-    });
-    const tr = state.tr.insert(pos, affiliations);
+    if (!affiliations) {
+        const title = getLastTitleNode(state);
+        const pos = title.pos + title.node.nodeSize;
+        const affiliationsNode = state.schema.nodes.affiliations.create({
+            id: '',
+        });
+        tr.insert(pos, affiliationsNode);
+        affiliations = { node: affiliationsNode, pos };
+    }
     if (dispatch) {
-        const selection = NodeSelection.create(tr.doc, pos);
+        const selection = NodeSelection.create(tr.doc, affiliations.pos);
         if (view) {
             view.focus();
         }

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '3.6.4';
+export const VERSION = '3.6.6';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/es/views/affiliations.js

@@ -131,7 +131,11 @@ export class AffiliationsView extends BlockView {
             return contextMenu ? [contextMenu] : [];
         };
         this.selectNode = () => {
+            const selectedMarker = document.querySelector('.comment-marker.selected-comment');
             this.dom.classList.add('ProseMirror-selectednode');
+            if (!isDeleted(this.node) && !selectedMarker) {
+                this.handleEdit('', true);
+            }
         };
         this.handleUpdateAuthors = (authors) => {
             authors.forEach((author) => {

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "3.6.4";
+export declare const VERSION = "3.6.6";
 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.4",
+  "version": "3.6.6",
   "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.4",
+    "@manuscripts/transform": "4.3.5",
     "@popperjs/core": "2.11.8",
     "citeproc": "2.4.63",
     "codemirror": "5.65.19",

package/styles/AdvancedEditor.css

@@ -407,6 +407,9 @@ ProseMirror .block-embed .position-menu {
 .ProseMirror .block-contributors {
   grid-template-columns: 52px auto 65px;
 }
+.ProseMirror .block-contributors.empty-node, .ProseMirror .block-affiliations.empty-node {
+  display: none !important;
+}
 .ProseMirror .block-affiliations {
   grid-template-columns: 52px auto 100px;
 }