Add CoroutineScope parameter to stateIn function (GH-6)

rickclephas · Dec 23, 2022 · 2cb7c91 · 2cb7c91
1 parent 091dd2a
commit 2cb7c91
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 2 deletions.
diff --git a/kmm-viewmodel-core/src/androidMain/kotlin/com/rickclephas/kmm/viewmodel/StateFlow.kt b/kmm-viewmodel-core/src/androidMain/kotlin/com/rickclephas/kmm/viewmodel/StateFlow.kt
@@ -1,5 +1,6 @@
 package com.rickclephas.kmm.viewmodel
 
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.*
 
 /**
@@ -17,6 +18,7 @@ public actual inline fun <T> MutableStateFlow(
 @Suppress("NOTHING_TO_INLINE")
 public actual inline fun <T> Flow<T>.stateIn(
     viewModelScope: ViewModelScope,
+    coroutineScope: CoroutineScope,
     started: SharingStarted,
     initialValue: T
-): StateFlow<T> = stateIn(viewModelScope.coroutineScope, started, initialValue)
+): StateFlow<T> = stateIn(coroutineScope, started, initialValue)
diff --git a/kmm-viewmodel-core/src/appleMain/kotlin/com/rickclephas/kmm/viewmodel/StateFlow.kt b/kmm-viewmodel-core/src/appleMain/kotlin/com/rickclephas/kmm/viewmodel/StateFlow.kt
@@ -90,14 +90,15 @@ private class SubscriptionCountFlow(
  */
 public actual fun <T> Flow<T>.stateIn(
     viewModelScope: ViewModelScope,
+    coroutineScope: CoroutineScope,
     started: SharingStarted,
     initialValue: T
 ): StateFlow<T> {
     // Similar to the kotlinx.coroutines implementation, but using our custom MutableStateFlowImpl.
     // https://github.com/Kotlin/kotlinx.coroutines/blob/6dfabf763fe9fc91fbb73eb0f2d5b488f53043f1/kotlinx-coroutines-core/common/src/flow/operators/Share.kt#L135
     val scope = viewModelScope.asImpl()
     val state = MutableStateFlowImpl(scope, MutableStateFlow(initialValue))
-    val job = scope.coroutineScope.launchSharing(EmptyCoroutineContext, this, state, started, initialValue)
+    val job = coroutineScope.launchSharing(EmptyCoroutineContext, this, state, started, initialValue)
     return ReadonlyStateFlow(state, job)
 }
 

diff --git a/kmm-viewmodel-core/src/commonMain/kotlin/com/rickclephas/kmm/viewmodel/StateFlow.kt b/kmm-viewmodel-core/src/commonMain/kotlin/com/rickclephas/kmm/viewmodel/StateFlow.kt
@@ -1,5 +1,6 @@
 package com.rickclephas.kmm.viewmodel
 
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -18,6 +19,7 @@ public expect fun <T> MutableStateFlow(
  */
 public expect fun <T> Flow<T>.stateIn(
     viewModelScope: ViewModelScope,
+    coroutineScope: CoroutineScope,
     started: SharingStarted,
     initialValue: T
 ): StateFlow<T>
diff --git a/kmm-viewmodel-core/src/commonMain/kotlin/com/rickclephas/kmm/viewmodel/StateFlowUtils.kt b/kmm-viewmodel-core/src/commonMain/kotlin/com/rickclephas/kmm/viewmodel/StateFlowUtils.kt
@@ -0,0 +1,28 @@
+package com.rickclephas.kmm.viewmodel
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.plus
+import kotlin.coroutines.CoroutineContext
+
+/**
+ * @see kotlinx.coroutines.flow.stateIn
+ */
+@Suppress("NOTHING_TO_INLINE")
+public inline fun <T> Flow<T>.stateIn(
+    viewModelScope: ViewModelScope,
+    started: SharingStarted,
+    initialValue: T
+): StateFlow<T> = stateIn(viewModelScope, viewModelScope.coroutineScope, started, initialValue)
+
+/**
+ * @see kotlinx.coroutines.flow.stateIn
+ */
+@Suppress("NOTHING_TO_INLINE")
+public inline fun <T> Flow<T>.stateIn(
+    viewModelScope: ViewModelScope,
+    context: CoroutineContext,
+    started: SharingStarted,
+    initialValue: T
+): StateFlow<T> = stateIn(viewModelScope, viewModelScope.coroutineScope + context, started, initialValue)