@contrail/document-table 1.0.1 → 1.0.2

package/lib/table-constants.d.ts

@@ -1,13 +1,5 @@
 export declare const TABLE_ROW_MIN_HEIGHT = 28;
 export declare const TABLE_COLUMN_MIN_WIDTH = 28;
-export declare const TABLE_DRAG_HANDLE_WIDTH = 40;
-export declare const TABLE_DRAG_HANDLE_HEIGHT = 20;
-export declare const TABLE_DRAG_HANDLE_PADDING = 40;
-export declare const TABLE_DRAG_HANDLE_RADIUS = 20;
-export declare const TABLE_DRAG_HANDLE_ARROW_X = 3;
-export declare const TABLE_DRAG_HANDLE_ARROW_Y = 4;
-export declare const TABLE_DRAG_HANDLE_ARROW_LENGTH = 7;
-export declare const TABLE_DRAG_HANDLE_ARROW_LINE_WIDTH = 2;
 export declare const TABLE_CELL_WIDTH = 200;
 export declare const TABLE_CELL_HEIGHT = 120;
 export declare const TABLE_TEXT_PADDING = 5;

package/lib/table-constants.js

@@ -1,16 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TEXT_ALIGN = exports.TEXT_VALIGN = exports.DEFAULT_TEXT_FONT_SIZE = exports.DEFAULT_TEXT_FONT_FAMILY = exports.TRANSPARENT_COLOR = exports.TABLE_TEXT_PADDING = exports.TABLE_CELL_HEIGHT = exports.TABLE_CELL_WIDTH = exports.TABLE_DRAG_HANDLE_ARROW_LINE_WIDTH = exports.TABLE_DRAG_HANDLE_ARROW_LENGTH = exports.TABLE_DRAG_HANDLE_ARROW_Y = exports.TABLE_DRAG_HANDLE_ARROW_X = exports.TABLE_DRAG_HANDLE_RADIUS = exports.TABLE_DRAG_HANDLE_PADDING = exports.TABLE_DRAG_HANDLE_HEIGHT = exports.TABLE_DRAG_HANDLE_WIDTH = exports.TABLE_COLUMN_MIN_WIDTH = exports.TABLE_ROW_MIN_HEIGHT = void 0;
+exports.TEXT_ALIGN = exports.TEXT_VALIGN = exports.DEFAULT_TEXT_FONT_SIZE = exports.DEFAULT_TEXT_FONT_FAMILY = exports.TRANSPARENT_COLOR = exports.TABLE_TEXT_PADDING = exports.TABLE_CELL_HEIGHT = exports.TABLE_CELL_WIDTH = exports.TABLE_COLUMN_MIN_WIDTH = exports.TABLE_ROW_MIN_HEIGHT = void 0;
 exports.TABLE_ROW_MIN_HEIGHT = 28;
 exports.TABLE_COLUMN_MIN_WIDTH = 28;
-exports.TABLE_DRAG_HANDLE_WIDTH = 40;
-exports.TABLE_DRAG_HANDLE_HEIGHT = 20;
-exports.TABLE_DRAG_HANDLE_PADDING = 40;
-exports.TABLE_DRAG_HANDLE_RADIUS = 20;
-exports.TABLE_DRAG_HANDLE_ARROW_X = 3;
-exports.TABLE_DRAG_HANDLE_ARROW_Y = 4;
-exports.TABLE_DRAG_HANDLE_ARROW_LENGTH = 7;
-exports.TABLE_DRAG_HANDLE_ARROW_LINE_WIDTH = 2;
 exports.TABLE_CELL_WIDTH = 200;
 exports.TABLE_CELL_HEIGHT = 120;
 exports.TABLE_TEXT_PADDING = 5;

package/lib/table-merge.service.js

