Skip to content

Commit ca3d9bd

Browse files
author
Douglas Machado
authored
fix(android): potential navigation crash (#9996)
1 parent 4b0c812 commit ca3d9bd

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

packages/core/ui/frame/fragment.transitions.android.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -672,14 +672,19 @@ function transitionOrAnimationCompleted(entry: ExpandedEntry, backEntry: Backsta
672672

673673
entries.delete(entry);
674674
if (entries.size === 0) {
675-
const frame = entry.resolvedPage.frame;
676-
677675
// We have 0 or 1 entry per frameId in completedEntries
678676
// So there is no need to make it to Set like waitingQueue
679677
const previousCompletedAnimationEntry = completedEntries.get(frameId);
680678
completedEntries.delete(frameId);
681679
waitingQueue.delete(frameId);
682680

681+
if (!entry.resolvedPage) {
682+
if (Trace.isEnabled()) {
683+
Trace.write(`Transition completed - Entry ${entry} with unexpected null value for the resolvedPage property.`, Trace.categories.Transition, Trace.messageType.error);
684+
}
685+
return;
686+
}
687+
const frame = entry.resolvedPage.frame;
683688
const navigationContext = frame._executingContext || {
684689
navigationType: NavigationType.back,
685690
};

0 commit comments

Comments
 (0)