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

package/dist/cjs/commands.js

@@ -311,17 +311,18 @@ const insertInlineFootnote = (kind) => (state, dispatch) => {
         id: (0, transform_1.generateID)(json_schema_1.ObjectTypes.Footnote),
         kind,
     });
-    const insertedAt = state.selection.to;
     const node = state.schema.nodes.inline_footnote.create({
         rids: [footnote.attrs.id],
     });
-    const tr = state.tr;
+    const insertedAt = state.selection.to;
+    const { tr } = state;
     tr.insert(insertedAt, node);
     const footnotesSection = (0, prosemirror_utils_1.findChildrenByType)(tr.doc, transform_1.schema.nodes.footnotes_section)[0];
     let selectionPos;
     if (!footnotesSection) {
+        const sectionTitle = 'Footnotes';
         const section = state.schema.nodes.footnotes_section.create({}, [
-            state.schema.nodes.section_title.create({}, state.schema.text('Notes')),
+            state.schema.nodes.section_title.create({}, state.schema.text(sectionTitle)),
             state.schema.nodes.footnotes_element.create({}, footnote),
         ]);
         const backmatter = (0, prosemirror_utils_1.findChildrenByType)(tr.doc, transform_1.schema.nodes.backmatter)[0];
@@ -330,10 +331,25 @@ const insertInlineFootnote = (kind) => (state, dispatch) => {
     }
     else {
         const footnoteElement = (0, prosemirror_utils_1.findChildrenByType)(footnotesSection.node, transform_1.schema.nodes.footnotes_element);
-        const pos = footnotesSection.pos +
-            footnoteElement[0].pos +
-            footnoteElement[0].node.nodeSize -
-            1;
+        let index = 0;
+        state.doc.slice(0, insertedAt).content.descendants((node) => {
+            if (node.type === transform_1.schema.nodes.inline_footnote) {
+                index++;
+                return false;
+            }
+        });
+        let correctPosition = 0;
+        if (index != 0) {
+            footnoteElement[0].node.descendants((node, pos, parent, nodeIndex) => {
+                if (node.type === transform_1.schema.nodes.footnote) {
+                    if (index > nodeIndex) {
+                        correctPosition = pos + node.nodeSize;
+                        return false;
+                    }
+                }
+            });
+        }
+        const pos = footnotesSection.pos + footnoteElement[0].pos + correctPosition + 2;
         tr.insert(pos, footnote);
         selectionPos = pos + 2;
     }

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/plugins/footnotes/footnotes-utils.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findTableInlineFootnoteIds = void 0;
+exports.createFootnoteLabel = exports.findTableInlineFootnoteIds = void 0;
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_utils_1 = require("prosemirror-utils");
 const findTableInlineFootnoteIds = ($pos) => {
@@ -28,3 +28,15 @@ const findTableInlineFootnoteIds = ($pos) => {
         : []);
 };
 exports.findTableInlineFootnoteIds = findTableInlineFootnoteIds;
+const createFootnoteLabel = (id) => {
+    const _id = parseInt(id, 10) + 1;
+    const START = 96;
+    const RANGE = 26;
+    const id1 = _id % RANGE || RANGE;
+    const id2 = Math.ceil(_id / RANGE);
+    const label = id2 === 1
+        ? String.fromCharCode(START + id1)
+        : `${String.fromCharCode(START + id2 - 1)}${String.fromCharCode(START + id1)}`;
+    return label;
+};
+exports.createFootnoteLabel = createFootnoteLabel;

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uncitedFootnoteWidget = exports.buildPluginState = exports.footnotesKey = void 0;
+exports.getFootnotesPluginState = exports.uncitedFootnoteWidget = exports.buildPluginState = exports.footnotesKey = void 0;
 const transform_1 = require("@manuscripts/transform");
 const lodash_1 = require("lodash");
 const prosemirror_state_1 = require("prosemirror-state");
@@ -36,7 +36,7 @@ const buildPluginState = (doc) => {
             parentNode.type !== transform_1.schema.nodes.table_cell) {
             nodes.push([node, pos]);
             node.attrs.rids.forEach((rid) => {
-                labels.set(rid, String(++index));
+                labels.set(rid, (0, footnotes_utils_1.createFootnoteLabel)(String(index++)));
             });
         }
     });
