power-focusable 4.3.2 → 4.3.4

package/README.md

@@ -21,14 +21,14 @@ import {
   hasFocusable,
   inertOutside,
   isFocusable,
-} from 'power-focusable@4.3.2';
+} from 'power-focusable@4.3.4';
 
 // CDNs
-import { ... } 'https://esm.sh/power-focusable@4.3.2';
+import { ... } 'https://esm.sh/power-focusable@4.3.4';
 // or
-import { ... } 'https://cdn.jsdelivr.net/npm/power-focusable@4.3.2/+esm';
+import { ... } 'https://cdn.jsdelivr.net/npm/power-focusable@4.3.4/+esm';
 // or
-import { ... } 'https://esm.unpkg.com/power-focusable@4.3.2';
+import { ... } 'https://esm.unpkg.com/power-focusable@4.3.4';
 ```
 
 ## 🪄 Options

package/dist/index.cjs

@@ -12,22 +12,21 @@ function createFocusTrap(container = document.body) {
     first && focusElement(first);
   }
   function onKeyDown(event) {
-    const { key, altKey, ctrlKey, metaKey, shiftKey } = event;
-    if (key !== "Tab" || altKey || ctrlKey || metaKey) {
+    if (!event.composedPath().includes(container)) {
       return;
     }
-    if (!event.composedPath().includes(container)) {
+    const { key, altKey, ctrlKey, metaKey, shiftKey } = event;
+    if (key !== "Tab" || altKey || ctrlKey || metaKey) {
       return;
     }
     const focusable = getRelativeFocusable(container, shiftKey ? -1 : 1, {
       composed: true,
       wrap: true
     });
-    if (!focusable) {
-      return;
+    if (focusable) {
+      event.preventDefault();
+      focusElement(focusable);
     }
-    event.preventDefault();
-    focusElement(focusable);
   }
   let controller = new AbortController();
   document.addEventListener("keydown", onKeyDown, {
@@ -78,21 +77,16 @@ function getFocusables(container = document.body, options = {}) {
   const elements = [];
   if (composed || include) {
     let traverse2 = function(node) {
-      if (node instanceof Element) {
-        if (isFocusable(node, {
-          skipNegativeTabIndexCheck,
-          skipVisibilityCheck
-        }) || include?.(node)) {
-          elements[elements.length] = node;
-        }
+      if (!(node instanceof Element)) {
+        return;
+      }
+      if (isFocusable(node, { skipNegativeTabIndexCheck, skipVisibilityCheck }) || include?.(node)) {
+        elements[elements.length] = node;
       }
       const children = getComposedChildren(node);
       for (let i = 0, l = children.length; i < l; i++) {
         const child = children[i];
-        if (!child) {
-          continue;
-        }
-        traverse2(child);
+        child && traverse2(child);
       }
     };
     traverse2(container);
@@ -100,10 +94,7 @@ function getFocusables(container = document.body, options = {}) {
     const candidates = container.querySelectorAll(FOCUSABLE_SELECTOR);
     for (let i = 0, l = candidates.length; i < l; i++) {
       const candidate = candidates[i];
-      if (!(candidate instanceof Element)) {
-        continue;
-      }
-      if (isFocusable(candidate, {
+      if (candidate && isFocusable(candidate, {
         skipNegativeTabIndexCheck,
         skipVisibilityCheck
       })) {
@@ -131,21 +122,15 @@ function inertOutside(element) {
   }
   function traverse(node, callback) {
     const parent = getComposedParent(node);
-    if (!parent) {
-      return;
-    }
-    for (const sibling of getComposedSiblings(node)) {
-      callback(sibling);
+    if (parent) {
+      for (const sibling of getComposedSiblings(node)) {
+        callback(sibling);
+      }
+      traverse(parent, callback);
     }
-    traverse(parent, callback);
   }
   const elements = [];
-  traverse(element, (node) => {
-    if (!(node instanceof Element)) {
-      return;
-    }
-    applyInert(node) && elements.push(node);
-  });
+  traverse(element, (node) => node && applyInert(node) && elements.push(node));
   return () => {
     elements.forEach((element2) => {
       restoreInert(element2);
@@ -322,23 +307,19 @@ function normalizeRadioGroup(elements) {
   for (const group of map.values()) {
     placeholder.add(group.find((radio) => radio.checked) ?? group[0]);
   }
-  return elements.filter((element) => {
-    if (isUngroupedRadio(element)) {
-      return placeholder.has(element);
-    }
-    return true;
-  });
+  return elements.filter(
+    (element) => isUngroupedRadio(element) ? placeholder.has(element) : true
+  );
 }
 function sortByTabIndex(elements) {
   const ordered = [];
   const natural = [];
   for (let i = 0, l = elements.length; i < l; i++) {
     const element = elements[i];
-    if (!element) {
-      continue;
+    if (element) {
+      const target = getTabIndex(element) > 0 ? ordered : natural;
+      target[target.length] = element;
     }
-    const target = getTabIndex(element) > 0 ? ordered : natural;
-    target[target.length] = element;
   }
   ordered.sort((a, b) => getTabIndex(a) - getTabIndex(b));
   let count = 0;
@@ -356,8 +337,9 @@ function containsComposed(container, element) {
   while (current) {
     if (current === container) {
       return true;
+    } else {
+      current = current instanceof ShadowRoot ? current.mode === "open" ? current.host : null : current.parentNode;
     }
-    current = current instanceof ShadowRoot ? current.mode === "open" ? current.host : null : current.parentNode;
   }
   return false;
 }
@@ -382,12 +364,10 @@ function getComposedChildren(node) {
 function getComposedParent(node) {
   if (node instanceof Element && node.assignedSlot) {
     return node.assignedSlot;
+  } else {
+    const parent = node.parentNode;
+    return parent instanceof ShadowRoot ? parent.host : parent instanceof Element ? parent : null;
   }
-  const parent = node.parentNode;
-  if (parent instanceof ShadowRoot) {
-    return parent.host;
-  }
-  return parent instanceof Element ? parent : null;
 }
 function getComposedSiblings(node) {
   if (node.assignedSlot) {
@@ -395,30 +375,25 @@ function getComposedSiblings(node) {
     const filtered = [];
     for (let i = 0, l = siblings.length; i < l; i++) {
       const sibling = siblings[i];
-      if (sibling !== node) {
-        if (!(sibling instanceof Element)) {
-          continue;
-        }
+      if (sibling && sibling !== node) {
         filtered[filtered.length] = sibling;
       }
     }
     return filtered;
+  } else {
+    return getComposedParent(node) ? getSiblings(node) : [];
   }
-  const parent = getComposedParent(node);
-  if (!parent) {
-    return [];
-  }
-  return getSiblings(node);
 }
 var inertRefCounts = /* @__PURE__ */ new WeakMap();
 function applyInert(element) {
-  if (isInert(element) && !inertRefCounts.has(element)) {
+  if (!isInert(element) || inertRefCounts.has(element)) {
+    const count = inertRefCounts.get(element) ?? 0;
+    inertRefCounts.set(element, count + 1);
+    count === 0 && element.setAttribute("inert", "");
+    return true;
+  } else {
     return false;
   }
-  const count = inertRefCounts.get(element) ?? 0;
-  inertRefCounts.set(element, count + 1);
-  count === 0 && element.setAttribute("inert", "");
-  return true;
 }
 function restoreInert(element) {
   const count = inertRefCounts.get(element);
@@ -428,9 +403,9 @@ function restoreInert(element) {
   if (count === 1) {
     inertRefCounts.delete(element);
     element.removeAttribute("inert");
-    return;
+  } else {
+    inertRefCounts.set(element, count - 1);
   }
-  inertRefCounts.set(element, count - 1);
 }
 function focusElement(element) {
   "focus" in element && typeof element.focus === "function" && element.focus();
@@ -483,7 +458,7 @@ function isUngroupedRadio(element) {
  * High-precision focus management utility with full composed tree support.
  * Handles complex focus rules including tabindex ordering, radio groups, inert.
  *
- * @version 4.3.2
+ * @version 4.3.3
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -491,6 +466,8 @@ function isUngroupedRadio(element) {
  */
 
 exports.createFocusTrap = createFocusTrap;
+exports.focusElement = focusElement;
+exports.getActiveElement = getActiveElement;
 exports.getFocusables = getFocusables;
 exports.getNextFocusable = getNextFocusable;
 exports.getPreviousFocusable = getPreviousFocusable;

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.2
+ * @version 4.3.3
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -28,5 +28,7 @@ declare function isFocusable(element: Element, options?: {
     skipNegativeTabIndexCheck?: boolean;
     skipVisibilityCheck?: boolean;
 }): boolean;
+declare function focusElement(element: Element): void;
+declare function getActiveElement(): Element | null;
 
-export { type PowerFocusableOptions, createFocusTrap, getFocusables, getNextFocusable, getPreviousFocusable, hasFocusable, inertOutside, isFocusable };
+export { type PowerFocusableOptions, createFocusTrap, focusElement, getActiveElement, getFocusables, getNextFocusable, getPreviousFocusable, hasFocusable, inertOutside, isFocusable };

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.2
+ * @version 4.3.3
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -28,5 +28,7 @@ declare function isFocusable(element: Element, options?: {
     skipNegativeTabIndexCheck?: boolean;
     skipVisibilityCheck?: boolean;
 }): boolean;
+declare function focusElement(element: Element): void;
+declare function getActiveElement(): Element | null;
 
-export { type PowerFocusableOptions, createFocusTrap, getFocusables, getNextFocusable, getPreviousFocusable, hasFocusable, inertOutside, isFocusable };
+export { type PowerFocusableOptions, createFocusTrap, focusElement, getActiveElement, getFocusables, getNextFocusable, getPreviousFocusable, hasFocusable, inertOutside, isFocusable };

package/dist/index.js

@@ -10,22 +10,21 @@ function createFocusTrap(container = document.body) {
     first && focusElement(first);
   }
   function onKeyDown(event) {
-    const { key, altKey, ctrlKey, metaKey, shiftKey } = event;
-    if (key !== "Tab" || altKey || ctrlKey || metaKey) {
+    if (!event.composedPath().includes(container)) {
       return;
     }
-    if (!event.composedPath().includes(container)) {
+    const { key, altKey, ctrlKey, metaKey, shiftKey } = event;
+    if (key !== "Tab" || altKey || ctrlKey || metaKey) {
       return;
     }
     const focusable = getRelativeFocusable(container, shiftKey ? -1 : 1, {
       composed: true,
       wrap: true
     });
-    if (!focusable) {
-      return;
+    if (focusable) {
+      event.preventDefault();
+      focusElement(focusable);
     }
-    event.preventDefault();
-    focusElement(focusable);
   }
   let controller = new AbortController();
   document.addEventListener("keydown", onKeyDown, {
@@ -76,21 +75,16 @@ function getFocusables(container = document.body, options = {}) {
   const elements = [];
   if (composed || include) {
     let traverse2 = function(node) {
-      if (node instanceof Element) {
-        if (isFocusable(node, {
-          skipNegativeTabIndexCheck,
-          skipVisibilityCheck
-        }) || include?.(node)) {
-          elements[elements.length] = node;
-        }
+      if (!(node instanceof Element)) {
+        return;
+      }
+      if (isFocusable(node, { skipNegativeTabIndexCheck, skipVisibilityCheck }) || include?.(node)) {
+        elements[elements.length] = node;
       }
       const children = getComposedChildren(node);
       for (let i = 0, l = children.length; i < l; i++) {
         const child = children[i];
-        if (!child) {
-          continue;
-        }
-        traverse2(child);
+        child && traverse2(child);
       }
     };
     traverse2(container);
@@ -98,10 +92,7 @@ function getFocusables(container = document.body, options = {}) {
     const candidates = container.querySelectorAll(FOCUSABLE_SELECTOR);
     for (let i = 0, l = candidates.length; i < l; i++) {
       const candidate = candidates[i];
-      if (!(candidate instanceof Element)) {
-        continue;
-      }
-      if (isFocusable(candidate, {
+      if (candidate && isFocusable(candidate, {
         skipNegativeTabIndexCheck,
         skipVisibilityCheck
       })) {
@@ -129,21 +120,15 @@ function inertOutside(element) {
   }
   function traverse(node, callback) {
     const parent = getComposedParent(node);
-    if (!parent) {
-      return;
-    }
-    for (const sibling of getComposedSiblings(node)) {
-      callback(sibling);
+    if (parent) {
+      for (const sibling of getComposedSiblings(node)) {
+        callback(sibling);
+      }
+      traverse(parent, callback);
     }
-    traverse(parent, callback);
   }
   const elements = [];
-  traverse(element, (node) => {
-    if (!(node instanceof Element)) {
-      return;
-    }
-    applyInert(node) && elements.push(node);
-  });
+  traverse(element, (node) => node && applyInert(node) && elements.push(node));
   return () => {
     elements.forEach((element2) => {
       restoreInert(element2);
@@ -320,23 +305,19 @@ function normalizeRadioGroup(elements) {
   for (const group of map.values()) {
     placeholder.add(group.find((radio) => radio.checked) ?? group[0]);
   }
-  return elements.filter((element) => {
-    if (isUngroupedRadio(element)) {
-      return placeholder.has(element);
-    }
-    return true;
-  });
+  return elements.filter(
+    (element) => isUngroupedRadio(element) ? placeholder.has(element) : true
+  );
 }
 function sortByTabIndex(elements) {
   const ordered = [];
   const natural = [];
   for (let i = 0, l = elements.length; i < l; i++) {
     const element = elements[i];
-    if (!element) {
-      continue;
+    if (element) {
+      const target = getTabIndex(element) > 0 ? ordered : natural;
+      target[target.length] = element;
     }
-    const target = getTabIndex(element) > 0 ? ordered : natural;
-    target[target.length] = element;
   }
   ordered.sort((a, b) => getTabIndex(a) - getTabIndex(b));
   let count = 0;
@@ -354,8 +335,9 @@ function containsComposed(container, element) {
   while (current) {
     if (current === container) {
       return true;
+    } else {
+      current = current instanceof ShadowRoot ? current.mode === "open" ? current.host : null : current.parentNode;
     }
-    current = current instanceof ShadowRoot ? current.mode === "open" ? current.host : null : current.parentNode;
   }
   return false;
 }
@@ -380,12 +362,10 @@ function getComposedChildren(node) {
 function getComposedParent(node) {
   if (node instanceof Element && node.assignedSlot) {
     return node.assignedSlot;
+  } else {
+    const parent = node.parentNode;
+    return parent instanceof ShadowRoot ? parent.host : parent instanceof Element ? parent : null;
   }
-  const parent = node.parentNode;
-  if (parent instanceof ShadowRoot) {
-    return parent.host;
-  }
-  return parent instanceof Element ? parent : null;
 }
 function getComposedSiblings(node) {
   if (node.assignedSlot) {
@@ -393,30 +373,25 @@ function getComposedSiblings(node) {
     const filtered = [];
     for (let i = 0, l = siblings.length; i < l; i++) {
       const sibling = siblings[i];
-      if (sibling !== node) {
-        if (!(sibling instanceof Element)) {
-          continue;
-        }
+      if (sibling && sibling !== node) {
         filtered[filtered.length] = sibling;
       }
     }
     return filtered;
+  } else {
+    return getComposedParent(node) ? getSiblings(node) : [];
   }
-  const parent = getComposedParent(node);
-  if (!parent) {
-    return [];
-  }
-  return getSiblings(node);
 }
 var inertRefCounts = /* @__PURE__ */ new WeakMap();
 function applyInert(element) {
-  if (isInert(element) && !inertRefCounts.has(element)) {
+  if (!isInert(element) || inertRefCounts.has(element)) {
+    const count = inertRefCounts.get(element) ?? 0;
+    inertRefCounts.set(element, count + 1);
+    count === 0 && element.setAttribute("inert", "");
+    return true;
+  } else {
     return false;
   }
-  const count = inertRefCounts.get(element) ?? 0;
-  inertRefCounts.set(element, count + 1);
-  count === 0 && element.setAttribute("inert", "");
-  return true;
 }
 function restoreInert(element) {
   const count = inertRefCounts.get(element);
@@ -426,9 +401,9 @@ function restoreInert(element) {
   if (count === 1) {
     inertRefCounts.delete(element);
     element.removeAttribute("inert");
-    return;
+  } else {
+    inertRefCounts.set(element, count - 1);
   }
-  inertRefCounts.set(element, count - 1);
 }
 function focusElement(element) {
   "focus" in element && typeof element.focus === "function" && element.focus();
@@ -481,11 +456,11 @@ function isUngroupedRadio(element) {
  * High-precision focus management utility with full composed tree support.
  * Handles complex focus rules including tabindex ordering, radio groups, inert.
  *
- * @version 4.3.2
+ * @version 4.3.3
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
  * @see {@link https://github.com/y14e/power-focusable}
  */
 
-export { createFocusTrap, getFocusables, getNextFocusable, getPreviousFocusable, hasFocusable, inertOutside, isFocusable };
+export { createFocusTrap, focusElement, getActiveElement, getFocusables, getNextFocusable, getPreviousFocusable, hasFocusable, inertOutside, isFocusable };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "power-focusable",
-  "version": "4.3.2",
+  "version": "4.3.4",
   "description": "High-precision focus management utility with full composed tree support",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -52,6 +52,9 @@
     "typescript": "^5.6.0",
     "vitest": "^4.1.5"
   },
+  "overrides": {
+    "@emnapi/wasi-threads": "1.2.2"
+  },
   "engines": {
     "node": ">=18"
   }