roosterjs 9.34.0 → 9.35.0

package/dist/rooster-amd.js

@@ -2682,7 +2682,9 @@ var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-mo
  */
 function toggleModelBlockQuote(model, formatLtr, formatRtl) {
     (0, splitSelectedParagraphByBr_1.splitSelectedParagraphByBr)(model);
-    var paragraphOfQuote = (0, roosterjs_content_model_dom_1.getOperationalBlocks)(model, ['FormatContainer', 'ListItem'], ['TableCell'], true /*deepFirst*/);
+    var paragraphOfQuote = (0, roosterjs_content_model_dom_1.getOperationalBlocks)(model, ['FormatContainer', 'ListItem'], ['TableCell'], true /*deepFirst*/, function (block) {
+        return block.blockGroupType == 'FormatContainer' ? block.tagName == 'blockquote' : true;
+    });
     if (areAllBlockQuotes(paragraphOfQuote)) {
         // All selections are already in quote, we need to unquote them
         paragraphOfQuote.forEach(function (_a) {
@@ -3588,6 +3590,9 @@ var splitTextSegment_1 = __webpack_require__(/*! ../../publicApi/segment/splitTe
  * @returns If a link is promoted, return this segment. Otherwise return null
  */
 function promoteLink(segment, paragraph, autoLinkOptions) {
+    if (segment.link) {
+        return null;
+    }
     var link = segment.text.split(' ').pop();
     var url = link === null || link === void 0 ? void 0 : link.trim();
     var linkUrl = undefined;
@@ -9366,6 +9371,8 @@ var formatContentModel = function (core, formatter, options, domToModelOptions)
                 data: (_b = options === null || options === void 0 ? void 0 : options.getChangeData) === null || _b === void 0 ? void 0 : _b.call(options),
                 formatApiName: options === null || options === void 0 ? void 0 : options.apiName,
                 changedEntities: getChangedEntities(context, rawEvent),
+                skipUndo: !(shouldMarkNewContent || shouldAddSnapshot) ||
+                    (options === null || options === void 0 ? void 0 : options.changeSource) == roosterjs_content_model_dom_1.ChangeSource.Keyboard, // Keyboard changes will be handled separately in undo plugin, so we need to skip handling it again
             };
             core.api.triggerEvent(core, eventData, true /*broadcast*/);
             if (canUndoByBackspace && (selection === null || selection === void 0 ? void 0 : selection.type) == 'range') {
@@ -9948,7 +9955,7 @@ var setContentModel = function (core, model, option, onNodeCreated, isInitializi
         : (0, roosterjs_content_model_dom_1.createModelToDomContextWithConfig)(core.environment.modelToDomSettings.calculated, editorContext);
     modelToDomContext.onNodeCreated = onNodeCreated;
     (_a = core.onFixUpModel) === null || _a === void 0 ? void 0 : _a.call(core, model);
-    var selection = (0, roosterjs_content_model_dom_1.contentModelToDom)(core.logicalRoot.ownerDocument, core.logicalRoot, model, modelToDomContext);
+    var selection = (0, roosterjs_content_model_dom_1.contentModelToDom)(core.logicalRoot.ownerDocument.implementation.createHTMLDocument(), core.logicalRoot, model, modelToDomContext);
     if (!core.lifecycle.shadowEditFragment) {
         // Clear pending mutations since we will use our latest model object to replace existing cache
         (_b = core.cache.textMutationObserver) === null || _b === void 0 ? void 0 : _b.flushMutations(true /*ignoreMutations*/);
@@ -10602,11 +10609,10 @@ var CachePlugin = /** @class */ (function () {
         var _this = this;
         this.editor = null;
         this.onMutation = function (mutation) {
-            var _a, _b;
             if (_this.editor) {
                 switch (mutation.type) {
                     case 'childList':
-                        if (!((_a = _this.state.domIndexer) === null || _a === void 0 ? void 0 : _a.reconcileChildList(mutation.addedNodes, mutation.removedNodes))) {
+                        if (!_this.state.domIndexer.reconcileChildList(mutation.addedNodes, mutation.removedNodes)) {
                             _this.invalidateCache();
                         }
                         break;
@@ -10615,7 +10621,7 @@ var CachePlugin = /** @class */ (function () {
                         break;
                     case 'elementId':
                         var element = mutation.element;
-                        if (!((_b = _this.state.domIndexer) === null || _b === void 0 ? void 0 : _b.reconcileElementId(element))) {
+                        if (!_this.state.domIndexer.reconcileElementId(element)) {
                             _this.invalidateCache();
                         }
                         break;
@@ -10631,13 +10637,12 @@ var CachePlugin = /** @class */ (function () {
                 _this.updateCachedModel(_this.editor);
             }
         };
-        this.state = {};
-        if (!option.disableCache) {
-            this.state.domIndexer = new domIndexerImpl_1.DomIndexerImpl(option.experimentalFeatures &&
+        this.state = {
+            domIndexer: new domIndexerImpl_1.DomIndexerImpl(option.experimentalFeatures &&
                 option.experimentalFeatures.indexOf('PersistCache') >= 0, option.experimentalFeatures &&
-                option.experimentalFeatures.indexOf('KeepSelectionMarkerWhenEnteringTextNode') >= 0);
-            this.state.textMutationObserver = (0, textMutationObserver_1.createTextMutationObserver)(contentDiv, this.onMutation);
-        }
+                option.experimentalFeatures.indexOf('KeepSelectionMarkerWhenEnteringTextNode') >= 0),
+            textMutationObserver: (0, textMutationObserver_1.createTextMutationObserver)(contentDiv, this.onMutation),
+        };
         if (option.enableParagraphMap) {
             this.state.paragraphMap = (0, ParagraphMapImpl_1.createParagraphMap)();
         }
@@ -10655,10 +10660,9 @@ var CachePlugin = /** @class */ (function () {
      * @param editor The editor object
      */
     CachePlugin.prototype.initialize = function (editor) {
-        var _a;
         this.editor = editor;
         this.editor.getDocument().addEventListener('selectionchange', this.onNativeSelectionChange);
-        (_a = this.state.textMutationObserver) === null || _a === void 0 ? void 0 : _a.startObserving();
+        this.state.textMutationObserver.startObserving();
     };
     /**
      * The last method that editor will call to a plugin before it is disposed.
@@ -10666,8 +10670,7 @@ var CachePlugin = /** @class */ (function () {
      * called, plugin should not call to any editor method since it will result in error.
      */
     CachePlugin.prototype.dispose = function () {
-        var _a;
-        (_a = this.state.textMutationObserver) === null || _a === void 0 ? void 0 : _a.stopObserving();
+        this.state.textMutationObserver.stopObserving();
         if (this.editor) {
             this.editor
                 .getDocument()
@@ -10694,25 +10697,16 @@ var CachePlugin = /** @class */ (function () {
         switch (event.eventType) {
             case 'logicalRootChanged':
                 this.invalidateCache();
-                if (this.state.textMutationObserver) {
-                    this.state.textMutationObserver.stopObserving();
-                    this.state.textMutationObserver = (0, textMutationObserver_1.createTextMutationObserver)(event.logicalRoot, this.onMutation);
-                    this.state.textMutationObserver.startObserving();
-                }
-                break;
-            case 'keyDown':
-            case 'input':
-                if (!this.state.textMutationObserver) {
-                    // When updating cache is not enabled, need to clear the cache to make sure other plugins can get an up-to-date content model
-                    this.invalidateCache();
-                }
+                this.state.textMutationObserver.stopObserving();
+                this.state.textMutationObserver = (0, textMutationObserver_1.createTextMutationObserver)(event.logicalRoot, this.onMutation);
+                this.state.textMutationObserver.startObserving();
                 break;
             case 'selectionChanged':
                 this.updateCachedModel(this.editor);
                 break;
             case 'contentChanged':
                 var contentModel = event.contentModel, selection = event.selection;
-                if (contentModel && this.state.domIndexer) {
+                if (contentModel) {
                     (0, updateCache_1.updateCache)(this.state, contentModel, selection);
                 }
                 else {
@@ -10732,7 +10726,6 @@ var CachePlugin = /** @class */ (function () {
         }
     };
     CachePlugin.prototype.updateCachedModel = function (editor, forceUpdate) {
-        var _a;
         if (editor.isInShadowEdit()) {
             return;
         }
@@ -10747,7 +10740,7 @@ var CachePlugin = /** @class */ (function () {
         if (isSelectionChanged) {
             if (!model ||
                 !newRangeEx ||
-                !((_a = this.state.domIndexer) === null || _a === void 0 ? void 0 : _a.reconcileSelection(model, newRangeEx, cachedSelection))) {
+                !this.state.domIndexer.reconcileSelection(model, newRangeEx, cachedSelection)) {
                 this.invalidateCache();
             }
             else {
@@ -14652,8 +14645,8 @@ function shouldAddSnapshot(currentSnapshot, snapshot) {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createUndoPlugin = void 0;
-var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
 var SnapshotsManagerImpl_1 = __webpack_require__(/*! ./SnapshotsManagerImpl */ "./packages/roosterjs-content-model-core/lib/corePlugin/undo/SnapshotsManagerImpl.ts");
+var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
 var undo_1 = __webpack_require__(/*! ../../command/undo/undo */ "./packages/roosterjs-content-model-core/lib/command/undo/undo.ts");
 var Backspace = 'Backspace';
 var Delete = 'Delete';
@@ -14830,10 +14823,7 @@ var UndoPlugin = /** @class */ (function () {
         this.state.snapshotsManager.hasNewContent = true;
     };
     UndoPlugin.prototype.onContentChanged = function (event) {
-        if (!(this.state.isRestoring ||
-            event.source == roosterjs_content_model_dom_1.ChangeSource.SwitchToDarkMode ||
-            event.source == roosterjs_content_model_dom_1.ChangeSource.SwitchToLightMode ||
-            event.source == roosterjs_content_model_dom_1.ChangeSource.Keyboard)) {
+        if (!this.state.isRestoring && !event.skipUndo) {
             this.clearRedoForInput();
         }
     };
@@ -15116,6 +15106,7 @@ var Editor = /** @class */ (function () {
                 source: isDarkMode
                     ? roosterjs_content_model_dom_1.ChangeSource.SwitchToDarkMode
                     : roosterjs_content_model_dom_1.ChangeSource.SwitchToLightMode,
+                skipUndo: true,
             }, true);
         }
     };
@@ -24753,12 +24744,14 @@ exports.getClosestAncestorBlockGroupIndex = void 0;
  * @param path The block group path, from the closest one to root
  * @param blockGroupTypes The expected block group types
  * @param stopTypes @optional Block group types that will cause stop searching
+ * @param isValidTarget @optional An additional callback to validate whether a matching block group is a valid target
  */
-function getClosestAncestorBlockGroupIndex(path, blockGroupTypes, stopTypes) {
+function getClosestAncestorBlockGroupIndex(path, blockGroupTypes, stopTypes, isValidTarget) {
     if (stopTypes === void 0) { stopTypes = []; }
     for (var i = 0; i < path.length; i++) {
         var group = path[i];
-        if (blockGroupTypes.indexOf(group.blockGroupType) >= 0) {
+        if (blockGroupTypes.indexOf(group.blockGroupType) >= 0 &&
+            (!isValidTarget || isValidTarget(group))) {
             return i;
         }
         else if (stopTypes.indexOf(group.blockGroupType) >= 0) {
@@ -25042,7 +25035,7 @@ function mergeTables(markerPosition, newTable, source) {
 function mergeList(markerPosition, newList) {
     splitParagraph(markerPosition, newList.format);
     var path = markerPosition.path, paragraph = markerPosition.paragraph;
-    var listItemIndex = (0, getClosestAncestorBlockGroupIndex_1.getClosestAncestorBlockGroupIndex)(path, ['ListItem']);
+    var listItemIndex = (0, getClosestAncestorBlockGroupIndex_1.getClosestAncestorBlockGroupIndex)(path, ['ListItem'], ['TableCell']);
     var listItem = path[listItemIndex];
     var listParent = path[listItemIndex + 1]; // It is ok here when index is -1, that means there is no list and we just insert a new paragraph and use path[0] as its parent
     var blockIndex = listParent.blocks.indexOf(listItem || paragraph);
@@ -26415,7 +26408,7 @@ function getSelectedParagraphs(model, mutate) {
     return result;
 }
 exports.getSelectedParagraphs = getSelectedParagraphs;
-function getOperationalBlocks(group, blockGroupTypes, stopTypes, deepFirst) {
+function getOperationalBlocks(group, blockGroupTypes, stopTypes, deepFirst, isValidTarget) {
     var result = [];
     var findSequence = deepFirst ? blockGroupTypes.map(function (type) { return [type]; }) : [blockGroupTypes];
     var selections = collectSelections(group, {
@@ -26426,7 +26419,7 @@ function getOperationalBlocks(group, blockGroupTypes, stopTypes, deepFirst) {
     selections.forEach(function (_a) {
         var path = _a.path, block = _a.block;
         var _loop_1 = function (i) {
-            var groupIndex = (0, getClosestAncestorBlockGroupIndex_1.getClosestAncestorBlockGroupIndex)(path, findSequence[i], stopTypes);
+            var groupIndex = (0, getClosestAncestorBlockGroupIndex_1.getClosestAncestorBlockGroupIndex)(path, findSequence[i], stopTypes, isValidTarget);
             if (groupIndex >= 0) {
                 if (result.filter(function (x) { return x.block == path[groupIndex]; }).length <= 0) {
                     result.push({
@@ -27894,8 +27887,8 @@ var handleParagraph = function (doc, parent, paragraph, context, refNode) {
                     paragraph.segments.some(function (segment) { return segment.segmentType != 'SelectionMarker'; }));
             var formatOnWrapper = needParagraphWrapper
                 ? (0, tslib_1.__assign)((0, tslib_1.__assign)({}, (((_a = paragraph.decorator) === null || _a === void 0 ? void 0 : _a.format) || {})), paragraph.segmentFormat) : {};
+            var prevRefNode = refNode === null || refNode === void 0 ? void 0 : refNode.previousSibling;
             container = doc.createElement(((_b = paragraph.decorator) === null || _b === void 0 ? void 0 : _b.tagName) || DefaultParagraphTag);
-            parent.insertBefore(container, refNode);
             context.regularSelection.current = {
                 block: needParagraphWrapper ? container : container.parentNode,
                 segment: null,
@@ -27937,7 +27930,13 @@ var handleParagraph = function (doc, parent, paragraph, context, refNode) {
             // since this paragraph it is implicit. In that case container.nextSibling will become original
             // inline entity's next sibling. So reset refNode to its real next sibling (after change) here
             // to make sure the value is correct.
-            refNode = container.nextSibling;
+            refNode =
+                prevRefNode === undefined // When refNode is not passed in
+                    ? null
+                    : prevRefNode === null // When refNode is the first child of parent
+                        ? parent.firstChild
+                        : prevRefNode.nextSibling; // Normal case
+            parent.insertBefore(container, refNode);
             if (container) {
                 (_d = context.onNodeCreated) === null || _d === void 0 ? void 0 : _d.call(context, paragraph, container);
                 (_e = context.domIndexer) === null || _e === void 0 ? void 0 : _e.onParagraph(container);
@@ -28724,9 +28723,11 @@ function applySegmentFormatting(text, paragraph, decorator) {
                     if (segment.type === 'link') {
                         (0, applyLink_1.applyLink)(formattedSegment, segment.text, segment.url);
                     }
-                    (0, adjustHeading_1.adjustHeading)(formattedSegment, decorator);
-                    var formattedSegments = (0, applyTextFormatting_1.applyTextFormatting)(formattedSegment);
-                    (_b = paragraph.segments).push.apply(_b, (0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(formattedSegments), false));
+                    var segmentWithAdjustedHeading = (0, adjustHeading_1.adjustHeading)(formattedSegment, decorator);
+                    if (segmentWithAdjustedHeading) {
+                        var formattedSegments = (0, applyTextFormatting_1.applyTextFormatting)(formattedSegment);
+                        (_b = paragraph.segments).push.apply(_b, (0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(formattedSegments), false));
+                    }
                 }
             }
         }
@@ -28757,52 +28758,129 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.applyTextFormatting = 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 SPLIT_PATTERN = /(\*\*\*.*?\*\*\*|\*\*.*?\*\*|\*.*?\*|\~\~.*?\~\~)/;
 /**
  * @internal
  */
 function applyTextFormatting(textSegment) {
-    var e_1, _a;
-    var texts = splitSegments(textSegment.text);
+    var text = textSegment.text;
+    // Quick check: if the text contains only formatting markers, return original
+    if (isOnlyFormattingMarkers(text)) {
+        return [textSegment];
+    }
     var textSegments = [];
-    try {
-        for (var texts_1 = (0, tslib_1.__values)(texts), texts_1_1 = texts_1.next(); !texts_1_1.done; texts_1_1 = texts_1.next()) {
-            var text = texts_1_1.value;
-            textSegments.push(createFormattedSegment(text, textSegment.format, textSegment.link));
+    var currentState = { bold: false, italic: false, strikethrough: false };
+    var currentText = '';
+    var i = 0;
+    while (i < text.length) {
+        var marker = parseMarkerAt(text, i);
+        if (marker) {
+            // Check if this marker should be treated as formatting or as literal text
+            if (shouldToggleFormatting(text, i, marker, currentState)) {
+                // If we have accumulated text, create a segment for it
+                if (currentText.length > 0) {
+                    textSegments.push(createFormattedSegment(currentText, textSegment.format, currentState, textSegment.link));
+                    currentText = '';
+                }
+                // Toggle the formatting state
+                toggleFormatting(currentState, marker.type);
+                // Skip the marker characters
+                i += marker.length;
+            }
+            else {
+                // Treat as regular text if marker is not valid in this context
+                currentText += text[i];
+                i++;
+            }
         }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (texts_1_1 && !texts_1_1.done && (_a = texts_1.return)) _a.call(texts_1);
+        else {
+            // Regular character, add to current text
+            currentText += text[i];
+            i++;
         }
-        finally { if (e_1) throw e_1.error; }
+    }
+    // Add any remaining text as a final segment
+    if (currentText.length > 0) {
+        textSegments.push(createFormattedSegment(currentText, textSegment.format, currentState, textSegment.link));
+    }
+    // If no meaningful formatting was applied, return the original segment
+    if (textSegments.length === 0 ||
+        (textSegments.length === 1 && textSegments[0].text === textSegment.text)) {
+        return [textSegment];
     }
     return textSegments;
 }
 exports.applyTextFormatting = applyTextFormatting;
-function splitSegments(text) {
-    return text.split(SPLIT_PATTERN).filter(function (s) { return s.trim().length > 0; });
+function isOnlyFormattingMarkers(text) {
+    // Remove all potential formatting markers and see if anything remains
+    var remaining = text;
+    remaining = remaining.replace(/\*\*/g, ''); // Remove **
+    remaining = remaining.replace(/~~/g, ''); // Remove ~~
+    remaining = remaining.replace(/\*/g, ''); // Remove *
+    // If nothing remains after removing all markers, it was only markers
+    return remaining.length === 0;
+}
+function parseMarkerAt(text, index) {
+    var remaining = text.substring(index);
+    if (remaining.startsWith('~~')) {
+        return { type: 'strikethrough', length: 2 };
+    }
+    if (remaining.startsWith('**')) {
+        return { type: 'bold', length: 2 };
+    }
+    if (remaining.startsWith('*')) {
+        return { type: 'italic', length: 1 };
+    }
+    return null;
 }
-function createFormattedSegment(text, format, link) {
-    if (text.startsWith('***') && text.endsWith('***')) {
-        format = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, format), { fontWeight: 'bold', italic: true });
-        text = text.replace(/\*\*\*/g, '');
-        text = text + ' ';
+function shouldToggleFormatting(text, index, marker, currentState) {
+    var nextChar = index + marker.length < text.length ? text.charAt(index + marker.length) : '';
+    var isCurrentlyActive = getCurrentFormatState(currentState, marker.type);
+    if (isCurrentlyActive) {
+        // We're currently in this format, so any marker can close it
+        return true;
     }
-    else if (text.startsWith('**') && text.endsWith('**')) {
-        format = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, format), { fontWeight: 'bold' });
-        text = text.replace(/\*\*/g, '');
-        text = text + ' ';
+    else {
+        // We're not in this format, so this marker would open it
+        // Opening markers must be followed by non-whitespace
+        return nextChar.length > 0 && !isWhitespace(nextChar);
     }
-    else if (text.startsWith('*') && text.endsWith('*')) {
-        format = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, format), { italic: true });
-        text = text.replace(/\*/g, '');
-        text = text + ' ';
+}
+function isWhitespace(char) {
+    return /\s/.test(char);
+}
+function toggleFormatting(state, type) {
+    switch (type) {
+        case 'bold':
+            state.bold = !state.bold;
+            break;
+        case 'italic':
+            state.italic = !state.italic;
+            break;
+        case 'strikethrough':
+            state.strikethrough = !state.strikethrough;
+            break;
     }
-    else if (text.startsWith('~~') && text.endsWith('~~')) {
-        format = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, format), { strikethrough: true });
-        text = text.replace(/\~\~/g, '');
+}
+function getCurrentFormatState(state, type) {
+    switch (type) {
+        case 'bold':
+            return state.bold;
+        case 'italic':
+            return state.italic;
+        case 'strikethrough':
+            return state.strikethrough;
+    }
+}
+function createFormattedSegment(text, baseFormat, state, link) {
+    var format = (0, tslib_1.__assign)({}, baseFormat);
+    if (state.bold) {
+        format.fontWeight = 'bold';
+    }
+    if (state.italic) {
+        format.italic = true;
+    }
+    if (state.strikethrough) {
+        format.strikethrough = true;
     }
     return (0, roosterjs_content_model_dom_1.createText)(text, format, link);
 }
@@ -28821,16 +28899,14 @@ function createFormattedSegment(text, format, link) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.convertMarkdownToContentModel = void 0;
 var markdownProcessor_1 = __webpack_require__(/*! ./processor/markdownProcessor */ "./packages/roosterjs-content-model-markdown/lib/markdownToModel/processor/markdownProcessor.ts");
-/**
- * Convert the whole content to ContentModel with the given plain text
- * @param editor The editor instance
- * @param text The markdown text
- * @param splitLinesPattern The pattern to split lines. Default is /\r\n|\r|\\n|\n/
- * @returns The ContentModelDocument
- */
-function convertMarkdownToContentModel(text, splitLinesPattern) {
-    var pattern = splitLinesPattern || /\r\n|\r|\\n|\n/;
-    return (0, markdownProcessor_1.markdownProcessor)(text, pattern);
+function convertMarkdownToContentModel(text, splitLinesPatternOrOptions) {
+    var _a;
+    var options = (_a = (typeof splitLinesPatternOrOptions === 'string'
+        ? {
+            splitLinesPattern: splitLinesPatternOrOptions,
+        }
+        : splitLinesPatternOrOptions)) !== null && _a !== void 0 ? _a : {};
+    return (0, markdownProcessor_1.markdownProcessor)(text, options);
 }
 exports.convertMarkdownToContentModel = convertMarkdownToContentModel;
 
@@ -29139,14 +29215,25 @@ var MarkdownBlockType = {
  * @param splitLinesPattern The pattern to split lines. Default is /\r\n|\r|\\n|\n/
  * @returns The ContentModelDocument
  */
-function markdownProcessor(text, splitLinesPattern) {
+function markdownProcessor(text, options) {
+    var _a;
+    var splitLinesPattern = options.splitLinesPattern || /\r\n|\r|\\n|\n/;
+    var emptyLine = (_a = options.emptyLine) !== null && _a !== void 0 ? _a : 'merge';
     var markdownText = text.split(splitLinesPattern);
     markdownText.push(''); // Add an empty line to make sure the last block is processed
     var doc = (0, roosterjs_content_model_dom_1.createContentModelDocument)();
-    return convertMarkdownText(doc, markdownText);
+    var model = convertMarkdownText(doc, markdownText, options);
+    var lastBlock = model.blocks[model.blocks.length - 1];
+    if (emptyLine != 'remove' &&
+        lastBlock &&
+        lastBlock.blockType == 'Paragraph' &&
+        lastBlock.segments.every(function (x) { return x.segmentType == 'Br'; })) {
+        model.blocks.pop();
+    }
+    return model;
 }
 exports.markdownProcessor = markdownProcessor;
-function addMarkdownBlockToModel(model, blockType, markdown, patternName, markdownContext) {
+function addMarkdownBlockToModel(model, blockType, markdown, patternName, markdownContext, options) {
     var e_1, _a;
     if (blockType !== 'Table' &&
         markdownContext.tableLines &&
@@ -29177,10 +29264,43 @@ function addMarkdownBlockToModel(model, blockType, markdown, patternName, markdo
         markdownContext.tableLines.length = 0;
     }
     if (patternName == 'space') {
-        markdownContext.tableLines = [];
-        markdownContext.lastQuote = undefined;
-        markdownContext.lastList = undefined;
-        return;
+        if (markdownContext.tableLines.length > 0 ||
+            markdownContext.lastQuote ||
+            markdownContext.lastList) {
+            markdownContext.tableLines = [];
+            markdownContext.lastQuote = undefined;
+            markdownContext.lastList = undefined;
+            return;
+        }
+        switch (options.emptyLine) {
+            case 'remove':
+                // no op, ignore this line
+                return;
+            case 'merge':
+                switch (markdownContext.emptyLineState) {
+                    case 'notEmpty':
+                    default:
+                        // Last line is not empty line, so this empty line is treated as the line end of last paragraph
+                        markdownContext.emptyLineState = 'lineEnded';
+                        return;
+                    case 'lineEnded':
+                        // We already see an empty line for paragraph ends, so this line is treated as a real empty line
+                        markdownContext.emptyLineState = 'empty';
+                        // Keep going, process as a normal paragraph
+                        break;
+                    case 'empty':
+                        // Already processed empty line, so this one should be ignored
+                        return;
+                }
+                break;
+            case 'preserve':
+            default:
+                // no op, treat it as paragraph
+                break;
+        }
+    }
+    else {
+        markdownContext.emptyLineState = 'notEmpty';
     }
     if (blockType == 'Paragraph' && (markdownContext.lastList || markdownContext.lastQuote)) {
         blockType = 'BlockGroup';
@@ -29219,7 +29339,7 @@ function addMarkdownBlockToModel(model, blockType, markdown, patternName, markdo
         markdownContext.lastList = undefined;
     }
 }
-function convertMarkdownText(model, lines) {
+function convertMarkdownText(model, lines, options) {
     var e_2, _a;
     var markdownContext = {
         lastQuote: undefined,
@@ -29234,14 +29354,14 @@ function convertMarkdownText(model, lines) {
                 if (MarkdownPattern.hasOwnProperty(patternName)) {
                     var pattern = MarkdownPattern[patternName];
                     if (pattern.test(line)) {
-                        addMarkdownBlockToModel(model, MarkdownBlockType[patternName], line, patternName, markdownContext);
+                        addMarkdownBlockToModel(model, MarkdownBlockType[patternName], line, patternName, markdownContext, options);
                         matched = true;
                         break;
                     }
                 }
             }
             if (!matched) {
-                addMarkdownBlockToModel(model, 'Paragraph', line, 'paragraph', markdownContext);
+                addMarkdownBlockToModel(model, 'Paragraph', line, 'paragraph', markdownContext, options);
             }
         }
     }
@@ -29276,6 +29396,10 @@ function adjustHeading(textSegment, decorator) {
     var markdownToBeRemoved = headings_1.MarkdownHeadings[(decorator === null || decorator === void 0 ? void 0 : decorator.tagName) || ''];
     if (markdownToBeRemoved) {
         textSegment.text = textSegment.text.replace(markdownToBeRemoved, '');
+        if (textSegment.text.length === 0) {
+            // If the text becomes empty after removing the heading markdown, we can remove the segment
+            return null;
+        }
     }
     return textSegment;
 }
@@ -30278,8 +30402,7 @@ function createLink(editor, autoLinkOptions) {
     (0, roosterjs_content_model_api_1.formatTextSegmentBeforeSelectionMarker)(editor, function (_model, segment, paragraph) {
         var promotedSegment = null;
         if (segment.link) {
-            links.push(segment.link);
-            return true;
+            return false;
         }
         else if ((promotedSegment = (0, roosterjs_content_model_api_1.promoteLink)(segment, paragraph, autoLinkOptions)) &&
             promotedSegment.link) {
@@ -31538,26 +31661,41 @@ exports.deleteList = deleteList;
 /*!***********************************************************************************************!*\
   !*** ./packages/roosterjs-content-model-plugins/lib/edit/deleteSteps/deleteParagraphStyle.ts ***!
   \***********************************************************************************************/
-/***/ ((__unused_webpack_module, exports) => {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.deleteParagraphStyle = void 0;
+var roosterjs_content_model_dom_1 = __webpack_require__(/*! roosterjs-content-model-dom */ "./packages/roosterjs-content-model-dom/lib/index.ts");
 /**
  * @internal
  */
 var deleteParagraphStyle = function (context) {
     if (context.deleteResult === 'nothingToDelete') {
         var insertPoint = context.insertPoint;
-        var paragraph = insertPoint.paragraph;
+        var paragraph = insertPoint.paragraph, path = insertPoint.path;
+        var group = path[0];
+        var parentGroup = path[1];
         // If the paragraph is empty, we will delete any style in it
         // This is to ensure the paragraph style is reset to default when there is no content in the paragraph
         if (paragraph.segments.every(function (s) { return s.segmentType === 'SelectionMarker' || s.segmentType === 'Br'; }) &&
-            paragraph.segments.filter(function (s) { return s.segmentType === 'Br'; }).length <= 1 &&
-            Object.keys(paragraph.format).length > 0) {
-            paragraph.format = {};
-            context.deleteResult = 'range';
+            paragraph.segments.filter(function (s) { return s.segmentType === 'Br'; }).length <= 1) {
+            if (Object.keys(paragraph.format).length > 0) {
+                paragraph.format = {};
+                context.deleteResult = 'range';
+            }
+            else if (group.blocks.length == 1 &&
+                group.blocks[0] == paragraph &&
+                parentGroup &&
+                (group.blockGroupType == 'FormatContainer' ||
+                    group.blockGroupType == 'ListItem' ||
+                    group.blockGroupType == 'General')) {
+                // Still has nothing to delete, try to unwrap parent container
+                (0, roosterjs_content_model_dom_1.unwrapBlock)(parentGroup, group);
+                path.shift();
+                context.deleteResult = 'range';
+            }
         }
     }
 };
@@ -31782,6 +31920,7 @@ function handleKeyboardEventResult(editor, model, rawEvent, result, context) {
             // We have deleted what we need from content model, no need to let browser keep handling the event
             rawEvent.preventDefault();
             (0, roosterjs_content_model_dom_1.normalizeContentModel)(model);
+            deleteEmptyBlockGroups(model);
             if (result == 'range') {
                 // A range is about to be deleted, so add an undo snapshot immediately
                 context.skipUndoSnapshot = false;
@@ -31810,6 +31949,22 @@ function shouldDeleteAllSegmentsBefore(rawEvent) {
     return rawEvent.metaKey && !rawEvent.altKey;
 }
 exports.shouldDeleteAllSegmentsBefore = shouldDeleteAllSegmentsBefore;
+function deleteEmptyBlockGroups(group) {
+    var modified = false;
+    for (var i = group.blocks.length - 1; i >= 0; i--) {
+        var block = group.blocks[i];
+        if (block.blockType == 'BlockGroup') {
+            deleteEmptyBlockGroups(block);
+            if (block.blocks.length == 0) {
+                (0, roosterjs_content_model_dom_1.mutateBlock)(group).blocks.splice(i, 1);
+                modified = true;
+            }
+        }
+    }
+    if (modified) {
+        group.blocks.forEach(roosterjs_content_model_dom_1.setParagraphNotImplicit);
+    }
+}
 
 
 /***/ }),
@@ -33424,12 +33579,14 @@ var ImageEditPlugin = /** @class */ (function () {
         var _this = this;
         var editingImageModel;
         var selection = editor.getDOMSelection();
-        editor.formatContentModel(function (model) {
+        editor.formatContentModel(function (model, context) {
             var editingImage = (0, getSelectedImage_1.getSelectedImage)(model);
             var previousSelectedImage = isApiOperation
                 ? editingImage
                 : (0, findEditingImage_1.findEditingImage)(model);
             var result = false;
+            // Skip adding undo snapshot for now. If we detect any changes later, we will reset it
+            context.skipUndoSnapshot = 'SkipAll';
             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.format.imageState) == findEditingImage_1.EDITING_MARKER ||
@@ -33442,7 +33599,10 @@ var ImageEditPlugin = /** @class */ (function () {
                     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);
+                        var changeState = (0, applyChange_1.applyChange)(editor, selectedImage_1, image, imageEditInfo_1, lastSrc_1, _this.wasImageResized || _this.isCropMode, clonedImage_1);
+                        if (_this.wasImageResized || changeState == 'FullyChanged') {
+                            context.skipUndoSnapshot = false;
+                        }
                         image.isSelected = shouldSelectImage;
                         image.isSelectedAsImageSelection = shouldSelectImage;
                         image.format.imageState = undefined;
@@ -34340,14 +34500,14 @@ function applyChange(editor, image, contentModelImage, editInfo, previousSrc, wa
     }
     // Write back the change to image, and set its new size
     var generatedImageSize = (0, generateImageSize_1.getGeneratedImageSize)(editInfo);
-    if (!generatedImageSize) {
-        return;
-    }
-    contentModelImage.src = newSrc;
-    if (wasResizedOrCropped || state == 'FullyChanged') {
-        contentModelImage.format.width = generatedImageSize.targetWidth + 'px';
-        contentModelImage.format.height = generatedImageSize.targetHeight + 'px';
+    if (generatedImageSize) {
+        contentModelImage.src = newSrc;
+        if (wasResizedOrCropped || state == 'FullyChanged') {
+            contentModelImage.format.width = generatedImageSize.targetWidth + 'px';
+            contentModelImage.format.height = generatedImageSize.targetHeight + 'px';
+        }
     }
+    return state;
 }
 exports.applyChange = applyChange;
 
@@ -34438,8 +34598,7 @@ function checkEditInfoState(editInfo, compareTo) {
         return 'ResizeOnly';
     }
     else if (compareTo &&
-        ROTATE_KEYS.every(function (key) { return areSameNumber(editInfo[key], 0); }) &&
-        ROTATE_KEYS.every(function (key) { return areSameNumber(compareTo[key], 0); }) &&
+        ROTATE_KEYS.every(function (key) { return areSameNumber(editInfo[key], compareTo[key]); }) &&
         CROP_KEYS.every(function (key) { return areSameNumber(editInfo[key], compareTo[key]); }) &&
         compareTo.flippedHorizontal === editInfo.flippedHorizontal &&
         compareTo.flippedVertical === editInfo.flippedVertical) {