npm - @y14e/portal - Versions diffs - 1.2.3 → 1.2.5 - Mend

@y14e/portal 1.2.3 → 1.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.cjs CHANGED Viewed

@@ -1,5 +1,36 @@
 'use strict';
+// node_modules/@y14e/attributes-utils/dist/index.js
+var snapshots = /* @__PURE__ */ new WeakMap();
+function restoreAttributes(elements) {
+  for (const element of elements) {
+    const snapshot = snapshots.get(element);
+    if (!snapshot) {
+      continue;
+    }
+    for (const [attribute, value] of snapshot.entries()) {
+      if (value === null) {
+        element.removeAttribute(attribute);
+      } else {
+        element.setAttribute(attribute, value);
+      }
+    }
+    snapshots.delete(element);
+  }
+}
+function saveAttributes(elements, attributes) {
+  elements.forEach((element) => {
+    let snapshot = snapshots.get(element);
+    if (!snapshot) {
+      snapshot = /* @__PURE__ */ new Map();
+      snapshots.set(element, snapshot);
+    }
+    attributes.forEach((attribute) => {
+      snapshot.set(attribute, element.getAttribute(attribute));
+    });
+  });
+}
 // node_modules/power-focusable/dist/index.js
 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"])`;
 function getFocusables(container = document.body, options = {}) {
@@ -7,14 +38,17 @@ function getFocusables(container = document.body, options = {}) {
     console.warn("Invalid container element. Fallback: <body> element.");
     container = document.body;
   }
-  const { composed = false } = options;
-  let { filter, include } = options;
-  if (filter && typeof filter !== "function") {
-    console.warn("Invalid filter function");
+  let { composed = false, filter, include } = options;
+  if (typeof composed !== "boolean") {
+    console.warn("Invalid composed. Fallback: false.");
+    composed = false;
+  }
+  if (typeof filter !== "undefined" && typeof filter !== "function") {
+    console.warn("Invalid filter. Fallback: no filter function (undefined).");
     filter = void 0;
   }
-  if (include && typeof include !== "function") {
-    console.warn("Invalid include function");
+  if (typeof include !== "undefined" && typeof include !== "function") {
+    console.warn("Invalid include. Fallback: no include function (undefined).");
     include = void 0;
   }
   const elements = [];
@@ -51,17 +85,9 @@ function getFocusables(container = document.body, options = {}) {
   return filter ? unfiltered.filter(filter) : unfiltered;
 }
 function getNextFocusable(container = document.body, options = {}) {
-  if (!(container instanceof Element)) {
-    console.warn("Invalid container element. Fallback: <body> element.");
-    container = document.body;
-  }
   return getRelativeFocusable(container, 1, options);
 }
 function getPreviousFocusable(container = document.body, options = {}) {
-  if (!(container instanceof Element)) {
-    console.warn("Invalid container element. Fallback: <body> element.");
-    container = document.body;
-  }
   return getRelativeFocusable(container, -1, options);
 }
 function isFocusable(element) {
@@ -91,8 +117,17 @@ function isFocusable(element) {
   return true;
 }
 function getRelativeFocusable(container, offset, options) {
-  let anchor = options.anchor ?? getActiveElement();
-  const { composed = false, filter, include, wrap = false } = options;
+  if (!(container instanceof Element)) {
+    console.warn("Invalid container element. Fallback: <body> element.");
+    container = document.body;
+  }
+  let {
+    anchor = getActiveElement(),
+    composed = false,
+    filter,
+    include,
+    wrap = false
+  } = options;
   if (!(anchor instanceof Element)) {
     const active = getActiveElement();
     if (active instanceof Element) {
@@ -107,6 +142,22 @@ function getRelativeFocusable(container, offset, options) {
     console.warn("Anchor (active) element not within container");
     return null;
   }
+  if (typeof composed !== "boolean") {
+    console.warn("Invalid composed. Fallback: false.");
+    composed = false;
+  }
+  if (typeof filter !== "undefined" && typeof filter !== "function") {
+    console.warn("Invalid filter. Fallback: no filter function (undefined).");
+    filter = void 0;
+  }
+  if (typeof include !== "undefined" && typeof include !== "function") {
+    console.warn("Invalid include. Fallback: no include function (undefined).");
+    include = void 0;
+  }
+  if (typeof wrap !== "boolean") {
+    console.warn("Invalid wrap. Fallback: false.");
+    wrap = false;
+  }
   const focusables = getFocusables(container, { composed, filter, include });
   const { length } = focusables;
   if (!length) {
@@ -296,7 +347,6 @@ var Portal = class {
   #entranceSentinel;
   #exitSentinel;
   #focusables = /* @__PURE__ */ new Set();
-  #tabIndexes = /* @__PURE__ */ new Map();
   #controller = null;
   #isDestroyed = false;
   constructor(host, container) {
@@ -313,16 +363,8 @@ var Portal = class {
     this.#isDestroyed = true;
     this.#controller?.abort();
     this.#controller = null;
-    this.#focusables.forEach((focusable) => {
-      const index = this.#tabIndexes.get(focusable);
-      if (index == null) {
-        focusable.removeAttribute("tabindex");
-      } else {
-        focusable.setAttribute("tabindex", index);
-      }
-    });
+    restoreAttributes([...this.#focusables]);
     this.#focusables.clear();
-    this.#tabIndexes.clear();
     this.#exitSentinel.after(this.#host);
     this.#entranceSentinel.remove();
     this.#exitSentinel.remove();
@@ -405,29 +447,23 @@ var Portal = class {
       ...this.#getFocusables(),
       ...getFocusables(this.#host, { composed: true })
     ]);
-    this.#focusables.forEach((focusable) => {
+    for (const focusable of this.#focusables) {
       if (current.has(focusable)) {
-        return;
+        continue;
       }
       if (focusable.isConnected) {
-        const index = this.#tabIndexes.get(focusable);
-        if (index == null) {
-          focusable.removeAttribute("tabindex");
-        } else {
-          focusable.setAttribute("tabindex", index);
-        }
+        restoreAttributes([focusable]);
       }
       this.#focusables.delete(focusable);
-      this.#tabIndexes.delete(focusable);
-    });
-    current.forEach((c) => {
+    }
+    for (const c of current) {
       if (this.#focusables.has(c)) {
-        return;
+        continue;
       }
       this.#focusables.add(c);
-      this.#tabIndexes.set(c, c.getAttribute("tabindex"));
+      saveAttributes([c], ["tabindex"]);
       c.setAttribute("tabindex", "-1");
-    });
+    }
   }
   #createSentinel() {
     const sentinel = document.createElement("span");
@@ -482,7 +518,7 @@ function getActiveElement2() {
  * Lightweight DOM portal (teleport) utility with fully focus management.
  * Designed for accessible dialogs, menus, overlays, popovers.
  *
- * @version 1.2.3
+ * @version 1.2.5
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -490,13 +526,24 @@ function getActiveElement2() {
  */
 /*! Bundled license information:
+@y14e/attributes-utils/dist/index.js:
+  (**
+   * Attributes Utils
+   *
+   * @version 1.0.2
+   * @author Yusuke Kamiyamane
+   * @license MIT
+   * @copyright Copyright (c) Yusuke Kamiyamane
+   * @see {@link https://github.com/y14e/attributes-utils}
+   *)
 power-focusable/dist/index.js:
   (**
    * Power Focusable
    * High-precision focus management utility with full composed tree support.
    * Handles complex focus rules including tabindex ordering, radio groups, inert.
    *
-   * @version 4.1.5
+   * @version 4.1.7
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.d.cts CHANGED Viewed

@@ -3,7 +3,7 @@
  * Lightweight DOM portal (teleport) utility with fully focus management.
  * Designed for accessible dialogs, menus, overlays, popovers.
  *
- * @version 1.2.3
+ * @version 1.2.5
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@
  * Lightweight DOM portal (teleport) utility with fully focus management.
  * Designed for accessible dialogs, menus, overlays, popovers.
  *
- * @version 1.2.3
+ * @version 1.2.5
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.js CHANGED Viewed

@@ -1,3 +1,34 @@
+// node_modules/@y14e/attributes-utils/dist/index.js
+var snapshots = /* @__PURE__ */ new WeakMap();
+function restoreAttributes(elements) {
+  for (const element of elements) {
+    const snapshot = snapshots.get(element);
+    if (!snapshot) {
+      continue;
+    }
+    for (const [attribute, value] of snapshot.entries()) {
+      if (value === null) {
+        element.removeAttribute(attribute);
+      } else {
+        element.setAttribute(attribute, value);
+      }
+    }
+    snapshots.delete(element);
+  }
+}
+function saveAttributes(elements, attributes) {
+  elements.forEach((element) => {
+    let snapshot = snapshots.get(element);
+    if (!snapshot) {
+      snapshot = /* @__PURE__ */ new Map();
+      snapshots.set(element, snapshot);
+    }
+    attributes.forEach((attribute) => {
+      snapshot.set(attribute, element.getAttribute(attribute));
+    });
+  });
+}
 // node_modules/power-focusable/dist/index.js
 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"])`;
 function getFocusables(container = document.body, options = {}) {
@@ -5,14 +36,17 @@ function getFocusables(container = document.body, options = {}) {
     console.warn("Invalid container element. Fallback: <body> element.");
     container = document.body;
   }
-  const { composed = false } = options;
-  let { filter, include } = options;
-  if (filter && typeof filter !== "function") {
-    console.warn("Invalid filter function");
+  let { composed = false, filter, include } = options;
+  if (typeof composed !== "boolean") {
+    console.warn("Invalid composed. Fallback: false.");
+    composed = false;
+  }
+  if (typeof filter !== "undefined" && typeof filter !== "function") {
+    console.warn("Invalid filter. Fallback: no filter function (undefined).");
     filter = void 0;
   }
-  if (include && typeof include !== "function") {
-    console.warn("Invalid include function");
+  if (typeof include !== "undefined" && typeof include !== "function") {
+    console.warn("Invalid include. Fallback: no include function (undefined).");
     include = void 0;
   }
   const elements = [];
@@ -49,17 +83,9 @@ function getFocusables(container = document.body, options = {}) {
   return filter ? unfiltered.filter(filter) : unfiltered;
 }
 function getNextFocusable(container = document.body, options = {}) {
-  if (!(container instanceof Element)) {
-    console.warn("Invalid container element. Fallback: <body> element.");
-    container = document.body;
-  }
   return getRelativeFocusable(container, 1, options);
 }
 function getPreviousFocusable(container = document.body, options = {}) {
-  if (!(container instanceof Element)) {
-    console.warn("Invalid container element. Fallback: <body> element.");
-    container = document.body;
-  }
   return getRelativeFocusable(container, -1, options);
 }
 function isFocusable(element) {
@@ -89,8 +115,17 @@ function isFocusable(element) {
   return true;
 }
 function getRelativeFocusable(container, offset, options) {
-  let anchor = options.anchor ?? getActiveElement();
-  const { composed = false, filter, include, wrap = false } = options;
+  if (!(container instanceof Element)) {
+    console.warn("Invalid container element. Fallback: <body> element.");
+    container = document.body;
+  }
+  let {
+    anchor = getActiveElement(),
+    composed = false,
+    filter,
+    include,
+    wrap = false
+  } = options;
   if (!(anchor instanceof Element)) {
     const active = getActiveElement();
     if (active instanceof Element) {
@@ -105,6 +140,22 @@ function getRelativeFocusable(container, offset, options) {
     console.warn("Anchor (active) element not within container");
     return null;
   }
+  if (typeof composed !== "boolean") {
+    console.warn("Invalid composed. Fallback: false.");
+    composed = false;
+  }
+  if (typeof filter !== "undefined" && typeof filter !== "function") {
+    console.warn("Invalid filter. Fallback: no filter function (undefined).");
+    filter = void 0;
+  }
+  if (typeof include !== "undefined" && typeof include !== "function") {
+    console.warn("Invalid include. Fallback: no include function (undefined).");
+    include = void 0;
+  }
+  if (typeof wrap !== "boolean") {
+    console.warn("Invalid wrap. Fallback: false.");
+    wrap = false;
+  }
   const focusables = getFocusables(container, { composed, filter, include });
   const { length } = focusables;
   if (!length) {
@@ -294,7 +345,6 @@ var Portal = class {
   #entranceSentinel;
   #exitSentinel;
   #focusables = /* @__PURE__ */ new Set();
-  #tabIndexes = /* @__PURE__ */ new Map();
   #controller = null;
   #isDestroyed = false;
   constructor(host, container) {
@@ -311,16 +361,8 @@ var Portal = class {
     this.#isDestroyed = true;
     this.#controller?.abort();
     this.#controller = null;
-    this.#focusables.forEach((focusable) => {
-      const index = this.#tabIndexes.get(focusable);
-      if (index == null) {
-        focusable.removeAttribute("tabindex");
-      } else {
-        focusable.setAttribute("tabindex", index);
-      }
-    });
+    restoreAttributes([...this.#focusables]);
     this.#focusables.clear();
-    this.#tabIndexes.clear();
     this.#exitSentinel.after(this.#host);
     this.#entranceSentinel.remove();
     this.#exitSentinel.remove();
@@ -403,29 +445,23 @@ var Portal = class {
       ...this.#getFocusables(),
       ...getFocusables(this.#host, { composed: true })
     ]);
-    this.#focusables.forEach((focusable) => {
+    for (const focusable of this.#focusables) {
       if (current.has(focusable)) {
-        return;
+        continue;
       }
       if (focusable.isConnected) {
-        const index = this.#tabIndexes.get(focusable);
-        if (index == null) {
-          focusable.removeAttribute("tabindex");
-        } else {
-          focusable.setAttribute("tabindex", index);
-        }
+        restoreAttributes([focusable]);
       }
       this.#focusables.delete(focusable);
-      this.#tabIndexes.delete(focusable);
-    });
-    current.forEach((c) => {
+    }
+    for (const c of current) {
       if (this.#focusables.has(c)) {
-        return;
+        continue;
       }
       this.#focusables.add(c);
-      this.#tabIndexes.set(c, c.getAttribute("tabindex"));
+      saveAttributes([c], ["tabindex"]);
       c.setAttribute("tabindex", "-1");
-    });
+    }
   }
   #createSentinel() {
     const sentinel = document.createElement("span");
@@ -480,7 +516,7 @@ function getActiveElement2() {
  * Lightweight DOM portal (teleport) utility with fully focus management.
  * Designed for accessible dialogs, menus, overlays, popovers.
  *
- * @version 1.2.3
+ * @version 1.2.5
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -488,13 +524,24 @@ function getActiveElement2() {
  */
 /*! Bundled license information:
+@y14e/attributes-utils/dist/index.js:
+  (**
+   * Attributes Utils
+   *
+   * @version 1.0.2
+   * @author Yusuke Kamiyamane
+   * @license MIT
+   * @copyright Copyright (c) Yusuke Kamiyamane
+   * @see {@link https://github.com/y14e/attributes-utils}
+   *)
 power-focusable/dist/index.js:
   (**
    * Power Focusable
    * High-precision focus management utility with full composed tree support.
    * Handles complex focus rules including tabindex ordering, radio groups, inert.
    *
-   * @version 4.1.5
+   * @version 4.1.7
    * @author Yusuke Kamiyamane
    * @license MIT
    * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/portal",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "Lightweight DOM portal (teleport) utility with fully focus management",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -47,8 +47,9 @@
   },
   "homepage": "https://github.com/y14e/portal#readme",
   "devDependencies": {
+    "@y14e/attributes-utils": "^1.0.2",
     "bun-types": "latest",
-    "power-focusable": "^4.1.5",
+    "power-focusable": "^4.1.7",
     "tsup": "^8.0.0",
     "typescript": "^5.6.0"
   },