@manuscripts/body-editor 1.7.27 → 1.7.28-LEAN-3417-1

package/dist/cjs/commands.js

@@ -29,6 +29,7 @@ const helpers_1 = require("./lib/helpers");
 const track_changes_utils_1 = require("./lib/track-changes-utils");
 const utils_1 = require("./lib/utils");
 const comment_annotation_1 = require("./plugins/comment_annotation");
+const footnotes_utils_1 = require("./plugins/footnotes/footnotes-utils");
 const highlight_1 = require("./plugins/highlight");
 const markActive = (type) => (state) => {
     const { from, $from, to, empty } = state.selection;
@@ -726,37 +727,38 @@ const updateCommentAnnotationState = (state, dispatch) => {
     }
 };
 exports.updateCommentAnnotationState = updateCommentAnnotationState;
-const insertTableFootnote = (node, position, state, dispatch) => {
+const insertTableFootnote = (node, position, view) => {
     var _a;
+    const { state, dispatch } = view;
     const footnote = state.schema.nodes.footnote.createAndFill({
         id: (0, transform_1.generateID)(json_schema_1.ObjectTypes.Footnote),
         kind: 'footnote',
     });
     const insertedAt = state.selection.to;
     const inlineFootnotes = (0, prosemirror_utils_1.findChildrenByType)(node, transform_1.schema.nodes.inline_footnote);
-    const labels = inlineFootnotes.map((nodeWithPos) => nodeWithPos.node.attrs.contents);
+    const footnoteIndex = inlineFootnotes.filter(({ pos }) => position + pos <= insertedAt).length + 1;
     const inlineFootnoteNode = state.schema.nodes.inline_footnote.create({
         rids: [footnote.attrs.id],
-        contents: labels.length ? Math.max(...labels) + 1 : 1,
+        contents: footnoteIndex === -1 ? inlineFootnotes.length : footnoteIndex,
     });
     const tr = state.tr;
     tr.insert(insertedAt, inlineFootnoteNode);
-    let insertionPos;
+    let insertionPos = position;
     const footnotesElement = (0, prosemirror_utils_1.findChildrenByType)(node, transform_1.schema.nodes.footnotes_element).pop();
     if (footnotesElement &&
         !(0, track_changes_utils_1.isDeleted)(footnotesElement.node) &&
         !(0, track_changes_utils_1.isRejectedInsert)(footnotesElement.node)) {
-        const pos = footnotesElement.pos;
-        insertionPos = position + pos + footnotesElement.node.nodeSize + 1;
+        const footnotePos = (0, footnotes_utils_1.getNewFootnotePos)(footnotesElement, footnoteIndex);
+        insertionPos = tr.mapping.map(position + footnotePos);
         tr.insert(insertionPos, footnote);
     }
     else {
         const footnoteElement = state.schema.nodes.footnotes_element.create({}, footnote);
-        const tableElementFooter = (0, prosemirror_utils_1.findChildrenByType)(node, transform_1.schema.nodes.table_element_footer);
-        if (tableElementFooter.length) {
-            const pos = tableElementFooter[0].pos;
-            insertionPos = position + pos + tableElementFooter[0].node.nodeSize + 1;
-            tr.insert(insertionPos, footnoteElement);
+        const tableElementFooter = (0, prosemirror_utils_1.findChildrenByType)(node, transform_1.schema.nodes.table_element_footer)[0];
+        if (tableElementFooter) {
+            const pos = tableElementFooter.pos;
+            insertionPos = position + pos + tableElementFooter.node.nodeSize;
+            tr.insert(tr.mapping.map(insertionPos), footnoteElement);
         }
         else {
             const tableElementFooter = transform_1.schema.nodes.table_element_footer.create({
@@ -765,21 +767,21 @@ const insertTableFootnote = (node, position, state, dispatch) => {
             const tableColGroup = (0, prosemirror_utils_1.findChildrenByType)(node, transform_1.schema.nodes.table_colgroup)[0];
             if (tableColGroup) {
                 insertionPos =
-                    position + tableColGroup.pos + tableColGroup.node.nodeSize + 2;
-                tr.insert(insertionPos, tableElementFooter);
+                    position + tableColGroup.pos + tableColGroup.node.nodeSize;
+                tr.insert(tr.mapping.map(insertionPos), tableElementFooter);
             }
             else {
                 const tableSize = (_a = node.content.firstChild) === null || _a === void 0 ? void 0 : _a.nodeSize;
                 if (tableSize) {
-                    insertionPos = position + tableSize + 2;
-                    tr.insert(insertionPos, tableElementFooter);
+                    insertionPos = position + tableSize;
+                    tr.insert(tr.mapping.map(insertionPos), tableElementFooter);
                 }
             }
         }
     }
-    if (dispatch && insertionPos) {
-        const nodeSelection = prosemirror_state_1.NodeSelection.create(tr.doc, insertionPos);
-        dispatch(tr.setSelection(nodeSelection));
-    }
+    dispatch(tr);
+    const textSelection = prosemirror_state_1.TextSelection.near(view.state.tr.doc.resolve(insertionPos + 1));
+    view.focus();
+    dispatch(view.state.tr.setSelection(textSelection).scrollIntoView());
 };
 exports.insertTableFootnote = insertTableFootnote;

package/dist/cjs/components/views/FigureDropdown.js

@@ -60,7 +60,7 @@ const NestedDropdown = ({ parentToggleOpen, buttonText, disabled, list, moveLeft
             " ",
             react_1.default.createElement(TriangleCollapsed_1.default, null)),
         isOpen && (react_1.default.createElement(NestedListDropdownList, { direction: 'right', moveLeft: moveLeft, width: 192, onClick: (e) => {
-                toggleOpen(e);
+                toggleOpen();
                 parentToggleOpen(e);
             } }, list))));
 };

package/dist/cjs/configs/editor-plugins.js

@@ -38,6 +38,7 @@ const persist_1 = __importDefault(require("../plugins/persist"));
 const placeholder_1 = __importDefault(require("../plugins/placeholder"));
 const sections_1 = __importDefault(require("../plugins/sections"));
 const selected_suggestion_ui_1 = __importDefault(require("../plugins/selected-suggestion-ui"));
+const table_footnote_1 = __importDefault(require("../plugins/table-footnote"));
 const tables_cursor_fix_1 = __importDefault(require("../plugins/tables-cursor-fix"));
 const toc_1 = __importDefault(require("../plugins/toc"));
 const rules_1 = __importDefault(require("../rules"));
@@ -69,6 +70,7 @@ exports.default = (props) => {
         (0, highlight_1.default)(props),
         (0, selected_suggestion_ui_1.default)(props),
         (0, footnotes_1.default)(),
+        (0, table_footnote_1.default)(),
     ];
     if (props.collabProvider) {
         allPlugins.push((0, prosemirror_collab_1.collab)({ version: props.collabProvider.currentVersion }));

package/dist/cjs/lib/context-menu.js

@@ -23,6 +23,7 @@ const style_guide_1 = require("@manuscripts/style-guide");
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_utils_1 = require("prosemirror-utils");
 const commands_1 = require("../commands");
+const footnotes_utils_1 = require("../plugins/footnotes/footnotes-utils");
 const ReactSubView_1 = __importDefault(require("../views/ReactSubView"));
 const popper_1 = require("./popper");
 const track_changes_utils_1 = require("./track-changes-utils");
@@ -187,35 +188,45 @@ class ContextMenu {
                 if (isInTable) {
                     menu.appendChild(this.createMenuSection((section) => {
                         section.appendChild(this.createMenuItem('Add Reference Note', () => {
-                            var _a, _b;
-                            const footnotesElement = (_a = (0, prosemirror_utils_1.findChildrenByType)(this.node, transform_1.schema.nodes.footnotes_element).pop()) === null || _a === void 0 ? void 0 : _a.node;
-                            if (!footnotesElement ||
-                                (0, track_changes_utils_1.isDeleted)(footnotesElement) ||
-                                (0, track_changes_utils_1.isRejectedInsert)(footnotesElement)) {
-                                const { state, dispatch } = this.view;
-                                (0, commands_1.insertTableFootnote)(this.node, this.getPos(), state, dispatch);
+                            var _a;
+                            const footnotesElementWithPos = (0, prosemirror_utils_1.findChildrenByType)(this.node, transform_1.schema.nodes.footnotes_element).pop();
+                            if (!footnotesElementWithPos ||
+                                (0, track_changes_utils_1.isDeleted)(footnotesElementWithPos.node) ||
+                                (0, track_changes_utils_1.isRejectedInsert)(footnotesElementWithPos.node)) {
+                                (0, commands_1.insertTableFootnote)(this.node, this.getPos(), this.view);
                             }
                             else {
-                                const footnotes = (0, prosemirror_utils_1.findChildrenByType)(footnotesElement, transform_1.schema.nodes.footnote).map((nodeWithPos) => {
-                                    return nodeWithPos.node;
-                                });
+                                const tablesFootnoteLabels = (0, footnotes_utils_1.buildTableFootnoteLabels)(this.node);
+                                const footnotesWithPos = (0, prosemirror_utils_1.findChildrenByType)(footnotesElementWithPos.node, transform_1.schema.nodes.footnote);
+                                const footnotes = footnotesWithPos.map((nodeWithPos) => ({
+                                    node: nodeWithPos.node,
+                                    index: tablesFootnoteLabels.get(nodeWithPos.node.attrs.id),
+                                }));
                                 const targetDom = this.view.domAtPos(this.view.state.selection.from);
                                 if (targetDom.node instanceof Element && this.props) {
                                     const popperContainer = (0, ReactSubView_1.default)(Object.assign(Object.assign({}, this.props), { dispatch: this.view.dispatch }), style_guide_1.TableFootnotesSelector, {
                                         notes: footnotes,
                                         onAdd: () => {
                                             var _a;
-                                            const { state, dispatch } = this.view;
-                                            (0, commands_1.insertTableFootnote)(this.node, this.getPos(), state, dispatch);
+                                            (0, commands_1.insertTableFootnote)(this.node, this.getPos(), this.view);
                                             (_a = this.props) === null || _a === void 0 ? void 0 : _a.popper.destroy();
                                         },
                                         onInsert: (notes) => {
                                             var _a;
                                             const insertedAt = this.view.state.selection.to;
+                                            let inlineFootnoteIndex = 1;
+                                            this.view.state.doc
+                                                .slice(this.getPos(), insertedAt)
+                                                .content.descendants((node) => {
+                                                if (node.type === transform_1.schema.nodes.inline_footnote) {
+                                                    inlineFootnoteIndex++;
+                                                    return false;
+                                                }
+                                            });
                                             const node = this.view.state.schema.nodes.inline_footnote.create({
-                                                rids: notes.map((note) => note.attrs.id),
+                                                rids: notes.map(({ node }) => node.attrs.id),
                                                 contents: notes
-                                                    .map((note) => footnotes.indexOf(note) + 1)
+                                                    .map(({ index }) => index ? index : inlineFootnoteIndex)
                                                     .join(),
                                             });
                                             const tr = this.view.state.tr;
@@ -228,7 +239,7 @@ class ContextMenu {
                                             (_a = this.props) === null || _a === void 0 ? void 0 : _a.popper.destroy();
                                         },
                                     }, this.node, this.getPos, this.view, 'table-footnote-editor');
-                                    (_b = this.props) === null || _b === void 0 ? void 0 : _b.popper.show(targetDom.node, popperContainer, 'bottom-end');
+                                    (_a = this.props) === null || _a === void 0 ? void 0 : _a.popper.show(targetDom.node, popperContainer, 'bottom-end');
                                 }
                             }
                         }));

package/dist/cjs/menus.js

@@ -19,10 +19,8 @@ exports.getEditorMenus = void 0;
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_commands_1 = require("prosemirror-commands");
 const prosemirror_history_1 = require("prosemirror-history");
-const prosemirror_schema_list_1 = require("prosemirror-schema-list");
 const prosemirror_tables_1 = require("prosemirror-tables");
 const commands_1 = require("./commands");
-const list_1 = require("./keys/list");
 const hierarchy_1 = require("./lib/hierarchy");
 const getEditorMenus = (editor) => {
     const { isCommandValid, state } = editor;
@@ -109,29 +107,6 @@ const getEditorMenus = (editor) => {
             {
                 role: 'separator',
             },
-            {
-                id: 'insert-ordered-list',
-                label: 'Numbered List',
-                shortcut: {
-                    mac: 'Option+CommandOrControl+O',
-                    pc: 'CommandOrControl+Option+O',
-                },
-                isEnabled: isCommandValid((0, prosemirror_schema_list_1.wrapInList)(transform_1.schema.nodes.ordered_list)),
-                run: doCommand((0, list_1.skipCommandTracking)((0, prosemirror_schema_list_1.wrapInList)(transform_1.schema.nodes.ordered_list))),
-            },
-            {
-                id: 'insert-bullet-list',
-                label: 'Bullet List',
-                shortcut: {
-                    mac: 'Option+CommandOrControl+K',
-                    pc: 'CommandOrControl+Option+K',
-                },
-                isEnabled: isCommandValid((0, prosemirror_schema_list_1.wrapInList)(transform_1.schema.nodes.bullet_list)),
-                run: doCommand((0, list_1.skipCommandTracking)((0, prosemirror_schema_list_1.wrapInList)(transform_1.schema.nodes.bullet_list))),
-            },
-            {
-                role: 'separator',
-            },
             {
                 id: 'insert-blockquote',
                 label: 'Block Quote',
@@ -322,6 +297,44 @@ const getEditorMenus = (editor) => {
             {
                 role: 'separator',
             },
+            {
+                id: 'insert-bullet-list',
+                label: 'Bullet List',
+                isEnabled: isCommandValid((0, commands_1.insertList)(transform_1.schema.nodes.bullet_list)),
+                submenu: [
+                    {
+                        id: 'bullet-list-context-menu',
+                        label: '',
+                        isEnabled: true,
+                        options: {
+                            bullet: doCommand((0, commands_1.insertList)(transform_1.schema.nodes.bullet_list, 'bullet')),
+                            simple: doCommand((0, commands_1.insertList)(transform_1.schema.nodes.bullet_list, 'simple')),
+                        },
+                    },
+                ],
+            },
+            {
+                id: 'insert-ordered-list',
+                label: 'Ordered List',
+                isEnabled: isCommandValid((0, commands_1.insertList)(transform_1.schema.nodes.ordered_list)),
+                submenu: [
+                    {
+                        id: 'ordered-list-context-menu',
+                        label: '',
+                        isEnabled: true,
+                        options: {
+                            order: doCommand((0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'order')),
+                            'alpha-upper': doCommand((0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'alpha-upper')),
+                            'alpha-lower': doCommand((0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'alpha-lower')),
+                            'roman-upper': doCommand((0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'roman-upper')),
+                            'roman-lower': doCommand((0, commands_1.insertList)(transform_1.schema.nodes.ordered_list, 'roman-lower')),
+                        },
+                    },
+                ],
+            },
+            {
+                role: 'separator',
+            },
             {
                 id: 'format-table',
                 label: 'Table',

package/dist/cjs/plugins/footnotes/footnotes-utils.js

@@ -15,8 +15,10 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findTableInlineFootnoteIds = void 0;
+exports.updateTableInlineFootnoteLabels = exports.orderTableFootnotes = exports.buildTableFootnoteLabels = exports.getNewFootnotePos = exports.findTableInlineFootnoteIds = void 0;
+const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
 const transform_1 = require("@manuscripts/transform");
+const prosemirror_model_1 = require("prosemirror-model");
 const prosemirror_utils_1 = require("prosemirror-utils");
 const findTableInlineFootnoteIds = ($pos) => {
     var _a;
@@ -28,3 +30,67 @@ const findTableInlineFootnoteIds = ($pos) => {
         : []);
 };
 exports.findTableInlineFootnoteIds = findTableInlineFootnoteIds;
+const getNewFootnotePos = (footnotesElement, footnoteIndex) => {
+    let newFootnotePos = footnotesElement.pos + footnotesElement.node.nodeSize - 1;
+    footnotesElement.node.descendants((node, pos, parent, index) => {
+        if ((0, transform_1.isFootnoteNode)(node)) {
+            if (footnoteIndex === ++index) {
+                newFootnotePos = footnotesElement.pos + pos + (index === 1 ? 2 : 1);
+            }
+        }
+    });
+    return newFootnotePos;
+};
+exports.getNewFootnotePos = getNewFootnotePos;
+const buildTableFootnoteLabels = (node) => {
+    const labels = new Map((0, prosemirror_utils_1.findChildrenByType)(node, transform_1.schema.nodes.footnote).map((node) => [
+        node.node.attrs.id,
+        undefined,
+    ]));
+    let index = 0;
+    (0, prosemirror_utils_1.findChildrenByType)(node, transform_1.schema.nodes.inline_footnote)
+        .map(({ node }) => node.attrs.rids)
+        .flat()
+        .map((rid) => {
+        if (!labels.get(rid)) {
+            labels.set(rid, String(++index));
+        }
+    });
+    return labels;
+};
+exports.buildTableFootnoteLabels = buildTableFootnoteLabels;
+const orderTableFootnotes = (tr, footnotesElementWithPos, position) => {
+    const tablesFootnoteLabels = (0, exports.buildTableFootnoteLabels)(tr.doc.nodeAt(tr.mapping.map(position)));
+    const footnotes = (0, prosemirror_utils_1.findChildrenByType)(footnotesElementWithPos.node, transform_1.schema.nodes.footnote).map((nodeWithPos) => ({
+        node: nodeWithPos.node,
+        index: tablesFootnoteLabels.get(nodeWithPos.node.attrs.id),
+    }));
+    const orderedFootnotes = [...footnotes]
+        .sort((a, b) => {
+        if (a.index !== undefined && b.index !== undefined) {
+            return Number.parseInt(a.index) - Number.parseInt(b.index);
+        }
+        else {
+            return a.index === undefined ? 1 : -1;
+        }
+    })
+        .map(({ node }) => node);
+    const { node: footnotesElement, pos } = footnotesElementWithPos;
+    const footnoteElementPos = position + pos;
+    return (0, track_changes_plugin_1.skipTracking)(tr.replaceWith(tr.mapping.map(footnoteElementPos), tr.mapping.map(footnoteElementPos + footnotesElement.nodeSize), prosemirror_model_1.Fragment.fromArray(orderedFootnotes)));
+};
+exports.orderTableFootnotes = orderTableFootnotes;
+const updateTableInlineFootnoteLabels = (tr, table) => {
+    const labels = (0, exports.buildTableFootnoteLabels)(table.node);
+    (0, prosemirror_utils_1.findChildrenByType)(table.node, transform_1.schema.nodes.inline_footnote).map(({ node, pos }) => {
+        const contents = node.attrs.rids
+            .map((rid) => labels.get(rid))
+            .join(',');
+        if (contents !== node.attrs.contents &&
+            tr.doc.nodeAt(tr.mapping.map(table.pos + pos + 1))) {
+            tr.setNodeMarkup(tr.mapping.map(table.pos + pos + 1), undefined, Object.assign(Object.assign({}, node.attrs), { rids: node.attrs.rids, contents }));
+        }
+    });
+    return tr;
+};
+exports.updateTableInlineFootnoteLabels = updateTableInlineFootnoteLabels;

package/dist/cjs/plugins/table-footnote.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const transform_1 = require("@manuscripts/transform");
+const prosemirror_state_1 = require("prosemirror-state");
+const prosemirror_transform_1 = require("prosemirror-transform");
+const prosemirror_utils_1 = require("prosemirror-utils");
+const footnotes_utils_1 = require("./footnotes/footnotes-utils");
+const isInlineFootnoteChange = (step, oldState, newState) => {
+    var _a, _b;
+    return step.slice.size > 0
+        ? ((_a = newState.doc.nodeAt(step.from)) === null || _a === void 0 ? void 0 : _a.type) === transform_1.schema.nodes.inline_footnote
+        : ((_b = oldState.doc.nodeAt(step.from)) === null || _b === void 0 ? void 0 : _b.type) === transform_1.schema.nodes.inline_footnote;
+};
+exports.default = () => {
+    return new prosemirror_state_1.Plugin({
+        appendTransaction(transactions, oldState, newState) {
+            const tableInlineFootnoteChange = transactions.find((tr) => tr.steps.find((s) => {
+                var _a;
+                if (s instanceof prosemirror_transform_1.ReplaceStep) {
+                    const step = s;
+                    const $pos = oldState.doc.resolve(step.from);
+                    return (((_a = $pos.node($pos.depth - 2)) === null || _a === void 0 ? void 0 : _a.type) === transform_1.schema.nodes.table &&
+                        isInlineFootnoteChange(step, oldState, newState));
+                }
+            }));
+            if (!tableInlineFootnoteChange) {
+                return null;
+            }
+            const step = tableInlineFootnoteChange.steps[0];
+            const tr = newState.tr;
+            const $pos = newState.doc.resolve(step.from);
+            const table = (0, prosemirror_utils_1.findParentNodeClosestToPos)($pos, (node) => node.type === transform_1.schema.nodes.table_element);
+            const footnotesElementWithPos = table &&
+                (0, prosemirror_utils_1.findChildrenByType)(table.node, transform_1.schema.nodes.footnotes_element).pop();
+            if (!table || !footnotesElementWithPos) {
+                return null;
+            }
+            (0, footnotes_utils_1.updateTableInlineFootnoteLabels)(tr, table);
+            (0, footnotes_utils_1.orderTableFootnotes)(tr, footnotesElementWithPos, tr.mapping.map(table.pos));
+            return tr;
+        },
+    });
+};

package/dist/cjs/toolbar.js

@@ -68,8 +68,12 @@ exports.toolbar = {
             title: 'Wrap in bullet list',
             content: icons_1.default.bullet_list,
             isActive: (0, commands_1.blockActive)(transform_1.schema.nodes.bullet_list),
-            isEnabled: (0, commands_1.insertList)(transform_1.schema.nodes.bullet_list),
-            run: (0, commands_1.insertList)(transform_1.schema.nodes.bullet_list),
+            isEnabled: (0, commands_1.insertList)(transform_1.schema.nodes.bullet_list, 'bullet'),
+            run: (0, commands_1.insertList)(transform_1.schema.nodes.bullet_list, 'bullet'),
+            options: {
+                bullet: (0, commands_1.insertList)(transform_1.schema.nodes.bullet_list, 'bullet'),
+                simple: (0, commands_1.insertList)(transform_1.schema.nodes.bullet_list, 'simple'),
+            },
         },
         ordered_list: {
             title: 'Wrap in ordered list',

package/dist/cjs/views/bullet_list.js

@@ -21,15 +21,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.bulletListCallback = exports.BulletListView = void 0;
 const block_view_1 = __importDefault(require("./block_view"));
 const creators_1 = require("./creators");
+const ordered_list_1 = require("./ordered_list");
 class BulletListView extends block_view_1.default {
     constructor() {
         super(...arguments);
         this.elementType = 'ul';
+        this.updateContents = () => {
+            if (this.contentDOM) {
+                const type = this.node.attrs.listStyleType || 'bullet';
+                this.contentDOM.style.listStyleType = ordered_list_1.JATS_HTML_LIST_STYLE_MAPPING[type];
+            }
+        };
     }
 }
 exports.BulletListView = BulletListView;
 const bulletListCallback = (node, dom) => {
     dom.classList.add('list');
+    const type = node.attrs.listStyleType || 'bullet';
+    dom.style.listStyleType = ordered_list_1.JATS_HTML_LIST_STYLE_MAPPING[type];
 };
 exports.bulletListCallback = bulletListCallback;
 exports.default = (0, creators_1.createNodeOrElementView)(BulletListView, 'ul', exports.bulletListCallback);

package/dist/cjs/views/citation_editable.js

@@ -74,6 +74,7 @@ class CitationEditableView extends citation_1.CitationView {
             this.props.popper.destroy();
         };
         this.showContextMenu = () => {
+            this.props.popper.destroy();
             const componentProps = {
                 actions: [
                     { label: 'Edit', action: this.handleEdit, icon: 'EditIcon' },

package/dist/cjs/views/contributors.js

@@ -20,7 +20,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContributorsView = void 0;
 const style_guide_1 = require("@manuscripts/style-guide");
+const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
 const transform_1 = require("@manuscripts/transform");
+const prosemirror_state_1 = require("prosemirror-state");
 const AuthorsModal_1 = require("../components/authors/AuthorsModal");
 const authors_1 = require("../lib/authors");
 const track_changes_utils_1 = require("../lib/track-changes-utils");
@@ -79,7 +81,9 @@ class ContributorsView extends block_view_1.default {
             const pluginState = affiliations_1.affiliationsKey.getState(this.view.state);
             const attrs = node.attrs;
             const displayAttr = (0, track_changes_utils_1.getActualAttrs)(node);
+            const containerWrapper = document.createElement('div');
             const container = document.createElement('button');
+            containerWrapper.classList.add('contributor-wrapper');
             container.classList.add('contributor');
             container.setAttribute('id', attrs.id);
             container.setAttribute('contenteditable', 'false');
@@ -95,9 +99,12 @@ class ContributorsView extends block_view_1.default {
             }
             const can = this.props.getCapabilities();
             const disableEditButton = !can.editMetadata;
-            const { isCorresponding, email } = displayAttr;
+            const { isCorresponding, email, id } = displayAttr;
             if (!disableEditButton) {
-                container.addEventListener('click', this.handleClick);
+                container.addEventListener('click', () => {
+                    const dataTracked = attrs.dataTracked;
+                    this.onClickHandler(id, dataTracked ? dataTracked[0] : undefined);
+                });
             }
             const name = (0, authors_1.authorLabel)(displayAttr);
             container.innerHTML =
@@ -125,7 +132,8 @@ class ContributorsView extends block_view_1.default {
             if (selectedAuthor && selectedAuthor === attrs.id) {
                 container.classList.add('selected-suggestion');
             }
-            return container;
+            containerWrapper.appendChild(container);
+            return containerWrapper;
         };
         this.isJointFirstAuthor = (authors, index) => {
             const author = index === 0 ? authors[index] : authors[index - 1];
@@ -143,11 +151,14 @@ class ContributorsView extends block_view_1.default {
             this.dom = document.createElement('div');
             this.dom.classList.add('block-container', `block-${this.node.type.name}`);
         };
+        this.deselectNode = () => {
+            this.props.popper.destroy();
+        };
         this.createEditButton = () => {
             const can = this.props.getCapabilities();
             const button = (0, ReactSubView_1.default)(this.props, style_guide_1.SecondaryButton, {
                 mini: true,
-                onClick: this.handleClick,
+                onClick: () => this.handleEdit(''),
                 className: 'edit-authors-button',
                 disabled: !can.editMetadata,
                 children: 'Edit Authors',
@@ -167,17 +178,45 @@ class ContributorsView extends block_view_1.default {
                 }
             }
         };
-        this.handleClick = (e) => {
-            var _a, _b;
-            e.stopPropagation();
+        this.onClickHandler = (elementId, dataTracked) => {
+            var _a;
+            this.props.popper.destroy();
+            const isSelectedSuggestion = !!((_a = selected_suggestion_ui_1.selectedSuggestionKey
+                .getState(this.view.state)) === null || _a === void 0 ? void 0 : _a.find(this.getPos(), this.getPos() + this.node.nodeSize).length);
+            const { tr } = this.view.state;
+            tr.setSelection(prosemirror_state_1.NodeSelection.create(this.view.state.doc, this.getPos()));
+            if (dataTracked && dataTracked.status !== track_changes_plugin_1.CHANGE_STATUS.rejected) {
+                tr.setMeta(selected_suggestion_ui_1.SET_SUGGESTION_ID, dataTracked.id);
+            }
+            else {
+                if (isSelectedSuggestion) {
+                    tr.setMeta(selected_suggestion_ui_1.CLEAR_SUGGESTION_ID, true);
+                }
+            }
+            this.view.dispatch(tr);
+            this.showContextMenu(elementId);
+        };
+        this.showContextMenu = (elementId) => {
+            this.props.popper.destroy();
+            const element = document.getElementById(elementId);
+            const componentProps = {
+                actions: [
+                    {
+                        label: 'Edit',
+                        action: () => this.handleEdit(elementId),
+                        icon: 'EditIcon',
+                    },
+                ],
+            };
+            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(element, this.contextMenu, 'right-start');
+        };
+        this.handleEdit = (id) => {
+            var _a;
+            this.props.popper.destroy();
             const contributors = (0, view_1.findChildrenAttrsByType)(this.view, transform_1.schema.nodes.contributor);
             const affiliations = (0, view_1.findChildrenAttrsByType)(this.view, transform_1.schema.nodes.affiliation);
-            let author = undefined;
-            const target = e.target;
-            if (target) {
-                const id = (_a = target.closest('.contributor')) === null || _a === void 0 ? void 0 : _a.getAttribute('id');
-                author = contributors.filter((a) => a.id === id)[0];
-            }
+            const author = id ? contributors.filter((a) => a.id === id)[0] : undefined;
             const componentProps = {
                 author,
                 authors: contributors,
@@ -186,7 +225,7 @@ class ContributorsView extends block_view_1.default {
                 onDeleteAuthor: this.handleDeleteAuthor,
                 onSaveAffiliation: this.handleSaveAffiliation,
             };
-            (_b = this.popper) === null || _b === void 0 ? void 0 : _b.remove();
+            (_a = this.popper) === null || _a === void 0 ? void 0 : _a.remove();
             this.popper = (0, ReactSubView_1.default)(this.props, AuthorsModal_1.AuthorsModal, componentProps, this.node, this.getPos, this.view);
             this.container.appendChild(this.popper);
         };

package/dist/cjs/views/ordered_list.js

@@ -22,6 +22,7 @@ exports.orderedListCallback = exports.OrderedListView = exports.JATS_HTML_LIST_S
 const block_view_1 = __importDefault(require("./block_view"));
 const creators_1 = require("./creators");
 exports.JATS_HTML_LIST_STYLE_MAPPING = {
+    simple: 'none',
     bullet: 'disc',
     order: 'decimal',
     'alpha-lower': 'lower-alpha',