Merge pull request #474 from arkivanov/unique-class-names-for-keys

Use unique class names for configuration keys
arkivanov · Sep 8, 2023 · 1f0f04a · 1f0f04a
2 parents 314a9f6 + b23cec4
commit 1f0f04a
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 13 deletions.
diff --git a/decompose/api/android/decompose.api b/decompose/api/android/decompose.api
@@ -70,6 +70,9 @@ public abstract interface annotation class com/arkivanov/decompose/FaultyDecompo
 public abstract interface annotation class com/arkivanov/decompose/InternalDecomposeApi : java/lang/annotation/Annotation {
 }
 
+public final class com/arkivanov/decompose/UtilsKt {
+}
+
 public final class com/arkivanov/decompose/errorhandler/ErrorHandlersKt {
 	public static final fun getOnDecomposeError ()Lkotlin/jvm/functions/Function1;
 	public static final fun setOnDecomposeError (Lkotlin/jvm/functions/Function1;)V

diff --git a/decompose/api/jvm/decompose.api b/decompose/api/jvm/decompose.api
@@ -56,6 +56,9 @@ public abstract interface annotation class com/arkivanov/decompose/FaultyDecompo
 public abstract interface annotation class com/arkivanov/decompose/InternalDecomposeApi : java/lang/annotation/Annotation {
 }
 
+public final class com/arkivanov/decompose/UtilsKt {
+}
+
 public final class com/arkivanov/decompose/errorhandler/ErrorHandlersKt {
 	public static final fun getOnDecomposeError ()Lkotlin/jvm/functions/Function1;
 	public static final fun setOnDecomposeError (Lkotlin/jvm/functions/Function1;)V

diff --git a/decompose/src/commonMain/kotlin/com/arkivanov/decompose/Utils.kt b/decompose/src/commonMain/kotlin/com/arkivanov/decompose/Utils.kt
@@ -1,6 +1,13 @@
 package com.arkivanov.decompose
 
 import com.arkivanov.essenty.lifecycle.Lifecycle
+import kotlin.reflect.KClass
+
+@InternalDecomposeApi
+fun Any.hashString(): String =
+    "${this::class.uniqueName ?: this::class.simpleName}_${hashCode().toString(radix = 36)}"
+
+internal expect val KClass<*>.uniqueName: String?
 
 internal expect fun Any.ensureNeverFrozen()
 

diff --git a/decompose/src/jsMain/kotlin/com/arkivanov/decompose/Utils.kt b/decompose/src/jsMain/kotlin/com/arkivanov/decompose/Utils.kt
@@ -0,0 +1,6 @@
+package com.arkivanov.decompose
+
+import kotlin.reflect.KClass
+
+internal actual val KClass<*>.uniqueName: String?
+    get() = js.name
diff --git a/...ain/kotlin/com/arkivanov/decompose/router/stack/webhistory/DefaultWebHistoryController.kt b/...ain/kotlin/com/arkivanov/decompose/router/stack/webhistory/DefaultWebHistoryController.kt
@@ -1,6 +1,7 @@
 package com.arkivanov.decompose.router.stack.webhistory
 
 import com.arkivanov.decompose.ExperimentalDecomposeApi
+import com.arkivanov.decompose.hashString
 import com.arkivanov.decompose.router.findFirstDifferentIndex
 import com.arkivanov.decompose.router.stack.ChildStack
 import com.arkivanov.decompose.router.stack.StackNavigator
@@ -125,7 +126,7 @@ class DefaultWebHistoryController internal constructor(
             isStateObserverEnabled = false
 
             navigator.navigate { stack ->
-                val indexInStack = stack.indexOfLast { it.hashCode() == newConfigurationKey }
+                val indexInStack = stack.indexOfLast { it.hashString() == newConfigurationKey }
                 if (indexInStack >= 0) {
                     // History popped, pop from the Router
                     stack.take(indexInStack + 1)
@@ -139,13 +140,13 @@ class DefaultWebHistoryController internal constructor(
         }
 
         private fun History.pushState(configuration: C) {
-            val nextItem = PageItem(configurationKey = configuration.hashCode(), path = getPath(configuration))
+            val nextItem = PageItem(configurationKey = configuration.hashString(), path = getPath(configuration))
             val newData = getCurrentData() + nextItem
             pushState(data = newData, url = nextItem.path)
         }
 
         private fun History.replaceState(configuration: C) {
-            val newItem = PageItem(configurationKey = configuration.hashCode(), path = getPath(configuration))
+            val newItem = PageItem(configurationKey = configuration.hashString(), path = getPath(configuration))
             val newData = getCurrentData().dropLast(1).toTypedArray() + newItem
             replaceState(data = newData, url = newItem.path)
         }
@@ -156,7 +157,7 @@ class DefaultWebHistoryController internal constructor(
     }
 
     private data class PageItem(
-        val configurationKey: Int,
+        val configurationKey: String,
         val path: String,
     )
 

diff --git a/decompose/src/nonJsMain/kotlin/com/arkivanov/decompose/Utils.nonJs.kt b/decompose/src/nonJsMain/kotlin/com/arkivanov/decompose/Utils.nonJs.kt
@@ -0,0 +1,6 @@
+package com.arkivanov.decompose
+
+import kotlin.reflect.KClass
+
+internal actual val KClass<*>.uniqueName: String?
+    get() = qualifiedName
diff --git a/...android/src/main/java/com/arkivanov/decompose/extensions/android/stack/StackRouterView.kt b/...android/src/main/java/com/arkivanov/decompose/extensions/android/stack/StackRouterView.kt
@@ -16,6 +16,7 @@ import com.arkivanov.decompose.extensions.android.DefaultViewContext
 import com.arkivanov.decompose.extensions.android.R
 import com.arkivanov.decompose.extensions.android.ViewContext
 import com.arkivanov.decompose.extensions.android.forEachChild
+import com.arkivanov.decompose.hashString
 import com.arkivanov.decompose.lifecycle.MergedLifecycle
 import com.arkivanov.decompose.router.stack.ChildStack
 import com.arkivanov.decompose.value.Value
@@ -125,7 +126,7 @@ class StackRouterView @JvmOverloads constructor(
 
         val newChildView = findNewChildView()
 
-        val activeChildKey = activeChild.configuration.hashCode().toString()
+        val activeChildKey = activeChild.configuration.hashString()
 
         newChildView.key = activeChildKey
 

diff --git a/.../commonMain/kotlin/com/arkivanov/decompose/extensions/compose/jetbrains/stack/Children.kt b/.../commonMain/kotlin/com/arkivanov/decompose/extensions/compose/jetbrains/stack/Children.kt
@@ -10,6 +10,7 @@ import com.arkivanov.decompose.Child
 import com.arkivanov.decompose.extensions.compose.jetbrains.stack.animation.StackAnimation
 import com.arkivanov.decompose.extensions.compose.jetbrains.stack.animation.emptyStackAnimation
 import com.arkivanov.decompose.extensions.compose.jetbrains.subscribeAsState
+import com.arkivanov.decompose.hashString
 import com.arkivanov.decompose.router.stack.ChildStack
 import com.arkivanov.decompose.value.Value
 
@@ -27,7 +28,7 @@ fun <C : Any, T : Any> Children(
     val anim = animation ?: emptyStackAnimation()
 
     anim(stack = stack, modifier = modifier) { child ->
-        holder.SaveableStateProvider(child.configuration.key()) {
+        holder.SaveableStateProvider(child.configuration.hashString()) {
             content(child)
         }
     }
@@ -51,9 +52,7 @@ fun <C : Any, T : Any> Children(
 }
 
 private fun ChildStack<*, *>.getConfigurations(): Set<String> =
-    items.mapTo(HashSet()) { it.configuration.key() }
-
-private fun Any.key(): String = "${this::class.simpleName}_${hashCode().toString(radix = 36)}"
+    items.mapTo(HashSet()) { it.configuration.hashString() }
 
 @Composable
 private fun SaveableStateHolder.retainStates(currentKeys: Set<Any>) {

diff --git a/...etpack/src/main/java/com/arkivanov/decompose/extensions/compose/jetpack/stack/Children.kt b/...etpack/src/main/java/com/arkivanov/decompose/extensions/compose/jetpack/stack/Children.kt
@@ -8,12 +8,15 @@ import androidx.compose.runtime.saveable.SaveableStateHolder
 import androidx.compose.runtime.saveable.rememberSaveableStateHolder
 import androidx.compose.ui.Modifier
 import com.arkivanov.decompose.Child
+import com.arkivanov.decompose.InternalDecomposeApi
 import com.arkivanov.decompose.extensions.compose.jetpack.stack.animation.StackAnimation
 import com.arkivanov.decompose.extensions.compose.jetpack.stack.animation.emptyStackAnimation
 import com.arkivanov.decompose.extensions.compose.jetpack.subscribeAsState
+import com.arkivanov.decompose.hashString
 import com.arkivanov.decompose.router.stack.ChildStack
 import com.arkivanov.decompose.value.Value
 
+@OptIn(InternalDecomposeApi::class)
 @Composable
 fun <C : Any, T : Any> Children(
     stack: ChildStack<C, T>,
@@ -28,7 +31,7 @@ fun <C : Any, T : Any> Children(
     val anim = animation ?: emptyStackAnimation()
 
     anim(stack = stack, modifier = modifier) { child ->
-        holder.SaveableStateProvider(child.configuration.key()) {
+        holder.SaveableStateProvider(child.configuration.hashString()) {
             content(child)
         }
     }
@@ -51,10 +54,9 @@ fun <C : Any, T : Any> Children(
     )
 }
 
+@OptIn(InternalDecomposeApi::class)
 private fun ChildStack<*, *>.getConfigurations(): Set<String> =
-    items.mapTo(HashSet()) { it.configuration.key() }
-
-private fun Any.key(): String = "${this::class.simpleName}_${hashCode().toString(radix = 36)}"
+    items.mapTo(HashSet()) { it.configuration.hashString() }
 
 @SuppressLint("ComposableNaming")
 @Composable