From b656d2baed0d54fcd26cbcabd34d457c8996975b Mon Sep 17 00:00:00 2001
From: Michael Foley <michael.foley@unqork.com>
Date: Sat, 6 Jun 2020 17:06:03 -0400
Subject: [PATCH] popover: fix stuck tab (#545)

---
 packages/popover/src/index.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/popover/src/index.tsx b/packages/popover/src/index.tsx
index 3bc4f5fe6..8c2e9cfbb 100644
--- 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() {