prlg-ui 1.7.18 → 1.7.20

package/dist/utils/onClickOutside.util.ts

@@ -1,5 +1,5 @@
 import type { ComponentPublicInstance, MaybeRef, MaybeRefOrGetter } from 'vue';
-import { unref, toValue, watch, isRef } from 'vue';
+import { unref, toValue } from 'vue';
 
 export type VueInstance = ComponentPublicInstance;
 export type MaybeElement = HTMLElement | SVGElement | VueInstance | undefined | null;
@@ -11,7 +11,6 @@ export interface OnClickOutsideOptions {
 }
 
 const activeListeners = new WeakMap<HTMLElement, () => void>();
-const activeWatchers = new WeakMap<any, () => void>();
 
 function unrefElement(elRef: MaybeElementRef<MaybeElement>): HTMLElement | null {
   const plain = unref(elRef);
@@ -30,89 +29,50 @@ export function onClickOutside(
     handler: (event: MouseEvent | TouchEvent) => void,
     options: OnClickOutsideOptions = {}
 ): () => void {
-  let currentElement: HTMLElement | null = null;
-  let currentListener: ((event: MouseEvent | TouchEvent) => void) | null = null;
+  const targetElement = resolveTarget(target);
+  if (!targetElement) return () => {};
+
+  // Remove existing listener if present
+  const existingCleanup = activeListeners.get(targetElement);
+  if (existingCleanup) {
+    existingCleanup();
+    activeListeners.delete(targetElement);
+  }
 
-  const setupListener = (targetElement: HTMLElement | null) => {
-    // Cleanup previous listener
-    if (currentElement && currentListener) {
-      document.removeEventListener('mousedown', currentListener, { capture: true });
-      document.removeEventListener('touchstart', currentListener, { capture: true });
-      activeListeners.delete(currentElement);
+  const listener = (event: MouseEvent | TouchEvent) => {
+    const targetNode = event.target instanceof Node ? event.target : null;
+    if (!targetNode) return;
+
+    const rawIgnores = toValue(options.ignore) ?? [];
+    const ignoreElements = rawIgnores
+        .map(el => {
+          if (typeof el === 'string') {
+            return document.querySelector(el) as HTMLElement | null;
+          }
+          return unrefElement(el);
+        })
+        .filter((el): el is HTMLElement => el !== null && el !== undefined);
+
+    if (
+        targetElement.contains(targetNode) ||
+        ignoreElements.some(ignoreEl => ignoreEl.contains(targetNode))
+    ) {
+      return;
     }
 
-    currentElement = targetElement;
-    currentListener = null;
-
-    if (!targetElement) return;
-
-    const listener = (event: MouseEvent | TouchEvent) => {
-      const targetNode = event.target instanceof Node ? event.target : null;
-      if (!targetNode) return;
-
-      const rawIgnores = toValue(options.ignore) ?? [];
-      const ignoreElements = rawIgnores
-          .map(el => {
-            if (typeof el === 'string') {
-              return document.querySelector(el) as HTMLElement | null;
-            }
-            return unrefElement(el);
-          })
-          .filter((el): el is HTMLElement => el !== null && el !== undefined);
-
-      if (
-          targetElement.contains(targetNode) ||
-          ignoreElements.some(ignoreEl => ignoreEl.contains(targetNode))
-      ) {
-        return;
-      }
-
-      handler(event);
-    };
-
-    currentListener = listener;
-    document.addEventListener('mousedown', listener, { capture: true });
-    document.addEventListener('touchstart', listener, { capture: true });
+    handler(event);
   };
 
-  // Initial setup
-  setupListener(resolveTarget(target));
-
-  // Watch for target changes if target is reactive
-  let stopWatcher: (() => void) | null = null;
-  if (isRef(target) || (typeof target === 'object' && target !== null)) {
-    try {
-      stopWatcher = watch(
-        () => resolveTarget(target),
-        (newElement) => {
-          setupListener(newElement);
-        },
-        { flush: 'sync' }
-      );
-      // Store watcher cleanup function
-      if (target && typeof target === 'object') {
-        activeWatchers.set(target, stopWatcher);
-      }
-    } catch {
-      // If watch fails (e.g., target is not reactive), continue without watching
-    }
-  }
+  document.addEventListener('mousedown', listener, { capture: true });
+  document.addEventListener('touchstart', listener, { capture: true });
 
+  // Store cleanup function and return it
   const cleanup = () => {
-    if (currentElement && currentListener) {
-      document.removeEventListener('mousedown', currentListener, { capture: true });
-      document.removeEventListener('touchstart', currentListener, { capture: true });
-      activeListeners.delete(currentElement);
-    }
-    if (stopWatcher) {
-      stopWatcher();
-      if (target && typeof target === 'object') {
-        activeWatchers.delete(target);
-      }
-    }
-    currentElement = null;
-    currentListener = null;
+    document.removeEventListener('mousedown', listener, { capture: true });
+    document.removeEventListener('touchstart', listener, { capture: true });
+    activeListeners.delete(targetElement);
   };
+  activeListeners.set(targetElement, cleanup);
 
   return cleanup;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "prlg-ui",
   "private": false,
-  "version": "1.7.18",
+  "version": "1.7.20",
   "type": "module",
   "main": "dist/prlg-ui.umd.js",
   "module": "dist/prlg-ui.es.js",

package/dist/onClickOutside.util-h1mIKJca.js

@@ -1,41 +0,0 @@
-import { isRef as L, watch as h, toValue as w, unref as E } from "vue";
-const a = /* @__PURE__ */ new WeakMap(), d = /* @__PURE__ */ new WeakMap();
-function m(e) {
-  const u = E(e);
-  return u?.$el ?? u;
-}
-function p(e) {
-  return typeof e == "string" ? document.querySelector(e) : m(e);
-}
-function k(e, u, v = {}) {
-  let r = null, n = null;
-  const f = (o) => {
-    if (r && n && (document.removeEventListener("mousedown", n, { capture: !0 }), document.removeEventListener("touchstart", n, { capture: !0 }), a.delete(r)), r = o, n = null, !o) return;
-    const s = (i) => {
-      const l = i.target instanceof Node ? i.target : null;
-      if (!l) return;
-      const y = (w(v.ignore) ?? []).map((t) => typeof t == "string" ? document.querySelector(t) : m(t)).filter((t) => t != null);
-      o.contains(l) || y.some((t) => t.contains(l)) || u(i);
-    };
-    n = s, document.addEventListener("mousedown", s, { capture: !0 }), document.addEventListener("touchstart", s, { capture: !0 });
-  };
-  f(p(e));
-  let c = null;
-  if (L(e) || typeof e == "object" && e !== null)
-    try {
-      c = h(
-        () => p(e),
-        (o) => {
-          f(o);
-        },
-        { flush: "sync" }
-      ), e && typeof e == "object" && d.set(e, c);
-    } catch {
-    }
-  return () => {
-    r && n && (document.removeEventListener("mousedown", n, { capture: !0 }), document.removeEventListener("touchstart", n, { capture: !0 }), a.delete(r)), c && (c(), e && typeof e == "object" && d.delete(e)), r = null, n = null;
-  };
-}
-export {
-  k as o
-};

package/dist/onClickOutside.util-s9tGCG0a.cjs

@@ -1 +0,0 @@
-"use strict";const s=require("vue"),a=new WeakMap,p=new WeakMap;function v(e){const o=s.unref(e);return o?.$el??o}function m(e){return typeof e=="string"?document.querySelector(e):v(e)}function h(e,o,y={}){let r=null,n=null;const d=u=>{if(r&&n&&(document.removeEventListener("mousedown",n,{capture:!0}),document.removeEventListener("touchstart",n,{capture:!0}),a.delete(r)),r=u,n=null,!u)return;const i=l=>{const f=l.target instanceof Node?l.target:null;if(!f)return;const L=(s.toValue(y.ignore)??[]).map(t=>typeof t=="string"?document.querySelector(t):v(t)).filter(t=>t!=null);u.contains(f)||L.some(t=>t.contains(f))||o(l)};n=i,document.addEventListener("mousedown",i,{capture:!0}),document.addEventListener("touchstart",i,{capture:!0})};d(m(e));let c=null;if(s.isRef(e)||typeof e=="object"&&e!==null)try{c=s.watch(()=>m(e),u=>{d(u)},{flush:"sync"}),e&&typeof e=="object"&&p.set(e,c)}catch{}return()=>{r&&n&&(document.removeEventListener("mousedown",n,{capture:!0}),document.removeEventListener("touchstart",n,{capture:!0}),a.delete(r)),c&&(c(),e&&typeof e=="object"&&p.delete(e)),r=null,n=null}}exports.onClickOutside=h;