Merge branch 'master' into u/jisong/2699

microsoft · Sep 23, 2024 · eecc965 · eecc965
2 parents 1256cb8 + 63747b9
commit eecc965
Show file tree

Hide file tree

Showing 5 changed files with 165 additions and 47 deletions.
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
         "coverage-istanbul-loader": "3.0.5",
         "css-loader": "3.5.3",
         "detect-port": "^1.3.0",
-        "dompurify": "2.3.0",
+        "dompurify": "2.5.4",
         "eslint": "^8.50.0",
         "eslint-plugin-etc": "^2.0.3",
         "eslint-plugin-react": "^7.33.2",

diff --git a/packages/roosterjs-content-model-plugins/lib/edit/keyboardEnter.ts b/packages/roosterjs-content-model-plugins/lib/edit/keyboardEnter.ts
@@ -1,7 +1,12 @@
 import { deleteEmptyQuote } from './deleteSteps/deleteEmptyQuote';
-import { deleteSelection, normalizeContentModel, runEditSteps } from 'roosterjs-content-model-dom';
 import { handleEnterOnList } from './inputSteps/handleEnterOnList';
 import { handleEnterOnParagraph } from './inputSteps/handleEnterOnParagraph';
+import {
+    ChangeSource,
+    deleteSelection,
+    normalizeContentModel,
+    runEditSteps,
+} from 'roosterjs-content-model-dom';
 import type { IEditor } from 'roosterjs-content-model-types';
 
 /**
@@ -49,6 +54,7 @@ export function keyboardEnter(
         {
             rawEvent,
             scrollCaretIntoView: true,
+            changeSource: ChangeSource.Keyboard,
         }
     );
 }
diff --git a/packages/roosterjs-content-model-plugins/lib/edit/keyboardInput.ts b/packages/roosterjs-content-model-plugins/lib/edit/keyboardInput.ts
@@ -1,4 +1,9 @@
-import { deleteSelection, isModifierKey, normalizeContentModel } from 'roosterjs-content-model-dom';
+import {
+    ChangeSource,
+    deleteSelection,
+    isModifierKey,
+    normalizeContentModel,
+} from 'roosterjs-content-model-dom';
 import type { DOMSelection, IEditor } from 'roosterjs-content-model-types';
 
 /**
@@ -32,6 +37,7 @@ export function keyboardInput(editor: IEditor, rawEvent: KeyboardEvent) {
             {
                 scrollCaretIntoView: true,
                 rawEvent,
+                changeSource: ChangeSource.Keyboard,
             }
         );
 

diff --git a/packages/roosterjs-content-model-plugins/lib/edit/keyboardTab.ts b/packages/roosterjs-content-model-plugins/lib/edit/keyboardTab.ts
@@ -1,9 +1,13 @@
-import { getOperationalBlocks, isBlockGroupOfType } from 'roosterjs-content-model-dom';
 import { handleTabOnList } from './tabUtils/handleTabOnList';
 import { handleTabOnParagraph } from './tabUtils/handleTabOnParagraph';
 import { handleTabOnTable } from './tabUtils/handleTabOnTable';
 import { handleTabOnTableCell } from './tabUtils/handleTabOnTableCell';
 import { setModelIndentation } from 'roosterjs-content-model-api';
+import {
+    ChangeSource,
+    getOperationalBlocks,
+    isBlockGroupOfType,
+} from 'roosterjs-content-model-dom';
 import type {
     ContentModelListItem,
     ContentModelTableCell,
@@ -37,6 +41,7 @@ export function keyboardTab(editor: IEditor, rawEvent: KeyboardEvent) {
                 },
                 {
                     apiName: 'handleTabKey',
+                    changeSource: ChangeSource.Keyboard,
                 }
             );
             return true;