@manuscripts/body-editor 2.8.63-LEAN-4160.2 → 2.8.63

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

@@ -32,6 +32,7 @@ const react_dnd_1 = require("react-dnd");
 const context_menu_1 = require("../../lib/context-menu");
 const dnd_1 = require("../../lib/dnd");
 const track_changes_utils_1 = require("../../lib/track-changes-utils");
+const utils_1 = require("../../lib/utils");
 const node_type_icons_1 = require("../../node-type-icons");
 const Outline_1 = require("./Outline");
 const excludedTypes = [
@@ -94,6 +95,7 @@ const DraggableTree = ({ tree, view, depth, can, }) => {
     const [dropSide, setDropSide] = (0, react_1.useState)();
     const [isOpen, setOpen] = (0, react_1.useState)(depth === 0);
     const ref = (0, react_1.useRef)(null);
+    const disableDragAndDrop = view ? (0, utils_1.isBodyLocked)(view.state) : true;
     const { node, items, parent } = tree;
     const itemText = (node) => {
         const text = (0, transform_1.nodeTitle)(node);
@@ -110,7 +112,7 @@ const DraggableTree = ({ tree, view, depth, can, }) => {
         type: 'outline',
         item: tree,
         canDrag: () => {
-            return depth !== 0;
+            return depth !== 0 && !disableDragAndDrop;
         },
         collect: (monitor) => ({
             isDragging: monitor.isDragging(),
@@ -119,6 +121,9 @@ const DraggableTree = ({ tree, view, depth, can, }) => {
     const [{ isOver }, dropRef] = (0, react_dnd_1.useDrop)({
         accept: 'outline',
         canDrop(item, monitor) {
+            if (disableDragAndDrop) {
+                return false;
+            }
             if (isAbstractOrBackmatter(item) || isAbstractOrBackmatter(tree)) {
                 return false;
             }
@@ -142,20 +147,20 @@ const DraggableTree = ({ tree, view, depth, can, }) => {
             return tree.parent.canReplace(index, index, prosemirror_model_1.Fragment.from(item.node));
         },
         hover(item, monitor) {
-            if (!ref.current || !monitor.canDrop()) {
+            if (disableDragAndDrop || !ref.current || !monitor.canDrop()) {
                 return;
             }
             const side = (0, dnd_1.getDropSide)(ref.current, monitor);
             setDropSide(side);
         },
         drop(item, monitor) {
-            if (!ref.current || !view) {
+            if (disableDragAndDrop || !ref.current || !view) {
                 return;
             }
             const side = (0, dnd_1.getDropSide)(ref.current, monitor);
             const pos = side === 'before' ? tree.pos - 1 : tree.endPos - 1;
             let sourcePos = item.pos - 1;
-            const node = item.node.type.schema.nodes[item.node.type.name].create(Object.assign({}, item.node.attrs), item.node.content);
+            const node = item.node.type.schema.nodes[item.node.type.name].create(Object.assign(Object.assign({}, item.node.attrs), { id: '' }), item.node.content);
             const tr = view.state.tr.insert(pos, node);
             sourcePos = tr.mapping.map(sourcePos);
             tr.delete(sourcePos, sourcePos + item.node.nodeSize);
@@ -182,7 +187,8 @@ const DraggableTree = ({ tree, view, depth, can, }) => {
     dragRef(dropRef(ref));
     const dragClass = isDragging ? 'dragging' : '';
     const dropClass = isOver && dropSide ? `drop-${dropSide}` : '';
-    return (react_1.default.createElement(Outline_1.Outline, { ref: ref, className: `${dragClass} ${dropClass} ${isDeletedItem && 'deleted'}` },
+    const deletedClass = isDeletedItem ? 'deleted' : '';
+    return (react_1.default.createElement(Outline_1.Outline, { ref: ref, className: `${dragClass} ${dropClass} ${deletedClass}` },
         !isTop && node.type.name != 'manuscript' && (react_1.default.createElement(Outline_1.OutlineItem, { depth: depth, onContextMenu: handleContextMenu },
             items.length ? (react_1.default.createElement(Outline_1.OutlineItemArrow, { onClick: toggleOpen }, isOpen ? react_1.default.createElement(style_guide_1.TriangleExpandedIcon, null) : react_1.default.createElement(style_guide_1.TriangleCollapsedIcon, null))) : (react_1.default.createElement(Outline_1.OutlineItemNoArrow, null)),
             react_1.default.createElement(Outline_1.OutlineItemLink, { to: `#${node.attrs.id}` },

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.8.63-LEAN-4160.2';
+exports.VERSION = '2.8.63';
 exports.MATHJAX_VERSION = '3.2.2';

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

@@ -6,6 +6,7 @@ import { useDrag, useDrop } from 'react-dnd';
 import { ContextMenu } from '../../lib/context-menu';
 import { getDropSide } from '../../lib/dnd';
 import { isDeleted } from '../../lib/track-changes-utils';
+import { isBodyLocked } from '../../lib/utils';
 import { nodeTypeIcon } from '../../node-type-icons';
 import { Outline, OutlineItem, OutlineItemArrow, OutlineItemIcon, OutlineItemLink, OutlineItemLinkText, OutlineItemNoArrow, OutlineItemPlaceholder, } from './Outline';
 const excludedTypes = [
@@ -67,6 +68,7 @@ export const DraggableTree = ({ tree, view, depth, can, }) => {
     const [dropSide, setDropSide] = useState();
     const [isOpen, setOpen] = useState(depth === 0);
     const ref = useRef(null);
+    const disableDragAndDrop = view ? isBodyLocked(view.state) : true;
     const { node, items, parent } = tree;
     const itemText = (node) => {
         const text = nodeTitle(node);
@@ -83,7 +85,7 @@ export const DraggableTree = ({ tree, view, depth, can, }) => {
         type: 'outline',
         item: tree,
         canDrag: () => {
-            return depth !== 0;
+            return depth !== 0 && !disableDragAndDrop;
         },
         collect: (monitor) => ({
             isDragging: monitor.isDragging(),
@@ -92,6 +94,9 @@ export const DraggableTree = ({ tree, view, depth, can, }) => {
     const [{ isOver }, dropRef] = useDrop({
         accept: 'outline',
         canDrop(item, monitor) {
+            if (disableDragAndDrop) {
+                return false;
+            }
             if (isAbstractOrBackmatter(item) || isAbstractOrBackmatter(tree)) {
                 return false;
             }
@@ -115,20 +120,20 @@ export const DraggableTree = ({ tree, view, depth, can, }) => {
             return tree.parent.canReplace(index, index, Fragment.from(item.node));
         },
         hover(item, monitor) {
-            if (!ref.current || !monitor.canDrop()) {
+            if (disableDragAndDrop || !ref.current || !monitor.canDrop()) {
                 return;
             }
             const side = getDropSide(ref.current, monitor);
             setDropSide(side);
         },
         drop(item, monitor) {
-            if (!ref.current || !view) {
+            if (disableDragAndDrop || !ref.current || !view) {
                 return;
             }
             const side = getDropSide(ref.current, monitor);
             const pos = side === 'before' ? tree.pos - 1 : tree.endPos - 1;
             let sourcePos = item.pos - 1;
-            const node = item.node.type.schema.nodes[item.node.type.name].create(Object.assign({}, item.node.attrs), item.node.content);
+            const node = item.node.type.schema.nodes[item.node.type.name].create(Object.assign(Object.assign({}, item.node.attrs), { id: '' }), item.node.content);
             const tr = view.state.tr.insert(pos, node);
             sourcePos = tr.mapping.map(sourcePos);
             tr.delete(sourcePos, sourcePos + item.node.nodeSize);
@@ -155,7 +160,8 @@ export const DraggableTree = ({ tree, view, depth, can, }) => {
     dragRef(dropRef(ref));
     const dragClass = isDragging ? 'dragging' : '';
     const dropClass = isOver && dropSide ? `drop-${dropSide}` : '';
-    return (React.createElement(Outline, { ref: ref, className: `${dragClass} ${dropClass} ${isDeletedItem && 'deleted'}` },
+    const deletedClass = isDeletedItem ? 'deleted' : '';
+    return (React.createElement(Outline, { ref: ref, className: `${dragClass} ${dropClass} ${deletedClass}` },
         !isTop && node.type.name != 'manuscript' && (React.createElement(OutlineItem, { depth: depth, onContextMenu: handleContextMenu },
             items.length ? (React.createElement(OutlineItemArrow, { onClick: toggleOpen }, isOpen ? React.createElement(TriangleExpandedIcon, null) : React.createElement(TriangleCollapsedIcon, null))) : (React.createElement(OutlineItemNoArrow, null)),
             React.createElement(OutlineItemLink, { to: `#${node.attrs.id}` },

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '2.8.63-LEAN-4160.2';
+export const VERSION = '2.8.63';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.8.63-LEAN-4160.2";
+export declare const VERSION = "2.8.63";
 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.8.63-LEAN-4160.2",
+  "version": "2.8.63",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -22,8 +22,8 @@
     "dependencies-versions": "node versions.mjs > src/versions.ts",
     "prettier": "prettier --write 'src/**/*.{ts,tsx}'",
     "prepare": "husky install",
-    "preversion": "concurrently 'yarn:typecheck' 'yarn:lint' 'yarn:test'",
     "pretest": "yarn prebuild",
+    "preversion": "concurrently 'yarn:typecheck' 'yarn:lint' 'yarn:test'",
     "test": "jest --runInBand",
     "typecheck": "tsc --noEmit",
     "version": "yarn build"
@@ -33,7 +33,7 @@
     "@manuscripts/json-schema": "2.2.11",
     "@manuscripts/library": "1.3.14",
     "@manuscripts/style-guide": "2.1.10",
-    "@manuscripts/track-changes-plugin": "1.10.5-LEAN-4160.6",
+    "@manuscripts/track-changes-plugin": "1.10.4",
     "@manuscripts/transform": "3.0.62",
     "@popperjs/core": "^2.11.8",
     "astrocite-eutils": "^0.16.4",

package/styles/AdvancedEditor.css

@@ -759,8 +759,6 @@ figure.block:has(.equation.selected-suggestion) {
   .block,
 .tracking-visible
   .selected-suggestion[data-track-op='wrap_with_node'][data-track-status='pending']
-  .block, .tracking-visible
-  .selected-suggestion[data-track-op='move'][data-track-status='pending']
   .block {
   box-shadow: inset 6px 0 0 var(--inserted-pending-color),
     inset 9px 0 0 var(--inserted-pending-bg-color) !important;