@@ -33,7 +33,7 @@ class TableMergeService {
                 const rowId = tableElement.rowIds[i];
                 for (let j = columnIndex; j < columnIndex + ((_b = cell.colspan) !== null && _b !== void 0 ? _b : 1); j++) {
                     const columnId = tableElement.columnIds[j];
-                    const mergedCell = childElements.find(e => e.type === 'cell' && e.columnId === columnId && e.rowId === rowId);
+                    const mergedCell = childElements.find((e) => e.type === 'cell' && e.columnId === columnId && e.rowId === rowId);
                     if (mergedCell) {
                         mergedCells.push(mergedCell);
                     }
@@ -45,7 +45,7 @@ class TableMergeService {
     static isValidRangeToMerge(tableElement, childElements, tableRange) {
         if (tableRange.singular())
             return false;
-        const mergedRanges = TableMergeService.getMergedRanges(tableElement, childElements).filter(range => range.intersects(tableRange) && !range.within(tableRange));
+        const mergedRanges = TableMergeService.getMergedRanges(tableElement, childElements).filter((range) => range.intersects(tableRange) && !range.within(tableRange));
         return mergedRanges.length === 0;
     }
     static merge(tableElement, childElements, tableRange) {
@@ -59,7 +59,7 @@ class TableMergeService {
         tableRange.each((rowIndex, columnIndex) => {
             const rowId = tableElement.rowIds[rowIndex];
             const columnId = tableElement.columnIds[columnIndex];
-            const element = childElements.find(e => e.type === 'cell' && e.columnId === columnId && e.rowId === rowId);
+            const element = childElements.find((e) => e.type === 'cell' && e.columnId === columnId && e.rowId === rowId);
             if (element) {
                 const elementUndo = util_1.ObjectUtil.cloneDeep(element);
                 element.colspan = 1;
@@ -67,9 +67,9 @@ class TableMergeService {
                 if (tableRange.isStart(rowIndex, columnIndex)) {
                     firstCell = element;
                     let width = 0;
-                    tableRange.eachColumn(columnIndex => {
+                    tableRange.eachColumn((columnIndex) => {
                         const columnId = tableElement.columnIds[columnIndex];
-                        const column = childElements.find(e => e.type === 'column' && e.id === columnId);
+                        const column = childElements.find((e) => e.type === 'column' && e.id === columnId);
                         width = width + column.size.width;
                     });
                     if (colspan > 1) {
@@ -96,7 +96,7 @@ class TableMergeService {
     }
     static unmerge(tableElement, childElements, tableRange) {
         const mergedRanges = TableMergeService.getMergedRanges(tableElement, childElements);
-        if (!mergedRanges.find(range => range.equals(tableRange)))
+        if (!mergedRanges.find((range) => range.equals(tableRange)))
             throw new Error(table_service_1.TABLE_ERROR.INVALID_RANGE_TO_UNMERGE);
         const tableUndo = Object.assign(Object.assign({}, (0, table_service_1.tableData)(tableElement)), { size: Object.assign({}, tableElement.size) });
         const elementsToUpdate = [];
@@ -104,9 +104,9 @@ class TableMergeService {
         tableRange.each((rowIndex, columnIndex) => {
             const rowId = tableElement.rowIds[rowIndex];
             const columnId = tableElement.columnIds[columnIndex];
-            const element = childElements.find(e => e.type === 'cell' && e.columnId === columnId && e.rowId === rowId);
-            const column = childElements.find(e => e.type === 'column' && e.id === columnId);
-            const row = childElements.find(e => e.type === 'row' && e.id === rowId);
+            const element = childElements.find((e) => e.type === 'cell' && e.columnId === columnId && e.rowId === rowId);
+            const column = childElements.find((e) => e.type === 'column' && e.id === columnId);
+            const row = childElements.find((e) => e.type === 'row' && e.id === rowId);
             if (element && column && row) {
                 const elementUndo = util_1.ObjectUtil.cloneDeep(element);
                 element.colspan = 1;

package/lib/table-paste.service.js

@@ -13,23 +13,23 @@ class TablePasteService {
     }
     static pasteRowsAndColumns(tableElement, childElements, elementsToPaste, targetRow, targetColumn) {
         var _a, _b, _c;
-        const tableToPaste = elementsToPaste.find(e => e.type === 'table');
-        const rowsToPaste = elementsToPaste.filter(e => e.type === 'row');
-        const columnsToPaste = elementsToPaste.filter(e => e.type === 'column');
-        const cellsToPaste = elementsToPaste.filter(e => e.type === 'cell');
+        const tableToPaste = elementsToPaste.find((e) => e.type === 'table');
+        const rowsToPaste = elementsToPaste.filter((e) => e.type === 'row');
+        const columnsToPaste = elementsToPaste.filter((e) => e.type === 'column');
+        const cellsToPaste = elementsToPaste.filter((e) => e.type === 'cell');
         const startRow = targetRow;
         const endRow = startRow + tableToPaste.rowIds.length - 1;
         const startColumn = targetColumn;
         const endColumn = startColumn + tableToPaste.columnIds.length - 1;
-        const existingCells = childElements.filter(e => e.type === 'cell');
+        const existingCells = childElements.filter((e) => e.type === 'cell');
         const elementsToCreate = [];
         const elementsToUpdate = [];
         let existingMergedRanges = table_merge_service_1.TableMergeService.getMergedRanges(tableElement, childElements);
         for (let rowIndex = startRow; rowIndex <= endRow; rowIndex++) {
             const rowToPaste = rowsToPaste[rowIndex - targetRow];
             let existingRowId = tableElement.rowIds[rowIndex];
-            let existingRow = childElements.find(e => e.type === 'row' && e.id === existingRowId) ||
-                elementsToCreate.find(e => e.type === 'row' && e.id === existingRowId);
+            let existingRow = childElements.find((e) => e.type === 'row' && e.id === existingRowId) ||
+                elementsToCreate.find((e) => e.type === 'row' && e.id === existingRowId);
             this.log('current row', rowIndex, existingRowId, existingRow);
             if (!existingRowId) {
                 const [newRow, ...newRowCells] = (_a = table_service_1.TableService.addRow(tableElement, [...existingCells, ...elementsToCreate], rowIndex, rowToPaste.size.height)) === null || _a === void 0 ? void 0 : _a.elementsToCreate;
@@ -46,8 +46,8 @@ class TablePasteService {
             for (let columnIndex = startColumn; columnIndex <= endColumn; columnIndex++) {
                 const columnToPaste = columnsToPaste[columnIndex - targetColumn];
                 let existingColumnId = tableElement.columnIds[columnIndex];
-                let existingColumn = childElements.find(e => e.type === 'column' && e.id === existingColumnId) ||
-                    elementsToCreate.find(e => e.type === 'column' && e.id === existingColumnId);
+                let existingColumn = childElements.find((e) => e.type === 'column' && e.id === existingColumnId) ||
+                    elementsToCreate.find((e) => e.type === 'column' && e.id === existingColumnId);
                 this.log('current column', columnIndex, existingColumnId, existingColumn);
                 if (!tableElement.columnIds[columnIndex]) {
                     const [newColumn, ...newColumnCells] = (_b = table_service_1.TableService.addColumn(tableElement, [...existingCells, ...elementsToCreate], columnIndex, columnToPaste.size.width)) === null || _b === void 0 ? void 0 : _b.elementsToCreate;
@@ -58,22 +58,21 @@ class TablePasteService {
                 }
                 if (columnToPaste.size.width > existingColumn.size.width) {
                     const updatedColumn = table_service_1.TableService.resizeColumn(tableElement, childElements, existingColumnId, columnToPaste.size.width).elementsToUpdate[1];
-                    const updatedRowAndCells = table_service_1.TableService.autoFitRows(tableElement, childElements, existingColumnId)
-                        .elementsToUpdate;
+                    const updatedRowAndCells = table_service_1.TableService.autoFitRows(tableElement, childElements, existingColumnId).elementsToUpdate;
                     const uniqueUpdatedRowAndCells = (0, documents_1.uniqueElementsToUpdate)(updatedRowAndCells, elementsToUpdate);
                     elementsToUpdate.push(updatedColumn);
                     elementsToUpdate.push(...uniqueUpdatedRowAndCells);
                     this.log('resized column', columnIndex, existingColumnId, existingColumn);
                     this.log('resized column cells and row', uniqueUpdatedRowAndCells, uniqueUpdatedRowAndCells);
                 }
-                const cellToPaste = cellsToPaste.find(e => e.rowId === rowToPaste.id && e.columnId === columnToPaste.id);
+                const cellToPaste = cellsToPaste.find((e) => e.rowId === rowToPaste.id && e.columnId === columnToPaste.id);
                 if (!cellToPaste)
                     continue;
                 const cellRange = new table_range_1.TableRange(rowIndex, rowIndex, columnIndex, columnIndex);
-                const mergedRange = existingMergedRanges.find(range => range.intersects(cellRange));
+                const mergedRange = existingMergedRanges.find((range) => range.intersects(cellRange));
                 const mergedRangeOther = mergedRange && !cellRange.equals(mergedRange.start());
                 if (mergedRange) {
-                    existingMergedRanges = existingMergedRanges.filter(r => !r.equals(mergedRange));
+                    existingMergedRanges = existingMergedRanges.filter((r) => !r.equals(mergedRange));
                 }
                 if (mergedRangeOther) {
                     const [updatedTable, ...unmergedCellAndRow] = (_c = table_merge_service_1.TableMergeService.unmerge(tableElement, childElements, mergedRange)) === null || _c === void 0 ? void 0 : _c.elementsToUpdate;
@@ -86,15 +85,15 @@ class TablePasteService {
         return { elementsToCreate, elementsToUpdate };
     }
     static pasteTableCells(tableElement, childElements, elementsToPaste, targetRow, targetColumn) {
-        const tableToPaste = elementsToPaste.find(e => e.type === 'table');
-        const rowsToPaste = elementsToPaste.filter(e => e.type === 'row');
-        const columnsToPaste = elementsToPaste.filter(e => e.type === 'column');
-        const cellsToPaste = elementsToPaste.filter(e => e.type === 'cell');
+        const tableToPaste = elementsToPaste.find((e) => e.type === 'table');
+        const rowsToPaste = elementsToPaste.filter((e) => e.type === 'row');
+        const columnsToPaste = elementsToPaste.filter((e) => e.type === 'column');
+        const cellsToPaste = elementsToPaste.filter((e) => e.type === 'cell');
         const startRow = targetRow;
         const endRow = startRow + tableToPaste.rowIds.length - 1;
         const startColumn = targetColumn;
         const endColumn = startColumn + tableToPaste.columnIds.length - 1;
-        const existingCells = childElements.filter(e => e.type === 'cell');
+        const existingCells = childElements.filter((e) => e.type === 'cell');
         const tableUndo = util_1.ObjectUtil.cloneDeep(tableElement);
         const { elementsToUpdate, elementsToCreate } = TablePasteService.pasteRowsAndColumns(tableElement, childElements, elementsToPaste, targetRow, targetColumn);
         for (let rowIndex = startRow; rowIndex <= endRow; rowIndex++) {
@@ -103,13 +102,13 @@ class TablePasteService {
             for (let columnIndex = startColumn; columnIndex <= endColumn; columnIndex++) {
                 const columnToPaste = columnsToPaste[columnIndex - targetColumn];
                 const existingColumnId = tableElement.columnIds[columnIndex];
-                const existingColumn = childElements.find(e => e.type === 'column' && e.id === existingColumnId) ||
-                    elementsToCreate.find(e => e.type === 'column' && e.id === existingColumnId);
-                const cellToPaste = cellsToPaste.find(e => e.rowId === rowToPaste.id && e.columnId === columnToPaste.id);
+                const existingColumn = childElements.find((e) => e.type === 'column' && e.id === existingColumnId) ||
+                    elementsToCreate.find((e) => e.type === 'column' && e.id === existingColumnId);
+                const cellToPaste = cellsToPaste.find((e) => e.rowId === rowToPaste.id && e.columnId === columnToPaste.id);
                 if (!cellToPaste)
                     continue;
-                const createdCell = elementsToCreate.find(e => e.type === 'cell' && e.rowId === existingRowId && e.columnId === existingColumnId);
-                const existingCell = existingCells.find(e => e.rowId === existingRowId && e.columnId === existingColumnId);
+                const createdCell = elementsToCreate.find((e) => e.type === 'cell' && e.rowId === existingRowId && e.columnId === existingColumnId);
+                const existingCell = existingCells.find((e) => e.rowId === existingRowId && e.columnId === existingColumnId);
                 const cell = createdCell !== null && createdCell !== void 0 ? createdCell : existingCell;
                 const cellUndo = util_1.ObjectUtil.cloneDeep(cell);
                 this.log('cell to paste', cellToPaste);

package/lib/table.service.js

@@ -120,11 +120,11 @@ class TableService {
     static addColumn(tableElement, childElements, index, optionalWidth) {
         const prevColumnId = tableElement.columnIds[Math.max(0, index - 1)];
         const prevColumnCells = TableService.getCellsAtColumn(prevColumnId, tableElement, childElements);
-        const width = optionalWidth != null ? optionalWidth : childElements.find(e => e.id === prevColumnId).size.width;
-        const mergedRanges = table_merge_service_1.TableMergeService.getMergedRanges(tableElement, childElements).filter(range => range.startColumn < index && index <= range.endColumn);
+        const width = optionalWidth != null ? optionalWidth : childElements.find((e) => e.id === prevColumnId).size.width;
+        const mergedRanges = table_merge_service_1.TableMergeService.getMergedRanges(tableElement, childElements).filter((range) => range.startColumn < index && index <= range.endColumn);
         const cellsToUpdate = [];
         if (mergedRanges.length > 0) {
-            const columnIndexes = [...new Set(mergedRanges.map(range => range.startColumn))];
+            const columnIndexes = [...new Set(mergedRanges.map((range) => range.startColumn))];
             for (const columnIndex of columnIndexes) {
                 const targetColumnId = tableElement.columnIds[columnIndex];
                 const targetCells = this.getCellsAtColumn(targetColumnId, tableElement, childElements);
@@ -208,19 +208,19 @@ class TableService {
     }
     static getCellsAtColumn(columnId, tableElement, childElements) {
         return childElements
-            .filter(element => element.type === 'cell' && element.columnId === columnId)
+            .filter((element) => element.type === 'cell' && element.columnId === columnId)
             .sort((a, b) => tableElement.rowIds.indexOf(a.rowId) - tableElement.rowIds.indexOf(b.rowId));
     }
     static getCellsAtRow(rowId, tableElement, childElements) {
         return childElements
-            .filter(element => element.type === 'cell' && element.rowId === rowId)
+            .filter((element) => element.type === 'cell' && element.rowId === rowId)
             .sort((a, b) => tableElement.columnIds.indexOf(a.columnId) - tableElement.columnIds.indexOf(b.columnId));
     }
     static addRow(tableElement, childElements, index, optionalHeight) {
-        const mergedRanges = table_merge_service_1.TableMergeService.getMergedRanges(tableElement, childElements).filter(range => range.startRow < index && index <= range.endRow);
+        const mergedRanges = table_merge_service_1.TableMergeService.getMergedRanges(tableElement, childElements).filter((range) => range.startRow < index && index <= range.endRow);
         const cellsToUpdate = [];
         if (mergedRanges.length > 0) {
-            const rowIndexes = [...new Set(mergedRanges.map(range => range.startRow))];
+            const rowIndexes = [...new Set(mergedRanges.map((range) => range.startRow))];
             for (const rowIndex of rowIndexes) {
                 const targetRowId = tableElement.rowIds[rowIndex];
                 const targetCells = this.getCellsAtRow(targetRowId, tableElement, childElements);
@@ -248,7 +248,7 @@ class TableService {
         }
         const prevRowId = tableElement.rowIds[Math.max(0, index - 1)];
         const prevRowCells = TableService.getCellsAtRow(prevRowId, tableElement, childElements);
-        const height = optionalHeight != null ? optionalHeight : childElements.find(e => e.id === prevRowId).size.height;
+        const height = optionalHeight != null ? optionalHeight : childElements.find((e) => e.id === prevRowId).size.height;
         const rowId = (0, nanoid_1.nanoid)(16);
         const row = {
             id: rowId,
@@ -306,7 +306,7 @@ class TableService {
         const elementsMap = new Map();
         for (const range of ranges) {
             range.each((rowIndex, columnIndex) => {
-                const cell = childElements.find(e => e.type === 'cell' &&
+                const cell = childElements.find((e) => e.type === 'cell' &&
                     e.rowId === tableElement.rowIds[rowIndex] &&
                     e.columnId === tableElement.columnIds[columnIndex]);
                 if (cell && !elementsMap.get(cell.id)) {
@@ -325,13 +325,13 @@ class TableService {
         if (columnIdsToDelete.length === tableElement.columnIds.length) {
             return this.deleteTable(tableElement, childElements);
         }
-        const mergedRanges = table_merge_service_1.TableMergeService.getMergedRanges(tableElement, childElements).filter(range => columnIndexes.filter(columnIndex => range.intersectsCol(columnIndex, columnIndex)).length > 0);
-        const columnsToDelete = columnIdsToDelete.map(columnId => childElements.find(e => e.type === 'column' && e.id === columnId));
-        const cellsToDelete = childElements.filter(e => e.type === 'cell' && columnIdsToDelete.indexOf(e.columnId) !== -1);
+        const mergedRanges = table_merge_service_1.TableMergeService.getMergedRanges(tableElement, childElements).filter((range) => columnIndexes.filter((columnIndex) => range.intersectsCol(columnIndex, columnIndex)).length > 0);
+        const columnsToDelete = columnIdsToDelete.map((columnId) => childElements.find((e) => e.type === 'column' && e.id === columnId));
+        const cellsToDelete = childElements.filter((e) => e.type === 'cell' && columnIdsToDelete.indexOf(e.columnId) !== -1);
         let deleteAllowed = true;
         if (mergedRanges.length > 0) {
             for (const cell of this.getCellsAtRanges(tableElement, childElements, mergedRanges)) {
-                if (!cellsToDelete.find(e => e.id === cell.id)) {
+                if (!cellsToDelete.find((e) => e.id === cell.id)) {
                     deleteAllowed = false;
                     break;
                 }
@@ -347,7 +347,7 @@ class TableService {
             size: Object.assign({}, tableElement.size),
             columnIds: [...tableElement.columnIds],
         };
-        tableElement.columnIds = tableElement.columnIds.filter(id => columnIdsToDelete.indexOf(id) === -1);
+        tableElement.columnIds = tableElement.columnIds.filter((id) => columnIdsToDelete.indexOf(id) === -1);
         tableElement.size.width =
             tableElement.size.width - columnsToDelete.reduce((totalWidth, element) => totalWidth + element.size.width, 0);
         return {
@@ -371,13 +371,13 @@ class TableService {
         if (rowIdsToDelete.length === tableElement.rowIds.length) {
             return this.deleteTable(tableElement, childElements);
         }
-        const mergedRanges = table_merge_service_1.TableMergeService.getMergedRanges(tableElement, childElements).filter(range => rowIndexes.filter(rowIndex => range.intersectsRow(rowIndex, rowIndex)).length > 0);
-        const rowsToDelete = rowIdsToDelete.map(rowId => childElements.find(e => e.type === 'row' && e.id === rowId));
-        const cellsToDelete = childElements.filter(e => e.type === 'cell' && rowIdsToDelete.indexOf(e.rowId) !== -1);
+        const mergedRanges = table_merge_service_1.TableMergeService.getMergedRanges(tableElement, childElements).filter((range) => rowIndexes.filter((rowIndex) => range.intersectsRow(rowIndex, rowIndex)).length > 0);
+        const rowsToDelete = rowIdsToDelete.map((rowId) => childElements.find((e) => e.type === 'row' && e.id === rowId));
+        const cellsToDelete = childElements.filter((e) => e.type === 'cell' && rowIdsToDelete.indexOf(e.rowId) !== -1);
         let deleteAllowed = true;
         if (mergedRanges.length > 0) {
             for (const cell of this.getCellsAtRanges(tableElement, childElements, mergedRanges)) {
-                if (!cellsToDelete.find(e => e.id === cell.id)) {
+                if (!cellsToDelete.find((e) => e.id === cell.id)) {
                     deleteAllowed = false;
                     break;
                 }
@@ -393,7 +393,7 @@ class TableService {
             size: Object.assign({}, tableElement.size),
             rowIds: [...tableElement.rowIds],
         };
-        tableElement.rowIds = tableElement.rowIds.filter(id => rowIdsToDelete.indexOf(id) === -1);
+        tableElement.rowIds = tableElement.rowIds.filter((id) => rowIdsToDelete.indexOf(id) === -1);
         tableElement.size.height =
             tableElement.size.height - rowsToDelete.reduce((totalHeight, element) => totalHeight + element.size.height, 0);
         return {
@@ -415,9 +415,9 @@ class TableService {
     static move(key, tableElement, childElements, from, to) {
         const isColumn = key === 'columnIds';
         const mergedRanges = table_merge_service_1.TableMergeService.getMergedRanges(tableElement, childElements);
-        const fromMergedRanges = mergedRanges.filter(range => isColumn ? range.cols > 0 && range.intersectsCol(from, from) : range.rows > 0 && range.intersectsRow(from, from));
+        const fromMergedRanges = mergedRanges.filter((range) => isColumn ? range.cols > 0 && range.intersectsCol(from, from) : range.rows > 0 && range.intersectsRow(from, from));
         const indexIncrement = from < to ? 1 : 0;
-        const toMergedRanges = mergedRanges.filter(range => isColumn
+        const toMergedRanges = mergedRanges.filter((range) => isColumn
             ? range.startColumn - indexIncrement < to && to <= range.endColumn - indexIncrement
             : range.startRow - indexIncrement < to && to <= range.endRow - indexIncrement);
         if (fromMergedRanges.length > 0 || toMergedRanges.length > 0) {
@@ -435,12 +435,12 @@ class TableService {
         };
     }
     static resizeRow(tableElement, childElements, rowId, height) {
-        const row = childElements.find(e => e.type === 'row' && e.id === rowId);
+        const row = childElements.find((e) => e.type === 'row' && e.id === rowId);
         const rowUndo = Object.assign(Object.assign({}, tableData(row)), { size: Object.assign({}, row.size) });
         const tableUndo = Object.assign(Object.assign({}, tableData(tableElement)), { size: Object.assign({}, tableElement.size) });
         row.size.height = height;
         tableElement.size.height = childElements
-            .filter(e => e.type === 'row')
+            .filter((e) => e.type === 'row')
             .reduce((acc, row) => acc + row.size.height, 0);
         return {
             elementsToUpdate: [
@@ -456,12 +456,12 @@ class TableService {
         };
     }
     static resizeColumn(tableElement, childElements, columnId, width) {
-        const column = childElements.find(e => e.type === 'column' && e.id === columnId);
+        const column = childElements.find((e) => e.type === 'column' && e.id === columnId);
         const columnUndo = Object.assign(Object.assign({}, tableData(column)), { size: Object.assign({}, column.size) });
         const tableUndo = Object.assign(Object.assign({}, tableData(tableElement)), { size: Object.assign({}, tableElement.size) });
         column.size.width = width;
         tableElement.size.width = childElements
-            .filter(e => e.type === 'column')
+            .filter((e) => e.type === 'column')
             .reduce((acc, column) => acc + column.size.width, 0);
         return {
             elementsToUpdate: [
@@ -479,7 +479,7 @@ class TableService {
     static getColumns(tableElement, childElements) {
         const columns = [];
         for (const columnId of tableElement.columnIds) {
-            const column = childElements.find(e => e.type === 'column' && e.id === columnId);
+            const column = childElements.find((e) => e.type === 'column' && e.id === columnId);
             if (!column)
                 throw new Error(TABLE_ERROR.INVALID_TABLE);
             columns.push(column);
@@ -500,7 +500,7 @@ class TableService {
     static getRows(tableElement, childElements) {
         const rows = [];
         for (const rowId of tableElement.rowIds) {
-            const row = childElements.find(e => e.type === 'row' && e.id === rowId);
+            const row = childElements.find((e) => e.type === 'row' && e.id === rowId);
             if (!row)
                 throw new Error(TABLE_ERROR.INVALID_TABLE);
             rows.push(row);
@@ -526,12 +526,12 @@ class TableService {
             throw new Error(TABLE_ERROR.INVALID_TABLE);
         const cellRange = new table_range_1.TableRange(rowIndex, rowIndex, columnIndex, columnIndex);
         const mergedRanges = table_merge_service_1.TableMergeService.getMergedRanges(tableElement, childElements);
-        const mergedRange = mergedRanges.find(range => cellRange.within(range));
+        const mergedRange = mergedRanges.find((range) => cellRange.within(range));
         if (mergedRange) {
             const mergedRangeStart = mergedRange && cellRange.equals(mergedRange.start());
             const mergedCell = mergedRangeStart
                 ? cell
-                : childElements.find(e => e.type === 'cell' &&
+                : childElements.find((e) => e.type === 'cell' &&
                     e.rowId === tableElement.rowIds[mergedRange.startRow] &&
                     e.columnId === tableElement.columnIds[mergedRange.startColumn]);
             height =
@@ -544,20 +544,20 @@ class TableService {
         var _a;
         const elementsToUpdate = [];
         const columnIndex = tableElement.columnIds.indexOf(columnId);
-        const column = childElements.find(e => e.type === 'column' && e.id === columnId);
+        const column = childElements.find((e) => e.type === 'column' && e.id === columnId);
         const mergedRanges = table_merge_service_1.TableMergeService.getMergedRanges(tableElement, childElements);
         for (const [rowIndex, rowId] of tableElement.rowIds.entries()) {
-            const row = childElements.find(e => e.type === 'row' && e.id === rowId);
-            const cell = childElements.find(e => e.type === 'cell' && e.rowId === rowId && e.columnId === columnId);
+            const row = childElements.find((e) => e.type === 'row' && e.id === rowId);
+            const cell = childElements.find((e) => e.type === 'cell' && e.rowId === rowId && e.columnId === columnId);
             if (!row || !cell)
                 continue;
             const cellUndo = util_1.ObjectUtil.cloneDeep(cell);
             const cellRange = new table_range_1.TableRange(rowIndex, rowIndex, columnIndex, columnIndex);
-            const mergedRange = mergedRanges.find(range => cellRange.within(range));
+            const mergedRange = mergedRanges.find((range) => cellRange.within(range));
             const mergedRangeStart = mergedRange && cellRange.equals(mergedRange.start());
             const mergedRangeOther = mergedRange && !cellRange.equals(mergedRange.start());
             if (mergedRangeOther) {
-                const mergedCell = childElements.find(e => e.type === 'cell' &&
+                const mergedCell = childElements.find((e) => e.type === 'cell' &&
                     e.rowId === tableElement.rowIds[mergedRange.startRow] &&
                     e.columnId === tableElement.columnIds[mergedRange.startColumn]);
                 if (rowIndex === mergedRange.endRow && columnIndex !== mergedRange.startColumn) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/document-table",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Library for document tables",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@contrail/actions": "^1.0.14",
-    "@contrail/documents": "^1.0.108",
+    "@contrail/documents": "^1.0.109",
     "@contrail/types": "^3.0.71",
     "@contrail/util": "^1.0.65",
     "reflect-metadata": "^0.1.13"