Remove manual form value listeners in favor of StateFlow collection (#80)

Author: VictorB00

nubrick/src/main/kotlin/app/nubrick/nubrick/component/provider/event/event.kt

@@ -10,13 +10,13 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
 import androidx.compose.ui.draw.alpha
@@ -26,7 +26,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import app.nubrick.nubrick.component.provider.container.ContainerContext
 import app.nubrick.nubrick.component.provider.data.DataContext
-import app.nubrick.nubrick.data.FormValueListener
+import app.nubrick.nubrick.data.toFormData
 import app.nubrick.nubrick.schema.UIBlockAction
 import kotlinx.coroutines.launch
 import kotlinx.serialization.json.JsonElement
@@ -85,19 +85,11 @@ internal fun Modifier.eventDispatcher(
     val interaction = remember { MutableInteractionSource() }
 
     if (event.requiredFields != null) {
-        val handleFormValueChange: FormValueListener = { values ->
-            disabled = event.requiredFields.any { key ->
-                val value = values[key]
-                value == null || (value is JsonPrimitive && value.isString && value.content.isEmpty())
-            }
-        }
-        DisposableEffect(Unit) {
-            handleFormValueChange(container.getFormValues())
-            container.addFormValueListener(handleFormValueChange)
-
-            onDispose {
-                container.removeFormValueListener(handleFormValueChange)
-            }
+        val formValues by container.formValuesFlow.collectAsStateWithLifecycle()
+        val values = formValues.toFormData()
+        disabled = event.requiredFields.any { key ->
+            val value = values[key]
+            value == null || (value is JsonPrimitive && value.isString && value.content.isEmpty())
         }
     }
 

nubrick/src/main/kotlin/app/nubrick/nubrick/data/container.kt

@@ -21,6 +21,8 @@ import app.nubrick.nubrick.schema.Property
 import app.nubrick.nubrick.schema.UIBlock
 import app.nubrick.nubrick.template.compile
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.JsonElement
 
@@ -53,11 +55,10 @@ internal interface Container {
         pageProperties: List<Property>?,
     ): JsonElement
 
+    val formValuesFlow: StateFlow<Map<String, FormValue>>
     fun getFormValues(): Map<String, JsonElement>
     fun getFormValue(key: String): FormValue?
     fun setFormValue(key: String, value: FormValue)
-    fun addFormValueListener(listener: FormValueListener)
-    fun removeFormValueListener(listener: FormValueListener)
 
     fun compileHttpRequest(
         req: ApiHttpRequest,
@@ -118,8 +119,8 @@ internal class ContainerImpl(
     ): JsonElement {
         val userState by user.state.collectAsStateWithLifecycle()
         val userProperties = userState.templateProperties
-        val formValues = formRepository?.formValues?.collectAsStateWithLifecycle()
-        val formData = formValues?.value?.toFormData()
+        val formValues by formValuesFlow.collectAsStateWithLifecycle()
+        val formData = formValues.toFormData()
         return remember(this, data, pageProperties, userProperties, formData) {
             createVariableForTemplate(
                 data = data,
@@ -132,6 +133,9 @@ internal class ContainerImpl(
         }
     }
 
+    override val formValuesFlow: StateFlow<Map<String, FormValue>> =
+        formRepository?.formValues ?: MutableStateFlow(emptyMap())
+
     override fun getFormValues(): Map<String, JsonElement> {
         return this.formRepository?.getFormData() ?: emptyMap()
     }
@@ -144,14 +148,6 @@ internal class ContainerImpl(
         this.formRepository?.setValue(key, value)
     }
 
-    override fun addFormValueListener(listener: FormValueListener) {
-        this.formRepository?.addListener(listener)
-    }
-
-    override fun removeFormValueListener(listener: FormValueListener) {
-        this.formRepository?.removeListener(listener)
-    }
-
     override suspend fun sendHttpRequest(
         req: ApiHttpRequest,
         variable: JsonElement,

nubrick/src/main/kotlin/app/nubrick/nubrick/data/form.kt

@@ -7,7 +7,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
-import java.util.concurrent.CopyOnWriteArraySet
 
 internal sealed class FormValue {
     class Bool(val bool: Boolean) : FormValue()
@@ -23,22 +22,16 @@ internal sealed class FormValue {
     }
 }
 
-typealias FormValueListener = (values: Map<String, JsonElement>) -> Unit
-
-
 internal interface FormRepository {
     val formValues: StateFlow<Map<String, FormValue>>
     fun getFormData(): Map<String, JsonElement>
     fun setValue(key: String, value: FormValue)
     fun getValue(key: String): FormValue?
-    fun addListener(listener: FormValueListener)
-    fun removeListener(listener: FormValueListener)
 }
 
 internal class FormRepositoryImpl : FormRepository {
     private val _formValues = MutableStateFlow<Map<String, FormValue>>(emptyMap())
     override val formValues: StateFlow<Map<String, FormValue>> = _formValues.asStateFlow()
-    private val listeners: MutableSet<FormValueListener> = CopyOnWriteArraySet()
 
     override fun getFormData(): Map<String, JsonElement> {
         return this.formValues.value.toFormData()
@@ -50,20 +43,6 @@ internal class FormRepositoryImpl : FormRepository {
 
     override fun setValue(key: String, value: FormValue) {
         this._formValues.update { it + (key to value) }
-        val formData = this._formValues.value.toFormData()
-        
-        // Listeners to be updated to simply collect StateFlow in future PR
-        listeners.forEach { listener ->
-            listener(formData)
-        }
-    }
-
-    override fun addListener(listener: FormValueListener) {
-        this.listeners.add(listener)
-    }
-
-    override fun removeListener(listener: FormValueListener) {
-        this.listeners.remove(listener)
     }
 }