Merge branch 'master' into u/ianeli/bump-2-26-2026

Author: ianeli1

packages/roosterjs-content-model-core/lib/corePlugin/cache/textMutationObserver.ts

@@ -59,6 +59,7 @@ class TextMutationObserverImpl implements TextMutationObserver {
                 continue;
             } else if (!includedNodes.has(target)) {
                 if (
+                    !this.domHelper.isNodeInEditor(target) ||
                     findClosestEntityWrapper(target, this.domHelper) ||
                     findClosestBlockEntityContainer(target, this.domHelper)
                 ) {

packages/roosterjs-content-model-core/lib/corePlugin/selection/SelectionPlugin.ts

@@ -3,6 +3,8 @@ import { findTableCellElement } from '../../coreApi/setDOMSelection/findTableCel
 import { isSingleImageInSelection } from './isSingleImageInSelection';
 import { normalizePos } from './normalizePos';
 import {
+    getDOMInsertPointRect,
+    getNodePositionFromEvent,
     isCharacterValue,
     isElementOfType,
     isModifierKey,
@@ -364,7 +366,9 @@ class SelectionPlugin implements PluginWithState<SelectionPluginState> {
                             this.handleSelectionInTable(this.getTabKey(rawEvent));
                             rawEvent.preventDefault();
                         } else {
-                            win?.requestAnimationFrame(() => this.handleSelectionInTable(key));
+                            win?.requestAnimationFrame(() =>
+                                this.handleSelectionInTable(key, selection.range)
+                            );
                         }
                     }
                 }
@@ -423,7 +427,8 @@ class SelectionPlugin implements PluginWithState<SelectionPluginState> {
     }
 
     private handleSelectionInTable(
-        key: 'ArrowUp' | 'ArrowDown' | 'ArrowLeft' | 'ArrowRight' | 'TabLeft' | 'TabRight'
+        key: 'ArrowUp' | 'ArrowDown' | 'ArrowLeft' | 'ArrowRight' | 'TabLeft' | 'TabRight',
+        rangeBeforeChange?: Range
     ) {
         if (!this.editor || !this.state.tableSelection) {
             return;
@@ -468,11 +473,30 @@ class SelectionPlugin implements PluginWithState<SelectionPluginState> {
                     }
 
                     if (collapsed && td) {
-                        this.setRangeSelectionInTable(
-                            td,
-                            key == Up ? td.childNodes.length : 0,
-                            this.editor
-                        );
+                        const textOffset =
+                            (key == 'ArrowUp' || key == 'ArrowDown') && rangeBeforeChange
+                                ? this.getTextOffset(
+                                      this.editor,
+                                      rangeBeforeChange,
+                                      td,
+                                      key == 'ArrowUp'
+                                  )
+                                : null;
+                        if (textOffset) {
+                            this.setRangeSelectionInTable(
+                                textOffset.node,
+                                textOffset.offset,
+                                this.editor,
+                                false /* selectAll */
+                            );
+                        } else {
+                            this.setRangeSelectionInTable(
+                                td,
+                                0,
+                                this.editor,
+                                false /* selectAll */
+                            );
+                        }
                     } else if (!td && (lastCo.row == -1 || lastCo.row <= parsedTable.length)) {
                         this.selectBeforeOrAfterElement(
                             this.editor,
@@ -545,13 +569,35 @@ class SelectionPlugin implements PluginWithState<SelectionPluginState> {
         }
     }
 
+    private getTextOffset(editor: IEditor, range: Range, td: HTMLElement, isKeyUp: boolean) {
+        const doc = editor.getDocument();
+        const cursorRect = range
+            ? getDOMInsertPointRect(doc, {
+                  node: range.startContainer,
+                  offset: range.startOffset,
+              })
+            : undefined;
+        const rect = td?.getBoundingClientRect();
+        const textOffset =
+            cursorRect && rect
+                ? getNodePositionFromEvent(
+                      doc,
+                      editor.getDOMHelper(),
+                      cursorRect.left,
+                      isKeyUp ? rect.top - 1 : rect.top + 1
+                  )
+                : null;
+        return textOffset;
+    }
+
     private setRangeSelectionInTable(
         cell: Node,
         nodeOffset: number,
         editor: IEditor,
         selectAll?: boolean
     ) {
-        const range = editor.getDocument().createRange();
+        const doc = editor.getDocument();
+        const range = doc.createRange();
         if (selectAll && cell.firstChild && cell.lastChild) {
             const cellStart = cell.firstChild;
             const cellEnd = cell.lastChild;
@@ -569,7 +615,6 @@ class SelectionPlugin implements PluginWithState<SelectionPluginState> {
         } else {
             // Get deepest editable position in the cell
             const { node, offset } = normalizePos(cell, nodeOffset);
-
             range.setStart(node, offset);
             range.collapse(true /* toStart */);
         }

packages/roosterjs-content-model-core/test/command/paste/pasteTest.ts

@@ -168,7 +168,7 @@ describe('paste with content model & paste plugin', () => {
         paste(editor!, clipboardData);
 
         expect(setProcessorF.setProcessor).toHaveBeenCalledTimes(2);
-        expect(addParserF.addParser).toHaveBeenCalledTimes(DEFAULT_TIMES_ADD_PARSER_CALLED + 6);
+        expect(addParserF.addParser).toHaveBeenCalledTimes(DEFAULT_TIMES_ADD_PARSER_CALLED + 7);
         expect(WordDesktopFile.processPastedContentFromWordDesktop).toHaveBeenCalledTimes(1);
     });
 
@@ -224,7 +224,7 @@ describe('paste with content model & paste plugin', () => {
         paste(editor!, clipboardData, 'asPlainText');
 
         expect(setProcessorF.setProcessor).toHaveBeenCalledTimes(2);
-        expect(addParserF.addParser).toHaveBeenCalledTimes(11);
+        expect(addParserF.addParser).toHaveBeenCalledTimes(12);
         expect(WordDesktopFile.processPastedContentFromWordDesktop).toHaveBeenCalledTimes(1);
     });
 

packages/roosterjs-content-model-core/test/corePlugin/cache/textMutationObserverTest.ts

@@ -384,4 +384,55 @@ describe('TextMutationObserverImpl', () => {
         expect(onMutation).toHaveBeenCalledTimes(1);
         expect(onMutation).toHaveBeenCalledWith({ type: 'unknown' });
     });
+
+    it('Ignore changes that is not in editor - add node', () => {
+        const div = document.createElement('div');
+        const span1 = document.createElement('span');
+        const span2 = document.createElement('span');
+
+        div.appendChild(span1);
+
+        const onMutation = jasmine.createSpy('onMutation');
+
+        observer = textMutationObserver.createTextMutationObserver(div, onMutation);
+        observer.startObserving();
+
+        span1.textContent = 'test1';
+        span2.textContent = 'test2';
+
+        observer.flushMutations();
+
+        expect(onMutation).toHaveBeenCalledTimes(1);
+        expect(onMutation).toHaveBeenCalledWith({
+            type: 'childList',
+            addedNodes: [span1.firstChild],
+            removedNodes: [],
+        });
+    });
+
+    it('Ignore changes that is not in editor - remove node', () => {
+        const div = document.createElement('div');
+        const span1 = document.createElement('span');
+        const span2 = document.createElement('span');
+
+        span1.appendChild(span2);
+        div.appendChild(span1);
+
+        const onMutation = jasmine.createSpy('onMutation');
+
+        observer = textMutationObserver.createTextMutationObserver(div, onMutation);
+        observer.startObserving();
+
+        div.removeChild(span1);
+        span1.removeChild(span2);
+
+        observer.flushMutations();
+
+        expect(onMutation).toHaveBeenCalledTimes(1);
+        expect(onMutation).toHaveBeenCalledWith({
+            type: 'childList',
+            addedNodes: [],
+            removedNodes: [span1],
+        });
+    });
 });