From f70e71a3d461cdab65626a5a7e1b6f4d03b852b1 Mon Sep 17 00:00:00 2001
From: Ely Lucas <ely@meta-tek.net>
Date: Mon, 28 Oct 2019 10:20:45 -0600
Subject: [PATCH] fix(react): checking isOpen again after async call before
 opening overlay, fixes #19755

---
 .../src/components/createControllerComponent.tsx   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/react/src/components/createControllerComponent.tsx b/packages/react/src/components/createControllerComponent.tsx
index ae6d1518e7..83c0d08537 100644
--- a/packages/react/src/components/createControllerComponent.tsx
+++ b/packages/react/src/components/createControllerComponent.tsx
@@ -54,13 +54,19 @@ export const createControllerComponent = <OptionsType extends object, OverlayTyp
 
     async present(prevProps?: Props) {
       const { isOpen, onDidDismiss, ...cProps } = this.props;
-      const overlay = this.overlay = await controller.create({
-        ...cProps as any
-      });
+      let overlay = this.overlay;
+      if (!overlay) {
+        overlay = this.overlay = await controller.create({
+          ...cProps as any
+        });
+      }
       attachProps(overlay, {
         [dismissEventName]: onDidDismiss
       }, prevProps);
-      await overlay.present();
+      // Check isOpen again since the value could of changed during the async call to controller.create
+      if (this.props.isOpen === true) {
+        await overlay.present();
+      }
     }
 
     render(): null {