refactor(core): invoke setActiveConsumer in ɵɵdeferHydrateWhen at the right time (#58864)

AndrewKushnir · thePunderWoman · commit 03a14b5034ba · 2024-11-25T16:12:37.000Z
This commit updates the code of the `ɵɵdeferHydrateWhen` function to invoke the `setActiveConsumer` function at the right time (currently, we invoke it in the `finally` block, which is too late). PR Close #58864
diff --git a/packages/core/src/defer/instructions.ts b/packages/core/src/defer/instructions.ts
@@ -262,6 +262,7 @@ export function ɵɵdeferHydrateWhen(rawValue: unknown) {
       // We are on the server and SSR for defer blocks is enabled.
       triggerDeferBlock(lView, tNode);
     } else {
+      const prevConsumer = setActiveConsumer(null);
       try {
         const value = Boolean(rawValue); // handle truthy or falsy values
         if (value === true) {
@@ -274,7 +275,6 @@ export function ɵɵdeferHydrateWhen(rawValue: unknown) {
           triggerHydrationFromBlockName(injector, ssrUniqueId);
         }
       } finally {
-        const prevConsumer = setActiveConsumer(null);
         setActiveConsumer(prevConsumer);
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,7 @@ export function ɵɵdeferHydrateWhen(rawValue: unknown) {`
`262`	`262`	`// We are on the server and SSR for defer blocks is enabled.`
`263`	`263`	`triggerDeferBlock(lView, tNode);`
`264`	`264`	`} else {`
	`265`	`+ const prevConsumer = setActiveConsumer(null);`
`265`	`266`	`try {`
`266`	`267`	`const value = Boolean(rawValue); // handle truthy or falsy values`
`267`	`268`	`if (value === true) {`
`@@ -274,7 +275,6 @@ export function ɵɵdeferHydrateWhen(rawValue: unknown) {`
`274`	`275`	`triggerHydrationFromBlockName(injector, ssrUniqueId);`
`275`	`276`	`}`
`276`	`277`	`} finally {`
`277`		`- const prevConsumer = setActiveConsumer(null);`
`278`	`278`	`setActiveConsumer(prevConsumer);`
`279`	`279`	`}`
`280`	`280`	`}`