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

Fix regressions #7262

Merged
merged 1 commit into from Jun 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Expand Up @@ -6,7 +6,7 @@
### Link to minimal working code that reproduces the issue

<!-- You may provide a repository or use our template-ready webpackbin
master: https://www.webpackbin.com/bins/-Kh7G86UTg0ckGC2hL94
master: https://www.webpackbin.com/bins/-KndEyl53H8td-WNXaut
next: https://www.webpackbin.com/bins/-Kh8lDulAxDq8j-7yTew

-->
Expand Down
10 changes: 6 additions & 4 deletions docs/src/app/components/Master.js
Expand Up @@ -117,10 +117,12 @@ class Master extends Component {
};

handleChangeList = (event, value) => {
this.context.router.push(value);
this.setState({
navDrawerOpen: false,
});
if (value) {
this.context.router.push(value);
this.setState({
navDrawerOpen: false,
});
}
};

handleChangeMuiTheme = (muiTheme) => {
Expand Down
1 change: 0 additions & 1 deletion src/RaisedButton/RaisedButton.js
Expand Up @@ -73,7 +73,6 @@ function getStyles(props, context, state) {
borderRadius,
transition: transitions.easeOut(),
backgroundColor: backgroundColor,
overflow: 'hidden',
// That's the default value for a button but not a link
textAlign: 'center',
},
Expand Down
3 changes: 3 additions & 0 deletions src/internal/EnhancedButton.js
Expand Up @@ -164,6 +164,9 @@ class EnhancedButton extends Component {
color={focusRippleColor}
opacity={focusRippleOpacity}
show={isKeyboardFocused}
style={{
overflow: 'hidden',
}}
key="focusRipple"
/>
) : undefined;
Expand Down
6 changes: 3 additions & 3 deletions src/internal/FocusRipple.js
Expand Up @@ -4,7 +4,7 @@ import ReactDOM from 'react-dom';
import shallowEqual from 'recompose/shallowEqual';
import autoPrefix from '../utils/autoPrefix';
import transitions from '../styles/transitions';
import ScaleInTransitionGroup from './ScaleIn';
import ScaleIn from './ScaleIn';

const pulsateDuration = 750;

Expand Down Expand Up @@ -115,12 +115,12 @@ class FocusRipple extends Component {
const ripple = show ? this.getRippleElement(this.props) : null;

return (
<ScaleInTransitionGroup
<ScaleIn
maxScale={0.85}
style={mergedRootStyles}
>
{ripple}
</ScaleInTransitionGroup>
</ScaleIn>
);
}
}
Expand Down