@manuscripts/body-editor 1.9.4-LEAN-3584.1 → 1.9.4

package/dist/cjs/commands.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.insertTableFootnote = exports.updateCommentAnnotationState = exports.addComment = exports.deleteHighlightMarkers = exports.insertHighlight = exports.createAndFillTableElement = exports.selectAllIsolating = exports.ignoreAtomBlockNodeForward = exports.isAtEndOfTextBlock = exports.ignoreAtomBlockNodeBackward = exports.isTextSelection = exports.isAtStartOfTextBlock = exports.ifInTableBody = exports.insertTOCSection = exports.insertBibliographySection = exports.insertList = exports.insertSection = exports.insertGraphicalAbstract = exports.insertInlineFootnote = exports.insertInlineEquation = exports.insertCrossReference = exports.insertInlineCitation = exports.insertLink = exports.insertSectionLabel = exports.insertBreak = exports.deleteBlock = exports.insertBlock = exports.insertFileAsFigure = exports.insertGeneralFootnote = exports.createBlock = exports.createSelection = exports.canInsert = exports.blockActive = exports.isNodeSelection = exports.markActive = void 0;
+exports.insertTableFootnote = exports.updateCommentAnnotationState = exports.addComment = exports.deleteHighlightMarkers = exports.insertHighlight = exports.createAndFillTableElement = exports.selectAllIsolating = exports.ignoreAtomBlockNodeForward = exports.isAtEndOfTextBlock = exports.ignoreMetaNodeBackspaceCommand = exports.ignoreAtomBlockNodeBackward = exports.isTextSelection = exports.isAtStartOfTextBlock = exports.ifInTableBody = exports.insertTOCSection = exports.insertBibliographySection = exports.insertList = exports.insertSection = exports.insertGraphicalAbstract = exports.insertInlineFootnote = exports.insertInlineEquation = exports.insertCrossReference = exports.insertInlineCitation = exports.insertLink = exports.insertSectionLabel = exports.insertBreak = exports.deleteBlock = exports.insertBlock = exports.insertFileAsFigure = exports.insertGeneralFootnote = exports.createBlock = exports.createSelection = exports.canInsert = exports.blockActive = exports.isNodeSelection = exports.markActive = void 0;
 const json_schema_1 = require("@manuscripts/json-schema");
 const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
 const transform_1 = require("@manuscripts/transform");
@@ -498,6 +498,16 @@ const ignoreAtomBlockNodeBackward = (state, dispatch, view) => {
     return node.isBlock && node.isAtom;
 };
 exports.ignoreAtomBlockNodeBackward = ignoreAtomBlockNodeBackward;
