@manuscripts/body-editor 3.5.13 → 3.5.14

package/dist/cjs/lib/utils.js

@@ -63,6 +63,9 @@ const findParentElement = (selection, validIds) => (0, prosemirror_utils_1.findP
 })(selection);
 exports.findParentElement = findParentElement;
 const isChildOfNodeTypes = (doc, pos, parentNodeTypes) => {
+    if (pos > doc.content.size) {
+        return false;
+    }
     const resolvedPos = doc.resolve(pos);
     for (let depth = resolvedPos.depth; depth >= 0; depth--) {
         if (parentNodeTypes.includes(resolvedPos.node(depth).type)) {

package/dist/cjs/plugins/detect-inconsistency/detect-inconsistency-utils.js

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildPluginState = exports.createDecoration = void 0;
 const prosemirror_state_1 = require("prosemirror-state");
 const prosemirror_view_1 = require("prosemirror-view");
+const affiliations_1 = require("../affiliations");
 const bibliography_1 = require("../bibliography");
 const footnotes_1 = require("../footnotes");
 const objects_1 = require("../objects");
@@ -43,9 +44,11 @@ const buildPluginState = (state, props, showDecorations) => {
     }
     const context = {
         pluginStates: {
+            affiliations: affiliations_1.affiliationsKey.getState(state)?.indexedAffiliationIds,
             bibliography: (0, bibliography_1.getBibliographyPluginState)(state)?.bibliographyItems,
             objects: objects_1.objectsKey.getState(state),
             footnotes: footnotes_1.footnotesKey.getState(state)?.footnotesElementIDs,
+            footnotesElements: footnotes_1.footnotesKey.getState(state)?.footnotesElements,
         },
         showDecorations,
         selectedPos,

package/dist/cjs/plugins/detect-inconsistency/validators.js

@@ -18,12 +18,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validators = void 0;
 const transform_1 = require("@manuscripts/transform");
 const url_1 = require("../../lib/url");
+const utils_1 = require("../../lib/utils");
 const detect_inconsistency_utils_1 = require("./detect-inconsistency-utils");
 const getNodeDescription = (node) => {
     return transform_1.nodeNames.get(node.type) || node.type?.name || 'node';
 };
-const createWarning = (node, pos, category, severity) => {
-    const nodeDescription = getNodeDescription(node);
+const createWarning = (node, pos, category, severity, customNodeDescription) => {
+    const nodeDescription = customNodeDescription || getNodeDescription(node);
     const message = (() => {
         switch (node.type) {
             case transform_1.schema.nodes.figure_element:
@@ -33,10 +34,14 @@ const createWarning = (node, pos, category, severity) => {
                 return 'Has no link or uploaded file';
             case transform_1.schema.nodes.link:
                 return 'Url is empty';
+            case transform_1.schema.nodes.footnote:
+                return 'Is not used';
+            case transform_1.schema.nodes.affiliation:
+                return 'Is not corresponding to any Author';
             default:
                 return category === 'empty-content'
-                    ? `Is empty`
-                    : `Has no linked reference`;
+                    ? 'Is empty'
+                    : 'Has no linked reference';
         }
     })();
     return {
@@ -128,6 +133,33 @@ const validateLink = (node, pos) => {
     }
     return inconsistencies;
 };
+const validateFootnote = (node, pos, context) => {
+    const inconsistencies = [];
+    const id = context.pluginStates.footnotes?.get(node.attrs.id);
+    const footnoteState = id
+        ? context.pluginStates.footnotesElements?.get(id)
+        : undefined;
+    const unused = footnoteState?.unusedFootnoteIDs?.has(node.attrs.id);
+    if (unused) {
+        const isTableFootnote = (0, utils_1.isChildOfNodeTypes)(context.props.doc, pos, [
+            transform_1.schema.nodes.table_element,
+        ]);
+        const inconsistency = createWarning(node, pos, 'not-used', 'warning', isTableFootnote ? 'table_footnote' : undefined);
+        inconsistencies.push(inconsistency);
+    }
+    return inconsistencies;
+};
+const validateAffiliation = (node, pos, context) => {
+    const inconsistencies = [];
+    const unused = !context.pluginStates.affiliations?.get(node.attrs.id);
+    if (unused) {
+        const $pos = context.props.doc.resolve(pos);
+        const affiliationsNodePos = $pos.before($pos.depth);
+        const inconsistency = createWarning(node, affiliationsNodePos, 'not-used', 'warning');
+        inconsistencies.push(inconsistency);
+    }
+    return inconsistencies;
+};
 exports.validators = {
     [transform_1.schema.nodes.title.name]: validateTitle,
     [transform_1.schema.nodes.cross_reference.name]: validateCrossReference,
@@ -136,4 +168,6 @@ exports.validators = {
     [transform_1.schema.nodes.figure.name]: validateFigure,
     [transform_1.schema.nodes.embed.name]: validateMedia,
     [transform_1.schema.nodes.link.name]: validateLink,
+    [transform_1.schema.nodes.footnote.name]: validateFootnote,
+    [transform_1.schema.nodes.affiliation.name]: validateAffiliation,
 };

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.5.13';
+exports.VERSION = '3.5.14';
 exports.MATHJAX_VERSION = '3.2.2';

package/dist/cjs/views/affiliations.js

@@ -23,6 +23,7 @@ const style_guide_1 = require("@manuscripts/style-guide");
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_state_1 = require("prosemirror-state");
 const AffiliationsModal_1 = require("../components/affiliations/AffiliationsModal");
+const icons_1 = require("../icons");
 const authors_1 = require("../lib/authors");
 const comments_1 = require("../lib/comments");
 const track_changes_utils_1 = require("../lib/track-changes-utils");
@@ -136,11 +137,7 @@ class AffiliationsView extends block_view_1.default {
             return contextMenu ? [contextMenu] : [];
         };
         this.selectNode = () => {
-            const selectedMarker = document.querySelector('.comment-marker.selected-comment');
             this.dom.classList.add('ProseMirror-selectednode');
-            if (!(0, track_changes_utils_1.isDeleted)(this.node) && !selectedMarker) {
-                this.handleEdit('', true);
-            }
         };
         this.handleUpdateAuthors = (authors) => {
             authors.forEach((author) => {
@@ -189,12 +186,15 @@ class AffiliationsView extends block_view_1.default {
         element.classList.add('affiliation');
         element.id = attrs.id;
         (0, track_changes_utils_1.addTrackChangesAttributes)(attrs, element);
+        const marker = document.createElement('span');
         if (index) {
-            const label = document.createElement('span');
-            label.classList.add('affiliation-label');
-            label.innerHTML = String(index);
-            element.appendChild(label);
+            marker.classList.add('affiliation-label');
+            marker.innerText = String(index);
+        }
+        else {
+            marker.innerHTML = icons_1.alertIcon;
         }
+        element.appendChild(marker);
         const name = document.createElement('span');
         name.classList.add('affiliation-name');
         name.innerHTML = (0, authors_1.affiliationName)(attrs);

package/dist/es/lib/utils.js

@@ -55,6 +55,9 @@ export const findParentElement = (selection, validIds) => findParentNode((node)
     return isElementNodeType(node.type) && node.attrs.id;
 })(selection);
 export const isChildOfNodeTypes = (doc, pos, parentNodeTypes) => {
+    if (pos > doc.content.size) {
+        return false;
+    }
     const resolvedPos = doc.resolve(pos);
     for (let depth = resolvedPos.depth; depth >= 0; depth--) {
         if (parentNodeTypes.includes(resolvedPos.node(depth).type)) {

package/dist/es/plugins/detect-inconsistency/detect-inconsistency-utils.js

@@ -15,6 +15,7 @@
  */
 import { NodeSelection } from 'prosemirror-state';
 import { Decoration, DecorationSet } from 'prosemirror-view';
+import { affiliationsKey } from '../affiliations';
 import { getBibliographyPluginState } from '../bibliography';
 import { footnotesKey } from '../footnotes';
 import { objectsKey } from '../objects';
@@ -39,9 +40,11 @@ export const buildPluginState = (state, props, showDecorations) => {
     }
     const context = {
         pluginStates: {
+            affiliations: affiliationsKey.getState(state)?.indexedAffiliationIds,
             bibliography: getBibliographyPluginState(state)?.bibliographyItems,
             objects: objectsKey.getState(state),
             footnotes: footnotesKey.getState(state)?.footnotesElementIDs,
+            footnotesElements: footnotesKey.getState(state)?.footnotesElements,
         },
         showDecorations,
         selectedPos,

package/dist/es/plugins/detect-inconsistency/validators.js

@@ -15,12 +15,13 @@
  */
 import { nodeNames, schema, } from '@manuscripts/transform';
 import { allowedHref } from '../../lib/url';
+import { isChildOfNodeTypes } from '../../lib/utils';
 import { createDecoration } from './detect-inconsistency-utils';
 const getNodeDescription = (node) => {
     return nodeNames.get(node.type) || node.type?.name || 'node';
 };
-const createWarning = (node, pos, category, severity) => {
-    const nodeDescription = getNodeDescription(node);
+const createWarning = (node, pos, category, severity, customNodeDescription) => {
+    const nodeDescription = customNodeDescription || getNodeDescription(node);
     const message = (() => {
         switch (node.type) {
             case schema.nodes.figure_element:
@@ -30,10 +31,14 @@ const createWarning = (node, pos, category, severity) => {
                 return 'Has no link or uploaded file';
             case schema.nodes.link:
                 return 'Url is empty';
+            case schema.nodes.footnote:
+                return 'Is not used';
+            case schema.nodes.affiliation:
+                return 'Is not corresponding to any Author';
             default:
                 return category === 'empty-content'
-                    ? `Is empty`
-                    : `Has no linked reference`;
+                    ? 'Is empty'
+                    : 'Has no linked reference';
         }
     })();
     return {
@@ -125,6 +130,33 @@ const validateLink = (node, pos) => {
     }
     return inconsistencies;
 };
+const validateFootnote = (node, pos, context) => {
+    const inconsistencies = [];
+    const id = context.pluginStates.footnotes?.get(node.attrs.id);
+    const footnoteState = id
+        ? context.pluginStates.footnotesElements?.get(id)
+        : undefined;
+    const unused = footnoteState?.unusedFootnoteIDs?.has(node.attrs.id);
+    if (unused) {
+        const isTableFootnote = isChildOfNodeTypes(context.props.doc, pos, [
+            schema.nodes.table_element,
+        ]);
+        const inconsistency = createWarning(node, pos, 'not-used', 'warning', isTableFootnote ? 'table_footnote' : undefined);
+        inconsistencies.push(inconsistency);
+    }
+    return inconsistencies;
+};
+const validateAffiliation = (node, pos, context) => {
+    const inconsistencies = [];
+    const unused = !context.pluginStates.affiliations?.get(node.attrs.id);
+    if (unused) {
+        const $pos = context.props.doc.resolve(pos);
+        const affiliationsNodePos = $pos.before($pos.depth);
+        const inconsistency = createWarning(node, affiliationsNodePos, 'not-used', 'warning');
+        inconsistencies.push(inconsistency);
+    }
+    return inconsistencies;
+};
 export const validators = {
     [schema.nodes.title.name]: validateTitle,
     [schema.nodes.cross_reference.name]: validateCrossReference,
@@ -133,4 +165,6 @@ export const validators = {
     [schema.nodes.figure.name]: validateFigure,
     [schema.nodes.embed.name]: validateMedia,
     [schema.nodes.link.name]: validateLink,
+    [schema.nodes.footnote.name]: validateFootnote,
+    [schema.nodes.affiliation.name]: validateAffiliation,
 };

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '3.5.13';
+export const VERSION = '3.5.14';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/es/views/affiliations.js

@@ -17,6 +17,7 @@ import { ContextMenu } from '@manuscripts/style-guide';
 import { schema } from '@manuscripts/transform';
 import { NodeSelection } from 'prosemirror-state';
 import { AffiliationsModal, } from '../components/affiliations/AffiliationsModal';
+import { alertIcon } from '../icons';
 import { affiliationName, } from '../lib/authors';
 import { handleComment } from '../lib/comments';
 import { addTrackChangesAttributes, isDeleted, } from '../lib/track-changes-utils';
@@ -130,11 +131,7 @@ export class AffiliationsView extends BlockView {
             return contextMenu ? [contextMenu] : [];
         };
         this.selectNode = () => {
-            const selectedMarker = document.querySelector('.comment-marker.selected-comment');
             this.dom.classList.add('ProseMirror-selectednode');
-            if (!isDeleted(this.node) && !selectedMarker) {
-                this.handleEdit('', true);
-            }
         };
         this.handleUpdateAuthors = (authors) => {
             authors.forEach((author) => {
@@ -183,12 +180,15 @@ export class AffiliationsView extends BlockView {
         element.classList.add('affiliation');
         element.id = attrs.id;
         addTrackChangesAttributes(attrs, element);
+        const marker = document.createElement('span');
         if (index) {
-            const label = document.createElement('span');
-            label.classList.add('affiliation-label');
-            label.innerHTML = String(index);
-            element.appendChild(label);
+            marker.classList.add('affiliation-label');
+            marker.innerText = String(index);
+        }
+        else {
+            marker.innerHTML = alertIcon;
         }
+        element.appendChild(marker);
         const name = document.createElement('span');
         name.classList.add('affiliation-name');
         name.innerHTML = affiliationName(attrs);

package/dist/types/plugins/detect-inconsistency/detect-inconsistency-utils.d.ts

@@ -18,7 +18,7 @@ import { Decoration, DecorationSet } from 'prosemirror-view';
 import { EditorProps } from '../../configs/ManuscriptsEditor';
 export type Inconsistency = {
     type: 'warning';
-    category: 'missing-reference' | 'empty-content';
+    category: 'missing-reference' | 'not-used' | 'empty-content';
     severity: 'error' | 'warning';
     message: string;
     nodeDescription: string;

package/dist/types/plugins/detect-inconsistency/validators.d.ts

@@ -16,12 +16,15 @@
 import { BibliographyItemAttrs, ManuscriptNode, Target } from '@manuscripts/transform';
 import { Decoration } from 'prosemirror-view';
 import { EditorProps } from '../../configs/ManuscriptsEditor';
+import { FootnotesElementState } from '../footnotes';
 import { Inconsistency } from './detect-inconsistency-utils';
 export type ValidatorContext = {
     pluginStates: {
+        affiliations: Map<string, number> | undefined;
         bibliography: Map<string, BibliographyItemAttrs> | undefined;
         objects: Map<string, Target> | undefined;
         footnotes: Map<string, string> | undefined;
+        footnotesElements: Map<string, FootnotesElementState> | undefined;
     };
     showDecorations: boolean;
     selectedPos: number | null;

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "3.5.13";
+export declare const VERSION = "3.5.14";
 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.5.13",
+  "version": "3.5.14",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -39,7 +39,7 @@
     "@cospired/i18n-iso-languages": "^4.2.0",
     "@iarna/word-count": "1.1.2",
     "@manuscripts/json-schema": "2.2.12",
-    "@manuscripts/style-guide": "3.3.0",
+    "@manuscripts/style-guide": "3.3.1",
     "@manuscripts/track-changes-plugin": "2.0.13",
     "@manuscripts/transform": "4.2.17",
     "@popperjs/core": "2.11.8",

package/styles/AdvancedEditor.css

@@ -1262,11 +1262,13 @@ figure.block:has(.equation.selected-suggestion) {
   line-height: 1.2;
   cursor: default;
   user-select: none;
+  display: flex;
+  justify-content: flex-start;
+  gap: 4px;
 }
 
 .affiliation .affiliation-label {
   font-weight: bold;
-  margin-right: 4px;
 }
 
 .ProseMirror .doi-container {