@manuscripts/body-editor 2.7.0 → 2.7.1-LEAN-3837.0

package/dist/cjs/commands.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.autoComplete = exports.mergeCellsWithSpace = exports.addColumns = exports.addHeaderRow = exports.addRows = exports.addInlineComment = exports.addNodeComment = exports.createAndFillTableElement = exports.selectAllIsolating = exports.ignoreAtomBlockNodeForward = exports.isAtEndOfTextBlock = exports.ignoreMetaNodeBackspaceCommand = exports.ignoreAtomBlockNodeBackward = exports.isTextSelection = exports.isAtStartOfTextBlock = exports.insertTOCSection = exports.insertBibliographySection = exports.insertList = exports.insertKeywords = exports.insertAffiliation = exports.insertContributors = exports.insertAbstract = exports.insertBackmatterSection = exports.insertSection = exports.insertGraphicalAbstract = exports.insertBoxElement = exports.insertInlineFootnote = exports.insertFootnotesElement = exports.insertTableElementFooter = exports.insertInlineEquation = exports.insertCrossReference = exports.insertInlineCitation = exports.insertLink = exports.insertSectionLabel = exports.findPosBeforeFirstSubsection = exports.insertBreak = exports.deleteBlock = exports.insertBlock = exports.insertSupplement = exports.insertTable = exports.insertFigure = exports.insertGeneralTableFootnote = exports.insertInlineTableFootnote = exports.createBlock = exports.createSelection = exports.canInsert = exports.blockActive = exports.isNodeSelection = exports.markActive = exports.addToStart = void 0;
+exports.autoComplete = exports.addColumns = exports.addHeaderRow = exports.addRows = exports.addInlineComment = exports.addNodeComment = exports.createAndFillTableElement = exports.selectAllIsolating = exports.ignoreAtomBlockNodeForward = exports.isAtEndOfTextBlock = exports.ignoreMetaNodeBackspaceCommand = exports.ignoreAtomBlockNodeBackward = exports.isTextSelection = exports.isAtStartOfTextBlock = exports.insertTOCSection = exports.insertBibliographySection = exports.insertList = exports.insertKeywords = exports.insertAffiliation = exports.insertContributors = exports.insertAbstract = exports.insertBackmatterSection = exports.insertSection = exports.insertGraphicalAbstract = exports.insertBoxElement = exports.insertInlineFootnote = exports.insertFootnotesElement = exports.insertTableElementFooter = exports.insertInlineEquation = exports.insertCrossReference = exports.insertInlineCitation = exports.insertLink = exports.insertSectionLabel = exports.findPosBeforeFirstSubsection = exports.insertBreak = exports.deleteBlock = exports.insertBlock = exports.insertSupplement = exports.insertTable = exports.insertFigure = exports.insertGeneralTableFootnote = exports.insertInlineTableFootnote = exports.createBlock = exports.createSelection = exports.canInsert = exports.blockActive = exports.isNodeSelection = exports.markActive = exports.addToStart = void 0;
 const json_schema_1 = require("@manuscripts/json-schema");
 const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
 const transform_1 = require("@manuscripts/transform");
