angular · atscott · Feb 8, 2024
diff --git a/packages/core/src/application/application_ref.ts b/packages/core/src/application/application_ref.ts
@@ -702,8 +702,5 @@ export function whenStable(applicationRef: ApplicationRef): Promise<void> {
 
 
 function shouldRecheckView(view: LView): boolean {
-  return requiresRefreshOrTraversal(view);
-  // TODO(atscott): We need to support rechecking views marked dirty again in afterRender hooks
-  // in order to support the transition to zoneless. b/308152025
-  /* || !!(view[FLAGS] & LViewFlags.Dirty); */
+  return requiresRefreshOrTraversal(view) || !!(view[FLAGS] & LViewFlags.Dirty); 
 }
diff --git a/packages/core/src/render3/instructions/change_detection.ts b/packages/core/src/render3/instructions/change_detection.ts
@@ -134,6 +134,7 @@ export function refreshView<T>(
   !isInCheckNoChangesPass && lView[ENVIRONMENT].inlineEffectRunner?.flush();
 
 
+  lView[FLAGS] |= LViewFlags.ExecutingRefresh;
   // Start component reactive context
   // - We might already be in a reactive context if this is an embedded view of the host.
   // - We might be descending into a view that needs a consumer.
@@ -277,6 +278,7 @@ export function refreshView<T>(
       maybeReturnReactiveLViewConsumer(currentConsumer);
     }
     leaveView();
+    lView[FLAGS] &= ~LViewFlags.ExecutingRefresh;
   }
 }
 

diff --git a/packages/core/src/render3/instructions/mark_view_dirty.ts b/packages/core/src/render3/instructions/mark_view_dirty.ts
@@ -19,19 +19,23 @@ import {getLViewParent} from '../util/view_utils';
  * an additional time to get the root view and schedule a tick on it.
  *
  * @param lView The starting LView to mark dirty
- * @returns the root LView
  */
-export function markViewDirty(lView: LView): LView|null {
+export function markViewDirty(lView: LView) {
   lView[ENVIRONMENT].changeDetectionScheduler?.notify();
   while (lView) {
+    // If we're already refreshing the view, we should not mark it or ancestors dirty.
+    // This is `ExpressionHasChangedAfterItWasCheckedError` if any bindings have actually changed
+    // and completely unnecessary to refresh views again if there weren't any updated bindings.
+    if (lView[FLAGS] & LViewFlags.ExecutingRefresh) {
+      return;
+    }
     lView[FLAGS] |= LViewFlags.Dirty;
     const parent = getLViewParent(lView);
     // Stop traversing up as soon as you find a root view that wasn't attached to any container
     if (isRootView(lView) && !parent) {
-      return lView;
+      return;
     }
     // continue otherwise
     lView = parent!;
   }
-  return null;
 }
diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
@@ -442,10 +442,15 @@ export const enum LViewFlags {
    */
   HasChildViewsToRefresh = 1 << 13,
 
+  /**
+   * Flag used to indicate that we are current running `refreshView` on the LView.
+   */
+  ExecutingRefresh = 1 << 14,
+
   /**
    * This is the count of the bits the 1 was shifted above (base 10)
    */
-  IndexWithinInitPhaseShift = 14,
+  IndexWithinInitPhaseShift = 15,
 
   /**
    * Index of the current init phase on last 21 bits

diff --git a/packages/core/test/acceptance/after_render_hook_spec.ts b/packages/core/test/acceptance/after_render_hook_spec.ts
@@ -946,8 +946,7 @@ describe('after render hooks', () => {
       const appRef = TestBed.inject(ApplicationRef);
       appRef.attachView(fixture.componentRef.hostView);
       appRef.tick();
-      // TODO(atscott): We need to support this for zoneless to succeed
-      expect(fixture.nativeElement.innerText).toBe('0');
+      expect(fixture.nativeElement.innerText).toBe('1');
     });
 
     it('throws error when causing infinite updates', () => {