feat(soba/loaders): rename injectProgress to progress

nartc · nartc · commit e2b059202d75 · 2025-03-22T09:00:51.000-05:00
diff --git a/libs/soba/loaders/src/lib/loader.ts b/libs/soba/loaders/src/lib/loader.ts
@@ -2,7 +2,6 @@ import {
 	ChangeDetectionStrategy,
 	Component,
 	ElementRef,
-	computed,
 	effect,
 	input,
 	signal,
@@ -11,7 +10,7 @@ import {
 } from '@angular/core';
 import { pick } from 'angular-three';
 import { mergeInputs } from 'ngxtension/inject-inputs';
-import { injectProgress } from './progress';
+import { progress } from './progress';
 
 const defaultDataInterpolation = (p: number) => `Loading ${p.toFixed(2)}%`;
 
@@ -59,10 +58,10 @@ const defaultOptions: NgtsLoaderOptions = {
 	changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class NgtsLoader {
-	private progressState = injectProgress();
+	private progressState = progress();
 
-	protected active = computed(() => this.progressState().active);
-	protected progress = computed(() => this.progressState().progress);
+	protected active = this.progressState.active;
+	protected progress = this.progressState.progress;
 
 	options = input(defaultOptions, { transform: mergeInputs(defaultOptions) });
 
diff --git a/libs/soba/loaders/src/lib/progress.ts b/libs/soba/loaders/src/lib/progress.ts
@@ -1,10 +1,11 @@
-import { DestroyRef, inject, Injector, signal } from '@angular/core';
+import { DestroyRef, inject, Injector } from '@angular/core';
+import { signalState } from 'angular-three';
 import { assertInjector } from 'ngxtension/assert-injector';
 import * as THREE from 'three';
 
-export function injectProgress(injector?: Injector) {
-	return assertInjector(injectProgress, injector, () => {
-		const progress = signal<{
+export function progress(injector?: Injector) {
+	return assertInjector(progress, injector, () => {
+		const progressState = signalState<{
 			errors: string[];
 			active: boolean;
 			progress: number;
@@ -21,34 +22,32 @@ export function injectProgress(injector?: Injector) {
 		let saveLastTotalLoaded = 0;
 
 		THREE.DefaultLoadingManager.onStart = (item, loaded, total) => {
-			progress.update((prev) => ({
-				...prev,
+			progressState.update({
 				active: true,
 				item,
 				loaded,
 				total,
 				progress: ((loaded - saveLastTotalLoaded) / (total - saveLastTotalLoaded)) * 100,
-			}));
+			});
 		};
 
 		THREE.DefaultLoadingManager.onLoad = () => {
-			progress.update((prev) => ({ ...prev, active: false }));
+			progressState.update({ active: false });
 		};
 
 		THREE.DefaultLoadingManager.onError = (url) => {
-			progress.update((prev) => ({ ...prev, errors: [...prev.errors, url] }));
+			progressState.update((prev) => ({ errors: [...prev.errors, url] }));
 		};
 
 		THREE.DefaultLoadingManager.onProgress = (item, loaded, total) => {
 			if (loaded === total) saveLastTotalLoaded = total;
 
-			progress.update((prev) => ({
-				...prev,
+			progressState.update({
 				item,
 				loaded,
 				total,
 				progress: ((loaded - saveLastTotalLoaded) / (total - saveLastTotalLoaded)) * 100 || 100,
-			}));
+			});
 		};
 
 		inject(DestroyRef).onDestroy(() => {
@@ -58,6 +57,12 @@ export function injectProgress(injector?: Injector) {
 			THREE.DefaultLoadingManager.onProgress = defaultOnProgress;
 		});
 
-		return progress.asReadonly();
+		return progressState;
 	});
 }
+
+/**
+ * @deprecated Use `progress` instead. Will be removed in v5.0.0
+ * @since v4.0.0
+ */
+export const injectProgress = progress;
