roosterjs 9.6.0 → 9.8.0

package/dist/rooster-amd.js

@@ -2093,8 +2093,8 @@ exports["default"] = getDarkColor;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.formatTextSegmentBeforeSelectionMarker = exports.formatSegmentWithContentModel = exports.formatParagraphWithContentModel = exports.formatImageWithContentModel = exports.formatTableWithContentModel = exports.clearSelectedCells = exports.insertTableColumn = exports.insertTableRow = exports.insertEntity = exports.toggleCode = exports.setParagraphMargin = exports.adjustImageSelection = exports.setImageAltText = exports.adjustLinkSelection = exports.removeLink = exports.insertLink = exports.clearFormat = exports.getFormatState = exports.changeImage = exports.setImageBoxShadow = exports.setImageBorder = exports.setSpacing = exports.toggleBlockQuote = exports.setHeadingLevel = exports.setDirection = exports.setAlignment = exports.setIndentation = exports.setListStartNumber = exports.setListStyle = exports.insertImage = exports.changeCapitalization = exports.applySegmentFormat = exports.changeFontSize = exports.setTextColor = exports.setFontSize = exports.setFontName = exports.setBackgroundColor = exports.toggleSuperscript = exports.toggleSubscript = exports.toggleStrikethrough = exports.toggleUnderline = exports.toggleItalic = exports.toggleBold = exports.toggleNumbering = exports.toggleBullet = exports.applyTableBorderFormat = exports.editTable = exports.setTableCellShade = exports.formatTable = exports.insertTable = void 0;
-exports.getListAnnounceData = exports.matchLink = exports.setModelIndentation = exports.findListItemsInSameThread = exports.setModelListStartNumber = exports.setModelListStyle = exports.setListType = exports.formatInsertPointWithContentModel = void 0;
+exports.formatSegmentWithContentModel = exports.formatParagraphWithContentModel = exports.formatImageWithContentModel = exports.formatTableWithContentModel = exports.clearSelectedCells = exports.insertTableColumn = exports.insertTableRow = exports.insertEntity = exports.toggleCode = exports.setParagraphMargin = exports.adjustImageSelection = exports.setImageAltText = exports.adjustLinkSelection = exports.removeLink = exports.insertLink = exports.clearFormat = exports.getFormatState = exports.changeImage = exports.setImageBoxShadow = exports.setImageBorder = exports.setSpacing = exports.toggleBlockQuote = exports.setHeadingLevel = exports.setDirection = exports.setAlignment = exports.setIndentation = exports.setListStartNumber = exports.setListStyle = exports.insertImage = exports.splitTextSegment = exports.changeCapitalization = exports.applySegmentFormat = exports.changeFontSize = exports.setTextColor = exports.setFontSize = exports.setFontName = exports.setBackgroundColor = exports.toggleSuperscript = exports.toggleSubscript = exports.toggleStrikethrough = exports.toggleUnderline = exports.toggleItalic = exports.toggleBold = exports.toggleNumbering = exports.toggleBullet = exports.applyTableBorderFormat = exports.editTable = exports.setTableCellShade = exports.formatTable = exports.insertTable = void 0;
+exports.getListAnnounceData = exports.matchLink = exports.setModelIndentation = exports.findListItemsInSameThread = exports.setModelListStartNumber = exports.setModelListStyle = exports.setListType = exports.formatInsertPointWithContentModel = exports.formatTextSegmentBeforeSelectionMarker = void 0;
 var insertTable_1 = __webpack_require__(/*! ./publicApi/table/insertTable */ "./packages/roosterjs-content-model-api/lib/publicApi/table/insertTable.ts");
 Object.defineProperty(exports, "insertTable", ({ enumerable: true, get: function () { return insertTable_1.insertTable; } }));
 var formatTable_1 = __webpack_require__(/*! ./publicApi/table/formatTable */ "./packages/roosterjs-content-model-api/lib/publicApi/table/formatTable.ts");
@@ -2135,6 +2135,8 @@ var applySegmentFormat_1 = __webpack_require__(/*! ./publicApi/segment/applySegm
 Object.defineProperty(exports, "applySegmentFormat", ({ enumerable: true, get: function () { return applySegmentFormat_1.applySegmentFormat; } }));
 var changeCapitalization_1 = __webpack_require__(/*! ./publicApi/segment/changeCapitalization */ "./packages/roosterjs-content-model-api/lib/publicApi/segment/changeCapitalization.ts");
 Object.defineProperty(exports, "changeCapitalization", ({ enumerable: true, get: function () { return changeCapitalization_1.changeCapitalization; } }));
+var splitTextSegment_1 = __webpack_require__(/*! ./publicApi/segment/splitTextSegment */ "./packages/roosterjs-content-model-api/lib/publicApi/segment/splitTextSegment.ts");
+Object.defineProperty(exports, "splitTextSegment", ({ enumerable: true, get: function () { return splitTextSegment_1.splitTextSegment; } }));
 var insertImage_1 = __webpack_require__(/*! ./publicApi/image/insertImage */ "./packages/roosterjs-content-model-api/lib/publicApi/image/insertImage.ts");
 Object.defineProperty(exports, "insertImage", ({ enumerable: true, get: function () { return insertImage_1.insertImage; } }));
 var setListStyle_1 = __webpack_require__(/*! ./publicApi/list/setListStyle */ "./packages/roosterjs-content-model-api/lib/publicApi/list/setListStyle.ts");
@@ -3459,6 +3461,15 @@ function setListType(model, listType, removeMargins) {
                     }
                     (0, roosterjs_content_model_dom_1.mutateBlock)(parent).blocks.splice(index, 1, newListItem);
                     existingListItems.push(newListItem);
+                    var levelIndex = newListItem.levels.length - 1;
+                    var level = (0, roosterjs_content_model_dom_1.mutateBlock)(newListItem).levels[levelIndex];
+                    if (level) {
+                        (0, roosterjs_content_model_dom_1.updateListMetadata)(level, function (metadata) {
+                            return Object.assign({}, metadata, {
+                                applyListStyleFromLevel: true,
+                            });
+                        });
+                    }
                 }
                 else {
                     existingListItems.forEach(function (x) { return ((0, roosterjs_content_model_dom_1.mutateBlock)(x).levels[0].format.marginBottom = '0px'); });
@@ -5877,6 +5888,47 @@ function setTextColor(editor, textColor) {
 exports.setTextColor = setTextColor;
 
 
+/***/ }),
+
+/***/ "./packages/roosterjs-content-model-api/lib/publicApi/segment/splitTextSegment.ts":
+/*!****************************************************************************************!*\
+  !*** ./packages/roosterjs-content-model-api/lib/publicApi/segment/splitTextSegment.ts ***!
+  \****************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.splitTextSegment = void 0;
+var tslib_1 = __webpack_require__(/*! tslib */ "./node_modules/tslib/tslib.es6.mjs");
+var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
+/**
+ * Split given text segments from the given range
+ * @param textSegment segment to split
+ * @param parent parent paragraph the text segment exist in
+ * @param start starting point of the split
+ * @param end ending point of the split
+ * @returns text segment from the indicated split.
+ */
+function splitTextSegment(textSegment, parent, start, end) {
+    var _a;
+    var text = textSegment.text;
+    var index = parent.segments.indexOf(textSegment);
+    var middleSegment = (0, roosterjs_content_model_dom_1.createText)(text.substring(start, end), textSegment.format, textSegment.link, textSegment.code);
+    var newSegments = [middleSegment];
+    if (start > 0) {
+        newSegments.unshift((0, roosterjs_content_model_dom_1.createText)(text.substring(0, start), textSegment.format, textSegment.link, textSegment.code));
+    }
+    if (end < text.length) {
+        newSegments.push((0, roosterjs_content_model_dom_1.createText)(text.substring(end), textSegment.format, textSegment.link, textSegment.code));
+    }
+    newSegments.forEach(function (segment) { return (segment.isSelected = textSegment.isSelected); });
+    (_a = parent.segments).splice.apply(_a, (0, tslib_1.__spreadArray)([index, 1], (0, tslib_1.__read)(newSegments), false));
+    return middleSegment;
+}
+exports.splitTextSegment = splitTextSegment;
+
+
 /***/ }),
 
 /***/ "./packages/roosterjs-content-model-api/lib/publicApi/segment/toggleBold.ts":
@@ -8259,12 +8311,14 @@ exports.getPath = getPath;
 /*!********************************************************************************!*\
   !*** ./packages/roosterjs-content-model-core/lib/coreApi/announce/announce.ts ***!
   \********************************************************************************/
-/***/ ((__unused_webpack_module, exports) => {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.announce = void 0;
+var createAriaLiveElement_1 = __webpack_require__(/*! ../../utils/createAriaLiveElement */ "./packages/roosterjs-content-model-core/lib/utils/createAriaLiveElement.ts");
+var DOT_STRING = '.';
 /**
  * @internal
  * Announce the given data
@@ -8272,17 +8326,17 @@ exports.announce = void 0;
  * @param announceData Data to announce
  */
 var announce = function (core, announceData) {
-    var _a;
-    var text = announceData.text, defaultStrings = announceData.defaultStrings, _b = announceData.formatStrings, formatStrings = _b === void 0 ? [] : _b;
+    var text = announceData.text, defaultStrings = announceData.defaultStrings, _a = announceData.formatStrings, formatStrings = _a === void 0 ? [] : _a;
     var announcerStringGetter = core.lifecycle.announcerStringGetter;
     var template = defaultStrings && (announcerStringGetter === null || announcerStringGetter === void 0 ? void 0 : announcerStringGetter(defaultStrings));
     var textToAnnounce = formatString(template || text, formatStrings);
-    if (textToAnnounce) {
+    if (!core.lifecycle.announceContainer) {
+        core.lifecycle.announceContainer = (0, createAriaLiveElement_1.createAriaLiveElement)(core.physicalRoot.ownerDocument);
+    }
+    if (textToAnnounce && core.lifecycle.announceContainer) {
         var announceContainer = core.lifecycle.announceContainer;
-        if (!announceContainer || textToAnnounce == announceContainer.textContent) {
-            (_a = announceContainer === null || announceContainer === void 0 ? void 0 : announceContainer.parentElement) === null || _a === void 0 ? void 0 : _a.removeChild(announceContainer);
-            announceContainer = createAriaLiveElement(core.physicalRoot.ownerDocument);
-            core.lifecycle.announceContainer = announceContainer;
+        if (textToAnnounce == announceContainer.textContent) {
+            textToAnnounce += DOT_STRING;
         }
         if (announceContainer) {
             announceContainer.textContent = textToAnnounce;
@@ -8301,19 +8355,6 @@ function formatString(text, formatStrings) {
     });
     return text;
 }
-function createAriaLiveElement(document) {
-    var div = document.createElement('div');
-    div.style.clip = 'rect(0px, 0px, 0px, 0px)';
-    div.style.clipPath = 'inset(100%)';
-    div.style.height = '1px';
-    div.style.overflow = 'hidden';
-    div.style.position = 'absolute';
-    div.style.whiteSpace = 'nowrap';
-    div.style.width = '1px';
-    div.ariaLive = 'assertive';
-    document.body.appendChild(div);
-    return div;
-}
 
 
 /***/ }),
@@ -8426,7 +8467,7 @@ exports.coreApiMap = {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createContentModel = void 0;
-var updateCachedSelection_1 = __webpack_require__(/*! ../../corePlugin/cache/updateCachedSelection */ "./packages/roosterjs-content-model-core/lib/corePlugin/cache/updateCachedSelection.ts");
+var updateCache_1 = __webpack_require__(/*! ../../corePlugin/cache/updateCache */ "./packages/roosterjs-content-model-core/lib/corePlugin/cache/updateCache.ts");
 var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
 /**
  * @internal
@@ -8462,8 +8503,7 @@ var createContentModel = function (core, option, selectionOverride) {
     }
     var model = (0, roosterjs_content_model_dom_1.domToContentModel)(core.logicalRoot, domToModelContext);
     if (saveIndex) {
-        core.cache.cachedModel = model;
-        (0, updateCachedSelection_1.updateCachedSelection)(core.cache, selection);
+        (0, updateCache_1.updateCache)(core.cache, model, selection);
     }
     return model;
 };
@@ -9165,7 +9205,7 @@ exports.restoreUndoSnapshot = restoreUndoSnapshot;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.setContentModel = void 0;
-var updateCachedSelection_1 = __webpack_require__(/*! ../../corePlugin/cache/updateCachedSelection */ "./packages/roosterjs-content-model-core/lib/corePlugin/cache/updateCachedSelection.ts");
+var updateCache_1 = __webpack_require__(/*! ../../corePlugin/cache/updateCache */ "./packages/roosterjs-content-model-core/lib/corePlugin/cache/updateCache.ts");
 var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
 /**
  * @internal
@@ -9183,15 +9223,15 @@ var setContentModel = function (core, model, option, onNodeCreated) {
     modelToDomContext.onNodeCreated = onNodeCreated;
     var selection = (0, roosterjs_content_model_dom_1.contentModelToDom)(core.logicalRoot.ownerDocument, core.logicalRoot, model, modelToDomContext);
     if (!core.lifecycle.shadowEditFragment) {
-        (0, updateCachedSelection_1.updateCachedSelection)(core.cache, selection || undefined);
+        // Clear pending mutations since we will use our latest model object to replace existing cache
+        (_a = core.cache.textMutationObserver) === null || _a === void 0 ? void 0 : _a.flushMutations(true /*ignoreMutations*/);
+        (0, updateCache_1.updateCache)(core.cache, model, selection);
         if (!(option === null || option === void 0 ? void 0 : option.ignoreSelection) && selection) {
             core.api.setDOMSelection(core, selection);
         }
         else {
             core.selection.selection = selection;
         }
-        // Clear pending mutations since we will use our latest model object to replace existing cache
-        (_a = core.cache.textMutationObserver) === null || _a === void 0 ? void 0 : _a.flushMutations(model);
     }
     return selection;
 };
