@progress/kendo-editor-common 1.9.0-dev.202204060830 → 1.9.0-dev.202204181342

package/dist/es/plugins/table-resize/table-resize.js

@@ -1,26 +1,8 @@
 import * as tslib_1 from "tslib";
 import { NodeSelection, Plugin } from 'prosemirror-state';
-import { colgroupAttr, dataDirection, resizableAttr } from '../../config/constants';
-import { getTable, parseStyle, setNodeStyle, tableResizeKey as key } from './utils';
-function parentNode(pos, predicate) {
-    for (var d = pos.depth; d > 0; d--) {
-        var node = pos.node(d);
-        if (predicate(node)) {
-            return node;
-        }
-    }
-    return null;
-}
-var directions = {
-    'southeast': { x: 1, y: 1 },
-    'east': { x: 1, y: 0 },
-    'south': { x: 0, y: 1 },
-    'north': { x: 0, y: -1 },
-    'west': { x: -1, y: 0 },
-    'southwest': { x: -1, y: 1 },
-    'northwest': { x: -1, y: -1 },
-    'northeast': { x: 1, y: -1 } // top right
-};
+import { colgroupAttr, dataResizeDirTable, resizableAttr } from '../../config/constants';
+import { getTable, parentNode, parseStyle, setNodeStyle, tableResizeKey as key } from './utils';
+import { directions } from './../resize-utils';
 var commonDir = {
     'southeast': true,
     'southwest': true,
@@ -29,9 +11,6 @@ var commonDir = {
 };
 var horizontalDir = tslib_1.__assign({ 'east': true, 'west': true }, commonDir);
 var verticalDir = tslib_1.__assign({ 'south': true, 'north': true }, commonDir);
-var setSize = function (domNode, sizeType, value) {
-    domNode.style[sizeType] = value + 'px';
-};
 var ResizeState = /** @class */ (function () {
     function ResizeState(activeHandle, dragging, nodePosition) {
         this.activeHandle = activeHandle;
@@ -48,73 +27,62 @@ var ResizeState = /** @class */ (function () {
     };
     return ResizeState;
 }());
-var handleMouseMove = function (view, event, options) {
+var handleMouseMove = function (view, event) {
     var state = key.getState(view.state);
     var dragging = state.dragging, nodePosition = state.nodePosition, activeHandle = state.activeHandle;
     if (nodePosition < 0 || !dragging) {
         return;
     }
-    var resizedNode = getTable(view.nodeDOM(nodePosition));
-    var rect = resizedNode.getBoundingClientRect();
+    var tableDom = getTable(view.nodeDOM(nodePosition));
+    var rect = tableDom.getBoundingClientRect();
     var dir = directions[activeHandle];
     var diffX = (event.clientX - dragging.startX) * dir.x;
     var diffY = (event.clientY - dragging.startY) * dir.y;
-    var nodeWidth = resizedNode.offsetWidth;
-    var nodeHeight = resizedNode.offsetHeight;
+    var win = (tableDom.ownerDocument && tableDom.ownerDocument.defaultView) || window;
+    var compStyles = win.getComputedStyle(tableDom);
+    var nodeWidth = /px/.test(compStyles.width) ? parseFloat(compStyles.width) : tableDom.offsetWidth;
+    var nodeHeight = /px/.test(compStyles.height) ? parseFloat(compStyles.height) : tableDom.offsetHeight;
     var width = dir.x ? diffX + nodeWidth : rect.width;
     var height = dir.y ? diffY + nodeHeight : rect.height;
-    if (options.lockRatio && dir.x && dir.y) {
-        var ratio = Math.min(width / nodeWidth, height / nodeHeight);
-        var lockWidth = nodeWidth * ratio;
-        var lockHeight = nodeHeight * ratio;
-        dragging.startX = event.clientX - (width - lockWidth) * dir.x;
-        dragging.startY = event.clientY - (height - lockHeight) * dir.y;
-        width = lockWidth;
-        height = lockHeight;
-    }
-    else {
-        dragging.startX = dir.x ? event.clientX : dragging.startX;
-        dragging.startY = dir.y ? event.clientY : dragging.startY;
-    }
+    dragging.startX = dir.x ? event.clientX : dragging.startX;
+    dragging.startY = dir.y ? event.clientY : dragging.startY;
     if (horizontalDir[activeHandle]) {
-        setSize(resizedNode, 'width', width);
+        tableDom.style.width = width + 'px';
     }
     if (verticalDir[activeHandle]) {
-        setSize(resizedNode, 'height', height);
+        tableDom.style.height = height + 'px';
     }
 };
 var toPercents = function (view, tr, tablePos) {
     var tableNode = view.state.doc.nodeAt(tablePos);
     var tableDom = getTable(view.nodeDOM(tablePos));
-    var _a = tableSize(tableDom), tableWidth = _a.width, tableHeight = _a.height, colsWidth = _a.colsWidth;
+    var _a = tableSize(tableDom), width = _a.width, height = _a.height, colsWidth = _a.colsWidth, rowsHeight = _a.rowsHeight, offsetWidth = _a.offsetWidth, offsetHeight = _a.offsetHeight;
     var colgroup = tableDom.firstChild;
     var cols = Array.from((colgroup && colgroup.children) || []);
-    // const borders = new Array(cols.length).fill(tableWidth / tableOffsetWidth / cols.length);
     var widthChanged = false;
     cols.forEach(function (col, i) {
         if (col.style.width && !/%$/.test(col.style.width)) {
-            col.style.width = ((colsWidth[i]) * 100 / tableWidth) + '%';
+            col.style.width = ((colsWidth[i]) * 100 / width) + '%';
             widthChanged = true;
         }
     });
-    var rows = Array.from(tableDom.rows);
     var heightChange = false;
     tableNode.forEach(function (row, offset, index) {
         var rowHeight = parseStyle(row.attrs.style).height;
         if (rowHeight && !/%$/.test(rowHeight)) {
-            tr.setNodeMarkup(tablePos + offset + 1, null, setNodeStyle(row.attrs, 'height', (rows[index].offsetHeight * 100 / tableHeight) + '%'));
+            tr.setNodeMarkup(tablePos + offset + 1, null, setNodeStyle(row.attrs, 'height', (rowsHeight[index] * 100 / height) + '%'));
             heightChange = true;
         }
     });
     var tableAttrs = tableNode.attrs;
-    if (parseStyle(tableAttrs.style).width !== tableWidth + 'px') {
-        tableAttrs = setNodeStyle(tableAttrs, 'width', tableWidth + 'px');
+    if (parseStyle(tableAttrs.style).width !== offsetWidth + 'px') {
+        tableAttrs = setNodeStyle(tableAttrs, 'width', offsetWidth + 'px');
     }
     if (widthChanged) {
         tableAttrs[colgroupAttr] = colgroup.outerHTML;
     }
     if (heightChange) {
-        tableAttrs = setNodeStyle(tableAttrs, 'height', tableHeight + 'px');
+        tableAttrs = setNodeStyle(tableAttrs, 'height', offsetHeight + 'px');
     }
     if (widthChanged || heightChange) {
         tr.setNodeMarkup(tablePos, null, tableAttrs);
@@ -123,11 +91,13 @@ var toPercents = function (view, tr, tablePos) {
 var toPixels = function (view, tr, tablePos, attrs) {
     var tableNode = view.state.doc.nodeAt(tablePos);
     var tableDom = getTable(view.nodeDOM(tablePos));
+    var win = (tableDom.ownerDocument && tableDom.ownerDocument.defaultView) || window;
+    var calcStyle = win.getComputedStyle;
     var rows = Array.from(tableDom.rows);
     tableNode.forEach(function (row, offset, index) {
         var rowHeight = parseStyle(row.attrs.style).height;
         if (rowHeight && !/px$/.test(rowHeight)) {
-            tr.setNodeMarkup(tablePos + offset + 1, null, setNodeStyle(row.attrs, 'height', rows[index].offsetHeight + 'px'));
+            tr.setNodeMarkup(tablePos + offset + 1, null, setNodeStyle(row.attrs, 'height', calcStyle(rows[index]).height));
         }
     });
     var colgroup = tableDom.firstChild;
@@ -135,7 +105,7 @@ var toPixels = function (view, tr, tablePos, attrs) {
     var widthChanged = false;
     cols.forEach(function (col, i) {
         if (col.style.width && !/px$/.test(col.style.width)) {
-            col.style.width = cols[i].offsetWidth + 'px';
+            col.style.width = calcStyle(cols[i]).width;
             widthChanged = true;
         }
     });
@@ -148,9 +118,12 @@ var toPixels = function (view, tr, tablePos, attrs) {
 var tableSize = function (table) {
     var cols = Array.from(table.firstChild.children);
     var colsWidth = cols.map(function (c) { return c.offsetWidth; });
+    var rowsHeight = Array.from(table.rows).map(function (row) { return row.offsetHeight; });
     var width = colsWidth.reduce(function (acc, cur) { return acc + cur; }, 0);
-    var height = table.offsetHeight; // Array.from(table.rows).reduce((acc, cur) => acc + cur.offsetHeight, 0);
-    return { width: width, height: height, colsWidth: colsWidth, offsetWidth: table.offsetWidth };
+    var height = rowsHeight.reduce(function (acc, cur) { return acc + cur; }, 0);
+    var offsetHeight = table.offsetHeight;
+    var offsetWidth = table.offsetWidth;
+    return { width: width, height: height, colsWidth: colsWidth, rowsHeight: rowsHeight, offsetWidth: offsetWidth, offsetHeight: offsetHeight };
 };
 var handleMouseUp = function (view) {
     var _a = key.getState(view.state), dragging = _a.dragging, nodePosition = _a.nodePosition, activeHandle = _a.activeHandle;
@@ -160,7 +133,7 @@ var handleMouseUp = function (view) {
         var rect = tableSize(dom);
         if (node) {
             var width = rect.offsetWidth + 'px';
-            var height = rect.height + 'px';
+            var height = rect.offsetHeight + 'px';
             var tr = view.state.tr;
             var attrs = node.attrs;
             var parsedStyles = parseStyle(attrs.style);
@@ -170,7 +143,7 @@ var handleMouseUp = function (view) {
             if (verticalDir[activeHandle] && dom.style.height && parsedStyles.height !== height) {
                 attrs = setNodeStyle(attrs, 'height', height);
             }
-            toPixels(view, tr, nodePosition, attrs);
+            attrs = toPixels(view, tr, nodePosition, attrs);
             tr.setNodeMarkup(nodePosition, null, attrs);
             tr.setMeta('commandName', 'node-resize');
             tr.setMeta('args', attrs);
@@ -183,9 +156,9 @@ var handleMouseUp = function (view) {
         }
     }
 };
-var handleMouseDown = function (view, event, options) {
+var handleMouseDown = function (view, event) {
     var target = event.target;
-    var activeHandle = target.getAttribute(dataDirection);
+    var activeHandle = target.getAttribute(dataResizeDirTable);
     if (!activeHandle) {
         return false;
     }
@@ -202,7 +175,7 @@ var handleMouseDown = function (view, event, options) {
     view.dispatch(transaction);
     var curWindow = event.view || window;
     function move(e) {
-        handleMouseMove(view, e, options);
+        handleMouseMove(view, e);
     }
     function finish(_e) {
         curWindow.removeEventListener('mouseup', finish);
@@ -214,7 +187,7 @@ var handleMouseDown = function (view, event, options) {
     return true;
 };
 export var tableResizing = function (options) {
-    if (options === void 0) { options = { node: 'table', lockRatio: false }; }
+    if (options === void 0) { options = { node: 'table' }; }
     return new Plugin({
         key: key,
         view: function (_viewObj) { return ({
@@ -224,7 +197,8 @@ export var tableResizing = function (options) {
                 if (isNodeSelected && selection instanceof NodeSelection) {
                     return { node: selection.node, pos: selection.from };
                 }
-                var node = parentNode(selection.$from, function (n) { return n.type === nodeType; });
+                var parent = parentNode(selection.$from, function (n) { return n.type === nodeType; });
+                var node = parent && parent.node;
                 if (node) {
                     var tableDepth = new Array(selection.$from.depth + 1).fill(0)
                         .findIndex(function (_, i) { return selection.$from.node(i).type.spec.tableRole === 'table'; });
@@ -234,7 +208,7 @@ export var tableResizing = function (options) {
                 return null;
             },
             update: function (view, prevState) {
-                var _a, _b, _c, _d;
+                var _a, _b, _c, _d, _f;
                 var state = view.state;
                 var nodeType = state.schema.nodes[options.node];
                 var selected = this.selectedNode(state, nodeType);
@@ -251,13 +225,18 @@ export var tableResizing = function (options) {
                         tr.setNodeMarkup(selected.pos, nodeType, tslib_1.__assign({}, selected.node.attrs, (_b = {}, _b[resizableAttr] = true, _b)));
                         view.dispatch(tr);
                     }
-                    else if (selected && !prevSelected) {
+                    else if (selected && prevSelected && selected.pos === prevSelected.pos &&
+                        !selected.node.attrs[resizableAttr] && !state.selection.eq(prevState.selection)) {
                         tr.setMeta(key, { nodePosition: selected.pos });
                         view.dispatch(tr.setNodeMarkup(selected.pos, nodeType, tslib_1.__assign({}, selected.node.attrs, (_c = {}, _c[resizableAttr] = true, _c))));
                     }
+                    else if (selected && !prevSelected) {
+                        tr.setMeta(key, { nodePosition: selected.pos });
+                        view.dispatch(tr.setNodeMarkup(selected.pos, nodeType, tslib_1.__assign({}, selected.node.attrs, (_d = {}, _d[resizableAttr] = true, _d))));
+                    }
                     else if (!selected && prevSelected) {
                         tr.setMeta(key, { nodePosition: -1 });
-                        view.dispatch(tr.setNodeMarkup(prevSelected.pos, nodeType, tslib_1.__assign({}, prevSelected.node.attrs, (_d = {}, _d[resizableAttr] = false, _d))));
+                        view.dispatch(tr.setNodeMarkup(prevSelected.pos, nodeType, tslib_1.__assign({}, prevSelected.node.attrs, (_f = {}, _f[resizableAttr] = false, _f))));
                     }
                 }
             }
@@ -273,7 +252,7 @@ export var tableResizing = function (options) {
         props: {
             handleDOMEvents: {
                 mousedown: function (view, event) {
-                    return handleMouseDown(view, event, options);
+                    return handleMouseDown(view, event);
                 }
             }
         }

package/dist/es/plugins/table-resize/table-view.js

@@ -1,6 +1,6 @@
-import { colgroupAttr, dataDirection, resizableAttr, resizableWrap, resizeHandle } from '../../config/constants';
+import { colgroupAttr, dataResizeDirTable, resizableAttr, resizableWrap, resizeHandle } from '../../config/constants';
 import { parseStrColgroup } from '../../config/schema';
-var directions = ['northwest', 'north', 'northeast', 'southwest', 'south', 'southeast', 'west', 'east'];
+import { handles } from './../resize-utils';
 var TableView = /** @class */ (function () {
     function TableView(node, view) {
         this.node = node;
@@ -13,10 +13,10 @@ var TableView = /** @class */ (function () {
         }
         var tBody = this.table.appendChild(document.createElement('tbody'));
         this.setAttributes(this.table, node.attrs);
-        this.resizeHandles = directions.map(function (dir) {
+        this.resizeHandles = handles.map(function (dir) {
             var handle = document.createElement('span');
             handle.className = resizeHandle + ' ' + dir;
-            handle.setAttribute(dataDirection, dir);
+            handle.setAttribute(dataResizeDirTable, dir);
             return handle;
         });
         this.contentDOM = tBody;
@@ -52,11 +52,11 @@ var TableView = /** @class */ (function () {
         return result;
     };
     TableView.prototype.destroy = function () {
-        this.node = null;
-        this.view = null;
-        this.table = null;
-        this.colgroup = null;
-        this.resizeHandles = null;
+        this.node = undefined;
+        this.view = undefined;
+        this.table = undefined;
+        this.colgroup = undefined;
+        this.resizeHandles = undefined;
     };
     TableView.prototype.renderColgroup = function (colgroupStr) {
         if (this.table && this.table.firstChild && this.table.firstChild.nodeName === 'COLGROUP') {

package/dist/es/plugins/table-resize/utils.js

@@ -40,9 +40,11 @@ export function otherResizing(current, state) {
 export function otherResizeHandle(current, state) {
     var activeResize = false;
     activeResize = activeResize ||
-        (current !== tableColumnResizing && tableColumnResizing.get(state) && tableColumnResizing.getState(state).activeHandle > -1);
+        (current !== tableColumnResizing &&
+            Boolean(tableColumnResizing.get(state)) &&
+            tableColumnResizing.getState(state).activeHandle > -1);
     activeResize = activeResize ||
-        (current !== tableRowResizing && tableRowResizing.get(state) && tableRowResizing.getState(state).activeHandle > -1);
+        (current !== tableRowResizing && Boolean(tableRowResizing.get(state)) && tableRowResizing.getState(state).activeHandle > -1);
     return activeResize;
 }
 export function getTable(dom) {
@@ -51,3 +53,25 @@ export function getTable(dom) {
     }
     return dom;
 }
+export function domCellAround(target) {
+    while (target && target.nodeName !== 'TD' && target.nodeName !== 'TH') {
+        target = target.classList.contains('ProseMirror') ? null : target.parentNode;
+    }
+    return target;
+}
+export function cellIndexes(cell) {
+    var row = cell.parentNode;
+    return {
+        cellIndex: cell.cellIndex,
+        rowIndex: row.rowIndex
+    };
+}
+export function parentNode(pos, predicate) {
+    for (var depth = pos.depth; depth > 0; depth--) {
+        var node = pos.node(depth);
+        if (predicate(node)) {
+            return { node: node, depth: depth };
+        }
+    }
+    return null;
+}

package/dist/es2015/config/constants.js

@@ -3,4 +3,5 @@ export const colgroupAttr = 'k-colgroup-data';
 export const resizableAttr = 'resizable-node';
 export const resizableWrap = 'k-editor-resize-wrap-element';
 export const resizeHandle = 'k-editor-resize-handle';
-export const dataDirection = 'data-direction';
+export const dataResizeDirTable = 'data-direction';
+export const dataResizeDirImage = 'data-direction-image';

package/dist/es2015/config/schema.js

@@ -30,10 +30,10 @@ const hasAttrs = (attrs, exclude) => {
     }
     return false;
 };
-const pmAttributes = (attrs, exclude) => {
+const pmAttributes = (attrs, exclude = []) => {
     const result = {};
     for (let attr in attrs) {
-        if (attr && attrs[attr] !== null && attr !== exclude) {
+        if (attr && attrs[attr] !== null && !exclude.find(e => e === attr)) {
             result[attr] = attrs[attr];
         }
     }
@@ -118,7 +118,7 @@ tNodes.table_row.toDOM = node => ['tr', pmAttributes(node.attrs), 0];
 tNodes.table_row.parseDOM = [{ tag: 'tr', getAttrs: domAttributes }];
 tNodes.table.attrs = Object.assign({}, tNodes.table.attrs, defaultAttrs(['style', 'class', 'id', colgroupAttr, resizableAttr]));
 tNodes.table.toDOM = (node) => {
-    const tableAttrs = hasAttrs(node.attrs) ? pmAttributes(node.attrs, colgroupAttr) : {};
+    const tableAttrs = hasAttrs(node.attrs) ? pmAttributes(node.attrs, [colgroupAttr, resizableAttr]) : {};
     let colgroup = null;
     if (node.attrs[colgroupAttr] && !shouldSkipColgroup(node)) {
         const colgroupEl = parseStrColgroup(node.attrs[colgroupAttr]);
@@ -207,7 +207,7 @@ const nodes = Object.assign({
             { tag: 'h6', getAttrs: node => (Object.assign({}, domAttributes(node), { level: 6 })) }
         ],
         toDOM: node => hasAttrs(node.attrs, 'level') ?
-            ['h' + node.attrs.level, pmAttributes(node.attrs, 'level'), hole] :
+            ['h' + node.attrs.level, pmAttributes(node.attrs, ['level']), hole] :
             ['h' + node.attrs.level, hole]
     }, 
     // :: NodeSpec A code listing. Disallows marks or non-text inline
@@ -264,8 +264,8 @@ const nodes = Object.assign({
                 } }],
         toDOM: node => {
             return node.attrs.order === 1 ?
-                (hasAttrs(node.attrs, 'order') ? ['ol', pmAttributes(node.attrs, 'order'), hole] : olDOM) :
-                ['ol', Object.assign({}, pmAttributes(node.attrs, 'order'), { start: node.attrs.order }), hole];
+                (hasAttrs(node.attrs, 'order') ? ['ol', pmAttributes(node.attrs, ['order']), hole] : olDOM) :
+                ['ol', Object.assign({}, pmAttributes(node.attrs, ['order']), { start: node.attrs.order }), hole];
         }
     }, 
     // :: NodeSpec

package/dist/es2015/plugins/image-resize.js

@@ -1,19 +1,9 @@
 import { NodeSelection, Plugin, PluginKey } from "prosemirror-state";
 import { Decoration, DecorationSet } from "prosemirror-view";
-import { dataDirection, resizeHandle } from "../config/constants";
+import { dataResizeDirImage, resizeHandle } from "../config/constants";
 import { changeStylesString } from "../utils";
+import { directions, handles } from './resize-utils';
 export const imageResizeKey = new PluginKey('image-resize');
-const directions = {
-    'southeast': { x: 1, y: 1 },
-    'east': { x: 1, y: 0 },
-    'south': { x: 0, y: 1 },
-    'north': { x: 0, y: -1 },
-    'west': { x: -1, y: 0 },
-    'southwest': { x: -1, y: 1 },
-    'northwest': { x: -1, y: -1 },
-    'northeast': { x: 1, y: -1 } // top right
-};
-const handles = Object.keys(directions);
 const setSize = (domNode, sizeType, value) => {
     domNode.style[sizeType] = value + 'px';
 };
@@ -108,7 +98,7 @@ const handleMouseUp = (view) => {
 };
 const handleMouseDown = (view, event, options) => {
     const target = event.target;
-    const activeHandle = target.getAttribute(dataDirection);
+    const activeHandle = target.getAttribute(dataResizeDirImage);
     if (!activeHandle) {
         return false;
     }
@@ -220,7 +210,7 @@ export const imageResizing = (options = { node: 'image', lockRatio: true }) => {
                     for (let i = 0; i < handles.length; i++) {
                         let dom = document.createElement('div');
                         dom.className = resizeHandle + ' ' + handles[i];
-                        dom.setAttribute(dataDirection, handles[i]);
+                        dom.setAttribute(dataResizeDirImage, handles[i]);
                         wrapper.appendChild(dom);
                     }
                     return DecorationSet.create(state.doc, [Decoration.widget(state.selection.from + 1, wrapper)]);

package/dist/es2015/plugins/resize-utils.js

@@ -0,0 +1,11 @@
+export const directions = {
+    'southeast': { x: 1, y: 1 },
+    'east': { x: 1, y: 0 },
+    'south': { x: 0, y: 1 },
+    'north': { x: 0, y: -1 },
+    'west': { x: -1, y: 0 },
+    'southwest': { x: -1, y: 1 },
+    'northwest': { x: -1, y: -1 },
+    'northeast': { x: 1, y: -1 } // top right
+};
+export const handles = Object.keys(directions);

package/dist/es2015/plugins/table-resize/column-resize.js

@@ -3,10 +3,10 @@ import { tableNodeTypes, TableMap } from 'prosemirror-tables';
 import { Decoration, DecorationSet } from 'prosemirror-view';
 import { colgroupAttr } from '../../config/constants';
 import { TableView } from './table-view';
-import { otherResizeHandle, otherResizing, parseStyle, setNodeStyle, tableColumnResizing as key } from './utils';
+import { cellIndexes, domCellAround, otherResizeHandle, otherResizing, parentNode, parseStyle, setNodeStyle, tableColumnResizing as key } from './utils';
 export function columnResizing() {
     // tslint:disable-next-line:variable-name
-    const View = TableView, lastColumnResizable = true, handleWidth = 5, cellMinWidth = 25;
+    const View = TableView, handleWidth = 5, cellMinWidth = 25;
     let plugin = new Plugin({
         key,
         state: {
@@ -29,7 +29,7 @@ export function columnResizing() {
             handleDOMEvents: {
                 mousemove(view, event) {
                     if (!otherResizing(key, view.state)) {
-                        handleMouseMove(view, event, handleWidth, cellMinWidth, lastColumnResizable);
+                        handleMouseMove(view, event, handleWidth);
                     }
                     return false;
                 },
@@ -42,29 +42,21 @@ export function columnResizing() {
                 }
             },
             decorations(state) {
-                if (otherResizing(key, state)) {
-                    return DecorationSet.empty;
-                }
-                let pluginState = key.getState(state);
-                if (pluginState.activeHandle > -1) {
-                    return handleDecorations(state, pluginState.activeHandle);
+                if (!otherResizing(key, state)) {
+                    let pluginState = key.getState(state);
+                    if (pluginState.activeHandle > -1) {
+                        return handleDecorations(state, pluginState.activeHandle);
+                    }
                 }
+                return DecorationSet.empty;
             },
             nodeViews: {}
         }
     });
     return plugin;
 }
-function cellAround($pos) {
-    for (let d = $pos.depth - 1; d > 0; d--) {
-        if ($pos.node(d).type.spec.tableRole === 'row') {
-            return $pos.node(0).resolve($pos.before(d + 1));
-        }
-    }
-    return null;
-}
 function pointsAtCell($pos) {
-    return $pos.parent.type.spec.tableRole === 'row' && $pos.nodeAfter;
+    return Boolean($pos.parent.type.spec.tableRole === 'row' && $pos.nodeAfter);
 }
 class ResizeState {
     constructor(activeHandle, dragging) {
@@ -82,35 +74,29 @@ class ResizeState {
         if (state.activeHandle > -1 && tr.docChanged) {
             let handle = tr.mapping.map(state.activeHandle, -1);
             if (!pointsAtCell(tr.doc.resolve(handle))) {
-                handle = null;
+                handle = -1;
             }
             state = new ResizeState(handle, state.dragging);
         }
         return state;
     }
 }
-function handleMouseMove(view, event, handleWidth, _cellMinWidth, lastColumnResizable) {
+function handleMouseMove(view, event, handleWidth) {
     let pluginState = key.getState(view.state);
     if (!pluginState.dragging) {
         let target = domCellAround(event.target), cell = -1;
         if (target) {
+            const indexes = cellIndexes(target);
             let { left, right } = target.getBoundingClientRect();
-            if (event.clientX - left <= handleWidth) {
-                cell = edgeCell(view, event, 'left');
+            if (Math.abs(event.clientX - left) <= handleWidth && indexes.cellIndex > 0) {
+                indexes.cellIndex--;
+                cell = edgeCell(view, event, indexes);
             }
-            else if (right - event.clientX <= handleWidth) {
-                cell = edgeCell(view, event, 'right');
+            else if (right - event.clientX > 0 && right - event.clientX <= handleWidth) {
+                cell = edgeCell(view, event, indexes);
             }
         }
         if (cell !== pluginState.activeHandle) {
-            if (!lastColumnResizable && cell !== -1) {
-                let $cell = view.state.doc.resolve(cell);
-                let table = $cell.node(-1), map = TableMap.get(table), start = $cell.start(-1);
-                let col = map.colCount($cell.pos - start) + $cell.nodeAfter.attrs.colspan - 1;
-                if (col === map.width - 1) {
-                    return;
-                }
-            }
             updateHandle(view, cell);
         }
     }
@@ -167,7 +153,7 @@ function handleMouseDown(view, event, cellMinWidth) {
         const widths = Array.from(col.parentNode.children).map((c) => c.style.width);
         if (widths.every(Boolean)) {
             const sum = widths.reduce((acc, cur) => acc + parseFloat(cur), 0);
-            tableAttrs = setNodeStyle(tableNode.attrs, 'width', sum + 'px');
+            tableAttrs = setNodeStyle(tableAttrs || tableNode.attrs, 'width', sum + 'px');
         }
     }
     if (tableAttrs) {
@@ -197,28 +183,21 @@ function handleMouseDown(view, event, cellMinWidth) {
     event.preventDefault();
     return true;
 }
-function domCellAround(target) {
-    while (target && target.nodeName !== 'TD' && target.nodeName !== 'TH') {
-        target = target.classList.contains('ProseMirror') ? null : target.parentNode;
-    }
-    return target;
-}
-function edgeCell(view, event, side) {
+function edgeCell(view, event, indexes) {
     let found = view.posAtCoords({ left: event.clientX, top: event.clientY });
     if (!found) {
         return -1;
     }
-    let { pos } = found;
-    let $cell = cellAround(view.state.doc.resolve(pos));
-    if (!$cell) {
+    let $pos = view.state.doc.resolve(found.pos);
+    let parentTable = parentNode($pos, n => n.type.spec.tableRole === 'table');
+    if (parentTable === null) {
         return -1;
     }
-    if (side === 'right') {
-        return $cell.pos;
-    }
-    let map = TableMap.get($cell.node(-1)), start = $cell.start(-1);
-    let index = map.map.indexOf($cell.pos - start);
-    return index % map.width === 0 ? -1 : start + map.map[index - 1];
+    let tablePos = $pos.start(parentTable.depth);
+    const tableNode = parentTable.node;
+    const map = TableMap.get(tableNode);
+    const cell = tablePos + map.map[(map.width * indexes.rowIndex) + indexes.cellIndex];
+    return cell;
 }
 function draggedWidth(dragging, event, cellMinWidth) {
     let offset = event.clientX - dragging.startX;