diff --git a/src/renderers/dom/shared/ReactDOMComponent.js b/src/renderers/dom/shared/ReactDOMComponent.js index 344d368963..22ba2c035b 100644 --- a/src/renderers/dom/shared/ReactDOMComponent.js +++ b/src/renderers/dom/shared/ReactDOMComponent.js @@ -654,15 +654,34 @@ ReactDOMComponent.Mixin = { inputPostMount, this ); + if (props.autoFocus) { + transaction.getReactMountReady().enqueue( + AutoFocusUtils.focusDOMComponent, + this + ); + } break; case 'textarea': transaction.getReactMountReady().enqueue( textareaPostMount, this ); + if (props.autoFocus) { + transaction.getReactMountReady().enqueue( + AutoFocusUtils.focusDOMComponent, + this + ); + } + break; + case 'select': + if (props.autoFocus) { + transaction.getReactMountReady().enqueue( + AutoFocusUtils.focusDOMComponent, + this + ); + } break; case 'button': - case 'select': if (props.autoFocus) { transaction.getReactMountReady().enqueue( AutoFocusUtils.focusDOMComponent,