@manuscripts/body-editor 1.7.26-LEAN-3429-1 → 1.7.27

package/dist/cjs/commands.js

@@ -29,7 +29,6 @@ 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;
@@ -727,38 +726,37 @@ const updateCommentAnnotationState = (state, dispatch) => {
     }
 };
 exports.updateCommentAnnotationState = updateCommentAnnotationState;
-const insertTableFootnote = (node, position, view) => {
+const insertTableFootnote = (node, position, state, dispatch) => {
     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 footnoteIndex = inlineFootnotes.filter(({ pos }) => position + pos <= insertedAt).length + 1;
+    const labels = inlineFootnotes.map((nodeWithPos) => nodeWithPos.node.attrs.contents);
     const inlineFootnoteNode = state.schema.nodes.inline_footnote.create({
         rids: [footnote.attrs.id],
-        contents: footnoteIndex === -1 ? inlineFootnotes.length : footnoteIndex,
+        contents: labels.length ? Math.max(...labels) + 1 : 1,
     });
     const tr = state.tr;
     tr.insert(insertedAt, inlineFootnoteNode);
-    let insertionPos = position;
+    let insertionPos;
     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 footnotePos = (0, footnotes_utils_1.getNewFootnotePos)(footnotesElement, footnoteIndex);
-        insertionPos = tr.mapping.map(position + footnotePos);
+        const pos = footnotesElement.pos;
+        insertionPos = position + pos + footnotesElement.node.nodeSize + 1;
         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)[0];
-        if (tableElementFooter) {
-            const pos = tableElementFooter.pos;
-            insertionPos = position + pos + tableElementFooter.node.nodeSize;
-            tr.insert(tr.mapping.map(insertionPos), footnoteElement);
+        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);
         }
         else {
             const tableElementFooter = transform_1.schema.nodes.table_element_footer.create({
@@ -767,21 +765,21 @@ const insertTableFootnote = (node, position, view) => {
             const tableColGroup = (0, prosemirror_utils_1.findChildrenByType)(node, transform_1.schema.nodes.table_colgroup)[0];
             if (tableColGroup) {
                 insertionPos =
-                    position + tableColGroup.pos + tableColGroup.node.nodeSize;
-                tr.insert(tr.mapping.map(insertionPos), tableElementFooter);
+                    position + tableColGroup.pos + tableColGroup.node.nodeSize + 2;
+                tr.insert(insertionPos, tableElementFooter);
             }
             else {
                 const tableSize = (_a = node.content.firstChild) === null || _a === void 0 ? void 0 : _a.nodeSize;
                 if (tableSize) {
-                    insertionPos = position + tableSize;
-                    tr.insert(tr.mapping.map(insertionPos), tableElementFooter);
+                    insertionPos = position + tableSize + 2;
+                    tr.insert(insertionPos, tableElementFooter);
                 }
             }
         }
     }
-    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());
+    if (dispatch && insertionPos) {
+        const nodeSelection = prosemirror_state_1.NodeSelection.create(tr.doc, insertionPos);
+        dispatch(tr.setSelection(nodeSelection));
+    }
 };
 exports.insertTableFootnote = insertTableFootnote;

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

@@ -38,7 +38,6 @@ 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"));
@@ -70,7 +69,6 @@ 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,7 +23,6 @@ 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");
@@ -188,45 +187,35 @@ class ContextMenu {
                 if (isInTable) {
                     menu.appendChild(this.createMenuSection((section) => {
                         section.appendChild(this.createMenuItem('Add Reference Note', () => {
-                            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);
+                            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);
                             }
                             else {
-                                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 footnotes = (0, prosemirror_utils_1.findChildrenByType)(footnotesElement, transform_1.schema.nodes.footnote).map((nodeWithPos) => {
+                                    return nodeWithPos.node;
+                                });
                                 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;
-                                            (0, commands_1.insertTableFootnote)(this.node, this.getPos(), this.view);
+                                            const { state, dispatch } = this.view;
+                                            (0, commands_1.insertTableFootnote)(this.node, this.getPos(), state, dispatch);
                                             (_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(({ node }) => node.attrs.id),
+                                                rids: notes.map((note) => note.attrs.id),
                                                 contents: notes
-                                                    .map(({ index }) => index ? index : inlineFootnoteIndex)
+                                                    .map((note) => footnotes.indexOf(note) + 1)
                                                     .join(),
                                             });
                                             const tr = this.view.state.tr;
@@ -239,7 +228,7 @@ class ContextMenu {
                                             (_a = this.props) === null || _a === void 0 ? void 0 : _a.popper.destroy();
                                         },
                                     }, this.node, this.getPos, this.view, 'table-footnote-editor');
-                                    (_a = this.props) === null || _a === void 0 ? void 0 : _a.popper.show(targetDom.node, popperContainer, 'bottom-end');
+                                    (_b = this.props) === null || _b === void 0 ? void 0 : _b.popper.show(targetDom.node, popperContainer, 'bottom-end');
                                 }
                             }
                         }));

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

