From 7356c401742ce2b3241d6ab05fce0fa65d2f1f8a Mon Sep 17 00:00:00 2001
From: Aubrey Holland <aubreyholland@gmail.com>
Date: Thu, 7 Nov 2019 15:20:36 -0500
Subject: [PATCH] fix(react): check for component unmount, fixes #19859

---
 .../react/src/components/createControllerComponent.tsx     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/react/src/components/createControllerComponent.tsx b/packages/react/src/components/createControllerComponent.tsx
index 8bda7a4078a..62def561c7a 100644
--- a/packages/react/src/components/createControllerComponent.tsx
+++ b/packages/react/src/components/createControllerComponent.tsx
@@ -23,6 +23,7 @@ export const createControllerComponent = <OptionsType extends object, OverlayTyp
 
   return class extends React.Component<Props> {
     overlay?: OverlayType;
+    isUnmounted = false;
 
     constructor(props: Props) {
       super(props);
@@ -40,6 +41,7 @@ export const createControllerComponent = <OptionsType extends object, OverlayTyp
     }
 
     componentWillUnmount() {
+      this.isUnmounted = true;
       if (this.overlay) { this.overlay.dismiss(); }
     }
 
@@ -60,8 +62,9 @@ export const createControllerComponent = <OptionsType extends object, OverlayTyp
       attachProps(this.overlay, {
         [dismissEventName]: onDidDismiss
       }, prevProps);
-      // Check isOpen again since the value could of changed during the async call to controller.create
-      if (this.props.isOpen === true) {
+      // Check isOpen again since the value could have changed during the async call to controller.create
+      // It's also possible for the component to have become unmounted.
+      if (this.props.isOpen === true && this.isUnmounted === false) {
         await this.overlay.present();
       }
     }