This repository has been archived by the owner on Mar 4, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 55
fix(List): handle onClick and onFocus on items correctly #779
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
d3a440a
fix(List): handle onClick and onFocus on items correctly
layershifter 14e40ba
add changelog entry
layershifter 11361e3
Merge branches 'fix/list-onclick' and 'master' of https://github.com/…
layershifter abf006c
update UTs
layershifter b41ed44
add more checks
layershifter File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,8 +14,8 @@ describe('List', () => { | |
handlesAccessibility(List, { defaultRootRole: 'list' }) | ||
listImplementsCollectionShorthandProp('items', ListItem, { mapsValueToProp: 'content' }) | ||
|
||
const getItems = () => [ | ||
{ key: 'irving', content: 'Irving', onClick: jest.fn() }, | ||
const getItems = (onClick?: Function) => [ | ||
{ key: 'irving', content: 'Irving', onClick }, | ||
{ key: 'skyler', content: 'Skyler' }, | ||
{ key: 'dante', content: 'Dante' }, | ||
] | ||
|
@@ -29,15 +29,15 @@ describe('List', () => { | |
}) | ||
|
||
it('calls onClick handler for item', () => { | ||
const items = getItems() | ||
const listItems = mountWithProvider(<List items={items} />).find('ListItem') | ||
const onClick = jest.fn() | ||
const listItems = mountWithProvider(<List items={getItems(onClick)} />).find('ListItem') | ||
|
||
listItems | ||
.first() | ||
.find('li') | ||
.first() | ||
.simulate('click') | ||
expect(items[0].onClick).toHaveBeenCalled() | ||
expect(onClick).toHaveBeenCalled() | ||
}) | ||
}) | ||
|
||
|
@@ -72,5 +72,22 @@ describe('List', () => { | |
expect(updatedItems.at(0).props().selected).toBe(false) | ||
expect(updatedItems.at(1).props().selected).toBe(true) | ||
}) | ||
|
||
it('calls onClick handler for item if `selectable`', () => { | ||
const onClick = jest.fn() | ||
const onSelectedIndexChange = jest.fn() | ||
const listItems = mountWithProvider( | ||
<List items={getItems(onClick)} onSelectedIndexChange={onSelectedIndexChange} selectable />, | ||
).find('ListItem') | ||
|
||
listItems | ||
.first() | ||
.find('li') | ||
.first() | ||
.simulate('click') | ||
|
||
expect(onClick).toHaveBeenCalled() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't you want to check cb params as well? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done 👍 |
||
expect(onSelectedIndexChange).toHaveBeenCalled() | ||
}) | ||
}) | ||
}) |
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.
Actually,
Menu
does the same thing