ref: Use event listeners to process nested frame entries in the correct order

CatchABus · CatchABus · commit 07f3a16077f6 · 2025-03-03T23:19:20.000+02:00
diff --git a/packages/core/ui/core/view-base/index.ts b/packages/core/ui/core/view-base/index.ts
@@ -345,6 +345,7 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
 	private _androidView: Object;
 	private _style: Style;
 	private _isLoaded: boolean;
+	private _isLoadingSubviews: boolean;
 
 	/**
 	 * @deprecated
@@ -637,6 +638,10 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
 		return this._isLoaded;
 	}
 
+	get isLoadingSubviews(): boolean {
+		return this._isLoadingSubviews;
+	}
+
 	get ['class'](): string {
 		return this.className;
 	}
@@ -686,14 +691,6 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
 		this[name] = WrappedValue.unwrap(value);
 	}
 
-	public loadSubviews(): void {
-		this.eachChild((child) => {
-			this.loadView(child);
-
-			return true;
-		});
-	}
-
 	@profile
 	public onLoaded() {
 		this.setFlag(Flags.superOnLoadedCalled, true);
@@ -705,7 +702,15 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
 		this._cssState.onLoaded();
 		this._resumeNativeUpdates(SuspendType.Loaded);
 
-		this.loadSubviews();
+		this._isLoadingSubviews = true;
+
+		this.eachChild((child) => {
+			this.loadView(child);
+
+			return true;
+		});
+
+		this._isLoadingSubviews = false;
 
 		this._emit('loaded');
 	}
diff --git a/packages/core/ui/frame/frame-common.ts b/packages/core/ui/frame/frame-common.ts
@@ -119,6 +119,31 @@ export class FrameBase extends CustomLayoutView {
 		throw new Error(`Frame should not have a view. Use 'defaultPage' property instead.`);
 	}
 
+	@profile
+	public onLoaded() {
+		const parentFrame = this.page?.frame;
+		let pendingFrame: FrameBase;
+
+		// This frame is a nested frame as it resides inside the Page view of another frame
+		if (parentFrame && parentFrame.isLoadingSubviews) {
+			pendingFrame = parentFrame;
+		} else {
+			pendingFrame = this;
+		}
+
+		// Process the entry of a nested frame once its parent has been loaded
+		// or wait for it to be loaded in case it's not nested inside another frame
+		pendingFrame.once(FrameBase.loadedEvent, () => {
+			this.onFrameLoaded();
+		});
+
+		super.onLoaded();
+	}
+
+	public onFrameLoaded(): void {
+		this._processNextNavigationEntry();
+	}
+
 	public canGoBack(): boolean {
 		let backstack = this._backStack.length;
 		let previousForwardNotInBackstack = false;
diff --git a/packages/core/ui/frame/index.android.ts b/packages/core/ui/frame/index.android.ts
@@ -245,10 +245,8 @@ export class Frame extends FrameBase {
 		super.onLoaded();
 	}
 
-	public override loadSubviews(): void {
-		// Process navigation entry after loading view but before loading children views, otherwise the navigation entries of nested frames will be processed first
-		// and needed fragments won't have been attached yet
-		this._processNextNavigationEntry();
+	public onFrameLoaded(): void {
+		super.onFrameLoaded();
 
 		// TODO: Check if this is still needed since there have been new improvements regarding fragment restoration
 		// there's a bug with nested frames where sometimes the nested fragment is not recreated at all
@@ -266,12 +264,11 @@ export class Frame extends FrameBase {
 
 			this._frameCreateTimeout = null;
 		}, 0);
-
-		super.loadSubviews();
 	}
 
 	onUnloaded() {
 		super.onUnloaded();
+
 		if (typeof this._frameCreateTimeout === 'number') {
 			clearTimeout(this._frameCreateTimeout);
 			this._frameCreateTimeout = null;
diff --git a/packages/core/ui/frame/index.ios.ts b/packages/core/ui/frame/index.ios.ts
@@ -75,14 +75,6 @@ export class Frame extends FrameBase {
 		return this._ios;
 	}
 
-	public override loadSubviews(): void {
-		// Process navigation entry after loading view but before loading children views, otherwise the navigation entries of nested frames will be processed first
-		// and needed fragments won't have been attached yet
-		this._processNextNavigationEntry();
-
-		super.loadSubviews();
-	}
-
 	public setCurrent(entry: BackstackEntry, navigationType: NavigationType): void {
 		const current = this._currentEntry;
 		const currentEntryChanged = current !== entry;
@@ -525,7 +517,7 @@ class UINavigationControllerImpl extends UINavigationController {
 		}
 	}
 
-	private animateWithDuration(navigationTransition: NavigationTransition, nativeTransition: UIViewAnimationTransition, transitionType: string, baseCallback: Function): void {
+	private animateWithDuration(navigationTransition: NavigationTransition, nativeTransition: UIViewAnimationTransition, transitionType: string, baseCallback: () => void): void {
 		const duration = navigationTransition.duration ? navigationTransition.duration / 1000 : CORE_ANIMATION_DEFAULTS.duration;
 		const curve = _getNativeCurve(navigationTransition);
 
