roosterjs 9.25.0 → 9.26.0

package/dist/rooster.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for roosterjs (Version 9.25.0)
+// Type definitions for roosterjs (Version 9.26.0)
 // Generated by dts tool from roosterjs
 // Project: https://github.com/Microsoft/roosterjs
 
@@ -2828,7 +2828,7 @@ interface EditorContext {
     /**
      * When set to true, size of table will be recalculated when converting from DOM to Content Model.
      */
-    recalculateTableSize?: boolean;
+    recalculateTableSize?: boolean | 'all' | 'selected' | 'none';
 }
 
     /**
@@ -3087,7 +3087,16 @@ interface DomToModelOptionForCreateModel extends DomToModelOption  {
     /**
      * When set to true, it will try to reuse cached content model if any
      */
-    tryGetFromCache: boolean;
+    tryGetFromCache?: boolean;
+    /**
+     * Whether recalculate table size when parse table
+     * 'all' or true means recalculate all tables in the model
+     * 'selected' means recalculate only selected tables in the model
+     * 'none' or false means do not recalculate any table in the model
+     *
+     * When this option is passed, "tryGetFromCache" will be ignored.
+     */
+    recalculateTableSize?: boolean | 'all' | 'selected' | 'none';
 }
 
     /**

package/dist/rooster.js

@@ -4302,16 +4302,18 @@ var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-mo
 function clearSelectedCells(table, sel) {
     if (sel.firstColumn >= 0 &&
         sel.firstRow >= 0 &&
-        sel.lastColumn < table.widths.length &&
-        sel.lastRow < table.rows.length) {
+        sel.lastRow < table.rows.length &&
+        sel.lastColumn < table.rows[sel.lastRow].cells.length) {
         for (var i = sel.firstRow; i <= sel.lastRow; i++) {
             var row = table.rows[i];
             for (var j = sel.firstColumn; j <= sel.lastColumn; j++) {
                 var cell = row.cells[j];
-                if (cell.isSelected) {
-                    (0, roosterjs_content_model_dom_1.mutateBlock)(cell).isSelected = false;
+                if (cell) {
+                    if (cell.isSelected) {
+                        (0, roosterjs_content_model_dom_1.mutateBlock)(cell).isSelected = false;
+                    }
+                    (0, roosterjs_content_model_dom_1.setSelection)(cell);
                 }
-                (0, roosterjs_content_model_dom_1.setSelection)(cell);
             }
         }
     }
@@ -4753,7 +4755,9 @@ function splitTableCellHorizontally(table) {
                 table.rows.forEach(function (row, rowIndex) {
                     var cell = row.cells[colIndex];
                     if (cell) {
-                        var newCell = (0, roosterjs_content_model_dom_1.createTableCell)(cell.spanLeft, cell.spanAbove, cell.isHeader, cell.format);
+                        var mutableCell = (0, roosterjs_content_model_dom_1.mutateBlock)(cell);
+                        delete mutableCell.format.width;
+                        var newCell = (0, roosterjs_content_model_dom_1.createTableCell)(cell.spanLeft, cell.spanAbove, cell.isHeader, mutableCell.format);
                         newCell.dataset = (0, tslib_1.__assign)({}, cell.dataset);
                         if (rowIndex < sel.firstRow || rowIndex > sel.lastRow) {
                             newCell.spanLeft = true;
@@ -4819,7 +4823,9 @@ function splitTableCellVertically(table) {
                     format: (0, tslib_1.__assign)({}, row.format),
                     height: newHeight,
                     cells: row.cells.map(function (cell, colIndex) {
-                        var newCell = (0, roosterjs_content_model_dom_1.createTableCell)(cell.spanLeft, cell.spanAbove, cell.isHeader, cell.format);
+                        var mutableCell = (0, roosterjs_content_model_dom_1.mutateBlock)(cell);
+                        delete mutableCell.format.height;
+                        var newCell = (0, roosterjs_content_model_dom_1.createTableCell)(cell.spanLeft, cell.spanAbove, cell.isHeader, mutableCell.format);
                         newCell.dataset = (0, tslib_1.__assign)({}, cell.dataset);
                         if (colIndex < sel.firstColumn || colIndex > sel.lastColumn) {
                             newCell.spanAbove = true;
@@ -7384,6 +7390,8 @@ function formatTableWithContentModel(editor, apiName, callback, selectionOverrid
     }, {
         apiName: apiName,
         selectionOverride: selectionOverride,
+    }, {
+        recalculateTableSize: 'selected',
     });
 }
 exports.formatTableWithContentModel = formatTableWithContentModel;
@@ -8892,7 +8900,8 @@ var createContentModel = function (core, option, selectionOverride) {
     var _a;
     // Flush all mutations if any, so that we can get an up-to-date Content Model
     (_a = core.cache.textMutationObserver) === null || _a === void 0 ? void 0 : _a.flushMutations();
-    if (!selectionOverride && (!option || option.tryGetFromCache)) {
+    var tryGetFromCache = !option || (option.tryGetFromCache && typeof option.recalculateTableSize === 'undefined');
+    if (!selectionOverride && tryGetFromCache) {
         var cachedModel = core.cache.cachedModel;
         if (cachedModel) {
             // When in shadow edit, use a cloned model so we won't pollute the cached one
@@ -8906,6 +8915,7 @@ var createContentModel = function (core, option, selectionOverride) {
         : selectionOverride || core.api.getDOMSelection(core) || undefined;
     var saveIndex = !option && !selectionOverride;
     var editorContext = core.api.createEditorContext(core, saveIndex);
+    editorContext.recalculateTableSize = option === null || option === void 0 ? void 0 : option.recalculateTableSize;
     var settings = core.environment.domToModelSettings;
     var domToModelContext = option
         ? (0, roosterjs_content_model_dom_1.createDomToModelContext)(editorContext, settings.builtIn, settings.customized, option)
@@ -17256,6 +17266,7 @@ var addBlock_1 = __webpack_require__(/*! ../../modelApi/common/addBlock */ "./pa
 var createTable_1 = __webpack_require__(/*! ../../modelApi/creators/createTable */ "./packages/roosterjs-content-model-dom/lib/modelApi/creators/createTable.ts");
 var createTableCell_1 = __webpack_require__(/*! ../../modelApi/creators/createTableCell */ "./packages/roosterjs-content-model-dom/lib/modelApi/creators/createTableCell.ts");
 var getBoundingClientRect_1 = __webpack_require__(/*! ../utils/getBoundingClientRect */ "./packages/roosterjs-content-model-dom/lib/domToModel/utils/getBoundingClientRect.ts");
