@manuscripts/body-editor 1.9.5 → 1.9.7-LEAN-3136

package/dist/cjs/commands.js

@@ -59,7 +59,10 @@ const blockActive = (type) => (state) => {
 };
 exports.blockActive = blockActive;
 const canInsert = (type) => (state) => {
-    const { $from } = state.selection;
+    const { $from, $to } = state.selection;
+    if ($from.node().type === transform_1.schema.nodes.title && $from.pos === $to.pos) {
+        return false;
+    }
     for (let d = $from.depth; d >= 0; d--) {
         const index = $from.index(d);
         if ($from.node(d).canReplaceWith(index, index, type)) {
@@ -324,12 +327,24 @@ const insertInlineFootnote = (kind) => (state, dispatch) => {
     let selectionPos;
     if (!footnotesSection) {
         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('Footnotes')),
             state.schema.nodes.footnotes_element.create({}, footnote),
         ]);
         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;
+        const sectionPos = backmatter.pos + 1;
+        tr.insert(sectionPos, section);
+        let footnotePos = 0;
+        section.descendants((n, pos) => {
+            if ((0, transform_1.isFootnoteNode)(n)) {
+                footnotePos = pos;
+                n.descendants((childNode, childPos) => {
+                    if ((0, transform_1.isParagraphNode)(childNode)) {
+                        footnotePos += childPos;
+                    }
+                });
+            }
+        });
+        selectionPos = sectionPos + footnotePos;
     }
     else {
         const footnoteElement = (0, prosemirror_utils_1.findChildrenByType)(footnotesSection.node, transform_1.schema.nodes.footnotes_element);
@@ -341,7 +356,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;
@@ -708,10 +723,13 @@ const addBlockComment = (node, state, dispatch) => {
         [highlight_1.SET_COMMENT]: comment,
     });
     tr.setMeta('addToHistory', false);
-    if (dispatch && isAllowedType(type)) {
-        dispatch(tr);
+    if (isAllowedType(type)) {
+        dispatch && dispatch(tr);
+        return true;
+    }
+    else {
+        return false;
     }
-    return true;
 };
 const addHighlightComment = (node, state, dispatch) => {
     const { attrs: { id }, type, } = node;

package/dist/cjs/configs/ManuscriptsEditor.js

@@ -32,18 +32,24 @@ const createEditorState = (props) => prosemirror_state_1.EditorState.create({
     plugins: (0, editor_plugins_1.default)(props),
 });
 exports.createEditorState = createEditorState;
-const createEditorView = (props, root, state, dispatch) => new prosemirror_view_1.EditorView(root, {
-    state,
-    editable: () => props.getCapabilities().editArticle,
-    scrollMargin: {
-        top: 100,
-        bottom: 100,
-        left: 0,
-        right: 0,
-    },
-    dispatchTransaction: dispatch,
-    nodeViews: (0, editor_views_1.default)(props, dispatch),
-    attributes: props.attributes,
-    transformPasted: paste_1.transformPasted,
-});
+const createEditorView = (props, root, state, dispatch) => {
+    const view = new prosemirror_view_1.EditorView(root, {
+        state,
+        editable: () => props.getCapabilities().editArticle,
+        scrollMargin: {
+            top: 100,
+            bottom: 100,
+            left: 0,
+            right: 0,
+        },
+        dispatchTransaction: dispatch,
+        nodeViews: (0, editor_views_1.default)(props, dispatch),
+        attributes: props.attributes,
+        transformPasted: paste_1.transformPasted,
+    });
+    const tr = view.state.tr.setMeta('INIT', true);
+    const nextState = view.state.apply(tr);
+    view.updateState(nextState);
+    return view;
+};
 exports.createEditorView = createEditorView;

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

@@ -69,7 +69,7 @@ exports.default = (props, dispatch) => {
         footnote: (0, footnote_editable_1.default)(props),
         footnotes_element: (0, footnotes_element_1.default)(props),
         inline_equation: (0, inline_equation_editable_1.default)(props),
-        inline_footnote: (0, inline_footnote_editable_1.default)(props),
+        inline_footnote: (0, inline_footnote_editable_1.default)(props, dispatch),
         keyword: (0, keyword_1.default)(props, dispatch),
         keyword_group: (0, keyword_group_1.default)(props, dispatch),
         link: (0, link_editable_1.default)(props, dispatch),

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

@@ -214,7 +214,10 @@ class ContextMenu {
                                     index: tablesFootnoteLabels.get(node.attrs.id),
                                 }));
                                 const targetDom = this.view.domAtPos(this.view.state.selection.from);
-                                if (targetDom.node instanceof Element && this.props) {
+                                const targetNode = targetDom.node.nodeType === Node.TEXT_NODE
+                                    ? targetDom.node.parentNode
+                                    : targetDom.node;
+                                if (targetNode 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: () => {
@@ -251,7 +254,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');
+                                    (_a = this.props) === null || _a === void 0 ? void 0 : _a.popper.show(targetNode, popperContainer, 'bottom-end');
                                 }
                             }
                         }));

