vrr/Flocon
2
0
Fork 0
mirror of https://github.com/openflocon/Flocon.git synced 2026-04-26 15:40:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make DashboardScope accept Flow instead of StateFlow (#507)
Some checks failed
docs / deploy (push) Has been cancelled
Details

Browse source 
Co-authored-by: Sebastian Neubauer <sebastian.neubauer@exaring.de>
This commit is contained in:
Sebastian Neubauer 2026-03-07 11:18:18 +01:00 • committed by GitHub
parent a3ed9215cf
commit 7a0c65fab0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
FloconAndroid/flocon-base/src/commonMain/kotlin/io/github/openflocon/flocon/plugins/dashboard/model/DashboardScope.kt
View file

@ -2,17 +2,17 @@ package io.github.openflocon.flocon.plugins.dashboard.model
import io.github.openflocon.flocon.plugins.dashboard.builder.FormBuilder
import io.github.openflocon.flocon.plugins.dashboard.builder.SectionBuilder
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.Flow
interface DashboardScope {
fun <T> section(name: String, flow: StateFlow<T>, content: SectionBuilder.(T) -> Unit)
fun <T> section(name: String, flow: Flow<T>, content: SectionBuilder.(T) -> Unit)
fun section(name: String, content: SectionBuilder.() -> Unit)
fun <T> form(
name: String,
submitText: String = "Submit",
onSubmitted: (Map<String, String>) -> Unit,
flow: StateFlow<T>,
flow: Flow<T>,
content: FormBuilder.(T) -> Unit
)

9
FloconAndroid/flocon/src/commonMain/kotlin/io/github/openflocon/flocon/plugins/dashboard/FloconDashboardDSL.kt
View file

@ -10,7 +10,6 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.map
@ -57,10 +56,10 @@ internal class DashboardScopeImpl : DashboardScope {
* The section will be re-rendered whenever the [flow] emits a new value.
*
* @param name The name of the section.
* @param flow The [StateFlow] providing the data for the section.
* @param flow The [Flow] providing the data for the section.
* @param content The builder to construct the section content based on the data.
*/
override fun <T> section(name: String, flow: StateFlow<T>, content: SectionBuilder.(T) -> Unit) {
override fun <T> section(name: String, flow: Flow<T>, content: SectionBuilder.(T) -> Unit) {
val sectionFlow = flow.map { item ->
SectionBuilder(name)
.apply { content(item) }
@ -90,14 +89,14 @@ internal class DashboardScopeImpl : DashboardScope {
* @param name The name of the form.
* @param submitText The text to display on the submit button.
* @param onSubmitted The callback to be invoked when the form is submitted.
* @param flow The [StateFlow] providing the data for the form.
* @param flow The [Flow] providing the data for the form.
* @param content The builder to construct the form content based on the data.
*/
override fun <T> form(
name: String,
submitText: String,
onSubmitted: (Map<String, String>) -> Unit,
flow: StateFlow<T>,
flow: Flow<T>,
content: FormBuilder.(T) -> Unit
) {
val formFlow = flow.map { item ->