@whitesev/domutils 1.6.3 → 1.6.5

package/src/DOMUtilsCommonUtils.ts

@@ -7,11 +7,15 @@ import {
 } from "worker-timers";
 
 /** 通用工具类 */
-const DOMUtilsCommonUtils = {
+export const DOMUtilsCommonUtils = {
 	windowApi: new WindowApi({
 		document: document,
 		window: window,
 		top: top!,
+		setTimeout: setTimeout,
+		clearTimeout: clearTimeout,
+		setInterval: setInterval,
+		clearInterval: clearInterval,
 	}),
 	/**
 	 * 判断元素是否已显示或已连接
@@ -142,7 +146,7 @@ const DOMUtilsCommonUtils = {
 		try {
 			return WorkerSetTimeout(callback, timeout);
 		} catch (error) {
-			return globalThis.setTimeout(callback, timeout);
+			return this.windowApi.setTimeout(callback, timeout);
 		}
 	},
 	/**
@@ -155,7 +159,7 @@ const DOMUtilsCommonUtils = {
 			}
 		} catch (error) {
 		} finally {
-			globalThis.clearTimeout(timeId);
+			this.windowApi.clearTimeout(timeId);
 		}
 	},
 	/**
@@ -165,7 +169,7 @@ const DOMUtilsCommonUtils = {
 		try {
 			return WorkerSetInterval(callback, timeout);
 		} catch (error) {
-			return globalThis.setInterval(callback, timeout);
+			return this.windowApi.setInterval(callback, timeout);
 		}
 	},
 	/**
@@ -178,7 +182,7 @@ const DOMUtilsCommonUtils = {
 			}
 		} catch (error) {
 		} finally {
-			globalThis.clearInterval(timeId);
+			this.windowApi.clearInterval(timeId);
 		}
 	},
 	/**
@@ -197,4 +201,3 @@ const DOMUtilsCommonUtils = {
 		return ["webkitTransitionEnd", "mozTransitionEnd", "MSTransitionEnd", "otransitionend", "transitionend"];
 	},
 };
-export { DOMUtilsCommonUtils };

package/src/WindowApi.ts

@@ -8,6 +8,10 @@ export class WindowApi {
 		globalThis: globalThis,
 		self: self,
 		top: top!,
+		setTimeout: globalThis.setTimeout.bind(globalThis),
+		setInterval: globalThis.setInterval.bind(globalThis),
+		clearTimeout: globalThis.clearTimeout.bind(globalThis),
+		clearInterval: globalThis.clearInterval.bind(globalThis),
 	};
 	/** 使用的配置 */
 	private api: Required<WindowApiOption>;
@@ -23,8 +27,7 @@ export class WindowApi {
 		if (!option) {
 			option = Object.assign({}, this.defaultApi);
 		}
-		// @ts-ignore
-		this.api = Object.assign({}, option);
+		this.api = Object.assign({}, option as Required<WindowApiOption>);
 	}
 	get document() {
 		return this.api.document;
@@ -41,4 +44,16 @@ export class WindowApi {
 	get top() {
 		return this.api.top;
 	}
+	get setTimeout() {
+		return this.api.setTimeout;
+	}
+	get clearTimeout() {
+		return this.api.clearTimeout;
+	}
+	get setInterval() {
+		return this.api.setInterval;
+	}
+	get clearInterval() {
+		return this.api.clearInterval;
+	}
 }

package/src/types/WindowApi.d.ts

@@ -7,4 +7,8 @@ export type WindowApiOption = {
 	globalThis?: typeof globalThis | Window;
 	self?: Window & typeof globalThis;
 	top: Window;
+	setTimeout: typeof setTimeout;
+	clearTimeout: typeof clearTimeout;
+	setInterval: typeof setInterval;
+	clearInterval: typeof clearInterval;
 };