Replace providesDefault in Navigator with provides and an if-check

Vodes · Dec 17, 2024 · 8318c66 · 8318c66
1 parent d140871
commit 8318c66
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/voyager-navigator/src/commonMain/kotlin/cafe/adriel/voyager/navigator/Navigator.kt b/voyager-navigator/src/commonMain/kotlin/cafe/adriel/voyager/navigator/Navigator.kt
@@ -64,9 +64,7 @@ public fun Navigator(
     require(screens.isNotEmpty()) { "Navigator must have at least one screen" }
     require(key.isNotEmpty()) { "Navigator key can't be empty" }
 
-    CompositionLocalProvider(
-        LocalNavigatorStateHolder providesDefault rememberSaveableStateHolder()
-    ) {
+    ConditionalLocalNavigationStateHolderCompositionLocalProvider {
         val navigator = rememberNavigator(screens, key, disposeBehavior, LocalNavigator.current)
 
         if (navigator.parent?.disposeBehavior?.disposeNestedNavigators != false) {
@@ -177,3 +175,18 @@ public data class NavigatorDisposeBehavior(
 public fun compositionUniqueId(): String = currentCompositeKeyHash.toString(MaxSupportedRadix)
 
 private val MaxSupportedRadix = 36
+
+@Composable
+private fun ConditionalLocalNavigationStateHolderCompositionLocalProvider(content: @Composable () -> Unit) {
+    val navigatorStateHolder = LocalNavigatorStateHolder.current
+
+    if (navigatorStateHolder == null) {
+        CompositionLocalProvider(
+            LocalNavigatorStateHolder provides rememberSaveableStateHolder(),
+        ) {
+            content()
+        }
+    } else {
+        content()
+    }
+}
diff --git a/...or/src/commonMain/kotlin/cafe/adriel/voyager/navigator/internal/NavigatorSaverInternal.kt b/...or/src/commonMain/kotlin/cafe/adriel/voyager/navigator/internal/NavigatorSaverInternal.kt
@@ -11,8 +11,8 @@ import cafe.adriel.voyager.navigator.LocalNavigatorSaver
 import cafe.adriel.voyager.navigator.Navigator
 import cafe.adriel.voyager.navigator.NavigatorDisposeBehavior
 
-internal val LocalNavigatorStateHolder: ProvidableCompositionLocal<SaveableStateHolder> =
-    staticCompositionLocalOf { error("LocalNavigatorStateHolder not initialized") }
+internal val LocalNavigatorStateHolder: ProvidableCompositionLocal<SaveableStateHolder?> =
+    staticCompositionLocalOf { null }
 
 @Composable
 internal fun rememberNavigator(
@@ -21,7 +21,7 @@ internal fun rememberNavigator(
     disposeBehavior: NavigatorDisposeBehavior,
     parent: Navigator?
 ): Navigator {
-    val stateHolder = LocalNavigatorStateHolder.current
+    val stateHolder = LocalNavigatorStateHolder.current ?: error("LocalNavigatorStateHolder not initialized")
     val navigatorSaver = LocalNavigatorSaver.current
     val saver = remember(navigatorSaver, stateHolder, parent, disposeBehavior) {
         navigatorSaver.saver(screens, key, stateHolder, disposeBehavior, parent)