Optimize scope allocation in Compose

InsertKoinIO · Nov 6, 2024 · cd36752 · cd36752
1 parent a2df2bc
commit cd36752
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 21 deletions.
diff --git a/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/ViewModel.kt b/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/ViewModel.kt
@@ -41,9 +41,7 @@ import org.koin.viewmodel.resolveViewModel
 @Composable
 inline fun <reified T : ViewModel> koinViewModel(
     qualifier: Qualifier? = null,
-    viewModelStoreOwner: ViewModelStoreOwner = checkNotNull(LocalViewModelStoreOwner.current) {
-        "No ViewModelStoreOwner was provided via LocalViewModelStoreOwner"
-    },
+    viewModelStoreOwner: ViewModelStoreOwner =  LocalViewModelStoreOwner.current ?: error("No ViewModelStoreOwner was provided via LocalViewModelStoreOwner"),
     key: String? = null,
     extras: CreationExtras = defaultExtras(viewModelStoreOwner),
     scope: Scope = currentKoinScope(),

diff --git a/...pose/koin-compose-viewmodel/src/commonMain/kotlin/org/koin/compose/viewmodel/ViewModel.kt b/...pose/koin-compose-viewmodel/src/commonMain/kotlin/org/koin/compose/viewmodel/ViewModel.kt
@@ -46,9 +46,7 @@ import org.koin.viewmodel.resolveViewModel
 @Composable
 inline fun <reified T : ViewModel> koinViewModel(
     qualifier: Qualifier? = null,
-    viewModelStoreOwner: ViewModelStoreOwner = checkNotNull(LocalViewModelStoreOwner.current) {
-        "No ViewModelStoreOwner was provided via LocalViewModelStoreOwner"
-    },
+    viewModelStoreOwner: ViewModelStoreOwner =  LocalViewModelStoreOwner.current ?: error("No ViewModelStoreOwner was provided via LocalViewModelStoreOwner"),
     key: String? = null,
     extras: CreationExtras = defaultExtras(viewModelStoreOwner),
     scope: Scope = currentKoinScope(),

diff --git a/projects/compose/koin-compose/src/commonMain/kotlin/org/koin/compose/KoinApplication.kt b/projects/compose/koin-compose/src/commonMain/kotlin/org/koin/compose/KoinApplication.kt
@@ -20,14 +20,18 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.InternalComposeApi
 import androidx.compose.runtime.ProvidableCompositionLocal
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.runtime.RememberObserver
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.currentComposer
 import androidx.compose.runtime.remember
 import org.koin.compose.application.rememberKoinApplication
 import org.koin.compose.error.UnknownKoinContext
+import org.koin.compose.scope.rememberKoinScope
 import org.koin.core.Koin
 import org.koin.core.KoinApplication
 import org.koin.core.annotation.KoinInternalApi
+import org.koin.core.error.ClosedScopeException
 import org.koin.core.scope.Scope
 import org.koin.dsl.KoinAppDeclaration
 import org.koin.dsl.koinApplication
@@ -77,18 +81,25 @@ fun getKoin(): Koin = currentComposer.run {
  */
 @OptIn(InternalComposeApi::class, KoinInternalApi::class)
 @Composable
+@ReadOnlyComposable
+//fun currentKoinScope(): Scope = LocalKoinScope.current
 fun currentKoinScope(): Scope = currentComposer.run {
-    remember {
-        try {
-            consume(LocalKoinScope)
-        } catch (_: UnknownKoinContext) {
-            val ctx = getDefaultKoinContext()
-            warningNoContext(ctx)
-            getDefaultKoinContext().scopeRegistry.rootScope
+    try {
+        consume(LocalKoinScope)
+    } catch (_: UnknownKoinContext) {
+        getDefaultKoinContext().let {
+            warningNoContext(it)
+            it.scopeRegistry.rootScope
+        }
+    } catch (e: ClosedScopeException) {
+        getDefaultKoinContext().let {
+            it.logger.warn("Try to refresh scope - fallback on default context from - $e")
+            it.scopeRegistry.rootScope
         }
     }
 }
 
+
 @OptIn(KoinInternalApi::class)
 private fun warningNoContext(ctx: Koin) {
     ctx.logger.error("[Warning] - No Compose Koin context setup, taking default. Use KoinContext(), KoinAndroidContext() or KoinApplication() function to setup or create Koin context and avoid such message.")

diff --git a/...e/koin-compose/src/commonMain/kotlin/org/koin/compose/scope/CompositionKoinScopeLoader.kt b/...e/koin-compose/src/commonMain/kotlin/org/koin/compose/scope/CompositionKoinScopeLoader.kt
@@ -16,16 +16,14 @@
 package org.koin.compose.scope
 
 import androidx.compose.runtime.RememberObserver
-import org.koin.core.Koin
 import org.koin.core.annotation.KoinExperimentalAPI
 import org.koin.core.annotation.KoinInternalApi
 import org.koin.core.scope.Scope
 
 @KoinExperimentalAPI
 @KoinInternalApi
 class CompositionKoinScopeLoader(
-    val scope: Scope,
-    val koin : Koin
+    val scope: Scope
 ) : RememberObserver {
 
     override fun onRemembered() {
@@ -41,7 +39,9 @@ class CompositionKoinScopeLoader(
     }
 
     private fun close() {
-        koin.logger.debug("$this -> close scope id: '${scope.id}'")
-        scope.close()
+        if (!scope.isRoot && !(scope.closed)){
+            scope.logger.debug("CompositionKoinScopeLoader close scope: '${scope.id}'")
+            scope.close()
+        }
     }
 }
diff --git a/projects/compose/koin-compose/src/commonMain/kotlin/org/koin/compose/scope/RememberScopes.kt b/projects/compose/koin-compose/src/commonMain/kotlin/org/koin/compose/scope/RememberScopes.kt
@@ -36,10 +36,9 @@ import org.koin.core.scope.ScopeID
  */
 @KoinExperimentalAPI
 @Composable
-inline fun rememberKoinScope(scope: Scope): Scope {
-    val koin = getKoin()
+fun rememberKoinScope(scope: Scope): Scope {
     val wrapper = remember(scope) {
-        CompositionKoinScopeLoader(scope, koin)
+        CompositionKoinScopeLoader(scope)
     }
     return wrapper.scope
 }