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

[ListItem] Fix triggers onTouchTap when disabled #7486

Merged
merged 6 commits into from
Jul 21, 2017
Merged

[ListItem] Fix triggers onTouchTap when disabled #7486

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6665680
#7449
jonashartwig Jul 20, 2017
29d4a4d
#7449 - should fix it
jonashartwig Jul 20, 2017
762e1a0
#7449 - should fix it
jonashartwig Jul 20, 2017
dbf72ee
added trailing ,
jonashartwig Jul 20, 2017
dc936ab
made requested changes
jonashartwig Jul 21, 2017
5eaa282
fixed stupid mistake
jonashartwig Jul 21, 2017
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
2 changes: 2 additions & 0 deletions src/List/ListItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@ class ListItem extends Component {
onMouseLeave, // eslint-disable-line no-unused-vars
onNestedListToggle, // eslint-disable-line no-unused-vars
onTouchStart, // eslint-disable-line no-unused-vars
onTouchTap, // eslint-disable-line no-unused-vars
rightAvatar,
rightIcon,
rightIconButton,
Expand Down Expand Up @@ -729,6 +730,7 @@ class ListItem extends Component {
onTouchStart={this.handleTouchStart}
onTouchEnd={this.handleTouchEnd}
onTouchTap={this.handleTouchTap}
disabled={disabled}
ref={(node) => this.button = node}
style={Object.assign({}, styles.root, style)}
>
Expand Down