@zag-js/interact-outside 0.0.0-dev-20230202113057 → 0.0.0-dev-20230217074947

package/dist/index.js

@@ -118,18 +118,44 @@ function addDomEvent(target, eventName, handler, options) {
 // src/index.ts
 var POINTER_OUTSIDE_EVENT = "pointerdown.outside";
 var FOCUS_OUTSIDE_EVENT = "focus.outside";
+function getWindowFrames(win) {
+  const frames = {
+    each(cb) {
+      for (let i = 0; i < win.frames?.length; i += 1) {
+        const frame = win.frames[i];
+        if (frame)
+          cb(frame);
+      }
+    },
+    addEventListener(event, listener, options) {
+      frames.each((frame) => {
+        frame.document.addEventListener(event, listener, options);
+      });
+      return () => {
+        frames.removeEventListener(event, listener, options);
+      };
+    },
+    removeEventListener(event, listener, options) {
+      frames.each((frame) => {
+        frame.document.removeEventListener(event, listener, options);
+      });
+    }
+  };
+  return frames;
+}
+var isHTMLElement2 = (node) => {
+  return node !== null && typeof node === "object" && node.nodeType === 1;
+};
 function trackInteractOutside(node, options) {
   const { exclude, onFocusOutside, onPointerDownOutside, onInteractOutside } = options;
   if (!node)
     return;
   const doc = getDocument(node);
   const win = getWindow(node);
+  const frames = getWindowFrames(win);
   function isEventOutside(event) {
     const target = getEventTarget(event);
-    if (!(target instanceof win.HTMLElement)) {
-      return false;
-    }
-    if (!contains(doc.documentElement, target)) {
+    if (!isHTMLElement2(target)) {
       return false;
     }
     if (contains(node, target)) {
@@ -157,15 +183,18 @@ function trackInteractOutside(node, options) {
       });
     }
     if (event.pointerType === "touch") {
+      frames.removeEventListener("click", handler);
       doc.removeEventListener("click", handler);
       clickHandler = handler;
       doc.addEventListener("click", handler, { once: true });
+      frames.addEventListener("click", handler, { once: true });
     } else {
       handler();
     }
   }
   const cleanups = /* @__PURE__ */ new Set();
   const timer = setTimeout(() => {
+    cleanups.add(frames.addEventListener("pointerdown", onPointerDown, true));
     cleanups.add(addDomEvent(doc, "pointerdown", onPointerDown, true));
   }, 0);
   function onFocusin(event) {
@@ -186,10 +215,13 @@ function trackInteractOutside(node, options) {
     });
   }
   cleanups.add(addDomEvent(doc, "focusin", onFocusin, true));
+  cleanups.add(frames.addEventListener("focusin", onFocusin, true));
   return () => {
     clearTimeout(timer);
-    if (clickHandler)
+    if (clickHandler) {
+      frames.removeEventListener("click", clickHandler);
       doc.removeEventListener("click", clickHandler);
+    }
     cleanups.forEach((fn) => fn());
   };
 }

package/dist/index.mjs

@@ -92,18 +92,44 @@ function addDomEvent(target, eventName, handler, options) {
 // src/index.ts
 var POINTER_OUTSIDE_EVENT = "pointerdown.outside";
 var FOCUS_OUTSIDE_EVENT = "focus.outside";
+function getWindowFrames(win) {
+  const frames = {
+    each(cb) {
+      for (let i = 0; i < win.frames?.length; i += 1) {
+        const frame = win.frames[i];
+        if (frame)
+          cb(frame);
+      }
+    },
+    addEventListener(event, listener, options) {
+      frames.each((frame) => {
+        frame.document.addEventListener(event, listener, options);
+      });
+      return () => {
+        frames.removeEventListener(event, listener, options);
+      };
+    },
+    removeEventListener(event, listener, options) {
+      frames.each((frame) => {
+        frame.document.removeEventListener(event, listener, options);
+      });
+    }
+  };
+  return frames;
+}
+var isHTMLElement2 = (node) => {
+  return node !== null && typeof node === "object" && node.nodeType === 1;
+};
 function trackInteractOutside(node, options) {
   const { exclude, onFocusOutside, onPointerDownOutside, onInteractOutside } = options;
   if (!node)
     return;
   const doc = getDocument(node);
   const win = getWindow(node);
+  const frames = getWindowFrames(win);
   function isEventOutside(event) {
     const target = getEventTarget(event);
-    if (!(target instanceof win.HTMLElement)) {
-      return false;
-    }
-    if (!contains(doc.documentElement, target)) {
+    if (!isHTMLElement2(target)) {
       return false;
     }
     if (contains(node, target)) {
@@ -131,15 +157,18 @@ function trackInteractOutside(node, options) {
       });
     }
     if (event.pointerType === "touch") {
+      frames.removeEventListener("click", handler);
       doc.removeEventListener("click", handler);
       clickHandler = handler;
       doc.addEventListener("click", handler, { once: true });
+      frames.addEventListener("click", handler, { once: true });
     } else {
       handler();
     }
   }
   const cleanups = /* @__PURE__ */ new Set();
   const timer = setTimeout(() => {
+    cleanups.add(frames.addEventListener("pointerdown", onPointerDown, true));
     cleanups.add(addDomEvent(doc, "pointerdown", onPointerDown, true));
   }, 0);
   function onFocusin(event) {
@@ -160,10 +189,13 @@ function trackInteractOutside(node, options) {
     });
   }
   cleanups.add(addDomEvent(doc, "focusin", onFocusin, true));
+  cleanups.add(frames.addEventListener("focusin", onFocusin, true));
   return () => {
     clearTimeout(timer);
-    if (clickHandler)
+    if (clickHandler) {
+      frames.removeEventListener("click", clickHandler);
       doc.removeEventListener("click", clickHandler);
+    }
     cleanups.forEach((fn) => fn());
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zag-js/interact-outside",
-  "version": "0.0.0-dev-20230202113057",
+  "version": "0.0.0-dev-20230217074947",
   "description": "Track interations or focus outside an element",
   "keywords": [
     "js",
@@ -17,8 +17,8 @@
   ],
   "devDependencies": {
     "clean-package": "2.2.0",
-    "@zag-js/dom-utils": "0.0.0-dev-20230202113057",
-    "@zag-js/utils": "0.0.0-dev-20230202113057"
+    "@zag-js/dom-utils": "0.2.4",
+    "@zag-js/utils": "0.3.3"
   },
   "publishConfig": {
     "access": "public"