Skip to content

Revert "Prevent ComboBox item selection if menu is closing (#3999)" #4057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 14, 2023
Merged

Revert "Prevent ComboBox item selection if menu is closing (#3999)" #4057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1212ac
Revert "Prevent ComboBox item selection if menu is closing (#3999)"
LFDanLu Feb 13, 2023
05da0ea
Merge branch 'main' into revert_proxy
snowystinger Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions packages/@react-stately/combobox/src/useComboBoxState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,26 +306,12 @@ export function useComboBoxState<T extends object>(props: ComboBoxStateOptions<T
setFocusedState(isFocused);
};

let selectionManagerProxy = useMemo(() => {
let proxy = new Proxy(selectionManager, {
get(target, prop, receiver) {
// If the menu is closed, don't update the selected key.
if (prop === 'replaceSelection' && !triggerState.isOpen) {
return () => {};
}
return Reflect.get(target, prop, receiver);
}
});

return proxy;
}, [selectionManager, triggerState.isOpen]);

return {
...triggerState,
toggle,
open,
close,
selectionManager: selectionManagerProxy,
selectionManager,
selectedKey,
setSelectedKey,
disabledKeys,
Expand Down
15 changes: 1 addition & 14 deletions packages/@react-stately/combobox/test/useComboBoxState.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ describe('useComboBoxState tests', function () {
expect(result.current.selectionManager.selectedKeys).toContain('0');
expect(result.current.selectionManager.selectedKeys).not.toContain('1');

act(() => {result.current.open();});
act(() => result.current.selectionManager.replaceSelection('1'));
expect(result.current.selectionManager.selectedKeys).toContain('0');
expect(result.current.selectionManager.selectedKeys).not.toContain('1');
Expand All @@ -191,34 +190,22 @@ describe('useComboBoxState tests', function () {
expect(result.current.selectionManager.selectedKeys).toContain('0');
expect(result.current.selectionManager.selectedKeys).not.toContain('1');

act(() => {result.current.open();});
act(() => result.current.selectionManager.replaceSelection('1'));
expect(result.current.selectionManager.selectedKeys).toContain('1');
expect(result.current.selectionManager.selectedKeys).not.toContain('0');
expect(onSelectionChange).toHaveBeenCalledWith('1');
});

it('supports default no selection', function () {
it('supports sdefault no selection', function () {
let initialProps = {...defaultProps};
let {result} = renderHook((props) => useComboBoxState(props), {initialProps});
expect(result.current.selectionManager.selectionMode).toBe('single');
expect(result.current.selectionManager.selectedKeys.size).toBe(0);

act(() => {result.current.open();});
act(() => result.current.selectionManager.replaceSelection('1'));
expect(result.current.selectionManager.selectedKeys).toContain('1');
expect(result.current.selectionManager.selectedKeys).not.toContain('0');
expect(onSelectionChange).toHaveBeenCalledWith('1');
});

it('won\'t perform replace a selection if the combobox is closed', function () {
// This case covers if a option in the menu is clicked while the menu is closing
let initialProps = {...defaultProps};
let {result} = renderHook((props) => useComboBoxState(props), {initialProps});

act(() => result.current.selectionManager.replaceSelection('1'));
expect(result.current.selectionManager.selectedKeys.size).toEqual(0);
expect(onSelectionChange).toHaveBeenCalledTimes(0);
});
});
});