@manuscripts/body-editor 2.7.48 → 2.7.49

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.7.48';
+exports.VERSION = '2.7.49';
 exports.MATHJAX_VERSION = '3.2.2';

package/dist/cjs/views/footnote.js

@@ -105,11 +105,11 @@ class FootnoteView extends base_node_view_1.BaseNodeView {
             const pos = tr.mapping.map(this.getPos());
             const $pos = tr.doc.resolve(pos);
             const element = (0, prosemirror_utils_1.findParentNodeOfTypeClosestToPos)($pos, transform_1.schema.nodes.footnotes_element);
-            if (element && getEffectiveChildCount(element.node) <= 1) {
-                tr.delete(element.pos, element.pos + element.node.nodeSize);
-            }
-            else {
-                tr.delete(pos, pos + this.node.nodeSize);
+            tr.delete(pos, pos + this.node.nodeSize);
+            if (element &&
+                getEffectiveChildCount(element.node) <= 1 &&
+                !(0, track_changes_utils_1.isPendingInsert)(this.node)) {
+                tr.delete(tr.mapping.map(element.pos), tr.mapping.map(element.pos + element.node.nodeSize));
             }
         };
     }
@@ -151,7 +151,7 @@ class FootnoteView extends base_node_view_1.BaseNodeView {
                 icon: 'Scroll',
             });
         }
