fix: move the enabled check to unmounting

tailwindlabs · Apr 26, 2023 · fc594eb · fc594eb
1 parent 547d795
commit fc594eb
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/packages/@headlessui-react/src/components/focus-trap/focus-trap.tsx b/packages/@headlessui-react/src/components/focus-trap/focus-trap.tsx
@@ -279,11 +279,10 @@ function useRestoreFocus({ ownerDocument }: { ownerDocument: Document | null },
   // Restore the focus to the previous element when the component is unmounted
   let trulyUnmounted = useRef(false)
   useEffect(() => {
-    if (!enabled) return
-
     trulyUnmounted.current = false
 
     return () => {
+      if (!enabled) return
       trulyUnmounted.current = true
       microTask(() => {
         if (!trulyUnmounted.current) return