Skip to content

Commit fd37f28

Browse files
committed
fix(core): adjust onLoad parameter type
1 parent b1d1006 commit fd37f28

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

libs/core/src/lib/loader.ts

+9-4
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ function load<
4444
TData,
4545
TUrl extends string | string[] | Record<string, string>,
4646
TLoaderConstructor extends NgtLoaderProto<TData>,
47+
TReturn = NgtLoaderReturnType<TData, TLoaderConstructor>,
4748
>(
4849
loaderConstructorFactory: (inputs: string[]) => TLoaderConstructor,
4950
inputs: () => TUrl,
@@ -53,7 +54,7 @@ function load<
5354
onProgress,
5455
}: {
5556
extensions?: NgtLoaderExtensions<TLoaderConstructor>;
56-
onLoad?: (data: TData) => void;
57+
onLoad?: (data: NoInfer<TReturn>) => void;
5758
onProgress?: (event: ProgressEvent) => void;
5859
} = {},
5960
) {
@@ -83,7 +84,7 @@ function load<
8384
}
8485

8586
if (onLoad) {
86-
onLoad(data);
87+
onLoad(data as unknown as TReturn);
8788
}
8889

8990
resolve(data);
@@ -115,7 +116,7 @@ function _injectLoader<
115116
}: {
116117
extensions?: NgtLoaderExtensions<TLoaderConstructor>;
117118
onProgress?: (event: ProgressEvent) => void;
118-
onLoad?: (data: NoInfer<TData>) => void;
119+
onLoad?: (data: NoInfer<TReturn>) => void;
119120
injector?: Injector;
120121
} = {},
121122
): Signal<NgtLoaderResults<TUrl, NgtBranchingReturn<TReturn, NgtGLTFLike, NgtGLTFLike & NgtObjectMap>> | null> {
@@ -127,7 +128,11 @@ function _injectLoader<
127128
> | null>(null);
128129

129130
afterNextRender(() => {
130-
const effector = load(loaderConstructorFactory, inputs, { extensions, onProgress, onLoad });
131+
const effector = load(loaderConstructorFactory, inputs, {
132+
extensions,
133+
onProgress,
134+
onLoad: onLoad as (data: unknown) => void,
135+
});
131136
autoEffect(
132137
() => {
133138
const originalUrls = inputs();

0 commit comments

Comments
 (0)