Skip to content

Rich Text: Restore the selection when focus returns to the editable #80396

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

Merged
Mamaduka merged 1 commit into from
Jul 17, 2026
Merged

Rich Text: Restore the selection when focus returns to the editable #80396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion packages/rich-text/src/hook/event-listeners/input-and-selection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,9 @@ export default ( props ) => ( element ) => {
// snapshot must not skip synchronization.
selectionSnapshot = undefined;
} else {
applyRecord( record.current, { domOnly: true } );
// The document's selection may have moved elsewhere while the
// element was blurred, so restore it from the record.
applyRecord( record.current );
}

onSelectionChange( record.current.start, record.current.end );
Expand Down
10 changes: 8 additions & 2 deletions test/e2e/specs/editor/various/block-notes.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1723,13 +1723,19 @@ test.describe( 'Block Notes', () => {

/*
* Pressing Escape closes the link popover and leaves the note
* form intact — focus does not get yanked out of the editor.
* form intact; focus does not get yanked out of the editor, and
* the selection is restored rather than left collapsed.
*/
await page.keyboard.press( 'Escape' );
await expect(
page.getByRole( 'combobox', { name: 'Search or type URL' } )
).toBeHidden();
await expect( textbox ).toBeVisible();
await expect( textbox ).toBeFocused();
await expect
.poll( () =>
page.evaluate( () => window.getSelection().toString() )
)
.toBe( 'visit example' );
} );

test( 'Cmd+K opens an unclipped link popover in the reply form', async ( {
Expand Down
Loading