Merge pull request #425 from Refinitiv/fix/overlay-tab

fix(overlay): Tab does not work with slotted elements
Refinitiv · Aug 9, 2022 · a6c2479 · a6c2479
2 parents 6f16e18 + 16f4b60
commit a6c2479
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/elements/src/overlay/managers/focus-manager.ts b/packages/elements/src/overlay/managers/focus-manager.ts
@@ -131,13 +131,13 @@ export class FocusManager {
 
   private isFocusBoundaryDescendant (element: HTMLElement): boolean {
     const focusBoundaryElements = this.focusBoundaryElements;
-    let node = element.parentNode;
+    let node = element.assignedSlot || element.parentNode;
     while (node) {
       if ((node instanceof HTMLElement || node instanceof ShadowRoot) && focusBoundaryElements.includes(node)) {
         return true;
       }
       // parenNode is not defined if the node is inside document fragment. Use host instead
-      node = node.nodeType === Node.DOCUMENT_FRAGMENT_NODE ? (node as ShadowRoot).host : node.parentNode;
+      node = node.nodeType === Node.DOCUMENT_FRAGMENT_NODE ? (node as ShadowRoot).host : ((node as Element).assignedSlot || node.parentNode);
     }
 
     return false;