kscience/visionforge
8
1
Fork 1
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

A dedicated builder for ComposeHtmlVisionRenderer

Browse Source
This commit is contained in:
Alexander Nozik 2024-05-23 19:36:13 +03:00
parent 5038829288
commit f238b03833
3 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -10,7 +10,7 @@ val dataforgeVersion by extra("0.8.0")
allprojects {
group = "space.kscience"
version = "0.4.1"
version = "0.4.2-dev-1"
}
subprojects {

21
visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/ComposeHtmlVisionRenderer.kt
View File

@ -8,6 +8,7 @@ import org.w3c.dom.Element
import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.names.Name
import space.kscience.visionforge.Vision
import kotlin.reflect.cast
/**
* An [ElementVisionRenderer] that could be used directly in Compose-html as well as a stand-alone renderer
@ -26,3 +27,23 @@ public interface ComposeHtmlVisionRenderer : ElementVisionRenderer {
public companion object
}
/**
* A compose-html renderer for a vision of given type
*/
public inline fun <reified T : Vision> ComposeHtmlVisionRenderer(
acceptRating: Int = ElementVisionRenderer.DEFAULT_RATING,
noinline renderFunction: @Composable DOMScope<Element>.(name: Name, vision: T, meta: Meta) -> Unit,
): ComposeHtmlVisionRenderer = object : ComposeHtmlVisionRenderer {
override fun rateVision(vision: Vision): Int =
if (vision::class == T::class) acceptRating else ElementVisionRenderer.ZERO_RATING
@Composable
override fun DOMScope<Element>.render(name: Name, vision: Vision, meta: Meta) {
renderFunction(name, T::class.cast(vision), meta)
}
override fun toString(): String = "ElementVisionRender(${T::class.simpleName})"
}

23
visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/html/ElementVisionRenderer.kt
View File

@ -9,7 +9,6 @@ import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.misc.DfType
import space.kscience.dataforge.names.Name
import space.kscience.visionforge.Vision
import kotlin.reflect.KClass
import kotlin.reflect.cast
/**
@ -46,16 +45,15 @@ public interface ElementVisionRenderer {
}
/**
* A browser renderer for element of given type
* A browser renderer for a vision of given type
*/
public class SingleTypeVisionRenderer<T : Vision>(
public val kClass: KClass<T>,
private val acceptRating: Int = ElementVisionRenderer.DEFAULT_RATING,
private val renderFunction: TagConsumer<HTMLElement>.(name: Name, vision: T, meta: Meta) -> Unit,
) : ElementVisionRenderer {
public inline fun <reified T : Vision> ElementVisionRenderer(
acceptRating: Int = ElementVisionRenderer.DEFAULT_RATING,
noinline renderFunction: TagConsumer<HTMLElement>.(name: Name, vision: T, meta: Meta) -> Unit,
): ElementVisionRenderer = object : ElementVisionRenderer {
override fun rateVision(vision: Vision): Int =
if (vision::class == kClass) acceptRating else ElementVisionRenderer.ZERO_RATING
if (vision::class == T::class) acceptRating else ElementVisionRenderer.ZERO_RATING
override fun render(
element: Element,
@ -65,14 +63,9 @@ public class SingleTypeVisionRenderer<T : Vision>(
) {
element.clear()
element.append {
renderFunction(name, kClass.cast(vision), meta)
renderFunction(name, T::class.cast(vision), meta)
}
}
override fun toString(): String = "ElementVisionRender(${kClass.simpleName})"
override fun toString(): String = "ElementVisionRender(${T::class.simpleName})"
}
public inline fun <reified T : Vision> ElementVisionRenderer(
acceptRating: Int = ElementVisionRenderer.DEFAULT_RATING,
noinline renderFunction: TagConsumer<HTMLElement>.(name: Name, vision: T, meta: Meta) -> Unit,
): ElementVisionRenderer = SingleTypeVisionRenderer(T::class, acceptRating, renderFunction)