Fix disabled after search #395
Merged
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
When searching, and the results contain exactly one result that is disabled, it was previously "focused" (at least set as the `focusedOption` in state), hence pressing enter caused it to be selected. This fixes that, ensuring that: 1. A disabled option does not become the focusedOption 2. When there is no focusedOption, pressing enter does nothing Closing the menu and leaving the selection empty would be another option, but that would IMHO feel strange. Fixes JedWatson#378
This ensures that error messages from unexpected are syntax highlighted on ansi terminals, due to an "issue" in unexpected, where if first detects the DOM, then if not, attempts to check for an ansi terminal. Moving the order of the requires works around this issue.
|
Nice work @bruderstein - I can't merge #382 yet because of conflicts, but this looks like it's safe to go in first. |
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.
This is a fix for the (reopened) #378, where a disabled option can be selected with enter when the search results in only (or a single) disabled option. Tests added to cover this case.
I've refactored a little in order to extract a
getFirstFocusableOptionfunction, which simply returns the first none-disabled option from the given options. This is now called in 2 places. This really needs simplifying, such that we're only setting the focused option in one place, but that's a bigger issue and this fixes the immediate issue.This will probably have an effect on #382, but should definitely go in together.