roosterjs 9.47.0 → 9.49.0

package/dist/rooster.js

@@ -4310,6 +4310,10 @@ function setListType(model, listType, removeMargins) {
                         fontSize: segmentFormat.fontSize,
                         textColor: segmentFormat.textColor,
                     });
+                    if (removeMargins) {
+                        newListItem.format.marginBottom = '0px';
+                        newListItem.format.marginTop = '0px';
+                    }
                     if (block.blockType == 'Paragraph') {
                         (0, roosterjs_content_model_dom_1.setParagraphNotImplicit)(block);
                     }
@@ -7887,21 +7891,25 @@ exports.setTableCellShade = setTableCellShade;
 /*!******************************************************************************!*\
   !*** ./packages/roosterjs-content-model-api/lib/publicApi/utils/checkXss.ts ***!
   \******************************************************************************/
-(__unused_webpack_module, exports) {
+(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.checkXss = void 0;
+var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
 /**
  * @internal Check if there is XSS attack in the link
  * @param link The link to be checked
- * @returns The safe link, or empty string if there is XSS attack
- * @remarks This function checks for patterns like s\nc\nr\ni\np\nt: to prevent XSS attacks. This may block some valid links,
+ * @returns The safe link with invisible Unicode characters stripped, or empty string if there is XSS attack
+ * @remarks This function strips invisible Unicode characters (zero-width chars, Unicode Tags, etc.)
+ * and checks for patterns like s\nc\nr\ni\np\nt: to prevent XSS attacks. This may block some valid links,
  * but it is necessary for security reasons. We treat the word "script" as safe if there are "/" before it.
  */
 function checkXss(link) {
-    return link.match(/^[^\/]*s\n*c\n*r\n*i\n*p\n*t\n*:/i) ? '' : link;
+    // Defense-in-depth: strip invisible Unicode even if already handled elsewhere
+    var sanitized = (0, roosterjs_content_model_dom_1.stripInvisibleUnicode)(link);
+    return sanitized.match(/^[^\/]*s\n*c\n*r\n*i\n*p\n*t\n*:/i) ? '' : sanitized;
 }
 exports.checkXss = checkXss;
 
@@ -8139,7 +8147,7 @@ var splitSelectedParagraphByBr_1 = __webpack_require__(/*! ../../modelApi/block/
 function formatParagraphWithContentModel(editor, apiName, setStyleCallback) {
     editor.formatContentModel(function (model, context) {
         (0, splitSelectedParagraphByBr_1.splitSelectedParagraphByBr)(model);
-        var paragraphs = (0, roosterjs_content_model_dom_1.getSelectedParagraphs)(model, true /*mutate*/);
+        var paragraphs = (0, roosterjs_content_model_dom_1.getSelectedParagraphs)(model, true /*mutate*/, false /*removeUnmeaningful*/);
         paragraphs.forEach(setStyleCallback);
         context.newPendingFormat = 'preserve';
         return paragraphs.length > 0;
@@ -11684,17 +11692,18 @@ var CachePlugin = /** @class */ (function () {
                 if (contentModel) {
                     (0, updateCache_1.updateCache)(this.state, contentModel, selection);
                 }
-                else {
-                    this.invalidateCache();
-                }
                 break;
         }
     };
     CachePlugin.prototype.invalidateCache = function () {
         var _a, _b;
         if (!((_a = this.editor) === null || _a === void 0 ? void 0 : _a.isInShadowEdit())) {
-            this.state.cachedModel = undefined;
-            this.state.cachedSelection = undefined;
+            if (this.state.cachedModel) {
+                this.state.cachedModel = undefined;
+            }
+            if (this.state.cachedSelection) {
+                this.state.cachedSelection = undefined;
+            }
             // Clear paragraph indexer to prevent stale references to old paragraphs
             // It will be rebuild next time when we create a new Content Model
             (_b = this.state.paragraphMap) === null || _b === void 0 ? void 0 : _b.clear();
@@ -14916,7 +14925,7 @@ var SelectionPlugin = /** @class */ (function () {
             : undefined;
         var rect = td === null || td === void 0 ? void 0 : td.getBoundingClientRect();
         var textOffset = cursorRect && rect
-            ? (0, roosterjs_content_model_dom_1.getNodePositionFromEvent)(doc, editor.getDOMHelper(), cursorRect.left, isKeyUp ? rect.top - 1 : rect.top + 1)
+            ? (0, roosterjs_content_model_dom_1.getNodePositionFromEvent)(doc, editor.getDOMHelper(), cursorRect.left, isKeyUp ? rect.top : rect.top + 1)
             : null;
         return textOffset;
     };
@@ -15618,6 +15627,7 @@ var Editor = /** @class */ (function () {
         };
         this.core = (0, createEditorCore_1.createEditorCore)(contentDiv, options);
         var initialModel = (_a = options.initialModel) !== null && _a !== void 0 ? _a : (0, roosterjs_content_model_dom_1.createEmptyModel)(this.core.format.defaultFormat);
+        (0, roosterjs_content_model_dom_1.sanitizeInvisibleUnicode)(initialModel);
         this.core.api.setContentModel(this.core, initialModel, { ignoreSelection: true }, undefined /*onNodeCreated*/, true /*isInitializing*/);
         this.core.plugins.forEach(function (plugin) { return plugin.initialize(_this); });
     }
@@ -16393,10 +16403,10 @@ function shouldApplyToItem(listStyleType, listType) {
 exports.listItemMetadataApplier = {
     metadataDefinition: roosterjs_content_model_dom_1.ListMetadataDefinition,
     applierFunction: function (metadata, format, context) {
-        var _a;
-        var depth = context.listFormat.nodeStack.length - 2; // Minus two for the parent element and convert length to index
+        var _a, _b;
+        var depth = context.listFormat.currentLevel;
         if (depth >= 0) {
-            var listType = (_a = context.listFormat.nodeStack[depth + 1].listType) !== null && _a !== void 0 ? _a : 'OL';
+            var listType = (_b = (_a = context.listFormat.nodeStack[depth + 1]) === null || _a === void 0 ? void 0 : _a.listType) !== null && _b !== void 0 ? _b : 'OL';
             var listStyleType = (0, roosterjs_content_model_dom_1.getAutoListStyleType)(listType, metadata !== null && metadata !== void 0 ? metadata : {}, depth);
             if (listStyleType !== undefined) {
                 if (shouldApplyToItem(listStyleType, listType)) {
@@ -16415,10 +16425,10 @@ exports.listItemMetadataApplier = {
 exports.listLevelMetadataApplier = {
     metadataDefinition: roosterjs_content_model_dom_1.ListMetadataDefinition,
     applierFunction: function (metadata, format, context) {
-        var _a;
-        var depth = context.listFormat.nodeStack.length - 2; // Minus two for the parent element and convert length to index
+        var _a, _b;
+        var depth = context.listFormat.currentLevel;
         if (depth >= 0) {
-            var listType = (_a = context.listFormat.nodeStack[depth + 1].listType) !== null && _a !== void 0 ? _a : 'OL';
+            var listType = (_b = (_a = context.listFormat.nodeStack[depth + 1]) === null || _a === void 0 ? void 0 : _a.listType) !== null && _b !== void 0 ? _b : 'OL';
             var listStyleType = (0, roosterjs_content_model_dom_1.getAutoListStyleType)(listType, metadata !== null && metadata !== void 0 ? metadata : {}, depth);
             if (listStyleType !== undefined) {
                 if (!shouldApplyToItem(listStyleType, listType)) {
@@ -20791,6 +20801,38 @@ function normalizeText(txt, isForward) {
 exports.normalizeText = normalizeText;
 
 
+/***/ },
+
+/***/ "./packages/roosterjs-content-model-dom/lib/domUtils/stripInvisibleUnicode.ts"
+/*!************************************************************************************!*\
+  !*** ./packages/roosterjs-content-model-dom/lib/domUtils/stripInvisibleUnicode.ts ***!
+  \************************************************************************************/
+(__unused_webpack_module, exports) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.stripInvisibleUnicode = void 0;
+var INVISIBLE_UNICODE_REGEX = 
+// eslint-disable-next-line no-misleading-character-class
+/[\u00AD\u034F\u061C\u115F\u1160\u17B4\u17B5\u180B-\u180E\u200B-\u200F\u202A-\u202E\u2028\u2029\u2060-\u2064\u2066-\u2069\u3164\uFEFF\uFFA0\uFFF9-\uFFFB]|\uDB40[\uDC01-\uDCFF]/g;
+/**
+ * Strip invisible Unicode characters from a string.
+ * This removes zero-width characters, bidirectional marks, Unicode Tags (U+E0001-U+E00FF),
+ * interlinear annotation anchors, Mongolian free variation selectors,
+ * and other invisible formatting characters that can be used to hide content in links.
+ *
+ * @remarks This function strips ZWJ (U+200D) which may affect emoji sequences.
+ * It should only be applied to href attributes, not to visible text content.
+ * @param value The string to strip invisible characters from
+ * @returns The string with invisible characters removed
+ */
+function stripInvisibleUnicode(value) {
+    return value.replace(INVISIBLE_UNICODE_REGEX, '');
+}
+exports.stripInvisibleUnicode = stripInvisibleUnicode;
+
+
 /***/ },
 
 /***/ "./packages/roosterjs-content-model-dom/lib/domUtils/style/borderValues.ts"
@@ -21634,6 +21676,7 @@ var BorderStyleKeyMap = {
     borderBottom: 'border-bottom-style',
     borderLeft: 'border-left-style',
 };
+var DEFAULT_COLOR = '#000000';
 /**
  * @internal
  */
@@ -21644,7 +21687,8 @@ exports.borderColorFormatHandler = {
             borderKeys_1.BorderKeys.forEach(function (key) {
                 var width = element.style.getPropertyValue(BorderWidthKeyMap[key]);
                 var style = element.style.getPropertyValue(BorderStyleKeyMap[key]);
-                var borderColor = (0, color_1.retrieveElementColor)(element, key);
+                var color = (0, color_1.retrieveElementColor)(element, key);
+                var borderColor = color == 'initial' ? DEFAULT_COLOR : color;
                 if (borderColor) {
                     var lightModeColor = (0, color_1.getLightModeColor)(borderColor, !!context.isDarkMode, context.darkColorHandler);
                     format[key] = (0, borderValues_1.combineBorderValue)({
@@ -21663,10 +21707,10 @@ exports.borderColorFormatHandler = {
                 var value = format[key];
                 if (value) {
                     var borderValues = (0, borderValues_1.extractBorderValues)(value);
+                    var borderColorProperty = borderKeys_1.BorderColorKeyMap[key];
                     if (borderValues.color) {
                         var transformedColor = (0, color_1.adaptColor)(element, borderValues.color, 'border', !!context.isDarkMode, context.darkColorHandler);
                         if (transformedColor) {
-                            var borderColorProperty = borderKeys_1.BorderColorKeyMap[key];
                             element.style.setProperty(borderColorProperty, transformedColor);
                         }
                     }
@@ -22155,13 +22199,15 @@ var styleBasedSegmentFormats = [
     'fontFamily',
     'fontSize',
 ];
-var elementBasedSegmentFormats = [
+var sizeNeutralElementBasedSegmentFormats = [
     'strike',
     'underline',
-    'superOrSubScript',
     'italic',
     'bold',
 ];
+var elementBasedSegmentFormats = (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(sizeNeutralElementBasedSegmentFormats), false), [
+    'superOrSubScript',
+], false);
 var sharedBlockFormats = [
     'direction',
     'textAlign',
@@ -22185,7 +22231,8 @@ exports.defaultFormatKeysPerCategory = {
     listItemElement: (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(sharedBlockFormats), false), ['listItemAlign', 'margin', 'listStyle'], false),
     listLevel: ['direction', 'textAlign', 'margin', 'padding', 'listStyle', 'backgroundColor'],
     styleBasedSegment: (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(styleBasedSegmentFormats), false), ['textColor', 'backgroundColor', 'lineHeight'], false),
-    elementBasedSegment: elementBasedSegmentFormats,
+    elementBasedSegment: sizeNeutralElementBasedSegmentFormats,
+    superOrSubScript: ['superOrSubScript'],
     segment: (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(styleBasedSegmentFormats), false), (0, tslib_1.__read)(elementBasedSegmentFormats), false), [
         'textColor',
         'backgroundColor',
@@ -23582,9 +23629,9 @@ exports.shouldSetValue = shouldSetValue;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createImage = exports.createText = exports.createTableCell = exports.createTable = exports.createSelectionMarker = exports.createParagraph = exports.createFormatContainer = exports.createListItem = exports.createBr = exports.isLinkUndeletable = exports.setLinkUndeletable = exports.scrollRectIntoView = exports.normalizeRect = exports.isWhiteSpacePreserved = exports.reuseCachedElement = exports.findClosestBlockEntityContainer = exports.isBlockEntityContainer = exports.isEntityDelimiter = exports.addDelimiters = exports.generateEntityClassNames = exports.parseEntityFormat = exports.getAllEntityWrappers = exports.findClosestEntityWrapper = exports.isEntityElement = exports.unwrap = exports.wrap = exports.wrapAllChildNodes = exports.moveChildNodes = exports.toArray = exports.getSafeIdSelector = exports.getObjectKeys = exports.isElementOfType = exports.isNodeOfType = exports.hasMetadata = exports.getMetadata = exports.updateMetadata = exports.buildSelectionMarker = exports.isBlockElement = exports.areSameFormats = exports.parseFormat = exports.getRegularSelectionOffsets = exports.formatContainerProcessor = exports.tableProcessor = exports.entityProcessor = exports.processChildNode = exports.handleRegularSelection = exports.childProcessor = exports.contentModelToText = exports.contentModelToDom = exports.domToContentModel = void 0;
-exports.trimModelForSelection = exports.getDOMInsertPointRect = exports.getSelectionRootNode = exports.isBold = exports.createModelToDomConfig = exports.createModelToDomContextWithConfig = exports.createModelToDomContext = exports.createDomToModelConfig = exports.createDomToModelContextWithConfig = exports.createDomToModelContext = exports.defaultGenerateColorKey = exports.parseColor = exports.setColor = exports.getColor = exports.DeprecatedColors = exports.BorderKeys = exports.parseValueWithUnit = exports.getAutoListStyleType = exports.getOrderedListNumberStr = exports.ParagraphFormats = exports.ListFormatsToMove = exports.ListFormatsToKeep = exports.ListFormats = exports.copyFormat = exports.setParagraphNotImplicit = exports.normalizeSegmentFormat = exports.mergeTextSegments = exports.normalizeSingleSegment = exports.isEmpty = exports.addSegment = exports.unwrapBlock = exports.isGeneralSegment = exports.normalizeContentModel = exports.normalizeParagraph = exports.addTextSegment = exports.addLink = exports.addCode = exports.addBlock = exports.mutateSegment = exports.mutateSegments = exports.mutateBlock = exports.createTableRow = exports.createEmptyModel = exports.createListLevel = exports.createDivider = exports.createEntity = exports.createGeneralBlock = exports.createGeneralSegment = exports.createParagraphDecorator = exports.createContentModelDocument = void 0;
-exports.runEditSteps = exports.getClosestAncestorBlockGroupIndex = exports.getSegmentTextFormat = exports.getListStyleTypeFromString = exports.retrieveModelFormatState = exports.setTableCellBackgroundColor = exports.MIN_ALLOWED_TABLE_CELL_HEIGHT = exports.MIN_ALLOWED_TABLE_CELL_WIDTH = exports.normalizeTable = exports.setFirstColumnFormatBorders = exports.applyTableFormat = exports.deleteBlock = exports.deleteSegment = exports.deleteSelection = exports.mergeModel = exports.cloneModel = exports.setSelection = exports.hasSelectionInBlockGroup = exports.hasSelectionInSegment = exports.hasSelectionInBlock = exports.getSelectedCells = exports.getSelectedSegmentsAndParagraphs = exports.getSelectedSegments = exports.getSelectedParagraphs = exports.getOperationalBlocks = exports.getFirstSelectedTable = exports.getFirstSelectedListItem = exports.iterateSelections = exports.isBlockGroupOfType = exports.getRangesByText = exports.getImageState = exports.setImageState = exports.getParagraphMarker = exports.setParagraphMarker = exports.cacheGetEventData = exports.extractClipboardItems = exports.normalizeFontFamily = exports.transformColor = exports.retrieveDocumentMetadata = exports.readFile = exports.parseTableCells = exports.normalizeText = exports.isSpace = exports.isPunctuation = exports.extractBorderValues = exports.combineBorderValue = exports.getNodePositionFromEvent = exports.isCursorMovingKey = exports.isModifierKey = exports.isCharacterValue = void 0;
-exports.EmptySegmentFormat = exports.UnorderedListStyleMap = exports.OrderedListStyleMap = exports.TableBorderFormat = exports.NumberingListType = exports.BulletListType = exports.ChangeSource = exports.ListMetadataDefinition = exports.getListMetadata = exports.updateListMetadata = exports.getTableMetadata = exports.updateTableMetadata = exports.getTableCellMetadata = exports.updateTableCellMetadata = exports.getImageMetadata = exports.updateImageMetadata = void 0;
+exports.getDOMInsertPointRect = exports.getSelectionRootNode = exports.isBold = exports.createModelToDomConfig = exports.createModelToDomContextWithConfig = exports.createModelToDomContext = exports.createDomToModelConfig = exports.createDomToModelContextWithConfig = exports.createDomToModelContext = exports.defaultGenerateColorKey = exports.parseColor = exports.setColor = exports.getColor = exports.DeprecatedColors = exports.BorderKeys = exports.parseValueWithUnit = exports.getAutoListStyleType = exports.getOrderedListNumberStr = exports.ParagraphFormats = exports.ListFormatsToMove = exports.ListFormatsToKeep = exports.ListFormats = exports.copyFormat = exports.setParagraphNotImplicit = exports.normalizeSegmentFormat = exports.mergeTextSegments = exports.normalizeSingleSegment = exports.isEmpty = exports.addSegment = exports.unwrapBlock = exports.isGeneralSegment = exports.sanitizeInvisibleUnicode = exports.normalizeContentModel = exports.normalizeParagraph = exports.addTextSegment = exports.addLink = exports.addCode = exports.addBlock = exports.mutateSegment = exports.mutateSegments = exports.mutateBlock = exports.createTableRow = exports.createEmptyModel = exports.createListLevel = exports.createDivider = exports.createEntity = exports.createGeneralBlock = exports.createGeneralSegment = exports.createParagraphDecorator = exports.createContentModelDocument = void 0;
+exports.getSegmentTextFormat = exports.getListStyleTypeFromString = exports.retrieveModelFormatState = exports.setTableCellBackgroundColor = exports.MIN_ALLOWED_TABLE_CELL_HEIGHT = exports.MIN_ALLOWED_TABLE_CELL_WIDTH = exports.normalizeTable = exports.setFirstColumnFormatBorders = exports.applyTableFormat = exports.deleteBlock = exports.deleteSegment = exports.deleteSelection = exports.mergeModel = exports.cloneModel = exports.setSelection = exports.hasSelectionInBlockGroup = exports.hasSelectionInSegment = exports.hasSelectionInBlock = exports.getSelectedCells = exports.getSelectedSegmentsAndParagraphs = exports.getSelectedSegments = exports.getSelectedParagraphs = exports.getOperationalBlocks = exports.getFirstSelectedTable = exports.getFirstSelectedListItem = exports.iterateSelections = exports.isBlockGroupOfType = exports.getRangesByText = exports.getImageState = exports.setImageState = exports.getParagraphMarker = exports.setParagraphMarker = exports.cacheGetEventData = exports.extractClipboardItems = exports.normalizeFontFamily = exports.transformColor = exports.retrieveDocumentMetadata = exports.readFile = exports.parseTableCells = exports.stripInvisibleUnicode = exports.normalizeText = exports.isSpace = exports.isPunctuation = exports.extractBorderValues = exports.combineBorderValue = exports.getNodePositionFromEvent = exports.isCursorMovingKey = exports.isModifierKey = exports.isCharacterValue = exports.trimModelForSelection = void 0;
+exports.EmptySegmentFormat = exports.UnorderedListStyleMap = exports.OrderedListStyleMap = exports.TableBorderFormat = exports.NumberingListType = exports.BulletListType = exports.ChangeSource = exports.ListMetadataDefinition = exports.getListMetadata = exports.updateListMetadata = exports.getTableMetadata = exports.updateTableMetadata = exports.getTableCellMetadata = exports.updateTableCellMetadata = exports.getImageMetadata = exports.updateImageMetadata = exports.runEditSteps = exports.getClosestAncestorBlockGroupIndex = void 0;
 var domToContentModel_1 = __webpack_require__(/*! ./domToModel/domToContentModel */ "./packages/roosterjs-content-model-dom/lib/domToModel/domToContentModel.ts");
 Object.defineProperty(exports, "domToContentModel", ({ enumerable: true, get: function () { return domToContentModel_1.domToContentModel; } }));
 var contentModelToDom_1 = __webpack_require__(/*! ./modelToDom/contentModelToDom */ "./packages/roosterjs-content-model-dom/lib/modelToDom/contentModelToDom.ts");
@@ -23705,6 +23752,8 @@ var normalizeParagraph_1 = __webpack_require__(/*! ./modelApi/common/normalizePa
 Object.defineProperty(exports, "normalizeParagraph", ({ enumerable: true, get: function () { return normalizeParagraph_1.normalizeParagraph; } }));
 var normalizeContentModel_1 = __webpack_require__(/*! ./modelApi/common/normalizeContentModel */ "./packages/roosterjs-content-model-dom/lib/modelApi/common/normalizeContentModel.ts");
 Object.defineProperty(exports, "normalizeContentModel", ({ enumerable: true, get: function () { return normalizeContentModel_1.normalizeContentModel; } }));
+var sanitizeInvisibleUnicode_1 = __webpack_require__(/*! ./modelApi/common/sanitizeInvisibleUnicode */ "./packages/roosterjs-content-model-dom/lib/modelApi/common/sanitizeInvisibleUnicode.ts");
+Object.defineProperty(exports, "sanitizeInvisibleUnicode", ({ enumerable: true, get: function () { return sanitizeInvisibleUnicode_1.sanitizeInvisibleUnicode; } }));
 var isGeneralSegment_1 = __webpack_require__(/*! ./modelApi/typeCheck/isGeneralSegment */ "./packages/roosterjs-content-model-dom/lib/modelApi/typeCheck/isGeneralSegment.ts");
 Object.defineProperty(exports, "isGeneralSegment", ({ enumerable: true, get: function () { return isGeneralSegment_1.isGeneralSegment; } }));
 var unwrapBlock_1 = __webpack_require__(/*! ./modelApi/common/unwrapBlock */ "./packages/roosterjs-content-model-dom/lib/modelApi/common/unwrapBlock.ts");
@@ -23770,6 +23819,8 @@ var stringUtil_1 = __webpack_require__(/*! ./domUtils/stringUtil */ "./packages/
 Object.defineProperty(exports, "isPunctuation", ({ enumerable: true, get: function () { return stringUtil_1.isPunctuation; } }));
 Object.defineProperty(exports, "isSpace", ({ enumerable: true, get: function () { return stringUtil_1.isSpace; } }));
 Object.defineProperty(exports, "normalizeText", ({ enumerable: true, get: function () { return stringUtil_1.normalizeText; } }));
+var stripInvisibleUnicode_1 = __webpack_require__(/*! ./domUtils/stripInvisibleUnicode */ "./packages/roosterjs-content-model-dom/lib/domUtils/stripInvisibleUnicode.ts");
+Object.defineProperty(exports, "stripInvisibleUnicode", ({ enumerable: true, get: function () { return stripInvisibleUnicode_1.stripInvisibleUnicode; } }));
 var parseTableCells_1 = __webpack_require__(/*! ./domUtils/table/parseTableCells */ "./packages/roosterjs-content-model-dom/lib/domUtils/table/parseTableCells.ts");
 Object.defineProperty(exports, "parseTableCells", ({ enumerable: true, get: function () { return parseTableCells_1.parseTableCells; } }));
 var readFile_1 = __webpack_require__(/*! ./domUtils/readFile */ "./packages/roosterjs-content-model-dom/lib/domUtils/readFile.ts");
@@ -23900,6 +23951,8 @@ exports.ListFormatsToKeep = [
     'direction',
     'textAlign',
     'htmlAlign',
+    'marginBottom',
+    'marginTop',
 ];
 /**
  * When copy format from one block to another, these are all the formats that we can copy
@@ -24766,6 +24819,134 @@ function normalizeSegmentFormat(format, environment) {
 exports.normalizeSegmentFormat = normalizeSegmentFormat;
 
 
+/***/ },
+
+/***/ "./packages/roosterjs-content-model-dom/lib/modelApi/common/sanitizeInvisibleUnicode.ts"
+/*!**********************************************************************************************!*\
+  !*** ./packages/roosterjs-content-model-dom/lib/modelApi/common/sanitizeInvisibleUnicode.ts ***!
+  \**********************************************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.sanitizeInvisibleUnicode = void 0;
+var tslib_1 = __webpack_require__(/*! tslib */ "./node_modules/tslib/tslib.es6.mjs");
+var stripInvisibleUnicode_1 = __webpack_require__(/*! ../../domUtils/stripInvisibleUnicode */ "./packages/roosterjs-content-model-dom/lib/domUtils/stripInvisibleUnicode.ts");
+/**
+ * Strip invisible Unicode characters from all text and link hrefs in a content model.
+ * This sanitizes the model at initialization time to prevent hidden content in links
+ * or text (e.g. zero-width chars, bidirectional marks, Unicode Tags).
+ * For General segments, all Text nodes under the element are also sanitized.
+ * @param model The content model document to sanitize in-place
+ */
+function sanitizeInvisibleUnicode(model) {
+    sanitizeBlockGroup(model);
+}
+exports.sanitizeInvisibleUnicode = sanitizeInvisibleUnicode;
+function sanitizeBlockGroup(group) {
+    var e_1, _a;
+    try {
+        for (var _b = (0, tslib_1.__values)(group.blocks), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var block = _c.value;
+            sanitizeBlock(block);
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+}
+function sanitizeBlock(block) {
+    var e_2, _a, e_3, _b, e_4, _c;
+    switch (block.blockType) {
+        case 'Paragraph':
+            try {
+                for (var _d = (0, tslib_1.__values)(block.segments), _e = _d.next(); !_e.done; _e = _d.next()) {
+                    var segment = _e.value;
+                    sanitizeSegment(segment);
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+            break;
+        case 'Table':
+            try {
+                for (var _f = (0, tslib_1.__values)(block.rows), _g = _f.next(); !_g.done; _g = _f.next()) {
+                    var row = _g.value;
+                    try {
+                        for (var _h = (e_4 = void 0, (0, tslib_1.__values)(row.cells)), _j = _h.next(); !_j.done; _j = _h.next()) {
+                            var cell = _j.value;
+                            sanitizeBlockGroup(cell);
+                        }
+                    }
+                    catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                    finally {
+                        try {
+                            if (_j && !_j.done && (_c = _h.return)) _c.call(_h);
+                        }
+                        finally { if (e_4) throw e_4.error; }
+                    }
+                }
+            }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            finally {
+                try {
+                    if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
+                }
+                finally { if (e_3) throw e_3.error; }
+            }
+            break;
+        case 'BlockGroup':
+            sanitizeBlockGroup(block);
+            if (block.blockGroupType === 'General' && block.element) {
+                sanitizeTextNodes(block.element);
+            }
+            break;
+        case 'Entity':
+        case 'Divider':
+            break;
+    }
+}
+function sanitizeSegment(segment) {
+    var _a;
+    if ((_a = segment.link) === null || _a === void 0 ? void 0 : _a.format.href) {
+        segment.link.format.href = (0, stripInvisibleUnicode_1.stripInvisibleUnicode)(segment.link.format.href);
+    }
+    switch (segment.segmentType) {
+        case 'Text':
+            segment.text = (0, stripInvisibleUnicode_1.stripInvisibleUnicode)(segment.text);
+            break;
+        case 'General':
+            sanitizeTextNodes(segment.element);
+            sanitizeBlockGroup(segment);
+            break;
+        case 'Image':
+        case 'Entity':
+        case 'Br':
+        case 'SelectionMarker':
+            break;
+    }
+}
+function sanitizeTextNodes(element) {
+    var walker = element.ownerDocument.createTreeWalker(element, NodeFilter.SHOW_TEXT);
+    var node;
+    while ((node = walker.nextNode())) {
+        if (node.nodeValue) {
+            node.nodeValue = (0, stripInvisibleUnicode_1.stripInvisibleUnicode)(node.nodeValue);
+        }
+    }
+}
+
+
 /***/ },
 
 /***/ "./packages/roosterjs-content-model-dom/lib/modelApi/common/unwrapBlock.ts"
@@ -25531,7 +25712,7 @@ var BorderFormatters = (_a = {},
  * Apply vertical align, borders, and background color to all cells in the table
  */
 function formatCells(rows, format, metaOverrides) {
-    var hasBandedRows = format.hasBandedRows, hasBandedColumns = format.hasBandedColumns, bgColorOdd = format.bgColorOdd, bgColorEven = format.bgColorEven, hasFirstColumn = format.hasFirstColumn;
+    var hasBandedRows = format.hasBandedRows, hasBandedColumns = format.hasBandedColumns, bgColorOdd = format.bgColorOdd, bgColorEven = format.bgColorEven, hasFirstColumn = format.hasFirstColumn, hasHeaderRow = format.hasHeaderRow;
     rows.forEach(function (row, rowIndex) {
         row.cells.forEach(function (readonlyCell, colIndex) {
             var _a;
@@ -25562,19 +25743,14 @@ function formatCells(rows, format, metaOverrides) {
             }
             // Format Background Color
             if (!metaOverrides.bgColorOverrides[rowIndex][colIndex]) {
-                var color = void 0;
-                if (hasFirstColumn && colIndex == 0 && rowIndex > 0) {
-                    color = null;
-                }
-                else {
-                    color =
-                        hasBandedRows || hasBandedColumns
-                            ? (hasBandedColumns && colIndex % 2 != 0) ||
-                                (hasBandedRows && rowIndex % 2 != 0)
-                                ? bgColorOdd
-                                : bgColorEven
-                            : bgColorEven; /* bgColorEven is the default color */
-                }
+                var bandedColumnMod = hasFirstColumn ? 0 : 1;
+                var bandedRowMod = hasHeaderRow ? 0 : 1;
+                var color = hasBandedRows || hasBandedColumns
+                    ? (hasBandedColumns && colIndex % 2 != bandedColumnMod) ||
+                        (hasBandedRows && rowIndex % 2 != bandedRowMod)
+                        ? bgColorOdd
+                        : bgColorEven
+                    : bgColorEven; /* bgColorEven is the default color */
                 (0, setTableCellBackgroundColor_1.setTableCellBackgroundColor)(cell, color, false /*isColorOverride*/, true /*applyToSegments*/);
             }
             // Format Vertical Align
@@ -25592,6 +25768,7 @@ function formatCells(rows, format, metaOverrides) {
  * @param format The table metadata format
  */
 function setFirstColumnFormatBorders(rows, format) {
+    var customStyles = format.hasFirstColumn ? format.firstColumnCustomStyles : undefined;
     rows.forEach(function (row, rowIndex) {
         row.cells.forEach(function (readonlyCell, cellIndex) {
             var e_1, _a, e_2, _b;
@@ -25600,6 +25777,16 @@ function setFirstColumnFormatBorders(rows, format) {
                 if (rowIndex == 0) {
                     cell.isHeader = !!format.hasHeaderRow;
                 }
+                if (format.hasFirstColumn && customStyles) {
+                    setStyleIfDefined(cell.format, 'textAlign', customStyles.textAlign);
+                    setBorderColorIfExists(cell.format, 'borderTop', customStyles.borderTopColor);
+                    setBorderColorIfExists(cell.format, 'borderRight', customStyles.borderRightColor);
+                    setBorderColorIfExists(cell.format, 'borderBottom', customStyles.borderBottomColor);
+                    setBorderColorIfExists(cell.format, 'borderLeft', customStyles.borderLeftColor);
+                    if (customStyles.backgroundColor) {
+                        (0, setTableCellBackgroundColor_1.setTableCellBackgroundColor)(cell, customStyles.backgroundColor, false /*isColorOverride*/, true /*applyToSegments*/);
+                    }
+                }
                 try {
                     for (var _c = (0, tslib_1.__values)(cell.blocks), _d = _c.next(); !_d.done; _d = _c.next()) {
                         var block = _d.value;
@@ -25608,9 +25795,12 @@ function setFirstColumnFormatBorders(rows, format) {
                                 for (var _e = (e_2 = void 0, (0, tslib_1.__values)(block.segments)), _f = _e.next(); !_f.done; _f = _e.next()) {
                                     var segment = _f.value;
                                     (0, mutate_1.mutateSegment)(block, segment, function (cellSegment) {
+                                        var _a, _b;
                                         if (format.hasFirstColumn) {
-                                            cellSegment.format.fontWeight = 'bold';
-                                            cell.format.fontWeight = 'bold';
+                                            setStyleIfDefined(cellSegment.format, 'fontWeight', (_a = customStyles === null || customStyles === void 0 ? void 0 : customStyles.fontWeight) !== null && _a !== void 0 ? _a : 'bold');
+                                            setStyleIfDefined(cell.format, 'textAlign', customStyles === null || customStyles === void 0 ? void 0 : customStyles.textAlign);
+                                            setStyleIfDefined(cell.format, 'fontWeight', (_b = customStyles === null || customStyles === void 0 ? void 0 : customStyles.fontWeight) !== null && _b !== void 0 ? _b : 'bold');
+                                            setStyleIfDefined(cellSegment.format, 'italic', customStyles === null || customStyles === void 0 ? void 0 : customStyles.italic);
                                         }
                                         else if (cellSegment.format.fontWeight == 'bold' &&
                                             cell.format.fontWeight == 'bold') {
@@ -25642,24 +25832,74 @@ function setFirstColumnFormatBorders(rows, format) {
     });
 }
 exports.setFirstColumnFormatBorders = setFirstColumnFormatBorders;
+function setBorderColorIfExists(format, key, value) {
+    if (value !== undefined) {
+        setBorderColor(format, key, value);
+    }
+}
+function setStyleIfDefined(format, key, value) {
+    if (value !== undefined) {
+        format[key] = value;
+    }
+}
 function setHeaderRowFormat(rows, format, metaOverrides) {
     var _a;
-    // Exit early if hasHeaderRow is not set
     if (!format.hasHeaderRow) {
         return;
     }
     var rowIndex = 0;
+    var customStyles = format.headerRowCustomStyles;
     (_a = rows[rowIndex]) === null || _a === void 0 ? void 0 : _a.cells.forEach(function (readonlyCell, cellIndex) {
+        var e_3, _a, e_4, _b;
+        var _c, _d, _e, _f;
         var cell = (0, mutate_1.mutateBlock)(readonlyCell);
         cell.isHeader = true;
-        cell.format.fontWeight = 'bold';
+        cell.format.fontWeight = (_c = customStyles === null || customStyles === void 0 ? void 0 : customStyles.fontWeight) !== null && _c !== void 0 ? _c : 'bold';
         if (format.headerRowColor) {
             if (!metaOverrides.bgColorOverrides[rowIndex][cellIndex]) {
                 (0, setTableCellBackgroundColor_1.setTableCellBackgroundColor)(cell, format.headerRowColor, false /*isColorOverride*/, true /*applyToSegments*/);
             }
-            setBorderColor(cell.format, 'borderTop', format.headerRowColor);
-            setBorderColor(cell.format, 'borderRight', format.headerRowColor);
-            setBorderColor(cell.format, 'borderLeft', format.headerRowColor);
+            setBorderColor(cell.format, 'borderTop', (_d = customStyles === null || customStyles === void 0 ? void 0 : customStyles.borderTopColor) !== null && _d !== void 0 ? _d : format.headerRowColor);
+            setBorderColor(cell.format, 'borderRight', (_e = customStyles === null || customStyles === void 0 ? void 0 : customStyles.borderRightColor) !== null && _e !== void 0 ? _e : format.headerRowColor);
+            setBorderColor(cell.format, 'borderLeft', (_f = customStyles === null || customStyles === void 0 ? void 0 : customStyles.borderLeftColor) !== null && _f !== void 0 ? _f : format.headerRowColor);
+        }
+        if (customStyles) {
+            setStyleIfDefined(cell.format, 'textAlign', customStyles.textAlign);
+            setBorderColorIfExists(cell.format, 'borderBottom', customStyles.borderBottomColor);
+            try {
+                for (var _g = (0, tslib_1.__values)(cell.blocks), _h = _g.next(); !_h.done; _h = _g.next()) {
+                    var block = _h.value;
+                    if (block.blockType == 'Paragraph') {
+                        try {
+                            for (var _j = (e_4 = void 0, (0, tslib_1.__values)(block.segments)), _k = _j.next(); !_k.done; _k = _j.next()) {
+                                var segment = _k.value;
+                                (0, mutate_1.mutateSegment)(block, segment, function (cellSegment) {
+                                    if (customStyles.italic) {
+                                        cellSegment.format.italic = customStyles.italic;
+                                    }
+                                    else if (cellSegment.format.italic) {
+                                        delete cellSegment.format.italic;
+                                    }
+                                });
+                            }
+                        }
+                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                        finally {
+                            try {
+                                if (_k && !_k.done && (_b = _j.return)) _b.call(_j);
+                            }
+                            finally { if (e_4) throw e_4.error; }
+                        }
+                    }
+                }
+            }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            finally {
+                try {
+                    if (_h && !_h.done && (_a = _g.return)) _a.call(_g);
+                }
+                finally { if (e_3) throw e_3.error; }
+            }
         }
     });
 }
@@ -26573,7 +26813,7 @@ function mergeParagraph(markerPosition, newPara, mergeToCurrentParagraph, contex
     }
 }
 function mergeTables(markerPosition, newTable, source) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     var tableContext = markerPosition.tableContext, marker = markerPosition.marker;
     if (tableContext && source.blocks.length == 1 && source.blocks[0] == newTable) {
         var readonlyTable = tableContext.table, colIndex = tableContext.colIndex, rowIndex = tableContext.rowIndex;
@@ -26610,12 +26850,30 @@ function mergeTables(markerPosition, newTable, source) {
                 }
             }
         }
+        var logicalRowOffsets = [];
+        var logicalRowCount = 0;
+        for (var i = 0; i < newTableRowCount; i++) {
+            logicalRowOffsets[i] = logicalRowCount;
+            var row = newTable.rows[i];
+            if (row && row.cells.some(function (cell) { return !cell.spanAbove; })) {
+                logicalRowCount++;
+            }
+        }
         for (var i = 0; i < newTable.rows.length; i++) {
-            var targetRowIndex = getTargetRowIndex(table, rowIndex, i, colIndex);
+            var sourceRow = newTable.rows[i];
+            var targetRowIndex = getTargetRowIndex(table, rowIndex, logicalRowOffsets[i], colIndex);
+            var logicalColOffsets = [];
+            var logicalColCount = 0;
+            for (var j = 0; j < sourceRow.cells.length; j++) {
+                logicalColOffsets[j] = logicalColCount;
+                if (!((_e = sourceRow.cells[j]) === null || _e === void 0 ? void 0 : _e.spanLeft)) {
+                    logicalColCount++;
+                }
+            }
             for (var j = 0; j < newTable.rows[i].cells.length; j++) {
-                var newCell = newTable.rows[i].cells[j];
-                var targetColIndex = getTargetColIndex(table, targetRowIndex, colIndex, j);
-                var oldCell = (_e = table.rows[targetRowIndex]) === null || _e === void 0 ? void 0 : _e.cells[targetColIndex];
+                var newCell = sourceRow.cells[j];
+                var targetColIndex = getTargetColIndex(table, targetRowIndex, colIndex, logicalColOffsets[j]);
+                var oldCell = (_f = table.rows[targetRowIndex]) === null || _f === void 0 ? void 0 : _f.cells[targetColIndex];
                 table.rows[targetRowIndex].cells[targetColIndex] = newCell;
                 if (i == 0 && j == 0) {
                     var newMarker = (0, createSelectionMarker_1.createSelectionMarker)(marker.format);
@@ -27854,14 +28112,28 @@ var updateMetadata_1 = __webpack_require__(/*! ./updateMetadata */ "./packages/r
 var TableBorderFormat_1 = __webpack_require__(/*! ../../constants/TableBorderFormat */ "./packages/roosterjs-content-model-dom/lib/constants/TableBorderFormat.ts");
 var definitionCreators_1 = __webpack_require__(/*! ./definitionCreators */ "./packages/roosterjs-content-model-dom/lib/modelApi/metadata/definitionCreators.ts");
 var NullStringDefinition = (0, definitionCreators_1.createStringDefinition)(false /** isOptional */, undefined /** value */, true /** allowNull */);
+var OptionalStringDefinition = (0, definitionCreators_1.createStringDefinition)(true /** isOptional */);
+var OptionalBooleanDefinition = (0, definitionCreators_1.createBooleanDefinition)(true /** isOptional */);
 var BooleanDefinition = (0, definitionCreators_1.createBooleanDefinition)(false /** isOptional */);
+var TableSpecialCellFormatDefinition = (0, definitionCreators_1.createObjectDefinition)({
+    fontWeight: OptionalStringDefinition,
+    italic: OptionalBooleanDefinition,
+    borderTopColor: OptionalStringDefinition,
+    borderRightColor: OptionalStringDefinition,
+    borderBottomColor: OptionalStringDefinition,
+    borderLeftColor: OptionalStringDefinition,
+    textAlign: OptionalStringDefinition,
+    backgroundColor: OptionalStringDefinition,
+}, true /* isOptional */, true /** allowNull */);
 var TableFormatDefinition = (0, definitionCreators_1.createObjectDefinition)({
     topBorderColor: NullStringDefinition,
     bottomBorderColor: NullStringDefinition,
     verticalBorderColor: NullStringDefinition,
     hasHeaderRow: BooleanDefinition,
     headerRowColor: NullStringDefinition,
+    headerRowCustomStyles: TableSpecialCellFormatDefinition,
     hasFirstColumn: BooleanDefinition,
+    firstColumnCustomStyles: TableSpecialCellFormatDefinition,
     hasBandedColumns: BooleanDefinition,
     hasBandedRows: BooleanDefinition,
     bgColorEven: NullStringDefinition,
@@ -28024,10 +28296,13 @@ function getSelectedSegments(model, includingFormatHolder, mutate) {
     return segments.map(function (x) { return x[0]; });
 }
 exports.getSelectedSegments = getSelectedSegments;
-function getSelectedParagraphs(model, mutate) {
+function getSelectedParagraphs(model, mutate, removeUnmeaningful) {
+    if (removeUnmeaningful === void 0) { removeUnmeaningful = true; }
     var selections = collectSelections(model, { includeListFormatHolder: 'never' });
     var result = [];
-    removeUnmeaningfulSelections(selections);
+    if (removeUnmeaningful) {
+        removeUnmeaningfulSelections(selections);
+    }
     selections.forEach(function (_a) {
         var block = _a.block;
         if ((block === null || block === void 0 ? void 0 : block.blockType) == 'Paragraph') {
@@ -28801,6 +29076,7 @@ function createModelToDomFormatContext() {
         listFormat: {
             threadItemCounts: [],
             nodeStack: [],
+            currentLevel: 0,
         },
         implicitFormat: {},
     };
@@ -29375,6 +29651,7 @@ var handleList = function (doc, parent, listItem, context, refNode) {
         var parentLevel = nodeStack[layer];
         var stackLevel = nodeStack[layer + 1];
         var itemLevel = listItem.levels[layer];
+        context.listFormat.currentLevel = layer;
         if (stackLevel.listType != itemLevel.listType ||
             ((_a = stackLevel.dataset) === null || _a === void 0 ? void 0 : _a.editingInfo) != itemLevel.dataset.editingInfo ||
             (itemLevel.listType == 'OL' &&
@@ -29410,6 +29687,7 @@ var handleList = function (doc, parent, listItem, context, refNode) {
         var newList = void 0;
         var isNewlyCreated = false;
         var levelRefNode = (_c = nodeStack[layer].refNode) !== null && _c !== void 0 ? _c : null;
+        context.listFormat.currentLevel = layer;
         if (context.allowCacheListItem && level.cachedElement) {
             newList = level.cachedElement;
             nodeStack[layer].refNode = (0, reuseCachedElement_1.reuseCachedElement)(lastParent, level.cachedElement, levelRefNode, context.rewriteFromModel);
@@ -30210,8 +30488,9 @@ function handleSegmentCommon(doc, segmentNode, containerNode, segment, context,
     }
     (0, applyFormat_1.applyFormat)(containerNode, context.formatAppliers.styleBasedSegment, segment.format, context);
     segmentNodes === null || segmentNodes === void 0 ? void 0 : segmentNodes.push(segmentNode);
-    context.modelHandlers.segmentDecorator(doc, containerNode, segment, context, segmentNodes);
     (0, applyFormat_1.applyFormat)(containerNode, context.formatAppliers.elementBasedSegment, segment.format, context);
+    context.modelHandlers.segmentDecorator(doc, containerNode, segment, context, segmentNodes);
+    (0, applyFormat_1.applyFormat)(containerNode, context.formatAppliers.superOrSubScript, segment.format, context);
     (_a = context.onNodeCreated) === null || _a === void 0 ? void 0 : _a.call(context, segment, segmentNode);
 }
 exports.handleSegmentCommon = handleSegmentCommon;
@@ -36426,7 +36705,7 @@ var ImageEditPlugin = /** @class */ (function () {
             operation === 'crop');
     };
     ImageEditPlugin.prototype.canRegenerateImage = function (image) {
-        return (0, canRegenerateImage_1.canRegenerateImage)(image);
+        return (0, canRegenerateImage_1.canRegenerateImage)(image, this.options.resolveImageSource);
     };
     ImageEditPlugin.prototype.startCropMode = function (editor, image, isRTL) {
         var _this = this;
@@ -37187,12 +37466,21 @@ exports.canRegenerateImage = void 0;
  * Check if we can regenerate edited image from the source image.
  * An image can't regenerate result when there is CORS issue of the source content.
  * @param img The image element to test
+ * @param resolveImageSource Optional callback to resolve an image `src` into a canvas-safe URL (e.g., a data URL).
  * @returns True when we can regenerate the edited image, otherwise false
  */
-function canRegenerateImage(img) {
+function canRegenerateImage(img, resolveImageSource) {
     if (!img) {
         return false;
     }
+    // If a resolveImageSource callback is provided, the image source should be resolved to a
+    // canvas-compatible URL when editing starts, so we can assume the image can be regenerated.
+    if (resolveImageSource && img.src) {
+        var resolved = resolveImageSource(img.src);
+        if (resolved && resolved !== img.src) {
+            return true;
+        }
+    }
     try {
         var canvas = img.ownerDocument.createElement('canvas');
         canvas.width = 10;
@@ -37296,7 +37584,7 @@ var IMAGE_EDIT_SHADOW_ROOT = 'ImageEditShadowRoot';
  * @internal
  */
 function createImageWrapper(editor, image, options, editInfo, htmlOptions, operation) {
-    var imageClone = cloneImage(image, editInfo);
+    var imageClone = cloneImage(image, editInfo, options.resolveImageSource);
     var doc = editor.getDocument();
     var rotators = [];
     if (!options.disableRotate && operation.indexOf('rotate') > -1) {
@@ -37362,11 +37650,12 @@ var createBorder = function (editor, borderColor) {
     resizeBorder.setAttribute("style", "position:absolute;left:0;right:0;top:0;bottom:0;border:solid 2px " + borderColor + ";pointer-events:none;");
     return resizeBorder;
 };
-var cloneImage = function (image, editInfo) {
+var cloneImage = function (image, editInfo, resolveImageSource) {
+    var _a;
     var imageClone = image.cloneNode(true);
     imageClone.style.removeProperty('transform');
     if (editInfo.src) {
-        imageClone.src = editInfo.src;
+        imageClone.src = (_a = resolveImageSource === null || resolveImageSource === void 0 ? void 0 : resolveImageSource(editInfo.src)) !== null && _a !== void 0 ? _a : editInfo.src;
         imageClone.removeAttribute('id');
         imageClone.style.removeProperty('max-width');
         imageClone.style.removeProperty('max-height');
@@ -39031,6 +39320,7 @@ var LIST_ELEMENT_TAGS = ['UL', 'OL', 'LI'];
 var LIST_ELEMENT_SELECTOR = LIST_ELEMENT_TAGS.join(',');
 var END_OF_PARAGRAPH = 'EOP';
 var SELECTED_CLASS = 'Selected';
+var BASE_PADDING_WAC_LISTS = '1em';
 /**
  * Wac components do not use sub and super tags, instead only add vertical align to a span.
  * This parser normalize the content for content model
@@ -39128,15 +39418,13 @@ var wacListItemParser = function (format, element) {
     if (element.style.display === 'block') {
         format.displayForDummyItem = undefined;
     }
-    format.marginLeft = undefined;
-    format.marginRight = undefined;
 };
 /**
  * Wac usually adds padding to lists which is unwanted so remove it.
  */
 var wacListLevelParser = function (format) {
     format.marginLeft = undefined;
-    format.paddingLeft = undefined;
+    format.paddingLeft = BASE_PADDING_WAC_LISTS;
 };
 /**
  * This function returns whether we need to clear the list format.