@y14e/portal 1.2.11 → 1.2.13

package/README.md

@@ -10,14 +10,14 @@ npm i @y14e/portal
 
 ```ts
 // npm
-import { createPortal } from '@y14e/portal@1.2.11';
+import { createPortal } from '@y14e/portal@1.2.13';
 
 // CDNs
-import { createPortal } from 'https://esm.sh/@y14e/portal@1.2.11';
+import { createPortal } from 'https://esm.sh/@y14e/portal@1.2.13';
 // or
-import { createPortal } from 'https://cdn.jsdelivr.net/npm/@y14e/portal@1.2.11/+esm';
+import { createPortal } from 'https://cdn.jsdelivr.net/npm/@y14e/portal@1.2.13/+esm';
 // or
-import { createPortal } from 'https://esm.unpkg.com/@y14e/portal@1.2.11';
+import { createPortal } from 'https://esm.unpkg.com/@y14e/portal@1.2.13';
 ```
 
 ## 📦 APIs

package/dist/index.cjs

@@ -400,6 +400,7 @@ var Portal = class {
   #exitSentinel;
   #focusables = /* @__PURE__ */ new Set();
   #controller = null;
+  #timer;
   #isDestroyed = false;
   constructor(host, container) {
     this.#host = host;
@@ -415,6 +416,10 @@ var Portal = class {
     this.#isDestroyed = true;
     this.#controller?.abort();
     this.#controller = null;
+    if (this.#timer !== void 0) {
+      cancelAnimationFrame(this.#timer);
+      this.#timer = void 0;
+    }
     restoreAttributes([...this.#focusables]);
     this.#focusables.clear();
     this.#exitSentinel.after(this.#host);
@@ -452,15 +457,7 @@ var Portal = class {
       }
       this.#update();
       const first = [...this.#focusables][0];
-      if (first) {
-        focusElement(first);
-      } else {
-        const next = getNextFocusable(document.body, {
-          anchor: this.#exitSentinel,
-          composed: true
-        });
-        next && focusElement(next);
-      }
+      first && focusElement(first);
       return;
     }
     if (current === this.#exitSentinel) {
@@ -470,15 +467,7 @@ var Portal = class {
       }
       this.#update();
       const last = [...this.#focusables].at(-1);
-      if (last) {
-        focusElement(last);
-      } else {
-        const previous = getPreviousFocusable(document.body, {
-          anchor: this.#entranceSentinel,
-          composed: true
-        });
-        previous && focusElement(previous);
-      }
+      last && focusElement(last);
       return;
     }
   };
@@ -498,7 +487,7 @@ var Portal = class {
     const focusables = this.#getFocusables();
     if (!focusables.length) {
       event.preventDefault();
-      this.#focusSentinel(shiftKey);
+      this.#moveFocus(shiftKey ? "previous" : "next");
       return;
     }
     const index = focusables.indexOf(active);
@@ -539,7 +528,8 @@ var Portal = class {
     return sentinel;
   }
   #focusSentinel(isPrevious) {
-    requestAnimationFrame(
+    this.#timer && cancelAnimationFrame(this.#timer);
+    this.#timer = requestAnimationFrame(
       () => (isPrevious ? this.#entranceSentinel : this.#exitSentinel).focus()
     );
   }
@@ -583,7 +573,7 @@ function getActiveElement2() {
  * Lightweight DOM portal (teleport) utility with fully focus management.
  * Designed for accessible dialogs, menus, overlays, popovers.
  *
- * @version 1.2.11
+ * @version 1.2.13
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

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.11
+ * @version 1.2.13
  * @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.11
+ * @version 1.2.13
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/dist/index.js

@@ -398,6 +398,7 @@ var Portal = class {
   #exitSentinel;
   #focusables = /* @__PURE__ */ new Set();
   #controller = null;
+  #timer;
   #isDestroyed = false;
   constructor(host, container) {
     this.#host = host;
@@ -413,6 +414,10 @@ var Portal = class {
     this.#isDestroyed = true;
     this.#controller?.abort();
     this.#controller = null;
+    if (this.#timer !== void 0) {
+      cancelAnimationFrame(this.#timer);
+      this.#timer = void 0;
+    }
     restoreAttributes([...this.#focusables]);
     this.#focusables.clear();
     this.#exitSentinel.after(this.#host);
@@ -450,15 +455,7 @@ var Portal = class {
       }
       this.#update();
       const first = [...this.#focusables][0];
-      if (first) {
-        focusElement(first);
-      } else {
-        const next = getNextFocusable(document.body, {
-          anchor: this.#exitSentinel,
-          composed: true
-        });
-        next && focusElement(next);
-      }
+      first && focusElement(first);
       return;
     }
     if (current === this.#exitSentinel) {
@@ -468,15 +465,7 @@ var Portal = class {
       }
       this.#update();
       const last = [...this.#focusables].at(-1);
-      if (last) {
-        focusElement(last);
-      } else {
-        const previous = getPreviousFocusable(document.body, {
-          anchor: this.#entranceSentinel,
-          composed: true
-        });
-        previous && focusElement(previous);
-      }
+      last && focusElement(last);
       return;
     }
   };
@@ -496,7 +485,7 @@ var Portal = class {
     const focusables = this.#getFocusables();
     if (!focusables.length) {
       event.preventDefault();
-      this.#focusSentinel(shiftKey);
+      this.#moveFocus(shiftKey ? "previous" : "next");
       return;
     }
     const index = focusables.indexOf(active);
@@ -537,7 +526,8 @@ var Portal = class {
     return sentinel;
   }
   #focusSentinel(isPrevious) {
-    requestAnimationFrame(
+    this.#timer && cancelAnimationFrame(this.#timer);
+    this.#timer = requestAnimationFrame(
       () => (isPrevious ? this.#entranceSentinel : this.#exitSentinel).focus()
     );
   }
@@ -581,7 +571,7 @@ function getActiveElement2() {
  * Lightweight DOM portal (teleport) utility with fully focus management.
  * Designed for accessible dialogs, menus, overlays, popovers.
  *
- * @version 1.2.11
+ * @version 1.2.13
  * @author Yusuke Kamiyamane
  * @license MIT
  * @copyright Copyright (c) Yusuke Kamiyamane

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@y14e/portal",
-  "version": "1.2.11",
+  "version": "1.2.13",
   "description": "Lightweight DOM portal (teleport) utility with fully focus management",
   "type": "module",
   "main": "./dist/index.cjs",