Skip to content
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

Jump to bottom

fix(dropdowns): allow object values for NextItem selection #817

Merged
merged 1 commit into from
Jul 22, 2020
Merged

fix(dropdowns): allow object values for NextItem selection #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 8 additions & 8 deletions packages/dropdowns/.size-snapshot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@
}
},
"index.cjs.js": {
"bundled": 82972,
"minified": 51254,
"gzipped": 11100
"bundled": 83051,
"minified": 51288,
"gzipped": 11114
},
"index.esm.js": {
"bundled": 80164,
"minified": 48558,
"gzipped": 10927,
"bundled": 80243,
"minified": 48592,
"gzipped": 10941,
"treeshaked": {
"rollup": {
"code": 37693,
"code": 37727,
"import_statements": 807
},
"webpack": {
"code": 41851
"code": 41885
}
}
}
Expand Down
29 changes: 29 additions & 0 deletions packages/dropdowns/src/elements/Dropdown/Dropdown.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,35 @@ describe('Dropdown', () => {
expect(onSelectSpy.mock.calls[0][0]).toBe('next-item-1');
});

it('selects next item when provided value is an object', () => {
const onSelectSpy = jest.fn();
const { container, getByTestId } = render(
<Dropdown
onSelect={onSelectSpy}
downshiftProps={{ itemToString: (item: { value: string }) => (item ? item.value : '') }}
>
<Trigger>
<button data-test-id="trigger">Trigger</button>
</Trigger>
<Menu data-test-id="menu">
<Item value={{ value: 'item-1' }}>Item 1</Item>
<NextItem value={{ value: 'next-item-1' }}>Next Item 1</NextItem>
<NextItem value={{ value: 'next-item-2' }}>Next Item 2</NextItem>
</Menu>
</Dropdown>
);

const trigger = getByTestId('trigger');
const input = container.querySelector('input');

fireEvent.click(trigger);
fireEvent.keyDown(input!, { key: 'ArrowDown', keyCode: 40 });
fireEvent.keyDown(input!, { key: 'ArrowDown', keyCode: 40 });
fireEvent.keyDown(input!, { key: 'ArrowRight', keyCode: 39 });

expect(onSelectSpy.mock.calls[0][0]).toEqual({ value: 'next-item-1' });
});

it('opens dropdown on SPACE key', () => {
const onSelectSpy = jest.fn();
const { container, getByTestId } = render(<ExampleDropdown onSelect={onSelectSpy} />);
Expand Down
7 changes: 5 additions & 2 deletions packages/dropdowns/src/elements/Menu/Items/NextItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,15 @@ NextItemComponent.displayName = 'NextItemComponent';
*/
export const NextItem = React.forwardRef<HTMLLIElement, Omit<IItemProps, 'component'>>(
({ value, disabled, ...props }, ref) => {
const { nextItemsHashRef } = useDropdownContext();
const {
nextItemsHashRef,
downshift: { itemToString }
} = useDropdownContext();
const { itemIndexRef } = useMenuContext();

if (!disabled) {
// Include current index in global Dropdown context
(nextItemsHashRef.current as any)[value] = itemIndexRef.current;
(nextItemsHashRef.current as any)[itemToString(value)] = itemIndexRef.current;
}

return (
Expand Down