@manuscripts/body-editor 3.18.0 → 3.18.1

package/dist/cjs/versions.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MATHJAX_VERSION = exports.VERSION = void 0;
-exports.VERSION = '3.18.0';
+exports.VERSION = '3.18.1';
 exports.MATHJAX_VERSION = '3.2.2';

package/dist/cjs/views/cross_reference.js

@@ -17,9 +17,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrossReferenceView = void 0;
 const transform_1 = require("@manuscripts/transform");
-const doc_1 = require("../lib/doc");
 const navigation_utils_1 = require("../lib/navigation-utils");
-const supplements_1 = require("../lib/supplements");
 const objects_1 = require("../plugins/objects");
 const base_node_view_1 = require("./base_node_view");
 const creators_1 = require("./creators");
@@ -53,13 +51,10 @@ class CrossReferenceView extends base_node_view_1.BaseNodeView {
         const targets = objects_1.objectsKey.getState(this.view.state);
         const attrs = this.node.attrs;
         const target = attrs.rids.length ? targets.get(attrs.rids[0]) : undefined;
-        let derivedLabel = target?.label || '';
-        if (target?.type === transform_1.schema.nodes.supplement.name && target.href) {
-            const found = (0, doc_1.findNodeByID)(this.view.state.doc, target.id);
-            if (found) {
-                derivedLabel = (0, supplements_1.getSupplementDisplayLabel)(found.node, this.props.getFiles());
-            }
-        }
+        const isSupplement = target?.type === transform_1.schema.nodes.supplement.name;
+        const derivedLabel = isSupplement
+            ? target?.caption || target?.label || ''
+            : target?.label || '';
         this.dom.textContent = attrs.label || derivedLabel;
         this.dom.addEventListener('click', this.handleClick);
     }

package/dist/cjs/views/cross_reference_editable.js

@@ -25,8 +25,6 @@ const transform_1 = require("@manuscripts/transform");
 const prosemirror_state_1 = require("prosemirror-state");
 const CrossReferenceItems_1 = require("../components/views/CrossReferenceItems");
 const comments_1 = require("../lib/comments");
-const doc_1 = require("../lib/doc");
-const supplements_1 = require("../lib/supplements");
 const objects_1 = require("../plugins/objects");
 const creators_1 = require("./creators");
 const cross_reference_1 = require("./cross_reference");
@@ -67,24 +65,12 @@ class CrossReferenceEditableView extends cross_reference_1.CrossReferenceView {
         };
         this.getTargets = () => {
             const targets = objects_1.objectsKey.getState(this.view.state);
-            const files = this.props.getFiles();
-            const fileMap = new Map(files.map((f) => [f.id, f.name]));
             const excludedTypes = [transform_1.schema.nodes.image_element.name];
-            const supplement = transform_1.schema.nodes.supplement.name;
             return Array.from(targets.values()).reduce((acc, t) => {
                 if (excludedTypes.includes(t.type)) {
                     return acc;
                 }
-                if (t.type === supplement && t.href) {
-                    const found = (0, doc_1.findNodeByID)(this.view.state.doc, t.id);
-                    const label = found
-                        ? (0, supplements_1.getSupplementDisplayLabel)(found.node, files)
-                        : (fileMap.get(t.href) ?? t.href);
-                    acc.push({ ...t, label, caption: '' });
-                }
-                else {
-                    acc.push(t);
-                }
+                acc.push(t);
                 return acc;
             }, []);
         };

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '3.18.0';
+export const VERSION = '3.18.1';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/es/views/cross_reference.js

@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 import { schema, } from '@manuscripts/transform';
-import { findNodeByID } from '../lib/doc';
 import { handleEnterKey } from '../lib/navigation-utils';
-import { getSupplementDisplayLabel } from '../lib/supplements';
 import { objectsKey } from '../plugins/objects';
 import { BaseNodeView } from './base_node_view';
 import { createNodeView } from './creators';
@@ -50,13 +48,10 @@ export class CrossReferenceView extends BaseNodeView {
         const targets = objectsKey.getState(this.view.state);
         const attrs = this.node.attrs;
         const target = attrs.rids.length ? targets.get(attrs.rids[0]) : undefined;
-        let derivedLabel = target?.label || '';
-        if (target?.type === schema.nodes.supplement.name && target.href) {
-            const found = findNodeByID(this.view.state.doc, target.id);
-            if (found) {
-                derivedLabel = getSupplementDisplayLabel(found.node, this.props.getFiles());
-            }
-        }
+        const isSupplement = target?.type === schema.nodes.supplement.name;
+        const derivedLabel = isSupplement
+            ? target?.caption || target?.label || ''
+            : target?.label || '';
         this.dom.textContent = attrs.label || derivedLabel;
         this.dom.addEventListener('click', this.handleClick);
     }

package/dist/es/views/cross_reference_editable.js

@@ -19,8 +19,6 @@ import { schema } from '@manuscripts/transform';
 import { TextSelection } from 'prosemirror-state';
 import { CrossReferenceItems } from '../components/views/CrossReferenceItems';
 import { handleComment } from '../lib/comments';
-import { findNodeByID } from '../lib/doc';
-import { getSupplementDisplayLabel } from '../lib/supplements';
 import { objectsKey } from '../plugins/objects';
 import { createEditableNodeView } from './creators';
 import { CrossReferenceView } from './cross_reference';
