@manuscripts/body-editor 1.7.23 → 1.7.24-LEAN-3429-0

package/dist/cjs/commands.js

@@ -25,6 +25,7 @@ const prosemirror_state_1 = require("prosemirror-state");
 const prosemirror_transform_1 = require("prosemirror-transform");
 const prosemirror_utils_1 = require("prosemirror-utils");
 const list_1 = require("./keys/list");
+const footnotes_utils_1 = require("./lib/footnotes-utils");
 const helpers_1 = require("./lib/helpers");
 const track_changes_utils_1 = require("./lib/track-changes-utils");
 const utils_1 = require("./lib/utils");
@@ -726,36 +727,32 @@ const updateCommentAnnotationState = (state, dispatch) => {
     }
 };
 exports.updateCommentAnnotationState = updateCommentAnnotationState;
-const insertTableFootnote = (node, position, state, dispatch) => {
+const insertTableFootnote = (node, position, view, tablesFootnoteLabels) => {
     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 inlineFootnoteNode = state.schema.nodes.inline_footnote.create({
-        rids: [footnote.attrs.id],
-        contents: labels.length ? Math.max(...labels) + 1 : 1,
-    });
+    const footnoteIndex = inlineFootnotes.filter(({ pos }) => position + pos >= insertedAt).length - 1;
     const tr = state.tr;
-    tr.insert(insertedAt, inlineFootnoteNode);
-    let insertionPos;
-    const footnotesElement = (0, prosemirror_utils_1.findChildrenByType)(node, transform_1.schema.nodes.footnotes_element).pop();
+    let insertionPos = position;
+    const footnotesElement = (0, prosemirror_utils_1.findChildrenByType)(node, transform_1.schema.nodes.footnotes_element)[0];
     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, tablesFootnoteLabels, footnoteIndex);
+        insertionPos = tr.mapping.map(position + footnotesElement.pos + 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;
+        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(insertionPos, footnoteElement);
         }
         else {
@@ -765,21 +762,25 @@ 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;
+                    position + tableColGroup.pos + tableColGroup.node.nodeSize;
                 tr.insert(insertionPos, tableElementFooter);
             }
             else {
                 const tableSize = (_a = node.content.firstChild) === null || _a === void 0 ? void 0 : _a.nodeSize;
                 if (tableSize) {
-                    insertionPos = position + tableSize + 2;
+                    insertionPos = position + tableSize;
                     tr.insert(insertionPos, tableElementFooter);
                 }
             }
         }
     }
-    if (dispatch && insertionPos) {
-        const nodeSelection = prosemirror_state_1.NodeSelection.create(tr.doc, insertionPos);
-        dispatch(tr.setSelection(nodeSelection));
-    }
+    const textSelection = prosemirror_state_1.TextSelection.near(tr.doc.resolve(insertionPos + 1));
+    view.focus();
+    tr.setSelection(textSelection);
+    const inlineFootnoteNode = state.schema.nodes.inline_footnote.create({
+        rids: [footnote.attrs.id],
+        contents: (footnoteIndex === -1 ? inlineFootnotes.length : footnoteIndex) + 1,
+    });
+    dispatch(tr.insert(insertedAt, inlineFootnoteNode).scrollIntoView());
 };
 exports.insertTableFootnote = insertTableFootnote;

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

@@ -20,6 +20,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 require("prosemirror-gapcursor/style/gapcursor.css");
 require("prosemirror-tables/style/tables.css");
+const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
 const prosemirror_collab_1 = require("prosemirror-collab");
 const prosemirror_dropcursor_1 = require("prosemirror-dropcursor");
 const prosemirror_history_1 = require("prosemirror-history");
