@progress/kendo-editor-common 1.9.3-dev.202209121201 → 1.9.3-dev.202210050740

package/dist/es/main.js

@@ -36,7 +36,7 @@ export * from 'prosemirror-model';
 export * from 'prosemirror-schema-list';
 export * from 'prosemirror-state';
 // Fixes an error related to setting over the addRowAfter and addRowBefore exports from the PM tables module
-export { TableMap, tableEditing, tableEditingKey, tableNodeTypes, tableNodes, fixTables, fixTablesKey, isInTable, deleteTable, inSameTable, CellSelection, selectedRect, selectionCell, setCellAttr, goToNextCell, toggleHeader, toggleHeaderCell, toggleHeaderColumn, toggleHeaderRow, splitCell, splitCellWithType, mergeCells, deleteColumn, deleteRow, rowIsHeader, addRow, addColSpan, addColumn, addColumnAfter, addColumnBefore, colCount, columnIsHeader, columnResizing, columnResizingPluginKey, updateColumnsOnResize, cellAround, findCell, removeColSpan, moveCellForward, nextCell } from 'prosemirror-tables';
+export { TableMap, tableEditing, tableEditingKey, tableNodeTypes, tableNodes, fixTables, fixTablesKey, isInTable, deleteTable, inSameTable, CellSelection, selectedRect, selectionCell, setCellAttr, goToNextCell, toggleHeader, toggleHeaderCell, toggleHeaderColumn, toggleHeaderRow, splitCell, splitCellWithType, mergeCells, deleteRow, rowIsHeader, addRow, addColSpan, addColumn, colCount, columnIsHeader, columnResizing, columnResizingPluginKey, updateColumnsOnResize, cellAround, findCell, removeColSpan, moveCellForward, nextCell } from 'prosemirror-tables';
 export * from 'prosemirror-transform';
 export * from 'prosemirror-view';
-export { createTable, addRowAfter, addRowBefore, pmAddRowAfter, pmAddRowBefore } from './table';
+export { createTable, addRowAfter, addRowBefore, addColumnBefore, addColumnAfter, deleteColumn, pmAddColumnBefore, pmAddColumnAfter, pmAddRowAfter, pmAddRowBefore, pmDeleteColumn } from './table';

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

@@ -4,7 +4,7 @@ import { tableNodeTypes, TableMap } from 'prosemirror-tables';
 import { Decoration, DecorationSet } from 'prosemirror-view';
 import { colgroupAttr } from '../../config/constants';
 import { TableView } from './table-view';
