popover: fix stuck tab (#545)

reach · Jun 6, 2020 · b656d2b · b656d2b
1 parent 115eb68
commit b656d2b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/popover/src/index.tsx b/packages/popover/src/index.tsx
@@ -241,7 +241,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() {