@@ -41,13 +42,18 @@ const tables_cursor_fix_1 = __importDefault(require("../plugins/tables-cursor-fi
 const toc_1 = __importDefault(require("../plugins/toc"));
 const rules_1 = __importDefault(require("../rules"));
 exports.default = (props) => {
-    const plugins = props.plugins || [];
     const allPlugins = [
         rules_1.default,
         ...keys_1.default,
         (0, prosemirror_dropcursor_1.dropCursor)(),
         (0, prosemirror_history_1.history)(),
-        ...plugins,
+        (0, track_changes_plugin_1.trackChangesPlugin)({
+            userID: props.userID,
+            debug: props.debug,
+            initialStatus: props.getCapabilities().editWithoutTracking
+                ? track_changes_plugin_1.TrackChangesStatus.disabled
+                : track_changes_plugin_1.TrackChangesStatus.enabled,
+        }),
         (0, tables_cursor_fix_1.default)(),
         (0, elements_1.default)(),
         (0, persist_1.default)(),

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

@@ -23,9 +23,11 @@ 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_1 = require("../plugins/footnotes");
 const ReactSubView_1 = __importDefault(require("../views/ReactSubView"));
 const popper_1 = require("./popper");
 const track_changes_utils_1 = require("./track-changes-utils");
+const utils_1 = require("./utils");
 const popper = new popper_1.PopperManager();
 const listTypes = [transform_1.schema.nodes.ordered_list, transform_1.schema.nodes.bullet_list];
 const readonlyTypes = [transform_1.schema.nodes.keywords, transform_1.schema.nodes.bibliography_element];
@@ -188,37 +190,50 @@ class ContextMenu {
                     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);
+                            const footnotesElementWithPos = (0, prosemirror_utils_1.findChildrenByType)(this.node, transform_1.schema.nodes.footnotes_element)[0];
+                            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 = ((_a = footnotes_1.footnotesKey
+                                    .getState(this.view.state)) === null || _a === void 0 ? void 0 : _a.tablesFootnoteLabels.get(this.node.attrs.id)) ||
+                                    new Map();
+                                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, tablesFootnoteLabels);
                                             (_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;
+                                            (0, utils_1.orderTableFootnotes)(tr, notes.map(({ node }) => node), footnotes, footnotesElementWithPos, this.getPos(), inlineFootnoteIndex);
                                             tr.insert(insertedAt, node);
                                             this.view.dispatch(tr);
                                             (_a = this.props) === null || _a === void 0 ? void 0 : _a.popper.destroy();

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

@@ -0,0 +1,32 @@
+"use strict";
+/*!
+ * © 2024 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNewFootnotePos = void 0;
+const prosemirror_utils_1 = require("prosemirror-utils");
+const getNewFootnotePos = (footnotesElement, tablesFootnoteLabels, footnoteIndex) => {
+    var _a;
+    const citedFootnotes = (0, prosemirror_utils_1.flatten)(footnotesElement.node, false).filter(({ node }) => tablesFootnoteLabels === null || tablesFootnoteLabels === void 0 ? void 0 : tablesFootnoteLabels.has(node.attrs.id));
+    if (citedFootnotes.length === 0 || footnoteIndex === 0) {
+        return 2;
+    }
+    if (footnoteIndex === -1) {
+        const lastChild = citedFootnotes[citedFootnotes.length - 1];
+        return (lastChild && lastChild.pos + lastChild.node.nodeSize) || 1;
+    }
+    return ((_a = citedFootnotes[footnoteIndex]) === null || _a === void 0 ? void 0 : _a.pos) || 0;
+};
+exports.getNewFootnotePos = getNewFootnotePos;

package/dist/cjs/lib/utils.js

@@ -15,8 +15,9 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findParentElement = exports.findParentSection = exports.findParentNodeWithIdValue = exports.findParentNodeWithId = exports.getChildOfType = exports.getMatchingDescendant = exports.getMatchingChild = exports.iterateChildren = void 0;
+exports.orderTableFootnotes = exports.findParentElement = exports.findParentSection = exports.findParentNodeWithIdValue = exports.findParentNodeWithId = exports.getChildOfType = exports.getMatchingDescendant = exports.getMatchingChild = exports.iterateChildren = void 0;
 const transform_1 = require("@manuscripts/transform");
+const prosemirror_model_1 = require("prosemirror-model");
 const prosemirror_utils_1 = require("prosemirror-utils");
 function* iterateChildren(node, recurse = false) {
     for (let i = 0; i < node.childCount; i++) {
@@ -58,3 +59,22 @@ const findParentElement = (selection, validIds) => (0, prosemirror_utils_1.findP
     return (0, transform_1.isElementNodeType)(node.type) && node.attrs.id;
 })(selection);
 exports.findParentElement = findParentElement;
+const orderTableFootnotes = (tr, notes, footnotes, footnotesElementWithPos, position, inlineFootnoteIndex) => {
+    const selectedNoteMap = new Map(notes.map((note) => [note.attrs.id, note]));
+    const orderedFootnotes = [...footnotes]
+        .map((note) => {
+        if (selectedNoteMap.has(note.node.attrs.id)) {
+            return Object.assign(Object.assign({}, note), { index: inlineFootnoteIndex++ });
+        }
+        if (note.index && note.index <= inlineFootnoteIndex) {
+            return Object.assign(Object.assign({}, note), { index: note.index + 1 });
+        }
+        return note;
+    })
+        .sort(({ index: i1 }, { index: i2 }) => (i1 && i2 ? i1 - i2 : -1))
+        .map(({ node }) => node);
+    const { node: footnotesElement, pos } = footnotesElementWithPos;
+    const footnoteElementPos = position + pos;
+    tr.replaceWith(footnoteElementPos, footnoteElementPos + footnotesElement.nodeSize, prosemirror_model_1.Fragment.fromArray(orderedFootnotes));
+};
+exports.orderTableFootnotes = orderTableFootnotes;

package/dist/cjs/plugins/footnotes/index.js

@@ -30,6 +30,7 @@ const buildPluginState = (doc) => {
     const nodes = [];
     let index = 0;
     const labels = new Map();
+    const tablesFootnoteLabels = new Map();
     doc.descendants((node, pos, parentNode) => {
         if ((0, transform_1.isInlineFootnoteNode)(node) &&
             parentNode &&
@@ -39,8 +40,20 @@ const buildPluginState = (doc) => {
                 labels.set(rid, String(++index));
             });
         }
+        if (node.type === transform_1.schema.nodes.table_element) {
+            let tableFootnoteIndex = 0, labelsMap = new Map();
+            node.descendants((child, childPos) => {
+                if ((0, transform_1.isInlineFootnoteNode)(child)) {
+                    nodes.push([child, pos + childPos + child.nodeSize]);
+                    child.attrs.rids.map((rid) => labelsMap.set(rid, ++tableFootnoteIndex));
+                }
+            });
+            tablesFootnoteLabels.set(node.attrs.id, labelsMap);
+            labelsMap = new Map();
+            return false;
+        }
     });
-    return { nodes, labels };
+    return { nodes, labels, tablesFootnoteLabels };
 };
 exports.buildPluginState = buildPluginState;
 const scrollToInlineFootnote = (rid, view) => {
@@ -81,15 +94,19 @@ exports.default = () => {
         },
         appendTransaction(transactions, oldState, newState) {
             const { nodes: oldInlineFootnoteNodes } = exports.footnotesKey.getState(oldState);
-            const { nodes: inlineFootnoteNodes, labels } = exports.footnotesKey.getState(newState);
+            const { nodes: inlineFootnoteNodes, labels, tablesFootnoteLabels, } = exports.footnotesKey.getState(newState);
             if ((0, lodash_1.isEqual)(inlineFootnoteNodes, oldInlineFootnoteNodes)) {
                 return null;
             }
+            const updatedLabels = Array.from(tablesFootnoteLabels.values()).reduce((labels, footnoteLabels) => {
+                Array.from(footnoteLabels.entries()).map(([id, content]) => labels.set(id, content.toString()));
+                return labels;
+            }, labels);
             const { tr } = newState;
             inlineFootnoteNodes.forEach(([node, pos]) => {
                 const footnote = node;
                 const contents = footnote.attrs.rids
-                    .map((rid) => labels.get(rid))
+                    .map((rid) => updatedLabels.get(rid))
                     .join('');
                 if (footnote.attrs.contents !== contents) {
                     tr.setNodeMarkup(pos, undefined, Object.assign(Object.assign({}, footnote.attrs), { rids: footnote.attrs.rids, contents }));

package/dist/cjs/testing/default-editor-data.js

@@ -81,10 +81,8 @@ exports.defaultEditorProps = {
         locale: '',
     },
     getCitationProvider: () => undefined,
-    plugins: [],
     retrySync: () => Promise.resolve(),
     setComment: () => undefined,
     setSelectedComment: () => undefined,
     setEditorSelectedSuggestion: () => undefined,
-    environment: undefined,
 };

package/dist/cjs/useEditor.js

@@ -60,8 +60,7 @@ const useEditor = (props) => {
         view.current.updateState(nextState);
         const trackState = track_changes_plugin_1.trackChangesPluginKey.getState(view.current.state);
         if (collabProvider &&
-            trackState &&
-            trackState.status !== track_changes_plugin_1.TrackChangesStatus.viewSnapshots) {
+            (!trackState || trackState.status !== track_changes_plugin_1.TrackChangesStatus.viewSnapshots)) {
             const sendable = (0, prosemirror_collab_1.sendableSteps)(nextState);
             if (sendable) {
                 collabProvider.sendSteps(sendable.version, sendable.steps, sendable.clientID, !tr.isGeneric);

package/dist/es/commands.js

@@ -22,6 +22,7 @@ import { NodeSelection, TextSelection, } from 'prosemirror-state';
 import { findWrapping } from 'prosemirror-transform';
 import { findChildrenByType, findParentNodeOfType, } from 'prosemirror-utils';
 import { skipCommandTracking } from './keys/list';
+import { getNewFootnotePos } from './lib/footnotes-utils';
 import { isNodeOfType, nearestAncestor } from './lib/helpers';
 import { isDeleted, isRejectedInsert } from './lib/track-changes-utils';
 import { findParentNodeWithId, getChildOfType } from './lib/utils';
@@ -689,36 +690,32 @@ export const updateCommentAnnotationState = (state, dispatch) => {
         dispatch(tr);
     }
 };
-export const insertTableFootnote = (node, position, state, dispatch) => {
+export const insertTableFootnote = (node, position, view, tablesFootnoteLabels) => {
     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 labels = inlineFootnotes.map((nodeWithPos) => nodeWithPos.node.attrs.contents);
-    const inlineFootnoteNode = state.schema.nodes.inline_footnote.create({
-        rids: [footnote.attrs.id],
-        contents: labels.length ? Math.max(...labels) + 1 : 1,
-    });
+    const footnoteIndex = inlineFootnotes.filter(({ pos }) => position + pos >= insertedAt).length - 1;
     const tr = state.tr;
-    tr.insert(insertedAt, inlineFootnoteNode);
-    let insertionPos;
-    const footnotesElement = findChildrenByType(node, schema.nodes.footnotes_element).pop();
+    let insertionPos = position;
+    const footnotesElement = findChildrenByType(node, schema.nodes.footnotes_element)[0];
     if (footnotesElement &&
         !isDeleted(footnotesElement.node) &&
         !isRejectedInsert(footnotesElement.node)) {
-        const pos = footnotesElement.pos;
-        insertionPos = position + pos + footnotesElement.node.nodeSize + 1;
+        const footnotePos = getNewFootnotePos(footnotesElement, tablesFootnoteLabels, footnoteIndex);
+        insertionPos = tr.mapping.map(position + footnotesElement.pos + footnotePos);
         tr.insert(insertionPos, footnote);
     }
     else {
         const footnoteElement = state.schema.nodes.footnotes_element.create({}, footnote);
-        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;
+        const tableElementFooter = findChildrenByType(node, schema.nodes.table_element_footer)[0];
+        if (tableElementFooter) {
+            const pos = tableElementFooter.pos;
+            insertionPos = position + pos + tableElementFooter.node.nodeSize;
             tr.insert(insertionPos, footnoteElement);
         }
         else {
@@ -728,20 +725,24 @@ export const insertTableFootnote = (node, position, state, dispatch) => {
             const tableColGroup = findChildrenByType(node, schema.nodes.table_colgroup)[0];
             if (tableColGroup) {
                 insertionPos =
-                    position + tableColGroup.pos + tableColGroup.node.nodeSize + 2;
+                    position + tableColGroup.pos + tableColGroup.node.nodeSize;
                 tr.insert(insertionPos, tableElementFooter);
             }
             else {
                 const tableSize = (_a = node.content.firstChild) === null || _a === void 0 ? void 0 : _a.nodeSize;
                 if (tableSize) {
-                    insertionPos = position + tableSize + 2;
+                    insertionPos = position + tableSize;
                     tr.insert(insertionPos, tableElementFooter);
                 }
             }
         }
     }
-    if (dispatch && insertionPos) {
-        const nodeSelection = NodeSelection.create(tr.doc, insertionPos);
-        dispatch(tr.setSelection(nodeSelection));
-    }
+    const textSelection = TextSelection.near(tr.doc.resolve(insertionPos + 1));
+    view.focus();
+    tr.setSelection(textSelection);
+    const inlineFootnoteNode = state.schema.nodes.inline_footnote.create({
+        rids: [footnote.attrs.id],
+        contents: (footnoteIndex === -1 ? inlineFootnotes.length : footnoteIndex) + 1,
+    });
+    dispatch(tr.insert(insertedAt, inlineFootnoteNode).scrollIntoView());
 };

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

@@ -15,6 +15,7 @@
  */
 import 'prosemirror-gapcursor/style/gapcursor.css';
 import 'prosemirror-tables/style/tables.css';
+import { trackChangesPlugin, TrackChangesStatus, } from '@manuscripts/track-changes-plugin';
 import { collab } from 'prosemirror-collab';
 import { dropCursor } from 'prosemirror-dropcursor';
 import { history } from 'prosemirror-history';
@@ -36,13 +37,18 @@ import table_editing_fix from '../plugins/tables-cursor-fix';
 import toc from '../plugins/toc';
 import rules from '../rules';
 export default (props) => {
-    const plugins = props.plugins || [];
     const allPlugins = [
         rules,
         ...keys,
         dropCursor(),
         history(),
-        ...plugins,
+        trackChangesPlugin({
+            userID: props.userID,
+            debug: props.debug,
+            initialStatus: props.getCapabilities().editWithoutTracking
+                ? TrackChangesStatus.disabled
+                : TrackChangesStatus.enabled,
+        }),
         table_editing_fix(),
         elements(),
         persist(),

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

@@ -13,13 +13,15 @@
  * 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 { footnotesKey } from '../plugins/footnotes';
 import ReactSubView from '../views/ReactSubView';
 import { PopperManager } from './popper';
 import { isDeleted, isRejectedInsert } from './track-changes-utils';
+import { orderTableFootnotes } from './utils';
 const popper = new PopperManager();
 const listTypes = [schema.nodes.ordered_list, schema.nodes.bullet_list];
 const readonlyTypes = [schema.nodes.keywords, schema.nodes.bibliography_element];
@@ -181,37 +183,50 @@ export class ContextMenu {
                     menu.appendChild(this.createMenuSection((section) => {
                         section.appendChild(this.createMenuItem('Add Reference Note', () => {
                             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);
+                            const footnotesElementWithPos = findChildrenByType(this.node, schema.nodes.footnotes_element)[0];
+                            if (!footnotesElementWithPos ||
+                                isDeleted(footnotesElementWithPos.node) ||
+                                isRejectedInsert(footnotesElementWithPos.node)) {
+                                insertTableFootnote(this.node, this.getPos(), this.view);
                             }
                             else {
-                                const footnotes = findChildrenByType(footnotesElement, schema.nodes.footnote).map((nodeWithPos) => {
-                                    return nodeWithPos.node;
-                                });
+                                const tablesFootnoteLabels = ((_a = footnotesKey
+                                    .getState(this.view.state)) === null || _a === void 0 ? void 0 : _a.tablesFootnoteLabels.get(this.node.attrs.id)) ||
+                                    new Map();
+                                const footnotesWithPos = findChildrenByType(footnotesElementWithPos.node, 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 = ReactSubView(Object.assign(Object.assign({}, this.props), { dispatch: this.view.dispatch }), TableFootnotesSelector, {
                                         notes: footnotes,
                                         onAdd: () => {
                                             var _a;
-                                            const { state, dispatch } = this.view;
-                                            insertTableFootnote(this.node, this.getPos(), state, dispatch);
+                                            insertTableFootnote(this.node, this.getPos(), this.view, tablesFootnoteLabels);
                                             (_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((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;
+                                            orderTableFootnotes(tr, notes.map(({ node }) => node), footnotes, footnotesElementWithPos, this.getPos(), inlineFootnoteIndex);
                                             tr.insert(insertedAt, node);
                                             this.view.dispatch(tr);
                                             (_a = this.props) === null || _a === void 0 ? void 0 : _a.popper.destroy();

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

@@ -0,0 +1,28 @@
+/*!
+ * © 2024 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { flatten } from 'prosemirror-utils';
+export const getNewFootnotePos = (footnotesElement, tablesFootnoteLabels, footnoteIndex) => {
+    var _a;
+    const citedFootnotes = flatten(footnotesElement.node, false).filter(({ node }) => tablesFootnoteLabels === null || tablesFootnoteLabels === void 0 ? void 0 : tablesFootnoteLabels.has(node.attrs.id));
+    if (citedFootnotes.length === 0 || footnoteIndex === 0) {
+        return 2;
+    }
+    if (footnoteIndex === -1) {
+        const lastChild = citedFootnotes[citedFootnotes.length - 1];
+        return (lastChild && lastChild.pos + lastChild.node.nodeSize) || 1;
+    }
+    return ((_a = citedFootnotes[footnoteIndex]) === null || _a === void 0 ? void 0 : _a.pos) || 0;
+};

package/dist/es/lib/utils.js

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import { isElementNodeType, isSectionNodeType, } from '@manuscripts/transform';
+import { Fragment } from 'prosemirror-model';
 import { findParentNode } from 'prosemirror-utils';
 export function* iterateChildren(node, recurse = false) {
     for (let i = 0; i < node.childCount; i++) {
@@ -50,3 +51,21 @@ export const findParentElement = (selection, validIds) => findParentNode((node)
     }
     return isElementNodeType(node.type) && node.attrs.id;
 })(selection);
+export const orderTableFootnotes = (tr, notes, footnotes, footnotesElementWithPos, position, inlineFootnoteIndex) => {
+    const selectedNoteMap = new Map(notes.map((note) => [note.attrs.id, note]));
+    const orderedFootnotes = [...footnotes]
+        .map((note) => {
+        if (selectedNoteMap.has(note.node.attrs.id)) {
+            return Object.assign(Object.assign({}, note), { index: inlineFootnoteIndex++ });
+        }
+        if (note.index && note.index <= inlineFootnoteIndex) {
+            return Object.assign(Object.assign({}, note), { index: note.index + 1 });
+        }
+        return note;
+    })
+        .sort(({ index: i1 }, { index: i2 }) => (i1 && i2 ? i1 - i2 : -1))
+        .map(({ node }) => node);
+    const { node: footnotesElement, pos } = footnotesElementWithPos;
+    const footnoteElementPos = position + pos;
+    tr.replaceWith(footnoteElementPos, footnoteElementPos + footnotesElement.nodeSize, Fragment.fromArray(orderedFootnotes));
+};

package/dist/es/plugins/footnotes/index.js

@@ -27,6 +27,7 @@ export const buildPluginState = (doc) => {
     const nodes = [];
     let index = 0;
     const labels = new Map();
+    const tablesFootnoteLabels = new Map();
     doc.descendants((node, pos, parentNode) => {
         if (isInlineFootnoteNode(node) &&
             parentNode &&
@@ -36,8 +37,20 @@ export const buildPluginState = (doc) => {
                 labels.set(rid, String(++index));
             });
         }
+        if (node.type === schema.nodes.table_element) {
+            let tableFootnoteIndex = 0, labelsMap = new Map();
+            node.descendants((child, childPos) => {
+                if (isInlineFootnoteNode(child)) {
+                    nodes.push([child, pos + childPos + child.nodeSize]);
+                    child.attrs.rids.map((rid) => labelsMap.set(rid, ++tableFootnoteIndex));
+                }
+            });
+            tablesFootnoteLabels.set(node.attrs.id, labelsMap);
+            labelsMap = new Map();
+            return false;
+        }
     });
-    return { nodes, labels };
+    return { nodes, labels, tablesFootnoteLabels };
 };
 const scrollToInlineFootnote = (rid, view) => {
     view.state.doc.descendants((node, pos) => {
@@ -76,15 +89,19 @@ export default () => {
         },
         appendTransaction(transactions, oldState, newState) {
             const { nodes: oldInlineFootnoteNodes } = footnotesKey.getState(oldState);
-            const { nodes: inlineFootnoteNodes, labels } = footnotesKey.getState(newState);
+            const { nodes: inlineFootnoteNodes, labels, tablesFootnoteLabels, } = footnotesKey.getState(newState);
             if (isEqual(inlineFootnoteNodes, oldInlineFootnoteNodes)) {
                 return null;
             }
+            const updatedLabels = Array.from(tablesFootnoteLabels.values()).reduce((labels, footnoteLabels) => {
+                Array.from(footnoteLabels.entries()).map(([id, content]) => labels.set(id, content.toString()));
+                return labels;
+            }, labels);
             const { tr } = newState;
             inlineFootnoteNodes.forEach(([node, pos]) => {
                 const footnote = node;
                 const contents = footnote.attrs.rids
-                    .map((rid) => labels.get(rid))
+                    .map((rid) => updatedLabels.get(rid))
                     .join('');
                 if (footnote.attrs.contents !== contents) {
                     tr.setNodeMarkup(pos, undefined, Object.assign(Object.assign({}, footnote.attrs), { rids: footnote.attrs.rids, contents }));

package/dist/es/testing/default-editor-data.js

@@ -75,10 +75,8 @@ export const defaultEditorProps = {
         locale: '',
     },
     getCitationProvider: () => undefined,
-    plugins: [],
     retrySync: () => Promise.resolve(),
     setComment: () => undefined,
     setSelectedComment: () => undefined,
     setEditorSelectedSuggestion: () => undefined,
-    environment: undefined,
 };

package/dist/es/useEditor.js

@@ -57,8 +57,7 @@ export const useEditor = (props) => {
         view.current.updateState(nextState);
         const trackState = trackChangesPluginKey.getState(view.current.state);
         if (collabProvider &&
-            trackState &&
-            trackState.status !== TrackChangesStatus.viewSnapshots) {
+            (!trackState || trackState.status !== TrackChangesStatus.viewSnapshots)) {
             const sendable = sendableSteps(nextState);
             if (sendable) {
                 collabProvider.sendSteps(sendable.version, sendable.steps, sendable.clientID, !tr.isGeneric);

package/dist/types/commands.d.ts

@@ -19,6 +19,7 @@ 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;
@@ -56,4 +57,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, state: ManuscriptEditorState, dispatch?: Dispatch) => void;
+export declare const insertTableFootnote: (node: ManuscriptNode, position: number, view: EditorView, tablesFootnoteLabels?: Map<string, number>) => void;

package/dist/types/configs/ManuscriptsEditor.d.ts

@@ -18,7 +18,7 @@ import { CommentAnnotation, Manuscript, UserProfile } from '@manuscripts/json-sc
 import { Capabilities, FileAttachment, FileManagement } from '@manuscripts/style-guide';
 import { ManuscriptNode } from '@manuscripts/transform';
 import { History } from 'history';
-import { EditorState, Plugin } from 'prosemirror-state';
+import { EditorState } from 'prosemirror-state';
 import { EditorView } from 'prosemirror-view';
 import { DefaultTheme } from 'styled-components';
 import { CollabProvider } from '../classes/collabProvider';
@@ -34,7 +34,6 @@ export interface EditorProps {
     };
     locale: string;
     theme: DefaultTheme;
-    plugins?: Plugin[];
     getCurrentUser: () => UserProfile;
     projectID: string;
     doc: ManuscriptNode;
@@ -44,12 +43,13 @@ export interface EditorProps {
     popper: PopperManager;
     history: History;
     getCapabilities: () => Capabilities;
+    userID: string;
+    debug: boolean;
     cslProps: CSLProps;
     setComment: (comment?: CommentAnnotation) => void;
     setSelectedComment: (id?: string) => void;
     setEditorSelectedSuggestion: (id?: string) => void;
     retrySync: (componentIDs: string[]) => Promise<void>;
-    environment?: string;
     collabProvider?: CollabProvider;
 }
 export declare const createEditorState: (props: EditorProps) => EditorState;

package/dist/types/configs/editor-plugins.d.ts

@@ -32,6 +32,8 @@ interface PluginProps {
     cslProps: CSLProps;
     popper: PopperManager;
     collabProvider?: CollabProvider;
+    userID: string;
+    debug: boolean;
 }
 declare const _default: (props: PluginProps) => any[];
 export default _default;

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

@@ -0,0 +1,17 @@
+/*!
+ * © 2024 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { NodeWithPos } from 'prosemirror-utils';
+export declare const getNewFootnotePos: (footnotesElement: NodeWithPos, tablesFootnoteLabels: Map<string, number> | undefined, footnoteIndex: number) => number;

package/dist/types/lib/utils.d.ts

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ManuscriptNode, ManuscriptNodeType } from '@manuscripts/transform';
-import { Selection } from 'prosemirror-state';
+import { FootnoteNode, ManuscriptNode, ManuscriptNodeType } from '@manuscripts/transform';
+import { Selection, Transaction } from 'prosemirror-state';
+import { NodeWithPos } from 'prosemirror-utils';
 export declare function iterateChildren(node: ManuscriptNode, recurse?: boolean): Iterable<ManuscriptNode>;
 export declare const getMatchingChild: (parent: ManuscriptNode, matcher: (node: ManuscriptNode) => boolean, deep?: boolean) => ManuscriptNode | undefined;
 export declare const getMatchingDescendant: (parent: ManuscriptNode, matcher: (node: ManuscriptNode) => boolean) => ManuscriptNode | undefined;
@@ -23,3 +24,7 @@ export declare const findParentNodeWithId: (selection: Selection) => import("pro
 export declare const findParentNodeWithIdValue: (selection: Selection) => import("prosemirror-utils").ContentNodeWithPos | undefined;
 export declare const findParentSection: (selection: Selection) => import("prosemirror-utils").ContentNodeWithPos | undefined;
 export declare const findParentElement: (selection: Selection, validIds?: string[]) => import("prosemirror-utils").ContentNodeWithPos | undefined;
+export declare const orderTableFootnotes: (tr: Transaction, notes: FootnoteNode[], footnotes: {
+    node: ManuscriptNode;
+    index: number | undefined;
+}[], footnotesElementWithPos: NodeWithPos, position: number, inlineFootnoteIndex: number) => void;

package/dist/types/plugins/footnotes/index.d.ts

@@ -18,6 +18,7 @@ import { Plugin, PluginKey } from 'prosemirror-state';
 interface PluginState {
     nodes: [InlineFootnoteNode, number][];
     labels: Map<string, string>;
+    tablesFootnoteLabels: Map<string, Map<string, number>>;
 }
 export declare const footnotesKey: PluginKey<PluginState>;
 export declare const buildPluginState: (doc: ManuscriptNode) => PluginState;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "1.7.23",
+  "version": "1.7.24-LEAN-3429-0",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -31,8 +31,8 @@
     "@manuscripts/assets": "^0.6.4",
     "@manuscripts/json-schema": "^2.2.6",
     "@manuscripts/library": "^1.3.5",
-    "@manuscripts/style-guide": "^1.8.0",
-    "@manuscripts/track-changes-plugin": "^1.7.7",
+    "@manuscripts/style-guide": "1.8.1-LEAN-3429-0",
+    "@manuscripts/track-changes-plugin": "1.7.8",
     "@manuscripts/transform": "^2.1.6",
     "astrocite-eutils": "^0.16.4",
     "axios": "^1.6.7",
@@ -109,6 +109,7 @@
     "uuid": "^9.0.0"
   },
   "resolutions": {
-    "@types/react": "^17.0.2"
+    "@types/react": "^17.0.2",
+    "prosemirror-tables": "^1.3.5"
   }
-}
+}