only return focus to the trigger if the focus trap is already set

bmcmahen · Aug 1, 2019 · f750c2f · f750c2f
1 parent e017940
commit f750c2f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Hooks/use-focus-trap.ts b/src/Hooks/use-focus-trap.ts
@@ -38,7 +38,11 @@ export function useFocusElement(
       trap.deactivate();
     }
 
-    if (showing) focusElement();
-    else focusTrigger();
+    if (showing) {
+      focusElement();
+      return () => {
+        focusTrigger();
+      };
+    }
   }, [showing]);
 }