@y14e/portal 1.2.2 → 1.2.4

package/dist/index.cjs

@@ -1,5 +1,36 @@
 'use strict';
 
+// node_modules/@y14e/attributes-utils/dist/index.js
+var snapshots = /* @__PURE__ */ new WeakMap();
+function restoreAttributes(elements) {
+  elements.forEach((element) => {
+    const snapshot = snapshots.get(element);
+    if (!snapshot) {
+      return;
+    }
+    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 = {}) {
@@ -296,7 +327,6 @@ var Portal = class {
   #entranceSentinel;
   #exitSentinel;
   #focusables = /* @__PURE__ */ new Set();
-  #tabIndexes = /* @__PURE__ */ new Map();
   #controller = null;
   #isDestroyed = false;
   constructor(host, container) {
@@ -313,16 +343,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();
@@ -370,7 +392,8 @@ var Portal = class {
     }
   };
   #onKeyDown = (event) => {
-    if (event.key !== "Tab" || event.altKey || event.ctrlKey || event.metaKey) {
+    const { key, altKey, ctrlKey, metaKey, shiftKey } = event;
+    if (key !== "Tab" || altKey || ctrlKey || metaKey) {
       return;
     }
     const active = getActiveElement2();
@@ -384,7 +407,7 @@ var Portal = class {
     const focusables = this.#getFocusables();
     if (!focusables.length) {
       event.preventDefault();
-      this.#focusSentinel(event.shiftKey);
+      this.#focusSentinel(shiftKey);
       return;
     }
     const index = focusables.indexOf(active);
@@ -392,11 +415,11 @@ var Portal = class {
       return;
     }
     event.preventDefault();
-    const focusable = focusables[index + (event.shiftKey ? -1 : 1)];
+    const focusable = focusables[index + (shiftKey ? -1 : 1)];
     if (focusable) {
       focusElement(focusable);
     } else {
-      this.#focusSentinel(event.shiftKey);
+      this.#focusSentinel(shiftKey);
     }
   };
   #update() {
@@ -409,22 +432,16 @@ var Portal = class {
         return;
       }
       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) => {
       if (this.#focusables.has(c)) {
         return;
       }
       this.#focusables.add(c);
-      this.#tabIndexes.set(c, c.getAttribute("tabindex"));
+      saveAttributes([c], ["tabindex"]);
       c.setAttribute("tabindex", "-1");
     });
   }
@@ -481,7 +498,7 @@ function getActiveElement2() {
  * Lightweight DOM portal (teleport) utility with fully focus management.
  * Designed for accessible dialogs, menus, overlays, popovers.
  *
- * @version 1.2.2
+ * @version 1.2.4
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -489,6 +506,17 @@ function getActiveElement2() {
  */
 /*! Bundled license information:
 
+@y14e/attributes-utils/dist/index.js:
+  (**
+   * Attributes Utils
+   *
+   * @version 1.0.0
+   * @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

package/dist/index.d.cts

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

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,3 +1,34 @@
+// node_modules/@y14e/attributes-utils/dist/index.js
+var snapshots = /* @__PURE__ */ new WeakMap();
+function restoreAttributes(elements) {
+  elements.forEach((element) => {
+    const snapshot = snapshots.get(element);
+    if (!snapshot) {
+      return;
+    }
+    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 = {}) {
@@ -294,7 +325,6 @@ var Portal = class {
   #entranceSentinel;
   #exitSentinel;
   #focusables = /* @__PURE__ */ new Set();
-  #tabIndexes = /* @__PURE__ */ new Map();
   #controller = null;
   #isDestroyed = false;
   constructor(host, container) {
@@ -311,16 +341,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();
@@ -368,7 +390,8 @@ var Portal = class {
     }
   };
   #onKeyDown = (event) => {
-    if (event.key !== "Tab" || event.altKey || event.ctrlKey || event.metaKey) {
+    const { key, altKey, ctrlKey, metaKey, shiftKey } = event;
+    if (key !== "Tab" || altKey || ctrlKey || metaKey) {
       return;
     }
     const active = getActiveElement2();
@@ -382,7 +405,7 @@ var Portal = class {
     const focusables = this.#getFocusables();
     if (!focusables.length) {
       event.preventDefault();
-      this.#focusSentinel(event.shiftKey);
+      this.#focusSentinel(shiftKey);
       return;
     }
     const index = focusables.indexOf(active);
@@ -390,11 +413,11 @@ var Portal = class {
       return;
     }
     event.preventDefault();
-    const focusable = focusables[index + (event.shiftKey ? -1 : 1)];
+    const focusable = focusables[index + (shiftKey ? -1 : 1)];
     if (focusable) {
       focusElement(focusable);
     } else {
-      this.#focusSentinel(event.shiftKey);
+      this.#focusSentinel(shiftKey);
     }
   };
   #update() {
@@ -407,22 +430,16 @@ var Portal = class {
         return;
       }
       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) => {
       if (this.#focusables.has(c)) {
         return;
       }
       this.#focusables.add(c);
-      this.#tabIndexes.set(c, c.getAttribute("tabindex"));
+      saveAttributes([c], ["tabindex"]);
       c.setAttribute("tabindex", "-1");
     });
   }
@@ -479,7 +496,7 @@ function getActiveElement2() {
  * Lightweight DOM portal (teleport) utility with fully focus management.
  * Designed for accessible dialogs, menus, overlays, popovers.
  *
- * @version 1.2.2
+ * @version 1.2.4
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane
@@ -487,6 +504,17 @@ function getActiveElement2() {
  */
 /*! Bundled license information:
 
+@y14e/attributes-utils/dist/index.js:
+  (**
+   * Attributes Utils
+   *
+   * @version 1.0.0
+   * @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

package/package.json

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