@@ -45,8 +45,9 @@ const buildPluginState = (doc) => {
 exports.buildPluginState = buildPluginState;
 const scrollToInlineFootnote = (rid, view) => {
     view.state.doc.descendants((node, pos) => {
+        var _a;
         const footnote = node;
-        if (footnote.attrs.rids.includes(rid)) {
+        if ((_a = footnote.attrs.rids) === null || _a === void 0 ? void 0 : _a.includes(rid)) {
             const selection = prosemirror_state_1.NodeSelection.create(view.state.doc, pos);
             view.dispatch(view.state.tr.setSelection(selection).scrollIntoView());
         }
@@ -148,3 +149,7 @@ exports.default = () => {
         },
     });
 };
+const getFootnotesPluginState = (state) => {
+    return exports.footnotesKey.getState(state);
+};
+exports.getFootnotesPluginState = getFootnotesPluginState;

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/cjs/views/inline_footnote.js

@@ -23,7 +23,7 @@ class InlineFootnoteView extends base_node_view_1.BaseNodeView {
     constructor() {
         super(...arguments);
         this.handleClick = () => {
-            this.props.history.push(Object.assign(Object.assign({}, this.props.history.location), { hash: '#' + this.node.attrs.rid }));
+            this.props.history.push(Object.assign(Object.assign({}, this.props.history.location), { hash: '#' + this.node.attrs.rids[0] }));
         };
         this.updateContents = () => {
             this.setDomAttrs(this.node, this.dom);

package/dist/es/commands.js

@@ -292,17 +292,18 @@ export const insertInlineFootnote = (kind) => (state, dispatch) => {
         id: generateID(ObjectTypes.Footnote),
         kind,
     });
-    const insertedAt = state.selection.to;
     const node = state.schema.nodes.inline_footnote.create({
         rids: [footnote.attrs.id],
     });
-    const tr = state.tr;
+    const insertedAt = state.selection.to;
+    const { tr } = state;
     tr.insert(insertedAt, node);
     const footnotesSection = findChildrenByType(tr.doc, schema.nodes.footnotes_section)[0];
     let selectionPos;
     if (!footnotesSection) {
+        const sectionTitle = 'Footnotes';
         const section = state.schema.nodes.footnotes_section.create({}, [
-            state.schema.nodes.section_title.create({}, state.schema.text('Notes')),
+            state.schema.nodes.section_title.create({}, state.schema.text(sectionTitle)),
             state.schema.nodes.footnotes_element.create({}, footnote),
         ]);
         const backmatter = findChildrenByType(tr.doc, schema.nodes.backmatter)[0];
@@ -311,10 +312,25 @@ export const insertInlineFootnote = (kind) => (state, dispatch) => {
     }
     else {
         const footnoteElement = findChildrenByType(footnotesSection.node, schema.nodes.footnotes_element);
-        const pos = footnotesSection.pos +
-            footnoteElement[0].pos +
-            footnoteElement[0].node.nodeSize -
-            1;
+        let index = 0;
+        state.doc.slice(0, insertedAt).content.descendants((node) => {
+            if (node.type === schema.nodes.inline_footnote) {
+                index++;
+                return false;
+            }
+        });
+        let correctPosition = 0;
+        if (index != 0) {
+            footnoteElement[0].node.descendants((node, pos, parent, nodeIndex) => {
+                if (node.type === schema.nodes.footnote) {
+                    if (index > nodeIndex) {
+                        correctPosition = pos + node.nodeSize;
+                        return false;
+                    }
+                }
+            });
+        }
+        const pos = footnotesSection.pos + footnoteElement[0].pos + correctPosition + 2;
         tr.insert(pos, footnote);
         selectionPos = pos + 2;
     }

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/plugins/footnotes/footnotes-utils.js

@@ -24,3 +24,14 @@ export const findTableInlineFootnoteIds = ($pos) => {
             .flat()
         : []);
 };
+export const createFootnoteLabel = (id) => {
+    const _id = parseInt(id, 10) + 1;
+    const START = 96;
+    const RANGE = 26;
+    const id1 = _id % RANGE || RANGE;
+    const id2 = Math.ceil(_id / RANGE);
+    const label = id2 === 1
+        ? String.fromCharCode(START + id1)
+        : `${String.fromCharCode(START + id2 - 1)}${String.fromCharCode(START + id1)}`;
+    return label;
+};

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

@@ -15,13 +15,13 @@
  */
 import { isFootnoteNode, isInlineFootnoteNode, schema, } from '@manuscripts/transform';
 import { isEqual } from 'lodash';
-import { NodeSelection, Plugin, PluginKey } from 'prosemirror-state';
+import { NodeSelection, Plugin, PluginKey, } from 'prosemirror-state';
 import { hasParentNodeOfType } from 'prosemirror-utils';
 import { Decoration, DecorationSet } from 'prosemirror-view';
 import { alertIcon } from '../../assets';
 import { findParentNodeWithIdValue } from '../../lib/utils';
 import { placeholderWidget } from '../placeholder';
-import { findTableInlineFootnoteIds } from './footnotes-utils';
+import { createFootnoteLabel, findTableInlineFootnoteIds, } from './footnotes-utils';
 export const footnotesKey = new PluginKey('footnotes');
 export const buildPluginState = (doc) => {
     const nodes = [];
@@ -33,7 +33,7 @@ export const buildPluginState = (doc) => {
             parentNode.type !== schema.nodes.table_cell) {
             nodes.push([node, pos]);
             node.attrs.rids.forEach((rid) => {
-                labels.set(rid, String(++index));
+                labels.set(rid, createFootnoteLabel(String(index++)));
             });
         }
     });
@@ -41,8 +41,9 @@ export const buildPluginState = (doc) => {
 };
 const scrollToInlineFootnote = (rid, view) => {
     view.state.doc.descendants((node, pos) => {
+        var _a;
         const footnote = node;
-        if (footnote.attrs.rids.includes(rid)) {
+        if ((_a = footnote.attrs.rids) === null || _a === void 0 ? void 0 : _a.includes(rid)) {
             const selection = NodeSelection.create(view.state.doc, pos);
             view.dispatch(view.state.tr.setSelection(selection).scrollIntoView());
         }
@@ -143,3 +144,6 @@ export default () => {
         },
     });
 };
+export const getFootnotesPluginState = (state) => {
+    return footnotesKey.getState(state);
+};

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/es/views/inline_footnote.js

@@ -20,7 +20,7 @@ export class InlineFootnoteView extends BaseNodeView {
     constructor() {
         super(...arguments);
         this.handleClick = () => {
-            this.props.history.push(Object.assign(Object.assign({}, this.props.history.location), { hash: '#' + this.node.attrs.rid }));
+            this.props.history.push(Object.assign(Object.assign({}, this.props.history.location), { hash: '#' + this.node.attrs.rids[0] }));
         };
         this.updateContents = () => {
             this.setDomAttrs(this.node, this.dom);

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/plugins/footnotes/footnotes-utils.d.ts

@@ -15,3 +15,4 @@
  */
 import { ResolvedPos } from 'prosemirror-model';
 export declare const findTableInlineFootnoteIds: ($pos: ResolvedPos) => Set<string>;
+export declare const createFootnoteLabel: (id: string) => string;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { InlineFootnoteNode, ManuscriptNode } from '@manuscripts/transform';
-import { Plugin, PluginKey } from 'prosemirror-state';
+import { EditorState, Plugin, PluginKey } from 'prosemirror-state';
 interface PluginState {
     nodes: [InlineFootnoteNode, number][];
     labels: Map<string, string>;
@@ -24,3 +24,4 @@ export declare const buildPluginState: (doc: ManuscriptNode) => PluginState;
 export declare const uncitedFootnoteWidget: () => () => HTMLSpanElement;
 declare const _default: () => Plugin<PluginState>;
 export default _default;
+export declare const getFootnotesPluginState: (state: EditorState) => 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-3338-0",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -31,9 +31,9 @@
     "@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/transform": "^2.1.6",
+    "@manuscripts/style-guide": "1.8.1",
+    "@manuscripts/track-changes-plugin": "1.7.8",
+    "@manuscripts/transform": "^2.1.8",
     "astrocite-eutils": "^0.16.4",
     "axios": "^1.6.7",
     "mathjax-full": "^3.2.2",
@@ -109,6 +109,7 @@
     "uuid": "^9.0.0"
   },
   "resolutions": {
-    "@types/react": "^17.0.2"
+    "@types/react": "^17.0.2",
+    "prosemirror-tables": "^1.3.5"
   }
-}
+}

package/styles/Editor.css

@@ -162,7 +162,7 @@
 .ProseMirror sub {
   line-height: 0;
 }
-
+.ProseMirror .footnote,
 .ProseMirror .citation,
 .ProseMirror .cross-reference {
   font-weight: bold;
@@ -991,10 +991,18 @@
 .table-footer > div:has(> p.footnote-selected) > p:last-child {
   border-bottom: 1px solid #bce7f6;
 }
+
+.ProseMirror .footnotes-element .block > div p {
+    display: flex;
+}
+.ProseMirror .footnotes-element .block > div p > ins {
+  flex: 1 0 auto;
+}
+
 .ProseMirror .footnote-label {
+  flex: 0 0 auto;
   vertical-align: super;
   font-size: 75%;
-  margin-right: 8px;
   cursor: pointer;
 }