Improve

microsoft · Jun 3, 2024 · 0698c39 · 0698c39
1 parent fa4c2ff
commit 0698c39
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/packages/roosterjs-content-model-core/lib/editor/Editor.ts b/packages/roosterjs-content-model-core/lib/editor/Editor.ts
@@ -32,6 +32,7 @@ import type {
     CachedElementHandler,
     DomToModelOptionForCreateModel,
     AnnounceData,
+    ExperimentalFeature,
 } from 'roosterjs-content-model-types';
 
 /**
@@ -406,6 +407,14 @@ export class Editor implements IEditor {
         core.api.announce(core, announceData);
     }
 
+    /**
+     * Check if a given feature is enabled
+     * @param featureName The name of feature to check
+     */
+    isExperimentalFeatureEnabled(featureName: ExperimentalFeature | string): boolean {
+        return this.getCore().experimentalFeatures.indexOf(featureName) >= 0;
+    }
+
     /**
      * @returns the current EditorCore object
      * @throws a standard Error if there's no core object

diff --git a/packages/roosterjs-content-model-plugins/lib/edit/EditPlugin.ts b/packages/roosterjs-content-model-plugins/lib/edit/EditPlugin.ts
@@ -26,6 +26,7 @@ export class EditPlugin implements EditorPlugin {
     private disposer: (() => void) | null = null;
     private shouldHandleNextInputEvent = false;
     private selectionAfterDelete: DOMSelection | null = null;
+    private handleEnterKey = false;
 
     /**
      * Get name of this plugin
@@ -42,6 +43,8 @@ export class EditPlugin implements EditorPlugin {
      */
     initialize(editor: IEditor) {
         this.editor = editor;
+        this.handleEnterKey = this.editor.isExperimentalFeatureEnabled('PersistCache');
+
         if (editor.getEnvironment().isAndroid) {
             this.disposer = this.editor.attachDomEvent({
                 beforeinput: {
@@ -154,7 +157,9 @@ export class EditPlugin implements EditorPlugin {
                     break;
 
                 case 'Enter':
-                    keyboardEnter(editor, rawEvent);
+                    if (this.handleEnterKey) {
+                        keyboardEnter(editor, rawEvent);
+                    }
                     break;
 
                 default:

diff --git a/packages/roosterjs-content-model-types/lib/editor/IEditor.ts b/packages/roosterjs-content-model-types/lib/editor/IEditor.ts
@@ -18,6 +18,7 @@ import type { DarkColorHandler } from '../context/DarkColorHandler';
 import type { TrustedHTMLHandler } from '../parameter/TrustedHTMLHandler';
 import type { Rect } from '../parameter/Rect';
 import type { EntityState } from '../parameter/FormatContentModelContext';
+import type { ExperimentalFeature } from './ExperimentalFeature';
 
 /**
  * An interface of Editor, built on top of Content Model
@@ -227,4 +228,10 @@ export interface IEditor {
      * @param announceData Data to announce
      */
     announce(announceData: AnnounceData): void;
+
+    /**
+     * Check if a given feature is enabled
+     * @param featureName The name of feature to check
+     */
+    isExperimentalFeatureEnabled(featureName: ExperimentalFeature | string): boolean;
 }