fix(overlay): do not focus the trigger when closing an overlay, unles…

…s expected
adobe · Dec 9, 2020 · bed817f · bed817f
1 parent 35ecb2a
commit bed817f
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/packages/overlay/src/overlay-stack.ts b/packages/overlay/src/overlay-stack.ts
@@ -328,7 +328,23 @@ export class OverlayStack {
                         overlay.interaction === 'inline') &&
                         !overlay.tabbingAway)
                 ) {
-                    overlay.trigger.focus();
+                    const overlayRoot = overlay.overlayContent.getRootNode() as ShadowRoot;
+                    const overlayContentActiveElement =
+                        overlayRoot.activeElement;
+                    const triggerRoot = overlay.trigger.getRootNode() as ShadowRoot;
+                    const triggerActiveElement = triggerRoot.activeElement;
+                    if (
+                        overlay.overlayContent.contains(
+                            overlayContentActiveElement
+                        ) ||
+                        overlay.trigger
+                            .getRootNode()
+                            .contains(triggerActiveElement) ||
+                        (triggerRoot.host &&
+                            triggerRoot.host.isSameNode(triggerActiveElement))
+                    ) {
+                        overlay.trigger.focus();
+                    }
                 }
                 overlay.tabbingAway = false;
             }