fix(core): adjust nested effects

nartc · nartc · commit 59f0dda41027 · 2023-10-13T14:58:44.000-05:00
diff --git a/libs/core/src/lib/canvas.ts b/libs/core/src/lib/canvas.ts
@@ -262,9 +262,10 @@ export class NgtCanvas implements OnInit, OnChanges {
 						this.zone.runOutsideAngular(() => {
 							if (!this.configurator) this.configurator = this.initRoot(this.glCanvas.nativeElement);
 							this.configurator.configure({ ...inputs(), size: result });
+							this.configurator.startInvalidate();
 
 							if (this.glRef) {
-								this.cdr.detectChanges();
+								safeDetectChanges(this.cdr);
 							} else {
 								this.render();
 							}
@@ -346,7 +347,7 @@ export class NgtCanvas implements OnInit, OnChanges {
 				for (const [key, value] of Object.entries(this.sceneGraphInputs)) {
 					this.glRef.setInput(key, value);
 				}
-				this.glRef.changeDetectorRef.detectChanges();
+				safeDetectChanges(this.glRef.changeDetectorRef);
 			}
 		});
 	}
diff --git a/libs/core/src/lib/renderer/store.ts b/libs/core/src/lib/renderer/store.ts
@@ -236,7 +236,7 @@ export class NgtRendererStore {
 			return;
 		}
 
-		const parent = getLocalState(node).parent() || rS[NgtRendererClassId.parent];
+		const parent = untracked(getLocalState(node).parent) || rS[NgtRendererClassId.parent];
 
 		// [rawValue]
 		if (getLocalState(node).isRaw && name === SPECIAL_PROPERTIES.VALUE) {
diff --git a/libs/core/src/lib/roots.ts b/libs/core/src/lib/roots.ts
@@ -261,9 +261,13 @@ export function injectCanvasRootInitializer(injector?: Injector) {
 					if (state.frameloop !== frameloop) state.setFrameloop(frameloop);
 
 					isConfigured = true;
-
+				},
+				startInvalidate: () => {
 					invalidateRef?.destroy();
-					invalidateRef = effect(() => void store.state().invalidate(), { manualCleanup: true, injector });
+					return (invalidateRef = effect(() => void store.state().invalidate(), {
+						manualCleanup: true,
+						injector,
+					}));
 				},
 			};
 		};

Original file line number	Diff line number	Diff line change
`@@ -262,9 +262,10 @@ export class NgtCanvas implements OnInit, OnChanges {`
`262`	`262`	`this.zone.runOutsideAngular(() => {`
`263`	`263`	`if (!this.configurator) this.configurator = this.initRoot(this.glCanvas.nativeElement);`
`264`	`264`	`this.configurator.configure({ ...inputs(), size: result });`
	`265`	`+ this.configurator.startInvalidate();`
`265`	`266`
`266`	`267`	`if (this.glRef) {`
`267`		`- this.cdr.detectChanges();`
	`268`	`+ safeDetectChanges(this.cdr);`
`268`	`269`	`} else {`
`269`	`270`	`this.render();`
`270`	`271`	`}`
`@@ -346,7 +347,7 @@ export class NgtCanvas implements OnInit, OnChanges {`
`346`	`347`	`for (const [key, value] of Object.entries(this.sceneGraphInputs)) {`
`347`	`348`	`this.glRef.setInput(key, value);`
`348`	`349`	`}`
`349`		`- this.glRef.changeDetectorRef.detectChanges();`
	`350`	`+ safeDetectChanges(this.glRef.changeDetectorRef);`
`350`	`351`	`}`
`351`	`352`	`});`
`352`	`353`	`}`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ export class NgtRendererStore {`
`236`	`236`	`return;`
`237`	`237`	`}`
`238`	`238`
`239`		`- const parent = getLocalState(node).parent() \|\| rS[NgtRendererClassId.parent];`
	`239`	`+ const parent = untracked(getLocalState(node).parent) \|\| rS[NgtRendererClassId.parent];`
`240`	`240`
`241`	`241`	`// [rawValue]`
`242`	`242`	`if (getLocalState(node).isRaw && name === SPECIAL_PROPERTIES.VALUE) {`