Update NavigationContext leafContext to be safe for Fragments which a…

…re not yet fully created
isaac-udy · Apr 25, 2024 · e43cc14 · e43cc14
1 parent 470177a
commit e43cc14
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/enro-core/src/main/java/dev/enro/core/NavigationContext.kt b/enro-core/src/main/java/dev/enro/core/NavigationContext.kt
@@ -201,10 +201,9 @@ public fun NavigationContext<*>.leafContext(): NavigationContext<*> {
         else -> null
     }
     return containerManager.activeContainer?.childContext?.leafContext()
-        ?: fragmentManager?.primaryNavigationFragment?.navigationContext?.leafContext()
+        ?: runCatching { fragmentManager?.primaryNavigationFragment?.navigationContext }.getOrNull()?.leafContext()
         ?: this
 }
-
 public val ComponentActivity.containerManager: NavigationContainerManager get() = navigationContext.containerManager
 public val Fragment.containerManager: NavigationContainerManager get() = navigationContext.containerManager
 public val ComposableDestination.containerManager: NavigationContainerManager get() = navigationContext.containerManager