Skip to content

Commit 9b66b44

Browse files
Chau TranChau Tran
Chau Tran
authored and
Chau Tran
committed
fix(core): clean up injectNgtLoader
1 parent 92a5d50 commit 9b66b44

File tree

1 file changed

+19
-22
lines changed

1 file changed

+19
-22
lines changed

libs/angular-three/src/lib/loader.ts

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -107,28 +107,25 @@ export function injectNgtLoader<
107107
const response = signal<NgtLoaderResults<TUrl, NgtBranchingReturn<TReturn, GLTF, GLTF & NgtObjectMap>>>(null!);
108108
const effector = load(loaderConstructorFactory, inputs, { extensions, onProgress });
109109

110-
effect(
111-
() => {
112-
const originalUrls = untracked(inputs);
113-
Promise.all(effector())
114-
.then((results) => {
115-
if (Array.isArray(originalUrls)) return results;
116-
if (typeof originalUrls === 'string') return results[0];
117-
const keys = Object.keys(originalUrls);
118-
return keys.reduce((result, key) => {
119-
(result as NgtAnyRecord)[key] = results[keys.indexOf(key)];
120-
return result;
121-
}, {} as { [key in keyof TUrl]: NgtBranchingReturn<TReturn, GLTF, GLTF & NgtObjectMap> });
122-
})
123-
.then((value) => {
124-
response.set(
125-
value as NgtLoaderResults<TUrl, NgtBranchingReturn<TReturn, GLTF, GLTF & NgtObjectMap>>
126-
);
127-
safeDetectChanges(cdr);
128-
});
129-
},
130-
{ injector: injector!, allowSignalWrites: true }
131-
);
110+
effect(() => {
111+
const originalUrls = untracked(inputs);
112+
Promise.all(effector())
113+
.then((results) => {
114+
if (Array.isArray(originalUrls)) return results;
115+
if (typeof originalUrls === 'string') return results[0];
116+
const keys = Object.keys(originalUrls);
117+
return keys.reduce((result, key) => {
118+
(result as NgtAnyRecord)[key] = results[keys.indexOf(key)];
119+
return result;
120+
}, {} as { [key in keyof TUrl]: NgtBranchingReturn<TReturn, GLTF, GLTF & NgtObjectMap> });
121+
})
122+
.then((value) => {
123+
response.set(
124+
value as NgtLoaderResults<TUrl, NgtBranchingReturn<TReturn, GLTF, GLTF & NgtObjectMap>>
125+
);
126+
safeDetectChanges(cdr);
127+
});
128+
});
132129

133130
return response.asReadonly();
134131
});

0 commit comments

Comments
 (0)