+const ignoreMetaNodeBackspaceCommand = (state) => {
+    const { selection } = state;
+    if (!(0, exports.isNodeSelection)(selection)) {
+        return false;
+    }
+    return (selection.node.type === transform_1.schema.nodes.keyword_group ||
+        selection.node.type === transform_1.schema.nodes.affiliations ||
+        selection.node.type === transform_1.schema.nodes.contributors);
+};
+exports.ignoreMetaNodeBackspaceCommand = ignoreMetaNodeBackspaceCommand;
 const findCutAfter = ($pos) => {
     if (!$pos.parent.type.spec.isolating) {
         for (let i = $pos.depth - 1; i >= 0; i--) {
@@ -750,8 +760,7 @@ const insertTableFootnote = (node, position, view, inlineFootnote) => {
     else {
         const inlineFootnotes = (0, prosemirror_utils_1.findChildrenByType)(node, transform_1.schema.nodes.inline_footnote);
         footnoteIndex =
-            inlineFootnotes.filter(({ pos }) => 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,

package/dist/cjs/keys/misc.js

@@ -22,7 +22,7 @@ const prosemirror_inputrules_1 = require("prosemirror-inputrules");
 const prosemirror_tables_1 = require("prosemirror-tables");
 const commands_1 = require("../commands");
 const customKeymap = {
-    Backspace: (0, prosemirror_commands_1.chainCommands)(prosemirror_inputrules_1.undoInputRule, commands_1.ignoreAtomBlockNodeBackward),
+    Backspace: (0, prosemirror_commands_1.chainCommands)(prosemirror_inputrules_1.undoInputRule, commands_1.ignoreAtomBlockNodeBackward, commands_1.ignoreMetaNodeBackspaceCommand),
     Delete: commands_1.ignoreAtomBlockNodeForward,
     Tab: (0, prosemirror_tables_1.goToNextCell)(1),
     'Mod-z': prosemirror_history_1.undo,

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

@@ -208,6 +208,7 @@ class ContextMenu {
                                 const tablesFootnoteLabels = (0, footnotes_utils_1.buildTableFootnoteLabels)(this.node);
                                 const footnotesWithPos = (0, prosemirror_utils_1.findChildrenByType)(footnotesElementWithPos.node, transform_1.schema.nodes.footnote);
                                 const footnotes = footnotesWithPos
+                                    .filter(({ node }) => !(0, track_changes_utils_1.isDeleted)(node) && !(0, track_changes_utils_1.isRejectedInsert)(node))
                                     .map(({ node }) => ({
                                     node: node,
                                     index: tablesFootnoteLabels.get(node.attrs.id),
@@ -228,7 +229,8 @@ class ContextMenu {
                                             this.view.state.doc
                                                 .slice(this.getPos(), insertedAt)
                                                 .content.descendants((node) => {
-                                                if (node.type === transform_1.schema.nodes.inline_footnote) {
+                                                if (node.type === transform_1.schema.nodes.inline_footnote &&
+                                                    !(0, track_changes_utils_1.isRejectedInsert)(node)) {
                                                     inlineFootnoteIndex++;
                                                     return false;
                                                 }

package/dist/cjs/plugins/comment_annotation.js

@@ -53,11 +53,17 @@ exports.default = (props) => {
                     }
                 }
                 const hasCommentChange = !!tr.steps.find((s) => {
-                    var _a, _b;
+                    var _a, _b, _c, _d;
                     if (s instanceof prosemirror_transform_1.ReplaceStep) {
-                        return s.slice.size > 0
-                            ? ((_a = newState.doc.nodeAt(s.from + 1)) === null || _a === void 0 ? void 0 : _a.type) === transform_1.schema.nodes.comment
-                            : ((_b = oldState.doc.nodeAt(s.from)) === null || _b === void 0 ? void 0 : _b.type) === transform_1.schema.nodes.comment;
+                        if (s.slice.size > 0) {
+                            return (((_a = newState.doc.nodeAt(s.from + 1)) === null || _a === void 0 ? void 0 : _a.type) ===
+                                transform_1.schema.nodes.comment ||
+                                ((_b = newState.doc.nodeAt(s.from)) === null || _b === void 0 ? void 0 : _b.type) ===
+                                    transform_1.schema.nodes.highlight_marker);
+                        }
+                        return (((_c = oldState.doc.nodeAt(s.from)) === null || _c === void 0 ? void 0 : _c.type) === transform_1.schema.nodes.comment ||
+                            ((_d = oldState.doc.nodeAt(s.from)) === null || _d === void 0 ? void 0 : _d.type) ===
+                                transform_1.schema.nodes.highlight_marker);
                     }
                 });
                 if (hasCommentChange) {

package/dist/cjs/plugins/footnotes/footnotes-utils.js

@@ -20,11 +20,13 @@ const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_model_1 = require("prosemirror-model");
 const prosemirror_utils_1 = require("prosemirror-utils");
+const track_changes_utils_1 = require("../../lib/track-changes-utils");
 const findTableInlineFootnoteIds = ($pos) => {
     var _a;
     const tableElement = (_a = (0, prosemirror_utils_1.findParentNodeClosestToPos)($pos, (node) => node.type === transform_1.schema.nodes.table_element)) === null || _a === void 0 ? void 0 : _a.node.firstChild;
     return new Set(tableElement
         ? (0, prosemirror_utils_1.findChildren)(tableElement, (node) => node.type === transform_1.schema.nodes.inline_footnote)
+            .filter(({ node }) => !(0, track_changes_utils_1.isRejectedInsert)(node))
             .map(({ node }) => node.attrs.rids)
             .flat()
         : []);
@@ -49,6 +51,7 @@ const buildTableFootnoteLabels = (node) => {
     ]));
     let index = 0;
     (0, prosemirror_utils_1.findChildrenByType)(node, transform_1.schema.nodes.inline_footnote)
+        .filter(({ node }) => !(0, track_changes_utils_1.isRejectedInsert)(node))
         .map(({ node }) => node.attrs.rids)
         .flat()
         .map((rid) => {
@@ -82,7 +85,9 @@ const orderTableFootnotes = (tr, footnotesElementWithPos, position) => {
 exports.orderTableFootnotes = orderTableFootnotes;
 const updateTableInlineFootnoteLabels = (tr, table) => {
     const labels = (0, exports.buildTableFootnoteLabels)(table.node);
-    (0, prosemirror_utils_1.findChildrenByType)(table.node, transform_1.schema.nodes.inline_footnote).map(({ node, pos }) => {
+    (0, prosemirror_utils_1.findChildrenByType)(table.node, transform_1.schema.nodes.inline_footnote)
+        .filter(({ node }) => !(0, track_changes_utils_1.isRejectedInsert)(node))
+        .map(({ node, pos }) => {
         const contents = node.attrs.rids
             .map((rid) => labels.get(rid))
             .join(',');

package/dist/cjs/views/inline_footnote.js

@@ -81,6 +81,7 @@ class InlineFootnoteView extends base_node_view_1.BaseNodeView {
             if (footnotesElement) {
                 const tablesFootnoteLabels = (0, footnotes_utils_1.buildTableFootnoteLabels)(tableElement.node);
                 footnotes = (0, prosemirror_utils_1.findChildrenByType)(footnotesElement, transform_1.schema.nodes.footnote)
+                    .filter(({ node }) => !(0, track_changes_utils_1.isDeleted)(node) && !(0, track_changes_utils_1.isRejectedInsert)(node))
                     .map(({ node }) => ({
                     node: node,
                     index: tablesFootnoteLabels.get(node.attrs.id),

package/dist/es/commands.js

@@ -469,6 +469,15 @@ export const ignoreAtomBlockNodeBackward = (state, dispatch, view) => {
     }
     return node.isBlock && node.isAtom;
 };
+export const ignoreMetaNodeBackspaceCommand = (state) => {
+    const { selection } = state;
+    if (!isNodeSelection(selection)) {
+        return false;
+    }
+    return (selection.node.type === schema.nodes.keyword_group ||
+        selection.node.type === schema.nodes.affiliations ||
+        selection.node.type === schema.nodes.contributors);
+};
 const findCutAfter = ($pos) => {
     if (!$pos.parent.type.spec.isolating) {
         for (let i = $pos.depth - 1; i >= 0; i--) {
@@ -713,8 +722,7 @@ export const insertTableFootnote = (node, position, view, inlineFootnote) => {
     else {
         const inlineFootnotes = findChildrenByType(node, schema.nodes.inline_footnote);
         footnoteIndex =
-            inlineFootnotes.filter(({ pos }) => 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,

package/dist/es/keys/misc.js

@@ -18,9 +18,9 @@ import { chainCommands, exitCode, joinDown, joinUp, lift, toggleMark, wrapIn, }
 import { redo, undo } from 'prosemirror-history';
 import { undoInputRule } from 'prosemirror-inputrules';
 import { goToNextCell } from 'prosemirror-tables';
-import { ignoreAtomBlockNodeBackward, ignoreAtomBlockNodeForward, insertBlock, insertBreak, insertCrossReference, insertInlineCitation, insertInlineEquation, insertSection, selectAllIsolating, } from '../commands';
+import { ignoreAtomBlockNodeBackward, ignoreAtomBlockNodeForward, ignoreMetaNodeBackspaceCommand, insertBlock, insertBreak, insertCrossReference, insertInlineCitation, insertInlineEquation, insertSection, selectAllIsolating, } from '../commands';
 const customKeymap = {
-    Backspace: chainCommands(undoInputRule, ignoreAtomBlockNodeBackward),
+    Backspace: chainCommands(undoInputRule, ignoreAtomBlockNodeBackward, ignoreMetaNodeBackspaceCommand),
     Delete: ignoreAtomBlockNodeForward,
     Tab: goToNextCell(1),
     'Mod-z': undo,

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

@@ -201,6 +201,7 @@ export class ContextMenu {
                                 const tablesFootnoteLabels = buildTableFootnoteLabels(this.node);
                                 const footnotesWithPos = findChildrenByType(footnotesElementWithPos.node, schema.nodes.footnote);
                                 const footnotes = footnotesWithPos
+                                    .filter(({ node }) => !isDeleted(node) && !isRejectedInsert(node))
                                     .map(({ node }) => ({
                                     node: node,
                                     index: tablesFootnoteLabels.get(node.attrs.id),
@@ -221,7 +222,8 @@ export class ContextMenu {
                                             this.view.state.doc
                                                 .slice(this.getPos(), insertedAt)
                                                 .content.descendants((node) => {
-                                                if (node.type === schema.nodes.inline_footnote) {
+                                                if (node.type === schema.nodes.inline_footnote &&
+                                                    !isRejectedInsert(node)) {
                                                     inlineFootnoteIndex++;
                                                     return false;
                                                 }

package/dist/es/plugins/comment_annotation.js

@@ -47,11 +47,17 @@ export default (props) => {
                     }
                 }
                 const hasCommentChange = !!tr.steps.find((s) => {
-                    var _a, _b;
+                    var _a, _b, _c, _d;
                     if (s instanceof ReplaceStep) {
-                        return s.slice.size > 0
-                            ? ((_a = newState.doc.nodeAt(s.from + 1)) === null || _a === void 0 ? void 0 : _a.type) === schema.nodes.comment
-                            : ((_b = oldState.doc.nodeAt(s.from)) === null || _b === void 0 ? void 0 : _b.type) === schema.nodes.comment;
+                        if (s.slice.size > 0) {
+                            return (((_a = newState.doc.nodeAt(s.from + 1)) === null || _a === void 0 ? void 0 : _a.type) ===
+                                schema.nodes.comment ||
+                                ((_b = newState.doc.nodeAt(s.from)) === null || _b === void 0 ? void 0 : _b.type) ===
+                                    schema.nodes.highlight_marker);
+                        }
+                        return (((_c = oldState.doc.nodeAt(s.from)) === null || _c === void 0 ? void 0 : _c.type) === schema.nodes.comment ||
+                            ((_d = oldState.doc.nodeAt(s.from)) === null || _d === void 0 ? void 0 : _d.type) ===
+                                schema.nodes.highlight_marker);
                     }
                 });
                 if (hasCommentChange) {

package/dist/es/plugins/footnotes/footnotes-utils.js

@@ -17,11 +17,13 @@ import { skipTracking } from '@manuscripts/track-changes-plugin';
 import { isFootnoteNode, schema, } from '@manuscripts/transform';
 import { Fragment } from 'prosemirror-model';
 import { findChildren, findChildrenByType, findParentNodeClosestToPos, } from 'prosemirror-utils';
+import { isRejectedInsert } from '../../lib/track-changes-utils';
 export const findTableInlineFootnoteIds = ($pos) => {
     var _a;
     const tableElement = (_a = findParentNodeClosestToPos($pos, (node) => node.type === schema.nodes.table_element)) === null || _a === void 0 ? void 0 : _a.node.firstChild;
     return new Set(tableElement
         ? findChildren(tableElement, (node) => node.type === schema.nodes.inline_footnote)
+            .filter(({ node }) => !isRejectedInsert(node))
             .map(({ node }) => node.attrs.rids)
             .flat()
         : []);
@@ -44,6 +46,7 @@ export const buildTableFootnoteLabels = (node) => {
     ]));
     let index = 0;
     findChildrenByType(node, schema.nodes.inline_footnote)
+        .filter(({ node }) => !isRejectedInsert(node))
         .map(({ node }) => node.attrs.rids)
         .flat()
         .map((rid) => {
@@ -75,7 +78,9 @@ export const orderTableFootnotes = (tr, footnotesElementWithPos, position) => {
 };
 export const updateTableInlineFootnoteLabels = (tr, table) => {
     const labels = buildTableFootnoteLabels(table.node);
-    findChildrenByType(table.node, schema.nodes.inline_footnote).map(({ node, pos }) => {
+    findChildrenByType(table.node, schema.nodes.inline_footnote)
+        .filter(({ node }) => !isRejectedInsert(node))
+        .map(({ node, pos }) => {
         const contents = node.attrs.rids
             .map((rid) => labels.get(rid))
             .join(',');

package/dist/es/views/inline_footnote.js

@@ -17,7 +17,7 @@ import { TableFootnotesSelector, } from '@manuscripts/style-guide';
 import { schema, } from '@manuscripts/transform';
 import { findChildrenByType, findParentNodeClosestToPos, } from 'prosemirror-utils';
 import { insertTableFootnote } from '../commands';
-import { getChangeClasses, isDeleted, } from '../lib/track-changes-utils';
+import { getChangeClasses, isDeleted, isRejectedInsert, } from '../lib/track-changes-utils';
 import { buildTableFootnoteLabels } from '../plugins/footnotes/footnotes-utils';
 import { BaseNodeView } from './base_node_view';
 import { createNodeView } from './creators';
@@ -75,6 +75,7 @@ export class InlineFootnoteView extends BaseNodeView {
             if (footnotesElement) {
                 const tablesFootnoteLabels = buildTableFootnoteLabels(tableElement.node);
                 footnotes = findChildrenByType(footnotesElement, schema.nodes.footnote)
+                    .filter(({ node }) => !isDeleted(node) && !isRejectedInsert(node))
                     .map(({ node }) => ({
                     node: node,
                     index: tablesFootnoteLabels.get(node.attrs.id),

package/dist/types/commands.d.ts

@@ -48,6 +48,7 @@ export declare const ifInTableBody: (command: (state: ManuscriptEditorState) =>
 export declare const isAtStartOfTextBlock: (state: ManuscriptEditorState, $cursor: ResolvedPos, view?: ManuscriptEditorView) => boolean;
 export declare const isTextSelection: (selection: Selection) => selection is TextSelection;
 export declare const ignoreAtomBlockNodeBackward: (state: ManuscriptEditorState, dispatch?: Dispatch, view?: ManuscriptEditorView) => boolean;
+export declare const ignoreMetaNodeBackspaceCommand: (state: ManuscriptEditorState) => boolean;
 export declare const isAtEndOfTextBlock: (state: ManuscriptEditorState, $cursor: ResolvedPos, view?: ManuscriptEditorView) => boolean;
 export declare const ignoreAtomBlockNodeForward: (state: ManuscriptEditorState, dispatch?: Dispatch, view?: ManuscriptEditorView) => boolean;
 export declare const selectAllIsolating: (state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "1.9.4-LEAN-3584.1",
+  "version": "1.9.4",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -31,9 +31,9 @@
     "@manuscripts/assets": "^0.6.4",
     "@manuscripts/json-schema": "^2.2.7",
     "@manuscripts/library": "^1.3.6",
-    "@manuscripts/style-guide": "1.12.2",
+    "@manuscripts/style-guide": "1.12.3",
     "@manuscripts/track-changes-plugin": "1.7.10",
-    "@manuscripts/transform": "2.3.2",
+    "@manuscripts/transform": "2.3.3",
     "astrocite-eutils": "^0.16.4",
     "mathjax-full": "^3.2.2",
     "codemirror": "^5.58.1",
@@ -111,4 +111,4 @@
     "@types/react": "^17.0.2",
     "prosemirror-tables": "^1.3.5"
   }
-}
+}