@progress/kendo-editor-common 1.9.0-dev.202204081457 → 1.9.0-dev.202204180753

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

@@ -1,25 +1,7 @@
 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 (let d = pos.depth; d > 0; d--) {
-        let node = pos.node(d);
-        if (predicate(node)) {
-            return node;
-        }
-    }
-    return null;
-}
-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
-};
+import { colgroupAttr, dataResizeDirTable, resizableAttr } from '../../config/constants';
+import { getTable, parentNode, parseStyle, setNodeStyle, tableResizeKey as key } from './utils';
+import { directions } from './../resize-utils';
 const commonDir = {
     'southeast': true,
     'southwest': true,
@@ -28,9 +10,6 @@ const commonDir = {
 };
 const horizontalDir = Object.assign({ 'east': true, 'west': true }, commonDir);
 const verticalDir = Object.assign({ 'south': true, 'north': true }, commonDir);
-const setSize = (domNode, sizeType, value) => {
-    domNode.style[sizeType] = value + 'px';
-};
 class ResizeState {
     constructor(activeHandle, dragging, nodePosition) {
         this.activeHandle = activeHandle;
@@ -46,73 +25,62 @@ class ResizeState {
         return state;
     }
 }
-const handleMouseMove = (view, event, options) => {
+const handleMouseMove = (view, event) => {
     const state = key.getState(view.state);
     const { dragging, nodePosition, activeHandle } = state;
     if (nodePosition < 0 || !dragging) {
         return;
     }
-    let resizedNode = getTable(view.nodeDOM(nodePosition));
-    const rect = resizedNode.getBoundingClientRect();
+    let tableDom = getTable(view.nodeDOM(nodePosition));
+    const rect = tableDom.getBoundingClientRect();
     const dir = directions[activeHandle];
     const diffX = (event.clientX - dragging.startX) * dir.x;
     const diffY = (event.clientY - dragging.startY) * dir.y;
-    const nodeWidth = resizedNode.offsetWidth;
-    const nodeHeight = resizedNode.offsetHeight;
-    let width = dir.x ? diffX + nodeWidth : rect.width;
-    let height = dir.y ? diffY + nodeHeight : rect.height;
-    if (options.lockRatio && dir.x && dir.y) {
-        let ratio = Math.min(width / nodeWidth, height / nodeHeight);
-        let lockWidth = nodeWidth * ratio;
-        let 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;
-    }
+    const win = (tableDom.ownerDocument && tableDom.ownerDocument.defaultView) || window;
+    const compStyles = win.getComputedStyle(tableDom);
+    const nodeWidth = /px/.test(compStyles.width) ? parseFloat(compStyles.width) : tableDom.offsetWidth;
+    const nodeHeight = /px/.test(compStyles.height) ? parseFloat(compStyles.height) : tableDom.offsetHeight;
+    const width = dir.x ? diffX + nodeWidth : rect.width;
+    const height = dir.y ? diffY + nodeHeight : rect.height;
+    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';
     }
 };
 const toPercents = (view, tr, tablePos) => {
     const tableNode = view.state.doc.nodeAt(tablePos);
     const tableDom = getTable(view.nodeDOM(tablePos));
-    const { width: tableWidth, height: tableHeight, colsWidth } = tableSize(tableDom);
+    const { width, height, colsWidth, rowsHeight, offsetWidth, offsetHeight } = tableSize(tableDom);
     const colgroup = tableDom.firstChild;
     const cols = Array.from((colgroup && colgroup.children) || []);
-    // const borders = new Array(cols.length).fill(tableWidth / tableOffsetWidth / cols.length);
     let widthChanged = false;
     cols.forEach((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;
         }
     });
-    const rows = Array.from(tableDom.rows);
     let heightChange = false;
     tableNode.forEach((row, offset, index) => {
         const 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;
         }
     });
     let 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);
@@ -121,11 +89,13 @@ const toPercents = (view, tr, tablePos) => {
 const toPixels = (view, tr, tablePos, attrs) => {
     const tableNode = view.state.doc.nodeAt(tablePos);
     const tableDom = getTable(view.nodeDOM(tablePos));
+    const win = (tableDom.ownerDocument && tableDom.ownerDocument.defaultView) || window;
+    const calcStyle = win.getComputedStyle;
     const rows = Array.from(tableDom.rows);
     tableNode.forEach((row, offset, index) => {
         const 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));
         }
     });
     const colgroup = tableDom.firstChild;
@@ -133,7 +103,7 @@ const toPixels = (view, tr, tablePos, attrs) => {
     let widthChanged = false;
     cols.forEach((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;
         }
     });
