ref: Use frameEntryLoaded event to properly process entry

CatchABus · CatchABus · commit 5f86bc7671aa · 2025-03-16T20:30:57.000+02:00
diff --git a/packages/core/ui/frame/frame-common.ts b/packages/core/ui/frame/frame-common.ts
@@ -122,18 +122,24 @@ export class FrameBase extends CustomLayoutView {
 	@profile
 	public onLoaded() {
 		const parentFrame = this.page?.frame;
-		// Pending frame can be the first frame in the view tree or a nested frame
-		const pendingFrame = parentFrame && parentFrame.isLoadingSubviews ? parentFrame : this;
-
-		pendingFrame.once(FrameBase.loadedEvent, () => {
-			this.onFrameLoaded();
-		});
 
 		super.onLoaded();
+
+		if (parentFrame && parentFrame.isLoadingSubviews) {
+			parentFrame.once('frameEntryLoaded', () => {
+				this.onFrameLoaded();
+			});
+		} else {
+			this.onFrameLoaded();
+		}
 	}
 
 	public onFrameLoaded(): void {
 		this._processNextNavigationEntry();
+		this.notify({
+			eventName: 'frameEntryLoaded',
+			object: this,
+		});
 	}
 
 	public canGoBack(): boolean {
diff --git a/packages/core/ui/frame/index.android.ts b/packages/core/ui/frame/index.android.ts
@@ -628,17 +628,20 @@ function cloneExpandedTransitionListener(expandedTransitionListener: any) {
 
 function getTransitionState(entry: BackstackEntry): TransitionState {
 	const expandedEntry = <any>entry;
-	const transitionState = <TransitionState>{};
+
+	let transitionState: TransitionState;
 
 	if (expandedEntry.enterTransitionListener && expandedEntry.exitTransitionListener) {
+		transitionState = <TransitionState>{};
+
 		transitionState.enterTransitionListener = cloneExpandedTransitionListener(expandedEntry.enterTransitionListener);
 		transitionState.exitTransitionListener = cloneExpandedTransitionListener(expandedEntry.exitTransitionListener);
 		transitionState.reenterTransitionListener = cloneExpandedTransitionListener(expandedEntry.reenterTransitionListener);
 		transitionState.returnTransitionListener = cloneExpandedTransitionListener(expandedEntry.returnTransitionListener);
 		transitionState.transitionName = expandedEntry.transitionName;
 		transitionState.entry = entry;
 	} else {
-		return null;
+		transitionState = null;
 	}
 
 	return transitionState;
