@manuscripts/body-editor 1.8.7-LEAN-3140.1 → 1.9.0

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

@@ -94,9 +94,9 @@ const updateTableInlineFootnoteLabels = (tr, table) => {
     return tr;
 };
 exports.updateTableInlineFootnoteLabels = updateTableInlineFootnoteLabels;
-const getInlineFootnotes = (id, targetNode) => {
+const getInlineFootnotes = (id, tableElement) => {
     const inlineFootnotes = [];
-    targetNode.descendants((node, pos) => {
+    tableElement.node.content.descendants((node, pos) => {
         var _a;
         if (node.type === transform_1.schema.nodes.inline_footnote) {
             const footnote = node;

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

@@ -73,20 +73,11 @@ const uncitedFootnoteWidget = () => () => {
     return element;
 };
 exports.uncitedFootnoteWidget = uncitedFootnoteWidget;
-const deleteFootnoteWidget = (node, props, id, tableElement) => (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;
-    const parentType = tableElement ? 'table ' : '';
-    const footnote = {
-        type: node.type === transform_1.schema.nodes.footnote
-            ? `${parentType}footnote`
-            : 'table general note',
-        message: node.type === transform_1.schema.nodes.footnote
-            ? `This action will entirely remove the ${parentType}footnote from the list because it will no longer be used.`
-            : 'This action will entirely remove the table general note.',
-    };
-    deleteBtn.addEventListener('mousedown', () => {
+    deleteBtn.addEventListener('click', () => {
         const handleDelete = () => {
             let tr = view.state.tr;
             const pos = getPos();
@@ -104,8 +95,7 @@ const deleteFootnoteWidget = (node, props, id, tableElement) => (view, getPos) =
                 }
             }
             if (node.type === transform_1.schema.nodes.footnote && pos) {
-                const targetNode = tableElement ? tableElement.node : view.state.doc;
-                const inlineFootnotes = (0, footnotes_utils_1.getInlineFootnotes)(id, targetNode);
+                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;
@@ -114,13 +104,13 @@ const deleteFootnoteWidget = (node, props, id, tableElement) => (view, getPos) =
                 if (inlineFootnotes) {
                     tr = view.state.tr;
                     inlineFootnotes.forEach((footnote) => {
-                        const pos = footnote.pos + (tableElement ? tableElement.pos + 1 : 0);
+                        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), tr.mapping.map(pos + footnote.node.nodeSize));
+                            tr.delete(tr.mapping.map(pos + 1), tr.mapping.map(pos + footnote.node.nodeSize + 1));
                         }
                     });
                 }
@@ -128,8 +118,8 @@ const deleteFootnoteWidget = (node, props, id, tableElement) => (view, getPos) =
             view.dispatch(tr);
         };
         const componentProps = {
-            footnoteType: footnote.type,
-            footnoteMessage: footnote.message,
+            footnoteType: footnoteType,
+            footnoteMessage: footnoteMessage,
             handleDelete: handleDelete,
         };
         (0, ReactSubView_1.default)(Object.assign(Object.assign({}, props), { dispatch: view.dispatch }), DeleteFootnoteDialog_1.DeleteFootnoteDialog, componentProps, node, () => getPos(), view);
@@ -168,30 +158,19 @@ exports.default = (props) => {
         props: {
             decorations: (state) => {
                 const decorations = [];
-                const tableElementFooter = (0, prosemirror_utils_1.findParentNodeOfType)(transform_1.schema.nodes.table_element_footer)(state.selection);
+                const isInTableElementFooter = (0, prosemirror_utils_1.hasParentNodeOfType)(transform_1.schema.nodes.table_element_footer)(state.selection);
                 const tableElement = (0, prosemirror_utils_1.findParentNodeOfType)(transform_1.schema.nodes.table_element)(state.selection);
-                const footnote = (0, prosemirror_utils_1.findParentNodeOfType)(transform_1.schema.nodes.footnote)(state.selection);
-                let targetNode;
-                if (footnote) {
-                    targetNode = footnote;
-                }
-                else if (tableElementFooter) {
-                    targetNode = tableElementFooter;
-                }
-                const can = props.getCapabilities();
-                if (targetNode && can.editArticle) {
+                if (isInTableElementFooter) {
                     const parent = (0, utils_1.findParentNodeWithIdValue)(state.selection);
                     if (parent) {
                         decorations.push(prosemirror_view_1.Decoration.node(parent.pos, parent.pos + parent.node.nodeSize, {
                             class: 'footnote-selected',
                         }));
-                        decorations.push(prosemirror_view_1.Decoration.widget(targetNode.pos + 2, deleteFootnoteWidget(targetNode.node, props, targetNode.node.attrs.id, tableElement), {
-                            key: targetNode.node.attrs.id,
-                        }));
                     }
                 }
                 const { labels } = exports.footnotesKey.getState(state);
                 let tableInlineFootnoteIds = undefined;
+                const can = props.getCapabilities();
                 state.doc.descendants((node, pos, parent) => {
                     var _a;
                     if ((0, transform_1.isFootnoteNode)(node)) {
@@ -212,6 +191,35 @@ exports.default = (props) => {
                             decorations.push(prosemirror_view_1.Decoration.widget(pos + node.nodeSize - 1, (0, exports.uncitedFootnoteWidget)()));
                         }
                     }
+                    if (can.editArticle) {
+                        if (tableElement) {
+                            const footnote = (() => {
+                                switch (node.type) {
+                                    case transform_1.schema.nodes.footnote:
+                                        return {
+                                            type: 'table footnote',
+                                            message: 'This action will entirely remove the table footnote from the list  because it will no longer be used.',
+                                        };
+                                    default:
+                                        return {
+                                            type: 'table general note',
+                                            message: 'This action will entirely remove the table general note.',
+                                        };
+                                }
+                            })();
+                            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, parent.attrs.id, tableElement), {
+                                    key: parent.attrs.id,
+                                }));
+                            }
+                        }
+                    }
                     if (node.type === transform_1.schema.nodes.footnotes_element) {
                         if ((parent === null || parent === void 0 ? void 0 : parent.type) === transform_1.schema.nodes.table_element_footer) {
                             decorations.push(prosemirror_view_1.Decoration.node(pos, pos + node.nodeSize, {

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

@@ -86,9 +86,9 @@ export const updateTableInlineFootnoteLabels = (tr, table) => {
     });
     return tr;
 };
-export const getInlineFootnotes = (id, targetNode) => {
+export const getInlineFootnotes = (id, tableElement) => {
     const inlineFootnotes = [];
-    targetNode.descendants((node, pos) => {
+    tableElement.node.content.descendants((node, pos) => {
         var _a;
         if (node.type === schema.nodes.inline_footnote) {
             const footnote = node;

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

@@ -16,7 +16,7 @@
 import { isFootnoteNode, isInlineFootnoteNode, schema, } from '@manuscripts/transform';
 import { isEqual } from 'lodash';
 import { NodeSelection, Plugin, PluginKey } from 'prosemirror-state';
-import { findParentNodeClosestToPos, findParentNodeOfType, } 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';
@@ -65,20 +65,11 @@ export const uncitedFootnoteWidget = () => () => {
     element.innerHTML = alertIcon;
     return element;
 };
-const deleteFootnoteWidget = (node, props, id, tableElement) => (view, getPos) => {
+const deleteFootnoteWidget = (node, props, footnoteType, footnoteMessage, id, tableElement) => (view, getPos) => {
     const deleteBtn = document.createElement('span');
     deleteBtn.className = 'delete-icon';
     deleteBtn.innerHTML = deleteIcon;
-    const parentType = tableElement ? 'table ' : '';
-    const footnote = {
-        type: node.type === schema.nodes.footnote
-            ? `${parentType}footnote`
-            : 'table general note',
-        message: node.type === schema.nodes.footnote
-            ? `This action will entirely remove the ${parentType}footnote from the list because it will no longer be used.`
-            : 'This action will entirely remove the table general note.',
-    };
-    deleteBtn.addEventListener('mousedown', () => {
+    deleteBtn.addEventListener('click', () => {
         const handleDelete = () => {
             let tr = view.state.tr;
             const pos = getPos();
@@ -96,8 +87,7 @@ const deleteFootnoteWidget = (node, props, id, tableElement) => (view, getPos) =
                 }
             }
             if (node.type === schema.nodes.footnote && pos) {
-                const targetNode = tableElement ? tableElement.node : view.state.doc;
-                const inlineFootnotes = getInlineFootnotes(id, targetNode);
+                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;
@@ -106,13 +96,13 @@ const deleteFootnoteWidget = (node, props, id, tableElement) => (view, getPos) =
                 if (inlineFootnotes) {
                     tr = view.state.tr;
                     inlineFootnotes.forEach((footnote) => {
-                        const pos = footnote.pos + (tableElement ? tableElement.pos + 1 : 0);
+                        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), tr.mapping.map(pos + footnote.node.nodeSize));
+                            tr.delete(tr.mapping.map(pos + 1), tr.mapping.map(pos + footnote.node.nodeSize + 1));
                         }
                     });
                 }
@@ -120,8 +110,8 @@ const deleteFootnoteWidget = (node, props, id, tableElement) => (view, getPos) =
             view.dispatch(tr);
         };
         const componentProps = {
-            footnoteType: footnote.type,
-            footnoteMessage: footnote.message,
+            footnoteType: footnoteType,
+            footnoteMessage: footnoteMessage,
             handleDelete: handleDelete,
         };
         ReactSubView(Object.assign(Object.assign({}, props), { dispatch: view.dispatch }), DeleteFootnoteDialog, componentProps, node, () => getPos(), view);
@@ -160,30 +150,19 @@ export default (props) => {
         props: {
             decorations: (state) => {
                 const decorations = [];
-                const tableElementFooter = findParentNodeOfType(schema.nodes.table_element_footer)(state.selection);
+                const isInTableElementFooter = hasParentNodeOfType(schema.nodes.table_element_footer)(state.selection);
                 const tableElement = findParentNodeOfType(schema.nodes.table_element)(state.selection);
-                const footnote = findParentNodeOfType(schema.nodes.footnote)(state.selection);
-                let targetNode;
-                if (footnote) {
-                    targetNode = footnote;
-                }
-                else if (tableElementFooter) {
-                    targetNode = tableElementFooter;
-                }
-                const can = props.getCapabilities();
-                if (targetNode && can.editArticle) {
+                if (isInTableElementFooter) {
                     const parent = findParentNodeWithIdValue(state.selection);
                     if (parent) {
                         decorations.push(Decoration.node(parent.pos, parent.pos + parent.node.nodeSize, {
                             class: 'footnote-selected',
                         }));
-                        decorations.push(Decoration.widget(targetNode.pos + 2, deleteFootnoteWidget(targetNode.node, props, targetNode.node.attrs.id, tableElement), {
-                            key: targetNode.node.attrs.id,
-                        }));
                     }
                 }
                 const { labels } = footnotesKey.getState(state);
                 let tableInlineFootnoteIds = undefined;
+                const can = props.getCapabilities();
                 state.doc.descendants((node, pos, parent) => {
                     var _a;
                     if (isFootnoteNode(node)) {
@@ -204,6 +183,35 @@ export default (props) => {
                             decorations.push(Decoration.widget(pos + node.nodeSize - 1, uncitedFootnoteWidget()));
                         }
                     }
+                    if (can.editArticle) {
+                        if (tableElement) {
+                            const footnote = (() => {
+                                switch (node.type) {
+                                    case schema.nodes.footnote:
+                                        return {
+                                            type: 'table footnote',
+                                            message: 'This action will entirely remove the table footnote from the list  because it will no longer be used.',
+                                        };
+                                    default:
+                                        return {
+                                            type: 'table general note',
+                                            message: 'This action will entirely remove the table general note.',
+                                        };
+                                }
+                            })();
+                            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, parent.attrs.id, tableElement), {
+                                    key: parent.attrs.id,
+                                }));
+                            }
+                        }
+                    }
                     if (node.type === schema.nodes.footnotes_element) {
                         if ((parent === null || parent === void 0 ? void 0 : parent.type) === schema.nodes.table_element_footer) {
                             decorations.push(Decoration.node(pos, pos + node.nodeSize, {

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

@@ -26,5 +26,5 @@ interface InlineFootnote {
     node: InlineFootnoteNode;
     pos: number;
 }
-export declare const getInlineFootnotes: (id: string, targetNode: ManuscriptNode) => InlineFootnote[];
+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.7-LEAN-3140.1",
+  "version": "1.9.0",
   "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.11.2",
+    "@manuscripts/style-guide": "1.12.0",
     "@manuscripts/track-changes-plugin": "1.7.10",
-    "@manuscripts/transform": "^2.2.1",
+    "@manuscripts/transform": "2.3.0",
     "astrocite-eutils": "^0.16.4",
     "axios": "^1.6.7",
     "mathjax-full": "^3.2.2",

package/styles/Editor.css

@@ -959,19 +959,18 @@
 .ProseMirror .table-footnotes-element {
   counter-reset: table_footnote;
 }
-.delete-icon {
+.table-footer .delete-icon {
+  display: none;
   position: absolute;
   right: -20px;
   top: -13px;
   cursor: pointer;
   z-index: 1;
 }
-.delete-icon:hover svg path {
+.table-footer .delete-icon:hover svg path {
   fill: #353535;
 }
-.ProseMirror .table-footnotes-element > div,
-.ProseMirror .block-footnotes_element > .block > div
- {
+.ProseMirror .table-footnotes-element > div {
   position: relative;
 }
 
@@ -991,25 +990,29 @@
   margin-top: 0px;
 }
 
-.ProseMirror .footnote-selected, .table-footer > div:has(> p.footnote-selected) > p  {
+.ProseMirror .table-footer .footnote-selected, .table-footer > div:has(> p.footnote-selected) > p  {
   background-color: #f2fbfc;
   padding: 4px;
 }
 
+.ProseMirror .table-footer .footnote-selected .delete-icon ,.ProseMirror .table-footer .footnote-selected .deleted.rejected .delete-icon {
+  display: block;
+}
 .table-footer > div > p {
   padding-bottom: 10px;
 }
 
-.ProseMirror .table-footnotes-element .footnote-selected,
-.ProseMirror .block-footnotes_element .footnote-selected
-{
+.ProseMirror .table-footnotes-element .footnote-selected {
   border: 1px solid #bce7f6;
 }
 .table-footer > div:has(> p.footnote-selected) > p {
   border-left: 1px solid #bce7f6;
   border-right: 1px solid #bce7f6;
 }
-
+.table-footer > div:has(> p.footnote-selected)  > p:first-child .delete-icon {
+  z-index: 2;
+  display: block;
+} 
 .table-footer > div:has(> p.footnote-selected) > p:first-child {
   border-top: 1px solid #bce7f6;
   position: relative;