@contrail/document-table 1.0.1 → 1.0.3

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-copy.service.js

@@ -11,7 +11,7 @@ class TableCopyService {
     static copy(tableElement, childElements) {
         const copiedChildElementIds = new Map();
         const childElementsMap = new Map();
-        childElements.forEach(element => {
+        childElements.forEach((element) => {
             childElementsMap.set(element.id, element);
         });
         const rowIds = [];
@@ -55,16 +55,16 @@ class TableCopyService {
             columnIds.push(newElement.id);
             newChildElements.push(newElement);
         }
-        const cellElements = childElements.filter(e => e.type === 'cell');
+        const cellElements = childElements.filter((e) => e.type === 'cell');
         if (cellElements.length < tableElement.rowIds.length * tableElement.columnIds.length) {
             for (let i = 0; i < tableElement.rowIds.length; i++) {
                 for (let j = 0; j < tableElement.columnIds.length; j++) {
                     const rowId = tableElement.rowIds[i];
                     const columnId = tableElement.columnIds[j];
-                    const cellElement = cellElements.find(e => e.type === 'cell' && e.rowId === rowId && e.columnId === columnId);
+                    const cellElement = cellElements.find((e) => e.type === 'cell' && e.rowId === rowId && e.columnId === columnId);
                     if (!cellElement) {
-                        const row = childElements.find(e => e.id === rowId);
-                        const column = childElements.find(e => e.id === columnId);
+                        const row = childElements.find((e) => e.id === rowId);
+                        const column = childElements.find((e) => e.id === columnId);
                         cellElements.push((0, table_service_1.createCell)({
                             rowId,
                             columnId,
@@ -110,7 +110,7 @@ class TableCopyService {
         const tableId = (0, nanoid_1.nanoid)(16);
         let width = 0, height = 0;
         let startRow, endRow, startColumn, endColumn;
-        cells.forEach(cell => {
+        cells.forEach((cell) => {
             const rowIndex = element.rowIds.indexOf(cell.rowId);
             const columnIndex = element.columnIds.indexOf(cell.columnId);
             const isNotSet = startRow == undefined;
@@ -124,8 +124,8 @@ class TableCopyService {
                 endColumn = columnIndex;
             existingCellsMap.set(`${rowIndex}_${columnIndex}`, cell);
         });
-        const skipRows = Array.from({ length: endRow - startRow + 1 }, (value, index) => startRow + index).filter(i => !Array.from(existingCellsMap.keys()).find(v => v.startsWith(`${i}_`)));
-        const skipColumns = Array.from({ length: endColumn - startColumn + 1 }, (value, index) => startColumn + index).filter(j => !Array.from(existingCellsMap.keys()).find(v => v.endsWith(`_${j}`)));
+        const skipRows = Array.from({ length: endRow - startRow + 1 }, (value, index) => startRow + index).filter((i) => !Array.from(existingCellsMap.keys()).find((v) => v.startsWith(`${i}_`)));
+        const skipColumns = Array.from({ length: endColumn - startColumn + 1 }, (value, index) => startColumn + index).filter((j) => !Array.from(existingCellsMap.keys()).find((v) => v.endsWith(`_${j}`)));
         for (let i = startRow; i <= endRow; i++) {
             if (skipRows.indexOf(i) !== -1)
                 continue;
@@ -275,8 +275,7 @@ class TableCopyService {
         var _a, _b, _c, _d, _e, _f;
         const fontFamily = `${(_c = (_b = (_a = cellElement.style) === null || _a === void 0 ? void 0 : _a.font) === null || _b === void 0 ? void 0 : _b.family) !== null && _c !== void 0 ? _c : table_constants_1.DEFAULT_TEXT_FONT_FAMILY}`;
         const fontSize = `${(_f = (_e = (_d = cellElement.style) === null || _d === void 0 ? void 0 : _d.font) === null || _e === void 0 ? void 0 : _e.size) !== null && _f !== void 0 ? _f : table_constants_1.DEFAULT_TEXT_FONT_SIZE}pt`;
-        const size = table_service_1.TableService.getSize(cellElement.text, `width: ${cellElement.size.width -
-            table_constants_1.TABLE_TEXT_PADDING * 2}px; height: auto; font-family: ${fontFamily}; font-size: ${fontSize};`);
+        const size = table_service_1.TableService.getSize(cellElement.text, `width: ${cellElement.size.width - table_constants_1.TABLE_TEXT_PADDING * 2}px; height: auto; font-family: ${fontFamily}; font-size: ${fontSize};`);
         const documentElement = {
             isTextTool: true,
             text: cellElement.text,

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.d.ts

@@ -39,4 +39,6 @@ export declare class TableService {
     static clearCell(element: DocumentElement): void;
     static getCellSize(element: DocumentElement, text?: string): SizeDefinition;
     static getSize(text: string, style: string): SizeDefinition;
+    getTableChildElements(tableId: string, elements: DocumentElement[]): DocumentElement[];
+    static updateCellText(tableElement: DocumentElement, childElements: DocumentElement[], rowIndex: number, columnIndex: number, text: string): DocumentElementChanges;
 }

package/lib/table.service.js

@@ -615,6 +615,32 @@ class TableService {
         div = null;
         return { width, height };
     }
+    getTableChildElements(tableId, elements) {
+        return elements.filter(e => e.tableId === tableId && ['cell', 'column', 'row'].indexOf(e.type) !== -1);
+    }
+    static updateCellText(tableElement, childElements, rowIndex, columnIndex, text) {
+        const rowId = tableElement.rowIds[rowIndex];
+        const columnId = tableElement.columnIds[columnIndex];
+        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);
+        if (!rowId || !columnId || !cell || !row) {
+            throw new Error(TABLE_ERROR.INVALID_TABLE);
+        }
+        const elementsToUpdate = [];
+        const cellUndo = Object.assign(Object.assign({}, tableData(cell)), { text: cell.text, size: Object.assign({}, cell.size) });
+        cell.text = text;
+        cell.size.height = TableService.getCellSize(cell).height;
+        elementsToUpdate.push({
+            change: Object.assign(Object.assign({}, tableData(cell)), { text: cell.text, size: cell.size }),
+            undo: cellUndo,
+        });
+        if (cell.size.height > row.size.height) {
+            elementsToUpdate.push(...TableService.resizeRow(tableElement, childElements, rowId, cell.size.height).elementsToUpdate);
+        }
+        return {
+            elementsToUpdate,
+        };
+    }
 }
 exports.TableService = TableService;
 TableService.DEFAULT_CELL_STYLE = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/document-table",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "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"