@y14e/roving-tabindex 1.3.2 → 2.0.1

package/README.md

@@ -44,7 +44,6 @@ interface RovingTabIndexOptions {
   direction?: 'horizontal' | 'vertical' | undefined; // default: both (undefined)
   navigationOnly?: boolean;                          // default: false
   selector?: string | undefined;
-  skipVisibilityCheck?: boolean;                     // default: false
   typeahead?: boolean;                               // default: false
   wrap?: boolean;                                    // default: false
 }
@@ -54,10 +53,6 @@ interface RovingTabIndexOptions {
 
 If `true`, enables keyboard navigation without modifying `tabindex`. Useful for widgets like accordions where all items should remain tabbable while still supporting arrow key navigation.
 
-### `skipVisibilityCheck`
-
-If `true`, skips `checkVisibility()` when determining focusability. Useful for initializing.
-
 ### `typeahead`
 
 If `true`, enables character-based focus navigation. Typing a character moves focus to the next matching element.

package/dist/index.cjs

@@ -61,6 +61,7 @@ function getFocusables(container = document.body, options = {}) {
     composed = false,
     filter,
     include,
+    skipNegativeTabIndexCheck = false,
     skipVisibilityCheck = false
   } = options;
   if (typeof composed !== "boolean") {
@@ -79,6 +80,10 @@ function getFocusables(container = document.body, options = {}) {
     );
     include = void 0;
   }
+  if (typeof skipNegativeTabIndexCheck !== "boolean") {
+    console.warn("Invalid skipNegativeTabIndexCheck option. Fallback: false.");
+    skipNegativeTabIndexCheck = false;
+  }
   if (typeof skipVisibilityCheck !== "boolean") {
     console.warn("Invalid skipVisibilityCheck option. Fallback: false.");
     skipVisibilityCheck = false;
@@ -87,7 +92,10 @@ function getFocusables(container = document.body, options = {}) {
   if (composed || include) {
     let traverse2 = function(node) {
       if (node instanceof Element) {
-        if (isFocusable(node, { skipVisibilityCheck }) || include?.(node)) {
+        if (isFocusable(node, {
+          skipNegativeTabIndexCheck,
+          skipVisibilityCheck
+        }) || include?.(node)) {
           elements[elements.length] = node;
         }
       }
@@ -108,7 +116,10 @@ function getFocusables(container = document.body, options = {}) {
       if (!(candidate instanceof Element)) {
         continue;
       }
-      if (isFocusable(candidate, { skipVisibilityCheck })) {
+      if (isFocusable(candidate, {
+        skipNegativeTabIndexCheck,
+        skipVisibilityCheck
+      })) {
         elements[elements.length] = candidate;
       }
     }
@@ -121,7 +132,11 @@ function isFocusable(element, options = {}) {
     console.warn("Invalid element");
     return false;
   }
-  let { skipVisibilityCheck = false } = options;
+  let { skipNegativeTabIndexCheck = false, skipVisibilityCheck = false } = options;
+  if (typeof skipNegativeTabIndexCheck !== "boolean") {
+    console.warn("Invalid skipNegativeTabIndexCheck option. Fallback: false.");
+    skipNegativeTabIndexCheck = false;
+  }
   if (typeof skipVisibilityCheck !== "boolean") {
     console.warn("Invalid skipVisibilityCheck option. Fallback: false.");
     skipVisibilityCheck = false;
@@ -129,10 +144,12 @@ function isFocusable(element, options = {}) {
   if (element.hasAttribute("hidden") || isInert(element)) {
     return false;
   }
-  if (getTabIndex(element) < 0) {
+  if (!skipNegativeTabIndexCheck && getTabIndex(element) < 0) {
     return false;
   }
-  if (!element.matches(FOCUSABLE_SELECTOR)) {
+  if (!element.matches(
+    skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR.replace(/(,\s*)?\[tabindex="-1"\]/g, "") : FOCUSABLE_SELECTOR
+  )) {
     return false;
   }
   if (isDisabledDeep(element)) {
@@ -284,7 +301,6 @@ function createRovingTabIndex(container, options = {}) {
     direction,
     navigationOnly = false,
     selector,
-    skipVisibilityCheck = false,
     typeahead = false,
     wrap = false
   } = options;
@@ -302,10 +318,6 @@ function createRovingTabIndex(container, options = {}) {
     );
     selector = void 0;
   }
-  if (typeof skipVisibilityCheck !== "boolean") {
-    console.warn("Invalid skipVisibilityCheck option. Fallback: false.");
-    skipVisibilityCheck = false;
-  }
   if (typeof typeahead !== "boolean") {
     console.warn("Invalid typeahead option. Fallback: false.");
     typeahead = false;
@@ -318,7 +330,6 @@ function createRovingTabIndex(container, options = {}) {
     direction,
     navigationOnly,
     selector,
-    skipVisibilityCheck,
     typeahead,
     wrap
   });
@@ -427,14 +438,7 @@ var RovingTabIndex = class {
     focusElement(focusable);
   };
   #update(active) {
-    const current = /* @__PURE__ */ new Set([
-      ...this.#getFocusables(),
-      ...getFocusables(this.#container, {
-        composed: true,
-        filter: this.#selectorFilter,
-        skipVisibilityCheck: !!this.#options.skipVisibilityCheck
-      })
-    ]);
+    const current = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
       if (current.has(focusable)) {
         continue;
@@ -498,8 +502,7 @@ var RovingTabIndex = class {
     return getFocusables(this.#container, {
       composed: true,
       filter: this.#selectorFilter,
-      include: (element) => this.#focusables.has(element),
-      skipVisibilityCheck: !!this.#options.skipVisibilityCheck
+      skipNegativeTabIndexCheck: !this.#options.navigationOnly
     });
   }
 };
@@ -518,7 +521,7 @@ function getActiveElement() {
  * Lightweight roving tabindex utility with fully focus management.
  * Designed for accessible menus, tabs, toolbars, and composite widgets.
  *
- * @version 1.3.2
+ * @version 2.0.1
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -543,7 +546,7 @@ power-focusable/dist/index.js:
    * High-precision focus management utility with full composed tree support.
    * Handles complex focus rules including tabindex ordering, radio groups, inert.
    *
-   * @version 4.2.1
+   * @version 4.3.0
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.d.cts

@@ -3,7 +3,7 @@
  * Lightweight roving tabindex utility with fully focus management.
  * Designed for accessible menus, tabs, toolbars, and composite widgets.
  *
- * @version 1.3.2
+ * @version 2.0.1
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -13,7 +13,6 @@ interface RovingTabIndexOptions {
     readonly direction?: 'horizontal' | 'vertical' | undefined;
     readonly navigationOnly?: boolean;
     readonly selector?: string | undefined;
-    readonly skipVisibilityCheck?: boolean;
     readonly typeahead?: boolean;
     readonly wrap?: boolean;
 }

package/dist/index.d.ts

@@ -3,7 +3,7 @@
  * Lightweight roving tabindex utility with fully focus management.
  * Designed for accessible menus, tabs, toolbars, and composite widgets.
  *
- * @version 1.3.2
+ * @version 2.0.1
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -13,7 +13,6 @@ interface RovingTabIndexOptions {
     readonly direction?: 'horizontal' | 'vertical' | undefined;
     readonly navigationOnly?: boolean;
     readonly selector?: string | undefined;
-    readonly skipVisibilityCheck?: boolean;
     readonly typeahead?: boolean;
     readonly wrap?: boolean;
 }

package/dist/index.js

@@ -59,6 +59,7 @@ function getFocusables(container = document.body, options = {}) {
     composed = false,
     filter,
     include,
+    skipNegativeTabIndexCheck = false,
     skipVisibilityCheck = false
   } = options;
   if (typeof composed !== "boolean") {
@@ -77,6 +78,10 @@ function getFocusables(container = document.body, options = {}) {
     );
     include = void 0;
   }
+  if (typeof skipNegativeTabIndexCheck !== "boolean") {
+    console.warn("Invalid skipNegativeTabIndexCheck option. Fallback: false.");
+    skipNegativeTabIndexCheck = false;
+  }
   if (typeof skipVisibilityCheck !== "boolean") {
     console.warn("Invalid skipVisibilityCheck option. Fallback: false.");
     skipVisibilityCheck = false;
@@ -85,7 +90,10 @@ function getFocusables(container = document.body, options = {}) {
   if (composed || include) {
     let traverse2 = function(node) {
       if (node instanceof Element) {
-        if (isFocusable(node, { skipVisibilityCheck }) || include?.(node)) {
+        if (isFocusable(node, {
+          skipNegativeTabIndexCheck,
+          skipVisibilityCheck
+        }) || include?.(node)) {
           elements[elements.length] = node;
         }
       }
@@ -106,7 +114,10 @@ function getFocusables(container = document.body, options = {}) {
       if (!(candidate instanceof Element)) {
         continue;
       }
-      if (isFocusable(candidate, { skipVisibilityCheck })) {
+      if (isFocusable(candidate, {
+        skipNegativeTabIndexCheck,
+        skipVisibilityCheck
+      })) {
         elements[elements.length] = candidate;
       }
     }
@@ -119,7 +130,11 @@ function isFocusable(element, options = {}) {
     console.warn("Invalid element");
     return false;
   }
-  let { skipVisibilityCheck = false } = options;
+  let { skipNegativeTabIndexCheck = false, skipVisibilityCheck = false } = options;
+  if (typeof skipNegativeTabIndexCheck !== "boolean") {
+    console.warn("Invalid skipNegativeTabIndexCheck option. Fallback: false.");
+    skipNegativeTabIndexCheck = false;
+  }
   if (typeof skipVisibilityCheck !== "boolean") {
     console.warn("Invalid skipVisibilityCheck option. Fallback: false.");
     skipVisibilityCheck = false;
@@ -127,10 +142,12 @@ function isFocusable(element, options = {}) {
   if (element.hasAttribute("hidden") || isInert(element)) {
     return false;
   }
-  if (getTabIndex(element) < 0) {
+  if (!skipNegativeTabIndexCheck && getTabIndex(element) < 0) {
     return false;
   }
-  if (!element.matches(FOCUSABLE_SELECTOR)) {
+  if (!element.matches(
+    skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR.replace(/(,\s*)?\[tabindex="-1"\]/g, "") : FOCUSABLE_SELECTOR
+  )) {
     return false;
   }
   if (isDisabledDeep(element)) {
@@ -282,7 +299,6 @@ function createRovingTabIndex(container, options = {}) {
     direction,
     navigationOnly = false,
     selector,
-    skipVisibilityCheck = false,
     typeahead = false,
     wrap = false
   } = options;
@@ -300,10 +316,6 @@ function createRovingTabIndex(container, options = {}) {
     );
     selector = void 0;
   }
-  if (typeof skipVisibilityCheck !== "boolean") {
-    console.warn("Invalid skipVisibilityCheck option. Fallback: false.");
-    skipVisibilityCheck = false;
-  }
   if (typeof typeahead !== "boolean") {
     console.warn("Invalid typeahead option. Fallback: false.");
     typeahead = false;
@@ -316,7 +328,6 @@ function createRovingTabIndex(container, options = {}) {
     direction,
     navigationOnly,
     selector,
-    skipVisibilityCheck,
     typeahead,
     wrap
   });
@@ -425,14 +436,7 @@ var RovingTabIndex = class {
     focusElement(focusable);
   };
   #update(active) {
-    const current = /* @__PURE__ */ new Set([
-      ...this.#getFocusables(),
-      ...getFocusables(this.#container, {
-        composed: true,
-        filter: this.#selectorFilter,
-        skipVisibilityCheck: !!this.#options.skipVisibilityCheck
-      })
-    ]);
+    const current = new Set(this.#getFocusables());
     for (const focusable of this.#focusables) {
       if (current.has(focusable)) {
         continue;
@@ -496,8 +500,7 @@ var RovingTabIndex = class {
     return getFocusables(this.#container, {
       composed: true,
       filter: this.#selectorFilter,
-      include: (element) => this.#focusables.has(element),
-      skipVisibilityCheck: !!this.#options.skipVisibilityCheck
+      skipNegativeTabIndexCheck: !this.#options.navigationOnly
     });
   }
 };
@@ -516,7 +519,7 @@ function getActiveElement() {
  * Lightweight roving tabindex utility with fully focus management.
  * Designed for accessible menus, tabs, toolbars, and composite widgets.
  *
- * @version 1.3.2
+ * @version 2.0.1
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -541,7 +544,7 @@ power-focusable/dist/index.js:
    * High-precision focus management utility with full composed tree support.
    * Handles complex focus rules including tabindex ordering, radio groups, inert.
    *
-   * @version 4.2.1
+   * @version 4.3.0
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/roving-tabindex",
-  "version": "1.3.2",
+  "version": "2.0.1",
   "description": "Lightweight roving tabindex utility with fully focus management",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -50,7 +50,7 @@
   "devDependencies": {
     "@y14e/attributes-utils": "^1.0.5",
     "bun-types": "latest",
-    "power-focusable": "^4.2.1",
+    "power-focusable": "^4.3.0",
     "tsup": "^8.0.0",
     "typescript": "^5.6.0"
   },