@manuscripts/body-editor 1.7.10-LEAN-3338-1 → 1.7.10

package/dist/cjs/commands.js

@@ -307,18 +307,17 @@ 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 insertedAt = state.selection.to;
-    const { tr } = state;
+    const tr = state.tr;
     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(sectionTitle)),
+            state.schema.nodes.section_title.create({}, state.schema.text('Notes')),
             state.schema.nodes.footnotes_element.create({}, footnote),
         ]);
         const backmatter = (0, prosemirror_utils_1.findChildrenByType)(tr.doc, transform_1.schema.nodes.backmatter)[0];
@@ -327,25 +326,10 @@ const insertInlineFootnote = (kind) => (state, dispatch) => {
     }
     else {
         const footnoteElement = (0, prosemirror_utils_1.findChildrenByType)(footnotesSection.node, transform_1.schema.nodes.footnotes_element);
-        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;
+        const pos = footnotesSection.pos +
+            footnoteElement[0].pos +
+            footnoteElement[0].node.nodeSize -
+            1;
         tr.insert(pos, footnote);
         selectionPos = pos + 2;
     }

package/dist/cjs/lib/utils.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFootnoteLabel = exports.isMetaNode = exports.findParentElement = exports.findParentSection = exports.findParentNodeWithIdValue = exports.findParentNodeWithId = exports.getChildOfType = exports.getMatchingDescendant = exports.getMatchingChild = exports.iterateChildren = void 0;
+exports.isMetaNode = 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_utils_1 = require("prosemirror-utils");
 function* iterateChildren(node, recurse = false) {
@@ -62,15 +62,3 @@ const isMetaNode = (nodeType) => nodeType === transform_1.schema.nodes.bibliogra
     nodeType === transform_1.schema.nodes.affiliation.name ||
     nodeType === transform_1.schema.nodes.contributor.name;
 exports.isMetaNode = isMetaNode;
-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.getFootnotesPluginState = exports.uncitedFootnoteWidget = exports.buildPluginState = exports.footnotesKey = void 0;
+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, (0, utils_1.createFootnoteLabel)(String(index++)));
+                labels.set(rid, String(++index));
             });
         }
     });
@@ -45,9 +45,8 @@ const buildPluginState = (doc) => {
 exports.buildPluginState = buildPluginState;
 const scrollToInlineFootnote = (rid, view) => {
     view.state.doc.descendants((node, pos) => {
-        var _a;
         const footnote = node;
-        if ((_a = footnote.attrs.rids) === null || _a === void 0 ? void 0 : _a.includes(rid)) {
+        if (footnote.attrs.rids.includes(rid)) {
             const selection = prosemirror_state_1.NodeSelection.create(view.state.doc, pos);
             view.dispatch(view.state.tr.setSelection(selection).scrollIntoView());
         }
@@ -149,7 +148,3 @@ exports.default = () => {
         },
     });
 };
-const getFootnotesPluginState = (state) => {
-    return exports.footnotesKey.getState(state);
-};
-exports.getFootnotesPluginState = getFootnotesPluginState;

package/dist/cjs/views/inline_footnote.js

@@ -22,7 +22,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.rids[0] }));
+            this.props.history.push(Object.assign(Object.assign({}, this.props.history.location), { hash: '#' + this.node.attrs.rid }));
         };
         this.updateContents = () => {
             this.setDomAttrs(this.node, this.dom);

package/dist/es/commands.js

@@ -288,18 +288,17 @@ 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 insertedAt = state.selection.to;
-    const { tr } = state;
+    const tr = state.tr;
     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(sectionTitle)),
+            state.schema.nodes.section_title.create({}, state.schema.text('Notes')),
             state.schema.nodes.footnotes_element.create({}, footnote),
         ]);
         const backmatter = findChildrenByType(tr.doc, schema.nodes.backmatter)[0];
@@ -308,25 +307,10 @@ export const insertInlineFootnote = (kind) => (state, dispatch) => {
     }
     else {
         const footnoteElement = findChildrenByType(footnotesSection.node, schema.nodes.footnotes_element);
-        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;
+        const pos = footnotesSection.pos +
+            footnoteElement[0].pos +
+            footnoteElement[0].node.nodeSize -
+            1;
         tr.insert(pos, footnote);
         selectionPos = pos + 2;
     }

package/dist/es/lib/utils.js

@@ -53,14 +53,3 @@ export const findParentElement = (selection, validIds) => findParentNode((node)
 export const isMetaNode = (nodeType) => nodeType === schema.nodes.bibliography_item.name ||
     nodeType === schema.nodes.affiliation.name ||
     nodeType === schema.nodes.contributor.name;
-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,11 +15,11 @@
  */
 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 { createFootnoteLabel, findParentNodeWithIdValue } from '../../lib/utils';
+import { findParentNodeWithIdValue } from '../../lib/utils';
 import { placeholderWidget } from '../placeholder';
 import { findTableInlineFootnoteIds } from './footnotes-utils';
 export const footnotesKey = new PluginKey('footnotes');
@@ -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, createFootnoteLabel(String(index++)));
+                labels.set(rid, String(++index));
             });
         }
     });
@@ -41,9 +41,8 @@ export const buildPluginState = (doc) => {
 };
 const scrollToInlineFootnote = (rid, view) => {
     view.state.doc.descendants((node, pos) => {
-        var _a;
         const footnote = node;
-        if ((_a = footnote.attrs.rids) === null || _a === void 0 ? void 0 : _a.includes(rid)) {
+        if (footnote.attrs.rids.includes(rid)) {
             const selection = NodeSelection.create(view.state.doc, pos);
             view.dispatch(view.state.tr.setSelection(selection).scrollIntoView());
         }
@@ -144,6 +143,3 @@ export default () => {
         },
     });
 };
-export const getFootnotesPluginState = (state) => {
-    return footnotesKey.getState(state);
-};

package/dist/es/views/inline_footnote.js

@@ -19,7 +19,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.rids[0] }));
+            this.props.history.push(Object.assign(Object.assign({}, this.props.history.location), { hash: '#' + this.node.attrs.rid }));
         };
         this.updateContents = () => {
             this.setDomAttrs(this.node, this.dom);

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

@@ -24,4 +24,3 @@ export declare const findParentNodeWithIdValue: (selection: Selection) => import
 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 isMetaNode: (nodeType: string) => boolean;
-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 { EditorState, Plugin, PluginKey } from 'prosemirror-state';
+import { Plugin, PluginKey } from 'prosemirror-state';
 interface PluginState {
     nodes: [InlineFootnoteNode, number][];
     labels: Map<string, string>;
@@ -24,4 +24,3 @@ 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.10-LEAN-3338-1",
+  "version": "1.7.10",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -109,4 +109,4 @@
   "resolutions": {
     "@types/react": "^17.0.2"
   }
-}
+}

package/styles/Editor.css

@@ -162,7 +162,7 @@
 .ProseMirror sub {
   line-height: 0;
 }
-.ProseMirror .footnote,
+
 .ProseMirror .citation,
 .ProseMirror .cross-reference {
   font-weight: bold;
@@ -991,18 +991,10 @@
 .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;
 }