.() -> Unit,
-): Unit = styledDiv {
- css {
- classes.add("container${size.suffix}")
- }
- block()
-}
-
-
-public enum class GridMaxSize(public val suffix: String) {
- NONE(""),
- SM("-sm"),
- MD("-md"),
- LG("-lg"),
- XL("-xl")
-}
-
-public inline fun RBuilder.gridColumn(
- weight: Int? = null,
- maxSize: GridMaxSize = GridMaxSize.NONE,
- block: StyledDOMBuilder
.() -> Unit,
-): Unit = styledDiv {
- val weightSuffix = weight?.let { "-$it" } ?: ""
- css {
- classes.add("col${maxSize.suffix}$weightSuffix")
- }
- block()
-}
-
-public inline fun RBuilder.gridRow(
- block: StyledDOMBuilder
.() -> Unit,
-): Unit = styledDiv {
- css {
- classes.add("row")
- }
- block()
-}
\ No newline at end of file
diff --git a/ui/bootstrap/src/jsMain/kotlin/space/kscience/visionforge/bootstrap/tabComponent.kt b/ui/bootstrap/src/jsMain/kotlin/space/kscience/visionforge/bootstrap/tabComponent.kt
deleted file mode 100644
index 23b5071b..00000000
--- a/ui/bootstrap/src/jsMain/kotlin/space/kscience/visionforge/bootstrap/tabComponent.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-package space.kscience.visionforge.bootstrap
-
-import kotlinx.html.DIV
-import kotlinx.html.classes
-import kotlinx.html.js.onClickFunction
-import react.*
-import react.dom.attrs
-import react.dom.button
-import react.dom.li
-import react.dom.ul
-import space.kscience.visionforge.react.flexColumn
-import styled.StyledDOMBuilder
-import styled.styledDiv
-
-public external interface TabProps : PropsWithChildren {
- public var id: String
- public var title: String?
-}
-
-@JsExport
-public val Tab: FC
= fc { props ->
- props.children()
-}
-
-public external interface TabPaneProps : PropsWithChildren {
- public var activeTab: String?
-}
-
-@JsExport
-public val TabPane: FC = fc("TabPane") { props ->
- var activeTab: String? by useState(props.activeTab)
-
- val children: Array?> = Children.map(props.children) {
- it.asElementOrNull()
- } ?: emptyArray()
-
- val childrenProps = children.mapNotNull {
- it?.props?.unsafeCast()
- }
-
- flexColumn {
- ul("nav nav-tabs") {
- childrenProps.forEach { cp ->
- li("nav-item") {
- button(classes = "nav-link") {
- +(cp.title ?: cp.id)
- attrs {
- if (cp.id == activeTab) {
- classes = classes + "active"
- }
- onClickFunction = {
- activeTab = cp.id
- }
- }
- }
- }
- }
- }
- children.find { (it?.props?.unsafeCast())?.id == activeTab }?.let {
- child(it)
- }
- }
-}
-
-public class TabBuilder(internal val parentBuilder: RBuilder) {
- public fun tab(id: String, title: String? = null, builder: StyledDOMBuilder.() -> Unit) {
- parentBuilder.child(Tab) {
- attrs {
- this.id = id
- this.title = title
- }
- styledDiv {
- builder()
- }
- }
- }
-}
-
-public inline fun RBuilder.tabPane(activeTab: String? = null, crossinline builder: TabBuilder.() -> Unit) {
- child(TabPane) {
- attrs {
- this.activeTab = activeTab
- }
- TabBuilder(this).builder()
- }
-}
diff --git a/ui/bootstrap/src/jsMain/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt b/ui/bootstrap/src/jsMain/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt
deleted file mode 100644
index 0d5578a7..00000000
--- a/ui/bootstrap/src/jsMain/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-package space.kscience.visionforge.bootstrap
-
-import kotlinx.css.*
-import react.FC
-import react.PropsWithChildren
-import react.RBuilder
-import react.dom.h2
-import react.fc
-import space.kscience.dataforge.names.Name
-import space.kscience.dataforge.names.isEmpty
-import space.kscience.visionforge.Vision
-import space.kscience.visionforge.react.visionTree
-import space.kscience.visionforge.solid.SolidGroup
-import space.kscience.visionforge.solid.specifications.Canvas3DOptions
-import styled.css
-import styled.styledDiv
-
-public external interface ThreeControlsProps : PropsWithChildren {
- public var canvasOptions: Canvas3DOptions
- public var vision: Vision?
- public var selected: Name?
- public var onSelect: (Name) -> Unit
-}
-
-@JsExport
-public val ThreeControls: FC
= fc { props ->
- tabPane(if (props.selected != null) "Properties" else null) {
- tab("Canvas") {
- card("Canvas configuration") {
- canvasControls(props.canvasOptions, props.vision)
- }
- }
- tab("Tree") {
- css {
- border = Border(1.px, BorderStyle.solid, Color.lightGray)
- padding = Padding(10.px)
- }
- h2 { +"Object tree" }
- styledDiv {
- css {
- flex = Flex(1.0, 1.0, FlexBasis.inherit)
- }
- props.vision?.let {
- visionTree(it, props.selected, props.onSelect)
- }
- }
- }
- tab("Properties") {
- props.selected.let { selected ->
- val selectedObject: Vision? = when {
- selected == null -> null
- selected.isEmpty() -> props.vision
- else -> (props.vision as? SolidGroup)?.get(selected)
- }
- if (selectedObject != null) {
- visionPropertyEditor(selectedObject, key = selected)
- }
- }
- }
- this.parentBuilder.run {
- props.children()
- }
- }
-}
-
-public fun RBuilder.threeControls(
- canvasOptions: Canvas3DOptions,
- vision: Vision?,
- selected: Name?,
- onSelect: (Name) -> Unit = {},
- builder: TabBuilder.() -> Unit = {},
-): Unit = child(ThreeControls) {
- attrs {
- this.canvasOptions = canvasOptions
- this.vision = vision
- this.selected = selected
- this.onSelect = onSelect
- }
- TabBuilder(this).builder()
-}
\ No newline at end of file
diff --git a/ui/bootstrap/src/jsMain/kotlin/space/kscience/visionforge/bootstrap/visionPropertyEditor.kt b/ui/bootstrap/src/jsMain/kotlin/space/kscience/visionforge/bootstrap/visionPropertyEditor.kt
deleted file mode 100644
index 8e7e1208..00000000
--- a/ui/bootstrap/src/jsMain/kotlin/space/kscience/visionforge/bootstrap/visionPropertyEditor.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package space.kscience.visionforge.bootstrap
-
-import org.w3c.dom.Element
-import react.RBuilder
-import space.kscience.dataforge.meta.descriptors.MetaDescriptor
-import space.kscience.dataforge.meta.isEmpty
-import space.kscience.visionforge.Vision
-import space.kscience.visionforge.getStyle
-import space.kscience.visionforge.react.EditorPropertyState
-import space.kscience.visionforge.react.PropertyEditor
-import space.kscience.visionforge.react.metaViewer
-import space.kscience.visionforge.react.render
-import space.kscience.visionforge.root
-import space.kscience.visionforge.solid.SolidReference
-import space.kscience.visionforge.styles
-
-public fun RBuilder.visionPropertyEditor(
- vision: Vision,
- descriptor: MetaDescriptor? = vision.descriptor,
- key: Any? = null,
-) {
-
- card("Properties") {
- child(PropertyEditor) {
- attrs {
- this.key = key?.toString()
- this.meta = vision.properties.root()
- this.updates = vision.properties.changes
- this.descriptor = descriptor
- this.scope = vision.manager?.context ?: error("Orphan vision could not be observed")
- this.getPropertyState = { name ->
- val ownMeta = vision.properties.own?.getMeta(name)
- if (ownMeta != null && !ownMeta.isEmpty()) {
- EditorPropertyState.Defined
- } else if (vision.properties.root().getValue(name) != null) {
- // TODO differentiate
- EditorPropertyState.Default()
- } else {
- EditorPropertyState.Undefined
- }
- }
- }
- }
- }
- val styles = if (vision is SolidReference) {
- (vision.styles + vision.prototype.styles).distinct()
- } else {
- vision.styles
- }
- if (styles.isNotEmpty()) {
- card("Styles") {
- accordion("styles") {
- styles.forEach { styleName ->
- val style = vision.getStyle(styleName)
- if (style != null) {
- entry(styleName) {
- metaViewer(style)
- }
- }
- }
- }
- }
- }
-}
-
-public fun Element.visionPropertyEditor(
- item: Vision,
- descriptor: MetaDescriptor? = item.descriptor,
-): Unit = space.kscience.visionforge.react.createRoot(this).render {
- visionPropertyEditor(item, descriptor = descriptor)
-}
\ No newline at end of file
diff --git a/ui/bootstrap/src/jsMain/resources/css/custom-bootstrap.css b/ui/bootstrap/src/jsMain/resources/css/custom-bootstrap.css
deleted file mode 100644
index ecb7ee5f..00000000
--- a/ui/bootstrap/src/jsMain/resources/css/custom-bootstrap.css
+++ /dev/null
@@ -1,56 +0,0 @@
-/*full height*/
-html, body {
- height: 100%;
- width: 100%;
-}
-
-.container-fluid { height: inherit; }
-
-/* Remove default bullets */
-ul, .tree {
- list-style-type: none;
-}
-
-/* Style the caret/arrow */
-.tree-caret {
- cursor: pointer;
- user-select: none; /* Prevent text selection */
-}
-
-/* Create the caret/arrow with a unicode, and style it */
-.tree-caret::before {
- content: "\25B6";
- color: black;
- display: inline-block;
- margin-right: 6px;
-}
-
-.tree-leaf{
- user-select: none;
- display: inline-block;
-}
-
-.tree-leaf::before {
- content: "\25C6";
- color: black;
- display: inline-block;
- margin-right: 6px;
-}
-
-
-/* Rotate the caret/arrow icon when clicked on (using JavaScript) */
-.tree-caret-down::before {
- transform: rotate(90deg);
-}
-
-.tree-label-inactive {
- color: lightgrey;
-}
-
-.tree-label-selected{
- background-color: lightblue;
-}
-
-.no-padding{
- padding: 0;
-}
\ No newline at end of file
diff --git a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/Tabs.kt b/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/Tabs.kt
deleted file mode 100644
index cae4e797..00000000
--- a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/Tabs.kt
+++ /dev/null
@@ -1,102 +0,0 @@
-package space.kscience.visionforge.compose
-
-import androidx.compose.runtime.*
-import org.jetbrains.compose.web.dom.*
-import org.w3c.dom.HTMLDivElement
-import org.w3c.dom.HTMLLIElement
-
-
-public class ComposeTab(
- public val key: String,
- public val title: String,
- public val content: ContentBuilder,
- public val disabled: Boolean,
- public val titleExt: ContentBuilder,
-)
-
-@Composable
-public fun Tabs(tabs: List, activeKey: String) {
- var active by remember(activeKey) { mutableStateOf(activeKey) }
-
- Div({ classes("card", "text-center") }) {
- Div({ classes("card-header") }) {
-
- Ul({ classes("nav", "nav-tabs", "card-header-tabs") }) {
- tabs.forEach { tab ->
- Li({
- classes("nav-item")
- }) {
- A(attrs = {
- classes("nav-link")
- if (active == tab.key) {
- classes("active")
- }
- if (tab.disabled) {
- classes("disabled")
- }
- onClick {
- active = tab.key
- }
- }) {
- Text(tab.title)
- }
- tab.titleExt.invoke(this)
- }
- }
- }
- }
- tabs.find { it.key == active }?.let { tab ->
- Div({ classes("card-body") }) {
- tab.content.invoke(this)
- }
- }
- }
-
-
-}
-
-public class TabBuilder internal constructor(public val key: String) {
- private var title: String = key
- public var disabled: Boolean = false
- private var content: ContentBuilder = {}
- private var titleExt: ContentBuilder = {}
-
- @Composable
- public fun Content(content: ContentBuilder) {
- this.content = content
- }
-
- @Composable
- public fun Title(title: String, titleExt: ContentBuilder = {}) {
- this.title = title
- this.titleExt = titleExt
- }
-
- internal fun build(): ComposeTab = ComposeTab(
- key,
- title,
- content,
- disabled,
- titleExt
- )
-}
-
-public class TabsBuilder {
- public var active: String = ""
- internal val tabs: MutableList = mutableListOf()
-
- @Composable
- public fun Tab(key: String, builder: @Composable TabBuilder.() -> Unit) {
- tabs.add(TabBuilder(key).apply { builder() }.build())
- }
-
- public fun addTab(tab: ComposeTab) {
- tabs.add(tab)
- }
-}
-
-@Composable
-public fun Tabs(builder: @Composable TabsBuilder.() -> Unit) {
- val result = TabsBuilder().apply { builder() }
- Tabs(result.tabs, result.active)
-}
\ No newline at end of file
diff --git a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/ThreeCanvas.kt b/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/ThreeCanvas.kt
deleted file mode 100644
index 9816b5c2..00000000
--- a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/ThreeCanvas.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package space.kscience.visionforge.compose
-
-import androidx.compose.runtime.*
-import kotlinx.dom.clear
-import org.jetbrains.compose.web.css.*
-import org.jetbrains.compose.web.dom.Div
-import space.kscience.dataforge.context.Context
-import space.kscience.dataforge.context.request
-import space.kscience.dataforge.names.Name
-import space.kscience.visionforge.solid.Solid
-import space.kscience.visionforge.solid.specifications.Canvas3DOptions
-import space.kscience.visionforge.solid.three.ThreeCanvas
-import space.kscience.visionforge.solid.three.ThreePlugin
-
-@Composable
-public fun ThreeCanvas(
- context: Context,
- options: Canvas3DOptions?,
- solid: Solid?,
- selected: Name?,
-) {
-
- val three: ThreePlugin by derivedStateOf { context.request(ThreePlugin) }
-
- Div({
- style {
- maxWidth(100.vw)
- maxHeight(100.vh)
- width(100.percent)
- height(100.percent)
- }
- }) {
- var canvas: ThreeCanvas? = null
- DisposableEffect(options) {
- canvas = ThreeCanvas(three, scopeElement, options ?: Canvas3DOptions())
- onDispose {
- scopeElement.clear()
- canvas = null
- }
- }
- LaunchedEffect(solid) {
- if (solid != null) {
- canvas?.render(solid)
- } else {
- canvas?.clear()
- }
- }
- LaunchedEffect(selected) {
- canvas?.select(selected)
- }
- }
-}
\ No newline at end of file
diff --git a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/ThreeControls.kt b/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/ThreeControls.kt
deleted file mode 100644
index c559b946..00000000
--- a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/ThreeControls.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-package space.kscience.visionforge.compose
-
-import androidx.compose.runtime.Composable
-import org.jetbrains.compose.web.css.*
-import org.jetbrains.compose.web.dom.Button
-import org.jetbrains.compose.web.dom.Text
-import org.w3c.files.Blob
-import org.w3c.files.BlobPropertyBag
-import space.kscience.dataforge.context.Global
-import space.kscience.dataforge.names.Name
-import space.kscience.visionforge.Vision
-import space.kscience.visionforge.encodeToString
-import space.kscience.visionforge.solid.specifications.Canvas3DOptions
-
-@Composable
-internal fun CanvasControls(
- vision: Vision?,
- options: Canvas3DOptions,
-) {
- FlexColumn {
- FlexRow({
- style {
- border {
- width(1.px)
- style(LineStyle.Solid)
- color(Color("blue"))
- }
- padding(4.px)
- }
- }) {
- vision?.let { vision ->
- Button({
- onClick { event ->
- val json = vision.encodeToString()
- event.stopPropagation();
- event.preventDefault();
-
- val fileSaver = kotlinext.js.require("file-saver")
- val blob = Blob(arrayOf(json), BlobPropertyBag("text/json;charset=utf-8"))
- fileSaver.saveAs(blob, "object.json") as Unit
- }
- }) {
- Text("Export")
- }
- }
- }
- PropertyEditor(
- scope = vision?.manager?.context ?: Global,
- properties = options.meta,
- descriptor = Canvas3DOptions.descriptor,
- expanded = false
- )
-
- }
-}
-
-
-@Composable
-public fun ThreeControls(
- vision: Vision?,
- canvasOptions: Canvas3DOptions,
- selected: Name?,
- onSelect: (Name?) -> Unit,
- tabBuilder: @Composable TabsBuilder.() -> Unit = {},
-) {
- Tabs {
- active = "Tree"
- vision?.let { vision ->
- Tab("Tree") {
- CardTitle("Vision tree")
- VisionTree(vision, Name.EMPTY, selected, onSelect)
- }
- }
- Tab("Settings") {
- CardTitle("Canvas configuration")
- CanvasControls(vision, canvasOptions)
- }
- tabBuilder()
- }
-}
diff --git a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/ThreeViewWithControls.kt b/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/ThreeViewWithControls.kt
deleted file mode 100644
index 7a347110..00000000
--- a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/ThreeViewWithControls.kt
+++ /dev/null
@@ -1,169 +0,0 @@
-@file:OptIn(ExperimentalComposeWebApi::class)
-
-package space.kscience.visionforge.compose
-
-import androidx.compose.runtime.*
-import app.softwork.bootstrapcompose.Card
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.launch
-import org.jetbrains.compose.web.ExperimentalComposeWebApi
-import org.jetbrains.compose.web.css.*
-import org.jetbrains.compose.web.dom.*
-import space.kscience.dataforge.meta.get
-import space.kscience.dataforge.names.Name
-import space.kscience.dataforge.names.isEmpty
-import space.kscience.visionforge.*
-import space.kscience.visionforge.solid.Solid
-import space.kscience.visionforge.solid.SolidGroup
-import space.kscience.visionforge.solid.Solids
-import space.kscience.visionforge.solid.specifications.Canvas3DOptions
-
-@Composable
-public fun ThreeCanvasWithControls(
- solids: Solids,
- builderOfSolid: Deferred,
- initialSelected: Name?,
- options: Canvas3DOptions?,
- tabBuilder: @Composable TabsBuilder.() -> Unit = {},
-) {
- var selected: Name? by remember { mutableStateOf(initialSelected) }
- var solid: Solid? by remember { mutableStateOf(null) }
-
- LaunchedEffect(builderOfSolid) {
- solids.context.launch {
- solid = builderOfSolid.await()
- //ensure that the solid is properly rooted
- if (solid?.parent == null) {
- solid?.setAsRoot(solids.context.visionManager)
- }
- }
- }
-
- val optionsWithSelector = remember(options) {
- (options ?: Canvas3DOptions()).apply {
- this.onSelect = {
- selected = it
- }
- }
- }
-
- val selectedVision: Vision? = remember(builderOfSolid, selected) {
- selected?.let {
- when {
- it.isEmpty() -> solid
- else -> (solid as? SolidGroup)?.get(it)
- }
- }
- }
-
-
- FlexRow({
- style {
- height(100.percent)
- width(100.percent)
- flexWrap(FlexWrap.Wrap)
- alignItems(AlignItems.Stretch)
- alignContent(AlignContent.Stretch)
- }
- }) {
- FlexColumn({
- style {
- height(100.percent)
- minWidth(600.px)
- flex(10, 1, 600.px)
- position(Position.Relative)
- }
- }) {
- if (solid == null) {
- Div({
- style {
- position(Position.Fixed)
- width(100.percent)
- height(100.percent)
- zIndex(1000)
- top(40.percent)
- left(0.px)
- opacity(0.5)
- filter {
- opacity(50.percent)
- }
- }
- }) {
- Div({ classes("d-flex", " justify-content-center") }) {
- Div({
- classes("spinner-grow", "text-primary")
- style {
- width(3.cssRem)
- height(3.cssRem)
- zIndex(20)
- }
- attr("role", "status")
- }) {
- Span({ classes("sr-only") }) { Text("Loading 3D vision") }
- }
- }
- }
- } else {
- ThreeCanvas(solids.context, optionsWithSelector, solid, selected)
- }
-
- selectedVision?.let { vision ->
- Div({
- style {
- position(Position.Absolute)
- top(5.px)
- right(5.px)
- width(450.px)
- }
- }) {
- Card(
- headerAttrs = {
- // border = true
- },
- header = {
- NameCrumbs(selected) { selected = it }
- }
- ) {
- PropertyEditor(
- scope = solids.context,
- meta = vision.properties.root(),
- getPropertyState = { name ->
- if (vision.properties.own?.get(name) != null) {
- EditorPropertyState.Defined
- } else if (vision.properties.root()[name] != null) {
- // TODO differentiate
- EditorPropertyState.Default()
- } else {
- EditorPropertyState.Undefined
- }
- },
- updates = vision.properties.changes,
- rootDescriptor = vision.descriptor
- )
-
- }
-
- vision.styles.takeIf { it.isNotEmpty() }?.let { styles ->
- P {
- B { Text("Styles: ") }
- Text(styles.joinToString(separator = ", "))
- }
- }
- }
- }
- }
- }
- FlexColumn({
- style {
- paddingAll(4.px)
- minWidth(400.px)
- height(100.percent)
- overflowY("auto")
- flex(1, 10, 300.px)
- }
- }) {
- ThreeControls(solid, optionsWithSelector, selected, onSelect = { selected = it }, tabBuilder = tabBuilder)
- }
-}
-
-
diff --git a/ui/react/README.md b/ui/react/README.md
deleted file mode 100644
index 9f862213..00000000
--- a/ui/react/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Module react
-
-
-
diff --git a/ui/react/build.gradle.kts b/ui/react/build.gradle.kts
deleted file mode 100644
index 1770feeb..00000000
--- a/ui/react/build.gradle.kts
+++ /dev/null
@@ -1,16 +0,0 @@
-plugins {
- id("space.kscience.gradle.mpp")
-}
-
-kscience {
- js()
- jsMain {
- dependencies {
- api(projects.visionforgeSolid)
- api("org.jetbrains.kotlin-wrappers:kotlin-styled")
- api("org.jetbrains.kotlin-wrappers:kotlin-react-dom")
-// implementation(npm("react-select","4.3.0"))
- api(projects.visionforgeThreejs)
- }
- }
-}
\ No newline at end of file
diff --git a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/MetaViewer.kt b/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/MetaViewer.kt
deleted file mode 100644
index 651c9d31..00000000
--- a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/MetaViewer.kt
+++ /dev/null
@@ -1,149 +0,0 @@
-package space.kscience.visionforge.react
-
-import kotlinx.css.Align
-import kotlinx.css.alignItems
-import kotlinx.html.js.onClickFunction
-import org.w3c.dom.events.Event
-import react.*
-import react.dom.a
-import react.dom.attrs
-import space.kscience.dataforge.meta.Meta
-import space.kscience.dataforge.meta.descriptors.MetaDescriptor
-import space.kscience.dataforge.meta.descriptors.get
-import space.kscience.dataforge.meta.get
-import space.kscience.dataforge.meta.isLeaf
-import space.kscience.dataforge.names.Name
-import space.kscience.dataforge.names.NameToken
-import space.kscience.dataforge.names.lastOrNull
-import space.kscience.dataforge.names.plus
-import styled.css
-import styled.styledDiv
-import styled.styledSpan
-
-public external interface MetaViewerProps : Props {
- /**
- * Root meta
- */
- public var root: Meta
-
- /**
- * The title of root node
- */
- public var rootName: String?
-
- /**
- * Full path to the displayed node in [root]. Could be empty
- */
- public var name: Name
-
- /**
- * Root descriptor
- */
- public var descriptor: MetaDescriptor?
-}
-
-private val MetaViewerItem: FC = fc("MetaViewerItem") { props ->
- metaViewerItem(props)
-}
-
-private fun RBuilder.metaViewerItem(props: MetaViewerProps) {
- var expanded: Boolean by useState { true }
- val item = props.root[props.name]
- val descriptorItem: MetaDescriptor? = props.descriptor?.get(props.name)
- val actualValue = item?.value ?: descriptorItem?.defaultValue
- val actualMeta = item ?: descriptorItem?.defaultNode
-
- val token = props.name.lastOrNull()?.toString() ?: props.rootName ?: ""
-
- val expanderClick: (Event) -> Unit = {
- expanded = !expanded
- }
-
- flexRow {
- css {
- alignItems = Align.center
- }
- if (actualMeta?.isLeaf == false) {
- styledSpan {
- css {
- +TreeStyles.treeCaret
- if (expanded) {
- +TreeStyles.treeCaredDown
- }
- }
- attrs {
- onClickFunction = expanderClick
- }
- }
- }
-
- styledSpan {
- css {
- +TreeStyles.treeLabel
- if (item == null) {
- +TreeStyles.treeLabelInactive
- }
- }
- +token
- }
- styledDiv {
- a {
- +actualValue.toString()
- }
- }
- }
- if (expanded) {
- flexColumn {
- css {
- +TreeStyles.tree
- }
- val keys = buildSet {
- descriptorItem?.children?.keys?.forEach {
- add(NameToken(it))
- }
- actualMeta!!.items.keys.let { addAll(it) }
- }
-
- keys.filter { !it.body.startsWith("@") }.forEach { token ->
- styledDiv {
- css {
- +TreeStyles.treeItem
- }
- child(MetaViewerItem) {
- attrs {
- this.key = props.name.toString()
- this.root = props.root
- this.name = props.name + token
- this.descriptor = props.descriptor
- }
- }
- //configEditor(props.root, props.name + token, props.descriptor, props.default)
- }
- }
- }
- }
-
-
-}
-
-@JsExport
-public val MetaViewer: FC = fc("MetaViewer") { props ->
- child(MetaViewerItem) {
- attrs {
- this.key = ""
- this.root = props.root
- this.name = Name.EMPTY
- this.descriptor = props.descriptor
- }
- }
-}
-
-public fun RBuilder.metaViewer(meta: Meta, descriptor: MetaDescriptor? = null, key: Any? = null) {
- child(MetaViewer) {
- attrs {
- this.key = key?.toString() ?: ""
- this.root = meta
- this.descriptor = descriptor
- }
- }
-}
diff --git a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/MultiSelectChooser.kt b/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/MultiSelectChooser.kt
deleted file mode 100644
index fc635d21..00000000
--- a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/MultiSelectChooser.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package space.kscience.visionforge.react
-
-import kotlinx.html.js.onChangeFunction
-import org.w3c.dom.HTMLOptionElement
-import org.w3c.dom.HTMLSelectElement
-import org.w3c.dom.asList
-import org.w3c.dom.events.Event
-import react.FC
-import react.dom.attrs
-import react.dom.option
-import react.dom.select
-import react.fc
-import space.kscience.dataforge.meta.asValue
-import space.kscience.dataforge.meta.descriptors.allowedValues
-import space.kscience.dataforge.meta.string
-
-@JsExport
-public val MultiSelectChooser: FC = fc("MultiSelectChooser") { props ->
- val onChange: (Event) -> Unit = { event: Event ->
- val newSelected = (event.target as HTMLSelectElement).selectedOptions.asList()
- .map { (it as HTMLOptionElement).value.asValue() }
- props.onValueChange(newSelected.asValue())
- }
-
- select {
- attrs {
- multiple = true
- values = (props.value?.list ?: emptyList()).mapTo(HashSet()) { it.string }
- onChangeFunction = onChange
- }
- props.descriptor?.allowedValues?.forEach { optionValue ->
- option {
- +optionValue.string
- }
- }
-
- }
-}
\ No newline at end of file
diff --git a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/PropertyEditor.kt b/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
deleted file mode 100644
index 58986076..00000000
--- a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
+++ /dev/null
@@ -1,278 +0,0 @@
-package space.kscience.visionforge.react
-
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
-import kotlinx.css.*
-import kotlinx.css.properties.TextDecoration
-import kotlinx.html.js.onClickFunction
-import org.w3c.dom.events.Event
-import react.*
-import react.dom.attrs
-import space.kscience.dataforge.meta.MutableMeta
-import space.kscience.dataforge.meta.ObservableMutableMeta
-import space.kscience.dataforge.meta.descriptors.MetaDescriptor
-import space.kscience.dataforge.meta.descriptors.ValueRequirement
-import space.kscience.dataforge.meta.descriptors.get
-import space.kscience.dataforge.meta.get
-import space.kscience.dataforge.meta.remove
-import space.kscience.dataforge.names.*
-import space.kscience.visionforge.hidden
-import styled.css
-import styled.styledButton
-import styled.styledDiv
-import styled.styledSpan
-
-/**
- * The display state of a property
- */
-public sealed class EditorPropertyState {
- public object Defined : EditorPropertyState()
- public class Default(public val source: String = "unknown") : EditorPropertyState()
-
- public object Undefined : EditorPropertyState()
-
-}
-
-
-public external interface PropertyEditorProps : Props {
-
- /**
- * Root config object - always non-null
- */
- public var meta: MutableMeta
-
- public var getPropertyState: (Name) -> EditorPropertyState
-
- public var scope: CoroutineScope
-
- public var updates: Flow
-
- /**
- * Full path to the displayed node in [meta]. Could be empty
- */
- public var name: Name
-
- /**
- * Root descriptor
- */
- public var descriptor: MetaDescriptor?
-
- /**
- * Initial expanded state
- */
- public var expanded: Boolean?
-}
-
-private val PropertyEditorItem: FC = fc("PropertyEditorItem") { props ->
- propertyEditorItem(props)
-}
-
-private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
- var expanded: Boolean by useState { props.expanded ?: true }
- val descriptor: MetaDescriptor? = useMemo(props.descriptor, props.name) { props.descriptor?.get(props.name) }
- var property: MutableMeta by useState { props.meta.getOrCreate(props.name) }
- var editorPropertyState: EditorPropertyState by useState { props.getPropertyState(props.name) }
-
-
- val keys = useMemo(descriptor) {
- buildSet {
- descriptor?.children?.filterNot {
- it.key.startsWith("@") || it.value.hidden
- }?.forEach {
- add(NameToken(it.key))
- }
- //ownProperty?.items?.keys?.filterNot { it.body.startsWith("@") }?.let { addAll(it) }
- }
- }
-
- val token = props.name.lastOrNull()?.toString() ?: "Properties"
-
- fun update() {
- property = props.meta.getOrCreate(props.name)
- editorPropertyState = props.getPropertyState(props.name)
- }
-
- useEffect(props.meta) {
- val job = props.updates.onEach { updatedName ->
- if (updatedName == props.name) {
- update()
- }
- }.launchIn(props.scope)
-
- cleanup {
- job.cancel()
- }
- }
-
- val expanderClick: (Event) -> Unit = {
- expanded = !expanded
- }
-
- val removeClick: (Event) -> Unit = {
- props.meta.remove(props.name)
- update()
- }
-
-
-
- flexRow {
- css {
- alignItems = Align.center
- }
- if (keys.isNotEmpty()) {
- styledSpan {
- css {
- +TreeStyles.treeCaret
- if (expanded) {
- +TreeStyles.treeCaredDown
- }
- }
- attrs {
- onClickFunction = expanderClick
- }
- }
- }
- styledSpan {
- css {
- +TreeStyles.treeLabel
- if (editorPropertyState != EditorPropertyState.Defined) {
- +TreeStyles.treeLabelInactive
- }
- }
- +token
- }
- if (!props.name.isEmpty() && descriptor?.valueRequirement != ValueRequirement.ABSENT) {
- styledDiv {
- css {
- //+TreeStyles.resizeableInput
- width = 160.px
- margin = Margin(1.px, 5.px)
- }
- ValueChooser {
- attrs {
- this.descriptor = descriptor
- this.state = editorPropertyState
- this.value = property.value
- this.onValueChange = {
- property.value = it
- editorPropertyState = props.getPropertyState(props.name)
- }
- }
- }
- }
-
- styledButton {
- css {
- width = 24.px
- alignSelf = Align.stretch
- margin = Margin(1.px, 5.px)
- backgroundColor = Color.white
- borderStyle = BorderStyle.solid
- borderRadius = 2.px
- textAlign = TextAlign.center
- textDecoration = TextDecoration.none
- cursor = Cursor.pointer
- disabled {
- cursor = Cursor.auto
- borderStyle = BorderStyle.dashed
- color = Color.lightGray
- }
- }
- +"\u00D7"
- attrs {
- if (editorPropertyState!= EditorPropertyState.Defined) {
- disabled = true
- } else {
- onClickFunction = removeClick
- }
- }
- }
- }
- }
- if (expanded) {
- flexColumn {
- css {
- +TreeStyles.tree
- }
- keys.forEach { token ->
- styledDiv {
- css {
- +TreeStyles.treeItem
- }
- child(PropertyEditorItem) {
- attrs {
- this.key = props.name.toString()
- this.meta = props.meta
- this.name = props.name + token
- this.descriptor = props.descriptor
- this.scope = props.scope
- this.getPropertyState = { props.getPropertyState(props.name + token) }
- this.updates = props.updates
- }
- }
- //configEditor(props.root, props.name + token, props.descriptor, props.default)
- }
- }
- }
- }
-}
-
-@JsExport
-public val PropertyEditor: FC = fc("PropertyEditor") { props ->
- child(PropertyEditorItem) {
- attrs {
- this.key = ""
- this.meta = props.meta
- this.name = Name.EMPTY
- this.descriptor = props.descriptor
- this.expanded = props.expanded
- this.scope = props.scope
- this.getPropertyState = props.getPropertyState
- this.updates = props.updates
- }
- }
-}
-
-@OptIn(ExperimentalCoroutinesApi::class)
-public fun RBuilder.propertyEditor(
- scope: CoroutineScope,
- properties: ObservableMutableMeta,
- descriptor: MetaDescriptor? = null,
- key: Any? = null,
- expanded: Boolean? = null,
-) {
- child(PropertyEditor) {
- attrs {
- this.meta = properties
- this.descriptor = descriptor
- this.key = key?.toString() ?: ""
- this.expanded = expanded
- this.scope = scope
- this.getPropertyState = { name ->
- if (properties[name] != null) {
- EditorPropertyState.Defined
- } else if (descriptor?.get(name)?.defaultValue != null) {
- EditorPropertyState.Default("descriptor")
- } else {
- EditorPropertyState.Undefined
- }
- }
- this.updates = callbackFlow {
- properties.onChange(scope) { name ->
- scope.launch {
- send(name)
- }
- }
-
- invokeOnClose {
- properties.removeListener(scope)
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt b/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt
deleted file mode 100644
index 4a82a6e9..00000000
--- a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-package space.kscience.visionforge.react
-
-import kotlinx.css.pct
-import kotlinx.css.width
-import kotlinx.html.InputType
-import kotlinx.html.js.onChangeFunction
-import kotlinx.html.js.onInputFunction
-import org.w3c.dom.HTMLInputElement
-import org.w3c.dom.events.Event
-import react.FC
-import react.dom.attrs
-import react.fc
-import react.useState
-import space.kscience.dataforge.meta.asValue
-import space.kscience.dataforge.meta.descriptors.ValueRequirement
-import space.kscience.dataforge.meta.double
-import space.kscience.dataforge.meta.get
-import space.kscience.dataforge.meta.string
-import styled.css
-import styled.styledInput
-
-@JsExport
-public val RangeValueChooser: FC = fc("RangeValueChooser") { props ->
- var innerValue by useState(props.value?.double)
- var rangeDisabled: Boolean by useState(props.state != EditorPropertyState.Defined)
-
- val handleDisable: (Event) -> Unit = {
- val checkBoxValue = (it.target as HTMLInputElement).checked
- rangeDisabled = !checkBoxValue
- props.onValueChange(
- if (!checkBoxValue) {
- null
- } else {
- innerValue?.asValue()
- }
- )
- }
-
- val handleChange: (Event) -> Unit = {
- val newValue = (it.target as HTMLInputElement).value
- props.onValueChange(newValue.toDoubleOrNull()?.asValue())
- innerValue = newValue.toDoubleOrNull()
- }
-
- flexRow {
- if (props.descriptor?.valueRequirement != ValueRequirement.REQUIRED) {
- styledInput(type = InputType.checkBox) {
- attrs {
- defaultChecked = rangeDisabled.not()
- onChangeFunction = handleDisable
- }
- }
- }
-
- styledInput(type = InputType.range) {
- css {
- width = 100.pct
- }
- attrs {
- disabled = rangeDisabled
- value = innerValue?.toString() ?: ""
-// onChangeFunction = handleChange
- onInputFunction = handleChange
- val minValue = props.descriptor?.attributes?.get("min").string
- minValue?.let {
- min = it
- }
- val maxValue = props.descriptor?.attributes?.get("max").string
- maxValue?.let {
- max = it
- }
- props.descriptor?.attributes?.get("step").string?.let {
- step = it
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt b/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
deleted file mode 100644
index 8cfa515d..00000000
--- a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package space.kscience.visionforge.react
-
-import kotlinx.css.*
-import org.w3c.dom.Element
-import react.*
-import space.kscience.dataforge.context.Context
-import space.kscience.dataforge.context.request
-import space.kscience.dataforge.names.Name
-import space.kscience.visionforge.solid.Solid
-import space.kscience.visionforge.solid.specifications.Canvas3DOptions
-import space.kscience.visionforge.solid.three.ThreeCanvas
-import space.kscience.visionforge.solid.three.ThreePlugin
-import styled.css
-import styled.styledDiv
-
-public external interface ThreeCanvasProps : Props {
- public var context: Context
- public var options: Canvas3DOptions?
- public var solid: Solid?
- public var selected: Name?
-}
-
-public val ThreeCanvasComponent: FC = fc("ThreeCanvasComponent") { props ->
- val elementRef = useRef(null)
- var canvas by useState(null)
-
- val three: ThreePlugin = useMemo(props.context) { props.context.request(ThreePlugin) }
-
- useEffect(props.solid, props.options, elementRef) {
- if (canvas == null) {
- val element = elementRef.current ?: error("Canvas element not found")
- canvas = ThreeCanvas(three, element, props.options ?: Canvas3DOptions())
- }
- }
-
- useEffect(canvas, props.solid) {
- props.solid?.let { obj ->
- canvas?.render(obj)
- }
- }
-
- useEffect(canvas, props.selected) {
- canvas?.select(props.selected)
- }
-
- styledDiv {
- css {
- maxWidth = 100.vw
- maxHeight = 100.vh
- width = 100.pct
- height = 100.pct
- }
- ref = elementRef
- }
-}
\ No newline at end of file
diff --git a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/TreeStyles.kt b/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/TreeStyles.kt
deleted file mode 100644
index 109d0256..00000000
--- a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/TreeStyles.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-package space.kscience.visionforge.react
-
-import kotlinx.css.*
-import kotlinx.css.properties.deg
-import kotlinx.css.properties.rotate
-import styled.StyleSheet
-
-public object TreeStyles : StyleSheet("treeStyles", true) {
- /**
- * Remove default bullets
- */
- public val tree: RuleSet by css {
- paddingLeft = 5.px
- marginLeft = 0.px
- listStyleType = ListStyleType.none
- }
-
- /**
- * Style the caret/arrow
- */
- public val treeCaret: RuleSet by css {
- cursor = Cursor.pointer
- userSelect = UserSelect.none
- /* Create the caret/arrow with a unicode, and style it */
- before {
- content = "\u25B6".quoted
- color = Color.black
- display = Display.inlineBlock
- marginRight = 6.px
- }
- }
-
- /**
- * Rotate the caret/arrow icon when clicked on (using JavaScript)
- */
- public val treeCaredDown:RuleSet by css {
- before {
- content = "\u25B6".quoted
- color = Color.black
- display = Display.inlineBlock
- marginRight = 6.px
- transform.rotate(90.deg)
- }
- }
-
- public val treeItem:RuleSet by css {
- alignItems = Align.center
- paddingLeft = 10.px
- borderLeftStyle = BorderStyle.dashed
- borderLeftWidth = 1.px
- borderLeftColor = Color.lightGray
- }
-
- public val treeLabel:RuleSet by css {
- border = Border.none
- padding = Padding(left = 4.pt, right = 4.pt, top = 0.pt, bottom = 0.pt)
- textAlign = TextAlign.left
- flex = Flex(1.0)
- }
-
- public val treeLabelInactive: RuleSet by css {
- color = Color.lightGray
- }
-
- public val treeLabelSelected:RuleSet by css {
- backgroundColor = Color.lightBlue
- }
-
-}
\ No newline at end of file
diff --git a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/VisionTree.kt b/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/VisionTree.kt
deleted file mode 100644
index 6212a456..00000000
--- a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/VisionTree.kt
+++ /dev/null
@@ -1,126 +0,0 @@
-package space.kscience.visionforge.react
-
-import kotlinx.css.*
-import kotlinx.css.properties.TextDecoration
-import kotlinx.css.properties.TextDecorationLine
-import kotlinx.html.js.onClickFunction
-import org.w3c.dom.events.Event
-import react.*
-import react.dom.attrs
-import space.kscience.dataforge.names.Name
-import space.kscience.dataforge.names.lastOrNull
-import space.kscience.dataforge.names.plus
-import space.kscience.dataforge.names.startsWith
-import space.kscience.visionforge.Vision
-import space.kscience.visionforge.VisionGroup
-import space.kscience.visionforge.asSequence
-import space.kscience.visionforge.isEmpty
-import styled.css
-import styled.styledDiv
-import styled.styledSpan
-
-public external interface ObjectTreeProps : Props {
- public var name: Name
- public var selected: Name?
- public var obj: Vision
- public var clickCallback: (Name) -> Unit
-}
-
-private val TreeLabel = fc { props ->
- val token = useMemo(props.name) { props.name.lastOrNull()?.toString() ?: "World" }
- styledSpan {
- css {
- +TreeStyles.treeLabel
- color = Color("#069")
- cursor = Cursor.pointer
- hover {
- textDecoration = TextDecoration(setOf(TextDecorationLine.underline))
- }
- if (props.name == props.selected) {
- +TreeStyles.treeLabelSelected
- }
- }
- +token
- attrs {
- onClickFunction = { props.clickCallback(props.name) }
- }
- }
-}
-
-private fun RBuilder.visionTree(props: ObjectTreeProps): Unit {
- var expanded: Boolean by useState { props.selected?.startsWith(props.name) ?: false }
-
- val onClick: (Event) -> Unit = {
- expanded = !expanded
- }
-
- val obj = props.obj
-
- //display as node if any child is visible
- if (obj is VisionGroup) {
- flexRow {
- if (obj.children.keys.any { !it.body.startsWith("@") }) {
- styledSpan {
- css {
- +TreeStyles.treeCaret
- if (expanded) {
- +TreeStyles.treeCaredDown
- }
- }
- attrs {
- onClickFunction = onClick
- }
- }
- }
- child(TreeLabel, props = props)
- }
- if (expanded) {
- flexColumn {
- css {
- +TreeStyles.tree
- }
- obj.children.asSequence()
- .filter { !it.first.toString().startsWith("@") } // ignore statics and other hidden children
- .sortedBy { (it.second as? VisionGroup)?.children?.isEmpty() ?: true } // ignore empty groups
- .forEach { (childToken, child) ->
- styledDiv {
- css {
- +TreeStyles.treeItem
- }
- child(ObjectTree) {
- attrs {
- this.name = props.name + childToken
- this.obj = child
- this.selected = props.selected
- this.clickCallback = props.clickCallback
- }
- }
- }
- }
- }
- }
- } else {
- child(TreeLabel, props = props)
- }
-}
-
-@JsExport
-public val ObjectTree: FC = fc("ObjectTree") { props ->
- visionTree(props)
-}
-
-public fun RBuilder.visionTree(
- vision: Vision,
- selected: Name? = null,
- clickCallback: (Name) -> Unit = {},
-) {
- child(ObjectTree) {
- attrs {
- this.name = Name.EMPTY
- this.obj = vision
- this.selected = selected
- this.clickCallback = clickCallback
- }
- }
-}
-
diff --git a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/createRoot.kt b/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/createRoot.kt
deleted file mode 100644
index fec86770..00000000
--- a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/createRoot.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-@file:JsModule("react-dom/client")
-@file:JsNonModule
-
-package space.kscience.visionforge.react
-
-import org.w3c.dom.Element
-import react.dom.client.Root
-import react.dom.client.RootOptions
-
-/**
- * Compatibility method to work with old browser API
- */
-public external fun createRoot(
- container: Element,
- options: RootOptions = definedExternally,
-): Root
diff --git a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/ext.kt b/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/ext.kt
deleted file mode 100644
index ae47fa65..00000000
--- a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/ext.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package space.kscience.visionforge.react
-
-import react.Props
-import react.RBuilder
-import react.createElement
-import react.dom.client.Root
-
-public fun Root.render(block: RBuilder.() -> Unit) {
- render(createElement(block))
-}
\ No newline at end of file
diff --git a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/layout.kt b/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/layout.kt
deleted file mode 100644
index 11a13561..00000000
--- a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/layout.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package space.kscience.visionforge.react
-
-import kotlinx.css.Display
-import kotlinx.css.FlexDirection
-import kotlinx.css.display
-import kotlinx.css.flexDirection
-import kotlinx.html.DIV
-import react.RBuilder
-import styled.StyledDOMBuilder
-import styled.css
-import styled.styledDiv
-
-public inline fun RBuilder.flexColumn(
- block: StyledDOMBuilder.() -> Unit
-): Unit = styledDiv {
- css {
- display = Display.flex
- flexDirection = FlexDirection.column
- }
- block()
-}
-
-public inline fun RBuilder.flexRow(
- block: StyledDOMBuilder
.() -> Unit
-): Unit = styledDiv {
- css {
- display = Display.flex
- flexDirection = FlexDirection.row
- }
- block()
-}
\ No newline at end of file
diff --git a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/valueChooser.kt b/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/valueChooser.kt
deleted file mode 100644
index 5d0c7c3d..00000000
--- a/ui/react/src/jsMain/kotlin/space/kscience/visionforge/react/valueChooser.kt
+++ /dev/null
@@ -1,175 +0,0 @@
-package space.kscience.visionforge.react
-
-import kotlinx.css.*
-import kotlinx.html.InputType
-import kotlinx.html.js.onChangeFunction
-import kotlinx.html.js.onKeyDownFunction
-import org.w3c.dom.HTMLInputElement
-import org.w3c.dom.HTMLSelectElement
-import org.w3c.dom.events.Event
-import react.FC
-import react.Props
-import react.dom.attrs
-import react.dom.option
-import react.fc
-import react.useState
-import space.kscience.dataforge.meta.*
-import space.kscience.dataforge.meta.descriptors.MetaDescriptor
-import space.kscience.dataforge.meta.descriptors.allowedValues
-import space.kscience.visionforge.Colors
-import space.kscience.visionforge.widgetType
-import styled.css
-import styled.styledInput
-import styled.styledSelect
-import three.math.Color
-
-public external interface ValueChooserProps : Props {
- public var descriptor: MetaDescriptor?
- public var state: EditorPropertyState
- public var value: Value?
- public var onValueChange: (Value?) -> Unit
-}
-
-@JsExport
-public val StringValueChooser: FC
= fc("StringValueChooser") { props ->
- var value by useState(props.value?.string ?: "")
- val keyDown: (Event) -> Unit = { event ->
- if (event.type == "keydown" && event.asDynamic().key == "Enter") {
- value = (event.target as HTMLInputElement).value
- props.onValueChange(value.asValue())
- }
- }
- val handleChange: (Event) -> Unit = {
- value = (it.target as HTMLInputElement).value
- }
- styledInput(type = InputType.text) {
- css {
- width = 100.pct
- }
- attrs {
- this.value = value
- onKeyDownFunction = keyDown
- onChangeFunction = handleChange
- }
- }
-}
-
-@JsExport
-public val BooleanValueChooser: FC = fc("BooleanValueChooser") { props ->
- val handleChange: (Event) -> Unit = {
- val newValue = (it.target as HTMLInputElement).checked
- props.onValueChange(newValue.asValue())
- }
- styledInput(type = InputType.checkBox) {
- css {
- width = 100.pct
- }
- attrs {
- //this.attributes["indeterminate"] = (props.item == null).toString()
- checked = props.value?.boolean ?: false
- onChangeFunction = handleChange
- }
- }
-}
-
-@JsExport
-public val NumberValueChooser: FC = fc("NumberValueChooser") { props ->
- var innerValue by useState(props.value?.string ?: "")
- val keyDown: (Event) -> Unit = { event ->
- if (event.type == "keydown" && event.asDynamic().key == "Enter") {
- innerValue = (event.target as HTMLInputElement).value
- val number = innerValue.toDoubleOrNull()
- if (number == null) {
- console.error("The input value $innerValue is not a number")
- } else {
- props.onValueChange(number.asValue())
- }
- }
- }
- val handleChange: (Event) -> Unit = {
- innerValue = (it.target as HTMLInputElement).value
- }
- styledInput(type = InputType.number) {
- css {
- width = 100.pct
- }
- attrs {
- value = innerValue
- onKeyDownFunction = keyDown
- onChangeFunction = handleChange
- props.descriptor?.attributes?.get("step").string?.let {
- step = it
- }
- props.descriptor?.attributes?.get("min").string?.let {
- min = it
- }
- props.descriptor?.attributes?.get("max").string?.let {
- max = it
- }
- }
- }
-}
-
-@JsExport
-public val ComboValueChooser: FC = fc("ComboValueChooser") { props ->
- var selected by useState(props.value?.string ?: "")
- val handleChange: (Event) -> Unit = {
- selected = (it.target as HTMLSelectElement).value
- props.onValueChange(selected.asValue())
- }
- styledSelect {
- css {
- width = 100.pct
- }
- props.descriptor?.allowedValues?.forEach {
- option {
- +it.string
- }
- }
- attrs {
- this.value = props.value?.string ?: ""
- multiple = false
- onChangeFunction = handleChange
- }
- }
-}
-
-@JsExport
-public val ColorValueChooser: FC = fc("ColorValueChooser") { props ->
- val handleChange: (Event) -> Unit = {
- props.onValueChange((it.target as HTMLInputElement).value.asValue())
- }
- styledInput(type = InputType.color) {
- css {
- width = 100.pct
- margin = Margin(0.px)
- }
- attrs {
- this.value = props.value?.let { value ->
- if (value.type == ValueType.NUMBER) Colors.rgbToString(value.int)
- else "#" + Color(value.string).getHexString()
- } ?: "#000000"
- onChangeFunction = handleChange
- }
- }
-}
-
-@JsExport
-public val ValueChooser: FC = fc("ValueChooser") { props ->
- val rawInput by useState(false)
-
- val descriptor = props.descriptor
- val type = descriptor?.valueTypes?.firstOrNull()
-
- when {
- rawInput -> child(StringValueChooser, props)
- descriptor?.widgetType == "color" -> child(ColorValueChooser, props)
- descriptor?.widgetType == "multiSelect" -> child(MultiSelectChooser, props)
- descriptor?.widgetType == "range" -> child(RangeValueChooser, props)
- type == ValueType.BOOLEAN -> child(BooleanValueChooser, props)
- type == ValueType.NUMBER -> child(NumberValueChooser, props)
- descriptor?.allowedValues?.isNotEmpty() ?: false -> child(ComboValueChooser, props)
- //TODO handle lists
- else -> child(StringValueChooser, props)
- }
-}
diff --git a/ui/ring/README.md b/ui/ring/README.md
deleted file mode 100644
index 6cdcbb60..00000000
--- a/ui/ring/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Module ring
-
-
-
diff --git a/ui/ring/build.gradle.kts b/ui/ring/build.gradle.kts
deleted file mode 100644
index d1f2ff72..00000000
--- a/ui/ring/build.gradle.kts
+++ /dev/null
@@ -1,25 +0,0 @@
-plugins {
- id("space.kscience.gradle.mpp")
-}
-
-val dataforgeVersion: String by rootProject.extra
-
-kscience{
- js{
- useCommonJs()
- browser {
- commonWebpackConfig {
- cssSupport{
- enabled.set(false)
- }
- }
- }
- }
- jsMain{
- api(projects.ui.react)
- api("org.jetbrains.kotlin-wrappers:kotlin-ring-ui")
-
- implementation(npm("core-js","3.12.1"))
- implementation(npm("file-saver", "2.0.2"))
- }
-}
\ No newline at end of file
diff --git a/ui/ring/src/jsMain/kotlin/ringui/Loader.kt b/ui/ring/src/jsMain/kotlin/ringui/Loader.kt
deleted file mode 100644
index b7bc63a9..00000000
--- a/ui/ring/src/jsMain/kotlin/ringui/Loader.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-@file:JsModule("@jetbrains/ring-ui/components/loader/loader")
-@file:JsNonModule
-
-package ringui
-
-import react.ComponentClass
-import react.PropsWithClassName
-
-
-// https://github.com/JetBrains/ring-ui/blob/master/components/loader/loader.js
-public external interface LoaderProps : PropsWithClassName {
- public var size: Number
- public var colors: Array
- public var message: String
- public var stop: Boolean
- public var deterministic: Boolean
-}
-
-@JsName("default")
-public external val Loader: ComponentClass
\ No newline at end of file
diff --git a/ui/ring/src/jsMain/kotlin/ringui/LoaderScreen.kt b/ui/ring/src/jsMain/kotlin/ringui/LoaderScreen.kt
deleted file mode 100644
index d662ee2b..00000000
--- a/ui/ring/src/jsMain/kotlin/ringui/LoaderScreen.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-@file:JsModule("@jetbrains/ring-ui/components/loader-screen/loader-screen")
-@file:JsNonModule
-
-package ringui
-
-import react.ComponentClass
-import react.PropsWithClassName
-
-// https://github.com/JetBrains/ring-ui/blob/master/components/loader-screen/loader-screen.js
-public external interface LoaderScreenProps : PropsWithClassName {
- public var containerClassName: String
- public var message: String
-}
-
-@JsName("default")
-public external val LoaderScreen: ComponentClass
\ No newline at end of file
diff --git a/ui/ring/src/jsMain/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt b/ui/ring/src/jsMain/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
deleted file mode 100644
index 6ae2ec62..00000000
--- a/ui/ring/src/jsMain/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
+++ /dev/null
@@ -1,212 +0,0 @@
-package space.kscience.visionforge.ring
-
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
-import kotlinx.css.*
-import react.*
-import react.dom.b
-import react.dom.div
-import react.dom.p
-import react.dom.span
-import ringui.*
-import space.kscience.dataforge.meta.get
-import space.kscience.dataforge.names.Name
-import space.kscience.dataforge.names.NameToken
-import space.kscience.dataforge.names.isEmpty
-import space.kscience.dataforge.names.length
-import space.kscience.visionforge.*
-import space.kscience.visionforge.react.*
-import space.kscience.visionforge.solid.Solid
-import space.kscience.visionforge.solid.SolidGroup
-import space.kscience.visionforge.solid.Solids
-import space.kscience.visionforge.solid.solidGroup
-import space.kscience.visionforge.solid.specifications.Canvas3DOptions
-import styled.css
-import styled.styledDiv
-
-public external interface ThreeCanvasWithControlsProps : Props {
- public var solids: Solids
- public var builderOfSolid: Deferred
- public var selected: Name?
- public var options: Canvas3DOptions?
- public var additionalTabs: Map Unit>?
-}
-
-private val ThreeCanvasWithControlsProps.context get() = solids.context
-
-public fun ThreeCanvasWithControlsProps.solid(block: SolidGroup.() -> Unit) {
- builderOfSolid = context.async {
- solids.solidGroup(null, block)
- }
-}
-
-public fun ThreeCanvasWithControlsProps.options(block: Canvas3DOptions.() -> Unit) {
- options = Canvas3DOptions(block)
-}
-
-public fun ThreeCanvasWithControlsProps.tab(title: String, block: RBuilder.() -> Unit) {
- additionalTabs = (additionalTabs ?: emptyMap()) + (title to block)
-}
-
-
-public fun RBuilder.nameCrumbs(name: Name?, link: (Name) -> Unit): Unit = styledDiv {
- div {
- Link {
- attrs {
- onClick = {
- link(Name.EMPTY)
- }
- }
- +"\u2302"
- }
-
- if (name != null) {
- val tokens = ArrayList(name.length)
- name.tokens.forEach { token ->
- tokens.add(token)
- val fullName = Name(tokens.toList())
- span { +"." }
- Link {
- +token.toString()
- attrs {
- onClick = {
- console.log("Selected = $fullName")
- link(fullName)
- }
- }
- }
- }
- }
- }
-
-}
-
-@JsExport
-public val ThreeCanvasWithControls: FC = fc("ThreeViewWithControls") { props ->
- var selected: Name? by useState { props.selected }
- var solid: Solid? by useState(null)
-
- useEffect {
- props.context.launch {
- solid = props.builderOfSolid.await()
- //ensure that the solid is properly rooted
- if (solid?.parent == null) {
- solid?.setAsRoot(props.context.visionManager)
- }
- }
- }
-
- val onSelect: (Name?) -> Unit = {
- selected = it
- }
-
- val options = useMemo(props.options) {
- (props.options ?: Canvas3DOptions()).apply {
- this.onSelect = onSelect
- }
- }
-
- val selectedVision: Vision? = useMemo(props.builderOfSolid, selected) {
- selected?.let {
- when {
- it.isEmpty() -> solid
- else -> (solid as? SolidGroup)?.get(it)
- }
- }
- }
-
-
- flexRow {
- css {
- height = 100.pct
- width = 100.pct
- flexWrap = FlexWrap.wrap
- alignItems = Align.stretch
- alignContent = Align.stretch
- }
-
- flexColumn {
- css {
- height = 100.pct
- minWidth = 600.px
- flex = Flex(10.0, 1.0, FlexBasis("600px"))
- position = Position.relative
- }
-
- if (solid == null) {
- LoaderScreen {
- attrs {
- message = "Loading Three vision"
- }
- }
- } else {
- child(ThreeCanvasComponent) {
- attrs {
- this.context = props.context
- this.solid = solid
- this.selected = selected
- this.options = options
- }
- }
- }
-
- selectedVision?.let { vision ->
- styledDiv {
- css {
- position = Position.absolute
- top = 5.px
- right = 5.px
- width = 450.px
- }
- Island {
- IslandHeader {
- attrs {
- border = true
- }
- nameCrumbs(selected) { selected = it }
- }
- IslandContent {
- child(PropertyEditor) {
- attrs {
- this.key = selected.toString()
- this.meta = vision.properties.root()
- this.updates = vision.properties.changes
- this.descriptor = vision.descriptor
- this.scope = props.context
- this.getPropertyState = { name ->
- if (vision.properties.own?.get(name) != null) {
- EditorPropertyState.Defined
- } else if (vision.properties.root()[name] != null) {
- // TODO differentiate
- EditorPropertyState.Default()
- } else {
- EditorPropertyState.Undefined
- }
- }
- }
- }
- vision.styles.takeIf { it.isNotEmpty() }?.let { styles ->
- p {
- b { +"Styles: " }
- +styles.joinToString(separator = ", ")
- }
- }
- }
- }
- }
- }
- }
- flexColumn {
- css {
- padding = Padding(4.px)
- minWidth = 400.px
- height = 100.pct
- overflowY = Overflow.auto
- flex = Flex(1.0, 10.0, FlexBasis("300px"))
- }
- ringThreeControls(options, solid, selected, onSelect, additionalTabs = props.additionalTabs)
- }
- }
-}
-
diff --git a/ui/ring/src/jsMain/kotlin/space.kscience.visionforge.ring/ThreeWithControlsPlugin.kt b/ui/ring/src/jsMain/kotlin/space.kscience.visionforge.ring/ThreeWithControlsPlugin.kt
deleted file mode 100644
index 94259b2f..00000000
--- a/ui/ring/src/jsMain/kotlin/space.kscience.visionforge.ring/ThreeWithControlsPlugin.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package space.kscience.visionforge.ring
-
-import kotlinx.coroutines.async
-import org.w3c.dom.Element
-import space.kscience.dataforge.context.AbstractPlugin
-import space.kscience.dataforge.context.Context
-import space.kscience.dataforge.context.PluginFactory
-import space.kscience.dataforge.context.PluginTag
-import space.kscience.dataforge.meta.Meta
-import space.kscience.dataforge.meta.boolean
-import space.kscience.dataforge.meta.get
-import space.kscience.dataforge.names.Name
-import space.kscience.dataforge.names.asName
-import space.kscience.visionforge.ElementVisionRenderer
-import space.kscience.visionforge.Vision
-import space.kscience.visionforge.react.render
-import space.kscience.visionforge.solid.Solid
-import space.kscience.visionforge.solid.specifications.Canvas3DOptions
-import space.kscience.visionforge.solid.three.ThreePlugin
-
-public class ThreeWithControlsPlugin : AbstractPlugin(), ElementVisionRenderer {
- public val three: ThreePlugin by require(ThreePlugin)
-
- override val tag: PluginTag get() = Companion.tag
-
- override fun rateVision(vision: Vision): Int =
- if (vision is Solid) ElementVisionRenderer.DEFAULT_RATING * 2 else ElementVisionRenderer.ZERO_RATING
-
- override fun render(element: Element, name: Name, vision: Vision, meta: Meta) {
- if(meta["controls.enabled"].boolean == false){
- three.render(element, name, vision, meta)
- } else {
- space.kscience.visionforge.react.createRoot(element).render {
- child(ThreeCanvasWithControls) {
- attrs {
- this.solids = three.solids
- this.options = Canvas3DOptions.read(meta)
- this.builderOfSolid = context.async { vision as Solid }
- }
- }
- }
- }
- }
-
- override fun content(target: String): Map {
- return when (target) {
- ElementVisionRenderer.TYPE -> mapOf("three.withControls".asName() to this)
- else -> super.content(target)
- }
- }
-
- public companion object : PluginFactory {
- override val tag: PluginTag = PluginTag("vision.threejs.withControls", PluginTag.DATAFORGE_GROUP)
-
- override fun build(context: Context, meta: Meta): ThreeWithControlsPlugin = ThreeWithControlsPlugin()
- }
-}
\ No newline at end of file
diff --git a/ui/ring/src/jsMain/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt b/ui/ring/src/jsMain/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt
deleted file mode 100644
index 83529d28..00000000
--- a/ui/ring/src/jsMain/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-package space.kscience.visionforge.ring
-
-import org.w3c.dom.Element
-import react.RBuilder
-import react.dom.p
-import ringui.Island
-import ringui.SmartTabs
-import ringui.Tab
-import space.kscience.dataforge.meta.descriptors.MetaDescriptor
-import space.kscience.dataforge.meta.get
-import space.kscience.visionforge.Vision
-import space.kscience.visionforge.getStyle
-import space.kscience.visionforge.react.*
-import space.kscience.visionforge.root
-import space.kscience.visionforge.solid.SolidReference
-import space.kscience.visionforge.styles
-
-public fun RBuilder.ringPropertyEditor(
- vision: Vision,
- descriptor: MetaDescriptor? = vision.descriptor,
- key: Any? = null,
-) {
- val styles = if (vision is SolidReference) {
- (vision.styles + vision.prototype.styles).distinct()
- } else {
- vision.styles
- }
-
- flexColumn {
- Island("Properties") {
- child(PropertyEditor) {
- attrs {
- this.key = key?.toString()
- this.meta = vision.properties.root()
- this.updates = vision.properties.changes
- this.descriptor = descriptor
- this.scope = vision.manager?.context ?: error("Orphan vision could not be observed")
- this.getPropertyState = {name->
- if(vision.properties.own?.get(name)!= null){
- EditorPropertyState.Defined
- } else if(vision.properties.root()[name] != null){
- // TODO differentiate
- EditorPropertyState.Default()
- } else {
- EditorPropertyState.Undefined
- }
- }
- }
- }
- }
-
- if (styles.isNotEmpty()) {
- Island("Styles") {
- if (styles.size == 1) {
- val styleName = styles.first()
- p {
- +styleName
- }
- val style = vision.getStyle(styleName)
- if (style != null) {
- Tab(styleName, id = styleName) {
- metaViewer(style)
- }
- }
- } else {
- SmartTabs {
- styles.forEach { styleName ->
- val style = vision.getStyle(styleName)
- if (style != null) {
- Tab(styleName, id = styleName) {
- metaViewer(style)
- }
- }
- }
- }
- }
- }
- }
- }
-}
-
-
-public fun Element.ringPropertyEditor(
- item: Vision,
- descriptor: MetaDescriptor? = item.descriptor,
-): Unit = createRoot(this).render {
- ringPropertyEditor(item, descriptor = descriptor)
-}
\ No newline at end of file
diff --git a/ui/ring/src/jsMain/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt b/ui/ring/src/jsMain/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
deleted file mode 100644
index 6cdc0707..00000000
--- a/ui/ring/src/jsMain/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
+++ /dev/null
@@ -1,131 +0,0 @@
-package space.kscience.visionforge.ring
-
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.GlobalScope
-import kotlinx.css.*
-import kotlinx.html.js.onClickFunction
-import org.w3c.dom.events.Event
-import org.w3c.files.Blob
-import org.w3c.files.BlobPropertyBag
-import react.FC
-import react.Props
-import react.RBuilder
-import react.dom.attrs
-import react.dom.button
-import react.fc
-import ringui.Island
-import ringui.SmartTabs
-import ringui.Tab
-import space.kscience.dataforge.names.Name
-import space.kscience.visionforge.Vision
-import space.kscience.visionforge.encodeToString
-import space.kscience.visionforge.react.flexColumn
-import space.kscience.visionforge.react.flexRow
-import space.kscience.visionforge.react.propertyEditor
-import space.kscience.visionforge.react.visionTree
-import space.kscience.visionforge.solid.specifications.Canvas3DOptions
-import styled.css
-
-internal fun saveData(event: Event, fileName: String, mimeType: String = "text/plain", dataBuilder: () -> String) {
- event.stopPropagation();
- event.preventDefault();
-
- val fileSaver = kotlinext.js.require("file-saver")
- val blob = Blob(arrayOf(dataBuilder()), BlobPropertyBag("$mimeType;charset=utf-8"))
- fileSaver.saveAs(blob, fileName)
-}
-
-internal fun RBuilder.canvasControls(options: Canvas3DOptions, vision: Vision?): Unit {
- child(CanvasControls) {
- attrs {
- this.options = options
- this.vision = vision
- }
- }
-}
-
-internal external interface CanvasControlsProps : Props {
- public var options: Canvas3DOptions
- public var vision: Vision?
-}
-
-@OptIn(DelicateCoroutinesApi::class)
-internal val CanvasControls: FC = fc("CanvasControls") { props ->
- flexColumn {
- flexRow {
- css {
- border = Border(1.px, BorderStyle.solid, Color.blue)
- padding = Padding(4.px)
- }
- props.vision?.let { vision ->
- button {
- +"Export"
- attrs {
- onClickFunction = {
- val json = vision.encodeToString()
- saveData(it, "object.json", "text/json") {
- json
- }
-
- }
- }
- }
- }
- }
- propertyEditor(
- scope = props.vision?.manager?.context ?: GlobalScope,
- properties = props.options.meta,
- descriptor = Canvas3DOptions.descriptor,
- expanded = false
- )
-
- }
-}
-
-
-public external interface ThreeControlsProps : Props {
- public var canvasOptions: Canvas3DOptions
- public var vision: Vision?
- public var selected: Name?
- public var onSelect: (Name?) -> Unit
- public var additionalTabs: Map Unit>
-}
-
-@JsExport
-public val ThreeControls: FC = fc { props ->
- SmartTabs("Tree") {
- props.vision?.let {
- Tab("Tree") {
- Island("Vision tree") {
- visionTree(it, props.selected, props.onSelect)
- }
- }
- }
- Tab("Settings") {
- Island("Canvas configuration") {
- canvasControls(props.canvasOptions, props.vision)
- }
- }
- props.additionalTabs.forEach { (name, handler) ->
- Tab(name) {
- handler()
- }
- }
- }
-}
-
-public fun RBuilder.ringThreeControls(
- canvasOptions: Canvas3DOptions,
- vision: Vision?,
- selected: Name?,
- onSelect: (Name?) -> Unit = {},
- additionalTabs: Map Unit>? = null
-): Unit = child(ThreeControls) {
- attrs {
- this.canvasOptions = canvasOptions
- this.vision = vision
- this.selected = selected
- this.onSelect = onSelect
- this.additionalTabs = additionalTabs ?: emptyMap()
- }
-}
\ No newline at end of file
diff --git a/ui/ring/webpack.config.d/01.ring.js b/ui/ring/webpack.config.d/01.ring.js
deleted file mode 100644
index 41da041c..00000000
--- a/ui/ring/webpack.config.d/01.ring.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const ringConfig = require('@jetbrains/ring-ui/webpack.config').config;
-
-config.module.rules.push(...ringConfig.module.rules)
\ No newline at end of file
diff --git a/ui/compose/build.gradle.kts b/visionforge-compose-html/build.gradle.kts
similarity index 54%
rename from ui/compose/build.gradle.kts
rename to visionforge-compose-html/build.gradle.kts
index 77a8cfcf..89d7c329 100644
--- a/ui/compose/build.gradle.kts
+++ b/visionforge-compose-html/build.gradle.kts
@@ -1,40 +1,31 @@
-
plugins {
id("space.kscience.gradle.mpp")
alias(spclibs.plugins.compose)
-// id("com.android.library")
}
-kscience{
- jvm()
+kscience {
js()
-// wasm()
+ jvm()
}
kotlin {
// android()
sourceSets {
- val commonMain by getting {
- dependencies {
-
- }
- }
-
- val jvmMain by getting {
+ commonMain {
dependencies {
+ api(projects.visionforgeCore)
+ //need this to placate compose compiler in MPP applications
api(compose.runtime)
- api(compose.foundation)
- api(compose.material)
- api(compose.preview)
}
}
- val jsMain by getting{
+ jsMain{
dependencies {
- api(compose.html.core)
api("app.softwork:bootstrap-compose:0.1.15")
api("app.softwork:bootstrap-compose-icons:0.1.15")
- api(projects.visionforge.visionforgeThreejs)
+ implementation(compose.html.svg)
+
+ api(compose.html.core)
}
}
}
diff --git a/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/ComposeHtmlVisionRenderer.kt b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/ComposeHtmlVisionRenderer.kt
new file mode 100644
index 00000000..5a54292d
--- /dev/null
+++ b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/ComposeHtmlVisionRenderer.kt
@@ -0,0 +1,28 @@
+package space.kscience.visionforge.html
+
+import androidx.compose.runtime.Composable
+import org.jetbrains.compose.web.css.Style
+import org.jetbrains.compose.web.dom.DOMScope
+import org.jetbrains.compose.web.renderComposable
+import org.w3c.dom.Element
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.names.Name
+import space.kscience.visionforge.Vision
+
+/**
+ * An [ElementVisionRenderer] that could be used directly in Compose-html as well as a stand-alone renderer
+ */
+public interface ComposeHtmlVisionRenderer : ElementVisionRenderer {
+
+ @Composable
+ public fun DOMScope.render(name: Name, vision: Vision, meta: Meta)
+
+ override fun render(element: Element, name: Name, vision: Vision, meta: Meta) {
+ renderComposable(element) {
+ Style(VisionForgeStyles)
+ render(name, vision, meta)
+ }
+ }
+
+ public companion object
+}
\ No newline at end of file
diff --git a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/MetaViewer.kt b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/MetaViewer.kt
similarity index 94%
rename from ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/MetaViewer.kt
rename to visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/MetaViewer.kt
index 5aaf4140..3f85fd9f 100644
--- a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/MetaViewer.kt
+++ b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/MetaViewer.kt
@@ -1,4 +1,4 @@
-package space.kscience.visionforge.compose
+package space.kscience.visionforge.html
import androidx.compose.runtime.*
import org.jetbrains.compose.web.css.AlignItems
@@ -10,7 +10,6 @@ import org.jetbrains.compose.web.dom.Text
import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.meta.descriptors.MetaDescriptor
import space.kscience.dataforge.meta.descriptors.get
-import space.kscience.dataforge.meta.get
import space.kscience.dataforge.meta.isLeaf
import space.kscience.dataforge.names.Name
import space.kscience.dataforge.names.NameToken
@@ -64,7 +63,7 @@ private fun MetaViewerItem(root: Meta, name: Name, rootDescriptor: MetaDescripto
classes(TreeStyles.tree)
}) {
val keys = buildSet {
- descriptorItem?.children?.keys?.forEach {
+ descriptorItem?.nodes?.keys?.forEach {
add(NameToken(it))
}
actualMeta!!.items.keys.let { addAll(it) }
diff --git a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/NameCrumbs.kt b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/NameCrumbs.kt
similarity index 61%
rename from ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/NameCrumbs.kt
rename to visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/NameCrumbs.kt
index 2becdbb6..787a45fa 100644
--- a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/NameCrumbs.kt
+++ b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/NameCrumbs.kt
@@ -1,26 +1,31 @@
-package space.kscience.visionforge.compose
+package space.kscience.visionforge.html
import androidx.compose.runtime.Composable
-import org.jetbrains.compose.web.dom.Li
-import org.jetbrains.compose.web.dom.Nav
-import org.jetbrains.compose.web.dom.Ol
-import org.jetbrains.compose.web.dom.Text
+import org.jetbrains.compose.web.dom.*
import space.kscience.dataforge.names.Name
import space.kscience.dataforge.names.NameToken
import space.kscience.dataforge.names.length
@Composable
public fun NameCrumbs(name: Name?, link: (Name) -> Unit): Unit = Nav({
- attr("aria-label","breadcrumb")
+ attr("aria-label", "breadcrumb")
}) {
- Ol({classes("breadcrumb")}) {
+ Ol({
+ classes("breadcrumb")
+ style {
+ property("--bs-breadcrumb-divider", "'.'")
+ property("--bs-breadcrumb-item-padding-x", ".1rem")
+ }
+ }) {
Li({
classes("breadcrumb-item")
onClick {
link(Name.EMPTY)
}
}) {
- Text("\u2302")
+ A("#") {
+ Text("\u2302")
+ }
}
if (name != null) {
@@ -28,15 +33,16 @@ public fun NameCrumbs(name: Name?, link: (Name) -> Unit): Unit = Nav({
name.tokens.forEach { token ->
tokens.add(token)
val fullName = Name(tokens.toList())
- Text(".")
Li({
classes("breadcrumb-item")
- if(tokens.size == name.length) classes("active")
+ if (tokens.size == name.length) classes("active")
onClick {
link(fullName)
}
}) {
- Text(token.toString())
+ A("#") {
+ Text(token.toString())
+ }
}
}
}
diff --git a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/PropertyEditor.kt b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/PropertyEditor.kt
similarity index 62%
rename from ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/PropertyEditor.kt
rename to visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/PropertyEditor.kt
index d919cd77..04329625 100644
--- a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/PropertyEditor.kt
+++ b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/PropertyEditor.kt
@@ -1,25 +1,23 @@
-package space.kscience.visionforge.compose
+package space.kscience.visionforge.html
import androidx.compose.runtime.*
-import kotlinx.coroutines.CoroutineScope
+import app.softwork.bootstrapcompose.CloseButton
+import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.callbackFlow
import kotlinx.coroutines.launch
-import org.jetbrains.compose.web.attributes.disabled
import org.jetbrains.compose.web.css.AlignItems
import org.jetbrains.compose.web.css.alignItems
import org.jetbrains.compose.web.css.px
import org.jetbrains.compose.web.css.width
-import org.jetbrains.compose.web.dom.Button
import org.jetbrains.compose.web.dom.Div
import org.jetbrains.compose.web.dom.Span
import org.jetbrains.compose.web.dom.Text
import space.kscience.dataforge.meta.MutableMeta
import space.kscience.dataforge.meta.ObservableMutableMeta
import space.kscience.dataforge.meta.descriptors.MetaDescriptor
-import space.kscience.dataforge.meta.descriptors.ValueRequirement
+import space.kscience.dataforge.meta.descriptors.ValueRestriction
import space.kscience.dataforge.meta.descriptors.get
-import space.kscience.dataforge.meta.get
import space.kscience.dataforge.meta.remove
import space.kscience.dataforge.names.*
import space.kscience.visionforge.hidden
@@ -29,35 +27,33 @@ import space.kscience.visionforge.hidden
* The display state of a property
*/
public sealed class EditorPropertyState {
- public object Defined : EditorPropertyState()
- public class Default(public val source: String = "unknown") : EditorPropertyState()
- public object Undefined : EditorPropertyState()
-
+ public data object Defined : EditorPropertyState()
+ public data class Default(public val source: String = "unknown") : EditorPropertyState()
+ public data object Undefined : EditorPropertyState()
}
/**
- * @param meta Root config object - always non-null
- * @param rootDescriptor Full path to the displayed node in [meta]. Could be empty
+ * @param rootMeta Root config object - always non-null
+ * @param rootDescriptor Full path to the displayed node in [rootMeta]. Could be empty
*/
@Composable
public fun PropertyEditor(
- scope: CoroutineScope,
- meta: MutableMeta,
+ rootMeta: MutableMeta,
getPropertyState: (Name) -> EditorPropertyState,
updates: Flow,
- name: Name = Name.EMPTY,
- rootDescriptor: MetaDescriptor? = null,
+ name: Name,
+ rootDescriptor: MetaDescriptor?,
initialExpanded: Boolean? = null,
) {
var expanded: Boolean by remember { mutableStateOf(initialExpanded ?: true) }
- val descriptor: MetaDescriptor? = remember(rootDescriptor, name) { rootDescriptor?.get(name) }
- var property: MutableMeta by remember { mutableStateOf(meta.getOrCreate(name)) }
+ val descriptor: MetaDescriptor? by derivedStateOf { rootDescriptor?.get(name) }
+ var displayedValue by remember { mutableStateOf(rootMeta.getValue(name)) }
var editorPropertyState: EditorPropertyState by remember { mutableStateOf(getPropertyState(name)) }
- val keys = remember(descriptor) {
+ val keys by derivedStateOf {
buildSet {
- descriptor?.children?.filterNot {
+ descriptor?.nodes?.filterNot {
it.key.startsWith("@") || it.value.hidden
}?.forEach {
add(NameToken(it.key))
@@ -69,13 +65,13 @@ public fun PropertyEditor(
val token = name.lastOrNull()?.toString() ?: "Properties"
fun update() {
- property = meta.getOrCreate(name)
+ displayedValue = rootMeta.getValue(name)
editorPropertyState = getPropertyState(name)
}
- LaunchedEffect(meta) {
+ LaunchedEffect(rootMeta) {
updates.collect { updatedName ->
- if (updatedName == name) {
+ if (name.startsWith(updatedName)) {
update()
}
}
@@ -86,6 +82,7 @@ public fun PropertyEditor(
alignItems(AlignItems.Center)
}
}) {
+ //if node has children
if (keys.isNotEmpty()) {
Span({
classes(TreeStyles.treeCaret)
@@ -97,38 +94,35 @@ public fun PropertyEditor(
}
Span({
classes(TreeStyles.treeLabel)
- if (editorPropertyState != EditorPropertyState.Defined) {
- classes(TreeStyles.treeLabelInactive)
+ when (editorPropertyState) {
+ is EditorPropertyState.Default, EditorPropertyState.Undefined -> {
+ classes(TreeStyles.treeLabelInactive)
+ }
+
+ EditorPropertyState.Defined -> {}
}
}) {
Text(token)
}
- if (!name.isEmpty() && descriptor?.valueRequirement != ValueRequirement.ABSENT) {
+ if (!name.isEmpty() && descriptor?.valueRestriction != ValueRestriction.ABSENT) {
Div({
style {
width(160.px)
marginAll(1.px, 5.px)
}
}) {
- ValueChooser(descriptor, editorPropertyState, property.value) {
- property.value = it
- editorPropertyState = getPropertyState(name)
+ ValueChooser(descriptor, editorPropertyState, displayedValue) {
+ rootMeta.setValue(name, it)
+ update()
}
}
- Button({
- classes(TreeStyles.propertyEditorButton)
- if (editorPropertyState != EditorPropertyState.Defined) {
- disabled()
- } else {
- onClick {
- meta.remove(name)
- update()
- }
- }
- }) {
- Text("\u00D7")
+ }
+ if (!name.isEmpty()) {
+ CloseButton(editorPropertyState != EditorPropertyState.Defined) {
+ rootMeta.remove(name)
+ update()
}
}
}
@@ -140,7 +134,7 @@ public fun PropertyEditor(
Div({
classes(TreeStyles.treeItem)
}) {
- PropertyEditor(scope, meta, getPropertyState, updates, name + token, descriptor, expanded)
+ PropertyEditor(rootMeta, getPropertyState, updates, name + token, rootDescriptor, expanded)
}
}
}
@@ -149,14 +143,13 @@ public fun PropertyEditor(
@Composable
public fun PropertyEditor(
- scope: CoroutineScope,
properties: ObservableMutableMeta,
descriptor: MetaDescriptor? = null,
expanded: Boolean? = null,
) {
+ val scope = rememberCoroutineScope()
PropertyEditor(
- scope = scope,
- meta = properties,
+ rootMeta = properties,
getPropertyState = { name ->
if (properties[name] != null) {
EditorPropertyState.Defined
@@ -173,9 +166,7 @@ public fun PropertyEditor(
}
}
- invokeOnClose {
- properties.removeListener(scope)
- }
+ awaitClose { properties.removeListener(scope) }
},
name = Name.EMPTY,
rootDescriptor = descriptor,
diff --git a/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/Tabs.kt b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/Tabs.kt
new file mode 100644
index 00000000..36504cf4
--- /dev/null
+++ b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/Tabs.kt
@@ -0,0 +1,94 @@
+package space.kscience.visionforge.html
+
+import androidx.compose.runtime.*
+import app.softwork.bootstrapcompose.Card
+import app.softwork.bootstrapcompose.NavbarLink
+import app.softwork.bootstrapcompose.Styling
+import org.jetbrains.compose.web.css.overflowY
+import org.jetbrains.compose.web.dom.*
+import org.w3c.dom.HTMLAnchorElement
+import org.w3c.dom.HTMLDivElement
+
+
+public class ComposeTab(
+ public val key: String,
+ public val title: ContentBuilder,
+ public val disabled: Boolean,
+ public val content: ContentBuilder,
+)
+
+@Composable
+public fun Tabs(
+ tabs: List,
+ activeKey: String,
+ styling: (Styling.() -> Unit)? = null,
+ attrs: AttrBuilderContext? = null,
+) {
+ var active by remember(activeKey) { mutableStateOf(activeKey) }
+
+ val activeTab by derivedStateOf { tabs.find { it.key == active } }
+
+ Card(
+ styling,
+ attrs,
+ header = {
+ Ul({ classes("nav", "nav-tabs", "card-header-tabs") }) {
+ tabs.forEach { tab ->
+ Li({
+ classes("nav-item")
+ }) {
+ NavbarLink(
+ active = active == tab.key,
+ disabled = tab.disabled,
+ attrs = {
+ onClick { event ->
+ event.preventDefault()
+ active = tab.key
+ }
+ }
+ ) {
+ tab.title.invoke(this)
+ }
+ }
+ }
+ }
+ },
+ bodyAttrs = {
+ style {
+ overflowY("auto")
+ }
+ }
+ ) {
+ activeTab?.content?.invoke(this)
+ }
+}
+
+public class TabsBuilder {
+ internal val tabs: MutableList = mutableListOf()
+
+ @Composable
+ public fun Tab(
+ key: String,
+ label: ContentBuilder = { A("#") { Text(key) } },
+ disabled: Boolean = false,
+ content: ContentBuilder,
+ ) {
+ tabs.add(ComposeTab(key, label, disabled, content))
+ }
+
+ public fun addTab(tab: ComposeTab) {
+ tabs.add(tab)
+ }
+}
+
+@Composable
+public fun Tabs(
+ activeKey: String? = null,
+ styling: (Styling.() -> Unit)? = null,
+ attrs: AttrBuilderContext? = null,
+ builder: @Composable TabsBuilder.() -> Unit,
+) {
+ val result = TabsBuilder().apply { builder() }
+
+ Tabs(result.tabs, activeKey ?: result.tabs.firstOrNull()?.key ?: "", styling, attrs)
+}
\ No newline at end of file
diff --git a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/TreeStyles.kt b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/TreeStyles.kt
similarity index 65%
rename from ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/TreeStyles.kt
rename to visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/TreeStyles.kt
index de9001ba..4d8406ad 100644
--- a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/TreeStyles.kt
+++ b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/TreeStyles.kt
@@ -1,16 +1,16 @@
-package space.kscience.visionforge.compose
+package space.kscience.visionforge.html
import org.jetbrains.compose.web.ExperimentalComposeWebApi
import org.jetbrains.compose.web.css.*
@OptIn(ExperimentalComposeWebApi::class)
-public object TreeStyles : StyleSheet() {
+public object TreeStyles : StyleSheet(VisionForgeStyles) {
/**
* Remove default bullets
*/
public val tree: String by style {
- paddingLeft(5.px)
+ paddingLeft(10.px)
marginLeft(0.px)
listStyleType("none")
}
@@ -22,7 +22,7 @@ public object TreeStyles : StyleSheet() {
cursor("pointer")
userSelect(UserSelect.none)
/* Create the caret/arrow with a unicode, and style it */
- before {
+ (self + before) {
content("\u25B6")
color(Color.black)
display(DisplayStyle.InlineBlock)
@@ -34,7 +34,7 @@ public object TreeStyles : StyleSheet() {
* Rotate the caret/arrow icon when clicked on (using JavaScript)
*/
public val treeCaretDown: String by style {
- before {
+ (self + before) {
content("\u25B6")
color(Color.black)
display(DisplayStyle.InlineBlock)
@@ -46,13 +46,11 @@ public object TreeStyles : StyleSheet() {
public val treeItem: String by style {
alignItems(AlignItems.Center)
paddingLeft(10.px)
- border {
- left {
- width(1.px)
- color(Color.lightgray)
- style = LineStyle.Dashed
- }
- }
+ property("border-left", CSSBorder().apply{
+ width(1.px)
+ color(Color.lightgray)
+ style = LineStyle.Dashed
+ })
}
public val treeLabel: String by style {
@@ -69,26 +67,4 @@ public object TreeStyles : StyleSheet() {
public val treeLabelSelected: String by style {
backgroundColor(Color.lightblue)
}
-
- public val propertyEditorButton: String by style {
- width(24.px)
- alignSelf(AlignSelf.Stretch)
- marginAll(1.px, 5.px)
- backgroundColor(Color.white)
- border{
- style(LineStyle.Solid)
- }
- borderRadius(2.px)
- textAlign("center")
- textDecoration("none")
- cursor("pointer")
- disabled {
- cursor("auto")
- border{
- style(LineStyle.Dashed)
- }
- color(Color.lightgray)
- }
- }
-
}
\ No newline at end of file
diff --git a/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/VisionForgeStyles.kt b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/VisionForgeStyles.kt
new file mode 100644
index 00000000..311f41b2
--- /dev/null
+++ b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/VisionForgeStyles.kt
@@ -0,0 +1,28 @@
+package space.kscience.visionforge.html
+
+import org.jetbrains.compose.web.css.*
+
+public object VisionForgeStyles: StyleSheet() {
+
+ public val propertyEditorButton: String by style {
+ width(24.px)
+ alignSelf(AlignSelf.Stretch)
+ marginAll(1.px, 5.px)
+ backgroundColor(Color.white)
+ border {
+ style(LineStyle.Solid)
+ }
+ borderRadius(2.px)
+ textAlign("center")
+ textDecoration("none")
+ cursor("pointer")
+ (self + disabled) {
+ cursor("auto")
+ border {
+ style(LineStyle.Dashed)
+ }
+ color(Color.lightgray)
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/VisionTree.kt b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/VisionTree.kt
similarity index 90%
rename from ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/VisionTree.kt
rename to visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/VisionTree.kt
index 2de59f90..b714fb71 100644
--- a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/VisionTree.kt
+++ b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/VisionTree.kt
@@ -1,10 +1,9 @@
-package space.kscience.visionforge.compose
+package space.kscience.visionforge.html
import androidx.compose.runtime.*
import org.jetbrains.compose.web.css.Color
import org.jetbrains.compose.web.css.color
import org.jetbrains.compose.web.css.cursor
-import org.jetbrains.compose.web.css.textDecorationLine
import org.jetbrains.compose.web.dom.Div
import org.jetbrains.compose.web.dom.Span
import org.jetbrains.compose.web.dom.Text
@@ -15,8 +14,6 @@ import space.kscience.dataforge.names.startsWith
import space.kscience.visionforge.Vision
import space.kscience.visionforge.VisionGroup
import space.kscience.visionforge.asSequence
-import space.kscience.visionforge.compose.TreeStyles.hover
-import space.kscience.visionforge.compose.TreeStyles.invoke
import space.kscience.visionforge.isEmpty
@@ -35,10 +32,6 @@ private fun TreeLabel(
style {
color(Color("#069"))
cursor("pointer")
- hover.invoke {
- textDecorationLine("underline")
- }
-
}
onClick { clickCallback(name) }
}) {
diff --git a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/bootstrap.kt b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/bootstrap.kt
similarity index 74%
rename from ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/bootstrap.kt
rename to visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/bootstrap.kt
index 8b0ee5b5..ce27653b 100644
--- a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/bootstrap.kt
+++ b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/bootstrap.kt
@@ -1,4 +1,4 @@
-package space.kscience.visionforge.compose
+package space.kscience.visionforge.html
import androidx.compose.runtime.Composable
import org.jetbrains.compose.web.dom.H5
diff --git a/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/composeHtmlVision.kt b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/composeHtmlVision.kt
new file mode 100644
index 00000000..9c8b6c8c
--- /dev/null
+++ b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/composeHtmlVision.kt
@@ -0,0 +1,56 @@
+package space.kscience.visionforge.html
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import kotlinx.dom.clear
+import org.jetbrains.compose.web.dom.AttrBuilderContext
+import org.jetbrains.compose.web.dom.Div
+import org.w3c.dom.HTMLDivElement
+import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.context.gather
+import space.kscience.dataforge.context.request
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.asName
+import space.kscience.visionforge.*
+
+
+/**
+ * Render an Element vision via injected vision renderer inside compose-html
+ */
+@Composable
+public fun Vision(
+ context: Context,
+ vision: Vision,
+ name: Name = "@vision[${vision.hashCode().toString(16)}]".asName(),
+ meta: Meta = Meta.EMPTY,
+ attrs: AttrBuilderContext? = null,
+): Unit = Div(attrs) {
+
+ val client: VisionClient = context.request(JsVisionClient)
+
+ // set vision root if necessary
+ if (vision.manager == null) {
+ vision.setAsRoot(client.visionManager)
+ }
+
+ val renderer by derivedStateOf {
+ client.context.gather(ElementVisionRenderer.TYPE).values.mapNotNull {
+ val rating = it.rateVision(vision)
+ if (rating > 0) {
+ rating to it
+ } else {
+ null
+ }
+ }.maxBy { it.first }.second
+ }
+
+ DisposableEffect(vision, name, renderer, meta) {
+ renderer.render(scopeElement, name, vision, meta)
+ onDispose {
+ scopeElement.clear()
+ }
+ }
+}
diff --git a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/css.kt b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/css.kt
similarity index 95%
rename from ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/css.kt
rename to visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/css.kt
index 0bf8f7c2..9ae652cf 100644
--- a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/css.kt
+++ b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/css.kt
@@ -1,4 +1,4 @@
-package space.kscience.visionforge.compose
+package space.kscience.visionforge.html
import org.jetbrains.compose.web.css.*
import org.jetbrains.compose.web.css.keywords.CSSAutoKeyword
diff --git a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/layouts.kt b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/layouts.kt
similarity index 96%
rename from ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/layouts.kt
rename to visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/layouts.kt
index 882f1f1c..ecdfbb1c 100644
--- a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/layouts.kt
+++ b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/layouts.kt
@@ -1,4 +1,4 @@
-package space.kscience.visionforge.compose
+package space.kscience.visionforge.html
import androidx.compose.runtime.Composable
import org.jetbrains.compose.web.css.DisplayStyle
diff --git a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/valueChooser.kt b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/valueChooser.kt
similarity index 59%
rename from ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/valueChooser.kt
rename to visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/valueChooser.kt
index 0be879ad..fdec8c3f 100644
--- a/ui/compose/src/jsMain/kotlin/space/kscience/visionforge/compose/valueChooser.kt
+++ b/visionforge-compose-html/src/jsMain/kotlin/space/kscience/visionforge/html/valueChooser.kt
@@ -1,26 +1,19 @@
@file:Suppress("UNUSED_PARAMETER")
-package space.kscience.visionforge.compose
+package space.kscience.visionforge.html
import androidx.compose.runtime.*
+import kotlinx.uuid.UUID
+import kotlinx.uuid.generateUUID
import org.jetbrains.compose.web.attributes.*
-import org.jetbrains.compose.web.css.percent
-import org.jetbrains.compose.web.css.px
-import org.jetbrains.compose.web.css.width
-import org.jetbrains.compose.web.dom.Input
-import org.jetbrains.compose.web.dom.Option
-import org.jetbrains.compose.web.dom.Select
-import org.jetbrains.compose.web.dom.Text
-import org.w3c.dom.HTMLInputElement
+import org.jetbrains.compose.web.dom.*
import org.w3c.dom.HTMLOptionElement
import org.w3c.dom.asList
import space.kscience.dataforge.meta.*
import space.kscience.dataforge.meta.descriptors.MetaDescriptor
-import space.kscience.dataforge.meta.descriptors.ValueRequirement
import space.kscience.dataforge.meta.descriptors.allowedValues
import space.kscience.visionforge.Colors
import space.kscience.visionforge.widgetType
-import three.math.Color
@Composable
@@ -30,20 +23,16 @@ public fun StringValueChooser(
value: Value?,
onValueChange: (Value?) -> Unit,
) {
- var stringValue by remember { mutableStateOf(value?.string ?: "") }
+ var stringValue by remember(value, descriptor) { mutableStateOf(value?.string ?: "") }
Input(type = InputType.Text) {
- style {
- width(100.percent)
- }
+ classes("w-100")
value(stringValue)
- onKeyDown { event ->
- if (event.type == "keydown" && event.asDynamic().key == "Enter") {
- stringValue = (event.target as HTMLInputElement).value
- onValueChange(stringValue.asValue())
- }
+ onChange { event ->
+ stringValue = event.value
}
- onChange {
- stringValue = it.target.value
+ onInput { event ->
+ stringValue = event.value
+ onValueChange(event.value.asValue())
}
}
}
@@ -56,16 +45,29 @@ public fun BooleanValueChooser(
value: Value?,
onValueChange: (Value?) -> Unit,
) {
- Input(type = InputType.Checkbox) {
- style {
- width(100.percent)
- }
- //this.attributes["indeterminate"] = (props.item == null).toString()
- checked(value?.boolean ?: false)
+ val uid = remember { "checkbox[${UUID.generateUUID().toString(false)}]" }
+ var innerValue by remember(value, descriptor) {
+ mutableStateOf(
+ value?.boolean ?: descriptor?.defaultValue?.boolean
+ )
+ }
- onChange {
- val newValue = it.target.checked
- onValueChange(newValue.asValue())
+ Input(type = InputType.Checkbox) {
+ classes("btn-check")
+ checked(innerValue ?: false)
+ autoComplete(AutoComplete.off)
+ id(uid)
+
+ onInput { event ->
+ innerValue = event.value
+ onValueChange(event.value.asValue())
+ }
+ }
+ Label(uid, attrs = { classes("btn", "btn-sm", "btn-outline-secondary", "w-100") }) {
+ if (innerValue == true) {
+ Text("On")
+ } else {
+ Text("Off")
}
}
}
@@ -77,25 +79,18 @@ public fun NumberValueChooser(
value: Value?,
onValueChange: (Value?) -> Unit,
) {
- var innerValue by remember { mutableStateOf(value?.string ?: "") }
+ var innerValue by remember(value, descriptor) { mutableStateOf(value?.number ?: descriptor?.defaultValue?.number) }
Input(type = InputType.Number) {
- style {
- width(100.percent)
+ classes("w-100")
+
+ value(innerValue ?: descriptor?.defaultValue?.number ?: 0.0)
+
+ onChange { event ->
+ innerValue = event.value
}
- value(innerValue)
- onKeyDown { event ->
- if (event.type == "keydown" && event.asDynamic().key == "Enter") {
- innerValue = (event.target as HTMLInputElement).value
- val number = innerValue.toDoubleOrNull()
- if (number == null) {
- console.error("The input value $innerValue is not a number")
- } else {
- onValueChange(number.asValue())
- }
- }
- }
- onChange {
- innerValue = it.target.value
+ onInput { event ->
+ innerValue = event.value
+ onValueChange(event.value?.asValue())
}
descriptor?.attributes?.get("step").number?.let {
step(it)
@@ -117,11 +112,10 @@ public fun ComboValueChooser(
value: Value?,
onValueChange: (Value?) -> Unit,
) {
- var selected by remember { mutableStateOf(value?.string ?: "") }
+ var selected by remember(value, descriptor) { mutableStateOf(value?.string ?: "") }
Select({
- style {
- width(100.percent)
- }
+ classes("w-100")
+
onChange {
selected = it.target.value
onValueChange(selected.asValue())
@@ -143,19 +137,24 @@ public fun ColorValueChooser(
value: Value?,
onValueChange: (Value?) -> Unit,
) {
+ var innerValue by remember { mutableStateOf(value?.string ?: descriptor?.defaultValue?.string) }
+
Input(type = InputType.Color) {
- style {
- width(100.percent)
- marginAll(0.px)
- }
+ classes("w-100")
+
value(
value?.let { value ->
if (value.type == ValueType.NUMBER) Colors.rgbToString(value.int)
- else "#" + Color(value.string).getHexString()
+ else value.string
+ //else "#" + Color(value.string).getHexString()
} ?: "#000000"
)
- onChange {
- onValueChange(it.target.value.asValue())
+ onChange { event ->
+ innerValue = event.value
+ }
+ onInput { event ->
+ innerValue = event.value
+ onValueChange(event.value.asValue())
}
}
}
@@ -169,6 +168,7 @@ public fun MultiSelectChooser(
onValueChange: (Value?) -> Unit,
) {
Select({
+ classes("w-100","form-select")
onChange { event ->
val newSelected = event.target.selectedOptions.asList()
.map { (it as HTMLOptionElement).value.asValue() }
@@ -194,40 +194,18 @@ public fun RangeValueChooser(
value: Value?,
onValueChange: (Value?) -> Unit,
) {
- var innerValue by remember { mutableStateOf(value?.double) }
- var rangeDisabled: Boolean by remember { mutableStateOf(state != EditorPropertyState.Defined) }
-
-
- FlexRow {
- if (descriptor?.valueRequirement != ValueRequirement.REQUIRED) {
- Input(type = InputType.Checkbox) {
- if (!rangeDisabled) defaultChecked()
-
- onChange {
- val checkBoxValue = it.target.checked
- rangeDisabled = !checkBoxValue
- onValueChange(
- if (!checkBoxValue) {
- null
- } else {
- innerValue?.asValue()
- }
- )
- }
- }
- }
- }
+ var innerValue by remember(value, descriptor) { mutableStateOf(value?.number ?: descriptor?.defaultValue?.number) }
Input(type = InputType.Range) {
- style {
- width(100.percent)
- }
- if (rangeDisabled) disabled()
+ classes("w-100", "form-range")
+
value(innerValue?.toString() ?: "")
- onChange {
- val newValue = it.target.value
- onValueChange(newValue.toDoubleOrNull()?.asValue())
- innerValue = newValue.toDoubleOrNull()
+ onInput { event ->
+ innerValue = event.value
+ }
+ onChange { event ->
+ innerValue = event.value
+ onValueChange(innerValue?.asValue())
}
descriptor?.attributes?.get("min").string?.let {
min(it)
diff --git a/visionforge-compose-multiplatform/README.md b/visionforge-compose-multiplatform/README.md
new file mode 100644
index 00000000..aef4ef10
--- /dev/null
+++ b/visionforge-compose-multiplatform/README.md
@@ -0,0 +1,21 @@
+# Module visionforge-compose-multiplatform
+
+
+
+## Usage
+
+## Artifact:
+
+The Maven coordinates of this project are `space.kscience:visionforge-compose-multiplatform:0.4.1`.
+
+**Gradle Kotlin DSL:**
+```kotlin
+repositories {
+ maven("https://repo.kotlin.link")
+ mavenCentral()
+}
+
+dependencies {
+ implementation("space.kscience:visionforge-compose-multiplatform:0.4.1")
+}
+```
diff --git a/visionforge-compose-multiplatform/build.gradle.kts b/visionforge-compose-multiplatform/build.gradle.kts
new file mode 100644
index 00000000..b3175b38
--- /dev/null
+++ b/visionforge-compose-multiplatform/build.gradle.kts
@@ -0,0 +1,35 @@
+import space.kscience.gradle.Maturity
+
+plugins {
+ id("space.kscience.gradle.mpp")
+ alias(spclibs.plugins.compose)
+}
+
+kscience {
+ jvm()
+// wasm()
+}
+
+kotlin {
+// android()
+ sourceSets {
+ commonMain {
+ dependencies {
+ api(projects.visionforgeCore)
+ api(compose.foundation)
+ api(compose.runtime)
+ api(compose.material)
+ api(compose.materialIconsExtended)
+ }
+ }
+ jvmMain {
+ dependencies {
+ implementation("com.eygraber:compose-color-picker:0.0.17")
+ }
+ }
+ }
+}
+
+readme {
+ maturity = Maturity.EXPERIMENTAL
+}
\ No newline at end of file
diff --git a/visionforge-compose-multiplatform/src/commonMain/kotlin/space/kscience/visionforge/compose/ComposeVisionClient.kt b/visionforge-compose-multiplatform/src/commonMain/kotlin/space/kscience/visionforge/compose/ComposeVisionClient.kt
new file mode 100644
index 00000000..29bca480
--- /dev/null
+++ b/visionforge-compose-multiplatform/src/commonMain/kotlin/space/kscience/visionforge/compose/ComposeVisionClient.kt
@@ -0,0 +1,134 @@
+package space.kscience.visionforge.compose
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.key
+import androidx.compose.runtime.remember
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import space.kscience.dataforge.context.*
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.get
+import space.kscience.dataforge.meta.int
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.NameToken
+import space.kscience.dataforge.names.asName
+import space.kscience.visionforge.*
+import space.kscience.visionforge.html.VisionOutput
+import space.kscience.visionforge.html.VisionTagConsumer
+
+/**
+ * A Kotlin-browser plugin that renders visions based on provided renderers and governs communication with the server.
+ */
+public class ComposeVisionClient : AbstractPlugin(), VisionClient {
+ override val tag: PluginTag get() = Companion.tag
+ override val visionManager: VisionManager by require(VisionManager)
+
+
+ private val renderers by lazy { context.gather(ComposeVisionRenderer.TYPE).values }
+
+ private fun findRendererFor(vision: Vision): ComposeVisionRenderer? = renderers.mapNotNull {
+ val rating = it.rateVision(vision)
+ if (rating > 0) {
+ rating to it
+ } else {
+ null
+ }
+ }.maxByOrNull { it.first }?.second
+
+
+ private val mutex = Mutex()
+
+
+ private val rootChangeCollector = VisionChangeBuilder()
+
+ /**
+ * Communicate vision property changed from rendering engine to model
+ */
+ override fun notifyPropertyChanged(visionName: Name, propertyName: Name, item: Meta?) {
+ context.launch {
+ mutex.withLock {
+ rootChangeCollector.propertyChanged(visionName, propertyName, item)
+ }
+ }
+ }
+
+ private val eventCollector = MutableSharedFlow>(meta["feedback.eventCache"].int ?: 100)
+
+ /**
+ * Send a custom feedback event
+ */
+ override suspend fun sendEvent(targetName: Name, event: VisionEvent) {
+ eventCollector.emit(targetName to event)
+ }
+
+ @Composable
+ public fun renderVision(name: Name, vision: Vision, outputMeta: Meta) {
+ val renderer: ComposeVisionRenderer = remember(vision) {
+ findRendererFor(vision) ?: error("Could not find renderer for ${vision::class}")
+ }
+
+ key(vision) {
+ vision.setAsRoot(visionManager)
+ }
+ //subscribe to a backwards events propagation for control visions
+ if (vision is ControlVision) {
+ LaunchedEffect(vision) {
+ vision.controlEventFlow.collect {
+ sendEvent(name, it)
+ }
+ }
+ }
+
+ renderer.render(name, vision, outputMeta)
+ }
+
+
+// override fun content(target: String): Map = if (target == ComposeVisionRenderer.TYPE) {
+// listOf(
+// htmlVisionRenderer,
+// inputVisionRenderer,
+// checkboxVisionRenderer,
+// numberVisionRenderer,
+// textVisionRenderer,
+// rangeVisionRenderer,
+// formVisionRenderer,
+// buttonVisionRenderer
+// ).associateBy { it.toString().asName() }
+// } else super.content(target)
+
+ public companion object : PluginFactory {
+ override fun build(context: Context, meta: Meta): ComposeVisionClient = ComposeVisionClient()
+
+ override val tag: PluginTag = PluginTag(name = "vision.client.compose", group = PluginTag.DATAFORGE_GROUP)
+ }
+}
+
+/**
+ * Render an Element vision via injected vision renderer inside compose-html
+ */
+@Composable
+public fun Vision(
+ context: Context,
+ vision: Vision,
+ name: Name? = null,
+ meta: Meta = Meta.EMPTY,
+) {
+ val actualName = name ?: NameToken(VisionTagConsumer.DEFAULT_VISION_NAME, vision.hashCode().toUInt().toString()).asName()
+ context.request(ComposeVisionClient).renderVision(actualName, vision, meta)
+}
+
+@Composable
+public fun Vision(
+ context: Context,
+ name: Name? = null,
+ meta: Meta = Meta.EMPTY,
+ buildOutput: VisionOutput.() -> Vision,
+) {
+ val actualName = name ?: NameToken(VisionTagConsumer.DEFAULT_VISION_NAME, buildOutput.hashCode().toUInt().toString()).asName()
+ val output = VisionOutput(context, actualName)
+ val vision = output.buildOutput()
+ context.request(ComposeVisionClient).renderVision(actualName, vision, meta)
+}
\ No newline at end of file
diff --git a/visionforge-compose-multiplatform/src/commonMain/kotlin/space/kscience/visionforge/compose/ComposeVisionRenderer.kt b/visionforge-compose-multiplatform/src/commonMain/kotlin/space/kscience/visionforge/compose/ComposeVisionRenderer.kt
new file mode 100644
index 00000000..a7abee3f
--- /dev/null
+++ b/visionforge-compose-multiplatform/src/commonMain/kotlin/space/kscience/visionforge/compose/ComposeVisionRenderer.kt
@@ -0,0 +1,47 @@
+package space.kscience.visionforge.compose
+
+import androidx.compose.runtime.Composable
+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
+
+@DfType(ComposeVisionRenderer.TYPE)
+public interface ComposeVisionRenderer {
+ public fun rateVision(vision: Vision): Int
+
+ @Composable
+ public fun render(name: Name, vision: Vision, meta: Meta)
+
+ public companion object {
+ public const val TYPE: String = "composeVisionRenderer"
+ public const val ZERO_RATING: Int = 0
+ public const val DEFAULT_RATING: Int = 10
+ }
+}
+
+public class SingleTypeComposeRenderer(
+ public val kClass: KClass,
+ private val acceptRating: Int = ComposeVisionRenderer.DEFAULT_RATING,
+ private val renderFunction: @Composable (name: Name, vision: T, meta: Meta) -> Unit,
+) : ComposeVisionRenderer {
+
+ override fun rateVision(vision: Vision): Int =
+ if (vision::class == kClass) acceptRating else ComposeVisionRenderer.ZERO_RATING
+
+ @Composable
+ override fun render(
+ name: Name,
+ vision: Vision,
+ meta: Meta,
+ ) {
+ renderFunction(name, kClass.cast(vision), meta)
+ }
+}
+
+public inline fun ComposeVisionRenderer(
+ acceptRating: Int = ComposeVisionRenderer.DEFAULT_RATING,
+ noinline renderFunction: @Composable (name: Name, vision: T, meta: Meta) -> Unit,
+): ComposeVisionRenderer = SingleTypeComposeRenderer(T::class, acceptRating, renderFunction)
diff --git a/visionforge-compose-multiplatform/src/jvmMain/kotlin/space/kscience/visionforge/compose/MetaViewer.kt b/visionforge-compose-multiplatform/src/jvmMain/kotlin/space/kscience/visionforge/compose/MetaViewer.kt
new file mode 100644
index 00000000..d6578c73
--- /dev/null
+++ b/visionforge-compose-multiplatform/src/jvmMain/kotlin/space/kscience/visionforge/compose/MetaViewer.kt
@@ -0,0 +1,69 @@
+package space.kscience.visionforge.compose
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material.Icon
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ExpandLess
+import androidx.compose.material.icons.filled.ExpandMore
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.descriptors.MetaDescriptor
+import space.kscience.dataforge.meta.descriptors.get
+import space.kscience.dataforge.meta.isLeaf
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.NameToken
+import space.kscience.dataforge.names.lastOrNull
+import space.kscience.dataforge.names.plus
+
+
+@Composable
+private fun MetaViewerItem(root: Meta, name: Name, rootDescriptor: MetaDescriptor? = null) {
+ var expanded: Boolean by remember { mutableStateOf(true) }
+ val item: Meta? = root[name]
+ val descriptorItem: MetaDescriptor? = rootDescriptor?.get(name)
+ val actualValue = item?.value ?: descriptorItem?.defaultValue
+ val actualMeta = item ?: descriptorItem?.defaultNode
+
+ val token = name.lastOrNull()?.toString() ?: ""
+
+ Row(modifier = Modifier.fillMaxWidth()) {
+ if (actualMeta?.isLeaf == false) {
+ TextButton({ expanded = !expanded }) {
+ if (expanded) {
+ Icon(Icons.Filled.ExpandLess, "collapse")
+ } else {
+ Icon(Icons.Filled.ExpandMore, "expand")
+ }
+ }
+ }
+ Text(token, color = if (item == null) Color.Gray else Color.Unspecified)
+ Spacer(Modifier.weight(1f))
+ Text(actualValue.toString())
+ }
+ if (expanded) {
+ Column {
+ val keys = buildSet {
+ descriptorItem?.nodes?.keys?.forEach {
+ add(NameToken(it))
+ }
+ actualMeta!!.items.keys.let { addAll(it) }
+ }
+
+ keys.filter { !it.body.startsWith("@") }.forEach { token ->
+ MetaViewerItem(root, name + token, rootDescriptor)
+ }
+ }
+ }
+}
+
+@Composable
+public fun MetaViewer(meta: Meta, descriptor: MetaDescriptor? = null) {
+ MetaViewerItem(meta, Name.EMPTY, descriptor)
+}
diff --git a/visionforge-compose-multiplatform/src/jvmMain/kotlin/space/kscience/visionforge/compose/PropertyEditor.kt b/visionforge-compose-multiplatform/src/jvmMain/kotlin/space/kscience/visionforge/compose/PropertyEditor.kt
new file mode 100644
index 00000000..f2088c61
--- /dev/null
+++ b/visionforge-compose-multiplatform/src/jvmMain/kotlin/space/kscience/visionforge/compose/PropertyEditor.kt
@@ -0,0 +1,174 @@
+package space.kscience.visionforge.compose
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.Icon
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Clear
+import androidx.compose.material.icons.filled.ExpandLess
+import androidx.compose.material.icons.filled.ExpandMore
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.launch
+import space.kscience.dataforge.meta.MutableMeta
+import space.kscience.dataforge.meta.ObservableMutableMeta
+import space.kscience.dataforge.meta.descriptors.MetaDescriptor
+import space.kscience.dataforge.meta.descriptors.ValueRestriction
+import space.kscience.dataforge.meta.descriptors.get
+import space.kscience.dataforge.meta.remove
+import space.kscience.dataforge.names.*
+import space.kscience.visionforge.hidden
+
+
+/**
+ * The display state of a property
+ */
+public sealed class EditorPropertyState {
+ public data object Defined : EditorPropertyState()
+ public data class Default(public val source: String = "unknown") : EditorPropertyState()
+ public data object Undefined : EditorPropertyState()
+}
+
+/**
+ * @param rootMeta Root config object - always non-null
+ * @param rootDescriptor Full path to the displayed node in [rootMeta]. Could be empty
+ */
+@Composable
+public fun PropertyEditor(
+ rootMeta: MutableMeta,
+ getPropertyState: (Name) -> EditorPropertyState,
+ updates: Flow,
+ name: Name,
+ rootDescriptor: MetaDescriptor?,
+ initialExpanded: Boolean? = null,
+) {
+ var expanded: Boolean by remember { mutableStateOf(initialExpanded ?: true) }
+ val descriptor: MetaDescriptor? by derivedStateOf { rootDescriptor?.get(name) }
+ var displayedValue by remember { mutableStateOf(rootMeta.getValue(name)) }
+ var editorPropertyState: EditorPropertyState by remember { mutableStateOf(getPropertyState(name)) }
+
+ fun buildKeys() = buildSet {
+ descriptor?.nodes?.filterNot {
+ it.key.startsWith("@") || it.value.hidden
+ }?.forEach {
+ add(NameToken(it.key))
+ }
+ rootMeta[name]?.items?.keys?.filterNot { it.body.startsWith("@") }?.let { addAll(it) }
+ }
+
+ var keys by remember { mutableStateOf(buildKeys()) }
+
+ val token = name.lastOrNull()?.toString() ?: "Properties"
+
+ fun update() {
+ displayedValue = rootMeta.getValue(name)
+ editorPropertyState = getPropertyState(name)
+ keys = buildKeys()
+ }
+
+ LaunchedEffect(rootMeta) {
+ updates.collect { updatedName ->
+ if (name.startsWith(updatedName)) {
+ update()
+ }
+ }
+ }
+ Column(modifier = Modifier.fillMaxWidth().padding(start = 20.dp)) {
+ Row(modifier = Modifier.fillMaxWidth().padding(start = 20.dp)) {
+ //if node has children
+ if (keys.isNotEmpty()) {
+ TextButton(
+ { expanded = !expanded },
+ modifier = Modifier.align(Alignment.CenterVertically).width(40.dp)
+ ) {
+ if (expanded) {
+ Icon(Icons.Filled.ExpandLess, "collapse")
+ } else {
+ Icon(Icons.Filled.ExpandMore, "expand")
+ }
+ }
+ }
+ Text(
+ token,
+ color = when (editorPropertyState) {
+ is EditorPropertyState.Default, EditorPropertyState.Undefined -> Color.Gray
+ else -> Color.Unspecified
+ },
+ modifier = Modifier.align(Alignment.CenterVertically)
+ )
+ Spacer(modifier = Modifier.weight(1f))
+
+ if (!name.isEmpty() && descriptor?.valueRestriction != ValueRestriction.ABSENT) {
+ Box(modifier = Modifier.padding(1.dp, 5.dp).width(160.dp)) {
+ ValueChooser(descriptor, editorPropertyState, displayedValue) {
+ rootMeta.setValue(name, it)
+ update()
+ }
+ }
+
+ }
+ if (!name.isEmpty()) {
+ TextButton(
+ onClick = {
+ rootMeta.remove(name)
+ update()
+ },
+ enabled = editorPropertyState == EditorPropertyState.Defined,
+ modifier = Modifier.align(Alignment.CenterVertically).width(50.dp)
+ ) {
+ if (editorPropertyState == EditorPropertyState.Defined) {
+ Icon(Icons.Filled.Clear, "Reset")
+ }
+ }
+ }
+ }
+ if (expanded) {
+ Column(modifier = Modifier.fillMaxWidth()) {
+ keys.forEach { token ->
+ PropertyEditor(rootMeta, getPropertyState, updates, name + token, rootDescriptor, expanded)
+ }
+ }
+ }
+ }
+}
+
+
+@Composable
+public fun PropertyEditor(
+ properties: ObservableMutableMeta,
+ descriptor: MetaDescriptor? = null,
+ expanded: Boolean? = null,
+) {
+ val scope = rememberCoroutineScope()
+ PropertyEditor(
+ rootMeta = properties,
+ getPropertyState = { name ->
+ if (properties[name] != null) {
+ EditorPropertyState.Defined
+ } else if (descriptor?.get(name)?.defaultValue != null) {
+ EditorPropertyState.Default("descriptor")
+ } else {
+ EditorPropertyState.Undefined
+ }
+ },
+ updates = callbackFlow {
+ properties.onChange(scope) { name ->
+ scope.launch {
+ send(name)
+ }
+ }
+
+ awaitClose { properties.removeListener(scope) }
+ },
+ name = Name.EMPTY,
+ rootDescriptor = descriptor,
+ initialExpanded = expanded,
+ )
+}
\ No newline at end of file
diff --git a/visionforge-compose-multiplatform/src/jvmMain/kotlin/space/kscience/visionforge/compose/valueChooser.kt b/visionforge-compose-multiplatform/src/jvmMain/kotlin/space/kscience/visionforge/compose/valueChooser.kt
new file mode 100644
index 00000000..cfecc54e
--- /dev/null
+++ b/visionforge-compose-multiplatform/src/jvmMain/kotlin/space/kscience/visionforge/compose/valueChooser.kt
@@ -0,0 +1,270 @@
+@file:Suppress("UNUSED_PARAMETER")
+
+package space.kscience.visionforge.compose
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.CheckBox
+import androidx.compose.material.icons.filled.CheckBoxOutlineBlank
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.isSpecified
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.text.input.KeyboardType
+import com.eygraber.compose.colorpicker.ColorPicker
+import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.meta.descriptors.MetaDescriptor
+import space.kscience.dataforge.meta.descriptors.allowedValues
+import space.kscience.visionforge.widgetType
+import kotlin.math.roundToInt
+
+
+@Composable
+public fun StringValueChooser(
+ descriptor: MetaDescriptor?,
+ state: EditorPropertyState,
+ value: Value?,
+ onValueChange: (Value?) -> Unit,
+) {
+ var stringValue by remember(value, descriptor) { mutableStateOf(value?.string ?: "") }
+ TextField(
+ value = stringValue,
+ onValueChange = {
+ stringValue = it
+ onValueChange(it.asValue())
+ },
+ modifier = Modifier.fillMaxWidth()
+ )
+}
+
+
+@Composable
+public fun BooleanValueChooser(
+ descriptor: MetaDescriptor?,
+ state: EditorPropertyState,
+ value: Value?,
+ onValueChange: (Value?) -> Unit,
+) {
+ var innerValue by remember(value, descriptor) {
+ mutableStateOf(
+ value?.boolean ?: descriptor?.defaultValue?.boolean ?: false
+ )
+ }
+
+ Button(
+ onClick = {
+ innerValue = !innerValue
+ onValueChange(innerValue.asValue())
+ },
+ colors = if (innerValue) ButtonDefaults.buttonColors(Color.Green) else ButtonDefaults.buttonColors(Color.Gray)
+ ) {
+ if (innerValue) {
+ Text("On")
+ } else {
+ Text("Off")
+ }
+ }
+}
+
+@Composable
+public fun NumberValueChooser(
+ descriptor: MetaDescriptor?,
+ state: EditorPropertyState,
+ value: Value?,
+ onValueChange: (Value?) -> Unit,
+) {
+ var stringValue by remember(value, descriptor) { mutableStateOf(value?.string ?: descriptor?.defaultValue?.string) }
+
+ TextField(
+ value = stringValue ?: "",
+ onValueChange = { newValue ->
+ stringValue = newValue
+ newValue.toDoubleOrNull()?.let { onValueChange(it.asValue()) }
+ },
+ isError = stringValue?.toDoubleOrNull() != null,
+ modifier = Modifier.fillMaxWidth(),
+ keyboardOptions = KeyboardOptions.Default.copy(keyboardType = KeyboardType.Number)
+ )
+}
+
+
+@OptIn(ExperimentalMaterialApi::class)
+@Composable
+public fun ComboValueChooser(
+ descriptor: MetaDescriptor?,
+ state: EditorPropertyState,
+ value: Value?,
+ onValueChange: (Value?) -> Unit,
+) {
+ var expanded by remember { mutableStateOf(false) }
+ var selected by remember(value, descriptor) { mutableStateOf(value?.string ?: "") }
+
+ ExposedDropdownMenuBox(
+ expanded = expanded,
+ onExpandedChange = {
+ expanded = !expanded
+ },
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ TextField(
+ value = selected,
+ onValueChange = {},
+ readOnly = true,
+ trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
+ )
+
+ ExposedDropdownMenu(
+ expanded = expanded,
+ onDismissRequest = { expanded = false }
+ ) {
+ descriptor?.allowedValues?.forEach { item: Value ->
+ DropdownMenuItem(
+ onClick = {
+ selected = item.string
+ expanded = false
+ onValueChange(selected.asValue())
+ }
+ ) {
+ Text(item.string)
+ }
+ }
+ }
+ }
+}
+
+
+@Composable
+public fun ColorValueChooser(
+ descriptor: MetaDescriptor?,
+ state: EditorPropertyState,
+ value: Value?,
+ onValueChange: (Value?) -> Unit,
+) {
+ //var innerValue by remember { mutableStateOf(value ?: descriptor?.defaultValue) }
+
+ Box(Modifier.fillMaxWidth()) {
+ ColorPicker(Modifier.fillMaxWidth()) {
+ if (it.isSpecified) {
+ onValueChange(it.toArgb().asValue())
+ }
+ }
+ }
+}
+
+
+@OptIn(ExperimentalMaterialApi::class)
+@Composable
+public fun MultiSelectChooser(
+ descriptor: MetaDescriptor?,
+ state: EditorPropertyState,
+ value: Value?,
+ onValueChange: (Value?) -> Unit,
+) {
+ var expanded by remember { mutableStateOf(false) }
+ var selected: Set by remember(value) {
+ mutableStateOf(value?.list?.toSet() ?: emptySet())
+ }
+
+ ExposedDropdownMenuBox(
+ expanded = expanded,
+ onExpandedChange = {
+ expanded = !expanded
+ },
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ TextField(
+ value = selected.joinToString(prefix = "[", postfix = "]"),
+ onValueChange = {},
+ readOnly = true,
+ trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
+ )
+
+ ExposedDropdownMenu(
+ expanded = expanded,
+ onDismissRequest = { expanded = false }
+ ) {
+ descriptor?.allowedValues?.forEach { item: Value ->
+ val currentlySelected = item in selected
+
+ DropdownMenuItem(
+ onClick = {
+ selected = if (currentlySelected) {
+ selected - item
+ } else {
+ selected + item
+ }
+ onValueChange(selected.asValue())
+ }
+ ) {
+ if (currentlySelected) {
+ Icon(Icons.Default.CheckBox, "checked")
+ } else {
+ Icon(Icons.Default.CheckBoxOutlineBlank, "checked")
+ }
+ Text(item.string)
+ }
+ }
+ }
+ }
+}
+
+
+@Composable
+public fun RangeValueChooser(
+ descriptor: MetaDescriptor?,
+ state: EditorPropertyState,
+ value: Value?,
+ onValueChange: (Value?) -> Unit,
+) {
+ var innerValue by remember(value, descriptor) { mutableStateOf(value?.number ?: descriptor?.defaultValue?.number) }
+ val min by derivedStateOf {
+ descriptor?.attributes?.get("min").float ?: 0f
+ }
+
+ val max by derivedStateOf {
+ descriptor?.attributes?.get("max").float ?: 0f
+ }
+
+ val step by derivedStateOf {
+ descriptor?.attributes?.get("step").float ?: 0.1f
+ }
+
+ Slider(
+ value = innerValue?.toFloat() ?: 0f,
+ onValueChange = {
+ innerValue = it
+ onValueChange(it.asValue())
+ },
+ valueRange = min..max,
+ steps = ((max - min) / step).roundToInt(),
+ modifier = Modifier.fillMaxWidth()
+ )
+}
+
+@Composable
+public fun ValueChooser(
+ descriptor: MetaDescriptor?,
+ state: EditorPropertyState,
+ value: Value?,
+ onValueChange: (Value?) -> Unit,
+) {
+ val rawInput by remember { mutableStateOf(false) }
+
+ val type = descriptor?.valueTypes?.firstOrNull()
+
+ when {
+ rawInput -> StringValueChooser(descriptor, state, value, onValueChange)
+ descriptor?.widgetType == "color" -> ColorValueChooser(descriptor, state, value, onValueChange)
+ descriptor?.widgetType == "multiSelect" -> MultiSelectChooser(descriptor, state, value, onValueChange)
+ descriptor?.widgetType == "range" -> RangeValueChooser(descriptor, state, value, onValueChange)
+ type == ValueType.BOOLEAN -> BooleanValueChooser(descriptor, state, value, onValueChange)
+ type == ValueType.NUMBER -> NumberValueChooser(descriptor, state, value, onValueChange)
+ descriptor?.allowedValues?.isNotEmpty() ?: false -> ComboValueChooser(descriptor, state, value, onValueChange)
+ //TODO handle lists
+ else -> StringValueChooser(descriptor, state, value, onValueChange)
+ }
+}
\ No newline at end of file
diff --git a/visionforge-core/README.md b/visionforge-core/README.md
index 2f9e6889..ebd092d8 100644
--- a/visionforge-core/README.md
+++ b/visionforge-core/README.md
@@ -6,19 +6,8 @@
## Artifact:
-The Maven coordinates of this project are `space.kscience:visionforge-core:0.2.0`.
+The Maven coordinates of this project are `space.kscience:visionforge-core:0.4.1`.
-**Gradle Groovy:**
-```groovy
-repositories {
- maven { url 'https://repo.kotlin.link' }
- mavenCentral()
-}
-
-dependencies {
- implementation 'space.kscience:visionforge-core:0.2.0'
-}
-```
**Gradle Kotlin DSL:**
```kotlin
repositories {
@@ -27,6 +16,6 @@ repositories {
}
dependencies {
- implementation("space.kscience:visionforge-core:0.2.0")
+ implementation("space.kscience:visionforge-core:0.4.1")
}
```
diff --git a/visionforge-core/api/visionforge-core.api b/visionforge-core/api/visionforge-core.api
index f9099a99..9586823b 100644
--- a/visionforge-core/api/visionforge-core.api
+++ b/visionforge-core/api/visionforge-core.api
@@ -1,3 +1,66 @@
+public abstract class space/kscience/visionforge/AbstractControlVision : space/kscience/visionforge/AbstractVision, space/kscience/visionforge/ControlVision {
+ public static final field Companion Lspace/kscience/visionforge/AbstractControlVision$Companion;
+ public fun ()V
+ public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
+ public fun dispatchControlEvent (Lspace/kscience/visionforge/VisionControlEvent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+ public fun getControlEventFlow ()Lkotlinx/coroutines/flow/SharedFlow;
+ public static final synthetic fun write$Self (Lspace/kscience/visionforge/AbstractControlVision;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class space/kscience/visionforge/AbstractControlVision$Companion {
+ public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
+public abstract class space/kscience/visionforge/AbstractVision : space/kscience/visionforge/Vision {
+ public static final field Companion Lspace/kscience/visionforge/AbstractVision$Companion;
+ public fun ()V
+ public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
+ public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;
+ public fun getParent ()Lspace/kscience/visionforge/Vision;
+ public final fun getProperties ()Lspace/kscience/visionforge/MutableVisionProperties;
+ protected final fun getPropertiesInternal ()Lspace/kscience/dataforge/meta/MutableMeta;
+ public fun setParent (Lspace/kscience/visionforge/Vision;)V
+ protected final fun setPropertiesInternal (Lspace/kscience/dataforge/meta/MutableMeta;)V
+ public static final synthetic fun write$Self (Lspace/kscience/visionforge/AbstractVision;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class space/kscience/visionforge/AbstractVision$Companion {
+ public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
+public abstract class space/kscience/visionforge/AbstractVisionGroup : space/kscience/visionforge/AbstractVision, space/kscience/visionforge/MutableVisionGroup {
+ public static final field Companion Lspace/kscience/visionforge/AbstractVisionGroup$Companion;
+ public fun ()V
+ public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Ljava/util/Map;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
+ public abstract fun createGroup ()Lspace/kscience/visionforge/AbstractVisionGroup;
+ public fun getChildren ()Lspace/kscience/visionforge/MutableVisionChildren;
+ public synthetic fun getChildren ()Lspace/kscience/visionforge/VisionChildren;
+ protected final fun getChildrenInternal ()Ljava/util/Map;
+ protected final fun setChildrenInternal (Ljava/util/Map;)V
+ public static final synthetic fun write$Self (Lspace/kscience/visionforge/AbstractVisionGroup;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+}
+
+public final class space/kscience/visionforge/AbstractVisionGroup$Companion {
+ public final fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;
+ public final fun serializer ()Lkotlinx/serialization/KSerializer;
+ public final fun updateProperties (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/names/Name;)V
+ public static synthetic fun updateProperties$default (Lspace/kscience/visionforge/AbstractVisionGroup$Companion;Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)V
+}
+
+public class space/kscience/visionforge/AbstractVisionProperties : space/kscience/visionforge/MutableVisionProperties {
+ public fun (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/MutableMeta;)V
+ public fun getChanges ()Lkotlinx/coroutines/flow/Flow;
+ protected final fun getChangesInternal ()Lkotlinx/coroutines/flow/MutableSharedFlow;
+ public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;
+ public synthetic fun getOwn ()Lspace/kscience/dataforge/meta/Meta;
+ public final fun getOwn ()Lspace/kscience/dataforge/meta/MutableMeta;
+ public fun getValue (Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lspace/kscience/dataforge/meta/Value;
+ public final fun getVision ()Lspace/kscience/visionforge/Vision;
+ public fun invalidate (Lspace/kscience/dataforge/names/Name;)V
+ public fun set (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Meta;Z)V
+ public fun setValue (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Value;Z)V
+}
+
public final class space/kscience/visionforge/Colors {
public static final field BLUE_KEY Ljava/lang/String;
public static final field GREEN_KEY Ljava/lang/String;
@@ -156,68 +219,144 @@ public final class space/kscience/visionforge/Colors {
public final fun rgbToString-8NGXxBw (BBB)Ljava/lang/String;
}
-public final class space/kscience/visionforge/ComputedVisionPropertiesKt {
- public static final fun computeProperties (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;)Lspace/kscience/dataforge/meta/Meta;
- public static synthetic fun computeProperties$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/Meta;
- public static final fun computeProperty (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;)Lspace/kscience/dataforge/values/Value;
- public static synthetic fun computeProperty$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;ILjava/lang/Object;)Lspace/kscience/dataforge/values/Value;
- public static final fun computePropertyNode (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;)Lspace/kscience/dataforge/meta/Meta;
- public static synthetic fun computePropertyNode$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;ILjava/lang/Object;)Lspace/kscience/dataforge/meta/Meta;
- public static final fun computePropertyValues (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;)Lspace/kscience/dataforge/values/MutableValueProvider;
- public static synthetic fun computePropertyValues$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;ILjava/lang/Object;)Lspace/kscience/dataforge/values/MutableValueProvider;
+public abstract interface class space/kscience/visionforge/ControlVision : space/kscience/visionforge/Vision {
+ public abstract fun dispatchControlEvent (Lspace/kscience/visionforge/VisionControlEvent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+ public abstract fun getControlEventFlow ()Lkotlinx/coroutines/flow/SharedFlow;
+ public fun receiveEvent (Lspace/kscience/visionforge/VisionEvent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+ public static synthetic fun receiveEvent$suspendImpl (Lspace/kscience/visionforge/ControlVision;Lspace/kscience/visionforge/VisionEvent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
}
-public final class space/kscience/visionforge/HtmlExportKt {
- public static final fun makeFile (Lspace/kscience/visionforge/html/Page;Ljava/nio/file/Path;Lkotlin/jvm/functions/Function1;)Ljava/nio/file/Path;
- public static synthetic fun makeFile$default (Lspace/kscience/visionforge/html/Page;Ljava/nio/file/Path;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/nio/file/Path;
- public static final fun show (Lspace/kscience/visionforge/html/Page;Ljava/nio/file/Path;)V
- public static synthetic fun show$default (Lspace/kscience/visionforge/html/Page;Ljava/nio/file/Path;ILjava/lang/Object;)V
+public final class space/kscience/visionforge/ControlVisionKt {
+ public static final fun VisionInputEvent (Lspace/kscience/dataforge/meta/Value;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/VisionInputEvent;
+ public static synthetic fun VisionInputEvent$default (Lspace/kscience/dataforge/meta/Value;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lspace/kscience/visionforge/VisionInputEvent;
+ public static final fun VisionSubmitEvent (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/VisionSubmitEvent;
+ public static synthetic fun VisionSubmitEvent$default (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lspace/kscience/visionforge/VisionSubmitEvent;
+ public static final fun VisionValueChangeEvent (Lspace/kscience/dataforge/meta/Value;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/VisionValueChangeEvent;
+ public static synthetic fun VisionValueChangeEvent$default (Lspace/kscience/dataforge/meta/Value;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lspace/kscience/visionforge/VisionValueChangeEvent;
+ public static final fun asyncControlEvent (Lspace/kscience/visionforge/ControlVision;Lspace/kscience/visionforge/VisionControlEvent;Lkotlinx/coroutines/CoroutineScope;)V
+ public static synthetic fun asyncControlEvent$default (Lspace/kscience/visionforge/ControlVision;Lspace/kscience/visionforge/VisionControlEvent;Lkotlinx/coroutines/CoroutineScope;ILjava/lang/Object;)V
+ public static final fun onSubmit (Lspace/kscience/visionforge/DataControl;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
}
-public abstract interface class space/kscience/visionforge/MutableVisionGroup : space/kscience/visionforge/VisionContainerBuilder, space/kscience/visionforge/VisionGroup {
- public abstract fun onStructureChanged (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)V
- public abstract fun removeStructureListener (Ljava/lang/Object;)V
+public abstract interface class space/kscience/visionforge/DataControl : space/kscience/visionforge/ControlVision {
+ public fun submit (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+ public static synthetic fun submit$default (Lspace/kscience/visionforge/DataControl;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+ public static synthetic fun submit$suspendImpl (Lspace/kscience/visionforge/DataControl;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
}
-public class space/kscience/visionforge/SimpleVisionPropertyContainer : space/kscience/dataforge/meta/Configurable, space/kscience/visionforge/VisionPropertyContainer {
- public fun (Lspace/kscience/dataforge/meta/ObservableMutableMeta;)V
- public synthetic fun getMeta ()Lspace/kscience/dataforge/meta/MutableMeta;
- public fun getMeta ()Lspace/kscience/dataforge/meta/ObservableMutableMeta;
- public fun getProperty (Lspace/kscience/dataforge/names/Name;ZZZ)Lspace/kscience/dataforge/values/Value;
+public final class space/kscience/visionforge/FlowPropertyKt {
+ public static final fun flowProperty (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lkotlinx/coroutines/flow/Flow;
+ public static final fun flowProperty (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lkotlinx/coroutines/flow/Flow;
+ public static synthetic fun flowProperty$default (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
+ public static synthetic fun flowProperty$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
+ public static final fun flowPropertyValue (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lkotlinx/coroutines/flow/Flow;
+ public static final fun flowPropertyValue (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lkotlinx/coroutines/flow/Flow;
+ public static synthetic fun flowPropertyValue$default (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
+ public static synthetic fun flowPropertyValue$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
+}
+
+public abstract interface class space/kscience/visionforge/MutableVisionChildren : space/kscience/visionforge/MutableVisionContainer, space/kscience/visionforge/VisionChildren {
+ public abstract fun clear ()V
+ public abstract fun getParent ()Lspace/kscience/visionforge/MutableVisionGroup;
+ public abstract fun set (Lspace/kscience/dataforge/names/NameToken;Lspace/kscience/visionforge/Vision;)V
+ public fun setChild (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)V
+}
+
+public abstract interface class space/kscience/visionforge/MutableVisionContainer {
+ public abstract fun setChild (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)V
+}
+
+public abstract interface class space/kscience/visionforge/MutableVisionGroup : space/kscience/visionforge/VisionGroup {
+ public abstract fun createGroup ()Lspace/kscience/visionforge/MutableVisionGroup;
+ public abstract fun getChildren ()Lspace/kscience/visionforge/MutableVisionChildren;
+ public fun update (Lspace/kscience/visionforge/VisionChange;)V
+}
+
+public abstract interface class space/kscience/visionforge/MutableVisionProperties : space/kscience/dataforge/meta/MutableMetaProvider, space/kscience/visionforge/VisionProperties {
+ public synthetic fun get (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/Meta;
+ public fun get (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/MutableMeta;
+ public synthetic fun get (Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lspace/kscience/dataforge/meta/Meta;
+ public fun get (Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lspace/kscience/dataforge/meta/MutableMeta;
+ public fun set (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Meta;)V
+ public abstract fun set (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Meta;Z)V
+ public fun setValue (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Value;)V
+ public abstract fun setValue (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Value;Z)V
+}
+
+public final class space/kscience/visionforge/NullVision : space/kscience/visionforge/Vision {
+ public static final field INSTANCE Lspace/kscience/visionforge/NullVision;
+ public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;
+ public fun getParent ()Lspace/kscience/visionforge/Vision;
+ public fun getProperties ()Lspace/kscience/visionforge/MutableVisionProperties;
+ public final fun serializer ()Lkotlinx/serialization/KSerializer;
+ public fun setParent (Lspace/kscience/visionforge/Vision;)V
+}
+
+public final class space/kscience/visionforge/RootVision : space/kscience/visionforge/AbstractVisionGroup {
+ public fun (Lspace/kscience/visionforge/VisionManager;)V
+ public synthetic fun createGroup ()Lspace/kscience/visionforge/AbstractVisionGroup;
+ public synthetic fun createGroup ()Lspace/kscience/visionforge/MutableVisionGroup;
+ public fun createGroup ()Lspace/kscience/visionforge/SimpleVisionGroup;
+ public fun getManager ()Lspace/kscience/visionforge/VisionManager;
+}
+
+public final class space/kscience/visionforge/SimpleVisionGroup : space/kscience/visionforge/AbstractVisionGroup, space/kscience/visionforge/MutableVisionContainer {
+ public static final field Companion Lspace/kscience/visionforge/SimpleVisionGroup$Companion;
+ public fun ()V
+ public synthetic fun createGroup ()Lspace/kscience/visionforge/AbstractVisionGroup;
+ public synthetic fun createGroup ()Lspace/kscience/visionforge/MutableVisionGroup;
+ public fun createGroup ()Lspace/kscience/visionforge/SimpleVisionGroup;
+ public fun setChild (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)V
+}
+
+public final class space/kscience/visionforge/SimpleVisionGroup$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
+ public static final field INSTANCE Lspace/kscience/visionforge/SimpleVisionGroup$$serializer;
+ public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
+ public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
+ public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/SimpleVisionGroup;
+ public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
+ public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
+ public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/SimpleVisionGroup;)V
+ public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
+}
+
+public final class space/kscience/visionforge/SimpleVisionGroup$Companion {
+ public final fun serializer ()Lkotlinx/serialization/KSerializer;
}
public final class space/kscience/visionforge/StyleReference {
- public fun (Lspace/kscience/visionforge/VisionGroup;Ljava/lang/String;)V
+ public fun (Lspace/kscience/visionforge/Vision;Ljava/lang/String;)V
public final fun getName ()Ljava/lang/String;
- public final fun getOwner ()Lspace/kscience/visionforge/VisionGroup;
+ public final fun getOwner ()Lspace/kscience/visionforge/Vision;
}
public final class space/kscience/visionforge/StyleReferenceKt {
- public static final fun style (Lspace/kscience/visionforge/VisionGroup;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lkotlin/properties/ReadOnlyProperty;
- public static final fun style (Lspace/kscience/visionforge/VisionGroup;Lspace/kscience/dataforge/meta/Specification;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lkotlin/properties/ReadOnlyProperty;
- public static synthetic fun style$default (Lspace/kscience/visionforge/VisionGroup;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty;
- public static synthetic fun style$default (Lspace/kscience/visionforge/VisionGroup;Lspace/kscience/dataforge/meta/Specification;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty;
- public static final fun useStyle (Lspace/kscience/visionforge/Vision;Lspace/kscience/visionforge/StyleReference;)V
+ public static final fun style (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lkotlin/properties/ReadOnlyProperty;
+ public static final fun style (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/SchemeSpec;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lkotlin/properties/ReadOnlyProperty;
+ public static synthetic fun style$default (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty;
+ public static synthetic fun style$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/SchemeSpec;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/properties/ReadOnlyProperty;
+ public static final fun useStyle (Lspace/kscience/visionforge/Vision;Lspace/kscience/visionforge/StyleReference;Z)V
+ public static synthetic fun useStyle$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/visionforge/StyleReference;ZILjava/lang/Object;)V
}
public final class space/kscience/visionforge/StyleSheet {
public static final field Companion Lspace/kscience/visionforge/StyleSheet$Companion;
- public static final synthetic fun box-impl (Lspace/kscience/visionforge/VisionGroup;)Lspace/kscience/visionforge/StyleSheet;
- public static fun constructor-impl (Lspace/kscience/visionforge/VisionGroup;)Lspace/kscience/visionforge/VisionGroup;
- public static final fun define-impl (Lspace/kscience/visionforge/VisionGroup;Ljava/lang/String;Lspace/kscience/dataforge/meta/Meta;)V
+ public static final synthetic fun box-impl (Lspace/kscience/visionforge/Vision;)Lspace/kscience/visionforge/StyleSheet;
+ public static fun constructor-impl (Lspace/kscience/visionforge/Vision;)Lspace/kscience/visionforge/Vision;
+ public static final fun define-impl (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Lspace/kscience/dataforge/meta/Meta;)V
public fun equals (Ljava/lang/Object;)Z
- public static fun equals-impl (Lspace/kscience/visionforge/VisionGroup;Ljava/lang/Object;)Z
- public static final fun equals-impl0 (Lspace/kscience/visionforge/VisionGroup;Lspace/kscience/visionforge/VisionGroup;)Z
- public static final fun get-impl (Lspace/kscience/visionforge/VisionGroup;Ljava/lang/String;)Lspace/kscience/dataforge/meta/Meta;
- public static final fun getItems-impl (Lspace/kscience/visionforge/VisionGroup;)Ljava/util/Map;
+ public static fun equals-impl (Lspace/kscience/visionforge/Vision;Ljava/lang/Object;)Z
+ public static final fun equals-impl0 (Lspace/kscience/visionforge/Vision;Lspace/kscience/visionforge/Vision;)Z
+ public static final fun get-impl (Lspace/kscience/visionforge/Vision;Ljava/lang/String;)Lspace/kscience/dataforge/meta/Meta;
+ public static final fun getItems-impl (Lspace/kscience/visionforge/Vision;)Ljava/util/Map;
public fun hashCode ()I
- public static fun hashCode-impl (Lspace/kscience/visionforge/VisionGroup;)I
- public static final fun invoke-impl (Lspace/kscience/visionforge/VisionGroup;Lkotlin/jvm/functions/Function1;)V
- public static final fun set-impl (Lspace/kscience/visionforge/VisionGroup;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
- public static final fun set-impl (Lspace/kscience/visionforge/VisionGroup;Ljava/lang/String;Lspace/kscience/dataforge/meta/Meta;)V
+ public static fun hashCode-impl (Lspace/kscience/visionforge/Vision;)I
+ public static final fun invoke-impl (Lspace/kscience/visionforge/Vision;Lkotlin/jvm/functions/Function1;)V
+ public static final fun set-impl (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Lspace/kscience/dataforge/meta/Meta;)V
public fun toString ()Ljava/lang/String;
- public static fun toString-impl (Lspace/kscience/visionforge/VisionGroup;)Ljava/lang/String;
- public final synthetic fun unbox-impl ()Lspace/kscience/visionforge/VisionGroup;
+ public static fun toString-impl (Lspace/kscience/visionforge/Vision;)Ljava/lang/String;
+ public final synthetic fun unbox-impl ()Lspace/kscience/visionforge/Vision;
+ public static final fun update-impl (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
}
public final class space/kscience/visionforge/StyleSheet$Companion {
@@ -227,99 +366,71 @@ public final class space/kscience/visionforge/StyleSheet$Companion {
public final class space/kscience/visionforge/StyleSheetKt {
public static final fun getStyle (Lspace/kscience/visionforge/Vision;Ljava/lang/String;)Lspace/kscience/dataforge/meta/Meta;
public static final fun getStyleNodes (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;)Ljava/util/List;
- public static final fun getStyleProperty (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/values/Value;
- public static final fun getStyleSheet (Lspace/kscience/visionforge/VisionGroup;)Lspace/kscience/visionforge/VisionGroup;
+ public static final fun getStyleProperty (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/Meta;
+ public static final fun getStyleSheet (Lspace/kscience/visionforge/Vision;)Lspace/kscience/visionforge/Vision;
public static final fun getStyles (Lspace/kscience/visionforge/Vision;)Ljava/util/List;
public static final fun setStyles (Lspace/kscience/visionforge/Vision;Ljava/util/List;)V
- public static final fun useStyle (Lspace/kscience/visionforge/Vision;Ljava/lang/String;)V
+ public static final fun useStyle (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Z)V
+ public static synthetic fun useStyle$default (Lspace/kscience/visionforge/Vision;Ljava/lang/String;ZILjava/lang/Object;)V
}
-public abstract interface class space/kscience/visionforge/Vision : space/kscience/dataforge/meta/Configurable, space/kscience/dataforge/meta/descriptors/Described {
+public final class space/kscience/visionforge/UsePropertyKt {
+ public static final fun onPropertyChange (Lspace/kscience/visionforge/Vision;Lkotlin/reflect/KProperty1;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function3;)Lkotlinx/coroutines/Job;
+ public static final fun onPropertyChange (Lspace/kscience/visionforge/Vision;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
+ public static synthetic fun onPropertyChange$default (Lspace/kscience/visionforge/Vision;Lkotlin/reflect/KProperty1;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+ public static synthetic fun onPropertyChange$default (Lspace/kscience/visionforge/Vision;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+ public static final fun useProperty (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/Job;
+ public static final fun useProperty (Lspace/kscience/visionforge/Vision;Lkotlin/reflect/KProperty1;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
+ public static final fun useProperty (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/Job;
+ public static synthetic fun useProperty$default (Lspace/kscience/visionforge/Vision;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Boolean;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+ public static synthetic fun useProperty$default (Lspace/kscience/visionforge/Vision;Lkotlin/reflect/KProperty1;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+ public static synthetic fun useProperty$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Ljava/lang/Boolean;Ljava/lang/Boolean;Lkotlinx/coroutines/CoroutineScope;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+}
+
+public abstract interface class space/kscience/visionforge/Vision : space/kscience/dataforge/meta/descriptors/Described {
public static final field Companion Lspace/kscience/visionforge/Vision$Companion;
+ public static final field STYLE_TARGET Ljava/lang/String;
public static final field TYPE Ljava/lang/String;
public abstract fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;
public fun getManager ()Lspace/kscience/visionforge/VisionManager;
- public abstract fun getMeta ()Lspace/kscience/dataforge/meta/ObservableMutableMeta;
- public abstract fun getParent ()Lspace/kscience/visionforge/VisionGroup;
- public abstract fun getProperty (Lspace/kscience/dataforge/names/Name;ZZZ)Lspace/kscience/dataforge/values/Value;
- public static synthetic fun getProperty$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZILjava/lang/Object;)Lspace/kscience/dataforge/values/Value;
- public abstract fun invalidateProperty (Lspace/kscience/dataforge/names/Name;)V
- public abstract fun setParent (Lspace/kscience/visionforge/VisionGroup;)V
- public abstract fun update (Lspace/kscience/visionforge/VisionChange;)V
+ public abstract fun getParent ()Lspace/kscience/visionforge/Vision;
+ public abstract fun getProperties ()Lspace/kscience/visionforge/MutableVisionProperties;
+ public fun receiveEvent (Lspace/kscience/visionforge/VisionEvent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+ public static synthetic fun receiveEvent$suspendImpl (Lspace/kscience/visionforge/Vision;Lspace/kscience/visionforge/VisionEvent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+ public abstract fun setParent (Lspace/kscience/visionforge/Vision;)V
+ public fun update (Lspace/kscience/visionforge/VisionChange;)V
}
public final class space/kscience/visionforge/Vision$Companion {
+ public static final field STYLE_TARGET Ljava/lang/String;
public static final field TYPE Ljava/lang/String;
public final fun getSTYLE_KEY ()Lspace/kscience/dataforge/names/Name;
public final fun getVISIBLE_KEY ()Lspace/kscience/dataforge/names/Name;
}
-public class space/kscience/visionforge/VisionBase : space/kscience/visionforge/Vision {
- public static final field Companion Lspace/kscience/visionforge/VisionBase$Companion;
- public fun ()V
- public synthetic fun (ILspace/kscience/dataforge/meta/MutableMeta;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
- public fun (Lspace/kscience/visionforge/VisionGroup;Lspace/kscience/dataforge/meta/MutableMeta;)V
- public synthetic fun (Lspace/kscience/visionforge/VisionGroup;Lspace/kscience/dataforge/meta/MutableMeta;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- public fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;
- public synthetic fun getMeta ()Lspace/kscience/dataforge/meta/MutableMeta;
- public final fun getMeta ()Lspace/kscience/dataforge/meta/ObservableMutableMeta;
- protected final fun getOrCreateProperties ()Lspace/kscience/dataforge/meta/MutableMeta;
- public fun getParent ()Lspace/kscience/visionforge/VisionGroup;
- protected final fun getProperties ()Lspace/kscience/dataforge/meta/MutableMeta;
- public fun getProperty (Lspace/kscience/dataforge/names/Name;ZZZ)Lspace/kscience/dataforge/values/Value;
- public fun invalidateProperty (Lspace/kscience/dataforge/names/Name;)V
- public fun setParent (Lspace/kscience/visionforge/VisionGroup;)V
- protected final fun setProperties (Lspace/kscience/dataforge/meta/MutableMeta;)V
- public fun update (Lspace/kscience/visionforge/VisionChange;)V
- public static final fun write$Self (Lspace/kscience/visionforge/VisionBase;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
-}
-
-public final class space/kscience/visionforge/VisionBase$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
- public static final field INSTANCE Lspace/kscience/visionforge/VisionBase$$serializer;
- public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
- public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
- public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
- public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/VisionBase;
- public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
- public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
- public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/visionforge/VisionBase;)V
- public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class space/kscience/visionforge/VisionBase$Companion {
- public final fun getDescriptor ()Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;
- public final fun serializer ()Lkotlinx/serialization/KSerializer;
- public final fun updateProperties (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Meta;)V
-}
-
public abstract interface annotation class space/kscience/visionforge/VisionBuilder : java/lang/annotation/Annotation {
}
-public final class space/kscience/visionforge/VisionChange {
+public final class space/kscience/visionforge/VisionChange : space/kscience/visionforge/VisionEvent {
public static final field Companion Lspace/kscience/visionforge/VisionChange$Companion;
public fun ()V
- public synthetic fun (IZLspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Ljava/util/Map;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
- public fun (ZLspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Ljava/util/Map;)V
- public synthetic fun (ZLspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- public final fun component1 ()Z
- public final fun component2 ()Lspace/kscience/visionforge/Vision;
- public final fun component3 ()Lspace/kscience/dataforge/meta/Meta;
- public final fun component4 ()Ljava/util/Map;
- public final fun copy (ZLspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Ljava/util/Map;)Lspace/kscience/visionforge/VisionChange;
- public static synthetic fun copy$default (Lspace/kscience/visionforge/VisionChange;ZLspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Ljava/util/Map;ILjava/lang/Object;)Lspace/kscience/visionforge/VisionChange;
+ public fun (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Ljava/util/Map;)V
+ public synthetic fun (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ public final fun component1 ()Lspace/kscience/visionforge/Vision;
+ public final fun component2 ()Lspace/kscience/dataforge/meta/Meta;
+ public final fun component3 ()Ljava/util/Map;
+ public final fun copy (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Ljava/util/Map;)Lspace/kscience/visionforge/VisionChange;
+ public static synthetic fun copy$default (Lspace/kscience/visionforge/VisionChange;Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/meta/Meta;Ljava/util/Map;ILjava/lang/Object;)Lspace/kscience/visionforge/VisionChange;
public fun equals (Ljava/lang/Object;)Z
public final fun getChildren ()Ljava/util/Map;
- public final fun getDelete ()Z
public final fun getProperties ()Lspace/kscience/dataforge/meta/Meta;
public final fun getVision ()Lspace/kscience/visionforge/Vision;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
- public static final fun write$Self (Lspace/kscience/visionforge/VisionChange;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
}
public final class space/kscience/visionforge/VisionChange$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
public static final field INSTANCE Lspace/kscience/visionforge/VisionChange$$serializer;
- public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/visionforge/VisionChange;
@@ -333,36 +444,75 @@ public final class space/kscience/visionforge/VisionChange$Companion {
public final fun serializer ()Lkotlinx/serialization/KSerializer;
}
-public final class space/kscience/visionforge/VisionChangeBuilder : space/kscience/visionforge/VisionContainerBuilder {
+public final class space/kscience/visionforge/VisionChangeBuilder : space/kscience/visionforge/MutableVisionContainer {
public fun ()V
- public final fun deepCopy ()Lspace/kscience/visionforge/VisionChange;
+ public final fun deepCopy (Lspace/kscience/visionforge/VisionManager;)Lspace/kscience/visionforge/VisionChange;
+ public final fun get (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/VisionChangeBuilder;
public final fun isEmpty ()Z
public final fun propertyChanged (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Meta;)V
- public fun set (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)V
+ public fun setChild (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)V
+ public final fun toJsonString (Lspace/kscience/visionforge/VisionManager;)Ljava/lang/String;
}
public final class space/kscience/visionforge/VisionChangeKt {
- public static final fun VisionChange (Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/VisionChange;
- public static final fun flowChanges-HG0u8IE (Lspace/kscience/visionforge/Vision;J)Lkotlinx/coroutines/flow/Flow;
+ public static final fun VisionChange (Lspace/kscience/visionforge/VisionManager;Lkotlin/jvm/functions/Function1;)Lspace/kscience/visionforge/VisionChange;
+ public static final fun flowChanges-8Mi8wO0 (Lspace/kscience/visionforge/Vision;JZ)Lkotlinx/coroutines/flow/Flow;
+ public static synthetic fun flowChanges-8Mi8wO0$default (Lspace/kscience/visionforge/Vision;JZILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
+}
+
+public abstract interface class space/kscience/visionforge/VisionChildren : space/kscience/visionforge/VisionContainer {
+ public static final field Companion Lspace/kscience/visionforge/VisionChildren$Companion;
+ public static final field STATIC_TOKEN_BODY Ljava/lang/String;
+ public abstract fun get (Lspace/kscience/dataforge/names/NameToken;)Lspace/kscience/visionforge/Vision;
+ public abstract fun getChanges ()Lkotlinx/coroutines/flow/Flow;
+ public fun getChild (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/Vision;
+ public abstract fun getKeys ()Ljava/util/Set;
+ public abstract fun getParent ()Lspace/kscience/visionforge/Vision;
+ public fun getValues ()Ljava/lang/Iterable;
+}
+
+public final class space/kscience/visionforge/VisionChildren$Companion {
+ public static final field STATIC_TOKEN_BODY Ljava/lang/String;
+ public final fun empty (Lspace/kscience/visionforge/Vision;)Lspace/kscience/visionforge/VisionChildren;
+}
+
+public abstract interface class space/kscience/visionforge/VisionClient : space/kscience/dataforge/context/Plugin {
+ public abstract fun getVisionManager ()Lspace/kscience/visionforge/VisionManager;
+ public abstract fun notifyPropertyChanged (Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/names/Name;Lspace/kscience/dataforge/meta/Meta;)V
+ public abstract fun sendEvent (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/VisionEvent;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class space/kscience/visionforge/VisionClientKt {
+ public static final fun notifyPropertyChanged (Lspace/kscience/visionforge/VisionClient;Lspace/kscience/dataforge/names/Name;Ljava/lang/String;Ljava/lang/Number;)V
+ public static final fun notifyPropertyChanged (Lspace/kscience/visionforge/VisionClient;Lspace/kscience/dataforge/names/Name;Ljava/lang/String;Ljava/lang/String;)V
+ public static final fun notifyPropertyChanged (Lspace/kscience/visionforge/VisionClient;Lspace/kscience/dataforge/names/Name;Ljava/lang/String;Lspace/kscience/dataforge/meta/Meta;)V
+ public static final fun notifyPropertyChanged (Lspace/kscience/visionforge/VisionClient;Lspace/kscience/dataforge/names/Name;Ljava/lang/String;Z)V
+ public static final fun sendEventAsync (Lspace/kscience/visionforge/VisionClient;Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/VisionEvent;)Lkotlinx/coroutines/Job;
}
public abstract interface class space/kscience/visionforge/VisionContainer {
- public abstract fun get (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/Vision;
+ public abstract fun getChild (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/Vision;
}
-public abstract interface class space/kscience/visionforge/VisionContainerBuilder {
- public abstract fun set (Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)V
+public final class space/kscience/visionforge/VisionContainerKt {
+ public static final fun asSequence (Lspace/kscience/visionforge/VisionChildren;)Lkotlin/sequences/Sequence;
+ public static final fun forEach (Lspace/kscience/visionforge/VisionChildren;Lkotlin/jvm/functions/Function2;)V
+ public static final fun get (Lspace/kscience/visionforge/VisionChildren;Ljava/lang/String;)Lspace/kscience/visionforge/Vision;
+ public static final fun get (Lspace/kscience/visionforge/VisionChildren;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/Vision;
+ public static final fun getChild (Lspace/kscience/visionforge/VisionContainer;Ljava/lang/String;)Lspace/kscience/visionforge/Vision;
+ public static final fun isEmpty (Lspace/kscience/visionforge/VisionChildren;)Z
+ public static final fun iterator (Lspace/kscience/visionforge/VisionChildren;)Ljava/util/Iterator;
+ public static final fun set (Lspace/kscience/visionforge/MutableVisionChildren;Ljava/lang/String;Lspace/kscience/visionforge/Vision;)V
+ public static final fun set (Lspace/kscience/visionforge/MutableVisionChildren;Lspace/kscience/dataforge/names/Name;Lspace/kscience/visionforge/Vision;)V
+ public static final fun setChild (Lspace/kscience/visionforge/MutableVisionContainer;Ljava/lang/String;Lspace/kscience/visionforge/Vision;)V
+ public static final fun static (Lspace/kscience/visionforge/MutableVisionChildren;Lspace/kscience/visionforge/Vision;)V
}
-public final class space/kscience/visionforge/VisionDelegatesKt {
- public static final fun numberProperty (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZ)Lkotlin/properties/ReadWriteProperty;
- public static final fun numberProperty (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZLkotlin/jvm/functions/Function0;)Lkotlin/properties/ReadWriteProperty;
- public static synthetic fun numberProperty$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty;
- public static synthetic fun numberProperty$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZLkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty;
- public static final fun propertyValue (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZ)Lkotlin/properties/ReadWriteProperty;
- public static final fun propertyValue (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lkotlin/properties/ReadWriteProperty;
- public static synthetic fun propertyValue$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty;
- public static synthetic fun propertyValue$default (Lspace/kscience/visionforge/Vision;Lspace/kscience/dataforge/names/Name;ZZZLkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty;
+public abstract class space/kscience/visionforge/VisionControlEvent : space/kscience/dataforge/meta/MetaRepr, space/kscience/visionforge/VisionEvent {
+ public fun ()V
+ public abstract fun getMeta ()Lspace/kscience/dataforge/meta/Meta;
+ public fun toMeta ()Lspace/kscience/dataforge/meta/Meta;
+ public fun toString ()Ljava/lang/String;
}
public final class space/kscience/visionforge/VisionDescriptorKt {
@@ -382,82 +532,57 @@ public final class space/kscience/visionforge/VisionDescriptorKt {
public static final fun setWidgetType (Lspace/kscience/dataforge/meta/descriptors/MetaDescriptorBuilder;Ljava/lang/String;)V
}
-public abstract interface class space/kscience/visionforge/VisionGroup : space/kscience/dataforge/provider/Provider, space/kscience/visionforge/Vision, space/kscience/visionforge/VisionContainer {
- public static final field Companion Lspace/kscience/visionforge/VisionGroup$Companion;
- public static final field STYLE_TARGET Ljava/lang/String;
- public fun content (Ljava/lang/String;)Ljava/util/Map;
- public fun get (Lspace/kscience/dataforge/names/Name;)Lspace/kscience/visionforge/Vision;
- public abstract fun getChildren ()Ljava/util/Map;
- public fun getDefaultTarget ()Ljava/lang/String;
+public abstract interface class space/kscience/visionforge/VisionEvent {
+ public static final field Companion Lspace/kscience/visionforge/VisionEvent$Companion;
}
-public final class space/kscience/visionforge/VisionGroup$Companion {
- public static final field STYLE_TARGET Ljava/lang/String;
+public final class space/kscience/visionforge/VisionEvent$Companion {
+ public final fun getCLICK_EVENT_KEY ()Lspace/kscience/dataforge/names/Name;
}
-public class space/kscience/visionforge/VisionGroupBase : space/kscience/visionforge/VisionBase, space/kscience/visionforge/MutableVisionGroup {
- public static final field Companion Lspace/kscience/visionforge/VisionGroupBase$Companion;
- public fun ()V
- public synthetic fun