@destyler/interact-outside 0.1.0 → 0.2.0-beta.5

package/dist/{index.js → index.mjs}

@@ -77,17 +77,15 @@ function isEventWithinScrollbar(event, ancestor) {
 	const onScrollbarY = isScrollableY && event.clientX > ancestor.offsetLeft + ancestor.clientWidth;
 	const isScrollableX = ancestor.scrollWidth > ancestor.clientWidth;
 	const onScrollbarX = isScrollableX && event.clientY > ancestor.offsetTop + ancestor.clientHeight;
-	const rect = {
+	if (!isPointInRect({
 		x: ancestor.offsetLeft,
 		y: ancestor.offsetTop,
 		width: ancestor.clientWidth + (isScrollableY ? 16 : 0),
 		height: ancestor.clientHeight + (isScrollableX ? 16 : 0)
-	};
-	const point = {
+	}, {
 		x: event.clientX,
 		y: event.clientY
-	};
-	if (!isPointInRect(rect, point)) return false;
+	})) return false;
 	return onScrollbarY || onScrollbarX;
 }
 function trackInteractOutsideImpl(node, options) {
@@ -105,11 +103,9 @@ function trackInteractOutsideImpl(node, options) {
 		if (isEventPointWithin(node, event)) return false;
 		const triggerEl = doc.querySelector(`[aria-controls="${node.id}"]`);
 		if (triggerEl) {
-			const triggerAncestor = getNearestOverflowAncestor(triggerEl);
-			if (isEventWithinScrollbar(event, triggerAncestor)) return false;
+			if (isEventWithinScrollbar(event, getNearestOverflowAncestor(triggerEl))) return false;
 		}
-		const nodeAncestor = getNearestOverflowAncestor(node);
-		if (isEventWithinScrollbar(event, nodeAncestor)) return false;
+		if (isEventWithinScrollbar(event, getNearestOverflowAncestor(node))) return false;
 		return !exclude?.(target);
 	}
 	const pointerdownCleanups = /* @__PURE__ */ new Set();
@@ -148,8 +144,7 @@ function trackInteractOutsideImpl(node, options) {
 		cleanups.add(frames.addEventListener("pointerdown", onPointerDown, true));
 	}, 0);
 	function onFocusin(event) {
-		const func = defer ? raf : (v) => v();
-		func(() => {
+		(defer ? raf : (v) => v())(() => {
 			if (!node || !isEventOutside(event)) return;
 			if (onFocusOutside || onInteractOutside) {
 				const handler = callAll(onFocusOutside, onInteractOutside);
@@ -188,8 +183,7 @@ function trackInteractOutside(nodeOrFn, options) {
 	};
 }
 function fireCustomEvent(el, type, init) {
-	const win = el.ownerDocument.defaultView || window;
-	const event = new win.CustomEvent(type, init);
+	const event = new (el.ownerDocument.defaultView || window).CustomEvent(type, init);
 	return el.dispatchEvent(event);
 }
 

package/package.json

@@ -1,23 +1,32 @@
 {
   "name": "@destyler/interact-outside",
   "type": "module",
-  "version": "0.1.0",
+  "version": "0.2.0-beta.5",
   "description": "",
   "author": "Elone Hoo <elonehoo@gmail.com>",
   "license": "MIT",
+  "homepage": "https://github.com/destyler/destyler",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/destyler/destyler.git",
+    "directory": "packages/shareds/interact-outside"
+  },
   "exports": {
-    ".": "./dist/index.js"
+    ".": "./dist/index.mjs"
   },
-  "main": "dist/index.js",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "dist/index.mjs",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.mts",
   "files": [
     "*.d.ts",
     "dist"
   ],
   "dependencies": {
-    "@destyler/dom": "0.1.0",
-    "@destyler/utils": "0.1.0"
+    "@destyler/dom": "0.2.0-beta.5",
+    "@destyler/utils": "0.2.0-beta.5"
+  },
+  "publishConfig": {
+    "access": "public"
   },
   "scripts": {
     "clear": "rimraf ./dist",