Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix cursor jump issue when applying Gboard suggestions #2638

Merged
merged 4 commits into from
May 20, 2024
Merged

Fix cursor jump issue when applying Gboard suggestions #2638

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
741df8d
fix cursor issue
Rain-Zheng May 16, 2024
35c1b3e
Merge branch 'master' into xiaozhe/fix-gboard-cursor-issue
JiuqingSong May 17, 2024
99f1d77
resolve comment
Rain-Zheng May 17, 2024
4b176e6
Merge branch 'master' into xiaozhe/fix-gboard-cursor-issue
JiuqingSong May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions packages/roosterjs-content-model-plugins/lib/edit/EditPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { keyboardDelete } from './keyboardDelete';
import { keyboardInput } from './keyboardInput';
import { keyboardTab } from './keyboardTab';
import type {
DOMSelection,
EditorPlugin,
IEditor,
KeyDownEvent,
Expand All @@ -22,6 +23,7 @@ export class EditPlugin implements EditorPlugin {
private editor: IEditor | null = null;
private disposer: (() => void) | null = null;
private shouldHandleNextInputEvent = false;
private selectionAfterDelete: DOMSelection | null = null;

/**
* Get name of this plugin
Expand Down Expand Up @@ -70,6 +72,12 @@ export class EditPlugin implements EditorPlugin {
case 'keyDown':
this.handleKeyDownEvent(this.editor, event);
break;
case 'keyUp':
if (this.selectionAfterDelete) {
this.editor.setDOMSelection(this.selectionAfterDelete);
this.selectionAfterDelete = null;
}
break;
}
}
}
Expand Down Expand Up @@ -150,15 +158,9 @@ 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.selectionAfterDelete = editor.getDOMSelection();
}
}
}
Loading