@manuscripts/body-editor 3.10.8 → 3.10.9

package/dist/cjs/commands.js

@@ -778,16 +778,16 @@ const insertAffiliation = (state, dispatch, view) => {
     return true;
 };
 exports.insertAffiliation = insertAffiliation;
-const insertAward = (state, dispatch, view) => {
-    const award = transform_1.schema.nodes.award.create();
+const insertAward = (attrs) => (state, dispatch, view) => {
+    const award = transform_1.schema.nodes.award.create(attrs);
     const tr = state.tr;
     const awards = (0, doc_1.insertAwardsNode)(tr);
     const pos = awards.pos + awards.node.nodeSize - 1;
     tr.insert(pos, award);
     const selection = prosemirror_state_1.NodeSelection.create(tr.doc, pos);
-    view && view.focus();
-    if (dispatch) {
+    if (dispatch && view) {
         dispatch(tr.setSelection(selection).scrollIntoView());
+        view.focus();
     }
     return true;
 };

package/dist/cjs/components/awards/AwardModal.js

@@ -32,18 +32,25 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AwardModal = void 0;
+exports.openInsertAwardModal = exports.AwardModal = void 0;
 const style_guide_1 = require("@manuscripts/style-guide");
 const react_1 = __importStar(require("react"));
+const transform_1 = require("@manuscripts/transform");
+const ReactSubView_1 = __importDefault(require("../../views/ReactSubView"));
+const editor_props_1 = require("../../plugins/editor-props");
 const AwardForm_1 = require("./AwardForm");
+const commands_1 = require("../../commands");
 const normalizeData = (award) => ({
     id: award.id || '',
     source: award.source || '',
     code: award.code || '',
     recipient: award.recipient || '',
 });
-const AwardModal = ({ initialData, onSaveAward, onCancelAward, }) => {
+const AwardModal = ({ initialData, onSaveAward, }) => {
     const [isOpen, setOpen] = (0, react_1.useState)(true);
     const valuesRef = (0, react_1.useRef)(undefined);
     const handleSave = () => {
@@ -53,19 +60,29 @@ const AwardModal = ({ initialData, onSaveAward, onCancelAward, }) => {
             handleClose();
         }
     };
-    const handleCancel = () => {
-        onCancelAward && onCancelAward();
-        handleClose();
-    };
     const handleClose = () => setOpen(false);
     const handleChange = (values) => (valuesRef.current = values);
     const normalizedValues = react_1.default.useMemo(() => normalizeData(initialData), [initialData]);
-    return (react_1.default.createElement(style_guide_1.StyledModal, { isOpen: isOpen, onRequestClose: handleCancel, shouldCloseOnOverlayClick: true },
+    return (react_1.default.createElement(style_guide_1.StyledModal, { isOpen: isOpen, onRequestClose: handleClose, shouldCloseOnOverlayClick: true },
         react_1.default.createElement(style_guide_1.ModalContainer, { "data-cy": "award-modal" },
             react_1.default.createElement(style_guide_1.ModalHeader, null,
-                react_1.default.createElement(style_guide_1.CloseButton, { onClick: handleCancel, "data-cy": "modal-close-button" })),
+                react_1.default.createElement(style_guide_1.CloseButton, { onClick: handleClose, "data-cy": "modal-close-button" })),
             react_1.default.createElement(style_guide_1.ModalCardBody, { width: 480 },
                 react_1.default.createElement(style_guide_1.ModalTitle, null, "Add Funder information"),
-                react_1.default.createElement(AwardForm_1.AwardForm, { values: normalizedValues, onSave: handleSave, onCancel: handleCancel, onChange: handleChange })))));
+                react_1.default.createElement(AwardForm_1.AwardForm, { values: normalizedValues, onSave: handleSave, onCancel: handleClose, onChange: handleChange })))));
 };
 exports.AwardModal = AwardModal;
+const openInsertAwardModal = (view) => {
+    if (!view) {
+        return;
+    }
+    const { state, dispatch } = view;
+    const props = (0, editor_props_1.getEditorProps)(state);
+    const onSaveAward = (attrs) => {
+        (0, commands_1.insertAward)(attrs)(state, dispatch, view);
+    };
+    const initialData = transform_1.schema.nodes.award.create().attrs;
+    const dialog = (0, ReactSubView_1.default)(props, exports.AwardModal, { initialData, onSaveAward }, state.doc, () => 0, view);
+    document.body.appendChild(dialog);
+};
+exports.openInsertAwardModal = openInsertAwardModal;

