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

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/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;

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

@@ -1,14 +1,14 @@
 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';
 class TableRowView {
     ignoreMutation(record) {
         return record.type === 'attributes' && record.attributeName === 'style' && record.target.nodeName === 'TR';
     }
 }
 export function rowResizing() {
-    const handleWidth = 5, rowMinHeight = 25, lastRowResizable = true;
+    const handleWidth = 5;
     let plugin = new Plugin({
         key,
         state: {
@@ -31,7 +31,7 @@ export function rowResizing() {
             handleDOMEvents: {
                 mousemove(view, event) {
                     if (!otherResizing(key, view.state)) {
-                        handleMouseMove(view, event, handleWidth, rowMinHeight, lastRowResizable);
+                        handleMouseMove(view, event, handleWidth);
                     }
                     return false;
                 },
@@ -40,7 +40,7 @@ export function rowResizing() {
                     return false;
                 },
                 mousedown(view, event) {
-                    return handleMouseDown(view, event, rowMinHeight);
+                    return handleMouseDown(view, event);
                 }
             },
             decorations(state) {
@@ -73,7 +73,7 @@ class ResizeState {
         if (action && action.setDragging !== undefined) {
             return new ResizeState(state.activeHandle, action.setDragging);
         }
-        if (state.activeHandle > -1) { //  && tr.docChanged
+        if (state.activeHandle > -1) {
             let handle = tr.mapping.map(state.activeHandle, -1);
             if (!pointsAtCell(tr.doc.resolve(handle))) {
                 handle = null;
@@ -83,30 +83,22 @@ class ResizeState {
         return state;
     }
 }
-function handleMouseMove(view, event, handleWidth, _rowMinHeight, lastRowResizable) {
+function handleMouseMove(view, event, handleWidth) {
     let pluginState = key.getState(view.state);
     if (!pluginState.dragging) {
-        let target = domCellAround(event.target), cell = -1;
+        let target = domCellAround(event.target), row = -1;
         if (target) {
             const rowDom = target.parentNode;
             let 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);
         }
     }
 }
@@ -116,7 +108,7 @@ function handleMouseLeave(view) {
         updateHandle(view, -1);
     }
 }
-function handleMouseDown(view, event, rowMinHeight) {
+function handleMouseDown(view, event) {
     let pluginState = key.getState(view.state);
     if (pluginState.activeHandle === -1 || pluginState.dragging) {
         return false;
@@ -144,7 +136,7 @@ function handleMouseDown(view, event, rowMinHeight) {
         let curPluginState = key.getState(view.state);
         if (curPluginState.dragging) {
             const 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);
         }
     }
@@ -153,54 +145,45 @@ function handleMouseDown(view, event, rowMinHeight) {
             return finish(ev);
         }
         let curPluginState = key.getState(view.state);
-        let dragged = draggedHeight(curPluginState.dragging, ev, rowMinHeight);
+        let dragged = draggedHeight(curPluginState.dragging, ev);
         let 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) {
     let found = view.posAtCoords({ left: event.clientX, top: event.clientY });
     if (!found) {
         return -1;
     }
-    let { pos } = found;
-    let doc = view.state.doc;
-    let $pos = doc.resolve(pos);
-    let rowDepth = new Array($pos.depth + 1).fill(0).findIndex((_, i) => $pos.node(i).type.spec.tableRole === 'row');
-    if (rowDepth === -1) {
-        return -1;
-    }
-    let tableDepth = rowDepth - 1;
-    let rowIndex = $pos.index(tableDepth);
-    rowIndex += side === 'up' ? -1 : 0;
-    if (rowIndex < 0) {
+    let $pos = view.state.doc.resolve(found.pos);
+    let parentTable = parentNode($pos, n => n.type.spec.tableRole === 'table');
+    if (parentTable === null) {
         return -1;
     }
-    let rowPos = $pos.posAtIndex(rowIndex, tableDepth);
-    return rowPos;
+    let tablePos = $pos.start(parentTable.depth);
+    const tableNode = parentTable.node;
+    const map = TableMap.get(tableNode);
+    const row = tablePos + map.map[(map.width * rowIndex)] - 1;
+    return row;
 }
-function draggedHeight(dragging, event, rowMinHeight) {
+function draggedHeight(dragging, event) {
     let 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) {
     const doc = view.state.doc;
     let row = doc.nodeAt(rowPos);
-    tr.setNodeMarkup(rowPos, null, setNodeStyle(row.attrs, 'height', height + 'px'));
     const dom = view.nodeDOM(rowPos);
+    const 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));
     const table = dom && dom.closest('table');
     const tableHeight = table && table.style.height;
     if (tableHeight) {
@@ -209,29 +192,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) {
     const dom = view.nodeDOM(rowPos);
     if (dom) {
-        dom.style.height = Math.max(height, rowMinHeight) + 'px';
+        dom.style.height = height + 'px';
+        const win = (dom.ownerDocument && dom.ownerDocument.defaultView) || window;
+        dom.style.height = win.getComputedStyle(dom).height;
         const table = dom.closest('table');
         const newHeight = (parseFloat(tableHeight) + offset) + 'px';
         const 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) {
     let decorations = [];
     if (typeof pos !== 'number') {
-        return;
+        return DecorationSet.empty;
     }
     let $row = state.doc.resolve(pos), table = $row.parent, map = TableMap.get(table), rowIndex = $row.index($row.depth), start = $row.start($row.depth);
     for (let col = 0; col < map.width; col++) {
         let index = col + rowIndex * map.width;
         let cellPos = map.map[index];
-        let widgetPos = start + cellPos + table.nodeAt(cellPos).nodeSize - 1;
+        const cell = table.nodeAt(cellPos);
+        let widgetPos = start + cellPos + (cell ? cell.nodeSize : 0) - 1;
         let dom = document.createElement('div');
         dom.className = 'row-resize-handle';
         decorations.push(Decoration.widget(widgetPos, dom));