-        if (can.editArticle) {
+        if (can.editArticle && !(0, track_changes_utils_1.isDeleted)(this.node)) {
             componentProps.actions.push({
                 label: 'Delete',
                 action: () => this.handleDelete(),

package/dist/cjs/views/general_table_footnote.js

@@ -62,15 +62,15 @@ class GeneralTableFootnoteView extends base_node_view_1.BaseNodeView {
             const pos = this.getPos();
             const $pos = this.view.state.doc.resolve(pos);
             const footer = (0, prosemirror_utils_1.findParentNodeOfTypeClosestToPos)($pos, transform_1.schema.nodes.table_element_footer);
-            const element = (0, prosemirror_utils_1.findChildrenByType)(footer.node, transform_1.schema.nodes.footnotes_element)[0];
+            const element = (0, prosemirror_utils_1.findChildrenByType)(footer.node, transform_1.schema.nodes.general_table_footnote)[0];
             if (element && !(0, track_changes_utils_1.isDeleted)(element.node)) {
-                const from = pos;
-                const to = from + this.node.nodeSize;
+                const from = tr.mapping.map(pos);
+                const to = tr.mapping.map(from + this.node.nodeSize);
                 tr.delete(from, to);
             }
-            else {
-                const from = footer.pos;
-                const to = from + footer.node.nodeSize;
+            if (footer.node.childCount <= 1 && !(0, track_changes_utils_1.isPendingInsert)(element.node)) {
+                const from = tr.mapping.map(footer.pos);
+                const to = tr.mapping.map(from + footer.node.nodeSize);
                 tr.delete(from, to);
             }
             this.view.dispatch(tr);
@@ -86,11 +86,13 @@ class GeneralTableFootnoteView extends base_node_view_1.BaseNodeView {
         const componentProps = {
             actions: [],
         };
-        componentProps.actions.push({
-            label: 'Delete',
-            action: () => this.handleDeleteClick(),
-            icon: 'Delete',
-        });
+        if (!(0, track_changes_utils_1.isDeleted)(this.node)) {
+            componentProps.actions.push({
+                label: 'Delete',
+                action: () => this.handleDeleteClick(),
+                icon: 'Delete',
+            });
+        }
         this.contextMenu = (0, ReactSubView_1.default)(this.props, style_guide_1.ContextMenu, componentProps, this.node, this.getPos, this.view, ['context-menu', 'footnote-context-menu']);
         this.props.popper.show(element, this.contextMenu, 'right-start');
     }

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '2.7.48';
+export const VERSION = '2.7.49';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/es/views/footnote.js

@@ -21,7 +21,7 @@ import { findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
 import { DeleteFootnoteDialog, } from '../components/views/DeleteFootnoteDialog';
 import { alertIcon } from '../icons';
 import { getFootnotesElementState } from '../lib/footnotes';
-import { isDeleted } from '../lib/track-changes-utils';
+import { isDeleted, isPendingInsert } from '../lib/track-changes-utils';
 import { BaseNodeView } from './base_node_view';
 import { createNodeView } from './creators';
 import ReactSubView from './ReactSubView';
@@ -99,11 +99,11 @@ export class FootnoteView extends BaseNodeView {
             const pos = tr.mapping.map(this.getPos());
             const $pos = tr.doc.resolve(pos);
             const element = findParentNodeOfTypeClosestToPos($pos, schema.nodes.footnotes_element);
-            if (element && getEffectiveChildCount(element.node) <= 1) {
-                tr.delete(element.pos, element.pos + element.node.nodeSize);
-            }
-            else {
-                tr.delete(pos, pos + this.node.nodeSize);
+            tr.delete(pos, pos + this.node.nodeSize);
+            if (element &&
+                getEffectiveChildCount(element.node) <= 1 &&
+                !isPendingInsert(this.node)) {
+                tr.delete(tr.mapping.map(element.pos), tr.mapping.map(element.pos + element.node.nodeSize));
             }
         };
     }
@@ -145,7 +145,7 @@ export class FootnoteView extends BaseNodeView {
                 icon: 'Scroll',
             });
         }
-        if (can.editArticle) {
+        if (can.editArticle && !isDeleted(this.node)) {
             componentProps.actions.push({
                 label: 'Delete',
                 action: () => this.handleDelete(),

package/dist/es/views/general_table_footnote.js

@@ -17,7 +17,7 @@ import { ContextMenu } from '@manuscripts/style-guide';
 import { schema } from '@manuscripts/transform';
 import { findChildrenByType, findParentNodeOfTypeClosestToPos, } from 'prosemirror-utils';
 import { DeleteFootnoteDialog, } from '../components/views/DeleteFootnoteDialog';
-import { isDeleted } from '../lib/track-changes-utils';
+import { isDeleted, isPendingInsert } from '../lib/track-changes-utils';
 import { BaseNodeView } from './base_node_view';
 import { createNodeView } from './creators';
 import ReactSubView from './ReactSubView';
@@ -56,15 +56,15 @@ export class GeneralTableFootnoteView extends BaseNodeView {
             const pos = this.getPos();
             const $pos = this.view.state.doc.resolve(pos);
             const footer = findParentNodeOfTypeClosestToPos($pos, schema.nodes.table_element_footer);
-            const element = findChildrenByType(footer.node, schema.nodes.footnotes_element)[0];
+            const element = findChildrenByType(footer.node, schema.nodes.general_table_footnote)[0];
             if (element && !isDeleted(element.node)) {
-                const from = pos;
-                const to = from + this.node.nodeSize;
+                const from = tr.mapping.map(pos);
+                const to = tr.mapping.map(from + this.node.nodeSize);
                 tr.delete(from, to);
             }
-            else {
-                const from = footer.pos;
-                const to = from + footer.node.nodeSize;
+            if (footer.node.childCount <= 1 && !isPendingInsert(element.node)) {
+                const from = tr.mapping.map(footer.pos);
+                const to = tr.mapping.map(from + footer.node.nodeSize);
                 tr.delete(from, to);
             }
             this.view.dispatch(tr);
@@ -80,11 +80,13 @@ export class GeneralTableFootnoteView extends BaseNodeView {
         const componentProps = {
             actions: [],
         };
-        componentProps.actions.push({
-            label: 'Delete',
-            action: () => this.handleDeleteClick(),
-            icon: 'Delete',
-        });
+        if (!isDeleted(this.node)) {
+            componentProps.actions.push({
+                label: 'Delete',
+                action: () => this.handleDeleteClick(),
+                icon: 'Delete',
+            });
+        }
         this.contextMenu = ReactSubView(this.props, ContextMenu, componentProps, this.node, this.getPos, this.view, ['context-menu', 'footnote-context-menu']);
         this.props.popper.show(element, this.contextMenu, 'right-start');
     }

package/dist/types/versions.d.ts

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

package/styles/Editor.css

@@ -1023,9 +1023,6 @@
 .ProseMirror .footnote .delete-icon {
   visibility: hidden;
 }
-.ProseMirror .footnote.footnote-selected .delete-icon {
-  visibility: visible;
-}
 .ProseMirror .footnote .scroll-icon {
   cursor: pointer;
   visibility: hidden;