Fixing a bug where the focus trap may not have been set before it is …

…unmounted (#184) Co-authored-by: Clint Goodman <clintgoodman@workfront.com>
focus-trap · Nov 17, 2020 · 0836c6d · 0836c6d
1 parent e414308
commit 0836c6d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.changeset/hip-bottles-turn.md b/.changeset/hip-bottles-turn.md
@@ -0,0 +1,5 @@
+---
+'focus-trap-react': patch
+---
+
+Fixing a bug where the focus trap may not have been set before it is unmounted #184
diff --git a/src/focus-trap-react.js b/src/focus-trap-react.js
@@ -118,7 +118,10 @@ class FocusTrap extends React.Component {
 
   componentWillUnmount() {
     // NOTE: we never let the trap return the focus since we do that ourselves
-    this.focusTrap.deactivate({ returnFocus: false });
+    if (this.focusTrap) {
+      this.focusTrap.deactivate({ returnFocus: false });
+    }
+
     if (this.returnFocusOnDeactivate) {
       this.returnFocus();
     }