+var getSelectionRootNode_1 = __webpack_require__(/*! ../../domUtils/selection/getSelectionRootNode */ "./packages/roosterjs-content-model-dom/lib/domUtils/selection/getSelectionRootNode.ts");
 var isElementOfType_1 = __webpack_require__(/*! ../../domUtils/isElementOfType */ "./packages/roosterjs-content-model-dom/lib/domUtils/isElementOfType.ts");
 var isNodeOfType_1 = __webpack_require__(/*! ../../domUtils/isNodeOfType */ "./packages/roosterjs-content-model-dom/lib/domUtils/isNodeOfType.ts");
 var parseFormat_1 = __webpack_require__(/*! ../utils/parseFormat */ "./packages/roosterjs-content-model-dom/lib/domToModel/utils/parseFormat.ts");
@@ -17286,6 +17297,7 @@ var tableProcessor = function (group, tableElement, context) {
         var tableSelection = ((_a = context.selection) === null || _a === void 0 ? void 0 : _a.type) == 'table' ? context.selection : null;
         var selectedTable = tableSelection === null || tableSelection === void 0 ? void 0 : tableSelection.table;
         var hasTableSelection = selectedTable == tableElement;
+        var recalculateTableSize = shouldRecalculateTableSize(tableElement, context);
         if (context.allowCacheElement) {
             table.cachedElement = tableElement;
         }
@@ -17328,7 +17340,7 @@ var tableProcessor = function (group, tableElement, context) {
                     for (; tableRow.cells[targetCol]; targetCol++) { }
                     var td = tr.cells[sourceCol];
                     var hasSelectionBeforeCell = context.isInSelection;
-                    if (context.recalculateTableSize) {
+                    if (recalculateTableSize) {
                         var colEnd = targetCol + td.colSpan;
                         var rowEnd = row + td.rowSpan;
                         var needCalcWidth = columnPositions[colEnd] === undefined;
@@ -17472,6 +17484,21 @@ function processColGroup(table, context, result) {
     }
     return hasColGroup;
 }
+function shouldRecalculateTableSize(table, context) {
+    switch (context.recalculateTableSize) {
+        case true:
+        case 'all':
+            return true;
+        case 'selected':
+            var selectionRoot = (0, getSelectionRootNode_1.getSelectionRootNode)(context.selection);
+            return (!!selectionRoot &&
+                (selectionRoot == table ||
+                    table.contains(selectionRoot) ||
+                    selectionRoot.contains(table)));
+        default:
+            return false;
+    }
+}
 
 
 /***/ }),
@@ -31486,9 +31513,10 @@ function handleTabOnTable(model, rawEvent) {
 }
 exports.handleTabOnTable = handleTabOnTable;
 function isWholeTableSelected(tableModel) {
-    var _a, _b, _c, _d;
-    return (((_b = (_a = tableModel.rows[0]) === null || _a === void 0 ? void 0 : _a.cells[0]) === null || _b === void 0 ? void 0 : _b.isSelected) &&
-        ((_d = (_c = tableModel.rows[tableModel.rows.length - 1]) === null || _c === void 0 ? void 0 : _c.cells[tableModel.widths.length - 1]) === null || _d === void 0 ? void 0 : _d.isSelected));
+    var _a, _b;
+    var lastRow = tableModel.rows[tableModel.rows.length - 1];
+    var lastCell = lastRow === null || lastRow === void 0 ? void 0 : lastRow.cells[lastRow.cells.length - 1];
+    return ((_b = (_a = tableModel.rows[0]) === null || _a === void 0 ? void 0 : _a.cells[0]) === null || _b === void 0 ? void 0 : _b.isSelected) && (lastCell === null || lastCell === void 0 ? void 0 : lastCell.isSelected);
 }
 
 
@@ -31511,32 +31539,35 @@ var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-mo
  * @internal
  */
 function handleTabOnTableCell(model, cell, rawEvent) {
-    var _a, _b, _c;
+    var _a, _b;
     var readonlyTableModel = (0, roosterjs_content_model_dom_1.getFirstSelectedTable)(model)[0];
-    // Check if cursor is on last cell of the table
-    if (!rawEvent.shiftKey &&
-        readonlyTableModel &&
-        ((_a = readonlyTableModel.rows[readonlyTableModel.rows.length - 1]) === null || _a === void 0 ? void 0 : _a.cells[readonlyTableModel.widths.length - 1]) === cell) {
-        var tableModel = (0, roosterjs_content_model_dom_1.mutateBlock)(readonlyTableModel);
-        (0, roosterjs_content_model_api_1.insertTableRow)(tableModel, 'insertBelow');
-        // Clear Table selection
-        (0, roosterjs_content_model_api_1.clearSelectedCells)(tableModel, {
-            firstRow: tableModel.rows.length - 1,
-            firstColumn: 0,
-            lastRow: tableModel.rows.length - 1,
-            lastColumn: tableModel.widths.length - 1,
-        });
-        (0, roosterjs_content_model_dom_1.normalizeTable)(tableModel, model.format);
-        // Add selection marker to the first cell of the new row
-        var markerParagraph = (_c = (_b = tableModel.rows[tableModel.rows.length - 1]) === null || _b === void 0 ? void 0 : _b.cells[0]) === null || _c === void 0 ? void 0 : _c.blocks[0];
-        if (markerParagraph.blockType == 'Paragraph') {
-            var marker = (0, roosterjs_content_model_dom_1.createSelectionMarker)(model.format);
-            (0, roosterjs_content_model_dom_1.mutateBlock)(markerParagraph).segments.unshift(marker);
-            (0, roosterjs_content_model_dom_1.setParagraphNotImplicit)(markerParagraph);
-            (0, roosterjs_content_model_dom_1.setSelection)(tableModel.rows[tableModel.rows.length - 1].cells[0], marker);
+    if (readonlyTableModel) {
+        // Check if cursor is on last cell of the table
+        var lastRow = readonlyTableModel.rows[readonlyTableModel.rows.length - 1];
+        var lastColumn = lastRow ? lastRow.cells.length - 1 : -1;
+        var lastCell = lastRow === null || lastRow === void 0 ? void 0 : lastRow.cells[lastColumn];
+        if (!rawEvent.shiftKey && lastCell && lastCell === cell) {
+            var tableModel = (0, roosterjs_content_model_dom_1.mutateBlock)(readonlyTableModel);
+            (0, roosterjs_content_model_api_1.insertTableRow)(tableModel, 'insertBelow');
+            // Clear Table selection
+            (0, roosterjs_content_model_api_1.clearSelectedCells)(tableModel, {
+                firstRow: tableModel.rows.length - 1,
+                firstColumn: 0,
+                lastRow: tableModel.rows.length - 1,
+                lastColumn: lastColumn,
+            });
+            (0, roosterjs_content_model_dom_1.normalizeTable)(tableModel, model.format);
+            // Add selection marker to the first cell of the new row
+            var markerParagraph = (_b = (_a = tableModel.rows[tableModel.rows.length - 1]) === null || _a === void 0 ? void 0 : _a.cells[0]) === null || _b === void 0 ? void 0 : _b.blocks[0];
+            if (markerParagraph.blockType == 'Paragraph') {
+                var marker = (0, roosterjs_content_model_dom_1.createSelectionMarker)(model.format);
+                (0, roosterjs_content_model_dom_1.mutateBlock)(markerParagraph).segments.unshift(marker);
+                (0, roosterjs_content_model_dom_1.setParagraphNotImplicit)(markerParagraph);
+                (0, roosterjs_content_model_dom_1.setSelection)(tableModel.rows[tableModel.rows.length - 1].cells[0], marker);
+            }
+            rawEvent.preventDefault();
+            return true;
         }
-        rawEvent.preventDefault();
-        return true;
     }
     return false;
 }