@manuscripts/body-editor 3.12.8 → 3.12.10

package/dist/cjs/commands.js

@@ -37,6 +37,8 @@ const editor_props_1 = require("./plugins/editor-props");
 const search_replace_1 = require("./plugins/search-replace");
 const autocompletion_1 = require("./plugins/section_title/autocompletion");
 const persistent_cursor_1 = require("./plugins/persistent-cursor");
+const AffiliationsModal_1 = require("./components/affiliations/AffiliationsModal");
+const AuthorsModal_1 = require("./components/authors/AuthorsModal");
 const addToStart = (state, dispatch) => {
     const { selection } = state;
     const props = (0, editor_props_1.getEditorProps)(state);
@@ -745,10 +747,8 @@ const insertContributors = (state, dispatch, view) => {
     }
     if (dispatch) {
         const selection = prosemirror_state_1.NodeSelection.create(tr.doc, contributors.pos);
-        if (view) {
-            view.focus();
-        }
         dispatch(tr.setSelection(selection).scrollIntoView());
+        (0, AuthorsModal_1.openAuthorsModal)(contributors.pos, view);
     }
     return true;
 };
@@ -769,10 +769,8 @@ const insertAffiliation = (state, dispatch, view) => {
     }
     if (dispatch) {
         const selection = prosemirror_state_1.NodeSelection.create(tr.doc, affiliations.pos);
-        if (view) {
-            view.focus();
-        }
         dispatch(tr.setSelection(selection).scrollIntoView());
+        (0, AffiliationsModal_1.openAffiliationsModal)(affiliations.pos, view);
     }
     return true;
 };

package/dist/cjs/components/affiliations/AffiliationsModal.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AffiliationsModal = void 0;
+exports.handleUpdateAuthors = exports.handleDeleteAffiliation = exports.handleSaveAffiliation = exports.openAffiliationsModal = exports.AffiliationsModal = void 0;
 const style_guide_1 = require("@manuscripts/style-guide");
 const transform_1 = require("@manuscripts/transform");
 const lodash_1 = require("lodash");
@@ -54,13 +54,16 @@ const GenericDrawer_1 = require("../modal-drawer/GenericDrawer");
 const GenericDrawerGroup_1 = require("../modal-drawer/GenericDrawerGroup");
 const AffiliationForm_1 = require("./AffiliationForm");
 const AffiliationList_1 = require("./AffiliationList");
+const editor_props_1 = require("../../plugins/editor-props");
+const ReactSubView_1 = __importDefault(require("../../views/ReactSubView"));
+const view_1 = require("../../lib/view");
 function makeAuthorItems(authors) {
     return authors.map((author) => ({
         id: author.id,
         label: `${author.given} ${author.family}`,
     }));
 }
