@manuscripts/body-editor 2.2.4-LEAN-4013.0 → 2.2.4

package/dist/cjs/commands.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.autoComplete = exports.mergeCellsWithSpace = exports.addColumns = exports.addRows = exports.insertTableFootnote = exports.addInlineComment = exports.addNodeComment = exports.createAndFillTableElement = exports.selectAllIsolating = exports.ignoreAtomBlockNodeForward = exports.isAtEndOfTextBlock = exports.ignoreMetaNodeBackspaceCommand = exports.ignoreAtomBlockNodeBackward = exports.isTextSelection = exports.isAtStartOfTextBlock = exports.insertTOCSection = exports.insertBibliographySection = exports.insertList = exports.insertKeywords = exports.insertContributors = exports.insertAbstract = exports.insertBackMatterSection = exports.insertSection = exports.insertGraphicalAbstract = exports.insertInlineFootnote = exports.insertFootnote = exports.createFootnote = exports.insertInlineEquation = exports.insertCrossReference = exports.insertInlineCitation = exports.insertLink = exports.insertSectionLabel = exports.findPosBeforeFirstSubsection = exports.insertBreak = exports.deleteBlock = exports.insertBlock = exports.insertSupplement = exports.insertTable = exports.insertFigure = exports.insertGeneralFootnote = exports.createBlock = exports.createSelection = exports.canInsert = exports.blockActive = exports.isNodeSelection = exports.markActive = void 0;
+exports.autoComplete = exports.mergeCellsWithSpace = exports.addColumns = exports.addRows = exports.insertTableFootnote = exports.addInlineComment = exports.addNodeComment = exports.createAndFillTableElement = exports.selectAllIsolating = exports.ignoreAtomBlockNodeForward = exports.isAtEndOfTextBlock = exports.ignoreMetaNodeBackspaceCommand = exports.ignoreAtomBlockNodeBackward = exports.isTextSelection = exports.isAtStartOfTextBlock = exports.insertTOCSection = exports.insertBibliographySection = exports.insertList = exports.insertKeywords = exports.insertContributors = exports.insertAbstract = exports.insertBackMatterSection = exports.insertSection = exports.insertGraphicalAbstract = exports.insertInlineFootnote = exports.insertFootnote = exports.createFootnote = exports.insertInlineEquation = exports.insertCrossReference = exports.insertInlineCitation = exports.insertLink = exports.insertSectionLabel = exports.findPosBeforeFirstSubsection = exports.insertBreak = exports.deleteBlock = exports.insertBlock = exports.insertSupplement = exports.insertTable = exports.insertFigure = exports.insertGeneralFootnote = exports.undoFootnoteDelete = 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");
@@ -131,6 +131,11 @@ const createBlock = (nodeType, position, state, dispatch, attrs) => {
     }
 };
 exports.createBlock = createBlock;
