fix cursor issue

Rain-Zheng · May 16, 2024 · 741df8d · 741df8d
1 parent b230301
commit 741df8d
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/packages/roosterjs-content-model-plugins/lib/edit/EditPlugin.ts b/packages/roosterjs-content-model-plugins/lib/edit/EditPlugin.ts
@@ -22,6 +22,7 @@ export class EditPlugin implements EditorPlugin {
     private editor: IEditor | null = null;
     private disposer: (() => void) | null = null;
     private shouldHandleNextInputEvent = false;
+    private restoreSelectionCallback: (() => void) | null = null;
 
     /**
      * Get name of this plugin
@@ -70,6 +71,10 @@ export class EditPlugin implements EditorPlugin {
                 case 'keyDown':
                     this.handleKeyDownEvent(this.editor, event);
                     break;
+                case 'keyUp':
+                    this.restoreSelectionCallback?.();
+                    this.restoreSelectionCallback = null;
+                    break;
             }
         }
     }
@@ -150,15 +155,12 @@ export class EditPlugin implements EditorPlugin {
         if (handled) {
             rawEvent.preventDefault();
 
-            // Restore the selection to avoid the cursor jump issue
+            // Restore the selection on keyup event to avoid the cursor jump issue
             // See: https://issues.chromium.org/issues/330596261
             const selection = editor.getDOMSelection();
-            const doc = this.editor?.getDocument();
-            doc?.defaultView?.requestAnimationFrame(() => {
-                if (this.editor) {
-                    this.editor.setDOMSelection(selection);
-                }
-            });
+            this.restoreSelectionCallback = () => {
+                this.editor?.setDOMSelection(selection);
+            };
         }
     }
 }