@progress/kendo-angular-editor 3.0.0-dev.202112211443 → 3.0.0-dev.202201121058

package/dist/es2015/config/table-commands.js

@@ -2,11 +2,7 @@
 * Copyright © 2021 Progress Software Corporation. All rights reserved.
 * Licensed under commercial license. See LICENSE.md in the project root for more information
 *-------------------------------------------------------------------------------------------*/
-import { insertNode, Fragment, Selection } from '@progress/kendo-editor-common';
-import { createTable, isInTable, selectedRect, tableNodeTypes, rowIsHeader, setAttr, addColSpan, removeColSpan, isCellEmpty, splitCellWithType, cellsOverlapRectangle, findParentNodeClosestToPos } from './tables/table-utils';
-import { isTable, isTableBody, isTableHead, isTableFoot, isTableHeaderCell, isTableCell } from './utils';
-import { TableMap } from './tables/TableMap';
-import { CellSelection } from './tables/CellSelection';
+import { insertNode, createTable } from '@progress/kendo-editor-common';
 /**
  * @hidden
  */
@@ -16,355 +12,3 @@ export const insertTable = (attrs) => (state, dispatch) => {
         insertNode(newTable, true)(state, dispatch);
     }
 };
-const addTableGroupColumn = (tr, { left, right }, col, mainTable, requiredGroup, doc) => {
-    let refColumn = col > 0 ? -1 : 0;
-    // not sure if this should be deleted
-    // if (columnIsHeader(map, table, col + refColumn)) {
-    //     refColumn = col === 0 || col === map.width ? null : 0;
-    // }
-    let rect;
-    mainTable.node.descendants((tableChildNode, offset) => {
-        if (requiredGroup(tableChildNode)) {
-            let i = -1;
-            tableChildNode.firstChild.descendants((childNode, pos) => {
-                if (isTableCell(childNode) || isTableHeaderCell(childNode)) {
-                    i = i + 1;
-                    if (i === right || i === left) {
-                        const selection = new Selection(doc.resolve(pos + offset + mainTable.start), doc.resolve(pos + offset + mainTable.start));
-                        rect = selectedRect(selection);
-                    }
-                }
-            });
-        }
-    });
-    // Do nothing if thead, tfoot or tbody is missing
-    if (!rect) {
-        return tr;
-    }
-    for (let row = 0; row < rect.map.height; row++) {
-        const index = row * rect.map.width + col;
-        // If this position falls inside a col-spanning cell
-        if (col > 0 && col < rect.map.width && rect.map.map[index - 1] === rect.map.map[index]) {
-            const pos = rect.map.map[index];
-            const cell = rect.table.nodeAt(pos);
-            tr.setNodeMarkup(tr.mapping.map(rect.tableStart + pos), null, addColSpan(cell.attrs, col - rect.map.colCount(pos)));
-            // Skip ahead if rowspan > 1
-            row += cell.attrs.rowspan - 1;
-        }
-        else {
-            const type = rect.table.nodeAt(rect.map.map[index + refColumn]).type;
-            const pos = rect.map.positionAt(row, col, rect.table);
-            tr.insert(tr.mapping.map(rect.tableStart + pos), type.createAndFill());
-        }
-    }
-    return tr;
-};
-const ɵ0 = addTableGroupColumn;
-const removeTableGroupColumn = (tr, { right, left }, mainTable, requiredGroup, doc) => {
-    let rect;
-    mainTable.node.descendants((tableChildNode, offset) => {
-        if (requiredGroup(tableChildNode)) {
-            let i = -1;
-            tableChildNode.firstChild.descendants((childNode, pos) => {
-                if (isTableCell(childNode) || isTableHeaderCell(childNode)) {
-                    i = i + 1;
-                    if (i >= left && i < right) {
-                        const resolvedPos = doc.resolve(pos + offset + mainTable.start + childNode.nodeSize);
-                        const selection = new Selection(resolvedPos, resolvedPos);
-                        rect = selectedRect(selection);
-                    }
-                }
-            });
-        }
-    });
-    // Do nothing if thead, tfoot or tbody is missing
-    if (!rect) {
-        return;
-    }
-    for (let i = rect.right - 1;; i--) {
-        removeColumn(tr, rect, i);
-        if (i === rect.left) {
-            break;
-        }
-        rect.table = rect.tableStart ? tr.doc.nodeAt(rect.tableStart - 1) : tr.doc;
-        rect.map = TableMap.get(rect.table);
-    }
-    return;
-};
-const ɵ1 = removeTableGroupColumn;
-const removeColumn = (tr, { map, table, tableStart }, col) => {
-    for (let row = 0; row < map.height;) {
-        const index = row * map.width + col;
-        const pos = map.map[index];
-        const cell = table.nodeAt(pos);
-        // If this is part of a col-spanning cell
-        if ((col > 0 && map.map[index - 1] === pos) || (col < map.width - 1 && map.map[index + 1] === pos)) {
-            tr.setNodeMarkup(tr.mapping.map(tableStart + pos), null, removeColSpan(cell.attrs, col - map.colCount(pos)));
-        }
-        else {
-            const start = tr.mapping.map(tableStart + pos);
-            tr.delete(start, start + cell.nodeSize);
-        }
-        row += cell.attrs.rowspan;
-    }
-};
-const ɵ2 = removeColumn;
-/**
- * @hidden
- */
-// Command to add a column before the column with the selection.
-export const addColumnBefore = (state, dispatch) => {
-    if (!isInTable(state)) {
-        return false;
-    }
-    if (dispatch) {
-        const rect = selectedRect(state.selection);
-        const mainTable = findParentNodeClosestToPos(state.selection.$anchor, isTable);
-        const tHeadTr = addTableGroupColumn(state.tr, rect, rect.left, mainTable, isTableHead, state.doc);
-        const tBodyTr = addTableGroupColumn(tHeadTr, rect, rect.left, mainTable, isTableBody, state.doc);
-        const tFootTr = addTableGroupColumn(tBodyTr, rect, rect.left, mainTable, isTableFoot, state.doc);
-        dispatch(tFootTr);
-    }
-    return true;
-};
-/**
- * @hidden
- */
-// Command to add a column after the column with the selection.
-export const addColumnAfter = (state, dispatch) => {
-    if (!isInTable(state)) {
-        return false;
-    }
-    if (dispatch) {
-        const rect = selectedRect(state.selection);
-        const mainTable = findParentNodeClosestToPos(state.selection.$anchor, isTable);
-        const theadTr = addTableGroupColumn(state.tr, rect, rect.right, mainTable, isTableHead, state.doc);
-        const tBodyTr = addTableGroupColumn(theadTr, rect, rect.right, mainTable, isTableBody, state.doc);
-        const tFootTr = addTableGroupColumn(tBodyTr, rect, rect.right, mainTable, isTableFoot, state.doc);
-        dispatch(tFootTr);
-    }
-    return true;
-};
-const addRow = (tr, { map, tableStart, table }, row) => {
-    let rowPos = tableStart;
-    for (let i = 0; i < row; i++) {
-        rowPos += table.child(i).nodeSize;
-    }
-    const cells = [];
-    let refRow = row > 0 ? -1 : 0;
-    if (rowIsHeader(map, table, row + refRow)) {
-        refRow = row === 0 || row === map.height ? null : 0;
-    }
-    for (let col = 0, index = map.width * row; col < map.width; col++, index++) {
-        // Covered by a rowspan cell
-        if (row > 0 && row < map.height && map.map[index] === map.map[index - map.width]) {
-            const pos = map.map[index];
-            const attrs = table.nodeAt(pos).attrs;
-            tr.setNodeMarkup(tableStart + pos, null, setAttr(attrs, 'rowspan', attrs.rowspan + 1));
-            col += attrs.colspan - 1;
-        }
-        else {
-            const type = refRow == null ? tableNodeTypes(table.type.schema).cell : table.nodeAt(map.map[index + refRow * map.width]).type;
-            cells.push(type.createAndFill());
-        }
-    }
-    tr.insert(rowPos, tableNodeTypes(table.type.schema).row.create(null, cells));
-    return tr;
-};
-const ɵ3 = addRow;
-/**
- * @hidden
- */
-// Add a table row before the selection.
-export const addRowBefore = (state, dispatch) => {
-    if (!isInTable(state)) {
-        return false;
-    }
-    if (dispatch) {
-        const rect = selectedRect(state.selection);
-        dispatch(addRow(state.tr, rect, rect.top));
-    }
-    return true;
-};
-/**
- * @hidden
- */
-// Add a table row after the selection.
-export const addRowAfter = (state, dispatch) => {
-    if (!isInTable(state)) {
-        return false;
-    }
-    if (dispatch) {
-        const rect = selectedRect(state.selection);
-        dispatch(addRow(state.tr, rect, rect.bottom));
-    }
-    return true;
-};
-/**
- * @hidden
- */
-// Command function that removes the selected columns from a table.
-export const deleteColumn = (state, dispatch) => {
-    if (!isInTable(state)) {
-        return false;
-    }
-    if (dispatch) {
-        const rect = selectedRect(state.selection);
-        // if only one column left - delete the whole table
-        if (rect.left === 0 && rect.right === rect.map.width) {
-            return deleteTable(state, dispatch);
-        }
-        const mainTable = findParentNodeClosestToPos(state.selection.$anchor, isTable);
-        const tr = state.tr;
-        removeTableGroupColumn(tr, rect, mainTable, isTableFoot, tr.doc);
-        removeTableGroupColumn(tr, rect, mainTable, isTableBody, tr.doc);
-        removeTableGroupColumn(tr, rect, mainTable, isTableHead, tr.doc);
-        dispatch(tr);
-    }
-    return true;
-};
-const removeRow = (tr, { map, table, tableStart }, row) => {
-    let rowPos = 0;
-    for (let i = 0; i < row; i++) {
-        rowPos += table.child(i).nodeSize;
-    }
-    const nextRow = rowPos + table.child(row).nodeSize;
-    const mapFrom = tr.mapping.maps.length;
-    tr.delete(rowPos + tableStart, nextRow + tableStart);
-    for (let col = 0, index = row * map.width; col < map.width; col++, index++) {
-        const pos = map.map[index];
-        if (row > 0 && pos === map.map[index - map.width]) {
-            // If this cell starts in the row above, simply reduce its rowspan
-            const attrs = table.nodeAt(pos).attrs;
-            tr.setNodeMarkup(tr.mapping.slice(mapFrom).map(pos + tableStart), null, setAttr(attrs, 'rowspan', attrs.rowspan - 1));
-            col += attrs.colspan - 1;
-        }
-        else if (row < map.width && pos === map.map[index + map.width]) {
-            // Else, if it continues in the row below, it has to be moved down
-            const cell = table.nodeAt(pos);
-            const copy = cell.type.create(setAttr(cell.attrs, 'rowspan', cell.attrs.rowspan - 1), cell.content);
-            const newPos = map.positionAt(row + 1, col, table);
-            tr.insert(tr.mapping.slice(mapFrom).map(tableStart + newPos), copy);
-            col += cell.attrs.colspan - 1;
-        }
-    }
-};
-const ɵ4 = removeRow;
-/**
- * @hidden
- */
-// Remove the selected rows from a table.
-export const deleteRow = (state, dispatch) => {
-    if (!isInTable(state)) {
-        return false;
-    }
-    if (dispatch) {
-        const rect = selectedRect(state.selection);
-        const tr = state.tr;
-        if (rect.top === 0 && rect.bottom === rect.map.height) {
-            const mainTable = findParentNodeClosestToPos(state.selection.$anchor, isTable);
-            if (mainTable.node.childCount === 1) {
-                deleteTable(state, dispatch);
-            }
-            else {
-                deleteTableElement(n => n.type.name === rect.table.type.name)(state, dispatch);
-            }
-            return true;
-        }
-        for (let i = rect.bottom - 1;; i--) {
-            removeRow(tr, rect, i);
-            if (i === rect.top) {
-                break;
-            }
-            rect.table = rect.tableStart ? tr.doc.nodeAt(rect.tableStart - 1) : tr.doc;
-            rect.map = TableMap.get(rect.table);
-        }
-        dispatch(tr);
-    }
-    return true;
-};
-/**
- * @hidden
- */
-// Merge the selected cells into a single cell. Only available when
-// the selected cells' outline forms a rectangle.
-export const mergeCells = (state, dispatch) => {
-    const sel = state.selection;
-    if (!(sel instanceof CellSelection) || sel.$anchorCell.pos === sel.$headCell.pos) {
-        return false;
-    }
-    const rect = selectedRect(state.selection);
-    const { map } = rect;
-    if (cellsOverlapRectangle(map, rect)) {
-        return false;
-    }
-    if (dispatch) {
-        const tr = state.tr;
-        const seen = {};
-        let content = Fragment.empty;
-        let mergedPos;
-        let mergedCell;
-        for (let row = rect.top; row < rect.bottom; row++) {
-            for (let col = rect.left; col < rect.right; col++) {
-                const cellPos = map.map[row * map.width + col], cell = rect.table.nodeAt(cellPos);
-                if (seen[cellPos]) {
-                    continue;
-                }
-                seen[cellPos] = true;
-                if (mergedPos === null) {
-                    mergedPos = cellPos;
-                    mergedCell = cell;
-                }
-                else {
-                    if (!isCellEmpty(cell)) {
-                        content = content.append(cell.content);
-                    }
-                    const mapped = tr.mapping.map(cellPos + rect.tableStart);
-                    tr.delete(mapped, mapped + cell.nodeSize);
-                }
-            }
-        }
-        tr.setNodeMarkup(mergedPos + rect.tableStart, null, setAttr(addColSpan(mergedCell.attrs, mergedCell.attrs.colspan, rect.right - rect.left - mergedCell.attrs.colspan), 'rowspan', rect.bottom - rect.top));
-        if (content.size) {
-            const end = mergedPos + 1 + mergedCell.content.size;
-            const start = isCellEmpty(mergedCell) ? mergedPos + 1 : end;
-            tr.replaceWith(start + rect.tableStart, end + rect.tableStart, content);
-        }
-        tr.setSelection(new CellSelection(tr.doc.resolve(mergedPos + rect.tableStart)));
-        dispatch(tr);
-    }
-    return true;
-};
-/**
- * @hidden
- */
-// Split a selected cell, whose rowpan or colspan is greater than one,
-// into smaller cells. Use the first cell type for the new cells.
-export const splitCell = (state, dispatch) => {
-    const nodeTypes = tableNodeTypes(state.schema);
-    return splitCellWithType(({ node }) => {
-        return nodeTypes[node.type.spec.tableRole];
-    })(state, dispatch);
-};
-const deleteTableElement = (selector) => (state, dispatch) => {
-    const $pos = state.selection.$anchor;
-    for (let d = $pos.depth; d > 0; d--) {
-        const node = $pos.node(d);
-        if (selector(node)) {
-            if (dispatch) {
-                const tr = state.tr;
-                tr.delete($pos.before(d), $pos.after(d)).scrollIntoView();
-                dispatch(tr);
-            }
-            return true;
-        }
-    }
-    return false;
-};
-const ɵ5 = deleteTableElement;
-/**
- * @hidden
- */
-// Deletes the table around the selection, if any.
-export const deleteTable = deleteTableElement(isTable);
-export { ɵ0, ɵ1, ɵ2, ɵ3, ɵ4, ɵ5 };

