@manuscripts/body-editor 1.13.21 → 1.13.23

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

@@ -58,7 +58,7 @@ const uncitedFootnoteWidget = () => () => {
     return element;
 };
 exports.uncitedFootnoteWidget = uncitedFootnoteWidget;
-const deleteFootnoteWidget = (node, props, id, tableElement) => (view, getPos) => {
+const deleteFootnoteWidget = (node, props, id, tableElement, tableElementFooter) => (view, getPos) => {
     const deleteBtn = document.createElement('span');
     deleteBtn.className = 'delete-icon';
     deleteBtn.innerHTML = assets_1.deleteIcon;
@@ -75,17 +75,14 @@ const deleteFootnoteWidget = (node, props, id, tableElement) => (view, getPos) =
         const handleDelete = () => {
             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) &&
-                    pos) {
-                    tr.delete(pos - 1, pos + node.nodeSize);
+            if (node.type === transform_1.schema.nodes.general_table_footnote && pos) {
+                if (tableElementFooter &&
+                    !(0, utils_1.getChildOfType)(tableElementFooter.node, transform_1.schema.nodes.footnotes_element, true) &&
+                    tableElementFooter.pos) {
+                    tr.delete(tableElementFooter.pos - 1, tableElementFooter.pos + tableElementFooter.node.nodeSize);
                 }
                 else {
-                    node.content.forEach((item) => {
-                        if (item.type === transform_1.schema.nodes.general_table_footnote && pos) {
-                            tr.delete(pos - 1, pos + item.nodeSize + 1);
-                        }
-                    });
+                    tr.delete(pos - 1, pos + node.nodeSize + 1);
                 }
             }
             if (node.type === transform_1.schema.nodes.footnote && pos) {
@@ -237,27 +234,25 @@ 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 generalFootnote = (0, prosemirror_utils_1.findParentNodeOfType)(transform_1.schema.nodes.general_table_footnote)(state.selection);
                 const tableElement = (0, prosemirror_utils_1.findParentNodeOfType)(transform_1.schema.nodes.table_element)(state.selection);
+                const tableElementFooter = (0, prosemirror_utils_1.findParentNodeOfType)(transform_1.schema.nodes.table_element_footer)(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;
+                else if (generalFootnote) {
+                    targetNode = generalFootnote;
                 }
                 const can = props.getCapabilities();
-                if (targetNode && can.editArticle) {
-                    const parent = (0, utils_1.findParentNodeWithIdValue)(state.selection);
-                    if (parent && (0, commands_1.isTextSelection)(state.selection)) {
-                        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 + 1, deleteFootnoteWidget(targetNode.node, props, targetNode.node.attrs.id, tableElement), {
-                            key: targetNode.node.attrs.id,
-                        }));
-                    }
+                if (targetNode && can.editArticle && (0, commands_1.isTextSelection)(state.selection)) {
+                    decorations.push(prosemirror_view_1.Decoration.node(targetNode.pos, targetNode.pos + targetNode.node.nodeSize, {
+                        class: 'footnote-selected',
+                    }));
+                    decorations.push(prosemirror_view_1.Decoration.widget(targetNode.pos + 1, deleteFootnoteWidget(targetNode.node, props, targetNode.node.attrs.id, tableElement, tableElementFooter), {
+                        key: targetNode.node.attrs.id,
+                    }));
                 }
                 const { labels } = exports.footnotesKey.getState(state);
                 let tableInlineFootnoteIds = undefined;

package/dist/cjs/plugins/selected-suggestion.js

@@ -83,8 +83,8 @@ const buildNodeDecoration = (doc, selection) => {
     const from = selection.from;
     const to = selection.to;
     const inline = node.type === transform_1.schema.nodes.keyword || node.isInline;
-    const decoration = prosemirror_view_1.Decoration.node(from, to, {
-        nodeName: inline ? 'span' : 'div',
+    const decorationType = inline ? prosemirror_view_1.Decoration.inline : prosemirror_view_1.Decoration.node;
+    const decoration = decorationType(from, to, {
         class: 'selected-suggestion',
     });
     return {

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

@@ -22,7 +22,7 @@ import { Decoration, DecorationSet } from 'prosemirror-view';
 import { alertIcon, deleteIcon } from '../../assets';
 import { isTextSelection } from '../../commands';
 import { DeleteFootnoteDialog, } from '../../components/views/DeleteFootnoteDialog';
-import { findParentNodeWithIdValue, getChildOfType } from '../../lib/utils';
+import { getChildOfType } from '../../lib/utils';
 import ReactSubView from '../../views/ReactSubView';
 import { placeholderWidget } from '../placeholder';
 import { findTableInlineFootnoteIds, getAlphaOrderIndices, getInlineFootnotes, } from './footnotes-utils';
@@ -51,7 +51,7 @@ export const uncitedFootnoteWidget = () => () => {
     element.innerHTML = alertIcon;
     return element;
 };
-const deleteFootnoteWidget = (node, props, id, tableElement) => (view, getPos) => {
+const deleteFootnoteWidget = (node, props, id, tableElement, tableElementFooter) => (view, getPos) => {
     const deleteBtn = document.createElement('span');
     deleteBtn.className = 'delete-icon';
     deleteBtn.innerHTML = deleteIcon;
@@ -68,17 +68,14 @@ const deleteFootnoteWidget = (node, props, id, tableElement) => (view, getPos) =
         const handleDelete = () => {
             let tr = view.state.tr;
             const pos = getPos();
-            if (node.type === schema.nodes.table_element_footer) {
-                if (!getChildOfType(node, schema.nodes.footnotes_element, true) &&
-                    pos) {
-                    tr.delete(pos - 1, pos + node.nodeSize);
+            if (node.type === schema.nodes.general_table_footnote && pos) {
+                if (tableElementFooter &&
+                    !getChildOfType(tableElementFooter.node, schema.nodes.footnotes_element, true) &&
+                    tableElementFooter.pos) {
+                    tr.delete(tableElementFooter.pos - 1, tableElementFooter.pos + tableElementFooter.node.nodeSize);
                 }
                 else {
-                    node.content.forEach((item) => {
-                        if (item.type === schema.nodes.general_table_footnote && pos) {
-                            tr.delete(pos - 1, pos + item.nodeSize + 1);
-                        }
-                    });
+                    tr.delete(pos - 1, pos + node.nodeSize + 1);
                 }
             }
             if (node.type === schema.nodes.footnote && pos) {
@@ -229,27 +226,25 @@ export default (props) => {
         props: {
             decorations: (state) => {
                 const decorations = [];
-                const tableElementFooter = findParentNodeOfType(schema.nodes.table_element_footer)(state.selection);
+                const generalFootnote = findParentNodeOfType(schema.nodes.general_table_footnote)(state.selection);
                 const tableElement = findParentNodeOfType(schema.nodes.table_element)(state.selection);
+                const tableElementFooter = findParentNodeOfType(schema.nodes.table_element_footer)(state.selection);
                 const footnote = findParentNodeOfType(schema.nodes.footnote)(state.selection);
                 let targetNode;
                 if (footnote) {
                     targetNode = footnote;
                 }
-                else if (tableElementFooter) {
-                    targetNode = tableElementFooter;
+                else if (generalFootnote) {
+                    targetNode = generalFootnote;
                 }
                 const can = props.getCapabilities();
-                if (targetNode && can.editArticle) {
-                    const parent = findParentNodeWithIdValue(state.selection);
-                    if (parent && isTextSelection(state.selection)) {
-                        decorations.push(Decoration.node(parent.pos, parent.pos + parent.node.nodeSize, {
-                            class: 'footnote-selected',
-                        }));
-                        decorations.push(Decoration.widget(targetNode.pos + 1, deleteFootnoteWidget(targetNode.node, props, targetNode.node.attrs.id, tableElement), {
-                            key: targetNode.node.attrs.id,
-                        }));
-                    }
+                if (targetNode && can.editArticle && isTextSelection(state.selection)) {
+                    decorations.push(Decoration.node(targetNode.pos, targetNode.pos + targetNode.node.nodeSize, {
+                        class: 'footnote-selected',
+                    }));
+                    decorations.push(Decoration.widget(targetNode.pos + 1, deleteFootnoteWidget(targetNode.node, props, targetNode.node.attrs.id, tableElement, tableElementFooter), {
+                        key: targetNode.node.attrs.id,
+                    }));
                 }
                 const { labels } = footnotesKey.getState(state);
                 let tableInlineFootnoteIds = undefined;

package/dist/es/plugins/selected-suggestion.js

@@ -80,8 +80,8 @@ const buildNodeDecoration = (doc, selection) => {
     const from = selection.from;
     const to = selection.to;
     const inline = node.type === schema.nodes.keyword || node.isInline;
-    const decoration = Decoration.node(from, to, {
-        nodeName: inline ? 'span' : 'div',
+    const decorationType = inline ? Decoration.inline : Decoration.node;
+    const decoration = decorationType(from, to, {
         class: 'selected-suggestion',
     });
     return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "1.13.21",
+  "version": "1.13.23",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -30,9 +30,9 @@
     "@iarna/word-count": "^1.1.2",
     "@manuscripts/json-schema": "2.2.10",
     "@manuscripts/library": "1.3.10",
-    "@manuscripts/style-guide": "1.13.13",
+    "@manuscripts/style-guide": "1.13.15",
     "@manuscripts/track-changes-plugin": "1.7.14",
-    "@manuscripts/transform": "2.3.19",
+    "@manuscripts/transform": "2.3.21",
     "@popperjs/core": "^2.11.8",
     "astrocite-eutils": "^0.16.4",
     "codemirror": "^5.58.1",
@@ -110,4 +110,4 @@
     "@types/react": "^17.0.2",
     "prosemirror-tables": "^1.3.5"
   }
-}
+}

package/styles/AdvancedEditor.css

@@ -335,9 +335,9 @@ Next levels are shifted 'up' by 1
 }
 
 .ProseMirror .figure-block > figure {
-  border-color: #000 !important;
-  border-style: none !important;
-  border-width: 0pt !important;
+  border-color: #000;
+  border-style: none;
+  border-width: 0pt;
   position: relative;
   grid-column: 1/-1;
 }

package/styles/Editor.css

@@ -969,24 +969,23 @@
 .table-footer > div {
   position: relative;
 }
-
+.general-table-footnote, .table-footnotes-element div {
+  padding: 4px;
+}
 .general-table-footnote > p {
   padding-bottom: 8px;
 }
 
-.general-table-footnote:has(> p.footnote-selected) > p:last-child {
-  padding-bottom: 0;
-}
-
 .ProseMirror .table-footnotes-element .footnote-selected,
 .ProseMirror .block-footnotes_element .footnote-selected,
-.ProseMirror .general-table-footnote:has(> p.footnote-selected)
+.ProseMirror .general-table-footnote.footnote-selected
 {
   background-color: #f2fbfc;
-  padding: 4px;
   border: 1px solid #bce7f6;
 }
-
+.ProseMirror .table-footer .inserted.pending {
+  margin-bottom: 5px;
+}
 .ProseMirror .footnote-label {
   vertical-align: super;
   font-size: 75%;
@@ -1002,7 +1001,7 @@
   display: flex;
   position: absolute;
   margin-right: 4px;
-  top: 10%;
+  top: 15%;
   right: 100%;
 }
 
@@ -1028,4 +1027,4 @@
 }
 .highlight {
   background-color: #ffeebf !important;
-}
+}