Skip to content
This repository has been archived by the owner on Mar 12, 2020. It is now read-only.

Make sure buttons update when their enablement has changed #trivial #926

Merged
merged 1 commit into from
Jan 8, 2018
Merged
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions src/lib/Components/Buttons/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,18 @@ export default class Button extends React.Component<Props, State> {
}

componentDidUpdate(_prevProps: any, prevState: any) {
const currentDisplayState = this.state.displayState

// Check to see if it has been enabled/disabled since last render; ignore this if highlighted
if (currentDisplayState !== DisplayState.Highlighted) {
const enablementState =
this.props.onPress && this.props.onPress !== undefined ? DisplayState.Enabled : DisplayState.Disabled

if (currentDisplayState !== enablementState) {
this.setState({ displayState: enablementState })
}
}

if (this.state.displayState !== prevState.displayState) {
// Don't animate in when it's the initial press down
const showHighlight =
Expand Down