package/dist/cjs/menus.js

@@ -27,6 +27,7 @@ const hierarchy_1 = require("./lib/hierarchy");
 const template_1 = require("./lib/template");
 const utils_1 = require("./lib/utils");
 const editor_props_1 = require("./plugins/editor-props");
+const AwardModal_1 = require("./components/awards/AwardModal");
 const getEditorMenus = (editor) => {
     const { isCommandValid, state, view } = editor;
     const doCommand = (command) => () => editor.doCommand(command);
@@ -562,8 +563,8 @@ const getEditorMenus = (editor) => {
             {
                 id: 'insert-awards',
                 label: 'Funder Information',
-                isEnabled: isCommandValid(commands_1.insertAward),
-                run: doCommand(commands_1.insertAward),
+                isEnabled: (0, utils_1.isEditAllowed)(state) && isCommandValid((0, commands_1.insertAward)()),
+                run: () => (0, AwardModal_1.openInsertAwardModal)(view),
                 isHidden: !(0, template_1.templateAllows)(state, transform_1.schema.nodes.awards),
             },
             {

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

package/dist/cjs/views/award.js

@@ -31,7 +31,6 @@ const ReactSubView_1 = __importDefault(require("./ReactSubView"));
 class AwardView extends block_view_1.default {
     constructor() {
         super(...arguments);
-        this.newAward = false;
         this.ignoreMutation = () => true;
         this.stopEvent = () => true;
         this.createAwardFragment = (className, title, content) => {
@@ -89,7 +88,6 @@ class AwardView extends block_view_1.default {
             const componentProps = {
                 initialData: award?.attrs || {},
                 onSaveAward: this.handleSaveAward,
-                onCancelAward: this.handleCancelAward,
             };
             this.popperContainer = (0, ReactSubView_1.default)(this.props, AwardModal_1.AwardModal, componentProps, this.node, this.getPos, this.view, ['award-editor']);
             this.props.popper.show(this.dom, this.popperContainer, 'auto', false);
@@ -105,11 +103,6 @@ class AwardView extends block_view_1.default {
         this.handleSaveAward = (award) => {
             (0, view_1.updateNodeAttrs)(this.view, transform_1.schema.nodes.award, award);
         };
-        this.handleCancelAward = () => {
-            if (this.newAward) {
-                this.handleDeleteAward();
-            }
-        };
         this.handleDeleteAward = () => {
             const award = this.node;
             const pos = this.getPos();
@@ -139,13 +132,6 @@ class AwardView extends block_view_1.default {
         this.contentDOM.appendChild(fragment);
         this.updateClasses();
     }
-    selectNode() {
-        super.selectNode();
-        if (!this.node.attrs.source) {
-            this.newAward = true;
-            this.showAwardModal(this.node);
-        }
-    }
 }
 exports.AwardView = AwardView;
 exports.default = (0, creators_1.createNodeView)(AwardView);

package/dist/es/commands.js

@@ -741,16 +741,16 @@ export const insertAffiliation = (state, dispatch, view) => {
     }
     return true;
 };
-export const insertAward = (state, dispatch, view) => {
-    const award = schema.nodes.award.create();
+export const insertAward = (attrs) => (state, dispatch, view) => {
+    const award = schema.nodes.award.create(attrs);
     const tr = state.tr;
     const awards = insertAwardsNode(tr);
     const pos = awards.pos + awards.node.nodeSize - 1;
     tr.insert(pos, award);
     const selection = NodeSelection.create(tr.doc, pos);
-    view && view.focus();
-    if (dispatch) {
+    if (dispatch && view) {
         dispatch(tr.setSelection(selection).scrollIntoView());
+        view.focus();
     }
     return true;
 };

package/dist/es/components/awards/AwardModal.js

@@ -1,13 +1,17 @@
 import { CloseButton, ModalCardBody, ModalContainer, ModalHeader, ModalTitle, StyledModal, } from '@manuscripts/style-guide';
 import React, { useRef, useState } from 'react';
+import { schema } from '@manuscripts/transform';
+import ReactSubView from '../../views/ReactSubView';
+import { getEditorProps } from '../../plugins/editor-props';
 import { AwardForm } from './AwardForm';
+import { insertAward } from '../../commands';
 const normalizeData = (award) => ({
     id: award.id || '',
     source: award.source || '',
     code: award.code || '',
     recipient: award.recipient || '',
 });
-export const AwardModal = ({ initialData, onSaveAward, onCancelAward, }) => {
+export const AwardModal = ({ initialData, onSaveAward, }) => {
     const [isOpen, setOpen] = useState(true);
     const valuesRef = useRef(undefined);
     const handleSave = () => {
@@ -17,18 +21,27 @@ export const AwardModal = ({ initialData, onSaveAward, onCancelAward, }) => {
             handleClose();
         }
     };
-    const handleCancel = () => {
-        onCancelAward && onCancelAward();
-        handleClose();
-    };
     const handleClose = () => setOpen(false);
     const handleChange = (values) => (valuesRef.current = values);
     const normalizedValues = React.useMemo(() => normalizeData(initialData), [initialData]);
-    return (React.createElement(StyledModal, { isOpen: isOpen, onRequestClose: handleCancel, shouldCloseOnOverlayClick: true },
+    return (React.createElement(StyledModal, { isOpen: isOpen, onRequestClose: handleClose, shouldCloseOnOverlayClick: true },
         React.createElement(ModalContainer, { "data-cy": "award-modal" },
             React.createElement(ModalHeader, null,
-                React.createElement(CloseButton, { onClick: handleCancel, "data-cy": "modal-close-button" })),
+                React.createElement(CloseButton, { onClick: handleClose, "data-cy": "modal-close-button" })),
             React.createElement(ModalCardBody, { width: 480 },
                 React.createElement(ModalTitle, null, "Add Funder information"),
-                React.createElement(AwardForm, { values: normalizedValues, onSave: handleSave, onCancel: handleCancel, onChange: handleChange })))));
+                React.createElement(AwardForm, { values: normalizedValues, onSave: handleSave, onCancel: handleClose, onChange: handleChange })))));
+};
+export const openInsertAwardModal = (view) => {
+    if (!view) {
+        return;
+    }
+    const { state, dispatch } = view;
+    const props = getEditorProps(state);
+    const onSaveAward = (attrs) => {
+        insertAward(attrs)(state, dispatch, view);
+    };
+    const initialData = schema.nodes.award.create().attrs;
+    const dialog = ReactSubView(props, AwardModal, { initialData, onSaveAward }, state.doc, () => 0, view);
+    document.body.appendChild(dialog);
 };

package/dist/es/menus.js

@@ -24,6 +24,7 @@ import { deleteClosestParentElement, findClosestParentElementNodeName, } from '.
 import { templateAllows } from './lib/template';
 import { isEditAllowed } from './lib/utils';
 import { getEditorProps } from './plugins/editor-props';
+import { openInsertAwardModal } from './components/awards/AwardModal';
 export const getEditorMenus = (editor) => {
     const { isCommandValid, state, view } = editor;
     const doCommand = (command) => () => editor.doCommand(command);
@@ -559,8 +560,8 @@ export const getEditorMenus = (editor) => {
             {
                 id: 'insert-awards',
                 label: 'Funder Information',
-                isEnabled: isCommandValid(insertAward),
-                run: doCommand(insertAward),
+                isEnabled: isEditAllowed(state) && isCommandValid(insertAward()),
+                run: () => openInsertAwardModal(view),
                 isHidden: !templateAllows(state, schema.nodes.awards),
             },
             {

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '3.10.8';
+export const VERSION = '3.10.9';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/es/views/award.js

@@ -25,7 +25,6 @@ import ReactSubView from './ReactSubView';
 export class AwardView extends BlockView {
     constructor() {
         super(...arguments);
-        this.newAward = false;
         this.ignoreMutation = () => true;
         this.stopEvent = () => true;
         this.createAwardFragment = (className, title, content) => {
@@ -83,7 +82,6 @@ export class AwardView extends BlockView {
             const componentProps = {
                 initialData: award?.attrs || {},
                 onSaveAward: this.handleSaveAward,
-                onCancelAward: this.handleCancelAward,
             };
             this.popperContainer = ReactSubView(this.props, AwardModal, componentProps, this.node, this.getPos, this.view, ['award-editor']);
             this.props.popper.show(this.dom, this.popperContainer, 'auto', false);
@@ -99,11 +97,6 @@ export class AwardView extends BlockView {
         this.handleSaveAward = (award) => {
             updateNodeAttrs(this.view, schema.nodes.award, award);
         };
-        this.handleCancelAward = () => {
-            if (this.newAward) {
-                this.handleDeleteAward();
-            }
-        };
         this.handleDeleteAward = () => {
             const award = this.node;
             const pos = this.getPos();
@@ -133,12 +126,5 @@ export class AwardView extends BlockView {
         this.contentDOM.appendChild(fragment);
         this.updateClasses();
     }
-    selectNode() {
-        super.selectNode();
-        if (!this.node.attrs.source) {
-            this.newAward = true;
-            this.showAwardModal(this.node);
-        }
-    }
 }
 export default createNodeView(AwardView);

package/dist/types/commands.d.ts

@@ -19,6 +19,7 @@ import { EditorState, Selection, Transaction } from 'prosemirror-state';
 import { EditorView } from 'prosemirror-view';
 import { FileAttachment } from './lib/files';
 import { EditorAction } from './types';
+import { AwardAttrs } from './views/award';
 export type Dispatch = (tr: ManuscriptTransaction) => void;
 export declare const addToStart: (state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;
 export declare const markActive: (type: ManuscriptMarkType) => (state: ManuscriptEditorState) => boolean;
@@ -56,7 +57,7 @@ export declare const insertBackmatterSection: (category: SectionCategory) => (st
 export declare const insertGraphicalAbstract: (category?: SectionCategory) => (state: ManuscriptEditorState, dispatch?: Dispatch, view?: EditorView) => boolean;
 export declare const insertContributors: (state: ManuscriptEditorState, dispatch?: Dispatch, view?: EditorView) => boolean;
 export declare const insertAffiliation: (state: ManuscriptEditorState, dispatch?: Dispatch, view?: EditorView) => boolean;
-export declare const insertAward: (state: ManuscriptEditorState, dispatch?: Dispatch, view?: EditorView) => boolean;
+export declare const insertAward: (attrs?: AwardAttrs) => (state: ManuscriptEditorState, dispatch?: Dispatch, view?: EditorView) => boolean;
 export declare const insertKeywords: (state: ManuscriptEditorState, dispatch?: Dispatch, view?: EditorView) => boolean;
 export declare const insertList: (type: ManuscriptNodeType, style?: string) => (state: ManuscriptEditorState, dispatch?: Dispatch, view?: EditorView) => boolean;
 export declare const insertBibliographySection: () => boolean;

package/dist/types/components/awards/AwardModal.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { EditorView } from 'prosemirror-view';
 import { AwardAttrs } from '../../views/award';
 export interface AwardFormData {
     id: string;
@@ -9,6 +10,6 @@ export interface AwardFormData {
 export interface AwardModalProps {
     initialData: AwardAttrs;
     onSaveAward: (data: AwardFormData) => void;
-    onCancelAward?: () => void;
 }
 export declare const AwardModal: React.FC<AwardModalProps>;
+export declare const openInsertAwardModal: (view?: EditorView) => void;

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "3.10.8";
+export declare const VERSION = "3.10.9";
 export declare const MATHJAX_VERSION = "3.2.2";

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

@@ -21,18 +21,15 @@ export declare class AwardView extends BlockView<Trackable<AwardNode>> {
     protected popperContainer: HTMLDivElement;
     private dialog;
     contextMenu: HTMLElement;
-    newAward: boolean;
     ignoreMutation: () => boolean;
     stopEvent: () => boolean;
     updateContents(): void;
-    selectNode(): void;
     private createAwardFragment;
     awardContextMenu: () => HTMLElement | undefined;
     actionGutterButtons: () => HTMLElement[];
     showAwardModal: (award: AwardNode) => void;
     showDeleteAwardDialog: () => void;
     handleSaveAward: (award: AwardAttrs) => void;
-    handleCancelAward: () => void;
     handleDeleteAward: () => void;
 }
 declare const _default: (props: import("../configs/ManuscriptsEditor").EditorProps, dispatch?: import("..").Dispatch) => import("../types").NodeViewCreator<AwardView>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "3.10.8",
+  "version": "3.10.9",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",