Merge pull request #4122 from ryantemple/enhanced-button-focus

[EnhancedButton] Fix not setting focus when keyboardFocused prop set
mui · May 13, 2016 · 416a42c · 416a42c
2 parents 9d20ad3 + 88ffe5d
commit 416a42c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/internal/EnhancedButton.js b/src/internal/EnhancedButton.js
@@ -106,6 +106,10 @@ class EnhancedButton extends Component {
   componentDidMount() {
     injectStyle();
     listenForTabPresses();
+    if (this.state.isKeyboardFocused) {
+      this.refs.enhancedButton.focus();
+      this.props.onKeyboardFocus(null, true);
+    }
   }
 
   componentWillReceiveProps(nextProps) {
@@ -323,6 +327,7 @@ class EnhancedButton extends Component {
     const buttonProps = {
       ...other,
       style: prepareStyles(mergedStyles),
+      ref: 'enhancedButton',
       disabled: disabled,
       onBlur: this.handleBlur,
       onClick: this.handleClick,