@destyler/dismissable 0.2.11 → 0.2.13

package/dist/index.d.mts

@@ -1,17 +1,16 @@
 import { FocusOutsideEvent, InteractOutsideEvent, InteractOutsideHandlers, InteractOutsideHandlers as InteractOutsideHandlers$1, PointerDownOutsideEvent } from "@destyler/interact-outside";
 import { MaybeFunction } from "@destyler/utils";
-
 //#region src/dismissable-layer.d.ts
 type MaybeElement = HTMLElement | null;
 type Container = MaybeElement | Array<MaybeElement>;
 type NodeOrFn = MaybeFunction<MaybeElement>;
-interface DismissableElementHandlers extends InteractOutsideHandlers$1 {
+export interface DismissableElementHandlers extends InteractOutsideHandlers$1 {
   /**
    * Function called when the escape key is pressed
    */
   onEscapeKeyDown?: ((event: KeyboardEvent) => void) | undefined;
 }
-interface PersistentElementOptions {
+export interface PersistentElementOptions {
   /**
    * Returns the persistent elements that:
    * - should not have pointer-events disabled
@@ -19,7 +18,7 @@ interface PersistentElementOptions {
    */
   persistentElements?: Array<() => Element | null> | undefined;
 }
-interface DismissableElementOptions extends DismissableElementHandlers, PersistentElementOptions {
+export interface DismissableElementOptions extends DismissableElementHandlers, PersistentElementOptions {
   /**
    * Whether to log debug information
    */
@@ -41,9 +40,9 @@ interface DismissableElementOptions extends DismissableElementHandlers, Persiste
    */
   defer?: boolean | undefined;
 }
-declare function trackDismissableElement(nodeOrFn: NodeOrFn, options: DismissableElementOptions): () => void;
-declare function trackDismissableBranch(nodeOrFn: NodeOrFn, options?: {
+export declare function trackDismissableElement(nodeOrFn: NodeOrFn, options: DismissableElementOptions): () => void;
+export declare function trackDismissableBranch(nodeOrFn: NodeOrFn, options?: {
   defer?: boolean;
 }): () => void;
 //#endregion
-export { DismissableElementHandlers, DismissableElementOptions, type FocusOutsideEvent, type InteractOutsideEvent, type InteractOutsideHandlers, PersistentElementOptions, type PointerDownOutsideEvent, trackDismissableBranch, trackDismissableElement };
+export type { FocusOutsideEvent, InteractOutsideEvent, InteractOutsideHandlers, PointerDownOutsideEvent };

package/dist/index.mjs

@@ -1,7 +1,6 @@
 import { addDomEvent, contains, getDocument, getEventTarget, isHTMLElement, raf, setStyle, waitForElements } from "@destyler/dom";
 import { trackInteractOutside } from "@destyler/interact-outside";
 import { isFunction } from "@destyler/utils";
-
 //#region src/escape-keydown.ts
 function trackEscapeKeydown(node, fn) {
 	const handleKeyDown = (event) => {
@@ -11,7 +10,6 @@ function trackEscapeKeydown(node, fn) {
 	};
 	return addDomEvent(getDocument(node), "keydown", handleKeyDown, { capture: true });
 }
-
 //#endregion
 //#region src/layer-stack.ts
 const layerStack = {
@@ -72,7 +70,6 @@ const layerStack = {
 		this.remove(this.layers[0].node);
 	}
 };
-
 //#endregion
 //#region src/pointer-event-outside.ts
 let originalBodyPointerEvents;
@@ -94,13 +91,12 @@ function disablePointerEventsOutside(node, persistentElements) {
 			doc.body.setAttribute("data-inert", "");
 		});
 	}
-	if (persistentElements) {
-		const persistedCleanup = waitForElements(persistentElements, (el) => {
-			cleanups.push(setStyle(el, { pointerEvents: "auto" }));
-		});
-		cleanups.push(persistedCleanup);
-	}
+	let cancelPersistentWait;
+	if (persistentElements) cancelPersistentWait = waitForElements(persistentElements, (el) => {
+		cleanups.push(setStyle(el, { pointerEvents: "auto" }));
+	});
 	return () => {
+		cancelPersistentWait?.();
 		if (layerStack.hasPointerBlockingLayer()) return;
 		queueMicrotask(() => {
 			doc.body.style.pointerEvents = originalBodyPointerEvents;
@@ -110,7 +106,6 @@ function disablePointerEventsOutside(node, persistentElements) {
 		cleanups.forEach((fn) => fn());
 	};
 }
-
 //#endregion
 //#region src/dismissable-layer.ts
 function trackDismissableElementImpl(node, options) {
@@ -155,7 +150,7 @@ function trackDismissableElementImpl(node, options) {
 		const _containers = Array.isArray(containers) ? containers : [containers];
 		const persistentElements = options.persistentElements?.map((fn) => fn()).filter(isHTMLElement);
 		if (persistentElements) _containers.push(...persistentElements);
-		return _containers.some((node$1) => contains(node$1, target)) || layerStack.isInNestedLayer(node, target);
+		return _containers.some((node) => contains(node, target)) || layerStack.isInNestedLayer(node, target);
 	}
 	const cleanups = [
 		pointerBlocking ? disablePointerEventsOutside(node, options.persistentElements) : void 0,
@@ -202,6 +197,5 @@ function trackDismissableBranch(nodeOrFn, options = {}) {
 		cleanups.forEach((fn) => fn?.());
 	};
 }
-
 //#endregion
-export { trackDismissableBranch, trackDismissableElement };
+export { trackDismissableBranch, trackDismissableElement };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@destyler/dismissable",
   "type": "module",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "description": "Dismissable layer utilities for the dom",
   "author": "Elone Hoo <elonehoo@gmail.com>",
   "license": "MIT",
@@ -22,9 +22,9 @@
     "dist"
   ],
   "dependencies": {
-    "@destyler/interact-outside": "0.2.11",
-    "@destyler/dom": "0.2.11",
-    "@destyler/utils": "0.2.11"
+    "@destyler/dom": "0.2.13",
+    "@destyler/interact-outside": "0.2.13",
+    "@destyler/utils": "0.2.13"
   },
   "publishConfig": {
     "access": "public"