power-focusable 4.3.29 → 4.3.31

package/README.md

@@ -24,11 +24,11 @@ import {
 } from 'power-focusable';
 
 // CDNs
-import { ... } 'https://esm.sh/power-focusable@4.3.29';
+import { ... } 'https://esm.sh/power-focusable@4.3.31';
 // or
-import { ... } 'https://cdn.jsdelivr.net/npm/power-focusable@4.3.29/+esm';
+import { ... } 'https://cdn.jsdelivr.net/npm/power-focusable@4.3.31/+esm';
 // or
-import { ... } 'https://esm.unpkg.com/power-focusable@4.3.29';
+import { ... } 'https://esm.unpkg.com/power-focusable@4.3.31';
 ```
 
 ## 🪄 Options

package/dist/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 // src/index.ts
-var FOCUSABLE_SELECTOR = `:is(a[href], area[href], button, embed, iframe, input:not([type="hidden" i]), object, select, details > summary:first-of-type, textarea, [contenteditable]:not([contenteditable="false" i]), [controls], [tabindex]):not(:disabled, [hidden], [inert], [tabindex="-1"])`;
+var FOCUSABLE_SELECTOR = ':is(a[href], area[href], button, embed, iframe, input:not([type="hidden" i]), object, select, details > summary:first-of-type, textarea, [contenteditable]:not([contenteditable="false" i]), [controls], [tabindex]):not(:disabled, [hidden], [inert], [tabindex="-1"])';
 var FOCUSABLE_SELECTOR_WITH_NEGATIVE_TABINDEX = FOCUSABLE_SELECTOR.replace(
   /(,\s*)?\[tabindex="-1"\]/g,
   ""
@@ -78,31 +78,21 @@ function getFocusables(container = document.body, options = {}) {
         skipNegativeTabIndexCheck,
         skipVisibilityCheck
       }) || include?.(node)) {
-        candidates[candidates.length] = node;
-      }
-      const children2 = composed ? getComposedChildren(node) : getChildren(node);
-      for (let i = 0, l = children2.length; i < l; i++) {
-        const child = children2[i];
-        child && traverse2(child);
+        candidates.push(node);
       }
+      (composed ? getComposedChildren(node) : [...node.children]).map(traverse2);
     };
-    const children = composed ? getComposedChildren(container) : getChildren(container);
-    for (let i = 0, l = children.length; i < l; i++) {
-      const child = children[i];
-      child && traverse2(child);
-    }
+    (composed ? getComposedChildren(container) : [...container.children]).map(
+      traverse2
+    );
   } else {
-    const matches = container.querySelectorAll(
+    for (const m of container.querySelectorAll(
       skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR_WITH_NEGATIVE_TABINDEX : FOCUSABLE_SELECTOR
-    );
-    for (let i = 0, l = matches.length; i < l; i++) {
-      const matched = matches[i];
-      if (matched && isFocusable(matched, {
+    )) {
+      m && isFocusable(m, {
         skipNegativeTabIndexCheck,
         skipVisibilityCheck
-      })) {
-        candidates[candidates.length] = matched;
-      }
+      }) && candidates.push(m);
     }
   }
   return normalizeRadioGroup(
@@ -127,20 +117,13 @@ function inertOutside(element) {
   function traverse(node, fn) {
     const parent = getComposedParent(node);
     if (parent) {
-      for (const sibling of getComposedSiblings(node)) {
-        fn(sibling);
-      }
+      getComposedSiblings(node).map(fn);
       traverse(parent, fn);
     }
   }
   const elements = [];
   traverse(element, (node) => node && applyInert(node) && elements.push(node));
-  return () => {
-    for (let i = 0, l = elements.length; i < l; i++) {
-      const element2 = elements[i];
-      element2 && restoreInert(element2);
-    }
-  };
+  return () => elements.map(restoreInert);
 }
 function isFocusable(element, options = {}) {
   if (!(element instanceof Element)) {
@@ -245,74 +228,60 @@ function isDisabledDeep(element) {
 }
 function normalizeRadioGroup(elements) {
   let map = null;
-  for (let i = 0, l = elements.length; i < l; i++) {
-    const element = elements[i];
-    if (!(element instanceof HTMLInputElement)) {
+  for (const e of elements) {
+    if (!(e instanceof HTMLInputElement)) {
       continue;
     }
-    if (!isUngroupedRadio(element)) {
+    if (!isUngroupedRadio(e)) {
       continue;
     }
     if (!map) {
       map = /* @__PURE__ */ new Map();
     }
-    const root = element.getRootNode();
-    let value = map.get(root);
-    if (!value) {
-      value = /* @__PURE__ */ new Map();
-      map.set(root, value);
+    const root = e.getRootNode();
+    let groups = map.get(root);
+    if (!groups) {
+      groups = /* @__PURE__ */ new Map();
+      map.set(root, groups);
     }
-    let v = value.get(element.form);
-    if (!v) {
-      v = /* @__PURE__ */ new Map();
-      value.set(element.form, v);
+    let group = groups.get(e.form);
+    if (!group) {
+      group = /* @__PURE__ */ new Map();
+      groups.set(e.form, group);
     }
-    let vv = v.get(element.name);
-    if (!vv) {
-      vv = [];
-      v.set(element.name, vv);
+    let radios = group.get(e.name);
+    if (!radios) {
+      radios = [];
+      group.set(e.name, radios);
     }
-    vv[vv.length] = element;
+    radios.push(e);
   }
   if (!map) {
     return elements;
   }
   const placeholder = /* @__PURE__ */ new Set();
-  for (const value of map.values()) {
-    for (const v of value.values()) {
-      for (const vv of v.values()) {
-        const radio = vv.find((element) => element.checked) ?? vv[0];
+  for (const v of map.values()) {
+    for (const w of v.values()) {
+      for (const x of w.values()) {
+        const radio = x.find((r) => r.checked) ?? x[0];
         radio && placeholder.add(radio);
       }
     }
   }
-  return elements.filter((element) => {
-    if (!(element instanceof HTMLInputElement)) {
+  return elements.filter((e) => {
+    if (!(e instanceof HTMLInputElement)) {
       return true;
     }
-    return !isUngroupedRadio(element) || placeholder.has(element);
+    return !isUngroupedRadio(e) || placeholder.has(e);
   });
 }
 function sortByTabIndex(elements) {
   const ordered = [];
   const natural = [];
-  for (let i = 0, l = elements.length; i < l; i++) {
-    const element = elements[i];
-    if (element) {
-      const target = getTabIndex(element) > 0 ? ordered : natural;
-      target[target.length] = element;
-    }
-  }
-  ordered.sort((a, b) => getTabIndex(a) - getTabIndex(b));
-  let count = 0;
-  const sorted = new Array(ordered.length + natural.length);
-  for (let i = 0, l = ordered.length; i < l; i++) {
-    sorted[count++] = ordered[i];
+  for (const e of elements) {
+    (getTabIndex(e) > 0 ? ordered : natural).push(e);
   }
-  for (let i = 0, l = natural.length; i < l; i++) {
-    sorted[count++] = natural[i];
-  }
-  return sorted;
+  return ordered.sort((a, b) => getTabIndex(a) - getTabIndex(b)).concat(natural);
 }
 function containsComposed(container, element) {
   let current = element;
@@ -327,7 +296,7 @@ function containsComposed(container, element) {
 }
 function getComposedChildren(node) {
   if (node instanceof ShadowRoot) {
-    return getChildren(node);
+    return [...node.children];
   }
   if (!(node instanceof Element)) {
     return [];
@@ -339,9 +308,9 @@ function getComposedChildren(node) {
     }
   }
   if (node instanceof HTMLElement && node.shadowRoot?.mode === "open") {
-    return getChildren(node.shadowRoot);
+    return [...node.shadowRoot.children];
   }
-  return getChildren(node);
+  return [...node.children];
 }
 function getComposedParent(node) {
   if (node instanceof Element && node.assignedSlot) {
@@ -356,13 +325,9 @@ function getComposedSiblings(node) {
   if (!parent) {
     return [];
   }
-  const siblings = parent instanceof HTMLSlotElement ? parent.assignedElements({ flatten: true }) : getComposedChildren(parent);
   const filtered = [];
-  for (let i = 0, l = siblings.length; i < l; i++) {
-    const sibling = siblings[i];
-    if (sibling && sibling !== node) {
-      filtered[filtered.length] = sibling;
-    }
+  for (const s of (parent instanceof HTMLSlotElement ? parent.assignedElements({ flatten: true }) : getComposedChildren(parent)).filter((s2) => s2 !== node)) {
+    filtered.push(s);
   }
   return filtered;
 }
@@ -399,13 +364,6 @@ function getActiveElement() {
   }
   return current;
 }
-function getChildren(node) {
-  const elements = [];
-  for (let child = node.firstElementChild; child; child = child.nextElementSibling) {
-    elements[elements.length] = child;
-  }
-  return elements;
-}
 function getTabIndex(element) {
   return "tabIndex" in element ? Number(element.tabIndex) : 0;
 }
@@ -482,7 +440,7 @@ function resolveOptions(options) {
  * High-precision focus management utility with full composed tree support.
  * Handles complex focus rules including tabindex ordering, radio groups, inert.
  *
- * @version 4.3.29
+ * @version 4.3.31
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.d.cts

@@ -3,7 +3,7 @@
  * High-precision focus management utility with full composed tree support.
  * Handles complex focus rules including tabindex ordering, radio groups, inert.
  *
- * @version 4.3.29
+ * @version 4.3.31
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.d.ts

@@ -3,7 +3,7 @@
  * High-precision focus management utility with full composed tree support.
  * Handles complex focus rules including tabindex ordering, radio groups, inert.
  *
- * @version 4.3.29
+ * @version 4.3.31
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/index.ts
-var FOCUSABLE_SELECTOR = `:is(a[href], area[href], button, embed, iframe, input:not([type="hidden" i]), object, select, details > summary:first-of-type, textarea, [contenteditable]:not([contenteditable="false" i]), [controls], [tabindex]):not(:disabled, [hidden], [inert], [tabindex="-1"])`;
+var FOCUSABLE_SELECTOR = ':is(a[href], area[href], button, embed, iframe, input:not([type="hidden" i]), object, select, details > summary:first-of-type, textarea, [contenteditable]:not([contenteditable="false" i]), [controls], [tabindex]):not(:disabled, [hidden], [inert], [tabindex="-1"])';
 var FOCUSABLE_SELECTOR_WITH_NEGATIVE_TABINDEX = FOCUSABLE_SELECTOR.replace(
   /(,\s*)?\[tabindex="-1"\]/g,
   ""
@@ -76,31 +76,21 @@ function getFocusables(container = document.body, options = {}) {
         skipNegativeTabIndexCheck,
         skipVisibilityCheck
       }) || include?.(node)) {
-        candidates[candidates.length] = node;
-      }
-      const children2 = composed ? getComposedChildren(node) : getChildren(node);
-      for (let i = 0, l = children2.length; i < l; i++) {
-        const child = children2[i];
-        child && traverse2(child);
+        candidates.push(node);
       }
+      (composed ? getComposedChildren(node) : [...node.children]).map(traverse2);
     };
-    const children = composed ? getComposedChildren(container) : getChildren(container);
-    for (let i = 0, l = children.length; i < l; i++) {
-      const child = children[i];
-      child && traverse2(child);
-    }
+    (composed ? getComposedChildren(container) : [...container.children]).map(
+      traverse2
+    );
   } else {
-    const matches = container.querySelectorAll(
+    for (const m of container.querySelectorAll(
       skipNegativeTabIndexCheck ? FOCUSABLE_SELECTOR_WITH_NEGATIVE_TABINDEX : FOCUSABLE_SELECTOR
-    );
-    for (let i = 0, l = matches.length; i < l; i++) {
-      const matched = matches[i];
-      if (matched && isFocusable(matched, {
+    )) {
+      m && isFocusable(m, {
         skipNegativeTabIndexCheck,
         skipVisibilityCheck
-      })) {
-        candidates[candidates.length] = matched;
-      }
+      }) && candidates.push(m);
     }
   }
   return normalizeRadioGroup(
@@ -125,20 +115,13 @@ function inertOutside(element) {
   function traverse(node, fn) {
     const parent = getComposedParent(node);
     if (parent) {
-      for (const sibling of getComposedSiblings(node)) {
-        fn(sibling);
-      }
+      getComposedSiblings(node).map(fn);
       traverse(parent, fn);
     }
   }
   const elements = [];
   traverse(element, (node) => node && applyInert(node) && elements.push(node));
-  return () => {
-    for (let i = 0, l = elements.length; i < l; i++) {
-      const element2 = elements[i];
-      element2 && restoreInert(element2);
-    }
-  };
+  return () => elements.map(restoreInert);
 }
 function isFocusable(element, options = {}) {
   if (!(element instanceof Element)) {
@@ -243,74 +226,60 @@ function isDisabledDeep(element) {
 }
 function normalizeRadioGroup(elements) {
   let map = null;
-  for (let i = 0, l = elements.length; i < l; i++) {
-    const element = elements[i];
-    if (!(element instanceof HTMLInputElement)) {
+  for (const e of elements) {
+    if (!(e instanceof HTMLInputElement)) {
       continue;
     }
-    if (!isUngroupedRadio(element)) {
+    if (!isUngroupedRadio(e)) {
       continue;
     }
     if (!map) {
       map = /* @__PURE__ */ new Map();
     }
-    const root = element.getRootNode();
-    let value = map.get(root);
-    if (!value) {
-      value = /* @__PURE__ */ new Map();
-      map.set(root, value);
+    const root = e.getRootNode();
+    let groups = map.get(root);
+    if (!groups) {
+      groups = /* @__PURE__ */ new Map();
+      map.set(root, groups);
     }
-    let v = value.get(element.form);
-    if (!v) {
-      v = /* @__PURE__ */ new Map();
-      value.set(element.form, v);
+    let group = groups.get(e.form);
+    if (!group) {
+      group = /* @__PURE__ */ new Map();
+      groups.set(e.form, group);
     }
-    let vv = v.get(element.name);
-    if (!vv) {
-      vv = [];
-      v.set(element.name, vv);
+    let radios = group.get(e.name);
+    if (!radios) {
+      radios = [];
+      group.set(e.name, radios);
     }
-    vv[vv.length] = element;
+    radios.push(e);
   }
   if (!map) {
     return elements;
   }
   const placeholder = /* @__PURE__ */ new Set();
-  for (const value of map.values()) {
-    for (const v of value.values()) {
-      for (const vv of v.values()) {
-        const radio = vv.find((element) => element.checked) ?? vv[0];
+  for (const v of map.values()) {
+    for (const w of v.values()) {
+      for (const x of w.values()) {
+        const radio = x.find((r) => r.checked) ?? x[0];
         radio && placeholder.add(radio);
       }
     }
   }
-  return elements.filter((element) => {
-    if (!(element instanceof HTMLInputElement)) {
+  return elements.filter((e) => {
+    if (!(e instanceof HTMLInputElement)) {
       return true;
     }
-    return !isUngroupedRadio(element) || placeholder.has(element);
+    return !isUngroupedRadio(e) || placeholder.has(e);
   });
 }
 function sortByTabIndex(elements) {
   const ordered = [];
   const natural = [];
-  for (let i = 0, l = elements.length; i < l; i++) {
-    const element = elements[i];
-    if (element) {
-      const target = getTabIndex(element) > 0 ? ordered : natural;
-      target[target.length] = element;
-    }
-  }
-  ordered.sort((a, b) => getTabIndex(a) - getTabIndex(b));
-  let count = 0;
-  const sorted = new Array(ordered.length + natural.length);
-  for (let i = 0, l = ordered.length; i < l; i++) {
-    sorted[count++] = ordered[i];
+  for (const e of elements) {
+    (getTabIndex(e) > 0 ? ordered : natural).push(e);
   }
-  for (let i = 0, l = natural.length; i < l; i++) {
-    sorted[count++] = natural[i];
-  }
-  return sorted;
+  return ordered.sort((a, b) => getTabIndex(a) - getTabIndex(b)).concat(natural);
 }
 function containsComposed(container, element) {
   let current = element;
@@ -325,7 +294,7 @@ function containsComposed(container, element) {
 }
 function getComposedChildren(node) {
   if (node instanceof ShadowRoot) {
-    return getChildren(node);
+    return [...node.children];
   }
   if (!(node instanceof Element)) {
     return [];
@@ -337,9 +306,9 @@ function getComposedChildren(node) {
     }
   }
   if (node instanceof HTMLElement && node.shadowRoot?.mode === "open") {
-    return getChildren(node.shadowRoot);
+    return [...node.shadowRoot.children];
   }
-  return getChildren(node);
+  return [...node.children];
 }
 function getComposedParent(node) {
   if (node instanceof Element && node.assignedSlot) {
@@ -354,13 +323,9 @@ function getComposedSiblings(node) {
   if (!parent) {
     return [];
   }
-  const siblings = parent instanceof HTMLSlotElement ? parent.assignedElements({ flatten: true }) : getComposedChildren(parent);
   const filtered = [];
-  for (let i = 0, l = siblings.length; i < l; i++) {
-    const sibling = siblings[i];
-    if (sibling && sibling !== node) {
-      filtered[filtered.length] = sibling;
-    }
+  for (const s of (parent instanceof HTMLSlotElement ? parent.assignedElements({ flatten: true }) : getComposedChildren(parent)).filter((s2) => s2 !== node)) {
+    filtered.push(s);
   }
   return filtered;
 }
@@ -397,13 +362,6 @@ function getActiveElement() {
   }
   return current;
 }
-function getChildren(node) {
-  const elements = [];
-  for (let child = node.firstElementChild; child; child = child.nextElementSibling) {
-    elements[elements.length] = child;
-  }
-  return elements;
-}
 function getTabIndex(element) {
   return "tabIndex" in element ? Number(element.tabIndex) : 0;
 }
@@ -480,7 +438,7 @@ function resolveOptions(options) {
  * High-precision focus management utility with full composed tree support.
  * Handles complex focus rules including tabindex ordering, radio groups, inert.
  *
- * @version 4.3.29
+ * @version 4.3.31
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "power-focusable",
-  "version": "4.3.29",
+  "version": "4.3.31",
   "description": "High-precision focus management utility with full composed tree support",
   "keywords": [
     "a11y",