package/dist/es2015/editor.component.js

@@ -11,7 +11,7 @@ import { map, filter, take } from 'rxjs/operators';
 import { ToolBarComponent } from '@progress/kendo-angular-toolbar';
 import { DialogService } from '@progress/kendo-angular-dialog';
 import { hasObservers, isDocumentAvailable, KendoInput } from '@progress/kendo-angular-common';
-import { buildKeymap, buildListKeymap, getHtml, pasteCleanup, sanitize, removeComments, sanitizeClassAttr, sanitizeStyleAttr, removeAttribute, placeholder, EditorView, EditorState, baseKeymap, keymap, history, parseContent, Plugin, PluginKey, TextSelection, Schema, AllSelection, gapCursor, getSelectionText, imageResizing } from '@progress/kendo-editor-common';
+import { buildKeymap, buildListKeymap, getHtml, pasteCleanup, sanitize, removeComments, sanitizeClassAttr, sanitizeStyleAttr, removeAttribute, placeholder, EditorView, EditorState, baseKeymap, keymap, history, parseContent, Plugin, PluginKey, TextSelection, Schema, AllSelection, gapCursor, getSelectionText, imageResizing, tableEditing } from '@progress/kendo-editor-common';
 import { validatePackage } from '@progress/kendo-licensing';
 import { packageMetadata } from './package-metadata';
 import { schema } from './config/schema';
@@ -122,6 +122,9 @@ let EditorComponent = EditorComponent_1 = class EditorComponent {
         this.contentAreaLoaded = new Subject();
         this.dispatchTransaction = (tr) => {
             const docChanged = tr.docChanged;
+            if (this.disabled || (this.readonly && docChanged)) {
+                return;
+            }
             if (docChanged) {
                 const doc = tr.doc;
                 const html = getHtml({ doc });
@@ -629,16 +632,13 @@ let EditorComponent = EditorComponent_1 = class EditorComponent {
                     }
                 })
             }),
-            new Plugin({
-                key: new PluginKey('editor-filter-disabled-state'),
-                filterTransaction: () => !this.disabled || this.inForm
-            }),
             history(),
             keymap(buildListKeymap(currentSchema)),
             keymap(buildKeymap(currentSchema, { applyToWord: this.applyToWord })),
             keymap(baseKeymap),
             gapCursor(),
-            imageResizing()
+            imageResizing(),
+            tableEditing()
         ];
         if (this.placeholder) {
             defaultPlugins.push(placeholder(this.placeholder));