From 0af39828fb3134ba84e3d054f9c0351612cd23a0 Mon Sep 17 00:00:00 2001 From: alexander Date: Wed, 22 May 2024 14:06:45 +0200 Subject: [PATCH] updated ready fn --- packages/clients/walkerjs/src/lib/trigger.ts | 18 ++++++++++-------- packages/utils/src/core/useHooks.ts | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/clients/walkerjs/src/lib/trigger.ts b/packages/clients/walkerjs/src/lib/trigger.ts index 671195ce..a29fd235 100644 --- a/packages/clients/walkerjs/src/lib/trigger.ts +++ b/packages/clients/walkerjs/src/lib/trigger.ts @@ -33,17 +33,19 @@ export const Trigger: { [key: string]: Walker.Trigger } = { Wait: 'wait', } as const; -export function ready( - run: (instance: WebClient.Instance) => void, - instance: WebClient.Instance, -) { - const fn = () => { - run(instance); +export function ready R, R>( + fn: T, + ...args: Parameters +): void { + const readyFn = () => { + fn(...args); }; + if (document.readyState !== 'loading') { - fn(); + readyFn(); } else { - document.addEventListener('DOMContentLoaded', fn); + document.addEventListener('DOMContentLoaded', readyFn); + return; } } diff --git a/packages/utils/src/core/useHooks.ts b/packages/utils/src/core/useHooks.ts index 7dd04a70..4c20cda3 100644 --- a/packages/utils/src/core/useHooks.ts +++ b/packages/utils/src/core/useHooks.ts @@ -1,6 +1,6 @@ import { Hooks } from '@elbwalker/types'; -export function useHooks

( +export function useHooks

( fn: (...args: P) => R, name: string, hooks: Hooks.Functions,