@vaadin/a11y-base 25.0.4 → 25.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/a11y-base",
-  "version": "25.0.4",
+  "version": "25.0.5",
   "publishConfig": {
     "access": "public"
   },
@@ -31,14 +31,14 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/component-base": "~25.0.4",
+    "@vaadin/component-base": "~25.0.5",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "~25.0.4",
-    "@vaadin/test-runner-commands": "~25.0.4",
+    "@vaadin/chai-plugins": "~25.0.5",
+    "@vaadin/test-runner-commands": "~25.0.5",
     "@vaadin/testing-helpers": "^2.0.0",
     "sinon": "^21.0.0"
   },
-  "gitHead": "17170982c3efa1d426af4fabb70ea36b70151347"
+  "gitHead": "f9de924c232acc7b113e9f7f48368e8ca8105f81"
 }

package/src/focus-trap-controller.d.ts

@@ -5,6 +5,12 @@
  */
 import type { ReactiveController } from 'lit';
 
+/**
+ * Returns the innermost active focus trap node that contains the given element,
+ * or null if the element is not inside any active focus trap.
+ */
+export declare function getActiveTrappingNode(element: HTMLElement): HTMLElement | null;
+
 /**
  * A controller for trapping focus within a DOM node.
  */

package/src/focus-trap-controller.js

@@ -7,6 +7,23 @@ import { getFocusableElements, isElementFocused, isKeyboardActive } from './focu
 
 const instances = [];
 
+/**
+ * Returns the innermost active focus trap node that contains the given element,
+ * or null if the element is not inside any active focus trap.
+ *
+ * @param {HTMLElement} element
+ * @return {HTMLElement | null}
+ */
+export function getActiveTrappingNode(element) {
+  // Iterate backwards since instances are ordered outer-to-inner (push/pop)
+  for (let i = instances.length - 1; i >= 0; i--) {
+    if (instances[i].__trapNode?.contains(element)) {
+      return instances[i].__trapNode;
+    }
+  }
+  return null;
+}
+
 /**
  * A controller for trapping focus within a DOM node.
  */
@@ -123,6 +140,11 @@ export class FocusTrapController {
     }
 
     if (event.key === 'Tab') {
+      // Skip if another handler already processed this event
+      if (event.defaultPrevented) {
+        return;
+      }
+
       event.preventDefault();
 
       const backward = event.shiftKey;