roosterjs 8.27.1 → 8.28.0-git

package/dist/rooster-amd.js

@@ -4592,7 +4592,6 @@ var roosterjs_editor_dom_1 = __webpack_require__(/*! roosterjs-editor-dom */ "./
  * @param formatApiName Optional parameter to provide the ContentChangeEvent which FormatApi was invoked.
  */
 var addUndoSnapshot = function (core, callback, changeSource, canUndoByBackspace, additionalData) {
-    if (additionalData === void 0) { additionalData = undefined; }
     var undoState = core.undo;
     var isNested = undoState.isNested;
     var data;
@@ -4670,8 +4669,9 @@ var roosterjs_editor_dom_1 = __webpack_require__(/*! roosterjs-editor-dom */ "./
  * @param beforeDispatch Optional callback function to be invoked when the DOM event is triggered before trigger plugin event
  */
 var attachDomEvent = function (core, eventMap) {
-    var disposers = (0, roosterjs_editor_dom_1.getObjectKeys)(eventMap || {}).map(function (eventName) {
-        var _a = extractHandler(eventMap[eventName]), pluginEventType = _a.pluginEventType, beforeDispatch = _a.beforeDispatch;
+    var disposers = (0, roosterjs_editor_dom_1.getObjectKeys)(eventMap || {}).map(function (key) {
+        var _a = extractHandler(eventMap[key]), pluginEventType = _a.pluginEventType, beforeDispatch = _a.beforeDispatch;
+        var eventName = key;
         var onEvent = function (event) {
             if (beforeDispatch) {
                 beforeDispatch(event);
@@ -4806,11 +4806,12 @@ var createPasteFragment = function (core, clipboardData, position, pasteAsText,
     var fragment = event.fragment, sanitizingOption = event.sanitizingOption;
     var rawHtml = clipboardData.rawHtml, text = clipboardData.text, imageDataUri = clipboardData.imageDataUri;
     var document = core.contentDiv.ownerDocument;
-    var doc;
+    var doc = rawHtml
+        ? new DOMParser().parseFromString(core.trustedHTMLHandler(rawHtml), 'text/html')
+        : undefined;
     // Step 2: Retrieve Metadata from Html and the Html that was copied.
-    if (rawHtml &&
-        ((_a = (doc = new DOMParser().parseFromString(core.trustedHTMLHandler(rawHtml), 'text/html'))) === null || _a === void 0 ? void 0 : _a.body)) {
-        var attributes = (_b = doc.querySelector('html')) === null || _b === void 0 ? void 0 : _b.attributes;
+    if (rawHtml && (doc === null || doc === void 0 ? void 0 : doc.body)) {
+        var attributes = (_a = doc.querySelector('html')) === null || _a === void 0 ? void 0 : _a.attributes;
         (attributes ? (0, roosterjs_editor_dom_1.toArray)(attributes) : []).reduce(function (attrs, attr) {
             attrs[attr.name] = attr.value;
             return attrs;
@@ -4824,7 +4825,7 @@ var createPasteFragment = function (core, clipboardData, position, pasteAsText,
         for (var i = 0; i < (doc === null || doc === void 0 ? void 0 : doc.body.childNodes.length); i++) {
             var node = doc === null || doc === void 0 ? void 0 : doc.body.childNodes.item(i);
             if (node.nodeType == Node.TEXT_NODE) {
-                var trimmedString = node.nodeValue.replace(/(\r\n|\r|\n)/gm, '').trim();
+                var trimmedString = (_b = node.nodeValue) === null || _b === void 0 ? void 0 : _b.replace(/(\r\n|\r|\n)/gm, '').trim();
                 if (!trimmedString) {
                     continue;
                 }
@@ -4837,7 +4838,7 @@ var createPasteFragment = function (core, clipboardData, position, pasteAsText,
         // Move all STYLE nodes into header, and save them into sanitizing options.
         // Because if we directly move them into a fragment, all sheets under STYLE will be lost.
         processStyles(doc, function (style) {
-            doc.head.appendChild(style);
+            doc === null || doc === void 0 ? void 0 : doc.head.appendChild(style);
             sanitizingOption.additionalGlobalStyleNodes.push(style);
         });
         var startIndex = rawHtml.indexOf(START_FRAGMENT);
@@ -4863,7 +4864,7 @@ var createPasteFragment = function (core, clipboardData, position, pasteAsText,
         fragment.appendChild(img);
     }
     else if (!pasteAsText && rawHtml && doc ? doc.body : false) {
-        (0, roosterjs_editor_dom_1.moveChildNodes)(fragment, doc.body);
+        (0, roosterjs_editor_dom_1.moveChildNodes)(fragment, doc === null || doc === void 0 ? void 0 : doc.body);
         if (applyCurrentStyle && position) {
             var format_1 = getCurrentFormat(core, position.node);
             (0, roosterjs_editor_dom_1.applyTextStyle)(fragment, function (node) { return (0, roosterjs_editor_dom_1.applyFormat)(node, format_1); });
@@ -5142,9 +5143,11 @@ var getContent = function (core, mode) {
         }
     }
     else {
-        content = (0, roosterjs_editor_dom_1.getHtmlWithSelectionPath)(root, includeSelectionMarker && core.api.getSelectionRange(core, true /*tryGetFromCache*/));
+        content = (0, roosterjs_editor_dom_1.getHtmlWithSelectionPath)(root, includeSelectionMarker
+            ? core.api.getSelectionRange(core, true /*tryGetFromCache*/)
+            : null);
     }
-    return content;
+    return content !== null && content !== void 0 ? content : '';
 };
 exports.getContent = getContent;
 function cloneNode(node) {
@@ -5247,7 +5250,7 @@ function queryCommandStateFromDOM(core, currentPosition) {
         }
         node = node.parentNode;
     };
-    while ((0, roosterjs_editor_dom_1.contains)(core.contentDiv, node)) {
+    while (node && (0, roosterjs_editor_dom_1.contains)(core.contentDiv, node)) {
         _loop_1();
     }
     return formatState;
@@ -5328,7 +5331,7 @@ var getSelectionRangeEx = function (core) {
     var result = null;
     if (core.lifecycle.shadowEditFragment) {
         var _c = core.lifecycle, shadowEditTableSelectionPath = _c.shadowEditTableSelectionPath, shadowEditSelectionPath = _c.shadowEditSelectionPath;
-        if ((shadowEditTableSelectionPath === null || shadowEditTableSelectionPath === void 0 ? void 0 : shadowEditTableSelectionPath.length) > 0) {
+        if (((shadowEditTableSelectionPath === null || shadowEditTableSelectionPath === void 0 ? void 0 : shadowEditTableSelectionPath.length) || 0) > 0) {
             var ranges = core.lifecycle.shadowEditTableSelectionPath.map(function (path) {
                 return (0, roosterjs_editor_dom_1.createRange)(core.contentDiv, path.start, path.end);
             });
@@ -5337,7 +5340,7 @@ var getSelectionRangeEx = function (core) {
                 ranges: ranges,
                 areAllCollapsed: checkAllCollapsed(ranges),
                 table: (0, roosterjs_editor_dom_1.findClosestElementAncestor)(ranges[0].startContainer, core.contentDiv, 'table'),
-                coordinates: null,
+                coordinates: undefined,
             };
         }
         else {
@@ -5415,14 +5418,16 @@ var getStyleBasedFormatState = function (core, node) {
             ? {
                 darkModeColor: styles[2],
                 lightModeColor: ogTextColorNode.dataset["ogsc" /* OriginalStyleColor */] ||
-                    ogTextColorNode.dataset["ogac" /* OriginalAttributeColor */],
+                    ogTextColorNode.dataset["ogac" /* OriginalAttributeColor */] ||
+                    styles[2],
             }
             : undefined,
         backgroundColors: ogBackgroundColorNode
             ? {
                 darkModeColor: styles[3],
                 lightModeColor: ogBackgroundColorNode.dataset["ogsb" /* OriginalStyleBackgroundColor */] ||
-                    ogBackgroundColorNode.dataset["ogab" /* OriginalAttributeBackgroundColor */],
+                    ogBackgroundColorNode.dataset["ogab" /* OriginalAttributeBackgroundColor */] ||
+                    styles[3],
             }
             : undefined,
     };
@@ -5452,7 +5457,7 @@ var roosterjs_editor_dom_1 = __webpack_require__(/*! roosterjs-editor-dom */ "./
  */
 var hasFocus = function (core) {
     var activeElement = core.contentDiv.ownerDocument.activeElement;
-    return (activeElement && (0, roosterjs_editor_dom_1.contains)(core.contentDiv, activeElement, true /*treatSameNodeAsContain*/));
+    return !!(activeElement && (0, roosterjs_editor_dom_1.contains)(core.contentDiv, activeElement, true /*treatSameNodeAsContain*/));
 };
 exports.hasFocus = hasFocus;
 
@@ -5494,6 +5499,7 @@ function getInitialRange(core, option) {
  * @param option An insert option object to specify how to insert the node
  */
 var insertNode = function (core, node, option) {
+    var _a;
     option = option || {
         position: 3 /* SelectionStart */,
         insertOnNewLine: false,
@@ -5505,10 +5511,11 @@ var insertNode = function (core, node, option) {
         core.api.focus(core);
     }
     if (option.position == 4 /* Outside */) {
-        contentDiv.parentNode.insertBefore(node, contentDiv.nextSibling);
+        (_a = contentDiv.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(node, contentDiv.nextSibling);
         return true;
     }
     core.api.transformColor(core, node, true /*includeSelf*/, function () {
+        var _a, _b;
         switch (option.position) {
             case 0 /* Begin */:
             case 1 /* End */: {
@@ -5527,10 +5534,10 @@ var insertNode = function (core, node, option) {
                             // if the node to be inserted is DocumentFragment, use its childNodes as insertedNode
                             // because insertBefore() returns an empty DocumentFragment
                             insertedNode_1 = (0, roosterjs_editor_dom_1.toArray)(node.childNodes);
-                            refNode.parentNode.insertBefore(node, isBegin ? refNode : refNode.nextSibling);
+                            (_a = refNode.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(node, isBegin ? refNode : refNode.nextSibling);
                         }
                         else {
-                            insertedNode_1 = refNode.parentNode.insertBefore(node, isBegin ? refNode : refNode.nextSibling);
+                            insertedNode_1 = (_b = refNode.parentNode) === null || _b === void 0 ? void 0 : _b.insertBefore(node, isBegin ? refNode : refNode.nextSibling);
                         }
                     }
                     else {
@@ -5564,7 +5571,7 @@ var insertNode = function (core, node, option) {
                 break;
             case 5 /* Range */:
             case 3 /* SelectionStart */:
-                var _a = getInitialRange(core, option), range = _a.range, rangeToRestore = _a.rangeToRestore;
+                var _c = getInitialRange(core, option), range = _c.range, rangeToRestore = _c.rangeToRestore;
                 if (!range) {
                     return;
                 }
@@ -5576,7 +5583,7 @@ var insertNode = function (core, node, option) {
                 var blockElement = void 0;
                 if (option.insertOnNewLine &&
                     (blockElement = (0, roosterjs_editor_dom_1.getBlockElementAtNode)(contentDiv, pos.normalize().node))) {
-                    pos = new roosterjs_editor_dom_1.Position(blockElement.getEndNode(), -3 /* After */);
+                    pos = adjustInsertPositionNewLine(blockElement, core, pos);
                 }
                 else {
                     pos = (0, roosterjs_editor_dom_1.adjustInsertPosition)(contentDiv, node, pos, range);
@@ -5587,13 +5594,25 @@ var insertNode = function (core, node, option) {
                 if (option.updateCursor && nodeForCursor) {
                     rangeToRestore = (0, roosterjs_editor_dom_1.createRange)(new roosterjs_editor_dom_1.Position(nodeForCursor, -3 /* After */).normalize());
                 }
-                core.api.selectRange(core, rangeToRestore);
+                if (rangeToRestore) {
+                    core.api.selectRange(core, rangeToRestore);
+                }
                 break;
         }
     }, 0 /* LightToDark */);
     return true;
 };
 exports.insertNode = insertNode;
+function adjustInsertPositionNewLine(blockElement, core, pos) {
+    var tempPos = new roosterjs_editor_dom_1.Position(blockElement.getEndNode(), -3 /* After */);
+    if ((0, roosterjs_editor_dom_1.safeInstanceOf)(tempPos.node, 'HTMLTableRowElement')) {
+        var div = core.contentDiv.ownerDocument.createElement('div');
+        var range = (0, roosterjs_editor_dom_1.createRange)(pos);
+        range.insertNode(div);
+        tempPos = new roosterjs_editor_dom_1.Position(div, 0 /* Begin */);
+    }
+    return tempPos;
+}
 
 
 /***/ }),
@@ -5616,6 +5635,7 @@ exports.restoreUndoSnapshot = void 0;
  * @param step Steps to move, can be 0, positive or negative
  */
 var restoreUndoSnapshot = function (core, step) {
+    var _a;
     if (core.undo.hasNewContent && step < 0) {
         core.api.addUndoSnapshot(core, null /*callback*/, null /*changeSource*/, false /*canUndoByBackspace*/);
     }
@@ -5623,7 +5643,7 @@ var restoreUndoSnapshot = function (core, step) {
     if (snapshot && snapshot.html != null) {
         try {
             core.undo.isRestoring = true;
-            core.api.setContent(core, snapshot.html, true /*triggerContentChangedEvent*/, snapshot.metadata);
+            core.api.setContent(core, snapshot.html, true /*triggerContentChangedEvent*/, (_a = snapshot.metadata) !== null && _a !== void 0 ? _a : undefined);
         }
         finally {
             core.undo.isRestoring = false;
@@ -5685,11 +5705,14 @@ function restorePendingFormatState(core) {
         var formatState_1 = (0, roosterjs_editor_dom_1.getPendableFormatState)(document_1);
         (0, roosterjs_editor_dom_1.getObjectKeys)(roosterjs_editor_dom_1.PendableFormatCommandMap).forEach(function (key) {
             if (!!pendingFormatState.pendableFormatState[key] != formatState_1[key]) {
-                document_1.execCommand(roosterjs_editor_dom_1.PendableFormatCommandMap[key], false, null);
+                document_1.execCommand(roosterjs_editor_dom_1.PendableFormatCommandMap[key], false /* showUI */, undefined /* value */);
             }
         });
         var range = getSelectionRange(core, true /*tryGetFromCache*/);
-        pendingFormatState.pendableFormatPosition = range && roosterjs_editor_dom_1.Position.getStart(range);
+        var position = range && roosterjs_editor_dom_1.Position.getStart(range);
+        if (position) {
+            pendingFormatState.pendableFormatPosition = position;
+        }
     }
 }
 
@@ -5721,15 +5744,18 @@ var STYLE_ID = 'tableStyle';
  * @returns true if successful
  */
 var selectTable = function (core, table, coordinates) {
+    var _a;
     unselect(core);
     if (areValidCoordinates(coordinates) && table) {
         ensureUniqueId(table, TABLE_ID);
         ensureUniqueId(core.contentDiv, CONTENT_DIV_ID);
         var ranges = select(core, table, coordinates);
         if (!isMergedCell(table, coordinates)) {
-            core.api.selectRange(core, (0, roosterjs_editor_dom_1.createRange)(new roosterjs_editor_dom_1.Position(table.rows
-                .item(coordinates.firstCell.y)
-                .cells.item(coordinates.firstCell.x), 0 /* Begin */)));
+            var cellToSelect = (_a = table.rows
+                .item(coordinates.firstCell.y)) === null || _a === void 0 ? void 0 : _a.cells.item(coordinates.firstCell.x);
+            if (cellToSelect) {
+                core.api.selectRange(core, (0, roosterjs_editor_dom_1.createRange)(new roosterjs_editor_dom_1.Position(cellToSelect, 0 /* Begin */)));
+            }
         }
         return {
             type: 1 /* TableSelection */,
@@ -5743,6 +5769,7 @@ var selectTable = function (core, table, coordinates) {
 };
 exports.selectTable = selectTable;
 function buildCss(table, coordinates, contentDivSelector) {
+    var _a;
     var tr1 = coordinates.firstCell.y;
     var td1 = coordinates.firstCell.x;
     var tr2 = coordinates.lastCell.y;
@@ -5766,7 +5793,7 @@ function buildCss(table, coordinates, contentDivSelector) {
         cont = result.end;
         return result;
     });
-    vTable.cells.forEach(function (row, rowIndex) {
+    (_a = vTable.cells) === null || _a === void 0 ? void 0 : _a.forEach(function (row, rowIndex) {
         var tdCount = 0;
         var thCount = 0;
         firstSelected = null;
@@ -5778,8 +5805,9 @@ function buildCss(table, coordinates, contentDivSelector) {
             ? rowIndex + 1 - midElement.start
             : rowIndex + 1;
         for (var cellIndex = 0; cellIndex < row.length; cellIndex++) {
-            if (row[cellIndex].td) {
-                var tag = (0, roosterjs_editor_dom_1.getTagOfNode)(row[cellIndex].td);
+            var cell = row[cellIndex].td;
+            if (cell) {
+                var tag = (0, roosterjs_editor_dom_1.getTagOfNode)(cell);
                 if (tag == 'TD') {
                     tdCount++;
                 }
@@ -5793,7 +5821,7 @@ function buildCss(table, coordinates, contentDivSelector) {
                     else if (!css.endsWith(',')) {
                         css += ',';
                     }
-                    removeImportant(row[cellIndex].td);
+                    removeImportant(cell);
                     var selector = generateCssFromCell(contentDivSelector, table.id, middleElSelector, currentRow, tag, tag == 'TD' ? tdCount : thCount);
                     css += selector;
                     firstSelected = firstSelected || table.querySelector(selector);
@@ -5812,16 +5840,17 @@ function buildCss(table, coordinates, contentDivSelector) {
     return { css: css, ranges: ranges };
 }
 function select(core, table, coordinates) {
+    var _a;
     var doc = core.contentDiv.ownerDocument;
     var contentDivSelector = '#' + core.contentDiv.id;
-    var _a = buildCss(table, coordinates, contentDivSelector), css = _a.css, ranges = _a.ranges;
+    var _b = buildCss(table, coordinates, contentDivSelector), css = _b.css, ranges = _b.ranges;
     var styleElement = doc.getElementById(STYLE_ID + core.contentDiv.id);
     if (!styleElement) {
         styleElement = doc.createElement('style');
         doc.head.appendChild(styleElement);
         styleElement.id = STYLE_ID + core.contentDiv.id;
     }
-    styleElement.sheet.insertRule(css);
+    (_a = styleElement.sheet) === null || _a === void 0 ? void 0 : _a.insertRule(css);
     return ranges;
 }
 function unselect(core) {
@@ -5901,8 +5930,9 @@ function isValidCoordinate(input) {
     return (!!input || input == 0) && input > -1;
 }
 function isMergedCell(table, coordinates) {
+    var _a;
     var firstCell = coordinates.firstCell;
-    return !(table.rows.item(firstCell.y) && table.rows.item(firstCell.y).cells.item(firstCell.x));
+    return !(table.rows.item(firstCell.y) && ((_a = table.rows.item(firstCell.y)) === null || _a === void 0 ? void 0 : _a.cells.item(firstCell.x)));
 }
 
 
@@ -5997,8 +6027,11 @@ var switchShadowEdit = function (core, isOn) {
             var range = core.api.getSelectionRange(core, true /*tryGetFromCache*/);
             shadowEditSelectionPath = range && (0, roosterjs_editor_dom_1.getSelectionPath)(contentDiv, range);
             shadowEditTableSelectionPath =
-                (selection === null || selection === void 0 ? void 0 : selection.type) == 1 /* TableSelection */ &&
-                    selection.ranges.map(function (range) { return (0, roosterjs_editor_dom_1.getSelectionPath)(contentDiv, range); });
+                ((selection === null || selection === void 0 ? void 0 : selection.type) == 1 /* TableSelection */ &&
+                    selection.ranges
+                        .map(function (range) { return (0, roosterjs_editor_dom_1.getSelectionPath)(contentDiv, range); })
+                        .map(function (w) { return w; })) ||
+                    null;
             shadowEditFragment = core.contentDiv.ownerDocument.createDocumentFragment();
             (0, roosterjs_editor_dom_1.moveChildNodes)(shadowEditFragment, contentDiv);
             shadowEditFragment.normalize();
@@ -6012,7 +6045,9 @@ var switchShadowEdit = function (core, isOn) {
             lifecycle.shadowEditTableSelectionPath = shadowEditTableSelectionPath;
         }
         (0, roosterjs_editor_dom_1.moveChildNodes)(contentDiv);
-        contentDiv.appendChild(lifecycle.shadowEditFragment.cloneNode(true /*deep*/));
+        if (lifecycle.shadowEditFragment) {
+            contentDiv.appendChild(lifecycle.shadowEditFragment.cloneNode(true /*deep*/));
+        }
     }
     else {
         lifecycle.shadowEditFragment = null;
@@ -6022,7 +6057,9 @@ var switchShadowEdit = function (core, isOn) {
                 eventType: 18 /* LeavingShadowEdit */,
             }, false /*broadcast*/);
             (0, roosterjs_editor_dom_1.moveChildNodes)(contentDiv);
-            contentDiv.appendChild(shadowEditFragment);
+            if (shadowEditFragment) {
+                contentDiv.appendChild(shadowEditFragment);
+            }
             core.api.focus(core);
             if (shadowEditSelectionPath) {
                 core.api.selectRange(core, (0, roosterjs_editor_dom_1.createRange)(contentDiv, shadowEditSelectionPath.start, shadowEditSelectionPath.end));
@@ -6103,8 +6140,8 @@ function transformToLightMode(elements) {
             element.style.setProperty(names[0 /* CssColor */], getValueOrDefault(element.dataset[names[2 /* CssDataSet */]], ''));
             delete element.dataset[names[2 /* CssDataSet */]];
             // Some elements might have set attribute colors. We need to reset these as well.
-            var value = element.dataset[names[3 /* HtmlDataSet */]];
-            if (getValueOrDefault(value, null)) {
+            var value = getValueOrDefault(element.dataset[names[3 /* HtmlDataSet */]], null);
+            if (value) {
                 element.setAttribute(names[1 /* HtmlColor */], value);
             }
             else {
@@ -6136,8 +6173,11 @@ function transformToDarkMode(elements, getDarkColor) {
                 : null;
         })
             .filter(function (x) { return !!x; })
-            .forEach(function (_a) {
-            var element = _a.element, styleColor = _a.styleColor, attrColor = _a.attrColor, newColor = _a.newColor;
+            .forEach(function (entry) {
+            if (!entry) {
+                return;
+            }
+            var element = entry.element, styleColor = entry.styleColor, attrColor = entry.attrColor, newColor = entry.newColor;
             element.style.setProperty(names[0 /* CssColor */], newColor, 'important');
             element.dataset[names[2 /* CssDataSet */]] = styleColor || '';
             if (attrColor) {
@@ -7607,6 +7647,7 @@ var TypeInContainerPlugin = /** @class */ (function () {
      * @param event PluginEvent object
      */
     TypeInContainerPlugin.prototype.onPluginEvent = function (event) {
+        var _this = this;
         if (event.eventType == 1 /* KeyPress */) {
             // If normalization was not possible before the keypress,
             // check again after the keyboard event has been processed by browser native behavior.
@@ -7625,9 +7666,17 @@ var TypeInContainerPlugin = /** @class */ (function () {
                 this.editor.ensureTypeInContainer(roosterjs_editor_dom_1.Position.getStart(range), event.rawEvent);
             }
             else {
-                this.editor.runAsync(function (editor) {
-                    editor.ensureTypeInContainer(editor.getFocusedPosition(), event.rawEvent);
-                });
+                var callback = function () {
+                    if (_this.editor) {
+                        _this.editor.ensureTypeInContainer(_this.editor.getFocusedPosition(), event.rawEvent);
+                    }
+                };
+                if (roosterjs_editor_dom_1.Browser.isMobileOrTablet) {
+                    this.editor.getDocument().defaultView.setTimeout(callback, 100);
+                }
+                else {
+                    this.editor.runAsync(callback);
+                }
             }
         }
     };
@@ -17566,14 +17615,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 function normalizeRect(clientRect) {
     var _a = clientRect || { left: 0, right: 0, top: 0, bottom: 0 }, left = _a.left, right = _a.right, top = _a.top, bottom = _a.bottom;
-    return left + right + top + bottom > 0
-        ? {
+    return left === 0 && right === 0 && top === 0 && bottom === 0
+        ? null
+        : {
             left: Math.round(left),
             right: Math.round(right),
             top: Math.round(top),
             bottom: Math.round(bottom),
-        }
-        : null;
+        };
 }
 exports.default = normalizeRect;
 
@@ -20543,12 +20592,13 @@ var CustomReplacePlugin = /** @class */ (function () {
         }
         var searcher = this.editor.getContentSearcherOfCursor(event);
         var stringToSearch = searcher.getSubStringBefore(this.longestReplacementLength);
+        var sourceEditor = this.editor;
         var replacement = this.getMatchingReplacement(stringToSearch);
         if (replacement == null) {
             return;
         }
         if (replacement.shouldReplace &&
-            !replacement.shouldReplace(replacement, searcher.getWordBefore())) {
+            !replacement.shouldReplace(replacement, searcher.getWordBefore(), sourceEditor)) {
             return;
         }
         // Reconstruct a selection of the text on the document that matches the
@@ -22832,10 +22882,11 @@ function handleLineMerge(root) {
         });
     }
     if (blocks.length > 0) {
+        var blocksLength = blocks.length - 1;
         processBlock(blocks[0]);
-        processBlock(blocks[blocks.length - 1]);
+        processBlock(blocks[blocksLength]);
         checkAndAddBr(root, blocks[0], true /*isFirst*/);
-        checkAndAddBr(root, blocks[blocks.length - 1], false /*isFirst*/);
+        checkAndAddBr(root, blocks[blocksLength], false /*isFirst*/, blocks[0]);
     }
 }
 exports.default = handleLineMerge;
@@ -22857,14 +22908,34 @@ function processBlock(block) {
         (_b = end.parentNode) === null || _b === void 0 ? void 0 : _b.removeChild(end);
     }
 }
-function checkAndAddBr(root, block, isFirst) {
-    var _a;
+function checkAndAddBr(root, block, isFirst, firstBlock) {
+    var _a, _b, _c, _d;
     var blockElement = (0, roosterjs_editor_dom_1.getBlockElementAtNode)(root, block.start);
     var sibling = isFirst
         ? (0, roosterjs_editor_dom_1.getNextLeafSibling)(root, block.end)
         : (0, roosterjs_editor_dom_1.getPreviousLeafSibling)(root, block.start);
+    if (!sibling) {
+        return;
+    }
     if (blockElement === null || blockElement === void 0 ? void 0 : blockElement.contains(sibling)) {
-        (_a = (isFirst ? block.end : block.start).parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(block.start.ownerDocument.createElement('br'), isFirst ? block.end.nextSibling : block.start);
+        var br = (_a = block.start.ownerDocument) === null || _a === void 0 ? void 0 : _a.createElement('br');
+        if (br) {
+            var blockToUse = isFirst ? block.end : block.start;
+            (_b = blockToUse.parentNode) === null || _b === void 0 ? void 0 : _b.insertBefore(br, isFirst ? block.end.nextSibling : block.start);
+        }
+    }
+    else if (firstBlock &&
+        firstBlock.end == firstBlock.start &&
+        (0, roosterjs_editor_dom_1.getTagOfNode)(firstBlock.end) == 'SPAN') {
+        // If the first block and the last block are Siblings, add a BR before so the only two
+        // lines that are being pasted are not merged.
+        var previousSibling = (0, roosterjs_editor_dom_1.getPreviousLeafSibling)(root, block.start);
+        if (firstBlock.end.contains(previousSibling)) {
+            var br = (_c = block.start.ownerDocument) === null || _c === void 0 ? void 0 : _c.createElement('br');
+            if (br) {
+                (_d = block.start.parentNode) === null || _d === void 0 ? void 0 : _d.insertBefore(br, block.start);
+            }
+        }
     }
 }
 
@@ -25461,7 +25532,7 @@ var TableResize = /** @class */ (function () {
     TableResize.prototype.dispose = function () {
         this.onMouseMoveDisposer();
         this.invalidateTableRects();
-        this.setTableEditor(null);
+        this.disposeTableEditor();
         this.editor = null;
     };
     /**
@@ -25480,14 +25551,18 @@ var TableResize = /** @class */ (function () {
         }
     };
     TableResize.prototype.setTableEditor = function (table, e) {
-        if (this.tableEditor && table != this.tableEditor.table) {
-            this.tableEditor.dispose();
-            this.tableEditor = null;
+        if (this.tableEditor && !this.tableEditor.isEditing() && table != this.tableEditor.table) {
+            this.disposeTableEditor();
         }
         if (!this.tableEditor && table) {
             this.tableEditor = new TableEditor_1.default(this.editor, table, this.invalidateTableRects, this.onShowHelperElement, e.currentTarget);
         }
     };
+    TableResize.prototype.disposeTableEditor = function () {
+        var _a;
+        (_a = this.tableEditor) === null || _a === void 0 ? void 0 : _a.dispose();
+        this.tableEditor = null;
+    };
     TableResize.prototype.ensureTableRects = function () {
         var _this = this;
         if (!this.tableRectMap) {
@@ -25740,12 +25815,15 @@ var TableEditor = /** @class */ (function () {
             _this.editor.select(_this.start, _this.end);
             _this.editor.addUndoSnapshot(null /*callback*/, "Format" /* Format */);
             _this.onChanged();
+            _this.isCurrentlyEditing = false;
             return false;
         };
         this.onStartTableResize = function () {
+            _this.isCurrentlyEditing = true;
             _this.onStartResize();
         };
         this.onStartCellResize = function () {
+            _this.isCurrentlyEditing = true;
             _this.disposeTableResizer();
             _this.onStartResize();
         };
@@ -25783,6 +25861,7 @@ var TableEditor = /** @class */ (function () {
         this.isRTL = (0, roosterjs_editor_dom_1.getComputedStyle)(table, 'direction') == 'rtl';
         this.tableResizer = (0, TableResizer_1.default)(table, editor.getZoomScale(), this.isRTL, this.onStartTableResize, this.onFinishEditing, this.onShowHelperElement);
         this.tableSelector = (0, TableSelector_1.default)(table, editor.getZoomScale(), this.onSelect, this.onShowHelperElement, this.getShouldShowTableSelectorHandler(this.editor.getScrollContainer(), eventTarget));
+        this.isCurrentlyEditing = false;
     }
     TableEditor.prototype.dispose = function () {
         this.disposeTableResizer();
@@ -25790,6 +25869,9 @@ var TableEditor = /** @class */ (function () {
         this.disposeTableInserter();
         this.disposeTableSelector();
     };
+    TableEditor.prototype.isEditing = function () {
+        return this.isCurrentlyEditing;
+    };
     TableEditor.prototype.onMouseMove = function (x, y) {
         var _a;
         for (var i = 0; i < this.table.rows.length; i++) {
@@ -25891,6 +25973,7 @@ var TableEditor = /** @class */ (function () {
         }
     };
     TableEditor.prototype.onStartResize = function () {
+        this.isCurrentlyEditing = true;
         var range = this.editor.getSelectionRange();
         if (range) {
             this.start = roosterjs_editor_dom_1.Position.getStart(range);