From ae2cf69e5af317998fb0ca69025ba51592ac2fd8 Mon Sep 17 00:00:00 2001 From: YummYume Date: Sat, 15 Jun 2024 21:22:01 +0200 Subject: [PATCH] Revert typing fix for hooks (done in another pr) --- .../assets/dist/Component/index.d.ts | 4 ++-- .../assets/dist/HookManager.d.ts | 7 +++---- .../assets/src/Component/index.ts | 4 ++-- src/LiveComponent/assets/src/HookManager.ts | 19 ++++--------------- 4 files changed, 11 insertions(+), 23 deletions(-) diff --git a/src/LiveComponent/assets/dist/Component/index.d.ts b/src/LiveComponent/assets/dist/Component/index.d.ts index d1d0cdf23c..16cc46f9ea 100644 --- a/src/LiveComponent/assets/dist/Component/index.d.ts +++ b/src/LiveComponent/assets/dist/Component/index.d.ts @@ -13,8 +13,8 @@ export type ComponentHooks = { 'response:error': (backendResponse: BackendResponse, controls: { displayError: boolean; }) => MaybePromise; - 'loading.state:started': (element: HTMLElement, request: BackendRequest) => MaybePromise; - 'loading.state:finished': (element: HTMLElement) => MaybePromise; + 'loading.state.started': (element: HTMLElement, request: BackendRequest) => MaybePromise; + 'loading.state.finished': (element: HTMLElement) => MaybePromise; 'model:set': (model: string, value: any, component: Component) => MaybePromise; }; export type ComponentHookName = keyof ComponentHooks; diff --git a/src/LiveComponent/assets/dist/HookManager.d.ts b/src/LiveComponent/assets/dist/HookManager.d.ts index ef92e72aa0..17b0fd0761 100644 --- a/src/LiveComponent/assets/dist/HookManager.d.ts +++ b/src/LiveComponent/assets/dist/HookManager.d.ts @@ -1,7 +1,6 @@ -import type { ComponentHookName, ComponentHookCallback } from './Component'; export default class { private hooks; - register(hookName: T, callback: ComponentHookCallback): void; - unregister(hookName: T, callback: ComponentHookCallback): void; - triggerHook(hookName: T, ...args: Parameters>): void; + register(hookName: string, callback: (...args: any[]) => void): void; + unregister(hookName: string, callback: (...args: any[]) => void): void; + triggerHook(hookName: string, ...args: any[]): void; } diff --git a/src/LiveComponent/assets/src/Component/index.ts b/src/LiveComponent/assets/src/Component/index.ts index d01dc96717..fdd2b4b0f1 100644 --- a/src/LiveComponent/assets/src/Component/index.ts +++ b/src/LiveComponent/assets/src/Component/index.ts @@ -22,8 +22,8 @@ export type ComponentHooks = { 'request:started': (requestConfig: any) => MaybePromise, 'render:finished': (component: Component) => MaybePromise, 'response:error': (backendResponse: BackendResponse, controls: { displayError: boolean }) => MaybePromise, - 'loading.state:started': (element: HTMLElement, request: BackendRequest) => MaybePromise, - 'loading.state:finished': (element: HTMLElement) => MaybePromise, + 'loading.state.started': (element: HTMLElement, request: BackendRequest) => MaybePromise, + 'loading.state.finished': (element: HTMLElement) => MaybePromise, 'model:set': (model: string, value: any, component: Component) => MaybePromise, }; diff --git a/src/LiveComponent/assets/src/HookManager.ts b/src/LiveComponent/assets/src/HookManager.ts index 9db14fccb9..cbf0ab5bf8 100644 --- a/src/LiveComponent/assets/src/HookManager.ts +++ b/src/LiveComponent/assets/src/HookManager.ts @@ -1,21 +1,13 @@ -import type { ComponentHookName, ComponentHookCallback } from './Component'; - export default class { - private hooks: Map void>> = new Map(); + private hooks: Map void>> = new Map(); - register( - hookName: T, - callback: ComponentHookCallback - ): void { + register(hookName: string, callback: (...args: any[]) => void): void { const hooks = this.hooks.get(hookName) || []; hooks.push(callback); this.hooks.set(hookName, hooks); } - unregister( - hookName: T, - callback: ComponentHookCallback - ): void { + unregister(hookName: string, callback: (...args: any[]) => void): void { const hooks = this.hooks.get(hookName) || []; const index = hooks.indexOf(callback); if (index === -1) { @@ -26,10 +18,7 @@ export default class { this.hooks.set(hookName, hooks); } - triggerHook( - hookName: T, - ...args: Parameters> - ): void { + triggerHook(hookName: string, ...args: any[]): void { const hooks = this.hooks.get(hookName) || []; hooks.forEach((callback) => callback(...args)); }