Merge branch 'master' into v2.2

arkivanov · Nov 17, 2023 · f1c6152 · f1c6152
2 parents 6916ca5 + c7e7363
commit f1c6152
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/sample/app-desktop/src/jvmMain/kotlin/com/arkivanov/sample/app/Main.kt b/sample/app-desktop/src/jvmMain/kotlin/com/arkivanov/sample/app/Main.kt
@@ -2,13 +2,11 @@ package com.arkivanov.sample.app
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.AlertDialog
 import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.material.TextButton
 import androidx.compose.runtime.Composable

diff --git a/...d/compose/src/commonMain/kotlin/com/arkivanov/sample/shared/multipane/MultiPaneContent.kt b/...d/compose/src/commonMain/kotlin/com/arkivanov/sample/shared/multipane/MultiPaneContent.kt
@@ -34,7 +34,7 @@ internal fun MultiPaneContent(component: MultiPaneComponent, modifier: Modifier
     val listPane: @Composable (Child.Created<*, ArticleListComponent>) -> Unit =
         remember {
             movableContentOf { (config, component) ->
-                saveableStateHolder.SaveableStateProvider(key = config) {
+                saveableStateHolder.SaveableStateProvider(key = config.hashCode()) {
                     ArticleListContent(
                         component = component,
                         modifier = Modifier.fillMaxSize(),