@manuscripts/body-editor 3.3.2 → 3.3.3

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

@@ -42,29 +42,23 @@ const react_1 = __importStar(require("react"));
 const styled_components_1 = __importDefault(require("styled-components"));
 const files_1 = require("../../lib/files");
 const get_media_type_1 = require("../../lib/get-media-type");
-function getSupplements(getFiles, getDoc, groupFiles, isEmbed, currentFileHref) {
+function getSupplements(getFiles, getDoc, groupFiles, isEmbed) {
     return groupFiles(getDoc(), getFiles())
         .supplements.map((s) => s.file)
         .filter((f) => {
-        if (currentFileHref && f.id === currentFileHref) {
-            return false;
-        }
         const mediaInfo = (0, get_media_type_1.getMediaTypeInfo)(f.name);
         return isEmbed
             ? mediaInfo.isVideo || mediaInfo.isAudio
             : mediaInfo.isImage;
     });
 }
-function getOtherFiles(getFiles, getDoc, groupFiles, isEmbed, currentFileHref) {
+function getOtherFiles(getFiles, getDoc, groupFiles, isEmbed) {
     return groupFiles(getDoc(), getFiles()).others.filter((f) => {
-        if (currentFileHref && f.id === currentFileHref) {
-            return false;
-        }
         const mediaInfo = (0, get_media_type_1.getMediaTypeInfo)(f.name);
         return isEmbed ? mediaInfo.isVideo || mediaInfo.isAudio : mediaInfo.isImage;
     });
 }
-const FigureOptions = ({ can, getDoc, getFiles, onDownload, onUpload, onDetach, onReplace, onReplaceEmbed, onDelete, isEmbed, hasSiblings, container, currentFileHref, }) => {
+const FigureOptions = ({ can, getDoc, getFiles, onDownload, onUpload, onDetach, onReplace, onReplaceEmbed, onDelete, isEmbed, hasSiblings, container, }) => {
     const { isOpen, toggleOpen, wrapperRef } = (0, style_guide_1.useDropdown)();
     const showDownload = onDownload && can.downloadFiles;
     const showUpload = onUpload && can.uploadFile;
@@ -97,10 +91,10 @@ const FigureOptions = ({ can, getDoc, getFiles, onDownload, onUpload, onDetach,
         isOpen && (react_1.default.createElement(OptionsDropdownList, { direction: 'right', width: 128, top: 5 },
             showReplace && isEmbedMode && (react_1.default.createElement(ListItemButton, { onClick: () => onReplaceEmbed && onReplaceEmbed() }, "Edit Link")),
             showReplace && !isEmbedMode && (react_1.default.createElement(NestedDropdown, { disabled: !showReplace, parentToggleOpen: toggleOpen, buttonText: replaceBtnText, moveLeft: true, list: react_1.default.createElement(react_1.default.Fragment, null,
-                    getSupplements(getFiles, getDoc, groupFiles, isEmbed, currentFileHref).map((file, index) => (react_1.default.createElement(ListItemButton, { key: file.id, id: index.toString(), onClick: () => onReplace && onReplace(file, true) },
+                    getSupplements(getFiles, getDoc, groupFiles, isEmbed).map((file, index) => (react_1.default.createElement(ListItemButton, { key: file.id, id: index.toString(), onClick: () => onReplace && onReplace(file, true) },
                         (0, style_guide_1.getFileIcon)(file.name),
                         react_1.default.createElement(ListItemText, null, file.name)))),
-                    getOtherFiles(getFiles, getDoc, groupFiles, isEmbed, currentFileHref).map((file, index) => (react_1.default.createElement(ListItemButton, { key: file.id, id: index.toString(), onClick: () => onReplace && onReplace(file) },
+                    getOtherFiles(getFiles, getDoc, groupFiles, isEmbed).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)))),
                     showUpload && (react_1.default.createElement(UploadButton, { onClick: onUpload, disabled: !showUpload },

package/dist/cjs/lib/files.js

@@ -13,6 +13,7 @@ const figureTypes = [
     transform_1.schema.nodes.figure_element,
     transform_1.schema.nodes.image_element,
     transform_1.schema.nodes.hero_image,
+    transform_1.schema.nodes.embed,
 ];
 function memoGroupFiles() {
     let prevFiles = [];
@@ -45,15 +46,26 @@ const groupFiles = (doc, files) => {
     };
     const getFigureElementFiles = (node, pos) => {
         const figureFiles = [];
-        for (const figure of (0, prosemirror_utils_1.findChildrenByType)(node, transform_1.schema.nodes.figure)) {
-            if ((0, track_changes_utils_1.isHidden)(figure.node)) {
-                continue;
+        if (node.type === transform_1.schema.nodes.embed) {
+            if (node.attrs.href) {
+                figureFiles.push({
+                    node,
+                    pos,
+                    file: getFile(node.attrs.href),
+                });
+            }
+        }
+        else {
+            for (const figure of (0, prosemirror_utils_1.findChildrenByType)(node, transform_1.schema.nodes.figure)) {
+                if ((0, track_changes_utils_1.isHidden)(figure.node)) {
+                    continue;
+                }
+                figureFiles.push({
+                    node: figure.node,
+                    pos: pos + figure.pos + 1,
+                    file: getFile(figure.node.attrs.src),
+                });
             }
-            figureFiles.push({
-                node: figure.node,
-                pos: pos + figure.pos + 1,
-                file: getFile(figure.node.attrs.src),
-            });
         }
         return {
             node,

package/dist/cjs/lib/media.js

@@ -121,7 +121,6 @@ const createReactTools = (node, view, getPos, props, handlers, isEmbed, hasSibli
         return null;
     }
     const can = props.getCapabilities();
-    const currentFileHref = node.attrs.href;
     const componentProps = {
         can,
         getDoc: () => view.state.doc,
@@ -134,7 +133,6 @@ const createReactTools = (node, view, getPos, props, handlers, isEmbed, hasSibli
         onDelete: handlers.handleDelete,
         isEmbed,
         hasSiblings,
-        currentFileHref,
     };
     return (0, ReactSubView_1.default)(props, FigureDropdown_1.FigureOptions, componentProps, node, getPos, view);
 };

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

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

@@ -3,29 +3,23 @@ import React, { useEffect } from 'react';
 import styled from 'styled-components';
 import { memoGroupFiles, } from '../../lib/files';
 import { getMediaTypeInfo } from '../../lib/get-media-type';
-function getSupplements(getFiles, getDoc, groupFiles, isEmbed, currentFileHref) {
+function getSupplements(getFiles, getDoc, groupFiles, isEmbed) {
     return groupFiles(getDoc(), getFiles())
         .supplements.map((s) => s.file)
         .filter((f) => {
-        if (currentFileHref && f.id === currentFileHref) {
-            return false;
-        }
         const mediaInfo = getMediaTypeInfo(f.name);
         return isEmbed
             ? mediaInfo.isVideo || mediaInfo.isAudio
             : mediaInfo.isImage;
     });
 }
-function getOtherFiles(getFiles, getDoc, groupFiles, isEmbed, currentFileHref) {
+function getOtherFiles(getFiles, getDoc, groupFiles, isEmbed) {
     return groupFiles(getDoc(), getFiles()).others.filter((f) => {
-        if (currentFileHref && f.id === currentFileHref) {
-            return false;
-        }
         const mediaInfo = getMediaTypeInfo(f.name);
         return isEmbed ? mediaInfo.isVideo || mediaInfo.isAudio : mediaInfo.isImage;
     });
 }
-export const FigureOptions = ({ can, getDoc, getFiles, onDownload, onUpload, onDetach, onReplace, onReplaceEmbed, onDelete, isEmbed, hasSiblings, container, currentFileHref, }) => {
+export const FigureOptions = ({ can, getDoc, getFiles, onDownload, onUpload, onDetach, onReplace, onReplaceEmbed, onDelete, isEmbed, hasSiblings, container, }) => {
     const { isOpen, toggleOpen, wrapperRef } = useDropdown();
     const showDownload = onDownload && can.downloadFiles;
     const showUpload = onUpload && can.uploadFile;
@@ -58,10 +52,10 @@ export const FigureOptions = ({ can, getDoc, getFiles, onDownload, onUpload, onD
         isOpen && (React.createElement(OptionsDropdownList, { direction: 'right', width: 128, top: 5 },
             showReplace && isEmbedMode && (React.createElement(ListItemButton, { onClick: () => onReplaceEmbed && onReplaceEmbed() }, "Edit Link")),
             showReplace && !isEmbedMode && (React.createElement(NestedDropdown, { disabled: !showReplace, parentToggleOpen: toggleOpen, buttonText: replaceBtnText, moveLeft: true, list: React.createElement(React.Fragment, null,
-                    getSupplements(getFiles, getDoc, groupFiles, isEmbed, currentFileHref).map((file, index) => (React.createElement(ListItemButton, { key: file.id, id: index.toString(), onClick: () => onReplace && onReplace(file, true) },
+                    getSupplements(getFiles, getDoc, groupFiles, isEmbed).map((file, index) => (React.createElement(ListItemButton, { key: file.id, id: index.toString(), onClick: () => onReplace && onReplace(file, true) },
                         getFileIcon(file.name),
                         React.createElement(ListItemText, null, file.name)))),
-                    getOtherFiles(getFiles, getDoc, groupFiles, isEmbed, currentFileHref).map((file, index) => (React.createElement(ListItemButton, { key: file.id, id: index.toString(), onClick: () => onReplace && onReplace(file) },
+                    getOtherFiles(getFiles, getDoc, groupFiles, isEmbed).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)))),
                     showUpload && (React.createElement(UploadButton, { onClick: onUpload, disabled: !showUpload },

package/dist/es/lib/files.js

@@ -9,6 +9,7 @@ const figureTypes = [
     schema.nodes.figure_element,
     schema.nodes.image_element,
     schema.nodes.hero_image,
+    schema.nodes.embed,
 ];
 export function memoGroupFiles() {
     let prevFiles = [];
@@ -41,15 +42,26 @@ export const groupFiles = (doc, files) => {
     };
     const getFigureElementFiles = (node, pos) => {
         const figureFiles = [];
-        for (const figure of findChildrenByType(node, schema.nodes.figure)) {
-            if (isHidden(figure.node)) {
-                continue;
+        if (node.type === schema.nodes.embed) {
+            if (node.attrs.href) {
+                figureFiles.push({
+                    node,
+                    pos,
+                    file: getFile(node.attrs.href),
+                });
+            }
+        }
+        else {
+            for (const figure of findChildrenByType(node, schema.nodes.figure)) {
+                if (isHidden(figure.node)) {
+                    continue;
+                }
+                figureFiles.push({
+                    node: figure.node,
+                    pos: pos + figure.pos + 1,
+                    file: getFile(figure.node.attrs.src),
+                });
             }
-            figureFiles.push({
-                node: figure.node,
-                pos: pos + figure.pos + 1,
-                file: getFile(figure.node.attrs.src),
-            });
         }
         return {
             node,

package/dist/es/lib/media.js

@@ -112,7 +112,6 @@ export const createReactTools = (node, view, getPos, props, handlers, isEmbed, h
         return null;
     }
     const can = props.getCapabilities();
-    const currentFileHref = node.attrs.href;
     const componentProps = {
         can,
         getDoc: () => view.state.doc,
@@ -125,7 +124,6 @@ export const createReactTools = (node, view, getPos, props, handlers, isEmbed, h
         onDelete: handlers.handleDelete,
         isEmbed,
         hasSiblings,
-        currentFileHref,
     };
     return ReactSubView(props, FigureOptions, componentProps, node, getPos, view);
 };

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '3.3.2';
+export const VERSION = '3.3.3';
 export const MATHJAX_VERSION = '3.2.2';

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

@@ -18,7 +18,6 @@ export interface FigureOptionsProps extends FigureDropdownProps {
     onDelete?: () => void;
     isEmbed: boolean;
     hasSiblings: () => boolean;
-    currentFileHref?: string;
 }
 export interface FigureElementOptionsProps extends FigureDropdownProps {
     onAdd: (file: FileAttachment) => Promise<void>;

package/dist/types/versions.d.ts

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