power-focusable 4.1.2 → 4.1.4

package/README.md

@@ -35,11 +35,11 @@ import { ... } 'https://unpkg.com/power-focusable/dist/index.js';
 
 ```ts
 interface PowerFocusableOptions {
-  anchor?: Element | null;                               // default: document.activeElement
-  composed?: boolean;                                    // default: false
-  filter?: ((element: Element) => boolean) | undefined;
-  include?: ((element: Element) => boolean) | undefined;
-  wrap?: boolean;                                        // default: false
+  anchor?: Element | null;                 // default: active element
+  composed?: boolean;                      // default: false
+  filter?: (element: Element) => boolean;
+  include?: (element: Element) => boolean;
+  wrap?: boolean;                          // default: false
 }
 ```
 

package/dist/index.cjs

@@ -6,10 +6,10 @@ function createFocusTrap(container = document.body) {
   if (!(container instanceof Element)) {
     throw new Error("Invalid container element");
   }
-  focus(container);
+  focusElement(container);
   if (getActiveElement() !== container) {
     const first = getFocusables(container, { composed: true })[0];
-    first && focus(first);
+    first && focusElement(first);
   }
   function onKeyDown(event) {
     const { key, altKey, ctrlKey, metaKey, shiftKey } = event;
@@ -27,7 +27,7 @@ function createFocusTrap(container = document.body) {
       return;
     }
     event.preventDefault();
-    focus(focusable);
+    focusElement(focusable);
   }
   let controller = new AbortController();
   document.addEventListener("keydown", onKeyDown, {
@@ -47,11 +47,11 @@ function getFocusables(container = document.body, options = {}) {
   const { composed = false } = options;
   let { filter, include } = options;
   if (filter && typeof filter !== "function") {
-    console.warn("Invalid filter function. Fallback: undefined.");
+    console.warn("Invalid filter function");
     filter = void 0;
   }
   if (include && typeof include !== "function") {
-    console.warn("Invalid include function. Fallback: undefined.");
+    console.warn("Invalid include function");
     include = void 0;
   }
   const elements = [];
@@ -164,22 +164,25 @@ function isFocusable(element) {
   return true;
 }
 function getRelativeFocusable(container, offset, options) {
-  const {
-    anchor = getActiveElement(),
-    composed = false,
-    filter,
-    include,
-    wrap = false
-  } = options;
-  const focusables = getFocusables(container, { composed, filter, include });
-  const { length } = focusables;
-  if (!length) {
-    return null;
+  let anchor = options.anchor ?? getActiveElement();
+  const { composed = false, filter, include, wrap = false } = options;
+  if (!(anchor instanceof Element)) {
+    const active = getActiveElement();
+    if (active instanceof Element) {
+      console.warn("Invalid anchor element. Fallback: active element.");
+      anchor = active;
+    } else {
+      console.warn("Invalid anchor element");
+      return null;
+    }
   }
-  if (!anchor || !containsComposed(container, anchor)) {
+  if (!containsComposed(container, anchor)) {
+    console.warn("Anchor (active) element not within container");
     return null;
   }
-  if (!(anchor instanceof Element)) {
+  const focusables = getFocusables(container, { composed, filter, include });
+  const { length } = focusables;
+  if (!length) {
     return null;
   }
   const currentIndex = focusables.indexOf(anchor);
@@ -357,7 +360,7 @@ function restoreInert(element) {
   }
   inertRefCounts.set(element, count - 1);
 }
-function focus(element) {
+function focusElement(element) {
   "focus" in element && typeof element.focus === "function" && element.focus();
 }
 function getActiveElement() {
@@ -408,7 +411,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.1.2
+ * @version 4.1.4
  * @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.1.2
+ * @version 4.1.4
  * @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.1.2
+ * @version 4.1.4
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.js

@@ -4,10 +4,10 @@ function createFocusTrap(container = document.body) {
   if (!(container instanceof Element)) {
     throw new Error("Invalid container element");
   }
-  focus(container);
+  focusElement(container);
   if (getActiveElement() !== container) {
     const first = getFocusables(container, { composed: true })[0];
-    first && focus(first);
+    first && focusElement(first);
   }
   function onKeyDown(event) {
     const { key, altKey, ctrlKey, metaKey, shiftKey } = event;
@@ -25,7 +25,7 @@ function createFocusTrap(container = document.body) {
       return;
     }
     event.preventDefault();
-    focus(focusable);
+    focusElement(focusable);
   }
   let controller = new AbortController();
   document.addEventListener("keydown", onKeyDown, {
@@ -45,11 +45,11 @@ function getFocusables(container = document.body, options = {}) {
   const { composed = false } = options;
   let { filter, include } = options;
   if (filter && typeof filter !== "function") {
-    console.warn("Invalid filter function. Fallback: undefined.");
+    console.warn("Invalid filter function");
     filter = void 0;
   }
   if (include && typeof include !== "function") {
-    console.warn("Invalid include function. Fallback: undefined.");
+    console.warn("Invalid include function");
     include = void 0;
   }
   const elements = [];
@@ -162,22 +162,25 @@ function isFocusable(element) {
   return true;
 }
 function getRelativeFocusable(container, offset, options) {
-  const {
-    anchor = getActiveElement(),
-    composed = false,
-    filter,
-    include,
-    wrap = false
-  } = options;
-  const focusables = getFocusables(container, { composed, filter, include });
-  const { length } = focusables;
-  if (!length) {
-    return null;
+  let anchor = options.anchor ?? getActiveElement();
+  const { composed = false, filter, include, wrap = false } = options;
+  if (!(anchor instanceof Element)) {
+    const active = getActiveElement();
+    if (active instanceof Element) {
+      console.warn("Invalid anchor element. Fallback: active element.");
+      anchor = active;
+    } else {
+      console.warn("Invalid anchor element");
+      return null;
+    }
   }
-  if (!anchor || !containsComposed(container, anchor)) {
+  if (!containsComposed(container, anchor)) {
+    console.warn("Anchor (active) element not within container");
     return null;
   }
-  if (!(anchor instanceof Element)) {
+  const focusables = getFocusables(container, { composed, filter, include });
+  const { length } = focusables;
+  if (!length) {
     return null;
   }
   const currentIndex = focusables.indexOf(anchor);
@@ -355,7 +358,7 @@ function restoreInert(element) {
   }
   inertRefCounts.set(element, count - 1);
 }
-function focus(element) {
+function focusElement(element) {
   "focus" in element && typeof element.focus === "function" && element.focus();
 }
 function getActiveElement() {
@@ -406,7 +409,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.1.2
+ * @version 4.1.4
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "power-focusable",
-  "version": "4.1.2",
+  "version": "4.1.4",
   "description": "High-precision focus management utility with full composed tree support",
   "type": "module",
   "main": "./dist/index.cjs",