@@ -146,9 +116,12 @@ const toPixels = (view, tr, tablePos, attrs) => {
 const tableSize = (table) => {
     const cols = Array.from(table.firstChild.children);
     const colsWidth = cols.map(c => c.offsetWidth);
+    const rowsHeight = Array.from(table.rows).map(row => row.offsetHeight);
     const width = colsWidth.reduce((acc, cur) => acc + cur, 0);
-    const height = table.offsetHeight; // Array.from(table.rows).reduce((acc, cur) => acc + cur.offsetHeight, 0);
-    return { width, height, colsWidth, offsetWidth: table.offsetWidth };
+    const height = rowsHeight.reduce((acc, cur) => acc + cur, 0);
+    const offsetHeight = table.offsetHeight;
+    const offsetWidth = table.offsetWidth;
+    return { width, height, colsWidth, rowsHeight, offsetWidth, offsetHeight };
 };
 const handleMouseUp = (view) => {
     const { dragging, nodePosition, activeHandle } = key.getState(view.state);
@@ -158,7 +131,7 @@ const handleMouseUp = (view) => {
         const rect = tableSize(dom);
         if (node) {
             const width = rect.offsetWidth + 'px';
-            const height = rect.height + 'px';
+            const height = rect.offsetHeight + 'px';
             const tr = view.state.tr;
             let attrs = node.attrs;
             const parsedStyles = parseStyle(attrs.style);
@@ -168,7 +141,7 @@ const handleMouseUp = (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);
@@ -181,9 +154,9 @@ const handleMouseUp = (view) => {
         }
     }
 };
-const handleMouseDown = (view, event, options) => {
+const handleMouseDown = (view, event) => {
     const target = event.target;
-    const activeHandle = target.getAttribute(dataDirection);
+    const activeHandle = target.getAttribute(dataResizeDirTable);
     if (!activeHandle) {
         return false;
     }
@@ -200,7 +173,7 @@ const handleMouseDown = (view, event, options) => {
     view.dispatch(transaction);
     const curWindow = event.view || window;
     function move(e) {
-        handleMouseMove(view, e, options);
+        handleMouseMove(view, e);
     }
     function finish(_e) {
         curWindow.removeEventListener('mouseup', finish);
@@ -211,7 +184,7 @@ const handleMouseDown = (view, event, options) => {
     curWindow.addEventListener('mousemove', move);
     return true;
 };
-export const tableResizing = (options = { node: 'table', lockRatio: false }) => {
+export const tableResizing = (options = { node: 'table' }) => {
     return new Plugin({
         key: key,
         view: (_viewObj) => ({
@@ -221,7 +194,8 @@ export const tableResizing = (options = { node: 'table', lockRatio: false }) =>
                 if (isNodeSelected && selection instanceof NodeSelection) {
                     return { node: selection.node, pos: selection.from };
                 }
-                const node = parentNode(selection.$from, (n) => n.type === nodeType);
+                const parent = parentNode(selection.$from, (n) => n.type === nodeType);
+                const node = parent && parent.node;
                 if (node) {
                     let tableDepth = new Array(selection.$from.depth + 1).fill(0)
                         .findIndex((_, i) => selection.$from.node(i).type.spec.tableRole === 'table');
@@ -269,7 +243,7 @@ export const tableResizing = (options = { node: 'table', lockRatio: false }) =>
         props: {
             handleDOMEvents: {
                 mousedown(view, event) {
-                    return handleMouseDown(view, event, options);
+                    return handleMouseDown(view, event);
                 }
             }
         }

package/dist/es2015/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';
-const directions = ['northwest', 'north', 'northeast', 'southwest', 'south', 'southeast', 'west', 'east'];
+import { handles } from './../resize-utils';
 export class TableView {
     constructor(node, view) {
         this.node = node;
@@ -13,10 +13,10 @@ export class TableView {
         }
         const tBody = this.table.appendChild(document.createElement('tbody'));
         this.setAttributes(this.table, node.attrs);
-        this.resizeHandles = directions.map(dir => {
+        this.resizeHandles = handles.map(dir => {
             const handle = document.createElement('span');
             handle.className = resizeHandle + ' ' + dir;
-            handle.setAttribute(dataDirection, dir);
+            handle.setAttribute(dataResizeDirTable, dir);
             return handle;
         });
         this.contentDOM = tBody;
@@ -51,11 +51,11 @@ export class TableView {
         return result;
     }
     destroy() {
-        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;
     }
     renderColgroup(colgroupStr) {
         if (this.table && this.table.firstChild && this.table.firstChild.nodeName === 'COLGROUP') {

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

@@ -38,9 +38,11 @@ export function otherResizing(current, state) {
 export function otherResizeHandle(current, state) {
     let 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) {
@@ -49,3 +51,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) {
+    const row = cell.parentNode;
+    return {
+        cellIndex: cell.cellIndex,
+        rowIndex: row.rowIndex
+    };
+}
+export function parentNode(pos, predicate) {
+    for (let depth = pos.depth; depth > 0; depth--) {
+        let node = pos.node(depth);
+        if (predicate(node)) {
+            return { node, depth };
+        }
+    }
+    return null;
+}

package/dist/npm/config/constants.d.ts

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

package/dist/npm/config/constants.js

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

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

@@ -5,18 +5,8 @@ var prosemirror_state_1 = require("prosemirror-state");
 var prosemirror_view_1 = require("prosemirror-view");
 var constants_1 = require("../config/constants");
 var utils_1 = require("../utils");
+var resize_utils_1 = require("./resize-utils");
 exports.imageResizeKey = new prosemirror_state_1.PluginKey('image-resize');
-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
-};
-var handles = Object.keys(directions);
 var setSize = function (domNode, sizeType, value) {
     domNode.style[sizeType] = value + 'px';
 };
@@ -45,7 +35,7 @@ var handleMouseMove = function (view, event, options) {
         return;
     }
     var img = view.nodeDOM(nodePosition);
-    var dir = directions[activeHandle];
+    var dir = resize_utils_1.directions[activeHandle];
     var diffX = (event.clientX - dragging.startX) * dir.x;
     var diffY = (event.clientY - dragging.startY) * dir.y;
     var width = dir.x ? diffX + img.width : rect.width;
@@ -112,7 +102,7 @@ var handleMouseUp = function (view) {
 };
 var handleMouseDown = function (view, event, options) {
     var target = event.target;
-    var activeHandle = target.getAttribute(constants_1.dataDirection);
+    var activeHandle = target.getAttribute(constants_1.dataResizeDirImage);
     if (!activeHandle) {
         return false;
     }
@@ -222,10 +212,10 @@ exports.imageResizing = function (options) {
                     wrapper.style.height = rect.height + 'px';
                     wrapper.style.top = rect.top + 'px';
                     wrapper.style.left = rect.left + 'px';
-                    for (var i = 0; i < handles.length; i++) {
+                    for (var i = 0; i < resize_utils_1.handles.length; i++) {
                         var dom = document.createElement('div');
-                        dom.className = constants_1.resizeHandle + ' ' + handles[i];
-                        dom.setAttribute(constants_1.dataDirection, handles[i]);
+                        dom.className = constants_1.resizeHandle + ' ' + resize_utils_1.handles[i];
+                        dom.setAttribute(constants_1.dataResizeDirImage, resize_utils_1.handles[i]);
                         wrapper.appendChild(dom);
                     }
                     return prosemirror_view_1.DecorationSet.create(state.doc, [prosemirror_view_1.Decoration.widget(state.selection.from + 1, wrapper)]);

package/dist/npm/plugins/resize-utils.d.ts

@@ -0,0 +1,35 @@
+export declare const directions: {
+    'southeast': {
+        x: number;
+        y: number;
+    };
+    'east': {
+        x: number;
+        y: number;
+    };
+    'south': {
+        x: number;
+        y: number;
+    };
+    'north': {
+        x: number;
+        y: number;
+    };
+    'west': {
+        x: number;
+        y: number;
+    };
+    'southwest': {
+        x: number;
+        y: number;
+    };
+    'northwest': {
+        x: number;
+        y: number;
+    };
+    'northeast': {
+        x: number;
+        y: number;
+    };
+};
+export declare const handles: string[];

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

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.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
+};
+exports.handles = Object.keys(exports.directions);

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

@@ -9,7 +9,7 @@ var table_view_1 = require("./table-view");
 var utils_1 = require("./utils");
 function columnResizing() {
     // tslint:disable-next-line:variable-name
-    var View = table_view_1.TableView, lastColumnResizable = true, handleWidth = 5, cellMinWidth = 25;
+    var View = table_view_1.TableView, handleWidth = 5, cellMinWidth = 25;
     var plugin = new prosemirror_state_1.Plugin({
         key: utils_1.tableColumnResizing,
         state: {
@@ -32,7 +32,7 @@ function columnResizing() {
             handleDOMEvents: {
                 mousemove: function (view, event) {
                     if (!utils_1.otherResizing(utils_1.tableColumnResizing, view.state)) {
-                        handleMouseMove(view, event, handleWidth, cellMinWidth, lastColumnResizable);
+                        handleMouseMove(view, event, handleWidth);
                     }
                     return false;
                 },
@@ -45,13 +45,13 @@ function columnResizing() {
                 }
             },
             decorations: function (state) {
-                if (utils_1.otherResizing(utils_1.tableColumnResizing, state)) {
-                    return prosemirror_view_1.DecorationSet.empty;
-                }
-                var pluginState = utils_1.tableColumnResizing.getState(state);
-                if (pluginState.activeHandle > -1) {
-                    return handleDecorations(state, pluginState.activeHandle);
+                if (!utils_1.otherResizing(utils_1.tableColumnResizing, state)) {
+                    var pluginState = utils_1.tableColumnResizing.getState(state);
+                    if (pluginState.activeHandle > -1) {
+                        return handleDecorations(state, pluginState.activeHandle);
+                    }
                 }
+                return prosemirror_view_1.DecorationSet.empty;
             },
             nodeViews: {}
         }
@@ -59,16 +59,8 @@ function columnResizing() {
     return plugin;
 }
 exports.columnResizing = columnResizing;
-function cellAround($pos) {
-    for (var 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);
 }
 var ResizeState = /** @class */ (function () {
     function ResizeState(activeHandle, dragging) {
@@ -86,7 +78,7 @@ var ResizeState = /** @class */ (function () {
         if (state.activeHandle > -1 && tr.docChanged) {
             var handle = tr.mapping.map(state.activeHandle, -1);
             if (!pointsAtCell(tr.doc.resolve(handle))) {
-                handle = null;
+                handle = -1;
             }
             state = new ResizeState(handle, state.dragging);
         }
@@ -94,28 +86,22 @@ var ResizeState = /** @class */ (function () {
     };
     return ResizeState;
 }());
-function handleMouseMove(view, event, handleWidth, _cellMinWidth, lastColumnResizable) {
+function handleMouseMove(view, event, handleWidth) {
     var pluginState = utils_1.tableColumnResizing.getState(view.state);
     if (!pluginState.dragging) {
-        var target = domCellAround(event.target), cell = -1;
+        var target = utils_1.domCellAround(event.target), cell = -1;
         if (target) {
+            var indexes = utils_1.cellIndexes(target);
             var _a = target.getBoundingClientRect(), left = _a.left, right = _a.right;
-            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) {
-                var $cell = view.state.doc.resolve(cell);
-                var table = $cell.node(-1), map = prosemirror_tables_1.TableMap.get(table), start = $cell.start(-1);
-                var col = map.colCount($cell.pos - start) + $cell.nodeAfter.attrs.colspan - 1;
-                if (col === map.width - 1) {
-                    return;
-                }
-            }
             updateHandle(view, cell);
         }
     }
@@ -173,7 +159,7 @@ function handleMouseDown(view, event, cellMinWidth) {
         var widths = Array.from(col.parentNode.children).map(function (c) { return c.style.width; });
         if (widths.every(Boolean)) {
             var sum = widths.reduce(function (acc, cur) { return acc + parseFloat(cur); }, 0);
-            tableAttrs = utils_1.setNodeStyle(tableNode.attrs, 'width', sum + 'px');
+            tableAttrs = utils_1.setNodeStyle(tableAttrs || tableNode.attrs, 'width', sum + 'px');
         }
     }
     if (tableAttrs) {
@@ -203,28 +189,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) {
     var found = view.posAtCoords({ left: event.clientX, top: event.clientY });
     if (!found) {
         return -1;
     }
-    var pos = found.pos;
-    var $cell = cellAround(view.state.doc.resolve(pos));
-    if (!$cell) {
+    var $pos = view.state.doc.resolve(found.pos);
+    var parentTable = utils_1.parentNode($pos, function (n) { return n.type.spec.tableRole === 'table'; });
+    if (parentTable === null) {
         return -1;
     }
-    if (side === 'right') {
-        return $cell.pos;
-    }
-    var map = prosemirror_tables_1.TableMap.get($cell.node(-1)), start = $cell.start(-1);
-    var index = map.map.indexOf($cell.pos - start);
-    return index % map.width === 0 ? -1 : start + map.map[index - 1];
+    var tablePos = $pos.start(parentTable.depth);
+    var tableNode = parentTable.node;
+    var map = prosemirror_tables_1.TableMap.get(tableNode);
+    var cell = tablePos + map.map[(map.width * indexes.rowIndex) + indexes.cellIndex];
+    return cell;
 }
 function draggedWidth(dragging, event, cellMinWidth) {
     var offset = event.clientX - dragging.startX;