@@ -15,10 +15,8 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateTableInlineFootnoteLabels = exports.orderTableFootnotes = exports.buildTableFootnoteLabels = exports.getNewFootnotePos = exports.findTableInlineFootnoteIds = void 0;
-const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
+exports.findTableInlineFootnoteIds = void 0;
 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;
@@ -30,67 +28,3 @@ 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/es/commands.js

@@ -26,7 +26,6 @@ import { isNodeOfType, nearestAncestor } from './lib/helpers';
 import { isDeleted, isRejectedInsert } from './lib/track-changes-utils';
 import { findParentNodeWithId, getChildOfType } from './lib/utils';
 import { commentAnnotation } from './plugins/comment_annotation';
-import { getNewFootnotePos } from './plugins/footnotes/footnotes-utils';
 import { highlightKey, SET_COMMENT } from './plugins/highlight';
 export const markActive = (type) => (state) => {
     const { from, $from, to, empty } = state.selection;
@@ -690,38 +689,37 @@ export const updateCommentAnnotationState = (state, dispatch) => {
         dispatch(tr);
     }
 };
-export const insertTableFootnote = (node, position, view) => {
+export const insertTableFootnote = (node, position, state, dispatch) => {
     var _a;
-    const { state, dispatch } = view;
     const footnote = state.schema.nodes.footnote.createAndFill({
         id: generateID(ObjectTypes.Footnote),
         kind: 'footnote',
     });
     const insertedAt = state.selection.to;
     const inlineFootnotes = findChildrenByType(node, schema.nodes.inline_footnote);
-    const footnoteIndex = inlineFootnotes.filter(({ pos }) => position + pos <= insertedAt).length + 1;
+    const labels = inlineFootnotes.map((nodeWithPos) => nodeWithPos.node.attrs.contents);
     const inlineFootnoteNode = state.schema.nodes.inline_footnote.create({
         rids: [footnote.attrs.id],
-        contents: footnoteIndex === -1 ? inlineFootnotes.length : footnoteIndex,
+        contents: labels.length ? Math.max(...labels) + 1 : 1,
     });
     const tr = state.tr;
     tr.insert(insertedAt, inlineFootnoteNode);
-    let insertionPos = position;
+    let insertionPos;
     const footnotesElement = findChildrenByType(node, schema.nodes.footnotes_element).pop();
     if (footnotesElement &&
         !isDeleted(footnotesElement.node) &&
         !isRejectedInsert(footnotesElement.node)) {
-        const footnotePos = getNewFootnotePos(footnotesElement, footnoteIndex);
-        insertionPos = tr.mapping.map(position + footnotePos);
+        const pos = footnotesElement.pos;
+        insertionPos = position + pos + footnotesElement.node.nodeSize + 1;
         tr.insert(insertionPos, footnote);
     }
     else {
         const footnoteElement = state.schema.nodes.footnotes_element.create({}, footnote);
-        const tableElementFooter = findChildrenByType(node, 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);
+        const tableElementFooter = findChildrenByType(node, 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);
         }
         else {
             const tableElementFooter = schema.nodes.table_element_footer.create({
@@ -730,20 +728,20 @@ export const insertTableFootnote = (node, position, view) => {
             const tableColGroup = findChildrenByType(node, schema.nodes.table_colgroup)[0];
             if (tableColGroup) {
                 insertionPos =
-                    position + tableColGroup.pos + tableColGroup.node.nodeSize;
-                tr.insert(tr.mapping.map(insertionPos), tableElementFooter);
+                    position + tableColGroup.pos + tableColGroup.node.nodeSize + 2;
+                tr.insert(insertionPos, tableElementFooter);
             }
             else {
                 const tableSize = (_a = node.content.firstChild) === null || _a === void 0 ? void 0 : _a.nodeSize;
                 if (tableSize) {
-                    insertionPos = position + tableSize;
-                    tr.insert(tr.mapping.map(insertionPos), tableElementFooter);
+                    insertionPos = position + tableSize + 2;
+                    tr.insert(insertionPos, tableElementFooter);
                 }
             }
         }
     }
-    dispatch(tr);
-    const textSelection = TextSelection.near(view.state.tr.doc.resolve(insertionPos + 1));
-    view.focus();
-    dispatch(view.state.tr.setSelection(textSelection).scrollIntoView());
+    if (dispatch && insertionPos) {
+        const nodeSelection = NodeSelection.create(tr.doc, insertionPos);
+        dispatch(tr.setSelection(nodeSelection));
+    }
 };

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

@@ -33,7 +33,6 @@ import persist from '../plugins/persist';
 import placeholder from '../plugins/placeholder';
 import sections from '../plugins/sections';
 import selected_suggestion_ui from '../plugins/selected-suggestion-ui';
-import table_footnote from '../plugins/table-footnote';
 import table_editing_fix from '../plugins/tables-cursor-fix';
 import toc from '../plugins/toc';
 import rules from '../rules';
@@ -65,7 +64,6 @@ export default (props) => {
         highlights(props),
         selected_suggestion_ui(props),
         footnotes(),
-        table_footnote(),
     ];
     if (props.collabProvider) {
         allPlugins.push(collab({ version: props.collabProvider.currentVersion }));

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

@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { TableFootnotesSelector, } from '@manuscripts/style-guide';
+import { TableFootnotesSelector } from '@manuscripts/style-guide';
 import { isInBibliographySection, nodeNames, schema, } from '@manuscripts/transform';
 import { findChildrenByType, hasParentNodeOfType } from 'prosemirror-utils';
 import { addComment, createBlock, insertGeneralFootnote, insertTableFootnote, } from '../commands';
-import { buildTableFootnoteLabels } from '../plugins/footnotes/footnotes-utils';
 import ReactSubView from '../views/ReactSubView';
 import { PopperManager } from './popper';
 import { isDeleted, isRejectedInsert } from './track-changes-utils';
@@ -181,45 +180,35 @@ export class ContextMenu {
                 if (isInTable) {
                     menu.appendChild(this.createMenuSection((section) => {
                         section.appendChild(this.createMenuItem('Add Reference Note', () => {
-                            var _a;
-                            const footnotesElementWithPos = findChildrenByType(this.node, schema.nodes.footnotes_element).pop();
-                            if (!footnotesElementWithPos ||
-                                isDeleted(footnotesElementWithPos.node) ||
-                                isRejectedInsert(footnotesElementWithPos.node)) {
-                                insertTableFootnote(this.node, this.getPos(), this.view);
+                            var _a, _b;
+                            const footnotesElement = (_a = findChildrenByType(this.node, schema.nodes.footnotes_element).pop()) === null || _a === void 0 ? void 0 : _a.node;
+                            if (!footnotesElement ||
+                                isDeleted(footnotesElement) ||
+                                isRejectedInsert(footnotesElement)) {
+                                const { state, dispatch } = this.view;
+                                insertTableFootnote(this.node, this.getPos(), state, dispatch);
                             }
                             else {
-                                const tablesFootnoteLabels = buildTableFootnoteLabels(this.node);
-                                const footnotesWithPos = findChildrenByType(footnotesElementWithPos.node, schema.nodes.footnote);
-                                const footnotes = footnotesWithPos.map((nodeWithPos) => ({
-                                    node: nodeWithPos.node,
-                                    index: tablesFootnoteLabels.get(nodeWithPos.node.attrs.id),
-                                }));
+                                const footnotes = findChildrenByType(footnotesElement, schema.nodes.footnote).map((nodeWithPos) => {
+                                    return nodeWithPos.node;
+                                });
                                 const targetDom = this.view.domAtPos(this.view.state.selection.from);
                                 if (targetDom.node instanceof Element && this.props) {
                                     const popperContainer = ReactSubView(Object.assign(Object.assign({}, this.props), { dispatch: this.view.dispatch }), TableFootnotesSelector, {
                                         notes: footnotes,
                                         onAdd: () => {
                                             var _a;
-                                            insertTableFootnote(this.node, this.getPos(), this.view);
+                                            const { state, dispatch } = this.view;
+                                            insertTableFootnote(this.node, this.getPos(), state, dispatch);
                                             (_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 === schema.nodes.inline_footnote) {
-                                                    inlineFootnoteIndex++;
-                                                    return false;
-                                                }
-                                            });
                                             const node = this.view.state.schema.nodes.inline_footnote.create({
-                                                rids: notes.map(({ node }) => node.attrs.id),
+                                                rids: notes.map((note) => note.attrs.id),
                                                 contents: notes
-                                                    .map(({ index }) => index ? index : inlineFootnoteIndex)
+                                                    .map((note) => footnotes.indexOf(note) + 1)
                                                     .join(),
                                             });
                                             const tr = this.view.state.tr;
@@ -232,7 +221,7 @@ export class ContextMenu {
                                             (_a = this.props) === null || _a === void 0 ? void 0 : _a.popper.destroy();
                                         },
                                     }, this.node, this.getPos, this.view, 'table-footnote-editor');
-                                    (_a = this.props) === null || _a === void 0 ? void 0 : _a.popper.show(targetDom.node, popperContainer, 'bottom-end');
+                                    (_b = this.props) === null || _b === void 0 ? void 0 : _b.popper.show(targetDom.node, popperContainer, 'bottom-end');
                                 }
                             }
                         }));

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

@@ -13,10 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { skipTracking } from '@manuscripts/track-changes-plugin';
-import { isFootnoteNode, schema, } from '@manuscripts/transform';
-import { Fragment } from 'prosemirror-model';
-import { findChildren, findChildrenByType, findParentNodeClosestToPos, } from 'prosemirror-utils';
+import { schema } from '@manuscripts/transform';
+import { findChildren, findParentNodeClosestToPos } from 'prosemirror-utils';
 export const findTableInlineFootnoteIds = ($pos) => {
     var _a;
     const tableElement = (_a = findParentNodeClosestToPos($pos, (node) => node.type === schema.nodes.table_element)) === null || _a === void 0 ? void 0 : _a.node.firstChild;
@@ -26,63 +24,3 @@ export const findTableInlineFootnoteIds = ($pos) => {
             .flat()
         : []);
 };
-export const getNewFootnotePos = (footnotesElement, footnoteIndex) => {
-    let newFootnotePos = footnotesElement.pos + footnotesElement.node.nodeSize - 1;
-    footnotesElement.node.descendants((node, pos, parent, index) => {
-        if (isFootnoteNode(node)) {
-            if (footnoteIndex === ++index) {
-                newFootnotePos = footnotesElement.pos + pos + (index === 1 ? 2 : 1);
-            }
-        }
-    });
-    return newFootnotePos;
-};
-export const buildTableFootnoteLabels = (node) => {
-    const labels = new Map(findChildrenByType(node, schema.nodes.footnote).map((node) => [
-        node.node.attrs.id,
-        undefined,
-    ]));
-    let index = 0;
-    findChildrenByType(node, schema.nodes.inline_footnote)
-        .map(({ node }) => node.attrs.rids)
-        .flat()
-        .map((rid) => {
-        if (!labels.get(rid)) {
-            labels.set(rid, String(++index));
-        }
-    });
-    return labels;
-};
-export const orderTableFootnotes = (tr, footnotesElementWithPos, position) => {
-    const tablesFootnoteLabels = buildTableFootnoteLabels(tr.doc.nodeAt(tr.mapping.map(position)));
-    const footnotes = findChildrenByType(footnotesElementWithPos.node, 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 skipTracking(tr.replaceWith(tr.mapping.map(footnoteElementPos), tr.mapping.map(footnoteElementPos + footnotesElement.nodeSize), Fragment.fromArray(orderedFootnotes)));
-};
-export const updateTableInlineFootnoteLabels = (tr, table) => {
-    const labels = buildTableFootnoteLabels(table.node);
-    findChildrenByType(table.node, 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;
-};

package/dist/types/commands.d.ts

@@ -19,7 +19,6 @@ import { ManuscriptEditorState, ManuscriptEditorView, ManuscriptMarkType, Manusc
 import { ResolvedPos } from 'prosemirror-model';
 import { Command, NodeSelection, Selection, TextSelection, Transaction } from 'prosemirror-state';
 import { NodeWithPos } from 'prosemirror-utils';
-import { EditorView } from 'prosemirror-view';
 import { EditorAction } from './types';
 export type Dispatch = (tr: ManuscriptTransaction) => void;
 export declare const markActive: (type: ManuscriptMarkType) => (state: ManuscriptEditorState) => boolean;
@@ -57,4 +56,4 @@ export declare const deleteHighlightMarkers: (rid: string) => Command;
 export declare function addComment(state: ManuscriptEditorState, dispatch?: Dispatch): boolean;
 export declare function addComment(state: ManuscriptEditorState, dispatch?: Dispatch, viewNode?: ManuscriptNode, resolvePos?: ResolvedPos): boolean;
 export declare const updateCommentAnnotationState: (state: ManuscriptEditorState, dispatch?: Dispatch) => void;
-export declare const insertTableFootnote: (node: ManuscriptNode, position: number, view: EditorView) => void;
+export declare const insertTableFootnote: (node: ManuscriptNode, position: number, state: ManuscriptEditorState, dispatch?: Dispatch) => void;

package/dist/types/plugins/footnotes/footnotes-utils.d.ts

@@ -13,12 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ManuscriptNode } from '@manuscripts/transform';
 import { ResolvedPos } from 'prosemirror-model';
-import { Transaction } from 'prosemirror-state';
-import { ContentNodeWithPos, NodeWithPos } from 'prosemirror-utils';
 export declare const findTableInlineFootnoteIds: ($pos: ResolvedPos) => Set<string>;
-export declare const getNewFootnotePos: (footnotesElement: NodeWithPos, footnoteIndex: number) => number;
-export declare const buildTableFootnoteLabels: (node: ManuscriptNode) => Map<string, string | undefined>;
-export declare const orderTableFootnotes: (tr: Transaction, footnotesElementWithPos: NodeWithPos, position: number) => Transaction;
-export declare const updateTableInlineFootnoteLabels: (tr: Transaction, table: ContentNodeWithPos) => Transaction;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "1.7.26-LEAN-3429-1",
+  "version": "1.7.27",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -31,7 +31,7 @@
     "@manuscripts/assets": "^0.6.4",
     "@manuscripts/json-schema": "^2.2.6",
     "@manuscripts/library": "^1.3.5",
-    "@manuscripts/style-guide": "1.8.2-LEAN-3429-0",
+    "@manuscripts/style-guide": "1.8.2",
     "@manuscripts/track-changes-plugin": "1.7.8",
     "@manuscripts/transform": "^2.1.6",
     "astrocite-eutils": "^0.16.4",
@@ -112,4 +112,4 @@
     "@types/react": "^17.0.2",
     "prosemirror-tables": "^1.3.5"
   }
-}
+}

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

@@ -1,43 +0,0 @@
-"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/es/plugins/table-footnote.js

@@ -1,41 +0,0 @@
-import { schema } from '@manuscripts/transform';
-import { Plugin } from 'prosemirror-state';
-import { ReplaceStep } from 'prosemirror-transform';
-import { findChildrenByType, findParentNodeClosestToPos, } from 'prosemirror-utils';
-import { orderTableFootnotes, updateTableInlineFootnoteLabels, } from './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) === schema.nodes.inline_footnote
-        : ((_b = oldState.doc.nodeAt(step.from)) === null || _b === void 0 ? void 0 : _b.type) === schema.nodes.inline_footnote;
-};
-export default () => {
-    return new Plugin({
-        appendTransaction(transactions, oldState, newState) {
-            const tableInlineFootnoteChange = transactions.find((tr) => tr.steps.find((s) => {
-                var _a;
-                if (s instanceof 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) === 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 = findParentNodeClosestToPos($pos, (node) => node.type === schema.nodes.table_element);
-            const footnotesElementWithPos = table &&
-                findChildrenByType(table.node, schema.nodes.footnotes_element).pop();
-            if (!table || !footnotesElementWithPos) {
-                return null;
-            }
-            updateTableInlineFootnoteLabels(tr, table);
-            orderTableFootnotes(tr, footnotesElementWithPos, tr.mapping.map(table.pos));
-            return tr;
-        },
-    });
-};

package/dist/types/plugins/table-footnote.d.ts

@@ -1,3 +0,0 @@
-import { Plugin } from 'prosemirror-state';
-declare const _default: () => Plugin<any>;
-export default _default;