fix(deps): update dependency downshift to v8 #565
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -181,9 +181,13 @@ export const useCombobox = < | |
| false | ||
| }; | ||
|
|
||
| case useDownshift.stateChangeTypes.InputClick: | ||
| if (!isAutocomplete) { | ||
| // Prevent input click listbox expansion on non-autocomplete comboboxes. | ||
| changes.isOpen = state.isOpen; | ||
| } | ||
|
|
||
| break; | ||
|
|
||
| case useDownshift.stateChangeTypes.InputKeyDownArrowDown: | ||
| case useDownshift.stateChangeTypes.FunctionOpenMenu: | ||
|
|
@@ -300,7 +304,7 @@ export const useCombobox = < | |
| initialHighlightedIndex: initialActiveIndex, | ||
| onStateChange: handleDownshiftStateChange, | ||
| stateReducer, | ||
| environment: win as any /* HACK around Downshift's addition of Node to environment */ | ||
| }); | ||
|
|
||
| const closeListbox = useCallback(() => { | ||
|
|
@@ -413,7 +417,7 @@ export const useCombobox = < | |
|
|
||
| previousStateRef.current = { | ||
| ...previousStateRef.current, | ||
| type: useDownshift.stateChangeTypes.InputClick | ||
| }; | ||
| } | ||
| }); | ||
|
|
@@ -449,11 +453,11 @@ export const useCombobox = < | |
| }; | ||
|
|
||
| if (isEditable && triggerContainsInput) { | ||
| const handleClick = (event: React.MouseEvent) => { | ||
| if (disabled) { | ||
| event.preventDefault(); | ||
| } else if (isAutocomplete) { | ||
| triggerProps.onClick && triggerProps.onClick(event); | ||
|
Contributor
There was a problem hiding this comment. 🚲
Member
There was a problem hiding this comment. I don't think it does. Instead of testing for invalid |
||
| } else { | ||
| inputRef.current?.focus(); | ||
| } | ||
|
|
@@ -591,13 +595,7 @@ export const useCombobox = < | |
| ); | ||
|
|
||
| const getInputProps = useCallback<IUseComboboxReturnValue['getInputProps']>( | ||
| ({ role = isEditable ? 'combobox' : null, onClick, onFocus, ...other } = {}) => { | ||
| const inputProps = { | ||
| 'data-garden-container-id': 'containers.combobox.input', | ||
| 'data-garden-container-version': PACKAGE_VERSION, | ||
|
|
@@ -613,11 +611,10 @@ export const useCombobox = < | |
| triggerRef.current?.contains(event.target) && | ||
| event.stopPropagation(); | ||
|
|
||
| return getDownshiftInputProps<any>({ | ||
| ...inputProps, | ||
| disabled, | ||
| role, | ||
| 'aria-autocomplete': isAutocomplete ? 'list' : undefined, | ||
| onClick: composeEventHandlers(onClick, handleClick), | ||
| ...getFieldInputProps(), | ||
|
|
@@ -672,7 +669,7 @@ export const useCombobox = < | |
| triggerRef.current?.contains(event.target) && | ||
| event.stopPropagation(); | ||
|
|
||
| const handleKeyDown = (event: React.KeyboardEvent) => { | ||
| if (event.key === KEYS.BACKSPACE || event.key === KEYS.DELETE) { | ||
| setDownshiftSelection(option.value); | ||
| } else { | ||
|
|
@@ -699,7 +696,7 @@ export const useCombobox = < | |
| triggerRef.current?.focus(); | ||
| } | ||
|
|
||
| inputProps.onKeyDown && inputProps.onKeyDown(event); | ||
| } | ||
| } | ||
| }; | ||
|
|
@@ -716,13 +713,12 @@ export const useCombobox = < | |
| ); | ||
|
|
||
| const getListboxProps = useCallback<IUseComboboxReturnValue['getListboxProps']>( | ||
| ({ role = 'listbox', ...other }) => | ||
| getDownshiftListboxProps<any>({ | ||
|
Contributor
There was a problem hiding this comment. Just checking re:
Member
There was a problem hiding this comment. Sort of. imo, while well-intended, the associated Downshift PR kind of made a mess out of the getter prop types to the point where there was no reasonable combo that could satisfy what is going on – so I hit the |
||
| 'data-garden-container-id': 'containers.combobox.listbox', | ||
| 'data-garden-container-version': PACKAGE_VERSION, | ||
| ref: listboxRef, | ||
| role, | ||
| 'aria-multiselectable': isMultiselectable ? true : undefined, | ||
| ...other | ||
| } as IDownshiftListboxProps), | ||
|
|
@@ -772,9 +768,10 @@ export const useCombobox = < | |
| }; | ||
| } | ||
|
|
||
| return getDownshiftOptionProps<any>({ | ||
| item: option.value, | ||
| index: values.indexOf(option.value), | ||
| 'aria-disabled': undefined, | ||
| 'aria-selected': ariaSelected, | ||
| ...optionProps | ||
| } as IDownshiftOptionProps<OptionValue>); | ||
|
|
||
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Downshift was throwing console errors for not calling the combobox getters