@manuscripts/body-editor 2.0.10 → 2.0.11

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

package/dist/cjs/views/bibliography_element.js

@@ -73,7 +73,7 @@ class BibliographyElementBlockView extends block_view_1.default {
                 componentProps.actions.push({
                     label: 'Edit',
                     action: () => this.handleEdit(element.id),
-                    icon: 'EditIcon',
+                    icon: 'Edit',
                 });
             }
             componentProps.actions.push({

package/dist/cjs/views/citation_editable.js

@@ -77,11 +77,15 @@ class CitationEditableView extends citation_1.CitationView {
         };
         this.showContextMenu = () => {
             this.props.popper.destroy();
+            const can = this.props.getCapabilities();
+            const actions = [
+                { label: 'Comment', action: this.handleComment, icon: 'AddComment' },
+            ];
+            if (can.editArticle) {
+                actions.unshift({ label: 'Edit', action: this.handleEdit, icon: 'Edit' });
+            }
             const componentProps = {
-                actions: [
-                    { label: 'Edit', action: this.handleEdit, icon: 'EditIcon' },
-                    { label: 'Comment', action: this.handleComment, icon: 'AddComment' },
-                ],
+                actions,
             };
             this.contextMenu = (0, ReactSubView_1.default)(this.props, style_guide_1.ContextMenu, componentProps, this.node, this.getPos, this.view, 'context-menu');
             this.props.popper.show(this.dom, this.contextMenu, 'right-start', false);

package/dist/cjs/views/contributors.js

@@ -205,7 +205,7 @@ class ContributorsView extends block_view_1.default {
                     {
                         label: 'Edit',
                         action: () => this.handleEdit(element.id),
-                        icon: 'EditIcon',
+                        icon: 'Edit',
                     },
                 ],
             };

package/dist/cjs/views/inline_footnote.js

@@ -34,8 +34,23 @@ class InlineFootnoteView extends base_node_view_1.BaseNodeView {
     constructor() {
         super(...arguments);
         this.findParentTableElement = () => (0, prosemirror_utils_1.findParentNodeClosestToPos)(this.view.state.doc.resolve(this.getPos()), (node) => node.type === transform_1.schema.nodes.table_element);
+        this.showContextMenu = () => {
+            this.props.popper.destroy();
+            const componentProps = {
+                actions: [
+                    {
+                        label: 'Edit',
+                        action: () => {
+                            this.props.popper.destroy();
+                            this.activateGenericFnModal();
+                        },
+                        icon: 'Edit',
+                    },
+                ],
+            };
+            this.props.popper.show(this.dom, (0, ReactSubView_1.default)(this.props, style_guide_1.ContextMenu, componentProps, this.node, this.getPos, this.view, 'context-menu'), 'right-start', false);
+        };
         this.handleClick = () => {
-            var _a;
             if ((0, track_changes_utils_1.isDeleted)(this.node)) {
                 return;
             }
@@ -46,21 +61,59 @@ class InlineFootnoteView extends base_node_view_1.BaseNodeView {
                     onAdd: this.onAdd,
                 });
             }
-            else if (!this.activateGenericFnModal()) {
-                if ((_a = this.node.attrs.rids) === null || _a === void 0 ? void 0 : _a.length) {
-                    let nodePos = undefined;
-                    this.view.state.doc.descendants((node, pos) => {
-                        if (node.attrs.id === this.node.attrs.rids[0]) {
-                            nodePos = pos;
-                        }
-                    });
-                    if (nodePos && this.props.dispatch) {
-                        const sel = prosemirror_state_1.TextSelection.near(this.view.state.doc.resolve(nodePos + 1));
-                        this.props.dispatch(this.view.state.tr.setSelection(sel).scrollIntoView());
+            else {
+                this.showContextMenu();
+            }
+        };
+        this.scrollToReferenced = () => {
+            var _a;
+            if ((_a = this.node.attrs.rids) === null || _a === void 0 ? void 0 : _a.length) {
+                let nodePos = undefined;
+                this.view.state.doc.descendants((node, pos) => {
+                    if (node.attrs.id === this.node.attrs.rids[0]) {
+                        nodePos = pos;
                     }
+                });
+                if (nodePos && this.props.dispatch) {
+                    const sel = prosemirror_state_1.TextSelection.near(this.view.state.doc.resolve(nodePos + 1));
+                    this.props.dispatch(this.view.state.tr.setSelection(sel).scrollIntoView());
                 }
             }
         };
+        this.activateGenericFnModal = () => {
+            if (!this.props.getCapabilities().editArticle) {
+                return;
+            }
+            const fnState = footnotes_1.footnotesKey.getState(this.view.state);
+            console.log(fnState);
+            if (fnState) {
+                this.activateModal({
+                    notes: Array.from(fnState.unusedFootnotes.values()).map((n) => ({
+                        node: n[0],
+                    })),
+                    onCancel: () => {
+                        const { tr } = this.view.state;
+                        if (!this.node.attrs.rids.length) {
+                            this.view.dispatch(tr.delete(this.getPos(), this.getPos() + this.node.nodeSize));
+                        }
+                        this.destroy();
+                    },
+                    onAdd: () => {
+                        const footnote = (0, commands_1.createFootnote)(this.view.state, 'footnote');
+                        const tr = (0, commands_1.insertFootnote)(this.view.state, this.view.state.tr, footnote);
+                        tr.setNodeAttribute(tr.mapping.map(this.getPos()), 'rids', [
+                            footnote.attrs.id,
+                        ]);
+                        this.view.dispatch(tr);
+                        this.view.focus();
+                        this.destroy();
+                    },
+                    addNewLabel: 'Replace with new footnote',
+                });
+                return true;
+            }
+            return false;
+        };
         this.updateContents = () => {
             const attrs = this.node.attrs;
             this.dom.setAttribute('rids', attrs.rids.join(','));
@@ -154,39 +207,6 @@ class InlineFootnoteView extends base_node_view_1.BaseNodeView {
         this.popperContainer = (0, ReactSubView_1.default)(Object.assign(Object.assign({}, this.props), { dispatch: this.view.dispatch }), style_guide_1.FootnotesSelector, Object.assign(Object.assign({}, defaultModal), modalProps), this.node, this.getPos, this.view, 'footnote-editor');
         this.props.popper.show(this.dom, this.popperContainer, 'auto', false);
     }
-    activateGenericFnModal() {
-        if (!this.props.getCapabilities().editArticle) {
-            return;
-        }
-        const fnState = footnotes_1.footnotesKey.getState(this.view.state);
-        if (fnState && fnState.unusedFootnotes.size > 0) {
-            this.activateModal({
-                notes: Array.from(fnState.unusedFootnotes.values()).map((n) => ({
-                    node: n[0],
-                })),
-                onCancel: () => {
-                    const { tr } = this.view.state;
-                    if (!this.node.attrs.rids.length) {
-                        this.view.dispatch(tr.delete(this.getPos(), this.getPos() + this.node.nodeSize));
-                    }
-                    this.destroy();
-                },
-                onAdd: () => {
-                    const footnote = (0, commands_1.createFootnote)(this.view.state, 'footnote');
-                    const tr = (0, commands_1.insertFootnote)(this.view.state, this.view.state.tr, footnote);
-                    tr.setNodeAttribute(tr.mapping.map(this.getPos()), 'rids', [
-                        footnote.attrs.id,
-                    ]);
-                    this.view.dispatch(tr);
-                    this.view.focus();
-                    this.destroy();
-                },
-                addNewLabel: 'Replace with new footnote',
-            });
-            return true;
-        }
-        return false;
-    }
 }
 exports.InlineFootnoteView = InlineFootnoteView;
 exports.default = (0, creators_1.createNodeView)(InlineFootnoteView);

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '2.0.10';
+export const VERSION = '2.0.11';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/es/views/bibliography_element.js

@@ -67,7 +67,7 @@ export class BibliographyElementBlockView extends BlockView {
                 componentProps.actions.push({
                     label: 'Edit',
                     action: () => this.handleEdit(element.id),
-                    icon: 'EditIcon',
+                    icon: 'Edit',
                 });
             }
             componentProps.actions.push({

package/dist/es/views/citation_editable.js

@@ -71,11 +71,15 @@ export class CitationEditableView extends CitationView {
         };
         this.showContextMenu = () => {
             this.props.popper.destroy();
+            const can = this.props.getCapabilities();
+            const actions = [
+                { label: 'Comment', action: this.handleComment, icon: 'AddComment' },
+            ];
+            if (can.editArticle) {
+                actions.unshift({ label: 'Edit', action: this.handleEdit, icon: 'Edit' });
+            }
             const componentProps = {
-                actions: [
-                    { label: 'Edit', action: this.handleEdit, icon: 'EditIcon' },
-                    { label: 'Comment', action: this.handleComment, icon: 'AddComment' },
-                ],
+                actions,
             };
             this.contextMenu = ReactSubView(this.props, ContextMenu, componentProps, this.node, this.getPos, this.view, 'context-menu');
             this.props.popper.show(this.dom, this.contextMenu, 'right-start', false);

package/dist/es/views/contributors.js

@@ -199,7 +199,7 @@ export class ContributorsView extends BlockView {
                     {
                         label: 'Edit',
                         action: () => this.handleEdit(element.id),
-                        icon: 'EditIcon',
+                        icon: 'Edit',
                     },
                 ],
             };

package/dist/es/views/inline_footnote.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { FootnotesSelector } from '@manuscripts/style-guide';
+import { ContextMenu, FootnotesSelector, } from '@manuscripts/style-guide';
 import { schema, } from '@manuscripts/transform';
 import { NodeSelection, TextSelection } from 'prosemirror-state';
 import { findChildrenByType, findParentNodeClosestToPos, } from 'prosemirror-utils';
@@ -28,8 +28,23 @@ export class InlineFootnoteView extends BaseNodeView {
     constructor() {
         super(...arguments);
         this.findParentTableElement = () => findParentNodeClosestToPos(this.view.state.doc.resolve(this.getPos()), (node) => node.type === schema.nodes.table_element);
+        this.showContextMenu = () => {
+            this.props.popper.destroy();
+            const componentProps = {
+                actions: [
+                    {
+                        label: 'Edit',
+                        action: () => {
+                            this.props.popper.destroy();
+                            this.activateGenericFnModal();
+                        },
+                        icon: 'Edit',
+                    },
+                ],
+            };
+            this.props.popper.show(this.dom, ReactSubView(this.props, ContextMenu, componentProps, this.node, this.getPos, this.view, 'context-menu'), 'right-start', false);
+        };
         this.handleClick = () => {
-            var _a;
             if (isDeleted(this.node)) {
                 return;
             }
@@ -40,21 +55,59 @@ export class InlineFootnoteView extends BaseNodeView {
                     onAdd: this.onAdd,
                 });
             }
-            else if (!this.activateGenericFnModal()) {
-                if ((_a = this.node.attrs.rids) === null || _a === void 0 ? void 0 : _a.length) {
-                    let nodePos = undefined;
-                    this.view.state.doc.descendants((node, pos) => {
-                        if (node.attrs.id === this.node.attrs.rids[0]) {
-                            nodePos = pos;
-                        }
-                    });
-                    if (nodePos && this.props.dispatch) {
-                        const sel = TextSelection.near(this.view.state.doc.resolve(nodePos + 1));
-                        this.props.dispatch(this.view.state.tr.setSelection(sel).scrollIntoView());
+            else {
+                this.showContextMenu();
+            }
+        };
+        this.scrollToReferenced = () => {
+            var _a;
+            if ((_a = this.node.attrs.rids) === null || _a === void 0 ? void 0 : _a.length) {
+                let nodePos = undefined;
+                this.view.state.doc.descendants((node, pos) => {
+                    if (node.attrs.id === this.node.attrs.rids[0]) {
+                        nodePos = pos;
                     }
+                });
+                if (nodePos && this.props.dispatch) {
+                    const sel = TextSelection.near(this.view.state.doc.resolve(nodePos + 1));
+                    this.props.dispatch(this.view.state.tr.setSelection(sel).scrollIntoView());
                 }
             }
         };
+        this.activateGenericFnModal = () => {
+            if (!this.props.getCapabilities().editArticle) {
+                return;
+            }
+            const fnState = footnotesKey.getState(this.view.state);
+            console.log(fnState);
+            if (fnState) {
+                this.activateModal({
+                    notes: Array.from(fnState.unusedFootnotes.values()).map((n) => ({
+                        node: n[0],
+                    })),
+                    onCancel: () => {
+                        const { tr } = this.view.state;
+                        if (!this.node.attrs.rids.length) {
+                            this.view.dispatch(tr.delete(this.getPos(), this.getPos() + this.node.nodeSize));
+                        }
+                        this.destroy();
+                    },
+                    onAdd: () => {
+                        const footnote = createFootnote(this.view.state, 'footnote');
+                        const tr = insertFootnote(this.view.state, this.view.state.tr, footnote);
+                        tr.setNodeAttribute(tr.mapping.map(this.getPos()), 'rids', [
+                            footnote.attrs.id,
+                        ]);
+                        this.view.dispatch(tr);
+                        this.view.focus();
+                        this.destroy();
+                    },
+                    addNewLabel: 'Replace with new footnote',
+                });
+                return true;
+            }
+            return false;
+        };
         this.updateContents = () => {
             const attrs = this.node.attrs;
             this.dom.setAttribute('rids', attrs.rids.join(','));
@@ -148,38 +201,5 @@ export class InlineFootnoteView extends BaseNodeView {
         this.popperContainer = ReactSubView(Object.assign(Object.assign({}, this.props), { dispatch: this.view.dispatch }), FootnotesSelector, Object.assign(Object.assign({}, defaultModal), modalProps), this.node, this.getPos, this.view, 'footnote-editor');
         this.props.popper.show(this.dom, this.popperContainer, 'auto', false);
     }
-    activateGenericFnModal() {
-        if (!this.props.getCapabilities().editArticle) {
-            return;
-        }
-        const fnState = footnotesKey.getState(this.view.state);
-        if (fnState && fnState.unusedFootnotes.size > 0) {
-            this.activateModal({
-                notes: Array.from(fnState.unusedFootnotes.values()).map((n) => ({
-                    node: n[0],
-                })),
-                onCancel: () => {
-                    const { tr } = this.view.state;
-                    if (!this.node.attrs.rids.length) {
-                        this.view.dispatch(tr.delete(this.getPos(), this.getPos() + this.node.nodeSize));
-                    }
-                    this.destroy();
-                },
-                onAdd: () => {
-                    const footnote = createFootnote(this.view.state, 'footnote');
-                    const tr = insertFootnote(this.view.state, this.view.state.tr, footnote);
-                    tr.setNodeAttribute(tr.mapping.map(this.getPos()), 'rids', [
-                        footnote.attrs.id,
-                    ]);
-                    this.view.dispatch(tr);
-                    this.view.focus();
-                    this.destroy();
-                },
-                addNewLabel: 'Replace with new footnote',
-            });
-            return true;
-        }
-        return false;
-    }
 }
 export default createNodeView(InlineFootnoteView);

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.0.10";
+export declare const VERSION = "2.0.11";
 export declare const MATHJAX_VERSION = "3.2.2";

package/dist/types/views/inline_footnote.d.ts

@@ -27,9 +27,11 @@ export declare class InlineFootnoteView<PropsType extends InlineFootnoteProps &
     protected popperContainer: HTMLDivElement;
     isSelected(): boolean;
     findParentTableElement: () => ContentNodeWithPos | undefined;
+    showContextMenu: () => void;
     handleClick: () => void;
+    scrollToReferenced: () => void;
     activateModal(modalProps: Partial<ModalProps>): void;
-    activateGenericFnModal(): boolean | undefined;
+    activateGenericFnModal: () => boolean | undefined;
     updateContents: () => void;
     initialise: () => void;
     ignoreMutation: () => boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -32,7 +32,7 @@
     "@iarna/word-count": "^1.1.2",
     "@manuscripts/json-schema": "2.2.10",
     "@manuscripts/library": "1.3.10",
-    "@manuscripts/style-guide": "2.0.1",
+    "@manuscripts/style-guide": "2.0.2",
     "@manuscripts/track-changes-plugin": "1.7.17",
     "@manuscripts/transform": "2.3.21",
     "@popperjs/core": "^2.11.8",
@@ -116,4 +116,4 @@
   "engines": {
     "node": ">=20.16.0"
   }
-}
+}