@manuscripts/style-guide 1.7.2 → 1.7.3-LEAN-3181-0

package/dist/cjs/components/FileManager/FileManager.js

@@ -35,8 +35,8 @@ const InlineFilesSection_1 = require("./InlineFilesSection");
 const OtherFilesSection_1 = require("./OtherFilesSection");
 const SupplementsSection_1 = require("./SupplementsSection");
 exports.PermissionsContext = (0, react_1.createContext)(null);
-const FileManager = ({ files, fileManagement, modelMap, saveModel, deleteModel, enableDragAndDrop, can, }) => {
-    const { inlineFiles, supplements, otherFiles } = (0, index_1.useFiles)(modelMap, files);
+const FileManager = ({ files, fileManagement, doc, modelMap, saveModel, deleteModel, enableDragAndDrop, can, }) => {
+    const { inlineFiles, supplements, otherFiles } = (0, index_1.useFiles)(doc, files);
     return (react_1.default.createElement(FileManagerProvider_1.FileManagerProvider, { saveModel: saveModel, deleteModel: deleteModel, modelMap: modelMap, fileManagement: fileManagement },
         react_1.default.createElement(DragLayer_1.DragLayer, null),
         react_1.default.createElement(exports.PermissionsContext.Provider, { value: can },

package/dist/cjs/components/References/ReferencesModal.js

@@ -175,6 +175,13 @@ const ReferencesModal = ({ isOpen, onCancel, items, item, citationCounts, onSave
         setSelection(item);
         setConfirm(false);
     };
+    const handleDelete = () => {
+        if (!selection) {
+            return;
+        }
+        onDelete(selection);
+        setSelection(undefined);
+    };
     const handleItemClick = (item) => {
         const values = valuesRef.current;
         if (values && selection && !(0, lodash_1.isEqual)(values, (0, exports.normalize)(selection))) {
@@ -214,6 +221,6 @@ const ReferencesModal = ({ isOpen, onCancel, items, item, citationCounts, onSave
                                 (citationCounts.get(item._id) || 0) > 0 ? (react_1.default.createElement(CitationCount, { "data-tooltip-id": "citation-count-tooltip" }, citationCounts.get(item._id))) : (react_1.default.createElement(CitationCount, { className: "unused" }, "0"))),
                             react_1.default.createElement(ReferenceLine_1.ReferenceLine, { item: item }))))),
                         react_1.default.createElement(Tooltip_1.Tooltip, { id: "citation-count-tooltip", place: "bottom" }, "Number of times used in the document"))),
-                react_1.default.createElement(StyledModal_1.ScrollableModalContent, null, selection && (react_1.default.createElement(ReferenceForm_1.ReferenceForm, { values: (0, exports.normalize)(selection), showDelete: !citationCounts.get(selection._id), onChange: handleChange, onCancel: onCancel, onDelete: () => onDelete(selection), onSave: save, actionsRef: actionsRef })))))));
+                react_1.default.createElement(StyledModal_1.ScrollableModalContent, null, selection && (react_1.default.createElement(ReferenceForm_1.ReferenceForm, { values: (0, exports.normalize)(selection), showDelete: !citationCounts.get(selection._id), onChange: handleChange, onCancel: onCancel, onDelete: handleDelete, onSave: save, actionsRef: actionsRef })))))));
 };
 exports.ReferencesModal = ReferencesModal;

package/dist/cjs/hooks/use-files.js

@@ -1,39 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useFiles = void 0;
-const json_schema_1 = require("@manuscripts/json-schema");
 const files_1 = require("../lib/files");
 const use_deep_compare_1 = require("./use-deep-compare");
-const types = [
-    json_schema_1.ObjectTypes.Section,
-    json_schema_1.ObjectTypes.FigureElement,
-    json_schema_1.ObjectTypes.Figure,
-    json_schema_1.ObjectTypes.Supplement,
-    json_schema_1.ObjectTypes.ElementsOrder,
-];
 const getOtherFiles = (inlineFiles, supplements, files) => {
     const excluded = new Set();
     inlineFiles.flatMap((f) => f.files).forEach((f) => excluded.add(f.id));
     supplements.forEach((s) => excluded.add(s.id));
     return files.filter((f) => !excluded.has(f.id));
 };