+const undoFootnoteDelete = (tr, footnote, position) => {
+    const updatedAttrs = Object.assign(Object.assign({}, footnote.node.attrs), { dataTracked: null });
+    tr.setNodeMarkup(position, undefined, updatedAttrs, footnote.node.marks);
+};
+exports.undoFootnoteDelete = undoFootnoteDelete;
 const insertGeneralFootnote = (tableElementNode, position, view, tableElementFooter) => {
     const { state, dispatch } = view;
     const paragraph = state.schema.nodes.paragraph.create({
@@ -149,6 +154,11 @@ const insertGeneralFootnote = (tableElementNode, position, view, tableElementFoo
                 ? table.pos + table.node.nodeSize
                 : tableColGroup.pos + tableColGroup.node.nodeSize);
     if (tableElementFooter === null || tableElementFooter === void 0 ? void 0 : tableElementFooter.length) {
+        if ((0, track_changes_utils_1.isDeleted)(tableElementFooter[0].node) ||
+            (0, track_changes_utils_1.isRejectedInsert)(tableElementFooter[0].node)) {
+            const tableElementFooterPos = tr.mapping.map(position + tableElementFooter[0].pos + 1);
+            (0, exports.undoFootnoteDelete)(tr, tableElementFooter[0], tableElementFooterPos);
+        }
         tr.insert(pos, generalNote);
     }
     else {
@@ -398,8 +408,10 @@ const insertFootnote = (state, tr, footnote) => {
     else {
         const footnoteElement = (0, prosemirror_utils_1.findChildrenByType)(footnotesSection.node, transform_1.schema.nodes.footnotes_element).pop();
         if (footnoteElement) {
-            if ((0, track_changes_utils_1.isDeleted)(footnoteElement.node)) {
+            if ((0, track_changes_utils_1.isDeleted)(footnoteElement.node) ||
+                (0, track_changes_utils_1.isRejectedInsert)(footnoteElement.node)) {
                 const footnoteElementPos = footnotesSection.pos + footnoteElement.pos + 1;
+                (0, exports.undoFootnoteDelete)(tr, footnoteElement, footnoteElementPos);
                 const updatedAttrs = Object.assign(Object.assign({}, footnoteElement.node.attrs), { dataTracked: null });
                 tr.setNodeMarkup(footnoteElementPos, undefined, updatedAttrs, footnoteElement.node.marks);
             }
@@ -1003,9 +1015,12 @@ const insertTableFootnote = (tableElementNode, position, view, inlineFootnote) =
     }
     let insertionPos = position;
     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)) {
+    if (footnotesElement) {
+        if ((0, track_changes_utils_1.isDeleted)(footnotesElement.node) ||
+            (0, track_changes_utils_1.isRejectedInsert)(footnotesElement.node)) {
+            const footnotesElementPos = tr.mapping.map(position + footnotesElement.pos + 1);
+            (0, exports.undoFootnoteDelete)(tr, footnotesElement, footnotesElementPos);
+        }
         const footnotePos = (0, footnotes_1.getNewFootnotePos)(footnotesElement, footnoteIndex);
         insertionPos = tr.mapping.map(position + footnotePos);
         tr.insert(insertionPos, footnote);
@@ -1014,6 +1029,11 @@ const insertTableFootnote = (tableElementNode, position, view, inlineFootnote) =
         const footnoteElement = state.schema.nodes.footnotes_element.create({}, footnote);
         const tableElementFooter = (0, prosemirror_utils_1.findChildrenByType)(tableElementNode, transform_1.schema.nodes.table_element_footer)[0];
         if (tableElementFooter) {
+            if ((0, track_changes_utils_1.isDeleted)(tableElementFooter.node) ||
+                (0, track_changes_utils_1.isRejectedInsert)(tableElementFooter.node)) {
+                const tableElementFooterPos = tr.mapping.map(position + tableElementFooter.pos + 1);
+                (0, exports.undoFootnoteDelete)(tr, tableElementFooter, tableElementFooterPos);
+            }
             const pos = tableElementFooter.pos;
             insertionPos = position + pos + tableElementFooter.node.nodeSize;
             tr.insert(tr.mapping.map(insertionPos), footnoteElement);

package/dist/cjs/plugins/footnotes/widgets.js

@@ -60,11 +60,23 @@ const deleteFootnoteWidget = (node, props, id, tableElement, tableElementFooter)
             if (node.type === transform_1.schema.nodes.footnote && pos) {
                 const targetNode = tableElement ? tableElement.node : view.state.doc;
                 const inlineFootnotes = (0, footnotes_1.getInlineFootnotes)(id, targetNode);
-                const footnote = (0, prosemirror_utils_1.findParentNodeClosestToPos)(tr.doc.resolve(pos), (node) => node.type === transform_1.schema.nodes.footnote);
-                if (footnote) {
-                    const { pos: fnPos, node: fnNode } = footnote;
+                const footnotesElement = (0, prosemirror_utils_1.findParentNodeClosestToPos)(tr.doc.resolve(pos), (node) => node.type === transform_1.schema.nodes.footnotes_element);
+                if ((footnotesElement === null || footnotesElement === void 0 ? void 0 : footnotesElement.node.childCount) === 1 &&
+                    (tableElementFooter === null || tableElementFooter === void 0 ? void 0 : tableElementFooter.node.childCount) === 1) {
+                    const { pos: fnPos, node: fnNode } = tableElementFooter;
                     tr.delete(fnPos, fnPos + fnNode.nodeSize + 1);
                 }
+                else if ((footnotesElement === null || footnotesElement === void 0 ? void 0 : footnotesElement.node.childCount) === 1) {
+                    const { pos: fnPos, node: fnNode } = footnotesElement;
+                    tr.delete(fnPos, fnPos + fnNode.nodeSize + 1);
+                }
+                else {
+                    const footnote = (0, prosemirror_utils_1.findParentNodeClosestToPos)(tr.doc.resolve(pos), (node) => node.type === transform_1.schema.nodes.footnote);
+                    if (footnote) {
+                        const { pos: fnPos, node: fnNode } = footnote;
+                        tr.delete(fnPos, fnPos + fnNode.nodeSize + 1);
+                    }
+                }
                 if (inlineFootnotes) {
                     inlineFootnotes.forEach((footnote) => {
                         const pos = footnote.pos + (tableElement ? tableElement.pos + 1 : 0);
@@ -79,24 +91,6 @@ const deleteFootnoteWidget = (node, props, id, tableElement, tableElementFooter)
                 }
             }
             view.dispatch(tr);
-            if (pos) {
-                const footnotesElement = (0, prosemirror_utils_1.findParentNodeClosestToPos)(view.state.doc.resolve(pos), (node) => node.type === transform_1.schema.nodes.footnotes_element);
-                if (footnotesElement) {
-                    let allFootnotesDeleted = true;
-                    footnotesElement.node.descendants((child) => {
-                        if (child.type === transform_1.schema.nodes.footnote && !(0, track_changes_utils_1.isDeleted)(child)) {
-                            allFootnotesDeleted = false;
-                            return false;
-                        }
-                    });
-                    if (allFootnotesDeleted) {
-                        const { pos: fnPos, node: fnNode } = footnotesElement;
-                        const tr2 = view.state.tr;
-                        tr2.delete(fnPos, fnPos + fnNode.nodeSize + 1);
-                        view.dispatch(tr2);
-                    }
-                }
-            }
         };
         const componentProps = {
             footnoteType: footnote.type,

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.2.4-LEAN-4013.0';
+exports.VERSION = '2.2.4';
 exports.MATHJAX_VERSION = '3.2.2';

package/dist/es/commands.js

@@ -122,6 +122,10 @@ export const createBlock = (nodeType, position, state, dispatch, attrs) => {
         dispatch(tr.setSelection(selection).scrollIntoView());
     }
 };
+export const undoFootnoteDelete = (tr, footnote, position) => {
+    const updatedAttrs = Object.assign(Object.assign({}, footnote.node.attrs), { dataTracked: null });
+    tr.setNodeMarkup(position, undefined, updatedAttrs, footnote.node.marks);
+};
 export const insertGeneralFootnote = (tableElementNode, position, view, tableElementFooter) => {
     const { state, dispatch } = view;
     const paragraph = state.schema.nodes.paragraph.create({
@@ -140,6 +144,11 @@ export const insertGeneralFootnote = (tableElementNode, position, view, tableEle
                 ? table.pos + table.node.nodeSize
                 : tableColGroup.pos + tableColGroup.node.nodeSize);
     if (tableElementFooter === null || tableElementFooter === void 0 ? void 0 : tableElementFooter.length) {
+        if (isDeleted(tableElementFooter[0].node) ||
+            isRejectedInsert(tableElementFooter[0].node)) {
+            const tableElementFooterPos = tr.mapping.map(position + tableElementFooter[0].pos + 1);
+            undoFootnoteDelete(tr, tableElementFooter[0], tableElementFooterPos);
+        }
         tr.insert(pos, generalNote);
     }
     else {
@@ -375,8 +384,10 @@ export const insertFootnote = (state, tr, footnote) => {
     else {
         const footnoteElement = findChildrenByType(footnotesSection.node, schema.nodes.footnotes_element).pop();
         if (footnoteElement) {
-            if (isDeleted(footnoteElement.node)) {
+            if (isDeleted(footnoteElement.node) ||
+                isRejectedInsert(footnoteElement.node)) {
                 const footnoteElementPos = footnotesSection.pos + footnoteElement.pos + 1;
+                undoFootnoteDelete(tr, footnoteElement, footnoteElementPos);
                 const updatedAttrs = Object.assign(Object.assign({}, footnoteElement.node.attrs), { dataTracked: null });
                 tr.setNodeMarkup(footnoteElementPos, undefined, updatedAttrs, footnoteElement.node.marks);
             }
@@ -959,9 +970,12 @@ export const insertTableFootnote = (tableElementNode, position, view, inlineFoot
     }
     let insertionPos = position;
     const footnotesElement = findChildrenByType(tableElementNode, schema.nodes.footnotes_element).pop();
-    if (footnotesElement &&
-        !isDeleted(footnotesElement.node) &&
-        !isRejectedInsert(footnotesElement.node)) {
+    if (footnotesElement) {
+        if (isDeleted(footnotesElement.node) ||
+            isRejectedInsert(footnotesElement.node)) {
+            const footnotesElementPos = tr.mapping.map(position + footnotesElement.pos + 1);
+            undoFootnoteDelete(tr, footnotesElement, footnotesElementPos);
+        }
         const footnotePos = getNewFootnotePos(footnotesElement, footnoteIndex);
         insertionPos = tr.mapping.map(position + footnotePos);
         tr.insert(insertionPos, footnote);
@@ -970,6 +984,11 @@ export const insertTableFootnote = (tableElementNode, position, view, inlineFoot
         const footnoteElement = state.schema.nodes.footnotes_element.create({}, footnote);
         const tableElementFooter = findChildrenByType(tableElementNode, schema.nodes.table_element_footer)[0];
         if (tableElementFooter) {
+            if (isDeleted(tableElementFooter.node) ||
+                isRejectedInsert(tableElementFooter.node)) {
+                const tableElementFooterPos = tr.mapping.map(position + tableElementFooter.pos + 1);
+                undoFootnoteDelete(tr, tableElementFooter, tableElementFooterPos);
+            }
             const pos = tableElementFooter.pos;
             insertionPos = position + pos + tableElementFooter.node.nodeSize;
             tr.insert(tr.mapping.map(insertionPos), footnoteElement);

package/dist/es/plugins/footnotes/widgets.js

@@ -21,7 +21,7 @@ import { createElement } from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 import { DeleteFootnoteDialog, } from '../../components/views/DeleteFootnoteDialog';
 import { getInlineFootnotes } from '../../lib/footnotes';
-import { getActualAttrs, isDeleted } from '../../lib/track-changes-utils';
+import { getActualAttrs } from '../../lib/track-changes-utils';
 import { getChildOfType } from '../../lib/utils';
 import ReactSubView from '../../views/ReactSubView';
 export const deleteFootnoteWidget = (node, props, id, tableElement, tableElementFooter) => (view, getPos) => {
@@ -54,11 +54,23 @@ export const deleteFootnoteWidget = (node, props, id, tableElement, tableElement
             if (node.type === schema.nodes.footnote && pos) {
                 const targetNode = tableElement ? tableElement.node : view.state.doc;
                 const inlineFootnotes = getInlineFootnotes(id, targetNode);
-                const footnote = findParentNodeClosestToPos(tr.doc.resolve(pos), (node) => node.type === schema.nodes.footnote);
-                if (footnote) {
-                    const { pos: fnPos, node: fnNode } = footnote;
+                const footnotesElement = findParentNodeClosestToPos(tr.doc.resolve(pos), (node) => node.type === schema.nodes.footnotes_element);
+                if ((footnotesElement === null || footnotesElement === void 0 ? void 0 : footnotesElement.node.childCount) === 1 &&
+                    (tableElementFooter === null || tableElementFooter === void 0 ? void 0 : tableElementFooter.node.childCount) === 1) {
+                    const { pos: fnPos, node: fnNode } = tableElementFooter;
                     tr.delete(fnPos, fnPos + fnNode.nodeSize + 1);
                 }
+                else if ((footnotesElement === null || footnotesElement === void 0 ? void 0 : footnotesElement.node.childCount) === 1) {
+                    const { pos: fnPos, node: fnNode } = footnotesElement;
+                    tr.delete(fnPos, fnPos + fnNode.nodeSize + 1);
+                }
+                else {
+                    const footnote = findParentNodeClosestToPos(tr.doc.resolve(pos), (node) => node.type === schema.nodes.footnote);
+                    if (footnote) {
+                        const { pos: fnPos, node: fnNode } = footnote;
+                        tr.delete(fnPos, fnPos + fnNode.nodeSize + 1);
+                    }
+                }
                 if (inlineFootnotes) {
                     inlineFootnotes.forEach((footnote) => {
                         const pos = footnote.pos + (tableElement ? tableElement.pos + 1 : 0);
@@ -73,24 +85,6 @@ export const deleteFootnoteWidget = (node, props, id, tableElement, tableElement
                 }
             }
             view.dispatch(tr);
-            if (pos) {
-                const footnotesElement = findParentNodeClosestToPos(view.state.doc.resolve(pos), (node) => node.type === schema.nodes.footnotes_element);
-                if (footnotesElement) {
-                    let allFootnotesDeleted = true;
-                    footnotesElement.node.descendants((child) => {
-                        if (child.type === schema.nodes.footnote && !isDeleted(child)) {
-                            allFootnotesDeleted = false;
-                            return false;
-                        }
-                    });
-                    if (allFootnotesDeleted) {
-                        const { pos: fnPos, node: fnNode } = footnotesElement;
-                        const tr2 = view.state.tr;
-                        tr2.delete(fnPos, fnPos + fnNode.nodeSize + 1);
-                        view.dispatch(tr2);
-                    }
-                }
-            }
         };
         const componentProps = {
             footnoteType: footnote.type,

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '2.2.4-LEAN-4013.0';
+export const VERSION = '2.2.4';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/types/commands.d.ts

@@ -27,6 +27,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) => void;
+export declare const undoFootnoteDelete: (tr: Transaction, footnote: NodeWithPos, position: number) => 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 insertTable: (config: TableConfig, state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;

package/dist/types/versions.d.ts

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