package/dist/cjs/plugins/affiliations.js

@@ -74,6 +74,9 @@ exports.default = () => {
         },
         appendTransaction(transactions, oldState, newState) {
             const { indexedAffiliationIds } = exports.affiliationsKey.getState(newState);
+            if (!transactions.find((tr) => tr.docChanged)) {
+                return;
+            }
             const oldPluginState = exports.affiliationsKey.getState(oldState);
             const { tr } = newState;
             const affiliations = [];

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

@@ -54,7 +54,7 @@ exports.default = (props) => {
         props: {
             decorations(state) {
                 const bib = (0, exports.getBibliographyPluginState)(state);
-                return prosemirror_view_1.DecorationSet.create(state.doc, (0, bibliography_utils_1.buildDecorations)(bib, state.doc));
+                return prosemirror_view_1.DecorationSet.create(state.doc, bib ? (0, bibliography_utils_1.buildDecorations)(bib, state.doc) : []);
             },
         },
     });

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");
@@ -113,3 +113,35 @@ const getInlineFootnotes = (id, targetNode) => {
     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,27 +32,10 @@ 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;
-        if (footnote.attrs.rids.includes(rid)) {
+        if ((0, transform_1.isInlineFootnoteNode)(node) && footnote.attrs.rids.includes(rid)) {
             const selection = prosemirror_state_1.NodeSelection.create(view.state.doc, pos);
             view.dispatch(view.state.tr.setSelection(selection).scrollIntoView());
         }
@@ -61,7 +45,7 @@ const labelWidget = (label, id) => (view) => {
     const element = document.createElement('span');
     element.className = 'footnote-label';
     element.textContent = label;
-    element.addEventListener('click', () => {
+    element.addEventListener('mousedown', () => {
         scrollToInlineFootnote(id, view);
     });
     return element;
@@ -136,6 +120,39 @@ const deleteFootnoteWidget = (node, props, id, tableElement) => (view, getPos) =
     });
     return deleteBtn;
 };
+const buildPluginState = (doc) => {
+    const inlineFootnotes = [];
+    const footnotes = new Map();
+    let footnoteElement;
+    doc.descendants((node, pos, parentNode) => {
+        if ((0, transform_1.isFootnotesSectionNode)(node)) {
+            node.descendants((node, childPos) => {
+                if ((0, transform_1.isFootnotesElementNode)(node)) {
+                    footnoteElement = [node, pos + childPos];
+                }
+                if ((0, transform_1.isFootnoteNode)(node)) {
+                    footnotes.set(node.attrs.id, [node, pos + childPos]);
+                }
+            });
+        }
+        if ((0, transform_1.isInlineFootnoteNode)(node) &&
+            parentNode &&
+            parentNode.type !== transform_1.schema.nodes.table_cell &&
+            parentNode.type !== transform_1.schema.nodes.table_header) {
+            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,
@@ -144,25 +161,60 @@ 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);
+            const initTransaction = transactions.find((t) => t.getMeta('INIT'));
+            if (!footnoteElement || (!initTransaction && (0, lodash_1.isEqual)(prevIds, newIds))) {
                 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 && footnotes.size > 0) {
+                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 > 0) {
+                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: {
@@ -205,7 +257,7 @@ exports.default = (props) => {
                             }
                         }
                         if (!((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.textContent)) {
-                            decorations.push(prosemirror_view_1.Decoration.widget(pos + 2, (0, placeholder_1.placeholderWidget)('Add new note here')));
+                            decorations.push(prosemirror_view_1.Decoration.widget(pos + 2, (0, placeholder_1.placeholderWidget)('Type new footnote here')));
                         }
                         if (tableInlineFootnoteIds &&
                             !tableInlineFootnoteIds.has(node.attrs.id)) {

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

@@ -62,12 +62,13 @@ exports.default = (props) => {
         key: exports.highlightKey,
         state: {
             init: (tr, state) => buildPluginState(state.doc),
-            apply: (tr) => {
+            apply: (tr, value) => {
                 const meta = tr.getMeta(exports.highlightKey);
-                if (meta) {
-                    if (exports.SET_COMMENT in meta) {
-                        props.setComment(meta[exports.SET_COMMENT]);
-                    }
+                if (meta && exports.SET_COMMENT in meta) {
+                    props.setComment(meta[exports.SET_COMMENT]);
+                }
+                else if (!tr.docChanged || tr.step.length === 0) {
+                    return value;
                 }
                 return buildPluginState(tr.doc);
             },

package/dist/cjs/plugins/selected-suggestion-ui.js

@@ -94,7 +94,6 @@ exports.default = (props) => new prosemirror_state_1.Plugin({
                 return buildSelectedSuggestionDecoration(suggestionId, state, props);
             }
             if (tr.getMeta(exports.CLEAR_SUGGESTION_ID)) {
-                props.setEditorSelectedSuggestion(undefined);
                 return prosemirror_view_1.DecorationSet.empty;
             }
             return value;
@@ -105,8 +104,11 @@ exports.default = (props) => new prosemirror_state_1.Plugin({
             const nodeClicked = view.state.doc.nodeAt(pos);
             const trackChangesData = nodeClicked && getTrackChangesData(nodeClicked);
             if (!trackChangesData) {
-                view.dispatch(view.state.tr.setMeta(exports.CLEAR_SUGGESTION_ID, true));
-                props.setEditorSelectedSuggestion(undefined);
+                setTimeout(() => {
+                    const newTr = view.state.tr.setMeta(exports.CLEAR_SUGGESTION_ID, true);
+                    view.dispatch(newTr);
+                    props.setEditorSelectedSuggestion(undefined);
+                });
             }
         },
         decorations: (state) => exports.selectedSuggestionKey.getState(state),
@@ -122,7 +124,9 @@ const buildSelectedSuggestionDecoration = (suggestionId, state, props) => {
         decorations.push(decoration(change.from, change.to, {
             class: 'selected-suggestion',
         }));
-        props.setEditorSelectedSuggestion(change.id);
+        setTimeout(() => {
+            props.setEditorSelectedSuggestion(change.id);
+        }, 0);
     }
     return prosemirror_view_1.DecorationSet.create(state.doc, decorations);
 };

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

@@ -14,6 +14,9 @@ const isInlineFootnoteChange = (step, oldState, newState) => {
 exports.default = () => {
     return new prosemirror_state_1.Plugin({
         appendTransaction(transactions, oldState, newState) {
+            if (!transactions.find((tr) => tr.docChanged)) {
+                return null;
+            }
             const tableInlineFootnoteChange = transactions.find((tr) => tr.steps.find((s, i) => {
                 var _a;
                 if (s instanceof prosemirror_transform_1.ReplaceStep) {

package/dist/cjs/views/base_node_view.js

@@ -62,7 +62,7 @@ class BaseNodeView {
             }
         };
     }
-    setDomAttrs(node, element, omit = []) {
+    setDomAttrs(node, element, omit = ['contents']) {
         Object.keys(node.attrs || {}).forEach((attr) => {
             if (!omit.includes(attr)) {
                 element.setAttribute(attr, node.attrs[attr]);

package/dist/cjs/views/bibliography_element.js

@@ -49,6 +49,9 @@ class BibliographyElementBlockView extends block_view_1.default {
         this.showPopper = (id) => {
             this.props.popper.destroy();
             const bib = (0, bibliography_1.getBibliographyPluginState)(this.view.state);
+            if (!bib) {
+                return;
+            }
             const componentProps = {
                 items: Array.from(bib.bibliographyItems.values()),
                 citationCounts: bib.citationCounts,
@@ -140,6 +143,9 @@ class BibliographyElementBlockView extends block_view_1.default {
             const can = this.props.getCapabilities();
             const wrapper = document.createElement('div');
             wrapper.classList.add('contents');
+            if (!bib) {
+                return;
+            }
             const [meta, bibliography] = bib.provider.makeBibliography();
             for (let i = 0; i < bibliography.length; i++) {
                 const id = meta.entry_ids[i];

package/dist/cjs/views/citation.js

@@ -40,6 +40,9 @@ class CitationView extends base_node_view_1.BaseNodeView {
         };
         this.updateContents = () => {
             const bib = (0, bibliography_1.getBibliographyPluginState)(this.view.state);
+            if (!bib) {
+                return;
+            }
             const classes = [
                 'citation',
                 ...(0, track_changes_utils_1.getChangeClasses)(this.node.attrs.dataTracked),

package/dist/cjs/views/citation_editable.js

@@ -90,6 +90,9 @@ class CitationEditableView extends citation_1.CitationView {
         this.showPopper = () => {
             this.props.popper.destroy();
             const bib = (0, bibliography_1.getBibliographyPluginState)(this.view.state);
+            if (!bib) {
+                return;
+            }
             const can = this.props.getCapabilities();
             const attrs = (0, track_changes_utils_1.getActualAttrs)(this.node);
             const rids = attrs.rids;
@@ -152,6 +155,9 @@ class CitationEditableView extends citation_1.CitationView {
         };
         this.handleCite = (items) => {
             const bib = (0, bibliography_1.getBibliographyPluginState)(this.view.state);
+            if (!bib) {
+                return;
+            }
             const attrs = (0, track_changes_utils_1.getActualAttrs)(this.node);
             const rids = [...attrs.rids];
             items = items.filter((i) => !rids.includes(i.id));

package/dist/cjs/views/footnotes_element.js

@@ -28,7 +28,9 @@ class FootnotesElementView extends block_view_1.default {
         this.elementType = 'div';
         this.checkEditability = () => {
             var _a, _b;
-            const editable = this.node.childCount ? 'true' : 'false';
+            const editable = this.props.getCapabilities().editArticle && this.node.childCount
+                ? 'true'
+                : 'false';
             (_a = this.contentDOM) === null || _a === void 0 ? void 0 : _a.setAttribute('contenteditable', editable);
             (_b = this.dom) === null || _b === void 0 ? void 0 : _b.setAttribute('contenteditable', editable);
         };

package/dist/cjs/views/inline_footnote.js

@@ -21,6 +21,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InlineFootnoteView = void 0;
 const style_guide_1 = require("@manuscripts/style-guide");
 const transform_1 = require("@manuscripts/transform");
+const prosemirror_state_1 = require("prosemirror-state");
 const prosemirror_utils_1 = require("prosemirror-utils");
 const commands_1 = require("../commands");
 const track_changes_utils_1 = require("../lib/track-changes-utils");
@@ -33,6 +34,7 @@ class InlineFootnoteView extends base_node_view_1.BaseNodeView {
         super(...arguments);
         this.findParentTableElement = () => (0, prosemirror_utils_1.findParentNodeClosestToPos)(this.view.state.doc.resolve(this.getPos()), (node) => node.type === transform_1.schema.nodes.table_element);
         this.handleClick = () => {
+            var _a;
             if ((0, track_changes_utils_1.isDeleted)(this.node)) {
                 return;
             }
@@ -49,11 +51,24 @@ class InlineFootnoteView extends base_node_view_1.BaseNodeView {
                 this.props.popper.show(this.dom, this.popperContainer, 'bottom-end');
             }
             else {
-                this.props.history.push(Object.assign(Object.assign({}, this.props.history.location), { hash: '#' + this.node.attrs.rid }));
+                if ((_a = this.node.attrs.rids) === null || _a === void 0 ? void 0 : _a.length) {
+                    let nodePos = undefined;
+                    this.view.state.doc.descendants((node, pos) => {
+                        if (node.attrs.id === this.node.attrs.rids[0]) {
+                            nodePos = pos;
+                        }
+                    });
+                    if (nodePos && this.props.dispatch) {
+                        const sel = prosemirror_state_1.TextSelection.near(this.view.state.doc.resolve(nodePos + 1));
+                        this.props.dispatch(this.view.state.tr.setSelection(sel).scrollIntoView());
+                    }
+                }
             }
         };
         this.updateContents = () => {
-            this.setDomAttrs(this.node, this.dom);
+            const node = this.node;
+            this.dom.setAttribute('rids', node.attrs.rids.join(','));
+            this.dom.setAttribute('contents', node.attrs.contents);
             this.dom.className = [
                 'footnote',
                 ...(0, track_changes_utils_1.getChangeClasses)(this.node.attrs.dataTracked),

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';
@@ -53,7 +53,10 @@ export const blockActive = (type) => (state) => {
     return false;
 };
 export const canInsert = (type) => (state) => {
-    const { $from } = state.selection;
+    const { $from, $to } = state.selection;
+    if ($from.node().type === schema.nodes.title && $from.pos === $to.pos) {
+        return false;
+    }
     for (let d = $from.depth; d >= 0; d--) {
         const index = $from.index(d);
         if ($from.node(d).canReplaceWith(index, index, type)) {
@@ -305,12 +308,24 @@ export const insertInlineFootnote = (kind) => (state, dispatch) => {
     let selectionPos;
     if (!footnotesSection) {
         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('Footnotes')),
             state.schema.nodes.footnotes_element.create({}, footnote),
         ]);
         const backmatter = findChildrenByType(tr.doc, schema.nodes.backmatter)[0];
-        tr.insert(backmatter.pos + 1, section);
-        selectionPos = backmatter.pos + section.nodeSize - 3;
+        const sectionPos = backmatter.pos + 1;
+        tr.insert(sectionPos, section);
+        let footnotePos = 0;
+        section.descendants((n, pos) => {
+            if (isFootnoteNode(n)) {
+                footnotePos = pos;
+                n.descendants((childNode, childPos) => {
+                    if (isParagraphNode(childNode)) {
+                        footnotePos += childPos;
+                    }
+                });
+            }
+        });
+        selectionPos = sectionPos + footnotePos;
     }
     else {
         const footnoteElement = findChildrenByType(footnotesSection.node, schema.nodes.footnotes_element);
@@ -322,7 +337,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;
@@ -671,10 +686,13 @@ const addBlockComment = (node, state, dispatch) => {
         [SET_COMMENT]: comment,
     });
     tr.setMeta('addToHistory', false);
-    if (dispatch && isAllowedType(type)) {
-        dispatch(tr);
+    if (isAllowedType(type)) {
+        dispatch && dispatch(tr);
+        return true;
+    }
+    else {
+        return false;
     }
-    return true;
 };
 const addHighlightComment = (node, state, dispatch) => {
     const { attrs: { id }, type, } = node;