Fix KoinApplication to create the right Global context

InsertKoinIO · Oct 25, 2024 · bd99e27 · bd99e27
1 parent 52cd502
commit bd99e27
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/...se/src/commonMain/kotlin/org/koin/compose/application/CompositionKoinApplicationLoader.kt b/...se/src/commonMain/kotlin/org/koin/compose/application/CompositionKoinApplicationLoader.kt
@@ -1,6 +1,7 @@
 package org.koin.compose.application
 
 import androidx.compose.runtime.RememberObserver
+import org.koin.core.Koin
 import org.koin.core.KoinApplication
 import org.koin.core.annotation.KoinInternalApi
 import org.koin.core.context.startKoin
@@ -12,6 +13,12 @@ class CompositionKoinApplicationLoader(
     val koinApplication: KoinApplication,
 ) : RememberObserver {
 
+    var koin : Koin? = null
+
+    init {
+        start()
+    }
+
     override fun onAbandoned() {
         stop()
     }
@@ -25,8 +32,10 @@ class CompositionKoinApplicationLoader(
     }
 
     private fun start() {
-        val koin = startKoin(koinApplication).koin
-        koin.logger.debug("$this -> started Koin Application $koinApplication")
+        if (KoinPlatform.getKoinOrNull() == null){
+            koin = startKoin(koinApplication).koin
+            koin!!.logger.debug("$this -> started Koin Application $koinApplication")
+        }
     }
 
     private fun stop() {

diff --git a/...oin-compose/src/commonMain/kotlin/org/koin/compose/application/RememberKoinApplication.kt b/...oin-compose/src/commonMain/kotlin/org/koin/compose/application/RememberKoinApplication.kt
@@ -36,5 +36,5 @@ inline fun rememberKoinApplication(koinApplication: KoinApplication): Koin {
     val wrapper = remember {
         CompositionKoinApplicationLoader(koinApplication)
     }
-    return wrapper.koinApplication.koin
+    return wrapper.koin ?: error("Koin context has not been initialized in rememberKoinApplication")
 }