@vaadin/a11y-base 25.3.0 → 25.3.2

package/index.d.ts

@@ -5,6 +5,7 @@ export { DisabledMixin } from './src/disabled-mixin.js';
 export { FieldAriaController } from './src/field-aria-controller.js';
 export { FocusMixin } from './src/focus-mixin.js';
 export {
+  getFocusableElements,
   getTabbableElements,
   isElementFocusable,
   isElementFocused,

package/index.js

@@ -7,6 +7,7 @@ export { FocusMixin } from './src/focus-mixin.js';
 export { FocusTrapController } from './src/focus-trap-controller.js';
 export { FocusRestorationController } from './src/focus-restoration-controller.js';
 export {
+  getFocusableElements,
   getTabbableElements,
   isElementFocusable,
   isElementFocused,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/a11y-base",
-  "version": "25.3.0",
+  "version": "25.3.2",
   "publishConfig": {
     "access": "public"
   },
@@ -32,15 +32,15 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/component-base": "~25.3.0",
+    "@vaadin/component-base": "~25.3.2",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "~25.3.0",
-    "@vaadin/test-runner-commands": "~25.3.0",
+    "@vaadin/chai-plugins": "~25.3.2",
+    "@vaadin/test-runner-commands": "~25.3.2",
     "@vaadin/testing-helpers": "^2.0.0",
     "sinon": "^22.0.0"
   },
   "customElements": "custom-elements.json",
-  "gitHead": "4133747243c03bf544f6e82cc2ec9f295aaccd65"
+  "gitHead": "3f75254a3f77da3977cb79a77f549f37b8a5d54e"
 }

package/src/delegate-focus-mixin.js

@@ -5,6 +5,7 @@
  */
 import { dedupeMixin } from '@open-wc/dedupe-mixin';
 import { FocusMixin } from './focus-mixin.js';
+import { isElementFocused } from './focus-utils.js';
 import { TabindexMixin } from './tabindex-mixin.js';
 
 /**
@@ -82,6 +83,11 @@ const DelegateFocusMixinImplementation = (superclass) => {
         // Only forward the native option, `focusVisible` is handled below.
         this.focusElement.focus({ preventScroll: !!options?.preventScroll });
 
+        // Focus did not move, e.g. while hidden in a closed dialog
+        if (!isElementFocused(this.focusElement)) {
+          return;
+        }
+
         // Set focus-ring attribute on programmatic focus by default
         // unless explicitly disabled by `{ focusVisible: false }`.
         if (options?.focusVisible !== false) {

package/src/focus-utils.d.ts

@@ -56,3 +56,13 @@ export declare function isElementFocused(element: HTMLElement): boolean;
  * The method traverses nodes in shadow DOM trees too if any.
  */
 export declare function getTabbableElements(element: HTMLElement): HTMLElement[];
+
+/**
+ * Returns a tab-ordered array of focusable elements for a root element.
+ * The resulting array will include the root element if it is focusable.
+ *
+ * The method traverses nodes in shadow DOM trees too if any.
+ *
+ * @deprecated This function is deprecated and will be removed in Vaadin 26. Use `getTabbableElements` instead.
+ */
+export declare function getFocusableElements(element: HTMLElement): HTMLElement[];

package/src/focus-utils.js

@@ -277,3 +277,17 @@ export function getTabbableElements(element) {
   }
   return focusableElements;
 }
+
+/**
+ * Returns a tab-ordered array of focusable elements for a root element.
+ * The resulting array will include the root element if it is focusable.
+ *
+ * The method traverses nodes in shadow DOM trees too if any.
+ *
+ * @deprecated This function is deprecated and will be removed in Vaadin 26. Use `getTabbableElements` instead.
+ * @param {HTMLElement} element
+ * @return {HTMLElement[]}
+ */
+export function getFocusableElements(element) {
+  return getTabbableElements(element);
+}