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.

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

Fixed DatePicker year/month navigation buttons #1081

Merged
merged 2 commits into from
Jul 9, 2015
Merged

Fixed DatePicker year/month navigation buttons #1081

merged 2 commits into from
Jul 9, 2015

Conversation

jkruder
Copy link
Contributor

@jkruder jkruder commented Jul 9, 2015

In svg-icons there was a command to delete the fill property from this.props.style. This is destructive behavior on something that should be treated as immutable. This issue presented itself as soon as I hovered over one of the year/month buttons in the DatePicker that was disabled.

Also fixed a z-indexing issue with the month year being displayed between the month/year buttons.

@jkruder
Copy link
Contributor Author

jkruder commented Jul 9, 2015

Addresses #1075

@jkruder jkruder self-assigned this Jul 9, 2015
}, style);
},
style,
{fill: this.state.hovered ? onColor : offColor}); // Make sure our fill color overrides fill provided in props.style
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small code formatting suggestion:

let mergedStyles = this.mergeAndPrefix({
  display: 'inline-block',
  height: 24,
  width: 24,
  userSelect: 'none',
  transition: Transitions.easeOut(),
}, style, {
  // Make sure our fill color overrides fill provided in props.style
  fill: this.state.hovered ? onColor : offColor
}); 

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You got it, I'll make the change.

@jkruder
Copy link
Contributor Author

jkruder commented Jul 9, 2015

@hai-cea Updated the formatting.

@hai-cea
Copy link
Member

hai-cea commented Jul 9, 2015

@jkruder Please rebase.

@jkruder
Copy link
Contributor Author

jkruder commented Jul 9, 2015

@hai-cea Rebased.

hai-cea added a commit that referenced this pull request Jul 9, 2015
Fixed DatePicker year/month navigation buttons
@hai-cea hai-cea merged commit da37ed6 into mui:master Jul 9, 2015
@hai-cea
Copy link
Member

hai-cea commented Jul 9, 2015

Thanks @jkruder

mnajdova pushed a commit to mnajdova/material-ui that referenced this pull request Nov 10, 2020
@zannager zannager added component: date picker This is the name of the generic UI component, not the React module! component: pickers This is the name of the generic UI component, not the React module! labels Mar 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component: date picker This is the name of the generic UI component, not the React module! component: pickers This is the name of the generic UI component, not the React module!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants