@manuscripts/body-editor 1.8.0-LEAN-3354 → 1.8.1

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

@@ -199,6 +199,7 @@ class ContextMenu {
                             var _a;
                             const footnotesElementWithPos = (0, prosemirror_utils_1.findChildrenByType)(this.node, transform_1.schema.nodes.footnotes_element).pop();
                             if (!footnotesElementWithPos ||
+                                !(footnotesElementWithPos === null || footnotesElementWithPos === void 0 ? void 0 : footnotesElementWithPos.node.content.childCount) ||
                                 (0, track_changes_utils_1.isDeleted)(footnotesElementWithPos.node) ||
                                 (0, track_changes_utils_1.isRejectedInsert)(footnotesElementWithPos.node)) {
                                 (0, commands_1.insertTableFootnote)(this.node, this.getPos(), this.view);

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateTableInlineFootnoteLabels = exports.orderTableFootnotes = exports.buildTableFootnoteLabels = exports.getNewFootnotePos = exports.findTableInlineFootnoteIds = void 0;
+exports.getInlineFootnotes = exports.updateTableInlineFootnoteLabels = exports.orderTableFootnotes = exports.buildTableFootnoteLabels = exports.getNewFootnotePos = exports.findTableInlineFootnoteIds = void 0;
 const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_model_1 = require("prosemirror-model");
@@ -94,3 +94,17 @@ const updateTableInlineFootnoteLabels = (tr, table) => {
     return tr;
 };
 exports.updateTableInlineFootnoteLabels = updateTableInlineFootnoteLabels;
+const getInlineFootnotes = (id, tableElement) => {
+    const inlineFootnotes = [];
+    tableElement.node.content.descendants((node, pos) => {
+        var _a;
+        if (node.type === transform_1.schema.nodes.inline_footnote) {
+            const footnote = node;
+            if ((_a = footnote.attrs.rids) === null || _a === void 0 ? void 0 : _a.includes(id)) {
+                inlineFootnotes.push({ node: footnote, pos });
+            }
+        }
+    });
+    return inlineFootnotes;
+};
+exports.getInlineFootnotes = getInlineFootnotes;

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

@@ -73,13 +73,13 @@ const uncitedFootnoteWidget = () => () => {
     return element;
 };
 exports.uncitedFootnoteWidget = uncitedFootnoteWidget;
-const deleteFootnoteWidget = (node, props, footnoteType, footnoteMessage) => (view, getPos) => {
+const deleteFootnoteWidget = (node, props, footnoteType, footnoteMessage, id, tableElement) => (view, getPos) => {
     const deleteBtn = document.createElement('span');
     deleteBtn.className = 'delete-icon';
     deleteBtn.innerHTML = assets_1.deleteIcon;
     deleteBtn.addEventListener('click', () => {
         const handleDelete = () => {
-            const tr = view.state.tr;
+            let tr = view.state.tr;
             const pos = getPos();
             if (node.type === transform_1.schema.nodes.table_element_footer) {
                 if (!(0, utils_1.getChildOfType)(node, transform_1.schema.nodes.footnotes_element, true) &&
@@ -94,6 +94,27 @@ const deleteFootnoteWidget = (node, props, footnoteType, footnoteMessage) => (vi
                     });
                 }
             }
+            if (node.type === transform_1.schema.nodes.footnote && pos) {
+                const inlineFootnotes = (0, footnotes_utils_1.getInlineFootnotes)(id, tableElement);
+                const nodeWithPos = (0, prosemirror_utils_1.findParentNodeClosestToPos)(tr.doc.resolve(pos), (node) => node.type === transform_1.schema.nodes.footnote);
+                if (nodeWithPos) {
+                    const { pos: fnPos, node: fnNode } = nodeWithPos;
+                    view.dispatch(tr.delete(fnPos, fnPos + fnNode.nodeSize));
+                }
+                if (inlineFootnotes) {
+                    tr = view.state.tr;
+                    inlineFootnotes.forEach((footnote) => {
+                        const pos = footnote.pos + tableElement.pos;
+                        if (footnote.node.attrs.rids.length > 1) {
+                            const updatedRids = footnote.node.attrs.rids.filter((rid) => rid !== id);
+                            tr.setNodeMarkup(tr.mapping.map(pos + 1), undefined, Object.assign(Object.assign({}, node.attrs), { rids: updatedRids }));
+                        }
+                        else {
+                            tr.delete(tr.mapping.map(pos + 1), tr.mapping.map(pos + footnote.node.nodeSize + 1));
+                        }
+                    });
+                }
+            }
             view.dispatch(tr);
         };
         const componentProps = {
@@ -138,7 +159,7 @@ exports.default = (props) => {
             decorations: (state) => {
                 const decorations = [];
                 const isInTableElementFooter = (0, prosemirror_utils_1.hasParentNodeOfType)(transform_1.schema.nodes.table_element_footer)(state.selection);
-                const isInTableElement = (0, prosemirror_utils_1.hasParentNodeOfType)(transform_1.schema.nodes.table_element)(state.selection);
+                const tableElement = (0, prosemirror_utils_1.findParentNodeOfType)(transform_1.schema.nodes.table_element)(state.selection);
                 if (isInTableElementFooter) {
                     const parent = (0, utils_1.findParentNodeWithIdValue)(state.selection);
                     if (parent) {
@@ -171,7 +192,7 @@ exports.default = (props) => {
                         }
                     }
                     if (can.editArticle) {
-                        if (isInTableElement) {
+                        if (tableElement) {
                             const footnote = (() => {
                                 switch (node.type) {
                                     case transform_1.schema.nodes.footnote:
@@ -186,9 +207,14 @@ exports.default = (props) => {
                                         };
                                 }
                             })();
-                            if (node.type === transform_1.schema.nodes.paragraph &&
+                            if (node.type === transform_1.schema.nodes.footnote) {
+                                decorations.push(prosemirror_view_1.Decoration.widget(pos + 2, deleteFootnoteWidget(node, props, footnote.type, footnote.message, node.attrs.id, tableElement), {
+                                    key: node.attrs.id,
+                                }));
+                            }
+                            else if (node.type === transform_1.schema.nodes.paragraph &&
                                 (parent === null || parent === void 0 ? void 0 : parent.type) === transform_1.schema.nodes.table_element_footer) {
-                                decorations.push(prosemirror_view_1.Decoration.widget(pos + 1, deleteFootnoteWidget(parent, props, footnote.type, footnote.message), {
+                                decorations.push(prosemirror_view_1.Decoration.widget(pos + 1, deleteFootnoteWidget(parent, props, footnote.type, footnote.message, parent.attrs.id, tableElement), {
                                     key: parent.attrs.id,
                                 }));
                             }

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

@@ -192,6 +192,7 @@ export class ContextMenu {
                             var _a;
                             const footnotesElementWithPos = findChildrenByType(this.node, schema.nodes.footnotes_element).pop();
                             if (!footnotesElementWithPos ||
+                                !(footnotesElementWithPos === null || footnotesElementWithPos === void 0 ? void 0 : footnotesElementWithPos.node.content.childCount) ||
                                 isDeleted(footnotesElementWithPos.node) ||
                                 isRejectedInsert(footnotesElementWithPos.node)) {
                                 insertTableFootnote(this.node, this.getPos(), this.view);

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

@@ -86,3 +86,16 @@ export const updateTableInlineFootnoteLabels = (tr, table) => {
     });
     return tr;
 };
+export const getInlineFootnotes = (id, tableElement) => {
+    const inlineFootnotes = [];
+    tableElement.node.content.descendants((node, pos) => {
+        var _a;
+        if (node.type === schema.nodes.inline_footnote) {
+            const footnote = node;
+            if ((_a = footnote.attrs.rids) === null || _a === void 0 ? void 0 : _a.includes(id)) {
+                inlineFootnotes.push({ node: footnote, pos });
+            }
+        }
+    });
+    return inlineFootnotes;
+};

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

@@ -16,14 +16,14 @@
 import { isFootnoteNode, isInlineFootnoteNode, schema, } from '@manuscripts/transform';
 import { isEqual } from 'lodash';
 import { NodeSelection, Plugin, PluginKey } from 'prosemirror-state';
-import { hasParentNodeOfType } from 'prosemirror-utils';
+import { findParentNodeClosestToPos, findParentNodeOfType, hasParentNodeOfType, } from 'prosemirror-utils';
 import { Decoration, DecorationSet } from 'prosemirror-view';
 import { alertIcon, deleteIcon } from '../../assets';
 import { DeleteFootnoteDialog, } from '../../components/views/DeleteFootnoteDialog';
 import { findParentNodeWithIdValue, getChildOfType } from '../../lib/utils';
 import ReactSubView from '../../views/ReactSubView';
 import { placeholderWidget } from '../placeholder';
-import { findTableInlineFootnoteIds } from './footnotes-utils';
+import { findTableInlineFootnoteIds, getInlineFootnotes, } from './footnotes-utils';
 export const footnotesKey = new PluginKey('footnotes');
 export const buildPluginState = (doc) => {
     const nodes = [];
@@ -65,13 +65,13 @@ export const uncitedFootnoteWidget = () => () => {
     element.innerHTML = alertIcon;
     return element;
 };
-const deleteFootnoteWidget = (node, props, footnoteType, footnoteMessage) => (view, getPos) => {
+const deleteFootnoteWidget = (node, props, footnoteType, footnoteMessage, id, tableElement) => (view, getPos) => {
     const deleteBtn = document.createElement('span');
     deleteBtn.className = 'delete-icon';
     deleteBtn.innerHTML = deleteIcon;
     deleteBtn.addEventListener('click', () => {
         const handleDelete = () => {
-            const tr = view.state.tr;
+            let tr = view.state.tr;
             const pos = getPos();
             if (node.type === schema.nodes.table_element_footer) {
                 if (!getChildOfType(node, schema.nodes.footnotes_element, true) &&
@@ -86,6 +86,27 @@ const deleteFootnoteWidget = (node, props, footnoteType, footnoteMessage) => (vi
                     });
                 }
             }
+            if (node.type === schema.nodes.footnote && pos) {
+                const inlineFootnotes = getInlineFootnotes(id, tableElement);
+                const nodeWithPos = findParentNodeClosestToPos(tr.doc.resolve(pos), (node) => node.type === schema.nodes.footnote);
+                if (nodeWithPos) {
+                    const { pos: fnPos, node: fnNode } = nodeWithPos;
+                    view.dispatch(tr.delete(fnPos, fnPos + fnNode.nodeSize));
+                }
+                if (inlineFootnotes) {
+                    tr = view.state.tr;
+                    inlineFootnotes.forEach((footnote) => {
+                        const pos = footnote.pos + tableElement.pos;
+                        if (footnote.node.attrs.rids.length > 1) {
+                            const updatedRids = footnote.node.attrs.rids.filter((rid) => rid !== id);
+                            tr.setNodeMarkup(tr.mapping.map(pos + 1), undefined, Object.assign(Object.assign({}, node.attrs), { rids: updatedRids }));
+                        }
+                        else {
+                            tr.delete(tr.mapping.map(pos + 1), tr.mapping.map(pos + footnote.node.nodeSize + 1));
+                        }
+                    });
+                }
+            }
             view.dispatch(tr);
         };
         const componentProps = {
@@ -130,7 +151,7 @@ export default (props) => {
             decorations: (state) => {
                 const decorations = [];
                 const isInTableElementFooter = hasParentNodeOfType(schema.nodes.table_element_footer)(state.selection);
-                const isInTableElement = hasParentNodeOfType(schema.nodes.table_element)(state.selection);
+                const tableElement = findParentNodeOfType(schema.nodes.table_element)(state.selection);
                 if (isInTableElementFooter) {
                     const parent = findParentNodeWithIdValue(state.selection);
                     if (parent) {
@@ -163,7 +184,7 @@ export default (props) => {
                         }
                     }
                     if (can.editArticle) {
-                        if (isInTableElement) {
+                        if (tableElement) {
                             const footnote = (() => {
                                 switch (node.type) {
                                     case schema.nodes.footnote:
@@ -178,9 +199,14 @@ export default (props) => {
                                         };
                                 }
                             })();
-                            if (node.type === schema.nodes.paragraph &&
+                            if (node.type === schema.nodes.footnote) {
+                                decorations.push(Decoration.widget(pos + 2, deleteFootnoteWidget(node, props, footnote.type, footnote.message, node.attrs.id, tableElement), {
+                                    key: node.attrs.id,
+                                }));
+                            }
+                            else if (node.type === schema.nodes.paragraph &&
                                 (parent === null || parent === void 0 ? void 0 : parent.type) === schema.nodes.table_element_footer) {
-                                decorations.push(Decoration.widget(pos + 1, deleteFootnoteWidget(parent, props, footnote.type, footnote.message), {
+                                decorations.push(Decoration.widget(pos + 1, deleteFootnoteWidget(parent, props, footnote.type, footnote.message, parent.attrs.id, tableElement), {
                                     key: parent.attrs.id,
                                 }));
                             }

package/dist/types/plugins/footnotes/footnotes-utils.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ManuscriptNode } from '@manuscripts/transform';
+import { InlineFootnoteNode, ManuscriptNode } from '@manuscripts/transform';
 import { ResolvedPos } from 'prosemirror-model';
 import { Transaction } from 'prosemirror-state';
 import { ContentNodeWithPos, NodeWithPos } from 'prosemirror-utils';
@@ -22,3 +22,9 @@ export declare const getNewFootnotePos: (footnotesElement: NodeWithPos, footnote
 export declare const buildTableFootnoteLabels: (node: ManuscriptNode) => Map<string, string | undefined>;
 export declare const orderTableFootnotes: (tr: Transaction, footnotesElementWithPos: NodeWithPos, position: number) => Transaction;
 export declare const updateTableInlineFootnoteLabels: (tr: Transaction, table: ContentNodeWithPos) => Transaction;
+interface InlineFootnote {
+    node: InlineFootnoteNode;
+    pos: number;
+}
+export declare const getInlineFootnotes: (id: string, tableElement: NodeWithPos) => InlineFootnote[];
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "1.8.0-LEAN-3354",
+  "version": "1.8.1",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -32,7 +32,7 @@
     "@manuscripts/json-schema": "^2.2.7",
     "@manuscripts/library": "^1.3.6",
     "@manuscripts/style-guide": "1.11.1",
-    "@manuscripts/track-changes-plugin": "1.7.9-LEAN-3354",
+    "@manuscripts/track-changes-plugin": "1.7.9",
     "@manuscripts/transform": "2.2.0",
     "astrocite-eutils": "^0.16.4",
     "axios": "^1.6.7",
@@ -112,4 +112,4 @@
     "@types/react": "^17.0.2",
     "prosemirror-tables": "^1.3.5"
   }
-}
+}

package/styles/AdvancedEditor.css

@@ -723,7 +723,6 @@ Next levels are shifted 'up' by 1
   background: var(--accepted-bg-color);
   text-decoration: none;
 }
-
 .ProseMirror .deleted.pending::before,
 .ProseMirror .deleted.pending {
   background: var(--pending-bg-color);