-const AffiliationsModal = ({ authors: $authors, affiliations: $affiliations, affiliation, onSaveAffiliation, onDeleteAffiliation, onUpdateAuthors, clearSelection, addNewAffiliation = false, }) => {
+const AffiliationsModal = ({ authors: $authors, affiliations: $affiliations, affiliation, onSaveAffiliation, onDeleteAffiliation, onUpdateAuthors, addNewAffiliation = false, }) => {
     const [isOpen, setIsOpen] = (0, react_1.useState)(true);
     const [selection, setSelection] = (0, react_1.useState)(affiliation);
     const [showingDeleteDialog, setShowDeleteDialog] = (0, react_1.useState)(false);
@@ -113,8 +116,8 @@ const AffiliationsModal = ({ authors: $authors, affiliations: $affiliations, aff
         }
         else {
             setIsOpen(false);
+            setSelection(undefined);
         }
-        clearSelection();
     };
     const handleSelect = (affiliation) => {
         const values = valuesRef.current;
@@ -441,3 +444,41 @@ const StyledModalSidebarHeader = (0, styled_components_1.default)(style_guide_1.
   margin-top: 8px;
   margin-bottom: 16px;
 `;
+const openAffiliationsModal = (pos, view) => {
+    if (!view) {
+        return;
+    }
+    const { state } = view;
+    const props = (0, editor_props_1.getEditorProps)(state);
+    const contributors = (0, view_1.findChildrenAttrsByType)(view, transform_1.schema.nodes.contributor);
+    const componentProps = {
+        affiliations: [],
+        authors: contributors,
+        onSaveAffiliation: (affiliation) => (0, exports.handleSaveAffiliation)(view, affiliation, pos),
+        onDeleteAffiliation: (affiliation) => (0, exports.handleDeleteAffiliation)(view, affiliation),
+        onUpdateAuthors: (authors) => (0, exports.handleUpdateAuthors)(view, authors),
+        addNewAffiliation: true,
+    };
+    const dialog = (0, ReactSubView_1.default)(props, exports.AffiliationsModal, componentProps, state.doc, () => pos, view);
+    view.focus();
+    document.body.appendChild(dialog);
+};
+exports.openAffiliationsModal = openAffiliationsModal;
+const handleSaveAffiliation = (view, affiliation, affiliationsPos) => {
+    const update = (0, view_1.updateNodeAttrs)(view, transform_1.schema.nodes.affiliation, affiliation);
+    if (!update) {
+        const node = transform_1.schema.nodes.affiliation.create(affiliation);
+        view.dispatch(view.state.tr.insert(affiliationsPos + 1, node));
+    }
+};
+exports.handleSaveAffiliation = handleSaveAffiliation;
+const handleDeleteAffiliation = (view, affiliation) => {
+    (0, view_1.deleteNode)(view, affiliation.id);
+};
+exports.handleDeleteAffiliation = handleDeleteAffiliation;
+const handleUpdateAuthors = (view, authors) => {
+    authors.forEach((author) => {
+        (0, view_1.updateNodeAttrs)(view, transform_1.schema.nodes.contributor, author);
+    });
+};
+exports.handleUpdateAuthors = handleUpdateAuthors;

package/dist/cjs/components/authors/AuthorsModal.js

@@ -51,7 +51,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AuthorsModal = exports.authorsReducer = void 0;
+exports.handleDeleteContributor = exports.handleSaveContributor = exports.openAuthorsModal = exports.AuthorsModal = exports.authorsReducer = void 0;
 const style_guide_1 = require("@manuscripts/style-guide");
 const transform_1 = require("@manuscripts/transform");
 const lodash_1 = require("lodash");
@@ -71,6 +71,9 @@ const AuthorList_1 = require("./AuthorList");
 const CreditDrawer_1 = require("./CreditDrawer");
 const useManageAffiliations_1 = require("./useManageAffiliations");
 const useManageCredit_1 = require("./useManageCredit");
+const editor_props_1 = require("../../plugins/editor-props");
+const ReactSubView_1 = __importDefault(require("../../views/ReactSubView"));
+const view_1 = require("../../lib/view");
 exports.authorsReducer = (0, array_reducer_1.arrayReducer)((a, b) => a.id === b.id);
 const AuthorsModal = ({ authors: $authors, affiliations: $affiliations, author, onSaveAuthor, onDeleteAuthor, addNewAuthor = false, }) => {
     const [isOpen, setOpen] = (0, react_1.useState)(true);
@@ -151,6 +154,7 @@ const AuthorsModal = ({ authors: $authors, affiliations: $affiliations, author,
             setShowRequiredFieldConfirmationDialog(false);
             setLastSavedAuthor(null);
             setOpen(false);
+            setSelection(undefined);
         }
     };
     const save = () => {
@@ -424,3 +428,34 @@ const StyledModalBody = (0, styled_components_1.default)(style_guide_1.ModalBody
 const StyledModalSidebarHeader = (0, styled_components_1.default)(style_guide_1.ModalSidebarHeader) `
   margin-bottom: 16px;
 `;
+const openAuthorsModal = (pos, view) => {
+    if (!view) {
+        return;
+    }
+    const { state } = view;
+    const props = (0, editor_props_1.getEditorProps)(state);
+    const affiliations = (0, view_1.findChildrenAttrsByType)(view, transform_1.schema.nodes.affiliation);
+    const componentProps = {
+        authors: [],
+        affiliations,
+        onSaveAuthor: (contributor) => (0, exports.handleSaveContributor)(view, contributor, pos),
+        onDeleteAuthor: (contributor) => (0, exports.handleDeleteContributor)(view, contributor),
+        addNewAuthor: true,
+    };
+    const dialog = (0, ReactSubView_1.default)(props, exports.AuthorsModal, componentProps, state.doc, () => pos, view);
+    view.focus();
+    document.body.appendChild(dialog);
+};
+exports.openAuthorsModal = openAuthorsModal;
+const handleSaveContributor = (view, contributor, contributorsPos) => {
+    const update = (0, view_1.updateNodeAttrs)(view, transform_1.schema.nodes.contributor, contributor);
+    if (!update) {
+        const node = transform_1.schema.nodes.contributor.create(contributor);
+        view.dispatch(view.state.tr.insert(contributorsPos + 1, node));
+    }
+};
+exports.handleSaveContributor = handleSaveContributor;
+const handleDeleteContributor = (view, contributor) => {
+    (0, view_1.deleteNode)(view, contributor.id);
+};
+exports.handleDeleteContributor = handleDeleteContributor;

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

package/dist/cjs/views/affiliations.js

@@ -56,21 +56,6 @@ class AffiliationsView extends block_view_1.default {
             tr.setSelection(prosemirror_state_1.NodeSelection.create(view.state.doc, pos));
             view.dispatch(tr);
         };
-        this.insertAffiliationNode = (attrs) => {
-            const pos = this.getPos();
-            const tr = this.view.state.tr;
-            const node = transform_1.schema.nodes.affiliation.create(attrs);
-            this.view.dispatch(tr.insert(pos + 1, node));
-        };
-        this.handleSaveAffiliation = (affiliation) => {
-            const update = (0, view_1.updateNodeAttrs)(this.view, transform_1.schema.nodes.affiliation, affiliation);
-            if (!update) {
-                this.insertAffiliationNode(affiliation);
-            }
-        };
-        this.handleDeleteAffiliation = (affiliation) => {
-            (0, view_1.deleteNode)(this.view, affiliation.id);
-        };
         this.handleEdit = (id, addNew) => {
             this.props.popper.destroy();
             const contributors = (0, view_1.findChildrenAttrsByType)(this.view, transform_1.schema.nodes.contributor);
@@ -82,11 +67,10 @@ class AffiliationsView extends block_view_1.default {
                 affiliation,
                 authors: contributors,
                 affiliations,
-                onSaveAffiliation: this.handleSaveAffiliation,
-                onDeleteAffiliation: this.handleDeleteAffiliation,
-                onUpdateAuthors: this.handleUpdateAuthors,
+                onSaveAffiliation: (affiliation) => (0, AffiliationsModal_1.handleSaveAffiliation)(this.view, affiliation, this.getPos()),
+                onDeleteAffiliation: (affiliation) => (0, AffiliationsModal_1.handleDeleteAffiliation)(this.view, affiliation),
+                onUpdateAuthors: (authors) => (0, AffiliationsModal_1.handleUpdateAuthors)(this.view, authors),
                 addNewAffiliation: addNew,
-                clearSelection: this.clearSelection,
             };
             this.popper?.remove();
             this.popper = (0, ReactSubView_1.default)(this.props, AffiliationsModal_1.AffiliationsModal, componentProps, this.node, this.getPos, this.view);
@@ -137,22 +121,6 @@ class AffiliationsView extends block_view_1.default {
             const contextMenu = this.showGroupContextMenu();
             return contextMenu ? [contextMenu] : [];
         };
-        this.selectNode = () => {
-            const selectedMarker = document.querySelector('.comment-marker.selected-comment');
-            this.dom.classList.add('ProseMirror-selectednode');
-            if (!(0, track_changes_plugin_1.isDeleted)(this.node) && !selectedMarker) {
-                this.handleEdit('', true);
-            }
-        };
-        this.clearSelection = () => {
-            const { state, dispatch } = this.view;
-            dispatch(state.tr.setSelection(prosemirror_state_1.Selection.atStart(state.doc)));
-        };
-        this.handleUpdateAuthors = (authors) => {
-            authors.forEach((author) => {
-                (0, view_1.updateNodeAttrs)(this.view, transform_1.schema.nodes.contributor, author);
-            });
-        };
     }
     createElement() {
         this.container = document.createElement('div');

package/dist/cjs/views/contributors.js

@@ -27,7 +27,6 @@ const AuthorsModal_1 = require("../components/authors/AuthorsModal");
 const authors_1 = require("../lib/authors");
 const comments_1 = require("../lib/comments");
 const navigation_utils_1 = require("../lib/navigation-utils");
-const utils_1 = require("../lib/utils");
 const view_1 = require("../lib/view");
 const affiliations_1 = require("../plugins/affiliations");
 const selected_suggestion_1 = require("../plugins/selected-suggestion");
@@ -40,13 +39,6 @@ class ContributorsView extends block_view_1.default {
         super(...arguments);
         this.ignoreMutation = () => true;
         this.stopEvent = () => true;
-        this.selectNode = () => {
-            const selectedMarker = document.querySelector('.comment-marker.selected-comment');
-            this.dom.classList.add('ProseMirror-selectednode');
-            if (!(0, track_changes_plugin_1.isDeleted)(this.node) && !selectedMarker) {
-                this.handleEdit('', true);
-            }
-        };
         this.buildAuthors = (affs) => {
             const wrapper = document.createElement('div');
             wrapper.classList.add('contributors-list');
@@ -230,46 +222,14 @@ class ContributorsView extends block_view_1.default {
                 author,
                 authors: contributors,
                 affiliations,
-                onSaveAuthor: this.handleSaveAuthor,
-                onDeleteAuthor: this.handleDeleteAuthor,
+                onSaveAuthor: (contributor) => (0, AuthorsModal_1.handleSaveContributor)(this.view, contributor, this.getPos()),
+                onDeleteAuthor: (contributor) => (0, AuthorsModal_1.handleDeleteContributor)(this.view, contributor),
                 addNewAuthor: addNew,
             };
             this.popper?.remove();
             this.popper = (0, ReactSubView_1.default)(this.props, AuthorsModal_1.AuthorsModal, componentProps, this.node, this.getPos, this.view);
             this.container.appendChild(this.popper);
         };
-        this.handleSaveAuthor = (author) => {
-            const update = (0, view_1.updateNodeAttrs)(this.view, transform_1.schema.nodes.contributor, author);
-            if (!update) {
-                this.insertAuthorNode(author);
-            }
-        };
-        this.handleDeleteAuthor = (author) => {
-            (0, view_1.deleteNode)(this.view, author.id);
-        };
-        this.insertAuthorNode = (attrs) => {
-            const parent = (0, view_1.findChildByType)(this.view, transform_1.schema.nodes.contributors);
-            const tr = this.view.state.tr;
-            const node = transform_1.schema.nodes.contributor.create(attrs);
-            this.view.dispatch(tr.insert(parent.pos + 1, node));
-        };
-        this.insertAffiliationNode = (attrs) => {
-            const { view } = this;
-            const { dispatch } = view;
-            const affiliationsNodeType = transform_1.schema.nodes.affiliations;
-            let affiliations = (0, view_1.findChildByType)(view, affiliationsNodeType);
-            if (!affiliations) {
-                const { tr } = this.view.state;
-                const insertPos = (0, utils_1.findInsertionPosition)(transform_1.schema.nodes.affiliations, view.state.doc);
-                dispatch(tr.insert(insertPos, transform_1.schema.nodes.affiliations.create()));
-                affiliations = (0, view_1.findChildByType)(view, affiliationsNodeType);
-            }
-            if (affiliations) {
-                const { tr } = this.view.state;
-                const affiliationNode = transform_1.schema.nodes.affiliation.create(attrs);
-                dispatch(tr.insert(affiliations.pos + 1, affiliationNode));
-            }
-        };
     }
     updateContents() {
         super.updateContents();

package/dist/es/commands.js

@@ -33,6 +33,8 @@ import { getEditorProps } from './plugins/editor-props';
 import { searchReplaceKey } from './plugins/search-replace';
 import { checkForCompletion } from './plugins/section_title/autocompletion';
 import { persistentCursor } from './plugins/persistent-cursor';
+import { openAffiliationsModal } from './components/affiliations/AffiliationsModal';
+import { openAuthorsModal } from './components/authors/AuthorsModal';
 export const addToStart = (state, dispatch) => {
     const { selection } = state;
     const props = getEditorProps(state);
@@ -710,10 +712,8 @@ export const insertContributors = (state, dispatch, view) => {
     }
     if (dispatch) {
         const selection = NodeSelection.create(tr.doc, contributors.pos);
-        if (view) {
-            view.focus();
-        }
         dispatch(tr.setSelection(selection).scrollIntoView());
+        openAuthorsModal(contributors.pos, view);
     }
     return true;
 };
@@ -733,10 +733,8 @@ export const insertAffiliation = (state, dispatch, view) => {
     }
     if (dispatch) {
         const selection = NodeSelection.create(tr.doc, affiliations.pos);
-        if (view) {
-            view.focus();
-        }
         dispatch(tr.setSelection(selection).scrollIntoView());
+        openAffiliationsModal(affiliations.pos, view);
     }
     return true;
 };

package/dist/es/components/affiliations/AffiliationsModal.js

@@ -15,13 +15,16 @@ import { GenericDrawer } from '../modal-drawer/GenericDrawer';
 import { DrawerGroup } from '../modal-drawer/GenericDrawerGroup';
 import { AffiliationForm } from './AffiliationForm';
 import { AffiliationList } from './AffiliationList';
+import { getEditorProps } from '../../plugins/editor-props';
+import ReactSubView from '../../views/ReactSubView';
+import { deleteNode, findChildrenAttrsByType, updateNodeAttrs, } from '../../lib/view';
 function makeAuthorItems(authors) {
     return authors.map((author) => ({
         id: author.id,
         label: `${author.given} ${author.family}`,
     }));
 }
-export const AffiliationsModal = ({ authors: $authors, affiliations: $affiliations, affiliation, onSaveAffiliation, onDeleteAffiliation, onUpdateAuthors, clearSelection, addNewAffiliation = false, }) => {
+export const AffiliationsModal = ({ authors: $authors, affiliations: $affiliations, affiliation, onSaveAffiliation, onDeleteAffiliation, onUpdateAuthors, addNewAffiliation = false, }) => {
     const [isOpen, setIsOpen] = useState(true);
     const [selection, setSelection] = useState(affiliation);
     const [showingDeleteDialog, setShowDeleteDialog] = useState(false);
@@ -74,8 +77,8 @@ export const AffiliationsModal = ({ authors: $authors, affiliations: $affiliatio
         }
         else {
             setIsOpen(false);
+            setSelection(undefined);
         }
-        clearSelection();
     };
     const handleSelect = (affiliation) => {
         const values = valuesRef.current;
@@ -401,3 +404,37 @@ const StyledModalSidebarHeader = styled(ModalSidebarHeader) `
   margin-top: 8px;
   margin-bottom: 16px;
 `;
+export const openAffiliationsModal = (pos, view) => {
+    if (!view) {
+        return;
+    }
+    const { state } = view;
+    const props = getEditorProps(state);
+    const contributors = findChildrenAttrsByType(view, schema.nodes.contributor);
+    const componentProps = {
+        affiliations: [],
+        authors: contributors,
+        onSaveAffiliation: (affiliation) => handleSaveAffiliation(view, affiliation, pos),
+        onDeleteAffiliation: (affiliation) => handleDeleteAffiliation(view, affiliation),
+        onUpdateAuthors: (authors) => handleUpdateAuthors(view, authors),
+        addNewAffiliation: true,
+    };
+    const dialog = ReactSubView(props, AffiliationsModal, componentProps, state.doc, () => pos, view);
+    view.focus();
+    document.body.appendChild(dialog);
+};
+export const handleSaveAffiliation = (view, affiliation, affiliationsPos) => {
+    const update = updateNodeAttrs(view, schema.nodes.affiliation, affiliation);
+    if (!update) {
+        const node = schema.nodes.affiliation.create(affiliation);
+        view.dispatch(view.state.tr.insert(affiliationsPos + 1, node));
+    }
+};
+export const handleDeleteAffiliation = (view, affiliation) => {
+    deleteNode(view, affiliation.id);
+};
+export const handleUpdateAuthors = (view, authors) => {
+    authors.forEach((author) => {
+        updateNodeAttrs(view, schema.nodes.contributor, author);
+    });
+};

package/dist/es/components/authors/AuthorsModal.js

@@ -32,6 +32,9 @@ import { AuthorList } from './AuthorList';
 import { CreditDrawer } from './CreditDrawer';
 import { useManageAffiliations } from './useManageAffiliations';
 import { useManageCredit } from './useManageCredit';
+import { getEditorProps } from '../../plugins/editor-props';
+import ReactSubView from '../../views/ReactSubView';
+import { deleteNode, findChildrenAttrsByType, updateNodeAttrs, } from '../../lib/view';
 export const authorsReducer = arrayReducer((a, b) => a.id === b.id);
 export const AuthorsModal = ({ authors: $authors, affiliations: $affiliations, author, onSaveAuthor, onDeleteAuthor, addNewAuthor = false, }) => {
     const [isOpen, setOpen] = useState(true);
@@ -112,6 +115,7 @@ export const AuthorsModal = ({ authors: $authors, affiliations: $affiliations, a
             setShowRequiredFieldConfirmationDialog(false);
             setLastSavedAuthor(null);
             setOpen(false);
+            setSelection(undefined);
         }
     };
     const save = () => {
@@ -384,3 +388,31 @@ const StyledModalBody = styled(ModalBody) `
 const StyledModalSidebarHeader = styled(ModalSidebarHeader) `
   margin-bottom: 16px;
 `;
+export const openAuthorsModal = (pos, view) => {
+    if (!view) {
+        return;
+    }
+    const { state } = view;
+    const props = getEditorProps(state);
+    const affiliations = findChildrenAttrsByType(view, schema.nodes.affiliation);
+    const componentProps = {
+        authors: [],
+        affiliations,
+        onSaveAuthor: (contributor) => handleSaveContributor(view, contributor, pos),
+        onDeleteAuthor: (contributor) => handleDeleteContributor(view, contributor),
+        addNewAuthor: true,
+    };
+    const dialog = ReactSubView(props, AuthorsModal, componentProps, state.doc, () => pos, view);
+    view.focus();
+    document.body.appendChild(dialog);
+};
+export const handleSaveContributor = (view, contributor, contributorsPos) => {
+    const update = updateNodeAttrs(view, schema.nodes.contributor, contributor);
+    if (!update) {
+        const node = schema.nodes.contributor.create(contributor);
+        view.dispatch(view.state.tr.insert(contributorsPos + 1, node));
+    }
+};
+export const handleDeleteContributor = (view, contributor) => {
+    deleteNode(view, contributor.id);
+};

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '3.12.8';
+export const VERSION = '3.12.10';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/es/views/affiliations.js

@@ -16,12 +16,12 @@
 import { ContextMenu } from '@manuscripts/style-guide';
 import { addTrackChangesAttributes, isDeleted, } from '@manuscripts/track-changes-plugin';
 import { schema } from '@manuscripts/transform';
-import { NodeSelection, Selection } from 'prosemirror-state';
-import { AffiliationsModal, } from '../components/affiliations/AffiliationsModal';
+import { NodeSelection } from 'prosemirror-state';
+import { AffiliationsModal, handleDeleteAffiliation, handleSaveAffiliation, handleUpdateAuthors, } from '../components/affiliations/AffiliationsModal';
 import { alertIcon } from '../icons';
 import { affiliationName, } from '../lib/authors';
 import { handleComment } from '../lib/comments';
-import { deleteNode, findChildByID, findChildrenAttrsByType, updateNodeAttrs, } from '../lib/view';
+import { findChildByID, findChildrenAttrsByType, } from '../lib/view';
 import { affiliationsKey } from '../plugins/affiliations';
 import { selectedSuggestionKey } from '../plugins/selected-suggestion';
 import BlockView from './block_view';
@@ -50,21 +50,6 @@ export class AffiliationsView extends BlockView {
             tr.setSelection(NodeSelection.create(view.state.doc, pos));
             view.dispatch(tr);
         };
-        this.insertAffiliationNode = (attrs) => {
-            const pos = this.getPos();
-            const tr = this.view.state.tr;
-            const node = schema.nodes.affiliation.create(attrs);
-            this.view.dispatch(tr.insert(pos + 1, node));
-        };
-        this.handleSaveAffiliation = (affiliation) => {
-            const update = updateNodeAttrs(this.view, schema.nodes.affiliation, affiliation);
-            if (!update) {
-                this.insertAffiliationNode(affiliation);
-            }
-        };
-        this.handleDeleteAffiliation = (affiliation) => {
-            deleteNode(this.view, affiliation.id);
-        };
         this.handleEdit = (id, addNew) => {
             this.props.popper.destroy();
             const contributors = findChildrenAttrsByType(this.view, schema.nodes.contributor);
@@ -76,11 +61,10 @@ export class AffiliationsView extends BlockView {
                 affiliation,
                 authors: contributors,
                 affiliations,
-                onSaveAffiliation: this.handleSaveAffiliation,
-                onDeleteAffiliation: this.handleDeleteAffiliation,
-                onUpdateAuthors: this.handleUpdateAuthors,
+                onSaveAffiliation: (affiliation) => handleSaveAffiliation(this.view, affiliation, this.getPos()),
+                onDeleteAffiliation: (affiliation) => handleDeleteAffiliation(this.view, affiliation),
+                onUpdateAuthors: (authors) => handleUpdateAuthors(this.view, authors),
                 addNewAffiliation: addNew,
-                clearSelection: this.clearSelection,
             };
             this.popper?.remove();
             this.popper = ReactSubView(this.props, AffiliationsModal, componentProps, this.node, this.getPos, this.view);
@@ -131,22 +115,6 @@ export class AffiliationsView extends BlockView {
             const contextMenu = this.showGroupContextMenu();
             return contextMenu ? [contextMenu] : [];
         };
-        this.selectNode = () => {
-            const selectedMarker = document.querySelector('.comment-marker.selected-comment');
-            this.dom.classList.add('ProseMirror-selectednode');
-            if (!isDeleted(this.node) && !selectedMarker) {
-                this.handleEdit('', true);
-            }
-        };
-        this.clearSelection = () => {
-            const { state, dispatch } = this.view;
-            dispatch(state.tr.setSelection(Selection.atStart(state.doc)));
-        };
-        this.handleUpdateAuthors = (authors) => {
-            authors.forEach((author) => {
-                updateNodeAttrs(this.view, schema.nodes.contributor, author);
-            });
-        };
     }
     createElement() {
         this.container = document.createElement('div');

package/dist/es/views/contributors.js

@@ -17,12 +17,11 @@ import { ContextMenu } from '@manuscripts/style-guide';
 import { addTrackChangesAttributes, isDeleted, } from '@manuscripts/track-changes-plugin';
 import { schema } from '@manuscripts/transform';
 import { NodeSelection } from 'prosemirror-state';
-import { AuthorsModal, } from '../components/authors/AuthorsModal';
+import { AuthorsModal, handleDeleteContributor, handleSaveContributor, } from '../components/authors/AuthorsModal';
 import { authorComparator, authorLabel, } from '../lib/authors';
 import { handleComment } from '../lib/comments';
 import { createKeyboardInteraction } from '../lib/navigation-utils';
-import { findInsertionPosition } from '../lib/utils';
-import { deleteNode, findChildByID, findChildByType, findChildrenAttrsByType, updateNodeAttrs, } from '../lib/view';
+import { findChildByID, findChildrenAttrsByType, } from '../lib/view';
 import { affiliationsKey } from '../plugins/affiliations';
 import { selectedSuggestionKey } from '../plugins/selected-suggestion';
 import BlockView from './block_view';
@@ -34,13 +33,6 @@ export class ContributorsView extends BlockView {
         super(...arguments);
         this.ignoreMutation = () => true;
         this.stopEvent = () => true;
-        this.selectNode = () => {
-            const selectedMarker = document.querySelector('.comment-marker.selected-comment');
-            this.dom.classList.add('ProseMirror-selectednode');
-            if (!isDeleted(this.node) && !selectedMarker) {
-                this.handleEdit('', true);
-            }
-        };
         this.buildAuthors = (affs) => {
             const wrapper = document.createElement('div');
             wrapper.classList.add('contributors-list');
@@ -224,46 +216,14 @@ export class ContributorsView extends BlockView {
                 author,
                 authors: contributors,
                 affiliations,
-                onSaveAuthor: this.handleSaveAuthor,
-                onDeleteAuthor: this.handleDeleteAuthor,
+                onSaveAuthor: (contributor) => handleSaveContributor(this.view, contributor, this.getPos()),
+                onDeleteAuthor: (contributor) => handleDeleteContributor(this.view, contributor),
                 addNewAuthor: addNew,
             };
             this.popper?.remove();
             this.popper = ReactSubView(this.props, AuthorsModal, componentProps, this.node, this.getPos, this.view);
             this.container.appendChild(this.popper);
         };
-        this.handleSaveAuthor = (author) => {
-            const update = updateNodeAttrs(this.view, schema.nodes.contributor, author);
-            if (!update) {
-                this.insertAuthorNode(author);
-            }
-        };
-        this.handleDeleteAuthor = (author) => {
-            deleteNode(this.view, author.id);
-        };
-        this.insertAuthorNode = (attrs) => {
-            const parent = findChildByType(this.view, schema.nodes.contributors);
-            const tr = this.view.state.tr;
-            const node = schema.nodes.contributor.create(attrs);
-            this.view.dispatch(tr.insert(parent.pos + 1, node));
-        };
-        this.insertAffiliationNode = (attrs) => {
-            const { view } = this;
-            const { dispatch } = view;
-            const affiliationsNodeType = schema.nodes.affiliations;
-            let affiliations = findChildByType(view, affiliationsNodeType);
-            if (!affiliations) {
-                const { tr } = this.view.state;
-                const insertPos = findInsertionPosition(schema.nodes.affiliations, view.state.doc);
-                dispatch(tr.insert(insertPos, schema.nodes.affiliations.create()));
-                affiliations = findChildByType(view, affiliationsNodeType);
-            }
-            if (affiliations) {
-                const { tr } = this.view.state;
-                const affiliationNode = schema.nodes.affiliation.create(attrs);
-                dispatch(tr.insert(affiliations.pos + 1, affiliationNode));
-            }
-        };
     }
     updateContents() {
         super.updateContents();

package/dist/types/components/affiliations/AffiliationsModal.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { AffiliationAttrs, ContributorAttrs } from '../../lib/authors';
+import { EditorView } from 'prosemirror-view';
 export interface AffiliationsModalProps {
     affiliation?: AffiliationAttrs;
     authors: ContributorAttrs[];
@@ -7,7 +8,10 @@ export interface AffiliationsModalProps {
     onSaveAffiliation: (affiliation: AffiliationAttrs) => void;
     onDeleteAffiliation: (affiliation: AffiliationAttrs) => void;
     onUpdateAuthors: (authors: ContributorAttrs[]) => void;
-    clearSelection: () => void;
     addNewAffiliation?: boolean;
 }
 export declare const AffiliationsModal: React.FC<AffiliationsModalProps>;
+export declare const openAffiliationsModal: (pos: number, view?: EditorView) => void;
+export declare const handleSaveAffiliation: (view: EditorView, affiliation: AffiliationAttrs, affiliationsPos: number) => void;
+export declare const handleDeleteAffiliation: (view: EditorView, affiliation: AffiliationAttrs) => void;
+export declare const handleUpdateAuthors: (view: EditorView, authors: ContributorAttrs[]) => void;

package/dist/types/components/authors/AuthorsModal.d.ts

@@ -15,6 +15,7 @@
  */
 import React from 'react';
 import { AffiliationAttrs, ContributorAttrs } from '../../lib/authors';
+import { EditorView } from 'prosemirror-view';
 export declare const authorsReducer: (state: ContributorAttrs[], action: import("../../lib/array-reducer").Action<ContributorAttrs>) => ContributorAttrs[];
 export interface AuthorsModalProps {
     author?: ContributorAttrs;
@@ -25,3 +26,6 @@ export interface AuthorsModalProps {
     addNewAuthor?: boolean;
 }
 export declare const AuthorsModal: React.FC<AuthorsModalProps>;
+export declare const openAuthorsModal: (pos: number, view?: EditorView) => void;
+export declare const handleSaveContributor: (view: EditorView, contributor: ContributorAttrs, contributorsPos: number) => void;
+export declare const handleDeleteContributor: (view: EditorView, contributor: ContributorAttrs) => void;

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "3.12.8";
+export declare const VERSION = "3.12.10";
 export declare const MATHJAX_VERSION = "3.2.2";

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

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { AffiliationNode } from '@manuscripts/transform';
-import { AffiliationAttrs, ContributorAttrs } from '../lib/authors';
 import { Trackable } from '../types';
 import BlockView from './block_view';
 export declare class AffiliationsView extends BlockView<Trackable<AffiliationNode>> {
@@ -31,16 +30,10 @@ export declare class AffiliationsView extends BlockView<Trackable<AffiliationNod
     private sortAffiliations;
     private handleClick;
     private updateSelection;
-    insertAffiliationNode: (attrs: AffiliationAttrs) => void;
-    handleSaveAffiliation: (affiliation: AffiliationAttrs) => void;
-    handleDeleteAffiliation: (affiliation: AffiliationAttrs) => void;
     handleEdit: (id: string, addNew?: boolean) => void;
     showGroupContextMenu: () => HTMLElement | undefined;
     showContextMenu: (element: Element) => void;
     actionGutterButtons: () => HTMLElement[];
-    selectNode: () => void;
-    clearSelection: () => void;
-    handleUpdateAuthors: (authors: ContributorAttrs[]) => void;
 }
 declare const _default: (props: import("../configs/ManuscriptsEditor").EditorProps, dispatch?: import("..").Dispatch) => import("../types").NodeViewCreator<AffiliationsView>;
 export default _default;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { ContributorsNode } from '@manuscripts/transform';
-import { AffiliationAttrs, ContributorAttrs } from '../lib/authors';
+import { ContributorAttrs } from '../lib/authors';
 import { PluginState } from '../plugins/affiliations';
 import { Trackable } from '../types';
 import BlockView from './block_view';
@@ -28,7 +28,6 @@ export declare class ContributorsView extends BlockView<Trackable<ContributorsNo
     stopEvent: () => boolean;
     private removeKeydownListener?;
     updateContents(): void;
-    selectNode: () => void;
     buildAuthors: (affs: PluginState) => void;
     buildAuthor: (attrs: ContributorAttrs, isJointFirstAuthor: boolean, index: number) => HTMLSpanElement;
     private createNote;
@@ -42,10 +41,6 @@ export declare class ContributorsView extends BlockView<Trackable<ContributorsNo
     private updateSelection;
     showContextMenu: (element: Element) => void;
     handleEdit: (id: string, addNew?: boolean) => void;
-    handleSaveAuthor: (author: ContributorAttrs) => void;
-    handleDeleteAuthor: (author: ContributorAttrs) => void;
-    insertAuthorNode: (attrs: ContributorAttrs) => void;
-    insertAffiliationNode: (attrs: AffiliationAttrs) => void;
     destroy(): void;
 }
 declare const _default: (props: import("../configs/ManuscriptsEditor").EditorProps, dispatch?: import("..").Dispatch) => import("../types").NodeViewCreator<ContributorsView>;

package/package.json

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

package/styles/AdvancedEditor.css

@@ -1379,13 +1379,11 @@ s[data-track-status='pending'][data-track-op='delete'] {
   line-height: 1.2;
   cursor: default;
   user-select: none;
-  display: flex;
-  justify-content: flex-start;
-  gap: 4px;
 }
 
 .affiliation .affiliation-label {
   font-weight: bold;
+  margin-right: 3.2px;
 }
 
 .ProseMirror .doi-container {