@@ -931,7 +931,7 @@ const DEFAULT_TABLE_CONFIG = {
 const createAndFillTableElement = (state, config = DEFAULT_TABLE_CONFIG) => {
     const { numberOfColumns, numberOfRows, includeHeader } = config;
     const createRow = (cellType) => {
-        const cells = Array.from({ length: numberOfColumns }, () => cellType.create());
+        const cells = Array.from({ length: numberOfColumns }, () => cellType.create({}, transform_1.schema.nodes.paragraph.create()));
         return transform_1.schema.nodes.table_row.create({}, cells);
     };
     const tableRows = includeHeader ? [createRow(transform_1.schema.nodes.table_header)] : [];
@@ -1101,83 +1101,6 @@ const addColumns = (direction) => (state, dispatch) => {
     return true;
 };
 exports.addColumns = addColumns;
-function isEmpty(cell) {
-    const c = cell.content;
-    return (c.childCount == 1 && c.child(0).isTextblock && c.child(0).childCount == 0);
-}
-function cellsOverlapRectangle({ width, height, map }, rect) {
-    let indexTop = rect.top * width + rect.left, indexLeft = indexTop;
-    let indexBottom = (rect.bottom - 1) * width + rect.left, indexRight = indexTop + (rect.right - rect.left - 1);
-    for (let i = rect.top; i < rect.bottom; i++) {
-        if ((rect.left > 0 && map[indexLeft] == map[indexLeft - 1]) ||
-            (rect.right < width && map[indexRight] == map[indexRight + 1])) {
-            return true;
-        }
-        indexLeft += width;
-        indexRight += width;
-    }
-    for (let i = rect.left; i < rect.right; i++) {
-        if ((rect.top > 0 && map[indexTop] == map[indexTop - width]) ||
-            (rect.bottom < height && map[indexBottom] == map[indexBottom + width])) {
-            return true;
-        }
-        indexTop++;
-        indexBottom++;
-    }
-    return false;
-}
-function mergeCellsWithSpace(state, dispatch) {
-    const sel = state.selection;
-    if (!(sel instanceof prosemirror_tables_1.CellSelection) ||
-        sel.$anchorCell.pos == sel.$headCell.pos) {
-        return false;
-    }
-    const rect = (0, prosemirror_tables_1.selectedRect)(state), { map } = rect;
-    if (cellsOverlapRectangle(map, rect)) {
-        return false;
-    }
-    if (dispatch) {
-        const tr = state.tr;
-        const seen = {};
-        let content = prosemirror_model_1.Fragment.empty;
-        let mergedPos;
-        let mergedCell;
-        for (let row = rect.top; row < rect.bottom; row++) {
-            for (let col = rect.left; col < rect.right; col++) {
-                const cellPos = map.map[row * map.width + col];
-                const cell = rect.table.nodeAt(cellPos);
-                if (seen[cellPos] || !cell) {
-                    continue;
-                }
-                seen[cellPos] = true;
-                if (mergedPos == null) {
-                    mergedPos = cellPos;
-                    mergedCell = cell;
-                }
-                else {
-                    if (!isEmpty(cell)) {
-                        content = content.append(cell.content.addToStart(cell.type.schema.text(' ')));
-                    }
-                    const mapped = tr.mapping.map(cellPos + rect.tableStart);
-                    tr.delete(mapped, mapped + cell.nodeSize);
-                }
-            }
-        }
-        if (mergedPos == null || mergedCell == null) {
-            return true;
-        }
-        tr.setNodeMarkup(mergedPos + rect.tableStart, null, Object.assign(Object.assign({}, (0, prosemirror_tables_1.addColSpan)(mergedCell.attrs, mergedCell.attrs.colspan, rect.right - rect.left - mergedCell.attrs.colspan)), { rowspan: rect.bottom - rect.top }));
-        if (content.size) {
-            const end = mergedPos + 1 + mergedCell.content.size;
-            const start = isEmpty(mergedCell) ? mergedPos + 1 : end;
-            tr.replaceWith(start + rect.tableStart, end + rect.tableStart, content);
-        }
-        tr.setSelection(new prosemirror_tables_1.CellSelection(tr.doc.resolve(mergedPos + rect.tableStart)));
-        dispatch(tr);
-    }
-    return true;
-}
-exports.mergeCellsWithSpace = mergeCellsWithSpace;
 const autoComplete = (state, dispatch) => {
     const complete = (0, autocompletion_1.checkForCompletion)(state);
     if (complete) {

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

@@ -114,7 +114,7 @@ const ContextMenu = ({ view, close, onCancelColumnDialog }) => {
             " Delete ",
             columns),
         (isCellSelectionMerged || isCellSelectionSplittable) && react_1.default.createElement(Separator, null),
-        isCellSelectionMerged && (react_1.default.createElement(ActionButton, { onClick: () => runCommand(commands_1.mergeCellsWithSpace, true) }, "Merge cells")),
+        isCellSelectionMerged && (react_1.default.createElement(ActionButton, { onClick: () => runCommand(prosemirror_tables_1.mergeCells, true) }, "Merge cells")),
         isCellSelectionSplittable && (react_1.default.createElement(ActionButton, { onClick: () => runCommand(prosemirror_tables_1.splitCell, true) }, "Split cells")),
         react_1.default.createElement(ColumnChangeWarningDialog, { isOpen: !!columnAction, primaryAction: () => {
                 if (columnAction) {

package/dist/cjs/configs/ManuscriptsEditor.js

@@ -49,6 +49,7 @@ const createEditorView = (props, root, state, dispatch) => {
         dispatchTransaction: dispatch,
         nodeViews: (0, editor_views_1.default)(props, dispatch),
         attributes: props.attributes,
+        transformPastedHTML: paste_1.transformPastedHTML,
         transformPasted: paste_1.transformPasted,
         handlePaste: paste_1.handlePaste,
         clipboardParser: clipboard_1.clipboardParser,

package/dist/cjs/lib/copy.js

@@ -1,53 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformCopied = void 0;
-const transform_1 = require("@manuscripts/transform");
 const prosemirror_model_1 = require("prosemirror-model");
-const prosemirror_utils_1 = require("prosemirror-utils");
-const table_1 = require("./table");
-const transformCopied = (slice, view) => {
-    var _a, _b, _c;
-    const { state } = view;
-    const cutDepth = Math.min(slice.openStart, slice.openEnd);
-    const tableSlice = handleTableSelection(slice, view, cutDepth);
-    if (tableSlice) {
-        return tableSlice;
-    }
-    if (((_a = slice.content.firstChild) === null || _a === void 0 ? void 0 : _a.type.isBlock) ||
-        ((_b = slice.content.lastChild) === null || _b === void 0 ? void 0 : _b.type.isBlock)) {
-        let newSliceContent = [];
-        (_c = slice.content.firstChild) === null || _c === void 0 ? void 0 : _c.descendants((node) => {
-            var _a, _b;
-            if (node.childCount > 1 ||
-                (((_a = node.content.firstChild) === null || _a === void 0 ? void 0 : _a.type) === transform_1.schema.nodes.table_element &&
-                    ((_b = node.content.lastChild) === null || _b === void 0 ? void 0 : _b.type) === transform_1.schema.nodes.table_element)) {
-                newSliceContent = (0, table_1.updateSliceWithFullTableContent)(state, node.content);
-                return false;
-            }
-            return true;
-        });
-        if (newSliceContent.length > 1) {
-            return new prosemirror_model_1.Slice(prosemirror_model_1.Fragment.from(newSliceContent), 0, 0);
-        }
-        else {
-            const updateSelection = handleTableSelection(new prosemirror_model_1.Slice(prosemirror_model_1.Fragment.from(newSliceContent), slice.openStart, slice.openEnd), view, 0);
-            if (updateSelection) {
-                return updateSelection;
-            }
-        }
+const transformCopied = (slice) => {
+    var _a, _b;
+    if (slice.openStart !== slice.openEnd &&
+        (((_a = slice.content.firstChild) === null || _a === void 0 ? void 0 : _a.type.isBlock) ||
+            ((_b = slice.content.lastChild) === null || _b === void 0 ? void 0 : _b.type.isBlock))) {
+        const cutDepth = Math.min(slice.openStart, slice.openEnd);
+        return new prosemirror_model_1.Slice(slice.content, cutDepth, cutDepth);
     }
     return slice;
 };
 exports.transformCopied = transformCopied;
-const handleTableSelection = (slice, view, cutDepth) => {
-    var _a, _b;
-    if ((!view.props.handleKeyDown || !view.state.selection.empty) &&
-        (((_a = slice.content.firstChild) === null || _a === void 0 ? void 0 : _a.type) === transform_1.schema.nodes.table ||
-            ((_b = slice.content.firstChild) === null || _b === void 0 ? void 0 : _b.type) === transform_1.schema.nodes.table_element)) {
-        const tableElement = (0, prosemirror_utils_1.findParentNodeOfType)(transform_1.schema.nodes.table_element)(view.state.selection);
-        if (tableElement) {
-            return (0, table_1.handleTableSlice)(view, cutDepth, tableElement);
-        }
-    }
-    return null;
-};

package/dist/cjs/lib/paste.js

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handlePaste = exports.transformPasted = void 0;
+exports.handlePaste = exports.transformPastedHTML = exports.transformPasted = void 0;
 const transform_1 = require("@manuscripts/transform");
 const prosemirror_model_1 = require("prosemirror-model");
 const prosemirror_state_1 = require("prosemirror-state");
 const prosemirror_utils_1 = require("prosemirror-utils");
-const table_1 = require("./table");
+const prosemirror_transform_1 = require("prosemirror-transform");
 const removeFirstParagraphIfEmpty = (slice) => {
     const firstChild = slice.content.firstChild;
     if (firstChild &&
@@ -49,6 +49,24 @@ const transformPasted = (slice) => {
     return slice;
 };
 exports.transformPasted = transformPasted;
+const transformPastedHTML = (html) => {
+    if (html.includes('table')) {
+        const doc = new DOMParser().parseFromString(html, 'text/html');
+        doc.querySelectorAll('table').forEach((table) => {
+            var _a, _b;
+            if (((_a = table.parentElement) === null || _a === void 0 ? void 0 : _a.tagName) !== 'figure') {
+                const tableElement = document.createElement('figure');
+                tableElement.className = 'table';
+                table.removeAttribute('data-pm-slice');
+                (_b = table.parentElement) === null || _b === void 0 ? void 0 : _b.insertBefore(tableElement, table);
+                tableElement.append(table);
+            }
+        });
+        return doc.body.innerHTML;
+    }
+    return html;
+};
+exports.transformPastedHTML = transformPastedHTML;
 const handlePaste = (view, event, slice) => {
     var _a;
     if (event.type !== 'paste') {
@@ -65,16 +83,6 @@ const handlePaste = (view, event, slice) => {
         dispatch(tr.setSelection(prosemirror_state_1.TextSelection.create(tr.doc, insertPos)).scrollIntoView());
         return true;
     }
-    if (slice.content.firstChild &&
-        (slice.content.firstChild.type == transform_1.schema.nodes.table_row ||
-            slice.content.firstChild.type == transform_1.schema.nodes.table_cell)) {
-        const newTable = (0, table_1.createTableFromSlice)(slice, view.state.schema);
-        if (newTable) {
-            const tr = view.state.tr.insert(view.state.selection.$anchor.pos, newTable);
-            view.dispatch(tr);
-            return true;
-        }
-    }
     if (selection instanceof prosemirror_state_1.TextSelection &&
         selection.$anchor.parentOffset === 0 &&
         selection.$head.parentOffset === 0 &&
@@ -82,7 +90,7 @@ const handlePaste = (view, event, slice) => {
         const { $from, $to } = selection;
         const side = (!$from.parentOffset && $to.index() < $to.parent.childCount ? $from : $to)
             .pos - 1;
-        tr.insert(side, slice.content);
+        tr.step(new prosemirror_transform_1.ReplaceStep(side, side, slice));
         dispatch(tr.setSelection(prosemirror_state_1.TextSelection.create(tr.doc, side + 1)).scrollIntoView());
         return true;
     }

package/dist/cjs/plugins/tables-cursor-fix.js

@@ -1,10 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
+const transform_1 = require("@manuscripts/transform");
 const prosemirror_state_1 = require("prosemirror-state");
+const prosemirror_tables_1 = require("prosemirror-tables");
+const prosemirror_utils_1 = require("prosemirror-utils");
+const commands_1 = require("../commands");
 exports.default = () => {
     return new prosemirror_state_1.Plugin({
         appendTransaction: (transactions, oldState, newState) => {
+            if ((0, commands_1.isTextSelection)(newState.selection) &&
+                !oldState.selection.eq(newState.selection)) {
+                const slice = newState.selection.$from.doc.slice(newState.selection.from, newState.selection.to);
+                const selectionTable = getTable(slice.content);
+                const selection = addTableElementToSelection(newState, selectionTable);
+                if (selection) {
+                    const newTr = newState.tr;
+                    newTr.setSelection(selection);
+                    return newTr;
+                }
+            }
+            if (isTableShapeSelected(newState) &&
+                !oldState.selection.eq(newState.selection)) {
+                const contentNode = (0, prosemirror_utils_1.findParentNodeOfTypeClosestToPos)(newState.selection.$from, transform_1.schema.nodes.table_element);
+                if (contentNode) {
+                    const newTr = newState.tr;
+                    newTr.setSelection(prosemirror_state_1.TextSelection.create(newState.doc, contentNode.pos, contentNode.pos + contentNode.node.nodeSize));
+                    return newTr;
+                }
+            }
             const tablesFixedTr = transactions.find((tr) => tr.getMeta('fix-tables$'));
             if (!tablesFixedTr) {
                 return null;
@@ -17,3 +41,35 @@ exports.default = () => {
         },
     });
 };
+const isTableShapeSelected = (state) => {
+    if (state.selection instanceof prosemirror_tables_1.CellSelection) {
+        const rect = (0, prosemirror_tables_1.selectedRect)(state);
+        return rect.bottom === rect.map.height && rect.right === rect.map.width;
+    }
+    return false;
+};
+const getTable = (fragment) => {
+    let table;
+    fragment === null || fragment === void 0 ? void 0 : fragment.descendants((node) => {
+        if ((node === null || node === void 0 ? void 0 : node.type) === transform_1.schema.nodes.table) {
+            table = node;
+            return false;
+        }
+    });
+    return table;
+};
+const addTableElementToSelection = (state, selectedTable) => {
+    var _a;
+    const { doc, selection } = state;
+    const fromContentNode = (0, prosemirror_utils_1.findParentNodeOfTypeClosestToPos)(selection.$from, transform_1.schema.nodes.table_element);
+    const toContentNode = (0, prosemirror_utils_1.findParentNodeOfTypeClosestToPos)(selection.$to, transform_1.schema.nodes.table_element);
+    const docTableElement = (fromContentNode === null || fromContentNode === void 0 ? void 0 : fromContentNode.node) || (toContentNode === null || toContentNode === void 0 ? void 0 : toContentNode.node);
+    if ((selectedTable === null || selectedTable === void 0 ? void 0 : selectedTable.nodeSize) !== ((_a = getTable(docTableElement === null || docTableElement === void 0 ? void 0 : docTableElement.content)) === null || _a === void 0 ? void 0 : _a.nodeSize)) {
+        return undefined;
+    }
+    const from = ((fromContentNode && toContentNode) || fromContentNode) &&
+        fromContentNode.pos;
+    const to = ((fromContentNode && toContentNode) || toContentNode) &&
+        toContentNode.pos + toContentNode.node.nodeSize;
+    return prosemirror_state_1.TextSelection.create(doc, from || selection.from, to || selection.to);
+};

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.0';
+exports.VERSION = '2.7.1-LEAN-3837.0';
 exports.MATHJAX_VERSION = '3.2.2';

package/dist/es/commands.js

@@ -19,7 +19,7 @@ import { generateNodeID, isElementNodeType, isListNode, isSectionNodeType, isTab
 import { Fragment, NodeRange, Slice, } from 'prosemirror-model';
 import { wrapInList } from 'prosemirror-schema-list';
 import { NodeSelection, TextSelection, } from 'prosemirror-state';
-import { addColSpan, addColumnAfter, addColumnBefore, addRow, CellSelection, selectedRect, } from 'prosemirror-tables';
+import { addColumnAfter, addColumnBefore, addRow, selectedRect, } from 'prosemirror-tables';
 import { findWrapping, liftTarget, ReplaceAroundStep, ReplaceStep, } from 'prosemirror-transform';
 import { findChildrenByType, findParentNodeOfType, findParentNodeOfTypeClosestToPos, flatten, hasParentNodeOfType, } from 'prosemirror-utils';
 import { getCommentKey, getCommentRange } from './lib/comments';
@@ -886,7 +886,7 @@ const DEFAULT_TABLE_CONFIG = {
 export const createAndFillTableElement = (state, config = DEFAULT_TABLE_CONFIG) => {
     const { numberOfColumns, numberOfRows, includeHeader } = config;
     const createRow = (cellType) => {
-        const cells = Array.from({ length: numberOfColumns }, () => cellType.create());
+        const cells = Array.from({ length: numberOfColumns }, () => cellType.create({}, schema.nodes.paragraph.create()));
         return schema.nodes.table_row.create({}, cells);
     };
     const tableRows = includeHeader ? [createRow(schema.nodes.table_header)] : [];
@@ -1050,82 +1050,6 @@ export const addColumns = (direction) => (state, dispatch) => {
     }
     return true;
 };
-function isEmpty(cell) {
-    const c = cell.content;
-    return (c.childCount == 1 && c.child(0).isTextblock && c.child(0).childCount == 0);
-}
-function cellsOverlapRectangle({ width, height, map }, rect) {
-    let indexTop = rect.top * width + rect.left, indexLeft = indexTop;
-    let indexBottom = (rect.bottom - 1) * width + rect.left, indexRight = indexTop + (rect.right - rect.left - 1);
-    for (let i = rect.top; i < rect.bottom; i++) {
-        if ((rect.left > 0 && map[indexLeft] == map[indexLeft - 1]) ||
-            (rect.right < width && map[indexRight] == map[indexRight + 1])) {
-            return true;
-        }
-        indexLeft += width;
-        indexRight += width;
-    }
-    for (let i = rect.left; i < rect.right; i++) {
-        if ((rect.top > 0 && map[indexTop] == map[indexTop - width]) ||
-            (rect.bottom < height && map[indexBottom] == map[indexBottom + width])) {
-            return true;
-        }
-        indexTop++;
-        indexBottom++;
-    }
-    return false;
-}
-export function mergeCellsWithSpace(state, dispatch) {
-    const sel = state.selection;
-    if (!(sel instanceof CellSelection) ||
-        sel.$anchorCell.pos == sel.$headCell.pos) {
-        return false;
-    }
-    const rect = selectedRect(state), { map } = rect;
-    if (cellsOverlapRectangle(map, rect)) {
-        return false;
-    }
-    if (dispatch) {
-        const tr = state.tr;
-        const seen = {};
-        let content = Fragment.empty;
-        let mergedPos;
-        let mergedCell;
-        for (let row = rect.top; row < rect.bottom; row++) {
-            for (let col = rect.left; col < rect.right; col++) {
-                const cellPos = map.map[row * map.width + col];
-                const cell = rect.table.nodeAt(cellPos);
-                if (seen[cellPos] || !cell) {
-                    continue;
-                }
-                seen[cellPos] = true;
-                if (mergedPos == null) {
-                    mergedPos = cellPos;
-                    mergedCell = cell;
-                }
-                else {
-                    if (!isEmpty(cell)) {
-                        content = content.append(cell.content.addToStart(cell.type.schema.text(' ')));
-                    }
-                    const mapped = tr.mapping.map(cellPos + rect.tableStart);
-                    tr.delete(mapped, mapped + cell.nodeSize);
-                }
-            }
-        }
-        if (mergedPos == null || mergedCell == null) {
-            return true;
-        }
-        tr.setNodeMarkup(mergedPos + rect.tableStart, null, Object.assign(Object.assign({}, addColSpan(mergedCell.attrs, mergedCell.attrs.colspan, rect.right - rect.left - mergedCell.attrs.colspan)), { rowspan: rect.bottom - rect.top }));
-        if (content.size) {
-            const end = mergedPos + 1 + mergedCell.content.size;
-            const start = isEmpty(mergedCell) ? mergedPos + 1 : end;
-            tr.replaceWith(start + rect.tableStart, end + rect.tableStart, content);
-        }
-        tr.setSelection(new CellSelection(tr.doc.resolve(mergedPos + rect.tableStart)));
-        dispatch(tr);
-    }
-    return true;
-}
 export const autoComplete = (state, dispatch) => {
     const complete = checkForCompletion(state);
     if (complete) {

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

@@ -4,7 +4,7 @@ import { schema } from '@manuscripts/transform';
 import { CellSelection, deleteColumn, deleteRow, mergeCells, selectedRect, splitCell, } from 'prosemirror-tables';
 import React, { useState } from 'react';
 import styled from 'styled-components';
-import { addColumns, addHeaderRow, addRows, mergeCellsWithSpace, } from '../../commands';
+import { addColumns, addHeaderRow, addRows } from '../../commands';
 const getSelectedCellsCount = (state) => {
     const { selection } = state;
     const selectedCells = { rows: 1, columns: 1 };
@@ -85,7 +85,7 @@ export const ContextMenu = ({ view, close, onCancelColumnDialog }) => {
             " Delete ",
             columns),
         (isCellSelectionMerged || isCellSelectionSplittable) && React.createElement(Separator, null),
-        isCellSelectionMerged && (React.createElement(ActionButton, { onClick: () => runCommand(mergeCellsWithSpace, true) }, "Merge cells")),
+        isCellSelectionMerged && (React.createElement(ActionButton, { onClick: () => runCommand(mergeCells, true) }, "Merge cells")),
         isCellSelectionSplittable && (React.createElement(ActionButton, { onClick: () => runCommand(splitCell, true) }, "Split cells")),
         React.createElement(ColumnChangeWarningDialog, { isOpen: !!columnAction, primaryAction: () => {
                 if (columnAction) {

package/dist/es/configs/ManuscriptsEditor.js

@@ -20,7 +20,7 @@ import { EditorView } from 'prosemirror-view';
 import { clipboardParser } from '../clipboard';
 import { transformCopied } from '../lib/copy';
 import { handleScrollToSelectedTarget } from '../lib/helpers';
-import { handlePaste, transformPasted } from '../lib/paste';
+import { handlePaste, transformPasted, transformPastedHTML } from '../lib/paste';
 import { INIT_META } from '../lib/plugins';
 import plugins from './editor-plugins';
 import views from './editor-views';
@@ -42,6 +42,7 @@ export const createEditorView = (props, root, state, dispatch) => {
         dispatchTransaction: dispatch,
         nodeViews: views(props, dispatch),
         attributes: props.attributes,
+        transformPastedHTML,
         transformPasted,
         handlePaste,
         clipboardParser,

package/dist/es/lib/copy.js

@@ -1,49 +1,11 @@
-import { schema } from '@manuscripts/transform';
-import { Fragment, Slice } from 'prosemirror-model';
-import { findParentNodeOfType } from 'prosemirror-utils';
-import { handleTableSlice, updateSliceWithFullTableContent } from './table';
-export const transformCopied = (slice, view) => {
-    var _a, _b, _c;
-    const { state } = view;
-    const cutDepth = Math.min(slice.openStart, slice.openEnd);
-    const tableSlice = handleTableSelection(slice, view, cutDepth);
-    if (tableSlice) {
-        return tableSlice;
-    }
-    if (((_a = slice.content.firstChild) === null || _a === void 0 ? void 0 : _a.type.isBlock) ||
-        ((_b = slice.content.lastChild) === null || _b === void 0 ? void 0 : _b.type.isBlock)) {
-        let newSliceContent = [];
-        (_c = slice.content.firstChild) === null || _c === void 0 ? void 0 : _c.descendants((node) => {
-            var _a, _b;
-            if (node.childCount > 1 ||
-                (((_a = node.content.firstChild) === null || _a === void 0 ? void 0 : _a.type) === schema.nodes.table_element &&
-                    ((_b = node.content.lastChild) === null || _b === void 0 ? void 0 : _b.type) === schema.nodes.table_element)) {
-                newSliceContent = updateSliceWithFullTableContent(state, node.content);
-                return false;
-            }
-            return true;
-        });
-        if (newSliceContent.length > 1) {
-            return new Slice(Fragment.from(newSliceContent), 0, 0);
-        }
-        else {
-            const updateSelection = handleTableSelection(new Slice(Fragment.from(newSliceContent), slice.openStart, slice.openEnd), view, 0);
-            if (updateSelection) {
-                return updateSelection;
-            }
-        }
-    }
-    return slice;
-};
-const handleTableSelection = (slice, view, cutDepth) => {
+import { Slice } from 'prosemirror-model';
+export const transformCopied = (slice) => {
     var _a, _b;
-    if ((!view.props.handleKeyDown || !view.state.selection.empty) &&
-        (((_a = slice.content.firstChild) === null || _a === void 0 ? void 0 : _a.type) === schema.nodes.table ||
-            ((_b = slice.content.firstChild) === null || _b === void 0 ? void 0 : _b.type) === schema.nodes.table_element)) {
-        const tableElement = findParentNodeOfType(schema.nodes.table_element)(view.state.selection);
-        if (tableElement) {
-            return handleTableSlice(view, cutDepth, tableElement);
-        }
+    if (slice.openStart !== slice.openEnd &&
+        (((_a = slice.content.firstChild) === null || _a === void 0 ? void 0 : _a.type.isBlock) ||
+            ((_b = slice.content.lastChild) === null || _b === void 0 ? void 0 : _b.type.isBlock))) {
+        const cutDepth = Math.min(slice.openStart, slice.openEnd);
+        return new Slice(slice.content, cutDepth, cutDepth);
     }
-    return null;
+    return slice;
 };

package/dist/es/lib/paste.js

@@ -17,7 +17,7 @@ import { schema, } from '@manuscripts/transform';
 import { Fragment } from 'prosemirror-model';
 import { TextSelection } from 'prosemirror-state';
 import { findParentNode } from 'prosemirror-utils';
-import { createTableFromSlice } from './table';
+import { ReplaceStep } from "prosemirror-transform";
 const removeFirstParagraphIfEmpty = (slice) => {
     const firstChild = slice.content.firstChild;
     if (firstChild &&
@@ -45,6 +45,23 @@ export const transformPasted = (slice) => {
     removeIDs(slice);
     return slice;
 };
+export const transformPastedHTML = (html) => {
+    if (html.includes('table')) {
+        const doc = new DOMParser().parseFromString(html, 'text/html');
+        doc.querySelectorAll('table').forEach((table) => {
+            var _a, _b;
+            if (((_a = table.parentElement) === null || _a === void 0 ? void 0 : _a.tagName) !== 'figure') {
+                const tableElement = document.createElement('figure');
+                tableElement.className = 'table';
+                table.removeAttribute('data-pm-slice');
+                (_b = table.parentElement) === null || _b === void 0 ? void 0 : _b.insertBefore(tableElement, table);
+                tableElement.append(table);
+            }
+        });
+        return doc.body.innerHTML;
+    }
+    return html;
+};
 export const handlePaste = (view, event, slice) => {
     var _a;
     if (event.type !== 'paste') {
@@ -61,16 +78,6 @@ export const handlePaste = (view, event, slice) => {
         dispatch(tr.setSelection(TextSelection.create(tr.doc, insertPos)).scrollIntoView());
         return true;
     }
-    if (slice.content.firstChild &&
-        (slice.content.firstChild.type == schema.nodes.table_row ||
-            slice.content.firstChild.type == schema.nodes.table_cell)) {
-        const newTable = createTableFromSlice(slice, view.state.schema);
-        if (newTable) {
-            const tr = view.state.tr.insert(view.state.selection.$anchor.pos, newTable);
-            view.dispatch(tr);
-            return true;
-        }
-    }
     if (selection instanceof TextSelection &&
         selection.$anchor.parentOffset === 0 &&
         selection.$head.parentOffset === 0 &&
@@ -78,7 +85,7 @@ export const handlePaste = (view, event, slice) => {
         const { $from, $to } = selection;
         const side = (!$from.parentOffset && $to.index() < $to.parent.childCount ? $from : $to)
             .pos - 1;
-        tr.insert(side, slice.content);
+        tr.step(new ReplaceStep(side, side, slice));
         dispatch(tr.setSelection(TextSelection.create(tr.doc, side + 1)).scrollIntoView());
         return true;
     }

package/dist/es/plugins/tables-cursor-fix.js

@@ -1,8 +1,32 @@
 import { skipTracking } from '@manuscripts/track-changes-plugin';
+import { schema } from '@manuscripts/transform';
 import { Plugin, TextSelection } from 'prosemirror-state';
+import { CellSelection, selectedRect } from 'prosemirror-tables';
+import { findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
+import { isTextSelection } from '../commands';
 export default () => {
     return new Plugin({
         appendTransaction: (transactions, oldState, newState) => {
+            if (isTextSelection(newState.selection) &&
+                !oldState.selection.eq(newState.selection)) {
+                const slice = newState.selection.$from.doc.slice(newState.selection.from, newState.selection.to);
+                const selectionTable = getTable(slice.content);
+                const selection = addTableElementToSelection(newState, selectionTable);
+                if (selection) {
+                    const newTr = newState.tr;
+                    newTr.setSelection(selection);
+                    return newTr;
+                }
+            }
+            if (isTableShapeSelected(newState) &&
+                !oldState.selection.eq(newState.selection)) {
+                const contentNode = findParentNodeOfTypeClosestToPos(newState.selection.$from, schema.nodes.table_element);
+                if (contentNode) {
+                    const newTr = newState.tr;
+                    newTr.setSelection(TextSelection.create(newState.doc, contentNode.pos, contentNode.pos + contentNode.node.nodeSize));
+                    return newTr;
+                }
+            }
             const tablesFixedTr = transactions.find((tr) => tr.getMeta('fix-tables$'));
             if (!tablesFixedTr) {
                 return null;
@@ -15,3 +39,35 @@ export default () => {
         },
     });
 };
+const isTableShapeSelected = (state) => {
+    if (state.selection instanceof CellSelection) {
+        const rect = selectedRect(state);
+        return rect.bottom === rect.map.height && rect.right === rect.map.width;
+    }
+    return false;
+};
+const getTable = (fragment) => {
+    let table;
+    fragment === null || fragment === void 0 ? void 0 : fragment.descendants((node) => {
+        if ((node === null || node === void 0 ? void 0 : node.type) === schema.nodes.table) {
+            table = node;
+            return false;
+        }
+    });
+    return table;
+};
+const addTableElementToSelection = (state, selectedTable) => {
+    var _a;
+    const { doc, selection } = state;
+    const fromContentNode = findParentNodeOfTypeClosestToPos(selection.$from, schema.nodes.table_element);
+    const toContentNode = findParentNodeOfTypeClosestToPos(selection.$to, schema.nodes.table_element);
+    const docTableElement = (fromContentNode === null || fromContentNode === void 0 ? void 0 : fromContentNode.node) || (toContentNode === null || toContentNode === void 0 ? void 0 : toContentNode.node);
+    if ((selectedTable === null || selectedTable === void 0 ? void 0 : selectedTable.nodeSize) !== ((_a = getTable(docTableElement === null || docTableElement === void 0 ? void 0 : docTableElement.content)) === null || _a === void 0 ? void 0 : _a.nodeSize)) {
+        return undefined;
+    }
+    const from = ((fromContentNode && toContentNode) || fromContentNode) &&
+        fromContentNode.pos;
+    const to = ((fromContentNode && toContentNode) || toContentNode) &&
+        toContentNode.pos + toContentNode.node.nodeSize;
+    return TextSelection.create(doc, from || selection.from, to || selection.to);
+};

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '2.7.0';
+export const VERSION = '2.7.1-LEAN-3837.0';
 export const MATHJAX_VERSION = '3.2.2';

package/dist/types/commands.d.ts

@@ -76,5 +76,4 @@ export declare const addInlineComment: (state: ManuscriptEditorState, dispatch?:
 export declare const addRows: (direction: 'top' | 'bottom') => (state: EditorState, dispatch?: ((tr: Transaction) => void) | undefined) => boolean;
 export declare const addHeaderRow: (direction: 'above' | 'below') => (state: EditorState, dispatch?: ((tr: Transaction) => void) | undefined) => boolean;
 export declare const addColumns: (direction: 'right' | 'left') => (state: EditorState, dispatch?: ((tr: Transaction) => void) | undefined) => boolean;
-export declare function mergeCellsWithSpace(state: EditorState, dispatch?: (tr: Transaction) => void): boolean;
 export declare const autoComplete: (state: ManuscriptEditorState, dispatch?: Dispatch) => boolean;

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

@@ -1,3 +1,2 @@
 import { Slice } from 'prosemirror-model';
-import { EditorView } from 'prosemirror-view';
-export declare const transformCopied: (slice: Slice, view: EditorView) => Slice;
+export declare const transformCopied: (slice: Slice) => Slice;

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

@@ -16,4 +16,5 @@
 import { ManuscriptEditorView, ManuscriptSlice } from '@manuscripts/transform';
 import { Slice } from 'prosemirror-model';
 export declare const transformPasted: (slice: ManuscriptSlice) => ManuscriptSlice;
+export declare const transformPastedHTML: (html: string) => string;
 export declare const handlePaste: (view: ManuscriptEditorView, event: ClipboardEvent, slice: Slice) => boolean;

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.7.0";
+export declare const VERSION = "2.7.1-LEAN-3837.0";
 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.0",
+  "version": "2.7.1-LEAN-3837.0",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -33,8 +33,8 @@
     "@manuscripts/json-schema": "2.2.11",
     "@manuscripts/library": "1.3.11",
     "@manuscripts/style-guide": "2.0.28",
-    "@manuscripts/track-changes-plugin": "1.9.0",
-    "@manuscripts/transform": "3.0.28",
+    "@manuscripts/track-changes-plugin": "1.9.1-LEAN-3837.0",
+    "@manuscripts/transform": "3.0.29-LEAN-3837.1",
     "@popperjs/core": "^2.11.8",
     "astrocite-eutils": "^0.16.4",
     "codemirror": "^5.58.1",

package/styles/Editor.css

@@ -162,6 +162,10 @@
   border-right: 1px solid #000;
 }
 
+.ProseMirror tbody p {
+  margin: 0;
+}
+
 .ProseMirror sup,
 .ProseMirror sub {
   line-height: 0;

package/dist/cjs/lib/table.js

@@ -1,55 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateSliceWithFullTableContent = exports.findTableElement = exports.handleTableSlice = exports.createTableFromSlice = void 0;
-const transform_1 = require("@manuscripts/transform");
-const prosemirror_model_1 = require("prosemirror-model");
-const prosemirror_state_1 = require("prosemirror-state");
-const createTableFromSlice = (slice, schema) => {
-    const rows = [];
-    slice.content.forEach((node) => {
-        if (node.type === schema.nodes.table_row) {
-            rows.push(node);
-        }
-        else if (node.type === schema.nodes.table_cell) {
-            rows.push(schema.nodes.table_row.create(null, prosemirror_model_1.Fragment.from(node)));
-        }
-    });
-    if (rows.length > 0) {
-        return schema.nodes.table.create(null, rows);
-    }
-    return null;
-};
-exports.createTableFromSlice = createTableFromSlice;
-const handleTableSlice = (view, cutDepth, tableElement) => {
-    const { node, pos } = tableElement;
-    view.dispatch(view.state.tr.setSelection(prosemirror_state_1.TextSelection.create(view.state.doc, pos, pos + node.nodeSize)));
-    return new prosemirror_model_1.Slice(prosemirror_model_1.Fragment.from(node), cutDepth, cutDepth);
-};
-exports.handleTableSlice = handleTableSlice;
-const findTableElement = (state) => {
-    const { from, to } = state.selection;
-    let tableNode = null;
-    state.doc.nodesBetween(from, to, (node) => {
-        if (node.type === transform_1.schema.nodes.table_element) {
-            tableNode = node;
-            return false;
-        }
-        return true;
-    });
-    return { tableNode };
-};
-exports.findTableElement = findTableElement;
-const updateSliceWithFullTableContent = (state, slice) => {
-    const newSliceContent = [];
-    slice.forEach((node) => {
-        if (node.type === transform_1.schema.nodes.table_element) {
-            const { tableNode } = (0, exports.findTableElement)(state);
-            tableNode && newSliceContent.push(tableNode);
-        }
-        else {
-            newSliceContent.push(node);
-        }
-    });
-    return newSliceContent;
-};
-exports.updateSliceWithFullTableContent = updateSliceWithFullTableContent;

package/dist/es/lib/table.js

@@ -1,48 +0,0 @@
-import { schema, } from '@manuscripts/transform';
-import { Fragment, Slice } from 'prosemirror-model';
-import { TextSelection } from 'prosemirror-state';
-export const createTableFromSlice = (slice, schema) => {
-    const rows = [];
-    slice.content.forEach((node) => {
-        if (node.type === schema.nodes.table_row) {
-            rows.push(node);
-        }
-        else if (node.type === schema.nodes.table_cell) {
-            rows.push(schema.nodes.table_row.create(null, Fragment.from(node)));
-        }
-    });
-    if (rows.length > 0) {
-        return schema.nodes.table.create(null, rows);
-    }
-    return null;
-};
-export const handleTableSlice = (view, cutDepth, tableElement) => {
-    const { node, pos } = tableElement;
-    view.dispatch(view.state.tr.setSelection(TextSelection.create(view.state.doc, pos, pos + node.nodeSize)));
-    return new Slice(Fragment.from(node), cutDepth, cutDepth);
-};
-export const findTableElement = (state) => {
-    const { from, to } = state.selection;
-    let tableNode = null;
-    state.doc.nodesBetween(from, to, (node) => {
-        if (node.type === schema.nodes.table_element) {
-            tableNode = node;
-            return false;
-        }
-        return true;
-    });
-    return { tableNode };
-};
-export const updateSliceWithFullTableContent = (state, slice) => {
-    const newSliceContent = [];
-    slice.forEach((node) => {
-        if (node.type === schema.nodes.table_element) {
-            const { tableNode } = findTableElement(state);
-            tableNode && newSliceContent.push(tableNode);
-        }
-        else {
-            newSliceContent.push(node);
-        }
-    });
-    return newSliceContent;
-};

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

@@ -1,9 +0,0 @@
-import { ManuscriptEditorState, ManuscriptEditorView } from '@manuscripts/transform';
-import { Fragment, Node, Schema, Slice } from 'prosemirror-model';
-import { ContentNodeWithPos } from 'prosemirror-utils';
-export declare const createTableFromSlice: (slice: Slice, schema: Schema) => Node | null;
-export declare const handleTableSlice: (view: ManuscriptEditorView, cutDepth: number, tableElement: ContentNodeWithPos) => Slice;
-export declare const findTableElement: (state: ManuscriptEditorState) => {
-    tableNode: null;
-};
-export declare const updateSliceWithFullTableContent: (state: ManuscriptEditorState, slice: Fragment) => Node[];