roosterjs 9.45.1 → 9.45.2

package/dist/rooster.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for roosterjs (Version 9.45.1)
+// Type definitions for roosterjs (Version 9.45.2)
 // Generated by dts tool from roosterjs
 // Project: https://github.com/Microsoft/roosterjs
 

package/dist/rooster.js

@@ -3910,13 +3910,17 @@ function setListType(model, listType, removeMargins) {
         }
         else {
             var index = parent.blocks.indexOf(block);
+            var isInsideTableCell = parent.blockGroupType == 'TableCell';
             if (index >= 0) {
-                if (paragraphOrListItems.length == 1 || !shouldIgnoreBlock(block)) {
+                if (paragraphOrListItems.length == 1 ||
+                    !shouldIgnoreBlock(block) ||
+                    isInsideTableCell) {
                     var prevBlock = parent.blocks[index - 1];
                     var segmentFormat = (block.blockType == 'Paragraph' && ((_b = block.segments[0]) === null || _b === void 0 ? void 0 : _b.format)) || {};
                     var newListItem = (0, roosterjs_content_model_dom_1.createListItem)([
                         (0, roosterjs_content_model_dom_1.createListLevel)(listType, {
-                            startNumberOverride: itemIndex > 0 ||
+                            startNumberOverride: isInsideTableCell ||
+                                itemIndex > 0 ||
                                 ((prevBlock === null || prevBlock === void 0 ? void 0 : prevBlock.blockType) == 'BlockGroup' &&
                                     prevBlock.blockGroupType == 'ListItem' &&
                                     ((_c = prevBlock.levels[0]) === null || _c === void 0 ? void 0 : _c.listType) == 'OL')
@@ -4538,6 +4542,40 @@ function clearSelectedCells(table, sel) {
 exports.clearSelectedCells = clearSelectedCells;
 
 
+/***/ }),
+
+/***/ "./packages/roosterjs-content-model-api/lib/modelApi/table/copyPreviousCellSegmentFormat.ts":
+/*!**************************************************************************************************!*\
+  !*** ./packages/roosterjs-content-model-api/lib/modelApi/table/copyPreviousCellSegmentFormat.ts ***!
+  \**************************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.copyPreviousCellSegmentFormat = void 0;
+var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
+/**
+ * @internal
+ */
+function copyPreviousCellSegmentFormat(cell, newCell) {
+    var block = cell.blocks[0];
+    if (block && (block === null || block === void 0 ? void 0 : block.blockType) == 'Paragraph') {
+        var firstSegment = block.segments[0];
+        if (firstSegment &&
+            (firstSegment.segmentType == 'Text' ||
+                firstSegment.segmentType == 'Br' ||
+                firstSegment.segmentType == 'SelectionMarker')) {
+            var newCellParagraph = (0, roosterjs_content_model_dom_1.createParagraph)(false /* isImplicit */, block.format, block.segmentFormat);
+            var br = (0, roosterjs_content_model_dom_1.createBr)(firstSegment.format);
+            newCellParagraph.segments.push(br);
+            (0, roosterjs_content_model_dom_1.mutateBlock)(newCell).blocks.push(newCellParagraph);
+        }
+    }
+}
+exports.copyPreviousCellSegmentFormat = copyPreviousCellSegmentFormat;
+
+
 /***/ }),
 
 /***/ "./packages/roosterjs-content-model-api/lib/modelApi/table/createTableStructure.ts":
@@ -4738,6 +4776,7 @@ function createEmptyParagraph(model) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.insertTableColumn = void 0;
 var clearSelectedCells_1 = __webpack_require__(/*! ./clearSelectedCells */ "./packages/roosterjs-content-model-api/lib/modelApi/table/clearSelectedCells.ts");
+var copyPreviousCellSegmentFormat_1 = __webpack_require__(/*! ./copyPreviousCellSegmentFormat */ "./packages/roosterjs-content-model-api/lib/modelApi/table/copyPreviousCellSegmentFormat.ts");
 var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
 /**
  * Insert a column to the table
@@ -4753,6 +4792,7 @@ function insertTableColumn(table, operation) {
             table.rows.forEach(function (row) {
                 var cell = row.cells[insertLeft ? sel.firstColumn : sel.lastColumn];
                 var newCell = (0, roosterjs_content_model_dom_1.createTableCell)(cell.spanLeft, cell.spanAbove, cell.isHeader, cell.format, cell.dataset);
+                (0, copyPreviousCellSegmentFormat_1.copyPreviousCellSegmentFormat)(cell, newCell);
                 newCell.isSelected = true;
                 row.cells.splice(insertLeft ? sel.firstColumn : sel.lastColumn + 1, 0, newCell);
             });
@@ -4777,6 +4817,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.insertTableRow = void 0;
 var tslib_1 = __webpack_require__(/*! tslib */ "./node_modules/tslib/tslib.es6.mjs");
 var clearSelectedCells_1 = __webpack_require__(/*! ./clearSelectedCells */ "./packages/roosterjs-content-model-api/lib/modelApi/table/clearSelectedCells.ts");
+var copyPreviousCellSegmentFormat_1 = __webpack_require__(/*! ./copyPreviousCellSegmentFormat */ "./packages/roosterjs-content-model-api/lib/modelApi/table/copyPreviousCellSegmentFormat.ts");
 var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
 /**
  * Insert a row to the table
@@ -4794,6 +4835,7 @@ function insertTableRow(table, operation) {
                 format: (0, tslib_1.__assign)({}, sourceRow.format),
                 cells: sourceRow.cells.map(function (cell) {
                     var newCell = (0, roosterjs_content_model_dom_1.createTableCell)(cell.spanLeft, cell.spanAbove, cell.isHeader, cell.format, cell.dataset);
+                    (0, copyPreviousCellSegmentFormat_1.copyPreviousCellSegmentFormat)(cell, newCell);
                     newCell.isSelected = true;
                     return newCell;
                 }),
@@ -17437,7 +17479,7 @@ exports.fontProcessor = fontProcessor;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.formatContainerProcessor = exports.ContextStyles = void 0;
+exports.forceFormatContainerProcessor = exports.formatContainerProcessor = exports.ContextStyles = void 0;
 var tslib_1 = __webpack_require__(/*! tslib */ "./node_modules/tslib/tslib.es6.mjs");
 var addBlock_1 = __webpack_require__(/*! ../../modelApi/common/addBlock */ "./packages/roosterjs-content-model-dom/lib/modelApi/common/addBlock.ts");
 var createFormatContainer_1 = __webpack_require__(/*! ../../modelApi/creators/createFormatContainer */ "./packages/roosterjs-content-model-dom/lib/modelApi/creators/createFormatContainer.ts");
@@ -17464,6 +17506,17 @@ exports.ContextStyles = [
  * @param context DOM to Content Model context
  */
 var formatContainerProcessor = function (group, element, context) {
+    formatContainerProcessorInternal(group, element, context, false /* forceFormatContainer */);
+};
+exports.formatContainerProcessor = formatContainerProcessor;
+/**
+ * @internal
+ */
+var forceFormatContainerProcessor = function (group, element, context) {
+    formatContainerProcessorInternal(group, element, context, true /* forceFormatContainer */);
+};
+exports.forceFormatContainerProcessor = forceFormatContainerProcessor;
+var formatContainerProcessorInternal = function (group, element, context, forceFormatContainer) {
     (0, stackFormat_1.stackFormat)(context, { segment: 'shallowCloneForBlock', paragraph: 'shallowClone' }, function () {
         (0, parseFormat_1.parseFormat)(element, context.formatParsers.block, context.blockFormat, context);
         (0, parseFormat_1.parseFormat)(element, context.formatParsers.segmentOnBlock, context.segmentFormat, context);
@@ -17481,7 +17534,7 @@ var formatContainerProcessor = function (group, element, context) {
         if (element.style.fontSize && parseInt(element.style.fontSize) == 0) {
             formatContainer.zeroFontSize = true;
         }
-        if (shouldFallbackToParagraph(formatContainer)) {
+        if (shouldFallbackToParagraph(formatContainer) && !forceFormatContainer) {
             // For DIV container that only has one paragraph child, container style can be merged into paragraph
             // and no need to have this container
             var paragraph = formatContainer.blocks[0];
@@ -17500,7 +17553,6 @@ var formatContainerProcessor = function (group, element, context) {
     });
     (0, addBlock_1.addBlock)(group, (0, createParagraph_1.createParagraph)(true /*isImplicit*/, context.blockFormat));
 };
-exports.formatContainerProcessor = formatContainerProcessor;
 function shouldFallbackToParagraph(formatContainer) {
     var firstChild = formatContainer.blocks[0];
     return (formatContainer.tagName == 'div' &&
@@ -17719,12 +17771,12 @@ exports.knownElementProcessor = void 0;
 var addBlock_1 = __webpack_require__(/*! ../../modelApi/common/addBlock */ "./packages/roosterjs-content-model-dom/lib/modelApi/common/addBlock.ts");
 var blockProcessor_1 = __webpack_require__(/*! ./blockProcessor */ "./packages/roosterjs-content-model-dom/lib/domToModel/processors/blockProcessor.ts");
 var createParagraph_1 = __webpack_require__(/*! ../../modelApi/creators/createParagraph */ "./packages/roosterjs-content-model-dom/lib/modelApi/creators/createParagraph.ts");
-var formatContainerProcessor_1 = __webpack_require__(/*! ./formatContainerProcessor */ "./packages/roosterjs-content-model-dom/lib/domToModel/processors/formatContainerProcessor.ts");
 var getDefaultStyle_1 = __webpack_require__(/*! ../utils/getDefaultStyle */ "./packages/roosterjs-content-model-dom/lib/domToModel/utils/getDefaultStyle.ts");
 var isBlockElement_1 = __webpack_require__(/*! ../utils/isBlockElement */ "./packages/roosterjs-content-model-dom/lib/domToModel/utils/isBlockElement.ts");
 var entityUtils_1 = __webpack_require__(/*! ../../domUtils/entityUtils */ "./packages/roosterjs-content-model-dom/lib/domUtils/entityUtils.ts");
 var parseFormat_1 = __webpack_require__(/*! ../utils/parseFormat */ "./packages/roosterjs-content-model-dom/lib/domToModel/utils/parseFormat.ts");
 var stackFormat_1 = __webpack_require__(/*! ../utils/stackFormat */ "./packages/roosterjs-content-model-dom/lib/domToModel/utils/stackFormat.ts");
+var formatContainerProcessor_1 = __webpack_require__(/*! ./formatContainerProcessor */ "./packages/roosterjs-content-model-dom/lib/domToModel/processors/formatContainerProcessor.ts");
 var FormatContainerTriggerStyles = [
     'marginBottom',
     'marginTop',
@@ -17751,8 +17803,12 @@ var SegmentDecoratorTags = ['A', 'CODE'];
  */
 var knownElementProcessor = function (group, element, context) {
     var isBlock = (0, isBlockElement_1.isBlockElement)(element);
-    if ((isBlock || element.style.display == 'inline-block') && // For inline-block here, we will also check if it should be represented as Format Container
-        shouldUseFormatContainer(element, context)) {
+    var isBlockContainer = isBlock || element.style.display == 'inline-block';
+    if (isBlockContainer && // For inline-block here, we will also check if it should be represented as Format Container
+        shouldForceUseFormatContainer(element, context)) {
+        (0, formatContainerProcessor_1.forceFormatContainerProcessor)(group, element, context);
+    }
+    else if (isBlockContainer && shouldUseFormatContainer(element, context)) {
         (0, formatContainerProcessor_1.formatContainerProcessor)(group, element, context);
     }
     else if ((0, entityUtils_1.isBlockEntityContainer)(element)) {
@@ -17786,6 +17842,9 @@ var knownElementProcessor = function (group, element, context) {
     }
 };
 exports.knownElementProcessor = knownElementProcessor;
+function shouldForceUseFormatContainer(element, context) {
+    return FormatContainerTriggerAttributes.some(function (attr) { return element.hasAttribute(attr); });
+}
 function shouldUseFormatContainer(element, context) {
     // For those tags that we know we should not use format container, just return false
     if (ByPassFormatContainerTags.indexOf(element.tagName) >= 0) {
@@ -17800,8 +17859,7 @@ function shouldUseFormatContainer(element, context) {
     }
     // For block element with positive value of border width or top/bottom margin/padding,
     // we need to use format container
-    if (FormatContainerTriggerStyles.some(function (key) { return parseInt(style[key] || defaultStyle[key] || '') > 0; }) ||
-        FormatContainerTriggerAttributes.some(function (attr) { return element.hasAttribute(attr); })) {
+    if (FormatContainerTriggerStyles.some(function (key) { return parseInt(style[key] || defaultStyle[key] || '') > 0; })) {
         return true;
     }
     // For margin left/right with value "auto", we need to use format container
@@ -18304,8 +18362,8 @@ var textProcessor = function (group, textNode, context) {
         (0, stackFormat_1.stackFormat)(context, { segment: 'shallowClone' }, function () {
             context.formatParsers.text.forEach(function (parser) {
                 parser(context.segmentFormat, textNode, context);
-                internalTextProcessor(group, textNode, context);
             });
+            internalTextProcessor(group, textNode, context);
         });
     }
     else {
@@ -24735,9 +24793,12 @@ function setFirstColumnFormatBorders(rows, format) {
                                     (0, mutate_1.mutateSegment)(block, segment, function (cellSegment) {
                                         if (format.hasFirstColumn) {
                                             cellSegment.format.fontWeight = 'bold';
+                                            cell.format.fontWeight = 'bold';
                                         }
-                                        else if (cellSegment.format.fontWeight == 'bold') {
+                                        else if (cellSegment.format.fontWeight == 'bold' &&
+                                            cell.format.fontWeight == 'bold') {
                                             delete cellSegment.format.fontWeight;
+                                            delete cell.format.fontWeight;
                                         }
                                     });
                                 }
@@ -26356,7 +26417,7 @@ function setTableCellBackgroundColor(cell, color, isColorOverride, applyToSegmen
             delete cell.format.textColor;
         }
         if (applyToSegments) {
-            setAdaptiveCellColor(cell);
+            setAdaptiveCellColor(cell, color);
         }
     }
     else {
@@ -26370,34 +26431,38 @@ function setTableCellBackgroundColor(cell, color, isColorOverride, applyToSegmen
 exports.setTableCellBackgroundColor = setTableCellBackgroundColor;
 function removeAdaptiveCellColor(cell) {
     cell.blocks.forEach(function (readonlyBlock) {
-        var _a, _b;
+        var _a;
         if (readonlyBlock.blockType == 'Paragraph') {
             var block = (0, mutate_1.mutateBlock)(readonlyBlock);
             if (((_a = block.segmentFormat) === null || _a === void 0 ? void 0 : _a.textColor) &&
-                shouldRemoveColor((_b = block.segmentFormat) === null || _b === void 0 ? void 0 : _b.textColor, cell.format.backgroundColor || '')) {
+                (areSameColor(block.segmentFormat.textColor, White) ||
+                    areSameColor(block.segmentFormat.textColor, Black))) {
                 delete block.segmentFormat.textColor;
             }
             block.segments.forEach(function (segment) {
                 if (segment.format.textColor &&
-                    shouldRemoveColor(segment.format.textColor, cell.format.backgroundColor || '')) {
+                    (areSameColor(segment.format.textColor, White) ||
+                        areSameColor(segment.format.textColor, Black))) {
                     delete segment.format.textColor;
                 }
             });
         }
     });
 }
-function setAdaptiveCellColor(cell) {
+function setAdaptiveCellColor(cell, backgroundColor) {
     if (cell.format.textColor) {
         cell.blocks.forEach(function (readonlyBlock) {
             var _a;
             if (readonlyBlock.blockType == 'Paragraph') {
                 var block = (0, mutate_1.mutateBlock)(readonlyBlock);
-                if (!((_a = block.segmentFormat) === null || _a === void 0 ? void 0 : _a.textColor)) {
+                if (!((_a = block.segmentFormat) === null || _a === void 0 ? void 0 : _a.textColor) ||
+                    areSameColor(backgroundColor, block.segmentFormat.textColor)) {
                     block.segmentFormat = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, block.segmentFormat), { textColor: cell.format.textColor });
                 }
                 block.segments.forEach(function (segment) {
                     var _a;
-                    if (!((_a = segment.format) === null || _a === void 0 ? void 0 : _a.textColor)) {
+                    if (!((_a = segment.format) === null || _a === void 0 ? void 0 : _a.textColor) ||
+                        areSameColor(backgroundColor, segment.format.textColor)) {
                         segment.format = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, segment.format), { textColor: cell.format.textColor });
                     }
                 });
@@ -26405,22 +26470,6 @@ function setAdaptiveCellColor(cell) {
         });
     }
 }
-/**
- * If the cell background color is too dark or too bright, and the text color is white or black, we should remove the text color
- * @param textColor the segment or block text color
- * @param cellBackgroundColor the cell background color
- * @returns
- */
-function shouldRemoveColor(textColor, cellBackgroundColor) {
-    var lightness = calculateLightness(cellBackgroundColor);
-    if (([White, 'rgb(255,255,255)'].indexOf(textColor) > -1 &&
-        (lightness > BRIGHT_COLORS_LIGHTNESS || cellBackgroundColor == '')) ||
-        ([Black, 'rgb(0,0,0)'].indexOf(textColor) > -1 &&
-            (lightness < DARK_COLORS_LIGHTNESS || cellBackgroundColor == ''))) {
-        return true;
-    }
-    return false;
-}
 function calculateLightness(color) {
     var colorValues = (0, color_1.parseColor)(color);
     // Use the values of r,g,b to calculate the lightness in the HSl representation
@@ -26436,6 +26485,17 @@ function calculateLightness(color) {
         return 255;
     }
 }
+/**
+ * Check if two colors are the same by comparing their RGB values
+ */
+function areSameColor(color1, color2) {
+    var rgb1 = (0, color_1.parseColor)(color1);
+    var rgb2 = (0, color_1.parseColor)(color2);
+    if (rgb1 && rgb2) {
+        return rgb1[0] === rgb2[0] && rgb1[1] === rgb2[1] && rgb1[2] === rgb2[2];
+    }
+    return false;
+}
 
 
 /***/ }),
@@ -32696,7 +32756,7 @@ var deleteList = function (context) {
         else {
             var removedBlocks = mutableList.blocks.splice(mutableList.blocks.indexOf(paragraph), mutableList.blocks.length);
             if (mutableList.levels.length > 1) {
-                var newListItem = (0, roosterjs_content_model_dom_1.createListItem)(mutableList.levels.slice(0, -1), mutableList.format);
+                var newListItem = (0, roosterjs_content_model_dom_1.createListItem)(mutableList.levels.slice(0, -1), mutableList.formatHolder.format);
                 newListItem.blocks = removedBlocks.map(function (block) { return (0, roosterjs_content_model_dom_1.mutateBlock)(block); });
                 (0, roosterjs_content_model_dom_1.mutateBlock)(parent).blocks.splice(listItemIndex + 1, 0, newListItem);
             }
@@ -41555,31 +41615,38 @@ exports.VERTICAL_INSERTER_ID = 'verticalInserter';
 function createTableInserter(editor, td, table, isRTL, isHorizontal, onBeforeInsert, onAfterInserted, anchorContainer, onTableEditorCreated) {
     var tdRect = (0, roosterjs_content_model_dom_1.normalizeRect)(td.getBoundingClientRect());
     var viewPort = editor.getVisibleViewport();
-    var tableRect = table && viewPort ? (0, getIntersectedRect_1.getIntersectedRect)([table], [viewPort]) : null;
-    // set inserter position
-    if (tdRect && tableRect) {
-        var document_1 = td.ownerDocument;
-        var createElementData = getInsertElementData(isHorizontal, editor.isDarkMode(), isRTL, editor.getDOMHelper().getDomStyle('backgroundColor') || 'white');
-        var div = (0, createElement_1.createElement)(createElementData, document_1);
-        if (isHorizontal) {
-            // tableRect.left/right is used because the Inserter is always intended to be on the side
-            div.id = exports.HORIZONTAL_INSERTER_ID;
-            div.style.left = (isRTL
-                ? tableRect.right
-                : tableRect.left - (INSERTER_SIDE_LENGTH - 1 + 2 * INSERTER_BORDER_SIZE)) + "px";
-            div.style.top = tdRect.bottom - 8 + "px";
-            div.firstChild.style.width = tableRect.right - tableRect.left + "px";
+    if (tdRect && viewPort) {
+        var isOutsideTop = tdRect.top <= viewPort.top;
+        var isOutsideBottom = tdRect.bottom >= viewPort.bottom;
+        if (isOutsideBottom || isOutsideTop) {
+            return null;
+        }
+        var tableRect = table ? (0, getIntersectedRect_1.getIntersectedRect)([table], [viewPort]) : null;
+        // set inserter position
+        if (tableRect) {
+            var document_1 = td.ownerDocument;
+            var createElementData = getInsertElementData(isHorizontal, editor.isDarkMode(), isRTL, editor.getDOMHelper().getDomStyle('backgroundColor') || 'white');
+            var div = (0, createElement_1.createElement)(createElementData, document_1);
+            if (isHorizontal) {
+                // tableRect.left/right is used because the Inserter is always intended to be on the side
+                div.id = exports.HORIZONTAL_INSERTER_ID;
+                div.style.left = (isRTL
+                    ? tableRect.right
+                    : tableRect.left - (INSERTER_SIDE_LENGTH - 1 + 2 * INSERTER_BORDER_SIZE)) + "px";
+                div.style.top = tdRect.bottom - 8 + "px";
+                div.firstChild.style.width = tableRect.right - tableRect.left + "px";
+            }
+            else {
+                div.id = exports.VERTICAL_INSERTER_ID;
+                div.style.left = (isRTL ? tdRect.left - 8 : tdRect.right - 8) + "px";
+                // tableRect.top is used because the Inserter is always intended to be on top
+                div.style.top = tableRect.top - (INSERTER_SIDE_LENGTH - 1 + 2 * INSERTER_BORDER_SIZE) + "px";
+                div.firstChild.style.height = tableRect.bottom - tableRect.top + "px";
+            }
+            (anchorContainer || document_1.body).appendChild(div);
+            var handler = new TableInsertHandler(div, td, table, isHorizontal, editor, onBeforeInsert, onAfterInserted, onTableEditorCreated);
+            return { div: div, featureHandler: handler, node: td };
         }
-        else {
-            div.id = exports.VERTICAL_INSERTER_ID;
-            div.style.left = (isRTL ? tdRect.left - 8 : tdRect.right - 8) + "px";
-            // tableRect.top is used because the Inserter is always intended to be on top
-            div.style.top = tableRect.top - (INSERTER_SIDE_LENGTH - 1 + 2 * INSERTER_BORDER_SIZE) + "px";
-            div.firstChild.style.height = tableRect.bottom - tableRect.top + "px";
-        }
-        (anchorContainer || document_1.body).appendChild(div);
-        var handler = new TableInsertHandler(div, td, table, isHorizontal, editor, onBeforeInsert, onAfterInserted, onTableEditorCreated);
-        return { div: div, featureHandler: handler, node: td };
     }
     return null;
 }