@@ -9204,12 +9244,13 @@ exports.setContentModel = setContentModel;
 /*!**************************************************************************************************!*\
   !*** ./packages/roosterjs-content-model-core/lib/coreApi/setDOMSelection/addRangeToSelection.ts ***!
   \**************************************************************************************************/
-/***/ ((__unused_webpack_module, exports) => {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.addRangeToSelection = void 0;
+var areSameSelections_1 = __webpack_require__(/*! ../../corePlugin/cache/areSameSelections */ "./packages/roosterjs-content-model-core/lib/corePlugin/cache/areSameSelections.ts");
 /**
  * @internal
  */
@@ -9219,11 +9260,7 @@ function addRangeToSelection(doc, range, isReverted) {
     var selection = (_a = doc.defaultView) === null || _a === void 0 ? void 0 : _a.getSelection();
     if (selection) {
         var currentRange = selection.rangeCount > 0 && selection.getRangeAt(0);
-        if (currentRange &&
-            currentRange.startContainer == range.startContainer &&
-            currentRange.endContainer == range.endContainer &&
-            currentRange.startOffset == range.startOffset &&
-            currentRange.endOffset == range.endOffset) {
+        if (currentRange && (0, areSameSelections_1.areSameRanges)(currentRange, range)) {
             return;
         }
         selection.removeAllRanges();
@@ -9238,40 +9275,6 @@ function addRangeToSelection(doc, range, isReverted) {
 exports.addRangeToSelection = addRangeToSelection;
 
 
-/***/ }),
-
-/***/ "./packages/roosterjs-content-model-core/lib/coreApi/setDOMSelection/ensureImageHasSpanParent.ts":
-/*!*******************************************************************************************************!*\
-  !*** ./packages/roosterjs-content-model-core/lib/coreApi/setDOMSelection/ensureImageHasSpanParent.ts ***!
-  \*******************************************************************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.ensureImageHasSpanParent = void 0;
-var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
-/**
- * @internal
- * Ensure image is wrapped by a span element
- * @param image
- * @returns the image
- */
-function ensureImageHasSpanParent(image) {
-    var parent = image.parentElement;
-    if (parent &&
-        (0, roosterjs_content_model_dom_1.isNodeOfType)(parent, 'ELEMENT_NODE') &&
-        (0, roosterjs_content_model_dom_1.isElementOfType)(parent, 'span') &&
-        parent.firstChild == image &&
-        parent.lastChild == image) {
-        return image;
-    }
-    (0, roosterjs_content_model_dom_1.wrap)(image.ownerDocument, image, 'span');
-    return image;
-}
-exports.ensureImageHasSpanParent = ensureImageHasSpanParent;
-
-
 /***/ }),
 
 /***/ "./packages/roosterjs-content-model-core/lib/coreApi/setDOMSelection/findLastedCoInMergedCell.ts":
@@ -9374,7 +9377,7 @@ exports.findTableCellElement = findTableCellElement;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.setDOMSelection = void 0;
 var addRangeToSelection_1 = __webpack_require__(/*! ./addRangeToSelection */ "./packages/roosterjs-content-model-core/lib/coreApi/setDOMSelection/addRangeToSelection.ts");
-var ensureImageHasSpanParent_1 = __webpack_require__(/*! ./ensureImageHasSpanParent */ "./packages/roosterjs-content-model-core/lib/coreApi/setDOMSelection/ensureImageHasSpanParent.ts");
+var areSameSelections_1 = __webpack_require__(/*! ../../corePlugin/cache/areSameSelections */ "./packages/roosterjs-content-model-core/lib/corePlugin/cache/areSameSelections.ts");
 var ensureUniqueId_1 = __webpack_require__(/*! ../setEditorStyle/ensureUniqueId */ "./packages/roosterjs-content-model-core/lib/coreApi/setEditorStyle/ensureUniqueId.ts");
 var findLastedCoInMergedCell_1 = __webpack_require__(/*! ./findLastedCoInMergedCell */ "./packages/roosterjs-content-model-core/lib/coreApi/setDOMSelection/findLastedCoInMergedCell.ts");
 var findTableCellElement_1 = __webpack_require__(/*! ./findTableCellElement */ "./packages/roosterjs-content-model-core/lib/coreApi/setDOMSelection/findTableCellElement.ts");
@@ -9387,11 +9390,16 @@ var TABLE_ID = 'table';
 var CARET_CSS_RULE = 'caret-color: transparent';
 var TRANSPARENT_SELECTION_CSS_RULE = 'background-color: transparent !important;';
 var SELECTION_SELECTOR = '*::selection';
+var DEFAULT_SELECTION_BORDER_COLOR = '#DB626C';
 /**
  * @internal
  */
 var setDOMSelection = function (core, selection, skipSelectionChangedEvent) {
     var _a, _b, _c;
+    var existingSelection = core.api.getDOMSelection(core);
+    if (existingSelection && selection && (0, areSameSelections_1.areSameSelections)(existingSelection, selection)) {
+        return;
+    }
     // We are applying a new selection, so we don't need to apply cached selection in DOMEventPlugin.
     // Set skipReselectOnFocus to skip this behavior
     var skipReselectOnFocus = core.selection.skipReselectOnFocus;
@@ -9404,15 +9412,12 @@ var setDOMSelection = function (core, selection, skipSelectionChangedEvent) {
     try {
         switch (selection === null || selection === void 0 ? void 0 : selection.type) {
             case 'image':
-                var image = (0, ensureImageHasSpanParent_1.ensureImageHasSpanParent)(selection.image);
-                core.selection.selection = {
-                    type: 'image',
-                    image: image,
-                };
+                var image = selection.image;
+                core.selection.selection = selection;
                 var imageSelectionColor = isDarkMode
                     ? core.selection.imageSelectionBorderColorDark
                     : core.selection.imageSelectionBorderColor;
-                core.api.setEditorStyle(core, DOM_SELECTION_CSS_KEY, "outline-style:solid!important; outline-color:" + imageSelectionColor + "!important;display: " + (core.environment.isSafari ? '-webkit-inline-flex' : 'inline-flex') + ";", ["span:has(>img#" + (0, ensureUniqueId_1.ensureUniqueId)(image, IMAGE_ID) + ")"]);
+                core.api.setEditorStyle(core, DOM_SELECTION_CSS_KEY, "outline-style:solid!important; outline-color:" + (imageSelectionColor || DEFAULT_SELECTION_BORDER_COLOR) + "!important;", ["#" + (0, ensureUniqueId_1.ensureUniqueId)(image, IMAGE_ID)]);
                 core.api.setEditorStyle(core, HIDE_SELECTION_CSS_KEY, TRANSPARENT_SELECTION_CSS_RULE, [SELECTION_SELECTOR]);
                 setRangeSelection(doc, image, false /* collapse */);
                 break;
@@ -9567,7 +9572,7 @@ function ensureUniqueId(element, idPrefix) {
     idPrefix = element.id || idPrefix;
     var doc = element.ownerDocument;
     var i = 0;
-    while (!element.id || doc.querySelectorAll('#' + element.id).length > 1) {
+    while (!element.id || doc.querySelectorAll("[id=\"" + element.id + "\"]").length > 1) {
         element.id = idPrefix + '_' + i++;
     }
     return element.id;
@@ -9807,10 +9812,10 @@ function handledExclusively(event, plugin) {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createCachePlugin = void 0;
-var areSameSelection_1 = __webpack_require__(/*! ./areSameSelection */ "./packages/roosterjs-content-model-core/lib/corePlugin/cache/areSameSelection.ts");
+var areSameSelections_1 = __webpack_require__(/*! ./areSameSelections */ "./packages/roosterjs-content-model-core/lib/corePlugin/cache/areSameSelections.ts");
 var textMutationObserver_1 = __webpack_require__(/*! ./textMutationObserver */ "./packages/roosterjs-content-model-core/lib/corePlugin/cache/textMutationObserver.ts");
 var domIndexerImpl_1 = __webpack_require__(/*! ./domIndexerImpl */ "./packages/roosterjs-content-model-core/lib/corePlugin/cache/domIndexerImpl.ts");
-var updateCachedSelection_1 = __webpack_require__(/*! ./updateCachedSelection */ "./packages/roosterjs-content-model-core/lib/corePlugin/cache/updateCachedSelection.ts");
+var updateCache_1 = __webpack_require__(/*! ./updateCache */ "./packages/roosterjs-content-model-core/lib/corePlugin/cache/updateCache.ts");
 /**
  * ContentModel cache plugin manages cached Content Model, and refresh the cache when necessary
  */
@@ -9823,40 +9828,37 @@ var CachePlugin = /** @class */ (function () {
     function CachePlugin(option, contentDiv) {
         var _this = this;
         this.editor = null;
-        this.onMutation = function (isTextChangeOnly) {
+        this.onMutation = function (mutation) {
+            var _a;
             if (_this.editor) {
-                if (isTextChangeOnly) {
-                    _this.updateCachedModel(_this.editor, true /*forceUpdate*/);
-                }
-                else {
-                    _this.invalidateCache();
+                switch (mutation.type) {
+                    case 'childList':
+                        if (!((_a = _this.state.domIndexer) === null || _a === void 0 ? void 0 : _a.reconcileChildList(mutation.addedNodes, mutation.removedNodes))) {
+                            _this.invalidateCache();
+                        }
+                        break;
+                    case 'text':
+                        _this.updateCachedModel(_this.editor, true /*forceUpdate*/);
+                        break;
+                    case 'unknown':
+                        _this.invalidateCache();
+                        break;
                 }
             }
         };
-        this.onSkipMutation = function (newModel) {
-            var _a;
-            if (!((_a = _this.editor) === null || _a === void 0 ? void 0 : _a.isInShadowEdit())) {
-                _this.state.cachedModel = newModel;
-                _this.state.cachedSelection = undefined;
-            }
-        };
         this.onNativeSelectionChange = function () {
             var _a;
             if ((_a = _this.editor) === null || _a === void 0 ? void 0 : _a.hasFocus()) {
                 _this.updateCachedModel(_this.editor);
             }
         };
-        if (option.disableCache) {
-            this.state = {};
-        }
-        else {
-            var domIndexer = new domIndexerImpl_1.DomIndexerImpl(option.experimentalFeatures &&
-                option.experimentalFeatures.indexOf('PersistCache') >= 0);
-            this.state = {
-                domIndexer: domIndexer,
-                textMutationObserver: (0, textMutationObserver_1.createTextMutationObserver)(contentDiv, domIndexer, this.onMutation, this.onSkipMutation),
+        this.state = option.disableCache
+            ? {}
+            : {
+                domIndexer: new domIndexerImpl_1.DomIndexerImpl(option.experimentalFeatures &&
+                    option.experimentalFeatures.indexOf('PersistCache') >= 0),
+                textMutationObserver: (0, textMutationObserver_1.createTextMutationObserver)(contentDiv, this.onMutation),
             };
-        }
     }
     /**
      * Get name of this plugin
@@ -9921,8 +9923,7 @@ var CachePlugin = /** @class */ (function () {
             case 'contentChanged':
                 var contentModel = event.contentModel, selection = event.selection;
                 if (contentModel && this.state.domIndexer) {
-                    this.state.cachedModel = contentModel;
-                    (0, updateCachedSelection_1.updateCachedSelection)(this.state, selection);
+                    (0, updateCache_1.updateCache)(this.state, contentModel, selection);
                 }
                 else {
                     this.invalidateCache();
@@ -9939,6 +9940,9 @@ var CachePlugin = /** @class */ (function () {
     };
     CachePlugin.prototype.updateCachedModel = function (editor, forceUpdate) {
         var _a;
+        if (editor.isInShadowEdit()) {
+            return;
+        }
         var cachedSelection = this.state.cachedSelection;
         this.state.cachedSelection = undefined; // Clear it to force getDOMSelection() retrieve the latest selection range
         var newRangeEx = editor.getDOMSelection() || undefined;
@@ -9946,7 +9950,7 @@ var CachePlugin = /** @class */ (function () {
         var isSelectionChanged = forceUpdate ||
             !cachedSelection ||
             !newRangeEx ||
-            !(0, areSameSelection_1.areSameSelection)(newRangeEx, cachedSelection);
+            !(0, areSameSelections_1.areSameSelections)(newRangeEx, cachedSelection);
         if (isSelectionChanged) {
             if (!model ||
                 !newRangeEx ||
@@ -9954,7 +9958,7 @@ var CachePlugin = /** @class */ (function () {
                 this.invalidateCache();
             }
             else {
-                (0, updateCachedSelection_1.updateCachedSelection)(this.state, newRangeEx);
+                (0, updateCache_1.updateCache)(this.state, model, newRangeEx);
             }
         }
         else {
@@ -9977,21 +9981,21 @@ exports.createCachePlugin = createCachePlugin;
 
 /***/ }),
 
-/***/ "./packages/roosterjs-content-model-core/lib/corePlugin/cache/areSameSelection.ts":
-/*!****************************************************************************************!*\
-  !*** ./packages/roosterjs-content-model-core/lib/corePlugin/cache/areSameSelection.ts ***!
-  \****************************************************************************************/
+/***/ "./packages/roosterjs-content-model-core/lib/corePlugin/cache/areSameSelections.ts":
+/*!*****************************************************************************************!*\
+  !*** ./packages/roosterjs-content-model-core/lib/corePlugin/cache/areSameSelections.ts ***!
+  \*****************************************************************************************/
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.areSameSelection = void 0;
+exports.areSameRanges = exports.areSameTableSelections = exports.areSameSelections = void 0;
 /**
  * @internal
  * Check if the given selections are the same
  */
-function areSameSelection(sel1, sel2) {
+function areSameSelections(sel1, sel2) {
     if (sel1 == sel2) {
         return true;
     }
@@ -9999,22 +10003,56 @@ function areSameSelection(sel1, sel2) {
         case 'image':
             return sel2.type == 'image' && sel2.image == sel1.image;
         case 'table':
-            return (sel2.type == 'table' &&
-                sel2.table == sel1.table &&
-                sel2.firstColumn == sel1.firstColumn &&
-                sel2.lastColumn == sel1.lastColumn &&
-                sel2.firstRow == sel1.firstRow &&
-                sel2.lastRow == sel1.lastRow);
+            return sel2.type == 'table' && areSameTableSelections(sel1, sel2);
         case 'range':
         default:
-            return (sel2.type == 'range' &&
-                sel1.range.startContainer == sel2.start.node &&
-                sel1.range.endContainer == sel2.end.node &&
-                sel1.range.startOffset == sel2.start.offset &&
-                sel1.range.endOffset == sel2.end.offset);
+            if (sel2.type == 'range') {
+                var range1 = sel1.range;
+                if (isCacheSelection(sel2)) {
+                    var start = sel2.start, end = sel2.end;
+                    return (range1.startContainer == start.node &&
+                        range1.endContainer == end.node &&
+                        range1.startOffset == start.offset &&
+                        range1.endOffset == end.offset);
+                }
+                else {
+                    return areSameRanges(range1, sel2.range);
+                }
+            }
+            else {
+                return false;
+            }
     }
 }
-exports.areSameSelection = areSameSelection;
+exports.areSameSelections = areSameSelections;
+function areSame(o1, o2, keys) {
+    return keys.every(function (k) { return o1[k] == o2[k]; });
+}
+var TableSelectionKeys = [
+    'table',
+    'firstColumn',
+    'lastColumn',
+    'firstRow',
+    'lastRow',
+];
+var RangeKeys = ['startContainer', 'endContainer', 'startOffset', 'endOffset'];
+/**
+ * @internal
+ */
+function areSameTableSelections(t1, t2) {
+    return areSame(t1, t2, TableSelectionKeys);
+}
+exports.areSameTableSelections = areSameTableSelections;
+/**
+ * @internal
+ */
+function areSameRanges(r1, r2) {
+    return areSame(r1, r2, RangeKeys);
+}
+exports.areSameRanges = areSameRanges;
+function isCacheSelection(sel) {
+    return !!sel.start;
+}
 
 
 /***/ }),
@@ -10353,12 +10391,10 @@ exports.DomIndexerImpl = DomIndexerImpl;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createTextMutationObserver = void 0;
 var TextMutationObserverImpl = /** @class */ (function () {
-    function TextMutationObserverImpl(contentDiv, domIndexer, onMutation, onSkipMutation) {
+    function TextMutationObserverImpl(contentDiv, onMutation) {
         var _this = this;
         this.contentDiv = contentDiv;
-        this.domIndexer = domIndexer;
         this.onMutation = onMutation;
-        this.onSkipMutation = onSkipMutation;
         this.onMutationInternal = function (mutations) {
             var canHandle = true;
             var firstTarget = null;
@@ -10399,14 +10435,20 @@ var TextMutationObserverImpl = /** @class */ (function () {
                         break;
                 }
             }
-            if (canHandle && (addedNodes.length > 0 || removedNodes.length > 0)) {
-                canHandle = _this.domIndexer.reconcileChildList(addedNodes, removedNodes);
-            }
-            if (canHandle && reconcileText) {
-                _this.onMutation(true /*textOnly*/);
+            if (canHandle) {
+                if (addedNodes.length > 0 || removedNodes.length > 0) {
+                    _this.onMutation({
+                        type: 'childList',
+                        addedNodes: addedNodes,
+                        removedNodes: removedNodes,
+                    });
+                }
+                if (reconcileText) {
+                    _this.onMutation({ type: 'text' });
+                }
             }
-            else if (!canHandle) {
-                _this.onMutation(false /*textOnly*/);
+            else {
+                _this.onMutation({ type: 'unknown' });
             }
         };
         this.observer = new MutationObserver(this.onMutationInternal);
@@ -10422,12 +10464,9 @@ var TextMutationObserverImpl = /** @class */ (function () {
     TextMutationObserverImpl.prototype.stopObserving = function () {
         this.observer.disconnect();
     };
-    TextMutationObserverImpl.prototype.flushMutations = function (model) {
+    TextMutationObserverImpl.prototype.flushMutations = function (ignoreMutations) {
         var mutations = this.observer.takeRecords();
-        if (model) {
-            this.onSkipMutation(model);
-        }
-        else {
+        if (!ignoreMutations) {
             this.onMutationInternal(mutations);
         }
     };
@@ -10436,28 +10475,29 @@ var TextMutationObserverImpl = /** @class */ (function () {
 /**
  * @internal
  */
-function createTextMutationObserver(contentDiv, domIndexer, onMutation, onSkipMutation) {
-    return new TextMutationObserverImpl(contentDiv, domIndexer, onMutation, onSkipMutation);
+function createTextMutationObserver(contentDiv, onMutation) {
+    return new TextMutationObserverImpl(contentDiv, onMutation);
 }
 exports.createTextMutationObserver = createTextMutationObserver;
 
 
 /***/ }),
 
-/***/ "./packages/roosterjs-content-model-core/lib/corePlugin/cache/updateCachedSelection.ts":
-/*!*********************************************************************************************!*\
-  !*** ./packages/roosterjs-content-model-core/lib/corePlugin/cache/updateCachedSelection.ts ***!
-  \*********************************************************************************************/
+/***/ "./packages/roosterjs-content-model-core/lib/corePlugin/cache/updateCache.ts":
+/*!***********************************************************************************!*\
+  !*** ./packages/roosterjs-content-model-core/lib/corePlugin/cache/updateCache.ts ***!
+  \***********************************************************************************/
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.updateCachedSelection = void 0;
+exports.updateCache = void 0;
 /**
  * @internal
  */
-function updateCachedSelection(state, selection) {
+function updateCache(state, model, selection) {
+    state.cachedModel = model;
     if ((selection === null || selection === void 0 ? void 0 : selection.type) == 'range') {
         var _a = selection.range, startContainer = _a.startContainer, startOffset = _a.startOffset, endContainer = _a.endContainer, endOffset = _a.endOffset, isReverted = selection.isReverted;
         state.cachedSelection = {
@@ -10474,10 +10514,10 @@ function updateCachedSelection(state, selection) {
         };
     }
     else {
-        state.cachedSelection = selection;
+        state.cachedSelection = selection !== null && selection !== void 0 ? selection : undefined;
     }
 }
-exports.updateCachedSelection = updateCachedSelection;
+exports.updateCache = updateCache;
 
 
 /***/ }),
@@ -12235,6 +12275,7 @@ exports.applyPendingFormat = applyPendingFormat;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createLifecyclePlugin = void 0;
 var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
+var createAriaLiveElement_1 = __webpack_require__(/*! ../../utils/createAriaLiveElement */ "./packages/roosterjs-content-model-core/lib/utils/createAriaLiveElement.ts");
 var ContentEditableAttributeName = 'contenteditable';
 var DefaultTextColor = '#000000';
 var DefaultBackColor = '#ffffff';
@@ -12294,6 +12335,8 @@ var LifecyclePlugin = /** @class */ (function () {
         this.adjustColor();
         // Let other plugins know that we are ready
         this.editor.triggerEvent('editorReady', {}, true /*broadcast*/);
+        // Initialize the Announce container.
+        this.state.announceContainer = (0, createAriaLiveElement_1.createAriaLiveElement)(editor.getDocument());
     };
     /**
      * Dispose this plugin
@@ -12377,7 +12420,6 @@ var isSingleImageInSelection_1 = __webpack_require__(/*! ./isSingleImageInSelect
 var normalizePos_1 = __webpack_require__(/*! ./normalizePos */ "./packages/roosterjs-content-model-core/lib/corePlugin/selection/normalizePos.ts");
 var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
 var MouseLeftButton = 0;
-var MouseMiddleButton = 1;
 var MouseRightButton = 2;
 var Up = 'ArrowUp';
 var Down = 'ArrowDown';
@@ -12492,16 +12534,17 @@ var SelectionPlugin = /** @class */ (function () {
                 var newSelection = _this.editor.getDOMSelection();
                 //If am image selection changed to a wider range due a keyboard event, we should update the selection
                 var selection = _this.editor.getDocument().getSelection();
-                if ((newSelection === null || newSelection === void 0 ? void 0 : newSelection.type) == 'image' && selection) {
-                    if (selection && !(0, isSingleImageInSelection_1.isSingleImageInSelection)(selection)) {
-                        var range = selection.getRangeAt(0);
-                        _this.editor.setDOMSelection({
-                            type: 'range',
-                            range: range,
-                            isReverted: selection.focusNode != range.endContainer ||
-                                selection.focusOffset != range.endOffset,
-                        });
-                    }
+                if ((newSelection === null || newSelection === void 0 ? void 0 : newSelection.type) == 'image' &&
+                    selection &&
+                    selection.focusNode &&
+                    !(0, isSingleImageInSelection_1.isSingleImageInSelection)(selection)) {
+                    var range = selection.getRangeAt(0);
+                    _this.editor.setDOMSelection({
+                        type: 'range',
+                        range: range,
+                        isReverted: selection.focusNode != range.endContainer ||
+                            selection.focusOffset != range.endOffset,
+                    });
                 }
                 // Safari has problem to handle onBlur event. When blur, we cannot get the original selection from editor.
                 // So we always save a selection whenever editor has focus. Then after blur, we can still use this cached selection.
@@ -12583,7 +12626,7 @@ var SelectionPlugin = /** @class */ (function () {
                 this.onMouseDown(this.editor, event.rawEvent);
                 break;
             case 'mouseUp':
-                this.onMouseUp(event);
+                this.onMouseUp();
                 break;
             case 'keyDown':
                 this.onKeyDown(this.editor, event.rawEvent);
@@ -12603,15 +12646,20 @@ var SelectionPlugin = /** @class */ (function () {
         var selection = editor.getDOMSelection();
         var image;
         // Image selection
-        if (rawEvent.button === MouseRightButton &&
-            (image =
-                (_a = this.getClickingImage(rawEvent)) !== null && _a !== void 0 ? _a : this.getContainedTargetImage(rawEvent, selection)) &&
-            image.isContentEditable) {
-            this.selectImageWithRange(image, rawEvent);
-            return;
+        if ((selection === null || selection === void 0 ? void 0 : selection.type) == 'image' &&
+            (rawEvent.button == MouseLeftButton ||
+                (rawEvent.button == MouseRightButton &&
+                    !this.getClickingImage(rawEvent) &&
+                    !this.getContainedTargetImage(rawEvent, selection)))) {
+            this.setDOMSelection(null /*domSelection*/, null /*tableSelection*/);
         }
-        else if ((selection === null || selection === void 0 ? void 0 : selection.type) == 'image' && selection.image !== rawEvent.target) {
-            this.selectBeforeOrAfterElement(editor, selection.image);
+        if ((image =
+            (_a = this.getClickingImage(rawEvent)) !== null && _a !== void 0 ? _a : this.getContainedTargetImage(rawEvent, selection)) &&
+            image.isContentEditable) {
+            this.setDOMSelection({
+                type: 'image',
+                image: image,
+            }, null);
             return;
         }
         // Table selection
@@ -12640,32 +12688,7 @@ var SelectionPlugin = /** @class */ (function () {
             });
         }
     };
-    SelectionPlugin.prototype.selectImageWithRange = function (image, event) {
-        var _a;
-        var range = image.ownerDocument.createRange();
-        range.selectNode(image);
-        var domSelection = (_a = this.editor) === null || _a === void 0 ? void 0 : _a.getDOMSelection();
-        if ((domSelection === null || domSelection === void 0 ? void 0 : domSelection.type) == 'image' && image == domSelection.image) {
-            event.preventDefault();
-        }
-        else {
-            this.setDOMSelection({
-                type: 'range',
-                isReverted: false,
-                range: range,
-            }, null);
-        }
-    };
-    SelectionPlugin.prototype.onMouseUp = function (event) {
-        var image;
-        if ((image = this.getClickingImage(event.rawEvent)) &&
-            image.isContentEditable &&
-            event.rawEvent.button != MouseMiddleButton &&
-            (event.rawEvent.button ==
-                MouseRightButton /* it's not possible to drag using right click */ ||
-                event.isClicking)) {
-            this.selectImageWithRange(image, event.rawEvent);
-        }
+    SelectionPlugin.prototype.onMouseUp = function () {
         this.detachMouseEvent();
     };
     SelectionPlugin.prototype.onKeyDown = function (editor, rawEvent) {
@@ -12743,6 +12766,7 @@ var SelectionPlugin = /** @class */ (function () {
                 return;
             }
             var lastCo = (0, findCoordinate_1.findCoordinate)(tableSel === null || tableSel === void 0 ? void 0 : tableSel.parsedTable, end, domHelper);
+            var tabMove = false;
             var _h = this.state.tableSelection, parsedTable = _h.parsedTable, oldCo = _h.firstCo, table = _h.table;
             if (lastCo && tableSel.table == table) {
                 if (lastCo.col != oldCo.col && (key == Up || key == Down)) {
@@ -12780,7 +12804,8 @@ var SelectionPlugin = /** @class */ (function () {
                         }
                         var cell = parsedTable[row][col];
                         if (typeof cell != 'string') {
-                            this.setRangeSelectionInTable(cell, 0, this.editor);
+                            tabMove = true;
+                            this.setRangeSelectionInTable(cell, 0, this.editor, true /* selectAll */);
                             lastCo.row = row;
                             lastCo.col = col;
                             break;
@@ -12798,18 +12823,23 @@ var SelectionPlugin = /** @class */ (function () {
                     (_f = this.editor) === null || _f === void 0 ? void 0 : _f.announce({ defaultStrings: 'announceOnFocusLastCell' });
                 }
             }
-            if (!collapsed && lastCo) {
+            if (!collapsed && lastCo && !tabMove) {
                 this.state.tableSelection = tableSel;
                 this.updateTableSelection(lastCo);
             }
         }
     };
-    SelectionPlugin.prototype.setRangeSelectionInTable = function (cell, nodeOffset, editor) {
-        // Get deepest editable position in the cell
-        var _a = (0, normalizePos_1.normalizePos)(cell, nodeOffset), node = _a.node, offset = _a.offset;
+    SelectionPlugin.prototype.setRangeSelectionInTable = function (cell, nodeOffset, editor, selectAll) {
         var range = editor.getDocument().createRange();
-        range.setStart(node, offset);
-        range.collapse(true /*toStart*/);
+        if (selectAll) {
+            range.selectNodeContents(cell);
+        }
+        else {
+            // Get deepest editable position in the cell
+            var _a = (0, normalizePos_1.normalizePos)(cell, nodeOffset), node = _a.node, offset = _a.offset;
+            range.setStart(node, offset);
+            range.collapse(true /* toStart */);
+        }
         this.setDOMSelection({
             type: 'range',
             range: range,
@@ -14442,6 +14472,37 @@ function shouldUseTableProcessor(element, context) {
 }
 
 
+/***/ }),
+
+/***/ "./packages/roosterjs-content-model-core/lib/utils/createAriaLiveElement.ts":
+/*!**********************************************************************************!*\
+  !*** ./packages/roosterjs-content-model-core/lib/utils/createAriaLiveElement.ts ***!
+  \**********************************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.createAriaLiveElement = void 0;
+/**
+ * @internal
+ */
+function createAriaLiveElement(document) {
+    var div = document.createElement('div');
+    div.style.clip = 'rect(0px, 0px, 0px, 0px)';
+    div.style.clipPath = 'inset(100%)';
+    div.style.height = '1px';
+    div.style.overflow = 'hidden';
+    div.style.position = 'absolute';
+    div.style.whiteSpace = 'nowrap';
+    div.style.width = '1px';
+    div.ariaLive = 'assertive';
+    document.body.appendChild(div);
+    return div;
+}
+exports.createAriaLiveElement = createAriaLiveElement;
+
+
 /***/ }),
 
 /***/ "./packages/roosterjs-content-model-dom/lib/config/defaultContentModelFormatMap.ts":
@@ -17541,16 +17602,14 @@ var normalizeRect_1 = __webpack_require__(/*! ../normalizeRect */ "./packages/ro
  * @param pos The input DOM insert point
  */
 function getDOMInsertPointRect(doc, pos) {
-    var _a;
-    var node = pos.node, offset = pos.offset;
+    var _a, _b;
     var range = doc.createRange();
-    range.setStart(node, offset);
-    // 1) try to get rect using range.getBoundingClientRect()
-    var rect = (0, normalizeRect_1.normalizeRect)(range.getBoundingClientRect());
-    if (rect) {
-        return rect;
-    }
-    // 2) try to get rect using range.getClientRects
+    return ((_b = (_a = tryGetRectFromPos(pos, range)) !== null && _a !== void 0 ? _a : tryGetRectFromPos((pos = normalizeInsertPoint(pos)), range)) !== null && _b !== void 0 ? _b : tryGetRectFromNode(pos.node) // 3. fallback to node rect using getBoundingClientRect
+    );
+}
+exports.getDOMInsertPointRect = getDOMInsertPointRect;
+function normalizeInsertPoint(pos) {
+    var node = pos.node, offset = pos.offset;
     while (node.lastChild) {
         if (offset == node.childNodes.length) {
             node = node.lastChild;
@@ -17561,32 +17620,26 @@ function getDOMInsertPointRect(doc, pos) {
             offset = 0;
         }
     }
-    var rects = range.getClientRects && range.getClientRects();
-    rect = rects && rects.length == 1 ? (0, normalizeRect_1.normalizeRect)(rects[0]) : null;
+    return { node: node, offset: offset };
+}
+function tryGetRectFromPos(pos, range) {
+    var node = pos.node, offset = pos.offset;
+    range.setStart(node, offset);
+    range.setEnd(node, offset);
+    var rect = (0, normalizeRect_1.normalizeRect)(range.getBoundingClientRect());
     if (rect) {
         return rect;
     }
-    // 3) if node is text node, try inserting a SPAN and get the rect of SPAN for others
-    if ((0, isNodeOfType_1.isNodeOfType)(node, 'TEXT_NODE')) {
-        var span = node.ownerDocument.createElement('span');
-        span.textContent = '\u200b';
-        range.insertNode(span);
-        rect = (0, normalizeRect_1.normalizeRect)(span.getBoundingClientRect());
-        (_a = span.parentNode) === null || _a === void 0 ? void 0 : _a.removeChild(span);
-        if (rect) {
-            return rect;
-        }
-    }
-    // 4) try getBoundingClientRect on element
-    if ((0, isNodeOfType_1.isNodeOfType)(node, 'ELEMENT_NODE') && node.getBoundingClientRect) {
-        rect = (0, normalizeRect_1.normalizeRect)(node.getBoundingClientRect());
-        if (rect) {
-            return rect;
-        }
+    else {
+        var rects = range.getClientRects && range.getClientRects();
+        return rects && rects.length == 1 ? (0, normalizeRect_1.normalizeRect)(rects[0]) : null;
     }
-    return null;
 }
-exports.getDOMInsertPointRect = getDOMInsertPointRect;
+function tryGetRectFromNode(node) {
+    return (0, isNodeOfType_1.isNodeOfType)(node, 'ELEMENT_NODE') && node.getBoundingClientRect
+        ? (0, normalizeRect_1.normalizeRect)(node.getBoundingClientRect())
+        : null;
+}
 
 
 /***/ }),
@@ -25880,8 +25933,7 @@ function removeUnnecessarySpan(root) {
     for (var child = root.firstChild; child;) {
         if ((0, isNodeOfType_1.isNodeOfType)(child, 'ELEMENT_NODE') &&
             child.tagName == 'SPAN' &&
-            child.attributes.length == 0 &&
-            !isImageSpan(child)) {
+            child.attributes.length == 0) {
             var node = child;
             var refNode = child.nextSibling;
             child = child.nextSibling;
@@ -25898,11 +25950,6 @@ function removeUnnecessarySpan(root) {
     }
 }
 exports.removeUnnecessarySpan = removeUnnecessarySpan;
-var isImageSpan = function (child) {
-    return ((0, isNodeOfType_1.isNodeOfType)(child.firstChild, 'ELEMENT_NODE') &&
-        child.firstChild.tagName == 'IMG' &&
-        child.firstChild == child.lastChild);
-};
 
 
 /***/ }),
@@ -26312,7 +26359,7 @@ var getChangeSource = function (shouldList, shouldHyphen, shouldLink) {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.transformHyphen = void 0;
-var splitTextSegment_1 = __webpack_require__(/*! ../../pluginUtils/splitTextSegment */ "./packages/roosterjs-content-model-plugins/lib/pluginUtils/splitTextSegment.ts");
+var roosterjs_content_model_api_1 = __webpack_require__(/*! roosterjs-content-model-api */ "./packages/roosterjs-content-model-api/lib/index.ts");
 /**
  * @internal
  */
@@ -26321,7 +26368,7 @@ function transformHyphen(previousSegment, paragraph, context) {
     var dashes = segments[segments.length - 2];
     if (dashes === '--') {
         var textIndex = previousSegment.text.lastIndexOf('--');
-        var textSegment = (0, splitTextSegment_1.splitTextSegment)(previousSegment, paragraph, textIndex, textIndex + 2);
+        var textSegment = (0, roosterjs_content_model_api_1.splitTextSegment)(previousSegment, paragraph, textIndex, textIndex + 2);
         textSegment.text = textSegment.text.replace('--', '—');
         context.canUndoByBackspace = true;
         return true;
@@ -26331,7 +26378,7 @@ function transformHyphen(previousSegment, paragraph, context) {
         var hasDashes = text && (text === null || text === void 0 ? void 0 : text.indexOf('--')) > -1;
         if (hasDashes && text.trim() !== '--') {
             var textIndex = previousSegment.text.indexOf(text);
-            var textSegment = (0, splitTextSegment_1.splitTextSegment)(previousSegment, paragraph, textIndex, textIndex + text.length - 1);
+            var textSegment = (0, roosterjs_content_model_api_1.splitTextSegment)(previousSegment, paragraph, textIndex, textIndex + text.length - 1);
             var textLength = textSegment.text.length;
             if (textSegment.text[0] !== '-' && textSegment.text[textLength - 1] !== '-') {
                 textSegment.text = textSegment.text.replace('--', '—');
@@ -26364,8 +26411,10 @@ var roosterjs_content_model_api_1 = __webpack_require__(/*! roosterjs-content-mo
  */
 function createLink(editor) {
     var anchorNode = null;
+    var links = [];
     (0, roosterjs_content_model_api_1.formatTextSegmentBeforeSelectionMarker)(editor, function (_model, linkSegment, _paragraph) {
         if (linkSegment.link) {
+            links.push(linkSegment.link);
             return true;
         }
         var linkData = null;
@@ -26377,13 +26426,16 @@ function createLink(editor) {
                 },
                 dataset: {},
             });
+            if (linkSegment.link) {
+                links.push(linkSegment.link);
+            }
             return true;
         }
         return false;
     }, {
         changeSource: roosterjs_content_model_dom_1.ChangeSource.AutoLink,
-        onNodeCreated: function (_modelElement, node) {
-            if (!anchorNode) {
+        onNodeCreated: function (modelElement, node) {
+            if (!anchorNode && links.indexOf(modelElement) >= 0) {
                 anchorNode = node;
             }
         },
@@ -26406,7 +26458,6 @@ exports.createLink = createLink;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createLinkAfterSpace = void 0;
 var roosterjs_content_model_api_1 = __webpack_require__(/*! roosterjs-content-model-api */ "./packages/roosterjs-content-model-api/lib/index.ts");
-var splitTextSegment_1 = __webpack_require__(/*! ../../pluginUtils/splitTextSegment */ "./packages/roosterjs-content-model-plugins/lib/pluginUtils/splitTextSegment.ts");
 /**
  * @internal
  */
@@ -26415,7 +26466,7 @@ function createLinkAfterSpace(previousSegment, paragraph, context) {
     var url = link === null || link === void 0 ? void 0 : link.trim();
     var linkData = null;
     if (url && link && (linkData = (0, roosterjs_content_model_api_1.matchLink)(url))) {
-        var linkSegment = (0, splitTextSegment_1.splitTextSegment)(previousSegment, paragraph, previousSegment.text.length - link.trimLeft().length, previousSegment.text.trimRight().length);
+        var linkSegment = (0, roosterjs_content_model_api_1.splitTextSegment)(previousSegment, paragraph, previousSegment.text.length - link.trimLeft().length, previousSegment.text.trimRight().length);
         linkSegment.link = {
             format: {
                 href: linkData.normalizedUrl,
@@ -26794,7 +26845,9 @@ function canAppendList(index, previousListIndex) {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.keyboardListTrigger = void 0;
+var tslib_1 = __webpack_require__(/*! tslib */ "./node_modules/tslib/tslib.es6.mjs");
 var getListTypeStyle_1 = __webpack_require__(/*! ./getListTypeStyle */ "./packages/roosterjs-content-model-plugins/lib/autoFormat/list/getListTypeStyle.ts");
+var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
 var roosterjs_content_model_api_1 = __webpack_require__(/*! roosterjs-content-model-api */ "./packages/roosterjs-content-model-api/lib/index.ts");
 /**
  * @internal
@@ -26808,6 +26861,7 @@ function keyboardListTrigger(model, paragraph, context, shouldSearchForBullet, s
         var listType = listStyleType.listType, styleType = listStyleType.styleType, index = listStyleType.index;
         triggerList(model, listType, styleType, index);
         context.canUndoByBackspace = true;
+        setAnnounceData(model, context);
         return true;
     }
     return false;
@@ -26822,11 +26876,21 @@ var triggerList = function (model, listType, styleType, index) {
     (0, roosterjs_content_model_api_1.setModelListStyle)(model, isOrderedList
         ? {
             orderedStyleType: styleType,
+            applyListStyleFromLevel: false,
         }
         : {
             unorderedStyleType: styleType,
+            applyListStyleFromLevel: false,
         });
 };
+function setAnnounceData(model, context) {
+    var _a = (0, tslib_1.__read)((0, roosterjs_content_model_dom_1.getOperationalBlocks)(model, ['ListItem'], [] // Set stop types to be empty so we can find list items even cross the boundary of table, then we can always operation on the list item if any
+    ), 1), paragraphOrListItems = _a[0];
+    if (paragraphOrListItems && (0, roosterjs_content_model_dom_1.isBlockGroupOfType)(paragraphOrListItems.block, 'ListItem')) {
+        var path = paragraphOrListItems.path, block = paragraphOrListItems.block;
+        context.announceData = (0, roosterjs_content_model_api_1.getListAnnounceData)((0, tslib_1.__spreadArray)([block], (0, tslib_1.__read)(path), false));
+    }
+}
 
 
 /***/ }),
@@ -26841,7 +26905,7 @@ var triggerList = function (model, listType, styleType, index) {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.transformFraction = void 0;
-var splitTextSegment_1 = __webpack_require__(/*! ../../pluginUtils/splitTextSegment */ "./packages/roosterjs-content-model-plugins/lib/pluginUtils/splitTextSegment.ts");
+var roosterjs_content_model_api_1 = __webpack_require__(/*! roosterjs-content-model-api */ "./packages/roosterjs-content-model-api/lib/index.ts");
 var FRACTIONS = new Map([
     ['1/2', '½'],
     ['1/4', '¼'],
@@ -26857,7 +26921,7 @@ function transformFraction(previousSegment, paragraph, context) {
     if (fraction && text) {
         var textLength = previousSegment.text.length - 1;
         var textIndex = textLength - fraction.length;
-        var textSegment = (0, splitTextSegment_1.splitTextSegment)(previousSegment, paragraph, textIndex, textLength);
+        var textSegment = (0, roosterjs_content_model_api_1.splitTextSegment)(previousSegment, paragraph, textIndex, textLength);
         textSegment.text = text;
         context.canUndoByBackspace = true;
         return true;
@@ -26879,7 +26943,7 @@ exports.transformFraction = transformFraction;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.transformOrdinals = void 0;
-var splitTextSegment_1 = __webpack_require__(/*! ../../pluginUtils/splitTextSegment */ "./packages/roosterjs-content-model-plugins/lib/pluginUtils/splitTextSegment.ts");
+var roosterjs_content_model_api_1 = __webpack_require__(/*! roosterjs-content-model-api */ "./packages/roosterjs-content-model-api/lib/index.ts");
 var getOrdinal = function (value) {
     var ORDINALS = {
         1: 'st',
@@ -26898,7 +26962,7 @@ function transformOrdinals(previousSegment, paragraph, context) {
         var ordinal = value.substring(value.length - 2);
         var ordinalValue = parseInt(value);
         if (ordinalValue && getOrdinal(ordinalValue) === ordinal) {
-            var ordinalSegment = (0, splitTextSegment_1.splitTextSegment)(previousSegment, paragraph, previousSegment.text.length - 3, previousSegment.text.length - 1);
+            var ordinalSegment = (0, roosterjs_content_model_api_1.splitTextSegment)(previousSegment, paragraph, previousSegment.text.length - 3, previousSegment.text.length - 1);
             ordinalSegment.format.superOrSubScriptSequence = 'super';
             context.canUndoByBackspace = true;
             return true;
@@ -27119,6 +27183,9 @@ var keyboardTab_1 = __webpack_require__(/*! ./keyboardTab */ "./packages/rooster
 var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
 var BACKSPACE_KEY = 8;
 var DELETE_KEY = 46;
+var DefaultOptions = {
+    handleTabKey: true,
+};
 /**
  * Edit plugins helps editor to do editing operation on top of content model.
  * This includes:
@@ -27127,7 +27194,13 @@ var DELETE_KEY = 46;
  * 3. Tab Key
  */
 var EditPlugin = /** @class */ (function () {
-    function EditPlugin() {
+    /**
+     * @param options An optional parameter that takes in an object of type EditOptions, which includes the following properties:
+     * handleTabKey: A boolean that enables or disables Tab key handling. Defaults to true.
+     */
+    function EditPlugin(options) {
+        if (options === void 0) { options = DefaultOptions; }
+        this.options = options;
         this.editor = null;
         this.disposer = null;
         this.shouldHandleNextInputEvent = false;
@@ -27200,6 +27273,7 @@ var EditPlugin = /** @class */ (function () {
      */
     EditPlugin.prototype.willHandleEventExclusively = function (event) {
         if (this.editor &&
+            this.options.handleTabKey &&
             event.eventType == 'keyDown' &&
             event.rawEvent.key == 'Tab' &&
             !event.rawEvent.shiftKey) {
@@ -27241,7 +27315,9 @@ var EditPlugin = /** @class */ (function () {
                     }
                     break;
                 case 'Tab':
-                    (0, keyboardTab_1.keyboardTab)(editor, rawEvent);
+                    if (this.options.handleTabKey) {
+                        (0, keyboardTab_1.keyboardTab)(editor, rawEvent);
+                    }
                     break;
                 case 'Unidentified':
                     if (editor.getEnvironment().isAndroid) {
@@ -28900,10 +28976,13 @@ var canRegenerateImage_1 = __webpack_require__(/*! ./utils/canRegenerateImage */
 var imageEditUtils_1 = __webpack_require__(/*! ./utils/imageEditUtils */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/imageEditUtils.ts");
 var createImageWrapper_1 = __webpack_require__(/*! ./utils/createImageWrapper */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/createImageWrapper.ts");
 var cropperContext_1 = __webpack_require__(/*! ./Cropper/cropperContext */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/Cropper/cropperContext.ts");
+var findEditingImage_1 = __webpack_require__(/*! ./utils/findEditingImage */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/findEditingImage.ts");
 var getDropAndDragHelpers_1 = __webpack_require__(/*! ./utils/getDropAndDragHelpers */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/getDropAndDragHelpers.ts");
 var getHTMLImageOptions_1 = __webpack_require__(/*! ./utils/getHTMLImageOptions */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/getHTMLImageOptions.ts");
+var getSelectedImage_1 = __webpack_require__(/*! ./utils/getSelectedImage */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/getSelectedImage.ts");
 var updateImageEditInfo_1 = __webpack_require__(/*! ./utils/updateImageEditInfo */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/updateImageEditInfo.ts");
 var ImageEditElementClass_1 = __webpack_require__(/*! ./types/ImageEditElementClass */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/types/ImageEditElementClass.ts");
+var normalizeImageSelection_1 = __webpack_require__(/*! ./utils/normalizeImageSelection */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/normalizeImageSelection.ts");
 var resizerContext_1 = __webpack_require__(/*! ./Resizer/resizerContext */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/Resizer/resizerContext.ts");
 var rotatorContext_1 = __webpack_require__(/*! ./Rotator/rotatorContext */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/Rotator/rotatorContext.ts");
 var updateRotateHandle_1 = __webpack_require__(/*! ./Rotator/updateRotateHandle */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/Rotator/updateRotateHandle.ts");
@@ -28916,9 +28995,9 @@ var DefaultOptions = {
     preserveRatio: true,
     disableRotate: false,
     disableSideResize: false,
-    onSelectState: 'resize',
+    onSelectState: ['resize', 'rotate'],
 };
-var IMAGE_EDIT_CHANGE_SOURCE = 'ImageEdit';
+var MouseRightButton = 2;
 /**
  * ImageEdit plugin handles the following image editing features:
  * - Resize image
@@ -28946,6 +29025,8 @@ var ImageEditPlugin = /** @class */ (function () {
         this.croppers = [];
         this.zoomScale = 1;
         this.disposer = null;
+        //EXPOSED FOR TEST ONLY
+        this.isEditing = false;
     }
     /**
      * Get name of this plugin
@@ -28965,7 +29046,9 @@ var ImageEditPlugin = /** @class */ (function () {
         this.disposer = editor.attachDomEvent({
             blur: {
                 beforeDispatch: function () {
-                    _this.formatImageWithContentModel(editor, true /* shouldSelectImage */, true /* shouldSelectAsImageSelection*/);
+                    if (_this.editor) {
+                        _this.applyFormatWithContentModel(_this.editor, _this.isCropMode, true /* shouldSelectImage */);
+                    }
                 },
             },
         });
@@ -28977,6 +29060,7 @@ var ImageEditPlugin = /** @class */ (function () {
      */
     ImageEditPlugin.prototype.dispose = function () {
         this.editor = null;
+        this.isEditing = false;
         this.cleanInfo();
         if (this.disposer) {
             this.disposer();
@@ -28989,16 +29073,148 @@ var ImageEditPlugin = /** @class */ (function () {
      * exclusively by another plugin.
      * @param event The event to handle:
      */
-    ImageEditPlugin.prototype.onPluginEvent = function (_event) { };
-    ImageEditPlugin.prototype.startEditing = function (editor, image, apiOperation) {
-        var imageSpan = image.parentElement;
-        if (!imageSpan || (imageSpan && !(0, roosterjs_content_model_dom_1.isElementOfType)(imageSpan, 'span'))) {
+    ImageEditPlugin.prototype.onPluginEvent = function (event) {
+        if (!this.editor) {
             return;
         }
-        this.imageEditInfo = (0, updateImageEditInfo_1.getSelectedImageMetadata)(editor, image);
+        switch (event.eventType) {
+            case 'mouseUp':
+                this.mouseUpHandler(this.editor, event);
+                break;
+            case 'keyDown':
+                this.keyDownHandler(this.editor, event);
+                break;
+        }
+    };
+    ImageEditPlugin.prototype.isImageSelection = function (target) {
+        return ((0, roosterjs_content_model_dom_1.isNodeOfType)(target, 'ELEMENT_NODE') &&
+            ((0, roosterjs_content_model_dom_1.isElementOfType)(target, 'img') ||
+                !!((0, roosterjs_content_model_dom_1.isElementOfType)(target, 'span') &&
+                    target.firstElementChild &&
+                    (0, roosterjs_content_model_dom_1.isNodeOfType)(target.firstElementChild, 'ELEMENT_NODE') &&
+                    (0, roosterjs_content_model_dom_1.isElementOfType)(target.firstElementChild, 'img'))));
+    };
+    ImageEditPlugin.prototype.mouseUpHandler = function (editor, event) {
+        var selection = editor.getDOMSelection();
+        if ((selection && selection.type == 'image') || this.isEditing) {
+            var shouldSelectImage = this.isImageSelection(event.rawEvent.target) &&
+                event.rawEvent.button === MouseRightButton;
+            this.applyFormatWithContentModel(editor, this.isCropMode, shouldSelectImage);
+        }
+    };
+    //Sometimes the cursor can be inside the editing image and inside shadow dom, then the cursor need to moved out of shadow dom
+    ImageEditPlugin.prototype.selectBeforeEditingImage = function (editor, element) {
+        var parent = element.parentNode;
+        if (parent && (0, roosterjs_content_model_dom_1.isNodeOfType)(parent, 'ELEMENT_NODE') && parent.shadowRoot) {
+            element = parent;
+            parent = parent.parentNode;
+        }
+        var index = parent && (0, roosterjs_content_model_dom_1.toArray)(parent.childNodes).indexOf(element);
+        if (index !== null && index >= 0 && parent) {
+            var doc = editor.getDocument();
+            var range = doc.createRange();
+            range.setStart(parent, index);
+            range.collapse();
+            editor.setDOMSelection({
+                type: 'range',
+                range: range,
+                isReverted: false,
+            });
+        }
+    };
+    ImageEditPlugin.prototype.keyDownHandler = function (editor, event) {
+        if (this.isEditing) {
+            if (event.rawEvent.key === 'Escape') {
+                this.removeImageWrapper();
+            }
+            else {
+                var selection = editor.getDOMSelection();
+                var isImageSelection = (selection === null || selection === void 0 ? void 0 : selection.type) == 'image';
+                if (isImageSelection) {
+                    this.selectBeforeEditingImage(editor, selection.image);
+                }
+                this.applyFormatWithContentModel(editor, this.isCropMode, ((0, roosterjs_content_model_dom_1.isModifierKey)(event.rawEvent) || event.rawEvent.shiftKey) && isImageSelection //if it's a modifier key over a image, the image should select the image
+                );
+            }
+        }
+    };
+    ImageEditPlugin.prototype.applyFormatWithContentModel = function (editor, isCropMode, shouldSelectImage, isApiOperation) {
+        var _this = this;
+        var editingImageModel;
+        var selection = editor.getDOMSelection();
+        editor.formatContentModel(function (model) {
+            var editingImage = (0, getSelectedImage_1.getSelectedImage)(model);
+            var previousSelectedImage = isApiOperation
+                ? editingImage
+                : (0, findEditingImage_1.findEditingImage)(model);
+            var result = false;
+            if (shouldSelectImage ||
+                (previousSelectedImage === null || previousSelectedImage === void 0 ? void 0 : previousSelectedImage.image) != (editingImage === null || editingImage === void 0 ? void 0 : editingImage.image) ||
+                (previousSelectedImage === null || previousSelectedImage === void 0 ? void 0 : previousSelectedImage.image.dataset.isEditing) ||
+                isApiOperation) {
+                var _a = _this, lastSrc_1 = _a.lastSrc, selectedImage_1 = _a.selectedImage, imageEditInfo_1 = _a.imageEditInfo, clonedImage_1 = _a.clonedImage;
+                if ((_this.isEditing || isApiOperation) &&
+                    previousSelectedImage &&
+                    lastSrc_1 &&
+                    selectedImage_1 &&
+                    imageEditInfo_1 &&
+                    clonedImage_1) {
+                    (0, roosterjs_content_model_dom_1.mutateSegment)(previousSelectedImage.paragraph, previousSelectedImage.image, function (image) {
+                        (0, applyChange_1.applyChange)(editor, selectedImage_1, image, imageEditInfo_1, lastSrc_1, _this.wasImageResized || _this.isCropMode, clonedImage_1);
+                        delete image.dataset.isEditing;
+                        image.isSelected = shouldSelectImage;
+                        image.isSelectedAsImageSelection = shouldSelectImage;
+                    });
+                    if (shouldSelectImage) {
+                        (0, normalizeImageSelection_1.normalizeImageSelection)(previousSelectedImage);
+                    }
+                    _this.cleanInfo();
+                    result = true;
+                }
+                _this.isEditing = false;
+                _this.isCropMode = false;
+                if (editingImage &&
+                    (selection === null || selection === void 0 ? void 0 : selection.type) == 'image' &&
+                    !shouldSelectImage &&
+                    !isApiOperation) {
+                    _this.isEditing = true;
+                    _this.isCropMode = isCropMode;
+                    (0, roosterjs_content_model_dom_1.mutateSegment)(editingImage.paragraph, editingImage.image, function (image) {
+                        editingImageModel = image;
+                        _this.imageEditInfo = (0, updateImageEditInfo_1.updateImageEditInfo)(image, selection.image);
+                        image.dataset.isEditing = 'true';
+                    });
+                    result = true;
+                }
+            }
+            return result;
+        }, {
+            onNodeCreated: function (model, node) {
+                if (!isApiOperation &&
+                    editingImageModel &&
+                    editingImageModel == model &&
+                    editingImageModel.dataset.isEditing &&
+                    (0, roosterjs_content_model_dom_1.isNodeOfType)(node, 'ELEMENT_NODE') &&
+                    (0, roosterjs_content_model_dom_1.isElementOfType)(node, 'img')) {
+                    if (isCropMode) {
+                        _this.startCropMode(editor, node);
+                    }
+                    else {
+                        _this.startRotateAndResize(editor, node);
+                    }
+                }
+            },
+        }, {
+            tryGetFromCache: true,
+        });
+    };
+    ImageEditPlugin.prototype.startEditing = function (editor, image, apiOperation) {
+        if (!this.imageEditInfo) {
+            this.imageEditInfo = (0, updateImageEditInfo_1.getSelectedImageMetadata)(editor, image);
+        }
         this.lastSrc = image.getAttribute('src');
         this.imageHTMLOptions = (0, getHTMLImageOptions_1.getHTMLImageOptions)(editor, this.options, this.imageEditInfo);
-        var _a = (0, createImageWrapper_1.createImageWrapper)(editor, image, imageSpan, this.options, this.imageEditInfo, this.imageHTMLOptions, apiOperation || this.options.onSelectState), resizers = _a.resizers, rotators = _a.rotators, wrapper = _a.wrapper, shadowSpan = _a.shadowSpan, imageClone = _a.imageClone, croppers = _a.croppers;
+        var _a = (0, createImageWrapper_1.createImageWrapper)(editor, image, this.options, this.imageEditInfo, this.imageHTMLOptions, apiOperation), resizers = _a.resizers, rotators = _a.rotators, wrapper = _a.wrapper, shadowSpan = _a.shadowSpan, imageClone = _a.imageClone, croppers = _a.croppers;
         this.shadowSpan = shadowSpan;
         this.selectedImage = image;
         this.wrapper = wrapper;
@@ -29012,34 +29228,33 @@ var ImageEditPlugin = /** @class */ (function () {
             "span:has(>img#" + this.selectedImage.id + ")",
         ]);
     };
-    ImageEditPlugin.prototype.startRotateAndResize = function (editor, image, apiOperation) {
+    ImageEditPlugin.prototype.startRotateAndResize = function (editor, image) {
         var _this = this;
         var _a;
-        if (this.wrapper && this.selectedImage && this.shadowSpan) {
-            this.removeImageWrapper();
-        }
-        this.startEditing(editor, image, apiOperation);
-        if (this.selectedImage && this.imageEditInfo && this.wrapper && this.clonedImage) {
-            this.dndHelpers = (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], (0, tslib_1.__read)((0, getDropAndDragHelpers_1.getDropAndDragHelpers)(this.wrapper, this.imageEditInfo, this.options, ImageEditElementClass_1.ImageEditElementClass.ResizeHandle, resizerContext_1.Resizer, function () {
-                if (_this.imageEditInfo &&
-                    _this.selectedImage &&
-                    _this.wrapper &&
-                    _this.clonedImage) {
-                    (0, updateWrapper_1.updateWrapper)(_this.imageEditInfo, _this.options, _this.selectedImage, _this.clonedImage, _this.wrapper, _this.resizers);
-                    _this.wasImageResized = true;
-                }
-            }, this.zoomScale)), false), (0, tslib_1.__read)((0, getDropAndDragHelpers_1.getDropAndDragHelpers)(this.wrapper, this.imageEditInfo, this.options, ImageEditElementClass_1.ImageEditElementClass.RotateHandle, rotatorContext_1.Rotator, function () {
-                var _a;
-                if (_this.imageEditInfo &&
-                    _this.selectedImage &&
-                    _this.wrapper &&
-                    _this.clonedImage) {
-                    (0, updateWrapper_1.updateWrapper)(_this.imageEditInfo, _this.options, _this.selectedImage, _this.clonedImage, _this.wrapper, _this.rotators);
-                    _this.updateRotateHandleState(editor, _this.selectedImage, _this.wrapper, _this.rotators, (_a = _this.imageEditInfo) === null || _a === void 0 ? void 0 : _a.angleRad);
-                }
-            }, this.zoomScale)), false);
-            (0, updateWrapper_1.updateWrapper)(this.imageEditInfo, this.options, this.selectedImage, this.clonedImage, this.wrapper, this.resizers);
-            this.updateRotateHandleState(editor, this.selectedImage, this.wrapper, this.rotators, (_a = this.imageEditInfo) === null || _a === void 0 ? void 0 : _a.angleRad);
+        if (this.imageEditInfo) {
+            this.startEditing(editor, image, ['resize', 'rotate']);
+            if (this.selectedImage && this.imageEditInfo && this.wrapper && this.clonedImage) {
+                this.dndHelpers = (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], (0, tslib_1.__read)((0, getDropAndDragHelpers_1.getDropAndDragHelpers)(this.wrapper, this.imageEditInfo, this.options, ImageEditElementClass_1.ImageEditElementClass.ResizeHandle, resizerContext_1.Resizer, function () {
+                    if (_this.imageEditInfo &&
+                        _this.selectedImage &&
+                        _this.wrapper &&
+                        _this.clonedImage) {
+                        (0, updateWrapper_1.updateWrapper)(_this.imageEditInfo, _this.options, _this.selectedImage, _this.clonedImage, _this.wrapper, _this.resizers);
+                        _this.wasImageResized = true;
+                    }
+                }, this.zoomScale)), false), (0, tslib_1.__read)((0, getDropAndDragHelpers_1.getDropAndDragHelpers)(this.wrapper, this.imageEditInfo, this.options, ImageEditElementClass_1.ImageEditElementClass.RotateHandle, rotatorContext_1.Rotator, function () {
+                    var _a;
+                    if (_this.imageEditInfo &&
+                        _this.selectedImage &&
+                        _this.wrapper &&
+                        _this.clonedImage) {
+                        (0, updateWrapper_1.updateWrapper)(_this.imageEditInfo, _this.options, _this.selectedImage, _this.clonedImage, _this.wrapper);
+                        _this.updateRotateHandleState(editor, _this.selectedImage, _this.wrapper, _this.rotators, (_a = _this.imageEditInfo) === null || _a === void 0 ? void 0 : _a.angleRad);
+                    }
+                }, this.zoomScale)), false);
+                (0, updateWrapper_1.updateWrapper)(this.imageEditInfo, this.options, this.selectedImage, this.clonedImage, this.wrapper, this.resizers);
+                this.updateRotateHandleState(editor, this.selectedImage, this.wrapper, this.rotators, (_a = this.imageEditInfo) === null || _a === void 0 ? void 0 : _a.angleRad);
+            }
         }
     };
     ImageEditPlugin.prototype.updateRotateHandleState = function (editor, image, wrapper, rotators, angleRad) {
@@ -29055,49 +29270,52 @@ var ImageEditPlugin = /** @class */ (function () {
         }
     };
     ImageEditPlugin.prototype.isOperationAllowed = function (operation) {
-        return operation === 'resize' || operation === 'rotate' || operation === 'flip';
+        return (operation === 'resize' ||
+            operation === 'rotate' ||
+            operation === 'flip' ||
+            operation === 'crop');
     };
     ImageEditPlugin.prototype.canRegenerateImage = function (image) {
         return (0, canRegenerateImage_1.canRegenerateImage)(image);
     };
-    ImageEditPlugin.prototype.cropImage = function () {
+    ImageEditPlugin.prototype.startCropMode = function (editor, image) {
         var _this = this;
-        var _a, _b;
-        var selection = (_a = this.editor) === null || _a === void 0 ? void 0 : _a.getDOMSelection();
-        if (!this.editor || !selection || selection.type !== 'image') {
+        if (this.imageEditInfo) {
+            this.startEditing(editor, image, ['crop']);
+            if (this.imageEditInfo && this.selectedImage && this.wrapper && this.clonedImage) {
+                this.dndHelpers = (0, tslib_1.__spreadArray)([], (0, tslib_1.__read)((0, getDropAndDragHelpers_1.getDropAndDragHelpers)(this.wrapper, this.imageEditInfo, this.options, ImageEditElementClass_1.ImageEditElementClass.CropHandle, cropperContext_1.Cropper, function () {
+                    if (_this.imageEditInfo &&
+                        _this.selectedImage &&
+                        _this.wrapper &&
+                        _this.clonedImage) {
+                        (0, updateWrapper_1.updateWrapper)(_this.imageEditInfo, _this.options, _this.selectedImage, _this.clonedImage, _this.wrapper, undefined, _this.croppers);
+                        _this.isCropMode = true;
+                    }
+                }, this.zoomScale)), false);
+                (0, updateWrapper_1.updateWrapper)(this.imageEditInfo, this.options, this.selectedImage, this.clonedImage, this.wrapper, undefined, this.croppers);
+            }
+        }
+    };
+    ImageEditPlugin.prototype.cropImage = function () {
+        if (!this.editor) {
             return;
         }
-        var image = selection.image;
-        if (this.wrapper && this.selectedImage && this.shadowSpan) {
-            image = (_b = this.removeImageWrapper()) !== null && _b !== void 0 ? _b : image;
+        if (!this.editor.getEnvironment().isSafari) {
+            this.editor.focus(); // Safari will keep the selection when click crop, then the focus() call should not be called
         }
-        this.startEditing(this.editor, image, 'crop');
-        if (!this.selectedImage || !this.imageEditInfo || !this.wrapper || !this.clonedImage) {
-            return;
+        var selection = this.editor.getDOMSelection();
+        if ((selection === null || selection === void 0 ? void 0 : selection.type) == 'image') {
+            this.applyFormatWithContentModel(this.editor, true /* isCropMode */, false /* shouldSelectImage */);
         }
-        this.dndHelpers = (0, tslib_1.__spreadArray)([], (0, tslib_1.__read)((0, getDropAndDragHelpers_1.getDropAndDragHelpers)(this.wrapper, this.imageEditInfo, this.options, ImageEditElementClass_1.ImageEditElementClass.CropHandle, cropperContext_1.Cropper, function () {
-            if (_this.imageEditInfo &&
-                _this.selectedImage &&
-                _this.wrapper &&
-                _this.clonedImage) {
-                (0, updateWrapper_1.updateWrapper)(_this.imageEditInfo, _this.options, _this.selectedImage, _this.clonedImage, _this.wrapper, undefined, _this.croppers);
-                _this.isCropMode = true;
-            }
-        }, this.zoomScale)), false);
-        (0, updateWrapper_1.updateWrapper)(this.imageEditInfo, this.options, this.selectedImage, this.clonedImage, this.wrapper, undefined, this.croppers);
     };
     ImageEditPlugin.prototype.editImage = function (editor, image, apiOperation, operation) {
-        var _a;
-        if (this.wrapper && this.selectedImage && this.shadowSpan) {
-            image = (_a = this.removeImageWrapper()) !== null && _a !== void 0 ? _a : image;
-        }
         this.startEditing(editor, image, apiOperation);
         if (!this.selectedImage || !this.imageEditInfo || !this.wrapper || !this.clonedImage) {
             return;
         }
         operation(this.imageEditInfo);
         (0, updateWrapper_1.updateWrapper)(this.imageEditInfo, this.options, this.selectedImage, this.clonedImage, this.wrapper);
-        this.formatImageWithContentModel(editor, true /* shouldSelect*/, true /* shouldSelectAsImageSelection*/);
+        this.applyFormatWithContentModel(editor, false /* isCrop */, true /* shouldSelect*/, true /* isApiOperation */);
     };
     ImageEditPlugin.prototype.cleanInfo = function () {
         var _a;
@@ -29117,42 +29335,6 @@ var ImageEditPlugin = /** @class */ (function () {
         this.rotators = [];
         this.croppers = [];
     };
-    ImageEditPlugin.prototype.formatImageWithContentModel = function (editor, shouldSelectImage, shouldSelectAsImageSelection) {
-        var _this = this;
-        if (this.lastSrc &&
-            this.selectedImage &&
-            this.imageEditInfo &&
-            this.clonedImage &&
-            this.shadowSpan) {
-            editor.formatContentModel(function (model) {
-                var selectedSegmentsAndParagraphs = (0, roosterjs_content_model_dom_1.getSelectedSegmentsAndParagraphs)(model, false);
-                if (!selectedSegmentsAndParagraphs[0]) {
-                    return false;
-                }
-                var segment = selectedSegmentsAndParagraphs[0][0];
-                var paragraph = selectedSegmentsAndParagraphs[0][1];
-                if (paragraph && segment.segmentType == 'Image') {
-                    (0, roosterjs_content_model_dom_1.mutateSegment)(paragraph, segment, function (image) {
-                        if (_this.lastSrc &&
-                            _this.selectedImage &&
-                            _this.imageEditInfo &&
-                            _this.clonedImage) {
-                            (0, applyChange_1.applyChange)(editor, _this.selectedImage, image, _this.imageEditInfo, _this.lastSrc, _this.wasImageResized || _this.isCropMode, _this.clonedImage);
-                            image.isSelected = shouldSelectImage;
-                            image.isSelectedAsImageSelection = shouldSelectAsImageSelection;
-                        }
-                    });
-                    return true;
-                }
-                return false;
-            }, {
-                changeSource: IMAGE_EDIT_CHANGE_SOURCE,
-                onNodeCreated: function () {
-                    _this.cleanInfo();
-                },
-            });
-        }
-    };
     ImageEditPlugin.prototype.removeImageWrapper = function () {
         var image = null;
         if (this.shadowSpan && this.shadowSpan.parentElement) {
@@ -29175,7 +29357,7 @@ var ImageEditPlugin = /** @class */ (function () {
         }
         var image = selection.image;
         if (this.editor) {
-            this.editImage(this.editor, image, 'flip', function (imageEditInfo) {
+            this.editImage(this.editor, image, ['flip'], function (imageEditInfo) {
                 var angleRad = imageEditInfo.angleRad || 0;
                 var isInVerticalPostion = (angleRad >= Math.PI / 2 && angleRad < (3 * Math.PI) / 4) ||
                     (angleRad <= -Math.PI / 2 && angleRad > (-3 * Math.PI) / 4);
@@ -29206,15 +29388,19 @@ var ImageEditPlugin = /** @class */ (function () {
         }
         var image = selection.image;
         if (this.editor) {
-            this.editImage(this.editor, image, 'rotate', function (imageEditInfo) {
+            this.editImage(this.editor, image, [], function (imageEditInfo) {
                 imageEditInfo.angleRad = (imageEditInfo.angleRad || 0) + angleRad;
             });
         }
     };
-    //EXPOSED FOR TEST ONLY
-    ImageEditPlugin.prototype.getWrapper = function () {
-        return this.wrapper;
-    };
+    Object.defineProperty(ImageEditPlugin.prototype, "isEditingImage", {
+        //EXPOSED FOR TEST ONLY
+        get: function () {
+            return this.isEditing;
+        },
+        enumerable: false,
+        configurable: true
+    });
     return ImageEditPlugin;
 }());
 exports.ImageEditPlugin = ImageEditPlugin;
@@ -29779,7 +29965,8 @@ var updateImageEditInfo_1 = __webpack_require__(/*! ./updateImageEditInfo */ "./
 function applyChange(editor, image, contentModelImage, editInfo, previousSrc, wasResizedOrCropped, editingImage) {
     var _a;
     var newSrc = '';
-    var initEditInfo = (_a = (0, updateImageEditInfo_1.getSelectedImageMetadata)(editor, editingImage !== null && editingImage !== void 0 ? editingImage : image)) !== null && _a !== void 0 ? _a : undefined;
+    var imageEditing = editingImage !== null && editingImage !== void 0 ? editingImage : image;
+    var initEditInfo = (_a = (0, updateImageEditInfo_1.updateImageEditInfo)(contentModelImage, imageEditing)) !== null && _a !== void 0 ? _a : undefined;
     var state = (0, checkEditInfoState_1.checkEditInfoState)(editInfo, initEditInfo);
     switch (state) {
         case 'ResizeOnly':
@@ -29811,12 +29998,12 @@ function applyChange(editor, image, contentModelImage, editInfo, previousSrc, wa
     if (newSrc == editInfo.src) {
         // If newSrc is the same with original one, it means there is only size change, but no rotation, no cropping,
         // so we don't need to keep edit info, we can delete it
-        (0, updateImageEditInfo_1.updateImageEditInfo)(contentModelImage, null);
+        (0, updateImageEditInfo_1.updateImageEditInfo)(contentModelImage, imageEditing, null);
     }
     else {
         // Otherwise, save the new edit info to the image so that next time when we edit the same image, we know
         // the edit info
-        (0, updateImageEditInfo_1.updateImageEditInfo)(contentModelImage, editInfo);
+        (0, updateImageEditInfo_1.updateImageEditInfo)(contentModelImage, imageEditing, editInfo);
     }
     // Write back the change to image, and set its new size
     var generatedImageSize = (0, generateImageSize_1.getGeneratedImageSize)(editInfo);
@@ -29827,11 +30014,6 @@ function applyChange(editor, image, contentModelImage, editInfo, previousSrc, wa
     if (wasResizedOrCropped || state == 'FullyChanged') {
         contentModelImage.format.width = generatedImageSize.targetWidth + 'px';
         contentModelImage.format.height = generatedImageSize.targetHeight + 'px';
-        // Remove width/height style so that it won't affect the image size, since style width/height has higher priority
-        image.style.removeProperty('width');
-        image.style.removeProperty('height');
-        image.style.removeProperty('max-width');
-        image.style.removeProperty('max-height');
     }
 }
 exports.applyChange = applyChange;
@@ -29958,25 +30140,27 @@ exports.createImageWrapper = void 0;
 var createImageCropper_1 = __webpack_require__(/*! ../Cropper/createImageCropper */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/Cropper/createImageCropper.ts");
 var createImageResizer_1 = __webpack_require__(/*! ../Resizer/createImageResizer */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/Resizer/createImageResizer.ts");
 var createImageRotator_1 = __webpack_require__(/*! ../Rotator/createImageRotator */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/Rotator/createImageRotator.ts");
+var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
 /**
  * @internal
  */
-function createImageWrapper(editor, image, imageSpan, options, editInfo, htmlOptions, operation) {
+function createImageWrapper(editor, image, options, editInfo, htmlOptions, operation) {
     var imageClone = cloneImage(image, editInfo);
     var doc = editor.getDocument();
     var rotators = [];
-    if (!options.disableRotate && operation === 'rotate') {
+    if (!options.disableRotate && operation.indexOf('rotate') > -1) {
         rotators = (0, createImageRotator_1.createImageRotator)(doc, htmlOptions);
     }
     var resizers = [];
-    if (operation === 'resize') {
+    if (operation.indexOf('resize') > -1) {
         resizers = (0, createImageResizer_1.createImageResizer)(doc);
     }
     var croppers = [];
-    if (operation === 'crop') {
+    if (operation.indexOf('crop') > -1) {
         croppers = (0, createImageCropper_1.createImageCropper)(doc);
     }
     var wrapper = createWrapper(editor, imageClone, options, editInfo, resizers, rotators, croppers);
+    var imageSpan = (0, roosterjs_content_model_dom_1.wrap)(doc, image, 'span');
     var shadowSpan = createShadowSpan(wrapper, imageSpan);
     return { wrapper: wrapper, shadowSpan: shadowSpan, imageClone: imageClone, resizers: resizers, rotators: rotators, croppers: croppers };
 }
@@ -29996,8 +30180,10 @@ var createWrapper = function (editor, image, options, editInfo, resizers, rotato
     var imageBox = doc.createElement('div');
     imageBox.setAttribute("style", "position:relative;width:100%;height:100%;overflow:hidden;transform:scale(1);");
     imageBox.appendChild(image);
-    wrapper.setAttribute('style', "max-width: 100%; position: relative; display: inline-flex; font-size: 24px; margin: 0px; transform: rotate(" + ((_a = editInfo.angleRad) !== null && _a !== void 0 ? _a : 0) + "rad); text-align: left;");
-    wrapper.style.display = editor.getEnvironment().isSafari ? 'inline-block' : 'inline-flex';
+    wrapper.setAttribute('style', "font-size: 24px; margin: 0px; transform: rotate(" + ((_a = editInfo.angleRad) !== null && _a !== void 0 ? _a : 0) + "rad);");
+    wrapper.style.display = editor.getEnvironment().isSafari
+        ? '-webkit-inline-flex'
+        : 'inline-flex';
     var border = createBorder(editor, options.borderColor);
     wrapper.appendChild(imageBox);
     wrapper.appendChild(border);
@@ -30086,6 +30272,59 @@ function doubleCheckResize(editInfo, preserveRatio, actualWidth, actualHeight) {
 exports.doubleCheckResize = doubleCheckResize;
 
 
+/***/ }),
+
+/***/ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/findEditingImage.ts":
+/*!******************************************************************************************!*\
+  !*** ./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/findEditingImage.ts ***!
+  \******************************************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.findEditingImage = void 0;
+/**
+ * @internal
+ */
+function findEditingImage(group) {
+    for (var i = 0; i < group.blocks.length; i++) {
+        var block = group.blocks[i];
+        switch (block.blockType) {
+            case 'BlockGroup':
+                var result = findEditingImage(block);
+                if (result) {
+                    return result;
+                }
+                break;
+            case 'Paragraph':
+                for (var j = 0; j < block.segments.length; j++) {
+                    var segment = block.segments[j];
+                    switch (segment.segmentType) {
+                        case 'Image':
+                            if (segment.dataset.isEditing) {
+                                return {
+                                    paragraph: block,
+                                    image: segment,
+                                };
+                            }
+                            break;
+                        case 'General':
+                            var result_1 = findEditingImage(segment);
+                            if (result_1) {
+                                return result_1;
+                            }
+                            break;
+                    }
+                }
+                break;
+        }
+    }
+    return null;
+}
+exports.findEditingImage = findEditingImage;
+
+
 /***/ }),
 
 /***/ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/generateDataURL.ts":
@@ -30270,28 +30509,33 @@ exports.getHTMLImageOptions = getHTMLImageOptions;
 
 /***/ }),
 
-/***/ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/getSelectedContentModelImage.ts":
-/*!******************************************************************************************************!*\
-  !*** ./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/getSelectedContentModelImage.ts ***!
-  \******************************************************************************************************/
+/***/ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/getSelectedImage.ts":
+/*!******************************************************************************************!*\
+  !*** ./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/getSelectedImage.ts ***!
+  \******************************************************************************************/
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getSelectedContentModelImage = void 0;
+exports.getSelectedImage = void 0;
 var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
 /**
  * @internal
  */
-function getSelectedContentModelImage(model) {
-    var selectedSegments = (0, roosterjs_content_model_dom_1.getSelectedSegments)(model, false /*includeFormatHolder*/);
-    if (selectedSegments.length == 1 && selectedSegments[0].segmentType == 'Image') {
-        return selectedSegments[0];
+function getSelectedImage(model) {
+    var selections = (0, roosterjs_content_model_dom_1.getSelectedSegmentsAndParagraphs)(model, false);
+    if (selections.length == 1 && selections[0][0].segmentType == 'Image' && selections[0][1]) {
+        return {
+            image: selections[0][0],
+            paragraph: selections[0][1],
+        };
+    }
+    else {
+        return null;
     }
-    return null;
 }
-exports.getSelectedContentModelImage = getSelectedContentModelImage;
+exports.getSelectedImage = getSelectedImage;
 
 
 /***/ }),
@@ -30406,6 +30650,48 @@ function isFixedNumberValue(value) {
 }
 
 
+/***/ }),
+
+/***/ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/normalizeImageSelection.ts":
+/*!*************************************************************************************************!*\
+  !*** ./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/normalizeImageSelection.ts ***!
+  \*************************************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.normalizeImageSelection = void 0;
+var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
+/**
+ * Selecting directly on the image will only capture the image segment.
+ * However, if the selection is made while the image is within a wrapper, it will capture the span that encloses the image.
+ * In the last case, the selection will be marked as <---SelectionMarker---><---Image---><---SelectionMarker--->.
+ * To fix this behavior the extra selection markers are removed.
+ * @internal
+ */
+function normalizeImageSelection(imageAndParagraph) {
+    var paragraph = imageAndParagraph.paragraph;
+    var index = paragraph.segments.indexOf(imageAndParagraph.image);
+    if (index > 0) {
+        var markerBefore = paragraph.segments[index - 1];
+        var markerAfter = paragraph.segments[index + 1];
+        if (markerBefore &&
+            markerAfter &&
+            markerAfter.segmentType == 'SelectionMarker' &&
+            markerBefore.segmentType == 'SelectionMarker' &&
+            markerAfter.isSelected &&
+            markerBefore.isSelected) {
+            var mutatedParagraph = (0, roosterjs_content_model_dom_1.mutateBlock)(paragraph);
+            mutatedParagraph.segments.splice(index - 1, 1);
+            mutatedParagraph.segments.splice(index, 1);
+        }
+        return imageAndParagraph;
+    }
+}
+exports.normalizeImageSelection = normalizeImageSelection;
+
+
 /***/ }),
 
 /***/ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/updateHandleCursor.ts":
@@ -30463,18 +30749,19 @@ exports.updateHandleCursor = updateHandleCursor;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getSelectedImageMetadata = exports.updateImageEditInfo = void 0;
 var tslib_1 = __webpack_require__(/*! tslib */ "./node_modules/tslib/tslib.es6.mjs");
-var getSelectedContentModelImage_1 = __webpack_require__(/*! ./getSelectedContentModelImage */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/getSelectedContentModelImage.ts");
+var getSelectedImage_1 = __webpack_require__(/*! ./getSelectedImage */ "./packages/roosterjs-content-model-plugins/lib/imageEdit/utils/getSelectedImage.ts");
 var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
 /**
  * @internal
  */
-function updateImageEditInfo(contentModelImage, newImageMetadata) {
-    (0, roosterjs_content_model_dom_1.updateImageMetadata)(contentModelImage, newImageMetadata !== undefined
+function updateImageEditInfo(contentModelImage, image, newImageMetadata) {
+    var contentModelMetadata = (0, roosterjs_content_model_dom_1.updateImageMetadata)(contentModelImage, newImageMetadata !== undefined
         ? function (format) {
             format = newImageMetadata;
             return format;
         }
         : undefined);
+    return (0, tslib_1.__assign)((0, tslib_1.__assign)({}, getInitialEditInfo(image)), contentModelMetadata);
 }
 exports.updateImageEditInfo = updateImageEditInfo;
 function getInitialEditInfo(image) {
@@ -30498,9 +30785,12 @@ function getInitialEditInfo(image) {
 function getSelectedImageMetadata(editor, image) {
     var imageMetadata = getInitialEditInfo(image);
     editor.formatContentModel(function (model) {
-        var selectedImage = (0, getSelectedContentModelImage_1.getSelectedContentModelImage)(model);
-        if (selectedImage) {
-            imageMetadata = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, imageMetadata), selectedImage.dataset);
+        var selectedImage = (0, getSelectedImage_1.getSelectedImage)(model);
+        if (selectedImage === null || selectedImage === void 0 ? void 0 : selectedImage.image) {
+            (0, roosterjs_content_model_dom_1.mutateSegment)(selectedImage.paragraph, selectedImage === null || selectedImage === void 0 ? void 0 : selectedImage.image, function (modelImage) {
+                imageMetadata = updateImageEditInfo(modelImage, image);
+            });
+            return true;
         }
         return false;
     });
@@ -30580,7 +30870,7 @@ function updateWrapper(editInfo, options, image, clonedImage, wrapper, resizers,
         (0, imageEditUtils_1.setSize)(cropOverlays[1], undefined, 0, 0, cropBottomPx, cropRightPx, undefined);
         (0, imageEditUtils_1.setSize)(cropOverlays[2], cropLeftPx, undefined, 0, 0, undefined, cropBottomPx);
         (0, imageEditUtils_1.setSize)(cropOverlays[3], 0, cropTopPx, undefined, 0, cropLeftPx, undefined);
-        if (angleRad) {
+        if (angleRad !== undefined) {
             (0, updateHandleCursor_1.updateHandleCursor)(croppers, angleRad);
         }
     }
@@ -30597,7 +30887,7 @@ function updateWrapper(editInfo, options, image, clonedImage, wrapper, resizers,
             }
         })
             .filter(function (handle) { return !!handle; });
-        if (angleRad) {
+        if (angleRad !== undefined) {
             (0, updateHandleCursor_1.updateHandleCursor)(resizeHandles, angleRad);
         }
         (0, updateSideHandlesVisibility_1.updateSideHandlesVisibility)(resizeHandles, smallImage);
@@ -30617,11 +30907,13 @@ exports.updateWrapper = updateWrapper;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.ImageEditPlugin = exports.CustomReplacePlugin = exports.PickerPlugin = exports.HyperlinkPlugin = exports.MarkdownPlugin = exports.WatermarkPlugin = exports.ContextMenuPluginBase = exports.ShortcutPlugin = exports.ShortcutOutdentList = exports.ShortcutIndentList = exports.ShortcutDecreaseFont = exports.ShortcutIncreaseFont = exports.ShortcutNumbering = exports.ShortcutBullet = exports.ShortcutRedoMacOS = exports.ShortcutRedoAlt = exports.ShortcutRedo = exports.ShortcutUndo2 = exports.ShortcutUndo = exports.ShortcutClearFormat = exports.ShortcutUnderline = exports.ShortcutItalic = exports.ShortcutBold = exports.AutoFormatPlugin = exports.EditPlugin = exports.PastePlugin = exports.TableEditPlugin = void 0;
+exports.ImageEditPlugin = exports.CustomReplacePlugin = exports.PickerPlugin = exports.HyperlinkPlugin = exports.MarkdownPlugin = exports.WatermarkPlugin = exports.ContextMenuPluginBase = exports.ShortcutPlugin = exports.ShortcutOutdentList = exports.ShortcutIndentList = exports.ShortcutDecreaseFont = exports.ShortcutIncreaseFont = exports.ShortcutNumbering = exports.ShortcutBullet = exports.ShortcutRedoMacOS = exports.ShortcutRedoAlt = exports.ShortcutRedo = exports.ShortcutUndo2 = exports.ShortcutUndo = exports.ShortcutClearFormat = exports.ShortcutUnderline = exports.ShortcutItalic = exports.ShortcutBold = exports.AutoFormatPlugin = exports.EditPlugin = exports.DefaultSanitizers = exports.PastePlugin = exports.TableEditPlugin = void 0;
 var TableEditPlugin_1 = __webpack_require__(/*! ./tableEdit/TableEditPlugin */ "./packages/roosterjs-content-model-plugins/lib/tableEdit/TableEditPlugin.ts");
 Object.defineProperty(exports, "TableEditPlugin", ({ enumerable: true, get: function () { return TableEditPlugin_1.TableEditPlugin; } }));
 var PastePlugin_1 = __webpack_require__(/*! ./paste/PastePlugin */ "./packages/roosterjs-content-model-plugins/lib/paste/PastePlugin.ts");
 Object.defineProperty(exports, "PastePlugin", ({ enumerable: true, get: function () { return PastePlugin_1.PastePlugin; } }));
+var DefaultSanitizers_1 = __webpack_require__(/*! ./paste/DefaultSanitizers */ "./packages/roosterjs-content-model-plugins/lib/paste/DefaultSanitizers.ts");
+Object.defineProperty(exports, "DefaultSanitizers", ({ enumerable: true, get: function () { return DefaultSanitizers_1.DefaultSanitizers; } }));
 var EditPlugin_1 = __webpack_require__(/*! ./edit/EditPlugin */ "./packages/roosterjs-content-model-plugins/lib/edit/EditPlugin.ts");
 Object.defineProperty(exports, "EditPlugin", ({ enumerable: true, get: function () { return EditPlugin_1.EditPlugin; } }));
 var AutoFormatPlugin_1 = __webpack_require__(/*! ./autoFormat/AutoFormatPlugin */ "./packages/roosterjs-content-model-plugins/lib/autoFormat/AutoFormatPlugin.ts");
@@ -30880,7 +31172,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.setFormat = void 0;
 var tslib_1 = __webpack_require__(/*! tslib */ "./node_modules/tslib/tslib.es6.mjs");
 var roosterjs_content_model_api_1 = __webpack_require__(/*! roosterjs-content-model-api */ "./packages/roosterjs-content-model-api/lib/index.ts");
-var splitTextSegment_1 = __webpack_require__(/*! ../../pluginUtils/splitTextSegment */ "./packages/roosterjs-content-model-plugins/lib/pluginUtils/splitTextSegment.ts");
 /**
  * @internal
  */
@@ -30895,7 +31186,7 @@ function setFormat(editor, character, format, codeFormat) {
                     .substring(0, lastCharIndex - 1)
                     .lastIndexOf(character);
                 if (lastCharIndex - firstCharIndex > 2) {
-                    var formattedText = (0, splitTextSegment_1.splitTextSegment)(previousSegment, paragraph, firstCharIndex, lastCharIndex);
+                    var formattedText = (0, roosterjs_content_model_api_1.splitTextSegment)(previousSegment, paragraph, firstCharIndex, lastCharIndex);
                     formattedText.text = formattedText.text.replace(character, '').slice(0, -1);
                     formattedText.format = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, formattedText.format), format);
                     if (codeFormat) {
@@ -30927,7 +31218,7 @@ exports.setFormat = setFormat;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.divParagraphSanitizer = exports.DefaultSanitizers = void 0;
 /**
- * @internal
+ * Default style sanitizers for PastePlugin.
  */
 exports.DefaultSanitizers = {
     width: divParagraphSanitizer,
@@ -32704,7 +32995,7 @@ exports.PickerPlugin = PickerPlugin;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getQueryString = void 0;
-var splitTextSegment_1 = __webpack_require__(/*! ../pluginUtils/splitTextSegment */ "./packages/roosterjs-content-model-plugins/lib/pluginUtils/splitTextSegment.ts");
+var roosterjs_content_model_api_1 = __webpack_require__(/*! roosterjs-content-model-api */ "./packages/roosterjs-content-model-api/lib/index.ts");
 /**
  * @internal
  */
@@ -32721,7 +33012,7 @@ function getQueryString(triggerCharacter, paragraph, previousSegment, splittedSe
         if (index >= 0) {
             result = segment.text.substring(index) + result;
             splittedSegmentResult === null || splittedSegmentResult === void 0 ? void 0 : splittedSegmentResult.unshift(index > 0
-                ? (0, splitTextSegment_1.splitTextSegment)(segment, paragraph, index, segment.text.length)
+                ? (0, roosterjs_content_model_api_1.splitTextSegment)(segment, paragraph, index, segment.text.length)
                 : segment);
             break;
         }
@@ -32987,42 +33278,6 @@ function getIntersectedRect(elements, additionalRects) {
 exports.getIntersectedRect = getIntersectedRect;
 
 
-/***/ }),
-
-/***/ "./packages/roosterjs-content-model-plugins/lib/pluginUtils/splitTextSegment.ts":
-/*!**************************************************************************************!*\
-  !*** ./packages/roosterjs-content-model-plugins/lib/pluginUtils/splitTextSegment.ts ***!
-  \**************************************************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.splitTextSegment = void 0;
-var tslib_1 = __webpack_require__(/*! tslib */ "./node_modules/tslib/tslib.es6.mjs");
-var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
-/**
- * @internal
- */
-function splitTextSegment(textSegment, parent, start, end) {
-    var _a;
-    var text = textSegment.text;
-    var index = parent.segments.indexOf(textSegment);
-    var middleSegment = (0, roosterjs_content_model_dom_1.createText)(text.substring(start, end), textSegment.format, textSegment.link, textSegment.code);
-    var newSegments = [middleSegment];
-    if (start > 0) {
-        newSegments.unshift((0, roosterjs_content_model_dom_1.createText)(text.substring(0, start), textSegment.format, textSegment.link, textSegment.code));
-    }
-    if (end < text.length) {
-        newSegments.push((0, roosterjs_content_model_dom_1.createText)(text.substring(end), textSegment.format, textSegment.link, textSegment.code));
-    }
-    newSegments.forEach(function (segment) { return (segment.isSelected = textSegment.isSelected); });
-    (_a = parent.segments).splice.apply(_a, (0, tslib_1.__spreadArray)([index, 1], (0, tslib_1.__read)(newSegments), false));
-    return middleSegment;
-}
-exports.splitTextSegment = splitTextSegment;
-
-
 /***/ }),
 
 /***/ "./packages/roosterjs-content-model-plugins/lib/shortcut/ShortcutPlugin.ts":
@@ -33710,8 +33965,10 @@ var TableEditor = /** @class */ (function () {
             _this.disposeTableInserter();
             _this.disposeCellResizers();
         };
-        this.onEndTableMove = function () {
-            _this.disposeTableMover();
+        this.onEndTableMove = function (disposeHandler) {
+            if (disposeHandler) {
+                _this.disposeTableMover();
+            }
             return _this.onFinishEditing();
         };
         this.onInserted = function () {
@@ -34485,9 +34742,9 @@ function onDragEnd(context, event, initValue) {
     // Reset cursor
     setTableMoverCursor(editor, false);
     if (element == context.div) {
-        // Table mover was only clicked, select whole table
+        // Table mover was only clicked, select whole table and do not dismiss the handler element.
         selectWholeTable(table);
-        context.onEnd();
+        context.onEnd(false /* disposeHandler */);
         return true;
     }
     else {
@@ -34496,7 +34753,7 @@ function onDragEnd(context, event, initValue) {
             !editor.getDOMHelper().isNodeInEditor(element) ||
             disableMovement) {
             editor.setDOMSelection((_a = initValue === null || initValue === void 0 ? void 0 : initValue.initialSelection) !== null && _a !== void 0 ? _a : null);
-            context.onEnd();
+            context.onEnd(true /* disposeHandler */);
             return false;
         }
         var insertionSuccess_1 = false;
@@ -34554,7 +34811,7 @@ function onDragEnd(context, event, initValue) {
             // No movement, restore initial selection
             editor.setDOMSelection((_b = initValue === null || initValue === void 0 ? void 0 : initValue.initialSelection) !== null && _b !== void 0 ? _b : null);
         }
-        context.onEnd();
+        context.onEnd(true /* disposeHandler */);
         return insertionSuccess_1;
     }
 }
@@ -34812,6 +35069,7 @@ exports.getCMTableFromTable = getCMTableFromTable;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.WatermarkPlugin = void 0;
+var tslib_1 = __webpack_require__(/*! tslib */ "./node_modules/tslib/tslib.es6.mjs");
 var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
 var isModelEmptyFast_1 = __webpack_require__(/*! ./isModelEmptyFast */ "./packages/roosterjs-content-model-plugins/lib/watermark/isModelEmptyFast.ts");
 var WATERMARK_CONTENT_KEY = '_WatermarkContent';
@@ -34832,6 +35090,7 @@ var WatermarkPlugin = /** @class */ (function () {
         this.watermark = watermark;
         this.editor = null;
         this.isShowing = false;
+        this.darkTextColor = null;
         this.format = format || {
             fontSize: '14px',
             textColor: '#AAAAAA',
@@ -34871,6 +35130,21 @@ var WatermarkPlugin = /** @class */ (function () {
             // When input text, editor must not be empty, so we can do hide watermark now without checking content model
             this.showHide(editor, false /*isEmpty*/);
         }
+        else if (event.eventType == 'contentChanged' &&
+            (event.source == roosterjs_content_model_dom_1.ChangeSource.SwitchToDarkMode ||
+                event.source == roosterjs_content_model_dom_1.ChangeSource.SwitchToLightMode) &&
+            this.isShowing) {
+            // When the placeholder is shown and user switches the mode, we need to update watermark style
+            if (event.source == roosterjs_content_model_dom_1.ChangeSource.SwitchToDarkMode &&
+                !this.darkTextColor &&
+                this.format.textColor) {
+                // Get the dark color only once when dark mode is enabled for the first time
+                this.darkTextColor = editor
+                    .getColorManager()
+                    .getDarkColor(this.format.textColor, undefined, 'text');
+            }
+            this.applyWatermarkStyle(editor);
+        }
         else if (event.eventType == 'editorReady' ||
             event.eventType == 'contentChanged' ||
             event.eventType == 'input' ||
@@ -34891,15 +35165,18 @@ var WatermarkPlugin = /** @class */ (function () {
         }
     };
     WatermarkPlugin.prototype.show = function (editor) {
-        var _this = this;
+        this.applyWatermarkStyle(editor);
+        this.isShowing = true;
+    };
+    WatermarkPlugin.prototype.applyWatermarkStyle = function (editor) {
         var rule = "position: absolute; pointer-events: none; content: \"" + this.watermark + "\";";
+        var format = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, this.format), { textColor: editor.isDarkMode() ? this.darkTextColor : this.format.textColor });
         (0, roosterjs_content_model_dom_1.getObjectKeys)(styleMap).forEach(function (x) {
-            if (_this.format[x]) {
-                rule += styleMap[x] + ": " + _this.format[x] + "!important;";
+            if (format[x]) {
+                rule += styleMap[x] + ": " + format[x] + "!important;";
             }
         });
         editor.setEditorStyle(WATERMARK_CONTENT_KEY, rule, 'before');
-        this.isShowing = true;
     };
     WatermarkPlugin.prototype.hide = function (editor) {
         editor.setEditorStyle(WATERMARK_CONTENT_KEY, null);