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

package/dist/es/config/constants.js

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

package/dist/es/config/schema.js

@@ -32,11 +32,15 @@ var hasAttrs = function (attrs, exclude) {
     return false;
 };
 var pmAttributes = function (attrs, exclude) {
+    if (exclude === void 0) { exclude = []; }
     var result = {};
-    for (var attr in attrs) {
-        if (attr && attrs[attr] !== null && attr !== exclude) {
+    var _loop_1 = function (attr) {
+        if (attr && attrs[attr] !== null && !exclude.find(function (e) { return e === attr; })) {
             result[attr] = attrs[attr];
         }
+    };
+    for (var attr in attrs) {
+        _loop_1(attr);
     }
     return result;
 };
@@ -121,7 +125,7 @@ tNodes.table_row.toDOM = function (node) { return ['tr', pmAttributes(node.attrs
 tNodes.table_row.parseDOM = [{ tag: 'tr', getAttrs: domAttributes }];
 tNodes.table.attrs = tslib_1.__assign({}, tNodes.table.attrs, defaultAttrs(['style', 'class', 'id', colgroupAttr, resizableAttr]));
 tNodes.table.toDOM = function (node) {
-    var tableAttrs = hasAttrs(node.attrs) ? pmAttributes(node.attrs, colgroupAttr) : {};
+    var tableAttrs = hasAttrs(node.attrs) ? pmAttributes(node.attrs, [colgroupAttr, resizableAttr]) : {};
     var colgroup = null;
     if (node.attrs[colgroupAttr] && !shouldSkipColgroup(node)) {
         var colgroupEl = parseStrColgroup(node.attrs[colgroupAttr]);
@@ -210,7 +214,7 @@ var nodes = tslib_1.__assign({
             { tag: 'h6', getAttrs: function (node) { return (tslib_1.__assign({}, domAttributes(node), { level: 6 })); } }
         ],
         toDOM: function (node) { return 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
@@ -267,8 +271,8 @@ var nodes = tslib_1.__assign({
                 } }],
         toDOM: function (node) {
             return node.attrs.order === 1 ?
-                (hasAttrs(node.attrs, 'order') ? ['ol', pmAttributes(node.attrs, 'order'), hole] : olDOM) :
-                ['ol', tslib_1.__assign({}, pmAttributes(node.attrs, 'order'), { start: node.attrs.order }), hole];
+                (hasAttrs(node.attrs, 'order') ? ['ol', pmAttributes(node.attrs, ['order']), hole] : olDOM) :
+                ['ol', tslib_1.__assign({}, pmAttributes(node.attrs, ['order']), { start: node.attrs.order }), hole];
         }
     }, 
     // :: NodeSpec

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

@@ -1,20 +1,10 @@
 import * as tslib_1 from "tslib";
 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 var imageResizeKey = new 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';
 };
@@ -110,7 +100,7 @@ var handleMouseUp = function (view) {
 };
 var handleMouseDown = function (view, event, options) {
     var target = event.target;
-    var activeHandle = target.getAttribute(dataDirection);
+    var activeHandle = target.getAttribute(dataResizeDirImage);
     if (!activeHandle) {
         return false;
     }
@@ -223,7 +213,7 @@ export var imageResizing = function (options) {
                     for (var i = 0; i < handles.length; i++) {
                         var 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/es/plugins/resize-utils.js

@@ -0,0 +1,11 @@
+export 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
+};
+export var handles = Object.keys(directions);

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

@@ -4,10 +4,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
-    var View = TableView, lastColumnResizable = true, handleWidth = 5, cellMinWidth = 25;
+    var View = TableView, handleWidth = 5, cellMinWidth = 25;
     var plugin = new Plugin({
         key: key,
         state: {
@@ -30,7 +30,7 @@ export function columnResizing() {
             handleDOMEvents: {
                 mousemove: function (view, event) {
                     if (!otherResizing(key, view.state)) {
-                        handleMouseMove(view, event, handleWidth, cellMinWidth, lastColumnResizable);
+                        handleMouseMove(view, event, handleWidth);
                     }
                     return false;
                 },
@@ -43,29 +43,21 @@ export function columnResizing() {
                 }
             },
             decorations: function (state) {
-                if (otherResizing(key, state)) {
-                    return DecorationSet.empty;
-                }
-                var pluginState = key.getState(state);
-                if (pluginState.activeHandle > -1) {
-                    return handleDecorations(state, pluginState.activeHandle);
+                if (!otherResizing(key, state)) {
+                    var pluginState = key.getState(state);
+                    if (pluginState.activeHandle > -1) {
+                        return handleDecorations(state, pluginState.activeHandle);
+                    }
                 }
+                return DecorationSet.empty;
             },
             nodeViews: {}
         }
     });
     return plugin;
 }
-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) {
@@ -83,7 +75,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);
         }
@@ -91,28 +83,22 @@ var ResizeState = /** @class */ (function () {
     };
     return ResizeState;
 }());
-function handleMouseMove(view, event, handleWidth, _cellMinWidth, lastColumnResizable) {
+function handleMouseMove(view, event, handleWidth) {
     var pluginState = key.getState(view.state);
     if (!pluginState.dragging) {
         var target = domCellAround(event.target), cell = -1;
         if (target) {
+            var indexes = 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 = 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);
         }
     }
@@ -170,7 +156,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 = setNodeStyle(tableNode.attrs, 'width', sum + 'px');
+            tableAttrs = setNodeStyle(tableAttrs || tableNode.attrs, 'width', sum + 'px');
         }
     }
     if (tableAttrs) {
@@ -200,28 +186,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 = parentNode($pos, function (n) { return n.type.spec.tableRole === 'table'; });
+    if (parentTable === null) {
         return -1;
     }
-    if (side === 'right') {
-        return $cell.pos;
-    }
-    var map = 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 = 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;

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 { otherResizeHandle, otherResizing, parseStyle, setNodeStyle, tableRowResizing as key } from './utils';
+import { domCellAround, otherResizeHandle, otherResizing, parentNode, parseStyle, setNodeStyle, tableRowResizing as key } from './utils';
 var TableRowView = /** @class */ (function () {
     function TableRowView() {
     }
@@ -11,7 +11,7 @@ var TableRowView = /** @class */ (function () {
     return TableRowView;
 }());
 export function rowResizing() {
-    var handleWidth = 5, rowMinHeight = 25, lastRowResizable = true;
+    var handleWidth = 5;
     var plugin = new Plugin({
         key: key,
         state: {
@@ -34,7 +34,7 @@ export function rowResizing() {
             handleDOMEvents: {
                 mousemove: function (view, event) {
                     if (!otherResizing(key, view.state)) {
-                        handleMouseMove(view, event, handleWidth, rowMinHeight, lastRowResizable);
+                        handleMouseMove(view, event, handleWidth);
                     }
                     return false;
                 },
@@ -43,7 +43,7 @@ export function rowResizing() {
                     return false;
                 },
                 mousedown: function (view, event) {
-                    return handleMouseDown(view, event, rowMinHeight);
+                    return handleMouseDown(view, event);
                 }
             },
             decorations: function (state) {
@@ -76,7 +76,7 @@ var ResizeState = /** @class */ (function () {
         if (action && action.setDragging !== undefined) {
             return new ResizeState(state.activeHandle, action.setDragging);
         }
-        if (state.activeHandle > -1) { //  && tr.docChanged
+        if (state.activeHandle > -1) {
             var handle = tr.mapping.map(state.activeHandle, -1);
             if (!pointsAtCell(tr.doc.resolve(handle))) {
                 handle = null;
@@ -87,30 +87,22 @@ var ResizeState = /** @class */ (function () {
     };
     return ResizeState;
 }());
-function handleMouseMove(view, event, handleWidth, _rowMinHeight, lastRowResizable) {
+function handleMouseMove(view, event, handleWidth) {
     var pluginState = key.getState(view.state);
     if (!pluginState.dragging) {
-        var target = domCellAround(event.target), cell = -1;
+        var target = domCellAround(event.target), row = -1;
         if (target) {
             var rowDom = target.parentNode;
             var domRect = rowDom.getBoundingClientRect();
-            if (event.clientY - domRect.top <= handleWidth) {
-                cell = edgeCell(view, event, 'up');
+            if (Math.abs(event.clientY - domRect.top) <= handleWidth && rowDom.rowIndex > 0) {
+                row = edgeRow(view, event, rowDom.rowIndex - 1);
             }
-            else if (domRect.bottom - event.clientY <= handleWidth) {
-                cell = edgeCell(view, event, 'down');
+            else if (domRect.bottom - event.clientY > 0 && domRect.bottom - event.clientY <= handleWidth) {
+                row = edgeRow(view, event, rowDom.rowIndex);
             }
         }
-        if (cell !== pluginState.activeHandle) {
-            if (!lastRowResizable && 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);
+        if (row !== pluginState.activeHandle) {
+            updateHandle(view, row);
         }
     }
 }
@@ -120,7 +112,7 @@ function handleMouseLeave(view) {
         updateHandle(view, -1);
     }
 }
-function handleMouseDown(view, event, rowMinHeight) {
+function handleMouseDown(view, event) {
     var pluginState = key.getState(view.state);
     if (pluginState.activeHandle === -1 || pluginState.dragging) {
         return false;
@@ -148,7 +140,7 @@ function handleMouseDown(view, event, rowMinHeight) {
         var curPluginState = key.getState(view.state);
         if (curPluginState.dragging) {
             var tr = view.state.tr.setMeta(key, { setDragging: null });
-            updateRowHeight(view, tr, curPluginState.activeHandle, draggedHeight(curPluginState.dragging, ev, rowMinHeight));
+            updateRowHeight(view, tr, curPluginState.activeHandle);
             view.dispatch(tr);
         }
     }
@@ -157,54 +149,45 @@ function handleMouseDown(view, event, rowMinHeight) {
             return finish(ev);
         }
         var curPluginState = key.getState(view.state);
-        var dragged = draggedHeight(curPluginState.dragging, ev, rowMinHeight);
+        var dragged = draggedHeight(curPluginState.dragging, ev);
         var offset = ev.clientY - curPluginState.dragging.startY;
-        displayRowHeight(view, curPluginState.activeHandle, dragged, rowMinHeight, offset, tableHeight);
+        displayRowHeight(view, curPluginState.activeHandle, dragged, offset, tableHeight);
     }
     event.view.addEventListener('mouseup', finish);
     event.view.addEventListener('mousemove', move);
     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 edgeRow(view, event, rowIndex) {
     var found = view.posAtCoords({ left: event.clientX, top: event.clientY });
     if (!found) {
         return -1;
     }
-    var pos = found.pos;
-    var doc = view.state.doc;
-    var $pos = doc.resolve(pos);
-    var rowDepth = new Array($pos.depth + 1).fill(0).findIndex(function (_, i) { return $pos.node(i).type.spec.tableRole === 'row'; });
-    if (rowDepth === -1) {
-        return -1;
-    }
-    var tableDepth = rowDepth - 1;
-    var rowIndex = $pos.index(tableDepth);
-    rowIndex += side === 'up' ? -1 : 0;
-    if (rowIndex < 0) {
+    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 rowPos = $pos.posAtIndex(rowIndex, tableDepth);
-    return rowPos;
+    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, rowMinHeight) {
+function draggedHeight(dragging, event) {
     var offset = event.clientY - dragging.startY;
-    return Math.max(rowMinHeight, dragging.startHeight.rowHeight + offset);
+    return dragging.startHeight.rowHeight + offset;
 }
 function updateHandle(view, value) {
     view.dispatch(view.state.tr.setMeta(key, { setHandle: value }));
 }
-function updateRowHeight(view, tr, rowPos, height) {
+function updateRowHeight(view, tr, rowPos) {
     var doc = view.state.doc;
     var row = doc.nodeAt(rowPos);
-    tr.setNodeMarkup(rowPos, null, setNodeStyle(row.attrs, 'height', height + 'px'));
     var dom = view.nodeDOM(rowPos);
+    var win = (dom.ownerDocument && dom.ownerDocument.defaultView) || window;
+    dom.style.height = win.getComputedStyle(dom).height;
+    tr.setNodeMarkup(rowPos, null, setNodeStyle(row.attrs, 'height', dom.style.height));
     var table = dom && dom.closest('table');
     var tableHeight = table && table.style.height;
     if (tableHeight) {
@@ -213,29 +196,32 @@ function updateRowHeight(view, tr, rowPos, height) {
         tr.setNodeMarkup(tablePos, null, setNodeStyle($pos.parent.attrs, 'height', tableHeight));
     }
 }
-// tslint:disable-next-line:max-line-length
-function displayRowHeight(view, rowPos, height, rowMinHeight, offset, tableHeight) {
+function displayRowHeight(view, rowPos, height, offset, tableHeight) {
     var dom = view.nodeDOM(rowPos);
     if (dom) {
-        dom.style.height = Math.max(height, rowMinHeight) + 'px';
+        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');
         var newHeight = (parseFloat(tableHeight) + offset) + 'px';
         var current = table && table.style.height;
         if (current && current !== newHeight) {
             table.style.height = (parseFloat(tableHeight) + offset) + 'px';
+            table.style.height = win.getComputedStyle(table).height;
         }
     }
 }
 function handleDecorations(state, pos) {
     var decorations = [];
     if (typeof pos !== 'number') {
-        return;
+        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 widgetPos = start + cellPos + table.nodeAt(cellPos).nodeSize - 1;
+        var cell = table.nodeAt(cellPos);
+        var widgetPos = start + cellPos + (cell ? cell.nodeSize : 0) - 1;
         var dom = document.createElement('div');
         dom.className = 'row-resize-handle';
         decorations.push(Decoration.widget(widgetPos, dom));