@manuscripts/body-editor 3.2.4 → 3.2.5

package/dist/cjs/components/references/ReferenceForm/ReferenceForm.js

@@ -64,8 +64,15 @@ const ReferenceForm = ({ values, showDelete, onChange, onDelete, onCancel, onSav
     const [showDeleteDialog, setShowDeleteDialog] = (0, react_1.useState)(false);
     const validateReference = (values) => {
         const errors = {};
-        if (!values.title?.trim()) {
-            errors.title = 'Title is required';
+        if (values.type === 'literal') {
+            if (!values.literal?.trim()) {
+                errors.literal = 'Literal is required for unstructured references';
+            }
+        }
+        else {
+            if (!values.title?.trim()) {
+                errors.title = 'Title is required';
+            }
         }
         return errors;
     };
@@ -110,6 +117,10 @@ const ReferenceForm = ({ values, showDelete, onChange, onDelete, onCancel, onSav
                     react_1.default.createElement(styled_components_1.LabelContainer, null,
                         react_1.default.createElement(styled_components_1.Label, null, "Title")),
                     react_1.default.createElement(formik_1.Field, { name: 'title' }, (props) => (react_1.default.createElement(styled_components_1.ReferenceTextArea, { id: 'title', ...props.field }))))),
+                (0, utils_1.shouldRenderField)('literal', formik.values.type) && (react_1.default.createElement(styled_components_1.FormField, null,
+                    react_1.default.createElement(styled_components_1.LabelContainer, null,
+                        react_1.default.createElement(styled_components_1.Label, null, "Text")),
+                    react_1.default.createElement(formik_1.Field, { name: 'literal' }, (props) => (react_1.default.createElement(styled_components_1.ReferenceTextArea, { id: 'literal', ...props.field }))))),
                 (0, utils_1.shouldRenderField)('std', formik.values.type) && (react_1.default.createElement(styled_components_1.FormField, null,
                     react_1.default.createElement(styled_components_1.LabelContainer, null,
                         react_1.default.createElement(styled_components_1.Label, { htmlFor: 'std' }, "Standard")),

package/dist/cjs/components/references/ReferenceLine.js

@@ -32,6 +32,6 @@ exports.MetadataContainer = styled_components_1.default.div `
   flex: 1;
 `;
 const ReferenceLine = ({ item }) => (react_1.default.createElement(exports.MetadataContainer, null,
-    react_1.default.createElement("div", { "data-cy": 'reference-title' }, item.title || 'Untitled'),
+    react_1.default.createElement("div", { "data-cy": 'reference-title' }, item.title || item.literal || 'Untitled'),
     react_1.default.createElement(exports.Metadata, null, (0, references_1.metadata)(item))));
 exports.ReferenceLine = ReferenceLine;

package/dist/cjs/components/views/FigureDropdown.js

@@ -7,27 +7,33 @@ exports.FigureOptions = void 0;
 const style_guide_1 = require("@manuscripts/style-guide");
 const react_1 = __importDefault(require("react"));
 const styled_components_1 = __importDefault(require("styled-components"));
-const FigureOptions = ({ can, files, onDownload, onUpload, onDetach, onReplace, onDelete, }) => {
-    const { isOpen, toggleOpen, wrapperRef } = (0, style_guide_1.useDropdown)();
-    const supplements = files.supplements
-        .map((s) => s.file)
+const files_1 = require("../../lib/files");
+function getSupplements(getFiles, getDoc, groupFiles) {
+    return groupFiles(getDoc(), getFiles())
+        .supplements.map((s) => s.file)
         .filter((f) => (0, style_guide_1.isImageFile)(f.name));
-    const otherFiles = files.others.filter((f) => (0, style_guide_1.isImageFile)(f.name));
+}
+function getOtherFiles(getFiles, getDoc, groupFiles) {
+    return groupFiles(getDoc(), getFiles()).others.filter((f) => (0, style_guide_1.isImageFile)(f.name));
+}
+const FigureOptions = ({ can, getDoc, getFiles, onDownload, onUpload, onDetach, onReplace, onDelete, }) => {
+    const { isOpen, toggleOpen, wrapperRef } = (0, style_guide_1.useDropdown)();
     const showDownload = onDownload && can.downloadFiles;
     const showUpload = onUpload && can.uploadFile;
     const showDetach = onDetach && can.detachFile;
     const showReplace = onReplace && can.replaceFile;
     const replaceBtnText = onDownload ? 'Replace' : 'Choose file';
     const showDelete = onDelete && can.detachFile;
+    const groupFiles = (0, files_1.memoGroupFiles)();
     return (react_1.default.createElement(DropdownWrapper, { ref: wrapperRef },
         react_1.default.createElement(OptionsButton, { className: 'options-button', onClick: toggleOpen },
             react_1.default.createElement(style_guide_1.DotsIcon, null)),
         isOpen && (react_1.default.createElement(OptionsDropdownList, { direction: 'right', width: 128, top: 5 },
             react_1.default.createElement(NestedDropdown, { disabled: !showReplace, parentToggleOpen: toggleOpen, buttonText: replaceBtnText, moveLeft: true, list: react_1.default.createElement(react_1.default.Fragment, null,
-                    supplements.map((file, index) => (react_1.default.createElement(ListItemButton, { key: file.id, id: index.toString(), onClick: () => onReplace && onReplace(file) },
+                    getSupplements(getFiles, getDoc, groupFiles).map((file, index) => (react_1.default.createElement(ListItemButton, { key: file.id, id: index.toString(), onClick: () => onReplace && onReplace(file) },
                         (0, style_guide_1.getFileIcon)(file.name),
                         react_1.default.createElement(ListItemText, null, file.name)))),
-                    otherFiles.map((file, index) => (react_1.default.createElement(ListItemButton, { key: file.id, id: index.toString(), onClick: () => onReplace && onReplace(file) },
+                    getOtherFiles(getFiles, getDoc, groupFiles).map((file, index) => (react_1.default.createElement(ListItemButton, { key: file.id, id: index.toString(), onClick: () => onReplace && onReplace(file) },
                         (0, style_guide_1.getFileIcon)(file.name),
                         react_1.default.createElement(ListItemText, null, file.name)))),
                     react_1.default.createElement(UploadButton, { onClick: onUpload, disabled: !showUpload },

package/dist/cjs/lib/files.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.groupFiles = void 0;
+exports.groupFiles = exports.memoGroupFiles = void 0;
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_utils_1 = require("prosemirror-utils");
 const track_changes_utils_1 = require("./track-changes-utils");
@@ -13,6 +13,20 @@ const figureTypes = [
     transform_1.schema.nodes.image_element,
     transform_1.schema.nodes.hero_image,
 ];
+function memoGroupFiles() {
+    let prevFiles = [];
+    let prevDoc = undefined;
+    let result;
+    return function (doc, files) {
+        if (result && prevDoc === doc && prevFiles === files) {
+            return result;
+        }
+        prevDoc = doc;
+        prevFiles = files;
+        return (0, exports.groupFiles)(doc, files);
+    };
+}
+exports.memoGroupFiles = memoGroupFiles;
 const groupFiles = (doc, files) => {
     const fileMap = new Map(files.map((f) => [f.id, f]));
     const figures = [];

package/dist/cjs/lib/references.js

@@ -88,5 +88,5 @@ exports.bibliographyItemTypes = [
     ['standard', 'Standard'],
     ['dataset', 'Dataset'],
     ['preprint', 'Preprint'],
-    ['literal', 'Literal'],
+    ['literal', 'Unstructured'],
 ];

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

package/dist/cjs/views/bibliography_element.js

@@ -174,8 +174,28 @@ class BibliographyElementBlockView extends block_view_1.default {
         for (let i = 0; i < bibliography.length; i++) {
             const id = meta.entry_ids[i][0];
             const fragment = bibliography[i];
-            const element = (0, dompurify_1.sanitize)(`<div id="${id}" class="bib-item"><div class="csl-bib-body">${fragment}</div></div>`).firstElementChild;
             const node = nodes.get(id);
+            const isUnstructured = node.attrs.type === 'literal';
+            const tempDiv = document.createElement('div');
+            tempDiv.innerHTML = fragment;
+            if (isUnstructured) {
+                const cslLeftMarginDiv = tempDiv.querySelector('.csl-left-margin');
+                let cslRightInlineDiv = tempDiv.querySelector('.csl-right-inline');
+                const cslEntry = tempDiv.querySelector('.csl-entry');
+                if (cslRightInlineDiv) {
+                    cslRightInlineDiv.textContent = node.attrs.literal ?? '';
+                }
+                else if (cslLeftMarginDiv) {
+                    cslRightInlineDiv = document.createElement('div');
+                    cslRightInlineDiv.classList.add('csl-right-inline');
+                    cslRightInlineDiv.textContent = node.attrs.literal ?? '';
+                    cslLeftMarginDiv.after(cslRightInlineDiv);
+                }
+                else if (cslEntry) {
+                    cslEntry.textContent = node.attrs.literal ?? '';
+                }
+            }
+            const element = (0, dompurify_1.sanitize)(`<div id="${id}" class="bib-item"><div class="csl-bib-body">${tempDiv.innerHTML}</div></div>`).firstElementChild;
             const comment = (0, comments_1.createCommentMarker)('div', id);
             element.prepend(comment);
             (0, track_changes_utils_1.addTrackChangesAttributes)(node.attrs, element);

package/dist/cjs/views/citation.js

@@ -41,7 +41,11 @@ class CitationView extends base_node_view_1.BaseNodeView {
         }
         const id = this.node.attrs.id;
         const text = bib.renderedCitations.get(id);
-        const fragment = (0, dompurify_1.sanitize)(text && text !== '[NO_PRINTED_FORM]' ? text : ' ', {
+        const fragment = (0, dompurify_1.sanitize)(text === '(n.d.)'
+            ? 'Missing citation data'
+            : text && text !== '[NO_PRINTED_FORM]'
+                ? text
+                : ' ', {
             ALLOWED_TAGS: ['i', 'b', 'span', 'sup', 'sub', '#text'],
         });
         this.dom.innerHTML = '';

package/dist/cjs/views/figure_editable.js

@@ -26,7 +26,6 @@ const prosemirror_utils_1 = require("prosemirror-utils");
 const react_1 = require("react");
 const server_1 = require("react-dom/server");
 const FigureDropdown_1 = require("../components/views/FigureDropdown");
-const files_1 = require("../lib/files");
 const track_changes_utils_1 = require("../lib/track-changes-utils");
 const view_1 = require("../lib/view");
 const creators_1 = require("./creators");
@@ -295,11 +294,10 @@ class FigureEditableView extends figure_1.FigureView {
         }
         this.reactTools?.remove();
         if (this.props.dispatch && this.props.theme) {
-            const files = this.props.getFiles();
-            const doc = this.view.state.doc;
             const componentProps = {
                 can,
-                files: (0, files_1.groupFiles)(doc, files),
+                getDoc: () => this.view.state.doc,
+                getFiles: this.props.getFiles,
                 onDownload: handleDownload,
                 onUpload: handleUpload,
                 onDetach: handleDetach,

package/dist/es/components/references/ReferenceForm/ReferenceForm.js

@@ -38,8 +38,15 @@ export const ReferenceForm = ({ values, showDelete, onChange, onDelete, onCancel
     const [showDeleteDialog, setShowDeleteDialog] = useState(false);
     const validateReference = (values) => {
         const errors = {};
-        if (!values.title?.trim()) {
-            errors.title = 'Title is required';
+        if (values.type === 'literal') {
+            if (!values.literal?.trim()) {
+                errors.literal = 'Literal is required for unstructured references';
+            }
+        }
+        else {
+            if (!values.title?.trim()) {
+                errors.title = 'Title is required';
+            }
         }
         return errors;
     };
@@ -84,6 +91,10 @@ export const ReferenceForm = ({ values, showDelete, onChange, onDelete, onCancel
                     React.createElement(LabelContainer, null,
                         React.createElement(Label, null, "Title")),
                     React.createElement(Field, { name: 'title' }, (props) => (React.createElement(ReferenceTextArea, { id: 'title', ...props.field }))))),
+                shouldRenderField('literal', formik.values.type) && (React.createElement(FormField, null,
+                    React.createElement(LabelContainer, null,
+                        React.createElement(Label, null, "Text")),
+                    React.createElement(Field, { name: 'literal' }, (props) => (React.createElement(ReferenceTextArea, { id: 'literal', ...props.field }))))),
                 shouldRenderField('std', formik.values.type) && (React.createElement(FormField, null,
                     React.createElement(LabelContainer, null,
                         React.createElement(Label, { htmlFor: 'std' }, "Standard")),

package/dist/es/components/references/ReferenceLine.js

@@ -26,5 +26,5 @@ export const MetadataContainer = styled.div `
   flex: 1;
 `;
 export const ReferenceLine = ({ item }) => (React.createElement(MetadataContainer, null,
-    React.createElement("div", { "data-cy": 'reference-title' }, item.title || 'Untitled'),
+    React.createElement("div", { "data-cy": 'reference-title' }, item.title || item.literal || 'Untitled'),
     React.createElement(Metadata, null, metadata(item))));

package/dist/es/components/views/FigureDropdown.js

@@ -1,27 +1,33 @@
 import { DotsIcon, DropdownList, getFileIcon, IconButton, IconTextButton, isImageFile, TriangleCollapsedIcon, UploadIcon, useDropdown, } from '@manuscripts/style-guide';
 import React from 'react';
 import styled from 'styled-components';
-export const FigureOptions = ({ can, files, onDownload, onUpload, onDetach, onReplace, onDelete, }) => {
-    const { isOpen, toggleOpen, wrapperRef } = useDropdown();
-    const supplements = files.supplements
-        .map((s) => s.file)
+import { memoGroupFiles, } from '../../lib/files';
+function getSupplements(getFiles, getDoc, groupFiles) {
+    return groupFiles(getDoc(), getFiles())
+        .supplements.map((s) => s.file)
         .filter((f) => isImageFile(f.name));
-    const otherFiles = files.others.filter((f) => isImageFile(f.name));
+}
+function getOtherFiles(getFiles, getDoc, groupFiles) {
+    return groupFiles(getDoc(), getFiles()).others.filter((f) => isImageFile(f.name));
+}
+export const FigureOptions = ({ can, getDoc, getFiles, onDownload, onUpload, onDetach, onReplace, onDelete, }) => {
+    const { isOpen, toggleOpen, wrapperRef } = useDropdown();
     const showDownload = onDownload && can.downloadFiles;
     const showUpload = onUpload && can.uploadFile;
     const showDetach = onDetach && can.detachFile;
     const showReplace = onReplace && can.replaceFile;
     const replaceBtnText = onDownload ? 'Replace' : 'Choose file';
     const showDelete = onDelete && can.detachFile;
+    const groupFiles = memoGroupFiles();
     return (React.createElement(DropdownWrapper, { ref: wrapperRef },
         React.createElement(OptionsButton, { className: 'options-button', onClick: toggleOpen },
             React.createElement(DotsIcon, null)),
         isOpen && (React.createElement(OptionsDropdownList, { direction: 'right', width: 128, top: 5 },
             React.createElement(NestedDropdown, { disabled: !showReplace, parentToggleOpen: toggleOpen, buttonText: replaceBtnText, moveLeft: true, list: React.createElement(React.Fragment, null,
-                    supplements.map((file, index) => (React.createElement(ListItemButton, { key: file.id, id: index.toString(), onClick: () => onReplace && onReplace(file) },
+                    getSupplements(getFiles, getDoc, groupFiles).map((file, index) => (React.createElement(ListItemButton, { key: file.id, id: index.toString(), onClick: () => onReplace && onReplace(file) },
                         getFileIcon(file.name),
                         React.createElement(ListItemText, null, file.name)))),
-                    otherFiles.map((file, index) => (React.createElement(ListItemButton, { key: file.id, id: index.toString(), onClick: () => onReplace && onReplace(file) },
+                    getOtherFiles(getFiles, getDoc, groupFiles).map((file, index) => (React.createElement(ListItemButton, { key: file.id, id: index.toString(), onClick: () => onReplace && onReplace(file) },
                         getFileIcon(file.name),
                         React.createElement(ListItemText, null, file.name)))),
                     React.createElement(UploadButton, { onClick: onUpload, disabled: !showUpload },

package/dist/es/lib/files.js

@@ -10,6 +10,19 @@ const figureTypes = [
     schema.nodes.image_element,
     schema.nodes.hero_image,
 ];
+export function memoGroupFiles() {
+    let prevFiles = [];
+    let prevDoc = undefined;
+    let result;
+    return function (doc, files) {
+        if (result && prevDoc === doc && prevFiles === files) {
+            return result;
+        }
+        prevDoc = doc;
+        prevFiles = files;
+        return groupFiles(doc, files);
+    };
+}
 export const groupFiles = (doc, files) => {
     const fileMap = new Map(files.map((f) => [f.id, f]));
     const figures = [];

package/dist/es/lib/references.js

@@ -58,5 +58,5 @@ export const bibliographyItemTypes = [
     ['standard', 'Standard'],
     ['dataset', 'Dataset'],
     ['preprint', 'Preprint'],
-    ['literal', 'Literal'],
+    ['literal', 'Unstructured'],
 ];

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '3.2.4';
+export const VERSION = '3.2.5';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/es/views/bibliography_element.js

@@ -168,8 +168,28 @@ export class BibliographyElementBlockView extends BlockView {
         for (let i = 0; i < bibliography.length; i++) {
             const id = meta.entry_ids[i][0];
             const fragment = bibliography[i];
-            const element = sanitize(`<div id="${id}" class="bib-item"><div class="csl-bib-body">${fragment}</div></div>`).firstElementChild;
             const node = nodes.get(id);
+            const isUnstructured = node.attrs.type === 'literal';
+            const tempDiv = document.createElement('div');
+            tempDiv.innerHTML = fragment;
+            if (isUnstructured) {
+                const cslLeftMarginDiv = tempDiv.querySelector('.csl-left-margin');
+                let cslRightInlineDiv = tempDiv.querySelector('.csl-right-inline');
+                const cslEntry = tempDiv.querySelector('.csl-entry');
+                if (cslRightInlineDiv) {
+                    cslRightInlineDiv.textContent = node.attrs.literal ?? '';
+                }
+                else if (cslLeftMarginDiv) {
+                    cslRightInlineDiv = document.createElement('div');
+                    cslRightInlineDiv.classList.add('csl-right-inline');
+                    cslRightInlineDiv.textContent = node.attrs.literal ?? '';
+                    cslLeftMarginDiv.after(cslRightInlineDiv);
+                }
+                else if (cslEntry) {
+                    cslEntry.textContent = node.attrs.literal ?? '';
+                }
+            }
+            const element = sanitize(`<div id="${id}" class="bib-item"><div class="csl-bib-body">${tempDiv.innerHTML}</div></div>`).firstElementChild;
             const comment = createCommentMarker('div', id);
             element.prepend(comment);
             addTrackChangesAttributes(node.attrs, element);

package/dist/es/views/citation.js

@@ -38,7 +38,11 @@ export class CitationView extends BaseNodeView {
         }
         const id = this.node.attrs.id;
         const text = bib.renderedCitations.get(id);
-        const fragment = sanitize(text && text !== '[NO_PRINTED_FORM]' ? text : ' ', {
+        const fragment = sanitize(text === '(n.d.)'
+            ? 'Missing citation data'
+            : text && text !== '[NO_PRINTED_FORM]'
+                ? text
+                : ' ', {
             ALLOWED_TAGS: ['i', 'b', 'span', 'sup', 'sub', '#text'],
         });
         this.dom.innerHTML = '';

package/dist/es/views/figure_editable.js

@@ -20,7 +20,6 @@ import { findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
 import { createElement } from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 import { FigureOptions, } from '../components/views/FigureDropdown';
-import { groupFiles } from '../lib/files';
 import { isDeleted } from '../lib/track-changes-utils';
 import { updateNodeAttrs } from '../lib/view';
 import { createEditableNodeView } from './creators';
@@ -289,11 +288,10 @@ export class FigureEditableView extends FigureView {
         }
         this.reactTools?.remove();
         if (this.props.dispatch && this.props.theme) {
-            const files = this.props.getFiles();
-            const doc = this.view.state.doc;
             const componentProps = {
                 can,
-                files: groupFiles(doc, files),
+                getDoc: () => this.view.state.doc,
+                getFiles: this.props.getFiles,
                 onDownload: handleDownload,
                 onUpload: handleUpload,
                 onDetach: handleDetach,

package/dist/types/components/views/FigureDropdown.d.ts

@@ -1,15 +1,17 @@
 import { Capabilities } from '@manuscripts/style-guide';
+import { Node as ManuscriptNode } from 'prosemirror-model';
 import React from 'react';
-import { FileAttachment, ManuscriptFiles } from '../../lib/files';
+import { FileAttachment } from '../../lib/files';
 export interface FigureDropdownProps {
     can: Capabilities;
-    files: ManuscriptFiles;
+    getFiles: () => FileAttachment[];
 }
 export interface FigureOptionsProps extends FigureDropdownProps {
     onDownload?: () => void;
     onUpload?: () => void;
     onDetach?: () => void;
     onReplace?: (file: FileAttachment) => void;
+    getDoc: () => ManuscriptNode;
     onDelete?: () => void;
 }
 export interface FigureElementOptionsProps extends FigureDropdownProps {

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

@@ -28,4 +28,5 @@ export type FileManagement = {
     download: Download;
     previewLink: PreviewLink;
 };
+export declare function memoGroupFiles(): (doc: ManuscriptNode, files: FileAttachment[]) => ManuscriptFiles;
 export declare const groupFiles: (doc: ManuscriptNode, files: FileAttachment[]) => ManuscriptFiles;

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "3.2.4";
+export declare const VERSION = "3.2.5";
 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.2.4",
+  "version": "3.2.5",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",