From 72fe1cbe71eec74a0fe1b4cca236fca36e946ffc Mon Sep 17 00:00:00 2001
From: Tim Doege <timdoege@gmail.com>
Date: Fri, 23 Oct 2026 20:34:53 +0200
Subject: [PATCH] fix(router): clear stale back-navigation marks on forward
 page navigation

_beginBackPageNavigation marks every descendant outlet as navigating back,
but only outlets activated during that back clear their mark. Outlets of a
page lower in the back stack (e.g. per-tab outlets of a tab page) keep it,
so a later forward navigation into that page was treated as a back
navigation for those outlets and they rendered blank.

_beginPageNavigation now clears the marks on all descendants of the
navigating outlet.
---
 .../lib/legacy/router/ns-location-strategy.ts | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/packages/angular/src/lib/legacy/router/ns-location-strategy.ts b/packages/angular/src/lib/legacy/router/ns-location-strategy.ts
index 07edcf87..7f3a7d51 100644
--- a/packages/angular/src/lib/legacy/router/ns-location-strategy.ts
+++ b/packages/angular/src/lib/legacy/router/ns-location-strategy.ts
@@ -288,22 +288,24 @@ export class NSLocationStrategy extends LocationStrategy implements OnDestroy {
     outlet.setOutletKeyNavigatingBack(outletKey);
     // outlet.isPageNavigationBack = true;
     // we find all the children and also set their isPageNavigationBack
-    this.outlets
-      .filter((o) => {
-        let parent = o.parent;
-        while (parent) {
-          if (parent === outlet) {
-            return true;
-          }
-          parent = parent.parent;
-        }
-        return false;
-      })
-      .forEach((o) => (o.isPageNavigationBack = true));
+    this.getDescendantOutlets(outlet).forEach((o) => (o.isPageNavigationBack = true));
 
     this.currentOutlet = outlet;
   }
 
+  private getDescendantOutlets(outlet: Outlet): Outlet[] {
+    return this.outlets.filter((o) => {
+      let parent = o.parent;
+      while (parent) {
+        if (parent === outlet) {
+          return true;
+        }
+        parent = parent.parent;
+      }
+      return false;
+    });
+  }
+
   public _finishBackPageNavigation(frame: Frame) {
     const outlet: Outlet = this.getOutletByFrame(frame);
 
@@ -366,6 +368,12 @@ export class NSLocationStrategy extends LocationStrategy implements OnDestroy {
     }
 
     this.currentOutlet = this.getOutletByFrame(frame) || this.currentOutlet;
+    // _beginBackPageNavigation marks every descendant outlet as going back, but only an outlet that
+    // is activated during that back clears its own mark. The outlets of a page lower in the back stack
+    // (for example the per-tab outlets of a tab page) are not activated, so they keep the mark. A later
+    // forward navigation into such a page then ran as a back navigation for those outlets and they
+    // rendered blank. A forward page navigation means no back is in progress below this outlet.
+    this.getDescendantOutlets(this.currentOutlet).forEach((o) => o._navigatingBackOutlets.clear());
     const lastState = this.currentOutlet.peekState();
 
     if (lastState) {