@manuscripts/body-editor 1.8.3 → 1.8.4-LEAN-3136-2MB

package/dist/cjs/commands.js

@@ -329,7 +329,18 @@ const insertInlineFootnote = (kind) => (state, dispatch) => {
         ]);
         const backmatter = (0, prosemirror_utils_1.findChildrenByType)(tr.doc, transform_1.schema.nodes.backmatter)[0];
         tr.insert(backmatter.pos + 1, section);
-        selectionPos = backmatter.pos + section.nodeSize - 3;
+        let footnotePos = 0;
+        tr.doc.descendants((n, pos) => {
+            if ((0, transform_1.isFootnoteNode)(n)) {
+                footnotePos = pos;
+                n.descendants((childNode, childPos) => {
+                    if ((0, transform_1.isParagraphNode)(childNode)) {
+                        footnotePos += childPos;
+                    }
+                });
+            }
+        });
+        selectionPos = footnotePos + 2;
     }
     else {
         const footnoteElement = (0, prosemirror_utils_1.findChildrenByType)(footnotesSection.node, transform_1.schema.nodes.footnotes_element);
@@ -341,7 +352,7 @@ const insertInlineFootnote = (kind) => (state, dispatch) => {
         selectionPos = pos + 2;
     }
     if (dispatch && selectionPos) {
-        const selection = prosemirror_state_1.TextSelection.create(tr.doc, selectionPos);
+        const selection = prosemirror_state_1.TextSelection.near(tr.doc.resolve(selectionPos));
         dispatch(tr.setSelection(selection).scrollIntoView());
     }
     return true;

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInlineFootnotes = exports.updateTableInlineFootnoteLabels = exports.orderTableFootnotes = exports.buildTableFootnoteLabels = exports.getNewFootnotePos = exports.findTableInlineFootnoteIds = void 0;
+exports.getAlphaOrderIndices = exports.getInlineFootnotes = exports.updateTableInlineFootnoteLabels = exports.orderTableFootnotes = exports.buildTableFootnoteLabels = exports.getNewFootnotePos = exports.findTableInlineFootnoteIds = void 0;
 const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_model_1 = require("prosemirror-model");
@@ -108,3 +108,35 @@ const getInlineFootnotes = (id, tableElement) => {
     return inlineFootnotes;
 };
 exports.getInlineFootnotes = getInlineFootnotes;
+function getAlphaOrderIndices(index) {
+    const unicodeInterval = [97, 123];
+    const places = unicodeInterval[1] - unicodeInterval[0];
+    function getClassCount(n, order) {
+        return n * Math.pow(places, order - 1);
+    }
+    let indices = null;
+    for (;;) {
+        let current = index;
+        let position = 1;
+        while (current >= places) {
+            current = current / places;
+            position++;
+        }
+        const newIndex = Math.floor(current);
+        indices = indices ? indices : new Array(position).fill(0);
+        indices.splice(indices.length - position, 1, newIndex);
+        index -= getClassCount(newIndex, position);
+        if (position === 1) {
+            break;
+        }
+    }
+    return (indices || [])
+        .map((v, i, array) => {
+        if (array.length > 1 && i !== array.length - 1) {
+            return String.fromCodePoint(v + unicodeInterval[0] - 1);
+        }
+        return String.fromCodePoint(v + unicodeInterval[0]);
+    })
+        .join('');
+}
+exports.getAlphaOrderIndices = getAlphaOrderIndices;

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

@@ -18,7 +18,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uncitedFootnoteWidget = exports.buildPluginState = exports.footnotesKey = void 0;
+exports.buildPluginState = exports.uncitedFootnoteWidget = exports.footnotesKey = void 0;
+const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
 const transform_1 = require("@manuscripts/transform");
 const lodash_1 = require("lodash");
 const prosemirror_state_1 = require("prosemirror-state");
@@ -31,23 +32,6 @@ const ReactSubView_1 = __importDefault(require("../../views/ReactSubView"));
 const placeholder_1 = require("../placeholder");
 const footnotes_utils_1 = require("./footnotes-utils");
 exports.footnotesKey = new prosemirror_state_1.PluginKey('footnotes');
-const buildPluginState = (doc) => {
-    const nodes = [];
-    let index = 0;
-    const labels = new Map();
-    doc.descendants((node, pos, parentNode) => {
-        if ((0, transform_1.isInlineFootnoteNode)(node) &&
-            parentNode &&
-            parentNode.type !== transform_1.schema.nodes.table_cell) {
-            nodes.push([node, pos]);
-            node.attrs.rids.forEach((rid) => {
-                labels.set(rid, String(++index));
-            });
-        }
-    });
-    return { nodes, labels };
-};
-exports.buildPluginState = buildPluginState;
 const scrollToInlineFootnote = (rid, view) => {
     view.state.doc.descendants((node, pos) => {
         const footnote = node;
@@ -126,6 +110,38 @@ const deleteFootnoteWidget = (node, props, footnoteType, footnoteMessage, id, ta
     });
     return deleteBtn;
 };
+const buildPluginState = (doc) => {
+    const inlineFootnotes = [];
+    const footnotes = new Map();
+    let footnoteElement;
+    doc.descendants((node, pos, parentNode) => {
+        if ((0, transform_1.isFootnoteNode)(node)) {
+            footnotes.set(node.attrs.id, [node, pos]);
+        }
+        if ((0, transform_1.isFootnotesSectionNode)(node)) {
+            node.descendants((node, childPos) => {
+                if ((0, transform_1.isFootnotesElementNode)(node)) {
+                    footnoteElement = [node, pos + childPos];
+                }
+            });
+        }
+        if ((0, transform_1.isInlineFootnoteNode)(node) &&
+            parentNode &&
+            parentNode.type !== transform_1.schema.nodes.table_cell) {
+            inlineFootnotes.push([node, pos]);
+        }
+    });
+    let index = 0;
+    const labels = new Map();
+    inlineFootnotes.sort((a, b) => a[1] - b[1]);
+    inlineFootnotes.forEach(([node]) => {
+        node.attrs.rids.forEach((rid) => {
+            labels.set(rid, (0, footnotes_utils_1.getAlphaOrderIndices)(index++));
+        });
+    });
+    return { inlineFootnotes, labels, footnotes, footnoteElement };
+};
+exports.buildPluginState = buildPluginState;
 exports.default = (props) => {
     return new prosemirror_state_1.Plugin({
         key: exports.footnotesKey,
@@ -134,25 +150,59 @@ exports.default = (props) => {
                 return (0, exports.buildPluginState)(instance.doc);
             },
             apply(tr, value, oldState, newState) {
+                const prevState = exports.footnotesKey.getState(oldState);
+                if (!tr.docChanged && prevState) {
+                    return prevState;
+                }
                 return (0, exports.buildPluginState)(newState.doc);
             },
         },
         appendTransaction(transactions, oldState, newState) {
-            const { nodes: oldInlineFootnoteNodes } = exports.footnotesKey.getState(oldState);
-            const { nodes: inlineFootnoteNodes, labels } = exports.footnotesKey.getState(newState);
-            if ((0, lodash_1.isEqual)(inlineFootnoteNodes, oldInlineFootnoteNodes)) {
+            const { inlineFootnotes: oldInlineFootnoteNodes } = exports.footnotesKey.getState(oldState);
+            const { inlineFootnotes: inlineFootnoteNodes, footnotes, labels, footnoteElement, } = exports.footnotesKey.getState(newState);
+            const prevIds = oldInlineFootnoteNodes.map(([node]) => node.attrs.rids);
+            const newIds = inlineFootnoteNodes.map(([node]) => node.attrs.rids);
+            if (!footnoteElement || (0, lodash_1.isEqual)(prevIds, newIds) || newIds.length < 2) {
                 return null;
             }
             const { tr } = newState;
+            const footnotesReordered = [];
+            const footnotesRest = new Map(footnotes);
             inlineFootnoteNodes.forEach(([node, pos]) => {
                 const footnote = node;
                 const contents = footnote.attrs.rids
-                    .map((rid) => labels.get(rid))
+                    .map((rid) => {
+                    const currentfNode = footnotesRest.get(rid);
+                    if (currentfNode) {
+                        footnotesReordered.push(currentfNode[0]);
+                        footnotesRest.delete(rid);
+                    }
+                    return labels.get(rid);
+                })
                     .join('');
                 if (footnote.attrs.contents !== contents) {
                     tr.setNodeMarkup(pos, undefined, Object.assign(Object.assign({}, footnote.attrs), { rids: footnote.attrs.rids, contents }));
                 }
             });
+            footnotesRest.forEach(([node]) => footnotesReordered.push(node));
+            const newFElement = transform_1.schema.nodes.footnotes_element.create(footnoteElement[0].attrs, footnotesReordered);
+            if (newFElement) {
+                tr.replaceWith(footnoteElement[1], footnoteElement[1] + footnoteElement[0].nodeSize, newFElement);
+            }
+            const prevSelection = newState.selection;
+            const selectedFootnote = (0, prosemirror_utils_1.findParentNodeClosestToPos)(prevSelection.$anchor, (node) => (0, transform_1.isFootnoteNode)(node));
+            if (selectedFootnote && footnotes.size > 1) {
+                let newFootnotePos = 0;
+                for (let i = 0; i < footnotesReordered.length; i++) {
+                    const node = footnotesReordered[i];
+                    newFootnotePos += node.nodeSize;
+                    if (node.attrs.id === selectedFootnote.node.attrs.id) {
+                        break;
+                    }
+                }
+                tr.setSelection(prosemirror_state_1.TextSelection.create(tr.doc, footnoteElement[1] + newFootnotePos));
+            }
+            (0, track_changes_plugin_1.skipTracking)(tr);
             return tr;
         },
         props: {

package/dist/es/commands.js

@@ -15,7 +15,7 @@
  */
 import { ObjectTypes } from '@manuscripts/json-schema';
 import { skipTracking } from '@manuscripts/track-changes-plugin';
-import { buildComment, generateID, isElementNodeType, isInBibliographySection, isListNode, isSectionNodeType, schema, } from '@manuscripts/transform';
+import { buildComment, generateID, isElementNodeType, isFootnoteNode, isInBibliographySection, isListNode, isParagraphNode, isSectionNodeType, schema, } from '@manuscripts/transform';
 import { NodeRange } from 'prosemirror-model';
 import { wrapInList } from 'prosemirror-schema-list';
 import { NodeSelection, TextSelection, } from 'prosemirror-state';
@@ -310,7 +310,18 @@ export const insertInlineFootnote = (kind) => (state, dispatch) => {
         ]);
         const backmatter = findChildrenByType(tr.doc, schema.nodes.backmatter)[0];
         tr.insert(backmatter.pos + 1, section);
-        selectionPos = backmatter.pos + section.nodeSize - 3;
+        let footnotePos = 0;
+        tr.doc.descendants((n, pos) => {
+            if (isFootnoteNode(n)) {
+                footnotePos = pos;
+                n.descendants((childNode, childPos) => {
+                    if (isParagraphNode(childNode)) {
+                        footnotePos += childPos;
+                    }
+                });
+            }
+        });
+        selectionPos = footnotePos + 2;
     }
     else {
         const footnoteElement = findChildrenByType(footnotesSection.node, schema.nodes.footnotes_element);
@@ -322,7 +333,7 @@ export const insertInlineFootnote = (kind) => (state, dispatch) => {
         selectionPos = pos + 2;
     }
     if (dispatch && selectionPos) {
-        const selection = TextSelection.create(tr.doc, selectionPos);
+        const selection = TextSelection.near(tr.doc.resolve(selectionPos));
         dispatch(tr.setSelection(selection).scrollIntoView());
     }
     return true;

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

@@ -99,3 +99,34 @@ export const getInlineFootnotes = (id, tableElement) => {
     });
     return inlineFootnotes;
 };
+export function getAlphaOrderIndices(index) {
+    const unicodeInterval = [97, 123];
+    const places = unicodeInterval[1] - unicodeInterval[0];
+    function getClassCount(n, order) {
+        return n * Math.pow(places, order - 1);
+    }
+    let indices = null;
+    for (;;) {
+        let current = index;
+        let position = 1;
+        while (current >= places) {
+            current = current / places;
+            position++;
+        }
+        const newIndex = Math.floor(current);
+        indices = indices ? indices : new Array(position).fill(0);
+        indices.splice(indices.length - position, 1, newIndex);
+        index -= getClassCount(newIndex, position);
+        if (position === 1) {
+            break;
+        }
+    }
+    return (indices || [])
+        .map((v, i, array) => {
+        if (array.length > 1 && i !== array.length - 1) {
+            return String.fromCodePoint(v + unicodeInterval[0] - 1);
+        }
+        return String.fromCodePoint(v + unicodeInterval[0]);
+    })
+        .join('');
+}

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

@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { isFootnoteNode, isInlineFootnoteNode, schema, } from '@manuscripts/transform';
+import { skipTracking } from '@manuscripts/track-changes-plugin';
+import { isFootnoteNode, isFootnotesElementNode, isFootnotesSectionNode, isInlineFootnoteNode, schema, } from '@manuscripts/transform';
 import { isEqual } from 'lodash';
-import { NodeSelection, Plugin, PluginKey } from 'prosemirror-state';
+import { NodeSelection, Plugin, PluginKey, TextSelection, } from 'prosemirror-state';
 import { findParentNodeClosestToPos, findParentNodeOfType, hasParentNodeOfType, } from 'prosemirror-utils';
 import { Decoration, DecorationSet } from 'prosemirror-view';
 import { alertIcon, deleteIcon } from '../../assets';
@@ -23,24 +24,8 @@ import { DeleteFootnoteDialog, } from '../../components/views/DeleteFootnoteDial
 import { findParentNodeWithIdValue, getChildOfType } from '../../lib/utils';
 import ReactSubView from '../../views/ReactSubView';
 import { placeholderWidget } from '../placeholder';
-import { findTableInlineFootnoteIds, getInlineFootnotes, } from './footnotes-utils';
+import { findTableInlineFootnoteIds, getAlphaOrderIndices, getInlineFootnotes, } from './footnotes-utils';
 export const footnotesKey = new PluginKey('footnotes');
-export const buildPluginState = (doc) => {
-    const nodes = [];
-    let index = 0;
-    const labels = new Map();
-    doc.descendants((node, pos, parentNode) => {
-        if (isInlineFootnoteNode(node) &&
-            parentNode &&
-            parentNode.type !== schema.nodes.table_cell) {
-            nodes.push([node, pos]);
-            node.attrs.rids.forEach((rid) => {
-                labels.set(rid, String(++index));
-            });
-        }
-    });
-    return { nodes, labels };
-};
 const scrollToInlineFootnote = (rid, view) => {
     view.state.doc.descendants((node, pos) => {
         const footnote = node;
@@ -118,6 +103,37 @@ const deleteFootnoteWidget = (node, props, footnoteType, footnoteMessage, id, ta
     });
     return deleteBtn;
 };
+export const buildPluginState = (doc) => {
+    const inlineFootnotes = [];
+    const footnotes = new Map();
+    let footnoteElement;
+    doc.descendants((node, pos, parentNode) => {
+        if (isFootnoteNode(node)) {
+            footnotes.set(node.attrs.id, [node, pos]);
+        }
+        if (isFootnotesSectionNode(node)) {
+            node.descendants((node, childPos) => {
+                if (isFootnotesElementNode(node)) {
+                    footnoteElement = [node, pos + childPos];
+                }
+            });
+        }
+        if (isInlineFootnoteNode(node) &&
+            parentNode &&
+            parentNode.type !== schema.nodes.table_cell) {
+            inlineFootnotes.push([node, pos]);
+        }
+    });
+    let index = 0;
+    const labels = new Map();
+    inlineFootnotes.sort((a, b) => a[1] - b[1]);
+    inlineFootnotes.forEach(([node]) => {
+        node.attrs.rids.forEach((rid) => {
+            labels.set(rid, getAlphaOrderIndices(index++));
+        });
+    });
+    return { inlineFootnotes, labels, footnotes, footnoteElement };
+};
 export default (props) => {
     return new Plugin({
         key: footnotesKey,
@@ -126,25 +142,59 @@ export default (props) => {
                 return buildPluginState(instance.doc);
             },
             apply(tr, value, oldState, newState) {
+                const prevState = footnotesKey.getState(oldState);
+                if (!tr.docChanged && prevState) {
+                    return prevState;
+                }
                 return buildPluginState(newState.doc);
             },
         },
         appendTransaction(transactions, oldState, newState) {
-            const { nodes: oldInlineFootnoteNodes } = footnotesKey.getState(oldState);
-            const { nodes: inlineFootnoteNodes, labels } = footnotesKey.getState(newState);
-            if (isEqual(inlineFootnoteNodes, oldInlineFootnoteNodes)) {
+            const { inlineFootnotes: oldInlineFootnoteNodes } = footnotesKey.getState(oldState);
+            const { inlineFootnotes: inlineFootnoteNodes, footnotes, labels, footnoteElement, } = footnotesKey.getState(newState);
+            const prevIds = oldInlineFootnoteNodes.map(([node]) => node.attrs.rids);
+            const newIds = inlineFootnoteNodes.map(([node]) => node.attrs.rids);
+            if (!footnoteElement || isEqual(prevIds, newIds) || newIds.length < 2) {
                 return null;
             }
             const { tr } = newState;
+            const footnotesReordered = [];
+            const footnotesRest = new Map(footnotes);
             inlineFootnoteNodes.forEach(([node, pos]) => {
                 const footnote = node;
                 const contents = footnote.attrs.rids
-                    .map((rid) => labels.get(rid))
+                    .map((rid) => {
+                    const currentfNode = footnotesRest.get(rid);
+                    if (currentfNode) {
+                        footnotesReordered.push(currentfNode[0]);
+                        footnotesRest.delete(rid);
+                    }
+                    return labels.get(rid);
+                })
                     .join('');
                 if (footnote.attrs.contents !== contents) {
                     tr.setNodeMarkup(pos, undefined, Object.assign(Object.assign({}, footnote.attrs), { rids: footnote.attrs.rids, contents }));
                 }
             });
+            footnotesRest.forEach(([node]) => footnotesReordered.push(node));
+            const newFElement = schema.nodes.footnotes_element.create(footnoteElement[0].attrs, footnotesReordered);
+            if (newFElement) {
+                tr.replaceWith(footnoteElement[1], footnoteElement[1] + footnoteElement[0].nodeSize, newFElement);
+            }
+            const prevSelection = newState.selection;
+            const selectedFootnote = findParentNodeClosestToPos(prevSelection.$anchor, (node) => isFootnoteNode(node));
+            if (selectedFootnote && footnotes.size > 1) {
+                let newFootnotePos = 0;
+                for (let i = 0; i < footnotesReordered.length; i++) {
+                    const node = footnotesReordered[i];
+                    newFootnotePos += node.nodeSize;
+                    if (node.attrs.id === selectedFootnote.node.attrs.id) {
+                        break;
+                    }
+                }
+                tr.setSelection(TextSelection.create(tr.doc, footnoteElement[1] + newFootnotePos));
+            }
+            skipTracking(tr);
             return tr;
         },
         props: {

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

@@ -27,4 +27,5 @@ interface InlineFootnote {
     pos: number;
 }
 export declare const getInlineFootnotes: (id: string, tableElement: NodeWithPos) => InlineFootnote[];
+export declare function getAlphaOrderIndices(index: number): string;
 export {};

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

@@ -13,15 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { InlineFootnoteNode, ManuscriptNode } from '@manuscripts/transform';
+import { FootnoteNode, FootnotesElementNode, InlineFootnoteNode, ManuscriptNode } from '@manuscripts/transform';
 import { Plugin, PluginKey } from 'prosemirror-state';
 import { PluginProps } from '../../configs/editor-plugins';
 interface PluginState {
-    nodes: [InlineFootnoteNode, number][];
+    inlineFootnotes: [InlineFootnoteNode, number][];
     labels: Map<string, string>;
+    footnotes: Map<string, [FootnoteNode, number]>;
+    footnoteElement?: [FootnotesElementNode, number];
 }
 export declare const footnotesKey: PluginKey<PluginState>;
-export declare const buildPluginState: (doc: ManuscriptNode) => PluginState;
 export declare const uncitedFootnoteWidget: () => () => HTMLSpanElement;
+export declare const buildPluginState: (doc: ManuscriptNode) => PluginState;
 declare const _default: (props: PluginProps) => Plugin<PluginState>;
 export default _default;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "1.8.3",
+  "version": "1.8.4-LEAN-3136-2MB",
   "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.7",
     "@manuscripts/library": "^1.3.6",
-    "@manuscripts/style-guide": "1.11.1",
-    "@manuscripts/track-changes-plugin": "1.7.9",
-    "@manuscripts/transform": "2.2.0",
+    "@manuscripts/style-guide": "^1.11.2",
+    "@manuscripts/track-changes-plugin": "1.7.10-LEAN-3136-2MB",
+    "@manuscripts/transform": "^2.2.1",
     "astrocite-eutils": "^0.16.4",
     "axios": "^1.6.7",
     "mathjax-full": "^3.2.2",