From 69ed76d120fcdd02e7dbdeacc10d57310a9da307 Mon Sep 17 00:00:00 2001 From: Toru Kobayashi Date: Fri, 1 Dec 2017 11:31:24 +0900 Subject: [PATCH] Fix autoFocus for hydration content when it is mismatched --- packages/react-dom/src/client/ReactDOM.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js index f898bb673a..8d8b071634 100644 --- a/packages/react-dom/src/client/ReactDOM.js +++ b/packages/react-dom/src/client/ReactDOM.js @@ -700,11 +700,13 @@ const DOMRenderer = ReactFiberReconciler({ newProps: Props, internalInstanceHandle: Object, ): void { - ((domElement: any): - | HTMLButtonElement - | HTMLInputElement - | HTMLSelectElement - | HTMLTextAreaElement).focus(); + if (shouldAutoFocusHostComponent(type, newProps)) { + ((domElement: any): + | HTMLButtonElement + | HTMLInputElement + | HTMLSelectElement + | HTMLTextAreaElement).focus(); + } }, commitUpdate(