From 6fc54b93704ef0dc4fefd9debeb446bc84abd992 Mon Sep 17 00:00:00 2001
From: Lam Hieu <lamhieu.vk@gmail.com>
Date: Thu, 30 May 2019 13:09:49 +0700
Subject: [PATCH] fix(Modal): update condition to call `setFocus` in case open
 modal is default

---
 src/Modal.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Modal.js b/src/Modal.js
index e663a9dc9..525a042c0 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -105,17 +105,18 @@ class Modal extends React.Component {
   }
 
   componentDidMount() {
-    if (this.props.isOpen) {
+    const { isOpen, autoFocus, onEnter } = this.props;
+
+    if (isOpen) {
       this.init();
       this.setState({ isOpen: true })
+      if (autoFocus) {
+        this.setFocus();
+      }
     }
 
-    if (this.props.onEnter) {
-      this.props.onEnter();
-    }
-
-    if (this.state.isOpen && this.props.autoFocus) {
-      this.setFocus();
+    if (onEnter) {
+      onEnter();
     }
 
     this._isMounted = true;