@@ -61,24 +59,12 @@ export class CrossReferenceEditableView extends CrossReferenceView {
         };
         this.getTargets = () => {
             const targets = objectsKey.getState(this.view.state);
-            const files = this.props.getFiles();
-            const fileMap = new Map(files.map((f) => [f.id, f.name]));
             const excludedTypes = [schema.nodes.image_element.name];
-            const supplement = schema.nodes.supplement.name;
             return Array.from(targets.values()).reduce((acc, t) => {
                 if (excludedTypes.includes(t.type)) {
                     return acc;
                 }
-                if (t.type === supplement && t.href) {
-                    const found = findNodeByID(this.view.state.doc, t.id);
-                    const label = found
-                        ? getSupplementDisplayLabel(found.node, files)
-                        : (fileMap.get(t.href) ?? t.href);
-                    acc.push({ ...t, label, caption: '' });
-                }
-                else {
-                    acc.push(t);
-                }
+                acc.push(t);
                 return acc;
             }, []);
         };

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "3.18.0";
+export declare const VERSION = "3.18.1";
 export declare const MATHJAX_VERSION = "3.2.2";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "3.18.0",
+  "version": "3.18.1",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -43,7 +43,7 @@
     "@iarna/word-count": "1.1.2",
     "@manuscripts/style-guide": "3.7.2",
     "@manuscripts/track-changes-plugin": "2.4.0",
-    "@manuscripts/transform": "4.5.4",
+    "@manuscripts/transform": "4.5.6",
     "@popperjs/core": "2.11.8",
     "citeproc": "2.4.63",
     "codemirror": "5.65.19",

package/src/versions.ts

@@ -1,3 +1,3 @@
 //THIS FILE WAS GENERATED BY versions.mjs
-export const VERSION = '3.18.0';
+export const VERSION = '3.18.1';
 export const MATHJAX_VERSION = '3.2.2';

package/src/views/cross_reference.ts

@@ -18,13 +18,10 @@ import {
   CrossReferenceNode,
   ManuscriptNodeView,
   schema,
-  SupplementNode,
   Target,
 } from '@manuscripts/transform'
 
-import { findNodeByID } from '../lib/doc'
 import { handleEnterKey } from '../lib/navigation-utils'
-import { getSupplementDisplayLabel } from '../lib/supplements'
 import { objectsKey } from '../plugins/objects'
 import { Trackable } from '../types'
 import { BaseNodeView } from './base_node_view'
@@ -51,16 +48,10 @@ export class CrossReferenceView
     const attrs = this.node.attrs
     const target = attrs.rids.length ? targets.get(attrs.rids[0]) : undefined
 
-    let derivedLabel = target?.label || ''
-    if (target?.type === schema.nodes.supplement.name && target.href) {
-      const found = findNodeByID(this.view.state.doc, target.id)
-      if (found) {
-        derivedLabel = getSupplementDisplayLabel(
-          found.node as SupplementNode,
-          this.props.getFiles()
-        )
-      }
-    }
+    const isSupplement = target?.type === schema.nodes.supplement.name;
+    const derivedLabel = isSupplement
+      ? target?.caption || target?.label || ''
+      : target?.label || ''
 
     this.dom.textContent = attrs.label || derivedLabel
     this.dom.addEventListener('click', this.handleClick)

package/src/views/cross_reference_editable.ts

@@ -16,13 +16,11 @@
 
 import { ContextMenu, ContextMenuProps } from '@manuscripts/style-guide'
 import { isDeleted, skipTracking } from '@manuscripts/track-changes-plugin'
-import { schema, SupplementNode, Target } from '@manuscripts/transform'
+import { schema, Target } from '@manuscripts/transform'
 import { TextSelection } from 'prosemirror-state'
 
 import { CrossReferenceItems } from '../components/views/CrossReferenceItems'
 import { handleComment } from '../lib/comments'
-import { findNodeByID } from '../lib/doc'
-import { getSupplementDisplayLabel } from '../lib/supplements'
 import { objectsKey } from '../plugins/objects'
 import { createEditableNodeView } from './creators'
 import { CrossReferenceView } from './cross_reference'
@@ -81,25 +79,13 @@ export class CrossReferenceEditableView extends CrossReferenceView {
 
   public getTargets = () => {
     const targets = objectsKey.getState(this.view.state) as Map<string, Target>
-    const files = this.props.getFiles()
-    const fileMap = new Map(files.map((f) => [f.id, f.name]))
     const excludedTypes = [schema.nodes.image_element.name]
-    const supplement = schema.nodes.supplement.name
 
     return Array.from(targets.values()).reduce<Target[]>((acc, t) => {
       if (excludedTypes.includes(t.type)) {
         return acc
       }
-      // Prefer caption title, then URL / file name for supplements and weblinks.
-      if (t.type === supplement && t.href) {
-        const found = findNodeByID(this.view.state.doc, t.id)
-        const label = found
-          ? getSupplementDisplayLabel(found.node as SupplementNode, files)
-          : (fileMap.get(t.href) ?? t.href)
-        acc.push({ ...t, label, caption: '' })
-      } else {
-        acc.push(t)
-      }
+      acc.push(t)
       return acc
     }, [])
   }