-import { cellIndexes, domCellAround, otherResizeHandle, otherResizing, parentNode, parseStyle, setNodeStyle, tableColumnResizeKey as key } from './utils';
+import { cellIndexes, domCellAround, otherResizeHandle, otherResizing, edgeCell, parseStyle, setNodeStyle, tableColumnResizeKey as key } from './utils';
 export function columnResizing() {
     // tslint:disable-next-line:variable-name
     var View = TableView, handleWidth = 5, cellMinWidth = 25;
@@ -91,7 +91,7 @@ function handleMouseMove(view, event, handleWidth) {
             var indexes = cellIndexes(target);
             var _a = target.getBoundingClientRect(), left = _a.left, right = _a.right;
             if (Math.abs(event.clientX - left) <= handleWidth && indexes.cellIndex > 0) {
-                indexes.cellIndex--;
+                indexes.cellIndex -= target.colSpan;
                 cell = edgeCell(view, event, indexes);
             }
             else if (right - event.clientX > 0 && right - event.clientX <= handleWidth) {
@@ -187,22 +187,6 @@ function handleMouseDown(view, event, cellMinWidth) {
     event.preventDefault();
     return true;
 }
-function edgeCell(view, event, indexes) {
-    var found = view.posAtCoords({ left: event.clientX, top: event.clientY });
-    if (!found) {
-        return -1;
-    }
-    var $pos = view.state.doc.resolve(found.pos);
-    var parentTable = parentNode($pos, function (n) { return n.type.spec.tableRole === 'table'; });
-    if (parentTable === null) {
-        return -1;
-    }
-    var tablePos = $pos.start(parentTable.depth);
-    var tableNode = parentTable.node;
-    var map = 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;
     return Math.max(cellMinWidth, dragging.startWidth + offset);
@@ -227,8 +211,8 @@ function updateColumnWidth(view, tr, cell, _width) {
     var tableDomWidth = tableDom.style.width;
     if (tableDom && tableDomWidth && parseStyle(attrs.style).width !== tableDomWidth) {
         attrs = setNodeStyle(attrs, 'width', tableDomWidth);
-        tr.setNodeMarkup(tablePos, null, attrs);
     }
+    tr.setNodeMarkup(tablePos, null, attrs);
 }
 function displayColumnWidth(view, cell, width, _cellMinWidth) {
     var $cell = view.state.doc.resolve(cell);
@@ -254,20 +238,27 @@ function handleDecorations(state, cell) {
     var decorations = [];
     var $cell = state.doc.resolve(cell);
     var table = $cell.node(-1), map = TableMap.get(table), start = $cell.start(-1);
-    var col = map.colCount($cell.pos - start) + $cell.nodeAfter.attrs.colspan;
-    for (var row = 0; row < map.height; row++) {
-        var index = col + row * map.width - 1;
-        // For positions that are have either a different cell or the end
-        // of the table to their right, and either the top of the table or
-        // a different cell above them, add a decoration
-        if ((col === map.width || map.map[index] !== map.map[index + 1]) &&
-            (row === 0 || map.map[index - 1] !== map.map[index - 1 - map.width])) {
-            var cellPos = map.map[index];
-            var pos = start + cellPos + table.nodeAt(cellPos).nodeSize - 1;
-            var dom = document.createElement('div');
-            dom.className = 'column-resize-handle';
-            decorations.push(Decoration.widget(pos, dom));
+    var cellsPositions = [];
+    var cellPos = cell - start;
+    var column = -1;
+    for (var i = 0; i < map.height; i++) {
+        cellsPositions.push(map.map.slice(i * map.width, (i * map.width) + map.width));
+        if (column === -1) {
+            column = cellsPositions[i].lastIndexOf(cellPos);
         }
     }
+    var cells = [];
+    cellsPositions.forEach(function (row) {
+        var c = row[column];
+        if (row[column] !== row[column + 1]) {
+            cells.push(c);
+        }
+    });
+    cells.forEach((function (cPos) {
+        var pos = start + cPos + table.nodeAt(cPos).nodeSize - 1;
+        var dom = document.createElement('div');
+        dom.className = 'column-resize-handle';
+        decorations.push(Decoration.widget(pos, dom));
+    }));
     return DecorationSet.create(state.doc, decorations);
 }

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

@@ -1,7 +1,7 @@
 import { Plugin } from 'prosemirror-state';
 import { TableMap, tableNodeTypes } from 'prosemirror-tables';
 import { Decoration, DecorationSet } from 'prosemirror-view';
-import { domCellAround, otherResizeHandle, otherResizing, parentNode, parseStyle, setNodeStyle, tableRowResizeKey as key } from './utils';
+import { cellIndexes, domCellAround, otherResizeHandle, otherResizing, parseStyle, setNodeStyle, tableRowResizeKey as key, edgeCell } from './utils';
 var TableRowView = /** @class */ (function () {
     function TableRowView() {
     }
@@ -90,19 +90,20 @@ var ResizeState = /** @class */ (function () {
 function handleMouseMove(view, event, handleWidth) {
     var pluginState = key.getState(view.state);
     if (!pluginState.dragging) {
-        var target = domCellAround(event.target), row = -1;
+        var target = domCellAround(event.target), cell = -1;
         if (target) {
-            var rowDom = target.parentNode;
-            var domRect = rowDom.getBoundingClientRect();
-            if (Math.abs(event.clientY - domRect.top) <= handleWidth && rowDom.rowIndex > 0) {
-                row = edgeRow(view, event, rowDom.rowIndex - 1);
+            var indexes = cellIndexes(target);
+            var _a = target.getBoundingClientRect(), top_1 = _a.top, bottom = _a.bottom;
+            if (Math.abs(event.clientY - top_1) <= handleWidth && indexes.rowIndex > 0) {
+                indexes.rowIndex -= target.rowSpan;
+                cell = edgeCell(view, event, indexes);
             }
-            else if (domRect.bottom - event.clientY > 0 && domRect.bottom - event.clientY <= handleWidth) {
-                row = edgeRow(view, event, rowDom.rowIndex);
+            else if (bottom - event.clientY > 0 && bottom - event.clientY <= handleWidth) {
+                cell = edgeCell(view, event, indexes);
             }
         }
-        if (row !== pluginState.activeHandle) {
-            updateHandle(view, row);
+        if (cell !== pluginState.activeHandle) {
+            updateHandle(view, cell);
         }
     }
 }
@@ -118,9 +119,9 @@ function handleMouseDown(view, event) {
         return false;
     }
     var doc = view.state.doc;
-    var $pos = doc.resolve(pluginState.activeHandle);
-    var row = doc.nodeAt(pluginState.activeHandle);
-    var table = $pos.parent;
+    var $cell = doc.resolve(pluginState.activeHandle);
+    var row = $cell.parent;
+    var table = $cell.node(-1);
     var rowHeightStr = parseStyle(row.attrs.style).height;
     var tableHeight = parseStyle(table.attrs.style).height;
     var rowHeight = rowHeightStr ? parseFloat(rowHeightStr) : 0;
@@ -158,22 +159,6 @@ function handleMouseDown(view, event) {
     event.preventDefault();
     return true;
 }
-function edgeRow(view, event, rowIndex) {
-    var found = view.posAtCoords({ left: event.clientX, top: event.clientY });
-    if (!found) {
-        return -1;
-    }
-    var $pos = view.state.doc.resolve(found.pos);
-    var parentTable = parentNode($pos, function (n) { return n.type.spec.tableRole === 'table'; });
-    if (parentTable === null) {
-        return -1;
-    }
-    var tablePos = $pos.start(parentTable.depth);
-    var tableNode = parentTable.node;
-    var map = TableMap.get(tableNode);
-    var row = tablePos + map.map[(map.width * rowIndex)] - 1;
-    return row;
-}
 function draggedHeight(dragging, event) {
     var offset = event.clientY - dragging.startY;
     return dragging.startHeight.rowHeight + offset;
@@ -184,9 +169,11 @@ function updateHandle(view, value) {
     tr.setMeta(key, { setHandle: value });
     view.dispatch(tr);
 }
-function updateRowHeight(view, tr, rowPos) {
+function updateRowHeight(view, tr, cellPos) {
     var doc = view.state.doc;
-    var row = doc.nodeAt(rowPos);
+    var $cell = doc.resolve(cellPos);
+    var row = $cell.parent;
+    var rowPos = $cell.posAtIndex(0) - 1;
     var dom = view.nodeDOM(rowPos);
     var win = (dom.ownerDocument && dom.ownerDocument.defaultView) || window;
     dom.style.height = win.getComputedStyle(dom).height;
@@ -199,13 +186,14 @@ function updateRowHeight(view, tr, rowPos) {
         tr.setNodeMarkup(tablePos, null, setNodeStyle($pos.parent.attrs, 'height', tableHeight));
     }
 }
-function displayRowHeight(view, rowPos, height, offset, tableHeight) {
-    var dom = view.nodeDOM(rowPos);
-    if (dom) {
-        dom.style.height = height + 'px';
-        var win = (dom.ownerDocument && dom.ownerDocument.defaultView) || window;
-        dom.style.height = win.getComputedStyle(dom).height;
-        var table = dom.closest('table');
+function displayRowHeight(view, cellPos, height, offset, tableHeight) {
+    var cell = view.nodeDOM(cellPos);
+    var row = cell && cell.parentNode;
+    if (row) {
+        row.style.height = height + 'px';
+        var win = (row.ownerDocument && row.ownerDocument.defaultView) || window;
+        row.style.height = win.getComputedStyle(row).height;
+        var table = row.closest('table');
         var newHeight = (parseFloat(tableHeight) + offset) + 'px';
         var current = table && table.style.height;
         if (current && current !== newHeight) {
@@ -214,20 +202,33 @@ function displayRowHeight(view, rowPos, height, offset, tableHeight) {
         }
     }
 }
-function handleDecorations(state, pos) {
+function handleDecorations(state, cell) {
     var decorations = [];
-    if (typeof pos !== 'number') {
+    if (typeof cell !== 'number') {
         return DecorationSet.empty;
     }
-    var $row = state.doc.resolve(pos), table = $row.parent, map = TableMap.get(table), rowIndex = $row.index($row.depth), start = $row.start($row.depth);
-    for (var col = 0; col < map.width; col++) {
-        var index = col + rowIndex * map.width;
-        var cellPos = map.map[index];
-        var cell = table.nodeAt(cellPos);
-        var widgetPos = start + cellPos + (cell ? cell.nodeSize : 0) - 1;
+    var $cell = state.doc.resolve(cell), table = $cell.node(-1), map = TableMap.get(table), start = $cell.start(-1);
+    var cellsPositions = [];
+    var cellPos = cell - start;
+    var rowIndex = -1;
+    for (var i = 0; i < map.height; i++) {
+        cellsPositions.push(map.map.slice(i * map.width, (i * map.width) + map.width));
+        if (cellsPositions[i].indexOf(cellPos) !== -1) {
+            rowIndex = i;
+        }
+    }
+    var cells = [];
+    cellsPositions[rowIndex].forEach(function (c, i) {
+        if (!cellsPositions[rowIndex + 1] || c !== cellsPositions[rowIndex + 1][i]) {
+            cells.push(c);
+        }
+    });
+    cells.forEach(function (cPos) {
+        var cellNode = table.nodeAt(cPos);
+        var widgetPos = start + cPos + (cellNode ? cellNode.nodeSize : 0) - 1;
         var dom = document.createElement('div');
         dom.className = 'row-resize-handle';
         decorations.push(Decoration.widget(widgetPos, dom));
-    }
+    });
     return DecorationSet.create(state.doc, decorations);
 }

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

@@ -200,9 +200,7 @@ export var tableResizing = function (options) {
                 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'; });
-                    var pos = selection.$from.start(tableDepth) - 1;
+                    var pos = selection.$from.start(parent.depth) - 1;
                     return { node: node, pos: pos };
                 }
                 return null;

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

@@ -1,5 +1,6 @@
 import { __assign } from "tslib";
 import { PluginKey } from 'prosemirror-state';
+import { TableMap } from 'prosemirror-tables';
 import { changeStylesString } from '../../utils';
 export var reAnyValue = /^.+$/;
 export var parseStyle = function (styleText) {
@@ -59,12 +60,46 @@ export function domCellAround(target) {
     }
     return target;
 }
-export function cellIndexes(cell) {
-    var row = cell.parentNode;
-    return {
-        cellIndex: cell.cellIndex,
-        rowIndex: row.rowIndex
+function tableSpansMap(table) {
+    var rows = Array.from((table && table.rows) || []);
+    var colsCount = Array.from((rows && rows[0] && rows[0].cells) || [])
+        .map(function (c) { return c.colSpan; })
+        .reduce(function (prev, cur) { return prev + cur; }, 0);
+    var map = rows.map(function () { return new Array(colsCount); });
+    rows.forEach(function (row, r) {
+        var curColSpan = 0;
+        Array.from(row.cells).forEach(function (c) {
+            for (var colSp = 0; colSp < c.colSpan; colSp++) {
+                for (var rowSp = 0; rowSp < c.rowSpan; rowSp++) {
+                    var ind = map[r + rowSp].findIndex(function (val, curInd) { return curInd >= curColSpan && !val; });
+                    map[r + rowSp][ind] = c;
+                }
+                curColSpan++;
+            }
+        });
+    });
+    return map;
+}
+export function cellIndexes(dataCell) {
+    var map = tableSpansMap(dataCell.closest('table'));
+    var result = null;
+    var _loop_1 = function (r) {
+        var row = map[r];
+        row.forEach(function (cell, c) {
+            if (dataCell === cell) {
+                result = { rowIndex: r, cellIndex: c };
+            }
+        });
+        if (result) {
+            return "break";
+        }
     };
+    for (var r = 0; r < map.length; r++) {
+        var state_1 = _loop_1(r);
+        if (state_1 === "break")
+            break;
+    }
+    return result || { rowIndex: -1, cellIndex: -1 };
 }
 export function parentNode(pos, predicate) {
     for (var depth = pos.depth; depth > 0; depth--) {
@@ -75,3 +110,19 @@ export function parentNode(pos, predicate) {
     }
     return null;
 }
+export function edgeCell(view, event, indexes) {
+    var found = view.posAtCoords({ left: event.clientX, top: event.clientY });
+    if (!found) {
+        return -1;
+    }
+    var $pos = view.state.doc.resolve(found.pos);
+    var parentTable = parentNode($pos, function (n) { return n.type.spec.tableRole === 'table'; });
+    if (parentTable === null) {
+        return -1;
+    }
+    var tablePos = $pos.start(parentTable.depth);
+    var tableNode = parentTable.node;
+    var map = TableMap.get(tableNode);
+    var cell = tablePos + map.map[(map.width * indexes.rowIndex) + indexes.cellIndex];
+    return cell;
+}

package/dist/es/table.js

@@ -1,5 +1,7 @@
-import { addRowAfter as pmAddRowAfter, addRowBefore as pmAddRowBefore } from 'prosemirror-tables';
-import { rowTypeAttr } from './config/constants';
+import { __assign } from "tslib";
+import { addRowAfter as pmAddRowAfter, addRowBefore as pmAddRowBefore, addColumnBefore as pmAddColumnBefore, addColumnAfter as pmAddColumnAfter, deleteColumn as pmDeleteColumn, TableMap } from 'prosemirror-tables';
+import { colgroupAttr, rowTypeAttr } from './config/constants';
+import { parseStrColgroup } from './config/schema';
 /**
  * Creates a table.
  * @returns Node
@@ -17,11 +19,14 @@ export var createTable = function (nodes, rows, columns) {
     }
     return table.createAndFill(undefined, tableRows);
 };
+var reTable = /^table$/;
+var reRow = /^table_row$/;
+var reCell = /^table_cell|table_header$/;
 var closest = function (selection, name) {
     var pos = selection.$head;
     for (var i = pos.depth; i > 0; i--) {
         var node = pos.node(i);
-        if (node.type.name === name) {
+        if (name.test(node.type.name)) {
             return {
                 pos: pos.before(i),
                 node: node
@@ -33,8 +38,8 @@ var closest = function (selection, name) {
 export var addRowBefore = function (state, dispatch) {
     var cmdDispatch = dispatch && (function (tr) {
         var _a;
-        var row = closest(tr.selection, 'table_row');
-        var table = closest(tr.selection, 'table');
+        var row = closest(tr.selection, reRow);
+        var table = closest(tr.selection, reTable);
         if (row && table && row.node.attrs[rowTypeAttr]) {
             var index = 0;
             for (var i = 0; i < table.node.nodeSize; i++) {
@@ -54,7 +59,7 @@ export var addRowBefore = function (state, dispatch) {
 export var addRowAfter = function (state, dispatch) {
     var cmdDispatch = dispatch && (function (tr) {
         var _a;
-        var row = closest(tr.selection, 'table_row');
+        var row = closest(tr.selection, reRow);
         if (row && row.node.attrs[rowTypeAttr]) {
             var from = row.pos + row.node.nodeSize;
             tr.setNodeMarkup(from, undefined, (_a = {}, _a[rowTypeAttr] = row.node.attrs[rowTypeAttr], _a));
@@ -63,4 +68,64 @@ export var addRowAfter = function (state, dispatch) {
     });
     return pmAddRowAfter(state, cmdDispatch);
 };
-export { pmAddRowBefore, pmAddRowAfter };
+var columnIndex = function (table, selection) {
+    if (!table) {
+        return -1;
+    }
+    var map = TableMap.get(table.node);
+    var tableCell = closest(selection, reCell);
+    var idx = map.map.indexOf(tableCell.pos - table.pos - 1);
+    var colIndex = -1;
+    if (idx !== -1) {
+        colIndex = idx % map.width;
+    }
+    return colIndex;
+};
+var addCol = function (tr, table, to) {
+    var _a;
+    var colIndex = columnIndex(table, tr.selection);
+    var colgroup = parseStrColgroup(table.node.attrs[colgroupAttr]);
+    colgroup.insertBefore(colgroup.ownerDocument.createElement('col'), colgroup.children[colIndex + to]);
+    tr.setNodeMarkup(table.pos, null, __assign(__assign({}, table.node.attrs), (_a = {}, _a[colgroupAttr] = colgroup.outerHTML, _a)));
+};
+var deleteCol = function (tr, table, colIndex) {
+    var _a;
+    var colgroup = parseStrColgroup(table.node.attrs[colgroupAttr]);
+    colgroup.removeChild(colgroup.children[colIndex]);
+    tr.setNodeMarkup(table.pos, null, __assign(__assign({}, table.node.attrs), (_a = {}, _a[colgroupAttr] = colgroup.outerHTML, _a)));
+};
+export var addColumnBefore = function (state, dispatch) {
+    var cmdDispatch = dispatch && (function (tr) {
+        var table = closest(tr.selection, reTable);
+        if (!table.node.attrs[colgroupAttr]) {
+            return dispatch(tr);
+        }
+        addCol(tr, table, -1);
+        return dispatch(tr);
+    });
+    return pmAddColumnBefore(state, cmdDispatch);
+};
+export var addColumnAfter = function (state, dispatch) {
+    var cmdDispatch = dispatch && (function (tr) {
+        var table = closest(tr.selection, reTable);
+        if (!table.node.attrs[colgroupAttr]) {
+            return dispatch(tr);
+        }
+        addCol(tr, table, 1);
+        return dispatch(tr);
+    });
+    return pmAddColumnAfter(state, cmdDispatch);
+};
+export var deleteColumn = function (state, dispatch) {
+    var colIndex = columnIndex(closest(state.selection, reTable), state.selection);
+    var cmdDispatch = dispatch && (function (tr) {
+        var table = closest(tr.selection, reTable);
+        if (!table.node.attrs[colgroupAttr]) {
+            return dispatch(tr);
+        }
+        deleteCol(tr, table, colIndex);
+        return dispatch(tr);
+    });
+    return pmDeleteColumn(state, cmdDispatch);
+};
+export { pmAddRowBefore, pmAddRowAfter, pmAddColumnBefore, pmAddColumnAfter, pmDeleteColumn };

package/dist/es2015/main.js

@@ -36,7 +36,7 @@ export * from 'prosemirror-model';
 export * from 'prosemirror-schema-list';
 export * from 'prosemirror-state';
 // Fixes an error related to setting over the addRowAfter and addRowBefore exports from the PM tables module
-export { TableMap, tableEditing, tableEditingKey, tableNodeTypes, tableNodes, fixTables, fixTablesKey, isInTable, deleteTable, inSameTable, CellSelection, selectedRect, selectionCell, setCellAttr, goToNextCell, toggleHeader, toggleHeaderCell, toggleHeaderColumn, toggleHeaderRow, splitCell, splitCellWithType, mergeCells, deleteColumn, deleteRow, rowIsHeader, addRow, addColSpan, addColumn, addColumnAfter, addColumnBefore, colCount, columnIsHeader, columnResizing, columnResizingPluginKey, updateColumnsOnResize, cellAround, findCell, removeColSpan, moveCellForward, nextCell } from 'prosemirror-tables';
+export { TableMap, tableEditing, tableEditingKey, tableNodeTypes, tableNodes, fixTables, fixTablesKey, isInTable, deleteTable, inSameTable, CellSelection, selectedRect, selectionCell, setCellAttr, goToNextCell, toggleHeader, toggleHeaderCell, toggleHeaderColumn, toggleHeaderRow, splitCell, splitCellWithType, mergeCells, deleteRow, rowIsHeader, addRow, addColSpan, addColumn, colCount, columnIsHeader, columnResizing, columnResizingPluginKey, updateColumnsOnResize, cellAround, findCell, removeColSpan, moveCellForward, nextCell } from 'prosemirror-tables';
 export * from 'prosemirror-transform';
 export * from 'prosemirror-view';
-export { createTable, addRowAfter, addRowBefore, pmAddRowAfter, pmAddRowBefore } from './table';
+export { createTable, addRowAfter, addRowBefore, addColumnBefore, addColumnAfter, deleteColumn, pmAddColumnBefore, pmAddColumnAfter, pmAddRowAfter, pmAddRowBefore, pmDeleteColumn } from './table';

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

@@ -3,7 +3,7 @@ import { tableNodeTypes, TableMap } from 'prosemirror-tables';
 import { Decoration, DecorationSet } from 'prosemirror-view';
 import { colgroupAttr } from '../../config/constants';
 import { TableView } from './table-view';
-import { cellIndexes, domCellAround, otherResizeHandle, otherResizing, parentNode, parseStyle, setNodeStyle, tableColumnResizeKey as key } from './utils';
+import { cellIndexes, domCellAround, otherResizeHandle, otherResizing, edgeCell, parseStyle, setNodeStyle, tableColumnResizeKey as key } from './utils';
 export function columnResizing() {
     // tslint:disable-next-line:variable-name
     const View = TableView, handleWidth = 5, cellMinWidth = 25;
@@ -89,7 +89,7 @@ function handleMouseMove(view, event, handleWidth) {
             const indexes = cellIndexes(target);
             let { left, right } = target.getBoundingClientRect();
             if (Math.abs(event.clientX - left) <= handleWidth && indexes.cellIndex > 0) {
-                indexes.cellIndex--;
+                indexes.cellIndex -= target.colSpan;
                 cell = edgeCell(view, event, indexes);
             }
             else if (right - event.clientX > 0 && right - event.clientX <= handleWidth) {
@@ -184,22 +184,6 @@ function handleMouseDown(view, event, cellMinWidth) {
     event.preventDefault();
     return true;
 }
-function edgeCell(view, event, indexes) {
-    let found = view.posAtCoords({ left: event.clientX, top: event.clientY });
-    if (!found) {
-        return -1;
-    }
-    let $pos = view.state.doc.resolve(found.pos);
-    let parentTable = parentNode($pos, n => n.type.spec.tableRole === 'table');
-    if (parentTable === null) {
-        return -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;
     return Math.max(cellMinWidth, dragging.startWidth + offset);
@@ -223,8 +207,8 @@ function updateColumnWidth(view, tr, cell, _width) {
     const tableDomWidth = tableDom.style.width;
     if (tableDom && tableDomWidth && parseStyle(attrs.style).width !== tableDomWidth) {
         attrs = setNodeStyle(attrs, 'width', tableDomWidth);
-        tr.setNodeMarkup(tablePos, null, attrs);
     }
+    tr.setNodeMarkup(tablePos, null, attrs);
 }
 function displayColumnWidth(view, cell, width, _cellMinWidth) {
     let $cell = view.state.doc.resolve(cell);
@@ -250,20 +234,27 @@ function handleDecorations(state, cell) {
     let decorations = [];
     let $cell = 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;
-    for (let row = 0; row < map.height; row++) {
-        let index = col + row * map.width - 1;
-        // For positions that are have either a different cell or the end
-        // of the table to their right, and either the top of the table or
-        // a different cell above them, add a decoration
-        if ((col === map.width || map.map[index] !== map.map[index + 1]) &&
-            (row === 0 || map.map[index - 1] !== map.map[index - 1 - map.width])) {
-            let cellPos = map.map[index];
-            let pos = start + cellPos + table.nodeAt(cellPos).nodeSize - 1;
-            let dom = document.createElement('div');
-            dom.className = 'column-resize-handle';
-            decorations.push(Decoration.widget(pos, dom));
+    const cellsPositions = [];
+    const cellPos = cell - start;
+    let column = -1;
+    for (let i = 0; i < map.height; i++) {
+        cellsPositions.push(map.map.slice(i * map.width, (i * map.width) + map.width));
+        if (column === -1) {
+            column = cellsPositions[i].lastIndexOf(cellPos);
         }
     }
+    const cells = [];
+    cellsPositions.forEach((row) => {
+        let c = row[column];
+        if (row[column] !== row[column + 1]) {
+            cells.push(c);
+        }
+    });
+    cells.forEach((cPos => {
+        let pos = start + cPos + table.nodeAt(cPos).nodeSize - 1;
+        let dom = document.createElement('div');
+        dom.className = 'column-resize-handle';
+        decorations.push(Decoration.widget(pos, dom));
+    }));
     return DecorationSet.create(state.doc, decorations);
 }