Merge pull request #609 from michaeldfoley/popover-stuck-focus

[popover] Fix stuck focus
reach · Jun 12, 2020 · 8a09b9e · 8a09b9e
2 parents 91eabcb + b656d2b
commit 8a09b9e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/popover/src/index.tsx b/packages/popover/src/index.tsx
@@ -239,7 +239,11 @@ function useSimulateTabNavigationForReactTree<
       elements && triggerRef.current
         ? elements.indexOf(triggerRef.current)
         : -1;
-    return elements && elements[targetIndex + 1];
+    const elementAfterTrigger = elements && elements[targetIndex + 1];
+    return popoverRef.current &&
+      popoverRef.current.contains(elementAfterTrigger || null)
+      ? false
+      : elementAfterTrigger;
   }
 
   function tabbedFromTriggerToPopover() {