Fix autofocus for input and textarea (#6986)

(cherry picked from commit eb705d1)
facebook · Jun 14, 2016 · 07389fd · 07389fd
1 parent 7a4aef0
commit 07389fd
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/src/renderers/dom/shared/ReactDOMComponent.js b/src/renderers/dom/shared/ReactDOMComponent.js
@@ -654,14 +654,25 @@ 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 'button':
       case 'select':
         if (props.autoFocus) {
           transaction.getReactMountReady().enqueue(
@@ -670,6 +681,14 @@ ReactDOMComponent.Mixin = {
           );
         }
         break;
+      case 'button':
+        if (props.autoFocus) {
+          transaction.getReactMountReady().enqueue(
+            AutoFocusUtils.focusDOMComponent,
+            this
+          );
+        }
+        break;
       case 'option':
         transaction.getReactMountReady().enqueue(
           optionPostMount,