adjust attach to use applyProps with a flag instead of always

nartc · nartc · commit b247f957dcfd · 2024-07-23T17:08:20.000-05:00
diff --git a/libs/core/src/lib/renderer/index.ts b/libs/core/src/lib/renderer/index.ts
@@ -360,9 +360,10 @@ export class NgtRenderer implements Renderer2 {
 					maybeCoerced = Number(maybeCoerced);
 				}
 				rS[NgtRendererClassId.rawValue] = maybeCoerced;
+			} else {
+				applyProps(el, { [name]: value });
 			}
 
-			applyProps(el, { [name]: value });
 			return false;
 		}
 
diff --git a/libs/core/src/lib/renderer/utils.ts b/libs/core/src/lib/renderer/utils.ts
@@ -95,7 +95,7 @@ export function attachThreeChild(parent: NgtInstanceNode, child: NgtInstanceNode
 				}
 				// at this point we don't have rawValue yet, so we bail and wait until the Renderer recalls attach
 				if (child.__ngt_renderer__[NgtRendererClassId.rawValue] === undefined) return;
-				attach(parent, child.__ngt_renderer__[NgtRendererClassId.rawValue], attachProp);
+				attach(parent, child.__ngt_renderer__[NgtRendererClassId.rawValue], attachProp, true);
 			} else {
 				attach(parent, child, attachProp);
 			}
diff --git a/libs/core/src/lib/utils/attach.ts b/libs/core/src/lib/utils/attach.ts
@@ -4,22 +4,28 @@ import { NgtAnyRecord } from '../types';
 import { applyProps } from './apply-props';
 import { NgtSignalStore } from './signal-store';
 
-export function attach(object: NgtAnyRecord, value: unknown, paths: string[] = []): void {
+export function attach(object: NgtAnyRecord, value: unknown, paths: string[] = [], useApplyProps = false): void {
 	const [base, ...remaining] = paths;
 	if (!base) return;
 
 	if (remaining.length === 0) {
-		applyProps(object, { [base]: value });
+		if (useApplyProps) applyProps(object, { [base]: value });
+		else object[base] = value;
 	} else {
 		assignEmpty(object, base);
-		attach(object[base], value, remaining);
+		attach(object[base], value, remaining, useApplyProps);
 	}
 }
 
-export function detach(parent: NgtAnyRecord, child: NgtAnyRecord, attachProp: string[] | NgtAttachFunction) {
+export function detach(
+	parent: NgtAnyRecord,
+	child: NgtAnyRecord,
+	attachProp: string[] | NgtAttachFunction,
+	useApplyProps = false,
+) {
 	const childLocalState = getLocalState(child);
 	if (childLocalState) {
-		if (Array.isArray(attachProp)) attach(parent, childLocalState.previousAttach, attachProp);
+		if (Array.isArray(attachProp)) attach(parent, childLocalState.previousAttach, attachProp, childLocalState.isRaw);
 		else (childLocalState.previousAttach as () => void)();
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -360,9 +360,10 @@ export class NgtRenderer implements Renderer2 {`
`360`	`360`	`maybeCoerced = Number(maybeCoerced);`
`361`	`361`	`}`
`362`	`362`	`rS[NgtRendererClassId.rawValue] = maybeCoerced;`
	`363`	`+ } else {`
	`364`	`+ applyProps(el, { [name]: value });`
`363`	`365`	`}`
`364`	`366`
`365`		`- applyProps(el, { [name]: value });`
`366`	`367`	`return false;`
`367`	`368`	`}`
`368`	`369`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ export function attachThreeChild(parent: NgtInstanceNode, child: NgtInstanceNode`
`95`	`95`	`}`
`96`	`96`	`// at this point we don't have rawValue yet, so we bail and wait until the Renderer recalls attach`
`97`	`97`	`if (child.__ngt_renderer__[NgtRendererClassId.rawValue] === undefined) return;`
`98`		`- attach(parent, child.__ngt_renderer__[NgtRendererClassId.rawValue], attachProp);`
	`98`	`+ attach(parent, child.__ngt_renderer__[NgtRendererClassId.rawValue], attachProp, true);`
`99`	`99`	`} else {`
`100`	`100`	`attach(parent, child, attachProp);`
`101`	`101`	`}`