diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 37a0bed457d66b..9ddcbbe0c523bd 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -6,7 +6,7 @@ ### Link to minimal working code that reproduces the issue diff --git a/docs/src/app/components/Master.js b/docs/src/app/components/Master.js index 4e03b811015dde..c4ff3231375474 100644 --- a/docs/src/app/components/Master.js +++ b/docs/src/app/components/Master.js @@ -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) => { diff --git a/src/RaisedButton/RaisedButton.js b/src/RaisedButton/RaisedButton.js index e4020705ecaa06..942856a39e626c 100644 --- a/src/RaisedButton/RaisedButton.js +++ b/src/RaisedButton/RaisedButton.js @@ -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', }, diff --git a/src/internal/EnhancedButton.js b/src/internal/EnhancedButton.js index 4d242292b24b4b..0b9c14aded6a11 100644 --- a/src/internal/EnhancedButton.js +++ b/src/internal/EnhancedButton.js @@ -164,6 +164,9 @@ class EnhancedButton extends Component { color={focusRippleColor} opacity={focusRippleOpacity} show={isKeyboardFocused} + style={{ + overflow: 'hidden', + }} key="focusRipple" /> ) : undefined; diff --git a/src/internal/FocusRipple.js b/src/internal/FocusRipple.js index 0507164614dc97..f930c427523d3e 100644 --- a/src/internal/FocusRipple.js +++ b/src/internal/FocusRipple.js @@ -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; @@ -115,12 +115,12 @@ class FocusRipple extends Component { const ripple = show ? this.getRippleElement(this.props) : null; return ( - {ripple} - + ); } }