@manuscripts/body-editor 2.7.19-LEAN-4231.0 → 2.7.19

package/dist/cjs/commands.js

@@ -145,9 +145,6 @@ const createBlock = (nodeType, position, state, dispatch, attrs) => {
         case state.schema.nodes.figure_element:
             node = createAndFillFigureElement(state);
             break;
-        case state.schema.nodes.image_element:
-            node = createImageElement(state);
-            break;
         case state.schema.nodes.listing_element:
             node = state.schema.nodes.listing_element.create({}, [
                 state.schema.nodes.listing.create(),
@@ -993,9 +990,6 @@ const createAndFillFigcaptionElement = (state) => state.schema.nodes.figcaption.
     state.schema.nodes.caption_title.create(),
     state.schema.nodes.caption.create(),
 ]);
-const createImageElement = (state) => state.schema.nodes.image_element.create({}, [
-    state.schema.nodes.figure.create(),
-]);
 const getParentNode = (selection) => {
     var _a;
     const parentNode = (0, utils_1.findParentNodeWithId)(selection);

package/dist/cjs/components/authors/AuthorsModal.js

@@ -311,10 +311,20 @@ const AuthorsModal = ({ authors: $authors, affiliations: $affiliations, author,
             items: [author],
         });
     };
-    const handleMoveAuthor = (from, to) => {
-        const copy = [...authors];
-        const order = copy.map((_, i) => (i === from ? to : i));
-        copy.sort((a, b) => order[authors.indexOf(a)] - order[authors.indexOf(b)]);
+    const handleMoveAuthor = (from, to, shift) => {
+        const copy = (0, lodash_1.cloneDeep)(authors);
+        const order = copy.map((a, i) => {
+            if (a.id === from.id) {
+                if (to.priority) {
+                    return to.priority + shift;
+                }
+                else {
+                    return authors.findIndex((i) => i === to) + shift;
+                }
+            }
+            return i;
+        });
+        copy.sort((a, b) => order[copy.indexOf(a)] - order[copy.indexOf(b)]);
         copy.forEach((a, i) => {
             if (a.priority !== i) {
                 a.priority = i;

package/dist/cjs/components/authors/DraggableAuthor.js

@@ -161,10 +161,8 @@ exports.DraggableAuthor = react_1.default.memo(({ author, isSelected, onClick, o
                 return;
             }
             const side = (0, dnd_1.getDropSide)(ref.current, monitor);
-            const from = item.author.priority;
-            const to = author.priority;
             const diff = side === 'before' ? -0.5 : 0.5;
-            moveAuthor(from, to + diff);
+            moveAuthor(item.author, author, diff);
         },
         collect: (monitor) => ({
             isOver: monitor.isOver(),

package/dist/cjs/components/outline/DraggableTree.js

@@ -44,6 +44,7 @@ const excludedTypes = [
     transform_1.schema.nodes.contributors,
     transform_1.schema.nodes.author_notes,
     transform_1.schema.nodes.title,
+    transform_1.schema.nodes.image_element,
 ];
 const childrenExcludedTypes = [
     transform_1.schema.nodes.pullquote_element,

package/dist/cjs/configs/editor-views.js

@@ -70,7 +70,6 @@ exports.default = (props, dispatch) => {
         equation_element: (0, equation_element_editable_1.default)(props),
         figure: (0, figure_editable_1.default)(props, dispatch),
         figure_element: (0, figure_element_editable_1.default)(props, dispatch),
-        image_element: (0, figure_element_editable_1.default)(props, dispatch),
         footnote: (0, footnote_1.default)(props),
         footnotes_element: (0, footnotes_element_1.default)(props),
         general_table_footnote: (0, general_table_footnote_1.default)(props, dispatch),

package/dist/cjs/lib/files.js

@@ -52,9 +52,7 @@ const groupFiles = (doc, files) => {
         figures.push(getFigureElementFiles(element.node, element.pos));
     }
     doc.descendants((node, pos) => {
-        if ((node.type === transform_1.schema.nodes.figure_element ||
-            node.type === transform_1.schema.nodes.image_element) &&
-            node.attrs.id !== gaID) {
+        if (node.type === transform_1.schema.nodes.figure_element && node.attrs.id !== gaID) {
             figures.push(getFigureElementFiles(node, pos));
         }
         if (node.type === transform_1.schema.nodes.supplement) {

package/dist/cjs/lib/track-changes-utils.js

@@ -121,7 +121,10 @@ exports.getActualTextContent = getActualTextContent;
 function sanitizeAttrsChange(newAttr, currentAttrs) {
     return Object.keys(newAttr).reduce((acc, attr) => {
         const key = attr;
-        if (!currentAttrs[key] && currentAttrs[key] !== 0 && !newAttr[key]) {
+        if (!currentAttrs[key] &&
+            currentAttrs[key] !== 0 &&
+            !newAttr[key] &&
+            newAttr[key] !== 0) {
             return acc;
         }
         acc[key] = newAttr[key];

package/dist/cjs/menus.js

@@ -199,12 +199,6 @@ const getEditorMenus = (editor) => {
                 isEnabled: isCommandValid((0, commands_1.canInsert)(transform_1.schema.nodes.figure_element)),
                 run: doCommand((0, commands_1.insertBlock)(transform_1.schema.nodes.figure_element)),
             },
-            {
-                id: 'insert-image-element',
-                label: 'Simple Image',
-                isEnabled: isCommandValid((0, commands_1.canInsert)(transform_1.schema.nodes.image_element)),
-                run: doCommand((0, commands_1.insertBlock)(transform_1.schema.nodes.image_element)),
-            },
             {
                 id: 'insert-table-element',
                 label: 'Table',

package/dist/cjs/node-type-icons.js

@@ -23,7 +23,6 @@ const style_guide_1 = require("@manuscripts/style-guide");
 const transform_1 = require("@manuscripts/transform");
 const react_1 = __importDefault(require("react"));
 const { nodes } = transform_1.schema;
-const OutlineImageIcon = () => (react_1.default.createElement(style_guide_1.FileImageIcon, { width: "11", height: "14" }));
 const icons = new Map([
     [nodes.manuscript, style_guide_1.OutlineManuscriptIcon],
     [nodes.bibliography_section, style_guide_1.OutlineSectionIcon],
@@ -37,7 +36,6 @@ const icons = new Map([
     [nodes.table_element, style_guide_1.OutlineTableIcon],
     [nodes.graphical_abstract_section, style_guide_1.OutlineSectionIcon],
     [nodes.footnotes_section, style_guide_1.OutlineSectionIcon],
-    [nodes.image_element, OutlineImageIcon],
 ]);
 const nodeTypeIcon = (nodeType, listType) => {
     if (nodeType === transform_1.schema.nodes.list) {

package/dist/cjs/plugins/objects.js

@@ -46,21 +46,15 @@ exports.default = () => {
                             if (target && !isInGraphicalAbstract) {
                                 const labelNode = document.createElement('span');
                                 labelNode.className = 'figure-label';
-                                if (node.type.name === 'image_element') {
-                                    labelNode.textContent = target.label;
-                                    decorations.push(prosemirror_view_1.Decoration.widget(pos + node.nodeSize - 1, labelNode));
-                                }
-                                else {
-                                    labelNode.textContent = target.label + ':';
-                                    node.forEach((child, offset) => {
-                                        if (child.type.name === 'figcaption') {
-                                            decorations.push(prosemirror_view_1.Decoration.widget(pos + 1 + offset + 1, labelNode, {
-                                                side: -1,
-                                                key: `figure-label-${id}-${target.label}`,
-                                            }));
-                                        }
-                                    });
-                                }
+                                labelNode.textContent = target.label + ':';
+                                node.forEach((child, offset) => {
+                                    if (child.type.name === 'figcaption') {
+                                        decorations.push(prosemirror_view_1.Decoration.widget(pos + 1 + offset + 1, labelNode, {
+                                            side: -1,
+                                            key: `figure-label-${id}-${target.label}`,
+                                        }));
+                                    }
+                                });
                             }
                         }
                     });

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 = '2.7.19-LEAN-4231.0';
+exports.VERSION = '2.7.19';
 exports.MATHJAX_VERSION = '3.2.2';

package/dist/cjs/views/figure_editable.js

@@ -94,10 +94,8 @@ class FigureEditableView extends figure_1.FigureView {
         var _a;
         super.updateContents();
         const attrs = this.node.attrs;
-        console.log('attrs:', attrs);
         const src = attrs.src;
         const files = this.props.getFiles();
-        console.log('files:', files);
         const file = src && files.filter((f) => f.id === src)[0];
         this.container.innerHTML = '';
         const can = this.props.getCapabilities();

package/dist/es/commands.js

@@ -135,9 +135,6 @@ export const createBlock = (nodeType, position, state, dispatch, attrs) => {
         case state.schema.nodes.figure_element:
             node = createAndFillFigureElement(state);
             break;
-        case state.schema.nodes.image_element:
-            node = createImageElement(state);
-            break;
         case state.schema.nodes.listing_element:
             node = state.schema.nodes.listing_element.create({}, [
                 state.schema.nodes.listing.create(),
@@ -944,9 +941,6 @@ const createAndFillFigcaptionElement = (state) => state.schema.nodes.figcaption.
     state.schema.nodes.caption_title.create(),
     state.schema.nodes.caption.create(),
 ]);
-const createImageElement = (state) => state.schema.nodes.image_element.create({}, [
-    state.schema.nodes.figure.create(),
-]);
 const getParentNode = (selection) => {
     var _a;
     const parentNode = findParentNodeWithId(selection);

package/dist/es/components/authors/AuthorsModal.js

@@ -15,7 +15,7 @@
  */
 import { buildBibliographicName, generateID, ObjectTypes, } from '@manuscripts/json-schema';
 import { AddIcon, AddInstitutionIcon, AuthorPlaceholderIcon, CloseButton, Drawer, ModalBody, ModalContainer, ModalHeader, ModalSidebar, ModalSidebarHeader, ModalSidebarTitle, ScrollableModalContent, SelectedItemsBox, SidebarContent, StyledModal, } from '@manuscripts/style-guide';
-import { isEqual, omit } from 'lodash';
+import { cloneDeep, isEqual, omit } from 'lodash';
 import React, { useEffect, useReducer, useRef, useState } from 'react';
 import styled from 'styled-components';
 import { arrayReducer } from '../../lib/array-reducer';
@@ -282,10 +282,20 @@ export const AuthorsModal = ({ authors: $authors, affiliations: $affiliations, a
             items: [author],
         });
     };
-    const handleMoveAuthor = (from, to) => {
-        const copy = [...authors];
-        const order = copy.map((_, i) => (i === from ? to : i));
-        copy.sort((a, b) => order[authors.indexOf(a)] - order[authors.indexOf(b)]);
+    const handleMoveAuthor = (from, to, shift) => {
+        const copy = cloneDeep(authors);
+        const order = copy.map((a, i) => {
+            if (a.id === from.id) {
+                if (to.priority) {
+                    return to.priority + shift;
+                }
+                else {
+                    return authors.findIndex((i) => i === to) + shift;
+                }
+            }
+            return i;
+        });
+        copy.sort((a, b) => order[copy.indexOf(a)] - order[copy.indexOf(b)]);
         copy.forEach((a, i) => {
             if (a.priority !== i) {
                 a.priority = i;

package/dist/es/components/authors/DraggableAuthor.js

@@ -132,10 +132,8 @@ export const DraggableAuthor = React.memo(({ author, isSelected, onClick, onDele
                 return;
             }
             const side = getDropSide(ref.current, monitor);
-            const from = item.author.priority;
-            const to = author.priority;
             const diff = side === 'before' ? -0.5 : 0.5;
-            moveAuthor(from, to + diff);
+            moveAuthor(item.author, author, diff);
         },
         collect: (monitor) => ({
             isOver: monitor.isOver(),

package/dist/es/components/outline/DraggableTree.js

@@ -18,6 +18,7 @@ const excludedTypes = [
     schema.nodes.contributors,
     schema.nodes.author_notes,
     schema.nodes.title,
+    schema.nodes.image_element,
 ];
 const childrenExcludedTypes = [
     schema.nodes.pullquote_element,

package/dist/es/configs/editor-views.js

@@ -65,7 +65,6 @@ export default (props, dispatch) => {
         equation_element: equationElement(props),
         figure: figure(props, dispatch),
         figure_element: figureElement(props, dispatch),
-        image_element: figureElement(props, dispatch),
         footnote: footnote(props),
         footnotes_element: footnotesElement(props),
         general_table_footnote: generalTableFootnote(props, dispatch),

package/dist/es/lib/files.js

@@ -49,9 +49,7 @@ export const groupFiles = (doc, files) => {
         figures.push(getFigureElementFiles(element.node, element.pos));
     }
     doc.descendants((node, pos) => {
-        if ((node.type === schema.nodes.figure_element ||
-            node.type === schema.nodes.image_element) &&
-            node.attrs.id !== gaID) {
+        if (node.type === schema.nodes.figure_element && node.attrs.id !== gaID) {
             figures.push(getFigureElementFiles(node, pos));
         }
         if (node.type === schema.nodes.supplement) {

package/dist/es/lib/track-changes-utils.js

@@ -108,7 +108,10 @@ export function getActualTextContent(fragment) {
 export function sanitizeAttrsChange(newAttr, currentAttrs) {
     return Object.keys(newAttr).reduce((acc, attr) => {
         const key = attr;
-        if (!currentAttrs[key] && currentAttrs[key] !== 0 && !newAttr[key]) {
+        if (!currentAttrs[key] &&
+            currentAttrs[key] !== 0 &&
+            !newAttr[key] &&
+            newAttr[key] !== 0) {
             return acc;
         }
         acc[key] = newAttr[key];

package/dist/es/menus.js

@@ -196,12 +196,6 @@ export const getEditorMenus = (editor) => {
                 isEnabled: isCommandValid(canInsert(schema.nodes.figure_element)),
                 run: doCommand(insertBlock(schema.nodes.figure_element)),
             },
-            {
-                id: 'insert-image-element',
-                label: 'Simple Image',
-                isEnabled: isCommandValid(canInsert(schema.nodes.image_element)),
-                run: doCommand(insertBlock(schema.nodes.image_element)),
-            },
             {
                 id: 'insert-table-element',
                 label: 'Table',

package/dist/es/node-type-icons.js

@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { FileImageIcon, OutlineBlockQuoteIcon, OutlineEmbedIcon, OutlineEquationIcon, OutlineFigureIcon, OutlineManuscriptIcon, OutlineOrderedListIcon, OutlineParagraphIcon, OutlinePullQuoteIcon, OutlineSectionIcon, OutlineTableIcon, OutlineUnorderedListIcon, } from '@manuscripts/style-guide';
+import { OutlineBlockQuoteIcon, OutlineEmbedIcon, OutlineEquationIcon, OutlineFigureIcon, OutlineManuscriptIcon, OutlineOrderedListIcon, OutlineParagraphIcon, OutlinePullQuoteIcon, OutlineSectionIcon, OutlineTableIcon, OutlineUnorderedListIcon, } from '@manuscripts/style-guide';
 import { schema } from '@manuscripts/transform';
 import React from 'react';
 const { nodes } = schema;
-const OutlineImageIcon = () => (React.createElement(FileImageIcon, { width: "11", height: "14" }));
 const icons = new Map([
     [nodes.manuscript, OutlineManuscriptIcon],
     [nodes.bibliography_section, OutlineSectionIcon],
@@ -31,7 +30,6 @@ const icons = new Map([
     [nodes.table_element, OutlineTableIcon],
     [nodes.graphical_abstract_section, OutlineSectionIcon],
     [nodes.footnotes_section, OutlineSectionIcon],
-    [nodes.image_element, OutlineImageIcon],
 ]);
 export const nodeTypeIcon = (nodeType, listType) => {
     if (nodeType === schema.nodes.list) {

package/dist/es/plugins/objects.js

@@ -43,21 +43,15 @@ export default () => {
                             if (target && !isInGraphicalAbstract) {
                                 const labelNode = document.createElement('span');
                                 labelNode.className = 'figure-label';
-                                if (node.type.name === 'image_element') {
-                                    labelNode.textContent = target.label;
-                                    decorations.push(Decoration.widget(pos + node.nodeSize - 1, labelNode));
-                                }
-                                else {
-                                    labelNode.textContent = target.label + ':';
-                                    node.forEach((child, offset) => {
-                                        if (child.type.name === 'figcaption') {
-                                            decorations.push(Decoration.widget(pos + 1 + offset + 1, labelNode, {
-                                                side: -1,
-                                                key: `figure-label-${id}-${target.label}`,
-                                            }));
-                                        }
-                                    });
-                                }
+                                labelNode.textContent = target.label + ':';
+                                node.forEach((child, offset) => {
+                                    if (child.type.name === 'figcaption') {
+                                        decorations.push(Decoration.widget(pos + 1 + offset + 1, labelNode, {
+                                            side: -1,
+                                            key: `figure-label-${id}-${target.label}`,
+                                        }));
+                                    }
+                                });
                             }
                         }
                     });

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '2.7.19-LEAN-4231.0';
+export const VERSION = '2.7.19';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/es/views/figure_editable.js

@@ -88,10 +88,8 @@ export class FigureEditableView extends FigureView {
         var _a;
         super.updateContents();
         const attrs = this.node.attrs;
-        console.log('attrs:', attrs);
         const src = attrs.src;
         const files = this.props.getFiles();
-        console.log('files:', files);
         const file = src && files.filter((f) => f.id === src)[0];
         this.container.innerHTML = '';
         const can = this.props.getCapabilities();

package/dist/types/components/authors/AuthorList.d.ts

@@ -20,7 +20,7 @@ interface AuthorListProps {
     authors: ContributorAttrs[];
     onSelect: (item: ContributorAttrs) => void;
     onDelete: () => void;
-    moveAuthor: (index: number, target: number) => void;
+    moveAuthor: (from: ContributorAttrs, to: ContributorAttrs, shift: number) => void;
     lastSavedAuthor: string | null;
 }
 export declare const AuthorList: React.FC<AuthorListProps>;

package/dist/types/components/authors/DraggableAuthor.d.ts

@@ -20,7 +20,7 @@ interface DraggableAuthorProps {
     isSelected: boolean;
     onClick: () => void;
     onDelete: () => void;
-    moveAuthor: (from: number, to: number) => void;
+    moveAuthor: (from: ContributorAttrs, to: ContributorAttrs, shift: number) => void;
     showSuccessIcon?: boolean;
 }
 export declare const DraggableAuthor: React.FC<DraggableAuthorProps>;

package/dist/types/configs/editor-views.d.ts

@@ -104,32 +104,6 @@ declare const _default: (props: EditorProps, dispatch: Dispatch) => {
         deselectNode(): void;
         destroy(): void;
     } & import("../views/figure_element").FigureElementView>;
-    image_element: import("../types").NodeViewCreator<{
-        gutterButtons(): HTMLElement[];
-        actionGutterButtons(): never[];
-        createAddButton(): HTMLAnchorElement | null;
-        createEditButton(): HTMLElement | null;
-        createMenu: () => import("../lib/context-menu").ContextMenu;
-        initialise(): void;
-        updateContents(): void;
-        handleTrackChanges(): void;
-        updateClasses(): void;
-        updatePlaceholder(): void;
-        createElement(): void;
-        createDOM(): void;
-        createGutter(className: string, buttons: HTMLElement[]): void;
-        dom: HTMLElement;
-        contentDOM?: HTMLElement | undefined;
-        elementType: string;
-        readonly props: EditorProps;
-        node: import("prosemirror-model").Node;
-        readonly view: import("prosemirror-view").EditorView;
-        readonly getPos: () => number;
-        update(newNode: import("prosemirror-model").Node): boolean;
-        selectNode(): void;
-        deselectNode(): void;
-        destroy(): void;
-    } & import("../views/figure_element").FigureElementView>;
     footnote: import("../types").NodeViewCreator<import("../views/footnote").FootnoteView>;
     footnotes_element: import("../types").NodeViewCreator<import("../views/footnotes_element").FootnotesElementView>;
     general_table_footnote: import("../types").NodeViewCreator<import("../views/general_table_footnote").GeneralTableFootnoteView>;

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.7.19-LEAN-4231.0";
+export declare const VERSION = "2.7.19";
 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": "2.7.19-LEAN-4231.0",
+  "version": "2.7.19",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -34,7 +34,7 @@
     "@manuscripts/library": "1.3.11",
     "@manuscripts/style-guide": "2.0.32",
     "@manuscripts/track-changes-plugin": "1.9.2",
-    "@manuscripts/transform": "3.0.37-LEAN-4231.0",
+    "@manuscripts/transform": "3.0.36",
     "@popperjs/core": "^2.11.8",
     "astrocite-eutils": "^0.16.4",
     "codemirror": "^5.58.1",

package/styles/Editor.css

@@ -348,17 +348,10 @@
 
 .ProseMirror .figure-label {
   font-weight: bold;
-  font-size: 14px;
   margin-right: 5px;
   white-space: nowrap;
 }
 
-.block-image_element .figure-label {
-  text-align: center;
-  grid-column-start: 1;
-  grid-column-end: -1;
-}
-
 .ProseMirror .executable-container {
   width: 100%;
   position: relative;