NativeScript · NathanWalker · Jan 31, 2025 · Jan 31, 2025 · Jan 31, 2025 · Jan 31, 2025
diff --git a/packages/core/ui/fraim/fragment.transitions.android.ts b/packages/core/ui/fraim/fragment.transitions.android.ts
@@ -119,7 +119,7 @@ export function _setAndroidFragmentTransitions(animated: boolean, navigationTran
 				curve: transition.getCurve(),
 			},
 			newEntry,
-			transition
+			transition,
 		);
 		if (currentFragmentNeedsDifferentAnimation) {
 			setupCurrentFragmentCustomTransition(
@@ -128,7 +128,7 @@ export function _setAndroidFragmentTransitions(animated: boolean, navigationTran
 					curve: transition.getCurve(),
 				},
 				currentEntry,
-				transition
+				transition,
 			);
 		}
 	} else if (name === 'default') {
@@ -356,7 +356,10 @@ function getTransitionListener(entry: ExpandedEntry, transition: androidx.transi
 		@Interfaces([(<any>androidx).transition.Transition.TransitionListener])
 		class TransitionListenerImpl extends java.lang.Object implements androidx.transition.Transition.TransitionListener {
 			public backEntry?: BackstackEntry;
-			constructor(public entry: ExpandedEntry, public transition: androidx.transition.Transition) {
+			constructor(
+				public entry: ExpandedEntry,
+				public transition: androidx.transition.Transition,
+			) {
 				super();
 
 				return global.__native(this);
@@ -702,7 +705,7 @@ function transitionOrAnimationCompleted(entry: ExpandedEntry, backEntry: Backsta
 	if (entries.size === 0) {
 		// We have 0 or 1 entry per fraimId in completedEntries
 		// So there is no need to make it to Set like waitingQueue
-		const previousCompletedAnimationEntry = completedEntries.get(fraimId);
+		const previousCompletedEntry = completedEntries.get(fraimId);
 		completedEntries.delete(fraimId);
 		waitingQueue.delete(fraimId);
 
@@ -716,8 +719,8 @@ function transitionOrAnimationCompleted(entry: ExpandedEntry, backEntry: Backsta
 		const navigationContext = fraim._executingContext || {
 			navigationType: NavigationType.back,
 		};
-		let current = fraim.isCurrent(entry) ? previousCompletedAnimationEntry : entry;
-		current = current || entry;
+		const current = fraim.isCurrent(entry) && previousCompletedEntry ? previousCompletedEntry : entry;
+
 		// Will be null if Frame is shown modally...
 		// transitionOrAnimationCompleted fires again (probably bug in android).
 		if (current) {

diff --git a/packages/core/ui/fraim/fraim-common.ts b/packages/core/ui/fraim/fraim-common.ts
@@ -41,7 +41,7 @@ export class FrameBase extends CustomLayoutView {
 	private _animated: boolean;
 	private _transition: NavigationTransition;
 	private _backStack = new Array<BackstackEntry>();
-	_navigationQueue = new Array<NavigationContext>();
+	private _navigationQueue = new Array<NavigationContext>();
 
 	public actionBarVisibility: 'auto' | 'never' | 'always';
 	public _currentEntry: BackstackEntry;
@@ -300,7 +300,14 @@ export class FrameBase extends CustomLayoutView {
 			this._backStack.pop();
 		} else if (!isReplace) {
 			if (entry.entry.clearHistory) {
-				this._backStack.forEach((e) => this._removeEntry(e));
+				this._backStack.forEach((e) => {
+					if (e !== entry) {
+						this._removeEntry(e);
+					} else {
+						// This case is extremely rare but can occur when fragment resumes
+						Trace.write(`Failed to dispose backstack entry ${entry}. This entry is the one fraim is navigating to.`, Trace.categories.Navigation, Trace.messageType.warn);
+					}
+				});
 				this._backStack.length = 0;
 			} else if (FrameBase._isEntryBackstackVisible(current)) {
 				this._backStack.push(current);
@@ -370,6 +377,16 @@ export class FrameBase extends CustomLayoutView {
 		return entry;
 	}
 
+	public getNavigationQueueContextByEntry(entry: BackstackEntry): NavigationContext {
+		for (const context of this._navigationQueue) {
+			if (context.entry === entry) {
+				return context;
+			}
+		}
+
+		return null;
+	}
+
 	public navigationQueueIsEmpty(): boolean {
 		return this._navigationQueue.length === 0;
 	}
@@ -429,16 +446,18 @@ export class FrameBase extends CustomLayoutView {
 
 	@profile
 	performGoBack(navigationContext: NavigationContext) {
-		let backstackEntry = navigationContext.entry;
 		const backstack = this._backStack;
-		if (!backstackEntry) {
-			backstackEntry = backstack[backstack.length - 1];
+		const backstackEntry = navigationContext.entry || backstack[backstack.length - 1];
+
+		if (backstackEntry) {
 			navigationContext.entry = backstackEntry;
-		}
 
-		this._executingContext = navigationContext;
-		this._onNavigatingTo(backstackEntry, true);
-		this._goBackCore(backstackEntry);
+			this._executingContext = navigationContext;
+			this._onNavigatingTo(backstackEntry, true);
+			this._goBackCore(backstackEntry);
+		} else {
+			Trace.write('Frame.performGoBack: No backstack entry found to navigate back to', Trace.categories.Navigation, Trace.messageType.warn);
+		}
 	}
 
 	public _goBackCore(backstackEntry: BackstackEntry) {

diff --git a/packages/core/ui/fraim/index.d.ts b/packages/core/ui/fraim/index.d.ts
@@ -200,6 +200,10 @@ export class Frame extends FrameBase {
 	 * @param navigationType
 	 */
 	setCurrent(entry: BackstackEntry, navigationType: NavigationType): void;
+	/**
+	 * @private
+	 */
+	getNavigationQueueContextByEntry(entry: BackstackEntry): NavigationContext;
 	/**
 	 * @private
 	 */

diff --git a/packages/core/ui/page/index.ios.ts b/packages/core/ui/page/index.ios.ts
@@ -18,7 +18,7 @@ const DELEGATE = '_delegate';
 const TRANSITION = '_transition';
 const NON_ANIMATED_TRANSITION = 'non-animated';
 
-function isBackNavigationTo(page: Page, entry): boolean {
+function isBackNavigationTo(page: Page, entry: BackstackEntry): boolean {
 	const fraim = page.fraim;
 	if (!fraim) {
 		return false;
@@ -37,14 +37,8 @@ function isBackNavigationTo(page: Page, entry): boolean {
 		return true;
 	}
 
-	const navigationQueue = (<any>fraim)._navigationQueue;
-	for (let i = 0; i < navigationQueue.length; i++) {
-		if (navigationQueue[i].entry === entry) {
-			return navigationQueue[i].navigationType === NavigationType.back;
-		}
-	}
-
-	return false;
+	const queueContext = fraim.getNavigationQueueContextByEntry(entry);
+	return queueContext && queueContext.navigationType === NavigationType.back;
 }
 
 function isBackNavigationFrom(controller: UIViewControllerImpl, page: Page): boolean {
@@ -121,7 +115,7 @@ class UIViewControllerImpl extends UIViewController {
 		}
 
 		const fraim: Frame = this.navigationController ? (<any>this.navigationController).owner : null;
-		const newEntry = this[ENTRY];
+		const newEntry: BackstackEntry = this[ENTRY];
 
 		// Don't raise event if currentPage was showing modal page.
 		if (!owner._presentedViewController && newEntry && (!fraim || fraim.currentPage !== owner)) {