Try and better settle focus after a focused widget is removed (redux) #954
Conversation
This file contains 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
This change ensures that, for example, the widget remains in the Screen.focus_chain so that it's easier to handle passing off focus on removal. To help address Textualize#939.
This makes it easier for me to see which widget is which in the focus chain, etc, when logging.
Addresses the issue raised in Textualize#939. Here I rework Screen._reset_focus so that, rather than deal with siblings, it deals with the focus chain. It now also optionally takes a list of DOMNodes to avoid and will, as that suggests, avoid them when looking for somewhere to move focus to. As a preference the new version of this will seek to settle focus on the nearest (in the chain) *previous* non-excluded DOMNode. NOTE: Currently the return value of Widget.walk_children is cast to a list to ensure that it doesn't get consumed (as of the time of commit, it's still qan iterable). Once Textualize#952 has been accepted I'll change this (remove the cast).
willmcgugan
approved these changes
Oct 19, 2022
|
|
||
| remove_widgets = widget.walk_children( | ||
| Widget, with_self=True, method="depth", reverse=True | ||
| remove_widgets = list( |
There was a problem hiding this comment.
Can remove the list when the other PR is merged.
There was a problem hiding this comment.
Aye, already noted in 11ddcdd on commit.
| for candidate in reversed( | ||
| focusable_widgets[widget_index + 1 :] + focusable_widgets[:widget_index] | ||
| ): | ||
| if candidate not in avoiding and candidate.can_focus: |
There was a problem hiding this comment.
I think that we can be sure that candidate.can_focus is True, can't we?
There was a problem hiding this comment.
Need a 🤦 as the real response here.
davep
added a commit
to davep/textual
that referenced
this pull request
Oct 19, 2022
As per Textualize#954 (comment) Good catch!
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.
A new approach to solving #939, written to avoid the issues that #943 would have caused.