fix: restore focus on toast dismiss - #10260
Merged
Merged
Conversation
gonfunko
approved these changes
Aug 11, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The basics
The details
Resolves
Fixes #8912
Proposed Changes
When a toast is dismissed via the close button, focus is restored to the node that was focused before the close button took focus, instead of always calling
workspace.markFocused().Screen.Recording.2026-08-11.at.12.39.27.PM.mov
To do this, a new
FocusManager.getPreviouslyFocusedNode()method was created. We fall back tofocusTree(workspace)if there is no focsuable previous node, so focus is parked on the workspace throughFocusManager.Reason for Changes
Previously, manually dismissing a toast always focused the workspace SVG. If the user had a block or other node focused, that context was lost.
Test Coverage
focus_manager_test.js:getPreviouslyFocusedNode()gets a basic unit testtoast_test.jsnew suite: