Skip to content

Commit d19bd5e

Browse files
committed
fix: don't select item on blur, allow down arrow key on clear button
1 parent f2406f3 commit d19bd5e

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

packages/shared/widget-plugin-dropdown-filter/src/controllers/mixins/SelectControllerMixin.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,18 @@ export function SelectControllerMixin<TBase extends BaseController>(Base: TBase)
101101
...changes
102102
};
103103
case useSelect.stateChangeTypes.ToggleButtonKeyDownEnter:
104+
case useSelect.stateChangeTypes.ToggleButtonKeyDownSpaceButton:
104105
case useSelect.stateChangeTypes.ItemClick:
105106
return {
106107
...changes,
107108
isOpen: true,
108109
highlightedIndex: state.highlightedIndex
109110
};
111+
case useSelect.stateChangeTypes.ToggleButtonBlur:
112+
return {
113+
...changes,
114+
selectedItem: null
115+
};
110116
default:
111117
return changes;
112118
}

packages/shared/widget-plugin-dropdown-filter/src/controls/base/ClearButton.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ type ClearButtonProps = {
1414
};
1515

1616
const stopKeyDown = (e: React.KeyboardEvent<HTMLButtonElement>) => {
17-
e.stopPropagation();
17+
if (e.key === "Enter" || e.key === " ") {
18+
e.stopPropagation();
19+
}
1820
};
1921

2022
export function ClearButton(props: ClearButtonProps): ReactElement | null {

0 commit comments

Comments
 (0)