-const useFiles = (modelMap, files) => {
-    const models = [];
-    for (const [_, model] of modelMap.entries()) {
-        if (types.includes(model.objectType)) {
-            models.push(model);
-        }
-    }
+const useFiles = (doc, files) => {
     return (0, use_deep_compare_1.useDeepCompareMemo)(() => {
-        const inlineFiles = (0, files_1.getInlineFiles)(modelMap, files);
-        const supplements = (0, files_1.getSupplements)(modelMap, files);
+        const inlineFiles = (0, files_1.getInlineFiles)(doc, files);
+        const supplements = (0, files_1.getSupplements)(doc, files);
         const otherFiles = getOtherFiles(inlineFiles, supplements, files);
         return {
             inlineFiles,
             supplements,
             otherFiles,
         };
-    }, [models, files]);
+    }, [doc, files]);
 };
 exports.useFiles = useFiles;
 exports.default = exports.useFiles;

package/dist/cjs/lib/files.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSupplements = exports.getInlineFiles = exports.isModelFile = void 0;
-const json_schema_1 = require("@manuscripts/json-schema");
+const transform_1 = require("@manuscripts/transform");
 const util_1 = require("../components/FileManager/util");
 const isModelFile = (file) => {
     return file.modelId;
@@ -17,68 +17,55 @@ const MISSING_FILE = {
 const getFile = (files, id) => {
     return files.filter((f) => f.id === id)[0] || MISSING_FILE;
 };
-const getFigureFiles = (element, modelMap, files) => {
+const getFigureFiles = (figureElement, files) => {
     const figureFiles = [];
-    element.containedObjectIDs.map((id) => {
-        const model = modelMap.get(id);
-        if (model && model.objectType === json_schema_1.ObjectTypes.Figure) {
-            const figure = model;
-            if (figure.src) {
-                figureFiles.push(Object.assign(Object.assign({}, getFile(files, figure.src)), { modelId: figure._id }));
-            }
+    figureElement.forEach((node) => {
+        if (node.type === transform_1.schema.nodes.figure) {
+            figureFiles.push(Object.assign(Object.assign({}, getFile(files, node.attrs.src)), { modelId: figureElement.attrs.id }));
         }
     });
     return figureFiles;
 };
 const getSupplementFiles = (supplement, files) => {
-    if (supplement.href) {
-        const href = supplement.href;
-        if (href) {
-            return [
-                Object.assign(Object.assign({}, getFile(files, href)), { modelId: supplement._id }),
-            ];
-        }
+    if (supplement.attrs.href) {
+        return [
+            Object.assign(Object.assign({}, getFile(files, supplement.attrs.href)), { modelId: supplement.attrs.id }),
+        ];
     }
     return [];
 };
-const getInlineFiles = (modelMap, files) => {
-    var _a;
+const getInlineFiles = (doc, files) => {
     const elements = [];
-    const orders = getOrderByType(modelMap);
-    const sections = (0, json_schema_1.getModelsByType)(modelMap, json_schema_1.ObjectTypes.Section);
-    const graphicalAbstractElementIds = (_a = sections.filter((s) => s.category === 'MPSectionCategory:abstract-graphical')[0]) === null || _a === void 0 ? void 0 : _a.elementIDs;
-    graphicalAbstractElementIds === null || graphicalAbstractElementIds === void 0 ? void 0 : graphicalAbstractElementIds.map((id) => {
-        const figure = modelMap.get(id);
-        if (figure) {
+    doc.descendants((node, _, parent) => {
+        const isGraphicalAbstractFigure = (parent === null || parent === void 0 ? void 0 : parent.type) === transform_1.schema.nodes.section &&
+            (parent === null || parent === void 0 ? void 0 : parent.attrs.category) === 'MPSectionCategory:abstract-graphical';
+        if (node.type === transform_1.schema.nodes.figure_element) {
             elements.push({
-                modelId: id,
-                type: util_1.FileType.GraphicalAbstract,
-                label: 'Graphical Abstract',
-                files: getFigureFiles(figure, modelMap, files),
+                modelId: node.attrs.id,
+                type: (isGraphicalAbstractFigure && util_1.FileType.GraphicalAbstract) ||
+                    util_1.FileType.Figure,
+                label: (isGraphicalAbstractFigure && `Graphical Abstract`) ||
+                    node.attrs.label,
+                files: getFigureFiles(node, files),
             });
+            return false;
         }
     });
-    const figures = (0, json_schema_1.getModelsByType)(modelMap, json_schema_1.ObjectTypes.FigureElement);
-    const figureOrder = orders.get(json_schema_1.ObjectTypes.FigureElement);
-    if (figureOrder) {
-    }
-    figures === null || figures === void 0 ? void 0 : figures.filter((f) => !(graphicalAbstractElementIds === null || graphicalAbstractElementIds === void 0 ? void 0 : graphicalAbstractElementIds.includes(f._id))).map((figure, index) => ({
-        modelId: figure._id,
-        type: util_1.FileType.Figure,
-        label: `Figure ${index + 1}`,
-        files: getFigureFiles(figure, modelMap, files),
-    })).forEach((e) => elements.push(e));
     return elements;
 };
 exports.getInlineFiles = getInlineFiles;
-const getSupplements = (modelMap, files) => {
-    const supplements = (0, json_schema_1.getModelsByType)(modelMap, json_schema_1.ObjectTypes.Supplement);
-    return supplements.flatMap((s) => getSupplementFiles(s, files));
+const getSupplements = (doc, files) => {
+    const supplements = [];
+    doc.descendants((node) => {
+        if (node.type === transform_1.schema.nodes.supplements) {
+            node.forEach((child) => {
+                if (child.type === transform_1.schema.nodes.supplement) {
+                    supplements.push(...getSupplementFiles(child, files));
+                }
+            });
+            return false;
+        }
+    });
+    return supplements;
 };
 exports.getSupplements = getSupplements;
-const getOrderByType = (modelMap) => {
-    const groups = new Map();
-    const orders = (0, json_schema_1.getModelsByType)(modelMap, json_schema_1.ObjectTypes.ElementsOrder);
-    orders.forEach((o) => groups.set(o.elementType, o));
-    return groups;
-};

package/dist/es/components/FileManager/FileManager.js

@@ -9,8 +9,8 @@ import { InlineFilesSection } from './InlineFilesSection';
 import { OtherFilesSection } from './OtherFilesSection';
 import { SupplementsSection } from './SupplementsSection';
 export const PermissionsContext = createContext(null);
-export const FileManager = ({ files, fileManagement, modelMap, saveModel, deleteModel, enableDragAndDrop, can, }) => {
-    const { inlineFiles, supplements, otherFiles } = useFiles(modelMap, files);
+export const FileManager = ({ files, fileManagement, doc, modelMap, saveModel, deleteModel, enableDragAndDrop, can, }) => {
+    const { inlineFiles, supplements, otherFiles } = useFiles(doc, files);
     return (React.createElement(FileManagerProvider, { saveModel: saveModel, deleteModel: deleteModel, modelMap: modelMap, fileManagement: fileManagement },
         React.createElement(DragLayer, null),
         React.createElement(PermissionsContext.Provider, { value: can },

package/dist/es/components/References/ReferencesModal.js

@@ -145,6 +145,13 @@ export const ReferencesModal = ({ isOpen, onCancel, items, item, citationCounts,
         setSelection(item);
         setConfirm(false);
     };
+    const handleDelete = () => {
+        if (!selection) {
+            return;
+        }
+        onDelete(selection);
+        setSelection(undefined);
+    };
     const handleItemClick = (item) => {
         const values = valuesRef.current;
         if (values && selection && !isEqual(values, normalize(selection))) {
@@ -184,5 +191,5 @@ export const ReferencesModal = ({ isOpen, onCancel, items, item, citationCounts,
                                 (citationCounts.get(item._id) || 0) > 0 ? (React.createElement(CitationCount, { "data-tooltip-id": "citation-count-tooltip" }, citationCounts.get(item._id))) : (React.createElement(CitationCount, { className: "unused" }, "0"))),
                             React.createElement(ReferenceLine, { item: item }))))),
                         React.createElement(Tooltip, { id: "citation-count-tooltip", place: "bottom" }, "Number of times used in the document"))),
-                React.createElement(ScrollableModalContent, null, selection && (React.createElement(ReferenceForm, { values: normalize(selection), showDelete: !citationCounts.get(selection._id), onChange: handleChange, onCancel: onCancel, onDelete: () => onDelete(selection), onSave: save, actionsRef: actionsRef })))))));
+                React.createElement(ScrollableModalContent, null, selection && (React.createElement(ReferenceForm, { values: normalize(selection), showDelete: !citationCounts.get(selection._id), onChange: handleChange, onCancel: onCancel, onDelete: handleDelete, onSave: save, actionsRef: actionsRef })))))));
 };

package/dist/es/hooks/use-files.js

@@ -1,35 +1,21 @@
-import { ObjectTypes } from '@manuscripts/json-schema';
 import { getInlineFiles, getSupplements, } from '../lib/files';
 import { useDeepCompareMemo } from './use-deep-compare';
-const types = [
-    ObjectTypes.Section,
-    ObjectTypes.FigureElement,
-    ObjectTypes.Figure,
-    ObjectTypes.Supplement,
-    ObjectTypes.ElementsOrder,
-];
 const getOtherFiles = (inlineFiles, supplements, files) => {
     const excluded = new Set();
     inlineFiles.flatMap((f) => f.files).forEach((f) => excluded.add(f.id));
     supplements.forEach((s) => excluded.add(s.id));
     return files.filter((f) => !excluded.has(f.id));
 };
-export const useFiles = (modelMap, files) => {
-    const models = [];
-    for (const [_, model] of modelMap.entries()) {
-        if (types.includes(model.objectType)) {
-            models.push(model);
-        }
-    }
+export const useFiles = (doc, files) => {
     return useDeepCompareMemo(() => {
-        const inlineFiles = getInlineFiles(modelMap, files);
-        const supplements = getSupplements(modelMap, files);
+        const inlineFiles = getInlineFiles(doc, files);
+        const supplements = getSupplements(doc, files);
         const otherFiles = getOtherFiles(inlineFiles, supplements, files);
         return {
             inlineFiles,
             supplements,
             otherFiles,
         };
-    }, [models, files]);
+    }, [doc, files]);
 };
 export default useFiles;

package/dist/es/lib/files.js

@@ -1,4 +1,4 @@
-import { getModelsByType, ObjectTypes, } from '@manuscripts/json-schema';
+import { schema } from '@manuscripts/transform';
 import { FileType } from '../components/FileManager/util';
 export const isModelFile = (file) => {
     return file.modelId;
@@ -13,66 +13,53 @@ const MISSING_FILE = {
 const getFile = (files, id) => {
     return files.filter((f) => f.id === id)[0] || MISSING_FILE;
 };
-const getFigureFiles = (element, modelMap, files) => {
+const getFigureFiles = (figureElement, files) => {
     const figureFiles = [];
-    element.containedObjectIDs.map((id) => {
-        const model = modelMap.get(id);
-        if (model && model.objectType === ObjectTypes.Figure) {
-            const figure = model;
-            if (figure.src) {
-                figureFiles.push(Object.assign(Object.assign({}, getFile(files, figure.src)), { modelId: figure._id }));
-            }
+    figureElement.forEach((node) => {
+        if (node.type === schema.nodes.figure) {
+            figureFiles.push(Object.assign(Object.assign({}, getFile(files, node.attrs.src)), { modelId: figureElement.attrs.id }));
         }
     });
     return figureFiles;
 };
 const getSupplementFiles = (supplement, files) => {
-    if (supplement.href) {
-        const href = supplement.href;
-        if (href) {
-            return [
-                Object.assign(Object.assign({}, getFile(files, href)), { modelId: supplement._id }),
-            ];
-        }
+    if (supplement.attrs.href) {
+        return [
+            Object.assign(Object.assign({}, getFile(files, supplement.attrs.href)), { modelId: supplement.attrs.id }),
+        ];
     }
     return [];
 };
-export const getInlineFiles = (modelMap, files) => {
-    var _a;
+export const getInlineFiles = (doc, files) => {
     const elements = [];
-    const orders = getOrderByType(modelMap);
-    const sections = getModelsByType(modelMap, ObjectTypes.Section);
-    const graphicalAbstractElementIds = (_a = sections.filter((s) => s.category === 'MPSectionCategory:abstract-graphical')[0]) === null || _a === void 0 ? void 0 : _a.elementIDs;
-    graphicalAbstractElementIds === null || graphicalAbstractElementIds === void 0 ? void 0 : graphicalAbstractElementIds.map((id) => {
-        const figure = modelMap.get(id);
-        if (figure) {
+    doc.descendants((node, _, parent) => {
+        const isGraphicalAbstractFigure = (parent === null || parent === void 0 ? void 0 : parent.type) === schema.nodes.section &&
+            (parent === null || parent === void 0 ? void 0 : parent.attrs.category) === 'MPSectionCategory:abstract-graphical';
+        if (node.type === schema.nodes.figure_element) {
             elements.push({
-                modelId: id,
-                type: FileType.GraphicalAbstract,
-                label: 'Graphical Abstract',
-                files: getFigureFiles(figure, modelMap, files),
+                modelId: node.attrs.id,
+                type: (isGraphicalAbstractFigure && FileType.GraphicalAbstract) ||
+                    FileType.Figure,
+                label: (isGraphicalAbstractFigure && `Graphical Abstract`) ||
+                    node.attrs.label,
+                files: getFigureFiles(node, files),
             });
+            return false;
         }
     });
-    const figures = getModelsByType(modelMap, ObjectTypes.FigureElement);
-    const figureOrder = orders.get(ObjectTypes.FigureElement);
-    if (figureOrder) {
-    }
-    figures === null || figures === void 0 ? void 0 : figures.filter((f) => !(graphicalAbstractElementIds === null || graphicalAbstractElementIds === void 0 ? void 0 : graphicalAbstractElementIds.includes(f._id))).map((figure, index) => ({
-        modelId: figure._id,
-        type: FileType.Figure,
-        label: `Figure ${index + 1}`,
-        files: getFigureFiles(figure, modelMap, files),
-    })).forEach((e) => elements.push(e));
     return elements;
 };
-export const getSupplements = (modelMap, files) => {
-    const supplements = getModelsByType(modelMap, ObjectTypes.Supplement);
-    return supplements.flatMap((s) => getSupplementFiles(s, files));
-};
-const getOrderByType = (modelMap) => {
-    const groups = new Map();
-    const orders = getModelsByType(modelMap, ObjectTypes.ElementsOrder);
-    orders.forEach((o) => groups.set(o.elementType, o));
-    return groups;
+export const getSupplements = (doc, files) => {
+    const supplements = [];
+    doc.descendants((node) => {
+        if (node.type === schema.nodes.supplements) {
+            node.forEach((child) => {
+                if (child.type === schema.nodes.supplement) {
+                    supplements.push(...getSupplementFiles(child, files));
+                }
+            });
+            return false;
+        }
+    });
+    return supplements;
 };

package/dist/types/components/FileManager/FileManager.d.ts

@@ -1,4 +1,5 @@
 import { Build, Model } from '@manuscripts/json-schema';
+import { ManuscriptNode } from '@manuscripts/transform';
 import React from 'react';
 import { FileSectionType } from '../../index';
 import { Capabilities } from '../../lib/capabilities';
@@ -22,6 +23,7 @@ export declare const PermissionsContext: React.Context<Capabilities | null>;
 export declare const FileManager: React.FC<{
     files: FileAttachment[];
     fileManagement: FileManagement;
+    doc: ManuscriptNode;
     modelMap: Map<string, Model>;
     saveModel: SaveModel;
     deleteModel: DeleteModel;

package/dist/types/hooks/use-files.d.ts

@@ -1,6 +1,6 @@
-import { Model } from '@manuscripts/json-schema';
+import { ManuscriptNode } from '@manuscripts/transform';
 import { ElementFiles, FileAttachment, ModelFile } from '../lib/files';
-export declare const useFiles: (modelMap: Map<string, Model>, files: FileAttachment[]) => {
+export declare const useFiles: (doc: ManuscriptNode, files: FileAttachment[]) => {
     inlineFiles: ElementFiles[];
     supplements: ModelFile[];
     otherFiles: FileAttachment[];

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

@@ -1,4 +1,4 @@
-import { Model } from '@manuscripts/json-schema';
+import { ManuscriptNode } from '@manuscripts/transform';
 import { FileType } from '../components/FileManager/util';
 export type FileDesignation = {
     id: string;
@@ -20,5 +20,5 @@ export type ElementFiles = {
     files: ModelFile[];
 };
 export declare const isModelFile: (file: FileAttachment) => file is ModelFile;
-export declare const getInlineFiles: (modelMap: Map<string, Model>, files: FileAttachment[]) => ElementFiles[];
-export declare const getSupplements: (modelMap: Map<string, Model>, files: FileAttachment[]) => ModelFile[];
+export declare const getInlineFiles: (doc: ManuscriptNode, files: FileAttachment[]) => ElementFiles[];
+export declare const getSupplements: (doc: ManuscriptNode, files: FileAttachment[]) => ModelFile[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/style-guide",
   "description": "Shared components for Manuscripts applications",
-  "version": "1.7.2",
+  "version": "1.7.3-LEAN-3181-0",
   "repository": "github:Atypon-OpenSource/manuscripts-style-guide",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -34,7 +34,7 @@
   "dependencies": {
     "@manuscripts/assets": "^0.6.4",
     "@manuscripts/json-schema": "^2.2.2",
-    "@manuscripts/transform": "2.0.4",
+    "@manuscripts/transform": "^2.1.0",
     "@reach/tabs": "^0.18.0",
     "date-fns": "^2.29.3",
     "formik": "^2.2.9",