From de2ef1dcc5cc2ece398ea2d428e6eaf9709691a1 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 9 Aug 2020 14:41:24 +0300
Subject: [PATCH 001/151] UI tune-up

---
 build.gradle.kts                              |   2 +-
 .../vision/gdml/demo/GDMLAppComponent.kt      |   7 +-
 .../mipt/npm/muon/monitor/MMAppComponent.kt   |   2 +-
 playground/src/jsMain/kotlin/PlayGroundApp.kt |   2 +-
 .../vision/bootstrap/MetaViewerComponent.kt   |  11 +-
 .../dataforge/vision/bootstrap/bootstrap.kt   |  20 ++++
 .../{configEditor.kt => ConfigEditor.kt}      |  51 +++------
 .../hep/dataforge/vision/react}/ObjectTree.kt |  75 ++++++------
 .../hep/dataforge/vision/react/TreeStyles.kt  |  83 +++++++++++---
 .../dataforge/vision/react/valueChooser.kt    | 108 ++++++++----------
 10 files changed, 199 insertions(+), 162 deletions(-)
 rename ui/react/src/main/kotlin/hep/dataforge/vision/react/{configEditor.kt => ConfigEditor.kt} (82%)
 rename ui/{bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap => react/src/main/kotlin/hep/dataforge/vision/react}/ObjectTree.kt (69%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 56f0b451..f2da0ea9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,7 +19,7 @@ allprojects {
     }
 
     group = "hep.dataforge"
-    version = "0.1.5-dev"
+    version = "0.1.5-dev-2"
 }
 
 val githubProject by extra("visionforge")
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index ee788190..c189b6b8 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -7,10 +7,7 @@ import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionGroup
 import hep.dataforge.vision.bootstrap.*
 import hep.dataforge.vision.gdml.toVision
-import hep.dataforge.vision.react.component
-import hep.dataforge.vision.react.configEditor
-import hep.dataforge.vision.react.flexColumn
-import hep.dataforge.vision.react.state
+import hep.dataforge.vision.react.*
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.SolidGroup
 import hep.dataforge.vision.solid.specifications.Camera
@@ -98,7 +95,7 @@ val GDMLApp = component<GDMLAppProps> { props ->
                     }
                 }
                 //tree
-                card("Object tree", "overflow-auto") {
+                card("Object tree") {
                     visual?.let {
                         objectTree(it, selected, select)
                     }
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
index 1291efb0..d08788c4 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
@@ -6,9 +6,9 @@ import hep.dataforge.names.NameToken
 import hep.dataforge.names.isEmpty
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.bootstrap.card
-import hep.dataforge.vision.bootstrap.objectTree
 import hep.dataforge.vision.react.component
 import hep.dataforge.vision.react.configEditor
+import hep.dataforge.vision.react.objectTree
 import hep.dataforge.vision.react.state
 import hep.dataforge.vision.solid.specifications.Camera
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
diff --git a/playground/src/jsMain/kotlin/PlayGroundApp.kt b/playground/src/jsMain/kotlin/PlayGroundApp.kt
index c4377c05..3b8a04a4 100644
--- a/playground/src/jsMain/kotlin/PlayGroundApp.kt
+++ b/playground/src/jsMain/kotlin/PlayGroundApp.kt
@@ -2,8 +2,8 @@ import hep.dataforge.context.Global
 import hep.dataforge.js.Application
 import hep.dataforge.js.startApplication
 import hep.dataforge.names.Name
-import hep.dataforge.vision.bootstrap.objectTree
 import hep.dataforge.vision.bootstrap.visualPropertyEditor
+import hep.dataforge.vision.react.objectTree
 import hep.dataforge.vision.solid.Point3D
 import hep.dataforge.vision.solid.SolidGroup
 import hep.dataforge.vision.solid.box
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/MetaViewerComponent.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/MetaViewerComponent.kt
index a8bd0f26..d4809611 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/MetaViewerComponent.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/MetaViewerComponent.kt
@@ -7,11 +7,8 @@ import hep.dataforge.names.NameToken
 import kotlinx.html.classes
 import kotlinx.html.js.onClickFunction
 import org.w3c.dom.events.Event
-import react.RBuilder
-import react.RComponent
-import react.RProps
+import react.*
 import react.dom.*
-import react.setState
 
 interface MetaViewerProps : RProps {
     var name: NameToken
@@ -19,6 +16,12 @@ interface MetaViewerProps : RProps {
     var descriptor: NodeDescriptor?
 }
 
+
+interface TreeState : RState {
+    var expanded: Boolean
+}
+
+@Deprecated("To be replaced by react functional component")
 class MetaViewerComponent : RComponent<MetaViewerProps, TreeState>() {
 
     override fun TreeState.init() {
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt
index a0561bd1..d624be23 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt
@@ -2,12 +2,16 @@ package hep.dataforge.vision.bootstrap
 
 import hep.dataforge.names.Name
 import hep.dataforge.names.NameToken
+import hep.dataforge.vision.Vision
+import hep.dataforge.vision.react.ObjectTree
 import kotlinx.html.*
 import kotlinx.html.js.div
 import kotlinx.html.js.onClickFunction
+import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
 import react.RBuilder
 import react.ReactElement
+import react.child
 import react.dom.*
 
 inline fun TagConsumer<HTMLElement>.card(title: String, crossinline block: TagConsumer<HTMLElement>.() -> Unit) {
@@ -205,4 +209,20 @@ inline fun RBuilder.gridRow(
     block: RDOMBuilder<DIV>.() -> Unit
 ): ReactElement {
     return div(joinStyles(classes, "row"), block)
+}
+
+fun Element.renderObjectTree(
+    vision: Vision,
+    clickCallback: (Name) -> Unit = {}
+) = render(this) {
+    card("Object tree") {
+        child(ObjectTree) {
+            attrs {
+                this.name = Name.EMPTY
+                this.obj = vision
+                this.selected = null
+                this.clickCallback = clickCallback
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/configEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
similarity index 82%
rename from ui/react/src/main/kotlin/hep/dataforge/vision/react/configEditor.kt
rename to ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
index 7f99d087..9331f581 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/configEditor.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
@@ -6,13 +6,10 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.NameToken
 import hep.dataforge.names.plus
 import hep.dataforge.values.Value
-import kotlinx.css.*
-import kotlinx.css.properties.TextDecoration
 import kotlinx.html.js.onClickFunction
 import org.w3c.dom.Element
 import org.w3c.dom.events.Event
 import react.*
-import react.dom.div
 import react.dom.render
 import styled.*
 
@@ -86,7 +83,10 @@ private fun RFBuilder.configEditorItem(props: ConfigEditorItemProps) {
 
     when (actualItem) {
         is MetaItem.NodeItem -> {
-            div {
+            styledDiv {
+                css {
+                    +TreeStyles.treeLeaf
+                }
                 styledSpan {
                     css {
                         +TreeStyles.treeCaret
@@ -145,15 +145,14 @@ private fun RFBuilder.configEditorItem(props: ConfigEditorItemProps) {
             styledDiv {
                 css {
                     +TreeStyles.treeLeaf
-                     justifyContent = JustifyContent.flexEnd
+//                     justifyContent = JustifyContent.flexEnd
                 }
                 styledDiv {
                     css {
-                        flexGrow = 1.0
+                        +TreeStyles.treeLabel
                     }
                     styledSpan {
                         css {
-                            +TreeStyles.treeLabel
                             if (item == null) {
                                 +TreeStyles.treeLabelInactive
                             }
@@ -162,6 +161,9 @@ private fun RFBuilder.configEditorItem(props: ConfigEditorItemProps) {
                     }
                 }
                 styledDiv {
+                    css {
+                        +TreeStyles.resizeableInput
+                    }
                     valueChooser(
                         props.name,
                         actualItem,
@@ -169,37 +171,20 @@ private fun RFBuilder.configEditorItem(props: ConfigEditorItemProps) {
                         valueChanged
                     )
                 }
-                styledDiv {
+                styledButton {
                     css {
-                        flexShrink = 1.0
+                        +TreeStyles.removeButton
                     }
-                    styledButton {
-                        css {
-                            backgroundColor = Color.white
-                            borderStyle = BorderStyle.solid
-                            borderRadius = 2.px
-                            padding(1.px, 5.px)
-                            marginLeft = 4.px
-                            textAlign = TextAlign.center
-                            textDecoration = TextDecoration.none
-                            display = Display.inlineBlock
-                            cursor = Cursor.pointer
-                            disabled {
-                                cursor = Cursor.auto
-                                borderStyle = BorderStyle.dashed
-                                color = Color.lightGray
-                            }
-                        }
-                        +"\u00D7"
-                        attrs {
-                            if (item == null) {
-                                disabled = true
-                            } else {
-                                onClickFunction = removeClick
-                            }
+                    +"\u00D7"
+                    attrs {
+                        if (item == null) {
+                            disabled = true
+                        } else {
+                            onClickFunction = removeClick
                         }
                     }
                 }
+
             }
         }
     }
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/ObjectTree.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt
similarity index 69%
rename from ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/ObjectTree.kt
rename to ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt
index d2ed503f..3b2112fb 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/ObjectTree.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.vision.bootstrap
+package hep.dataforge.vision.react
 
 import hep.dataforge.names.Name
 import hep.dataforge.names.plus
@@ -6,14 +6,10 @@ import hep.dataforge.names.startsWith
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionGroup
 import hep.dataforge.vision.isEmpty
-import hep.dataforge.vision.react.RFBuilder
-import hep.dataforge.vision.react.component
-import kotlinx.html.classes
 import kotlinx.html.js.onClickFunction
-import org.w3c.dom.Element
 import org.w3c.dom.events.Event
 import react.*
-import react.dom.*
+import styled.*
 
 interface ObjectTreeProps : RProps {
     var name: Name
@@ -22,24 +18,25 @@ interface ObjectTreeProps : RProps {
     var clickCallback: (Name) -> Unit
 }
 
-interface TreeState : RState {
-    var expanded: Boolean
-}
-
 private fun RFBuilder.objectTree(props: ObjectTreeProps): Unit {
-    var expanded: Boolean by useState{ props.selected?.startsWith(props.name) ?: false }
+    var expanded: Boolean by useState { props.selected?.startsWith(props.name) ?: false }
 
     val onClick: (Event) -> Unit = {
         expanded = !expanded
     }
 
     fun RBuilder.treeLabel(text: String) {
-        button(classes = "btn btn-link align-middle tree-label p-0") {
+        styledButton {
+            css {
+                //classes = mutableListOf("btn", "btn-link", "align-middle", "text-truncate", "p-0")
+                +TreeStyles.treeLabel
+                +TreeStyles.linkButton
+                if (props.name == props.selected) {
+                    +TreeStyles.treeLabelSelected
+                }
+            }
             +text
             attrs {
-                if (props.name == props.selected) {
-                    classes += "tree-label-selected"
-                }
                 onClickFunction = { props.clickCallback(props.name) }
             }
         }
@@ -50,13 +47,19 @@ private fun RFBuilder.objectTree(props: ObjectTreeProps): Unit {
 
     //display as node if any child is visible
     if (obj is VisionGroup) {
-        div("d-block text-truncate") {
+        styledDiv {
+            css {
+                +TreeStyles.treeLeaf
+            }
             if (obj.children.any { !it.key.body.startsWith("@") }) {
-                span("tree-caret") {
-                    attrs {
+                styledSpan {
+                    css {
+                        +TreeStyles.treeCaret
                         if (expanded) {
-                            classes += "tree-caret-down"
+                            +TreeStyles.treeCaredDown
                         }
+                    }
+                    attrs {
                         onClickFunction = onClick
                     }
                 }
@@ -64,12 +67,18 @@ private fun RFBuilder.objectTree(props: ObjectTreeProps): Unit {
             treeLabel(token)
         }
         if (expanded) {
-            ul("tree") {
+            styledUl {
+                css {
+                    +TreeStyles.tree
+                }
                 obj.children.entries
                     .filter { !it.key.toString().startsWith("@") } // ignore statics and other hidden children
-                    .sortedBy { (it.value as? VisionGroup)?.isEmpty ?: true }
+                    .sortedBy { (it.value as? VisionGroup)?.isEmpty ?: true } // ignore empty groups
                     .forEach { (childToken, child) ->
-                        li("tree-item") {
+                        styledLi {
+                            css {
+                                +TreeStyles.treeItem
+                            }
                             child(ObjectTree) {
                                 attrs {
                                     this.name = props.name + childToken
@@ -83,8 +92,10 @@ private fun RFBuilder.objectTree(props: ObjectTreeProps): Unit {
             }
         }
     } else {
-        div("d-block text-truncate") {
-            span("tree-leaf") {}
+        styledDiv {
+            css {
+                +TreeStyles.treeLeaf
+            }
             treeLabel(token)
         }
     }
@@ -94,22 +105,6 @@ val ObjectTree: FunctionalComponent<ObjectTreeProps> = component { props ->
     objectTree(props)
 }
 
-fun Element.renderObjectTree(
-    vision: Vision,
-    clickCallback: (Name) -> Unit = {}
-) = render(this) {
-    card("Object tree") {
-        child(ObjectTree) {
-            attrs {
-                this.name = Name.EMPTY
-                this.obj = vision
-                this.selected = null
-                this.clickCallback = clickCallback
-            }
-        }
-    }
-}
-
 fun RBuilder.objectTree(
     vision: Vision,
     selected: Name? = null,
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt
index d28a6ede..ead7d577 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt
@@ -1,8 +1,7 @@
 package hep.dataforge.vision.react
 
 import kotlinx.css.*
-import kotlinx.css.properties.deg
-import kotlinx.css.properties.rotate
+import kotlinx.css.properties.*
 import styled.StyleSheet
 
 object TreeStyles : StyleSheet("treeStyles", true) {
@@ -30,22 +29,6 @@ object TreeStyles : StyleSheet("treeStyles", true) {
         }
     }
 
-    val treeItem by css {
-        alignItems = Align.center
-        paddingLeft = 10.px
-        borderLeftStyle = BorderStyle.dashed
-        borderLeftWidth = 1.px
-        borderLeftColor = Color.lightGray
-    }
-
-    val treeLeaf by css {
-        display = Display.flex
-        flexDirection = FlexDirection.row
-        userSelect = UserSelect.none
-        alignItems = Align.center
-    }
-
-
     /**
      *  Rotate the caret/arrow icon when clicked on (using JavaScript)
      */
@@ -59,8 +42,27 @@ object TreeStyles : StyleSheet("treeStyles", true) {
         }
     }
 
+    val treeItem by css {
+        alignItems = Align.center
+        paddingLeft = 10.px
+        borderLeftStyle = BorderStyle.dashed
+        borderLeftWidth = 1.px
+        borderLeftColor = Color.lightGray
+        borderBottomStyle = BorderStyle.dashed
+        borderBottomWidth = 1.px
+        borderBottomColor = Color.lightGray
+    }
+
+    val treeLeaf by css {
+        display = Display.flex
+        flexDirection = FlexDirection.row
+        flexWrap = FlexWrap.nowrap
+        //alignItems = Align.center
+    }
+
     val treeLabel by css {
         overflow = Overflow.hidden
+        flex(flexGrow = 1.0, flexShrink = 1.0)
     }
 
     val treeLabelInactive by css {
@@ -71,4 +73,49 @@ object TreeStyles : StyleSheet("treeStyles", true) {
         backgroundColor = Color.lightBlue
     }
 
+    val linkButton by css {
+        backgroundColor = Color.white
+        border = "none"
+        padding(left = 4.pt, right = 4.pt, top = 0.pt, bottom = 0.pt)
+        textAlign = TextAlign.left
+        fontFamily = "arial,sans-serif"
+        color = Color("#069")
+        cursor = Cursor.pointer
+        hover {
+            textDecoration(TextDecorationLine.underline)
+        }
+    }
+
+    val removeButton by css {
+        backgroundColor = Color.white
+        borderStyle = BorderStyle.solid
+        borderRadius = 2.px
+        padding(1.px, 5.px)
+        marginLeft = 4.px
+        textAlign = TextAlign.center
+        textDecoration = TextDecoration.none
+        display = Display.inlineBlock
+        flexShrink = 1.0
+        cursor = Cursor.pointer
+        disabled {
+            cursor = Cursor.auto
+            borderStyle = BorderStyle.dashed
+            color = Color.lightGray
+        }
+    }
+
+    val resizeableInput by css {
+        overflow = Overflow.hidden
+        maxWidth = 120.pt
+        flex(flexGrow = 2.0, flexShrink = 2.0, flexBasis = 60.pt)
+        input {
+            textAlign = TextAlign.right
+            width = 100.pct
+        }
+        select{
+            textAlign = TextAlign.right
+            width = 100.pct
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
index e7562131..cf51b5aa 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
@@ -6,8 +6,6 @@ import hep.dataforge.names.Name
 import hep.dataforge.values.*
 import hep.dataforge.vision.Colors
 import hep.dataforge.vision.widgetType
-import kotlinx.css.Align
-import kotlinx.css.alignSelf
 import kotlinx.html.InputType
 import kotlinx.html.js.onChangeFunction
 import kotlinx.html.js.onKeyDownFunction
@@ -17,11 +15,9 @@ import org.w3c.dom.HTMLSelectElement
 import org.w3c.dom.events.Event
 import react.*
 import react.dom.defaultValue
-import react.dom.input
 import react.dom.option
-import react.dom.select
-import styled.css
-import styled.styledDiv
+import styled.styledInput
+import styled.styledSelect
 
 interface ValueChooserProps : RProps {
     var item: MetaItem<*>?
@@ -75,7 +71,7 @@ class ValueChooserComponent(props: ValueChooserProps) : RComponent<ValueChooserP
         }
     }
 
-    private fun RBuilder.stringInput() = input(type = InputType.text) {
+    private fun RBuilder.stringInput() = styledInput(type = InputType.text) {
         attrs {
             this.defaultValue = props.item?.string ?: ""
             onKeyDownFunction = keyDown
@@ -84,67 +80,61 @@ class ValueChooserComponent(props: ValueChooserProps) : RComponent<ValueChooserP
     }
 
     override fun RBuilder.render() {
-        styledDiv {
-            css {
-                alignSelf = Align.center
+        val descriptor = props.descriptor
+        val type = descriptor?.type?.firstOrNull()
+        when {
+            state.rawInput == true -> stringInput()
+            descriptor?.widgetType == "color" -> styledInput(type = InputType.color) {
+                ref = element
+                attrs {
+                    this.defaultValue = props.item?.value?.let { value ->
+                        if (value.type == ValueType.NUMBER) Colors.rgbToString(value.int)
+                        else value.string
+                    } ?: "#000000"
+                    onChangeFunction = commit
+                }
             }
-            val descriptor = props.descriptor
-            val type = descriptor?.type?.firstOrNull()
-            when {
-                state.rawInput == true -> stringInput()
-                descriptor?.widgetType == "color" -> input(type = InputType.color) {
+            type == ValueType.BOOLEAN -> {
+                styledInput(type = InputType.checkBox) {
                     ref = element
                     attrs {
-                        this.defaultValue = props.item?.value?.let { value ->
-                            if (value.type == ValueType.NUMBER) Colors.rgbToString(value.int)
-                            else value.string
-                        } ?: "#000000"
+                        defaultChecked = props.item?.boolean ?: false
                         onChangeFunction = commit
                     }
                 }
-                type == ValueType.BOOLEAN -> {
-                    input(type = InputType.checkBox) {
-                        ref = element
-                        attrs {
-                            defaultChecked = props.item?.boolean ?: false
-                            onChangeFunction = commit
-                        }
-                    }
-                }
-                type == ValueType.NUMBER -> input(type = InputType.number) {
-                    ref = element
-                    attrs {
-                        descriptor.attributes["step"].string?.let {
-                            step = it
-                        }
-                        descriptor.attributes["min"].string?.let {
-                            min = it
-                        }
-                        descriptor.attributes["max"].string?.let {
-                            max = it
-                        }
-                        defaultValue = props.item?.string ?: ""
-                        onKeyDownFunction = keyDown
-                    }
-                }
-                descriptor?.allowedValues?.isNotEmpty() ?: false -> select {
-                    descriptor!!.allowedValues.forEach {
-                        option {
-                            +it.string
-                        }
-                    }
-                    ref = element
-                    attrs {
-                        this.value = props.item?.string ?: ""
-                        multiple = false
-                        onChangeFunction = commit
-                    }
-                }
-                else -> stringInput()
             }
+            type == ValueType.NUMBER -> styledInput(type = InputType.number) {
+                ref = element
+                attrs {
+                    descriptor.attributes["step"].string?.let {
+                        step = it
+                    }
+                    descriptor.attributes["min"].string?.let {
+                        min = it
+                    }
+                    descriptor.attributes["max"].string?.let {
+                        max = it
+                    }
+                    defaultValue = props.item?.string ?: ""
+                    onKeyDownFunction = keyDown
+                }
+            }
+            descriptor?.allowedValues?.isNotEmpty() ?: false -> styledSelect {
+                descriptor!!.allowedValues.forEach {
+                    option {
+                        +it.string
+                    }
+                }
+                ref = element
+                attrs {
+                    this.value = props.item?.string ?: ""
+                    multiple = false
+                    onChangeFunction = commit
+                }
+            }
+            else -> stringInput()
         }
     }
-
 }
 
 internal fun RBuilder.valueChooser(

From 48705e66705168b1d5d66508e24a0a55a2693a31 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 10 Aug 2020 22:28:05 +0300
Subject: [PATCH 002/151] Style viewer and styles resolution fix for proxies.

---
 .../vision/gdml/demo/GDMLAppComponent.kt      |  39 +++--
 .../mipt/npm/muon/monitor/server/MMServer.kt  |   2 +
 gradle/wrapper/gradle-wrapper.jar             | Bin 58694 -> 58910 bytes
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 gradlew                                       |   2 +
 gradlew.bat                                   |   1 +
 playground/src/jsMain/kotlin/PlayGroundApp.kt |   5 +-
 .../vision/bootstrap/MetaViewerComponent.kt   |  87 ----------
 .../vision/bootstrap/propertyEditor.kt        |  49 ------
 .../vision/bootstrap/visionPropertyEditor.kt  |  45 +++++
 .../dataforge/vision/react/ConfigEditor.kt    |  16 +-
 .../hep/dataforge/vision/react/MetaViewer.kt  | 157 ++++++++++++++++++
 .../hep/dataforge/vision/react/styles.kt      |   9 -
 .../kotlin/hep/dataforge/vision/StyleSheet.kt |  10 --
 .../kotlin/hep/dataforge/vision/Vision.kt     |  16 +-
 .../hep/dataforge/vision/VisionManager.kt     |   2 +-
 .../editor/VisualObjectEditorFragment.kt      |   1 -
 .../hep/dataforge/vision/solid/Proxy.kt       |  18 +-
 .../dataforge/vision/solid/serialization.kt   |   2 +-
 .../hep/dataforge/vision/solid/ConvexTest.kt  |   6 +-
 .../dataforge/vision/solid/PropertyTest.kt    |   1 -
 21 files changed, 265 insertions(+), 205 deletions(-)
 delete mode 100644 ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/MetaViewerComponent.kt
 delete mode 100644 ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/propertyEditor.kt
 create mode 100644 ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
 create mode 100644 ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
 delete mode 100644 ui/react/src/main/kotlin/hep/dataforge/vision/react/styles.kt

diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index c189b6b8..f6d7d016 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -7,7 +7,10 @@ import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionGroup
 import hep.dataforge.vision.bootstrap.*
 import hep.dataforge.vision.gdml.toVision
-import hep.dataforge.vision.react.*
+import hep.dataforge.vision.react.component
+import hep.dataforge.vision.react.flexColumn
+import hep.dataforge.vision.react.objectTree
+import hep.dataforge.vision.react.state
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.SolidGroup
 import hep.dataforge.vision.solid.specifications.Camera
@@ -78,7 +81,7 @@ val GDMLApp = component<GDMLAppProps> { props ->
                 classes.add("p-1")
                 overflow = Overflow.auto
             }
-            gridColumn(3, maxSize= GridMaxSize.XL, classes = "order-2 order-xl-1") {
+            gridColumn(3, maxSize = GridMaxSize.XL, classes = "order-2 order-xl-1") {
                 card("Load data") {
                     fileDrop("(drag file here)") { files ->
                         val file = files?.get(0)
@@ -102,7 +105,7 @@ val GDMLApp = component<GDMLAppProps> { props ->
                 }
             }
 
-            gridColumn(6, maxSize= GridMaxSize.XL, classes = "order-1 order-xl-2") {
+            gridColumn(6, maxSize = GridMaxSize.XL, classes = "order-1 order-xl-2") {
                 //canvas
                 (visual as? Solid)?.let { visual3D ->
                     child(ThreeCanvasComponent::class) {
@@ -118,7 +121,7 @@ val GDMLApp = component<GDMLAppProps> { props ->
                     }
                 }
             }
-            gridColumn(3, maxSize= GridMaxSize.XL, classes = "order-3") {
+            gridColumn(3, maxSize = GridMaxSize.XL, classes = "order-3") {
                 container {
                     //settings
                     canvas?.let {
@@ -127,25 +130,25 @@ val GDMLApp = component<GDMLAppProps> { props ->
                         }
                     }
                 }
-                container {
-                    namecrumbs(selected, "World") { selected = it }
-                }
                 container {
                     //properties
-                    card("Properties") {
-                        selected.let { selected ->
-                            val selectedObject: Vision? = when {
-                                selected == null -> null
-                                selected.isEmpty() -> visual
-                                else -> (visual as? VisionGroup)?.get(selected)
-                            }
-                            if (selectedObject != null) {
-                                configEditor(selectedObject, default = selectedObject.getAllProperties(), key = selected)
-                            }
+                    namecrumbs(selected, "World") { selected = it }
+                    selected.let { selected ->
+                        val selectedObject: Vision? = when {
+                            selected == null -> null
+                            selected.isEmpty() -> visual
+                            else -> (visual as? VisionGroup)?.get(selected)
+                        }
+                        if (selectedObject != null) {
+                            visionPropertyEditor(
+                                selectedObject,
+                                default = selectedObject.getAllProperties(),
+                                key = selected
+                            )
                         }
                     }
                 }
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
index 2052ffe8..d1e637b4 100644
--- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
+++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
@@ -1,6 +1,7 @@
 package ru.mipt.npm.muon.monitor.server
 
 
+import hep.dataforge.meta.DFExperimental
 import hep.dataforge.vision.solid.SolidManager
 import io.ktor.application.Application
 import io.ktor.application.call
@@ -28,6 +29,7 @@ import java.net.URI
 
 private val generator = Cos2TrackGenerator(JDKRandomGenerator(223))
 
+@OptIn(DFExperimental::class)
 fun Application.module() {
     val currentDir = File(".").absoluteFile
     environment.log.info("Current directory: $currentDir")
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 490fda8577df6c95960ba7077c43220e5bb2c0d9..62d4c053550b91381bbd28b1afc82d634bf73a8a 100644
GIT binary patch
delta 6447
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
Xd0iPaGX_wOF#=p0c#ocs{}cZodb%%W

delta 6107
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
F{|nTN-B$nr

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a4b44297..bb8b2fc2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 2fe81a7d..fbd7c515 100644
--- a/gradlew
+++ b/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat
index 62bd9b9c..5093609d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
diff --git a/playground/src/jsMain/kotlin/PlayGroundApp.kt b/playground/src/jsMain/kotlin/PlayGroundApp.kt
index 3b8a04a4..ea95c926 100644
--- a/playground/src/jsMain/kotlin/PlayGroundApp.kt
+++ b/playground/src/jsMain/kotlin/PlayGroundApp.kt
@@ -1,8 +1,7 @@
 import hep.dataforge.context.Global
 import hep.dataforge.js.Application
 import hep.dataforge.js.startApplication
-import hep.dataforge.names.Name
-import hep.dataforge.vision.bootstrap.visualPropertyEditor
+import hep.dataforge.vision.bootstrap.visionPropertyEditor
 import hep.dataforge.vision.react.objectTree
 import hep.dataforge.vision.solid.Point3D
 import hep.dataforge.vision.solid.SolidGroup
@@ -41,7 +40,7 @@ private class PlayGroundApp : Application {
                     threeCanvas(obj)
                 }
                 div("col-3") {
-                    visualPropertyEditor(Name.EMPTY, obj)
+                    visionPropertyEditor(obj)
                 }
             }
         }
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/MetaViewerComponent.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/MetaViewerComponent.kt
deleted file mode 100644
index d4809611..00000000
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/MetaViewerComponent.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-package hep.dataforge.vision.bootstrap
-
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.MetaItem
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.names.NameToken
-import kotlinx.html.classes
-import kotlinx.html.js.onClickFunction
-import org.w3c.dom.events.Event
-import react.*
-import react.dom.*
-
-interface MetaViewerProps : RProps {
-    var name: NameToken
-    var meta: Meta
-    var descriptor: NodeDescriptor?
-}
-
-
-interface TreeState : RState {
-    var expanded: Boolean
-}
-
-@Deprecated("To be replaced by react functional component")
-class MetaViewerComponent : RComponent<MetaViewerProps, TreeState>() {
-
-    override fun TreeState.init() {
-        expanded = false
-    }
-
-    private val onClick: (Event) -> Unit = {
-        setState {
-            expanded = !expanded
-        }
-    }
-
-    override fun RBuilder.render() {
-        div("d-inline-block text-truncate") {
-            if (props.meta.items.isNotEmpty()) {
-                span("tree-caret") {
-                    attrs {
-                        if (state.expanded) {
-                            classes += "tree-caret-down"
-                        }
-                        onClickFunction = onClick
-                    }
-                }
-            }
-            label("tree-label") {
-                +props.name.toString()
-            }
-            ul("tree") {
-                props.meta.items.forEach { (token, item) ->
-                    //val descriptor = props.
-                    li {
-                        when (item) {
-                            is MetaItem.NodeItem -> {
-                                child(MetaViewerComponent::class) {
-                                    attrs {
-                                        name = token
-                                        meta = item.node
-                                        descriptor = props.descriptor?.nodes?.get(token.body)
-                                    }
-                                }
-                            }
-                            is MetaItem.ValueItem -> {
-                                div("row") {
-                                    div("col") {
-                                        label("tree-label") {
-                                            +token.toString()
-                                        }
-                                    }
-                                    div("col") {
-                                        label {
-                                            +item.value.toString()
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/propertyEditor.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/propertyEditor.kt
deleted file mode 100644
index d51375ee..00000000
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/propertyEditor.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package hep.dataforge.vision.bootstrap
-
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.names.Name
-import hep.dataforge.names.isEmpty
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.react.configEditor
-import org.w3c.dom.Element
-import react.RBuilder
-import react.dom.li
-import react.dom.nav
-import react.dom.ol
-import react.dom.render
-import kotlin.collections.set
-
-fun RBuilder.visualPropertyEditor(
-    path: Name,
-    item: Vision,
-    descriptor: NodeDescriptor? = item.descriptor,
-    default: Meta? = null
-) {
-    card("Properties") {
-        if (!path.isEmpty()) {
-            nav {
-                attrs {
-                    attributes["aria-label"] = "breadcrumb"
-                }
-                ol("breadcrumb") {
-                    path.tokens.forEach { token ->
-                        li("breadcrumb-item") {
-                            +token.toString()
-                        }
-                    }
-                }
-            }
-        }
-        configEditor(item, descriptor, default)
-    }
-}
-
-fun Element.visualPropertyEditor(
-    path: Name,
-    item: Vision,
-    descriptor: NodeDescriptor? = item.descriptor,
-    default: Meta? = null
-) = render(this) {
-    this.visualPropertyEditor(path, item, descriptor, default)
-}
\ No newline at end of file
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
new file mode 100644
index 00000000..0c46e386
--- /dev/null
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
@@ -0,0 +1,45 @@
+package hep.dataforge.vision.bootstrap
+
+import hep.dataforge.meta.Meta
+import hep.dataforge.meta.descriptors.NodeDescriptor
+import hep.dataforge.vision.Vision
+import hep.dataforge.vision.react.configEditor
+import hep.dataforge.vision.react.metaViewer
+import hep.dataforge.vision.resolveStyle
+import org.w3c.dom.Element
+import react.RBuilder
+import react.dom.render
+
+fun RBuilder.visionPropertyEditor(
+    item: Vision,
+    descriptor: NodeDescriptor? = item.descriptor,
+    default: Meta? = null,
+    key: Any? = null
+) {
+    card("Properties") {
+        configEditor(item, descriptor, default, key)
+    }
+    val styles = item.styles
+    if(styles.isNotEmpty()) {
+        card("Styles") {
+            accordion("styles") {
+                styles.forEach { styleName ->
+                    val style = item.resolveStyle(styleName)
+                    if (style != null) {
+                        entry(styleName) {
+                            metaViewer(style)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+fun Element.visionPropertyEditor(
+    item: Vision,
+    descriptor: NodeDescriptor? = item.descriptor,
+    default: Meta? = null
+) = render(this) {
+    visionPropertyEditor(item, descriptor, default)
+}
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
index 9331f581..712d3b60 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
@@ -113,7 +113,7 @@ private fun RFBuilder.configEditorItem(props: ConfigEditorItemProps) {
                     css {
                         +TreeStyles.tree
                     }
-                    val keys = buildSet<NameToken> {
+                    val keys = buildSet {
                         (descriptorItem as? NodeDescriptor)?.items?.keys?.forEach {
                             add(NameToken(it))
                         }
@@ -121,7 +121,7 @@ private fun RFBuilder.configEditorItem(props: ConfigEditorItemProps) {
                         defaultItem?.node?.items?.keys?.let { addAll(it) }
                     }
 
-                    keys.forEach { token ->
+                    keys.filter { !it.body.startsWith("@") }.forEach { token ->
                         styledLi {
                             css {
                                 +TreeStyles.treeItem
@@ -145,7 +145,6 @@ private fun RFBuilder.configEditorItem(props: ConfigEditorItemProps) {
             styledDiv {
                 css {
                     +TreeStyles.treeLeaf
-//                     justifyContent = JustifyContent.flexEnd
                 }
                 styledDiv {
                     css {
@@ -238,13 +237,4 @@ fun RBuilder.configEditor(
     descriptor: NodeDescriptor? = obj.descriptor,
     default: Meta? = null,
     key: Any? = null
-) {
-    child(ConfigEditor) {
-        attrs {
-            this.key = key?.toString() ?: ""
-            this.root = obj.config
-            this.descriptor = descriptor
-            this.default = default
-        }
-    }
-}
+) = configEditor(obj.config,descriptor, default, key)
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
new file mode 100644
index 00000000..e5a628b4
--- /dev/null
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
@@ -0,0 +1,157 @@
+package hep.dataforge.vision.react
+
+import hep.dataforge.meta.Meta
+import hep.dataforge.meta.MetaItem
+import hep.dataforge.meta.descriptors.ItemDescriptor
+import hep.dataforge.meta.descriptors.NodeDescriptor
+import hep.dataforge.meta.descriptors.defaultItem
+import hep.dataforge.meta.descriptors.get
+import hep.dataforge.meta.get
+import hep.dataforge.names.Name
+import hep.dataforge.names.NameToken
+import hep.dataforge.names.plus
+import kotlinx.html.js.onClickFunction
+import org.w3c.dom.events.Event
+import react.*
+import react.dom.a
+import styled.*
+
+interface MetaViewerProps : RProps {
+    /**
+     * Root meta
+     */
+    var root: Meta
+
+    /**
+     * Full path to the displayed node in [root]. Could be empty
+     */
+    var name: Name
+
+    /**
+     * Root descriptor
+     */
+    var descriptor: NodeDescriptor?
+}
+
+private val MetaViewerItem: FunctionalComponent<MetaViewerProps> = component { props ->
+    metaViewerItem(props)
+}
+
+private fun RFBuilder.metaViewerItem(props: MetaViewerProps) {
+    var expanded: Boolean by state { true }
+    val item = props.root[props.name]
+    val descriptorItem: ItemDescriptor? = props.descriptor?.get(props.name)
+    val actualItem = item ?: descriptorItem?.defaultItem()
+
+    val token = props.name.last()?.toString() ?: "Meta"
+
+    val expanderClick: (Event) -> Unit = {
+        expanded = !expanded
+    }
+
+    when (actualItem) {
+        is MetaItem.NodeItem -> {
+            styledDiv {
+                css {
+                    +TreeStyles.treeLeaf
+                }
+                styledSpan {
+                    css {
+                        +TreeStyles.treeCaret
+                        if (expanded) {
+                            +TreeStyles.treeCaredDown
+                        }
+                    }
+                    attrs {
+                        onClickFunction = expanderClick
+                    }
+                }
+                styledSpan {
+                    css {
+                        +TreeStyles.treeLabel
+                        if (item == null) {
+                            +TreeStyles.treeLabelInactive
+                        }
+                    }
+                    +token
+                }
+            }
+            if (expanded) {
+                styledUl {
+                    css {
+                        +TreeStyles.tree
+                    }
+                    val keys = buildSet {
+                        (descriptorItem as? NodeDescriptor)?.items?.keys?.forEach {
+                            add(NameToken(it))
+                        }
+                        actualItem.node.items.keys.let { addAll(it) }
+                    }
+
+                    keys.filter { !it.body.startsWith("@") }.forEach { token ->
+                        styledLi {
+                            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)
+                        }
+                    }
+                }
+            }
+        }
+        is MetaItem.ValueItem -> {
+            styledDiv {
+                css {
+                    +TreeStyles.treeLeaf
+                }
+                styledDiv {
+                    css {
+                        +TreeStyles.treeLabel
+                    }
+                    styledSpan {
+                        css {
+                            if (item == null) {
+                                +TreeStyles.treeLabelInactive
+                            }
+                        }
+                        +token
+                    }
+                }
+                styledDiv {
+                    a {
+                        +actualItem.value.toString()
+                    }
+                }
+            }
+        }
+    }
+}
+
+val MetaViewer = component<MetaViewerProps> { props ->
+    child(MetaViewerItem) {
+        attrs {
+            this.key = ""
+            this.root = props.root
+            this.name = Name.EMPTY
+            this.descriptor = props.descriptor
+        }
+    }
+}
+
+fun RBuilder.metaViewer(meta: Meta, descriptor: NodeDescriptor? = null, key: Any? = null) {
+    child(MetaViewer) {
+        attrs {
+            this.key = key?.toString() ?: ""
+            this.root = meta
+            this.descriptor = descriptor
+        }
+    }
+}
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/styles.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/styles.kt
deleted file mode 100644
index 5a3a7576..00000000
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/styles.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package hep.dataforge.vision.react
-
-import styled.StyleSheet
-
-
-class MainStyle: StyleSheet("main", true){
-
-
-}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
index 4dfb28d1..1ff736c9 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
@@ -5,7 +5,6 @@ package hep.dataforge.vision
 import hep.dataforge.meta.*
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
-import hep.dataforge.values.asValue
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.MapSerializer
 import kotlinx.serialization.builtins.serializer
@@ -90,15 +89,6 @@ class StyleSheet private constructor(private val styleMap: MutableMap<String, Me
 }
 
 
-/**
- * List of names of styles applied to this object. Order matters. Not inherited
- */
-var Vision.styles: List<String>
-    get() = properties?.get(Vision.STYLE_KEY).stringList
-    set(value) {
-        setItem(Vision.STYLE_KEY,value.map { it.asValue() }.asValue())
-    }
-
 /**
  * Add style name to the list of styles to be resolved later. The style with given name does not necessary exist at the moment.
  */
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 8af6989b..1b8bcabd 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -5,6 +5,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.toName
 import hep.dataforge.provider.Type
+import hep.dataforge.values.asValue
 import hep.dataforge.vision.Vision.Companion.TYPE
 import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.Transient
@@ -56,13 +57,22 @@ interface Vision : Configurable {
      */
     fun removeChangeListener(owner: Any?)
 
+    /**
+     * List of names of styles applied to this object. Order matters. Not inherited.
+     */
+    var styles: List<String>
+        get() =  properties[STYLE_KEY].stringList
+        set(value) {
+            setItem(STYLE_KEY,value.map { it.asValue() }.asValue())
+        }
+
     companion object {
-        const val TYPE = "visual"
+        const val TYPE = "vision"
         val STYLE_KEY = "@style".asName()
 
-        private val VISUAL_OBJECT_SERIALIZER = PolymorphicSerializer(Vision::class)
+        private val VISION_SERIALIZER = PolymorphicSerializer(Vision::class)
 
-        fun serializer() = VISUAL_OBJECT_SERIALIZER
+        fun serializer() = VISION_SERIALIZER
     }
 }
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
index 4bebd56a..6bf7291c 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
@@ -84,7 +84,7 @@ class VisionManager(meta: Meta) : AbstractPlugin(meta) {
     }
 
     fun buildVision(meta: Meta): Vision {
-        val type = meta["type"].string ?: SimpleVisionGroup.serializer().descriptor.serialName
+        val type = meta["type"].string ?: Vision.serializer().descriptor.serialName
         val form = forms.values.find { it.name.toString() == type } ?: error("Could not resolve a form for type $type")
         return form.buildVision(meta, visionSerialModule)
     }
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
index 846fad14..7da6885d 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
@@ -6,7 +6,6 @@ import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.update
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.resolveStyle
-import hep.dataforge.vision.styles
 import javafx.beans.binding.Binding
 import javafx.beans.property.SimpleObjectProperty
 import javafx.scene.Node
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
index 463434cc..53d65b0a 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
@@ -2,12 +2,10 @@
 
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.Config
-import hep.dataforge.meta.Laminate
-import hep.dataforge.meta.MetaItem
+import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.meta.get
 import hep.dataforge.names.*
+import hep.dataforge.values.asValue
 import hep.dataforge.vision.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -89,6 +87,12 @@ class Proxy private constructor(
 
     //override fun findAllStyles(): Laminate = Laminate((styles + prototype.styles).mapNotNull { findStyle(it) })
 
+    override var styles: List<String>
+        get() = properties[Vision.STYLE_KEY].stringList + prototype.styles
+        set(value) {
+            setItem(Vision.STYLE_KEY, value.map { it.asValue() }.asValue())
+        }
+
     override val descriptor: NodeDescriptor?
         get() = prototype.descriptor
 
@@ -147,6 +151,12 @@ class Proxy private constructor(
             Laminate(properties, allStyles, prototype.getAllProperties(), parent?.getAllProperties())
 
 
+        override var styles: List<String>
+            get() = properties[Vision.STYLE_KEY].stringList + prototype.styles
+            set(value) {
+                setItem(Vision.STYLE_KEY, value.map { it.asValue() }.asValue())
+            }
+
         override val descriptor: NodeDescriptor?
             get() = prototype.descriptor
     }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt
index ba672093..0b0a4d0b 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt
@@ -123,7 +123,7 @@ internal object PrototypesSerializer : KSerializer<MutableVisionGroup> {
 fun Vision.stringify(): String = SolidManager.jsonForSolids.stringify(Vision.serializer(), this)
 
 @OptIn(DFExperimental::class)
-fun Vision.Companion.parseJson(str: String) = SolidManager.jsonForSolids.parse(Vision.serializer(), str).also {
+fun Vision.Companion.parseJson(str: String) = SolidManager.jsonForSolids.parse(serializer(), str).also {
     if(it is VisionGroup){
         it.attachChildren()
     }
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
index 8dc87500..0afb5a7c 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
@@ -1,13 +1,11 @@
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.MetaItem
-import hep.dataforge.meta.getIndexed
-import hep.dataforge.meta.node
-import hep.dataforge.meta.toMetaItem
+import hep.dataforge.meta.*
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class ConvexTest {
+    @OptIn(DFExperimental::class)
     @Suppress("UNUSED_VARIABLE")
     @Test
     fun testConvexBuilder() {
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
index efa9e1a0..48c7ec9d 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
@@ -3,7 +3,6 @@ package hep.dataforge.vision.solid
 import hep.dataforge.meta.int
 import hep.dataforge.meta.set
 import hep.dataforge.names.asName
-import hep.dataforge.vision.styles
 import hep.dataforge.vision.useStyle
 import kotlin.test.Test
 import kotlin.test.assertEquals

From a5eba1789b35e6124e198be5a71fef6085744042 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 26 Aug 2020 10:16:55 +0300
Subject: [PATCH 003/151] GDML optimization

---
 demo/gdml/build.gradle.kts                    |   3 +-
 .../vision/gdml/demo/GDMLAppComponent.kt      |  42 ++-
 .../demo/{GDMLDemoApp.kt => GdmlJsDemoApp.kt} |  31 +-
 .../demo/{GDMLDemoApp.kt => GdmlFxDemoApp.kt} |  11 +-
 .../vision/solid/demo/VariableBox.kt          |   2 +-
 gradle/wrapper/gradle-wrapper.jar             | Bin 58910 -> 59203 bytes
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 gradlew                                       |   2 +-
 gradlew.bat                                   |  21 +-
 .../dataforge/vision/bootstrap/bootstrap.kt   |  33 +-
 .../hep/dataforge/vision/VisionGroup.kt       |   5 +-
 .../vision/visitor/StatisticsVisitor.kt       |  35 +++
 .../dataforge/vision/visitor/VisionVisitor.kt |  55 ++++
 .../dataforge/vision/visitor/countDistinct.kt |  16 +
 .../dataforge/vision/gdml/GDMLTransformer.kt  | 287 +++++++++++++++++-
 .../dataforge/vision/gdml/GdmlOptimizer.kt    |  89 ++++++
 .../hep/dataforge/vision/gdml/GdmlVision.kt   | 268 ----------------
 .../hep/dataforge/vision/gdml/gdmlJs.kt       |   8 +
 .../gdml/{visualGDMLJvm.kt => gdmlJVM.kt}     |   4 +-
 .../dataforge/vision/gdml/TestConvertor.kt    |   5 +-
 .../dataforge/vision/gdml/bmanStatistics.kt   |  34 +++
 .../hep/dataforge/vision/solid/Proxy.kt       |   6 +-
 .../hep/dataforge/vision/solid/Solid.kt       |   4 +-
 .../vision/solid/three/MeshThreeFactory.kt    |  43 +--
 .../vision/solid/three/ThreeFactory.kt        |   2 +-
 .../vision/solid/three/ThreeLabelFactory.kt   |   2 +-
 .../vision/solid/three/ThreeLineFactory.kt    |   2 +-
 .../vision/solid/three/ThreeMaterials.kt      |  34 ++-
 .../vision/solid/three/ThreePlugin.kt         |   2 +-
 .../vision/solid/three/ThreeProxyFactory.kt   |  24 +-
 .../info/laht/threekt/objects/LineSegments.kt |   3 +
 31 files changed, 671 insertions(+), 404 deletions(-)
 rename demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/{GDMLDemoApp.kt => GdmlJsDemoApp.kt} (52%)
 rename demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/{GDMLDemoApp.kt => GdmlFxDemoApp.kt} (86%)
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/StatisticsVisitor.kt
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/VisionVisitor.kt
 create mode 100644 visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visitor/countDistinct.kt
 create mode 100644 visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
 delete mode 100644 visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlVision.kt
 create mode 100644 visionforge-gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/gdmlJs.kt
 rename visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/{visualGDMLJvm.kt => gdmlJVM.kt} (85%)
 create mode 100644 visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt

diff --git a/demo/gdml/build.gradle.kts b/demo/gdml/build.gradle.kts
index c16fce83..8d5342c3 100644
--- a/demo/gdml/build.gradle.kts
+++ b/demo/gdml/build.gradle.kts
@@ -1,6 +1,5 @@
 import scientifik.DependencyConfiguration
 import scientifik.FXModule
-import scientifik.useFx
 
 plugins {
     id("scientifik.mpp")
@@ -37,7 +36,7 @@ kotlin {
 }
 
 application {
-    mainClassName = "hep.dataforge.vision.gdml.demo.GDMLDemoAppKt"
+    mainClassName = "hep.dataforge.vision.gdml.demo.GdmlFxDemoAppKt"
 }
 
 val convertGdmlToJson by tasks.creating(JavaExec::class) {
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index f6d7d016..ae1dce60 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -1,6 +1,7 @@
 package hep.dataforge.vision.gdml.demo
 
 import hep.dataforge.context.Context
+import hep.dataforge.meta.set
 import hep.dataforge.names.Name
 import hep.dataforge.names.isEmpty
 import hep.dataforge.vision.Vision
@@ -8,7 +9,6 @@ import hep.dataforge.vision.VisionGroup
 import hep.dataforge.vision.bootstrap.*
 import hep.dataforge.vision.gdml.toVision
 import hep.dataforge.vision.react.component
-import hep.dataforge.vision.react.flexColumn
 import hep.dataforge.vision.react.objectTree
 import hep.dataforge.vision.react.state
 import hep.dataforge.vision.solid.Solid
@@ -29,7 +29,6 @@ import react.dom.h1
 import scientifik.gdml.GDML
 import scientifik.gdml.parse
 import styled.css
-import styled.styledDiv
 import kotlin.browser.window
 import kotlin.math.PI
 
@@ -50,14 +49,14 @@ private val canvasConfig = Canvas3DOptions {
 val GDMLApp = component<GDMLAppProps> { props ->
     var selected by state { props.selected }
     var canvas: ThreeCanvas? by state { null }
-    var visual: Vision? by state { props.rootObject }
+    var vision: Vision? by state { props.rootObject }
 
     val select: (Name?) -> Unit = {
         selected = it
     }
 
     fun loadData(name: String, data: String) {
-        visual = when {
+        val parsedVision = when {
             name.endsWith(".gdml") || name.endsWith(".xml") -> {
                 val gdml = GDML.parse(data)
                 gdml.toVision(gdmlConfiguration)
@@ -68,20 +67,26 @@ val GDMLApp = component<GDMLAppProps> { props ->
                 error("File extension is not recognized: $name")
             }
         }
+        parsedVision.config["edges.enabled"] = false
+
+        vision = parsedVision
     }
 
-    flexColumn {
+    gridColumn {
         css {
             flex(1.0, 1.0, FlexBasis.auto)
         }
         h1 { +"GDML/JSON loader demo" }
-        styledDiv {
+        gridRow {
             css {
-                classes.add("row")
-                classes.add("p-1")
+                +"p-1"
                 overflow = Overflow.auto
             }
-            gridColumn(3, maxSize = GridMaxSize.XL, classes = "order-2 order-xl-1") {
+            gridColumn(3, maxSize = GridMaxSize.XL) {
+                css {
+                    +"order-2"
+                    +"order-xl-1"
+                }
                 card("Load data") {
                     fileDrop("(drag file here)") { files ->
                         val file = files?.get(0)
@@ -99,15 +104,19 @@ val GDMLApp = component<GDMLAppProps> { props ->
                 }
                 //tree
                 card("Object tree") {
-                    visual?.let {
+                    vision?.let {
                         objectTree(it, selected, select)
                     }
                 }
             }
 
-            gridColumn(6, maxSize = GridMaxSize.XL, classes = "order-1 order-xl-2") {
+            gridColumn(6, maxSize = GridMaxSize.XL) {
+                css {
+                    +"order-1"
+                    +"order-xl-2"
+                }
                 //canvas
-                (visual as? Solid)?.let { visual3D ->
+                (vision as? Solid)?.let { visual3D ->
                     child(ThreeCanvasComponent::class) {
                         attrs {
                             this.context = props.context
@@ -121,7 +130,10 @@ val GDMLApp = component<GDMLAppProps> { props ->
                     }
                 }
             }
-            gridColumn(3, maxSize = GridMaxSize.XL, classes = "order-3") {
+            gridColumn(3, maxSize = GridMaxSize.XL) {
+                css {
+                    +"order-3"
+                }
                 container {
                     //settings
                     canvas?.let {
@@ -136,8 +148,8 @@ val GDMLApp = component<GDMLAppProps> { props ->
                     selected.let { selected ->
                         val selectedObject: Vision? = when {
                             selected == null -> null
-                            selected.isEmpty() -> visual
-                            else -> (visual as? VisionGroup)?.get(selected)
+                            selected.isEmpty() -> vision
+                            else -> (vision as? VisionGroup)?.get(selected)
                         }
                         if (selectedObject != null) {
                             visionPropertyEditor(
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLDemoApp.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
similarity index 52%
rename from demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLDemoApp.kt
rename to demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
index 56b9fecd..40d35a09 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLDemoApp.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
@@ -16,23 +16,9 @@ import kotlin.browser.document
 
 val gdmlConfiguration: GDMLTransformer.() -> Unit = {
     lUnit = LUnit.CM
-    volumeAction = { volume ->
-        when {
-            volume.name.startsWith("ecal01lay") -> GDMLTransformer.Action.REJECT
-            volume.name.startsWith("UPBL") -> GDMLTransformer.Action.REJECT
-            volume.name.startsWith("USCL") -> GDMLTransformer.Action.REJECT
-            volume.name.startsWith("VPBL") -> GDMLTransformer.Action.REJECT
-            volume.name.startsWith("VSCL") -> GDMLTransformer.Action.REJECT
-            else -> GDMLTransformer.Action.CACHE
-        }
-    }
 
-    solidConfiguration = { parent, solid ->
-        if (
-            solid.name.startsWith("Yoke")
-            || solid.name.startsWith("Pole")
-            || parent.physVolumes.isNotEmpty()
-        ) {
+    solidConfiguration = { parent, _ ->
+        if (parent.physVolumes.isNotEmpty()) {
             useStyle("opaque") {
                 MATERIAL_OPACITY_KEY put 0.3
             }
@@ -64,19 +50,6 @@ private class GDMLDemoApp : Application {
                 }
             }
         }
-//        (document.getElementById("file_load_button") as? HTMLInputElement)?.apply {
-//            addEventListener("change", {
-//                (it.target as HTMLInputElement).files?.asList()?.first()?.let { file ->
-//                    FileReader().apply {
-//                        onload = {
-//                            val string = result as String
-//                            action(file.name, string)
-//                        }
-//                        readAsText(file)
-//                    }
-//                }
-//            }, false)
-//        }
 
     }
 }
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLDemoApp.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
similarity index 86%
rename from demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLDemoApp.kt
rename to demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
index 35b00615..c69682b8 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLDemoApp.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
@@ -36,12 +36,11 @@ class GDMLView : View() {
             buttonbar {
                 button("Load GDML/json") {
                     action {
-                        runAsync {
-                            val file = chooseFile("Select a GDML/json file", filters = fileNameFilter).firstOrNull()
-                                ?: return@runAsync null
-                            SolidManager.readFile(file)
-                        } ui {
-                            if (it != null) {
+                        val file = chooseFile("Select a GDML/json file", filters = fileNameFilter).firstOrNull()
+                        if(file!= null) {
+                            runAsync {
+                                SolidManager.readFile(file)
+                            } ui {
                                 canvas.render(it)
                             }
                         }
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
index 3664d4a5..abe6097b 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
@@ -71,7 +71,7 @@ private object VariableBoxThreeFactory : ThreeFactory<Solid> {
         //JS sometimes tries to pass Geometry as BufferGeometry
         @Suppress("USELESS_IS_CHECK") if (geometry !is BufferGeometry) error("BufferGeometry expected")
 
-        val mesh = Mesh(geometry, getMaterial(obj)).apply {
+        val mesh = Mesh(geometry, getMaterial(obj,true)).apply {
             applyEdges(obj)
             applyWireFrame(obj)
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 62d4c053550b91381bbd28b1afc82d634bf73a8a..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f 100644
GIT binary patch
delta 6656
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
Yte!%o?r4GTrVtxD61Ym!|5fq-1K$0e!T<mO

delta 6475
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bb8b2fc2..6c9a2247 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index fbd7c515..4f906e0c 100644
--- a/gradlew
+++ b/gradlew
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat
index 5093609d..107acd32 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt
index d624be23..f41c7ecc 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt
@@ -13,6 +13,9 @@ import react.RBuilder
 import react.ReactElement
 import react.child
 import react.dom.*
+import styled.StyledDOMBuilder
+import styled.css
+import styled.styledDiv
 
 inline fun TagConsumer<HTMLElement>.card(title: String, crossinline block: TagConsumer<HTMLElement>.() -> Unit) {
     div("card w-100") {
@@ -180,10 +183,14 @@ enum class ContainerSize(val suffix: String) {
 }
 
 inline fun RBuilder.container(
-    classes: String? = null,
     size: ContainerSize = ContainerSize.FLUID,
-    block: RDOMBuilder<DIV>.() -> Unit
-): ReactElement = div(joinStyles(classes, "container${size.suffix}"), block)
+    block: StyledDOMBuilder<DIV>.() -> Unit
+): ReactElement = styledDiv{
+    css{
+        classes.add("container${size.suffix}")
+    }
+    block()
+}
 
 
 enum class GridMaxSize(val suffix: String) {
@@ -196,19 +203,23 @@ enum class GridMaxSize(val suffix: String) {
 
 inline fun RBuilder.gridColumn(
     weight: Int? = null,
-    classes: String? = null,
     maxSize: GridMaxSize = GridMaxSize.NONE,
-    block: RDOMBuilder<DIV>.() -> Unit
-): ReactElement {
+    block: StyledDOMBuilder<DIV>.() -> Unit
+): ReactElement = styledDiv {
     val weightSuffix = weight?.let { "-$it" } ?: ""
-    return div(joinStyles(classes, "col${maxSize.suffix}$weightSuffix"), block)
+    css {
+        classes.add("col${maxSize.suffix}$weightSuffix")
+    }
+    block()
 }
 
 inline fun RBuilder.gridRow(
-    classes: String? = null,
-    block: RDOMBuilder<DIV>.() -> Unit
-): ReactElement {
-    return div(joinStyles(classes, "row"), block)
+    block: StyledDOMBuilder<DIV>.() -> Unit
+): ReactElement = styledDiv{
+    css{
+        classes.add("row")
+    }
+    block()
 }
 
 fun Element.renderObjectTree(
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
index cae2e2b0..43b964f2 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
@@ -91,8 +91,7 @@ interface MutableVisionGroup : VisionGroup {
 
 operator fun VisionGroup.get(str: String?): Vision? = get(str?.toName() ?: Name.EMPTY)
 
-operator fun MutableVisionGroup.set(key: String, child: Vision?) {
-    set(key.toName(), child)
-}
+operator fun MutableVisionGroup.set(token: NameToken, child: Vision?): Unit = set(token.asName(), child)
+operator fun MutableVisionGroup.set(key: String, child: Vision?): Unit = set(key.toName(), child)
 
 fun MutableVisionGroup.removeAll() = children.keys.map { it.asName() }.forEach { this[it] = null }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/StatisticsVisitor.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/StatisticsVisitor.kt
new file mode 100644
index 00000000..21842994
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/StatisticsVisitor.kt
@@ -0,0 +1,35 @@
+package hep.dataforge.vision.visitor
+
+import hep.dataforge.names.Name
+import hep.dataforge.vision.Vision
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlin.reflect.KClass
+
+
+@OptIn(ExperimentalCoroutinesApi::class)
+suspend fun <T> Vision.flowStatistics(statistics: (Name, Vision) -> T): Flow<T> = callbackFlow<T> {
+    val visitor = object : VisionVisitor {
+        override suspend fun visit(name: Name, vision: Vision){
+            send(statistics(name, vision))
+        }
+    }
+    val job: Job = VisionVisitor.visitTree(visitor, this, this@flowStatistics)
+    job.invokeOnCompletion {
+        channel.close()
+    }
+    awaitClose {
+        job.cancel()
+    }
+}
+
+data class DefaultVisionStatistics(val name: Name, val type: KClass<out Vision>) {
+    val depth get() = name.length
+}
+
+suspend fun Vision.flowStatistics(): Flow<DefaultVisionStatistics> = flowStatistics { name, vision ->
+    DefaultVisionStatistics(name, vision::class)
+}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/VisionVisitor.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/VisionVisitor.kt
new file mode 100644
index 00000000..192e36a0
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/VisionVisitor.kt
@@ -0,0 +1,55 @@
+package hep.dataforge.vision.visitor
+
+import hep.dataforge.names.Name
+import hep.dataforge.names.plus
+import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionGroup
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+
+interface VisionVisitor {
+    /**
+     * Visit a vision possibly mutating in in the process. Should not rearrange children.
+     * @param name full name of a [Vision] being visited
+     * @param vision the visited [Vision]
+     */
+    suspend fun visit(name: Name, vision: Vision)
+
+    /**
+     * Rearrange children of given group
+     */
+    suspend fun visitChildren(name: Name, group: VisionGroup) {
+        //Do nothing by default
+    }
+
+    fun skip(name: Name, vision: Vision): Boolean = false
+
+    companion object{
+        private fun CoroutineScope.visitTreeAsync(
+            visionVisitor: VisionVisitor,
+            name: Name,
+            vision: Vision
+        ): Job = launch {
+            if (visionVisitor.skip(name, vision)) return@launch
+            visionVisitor.visit(name, vision)
+
+            if (vision is VisionGroup) {
+                visionVisitor.visitChildren(name, vision)
+
+                for ((token, child) in vision.children) {
+                    visitTreeAsync(visionVisitor, name + token, child)
+                }
+            }
+        }
+
+        /**
+         * Recursively visit this [Vision] and all children
+         */
+        fun visitTree(visionVisitor: VisionVisitor, scope: CoroutineScope, root: Vision): Job =
+            scope.visitTreeAsync(visionVisitor, Name.EMPTY, root)
+
+
+    }
+}
+
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visitor/countDistinct.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visitor/countDistinct.kt
new file mode 100644
index 00000000..6f9594de
--- /dev/null
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visitor/countDistinct.kt
@@ -0,0 +1,16 @@
+package hep.dataforge.vision.visitor
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.collect
+import java.util.concurrent.atomic.AtomicInteger
+
+suspend fun <T, K> Flow<T>.countDistinctBy(selector: (T) -> K): Map<K, Int> {
+    val counter = LinkedHashMap<K, AtomicInteger>()
+    collect {
+        val key = selector(it)
+        counter.getOrPut(key) { AtomicInteger() }.incrementAndGet()
+    }
+    return counter.mapValues { it.value.toInt() }
+}
+
+suspend fun <T> Flow<T>.countDistinct(): Map<T, Int> = countDistinctBy { it }
\ No newline at end of file
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
index b7019f69..82413d93 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
@@ -4,11 +4,16 @@ import hep.dataforge.meta.Meta
 import hep.dataforge.meta.MetaBuilder
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
+import hep.dataforge.names.plus
 import hep.dataforge.names.toName
+import hep.dataforge.vision.get
+import hep.dataforge.vision.set
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
 import hep.dataforge.vision.useStyle
 import scientifik.gdml.*
+import kotlin.math.cos
+import kotlin.math.sin
 import kotlin.random.Random
 
 class GDMLTransformer(val root: GDML) {
@@ -21,17 +26,16 @@ class GDMLTransformer(val root: GDML) {
         CACHE
     }
 
-    /**
-     * A special group for local templates
-     */
-    val proto by lazy { SolidGroup() }
-    private val styleCache = HashMap<Name, Meta>()
-
     var lUnit: LUnit = LUnit.MM
 
     var solidAction: (GDMLSolid) -> Action = { Action.CACHE }
     var volumeAction: (GDMLGroup) -> Action = { Action.CACHE }
 
+    /**
+     * A special group for local templates
+     */
+    internal val proto by lazy { SolidGroup() }
+    private val styleCache = HashMap<Name, Meta>()
 
     var solidConfiguration: Solid.(parent: GDMLVolume, solid: GDMLSolid) -> Unit = { parent, _ ->
         lUnit = LUnit.CM
@@ -86,4 +90,275 @@ class GDMLTransformer(val root: GDML) {
         return final
     }
 
+}
+
+private fun Solid.withPosition(
+    lUnit: LUnit,
+    newPos: GDMLPosition? = null,
+    newRotation: GDMLRotation? = null,
+    newScale: GDMLScale? = null
+): Solid = apply {
+    newPos?.let {
+        val point = Point3D(it.x(lUnit), it.y(lUnit), it.z(lUnit))
+        if (position != null || point != World.ZERO) {
+            position = point
+        }
+    }
+    newRotation?.let {
+        val point = Point3D(it.x(), it.y(), it.z())
+        if (rotation != null || point != World.ZERO) {
+            rotation = point
+        }
+        //this@withPosition.rotationOrder = RotationOrder.ZXY
+    }
+    newScale?.let {
+        val point = Point3D(it.x, it.y, it.z)
+        if (scale != null || point != World.ONE) {
+            scale = point
+        }
+    }
+    //TODO convert units if needed
+}
+
+@Suppress("NOTHING_TO_INLINE")
+private inline operator fun Number.times(d: Double) = toDouble() * d
+
+@Suppress("NOTHING_TO_INLINE")
+private inline operator fun Number.times(f: Float) = toFloat() * f
+
+private fun SolidGroup.addSolid(
+    context: GDMLTransformer,
+    solid: GDMLSolid,
+    name: String = "",
+    block: Solid.() -> Unit = {}
+): Solid {
+    //context.solidAdded(solid)
+    val lScale = solid.lscale(context.lUnit)
+    val aScale = solid.ascale()
+    return when (solid) {
+        is GDMLBox -> box(solid.x * lScale, solid.y * lScale, solid.z * lScale, name)
+        is GDMLTube -> tube(
+            solid.rmax * lScale,
+            solid.z * lScale,
+            solid.rmin * lScale,
+            solid.startphi * aScale,
+            solid.deltaphi * aScale,
+            name
+        )
+        is GDMLCone -> cone(solid.rmax1, solid.z, solid.rmax2, name = name) {
+            require(solid.rmin1 == 0.0) { "Empty cones are not supported" }
+            require(solid.rmin2 == 0.0) { "Empty cones are not supported" }
+            startAngle = solid.startphi.toFloat()
+            angle = solid.deltaphi.toFloat()
+        }
+        is GDMLXtru -> extrude(name) {
+            shape {
+                solid.vertices.forEach {
+                    point(it.x * lScale, it.y * lScale)
+                }
+            }
+            solid.sections.sortedBy { it.zOrder }.forEach { section ->
+                layer(
+                    section.zPosition * lScale,
+                    section.xOffset * lScale,
+                    section.yOffset * lScale,
+                    section.scalingFactor
+                )
+            }
+        }
+        is GDMLScaledSolid -> {
+            //Add solid with modified scale
+            val innerSolid = solid.solidref.resolve(context.root)
+                ?: error("Solid with tag ${solid.solidref.ref} for scaled solid ${solid.name} not defined")
+
+            addSolid(context, innerSolid, name) {
+                block()
+                scaleX *= solid.scale.x.toFloat()
+                scaleY *= solid.scale.y.toFloat()
+                scaleZ = solid.scale.z.toFloat()
+            }
+        }
+        is GDMLSphere -> sphere(solid.rmax * lScale, solid.deltaphi * aScale, solid.deltatheta * aScale, name) {
+            phiStart = solid.startphi * aScale
+            thetaStart = solid.starttheta * aScale
+        }
+        is GDMLOrb -> sphere(solid.r * lScale, name = name)
+        is GDMLPolyhedra -> extrude(name) {
+            //getting the radius of first
+            require(solid.planes.size > 1) { "The polyhedron geometry requires at least two planes" }
+            val baseRadius = solid.planes.first().rmax * lScale
+            shape {
+                (0..solid.numsides).forEach {
+                    val phi = solid.deltaphi * aScale / solid.numsides * it + solid.startphi * aScale
+                    (baseRadius * cos(phi) to baseRadius * sin(phi))
+                }
+            }
+            solid.planes.forEach { plane ->
+                //scaling all radii relative to first layer radius
+                layer(plane.z * lScale, scale = plane.rmax * lScale / baseRadius)
+            }
+        }
+        is GDMLBoolSolid -> {
+            val first = solid.first.resolve(context.root) ?: error("")
+            val second = solid.second.resolve(context.root) ?: error("")
+            val type: CompositeType = when (solid) {
+                is GDMLUnion -> CompositeType.UNION
+                is GDMLSubtraction -> CompositeType.SUBTRACT
+                is GDMLIntersection -> CompositeType.INTERSECT
+            }
+
+            return composite(type, name) {
+                addSolid(context, first) {
+                    withPosition(
+                        context.lUnit,
+                        solid.resolveFirstPosition(context.root),
+                        solid.resolveFirstRotation(context.root),
+                        null
+                    )
+                }
+                addSolid(context, second) {
+                    withPosition(
+                        context.lUnit,
+                        solid.resolvePosition(context.root),
+                        solid.resolveRotation(context.root),
+                        null
+                    )
+                }
+            }
+        }
+        else -> error("Renderer for $solid not supported yet")
+    }.apply(block)
+}
+
+
+private fun SolidGroup.addSolidWithCaching(
+    context: GDMLTransformer,
+    solid: GDMLSolid,
+    volume: GDMLVolume,
+    name: String = solid.name
+) {
+    when (context.solidAction(solid)) {
+        GDMLTransformer.Action.ACCEPT -> {
+            addSolid(context, solid, name) {
+                context.configureSolid(this, volume, solid)
+            }
+        }
+        GDMLTransformer.Action.CACHE -> {
+            if (context.proto[solid.name] == null) {
+                context.proto.addSolid(context, solid, name) {
+                    context.configureSolid(this, volume, solid)
+                }
+            }
+            ref(solid.name.asName(), name)
+        }
+        GDMLTransformer.Action.REJECT -> {
+            //ignore
+        }
+    }
+
+}
+
+private val volumesName = "volumes".asName()
+
+private fun SolidGroup.addPhysicalVolume(
+    context: GDMLTransformer,
+    physVolume: GDMLPhysVolume
+) {
+    val volume: GDMLGroup = physVolume.volumeref.resolve(context.root)
+        ?: error("Volume with ref ${physVolume.volumeref.ref} could not be resolved")
+
+    // a special case for single solid volume
+//    if (volume is GDMLVolume && volume.physVolumes.isEmpty() && volume.placement == null) {
+//        val solid = volume.solidref.resolve(context.root)
+//            ?: error("Solid with tag ${volume.solidref.ref} for volume ${volume.name} not defined")
+//        addSolidWithCaching(context, solid, volume, physVolume.name ?: "").apply {
+//            withPosition(
+//                context.lUnit,
+//                physVolume.resolvePosition(context.root),
+//                physVolume.resolveRotation(context.root),
+//                physVolume.resolveScale(context.root)
+//            )
+//        }
+//        return
+//    }
+
+    when (context.volumeAction(volume)) {
+        GDMLTransformer.Action.ACCEPT -> {
+            val group: SolidGroup = volume(context, volume)
+            this[physVolume.name ?: ""] = group.apply {
+                withPosition(
+                    context.lUnit,
+                    physVolume.resolvePosition(context.root),
+                    physVolume.resolveRotation(context.root),
+                    physVolume.resolveScale(context.root)
+                )
+            }
+        }
+        GDMLTransformer.Action.CACHE -> {
+            val fullName = volumesName + volume.name.asName()
+            if (context.proto[fullName] == null) {
+                context.proto[fullName] = volume(context, volume)
+            }
+
+            this[physVolume.name ?: ""] = Proxy(this, fullName).apply {
+                withPosition(
+                    context.lUnit,
+                    physVolume.resolvePosition(context.root),
+                    physVolume.resolveRotation(context.root),
+                    physVolume.resolveScale(context.root)
+                )
+            }
+        }
+        GDMLTransformer.Action.REJECT -> {
+            //ignore
+        }
+    }
+}
+
+private fun SolidGroup.addDivisionVolume(
+    context: GDMLTransformer,
+    divisionVolume: GDMLDivisionVolume
+) {
+    val volume: GDMLGroup = divisionVolume.volumeref.resolve(context.root)
+        ?: error("Volume with ref ${divisionVolume.volumeref.ref} could not be resolved")
+
+    //TODO add divisions
+    set(Name.EMPTY, volume(context, volume))
+}
+
+//private val solidsName = "solids".asName()
+
+private fun volume(
+    context: GDMLTransformer,
+    group: GDMLGroup
+): SolidGroup = SolidGroup().apply {
+    if (group is GDMLVolume) {
+        val solid: GDMLSolid = group.solidref.resolve(context.root)
+            ?: error("Solid with tag ${group.solidref.ref} for volume ${group.name} not defined")
+
+        addSolidWithCaching(context, solid, group)
+
+        when (val vol: GDMLPlacement? = group.placement) {
+            is GDMLPhysVolume -> addPhysicalVolume(context, vol)
+            is GDMLDivisionVolume -> addDivisionVolume(context, vol)
+        }
+    }
+
+    group.physVolumes.forEach { physVolume ->
+        addPhysicalVolume(context, physVolume)
+    }
+}
+
+fun GDML.toVision(block: GDMLTransformer.() -> Unit = {}): SolidGroup {
+    val context = GDMLTransformer(this).apply(block)
+    return context.finalize(volume(context, world))
+}
+
+/**
+ * Append gdml node to the group
+ */
+fun SolidGroup.gdml(gdml: GDML, key: String = "", transformer: GDMLTransformer.() -> Unit = {}) {
+    val visual = gdml.toVision(transformer)
+    //println(Visual3DPlugin.json.stringify(VisualGroup3D.serializer(), visual))
+    set(key, visual)
 }
\ No newline at end of file
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
new file mode 100644
index 00000000..c138fcc6
--- /dev/null
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
@@ -0,0 +1,89 @@
+package hep.dataforge.vision.gdml
+
+import hep.dataforge.meta.DFExperimental
+import hep.dataforge.meta.sequence
+import hep.dataforge.meta.set
+import hep.dataforge.names.Name
+import hep.dataforge.names.toName
+import hep.dataforge.vision.*
+import hep.dataforge.vision.solid.*
+import hep.dataforge.vision.visitor.VisionVisitor
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.coroutineScope
+import mu.KotlinLogging
+
+expect class Counter() {
+    fun get(): Int
+    fun incrementAndGet(): Int
+}
+
+@DFExperimental
+private class GdmlOptimizer() : VisionVisitor {
+    val logger = KotlinLogging.logger("SingleChildReducer")
+
+    private operator fun Point3D?.plus(other: Point3D?): Point3D? = if (this == null && other == null) {
+        null
+    } else {
+        (this ?: Point3D(0, 0, 0)) + (other ?: Point3D(0, 0, 0))
+    }
+
+    private fun Vision.updateFrom(other: Vision): Vision {
+        if (this is Solid && other is Solid) {
+            position += other.position
+            rotation += other.rotation
+            if (this.scale != null || other.scale != null) {
+                scaleX = scaleX.toDouble() * other.scaleX.toDouble()
+                scaleY = scaleY.toDouble() * other.scaleY.toDouble()
+                scaleZ = scaleZ.toDouble() * other.scaleZ.toDouble()
+            }
+            other.properties?.sequence()?.forEach { (name, item) ->
+                if (properties?.getItem(name) == null) {
+                    config[name] = item
+                }
+            }
+        }
+        return this
+    }
+
+    private val depthCount = HashMap<Int, Counter>()
+
+    override suspend fun visit(name: Name, vision: Vision) {
+        val depth = name.length
+        depthCount.getOrPut(depth) { Counter() }.incrementAndGet()
+    }
+
+    override fun skip(name: Name, vision: Vision): Boolean = vision is Proxy.ProxyChild
+
+    override suspend fun visitChildren(name: Name, group: VisionGroup) {
+        if (name == "volumes".toName()) return
+        if (group !is MutableVisionGroup) return
+
+        val newChildren = group.children.entries.associate { (visionToken, vision) ->
+            //Reduce single child groups
+            if (vision is VisionGroup && vision !is Proxy && vision.children.size == 1) {
+                val (token, child) = vision.children.entries.first()
+                child.parent = null
+                if (token != visionToken) {
+                    child.config["solidName"] = token.toString()
+                }
+                visionToken to child.updateFrom(vision)
+            } else {
+                visionToken to vision
+            }
+        }
+        if (newChildren != group.children) {
+            group.removeAll()
+            newChildren.forEach { (token, child) ->
+                group[token] = child
+            }
+        }
+    }
+}
+
+@DFExperimental
+suspend fun SolidGroup.optimizeGdml(): Job = coroutineScope {
+    prototypes?.let {
+        VisionVisitor.visitTree(GdmlOptimizer(), this, it)
+    } ?: CompletableDeferred(Unit)
+}
\ No newline at end of file
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlVision.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlVision.kt
deleted file mode 100644
index 29efa338..00000000
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlVision.kt
+++ /dev/null
@@ -1,268 +0,0 @@
-package hep.dataforge.vision.gdml
-
-
-import hep.dataforge.names.Name
-import hep.dataforge.names.asName
-import hep.dataforge.names.plus
-import hep.dataforge.vision.get
-import hep.dataforge.vision.set
-import hep.dataforge.vision.solid.*
-import hep.dataforge.vision.solid.World.ONE
-import hep.dataforge.vision.solid.World.ZERO
-import scientifik.gdml.*
-import kotlin.math.cos
-import kotlin.math.sin
-
-
-private fun Solid.withPosition(
-    lUnit: LUnit,
-    newPos: GDMLPosition? = null,
-    newRotation: GDMLRotation? = null,
-    newScale: GDMLScale? = null
-): Solid = apply {
-    newPos?.let {
-        val point = Point3D(it.x(lUnit), it.y(lUnit), it.z(lUnit))
-        if (position != null || point != ZERO) {
-            position = point
-        }
-    }
-    newRotation?.let {
-        val point = Point3D(it.x(), it.y(), it.z())
-        if (rotation != null || point != ZERO) {
-            rotation = point
-        }
-        //this@withPosition.rotationOrder = RotationOrder.ZXY
-    }
-    newScale?.let {
-        val point = Point3D(it.x, it.y, it.z)
-        if (scale != null || point != ONE) {
-            scale = point
-        }
-    }
-    //TODO convert units if needed
-}
-
-@Suppress("NOTHING_TO_INLINE")
-private inline operator fun Number.times(d: Double) = toDouble() * d
-
-@Suppress("NOTHING_TO_INLINE")
-private inline operator fun Number.times(f: Float) = toFloat() * f
-
-private fun SolidGroup.addSolid(
-    context: GDMLTransformer,
-    solid: GDMLSolid,
-    name: String = "",
-    block: Solid.() -> Unit = {}
-): Solid {
-    //context.solidAdded(solid)
-    val lScale = solid.lscale(context.lUnit)
-    val aScale = solid.ascale()
-    return when (solid) {
-        is GDMLBox -> box(solid.x * lScale, solid.y * lScale, solid.z * lScale, name)
-        is GDMLTube -> tube(
-            solid.rmax * lScale,
-            solid.z * lScale,
-            solid.rmin * lScale,
-            solid.startphi * aScale,
-            solid.deltaphi * aScale,
-            name
-        )
-        is GDMLCone -> cone(solid.rmax1, solid.z, solid.rmax2, name = name) {
-            require(solid.rmin1 == 0.0) { "Empty cones are not supported" }
-            require(solid.rmin2 == 0.0) { "Empty cones are not supported" }
-            startAngle = solid.startphi.toFloat()
-            angle = solid.deltaphi.toFloat()
-        }
-        is GDMLXtru -> extrude(name) {
-            shape {
-                solid.vertices.forEach {
-                    point(it.x * lScale, it.y * lScale)
-                }
-            }
-            solid.sections.sortedBy { it.zOrder }.forEach { section ->
-                layer(
-                    section.zPosition * lScale,
-                    section.xOffset * lScale,
-                    section.yOffset * lScale,
-                    section.scalingFactor
-                )
-            }
-        }
-        is GDMLScaledSolid -> {
-            //Add solid with modified scale
-            val innerSolid = solid.solidref.resolve(context.root)
-                ?: error("Solid with tag ${solid.solidref.ref} for scaled solid ${solid.name} not defined")
-
-            addSolid(context, innerSolid, name) {
-                block()
-                scaleX *= solid.scale.x.toFloat()
-                scaleY *= solid.scale.y.toFloat()
-                scaleZ = solid.scale.z.toFloat()
-            }
-        }
-        is GDMLSphere -> sphere(solid.rmax * lScale, solid.deltaphi * aScale, solid.deltatheta * aScale, name) {
-            phiStart = solid.startphi * aScale
-            thetaStart = solid.starttheta * aScale
-        }
-        is GDMLOrb -> sphere(solid.r * lScale, name = name)
-        is GDMLPolyhedra -> extrude(name) {
-            //getting the radius of first
-            require(solid.planes.size > 1) { "The polyhedron geometry requires at least two planes" }
-            val baseRadius = solid.planes.first().rmax * lScale
-            shape {
-                (0..solid.numsides).forEach {
-                    val phi = solid.deltaphi * aScale / solid.numsides * it + solid.startphi * aScale
-                    (baseRadius * cos(phi) to baseRadius * sin(phi))
-                }
-            }
-            solid.planes.forEach { plane ->
-                //scaling all radii relative to first layer radius
-                layer(plane.z * lScale, scale = plane.rmax * lScale / baseRadius)
-            }
-        }
-        is GDMLBoolSolid -> {
-            val first = solid.first.resolve(context.root) ?: error("")
-            val second = solid.second.resolve(context.root) ?: error("")
-            val type: CompositeType = when (solid) {
-                is GDMLUnion -> CompositeType.UNION
-                is GDMLSubtraction -> CompositeType.SUBTRACT
-                is GDMLIntersection -> CompositeType.INTERSECT
-            }
-
-            return composite(type, name) {
-                addSolid(context, first) {
-                    withPosition(
-                        context.lUnit,
-                        solid.resolveFirstPosition(context.root),
-                        solid.resolveFirstRotation(context.root),
-                        null
-                    )
-                }
-                addSolid(context, second) {
-                    withPosition(
-                        context.lUnit,
-                        solid.resolvePosition(context.root),
-                        solid.resolveRotation(context.root),
-                        null
-                    )
-                }
-            }
-        }
-        else -> error("Renderer for $solid not supported yet")
-    }.apply(block)
-}
-
-private val volumesName = "volumes".asName()
-
-private fun SolidGroup.addPhysicalVolume(
-    context: GDMLTransformer,
-    physVolume: GDMLPhysVolume
-) {
-    val volume: GDMLGroup = physVolume.volumeref.resolve(context.root)
-        ?: error("Volume with ref ${physVolume.volumeref.ref} could not be resolved")
-
-    when (context.volumeAction(volume)) {
-        GDMLTransformer.Action.ACCEPT -> {
-            val group = volume(context, volume)
-            this[physVolume.name ?: ""] = group.apply {
-                withPosition(
-                    context.lUnit,
-                    physVolume.resolvePosition(context.root),
-                    physVolume.resolveRotation(context.root),
-                    physVolume.resolveScale(context.root)
-                )
-            }
-        }
-        GDMLTransformer.Action.CACHE -> {
-            val fullName = volumesName + volume.name.asName()
-            if (context.proto[fullName] == null) {
-                context.proto[fullName] = volume(context, volume)
-            }
-
-            this[physVolume.name ?: ""] = Proxy(this, fullName).apply {
-                withPosition(
-                    context.lUnit,
-                    physVolume.resolvePosition(context.root),
-                    physVolume.resolveRotation(context.root),
-                    physVolume.resolveScale(context.root)
-                )
-            }
-        }
-        GDMLTransformer.Action.REJECT -> {
-            //ignore
-        }
-    }
-}
-
-private fun SolidGroup.addDivisionVolume(
-    context: GDMLTransformer,
-    divisionVolume: GDMLDivisionVolume
-) {
-    val volume: GDMLGroup = divisionVolume.volumeref.resolve(context.root)
-        ?: error("Volume with ref ${divisionVolume.volumeref.ref} could not be resolved")
-
-    //TODO add divisions
-    set(
-        Name.EMPTY,
-        volume(
-            context,
-            volume
-        )
-    )
-}
-
-private val solidsName = "solids".asName()
-
-private fun volume(
-    context: GDMLTransformer,
-    group: GDMLGroup
-): SolidGroup {
-    return SolidGroup().apply {
-        if (group is GDMLVolume) {
-            val solid = group.solidref.resolve(context.root)
-                ?: error("Solid with tag ${group.solidref.ref} for volume ${group.name} not defined")
-
-            when (context.solidAction(solid)) {
-                GDMLTransformer.Action.ACCEPT -> {
-                    addSolid(context, solid, solid.name) {
-                        context.configureSolid(this, group, solid)
-                    }
-                }
-                GDMLTransformer.Action.CACHE -> {
-                    if (context.proto[solid.name] == null) {
-                        context.proto.addSolid(context, solid, solid.name) {
-                            context.configureSolid(this, group, solid)
-                        }
-                    }
-                    ref(solid.name.asName(), solid.name)
-                }
-                GDMLTransformer.Action.REJECT -> {
-                    //ignore
-                }
-            }
-
-            when (val vol = group.placement) {
-                is GDMLPhysVolume -> addPhysicalVolume(context, vol)
-                is GDMLDivisionVolume -> addDivisionVolume(context, vol)
-            }
-        }
-
-        group.physVolumes.forEach { physVolume ->
-            addPhysicalVolume(context, physVolume)
-        }
-    }
-}
-
-fun GDML.toVision(block: GDMLTransformer.() -> Unit = {}): SolidGroup {
-    val context = GDMLTransformer(this).apply(block)
-    return context.finalize(volume(context, world))
-}
-
-/**
- * Append gdml node to the group
- */
-fun SolidGroup.gdml(gdml: GDML, key: String = "", transformer: GDMLTransformer.() -> Unit = {}) {
-    val visual = gdml.toVision(transformer)
-    //println(Visual3DPlugin.json.stringify(VisualGroup3D.serializer(), visual))
-    set(key, visual)
-}
\ No newline at end of file
diff --git a/visionforge-gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/gdmlJs.kt b/visionforge-gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/gdmlJs.kt
new file mode 100644
index 00000000..44a36b6c
--- /dev/null
+++ b/visionforge-gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/gdmlJs.kt
@@ -0,0 +1,8 @@
+package hep.dataforge.vision.gdml
+
+actual class Counter {
+    private var count: Int = 0
+    actual fun get(): Int = count
+
+    actual fun incrementAndGet(): Int = count++
+}
\ No newline at end of file
diff --git a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/visualGDMLJvm.kt b/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
similarity index 85%
rename from visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/visualGDMLJvm.kt
rename to visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
index 0d47ea7a..1718cc74 100644
--- a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/visualGDMLJvm.kt
+++ b/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
@@ -5,6 +5,9 @@ import nl.adaptivity.xmlutil.StAXReader
 import scientifik.gdml.GDML
 import java.nio.file.Files
 import java.nio.file.Path
+import java.util.concurrent.atomic.AtomicInteger
+
+actual typealias Counter = AtomicInteger
 
 fun GDML.Companion.readFile(file: Path): GDML {
     val xmlReader = StAXReader(Files.newInputStream(file), "UTF-8")
@@ -15,4 +18,3 @@ fun SolidGroup.gdml(file: Path, key: String = "", transformer: GDMLTransformer.(
     val gdml = GDML.readFile(file)
     gdml(gdml, key, transformer)
 }
-
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
index d932ab0e..287553a1 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
@@ -10,11 +10,10 @@ class TestConvertor {
     @Test
     fun testBMNGeometry() {
         val stream = javaClass.getResourceAsStream("/gdml/BM@N.gdml")
-
         val xmlReader = StAXReader(stream, "UTF-8")
         val xml = GDML.format.parse(GDML.serializer(), xmlReader)
-        val visual = xml.toVision()
-        println(visual.stringify())
+        val vision = xml.toVision()
+        println(vision.stringify())
     }
 
     @Test
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
new file mode 100644
index 00000000..a8af85c6
--- /dev/null
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
@@ -0,0 +1,34 @@
+package hep.dataforge.vision.gdml
+
+import hep.dataforge.vision.visitor.countDistinctBy
+import hep.dataforge.vision.visitor.flowStatistics
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import nl.adaptivity.xmlutil.StAXReader
+import scientifik.gdml.GDML
+import java.io.File
+
+suspend fun main() {
+    withContext(Dispatchers.Default) {
+        //val stream = SingleChildReducer::class.java.getResourceAsStream("/gdml/BM@N.gdml")
+        val stream =
+            File("D:\\Work\\Projects\\dataforge-vis\\visionforge-gdml\\src\\jvmTest\\resources\\gdml\\BM@N.gdml").inputStream()
+
+        val xmlReader = StAXReader(stream, "UTF-8")
+        val xml = GDML.format.parse(GDML.serializer(), xmlReader)
+        val vision = xml.toVision()
+
+
+        vision.flowStatistics().countDistinctBy { it.type }.forEach { (depth, size) ->
+            println("$depth\t$size")
+        }
+
+        println("***REDUCED***")
+
+        vision.optimizeGdml()
+
+        vision.flowStatistics().countDistinctBy { it.type }.forEach { (depth, size) ->
+            println("$depth\t$size")
+        }
+    }
+}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
index 53d65b0a..85d122c8 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
@@ -13,6 +13,9 @@ import kotlinx.serialization.Transient
 import kotlinx.serialization.UseSerializers
 import kotlin.collections.set
 
+
+class AbstractProxy
+
 /**
  * A proxy [Solid] to reuse a template object
  */
@@ -39,8 +42,7 @@ class Proxy private constructor(
         get() = (parent as? SolidGroup)?.getPrototype(templateName)
             ?: error("Prototype with name $templateName not found in $parent")
 
-    override val styleSheet: StyleSheet
-        get() = parent?.styleSheet ?: StyleSheet(this)
+    override val styleSheet: StyleSheet get() = parent?.styleSheet ?: StyleSheet(this)
 
     override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? {
         return if (inherit) {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
index d1cfdaca..721d38ee 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
@@ -103,9 +103,9 @@ interface Solid : Vision {
  * Count number of layers to the top object. Return 1 if this is top layer
  */
 var Solid.layer: Int
-    get() = getItem(LAYER_KEY).int ?: 0
+    get() = properties?.getItem(LAYER_KEY).int ?: 0
     set(value) {
-        setItem(LAYER_KEY, value.asValue())
+        config[LAYER_KEY] = value.asValue()
     }
 
 fun Renderer<Solid>.render(meta: Meta = Meta.EMPTY, action: SolidGroup.() -> Unit) =
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
index f3b2d30f..eb7192c0 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
@@ -35,7 +35,7 @@ abstract class MeshThreeFactory<in T : Solid>(
 
         //val meshMeta: Meta = obj.properties[Material3D.MATERIAL_KEY]?.node ?: Meta.empty
 
-        val mesh = Mesh(geometry, getMaterial(obj)).apply {
+        val mesh = Mesh(geometry, getMaterial(obj, true)).apply {
             matrixAutoUpdate = false
             applyEdges(obj)
             applyWireFrame(obj)
@@ -50,7 +50,7 @@ abstract class MeshThreeFactory<in T : Solid>(
         }
 
         //add listener to object properties
-        obj.onPropertyChange(this) { name->
+        obj.onPropertyChange(this) { name ->
             when {
                 name.startsWith(Solid.GEOMETRY_KEY) -> {
                     val oldGeometry = mesh.geometry as BufferGeometry
@@ -80,22 +80,28 @@ abstract class MeshThreeFactory<in T : Solid>(
 }
 
 fun Mesh.applyEdges(obj: Solid) {
-    children.find { it.name == "@edges" }?.let {
-        remove(it)
-        (it as LineSegments).dispose()
-    }
+    val edges = children.find { it.name == "@edges" } as? LineSegments
     //inherited edges definition, enabled by default
     if (obj.getItem(MeshThreeFactory.EDGES_ENABLED_KEY).boolean != false) {
-
-        val material = ThreeMaterials.getLineMaterial(obj.getItem(MeshThreeFactory.EDGES_MATERIAL_KEY).node)
-        add(
-            LineSegments(
-                EdgesGeometry(geometry as BufferGeometry),
-                material
-            ).apply {
-                name = "@edges"
-            }
-        )
+        val bufferGeometry = geometry as? BufferGeometry ?: return
+        val material = ThreeMaterials.getLineMaterial(obj.getItem(MeshThreeFactory.EDGES_MATERIAL_KEY).node, true)
+        if (edges == null) {
+            add(
+                LineSegments(
+                    EdgesGeometry(bufferGeometry),
+                    material
+                ).apply {
+                    name = "@edges"
+                }
+            )
+        } else {
+            edges.material = material
+        }
+    } else {
+        edges?.let {
+            remove(it)
+            it.dispose()
+        }
     }
 }
 
@@ -106,10 +112,11 @@ fun Mesh.applyWireFrame(obj: Solid) {
     }
     //inherited wireframe definition, disabled by default
     if (obj.getItem(MeshThreeFactory.WIREFRAME_ENABLED_KEY).boolean == true) {
-        val material = ThreeMaterials.getLineMaterial(obj.getItem(MeshThreeFactory.WIREFRAME_MATERIAL_KEY).node)
+        val bufferGeometry = geometry as? BufferGeometry ?: return
+        val material = ThreeMaterials.getLineMaterial(obj.getItem(MeshThreeFactory.WIREFRAME_MATERIAL_KEY).node, true)
         add(
             LineSegments(
-                WireframeGeometry(geometry as BufferGeometry),
+                WireframeGeometry(bufferGeometry),
                 material
             ).apply {
                 name = "@wireframe"
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
index 8bbd55a3..8b83ef16 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
@@ -58,7 +58,7 @@ fun Object3D.updatePosition(obj: Vision) {
  */
 fun Object3D.updateProperty(source: Vision, propertyName: Name) {
     if (this is Mesh && propertyName.startsWith(MATERIAL_KEY)) {
-        this.material = getMaterial(source)
+        this.material = getMaterial(source, false)
     } else if (
         propertyName.startsWith(Solid.POSITION_KEY)
         || propertyName.startsWith(Solid.ROTATION)
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
index 60b0352a..f6c677c4 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
@@ -21,7 +21,7 @@ object ThreeLabelFactory : ThreeFactory<SolidLabel> {
             height = 1
             curveSegments = 1
         })
-        return Mesh(textGeo, getMaterial(obj)).apply {
+        return Mesh(textGeo, getMaterial(obj,true)).apply {
             updatePosition(obj)
             obj.onPropertyChange(this@ThreeLabelFactory) { _ ->
                 //TODO
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
index c0b67e25..a032f527 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
@@ -18,7 +18,7 @@ object ThreeLineFactory : ThreeFactory<PolyLine> {
             vertices = obj.points.toTypedArray()
         }
 
-        val material = ThreeMaterials.getLineMaterial(obj.getItem(MeshThreeFactory.EDGES_MATERIAL_KEY).node)
+        val material = ThreeMaterials.getLineMaterial(obj.getItem(MeshThreeFactory.EDGES_MATERIAL_KEY).node, true)
 
         material.linewidth = obj.thickness.toDouble()
         material.color = obj.color?.let { Color(it) } ?: DEFAULT_LINE_COLOR
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
index a2da8611..7566e136 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
@@ -33,18 +33,27 @@ object ThreeMaterials {
         linewidth = 8.0
     }
 
-    fun getLineMaterial(meta: Meta?): LineBasicMaterial {
+    private val lineMaterialCache = HashMap<Meta, LineBasicMaterial>()
+
+    private fun buildLineMaterial(meta: Meta): LineBasicMaterial = LineBasicMaterial().apply {
+        color = meta[SolidMaterial.COLOR_KEY]?.getColor() ?: DEFAULT_LINE_COLOR
+        opacity = meta[SolidMaterial.OPACITY_KEY].double ?: 1.0
+        transparent = opacity < 1.0
+        linewidth = meta["thickness"].double ?: 1.0
+    }
+
+    fun getLineMaterial(meta: Meta?, cache: Boolean): LineBasicMaterial {
         if (meta == null) return DEFAULT_LINE
-        return LineBasicMaterial().apply {
-            color = meta[SolidMaterial.COLOR_KEY]?.getColor() ?: DEFAULT_LINE_COLOR
-            opacity = meta[SolidMaterial.OPACITY_KEY].double ?: 1.0
-            transparent = opacity < 1.0
-            linewidth = meta["thickness"].double ?: 1.0
+        return if (cache) {
+            lineMaterialCache.getOrPut(meta) { buildLineMaterial(meta) }
+        } else {
+            buildLineMaterial(meta)
         }
     }
 
-    fun getMaterial(vision3D: Vision): Material {
-        val meta = vision3D.getItem(SolidMaterial.MATERIAL_KEY).node ?: return DEFAULT
+    private val materialCache = HashMap<Meta, Material>()
+
+    private fun buildMaterial(meta: Meta): Material {
         return if (meta[SolidMaterial.SPECULAR_COLOR_KEY] != null) {
             MeshPhongMaterial().apply {
                 color = meta[SolidMaterial.COLOR_KEY]?.getColor() ?: DEFAULT_COLOR
@@ -65,6 +74,15 @@ object ThreeMaterials {
         }
     }
 
+    fun getMaterial(vision3D: Vision, cache: Boolean): Material {
+        val meta = vision3D.getItem(SolidMaterial.MATERIAL_KEY).node ?: return DEFAULT
+        return if (cache) {
+            materialCache.getOrPut(meta) { buildMaterial(meta) }
+        } else {
+            buildMaterial(meta)
+        }
+    }
+
 }
 
 /**
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index a3af79d4..d8f467fe 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -70,7 +70,7 @@ class ThreePlugin : AbstractPlugin() {
 
                     obj.onChildrenChange(this) { name, child ->
                         if (name.isEmpty()) {
-                            logger.error { "Children change with empty namr on $group" }
+                            logger.error { "Children change with empty name on $group" }
                             return@onChildrenChange
                         }
 
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
index 9ae86b4d..2fd83dfa 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
@@ -4,12 +4,26 @@ import hep.dataforge.names.toName
 import hep.dataforge.vision.solid.Proxy
 import hep.dataforge.vision.solid.Proxy.Companion.PROXY_CHILD_PROPERTY_PREFIX
 import hep.dataforge.vision.solid.Solid
+import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
+import info.laht.threekt.objects.Mesh
+import kotlin.reflect.KClass
 
 class ThreeProxyFactory(val three: ThreePlugin) : ThreeFactory<Proxy> {
     private val cache = HashMap<Solid, Object3D>()
 
-    override val type = Proxy::class
+    override val type: KClass<Proxy> = Proxy::class
+
+    private fun Object3D.replicate(): Object3D {
+        return when (this) {
+            is Mesh -> Mesh(geometry as BufferGeometry, material)
+            else -> clone(false)
+        }.also { obj: Object3D ->
+            children.forEach { child: Object3D ->
+                obj.add(child.replicate())
+            }
+        }
+    }
 
     override fun invoke(obj: Proxy): Object3D {
         val template = obj.prototype
@@ -17,16 +31,16 @@ class ThreeProxyFactory(val three: ThreePlugin) : ThreeFactory<Proxy> {
             three.buildObject3D(template)
         }
 
-        //val mesh = Mesh(templateMesh.geometry as BufferGeometry, templateMesh.material)
-        val object3D = cachedObject.clone()
+        val object3D: Object3D = cachedObject.replicate()
+
         object3D.updatePosition(obj)
 
-        obj.onPropertyChange(this) { name->
+        obj.onPropertyChange(this) { name ->
             if (name.first()?.body == PROXY_CHILD_PROPERTY_PREFIX) {
                 val childName = name.first()?.index?.toName() ?: error("Wrong syntax for proxy child property: '$name'")
                 val propertyName = name.cutFirst()
                 val proxyChild = obj[childName] ?: error("Proxy child with name '$childName' not found")
-                val child = object3D.findChild(childName)?: error("Object child with name '$childName' not found")
+                val child = object3D.findChild(childName) ?: error("Object child with name '$childName' not found")
                 child.updateProperty(proxyChild, propertyName)
             } else {
                 object3D.updateProperty(obj, name)
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LineSegments.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LineSegments.kt
index 3925c7fb..b5a83ff0 100644
--- a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LineSegments.kt
+++ b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LineSegments.kt
@@ -34,4 +34,7 @@ import info.laht.threekt.materials.Material
 
 open external class LineSegments(geometry: BufferGeometry, material: Material) : Object3D {
     constructor(geometry: Geometry, material: Material)
+
+    var geometry: BufferGeometry
+    var material: Material
 }
\ No newline at end of file

From b362f86f9bc89abaac2c41c87bad817081092d0f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 26 Aug 2020 21:12:39 +0300
Subject: [PATCH 004/151] GDML optimization

---
 .../hep/dataforge/vision/gdml/demo/cubes.kt   |   2 +-
 .../dataforge/vision/gdml/GDMLVisualTest.kt   |  16 +-
 .../kotlin/hep/dataforge/vision/StyleSheet.kt |   3 +-
 .../kotlin/hep/dataforge/vision/Vision.kt     |   3 +-
 .../dataforge/vision/gdml/GDMLTransformer.kt  | 129 ++++++-------
 .../hep/dataforge/vision/solid/Proxy.kt       | 172 ++++++++----------
 .../hep/dataforge/vision/solid/SolidGroup.kt  |   9 +-
 .../vision/solid/three/MeshThreeFactory.kt    |  22 ++-
 .../vision/solid/three/ThreeFactory.kt        |  12 --
 .../vision/solid/three/ThreeProxyFactory.kt   |  28 +--
 .../vision/solid/three/outputConfig.kt        |   2 +
 .../kotlin/info/laht/threekt/objects/Mesh.kt  |   4 +-
 12 files changed, 179 insertions(+), 223 deletions(-)

diff --git a/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/demo/cubes.kt b/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/demo/cubes.kt
index e0666f2a..1f0b8cf9 100644
--- a/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/demo/cubes.kt
+++ b/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/demo/cubes.kt
@@ -20,7 +20,7 @@ fun cubes(): GDML = GDML {
         val circle = volume("composite", boxMaterial, smallBox.ref()) {
             for (i in 0 until 6) {
                 physVolume(segmentVolume) {
-                    name = "segment$i"
+                    name = "segment_$i"
                     positionref = center.ref()
                     rotation {
                         z = 60 * i
diff --git a/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt b/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt
index ed3710e3..59545bdf 100644
--- a/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt
+++ b/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt
@@ -10,11 +10,21 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class GDMLVisualTest {
+    val gdml = cubes()
+
+//    @Test
+//    fun testCubesStyles(){
+//        val cubes = gdml.toVision()
+//        val segment = cubes["composite000.segment_0".toName()] as Solid
+//        println(segment.styles)
+//        println(segment.material)
+//    }
+
+
     @Test
     fun testPrototypeProperty() {
-        val gdml = cubes()
         val visual = gdml.toVision()
-        visual["composite000.segment0".toName()]?.setItem(SolidMaterial.MATERIAL_COLOR_KEY, "red".asValue())
-        assertEquals("red", visual["composite000.segment0".toName()]?.getItem(SolidMaterial.MATERIAL_COLOR_KEY).string)
+        visual["composite000.segment_0".toName()]?.setItem(SolidMaterial.MATERIAL_COLOR_KEY, "red".asValue())
+        assertEquals("red", visual["composite000.segment_0".toName()]?.getItem(SolidMaterial.MATERIAL_COLOR_KEY).string)
     }
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
index 1ff736c9..d4199657 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
@@ -84,7 +84,6 @@ class StyleSheet private constructor(private val styleMap: MutableMap<String, Me
         override fun serialize(encoder: Encoder, value: StyleSheet) {
             mapSerializer.serialize(encoder, value.items)
         }
-
     }
 }
 
@@ -93,7 +92,7 @@ class StyleSheet private constructor(private val styleMap: MutableMap<String, Me
  * Add style name to the list of styles to be resolved later. The style with given name does not necessary exist at the moment.
  */
 fun Vision.useStyle(name: String) {
-    styles = styles + name
+    styles = properties[Vision.STYLE_KEY].stringList + name
 }
 
 /**
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 1b8bcabd..4d819910 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -5,7 +5,6 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.toName
 import hep.dataforge.provider.Type
-import hep.dataforge.values.asValue
 import hep.dataforge.vision.Vision.Companion.TYPE
 import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.Transient
@@ -63,7 +62,7 @@ interface Vision : Configurable {
     var styles: List<String>
         get() =  properties[STYLE_KEY].stringList
         set(value) {
-            setItem(STYLE_KEY,value.map { it.asValue() }.asValue())
+            config[STYLE_KEY] = value
         }
 
     companion object {
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
index 82413d93..ad48480b 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
@@ -6,7 +6,6 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
 import hep.dataforge.names.toName
-import hep.dataforge.vision.get
 import hep.dataforge.vision.set
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
@@ -27,6 +26,7 @@ class GDMLTransformer(val root: GDML) {
     }
 
     var lUnit: LUnit = LUnit.MM
+    var aUnit: AUnit = AUnit.RADIAN
 
     var solidAction: (GDMLSolid) -> Action = { Action.CACHE }
     var volumeAction: (GDMLGroup) -> Action = { Action.CACHE }
@@ -65,10 +65,6 @@ class GDMLTransformer(val root: GDML) {
 
         obj.solidConfiguration(parent, solid)
     }
-//
-//    internal fun solidAdded(solid: GDMLSolid) {
-//        solidCounter[solid.name] = (solidCounter[solid.name] ?: 0) + 1
-//    }
 
     var onFinish: GDMLTransformer.() -> Unit = {}
 
@@ -94,6 +90,7 @@ class GDMLTransformer(val root: GDML) {
 
 private fun Solid.withPosition(
     lUnit: LUnit,
+    aUnit: AUnit = AUnit.RADIAN,
     newPos: GDMLPosition? = null,
     newRotation: GDMLRotation? = null,
     newScale: GDMLScale? = null
@@ -105,7 +102,7 @@ private fun Solid.withPosition(
         }
     }
     newRotation?.let {
-        val point = Point3D(it.x(), it.y(), it.z())
+        val point = Point3D(it.x(aUnit), it.y(aUnit), it.z(aUnit))
         if (rotation != null || point != World.ZERO) {
             rotation = point
         }
@@ -120,6 +117,13 @@ private fun Solid.withPosition(
     //TODO convert units if needed
 }
 
+private fun Solid.withPosition(context: GDMLTransformer, physVolume: GDMLPhysVolume) = withPosition(
+    context.lUnit, context.aUnit,
+    physVolume.resolvePosition(context.root),
+    physVolume.resolveRotation(context.root),
+    physVolume.resolveScale(context.root)
+)
+
 @Suppress("NOTHING_TO_INLINE")
 private inline operator fun Number.times(d: Double) = toDouble() * d
 
@@ -129,8 +133,7 @@ private inline operator fun Number.times(f: Float) = toFloat() * f
 private fun SolidGroup.addSolid(
     context: GDMLTransformer,
     solid: GDMLSolid,
-    name: String = "",
-    block: Solid.() -> Unit = {}
+    name: String = ""
 ): Solid {
     //context.solidAdded(solid)
     val lScale = solid.lscale(context.lUnit)
@@ -168,11 +171,10 @@ private fun SolidGroup.addSolid(
         }
         is GDMLScaledSolid -> {
             //Add solid with modified scale
-            val innerSolid = solid.solidref.resolve(context.root)
+            val innerSolid: GDMLSolid = solid.solidref.resolve(context.root)
                 ?: error("Solid with tag ${solid.solidref.ref} for scaled solid ${solid.name} not defined")
 
-            addSolid(context, innerSolid, name) {
-                block()
+            addSolid(context, innerSolid, name).apply {
                 scaleX *= solid.scale.x.toFloat()
                 scaleY *= solid.scale.y.toFloat()
                 scaleZ = solid.scale.z.toFloat()
@@ -199,8 +201,8 @@ private fun SolidGroup.addSolid(
             }
         }
         is GDMLBoolSolid -> {
-            val first = solid.first.resolve(context.root) ?: error("")
-            val second = solid.second.resolve(context.root) ?: error("")
+            val first: GDMLSolid = solid.first.resolve(context.root) ?: error("")
+            val second: GDMLSolid = solid.second.resolve(context.root) ?: error("")
             val type: CompositeType = when (solid) {
                 is GDMLUnion -> CompositeType.UNION
                 is GDMLSubtraction -> CompositeType.SUBTRACT
@@ -208,54 +210,51 @@ private fun SolidGroup.addSolid(
             }
 
             return composite(type, name) {
-                addSolid(context, first) {
-                    withPosition(
-                        context.lUnit,
-                        solid.resolveFirstPosition(context.root),
-                        solid.resolveFirstRotation(context.root),
-                        null
-                    )
-                }
-                addSolid(context, second) {
-                    withPosition(
-                        context.lUnit,
-                        solid.resolvePosition(context.root),
-                        solid.resolveRotation(context.root),
-                        null
-                    )
-                }
+                addSolid(context, first).withPosition(
+                    context.lUnit, context.aUnit,
+                    solid.resolveFirstPosition(context.root),
+                    solid.resolveFirstRotation(context.root),
+                    null
+                )
+
+                addSolid(context, second).withPosition(
+                    context.lUnit, context.aUnit,
+                    solid.resolvePosition(context.root),
+                    solid.resolveRotation(context.root),
+                    null
+                )
+
             }
         }
         else -> error("Renderer for $solid not supported yet")
-    }.apply(block)
+    }
 }
 
 
+private val solidsName = "solids".asName()
+
 private fun SolidGroup.addSolidWithCaching(
     context: GDMLTransformer,
     solid: GDMLSolid,
-    volume: GDMLVolume,
     name: String = solid.name
-) {
-    when (context.solidAction(solid)) {
+): Solid? {
+    return when (context.solidAction(solid)) {
         GDMLTransformer.Action.ACCEPT -> {
-            addSolid(context, solid, name) {
-                context.configureSolid(this, volume, solid)
-            }
+            addSolid(context, solid, name)
         }
         GDMLTransformer.Action.CACHE -> {
-            if (context.proto[solid.name] == null) {
-                context.proto.addSolid(context, solid, name) {
-                    context.configureSolid(this, volume, solid)
-                }
+            val fullName = solidsName + solid.name.asName()
+            if (context.proto[fullName] == null) {
+                val parent = (context.proto[solidsName] as? SolidGroup) ?: context.proto.group(solidsName)
+                parent.addSolid(context, solid, solid.name)
             }
-            ref(solid.name.asName(), name)
+            ref(fullName, name)
         }
         GDMLTransformer.Action.REJECT -> {
             //ignore
+            null
         }
     }
-
 }
 
 private val volumesName = "volumes".asName()
@@ -268,31 +267,20 @@ private fun SolidGroup.addPhysicalVolume(
         ?: error("Volume with ref ${physVolume.volumeref.ref} could not be resolved")
 
     // a special case for single solid volume
-//    if (volume is GDMLVolume && volume.physVolumes.isEmpty() && volume.placement == null) {
-//        val solid = volume.solidref.resolve(context.root)
-//            ?: error("Solid with tag ${volume.solidref.ref} for volume ${volume.name} not defined")
-//        addSolidWithCaching(context, solid, volume, physVolume.name ?: "").apply {
-//            withPosition(
-//                context.lUnit,
-//                physVolume.resolvePosition(context.root),
-//                physVolume.resolveRotation(context.root),
-//                physVolume.resolveScale(context.root)
-//            )
-//        }
-//        return
-//    }
+    if (volume is GDMLVolume && volume.physVolumes.isEmpty() && volume.placement == null) {
+        val solid = volume.solidref.resolve(context.root)
+            ?: error("Solid with tag ${volume.solidref.ref} for volume ${volume.name} not defined")
+        addSolidWithCaching(context, solid, physVolume.name ?: "")?.apply {
+            context.configureSolid(this, volume, solid)
+            withPosition(context, physVolume)
+        }
+        return
+    }
 
     when (context.volumeAction(volume)) {
         GDMLTransformer.Action.ACCEPT -> {
             val group: SolidGroup = volume(context, volume)
-            this[physVolume.name ?: ""] = group.apply {
-                withPosition(
-                    context.lUnit,
-                    physVolume.resolvePosition(context.root),
-                    physVolume.resolveRotation(context.root),
-                    physVolume.resolveScale(context.root)
-                )
-            }
+            this[physVolume.name ?: ""] = group.withPosition(context, physVolume)
         }
         GDMLTransformer.Action.CACHE -> {
             val fullName = volumesName + volume.name.asName()
@@ -300,14 +288,7 @@ private fun SolidGroup.addPhysicalVolume(
                 context.proto[fullName] = volume(context, volume)
             }
 
-            this[physVolume.name ?: ""] = Proxy(this, fullName).apply {
-                withPosition(
-                    context.lUnit,
-                    physVolume.resolvePosition(context.root),
-                    physVolume.resolveRotation(context.root),
-                    physVolume.resolveScale(context.root)
-                )
-            }
+            this[physVolume.name ?: ""] = Proxy(this, fullName).withPosition(context, physVolume)
         }
         GDMLTransformer.Action.REJECT -> {
             //ignore
@@ -326,8 +307,6 @@ private fun SolidGroup.addDivisionVolume(
     set(Name.EMPTY, volume(context, volume))
 }
 
-//private val solidsName = "solids".asName()
-
 private fun volume(
     context: GDMLTransformer,
     group: GDMLGroup
@@ -336,7 +315,9 @@ private fun volume(
         val solid: GDMLSolid = group.solidref.resolve(context.root)
             ?: error("Solid with tag ${group.solidref.ref} for volume ${group.name} not defined")
 
-        addSolidWithCaching(context, solid, group)
+        addSolidWithCaching(context, solid)?.apply {
+            context.configureSolid(this, group, solid)
+        }
 
         when (val vol: GDMLPlacement? = group.placement) {
             is GDMLPhysVolume -> addPhysicalVolume(context, vol)
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
index 85d122c8..bf2369a7 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
@@ -5,7 +5,6 @@ package hep.dataforge.vision.solid
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.names.*
-import hep.dataforge.values.asValue
 import hep.dataforge.vision.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -13,36 +12,8 @@ import kotlinx.serialization.Transient
 import kotlinx.serialization.UseSerializers
 import kotlin.collections.set
 
-
-class AbstractProxy
-
-/**
- * A proxy [Solid] to reuse a template object
- */
-@Serializable
-@SerialName("solid.proxy")
-class Proxy private constructor(
-    val templateName: Name
-) : AbstractVision(), VisionGroup, Solid {
-
-    constructor(parent: SolidGroup, templateName: Name) : this(templateName) {
-        this.parent = parent
-    }
-
-    override var position: Point3D? = null
-    override var rotation: Point3D? = null
-    override var scale: Point3D? = null
-
-    override var properties: Config? = null
-
-    /**
-     * Recursively search for defined template in the parent
-     */
-    val prototype: Solid
-        get() = (parent as? SolidGroup)?.getPrototype(templateName)
-            ?: error("Prototype with name $templateName not found in $parent")
-
-    override val styleSheet: StyleSheet get() = parent?.styleSheet ?: StyleSheet(this)
+abstract class AbstractProxy : AbstractVision(), VisionGroup {
+    abstract val prototype: Vision
 
     override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? {
         return if (inherit) {
@@ -61,24 +32,11 @@ class Proxy private constructor(
         }
     }
 
-    override val children: Map<NameToken, ProxyChild>
-        get() = (prototype as? VisionGroup)?.children
-            ?.filter { !it.key.toString().startsWith("@") }
-            ?.mapValues {
-                ProxyChild(it.key.asName())
-            } ?: emptyMap()
-
-    @Transient
-    private val propertyCache: HashMap<Name, Config> = HashMap()
-
-    fun childPropertyName(childName: Name, propertyName: Name): Name {
-        return NameToken(PROXY_CHILD_PROPERTY_PREFIX, childName.toString()) + propertyName
-    }
-
-    private fun prototypeFor(name: Name): Vision {
-        return (prototype as? VisionGroup)?.get(name)
-            ?: error("Prototype with name $name not found in $this")
-    }
+    override var styles: List<String>
+        get() = properties[Vision.STYLE_KEY].stringList + prototype.styles
+        set(value) {
+            config[Vision.STYLE_KEY] = value
+        }
 
     override fun getAllProperties(): Laminate =
         Laminate(properties, allStyles, prototype.getAllProperties(), parent?.getAllProperties())
@@ -87,29 +45,77 @@ class Proxy private constructor(
         //do nothing
     }
 
+    override val descriptor: NodeDescriptor? get() = prototype.descriptor
+}
+
+/**
+ * A proxy [Solid] to reuse a template object
+ */
+@Serializable
+@SerialName("solid.proxy")
+class Proxy private constructor(
+    val templateName: Name
+) : AbstractProxy(), Solid {
+
+    constructor(parent: SolidGroup, templateName: Name) : this(templateName) {
+        this.parent = parent
+    }
+
+    override var position: Point3D? = null
+    override var rotation: Point3D? = null
+    override var scale: Point3D? = null
+
+    override var properties: Config? = null
+
+    /**
+     * Recursively search for defined template in the parent
+     */
+    override val prototype: Solid
+        get() = (parent as? SolidGroup)?.getPrototype(templateName)
+            ?: error("Prototype with name $templateName not found in $parent")
+
+    override val styleSheet: StyleSheet get() = parent?.styleSheet ?: StyleSheet(this)
+
+    @Transient
+    private val propertyCache: HashMap<Name, Config> = HashMap()
+
+
+    override val children: Map<NameToken, Proxy.ProxyChild>
+        get() = (prototype as? VisionGroup)?.children
+            ?.filter { !it.key.toString().startsWith("@") }
+            ?.mapValues {
+                ProxyChild(it.key.asName())
+            } ?: emptyMap()
+
+    private fun childPropertyName(childName: Name, propertyName: Name): Name {
+        return NameToken(PROXY_CHILD_PROPERTY_PREFIX, childName.toString()) + propertyName
+    }
+
+    private fun prototypeFor(name: Name): Vision {
+        return (prototype as? VisionGroup)?.get(name)
+            ?: error("Prototype with name $name not found in $this")
+    }
+
+    override val descriptor: NodeDescriptor? get() = prototype.descriptor
+
     //override fun findAllStyles(): Laminate = Laminate((styles + prototype.styles).mapNotNull { findStyle(it) })
 
-    override var styles: List<String>
-        get() = properties[Vision.STYLE_KEY].stringList + prototype.styles
-        set(value) {
-            setItem(Vision.STYLE_KEY, value.map { it.asValue() }.asValue())
-        }
+    /**
+     * A ProxyChild is created temporarily only to interact with properties, it does not store any values
+     * (properties are stored in external cache) and created and destroyed on-demand).
+     */
+    inner class ProxyChild(val name: Name) : AbstractProxy() {
 
-    override val descriptor: NodeDescriptor?
-        get() = prototype.descriptor
-
-    inner class ProxyChild(val name: Name) : AbstractVision(), VisionGroup {
-
-        val prototype: Vision get() = prototypeFor(name)
+        override val prototype: Vision get() = prototypeFor(name)
 
         override val styleSheet: StyleSheet get() = this@Proxy.styleSheet
 
         override val children: Map<NameToken, Vision>
-            get() = (prototype as? VisionGroup)?.children?.mapValues { (key, _) ->
-                ProxyChild(
-                    name + key.asName()
-                )
-            } ?: emptyMap()
+            get() = (prototype as? VisionGroup)?.children
+                ?.filter { !it.key.toString().startsWith("@") }
+                ?.mapValues { (key, _) ->
+                    ProxyChild(name + key.asName())
+                } ?: emptyMap()
 
         override var properties: Config?
             get() = propertyCache[name]
@@ -128,39 +134,6 @@ class Proxy private constructor(
                 }
             }
 
-        override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? {
-            return if (inherit) {
-                sequence {
-                    yield(properties?.get(name))
-                    yieldAll(getStyleItems(name))
-                    yield(prototype.getItem(name))
-                    yield(parent?.getProperty(name, inherit))
-                }.merge()
-            } else {
-                sequence {
-                    yield(properties?.get(name))
-                    yieldAll(getStyleItems(name))
-                    yield(prototype.getProperty(name, false))
-                }.merge()
-            }
-        }
-
-        override fun attachChildren() {
-            //do nothing
-        }
-
-        override fun getAllProperties(): Laminate =
-            Laminate(properties, allStyles, prototype.getAllProperties(), parent?.getAllProperties())
-
-
-        override var styles: List<String>
-            get() = properties[Vision.STYLE_KEY].stringList + prototype.styles
-            set(value) {
-                setItem(Vision.STYLE_KEY, value.map { it.asValue() }.asValue())
-            }
-
-        override val descriptor: NodeDescriptor?
-            get() = prototype.descriptor
     }
 
     companion object {
@@ -170,8 +143,7 @@ class Proxy private constructor(
 
 val Vision.prototype: Vision
     get() = when (this) {
-        is Proxy -> prototype
-        is Proxy.ProxyChild -> prototype
+        is AbstractProxy -> prototype
         else -> this
     }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index e7f17c9b..83e2deff 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -99,13 +99,14 @@ fun SolidGroup(block: SolidGroup.() -> Unit): SolidGroup {
 tailrec fun PrototypeHolder.getPrototype(name: Name): Solid? =
     prototypes?.get(name) as? Solid ?: (parent as? PrototypeHolder)?.getPrototype(name)
 
+fun MutableVisionGroup.group(name: Name = Name.EMPTY, action: SolidGroup.() -> Unit = {}): SolidGroup =
+    SolidGroup().apply(action).also { set(name, it) }
+
 /**
  * Define a group with given [name], attach it to this parent and return it.
  */
-fun MutableVisionGroup.group(name: String = "", action: SolidGroup.() -> Unit = {}): SolidGroup =
-    SolidGroup().apply(action).also {
-        set(name, it)
-    }
+fun MutableVisionGroup.group(name: String, action: SolidGroup.() -> Unit = {}): SolidGroup =
+    SolidGroup().apply(action).also { set(name, it) }
 
 /**
  * A special class which works as a holder for prototypes
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
index eb7192c0..ac153ab5 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
@@ -35,19 +35,11 @@ abstract class MeshThreeFactory<in T : Solid>(
 
         //val meshMeta: Meta = obj.properties[Material3D.MATERIAL_KEY]?.node ?: Meta.empty
 
-        val mesh = Mesh(geometry, getMaterial(obj, true)).apply {
+        val mesh = Mesh(geometry, null).apply{
             matrixAutoUpdate = false
-            applyEdges(obj)
-            applyWireFrame(obj)
-
             //set position for mesh
             updatePosition(obj)
-
-            layers.enable(obj.layer)
-            children.forEach {
-                it.layers.enable(obj.layer)
-            }
-        }
+        }.applyProperties(obj)
 
         //add listener to object properties
         obj.onPropertyChange(this) { name ->
@@ -79,6 +71,16 @@ abstract class MeshThreeFactory<in T : Solid>(
     }
 }
 
+fun Mesh.applyProperties(obj: Solid): Mesh = apply{
+    material = getMaterial(obj, true)
+    applyEdges(obj)
+    applyWireFrame(obj)
+    layers.enable(obj.layer)
+    children.forEach {
+        it.layers.enable(obj.layer)
+    }
+}
+
 fun Mesh.applyEdges(obj: Solid) {
     val edges = children.find { it.name == "@edges" } as? LineSegments
     //inherited edges definition, enabled by default
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
index 8b83ef16..c432fbd3 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
@@ -41,18 +41,6 @@ fun Object3D.updatePosition(obj: Vision) {
     }
 }
 
-///**
-// * Unsafe invocation of a factory
-// */
-//operator fun <T : VisualObject3D> ThreeFactory<T>.invoke(obj: Any): Object3D {
-//    if (type.isInstance(obj)) {
-//        @Suppress("UNCHECKED_CAST")
-//        return invoke(obj as T)
-//    } else {
-//        error("The object of type ${obj::class} could not be rendered by this factory")
-//    }
-//}
-
 /**
  * Update non-position non-geometry property
  */
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
index 2fd83dfa..9063a968 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
@@ -4,7 +4,6 @@ import hep.dataforge.names.toName
 import hep.dataforge.vision.solid.Proxy
 import hep.dataforge.vision.solid.Proxy.Companion.PROXY_CHILD_PROPERTY_PREFIX
 import hep.dataforge.vision.solid.Solid
-import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.objects.Mesh
 import kotlin.reflect.KClass
@@ -14,16 +13,16 @@ class ThreeProxyFactory(val three: ThreePlugin) : ThreeFactory<Proxy> {
 
     override val type: KClass<Proxy> = Proxy::class
 
-    private fun Object3D.replicate(): Object3D {
-        return when (this) {
-            is Mesh -> Mesh(geometry as BufferGeometry, material)
-            else -> clone(false)
-        }.also { obj: Object3D ->
-            children.forEach { child: Object3D ->
-                obj.add(child.replicate())
-            }
-        }
-    }
+//    private fun Object3D.replicate(): Object3D {
+//        return when (this) {
+//            is Mesh -> Mesh(geometry as BufferGeometry, material)
+//            else -> clone(false)
+//        }.also { obj: Object3D ->
+//            children.forEach { child: Object3D ->
+//                obj.add(child.replicate())
+//            }
+//        }
+//    }
 
     override fun invoke(obj: Proxy): Object3D {
         val template = obj.prototype
@@ -31,10 +30,13 @@ class ThreeProxyFactory(val three: ThreePlugin) : ThreeFactory<Proxy> {
             three.buildObject3D(template)
         }
 
-        val object3D: Object3D = cachedObject.replicate()
-
+        val object3D: Object3D = cachedObject.clone()//cachedObject.replicate()
         object3D.updatePosition(obj)
 
+        if(object3D is Mesh){
+            object3D.applyProperties(obj)
+        }
+
         obj.onPropertyChange(this) { name ->
             if (name.first()?.body == PROXY_CHILD_PROPERTY_PREFIX) {
                 val childName = name.first()?.index?.toName() ?: error("Wrong syntax for proxy child property: '$name'")
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/outputConfig.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/outputConfig.kt
index fe01bba8..2956f8cc 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/outputConfig.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/outputConfig.kt
@@ -1,6 +1,7 @@
 package hep.dataforge.vision.solid.three
 
 import hep.dataforge.js.requireJS
+import hep.dataforge.meta.DFExperimental
 import hep.dataforge.vision.bootstrap.accordion
 import hep.dataforge.vision.bootstrap.entry
 import hep.dataforge.vision.solid.SolidGroup
@@ -31,6 +32,7 @@ private fun saveData(event: Event, fileName: String, mimeType: String = "text/pl
     fileSaver.saveAs(blob, fileName)
 }
 
+@OptIn(DFExperimental::class)
 fun RBuilder.canvasControls(canvas: ThreeCanvas) = accordion("controls") {
     entry("Settings") {
         div("row") {
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Mesh.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Mesh.kt
index 6c5b4555..78dcb9f6 100644
--- a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Mesh.kt
+++ b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Mesh.kt
@@ -33,8 +33,8 @@ import info.laht.threekt.materials.Material
 
 open external class Mesh : Object3D {
 
-    constructor(geometry: Geometry, material: Material)
-    constructor(geometry: BufferGeometry, material: Material)
+    constructor(geometry: Geometry?, material: Material?)
+    constructor(geometry: BufferGeometry?, material: Material?)
 
     var geometry: dynamic
     var material: Material

From 998afb1ce0c1b3a9b3f6bb75bc9351c3cd7c9bfc Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 26 Aug 2020 22:54:26 +0300
Subject: [PATCH 005/151] replicate mesh

---
 demo/gdml/build.gradle.kts                    |  1 +
 .../vision/gdml/demo/GDMLAppComponent.kt      |  1 -
 .../dataforge/vision/gdml/GDMLTransformer.kt  | 24 ++++++++++++++----
 .../vision/solid/three/ThreeProxyFactory.kt   | 25 +++++++++++--------
 4 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/demo/gdml/build.gradle.kts b/demo/gdml/build.gradle.kts
index 8d5342c3..1ae0ffd9 100644
--- a/demo/gdml/build.gradle.kts
+++ b/demo/gdml/build.gradle.kts
@@ -1,5 +1,6 @@
 import scientifik.DependencyConfiguration
 import scientifik.FXModule
+import scientifik.useFx
 
 plugins {
     id("scientifik.mpp")
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index ae1dce60..99d4bc59 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -67,7 +67,6 @@ val GDMLApp = component<GDMLAppProps> { props ->
                 error("File extension is not recognized: $name")
             }
         }
-        parsedVision.config["edges.enabled"] = false
 
         vision = parsedVision
     }
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
index ad48480b..299a9b16 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
@@ -2,6 +2,7 @@ package hep.dataforge.vision.gdml
 
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.MetaBuilder
+import hep.dataforge.meta.set
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
@@ -15,6 +16,9 @@ import kotlin.math.cos
 import kotlin.math.sin
 import kotlin.random.Random
 
+private val solidsName = "solids".asName()
+private val volumesName = "volumes".asName()
+
 class GDMLTransformer(val root: GDML) {
     //private val materialCache = HashMap<GDMLMaterial, Meta>()
     private val random = Random(222)
@@ -35,6 +39,18 @@ class GDMLTransformer(val root: GDML) {
      * A special group for local templates
      */
     internal val proto by lazy { SolidGroup() }
+
+    internal val solids by lazy {
+        proto.group(solidsName) {
+            config["edges.enabled"] = false
+        }
+    }
+
+    internal val volumes by lazy {
+        proto.group(volumesName) {
+            config["edges.enabled"] = true
+        }
+    }
     private val styleCache = HashMap<Name, Meta>()
 
     var solidConfiguration: Solid.(parent: GDMLVolume, solid: GDMLSolid) -> Unit = { parent, _ ->
@@ -231,7 +247,7 @@ private fun SolidGroup.addSolid(
 }
 
 
-private val solidsName = "solids".asName()
+
 
 private fun SolidGroup.addSolidWithCaching(
     context: GDMLTransformer,
@@ -245,8 +261,7 @@ private fun SolidGroup.addSolidWithCaching(
         GDMLTransformer.Action.CACHE -> {
             val fullName = solidsName + solid.name.asName()
             if (context.proto[fullName] == null) {
-                val parent = (context.proto[solidsName] as? SolidGroup) ?: context.proto.group(solidsName)
-                parent.addSolid(context, solid, solid.name)
+                context.solids.addSolid(context, solid, solid.name)
             }
             ref(fullName, name)
         }
@@ -257,7 +272,6 @@ private fun SolidGroup.addSolidWithCaching(
     }
 }
 
-private val volumesName = "volumes".asName()
 
 private fun SolidGroup.addPhysicalVolume(
     context: GDMLTransformer,
@@ -288,7 +302,7 @@ private fun SolidGroup.addPhysicalVolume(
                 context.proto[fullName] = volume(context, volume)
             }
 
-            this[physVolume.name ?: ""] = Proxy(this, fullName).withPosition(context, physVolume)
+            ref(fullName,physVolume.name ?: "").withPosition(context, physVolume)
         }
         GDMLTransformer.Action.REJECT -> {
             //ignore
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
index 9063a968..2ceb75aa 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
@@ -4,6 +4,7 @@ import hep.dataforge.names.toName
 import hep.dataforge.vision.solid.Proxy
 import hep.dataforge.vision.solid.Proxy.Companion.PROXY_CHILD_PROPERTY_PREFIX
 import hep.dataforge.vision.solid.Solid
+import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.objects.Mesh
 import kotlin.reflect.KClass
@@ -13,16 +14,18 @@ class ThreeProxyFactory(val three: ThreePlugin) : ThreeFactory<Proxy> {
 
     override val type: KClass<Proxy> = Proxy::class
 
-//    private fun Object3D.replicate(): Object3D {
-//        return when (this) {
-//            is Mesh -> Mesh(geometry as BufferGeometry, material)
-//            else -> clone(false)
-//        }.also { obj: Object3D ->
-//            children.forEach { child: Object3D ->
-//                obj.add(child.replicate())
-//            }
-//        }
-//    }
+    private fun Object3D.replicate(): Object3D {
+        return when (this) {
+            is Mesh -> Mesh(geometry as BufferGeometry, material).also {
+                it.applyMatrix(matrix)
+            }
+            else -> clone(false)
+        }.also { obj: Object3D ->
+            children.forEach { child: Object3D ->
+                obj.add(child.replicate())
+            }
+        }
+    }
 
     override fun invoke(obj: Proxy): Object3D {
         val template = obj.prototype
@@ -30,7 +33,7 @@ class ThreeProxyFactory(val three: ThreePlugin) : ThreeFactory<Proxy> {
             three.buildObject3D(template)
         }
 
-        val object3D: Object3D = cachedObject.clone()//cachedObject.replicate()
+        val object3D: Object3D = cachedObject.replicate()
         object3D.updatePosition(obj)
 
         if(object3D is Mesh){

From ea82082304d46fb560b3cc529e376e0b2d26d7aa Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 26 Aug 2020 23:00:21 +0300
Subject: [PATCH 006/151] Add edges to transparent objects. remove unnecessary
 re-configuration

---
 .../vision/gdml/demo/GDMLAppComponent.kt      |  2 +-
 .../vision/gdml/demo/GdmlJsDemoApp.kt         | 14 +----------
 .../dataforge/vision/gdml/demo/readFile.kt    | 24 +++++++++----------
 .../dataforge/vision/gdml/GDMLTransformer.kt  |  5 ++--
 4 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index 99d4bc59..9cd2c2bd 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -59,7 +59,7 @@ val GDMLApp = component<GDMLAppProps> { props ->
         val parsedVision = when {
             name.endsWith(".gdml") || name.endsWith(".xml") -> {
                 val gdml = GDML.parse(data)
-                gdml.toVision(gdmlConfiguration)
+                gdml.toVision()
             }
             name.endsWith(".json") -> SolidGroup.parseJson(data)
             else -> {
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
index 40d35a09..fc0478f0 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
@@ -14,18 +14,6 @@ import styled.injectGlobal
 import kotlin.browser.document
 
 
-val gdmlConfiguration: GDMLTransformer.() -> Unit = {
-    lUnit = LUnit.CM
-
-    solidConfiguration = { parent, _ ->
-        if (parent.physVolumes.isNotEmpty()) {
-            useStyle("opaque") {
-                MATERIAL_OPACITY_KEY put 0.3
-            }
-        }
-    }
-}
-
 private class GDMLDemoApp : Application {
 
     override fun start(state: Map<String, Any>) {
@@ -46,7 +34,7 @@ private class GDMLDemoApp : Application {
             child(GDMLApp) {
                 attrs {
                     this.context = context
-                    this.rootObject = cubes().toVision(gdmlConfiguration)
+                    this.rootObject = cubes().toVision()
                 }
             }
         }
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
index c0fcd2ed..355d6f98 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
@@ -18,18 +18,18 @@ import java.util.zip.ZipInputStream
 fun SolidManager.Companion.readFile(file: File): SolidGroup = when {
     file.extension == "gdml" || file.extension == "xml" -> {
         GDML.readFile(file.toPath()).toVision {
-            lUnit = LUnit.CM
-
-            solidConfiguration = { parent, solid ->
-                if (solid.name == "cave") {
-                    setItem(SolidMaterial.MATERIAL_WIREFRAME_KEY, true.asValue())
-                }
-                if (parent.physVolumes.isNotEmpty()) {
-                    useStyle("opaque") {
-                        SolidMaterial.MATERIAL_OPACITY_KEY put 0.3
-                    }
-                }
-            }
+//            lUnit = LUnit.CM
+//
+//            solidConfiguration = { parent, solid ->
+//                if (solid.name == "cave") {
+//                    setItem(SolidMaterial.MATERIAL_WIREFRAME_KEY, true.asValue())
+//                }
+//                if (parent.physVolumes.isNotEmpty()) {
+//                    useStyle("opaque") {
+//                        SolidMaterial.MATERIAL_OPACITY_KEY put 0.3
+//                    }
+//                }
+//            }
         }
     }
     file.extension == "json" -> SolidGroup.parseJson(file.readText())
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
index 299a9b16..df14eb40 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
@@ -47,9 +47,7 @@ class GDMLTransformer(val root: GDML) {
     }
 
     internal val volumes by lazy {
-        proto.group(volumesName) {
-            config["edges.enabled"] = true
-        }
+        proto.group(volumesName)
     }
     private val styleCache = HashMap<Name, Meta>()
 
@@ -58,6 +56,7 @@ class GDMLTransformer(val root: GDML) {
         if (parent.physVolumes.isNotEmpty()) {
             useStyle("opaque") {
                 SolidMaterial.MATERIAL_OPACITY_KEY put 0.3
+                "edges.enabled" put true
             }
         }
     }

From 68cf4748d8e8aca5b2110263617322ecc933803d Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 27 Aug 2020 11:10:28 +0300
Subject: [PATCH 007/151] Fix name replication

---
 .../dataforge/vision/gdml/GDMLTransformer.kt  | 33 +++++++++++--------
 .../vision/solid/three/ThreeProxyFactory.kt   |  3 +-
 .../info/laht/threekt/core/BufferGeometry.kt  |  2 +-
 .../kotlin/info/laht/threekt/core/Geometry.kt |  2 +-
 .../kotlin/info/laht/threekt/core/Object3D.kt |  2 +-
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
index df14eb40..94749b45 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
@@ -24,16 +24,16 @@ class GDMLTransformer(val root: GDML) {
     private val random = Random(222)
 
     enum class Action {
-        ACCEPT,
+        ADD,
         REJECT,
-        CACHE
+        PROTOTYPE
     }
 
     var lUnit: LUnit = LUnit.MM
     var aUnit: AUnit = AUnit.RADIAN
 
-    var solidAction: (GDMLSolid) -> Action = { Action.CACHE }
-    var volumeAction: (GDMLGroup) -> Action = { Action.CACHE }
+    var solidAction: (GDMLSolid) -> Action = { Action.PROTOTYPE }
+    var volumeAction: (GDMLGroup) -> Action = { Action.PROTOTYPE }
 
     /**
      * A special group for local templates
@@ -49,6 +49,15 @@ class GDMLTransformer(val root: GDML) {
     internal val volumes by lazy {
         proto.group(volumesName)
     }
+
+//    fun proxySolid(group: SolidGroup, solid: GDMLSolid, name: String): Proxy {
+//        val fullName = solidsName + name
+//        if (proto[fullName] == null) {
+//            solids.addSolid(this, solid, name)
+//        }
+//        return group.ref(fullName, name)
+//    }
+
     private val styleCache = HashMap<Name, Meta>()
 
     var solidConfiguration: Solid.(parent: GDMLVolume, solid: GDMLSolid) -> Unit = { parent, _ ->
@@ -245,19 +254,17 @@ private fun SolidGroup.addSolid(
     }
 }
 
-
-
-
 private fun SolidGroup.addSolidWithCaching(
     context: GDMLTransformer,
     solid: GDMLSolid,
     name: String = solid.name
 ): Solid? {
     return when (context.solidAction(solid)) {
-        GDMLTransformer.Action.ACCEPT -> {
+        GDMLTransformer.Action.ADD -> {
             addSolid(context, solid, name)
         }
-        GDMLTransformer.Action.CACHE -> {
+        GDMLTransformer.Action.PROTOTYPE -> {
+//            context.proxySolid(this, solid, name)
             val fullName = solidsName + solid.name.asName()
             if (context.proto[fullName] == null) {
                 context.solids.addSolid(context, solid, solid.name)
@@ -271,7 +278,6 @@ private fun SolidGroup.addSolidWithCaching(
     }
 }
 
-
 private fun SolidGroup.addPhysicalVolume(
     context: GDMLTransformer,
     physVolume: GDMLPhysVolume
@@ -291,17 +297,16 @@ private fun SolidGroup.addPhysicalVolume(
     }
 
     when (context.volumeAction(volume)) {
-        GDMLTransformer.Action.ACCEPT -> {
+        GDMLTransformer.Action.ADD -> {
             val group: SolidGroup = volume(context, volume)
             this[physVolume.name ?: ""] = group.withPosition(context, physVolume)
         }
-        GDMLTransformer.Action.CACHE -> {
+        GDMLTransformer.Action.PROTOTYPE -> {
             val fullName = volumesName + volume.name.asName()
             if (context.proto[fullName] == null) {
                 context.proto[fullName] = volume(context, volume)
             }
-
-            ref(fullName,physVolume.name ?: "").withPosition(context, physVolume)
+            ref(fullName, physVolume.name ?: "").withPosition(context, physVolume)
         }
         GDMLTransformer.Action.REJECT -> {
             //ignore
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
index 2ceb75aa..832dd32d 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
@@ -17,10 +17,11 @@ class ThreeProxyFactory(val three: ThreePlugin) : ThreeFactory<Proxy> {
     private fun Object3D.replicate(): Object3D {
         return when (this) {
             is Mesh -> Mesh(geometry as BufferGeometry, material).also {
-                it.applyMatrix(matrix)
+                it.applyMatrix4(matrix)
             }
             else -> clone(false)
         }.also { obj: Object3D ->
+            obj.name = this.name
             children.forEach { child: Object3D ->
                 obj.add(child.replicate())
             }
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/BufferGeometry.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/BufferGeometry.kt
index a4219aeb..c3fd093b 100644
--- a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/BufferGeometry.kt
+++ b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/BufferGeometry.kt
@@ -99,7 +99,7 @@ open external class BufferGeometry {
     fun merge(bufferGeometry: BufferGeometry, offset: Int = definedExternally): BufferGeometry
 
 
-    fun applyMatrix(matrix: Matrix4)
+    fun applyMatrix4(matrix: Matrix4)
     fun lookAt(vector: Vector3): BufferGeometry
     fun rotateX(radians: Double): BufferGeometry
     fun rotateY(radians: Double): BufferGeometry
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Geometry.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Geometry.kt
index 518cc6d6..522ab07c 100644
--- a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Geometry.kt
+++ b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Geometry.kt
@@ -70,7 +70,7 @@ open external class Geometry {
     var lineDistancesNeedUpdate: Boolean
     var groupsNeedUpdate: Boolean
 
-    fun applyMatrix(matrix: Matrix4): Geometry
+    fun applyMatrix4(matrix: Matrix4): Geometry
     fun rotateX(angle: Number): Geometry
     fun rotateY(angle: Number): Geometry
     fun rotateZ(angle: Number): Geometry
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Object3D.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Object3D.kt
index be7a95d5..e49add5e 100644
--- a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Object3D.kt
+++ b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Object3D.kt
@@ -165,7 +165,7 @@ open external class Object3D {
     /**
      * Applies the matrix transform to the object and updates the object's position, rotation and scale.
      */
-    fun applyMatrix(matrix: Matrix4)
+    fun applyMatrix4(matrix: Matrix4)
 
     /**
      * Applies the rotation represented by the quaternion to the object.

From c83a25b0a1dcc61a25f3d06c68ae9c526a216033 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 27 Aug 2020 14:29:50 +0300
Subject: [PATCH 008/151] GDML converter refactoring

---
 .../dataforge/vision/gdml/GDMLTransformer.kt  | 516 +++++++++---------
 .../dataforge/vision/gdml/GdmlOptimizer.kt    | 134 ++---
 2 files changed, 332 insertions(+), 318 deletions(-)

diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
index 94749b45..ceecd768 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
@@ -7,6 +7,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
 import hep.dataforge.names.toName
+import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.set
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
@@ -19,7 +20,7 @@ import kotlin.random.Random
 private val solidsName = "solids".asName()
 private val volumesName = "volumes".asName()
 
-class GDMLTransformer(val root: GDML) {
+class GDMLTransformer internal constructor(val root: GDML) {
     //private val materialCache = HashMap<GDMLMaterial, Meta>()
     private val random = Random(222)
 
@@ -38,25 +39,35 @@ class GDMLTransformer(val root: GDML) {
     /**
      * A special group for local templates
      */
-    internal val proto by lazy { SolidGroup() }
+    private val proto by lazy { SolidGroup() }
 
-    internal val solids by lazy {
+    private val solids by lazy {
         proto.group(solidsName) {
             config["edges.enabled"] = false
         }
     }
 
-    internal val volumes by lazy {
-        proto.group(volumesName)
+    private val referenceStore = HashMap<Name, MutableList<Proxy>>()
+
+    private fun proxySolid(group: SolidGroup, solid: GDMLSolid, name: String): Proxy {
+        val templateName = solidsName + name
+        if (proto[templateName] == null) {
+            solids.addSolid(solid, name)
+        }
+        val ref = group.ref(templateName, name)
+        referenceStore.getOrPut(templateName) { ArrayList() }.add(ref)
+        return ref
     }
 
-//    fun proxySolid(group: SolidGroup, solid: GDMLSolid, name: String): Proxy {
-//        val fullName = solidsName + name
-//        if (proto[fullName] == null) {
-//            solids.addSolid(this, solid, name)
-//        }
-//        return group.ref(fullName, name)
-//    }
+    private fun proxyVolume(group: SolidGroup, physVolume: GDMLPhysVolume, volume: GDMLGroup): Proxy {
+        val templateName = volumesName + volume.name.asName()
+        if (proto[templateName] == null) {
+            proto[templateName] = volume(volume)
+        }
+        val ref = group.ref(templateName, physVolume.name ?: "").withPosition(physVolume)
+        referenceStore.getOrPut(templateName) { ArrayList() }.add(ref)
+        return ref
+    }
 
     private val styleCache = HashMap<Name, Meta>()
 
@@ -70,14 +81,14 @@ class GDMLTransformer(val root: GDML) {
         }
     }
 
-    fun Solid.useStyle(name: String, builder: MetaBuilder.() -> Unit) {
+    private fun Solid.useStyle(name: String, builder: MetaBuilder.() -> Unit) {
         styleCache.getOrPut(name.toName()) {
             Meta(builder)
         }
         useStyle(name)
     }
 
-    internal fun configureSolid(obj: Solid, parent: GDMLVolume, solid: GDMLSolid) {
+    private fun configureSolid(obj: Solid, parent: GDMLVolume, solid: GDMLSolid) {
         val material = parent.materialref.resolve(root) ?: GDMLElement(parent.materialref.ref)
 
         val styleName = "material[${material.name}]"
@@ -92,8 +103,244 @@ class GDMLTransformer(val root: GDML) {
 
     var onFinish: GDMLTransformer.() -> Unit = {}
 
-    internal fun finalize(final: SolidGroup): SolidGroup {
+
+    private fun <T : Solid> T.withPosition(
+        newPos: GDMLPosition? = null,
+        newRotation: GDMLRotation? = null,
+        newScale: GDMLScale? = null
+    ): T = apply {
+        newPos?.let {
+            val point = Point3D(it.x(lUnit), it.y(lUnit), it.z(lUnit))
+            if (position != null || point != World.ZERO) {
+                position = point
+            }
+        }
+        newRotation?.let {
+            val point = Point3D(it.x(aUnit), it.y(aUnit), it.z(aUnit))
+            if (rotation != null || point != World.ZERO) {
+                rotation = point
+            }
+            //this@withPosition.rotationOrder = RotationOrder.ZXY
+        }
+        newScale?.let {
+            val point = Point3D(it.x, it.y, it.z)
+            if (scale != null || point != World.ONE) {
+                scale = point
+            }
+        }
+        //TODO convert units if needed
+    }
+
+    private fun <T : Solid> T.withPosition(physVolume: GDMLPhysVolume): T = withPosition(
+        physVolume.resolvePosition(root),
+        physVolume.resolveRotation(root),
+        physVolume.resolveScale(root)
+    )
+
+    @Suppress("NOTHING_TO_INLINE")
+    private inline operator fun Number.times(d: Double) = toDouble() * d
+
+    @Suppress("NOTHING_TO_INLINE")
+    private inline operator fun Number.times(f: Float) = toFloat() * f
+
+    private fun SolidGroup.addSolid(
+        solid: GDMLSolid,
+        name: String = ""
+    ): Solid {
+        //context.solidAdded(solid)
+        val lScale = solid.lscale(lUnit)
+        val aScale = solid.ascale()
+        return when (solid) {
+            is GDMLBox -> box(solid.x * lScale, solid.y * lScale, solid.z * lScale, name)
+            is GDMLTube -> tube(
+                solid.rmax * lScale,
+                solid.z * lScale,
+                solid.rmin * lScale,
+                solid.startphi * aScale,
+                solid.deltaphi * aScale,
+                name
+            )
+            is GDMLCone -> cone(solid.rmax1, solid.z, solid.rmax2, name = name) {
+                require(solid.rmin1 == 0.0) { "Empty cones are not supported" }
+                require(solid.rmin2 == 0.0) { "Empty cones are not supported" }
+                startAngle = solid.startphi.toFloat()
+                angle = solid.deltaphi.toFloat()
+            }
+            is GDMLXtru -> extrude(name) {
+                shape {
+                    solid.vertices.forEach {
+                        point(it.x * lScale, it.y * lScale)
+                    }
+                }
+                solid.sections.sortedBy { it.zOrder }.forEach { section ->
+                    layer(
+                        section.zPosition * lScale,
+                        section.xOffset * lScale,
+                        section.yOffset * lScale,
+                        section.scalingFactor
+                    )
+                }
+            }
+            is GDMLScaledSolid -> {
+                //Add solid with modified scale
+                val innerSolid: GDMLSolid = solid.solidref.resolve(root)
+                    ?: error("Solid with tag ${solid.solidref.ref} for scaled solid ${solid.name} not defined")
+
+                addSolid(innerSolid, name).apply {
+                    scaleX *= solid.scale.x.toFloat()
+                    scaleY *= solid.scale.y.toFloat()
+                    scaleZ = solid.scale.z.toFloat()
+                }
+            }
+            is GDMLSphere -> sphere(solid.rmax * lScale, solid.deltaphi * aScale, solid.deltatheta * aScale, name) {
+                phiStart = solid.startphi * aScale
+                thetaStart = solid.starttheta * aScale
+            }
+            is GDMLOrb -> sphere(solid.r * lScale, name = name)
+            is GDMLPolyhedra -> extrude(name) {
+                //getting the radius of first
+                require(solid.planes.size > 1) { "The polyhedron geometry requires at least two planes" }
+                val baseRadius = solid.planes.first().rmax * lScale
+                shape {
+                    (0..solid.numsides).forEach {
+                        val phi = solid.deltaphi * aScale / solid.numsides * it + solid.startphi * aScale
+                        (baseRadius * cos(phi) to baseRadius * sin(phi))
+                    }
+                }
+                solid.planes.forEach { plane ->
+                    //scaling all radii relative to first layer radius
+                    layer(plane.z * lScale, scale = plane.rmax * lScale / baseRadius)
+                }
+            }
+            is GDMLBoolSolid -> {
+                val first: GDMLSolid = solid.first.resolve(root) ?: error("")
+                val second: GDMLSolid = solid.second.resolve(root) ?: error("")
+                val type: CompositeType = when (solid) {
+                    is GDMLUnion -> CompositeType.UNION
+                    is GDMLSubtraction -> CompositeType.SUBTRACT
+                    is GDMLIntersection -> CompositeType.INTERSECT
+                }
+
+                return composite(type, name) {
+                    addSolid(first).withPosition(
+                        solid.resolveFirstPosition(root),
+                        solid.resolveFirstRotation(root),
+                        null
+                    )
+
+                    addSolid(second).withPosition(
+                        solid.resolvePosition(root),
+                        solid.resolveRotation(root),
+                        null
+                    )
+
+                }
+            }
+            else -> error("Renderer for $solid not supported yet")
+        }
+    }
+
+    private fun SolidGroup.addSolidWithCaching(
+        solid: GDMLSolid,
+        name: String = solid.name
+    ): Solid? {
+        return when (solidAction(solid)) {
+            Action.ADD -> {
+                addSolid(solid, name)
+            }
+            Action.PROTOTYPE -> {
+                proxySolid(this, solid, name)
+            }
+            Action.REJECT -> {
+                //ignore
+                null
+            }
+        }
+    }
+
+    private fun SolidGroup.addPhysicalVolume(
+        physVolume: GDMLPhysVolume
+    ) {
+        val volume: GDMLGroup = physVolume.volumeref.resolve(root)
+            ?: error("Volume with ref ${physVolume.volumeref.ref} could not be resolved")
+
+        // a special case for single solid volume
+        if (volume is GDMLVolume && volume.physVolumes.isEmpty() && volume.placement == null) {
+            val solid = volume.solidref.resolve(root)
+                ?: error("Solid with tag ${volume.solidref.ref} for volume ${volume.name} not defined")
+            addSolidWithCaching(solid, physVolume.name ?: "")?.apply {
+                configureSolid(this, volume, solid)
+                withPosition(physVolume)
+            }
+            return
+        }
+
+        when (volumeAction(volume)) {
+            Action.ADD -> {
+                val group: SolidGroup = volume(volume)
+                this[physVolume.name ?: ""] = group.withPosition(physVolume)
+            }
+            Action.PROTOTYPE -> {
+                proxyVolume(this, physVolume, volume)
+            }
+            Action.REJECT -> {
+                //ignore
+            }
+        }
+    }
+
+    private fun SolidGroup.addDivisionVolume(
+        divisionVolume: GDMLDivisionVolume
+    ) {
+        val volume: GDMLGroup = divisionVolume.volumeref.resolve(root)
+            ?: error("Volume with ref ${divisionVolume.volumeref.ref} could not be resolved")
+
+        //TODO add divisions
+        set(Name.EMPTY, volume(volume))
+    }
+
+    private fun volume(
+        group: GDMLGroup
+    ): SolidGroup = SolidGroup().apply {
+        if (group is GDMLVolume) {
+            val solid: GDMLSolid = group.solidref.resolve(root)
+                ?: error("Solid with tag ${group.solidref.ref} for volume ${group.name} not defined")
+
+            addSolidWithCaching(solid)?.apply {
+                configureSolid(this, group, solid)
+            }
+
+            when (val vol: GDMLPlacement? = group.placement) {
+                is GDMLPhysVolume -> addPhysicalVolume(vol)
+                is GDMLDivisionVolume -> addDivisionVolume(vol)
+            }
+        }
+
+        group.physVolumes.forEach { physVolume ->
+            addPhysicalVolume(physVolume)
+        }
+    }
+
+    private fun finalize(final: SolidGroup): SolidGroup {
         //final.prototypes = proto
+        final.useStyle("GDML") {
+            Solid.ROTATION_ORDER_KEY put RotationOrder.ZXY
+        }
+
+        //inline prototypes
+//        referenceStore.forEach { (protoName, list) ->
+//            val proxy = list.singleOrNull() ?: return@forEach
+//            val parent = proxy.parent as? MutableVisionGroup ?: return@forEach
+//            val token = parent.children.entries.find { it.value == proxy }?.key ?: error("Inconsistent reference cache")
+//            val prototype = proto[protoName] as? Solid ?:  error("Inconsistent reference cache")
+//            prototype.parent = null
+//            parent[token] = prototype
+//            prototype.updateFrom(proxy)
+//
+//            //FIXME update prototype
+//            proto[protoName] = null
+//        }
+
         final.prototypes {
             proto.children.forEach { (token, item) ->
                 item.parent = null
@@ -105,252 +352,19 @@ class GDMLTransformer(val root: GDML) {
                 define(it.key.toString(), it.value)
             }
         }
-        final.rotationOrder = RotationOrder.ZXY
         onFinish(this@GDMLTransformer)
         return final
     }
 
-}
-
-private fun Solid.withPosition(
-    lUnit: LUnit,
-    aUnit: AUnit = AUnit.RADIAN,
-    newPos: GDMLPosition? = null,
-    newRotation: GDMLRotation? = null,
-    newScale: GDMLScale? = null
-): Solid = apply {
-    newPos?.let {
-        val point = Point3D(it.x(lUnit), it.y(lUnit), it.z(lUnit))
-        if (position != null || point != World.ZERO) {
-            position = point
-        }
-    }
-    newRotation?.let {
-        val point = Point3D(it.x(aUnit), it.y(aUnit), it.z(aUnit))
-        if (rotation != null || point != World.ZERO) {
-            rotation = point
-        }
-        //this@withPosition.rotationOrder = RotationOrder.ZXY
-    }
-    newScale?.let {
-        val point = Point3D(it.x, it.y, it.z)
-        if (scale != null || point != World.ONE) {
-            scale = point
-        }
-    }
-    //TODO convert units if needed
-}
-
-private fun Solid.withPosition(context: GDMLTransformer, physVolume: GDMLPhysVolume) = withPosition(
-    context.lUnit, context.aUnit,
-    physVolume.resolvePosition(context.root),
-    physVolume.resolveRotation(context.root),
-    physVolume.resolveScale(context.root)
-)
-
-@Suppress("NOTHING_TO_INLINE")
-private inline operator fun Number.times(d: Double) = toDouble() * d
-
-@Suppress("NOTHING_TO_INLINE")
-private inline operator fun Number.times(f: Float) = toFloat() * f
-
-private fun SolidGroup.addSolid(
-    context: GDMLTransformer,
-    solid: GDMLSolid,
-    name: String = ""
-): Solid {
-    //context.solidAdded(solid)
-    val lScale = solid.lscale(context.lUnit)
-    val aScale = solid.ascale()
-    return when (solid) {
-        is GDMLBox -> box(solid.x * lScale, solid.y * lScale, solid.z * lScale, name)
-        is GDMLTube -> tube(
-            solid.rmax * lScale,
-            solid.z * lScale,
-            solid.rmin * lScale,
-            solid.startphi * aScale,
-            solid.deltaphi * aScale,
-            name
-        )
-        is GDMLCone -> cone(solid.rmax1, solid.z, solid.rmax2, name = name) {
-            require(solid.rmin1 == 0.0) { "Empty cones are not supported" }
-            require(solid.rmin2 == 0.0) { "Empty cones are not supported" }
-            startAngle = solid.startphi.toFloat()
-            angle = solid.deltaphi.toFloat()
-        }
-        is GDMLXtru -> extrude(name) {
-            shape {
-                solid.vertices.forEach {
-                    point(it.x * lScale, it.y * lScale)
-                }
-            }
-            solid.sections.sortedBy { it.zOrder }.forEach { section ->
-                layer(
-                    section.zPosition * lScale,
-                    section.xOffset * lScale,
-                    section.yOffset * lScale,
-                    section.scalingFactor
-                )
-            }
-        }
-        is GDMLScaledSolid -> {
-            //Add solid with modified scale
-            val innerSolid: GDMLSolid = solid.solidref.resolve(context.root)
-                ?: error("Solid with tag ${solid.solidref.ref} for scaled solid ${solid.name} not defined")
-
-            addSolid(context, innerSolid, name).apply {
-                scaleX *= solid.scale.x.toFloat()
-                scaleY *= solid.scale.y.toFloat()
-                scaleZ = solid.scale.z.toFloat()
-            }
-        }
-        is GDMLSphere -> sphere(solid.rmax * lScale, solid.deltaphi * aScale, solid.deltatheta * aScale, name) {
-            phiStart = solid.startphi * aScale
-            thetaStart = solid.starttheta * aScale
-        }
-        is GDMLOrb -> sphere(solid.r * lScale, name = name)
-        is GDMLPolyhedra -> extrude(name) {
-            //getting the radius of first
-            require(solid.planes.size > 1) { "The polyhedron geometry requires at least two planes" }
-            val baseRadius = solid.planes.first().rmax * lScale
-            shape {
-                (0..solid.numsides).forEach {
-                    val phi = solid.deltaphi * aScale / solid.numsides * it + solid.startphi * aScale
-                    (baseRadius * cos(phi) to baseRadius * sin(phi))
-                }
-            }
-            solid.planes.forEach { plane ->
-                //scaling all radii relative to first layer radius
-                layer(plane.z * lScale, scale = plane.rmax * lScale / baseRadius)
-            }
-        }
-        is GDMLBoolSolid -> {
-            val first: GDMLSolid = solid.first.resolve(context.root) ?: error("")
-            val second: GDMLSolid = solid.second.resolve(context.root) ?: error("")
-            val type: CompositeType = when (solid) {
-                is GDMLUnion -> CompositeType.UNION
-                is GDMLSubtraction -> CompositeType.SUBTRACT
-                is GDMLIntersection -> CompositeType.INTERSECT
-            }
-
-            return composite(type, name) {
-                addSolid(context, first).withPosition(
-                    context.lUnit, context.aUnit,
-                    solid.resolveFirstPosition(context.root),
-                    solid.resolveFirstRotation(context.root),
-                    null
-                )
-
-                addSolid(context, second).withPosition(
-                    context.lUnit, context.aUnit,
-                    solid.resolvePosition(context.root),
-                    solid.resolveRotation(context.root),
-                    null
-                )
-
-            }
-        }
-        else -> error("Renderer for $solid not supported yet")
+    val result by lazy {
+        finalize(volume(root.world))
     }
 }
 
-private fun SolidGroup.addSolidWithCaching(
-    context: GDMLTransformer,
-    solid: GDMLSolid,
-    name: String = solid.name
-): Solid? {
-    return when (context.solidAction(solid)) {
-        GDMLTransformer.Action.ADD -> {
-            addSolid(context, solid, name)
-        }
-        GDMLTransformer.Action.PROTOTYPE -> {
-//            context.proxySolid(this, solid, name)
-            val fullName = solidsName + solid.name.asName()
-            if (context.proto[fullName] == null) {
-                context.solids.addSolid(context, solid, solid.name)
-            }
-            ref(fullName, name)
-        }
-        GDMLTransformer.Action.REJECT -> {
-            //ignore
-            null
-        }
-    }
-}
-
-private fun SolidGroup.addPhysicalVolume(
-    context: GDMLTransformer,
-    physVolume: GDMLPhysVolume
-) {
-    val volume: GDMLGroup = physVolume.volumeref.resolve(context.root)
-        ?: error("Volume with ref ${physVolume.volumeref.ref} could not be resolved")
-
-    // a special case for single solid volume
-    if (volume is GDMLVolume && volume.physVolumes.isEmpty() && volume.placement == null) {
-        val solid = volume.solidref.resolve(context.root)
-            ?: error("Solid with tag ${volume.solidref.ref} for volume ${volume.name} not defined")
-        addSolidWithCaching(context, solid, physVolume.name ?: "")?.apply {
-            context.configureSolid(this, volume, solid)
-            withPosition(context, physVolume)
-        }
-        return
-    }
-
-    when (context.volumeAction(volume)) {
-        GDMLTransformer.Action.ADD -> {
-            val group: SolidGroup = volume(context, volume)
-            this[physVolume.name ?: ""] = group.withPosition(context, physVolume)
-        }
-        GDMLTransformer.Action.PROTOTYPE -> {
-            val fullName = volumesName + volume.name.asName()
-            if (context.proto[fullName] == null) {
-                context.proto[fullName] = volume(context, volume)
-            }
-            ref(fullName, physVolume.name ?: "").withPosition(context, physVolume)
-        }
-        GDMLTransformer.Action.REJECT -> {
-            //ignore
-        }
-    }
-}
-
-private fun SolidGroup.addDivisionVolume(
-    context: GDMLTransformer,
-    divisionVolume: GDMLDivisionVolume
-) {
-    val volume: GDMLGroup = divisionVolume.volumeref.resolve(context.root)
-        ?: error("Volume with ref ${divisionVolume.volumeref.ref} could not be resolved")
-
-    //TODO add divisions
-    set(Name.EMPTY, volume(context, volume))
-}
-
-private fun volume(
-    context: GDMLTransformer,
-    group: GDMLGroup
-): SolidGroup = SolidGroup().apply {
-    if (group is GDMLVolume) {
-        val solid: GDMLSolid = group.solidref.resolve(context.root)
-            ?: error("Solid with tag ${group.solidref.ref} for volume ${group.name} not defined")
-
-        addSolidWithCaching(context, solid)?.apply {
-            context.configureSolid(this, group, solid)
-        }
-
-        when (val vol: GDMLPlacement? = group.placement) {
-            is GDMLPhysVolume -> addPhysicalVolume(context, vol)
-            is GDMLDivisionVolume -> addDivisionVolume(context, vol)
-        }
-    }
-
-    group.physVolumes.forEach { physVolume ->
-        addPhysicalVolume(context, physVolume)
-    }
-}
 
 fun GDML.toVision(block: GDMLTransformer.() -> Unit = {}): SolidGroup {
     val context = GDMLTransformer(this).apply(block)
-    return context.finalize(volume(context, world))
+    return context.result
 }
 
 /**
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
index c138fcc6..dba7e32f 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
@@ -18,72 +18,72 @@ expect class Counter() {
     fun incrementAndGet(): Int
 }
 
-@DFExperimental
-private class GdmlOptimizer() : VisionVisitor {
-    val logger = KotlinLogging.logger("SingleChildReducer")
-
-    private operator fun Point3D?.plus(other: Point3D?): Point3D? = if (this == null && other == null) {
-        null
-    } else {
-        (this ?: Point3D(0, 0, 0)) + (other ?: Point3D(0, 0, 0))
-    }
-
-    private fun Vision.updateFrom(other: Vision): Vision {
-        if (this is Solid && other is Solid) {
-            position += other.position
-            rotation += other.rotation
-            if (this.scale != null || other.scale != null) {
-                scaleX = scaleX.toDouble() * other.scaleX.toDouble()
-                scaleY = scaleY.toDouble() * other.scaleY.toDouble()
-                scaleZ = scaleZ.toDouble() * other.scaleZ.toDouble()
-            }
-            other.properties?.sequence()?.forEach { (name, item) ->
-                if (properties?.getItem(name) == null) {
-                    config[name] = item
-                }
-            }
-        }
-        return this
-    }
-
-    private val depthCount = HashMap<Int, Counter>()
-
-    override suspend fun visit(name: Name, vision: Vision) {
-        val depth = name.length
-        depthCount.getOrPut(depth) { Counter() }.incrementAndGet()
-    }
-
-    override fun skip(name: Name, vision: Vision): Boolean = vision is Proxy.ProxyChild
-
-    override suspend fun visitChildren(name: Name, group: VisionGroup) {
-        if (name == "volumes".toName()) return
-        if (group !is MutableVisionGroup) return
-
-        val newChildren = group.children.entries.associate { (visionToken, vision) ->
-            //Reduce single child groups
-            if (vision is VisionGroup && vision !is Proxy && vision.children.size == 1) {
-                val (token, child) = vision.children.entries.first()
-                child.parent = null
-                if (token != visionToken) {
-                    child.config["solidName"] = token.toString()
-                }
-                visionToken to child.updateFrom(vision)
-            } else {
-                visionToken to vision
-            }
-        }
-        if (newChildren != group.children) {
-            group.removeAll()
-            newChildren.forEach { (token, child) ->
-                group[token] = child
-            }
-        }
-    }
+private fun Point3D?.safePlus(other: Point3D?): Point3D? = if (this == null && other == null) {
+    null
+} else {
+    (this ?: Point3D(0, 0, 0)) + (other ?: Point3D(0, 0, 0))
 }
 
-@DFExperimental
-suspend fun SolidGroup.optimizeGdml(): Job = coroutineScope {
-    prototypes?.let {
-        VisionVisitor.visitTree(GdmlOptimizer(), this, it)
-    } ?: CompletableDeferred(Unit)
-}
\ No newline at end of file
+internal fun Vision.updateFrom(other: Vision): Vision {
+    if (this is Solid && other is Solid) {
+        position = position.safePlus(other.position)
+        rotation = rotation.safePlus(other.rotation)
+        if (this.scale != null || other.scale != null) {
+            scaleX = scaleX.toDouble() * other.scaleX.toDouble()
+            scaleY = scaleY.toDouble() * other.scaleY.toDouble()
+            scaleZ = scaleZ.toDouble() * other.scaleZ.toDouble()
+        }
+        other.properties?.sequence()?.forEach { (name, item) ->
+            if (properties?.getItem(name) == null) {
+                config[name] = item
+            }
+        }
+    }
+    return this
+}
+//
+//@DFExperimental
+//private class GdmlOptimizer() : VisionVisitor {
+//    val logger = KotlinLogging.logger("SingleChildReducer")
+//
+//    private val depthCount = HashMap<Int, Counter>()
+//
+//    override suspend fun visit(name: Name, vision: Vision) {
+//        val depth = name.length
+//        depthCount.getOrPut(depth) { Counter() }.incrementAndGet()
+//    }
+//
+//    override fun skip(name: Name, vision: Vision): Boolean = vision is Proxy.ProxyChild
+//
+//    override suspend fun visitChildren(name: Name, group: VisionGroup) {
+//        if (name == "volumes".toName()) return
+//        if (group !is MutableVisionGroup) return
+//
+//        val newChildren = group.children.entries.associate { (visionToken, vision) ->
+//            //Reduce single child groups
+//            if (vision is VisionGroup && vision !is Proxy && vision.children.size == 1) {
+//                val (token, child) = vision.children.entries.first()
+//                child.parent = null
+//                if (token != visionToken) {
+//                    child.config["solidName"] = token.toString()
+//                }
+//                visionToken to child.updateFrom(vision)
+//            } else {
+//                visionToken to vision
+//            }
+//        }
+//        if (newChildren != group.children) {
+//            group.removeAll()
+//            newChildren.forEach { (token, child) ->
+//                group[token] = child
+//            }
+//        }
+//    }
+//}
+//
+//@DFExperimental
+//suspend fun SolidGroup.optimizeGdml(): Job = coroutineScope {
+//    prototypes?.let {
+//        VisionVisitor.visitTree(GdmlOptimizer(), this, it)
+//    } ?: CompletableDeferred(Unit)
+//}
\ No newline at end of file

From 936114519755927c67b309a543781b97be6546be Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 27 Aug 2020 17:06:33 +0300
Subject: [PATCH 009/151] Fix dead test

---
 .../dataforge/vision/gdml/bmanStatistics.kt   | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
index a8af85c6..d737d2ae 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
@@ -1,5 +1,8 @@
 package hep.dataforge.vision.gdml
 
+import hep.dataforge.vision.solid.AbstractProxy
+import hep.dataforge.vision.solid.prototype
+import hep.dataforge.vision.visitor.countDistinct
 import hep.dataforge.vision.visitor.countDistinctBy
 import hep.dataforge.vision.visitor.flowStatistics
 import kotlinx.coroutines.Dispatchers
@@ -7,6 +10,7 @@ import kotlinx.coroutines.withContext
 import nl.adaptivity.xmlutil.StAXReader
 import scientifik.gdml.GDML
 import java.io.File
+import kotlin.reflect.KClass
 
 suspend fun main() {
     withContext(Dispatchers.Default) {
@@ -19,16 +23,18 @@ suspend fun main() {
         val vision = xml.toVision()
 
 
-        vision.flowStatistics().countDistinctBy { it.type }.forEach { (depth, size) ->
+        vision.flowStatistics<KClass<*>>{ _, child ->
+            child.prototype::class
+        }.countDistinct().forEach { (depth, size) ->
             println("$depth\t$size")
         }
 
-        println("***REDUCED***")
-
-        vision.optimizeGdml()
-
-        vision.flowStatistics().countDistinctBy { it.type }.forEach { (depth, size) ->
-            println("$depth\t$size")
-        }
+//        println("***REDUCED***")
+//
+//        vision.optimizeGdml()
+//
+//        vision.flowStatistics().countDistinctBy { it.type }.forEach { (depth, size) ->
+//            println("$depth\t$size")
+//        }
     }
 }
\ No newline at end of file

From 61165230916d9515b1eb5ed324d41ed28e69e381 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 2 Oct 2020 19:09:25 +0300
Subject: [PATCH 010/151] Major build update and refactoring

---
 .gitignore                                    |   2 -
 CHANGELOG.md                                  |  14 +
 build.gradle.kts                              |  31 +-
 demo/build.gradle.kts                         |   0
 demo/gdml/build.gradle.kts                    |  23 +-
 .../hep/dataforge/vision/gdml/demo/cubes.kt   |   2 +-
 .../vision/gdml/demo/GDMLAppComponent.kt      |  11 +-
 .../vision/gdml/demo/GdmlJsDemoApp.kt         |   5 +-
 demo/gdml/src/jsMain/resources/index.html     |   2 +-
 .../dataforge/vision/gdml/demo/readFile.kt    |   9 +-
 .../dataforge/vision/gdml/demo/saveToJson.kt  |   8 +-
 .../vision/solid/FileSerializationTest.kt     |   2 +-
 demo/muon-monitor/build.gradle.kts            |  53 +--
 .../mipt/npm/muon/monitor/MMAppComponent.kt   |   1 +
 .../ru/mipt/npm/muon/monitor/MMDemoApp.kt     |   8 +-
 .../src/jsMain/resources/index.html           |   2 +-
 .../mipt/npm/muon/monitor/server/MMServer.kt  |   4 +-
 demo/spatial-showcase/build.gradle.kts        |  19 +-
 .../hep/dataforge/vision/solid/demo/demo.kt   |   1 +
 .../src/jsMain/resources/index.html           |   2 +-
 gradle.properties                             |   9 +
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 playground/build.gradle.kts                   |   4 +-
 settings.gradle.kts                           |  32 +-
 ui/bootstrap/build.gradle.kts                 |   8 +-
 .../dataforge/vision/bootstrap/bootstrap.kt   |  39 +-
 ui/material/build.gradle.kts                  |  12 +-
 ui/react/build.gradle.kts                     |  10 +-
 .../dataforge/vision/react/ConfigEditor.kt    |   3 +-
 .../hep/dataforge/vision/react/MetaViewer.kt  |   3 +-
 .../hep/dataforge/vision/react/ObjectTree.kt  |   3 +-
 ui/ring/build.gradle.kts                      |  11 +-
 visionforge-core/build.gradle.kts             |  11 +-
 .../dataforge/properties/ConfigProperty.kt    |   2 +-
 .../hep/dataforge/vision/AbstractVision.kt    |   6 +-
 .../dataforge/vision/AbstractVisionGroup.kt   |  13 +-
 .../kotlin/hep/dataforge/vision/StyleSheet.kt |  28 +-
 .../kotlin/hep/dataforge/vision/Vision.kt     |  43 +-
 .../hep/dataforge/vision/VisionGroup.kt       |  50 ++-
 .../hep/dataforge/vision/VisionManager.kt     |  87 ++--
 .../hep/dataforge/vision/valueWidget.kt       |  20 +-
 .../vision/visitor/StatisticsVisitor.kt       |   1 +
 .../hep/dataforge/vision/editor/FXMeta.kt     |  17 +-
 visionforge-gdml/build.gradle.kts             |   4 +-
 .../dataforge/vision/gdml/GDMLTransformer.kt  |   4 +-
 .../kotlin/hep/dataforge/vision/gdml/units.kt |  70 ---
 .../hep/dataforge/vision/gdml/gdmlJVM.kt      |   2 +-
 .../dataforge/vision/gdml/TestConvertor.kt    |   8 +-
 .../dataforge/vision/gdml/bmanStatistics.kt   |   2 +-
 visionforge-solid/build.gradle.kts            |  15 +-
 .../kotlin/hep/dataforge/vision/solid/Box.kt  |  15 +-
 .../hep/dataforge/vision/solid/Composite.kt   |  18 +-
 .../hep/dataforge/vision/solid/ConeSegment.kt |  17 +-
 .../hep/dataforge/vision/solid/Convex.kt      |  11 +-
 .../hep/dataforge/vision/solid/Extruded.kt    |  31 +-
 .../dataforge/vision/solid/GeometryBuilder.kt |  14 +-
 .../hep/dataforge/vision/solid/PolyLine.kt    |  12 +-
 .../hep/dataforge/vision/solid/Proxy.kt       |  36 +-
 .../hep/dataforge/vision/solid/Solid.kt       |  94 ++--
 .../hep/dataforge/vision/solid/SolidGroup.kt  |  24 +-
 .../hep/dataforge/vision/solid/SolidLabel.kt  |  10 +-
 .../dataforge/vision/solid/SolidManager.kt    |  59 +--
 .../dataforge/vision/solid/SolidMaterial.kt   |  39 +-
 .../hep/dataforge/vision/solid/Sphere.kt      |  17 +-
 .../kotlin/hep/dataforge/vision/solid/Tube.kt |  15 +-
 .../hep/dataforge/vision/solid/geometry.kt    |  43 +-
 .../dataforge/vision/solid/serialization.kt   |  54 +--
 .../vision/solid/specifications/Axes.kt       |  14 +-
 .../vision/solid/specifications/Camera.kt     |  30 +-
 .../solid/specifications/Canvas3DOptions.kt   |  12 +-
 .../solid/transform/RemoveSingleChild.kt      |   3 +
 .../dataforge/vision/solid/transform/UnRef.kt |   2 +
 .../hep/dataforge/vision/solid/ConvexTest.kt  |   3 +-
 .../vision/solid/SerializationTest.kt         |  23 +-
 .../hep/dataforge/vision/solid/geometryJs.kt  |   6 +-
 .../vision/solid/three/ThreeFactory.kt        |   3 +-
 .../vision/solid/three/ThreePlugin.kt         |  17 +-
 .../vision/solid/three/ThreeProxyFactory.kt   |   6 +-
 .../vision/solid/three/outputConfig.kt        |   8 +-
 .../dataforge/vision/solid/fx/FX3DPlugin.kt   |   2 +-
 .../vision/solid/fx/FXProxyFactory.kt         |  10 +-
 .../dataforge/vision/solid/generateSchema.kt  | 413 +++++++++---------
 .../hep/dataforge/vision/solid/geometryJVM.kt |  12 +-
 83 files changed, 874 insertions(+), 917 deletions(-)
 delete mode 100644 demo/build.gradle.kts
 create mode 100644 gradle.properties
 delete mode 100644 visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/units.kt

diff --git a/.gitignore b/.gitignore
index 89cc712a..33607764 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,4 @@ out/
 .gradle
 build/
 
-
 !gradle-wrapper.jar
-gradle.properties
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e69de29b..db566d2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,14 @@
+# Changelog
+
+## [Unreleased]
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
diff --git a/build.gradle.kts b/build.gradle.kts
index f2da0ea9..f2a94902 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,16 +1,12 @@
-import scientifik.useFx
-import scientifik.useSerialization
-
-val dataforgeVersion by extra("0.1.8")
+import ru.mipt.npm.gradle.useFx
 
 plugins {
-    id("scientifik.mpp") apply false
-    id("scientifik.jvm") apply false
-    id("scientifik.js") apply false
-    id("scientifik.publish") apply false
-    id("org.jetbrains.changelog") version "0.4.0"
+    id("ru.mipt.npm.project")
 }
 
+val dataforgeVersion by extra("0.2.0-dev-3")
+val ktorVersion by extra("1.4.1")
+
 allprojects {
     repositories {
         mavenLocal()
@@ -19,7 +15,7 @@ allprojects {
     }
 
     group = "hep.dataforge"
-    version = "0.1.5-dev-2"
+    version = "0.2.0-dev-1"
 }
 
 val githubProject by extra("visionforge")
@@ -28,8 +24,17 @@ val fxVersion by extra("14")
 
 subprojects {
     if(name.startsWith("visionforge")) {
-        apply(plugin = "scientifik.publish")
+        apply<ru.mipt.npm.gradle.KSciencePublishPlugin>()
     }
-    useSerialization()
-    useFx(scientifik.FXModule.CONTROLS, version = fxVersion)
+    afterEvaluate {
+        extensions.findByType<ru.mipt.npm.gradle.KScienceExtension>()?.run {
+            useSerialization()
+            useFx(ru.mipt.npm.gradle.FXModule.CONTROLS, version = fxVersion)
+        }
+    }
+}
+
+apiValidation {
+    validationDisabled = true
+    ignoredPackages.add("info.laht.threekt")
 }
\ No newline at end of file
diff --git a/demo/build.gradle.kts b/demo/build.gradle.kts
deleted file mode 100644
index e69de29b..00000000
diff --git a/demo/gdml/build.gradle.kts b/demo/gdml/build.gradle.kts
index 1ae0ffd9..b0a00e61 100644
--- a/demo/gdml/build.gradle.kts
+++ b/demo/gdml/build.gradle.kts
@@ -1,19 +1,24 @@
-import scientifik.DependencyConfiguration
-import scientifik.FXModule
-import scientifik.useFx
+import ru.mipt.npm.gradle.DependencyConfiguration
+import ru.mipt.npm.gradle.FXModule
+import ru.mipt.npm.gradle.useFx
 
 plugins {
-    id("scientifik.mpp")
-    id("application")
+    id("ru.mipt.npm.mpp")
+    application
 }
 
-val fxVersion: String by rootProject.extra
-useFx(FXModule.CONTROLS, version = fxVersion, configuration = DependencyConfiguration.IMPLEMENTATION)
+kscience {
+    val fxVersion: String by rootProject.extra
+    useFx(FXModule.CONTROLS, version = fxVersion, configuration = DependencyConfiguration.IMPLEMENTATION)
+    application()
+}
 
 kotlin {
 
     jvm {
-        withJava()
+        afterEvaluate {
+            withJava()
+        }
     }
 
     js {
@@ -27,7 +32,7 @@ kotlin {
                 implementation(project(":visionforge-gdml"))
             }
         }
-        jsMain{
+        jsMain {
             dependencies {
                 implementation(project(":ui:bootstrap"))
                 implementation(npm("react-file-drop", "3.0.6"))
diff --git a/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/demo/cubes.kt b/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/demo/cubes.kt
index 1f0b8cf9..e37ba142 100644
--- a/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/demo/cubes.kt
+++ b/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/demo/cubes.kt
@@ -1,6 +1,6 @@
 package hep.dataforge.vision.gdml.demo
 
-import scientifik.gdml.*
+import kscience.gdml.*
 
 
 fun cubes(): GDML = GDML {
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index 9cd2c2bd..2392e042 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -1,7 +1,6 @@
 package hep.dataforge.vision.gdml.demo
 
 import hep.dataforge.context.Context
-import hep.dataforge.meta.set
 import hep.dataforge.names.Name
 import hep.dataforge.names.isEmpty
 import hep.dataforge.vision.Vision
@@ -18,18 +17,18 @@ import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.solid.three.ThreeCanvas
 import hep.dataforge.vision.solid.three.ThreeCanvasComponent
 import hep.dataforge.vision.solid.three.canvasControls
+import kotlinx.browser.window
 import kotlinx.css.FlexBasis
 import kotlinx.css.Overflow
 import kotlinx.css.flex
 import kotlinx.css.overflow
+import kscience.gdml.GDML
+import kscience.gdml.decodeFromString
 import org.w3c.files.FileReader
 import org.w3c.files.get
 import react.RProps
 import react.dom.h1
-import scientifik.gdml.GDML
-import scientifik.gdml.parse
 import styled.css
-import kotlin.browser.window
 import kotlin.math.PI
 
 interface GDMLAppProps : RProps {
@@ -58,10 +57,10 @@ val GDMLApp = component<GDMLAppProps> { props ->
     fun loadData(name: String, data: String) {
         val parsedVision = when {
             name.endsWith(".gdml") || name.endsWith(".xml") -> {
-                val gdml = GDML.parse(data)
+                val gdml = GDML.decodeFromString(data)
                 gdml.toVision()
             }
-            name.endsWith(".json") -> SolidGroup.parseJson(data)
+            name.endsWith(".json") -> SolidGroup.decodeFromString(data)
             else -> {
                 window.alert("File extension is not recognized: $name")
                 error("File extension is not recognized: $name")
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
index fc0478f0..cfb23cd5 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
@@ -3,15 +3,12 @@ package hep.dataforge.vision.gdml.demo
 import hep.dataforge.context.Global
 import hep.dataforge.js.Application
 import hep.dataforge.js.startApplication
-import hep.dataforge.vision.gdml.GDMLTransformer
-import hep.dataforge.vision.gdml.LUnit
 import hep.dataforge.vision.gdml.toVision
-import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_OPACITY_KEY
+import kotlinx.browser.document
 import kotlinx.css.*
 import react.child
 import react.dom.render
 import styled.injectGlobal
-import kotlin.browser.document
 
 
 private class GDMLDemoApp : Application {
diff --git a/demo/gdml/src/jsMain/resources/index.html b/demo/gdml/src/jsMain/resources/index.html
index fb53883c..14bb3178 100644
--- a/demo/gdml/src/jsMain/resources/index.html
+++ b/demo/gdml/src/jsMain/resources/index.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="css/bootstrap.min.css">
     <link rel="stylesheet" href="css/main.css">
     <link rel="stylesheet" href="css/fileDrop.css">
-    <script type="text/javascript" src="main.bundle.js"></script>
+    <script type="text/javascript" src="gdml.js"></script>
     <script type="text/javascript" src ="js/jquery-3.4.1.min.js"></script>
     <script type="text/javascript" src ="js/bootstrap.bundle.min.js"></script>
 </head>
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
index 355d6f98..e4344795 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
@@ -3,13 +3,12 @@ package hep.dataforge.vision.gdml.demo
 import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.setItem
 import hep.dataforge.values.asValue
-import hep.dataforge.vision.gdml.LUnit
 import hep.dataforge.vision.gdml.readFile
 import hep.dataforge.vision.gdml.toVision
 import hep.dataforge.vision.solid.SolidGroup
 import hep.dataforge.vision.solid.SolidManager
 import hep.dataforge.vision.solid.SolidMaterial
-import scientifik.gdml.GDML
+import kscience.gdml.GDML
 import java.io.File
 import java.util.zip.GZIPInputStream
 import java.util.zip.ZipInputStream
@@ -32,19 +31,19 @@ fun SolidManager.Companion.readFile(file: File): SolidGroup = when {
 //            }
         }
     }
-    file.extension == "json" -> SolidGroup.parseJson(file.readText())
+    file.extension == "json" -> SolidGroup.decodeFromString(file.readText())
     file.name.endsWith("json.zip") -> {
         file.inputStream().use {
             val unzip = ZipInputStream(it, Charsets.UTF_8)
             val text = unzip.readBytes().decodeToString()
-            SolidGroup.parseJson(text)
+            SolidGroup.decodeFromString(text)
         }
     }
     file.name.endsWith("json.gz") -> {
         file.inputStream().use {
             val unzip = GZIPInputStream(it)
             val text = unzip.readBytes().decodeToString()
-            SolidGroup.parseJson(text)
+            SolidGroup.decodeFromString(text)
         }
     }
     else -> error("Unknown extension ${file.extension}")
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt
index 5c0c09c6..798fd8b7 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt
@@ -1,10 +1,10 @@
 package hep.dataforge.vision.gdml.demo
 
-import hep.dataforge.vision.gdml.LUnit
 import hep.dataforge.vision.gdml.readFile
 import hep.dataforge.vision.gdml.toVision
-import hep.dataforge.vision.solid.stringify
-import scientifik.gdml.GDML
+import hep.dataforge.vision.solid.encodeToString
+import kscience.gdml.GDML
+import kscience.gdml.LUnit
 import java.io.File
 import java.nio.file.Paths
 
@@ -21,7 +21,7 @@ fun main(args: Array<String>) {
         lUnit = LUnit.CM
     }
 
-    val json = visual.stringify()
+    val json = visual.encodeToString()
     println(json)
     File(outputFileName).writeText(json)
     //File("D:\\Work\\Projects\\gdml.kt\\gdml-source\\cubes.json").writeText(json)
diff --git a/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt b/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt
index e10acbee..a1f9bab9 100644
--- a/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt
+++ b/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt
@@ -9,7 +9,7 @@ class FileSerializationTest {
     @Ignore
     fun testFileRead(){
         val text = this::class.java.getResourceAsStream("/cubes.json").readBytes().decodeToString()
-        val visual = SolidGroup.parseJson(text)
+        val visual = SolidGroup.decodeFromString(text)
         visual["composite_001".asName()]
     }
 }
\ No newline at end of file
diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts
index ccb4d098..f4ba471d 100644
--- a/demo/muon-monitor/build.gradle.kts
+++ b/demo/muon-monitor/build.gradle.kts
@@ -1,43 +1,38 @@
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME
-import scientifik.jsDistDirectory
 
 plugins {
-    id("scientifik.mpp")
-    id("application")
+    id("ru.mipt.npm.mpp")
+    application
 }
 
 group = "ru.mipt.npm"
 
-val ktorVersion = "1.3.2"
+val ktorVersion: String by rootProject.extra
+
+kscience {
+    application()
+}
 
 kotlin {
+    afterEvaluate {
+        val jsBrowserDistribution by tasks.getting
 
-    val installJS = tasks.getByName("jsBrowserDistribution")
-
-    js {
-        browser {
-            dceTask {
-                dceOptions {
-                    keep("ktor-ktor-io.\$\$importsForInline\$\$.ktor-ktor-io.io.ktor.utils.io")
+        jvm {
+            withJava()
+            compilations[MAIN_COMPILATION_NAME]?.apply {
+                tasks.getByName<ProcessResources>(processResourcesTaskName) {
+                    dependsOn(jsBrowserDistribution)
+                    afterEvaluate {
+                        from(jsBrowserDistribution)
+                    }
                 }
             }
-            webpackTask {
-                mode = org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig.Mode.PRODUCTION
-            }
+
         }
     }
 
-    jvm {
-        withJava()
-        compilations[MAIN_COMPILATION_NAME]?.apply {
-            tasks.getByName<ProcessResources>(processResourcesTaskName) {
-                dependsOn(installJS)
-                afterEvaluate {
-                    from(project.jsDistDirectory)
-                }
-            }
-        }
-
+    js {
+        useCommonJs()
     }
 
     sourceSets {
@@ -58,14 +53,6 @@ kotlin {
                 implementation(project(":ui:bootstrap"))
                 implementation("io.ktor:ktor-client-js:$ktorVersion")
                 implementation("io.ktor:ktor-client-serialization-js:$ktorVersion")
-                implementation(npm("text-encoding"))
-                implementation(npm("abort-controller"))
-                implementation(npm("bufferutil"))
-                implementation(npm("utf-8-validate"))
-                implementation(npm("fs"))
-//                implementation(npm("jquery"))
-//                implementation(npm("popper.js"))
-//                implementation(npm("react-is"))
             }
         }
     }
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
index d08788c4..61deb655 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
@@ -4,6 +4,7 @@ import hep.dataforge.context.Context
 import hep.dataforge.names.Name
 import hep.dataforge.names.NameToken
 import hep.dataforge.names.isEmpty
+import hep.dataforge.names.length
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.bootstrap.card
 import hep.dataforge.vision.react.component
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
index 3fc00667..f4f93495 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
@@ -7,11 +7,11 @@ import hep.dataforge.vision.solid.SolidManager
 import io.ktor.client.HttpClient
 import io.ktor.client.features.json.JsonFeature
 import io.ktor.client.features.json.serializer.KotlinxSerializer
+import kotlinx.browser.document
 import kotlinx.serialization.json.Json
 import react.child
 import react.dom.div
 import react.dom.render
-import kotlin.browser.document
 
 private class MMDemoApp : Application {
 
@@ -19,7 +19,7 @@ private class MMDemoApp : Application {
 
     private val connection = HttpClient {
         install(JsonFeature) {
-            serializer = KotlinxSerializer(Json(context = SolidManager.serialModule))
+            serializer = KotlinxSerializer(Json { serializersModule = SolidManager.serialModule })
         }
     }
 
@@ -34,8 +34,8 @@ private class MMDemoApp : Application {
             div("container-fluid h-100") {
                 child(MMApp) {
                     attrs {
-                        model = this@MMDemoApp.model
-                        connection = this@MMDemoApp.connection
+                        this.model = this@MMDemoApp.model
+                        this.connection = this@MMDemoApp.connection
                         this.context = context
                     }
                 }
diff --git a/demo/muon-monitor/src/jsMain/resources/index.html b/demo/muon-monitor/src/jsMain/resources/index.html
index 13624f25..9044e628 100644
--- a/demo/muon-monitor/src/jsMain/resources/index.html
+++ b/demo/muon-monitor/src/jsMain/resources/index.html
@@ -6,7 +6,7 @@
     <title>Three js demo for particle physics</title>
     <link rel="stylesheet" href="css/bootstrap.min.css">
     <link rel="stylesheet" href="css/main.css">
-    <script type="text/javascript" src="main.bundle.js"></script>
+    <script type="text/javascript" src="muon-monitor.js"></script>
     <script type="text/javascript" src ="js/jquery-3.4.1.min.js"></script>
     <script type="text/javascript" src ="js/bootstrap.bundle.min.js"></script>
 </head>
diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
index d1e637b4..71d6b53a 100644
--- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
+++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
@@ -10,6 +10,7 @@ import io.ktor.application.log
 import io.ktor.features.CallLogging
 import io.ktor.features.ContentNegotiation
 import io.ktor.features.DefaultHeaders
+import io.ktor.http.ContentType
 import io.ktor.http.content.resources
 import io.ktor.http.content.static
 import io.ktor.response.respond
@@ -19,6 +20,7 @@ import io.ktor.serialization.json
 import io.ktor.server.cio.CIO
 import io.ktor.server.engine.embeddedServer
 import io.ktor.util.KtorExperimentalAPI
+import kotlinx.serialization.json.Json
 import org.apache.commons.math3.random.JDKRandomGenerator
 import ru.mipt.npm.muon.monitor.Model
 import ru.mipt.npm.muon.monitor.sim.Cos2TrackGenerator
@@ -38,7 +40,7 @@ fun Application.module() {
     install(DefaultHeaders)
     install(CallLogging)
     install(ContentNegotiation) {
-        json(module = SolidManager.serialModule)
+        json(Json { serializersModule = SolidManager.serialModule }, ContentType.Application.Json)
     }
     install(Routing) {
         get("/event") {
diff --git a/demo/spatial-showcase/build.gradle.kts b/demo/spatial-showcase/build.gradle.kts
index b2816c18..40c4b04d 100644
--- a/demo/spatial-showcase/build.gradle.kts
+++ b/demo/spatial-showcase/build.gradle.kts
@@ -1,19 +1,22 @@
-import scientifik.DependencyConfiguration
-import scientifik.FXModule
-import scientifik.useFx
+import ru.mipt.npm.gradle.*
 
 plugins {
-    id("scientifik.mpp")
-    id("application")
+    id("ru.mipt.npm.mpp")
+    application
 }
 
-val fxVersion: String by rootProject.extra
-useFx(FXModule.CONTROLS, version = fxVersion, configuration = DependencyConfiguration.IMPLEMENTATION)
+kscience {
+    val fxVersion: String by rootProject.extra
+    useFx(FXModule.CONTROLS, version = fxVersion, configuration = DependencyConfiguration.IMPLEMENTATION)
+    application()
+}
 
 kotlin {
 
     jvm {
-        withJava()
+        afterEvaluate {
+            withJava()
+        }
     }
 
     sourceSets {
diff --git a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
index a2786881..4f96f21b 100644
--- a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
+++ b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
@@ -8,6 +8,7 @@ import hep.dataforge.vision.Colors
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
+import hep.dataforge.vision.visible
 import kotlinx.coroutines.*
 import kotlin.math.PI
 import kotlin.math.cos
diff --git a/demo/spatial-showcase/src/jsMain/resources/index.html b/demo/spatial-showcase/src/jsMain/resources/index.html
index d709af37..278366e0 100644
--- a/demo/spatial-showcase/src/jsMain/resources/index.html
+++ b/demo/spatial-showcase/src/jsMain/resources/index.html
@@ -6,7 +6,7 @@
     <title>Three js demo for particle physics</title>
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
           integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
-    <script type="text/javascript" src="main.bundle.js"></script>
+    <script type="text/javascript" src="spatial-showcase.js"></script>
 </head>
 <body class="application">
 <div class="container">
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..930bba55
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,9 @@
+kotlin.code.style=official
+kotlin.parallel.tasks.in.project=true
+kotlin.mpp.enableGranularSourceSetsMetadata=true
+kotlin.native.enableDependencyPropagation=false
+kotlin.mpp.stability.nowarn=true
+
+org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
+org.gradle.parallel=true
+systemProp.org.gradle.internal.publish.checksums.insecure=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6c9a2247..12d38de6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/playground/build.gradle.kts b/playground/build.gradle.kts
index 4c71daab..4eeabfa2 100644
--- a/playground/build.gradle.kts
+++ b/playground/build.gradle.kts
@@ -7,12 +7,12 @@ repositories{
     maven("https://kotlin.bintray.com/kotlinx")
     maven("https://dl.bintray.com/kotlin/kotlin-eap")
     maven("https://dl.bintray.com/mipt-npm/dataforge")
-    maven("https://dl.bintray.com/mipt-npm/scientifik")
+    maven("https://dl.bintray.com/mipt-npm/kscience")
     maven("https://dl.bintray.com/mipt-npm/dev")
 }
 
 kotlin {
-    js {
+    js(IR) {
         browser {}
     }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 187e5143..40fcab11 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,32 +1,27 @@
 pluginManagement {
-    val kotlinVersion = "1.3.72"
-    val toolsVersion = "0.5.2"
+    val kotlinVersion = "1.4.20-M1"
+    val toolsVersion = "0.6.3-dev-1.4.20-M1"
 
     repositories {
         mavenLocal()
         jcenter()
         gradlePluginPortal()
-        maven("https://kotlin.bintray.com/kotlinx")
         maven("https://dl.bintray.com/kotlin/kotlin-eap")
+        maven("https://dl.bintray.com/kotlin/kotlinx")
         maven("https://dl.bintray.com/mipt-npm/dataforge")
-        maven("https://dl.bintray.com/mipt-npm/scientifik")
+        maven("https://dl.bintray.com/mipt-npm/kscience")
         maven("https://dl.bintray.com/mipt-npm/dev")
     }
 
     plugins {
+        id("ru.mipt.npm.project") version toolsVersion
+        id("ru.mipt.npm.mpp") version toolsVersion
+        id("ru.mipt.npm.jvm") version toolsVersion
+        id("ru.mipt.npm.js") version toolsVersion
+        id("ru.mipt.npm.publish") version toolsVersion
         kotlin("jvm") version kotlinVersion
-        id("scientifik.mpp") version toolsVersion
-        id("scientifik.jvm") version toolsVersion
-        id("scientifik.js") version toolsVersion
-        id("scientifik.publish") version toolsVersion
-    }
-
-    resolutionStrategy {
-        eachPlugin {
-            when (requested.id.id) {
-                "scientifik.mpp", "scientifik.publish", "scientifik.jvm", "scientifik.js" -> useModule("scientifik:gradle-tools:${toolsVersion}")
-            }
-        }
+        kotlin("js") version kotlinVersion
+        kotlin("multiplatform") version kotlinVersion
     }
 }
 
@@ -34,11 +29,12 @@ pluginManagement {
 
 rootProject.name = "visionforge"
 
+
 include(
-    ":ui",
+//    ":ui",
     ":ui:react",
     ":ui:ring",
-    ":ui:material",
+//    ":ui:material",
     ":ui:bootstrap",
     ":visionforge-core",
     ":visionforge-solid",
diff --git a/ui/bootstrap/build.gradle.kts b/ui/bootstrap/build.gradle.kts
index 598c1e56..b2400d0c 100644
--- a/ui/bootstrap/build.gradle.kts
+++ b/ui/bootstrap/build.gradle.kts
@@ -1,15 +1,9 @@
 plugins {
-    id("scientifik.js")
+    id("ru.mipt.npm.js")
 }
 
 val dataforgeVersion: String by rootProject.extra
 
-kotlin {
-    target {
-        useCommonJs()
-    }
-}
-
 dependencies{
     api(project(":ui:react"))
 }
\ No newline at end of file
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt
index f41c7ecc..14efcccb 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt
@@ -2,6 +2,7 @@ package hep.dataforge.vision.bootstrap
 
 import hep.dataforge.names.Name
 import hep.dataforge.names.NameToken
+import hep.dataforge.names.length
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.react.ObjectTree
 import kotlinx.html.*
@@ -17,7 +18,7 @@ import styled.StyledDOMBuilder
 import styled.css
 import styled.styledDiv
 
-inline fun TagConsumer<HTMLElement>.card(title: String, crossinline block: TagConsumer<HTMLElement>.() -> Unit) {
+public inline fun TagConsumer<HTMLElement>.card(title: String, crossinline block: TagConsumer<HTMLElement>.() -> Unit) {
     div("card w-100") {
         div("card-body") {
             h3(classes = "card-title") { +title }
@@ -26,7 +27,7 @@ inline fun TagConsumer<HTMLElement>.card(title: String, crossinline block: TagCo
     }
 }
 
-inline fun RBuilder.card(title: String, classes: String? = null, crossinline block: RBuilder.() -> Unit) {
+public inline fun RBuilder.card(title: String, classes: String? = null, crossinline block: RBuilder.() -> Unit) {
     div("card w-100 $classes") {
         div("card-body") {
             h3(classes = "card-title") {
@@ -37,7 +38,7 @@ inline fun RBuilder.card(title: String, classes: String? = null, crossinline blo
     }
 }
 
-fun TagConsumer<HTMLElement>.accordion(id: String, elements: List<Pair<String, DIV.() -> Unit>>) {
+public fun TagConsumer<HTMLElement>.accordion(id: String, elements: List<Pair<String, DIV.() -> Unit>>) {
     div("container-fluid") {
         div("accordion") {
             this.id = id
@@ -69,18 +70,18 @@ fun TagConsumer<HTMLElement>.accordion(id: String, elements: List<Pair<String, D
     }
 }
 
-typealias AccordionBuilder = MutableList<Pair<String, DIV.() -> Unit>>
+public typealias AccordionBuilder = MutableList<Pair<String, DIV.() -> Unit>>
 
-fun AccordionBuilder.entry(title: String, builder: DIV.() -> Unit) {
+public fun AccordionBuilder.entry(title: String, builder: DIV.() -> Unit) {
     add(title to builder)
 }
 
-fun TagConsumer<HTMLElement>.accordion(id: String, builder: AccordionBuilder.() -> Unit) {
+public fun TagConsumer<HTMLElement>.accordion(id: String, builder: AccordionBuilder.() -> Unit) {
     val list = ArrayList<Pair<String, DIV.() -> Unit>>().apply(builder)
     accordion(id, list)
 }
 
-fun RBuilder.accordion(id: String, elements: List<Pair<String, RDOMBuilder<DIV>.() -> Unit>>): ReactElement {
+public fun RBuilder.accordion(id: String, elements: List<Pair<String, RDOMBuilder<DIV>.() -> Unit>>): ReactElement {
     return div("container-fluid") {
         div("accordion") {
             attrs {
@@ -120,7 +121,7 @@ fun RBuilder.accordion(id: String, elements: List<Pair<String, RDOMBuilder<DIV>.
     }
 }
 
-fun RBuilder.namecrumbs(name: Name?, rootTitle: String, link: (Name) -> Unit) {
+public fun RBuilder.namecrumbs(name: Name?, rootTitle: String, link: (Name) -> Unit) {
     div("container-fluid p-0") {
         nav {
             attrs {
@@ -160,20 +161,18 @@ fun RBuilder.namecrumbs(name: Name?, rootTitle: String, link: (Name) -> Unit) {
     }
 }
 
-typealias RAccordionBuilder = MutableList<Pair<String, RDOMBuilder<DIV>.() -> Unit>>
+public typealias RAccordionBuilder = MutableList<Pair<String, RDOMBuilder<DIV>.() -> Unit>>
 
-fun RAccordionBuilder.entry(title: String, builder: RDOMBuilder<DIV>.() -> Unit) {
+public fun RAccordionBuilder.entry(title: String, builder: RDOMBuilder<DIV>.() -> Unit) {
     add(title to builder)
 }
 
-fun RBuilder.accordion(id: String, builder: RAccordionBuilder.() -> Unit): ReactElement {
+public fun RBuilder.accordion(id: String, builder: RAccordionBuilder.() -> Unit): ReactElement {
     val list = ArrayList<Pair<String, RDOMBuilder<DIV>.() -> Unit>>().apply(builder)
     return accordion(id, list)
 }
 
-fun joinStyles(vararg styles: String?) = styles.joinToString(separator = " ") { it ?: "" }
-
-enum class ContainerSize(val suffix: String) {
+public enum class ContainerSize(public val suffix: String) {
     DEFAULT(""),
     SM("-sm"),
     MD("-md"),
@@ -182,7 +181,7 @@ enum class ContainerSize(val suffix: String) {
     FLUID("-fluid")
 }
 
-inline fun RBuilder.container(
+public inline fun RBuilder.container(
     size: ContainerSize = ContainerSize.FLUID,
     block: StyledDOMBuilder<DIV>.() -> Unit
 ): ReactElement = styledDiv{
@@ -193,7 +192,7 @@ inline fun RBuilder.container(
 }
 
 
-enum class GridMaxSize(val suffix: String) {
+public enum class GridMaxSize(public val suffix: String) {
     NONE(""),
     SM("-sm"),
     MD("-md"),
@@ -201,7 +200,7 @@ enum class GridMaxSize(val suffix: String) {
     XL("-xl")
 }
 
-inline fun RBuilder.gridColumn(
+public inline fun RBuilder.gridColumn(
     weight: Int? = null,
     maxSize: GridMaxSize = GridMaxSize.NONE,
     block: StyledDOMBuilder<DIV>.() -> Unit
@@ -213,7 +212,7 @@ inline fun RBuilder.gridColumn(
     block()
 }
 
-inline fun RBuilder.gridRow(
+public inline fun RBuilder.gridRow(
     block: StyledDOMBuilder<DIV>.() -> Unit
 ): ReactElement = styledDiv{
     css{
@@ -222,10 +221,10 @@ inline fun RBuilder.gridRow(
     block()
 }
 
-fun Element.renderObjectTree(
+public fun Element.renderObjectTree(
     vision: Vision,
     clickCallback: (Name) -> Unit = {}
-) = render(this) {
+): Unit = render(this) {
     card("Object tree") {
         child(ObjectTree) {
             attrs {
diff --git a/ui/material/build.gradle.kts b/ui/material/build.gradle.kts
index 78e48bc4..15eb5377 100644
--- a/ui/material/build.gradle.kts
+++ b/ui/material/build.gradle.kts
@@ -1,20 +1,14 @@
 plugins {
-    id("scientifik.js")
+    id("ru.mipt.npm.js")
 }
 
 val dataforgeVersion: String by rootProject.extra
 
-kotlin {
-    target {
-        useCommonJs()
-    }
-}
-
 dependencies{
     api(project(":ui:react"))
 
-    api("subroh0508.net.kotlinmaterialui:core:0.4.0")
-    api("subroh0508.net.kotlinmaterialui:lab:0.4.0")
+    api("subroh0508.net.kotlinmaterialui:core:0.4.5")
+    api("subroh0508.net.kotlinmaterialui:lab:0.4.5")
     api(npm("@material-ui/core","4.9.14"))
     api(npm("@material-ui/lab","4.0.0-alpha.51"))
     //api(npm("@material-ui/icons","4.9.1"))
diff --git a/ui/react/build.gradle.kts b/ui/react/build.gradle.kts
index 64586c43..3fb049b5 100644
--- a/ui/react/build.gradle.kts
+++ b/ui/react/build.gradle.kts
@@ -1,11 +1,5 @@
 plugins {
-    id("scientifik.js")
-}
-
-kotlin {
-    target {
-        useCommonJs()
-    }
+    id("ru.mipt.npm.js")
 }
 
 val reactVersion by extra("16.13.1")
@@ -14,7 +8,7 @@ dependencies{
     api(project(":visionforge-core"))
 
     //api("org.jetbrains:kotlin-react:16.13.1-pre.104-kotlin-1.3.72")
-    api("org.jetbrains:kotlin-react-dom:$reactVersion-pre.104-kotlin-1.3.72")
+    api("org.jetbrains:kotlin-react-dom:$reactVersion-pre.123-kotlin-1.4.10")
 
     api(npm("react", reactVersion))
     api(npm("react-dom", reactVersion))
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
index 712d3b60..b7c4407e 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
@@ -4,6 +4,7 @@ import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.*
 import hep.dataforge.names.Name
 import hep.dataforge.names.NameToken
+import hep.dataforge.names.lastOrNull
 import hep.dataforge.names.plus
 import hep.dataforge.values.Value
 import kotlinx.html.js.onClickFunction
@@ -47,7 +48,7 @@ private fun RFBuilder.configEditorItem(props: ConfigEditorItemProps) {
     val defaultItem = props.default?.get(props.name)
     var actualItem: MetaItem<Meta>? by state { item ?: defaultItem ?: descriptorItem?.defaultItem() }
 
-    val token = props.name.last()?.toString() ?: "Properties"
+    val token = props.name.lastOrNull()?.toString() ?: "Properties"
 
     fun update() {
         item = props.root[props.name]
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
index e5a628b4..5f98e40f 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
@@ -9,6 +9,7 @@ import hep.dataforge.meta.descriptors.get
 import hep.dataforge.meta.get
 import hep.dataforge.names.Name
 import hep.dataforge.names.NameToken
+import hep.dataforge.names.lastOrNull
 import hep.dataforge.names.plus
 import kotlinx.html.js.onClickFunction
 import org.w3c.dom.events.Event
@@ -43,7 +44,7 @@ private fun RFBuilder.metaViewerItem(props: MetaViewerProps) {
     val descriptorItem: ItemDescriptor? = props.descriptor?.get(props.name)
     val actualItem = item ?: descriptorItem?.defaultItem()
 
-    val token = props.name.last()?.toString() ?: "Meta"
+    val token = props.name.lastOrNull()?.toString() ?: "Meta"
 
     val expanderClick: (Event) -> Unit = {
         expanded = !expanded
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt
index 3b2112fb..ece2a32b 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt
@@ -1,6 +1,7 @@
 package hep.dataforge.vision.react
 
 import hep.dataforge.names.Name
+import hep.dataforge.names.lastOrNull
 import hep.dataforge.names.plus
 import hep.dataforge.names.startsWith
 import hep.dataforge.vision.Vision
@@ -42,7 +43,7 @@ private fun RFBuilder.objectTree(props: ObjectTreeProps): Unit {
         }
     }
 
-    val token = props.name.last()?.toString() ?: "World"
+    val token = props.name.lastOrNull()?.toString() ?: "World"
     val obj = props.obj
 
     //display as node if any child is visible
diff --git a/ui/ring/build.gradle.kts b/ui/ring/build.gradle.kts
index 6cb807a3..167743be 100644
--- a/ui/ring/build.gradle.kts
+++ b/ui/ring/build.gradle.kts
@@ -1,22 +1,13 @@
 plugins {
-    id("scientifik.js")
+    id("ru.mipt.npm.js")
 }
 
 val dataforgeVersion: String by rootProject.extra
 
-kotlin {
-    target {
-        useCommonJs()
-    }
-}
-
-
 dependencies{
     api(project(":ui:react"))
 
     implementation(npm("@jetbrains/logos", "1.1.6"))
     implementation(npm("@jetbrains/ring-ui", "3.0.13"))
-
-
     implementation(npm("svg-inline-loader", "0.8.0"))
 }
\ No newline at end of file
diff --git a/visionforge-core/build.gradle.kts b/visionforge-core/build.gradle.kts
index 2ef4cad5..546587d2 100644
--- a/visionforge-core/build.gradle.kts
+++ b/visionforge-core/build.gradle.kts
@@ -1,13 +1,10 @@
 plugins {
-    id("scientifik.mpp")
+    id("ru.mipt.npm.mpp")
 }
 
 val dataforgeVersion: String by rootProject.extra
 
 kotlin {
-    js {
-        useCommonJs()
-    }
 
     sourceSets {
         commonMain {
@@ -30,15 +27,15 @@ kotlin {
         jsMain {
             dependencies {
                 api("hep.dataforge:dataforge-output-html:$dataforgeVersion")
-                api("org.jetbrains.kotlinx:kotlinx-html:0.6.12")
+                api("org.jetbrains.kotlinx:kotlinx-html:0.7.2")
 
                 //api("org.jetbrains:kotlin-extensions:1.0.1-pre.105-kotlin-1.3.72")
                 //api("org.jetbrains:kotlin-css-js:1.0.0-pre.105-kotlin-1.3.72")
-                api("org.jetbrains:kotlin-styled:1.0.0-pre.104-kotlin-1.3.72")
+                api("org.jetbrains:kotlin-styled:5.2.0-pre.123-kotlin-1.4.10")
 
                 api(npm("core-js", "2.6.5"))
                 api(npm("inline-style-prefixer", "5.1.0"))
-                api(npm("styled-components", "4.3.2"))
+                api(npm("styled-components", "5.2.0"))
                 //api(project(":ringui-wrapper"))
             }
         }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/properties/ConfigProperty.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/properties/ConfigProperty.kt
index 11936eda..550d39a7 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/properties/ConfigProperty.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/properties/ConfigProperty.kt
@@ -4,7 +4,7 @@ import hep.dataforge.meta.*
 import hep.dataforge.names.Name
 
 @DFExperimental
-class ConfigProperty(val config: Config, val name: Name) : Property<MetaItem<*>?> {
+internal class ConfigProperty(val config: Config, val name: Name) : Property<MetaItem<*>?> {
     override var value: MetaItem<*>?
         get() = config[name]
         set(value) {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt
index a025a87a..68e6ee85 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt
@@ -87,13 +87,13 @@ abstract class AbstractVision : Vision {
     /**
      * Reset all properties to their default values
      */
-    fun resetProperties() {
+    public fun resetProperties() {
         properties?.removeListener(this)
         properties = null
     }
 
-    companion object {
-        val descriptor = NodeDescriptor {
+    public companion object {
+        public val descriptor: NodeDescriptor = NodeDescriptor {
             value(STYLE_KEY) {
                 type(ValueType.STRING)
                 multiple = true
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt
index d1d7f523..f2c343d6 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt
@@ -1,9 +1,6 @@
 package hep.dataforge.vision
 
-import hep.dataforge.names.Name
-import hep.dataforge.names.NameToken
-import hep.dataforge.names.asName
-import hep.dataforge.names.isEmpty
+import hep.dataforge.names.*
 import kotlinx.serialization.Transient
 
 
@@ -105,7 +102,7 @@ abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup {
         return when {
             name.isEmpty() -> error("Should be unreachable")
             name.length == 1 -> {
-                val token = name.first()!!
+                val token = name.tokens.first()
                 when (val current = children[token]) {
                     null -> createGroup().also { child ->
                         attach(child)
@@ -115,7 +112,7 @@ abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup {
                     else -> error("Can't create group with name $name because it exists and not a group")
                 }
             }
-            else -> createGroups(name.first()!!.asName()).createGroups(name.cutFirst())
+            else -> createGroups(name.tokens.first().asName()).createGroups(name.cutFirst())
         }
     }
 
@@ -131,7 +128,7 @@ abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup {
                 }
             }
             name.length == 1 -> {
-                val token = name.first()!!
+                val token = name.tokens.first()
                 if (child == null) {
                     removeChild(token)
                 } else {
@@ -142,7 +139,7 @@ abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup {
             else -> {
                 //TODO add safety check
                 val parent = (get(name.cutLast()) as? MutableVisionGroup) ?: createGroups(name.cutLast())
-                parent[name.last()!!.asName()] = child
+                parent[name.tokens.last().asName()] = child
             }
         }
         childrenChanged(name, child)
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
index d4199657..0a5f27e5 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
@@ -8,20 +8,23 @@ import hep.dataforge.names.asName
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.MapSerializer
 import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
 /**
  * A container for styles
  */
 @Serializable
-class StyleSheet private constructor(private val styleMap: MutableMap<String, Meta> = LinkedHashMap()) {
+public class StyleSheet private constructor(private val styleMap: MutableMap<String, Meta> = LinkedHashMap()) {
     @Transient
     internal var owner: Vision? = null
 
-    constructor(owner: Vision) : this() {
+    public constructor(owner: Vision) : this() {
         this.owner = owner
     }
 
-    val items: Map<String, Meta> get() = styleMap
+    public val items: Map<String, Meta> get() = styleMap
 
 
     private fun Vision.styleChanged(key: String, oldStyle: Meta?, newStyle: Meta?) {
@@ -38,14 +41,14 @@ class StyleSheet private constructor(private val styleMap: MutableMap<String, Me
         }
     }
 
-    operator fun get(key: String): Meta? {
+    public operator fun get(key: String): Meta? {
         return styleMap[key] ?: owner?.parent?.styleSheet?.get(key)
     }
 
     /**
      * Define a style without notifying owner
      */
-    fun define(key: String, style: Meta?) {
+    public fun define(key: String, style: Meta?) {
         if (style == null) {
             styleMap.remove(key)
         } else {
@@ -56,7 +59,7 @@ class StyleSheet private constructor(private val styleMap: MutableMap<String, Me
     /**
      * Set or clear the style
      */
-    operator fun set(key: String, style: Meta?) {
+    public operator fun set(key: String, style: Meta?) {
         val oldStyle = styleMap[key]
         define(key, style)
         owner?.styleChanged(key, oldStyle, style)
@@ -65,13 +68,14 @@ class StyleSheet private constructor(private val styleMap: MutableMap<String, Me
     /**
      * Create and set a style
      */
-    operator fun set(key: String, builder: MetaBuilder.() -> Unit) {
+    public operator fun set(key: String, builder: MetaBuilder.() -> Unit) {
         val newStyle = get(key)?.edit(builder) ?: Meta(builder)
         set(key, newStyle.seal())
     }
 
+    @ExperimentalSerializationApi
     @Serializer(StyleSheet::class)
-    companion object : KSerializer<StyleSheet> {
+    public companion object : KSerializer<StyleSheet> {
         private val mapSerializer = MapSerializer(String.serializer(), MetaSerializer)
         override val descriptor: SerialDescriptor get() = mapSerializer.descriptor
 
@@ -91,14 +95,14 @@ class StyleSheet private constructor(private val styleMap: MutableMap<String, Me
 /**
  * Add style name to the list of styles to be resolved later. The style with given name does not necessary exist at the moment.
  */
-fun Vision.useStyle(name: String) {
-    styles = properties[Vision.STYLE_KEY].stringList + name
+public fun Vision.useStyle(name: String) {
+    styles = (properties[Vision.STYLE_KEY]?.stringList ?: emptyList()) + name
 }
 
 /**
  * Resolve an item in all style layers
  */
-fun Vision.getStyleItems(name: Name): Sequence<MetaItem<*>> {
+public fun Vision.getStyleItems(name: Name): Sequence<MetaItem<*>> {
     return styles.asSequence().map {
         resolveStyle(it)
     }.map {
@@ -109,4 +113,4 @@ fun Vision.getStyleItems(name: Name): Sequence<MetaItem<*>> {
 /**
  * Collect all styles for this object in a single laminate
  */
-val Vision.allStyles: Laminate get() = Laminate(styles.mapNotNull(::resolveStyle))
\ No newline at end of file
+public val Vision.allStyles: Laminate get() = Laminate(styles.mapNotNull(::resolveStyle))
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 4d819910..7ccdd81e 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -5,7 +5,9 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.toName
 import hep.dataforge.provider.Type
+import hep.dataforge.values.asValue
 import hep.dataforge.vision.Vision.Companion.TYPE
+import hep.dataforge.vision.Vision.Companion.VISIBLE_KEY
 import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.Transient
 
@@ -13,28 +15,28 @@ import kotlinx.serialization.Transient
  * A root type for display hierarchy
  */
 @Type(TYPE)
-interface Vision : Configurable {
+public interface Vision : Configurable {
 
     /**
      * The parent object of this one. If null, this one is a root.
      */
     @Transient
-    var parent: VisionGroup?
+    public var parent: VisionGroup?
 
     /**
      * Nullable version of [config] used to check if this [Vision] has custom properties
      */
-    val properties: Config?
+    public val properties: Config?
 
     /**
      * All properties including styles and prototypes if present, including inherited ones
      */
-    fun getAllProperties(): Laminate
+    public fun getAllProperties(): Laminate
 
     /**
      * Get property (including styles). [inherit] toggles parent node property lookup
      */
-    fun getProperty(name: Name, inherit: Boolean): MetaItem<*>?
+    public fun getProperty(name: Name, inherit: Boolean): MetaItem<*>?
 
     /**
      * Ger a property including inherited values
@@ -44,46 +46,55 @@ interface Vision : Configurable {
     /**
      * Trigger property invalidation event. If [name] is empty, notify that the whole object is changed
      */
-    fun propertyChanged(name: Name): Unit
+    public fun propertyChanged(name: Name): Unit
 
     /**
      * Add listener triggering on property change
      */
-    fun onPropertyChange(owner: Any?, action: (Name) -> Unit): Unit
+    public fun onPropertyChange(owner: Any?, action: (Name) -> Unit): Unit
 
     /**
      * Remove change listeners with given owner.
      */
-    fun removeChangeListener(owner: Any?)
+    public fun removeChangeListener(owner: Any?)
 
     /**
      * List of names of styles applied to this object. Order matters. Not inherited.
      */
-    var styles: List<String>
-        get() =  properties[STYLE_KEY].stringList
+    public var styles: List<String>
+        get() =  properties[STYLE_KEY]?.stringList?: emptyList()
         set(value) {
             config[STYLE_KEY] = value
         }
 
-    companion object {
-        const val TYPE = "vision"
-        val STYLE_KEY = "@style".asName()
+    public companion object {
+        public const val TYPE: String = "vision"
+        public val STYLE_KEY: Name = "@style".asName()
 
         private val VISION_SERIALIZER = PolymorphicSerializer(Vision::class)
 
-        fun serializer() = VISION_SERIALIZER
+        public fun serializer(): PolymorphicSerializer<Vision> = VISION_SERIALIZER
+
+        public val VISIBLE_KEY: Name = "visible".asName()
     }
 }
 
 /**
  * Get [Vision] property using key as a String
  */
-fun Vision.getProperty(key: String, inherit: Boolean = true): MetaItem<*>? =
+public fun Vision.getProperty(key: String, inherit: Boolean = true): MetaItem<*>? =
     getProperty(key.toName(), inherit)
 
 /**
  * Find a style with given name for given [Vision]. The style is not necessary applied to this [Vision].
  */
-tailrec fun Vision.resolveStyle(name: String): Meta? =
+public tailrec fun Vision.resolveStyle(name: String): Meta? =
     (this as? VisionGroup)?.styleSheet?.get(name) ?: parent?.resolveStyle(name)
 
+
+/**
+ * Control visibility of the element
+ */
+public var Vision.visible: Boolean?
+    get() = getItem(VISIBLE_KEY).boolean
+    set(value) = setItem(VISIBLE_KEY, value?.asValue())
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
index 43b964f2..3035e18d 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
@@ -3,14 +3,18 @@ package hep.dataforge.vision
 import hep.dataforge.names.*
 import hep.dataforge.provider.Provider
 
+public interface VisionContainer<out V: Vision>{
+    public operator fun get(name: Name): V?
+}
+
 /**
  * Represents a group of [Vision] instances
  */
-interface VisionGroup : Provider, Vision {
+public interface VisionGroup : Provider, Vision, VisionContainer<Vision> {
     /**
      * A map of top level named children
      */
-    val children: Map<NameToken, Vision>
+    public val children: Map<NameToken, Vision>
 
     override val defaultTarget: String get() = Vision.TYPE
 
@@ -18,17 +22,17 @@ interface VisionGroup : Provider, Vision {
      * A stylesheet for this group and its descendants. Stylesheet is not applied directly,
      * but instead is just a repository for named configurations.
      */
-    val styleSheet: StyleSheet?
+    public val styleSheet: StyleSheet?
 
     /**
      * A map of direct children for specific target
      * (currently "visual" or "style")
      */
-    override fun provideTop(target: String): Map<Name, Any> =
+    override fun content(target: String): Map<Name, Any> =
         when (target) {
             Vision.TYPE -> children.flatMap { (key, value) ->
                 val res: Map<Name, Any> = if (value is VisionGroup) {
-                    value.provideTop(target).mapKeys { key + it.key }
+                    value.content(target).mapKeys { key + it.key }
                 } else {
                     mapOf(key.asName() to value)
                 }
@@ -38,18 +42,18 @@ interface VisionGroup : Provider, Vision {
             else -> emptyMap()
         }
 
-    operator fun get(name: Name): Vision? {
+    public override operator fun get(name: Name): Vision? {
         return when {
             name.isEmpty() -> this
-            name.length == 1 -> children[name.first()!!]
-            else -> (children[name.first()!!] as? VisionGroup)?.get(name.cutFirst())
+            name.length == 1 -> children[name.tokens.first()]
+            else -> (children[name.tokens.first()] as? VisionGroup)?.get(name.cutFirst())
         }
     }
 
     /**
      * A fix for serialization bug that writes all proper parents inside the tree after deserialization
      */
-    fun attachChildren() {
+    public fun attachChildren() {
         styleSheet?.owner = this
         children.values.forEach {
             it.parent = this
@@ -57,41 +61,45 @@ interface VisionGroup : Provider, Vision {
         }
     }
 
-    companion object {
-        const val STYLE_TARGET = "style"
+    public companion object {
+        public const val STYLE_TARGET: String = "style"
     }
 }
 
 /**
  * Iterate over children of this group
  */
-operator fun VisionGroup.iterator(): Iterator<Vision> = children.values.iterator()
+public operator fun VisionGroup.iterator(): Iterator<Vision> = children.values.iterator()
 
-val VisionGroup.isEmpty: Boolean get() = this.children.isEmpty()
+public val VisionGroup.isEmpty: Boolean get() = this.children.isEmpty()
+
+public interface VisionContainerBuilder<in V: Vision>{
+    public operator fun set(name: Name, child: V?)
+}
 
 /**
  * Mutable version of [VisionGroup]
  */
-interface MutableVisionGroup : VisionGroup {
+public interface MutableVisionGroup : VisionGroup, VisionContainerBuilder<Vision> {
 
     /**
      * Add listener for children structure change.
      * @param owner the handler to properly remove listeners
      * @param action First argument of the action is the name of changed child. Second argument is the new value of the object.
      */
-    fun onChildrenChange(owner: Any?, action: (Name, Vision?) -> Unit)
+    public fun onChildrenChange(owner: Any?, action: (Name, Vision?) -> Unit)
 
     /**
      * Remove children change listener
      */
-    fun removeChildrenChangeListener(owner: Any?)
+    public fun removeChildrenChangeListener(owner: Any?)
 
-    operator fun set(name: Name, child: Vision?)
+//    public operator fun set(name: Name, child: Vision?)
 }
 
-operator fun VisionGroup.get(str: String?): Vision? = get(str?.toName() ?: Name.EMPTY)
+public operator fun <V: Vision> VisionContainer<V>.get(str: String?): V? = get(str?.toName() ?: Name.EMPTY)
 
-operator fun MutableVisionGroup.set(token: NameToken, child: Vision?): Unit = set(token.asName(), child)
-operator fun MutableVisionGroup.set(key: String, child: Vision?): Unit = set(key.toName(), child)
+public operator fun <V: Vision>  VisionContainerBuilder<V>.set(token: NameToken, child: V?): Unit = set(token.asName(), child)
+public operator fun <V: Vision>  VisionContainerBuilder<V>.set(key: String, child: V?): Unit = set(key.toName(), child)
 
-fun MutableVisionGroup.removeAll() = children.keys.map { it.asName() }.forEach { this[it] = null }
\ No newline at end of file
+public fun MutableVisionGroup.removeAll(): Unit = children.keys.map { it.asName() }.forEach { this[it] = null }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
index 6bf7291c..39f7096f 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
@@ -3,35 +3,37 @@ package hep.dataforge.vision
 import hep.dataforge.context.*
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
+import hep.dataforge.names.Name
 import hep.dataforge.names.toName
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.KSerializer
-import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
-import kotlinx.serialization.modules.SerialModule
 import kotlinx.serialization.modules.SerializersModule
+import kotlinx.serialization.modules.polymorphic
+import kotlinx.serialization.modules.subclass
 import kotlin.reflect.KClass
 
 
 @DFExperimental
-interface VisionForm<T : Vision> {
-    val type: KClass<out T>
-    val serializer: KSerializer<T>
+public interface VisionForm<T : Vision> {
+    public val type: KClass<out T>
+    public val serializer: KSerializer<T>
 
-    val name get() = serializer.descriptor.serialName.toName()
+    public val name: Name
+        get() = serializer.descriptor.serialName.toName()
 
     /**
      * Apply a patch to given [Vision]
      */
-    fun patch(obj: T, meta: Meta)
+    public fun patch(obj: T, meta: Meta)
 
-    companion object {
-        const val TYPE = "visionForm"
+    public companion object {
+        public const val TYPE: String = "visionForm"
     }
 }
 
 @DFExperimental
-object SimpleGroupForm: VisionForm<SimpleVisionGroup>{
+public object SimpleGroupForm : VisionForm<SimpleVisionGroup> {
     override val type: KClass<out SimpleVisionGroup> = SimpleVisionGroup::class
     override val serializer: KSerializer<SimpleVisionGroup> = SimpleVisionGroup.serializer()
 
@@ -42,86 +44,93 @@ object SimpleGroupForm: VisionForm<SimpleVisionGroup>{
 }
 
 @DFExperimental
-fun <T : Vision> VisionForm<T>.visionToMeta(vision: T, module: SerialModule, descriptor: NodeDescriptor? = null): Meta {
-    val engine = Json(VisionManager.jsonConfiguration, module)
-    val json = engine.toJson<T>(serializer, vision)
+public fun <T : Vision> VisionForm<T>.visionToMeta(
+    vision: T,
+    module: SerializersModule,
+    descriptor: NodeDescriptor? = null,
+): Meta {
+    val engine = Json(VisionManager.jsonConfiguration) { serializersModule = module }
+    val json = engine.encodeToJsonElement(serializer, vision)
     return json.toMetaItem(descriptor).node!!
 }
 
 @DFExperimental
-fun <T : Vision> VisionForm<T>.buildVision(meta: Meta, module: SerialModule, descriptor: NodeDescriptor? = null): T {
-    val engine = Json(VisionManager.jsonConfiguration, module)
+public fun <T : Vision> VisionForm<T>.buildVision(
+    meta: Meta,
+    module: SerializersModule,
+    descriptor: NodeDescriptor? = null,
+): T {
+    val engine = Json(VisionManager.jsonConfiguration) { serializersModule = module }
     val json = meta.toJson(descriptor)
-    return engine.fromJson(serializer, json)
+    return engine.decodeFromJsonElement(serializer, json)
 }
 
 @DFExperimental
-class VisionManager(meta: Meta) : AbstractPlugin(meta) {
+public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
     override val tag: PluginTag get() = Companion.tag
 
     /**
      * Create a list of factories on first call and cache it
      */
     private val forms by lazy {
-        context.content<VisionForm<*>>(VisionForm.TYPE).mapKeys { it.value.type }
+        context.gather<VisionForm<*>>(VisionForm.TYPE).mapKeys { it.value.type }
     }
 
-    val visionSerialModule
+    public val visionSerialModule: SerializersModule
         get() = SerializersModule {
             include(defaultSerialModule)
-            context.content<SerialModule>(VISION_SERIAL_MODULE_TARGET).values.forEach {
+            context.gather<SerializersModule>(VISION_SERIAL_MODULE_TARGET).values.forEach {
                 include(it)
             }
         }
 
     @Suppress("UNCHECKED_CAST")
-    fun <T : Vision> resolveVisionForm(type: KClass<out T>): VisionForm<T>? =
+    public fun <T : Vision> resolveVisionForm(type: KClass<out T>): VisionForm<T> =
         forms[type] as VisionForm<T>
 
-    inline fun <reified T : Vision> buildSpecificVision(meta: Meta): T {
+    public inline fun <reified T : Vision> buildSpecificVision(meta: Meta): T {
         val factory = resolveVisionForm(T::class) ?: error("Could not resolve a form for ${meta["type"].string}")
         return factory.buildVision(meta, visionSerialModule)
     }
 
-    fun buildVision(meta: Meta): Vision {
+    @OptIn(ExperimentalSerializationApi::class)
+    public fun buildVision(meta: Meta): Vision {
         val type = meta["type"].string ?: Vision.serializer().descriptor.serialName
         val form = forms.values.find { it.name.toString() == type } ?: error("Could not resolve a form for type $type")
         return form.buildVision(meta, visionSerialModule)
     }
 
-    fun <T : Vision> writeVisionToMeta(vision: T): Meta {
+    public fun <T : Vision> writeVisionToMeta(vision: T): Meta {
         val form = resolveVisionForm(vision::class) ?: error("Could not resolve a form for $vision")
-        val engine = Json(VisionManager.jsonConfiguration, visionSerialModule)
-        val json = engine.toJson(form.serializer,vision)
+        val engine = Json(jsonConfiguration) { serializersModule = visionSerialModule }
+        val json = engine.encodeToJsonElement(form.serializer, vision)
         return json.toMetaItem().node!!
     }
 
-    fun patchVision(vision: Vision, meta: Meta) {
+    public fun patchVision(vision: Vision, meta: Meta) {
         val form = resolveVisionForm(vision::class) ?: error("Could not resolve a form for $vision")
         form.patch(vision, meta)
     }
 
-    companion object : PluginFactory<VisionManager> {
+    public companion object : PluginFactory<VisionManager> {
         override val tag: PluginTag = PluginTag(name = "vision", group = PluginTag.DATAFORGE_GROUP)
         override val type: KClass<out VisionManager> = VisionManager::class
 
-        const val VISION_SERIAL_MODULE_TARGET = "visionSerialModule"
+        public const val VISION_SERIAL_MODULE_TARGET: String = "visionSerialModule"
 
         override fun invoke(meta: Meta, context: Context): VisionManager = VisionManager(meta)
 
-        @OptIn(UnstableDefault::class)
-        val jsonConfiguration = JsonConfiguration(
-            prettyPrint = true,
-            useArrayPolymorphism = false,
-            encodeDefaults = false,
+        public val jsonConfiguration: Json = Json {
+            prettyPrint = true
+            useArrayPolymorphism = false
+            encodeDefaults = false
             ignoreUnknownKeys = true
-        )
+        }
 
-        val defaultSerialModule = SerializersModule {
-            polymorphic(Vision::class, VisionGroup::class) {
+        public val defaultSerialModule: SerializersModule = SerializersModule {
+            polymorphic(Vision::class) {
                 subclass(SimpleVisionGroup.serializer())
             }
         }
-
     }
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/valueWidget.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/valueWidget.kt
index 4edc70e4..f563d87c 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/valueWidget.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/valueWidget.kt
@@ -1,27 +1,27 @@
 package hep.dataforge.vision
 
-import hep.dataforge.meta.Meta
+import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.ValueDescriptor
-import hep.dataforge.meta.descriptors.setAttribute
-import hep.dataforge.meta.get
-import hep.dataforge.meta.node
-import hep.dataforge.meta.string
-import hep.dataforge.names.toName
+import hep.dataforge.meta.descriptors.attributes
 
 /**
  * Extension property to access the "widget" key of [ValueDescriptor]
  */
-var ValueDescriptor.widget: Meta
+public var ValueDescriptor.widget: Meta
     get() = attributes["widget"].node ?: Meta.EMPTY
     set(value) {
-        setAttribute("widget".toName(), value)
+        attributes {
+            set("widget", value)
+        }
     }
 
 /**
  * Extension property to access the "widget.type" key of [ValueDescriptor]
  */
-var ValueDescriptor.widgetType: String?
+public var ValueDescriptor.widgetType: String?
     get() = attributes["widget.type"].string
     set(value) {
-        setAttribute("widget.type".toName(), value)
+        attributes{
+            set("widget.type", value)
+        }
     }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/StatisticsVisitor.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/StatisticsVisitor.kt
index 21842994..89877fe6 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/StatisticsVisitor.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/StatisticsVisitor.kt
@@ -1,6 +1,7 @@
 package hep.dataforge.vision.visitor
 
 import hep.dataforge.names.Name
+import hep.dataforge.names.length
 import hep.dataforge.vision.Vision
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/FXMeta.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/FXMeta.kt
index 04d954b6..84a286ed 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/FXMeta.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/FXMeta.kt
@@ -4,10 +4,7 @@ import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.ItemDescriptor
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.descriptors.ValueDescriptor
-import hep.dataforge.names.Name
-import hep.dataforge.names.NameToken
-import hep.dataforge.names.asName
-import hep.dataforge.names.withIndex
+import hep.dataforge.names.*
 import hep.dataforge.values.Null
 import hep.dataforge.values.Value
 import javafx.beans.binding.ListBinding
@@ -137,12 +134,12 @@ class FXMetaNode<M : MetaNode<M>>(
     }
 }
 
-class FXMetaValue<M : MetaNode<M>>(
+public class FXMetaValue<M : MetaNode<M>>(
     override val name: NameToken,
     override val parent: FXMetaNode<M>
 ) : FXMeta<M>() {
 
-    val descriptorProperty = parent.descriptorProperty.objectBinding {
+    public val descriptorProperty = parent.descriptorProperty.objectBinding {
         it?.values?.get(name.body)
     }
 
@@ -153,24 +150,24 @@ class FXMetaValue<M : MetaNode<M>>(
 
     //private val innerValueProperty = SimpleObjectProperty(value)
 
-    val valueProperty = descriptorProperty.objectBinding { descriptor ->
+    public val valueProperty = descriptorProperty.objectBinding { descriptor ->
         parent.node[name].value ?: descriptor?.default
     }
 
     override val hasValue: ObservableBooleanValue = parent.nodeProperty.booleanBinding { it[name] != null }
 
-    val value by valueProperty
+    public val value by valueProperty
 
     override val descriptionProperty = descriptorProperty.stringBinding { it?.info ?: "" }
 }
 
-fun <M : MutableMeta<M>> FXMetaNode<M>.remove(name: NameToken) {
+public fun <M : MutableMeta<M>> FXMetaNode<M>.remove(name: NameToken) {
     node?.remove(name.asName())
     children.invalidate()
 }
 
 private fun <M : MutableMeta<M>> M.createEmptyNode(token: NameToken, append: Boolean): M {
-    return if (append && token.index.isNotEmpty()) {
+    return if (append && token.hasIndex()) {
         val name = token.asName()
         val index = (getIndexed(name).keys.mapNotNull { it.toIntOrNull() }.max() ?: -1) + 1
         val newName = name.withIndex(index.toString())
diff --git a/visionforge-gdml/build.gradle.kts b/visionforge-gdml/build.gradle.kts
index 874523ac..ebb6a865 100644
--- a/visionforge-gdml/build.gradle.kts
+++ b/visionforge-gdml/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("scientifik.mpp")
+    id("ru.mipt.npm.mpp")
 }
 
 kotlin {
@@ -7,7 +7,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 api(project(":visionforge-solid"))
-                api("scientifik:gdml:0.1.8")
+                api("kscience.gdml:gdml:0.2.0-dev-2")
             }
         }
     }
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
index ceecd768..3995c92f 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
@@ -12,7 +12,7 @@ import hep.dataforge.vision.set
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
 import hep.dataforge.vision.useStyle
-import scientifik.gdml.*
+import kscience.gdml.*
 import kotlin.math.cos
 import kotlin.math.sin
 import kotlin.random.Random
@@ -20,7 +20,7 @@ import kotlin.random.Random
 private val solidsName = "solids".asName()
 private val volumesName = "volumes".asName()
 
-class GDMLTransformer internal constructor(val root: GDML) {
+public class GDMLTransformer internal constructor(val root: GDML) {
     //private val materialCache = HashMap<GDMLMaterial, Meta>()
     private val random = Random(222)
 
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/units.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/units.kt
deleted file mode 100644
index 3e5783ef..00000000
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/units.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-package hep.dataforge.vision.gdml
-
-import scientifik.gdml.AUnit
-import scientifik.gdml.GDMLPosition
-import scientifik.gdml.GDMLRotation
-import scientifik.gdml.GDMLSolid
-
-enum class LUnit(val value: Float) {
-    MM(1f),
-    CM(10f),
-    M(1000f)
-}
-
-fun GDMLPosition.unit(): LUnit = LUnit.valueOf(unit.toUpperCase())
-
-fun GDMLPosition.x(unit: LUnit): Float = if (unit.name == this.unit) {
-    x.toFloat()
-} else {
-    x.toFloat() / unit.value * unit().value
-}
-
-fun GDMLPosition.y(unit: LUnit): Float = if (unit.name == this.unit) {
-    y.toFloat()
-} else {
-    y.toFloat() / unit.value * unit().value
-}
-
-fun GDMLPosition.z(unit: LUnit): Float = if (unit.name == this.unit) {
-    z.toFloat()
-} else {
-    z.toFloat() / unit.value * unit().value
-}
-
-fun GDMLRotation.unit(): AUnit = AUnit.valueOf(unit.toUpperCase())
-
-fun GDMLRotation.x(unit: AUnit = AUnit.RAD): Float = if (unit.name == this.unit) {
-    x.toFloat()
-} else {
-    x.toFloat() / unit.value * unit().value
-}
-
-fun GDMLRotation.y(unit: AUnit = AUnit.RAD): Float = if (unit.name == this.unit) {
-    y.toFloat()
-} else {
-    y.toFloat() / unit.value * unit().value
-}
-
-fun GDMLRotation.z(unit: AUnit = AUnit.RAD): Float = if (unit.name == this.unit) {
-    z.toFloat()
-} else {
-    z.toFloat() / unit.value * unit().value
-}
-
-fun GDMLSolid.lscale(unit: LUnit): Float {
-    val solidUnit = lunit?.let { LUnit.valueOf(it.toUpperCase()) } ?: return 1f
-    return if (solidUnit == unit) {
-        1f
-    } else {
-        solidUnit.value / unit.value
-    }
-}
-
-fun GDMLSolid.ascale(unit: AUnit = AUnit.RAD): Float {
-    val solidUnit = aunit?.let { AUnit.valueOf(it.toUpperCase()) } ?: return 1f
-    return if (solidUnit == unit) {
-        1f
-    } else {
-        solidUnit.value / unit.value
-    }
-}
\ No newline at end of file
diff --git a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt b/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
index 1718cc74..ab58deb9 100644
--- a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
+++ b/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
@@ -2,7 +2,7 @@ package hep.dataforge.vision.gdml
 
 import hep.dataforge.vision.solid.SolidGroup
 import nl.adaptivity.xmlutil.StAXReader
-import scientifik.gdml.GDML
+import kscience.gdml.GDML
 import java.nio.file.Files
 import java.nio.file.Path
 import java.util.concurrent.atomic.AtomicInteger
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
index 287553a1..cf9fb7b4 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
@@ -1,9 +1,9 @@
 package hep.dataforge.vision.gdml
 
-import hep.dataforge.vision.solid.stringify
+import hep.dataforge.vision.solid.encodeToString
 import nl.adaptivity.xmlutil.StAXReader
 import org.junit.jupiter.api.Test
-import scientifik.gdml.GDML
+import kscience.gdml.GDML
 
 class TestConvertor {
 
@@ -13,7 +13,7 @@ class TestConvertor {
         val xmlReader = StAXReader(stream, "UTF-8")
         val xml = GDML.format.parse(GDML.serializer(), xmlReader)
         val vision = xml.toVision()
-        println(vision.stringify())
+        println(vision.encodeToString())
     }
 
     @Test
@@ -33,6 +33,6 @@ class TestConvertor {
         val xmlReader = StAXReader(stream, "UTF-8")
         val xml = GDML.format.parse(GDML.serializer(), xmlReader)
         val visual = xml.toVision()
-        println(visual.stringify())
+        println(visual.encodeToString())
     }
 }
\ No newline at end of file
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
index d737d2ae..87b93093 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
@@ -8,7 +8,7 @@ import hep.dataforge.vision.visitor.flowStatistics
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import nl.adaptivity.xmlutil.StAXReader
-import scientifik.gdml.GDML
+import kscience.gdml.GDML
 import java.io.File
 import kotlin.reflect.KClass
 
diff --git a/visionforge-solid/build.gradle.kts b/visionforge-solid/build.gradle.kts
index 722cd2f3..7f08e038 100644
--- a/visionforge-solid/build.gradle.kts
+++ b/visionforge-solid/build.gradle.kts
@@ -1,15 +1,14 @@
-import scientifik.useSerialization
+import ru.mipt.npm.gradle.KScienceVersions.coroutinesVersion
 
 plugins {
-    id("scientifik.mpp")
+    id("ru.mipt.npm.mpp")
 }
 
-useSerialization()
+kscience {
+    useSerialization()
+}
 
 kotlin {
-    js {
-        useCommonJs()
-    }
 
     sourceSets {
         commonMain {
@@ -22,7 +21,7 @@ kotlin {
                 api("org.fxyz3d:fxyz3d:0.5.2") {
                     exclude(module = "slf4j-simple")
                 }
-                api("org.jetbrains.kotlinx:kotlinx-coroutines-javafx:${Scientifik.coroutinesVersion}")
+                api("org.jetbrains.kotlinx:kotlinx-coroutines-javafx:${coroutinesVersion}")
                 implementation("eu.mihosoft.vrl.jcsg:jcsg:0.5.7") {
                     exclude(module = "slf4j-simple")
                 }
@@ -37,4 +36,4 @@ kotlin {
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
index 1f05d4ef..5bd6aef5 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
@@ -5,6 +5,7 @@ package hep.dataforge.vision.solid
 import hep.dataforge.meta.Config
 import hep.dataforge.vision.AbstractVision
 import hep.dataforge.vision.MutableVisionGroup
+import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import hep.dataforge.vision.solid.Solid.Companion.solidEquals
 import kotlinx.serialization.SerialName
@@ -13,10 +14,10 @@ import kotlinx.serialization.UseSerializers
 
 @Serializable
 @SerialName("solid.box")
-class Box(
-    val xSize: Float,
-    val ySize: Float,
-    val zSize: Float
+public class Box(
+    public val xSize: Float,
+    public val ySize: Float,
+    public val zSize: Float
 ) : AbstractVision(), GeometrySolid {
 
     override var position: Point3D? = null
@@ -67,15 +68,15 @@ class Box(
     }
 
 
-    companion object {
+    public companion object {
 
     }
 }
 
-inline fun MutableVisionGroup.box(
+public inline fun VisionContainerBuilder<Solid>.box(
     xSize: Number,
     ySize: Number,
     zSize: Number,
     name: String = "",
     action: Box.() -> Unit = {}
-) = Box(xSize.toFloat(), ySize.toFloat(), zSize.toFloat()).apply(action).also { set(name, it) }
\ No newline at end of file
+): Box = Box(xSize.toFloat(), ySize.toFloat(), zSize.toFloat()).apply(action).also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
index d2049226..06da6e07 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
@@ -10,7 +10,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers
 
-enum class CompositeType {
+public enum class CompositeType {
     UNION,
     INTERSECT,
     SUBTRACT
@@ -18,10 +18,10 @@ enum class CompositeType {
 
 @Serializable
 @SerialName("solid.composite")
-class Composite(
-    val compositeType: CompositeType,
-    val first: Solid,
-    val second: Solid
+public class Composite(
+    public val compositeType: CompositeType,
+    public val first: Solid,
+    public val second: Solid
 ) : AbstractVision(), Solid, VisionGroup {
 
     init {
@@ -42,7 +42,7 @@ class Composite(
         get() = null
 }
 
-inline fun MutableVisionGroup.composite(
+public inline fun MutableVisionGroup.composite(
     type: CompositeType,
     name: String = "",
     builder: SolidGroup.() -> Unit
@@ -67,11 +67,11 @@ inline fun MutableVisionGroup.composite(
     }
 }
 
-inline fun MutableVisionGroup.union(name: String = "", builder: SolidGroup.() -> Unit) =
+public inline fun MutableVisionGroup.union(name: String = "", builder: SolidGroup.() -> Unit): Composite =
     composite(CompositeType.UNION, name, builder = builder)
 
-inline fun MutableVisionGroup.subtract(name: String = "", builder: SolidGroup.() -> Unit) =
+public inline fun MutableVisionGroup.subtract(name: String = "", builder: SolidGroup.() -> Unit): Composite =
     composite(CompositeType.SUBTRACT, name, builder = builder)
 
-inline fun MutableVisionGroup.intersect(name: String = "", builder: SolidGroup.() -> Unit) =
+public inline fun MutableVisionGroup.intersect(name: String = "", builder: SolidGroup.() -> Unit): Composite =
     composite(CompositeType.INTERSECT, name, builder = builder)
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
index 805151c9..428e6271 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
@@ -5,6 +5,7 @@ package hep.dataforge.vision.solid
 import hep.dataforge.meta.Config
 import hep.dataforge.vision.AbstractVision
 import hep.dataforge.vision.MutableVisionGroup
+import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -17,12 +18,12 @@ import kotlin.math.sin
  */
 @Serializable
 @SerialName("solid.cone")
-class ConeSegment(
-    var radius: Float,
-    var height: Float,
-    var upperRadius: Float,
-    var startAngle: Float = 0f,
-    var angle: Float = PI2
+public class ConeSegment(
+    public var radius: Float,
+    public var height: Float,
+    public var upperRadius: Float,
+    public var startAngle: Float = 0f,
+    public var angle: Float = PI2
 ) : AbstractVision(), GeometrySolid {
 
     override var properties: Config? = null
@@ -75,7 +76,7 @@ class ConeSegment(
 
 }
 
-inline fun MutableVisionGroup.cylinder(
+public inline fun VisionContainerBuilder<Solid>.cylinder(
     r: Number,
     height: Number,
     name: String = "",
@@ -87,7 +88,7 @@ inline fun MutableVisionGroup.cylinder(
 ).apply(block).also { set(name, it) }
 
 
-inline fun MutableVisionGroup.cone(
+public inline fun VisionContainerBuilder<Solid>.cone(
     bottomRadius: Number,
     height: Number,
     upperRadius: Number = 0.0,
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
index ad17c532..fd2b0389 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
@@ -5,6 +5,7 @@ package hep.dataforge.vision.solid
 import hep.dataforge.meta.Config
 import hep.dataforge.vision.AbstractVision
 import hep.dataforge.vision.MutableVisionGroup
+import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -12,7 +13,7 @@ import kotlinx.serialization.UseSerializers
 
 @Serializable
 @SerialName("solid.convex")
-class Convex(val points: List<Point3D>) : AbstractVision(), Solid {
+public class Convex(public val points: List<Point3D>) : AbstractVision(), Solid {
 
     override var properties: Config? = null
 
@@ -23,17 +24,17 @@ class Convex(val points: List<Point3D>) : AbstractVision(), Solid {
 
 }
 
-inline fun MutableVisionGroup.convex(name: String = "", action: ConvexBuilder.() -> Unit = {}) =
+public inline fun VisionContainerBuilder<Solid>.convex(name: String = "", action: ConvexBuilder.() -> Unit = {}): Convex =
     ConvexBuilder().apply(action).build().also { set(name, it) }
 
-class ConvexBuilder {
+public class ConvexBuilder {
     private val points = ArrayList<Point3D>()
 
-    fun point(x: Number, y: Number, z: Number) {
+    public fun point(x: Number, y: Number, z: Number) {
         points.add(Point3D(x, y, z))
     }
 
-    fun build(): Convex {
+    public fun build(): Convex {
         return Convex(points)
     }
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
index e7f92a57..8ca27740 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
@@ -4,6 +4,7 @@ package hep.dataforge.vision.solid
 import hep.dataforge.meta.Config
 import hep.dataforge.vision.AbstractVision
 import hep.dataforge.vision.MutableVisionGroup
+import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -13,21 +14,21 @@ import kotlin.math.cos
 import kotlin.math.sin
 
 
-typealias Shape2D = List<Point2D>
+public typealias Shape2D = List<Point2D>
 
 @Serializable
-class Shape2DBuilder(private val points: MutableList<Point2D> = ArrayList()) {
+public class Shape2DBuilder(private val points: MutableList<Point2D> = ArrayList()) {
 
-    fun point(x: Number, y: Number) {
+    public fun point(x: Number, y: Number) {
         points.add(Point2D(x, y))
     }
 
-    infix fun Number.to(y: Number) = point(this, y)
+    public infix fun Number.to(y: Number): Unit = point(this, y)
 
-    fun build(): Shape2D = points
+    public fun build(): Shape2D = points
 }
 
-fun Shape2DBuilder.polygon(vertices: Int, radius: Number) {
+public fun Shape2DBuilder.polygon(vertices: Int, radius: Number) {
     require(vertices > 2) { "Polygon must have more than 2 vertices" }
     val angle = 2 * PI / vertices
     for (i in 0 until vertices) {
@@ -36,13 +37,13 @@ fun Shape2DBuilder.polygon(vertices: Int, radius: Number) {
 }
 
 @Serializable
-data class Layer(var x: Float, var y: Float, var z: Float, var scale: Float)
+public data class Layer(var x: Float, var y: Float, var z: Float, var scale: Float)
 
 @Serializable
 @SerialName("solid.extrude")
-class Extruded(
-    var shape: List<Point2D> = ArrayList(),
-    var layers: MutableList<Layer> = ArrayList()
+public class Extruded(
+    public var shape: List<Point2D> = ArrayList(),
+    public var layers: MutableList<Layer> = ArrayList()
 ) : AbstractVision(), GeometrySolid {
 
     override var properties: Config? = null
@@ -51,12 +52,12 @@ class Extruded(
     override var rotation: Point3D? = null
     override var scale: Point3D? = null
 
-    fun shape(block: Shape2DBuilder.() -> Unit) {
+    public fun shape(block: Shape2DBuilder.() -> Unit) {
         this.shape = Shape2DBuilder().apply(block).build()
         //TODO send invalidation signal
     }
 
-    fun layer(z: Number, x: Number = 0.0, y: Number = 0.0, scale: Number = 1.0) {
+    public fun layer(z: Number, x: Number = 0.0, y: Number = 0.0, scale: Number = 1.0) {
         layers.add(Layer(x.toFloat(), y.toFloat(), z.toFloat(), scale.toFloat()))
         //TODO send invalidation signal
     }
@@ -107,10 +108,10 @@ class Extruded(
         geometryBuilder.cap(layers.last())
     }
 
-    companion object {
-        const val TYPE = "geometry.3d.extruded"
+    public companion object {
+        public const val TYPE: String = "solid.extruded"
     }
 }
 
-fun MutableVisionGroup.extrude(name: String = "", action: Extruded.() -> Unit = {}) =
+public fun VisionContainerBuilder<Solid>.extrude(name: String = "", action: Extruded.() -> Unit = {}): Extruded =
     Extruded().apply(action).also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/GeometryBuilder.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/GeometryBuilder.kt
index b813da89..5d06ea2a 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/GeometryBuilder.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/GeometryBuilder.kt
@@ -5,7 +5,7 @@ import hep.dataforge.meta.Meta
 /**
  * @param T the type of resulting geometry
  */
-interface GeometryBuilder<T : Any> {
+public interface GeometryBuilder<T : Any> {
     /**
      * Add a face to 3D model. If one of the vertices is not present in the current geometry model list of vertices,
      * it is added automatically.
@@ -13,12 +13,12 @@ interface GeometryBuilder<T : Any> {
      * @param normal optional external normal to the face
      * @param meta optional additional platform-specific parameters like color or texture index
      */
-    fun face(vertex1: Point3D, vertex2: Point3D, vertex3: Point3D, normal: Point3D? = null, meta: Meta = Meta.EMPTY)
+    public fun face(vertex1: Point3D, vertex2: Point3D, vertex3: Point3D, normal: Point3D? = null, meta: Meta = Meta.EMPTY)
 
-    fun build(): T
+    public fun build(): T
 }
 
-fun GeometryBuilder<*>.face4(
+public fun GeometryBuilder<*>.face4(
     vertex1: Point3D,
     vertex2: Point3D,
     vertex3: Point3D,
@@ -33,11 +33,11 @@ fun GeometryBuilder<*>.face4(
 /**
  * [GeometrySolid] is a [Solid] that can represent its own geometry as a set of polygons.
  */
-interface GeometrySolid : Solid {
-    fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>)
+public interface GeometrySolid : Solid {
+    public fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>)
 }
 
-fun <T : Any> GeometryBuilder<T>.cap(shape: List<Point3D>, normal: Point3D? = null) {
+public fun <T : Any> GeometryBuilder<T>.cap(shape: List<Point3D>, normal: Point3D? = null) {
     //FIXME won't work for non-convex shapes
     val center = Point3D(
         shape.map { it.x }.average(),
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
index 280e6b9b..67e22080 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
@@ -4,10 +4,12 @@ package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.Config
 import hep.dataforge.meta.number
+import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
 import hep.dataforge.vision.AbstractVision
 import hep.dataforge.vision.MutableVisionGroup
+import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -15,7 +17,7 @@ import kotlinx.serialization.UseSerializers
 
 @Serializable
 @SerialName("solid.line")
-class PolyLine(var points: List<Point3D>) : AbstractVision(), Solid {
+public class PolyLine(public var points: List<Point3D>) : AbstractVision(), Solid {
     override var properties: Config? = null
 
     override var position: Point3D? = null
@@ -23,13 +25,13 @@ class PolyLine(var points: List<Point3D>) : AbstractVision(), Solid {
     override var scale: Point3D? = null
 
     //var lineType by string()
-    var thickness by number(1.0, key = SolidMaterial.MATERIAL_KEY + THICKNESS_KEY)
+    public var thickness: Number by number(1.0, key = SolidMaterial.MATERIAL_KEY + THICKNESS_KEY)
 
-    companion object {
-        val THICKNESS_KEY = "thickness".asName()
+    public companion object {
+        public val THICKNESS_KEY: Name = "thickness".asName()
     }
 
 }
 
-fun MutableVisionGroup.polyline(vararg points: Point3D, name: String = "", action: PolyLine.() -> Unit = {}) =
+public fun VisionContainerBuilder<Solid>.polyline(vararg points: Point3D, name: String = "", action: PolyLine.() -> Unit = {}): PolyLine =
     PolyLine(points.toList()).apply(action).also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
index bf2369a7..cc56f827 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
@@ -12,8 +12,8 @@ import kotlinx.serialization.Transient
 import kotlinx.serialization.UseSerializers
 import kotlin.collections.set
 
-abstract class AbstractProxy : AbstractVision(), VisionGroup {
-    abstract val prototype: Vision
+public abstract class AbstractProxy : AbstractVision(), VisionGroup {
+    public abstract val prototype: Vision
 
     override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? {
         return if (inherit) {
@@ -33,7 +33,7 @@ abstract class AbstractProxy : AbstractVision(), VisionGroup {
     }
 
     override var styles: List<String>
-        get() = properties[Vision.STYLE_KEY].stringList + prototype.styles
+        get() = (properties[Vision.STYLE_KEY]?.stringList ?: emptyList()) + prototype.styles
         set(value) {
             config[Vision.STYLE_KEY] = value
         }
@@ -53,11 +53,11 @@ abstract class AbstractProxy : AbstractVision(), VisionGroup {
  */
 @Serializable
 @SerialName("solid.proxy")
-class Proxy private constructor(
-    val templateName: Name
+public class Proxy private constructor(
+    public val templateName: Name
 ) : AbstractProxy(), Solid {
 
-    constructor(parent: SolidGroup, templateName: Name) : this(templateName) {
+    public constructor(parent: SolidGroup, templateName: Name) : this(templateName) {
         this.parent = parent
     }
 
@@ -104,7 +104,7 @@ class Proxy private constructor(
      * A ProxyChild is created temporarily only to interact with properties, it does not store any values
      * (properties are stored in external cache) and created and destroyed on-demand).
      */
-    inner class ProxyChild(val name: Name) : AbstractProxy() {
+    public inner class ProxyChild(public val name: Name) : AbstractProxy() {
 
         override val prototype: Vision get() = prototypeFor(name)
 
@@ -136,12 +136,15 @@ class Proxy private constructor(
 
     }
 
-    companion object {
-        const val PROXY_CHILD_PROPERTY_PREFIX = "@child"
+    public companion object {
+        public const val PROXY_CHILD_PROPERTY_PREFIX: String = "@child"
     }
 }
 
-val Vision.prototype: Vision
+/**
+ * Get a vision prototype if it is a [Proxy] or vision itself if it is not
+ */
+public val Vision.prototype: Vision
     get() = when (this) {
         is AbstractProxy -> prototype
         else -> this
@@ -150,7 +153,7 @@ val Vision.prototype: Vision
 /**
  * Create ref for existing prototype
  */
-fun SolidGroup.ref(
+public fun SolidGroup.ref(
     templateName: Name,
     name: String = ""
 ): Proxy = Proxy(this, templateName).also { set(name, it) }
@@ -158,7 +161,7 @@ fun SolidGroup.ref(
 /**
  * Add new proxy wrapping given object and automatically adding it to the prototypes
  */
-fun SolidGroup.proxy(
+public fun SolidGroup.proxy(
     name: String,
     obj: Solid,
     templateName: Name = name.toName()
@@ -173,12 +176,3 @@ fun SolidGroup.proxy(
     }
     return ref(templateName, name)
 }
-
-fun SolidGroup.proxyGroup(
-    name: String,
-    templateName: Name = name.toName(),
-    block: MutableVisionGroup.() -> Unit
-): Proxy {
-    val group = SolidGroup().apply(block)
-    return proxy(name, group, templateName)
-}
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
index 721d38ee..fce83d6d 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
@@ -4,65 +4,63 @@ package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
+import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
 import hep.dataforge.output.Renderer
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.asValue
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.Vision.Companion.VISIBLE_KEY
 import hep.dataforge.vision.enum
 import hep.dataforge.vision.solid.Solid.Companion.DETAIL_KEY
 import hep.dataforge.vision.solid.Solid.Companion.IGNORE_KEY
 import hep.dataforge.vision.solid.Solid.Companion.LAYER_KEY
-import hep.dataforge.vision.solid.Solid.Companion.VISIBLE_KEY
 import kotlinx.serialization.UseSerializers
 
 /**
  * Interface for 3-dimensional [Vision]
  */
-interface Solid : Vision {
-    var position: Point3D?
-    var rotation: Point3D?
-    var scale: Point3D?
+public interface Solid : Vision {
+    public var position: Point3D?
+    public var rotation: Point3D?
+    public var scale: Point3D?
 
     override val descriptor: NodeDescriptor? get() = Companion.descriptor
 
-    companion object {
-
-        val VISIBLE_KEY = "visible".asName()
-
+    public companion object {
         //        val SELECTED_KEY = "selected".asName()
-        val DETAIL_KEY = "detail".asName()
-        val LAYER_KEY = "layer".asName()
-        val IGNORE_KEY = "ignore".asName()
+        public val DETAIL_KEY: Name = "detail".asName()
+        public val LAYER_KEY: Name = "layer".asName()
+        public val IGNORE_KEY: Name = "ignore".asName()
 
-        val GEOMETRY_KEY = "geometry".asName()
+        public val GEOMETRY_KEY: Name = "geometry".asName()
 
-        val X_KEY = "x".asName()
-        val Y_KEY = "y".asName()
-        val Z_KEY = "z".asName()
+        public val X_KEY: Name = "x".asName()
+        public val Y_KEY: Name = "y".asName()
+        public val Z_KEY: Name = "z".asName()
 
-        val POSITION_KEY = "pos".asName()
+        public val POSITION_KEY: Name = "pos".asName()
 
-        val X_POSITION_KEY = POSITION_KEY + X_KEY
-        val Y_POSITION_KEY = POSITION_KEY + Y_KEY
-        val Z_POSITION_KEY = POSITION_KEY + Z_KEY
+        public val X_POSITION_KEY: Name = POSITION_KEY + X_KEY
+        public val Y_POSITION_KEY: Name = POSITION_KEY + Y_KEY
+        public val Z_POSITION_KEY: Name = POSITION_KEY + Z_KEY
 
-        val ROTATION = "rotation".asName()
+        public val ROTATION: Name = "rotation".asName()
 
-        val X_ROTATION_KEY = ROTATION + X_KEY
-        val Y_ROTATION_KEY = ROTATION + Y_KEY
-        val Z_ROTATION_KEY = ROTATION + Z_KEY
+        public val X_ROTATION_KEY: Name = ROTATION + X_KEY
+        public val Y_ROTATION_KEY: Name = ROTATION + Y_KEY
+        public val Z_ROTATION_KEY: Name = ROTATION + Z_KEY
 
-        val ROTATION_ORDER_KEY = ROTATION + "order"
+        public val ROTATION_ORDER_KEY: Name = ROTATION + "order"
 
-        val SCALE_KEY = "scale".asName()
+        public val SCALE_KEY: Name = "scale".asName()
 
-        val X_SCALE_KEY = SCALE_KEY + X_KEY
-        val Y_SCALE_KEY = SCALE_KEY + Y_KEY
-        val Z_SCALE_KEY = SCALE_KEY + Z_KEY
+        public val X_SCALE_KEY: Name = SCALE_KEY + X_KEY
+        public val Y_SCALE_KEY: Name = SCALE_KEY + Y_KEY
+        public val Z_SCALE_KEY: Name = SCALE_KEY + Z_KEY
 
-        val descriptor by lazy {
+        public val descriptor: NodeDescriptor by lazy {
             NodeDescriptor {
                 value(VISIBLE_KEY) {
                     type(ValueType.BOOLEAN)
@@ -100,20 +98,20 @@ interface Solid : Vision {
 }
 
 /**
- * Count number of layers to the top object. Return 1 if this is top layer
+ * Get the layer number this solid belongs to. Return 0 if layer is not defined.
  */
-var Solid.layer: Int
+public var Solid.layer: Int
     get() = properties?.getItem(LAYER_KEY).int ?: 0
     set(value) {
         config[LAYER_KEY] = value.asValue()
     }
 
-fun Renderer<Solid>.render(meta: Meta = Meta.EMPTY, action: SolidGroup.() -> Unit) =
+public fun Renderer<Solid>.render(meta: Meta = Meta.EMPTY, action: SolidGroup.() -> Unit): Unit =
     render(SolidGroup().apply(action), meta)
 
 // Common properties
 
-enum class RotationOrder {
+public enum class RotationOrder {
     XYZ,
     YZX,
     ZXY,
@@ -125,7 +123,7 @@ enum class RotationOrder {
 /**
  * Rotation order
  */
-var Solid.rotationOrder: RotationOrder
+public var Solid.rotationOrder: RotationOrder
     get() = getItem(Solid.ROTATION_ORDER_KEY).enum<RotationOrder>() ?: RotationOrder.XYZ
     set(value) = setItem(Solid.ROTATION_ORDER_KEY, value.name.asValue())
 
@@ -133,19 +131,15 @@ var Solid.rotationOrder: RotationOrder
 /**
  * Preferred number of polygons for displaying the object. If not defined, uses shape or renderer default. Not inherited
  */
-var Solid.detail: Int?
+public var Solid.detail: Int?
     get() = getProperty(DETAIL_KEY, false).int
     set(value) = setItem(DETAIL_KEY, value?.asValue())
 
-var Vision.visible: Boolean?
-    get() = getItem(VISIBLE_KEY).boolean
-    set(value) = setItem(VISIBLE_KEY, value?.asValue())
-
 /**
  * If this property is true, the object will be ignored on render.
  * Property is not inherited.
  */
-var Vision.ignore: Boolean?
+public var Vision.ignore: Boolean?
     get() = getProperty(IGNORE_KEY, false).boolean
     set(value) = setItem(IGNORE_KEY, value?.asValue())
 
@@ -156,21 +150,21 @@ var Vision.ignore: Boolean?
 private fun Solid.position(): Point3D =
     position ?: Point3D(0.0, 0.0, 0.0).also { position = it }
 
-var Solid.x: Number
+public var Solid.x: Number
     get() = position?.x ?: 0f
     set(value) {
         position().x = value.toDouble()
         propertyChanged(Solid.X_POSITION_KEY)
     }
 
-var Solid.y: Number
+public var Solid.y: Number
     get() = position?.y ?: 0f
     set(value) {
         position().y = value.toDouble()
         propertyChanged(Solid.Y_POSITION_KEY)
     }
 
-var Solid.z: Number
+public var Solid.z: Number
     get() = position?.z ?: 0f
     set(value) {
         position().z = value.toDouble()
@@ -180,21 +174,21 @@ var Solid.z: Number
 private fun Solid.rotation(): Point3D =
     rotation ?: Point3D(0.0, 0.0, 0.0).also { rotation = it }
 
-var Solid.rotationX: Number
+public var Solid.rotationX: Number
     get() = rotation?.x ?: 0f
     set(value) {
         rotation().x = value.toDouble()
         propertyChanged(Solid.X_ROTATION_KEY)
     }
 
-var Solid.rotationY: Number
+public var Solid.rotationY: Number
     get() = rotation?.y ?: 0f
     set(value) {
         rotation().y = value.toDouble()
         propertyChanged(Solid.Y_ROTATION_KEY)
     }
 
-var Solid.rotationZ: Number
+public var Solid.rotationZ: Number
     get() = rotation?.z ?: 0f
     set(value) {
         rotation().z = value.toDouble()
@@ -204,21 +198,21 @@ var Solid.rotationZ: Number
 private fun Solid.scale(): Point3D =
     scale ?: Point3D(1.0, 1.0, 1.0).also { scale = it }
 
-var Solid.scaleX: Number
+public var Solid.scaleX: Number
     get() = scale?.x ?: 1f
     set(value) {
         scale().x = value.toDouble()
         propertyChanged(Solid.X_SCALE_KEY)
     }
 
-var Solid.scaleY: Number
+public var Solid.scaleY: Number
     get() = scale?.y ?: 1f
     set(value) {
         scale().y = value.toDouble()
         propertyChanged(Solid.Y_SCALE_KEY)
     }
 
-var Solid.scaleZ: Number
+public var Solid.scaleZ: Number
     get() = scale?.z ?: 1f
     set(value) {
         scale().z = value.toDouble()
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index 83e2deff..1e2dd7a4 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -15,9 +15,9 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers
 import kotlin.collections.set
 
-interface PrototypeHolder {
-    val parent: VisionGroup?
-    val prototypes: MutableVisionGroup?
+public interface PrototypeHolder {
+    public val parent: VisionGroup?
+    public val prototypes: MutableVisionGroup?
 }
 
 /**
@@ -25,7 +25,7 @@ interface PrototypeHolder {
  */
 @Serializable
 @SerialName("group.solid")
-class SolidGroup : AbstractVisionGroup(), Solid, PrototypeHolder {
+public class SolidGroup : AbstractVisionGroup(), Solid, PrototypeHolder {
 
     override var styleSheet: StyleSheet? = null
 
@@ -39,7 +39,7 @@ class SolidGroup : AbstractVisionGroup(), Solid, PrototypeHolder {
     /**
      * Create or edit prototype node as a group
      */
-    fun prototypes(builder: MutableVisionGroup.() -> Unit): Unit {
+    public fun prototypes(builder: MutableVisionGroup.() -> Unit): Unit {
         (prototypes ?: Prototypes().also {
             prototypes = it
             attach(it)
@@ -79,33 +79,33 @@ class SolidGroup : AbstractVisionGroup(), Solid, PrototypeHolder {
     override fun createGroup(): SolidGroup = SolidGroup()
 
 
-    companion object {
+    public companion object {
 //        val PROTOTYPES_KEY = NameToken("@prototypes")
 
         @OptIn(DFExperimental::class)
-        fun parseJson(json: String): SolidGroup =
-            SolidManager.jsonForSolids.parse(serializer(), json).also { it.attachChildren() }
+        public fun decodeFromString(json: String): SolidGroup =
+            SolidManager.jsonForSolids.decodeFromString(serializer(), json).also { it.attachChildren() }
     }
 }
 
 @Suppress("FunctionName")
-fun SolidGroup(block: SolidGroup.() -> Unit): SolidGroup {
+public fun SolidGroup(block: SolidGroup.() -> Unit): SolidGroup {
     return SolidGroup().apply(block)
 }
 
 /**
  * Ger a prototype redirecting the request to the parent if prototype is not found
  */
-tailrec fun PrototypeHolder.getPrototype(name: Name): Solid? =
+public tailrec fun PrototypeHolder.getPrototype(name: Name): Solid? =
     prototypes?.get(name) as? Solid ?: (parent as? PrototypeHolder)?.getPrototype(name)
 
-fun MutableVisionGroup.group(name: Name = Name.EMPTY, action: SolidGroup.() -> Unit = {}): SolidGroup =
+public fun MutableVisionGroup.group(name: Name = Name.EMPTY, action: SolidGroup.() -> Unit = {}): SolidGroup =
     SolidGroup().apply(action).also { set(name, it) }
 
 /**
  * Define a group with given [name], attach it to this parent and return it.
  */
-fun MutableVisionGroup.group(name: String, action: SolidGroup.() -> Unit = {}): SolidGroup =
+public fun MutableVisionGroup.group(name: String, action: SolidGroup.() -> Unit = {}): SolidGroup =
     SolidGroup().apply(action).also { set(name, it) }
 
 /**
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
index c740f778..c7f459a5 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
@@ -5,6 +5,7 @@ package hep.dataforge.vision.solid
 import hep.dataforge.meta.Config
 import hep.dataforge.vision.AbstractVision
 import hep.dataforge.vision.MutableVisionGroup
+import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -12,7 +13,7 @@ import kotlinx.serialization.UseSerializers
 
 @Serializable
 @SerialName("solid.label")
-class SolidLabel(var text: String, var fontSize: Double, var fontFamily: String) : AbstractVision(), Solid {
+public class SolidLabel(public var text: String, public var fontSize: Double, public var fontFamily: String) : AbstractVision(), Solid {
     override var properties: Config? = null
 
     override var position: Point3D? = null
@@ -21,11 +22,10 @@ class SolidLabel(var text: String, var fontSize: Double, var fontFamily: String)
 
 }
 
-fun MutableVisionGroup.label(
+public fun VisionContainerBuilder<Solid>.label(
     text: String,
     fontSize: Number = 20,
     fontFamily: String = "Arial",
     name: String = "",
-    action: SolidLabel.() -> Unit = {}
-) =
-    SolidLabel(text, fontSize.toDouble(), fontFamily).apply(action).also { set(name, it) }
\ No newline at end of file
+    action: SolidLabel.() -> Unit = {},
+): SolidLabel = SolidLabel(text, fontSize.toDouble(), fontFamily).apply(action).also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index 36a46425..5cc3948c 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -12,20 +12,17 @@ import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionForm
 import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.VisionManager.Companion.VISION_SERIAL_MODULE_TARGET
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.KSerializer
-import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
-import kotlinx.serialization.modules.SerialModule
-import kotlinx.serialization.modules.SerialModuleCollector
-import kotlinx.serialization.modules.SerializersModule
-import kotlinx.serialization.modules.contextual
+import kotlinx.serialization.modules.*
 import kotlin.reflect.KClass
 
 @DFExperimental
-private class SolidForm<T :Solid>(
+private class SolidForm<T : Solid>(
     override val type: KClass<T>,
-    override val serializer: KSerializer<T>
+    override val serializer: KSerializer<T>,
 ) : VisionForm<T> {
 
     private fun Solid.update(meta: Meta) {
@@ -46,12 +43,12 @@ private class SolidForm<T :Solid>(
     }
 }
 
+@OptIn(ExperimentalSerializationApi::class)
 @DFExperimental
-@OptIn(UnstableDefault::class)
-private fun SerialModule.extractFactories(): List<SolidForm<*>> {
+private fun SerializersModule.extractFactories(): List<SolidForm<*>> {
     val list = ArrayList<SolidForm<*>>()
 
-    val collector = object : SerialModuleCollector {
+    val collector = object : SerializersModuleCollector {
         override fun <T : Any> contextual(kClass: KClass<T>, serializer: KSerializer<T>) {
             //Do nothing
         }
@@ -59,7 +56,7 @@ private fun SerialModule.extractFactories(): List<SolidForm<*>> {
         override fun <Base : Any, Sub : Base> polymorphic(
             baseClass: KClass<Base>,
             actualClass: KClass<Sub>,
-            actualSerializer: KSerializer<Sub>
+            actualSerializer: KSerializer<Sub>,
         ) {
             if (baseClass == Vision::class) {
                 @Suppress("UNCHECKED_CAST") val factory = SolidForm<Solid>(
@@ -70,34 +67,41 @@ private fun SerialModule.extractFactories(): List<SolidForm<*>> {
             }
         }
 
+        override fun <Base : Any> polymorphicDefault(
+            baseClass: KClass<Base>,
+            defaultSerializerProvider: (className: String?) -> DeserializationStrategy<out Base>?,
+        ) {
+            TODO("Not yet implemented")
+        }
+
     }
     dumpTo(collector)
     return list
 }
 
 @DFExperimental
-class SolidManager(meta: Meta) : AbstractPlugin(meta) {
+public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
 
-    val visionManager by require(VisionManager)
+    public val visionManager: VisionManager by require(VisionManager)
 
     override val tag: PluginTag get() = Companion.tag
 
-    override fun provideTop(target: String): Map<Name, Any> = when (target) {
+    override fun content(target: String): Map<Name, Any> = when (target) {
         VisionForm.TYPE -> serialModule.extractFactories().associateBy { it.name }
         VISION_SERIAL_MODULE_TARGET -> mapOf(tag.name.toName() to serialModule)
-        else -> super.provideTop(target)
+        else -> super.content(target)
     }
 
-    companion object : PluginFactory<SolidManager> {
+    public companion object : PluginFactory<SolidManager> {
         override val tag: PluginTag = PluginTag(name = "visual.spatial", group = PluginTag.DATAFORGE_GROUP)
         override val type: KClass<out SolidManager> = SolidManager::class
         override fun invoke(meta: Meta, context: Context): SolidManager = SolidManager(meta)
 
-        val serialModule = SerializersModule {
+        public val serialModule: SerializersModule = SerializersModule {
             contextual(Point3DSerializer)
             contextual(Point2DSerializer)
 
-            polymorphic(Vision::class, Solid::class) {
+            polymorphic(Vision::class) {
                 subclass(SimpleVisionGroup.serializer())
                 subclass(SolidGroup.serializer())
                 subclass(Proxy.serializer())
@@ -112,15 +116,12 @@ class SolidManager(meta: Meta) : AbstractPlugin(meta) {
             }
         }
 
-        @OptIn(UnstableDefault::class)
-        val jsonForSolids = Json(
-            JsonConfiguration(
-                prettyPrint = true,
-                useArrayPolymorphism = false,
-                encodeDefaults = false,
-                ignoreUnknownKeys = true
-            ),
-            context = serialModule
-        )
+        val jsonForSolids = Json {
+            prettyPrint = true
+            useArrayPolymorphism = false
+            encodeDefaults = false
+            ignoreUnknownKeys = true
+            serializersModule = this@Companion.serialModule
+        }
     }
 }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
index d5a29a55..d1a9b121 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
@@ -3,6 +3,7 @@ package hep.dataforge.vision.solid
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.descriptors.attributes
+import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
 import hep.dataforge.values.ValueType
@@ -13,41 +14,41 @@ import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_OPACITY_KEY
 import hep.dataforge.vision.widgetType
 
-class SolidMaterial : Scheme() {
+public class SolidMaterial : Scheme() {
 
     /**
      * Primary web-color for the material
      */
-    var color by string(key = COLOR_KEY)
+    public var color: String? by string(key = COLOR_KEY)
 
     /**
      * Specular color for phong material
      */
-    var specularColor by string(key = SPECULAR_COLOR_KEY)
+    public var specularColor: String? by string(key = SPECULAR_COLOR_KEY)
 
     /**
      * Opacity
      */
-    var opacity by float(1f, key = OPACITY_KEY)
+    public var opacity: Float by float(1f, key = OPACITY_KEY)
 
     /**
      * Replace material by wire frame
      */
-    var wireframe by boolean(false, WIREFRAME_KEY)
+    public var wireframe: Boolean by boolean(false, WIREFRAME_KEY)
 
-    companion object : SchemeSpec<SolidMaterial>(::SolidMaterial) {
+    public companion object : SchemeSpec<SolidMaterial>(::SolidMaterial) {
 
-        val MATERIAL_KEY = "material".asName()
+        public val MATERIAL_KEY: Name = "material".asName()
         internal val COLOR_KEY = "color".asName()
-        val MATERIAL_COLOR_KEY = MATERIAL_KEY + COLOR_KEY
+        public val MATERIAL_COLOR_KEY: Name = MATERIAL_KEY + COLOR_KEY
         internal val SPECULAR_COLOR_KEY = "specularColor".asName()
-        val MATERIAL_SPECULAR_COLOR_KEY = MATERIAL_KEY + SPECULAR_COLOR_KEY
+        public val MATERIAL_SPECULAR_COLOR_KEY: Name = MATERIAL_KEY + SPECULAR_COLOR_KEY
         internal val OPACITY_KEY = "opacity".asName()
-        val MATERIAL_OPACITY_KEY = MATERIAL_KEY + OPACITY_KEY
+        public val MATERIAL_OPACITY_KEY: Name = MATERIAL_KEY + OPACITY_KEY
         internal val WIREFRAME_KEY = "wireframe".asName()
-        val MATERIAL_WIREFRAME_KEY = MATERIAL_KEY + WIREFRAME_KEY
+        public val MATERIAL_WIREFRAME_KEY: Name = MATERIAL_KEY + WIREFRAME_KEY
 
-        val descriptor by lazy {
+        public val descriptor: NodeDescriptor by lazy {
             //must be lazy to avoid initialization bug
             NodeDescriptor {
                 value(COLOR_KEY) {
@@ -77,18 +78,18 @@ class SolidMaterial : Scheme() {
 /**
  * Set color as web-color
  */
-fun Solid.color(webColor: String) {
+public fun Solid.color(webColor: String) {
     setItem(MATERIAL_COLOR_KEY, webColor.asValue())
 }
 
 /**
  * Set color as integer
  */
-fun Solid.color(rgb: Int) {
+public fun Solid.color(rgb: Int) {
     setItem(MATERIAL_COLOR_KEY, rgb.asValue())
 }
 
-fun Solid.color(r: UByte, g: UByte, b: UByte) = setItem(
+public fun Solid.color(r: UByte, g: UByte, b: UByte): Unit = setItem(
     MATERIAL_COLOR_KEY,
     Colors.rgbToMeta(r, g, b)
 )
@@ -96,16 +97,16 @@ fun Solid.color(r: UByte, g: UByte, b: UByte) = setItem(
 /**
  * Web colors representation of the color in `#rrggbb` format or HTML name
  */
-var Solid.color: String?
+public var Solid.color: String?
     get() = getItem(MATERIAL_COLOR_KEY)?.let { Colors.fromMeta(it) }
     set(value) {
         setItem(MATERIAL_COLOR_KEY, value?.asValue())
     }
 
-val Solid.material: SolidMaterial?
+public val Solid.material: SolidMaterial?
     get() = getItem(MATERIAL_KEY).node?.let { SolidMaterial.wrap(it) }
 
-fun Solid.material(builder: SolidMaterial.() -> Unit) {
+public fun Solid.material(builder: SolidMaterial.() -> Unit) {
     val node = config[MATERIAL_KEY].node
     if (node != null) {
         SolidMaterial.update(node, builder)
@@ -114,7 +115,7 @@ fun Solid.material(builder: SolidMaterial.() -> Unit) {
     }
 }
 
-var Solid.opacity: Double?
+public var Solid.opacity: Double?
     get() = getItem(MATERIAL_OPACITY_KEY).double
     set(value) {
         setItem(MATERIAL_OPACITY_KEY, value?.asValue())
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
index 13cb7fbd..f21dfbc6 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
@@ -5,6 +5,7 @@ package hep.dataforge.vision.solid
 import hep.dataforge.meta.Config
 import hep.dataforge.vision.AbstractVision
 import hep.dataforge.vision.MutableVisionGroup
+import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -15,12 +16,12 @@ import kotlin.math.sin
 
 @Serializable
 @SerialName("solid.sphere")
-class Sphere(
-    var radius: Float,
-    var phiStart: Float = 0f,
-    var phi: Float = PI2,
-    var thetaStart: Float = 0f,
-    var theta: Float = PI.toFloat()
+public class Sphere(
+    public var radius: Float,
+    public var phiStart: Float = 0f,
+    public var phi: Float = PI2,
+    public var thetaStart: Float = 0f,
+    public var theta: Float = PI.toFloat()
 ) : AbstractVision(), GeometrySolid {
 
     override var properties: Config? = null
@@ -60,13 +61,13 @@ class Sphere(
     }
 }
 
-inline fun MutableVisionGroup.sphere(
+public inline fun VisionContainerBuilder<Solid>.sphere(
     radius: Number,
     phi: Number = 2 * PI,
     theta: Number = PI,
     name: String = "",
     action: Sphere.() -> Unit = {}
-) = Sphere(
+): Sphere = Sphere(
     radius.toFloat(),
     phi = phi.toFloat(),
     theta = theta.toFloat()
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
index a8b699c5..9bc2add9 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
@@ -5,6 +5,7 @@ package hep.dataforge.vision.solid
 import hep.dataforge.meta.Config
 import hep.dataforge.vision.AbstractVision
 import hep.dataforge.vision.MutableVisionGroup
+import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -18,12 +19,12 @@ import kotlin.math.sin
  */
 @Serializable
 @SerialName("solid.tube")
-class Tube(
-    var radius: Float,
-    var height: Float,
-    var innerRadius: Float = 0f,
-    var startAngle: Float = 0f,
-    var angle: Float = PI2
+public class Tube(
+    public var radius: Float,
+    public var height: Float,
+    public var innerRadius: Float = 0f,
+    public var startAngle: Float = 0f,
+    public var angle: Float = PI2
 ) : AbstractVision(), GeometrySolid {
 
     override var position: Point3D? = null
@@ -129,7 +130,7 @@ class Tube(
 
 }
 
-inline fun MutableVisionGroup.tube(
+public inline fun VisionContainerBuilder<Solid>.tube(
     r: Number,
     height: Number,
     innerRadius: Number = 0f,
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt
index 8764bc41..1eb501b0 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt
@@ -1,47 +1,48 @@
 package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.Meta
+import hep.dataforge.meta.MetaBuilder
 import hep.dataforge.meta.get
 import hep.dataforge.meta.number
 import kotlin.math.PI
 
-object World {
-    val ZERO = Point3D(0.0, 0.0, 0.0)
-    val ONE = Point3D(1.0, 1.0, 1.0)
+public object World {
+    public val ZERO: Point3D = Point3D(0.0, 0.0, 0.0)
+    public val ONE: Point3D = Point3D(1.0, 1.0, 1.0)
 }
 
-const val PI2: Float = 2 * PI.toFloat()
+public const val PI2: Float = 2 * PI.toFloat()
 
-expect class Point2D(x: Number, y: Number) {
-    var x: Double
-    var y: Double
+public expect class Point2D(x: Number, y: Number) {
+    public var x: Double
+    public var y: Double
 }
 
-operator fun Point2D.component1() = x
-operator fun Point2D.component2() = y
+public operator fun Point2D.component1(): Double = x
+public operator fun Point2D.component2(): Double = y
 
-fun Point2D.toMeta() = Meta {
+public fun Point2D.toMeta(): Meta = Meta {
     Solid.X_KEY put x
     Solid.Y_KEY put y
 }
 
-fun Meta.point2D() = Point2D(this["x"].number ?: 0, this["y"].number ?: 0)
+internal fun Meta.point2D(): Point2D = Point2D(this["x"].number ?: 0, this["y"].number ?: 0)
 
-expect class Point3D(x: Number, y: Number, z: Number) {
-    var x: Double
-    var y: Double
-    var z: Double
+public expect class Point3D(x: Number, y: Number, z: Number) {
+    public var x: Double
+    public var y: Double
+    public var z: Double
 }
 
-expect operator fun Point3D.plus(other: Point3D): Point3D
+public expect operator fun Point3D.plus(other: Point3D): Point3D
 
-operator fun Point3D.component1() = x
-operator fun Point3D.component2() = y
-operator fun Point3D.component3() = z
+public operator fun Point3D.component1(): Double = x
+public operator fun Point3D.component2(): Double = y
+public operator fun Point3D.component3(): Double = z
 
-fun Meta.point3D() = Point3D(this["x"].number ?: 0, this["y"].number ?: 0, this["y"].number ?: 0)
+internal fun Meta.point3D() = Point3D(this["x"].number ?: 0, this["y"].number ?: 0, this["y"].number ?: 0)
 
-fun Point3D.toMeta() = Meta {
+public fun Point3D.toMeta(): MetaBuilder = Meta {
     Solid.X_KEY put x
     Solid.Y_KEY put y
     Solid.Z_KEY put z
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt
index 0b0a4d0b..25724fab 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt
@@ -2,6 +2,7 @@ package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.double
+import hep.dataforge.meta.transformations.MetaConverter.Companion.double
 import hep.dataforge.names.NameToken
 import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.Vision
@@ -10,34 +11,19 @@ import kotlinx.serialization.*
 import kotlinx.serialization.builtins.MapSerializer
 import kotlinx.serialization.builtins.nullable
 import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.buildClassSerialDescriptor
+import kotlinx.serialization.descriptors.element
+import kotlinx.serialization.encoding.*
 
-inline fun <R> Decoder.decodeStructure(
-    desc: SerialDescriptor,
-    vararg typeParams: KSerializer<*> = emptyArray(),
-    crossinline block: CompositeDecoder.() -> R
-): R {
-    val decoder = beginStructure(desc, *typeParams)
-    val res = decoder.block()
-    decoder.endStructure(desc)
-    return res
-}
-
-inline fun Encoder.encodeStructure(
-    desc: SerialDescriptor,
-    vararg typeParams: KSerializer<*> = emptyArray(),
-    block: CompositeEncoder.() -> Unit
-) {
-    val encoder = beginStructure(desc, *typeParams)
-    encoder.block()
-    encoder.endStructure(desc)
-}
 
+@OptIn(ExperimentalSerializationApi::class)
 @Serializer(Point3D::class)
-object Point3DSerializer : KSerializer<Point3D> {
-    override val descriptor: SerialDescriptor = SerialDescriptor("hep.dataforge.vis.spatial.Point3D") {
-        double("x", true)
-        double("y", true)
-        double("z", true)
+public object Point3DSerializer : KSerializer<Point3D> {
+    override val descriptor: SerialDescriptor = buildClassSerialDescriptor("hep.dataforge.vis.spatial.Point3D") {
+        element<Double>("x")
+        element<Double>("y")
+        element<Double>("z")
     }
 
     override fun deserialize(decoder: Decoder): Point3D {
@@ -47,7 +33,7 @@ object Point3DSerializer : KSerializer<Point3D> {
         decoder.decodeStructure(descriptor) {
             loop@ while (true) {
                 when (val i = decodeElementIndex(descriptor)) {
-                    CompositeDecoder.READ_DONE -> break@loop
+                    CompositeDecoder.DECODE_DONE -> break@loop
                     0 -> x = decodeNullableSerializableElement(descriptor, 0, Double.serializer().nullable) ?: 0.0
                     1 -> y = decodeNullableSerializableElement(descriptor, 1, Double.serializer().nullable) ?: 0.0
                     2 -> z = decodeNullableSerializableElement(descriptor, 2, Double.serializer().nullable) ?: 0.0
@@ -67,11 +53,12 @@ object Point3DSerializer : KSerializer<Point3D> {
     }
 }
 
+@OptIn(ExperimentalSerializationApi::class)
 @Serializer(Point2D::class)
-object Point2DSerializer : KSerializer<Point2D> {
-    override val descriptor: SerialDescriptor = SerialDescriptor("hep.dataforge.vis.spatial.Point2D") {
-        double("x", true)
-        double("y", true)
+public object Point2DSerializer : KSerializer<Point2D> {
+    override val descriptor: SerialDescriptor = buildClassSerialDescriptor("hep.dataforge.vis.spatial.Point2D") {
+        element<Double>("x")
+        element<Double>("y")
     }
 
     override fun deserialize(decoder: Decoder): Point2D {
@@ -80,7 +67,7 @@ object Point2DSerializer : KSerializer<Point2D> {
         decoder.decodeStructure(descriptor) {
             loop@ while (true) {
                 when (val i = decodeElementIndex(descriptor)) {
-                    CompositeDecoder.READ_DONE -> break@loop
+                    CompositeDecoder.DECODE_DONE -> break@loop
                     0 -> x = decodeNullableSerializableElement(descriptor, 0, Double.serializer().nullable) ?: 0.0
                     1 -> y = decodeNullableSerializableElement(descriptor, 1, Double.serializer().nullable) ?: 0.0
                     else -> throw SerializationException("Unknown index $i")
@@ -98,6 +85,7 @@ object Point2DSerializer : KSerializer<Point2D> {
     }
 }
 
+@OptIn(ExperimentalSerializationApi::class)
 @Serializer(MutableVisionGroup::class)
 internal object PrototypesSerializer : KSerializer<MutableVisionGroup> {
 
@@ -120,10 +108,10 @@ internal object PrototypesSerializer : KSerializer<MutableVisionGroup> {
 }
 
 @OptIn(DFExperimental::class)
-fun Vision.stringify(): String = SolidManager.jsonForSolids.stringify(Vision.serializer(), this)
+public fun Vision.encodeToString(): String = SolidManager.jsonForSolids.encodeToString(Vision.serializer(), this)
 
 @OptIn(DFExperimental::class)
-fun Vision.Companion.parseJson(str: String) = SolidManager.jsonForSolids.parse(serializer(), str).also {
+public fun Vision.Companion.decodeFromString(str: String): Vision = SolidManager.jsonForSolids.decodeFromString(serializer(), str).also {
     if(it is VisionGroup){
         it.attachChildren()
     }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt
index 8a45e0a4..5e835c83 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt
@@ -2,13 +2,13 @@ package hep.dataforge.vision.solid.specifications
 
 import hep.dataforge.meta.*
 
-class Axes : Scheme() {
-    var visible by boolean(!config.isEmpty())
-    var size by double(AXIS_SIZE)
-    var width by double(AXIS_WIDTH)
+public class Axes : Scheme() {
+    public var visible: Boolean by boolean(!config.isEmpty())
+    public var size: Double by double(AXIS_SIZE)
+    public var width: Double by double(AXIS_WIDTH)
 
-    companion object : SchemeSpec<Axes>(::Axes) {
-        const val AXIS_SIZE = 1000.0
-        const val AXIS_WIDTH = 3.0
+    public companion object : SchemeSpec<Axes>(::Axes) {
+        public const val AXIS_SIZE: Double = 1000.0
+        public const val AXIS_WIDTH: Double = 3.0
     }
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Camera.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Camera.kt
index dbd79bd8..396df8a4 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Camera.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Camera.kt
@@ -6,24 +6,24 @@ import hep.dataforge.meta.double
 import hep.dataforge.meta.int
 import kotlin.math.PI
 
-class Camera : Scheme() {
-    var fov by int(FIELD_OF_VIEW)
+public class Camera : Scheme() {
+    public var fov: Int by int(FIELD_OF_VIEW)
 
     //var aspect by double(1.0)
-    var nearClip by double(NEAR_CLIP)
-    var farClip by double(FAR_CLIP)
+    public var nearClip: Double by double(NEAR_CLIP)
+    public var farClip: Double by double(FAR_CLIP)
 
-    var distance by double(INITIAL_DISTANCE)
-    var azimuth by double(INITIAL_AZIMUTH)
-    var latitude by double(INITIAL_LATITUDE)
-    val zenith: Double get() = PI / 2 - latitude
+    public var distance: Double by double(INITIAL_DISTANCE)
+    public var azimuth: Double by double(INITIAL_AZIMUTH)
+    public var latitude: Double by double(INITIAL_LATITUDE)
+    public val zenith: Double get() = PI / 2 - latitude
 
-    companion object : SchemeSpec<Camera>(::Camera) {
-        const val INITIAL_DISTANCE = 300.0
-        const val INITIAL_AZIMUTH = 0.0
-        const val INITIAL_LATITUDE = PI / 6
-        const val NEAR_CLIP = 0.1
-        const val FAR_CLIP = 10000.0
-        const val FIELD_OF_VIEW = 75
+    public companion object : SchemeSpec<Camera>(::Camera) {
+        public const val INITIAL_DISTANCE: Double = 300.0
+        public const val INITIAL_AZIMUTH: Double = 0.0
+        public const val INITIAL_LATITUDE: Double = PI / 6
+        public const val NEAR_CLIP: Double = 0.1
+        public const val FAR_CLIP: Double = 10000.0
+        public const val FIELD_OF_VIEW: Int = 75
     }
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
index 9e4ceed6..33ba4bd0 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
@@ -5,11 +5,11 @@ import hep.dataforge.meta.SchemeSpec
 import hep.dataforge.meta.int
 import hep.dataforge.meta.spec
 
-class Canvas3DOptions : Scheme() {
-    var axes by spec(Axes, Axes.empty())
-    var camera by spec(Camera, Camera.empty())
-    var controls by spec(Controls, Controls.empty())
-    var minSize by int(300)
+public class Canvas3DOptions : Scheme() {
+    public var axes: Axes by spec(Axes, Axes.empty())
+    public var camera: Camera by spec(Camera, Camera.empty())
+    public var controls: Controls by spec(Controls, Controls.empty())
+    public var minSize: Int by int(300)
 
-    companion object : SchemeSpec<Canvas3DOptions>(::Canvas3DOptions)
+    public companion object : SchemeSpec<Canvas3DOptions>(::Canvas3DOptions)
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
index 36b6db76..2fc1ffdb 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
@@ -1,5 +1,6 @@
 package hep.dataforge.vision.solid.transform
 
+import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.update
 import hep.dataforge.names.asName
 import hep.dataforge.vision.MutableVisionGroup
@@ -7,6 +8,7 @@ import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionGroup
 import hep.dataforge.vision.solid.*
 
+@DFExperimental
 internal fun mergeChild(parent: VisionGroup, child: Vision): Vision {
     return child.apply {
 
@@ -32,6 +34,7 @@ internal fun mergeChild(parent: VisionGroup, child: Vision): Vision {
     }
 }
 
+@DFExperimental
 object RemoveSingleChild : VisualTreeTransform<SolidGroup>() {
 
     override fun SolidGroup.transformInPlace() {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
index 1eeec5ad..9028b667 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
@@ -1,5 +1,6 @@
 package hep.dataforge.vision.solid.transform
 
+import hep.dataforge.meta.DFExperimental
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.vision.MutableVisionGroup
@@ -7,6 +8,7 @@ import hep.dataforge.vision.VisionGroup
 import hep.dataforge.vision.solid.Proxy
 import hep.dataforge.vision.solid.SolidGroup
 
+@DFExperimental
 object UnRef : VisualTreeTransform<SolidGroup>() {
     private fun VisionGroup.countRefs(): Map<Name, Int> {
         return children.values.fold(HashMap()) { reducer, obj ->
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
index 0afb5a7c..7da077bd 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
@@ -1,6 +1,7 @@
 package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.*
+import kotlinx.serialization.json.toJson
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -24,7 +25,7 @@ class ConvexTest {
 
         val convex = group.children.values.first() as Convex
 
-        val json = SolidManager.jsonForSolids.toJson(Convex.serializer(), convex)
+        val json = SolidManager.jsonForSolids.encodeToJsonElement(Convex.serializer(), convex)
         val meta = json.toMetaItem().node!!
 
         val points = meta.getIndexed("points").values.map { (it as MetaItem.NodeItem<*>).node.point3D() }
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
index f52b5c25..57b94441 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
@@ -1,11 +1,26 @@
 package hep.dataforge.vision.solid
 
+import hep.dataforge.names.Name
 import hep.dataforge.names.toName
+import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.get
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
+/**
+ * Create and attach new proxied group
+ */
+fun SolidGroup.proxyGroup(
+    name: String,
+    templateName: Name = name.toName(),
+    block: MutableVisionGroup.() -> Unit
+): Proxy {
+    val group = SolidGroup().apply(block)
+    return proxy(name, group, templateName)
+}
+
+
 class SerializationTest {
     @Test
     fun testCubeSerialization() {
@@ -14,9 +29,9 @@ class SerializationTest {
             x = 100
             z = -100
         }
-        val string =  cube.stringify()
+        val string =  cube.encodeToString()
         println(string)
-        val newCube = Vision.parseJson(string)
+        val newCube = Vision.decodeFromString(string)
         assertEquals(cube.config, newCube.config)
     }
 
@@ -35,9 +50,9 @@ class SerializationTest {
                 }
             }
         }
-        val string = group.stringify()
+        val string = group.encodeToString()
         println(string)
-        val reconstructed = SolidGroup.parseJson(string)
+        val reconstructed = SolidGroup.decodeFromString(string)
         assertEquals(group["cube"]?.config, reconstructed["cube"]?.config)
     }
 
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/geometryJs.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/geometryJs.kt
index 8aa5fe91..170e8249 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/geometryJs.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/geometryJs.kt
@@ -5,10 +5,10 @@ import info.laht.threekt.math.Vector2
 import info.laht.threekt.math.Vector3
 import info.laht.threekt.math.plus
 
-actual typealias Point2D = Vector2
+public actual typealias Point2D = Vector2
 
-actual typealias Point3D = Vector3
+public actual typealias Point3D = Vector3
 
-actual operator fun Point3D.plus(other: Point3D): Point3D {
+public actual operator fun Point3D.plus(other: Point3D): Point3D {
     return this.plus(other)
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
index c432fbd3..28bb21d6 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
@@ -8,6 +8,7 @@ import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY
 import hep.dataforge.vision.solid.three.ThreeFactory.Companion.TYPE
 import hep.dataforge.vision.solid.three.ThreeMaterials.getMaterial
+import hep.dataforge.vision.visible
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.objects.Mesh
@@ -54,7 +55,7 @@ fun Object3D.updateProperty(source: Vision, propertyName: Name) {
     ) {
         //update position of mesh using this object
         updatePosition(source)
-    } else if (propertyName == Solid.VISIBLE_KEY) {
+    } else if (propertyName == Vision.VISIBLE_KEY) {
         visible = source.visible ?: true
     }
 }
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index d8f467fe..546cb882 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -5,6 +5,7 @@ import hep.dataforge.meta.Meta
 import hep.dataforge.names.*
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.solid.*
+import hep.dataforge.vision.visible
 import info.laht.threekt.core.Object3D
 import kotlin.collections.set
 import kotlin.reflect.KClass
@@ -30,7 +31,7 @@ class ThreePlugin : AbstractPlugin() {
     @Suppress("UNCHECKED_CAST")
     private fun findObjectFactory(type: KClass<out Vision>): ThreeFactory<Solid>? {
         return (objectFactories[type]
-            ?: context.content<ThreeFactory<*>>(ThreeFactory.TYPE).values.find { it.type == type })
+            ?: context.gather<ThreeFactory<*>>(ThreeFactory.TYPE).values.find { it.type == type })
                 as ThreeFactory<Solid>?
     }
 
@@ -63,7 +64,7 @@ class ThreePlugin : AbstractPlugin() {
                         ) {
                             //update position of mesh using this object
                             updatePosition(obj)
-                        } else if (name == Solid.VISIBLE_KEY) {
+                        } else if (name == Vision.VISIBLE_KEY) {
                             visible = obj.visible ?: true
                         }
                     }
@@ -123,28 +124,28 @@ internal fun Object3D.getOrCreateGroup(name: Name): Object3D {
     return when {
         name.isEmpty() -> this
         name.length == 1 -> {
-            val token = name.first()!!
+            val token = name.tokens.first()
             children.find { it.name == token.toString() } ?: info.laht.threekt.objects.Group().also { group ->
                 group.name = token.toString()
                 this.add(group)
             }
         }
-        else -> getOrCreateGroup(name.first()!!.asName()).getOrCreateGroup(name.cutFirst())
+        else -> getOrCreateGroup(name.tokens.first().asName()).getOrCreateGroup(name.cutFirst())
     }
 }
 
 internal operator fun Object3D.set(name: Name, obj: Object3D) {
     when (name.length) {
         0 -> error("Can't set object with an empty name")
-        1 -> set(name.first()!!, obj)
-        else -> getOrCreateGroup(name.cutLast())[name.last()!!] = obj
+        1 -> set(name.tokens.first(), obj)
+        else -> getOrCreateGroup(name.cutLast())[name.tokens.last()] = obj
     }
 }
 
 internal fun Object3D.findChild(name: Name): Object3D? {
     return when {
         name.isEmpty() -> this
-        name.length == 1 -> this.children.find { it.name == name.first()!!.toString() }
-        else -> findChild(name.first()!!.asName())?.findChild(name.cutFirst())
+        name.length == 1 -> this.children.find { it.name == name.tokens.first().toString() }
+        else -> findChild(name.tokens.first().asName())?.findChild(name.cutFirst())
     }
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
index 832dd32d..b6321d25 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
@@ -1,5 +1,7 @@
 package hep.dataforge.vision.solid.three
 
+import hep.dataforge.names.cutFirst
+import hep.dataforge.names.firstOrNull
 import hep.dataforge.names.toName
 import hep.dataforge.vision.solid.Proxy
 import hep.dataforge.vision.solid.Proxy.Companion.PROXY_CHILD_PROPERTY_PREFIX
@@ -42,8 +44,8 @@ class ThreeProxyFactory(val three: ThreePlugin) : ThreeFactory<Proxy> {
         }
 
         obj.onPropertyChange(this) { name ->
-            if (name.first()?.body == PROXY_CHILD_PROPERTY_PREFIX) {
-                val childName = name.first()?.index?.toName() ?: error("Wrong syntax for proxy child property: '$name'")
+            if (name.firstOrNull()?.body == PROXY_CHILD_PROPERTY_PREFIX) {
+                val childName = name.firstOrNull()?.index?.toName() ?: error("Wrong syntax for proxy child property: '$name'")
                 val propertyName = name.cutFirst()
                 val proxyChild = obj[childName] ?: error("Proxy child with name '$childName' not found")
                 val child = object3D.findChild(childName) ?: error("Object child with name '$childName' not found")
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/outputConfig.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/outputConfig.kt
index 2956f8cc..f4e65da1 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/outputConfig.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/outputConfig.kt
@@ -38,7 +38,7 @@ fun RBuilder.canvasControls(canvas: ThreeCanvas) = accordion("controls") {
         div("row") {
             div("col-2") {
                 label("checkbox-inline") {
-                    input(type = InputType.checkBox){
+                    input(type = InputType.checkBox) {
                         attrs {
                             defaultChecked = canvas.axes.visible
                             onChangeFunction = {
@@ -55,7 +55,7 @@ fun RBuilder.canvasControls(canvas: ThreeCanvas) = accordion("controls") {
                     attrs {
                         onClickFunction = {
                             val json = (canvas.content as? SolidGroup)?.let { group ->
-                                SolidManager.jsonForSolids.stringify(
+                                SolidManager.jsonForSolids.encodeToString(
                                     SolidGroup.serializer(),
                                     group
                                 )
@@ -76,7 +76,7 @@ fun RBuilder.canvasControls(canvas: ThreeCanvas) = accordion("controls") {
             (0..11).forEach { layer ->
                 div("col-1") {
                     label { +layer.toString() }
-                    input(type = InputType.checkBox){
+                    input(type = InputType.checkBox) {
                         attrs {
                             if (layer == 0) {
                                 defaultChecked = true
@@ -119,7 +119,7 @@ fun Element.displayCanvasControls(canvas: ThreeCanvas, block: TagConsumer<HTMLEl
                             +"Export"
                             onClickFunction = {
                                 val json = (canvas.content as? SolidGroup)?.let { group ->
-                                    SolidManager.jsonForSolids.stringify(
+                                    SolidManager.jsonForSolids.encodeToString(
                                         SolidGroup.serializer(),
                                         group
                                     )
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt
index 0b2f064f..712b2b2e 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt
+++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt
@@ -38,7 +38,7 @@ class FX3DPlugin : AbstractPlugin() {
 
     @Suppress("UNCHECKED_CAST")
     private fun findObjectFactory(type: KClass<out Solid>): FX3DFactory<Solid>? {
-        return (objectFactories[type] ?: context.content<FX3DFactory<*>>(TYPE).values.find { it.type == type })
+        return (objectFactories[type] ?: context.gather<FX3DFactory<*>>(TYPE).values.find { it.type == type })
                 as FX3DFactory<Solid>?
     }
 
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXProxyFactory.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXProxyFactory.kt
index 6a171854..3dca5113 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXProxyFactory.kt
+++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXProxyFactory.kt
@@ -1,8 +1,6 @@
 package hep.dataforge.vision.solid.fx
 
-import hep.dataforge.names.Name
-import hep.dataforge.names.isEmpty
-import hep.dataforge.names.toName
+import hep.dataforge.names.*
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.solid.Proxy
 import javafx.scene.Group
@@ -17,8 +15,8 @@ class FXProxyFactory(val plugin: FX3DPlugin) : FX3DFactory<Proxy> {
         val node = plugin.buildNode(prototype)
 
         obj.onPropertyChange(this) { name->
-            if (name.first()?.body == Proxy.PROXY_CHILD_PROPERTY_PREFIX) {
-                val childName = name.first()?.index?.toName() ?: error("Wrong syntax for proxy child property: '$name'")
+            if (name.firstOrNull()?.body == Proxy.PROXY_CHILD_PROPERTY_PREFIX) {
+                val childName = name.firstOrNull()?.index?.toName() ?: error("Wrong syntax for proxy child property: '$name'")
                 val propertyName = name.cutFirst()
                 val proxyChild = obj[childName] ?: error("Proxy child with name '$childName' not found")
                 val child = node.findChild(childName) ?: error("Object child with name '$childName' not found")
@@ -35,7 +33,7 @@ private fun Node.findChild(name: Name): Node? {
     } else {
         (this as? Group)
             ?.children
-            ?.find { it.properties["name"] as String == name.first()?.toString() }
+            ?.find { it.properties["name"] as String == name.firstOrNull()?.toString() }
             ?.findChild(name.cutFirst())
     }
 }
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/generateSchema.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/generateSchema.kt
index 122f051b..9d3c332b 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/generateSchema.kt
+++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/generateSchema.kt
@@ -1,205 +1,208 @@
-package hep.dataforge.vision.solid
-
-import hep.dataforge.meta.JSON_PRETTY
-import kotlinx.serialization.*
-import kotlinx.serialization.json.*
-import kotlinx.serialization.modules.SerialModule
-import kotlinx.serialization.modules.SerialModuleCollector
-import kotlin.reflect.KClass
-
-private fun SerialDescriptor.getJsonType() = when (this.kind) {
-    StructureKind.LIST -> "array"
-    PrimitiveKind.BYTE, PrimitiveKind.SHORT, PrimitiveKind.INT, PrimitiveKind.LONG,
-    PrimitiveKind.FLOAT, PrimitiveKind.DOUBLE -> "number"
-    PrimitiveKind.STRING, PrimitiveKind.CHAR, UnionKind.ENUM_KIND -> "string"
-    PrimitiveKind.BOOLEAN -> "boolean"
-    else -> "object"
-}
-
-private fun SerialDescriptor.isVisualObject() = serialName.startsWith("solid")||serialName.startsWith("group.solid")
-
-private const val definitionNode = "\$defs"
-
-private fun SerialModule.enumerate(type: KClass<*>): Sequence<SerialDescriptor> {
-    val list = ArrayList<SerialDescriptor>()
-    fun send(descriptor: SerialDescriptor) = list.add(descriptor)
-
-    val enumerator = object : SerialModuleCollector {
-        override fun <T : Any> contextual(kClass: KClass<T>, serializer: KSerializer<T>) {
-            if (kClass == type) {
-                send(serializer.descriptor)
-            }
-        }
-
-        override fun <Base : Any, Sub : Base> polymorphic(
-            baseClass: KClass<Base>,
-            actualClass: KClass<Sub>,
-            actualSerializer: KSerializer<Sub>
-        ) {
-            if (baseClass == type) {
-                send(actualSerializer.descriptor)
-            }
-        }
-
-    }
-    dumpTo(enumerator)
-    return list.asSequence()
-}
-
-/**
- * Creates an [JsonObject] which contains Json Schema of given [descriptor].
- *
- * Schema can contain following fields:
- * `description`, `type` for all descriptors;
- * `properties` and `required` for objects;
- * `enum` for enums;
- * `items` for arrays.
- *
- * User can modify this schema to add additional validation keywords
- * (as per [https://json-schema.org/latest/json-schema-validation.html])
- * if they want.
- */
-private fun jsonSchema(descriptor: SerialDescriptor, context: SerialModule): JsonObject {
-
-    if (descriptor.serialName in arrayOf(
-            "hep.dataforge.vision.solid.Point3D",
-            "hep.dataforge.vision.solid.Point3D?",
-            "hep.dataforge.vision.solid.Point2D",
-            "hep.dataforge.vision.solid.Point2D?",
-            "hep.dataforge.meta.Meta",
-            "hep.dataforge.meta.Meta?"
-        )
-    ) return json {
-        "\$ref" to "#/$definitionNode/${descriptor.serialName.replace("?", "")}"
-    }
-
-
-    val properties: MutableMap<String, JsonObject> = mutableMapOf()
-    val requiredProperties: MutableSet<String> = mutableSetOf()
-    val isEnum = descriptor.kind == UnionKind.ENUM_KIND
-    val isPolymorphic = descriptor.kind is PolymorphicKind
-
-
-    if (!isEnum && !isPolymorphic) descriptor.elementDescriptors().forEachIndexed { index, child ->
-        val elementName = descriptor.getElementName(index)
-
-        val elementSchema = when (elementName) {
-            "properties" -> json {
-                "\$ref" to "#/$definitionNode/hep.dataforge.meta.Meta"
-            }
-            "first", "second" -> json {
-                "\$ref" to "#/$definitionNode/children"
-            }
-            "styleSheet" -> json {
-                "type" to "object"
-                "additionalProperties" to json {
-                    "\$ref" to "#/$definitionNode/hep.dataforge.meta.Meta"
-                }
-            }
-            in arrayOf("children", "prototypes") -> json {
-                "type" to "object"
-                "additionalProperties" to json {
-                    "\$ref" to "#/$definitionNode/children"
-                }
-            }
-            else -> jsonSchema(child, context)
-        }
-        properties[elementName] = elementSchema
-
-        if (!descriptor.isElementOptional(index)) requiredProperties.add(elementName)
-    }
-
-    val jsonType = descriptor.getJsonType()
-    val objectData: MutableMap<String, JsonElement> = mutableMapOf(
-        "description" to JsonLiteral(descriptor.serialName),
-        "type" to JsonLiteral(jsonType)
-    )
-    if (isEnum) {
-        val allElementNames = (0 until descriptor.elementsCount).map(descriptor::getElementName)
-        objectData += "enum" to JsonArray(allElementNames.map(::JsonLiteral))
-    }
-    when (jsonType) {
-        "object" -> {
-            if(descriptor.isVisualObject()) {
-                properties["type"] = json {
-                    "const" to descriptor.serialName
-                }
-            }
-            objectData["properties"] = JsonObject(properties)
-            val required = requiredProperties.map { JsonLiteral(it) }
-            if (required.isNotEmpty()) {
-                objectData["required"] = JsonArray(required)
-            }
-        }
-        "array" -> objectData["items"] = properties.values.let {
-            check(it.size == 1) { "Array descriptor has returned inconsistent number of elements: expected 1, found ${it.size}" }
-            it.first()
-        }
-        else -> { /* no-op */
-        }
-    }
-    return JsonObject(objectData)
-}
-
-fun main() {
-    val context = SolidManager.serialModule
-    val definitions = json {
-        "children" to json {
-            "anyOf" to jsonArray {
-                context.enumerate(Solid::class).forEach {
-                    if (it.serialName == "hep.dataforge.vis.spatial.SolidGroup") {
-                        +json {
-                            "\$ref" to "#/$definitionNode/${it.serialName}"
-                        }
-                    } else {
-                        +jsonSchema(it, context)
-                    }
-                }
-            }
-        }
-        "hep.dataforge.meta.Meta" to json {
-            "type" to "object"
-        }
-        "hep.dataforge.vision.solid.Point3D" to json {
-            "type" to "object"
-            "properties" to json {
-                "x" to json {
-                    "type" to "number"
-                }
-                "y" to json {
-                    "type" to "number"
-                }
-                "z" to json {
-                    "type" to "number"
-                }
-            }
-        }
-        "hep.dataforge.vision.solid.Point2D" to json {
-            "type" to "object"
-            "properties" to json {
-                "x" to json {
-                    "type" to "number"
-                }
-                "y" to json {
-                    "type" to "number"
-                }
-            }
-        }
-        "hep.dataforge.vision.solid.SolidGroup" to jsonSchema(
-            SolidGroup.serializer().descriptor,
-            context
-        )
-
-    }
-
-    println(
-        JSON_PRETTY.stringify(
-            JsonObjectSerializer,
-            json {
-                "\$defs" to definitions
-                "\$ref" to "#/$definitionNode/hep.dataforge.vision.solid.SolidGroup"
-            }
-        )
-    )
-}
-
+//package hep.dataforge.vision.solid
+//
+//import hep.dataforge.meta.JSON_PRETTY
+//import kotlinx.serialization.*
+//import kotlinx.serialization.descriptors.PrimitiveKind
+//import kotlinx.serialization.descriptors.SerialDescriptor
+//import kotlinx.serialization.descriptors.StructureKind
+//import kotlinx.serialization.descriptors.UnionKind
+//import kotlinx.serialization.json.*
+//import kotlinx.serialization.modules.SerialModule
+//import kotlin.reflect.KClass
+//
+//private fun SerialDescriptor.getJsonType() = when (this.kind) {
+//    StructureKind.LIST -> "array"
+//    PrimitiveKind.BYTE, PrimitiveKind.SHORT, PrimitiveKind.INT, PrimitiveKind.LONG,
+//    PrimitiveKind.FLOAT, PrimitiveKind.DOUBLE -> "number"
+//    PrimitiveKind.STRING, PrimitiveKind.CHAR, UnionKind.ENUM_KIND -> "string"
+//    PrimitiveKind.BOOLEAN -> "boolean"
+//    else -> "object"
+//}
+//
+//private fun SerialDescriptor.isVisualObject() = serialName.startsWith("solid")||serialName.startsWith("group.solid")
+//
+//private const val definitionNode = "\$defs"
+//
+//private fun SerialModule.enumerate(type: KClass<*>): Sequence<SerialDescriptor> {
+//    val list = ArrayList<SerialDescriptor>()
+//    fun send(descriptor: SerialDescriptor) = list.add(descriptor)
+//
+//    val enumerator = object : SerialModuleCollector {
+//        override fun <T : Any> contextual(kClass: KClass<T>, serializer: KSerializer<T>) {
+//            if (kClass == type) {
+//                send(serializer.descriptor)
+//            }
+//        }
+//
+//        override fun <Base : Any, Sub : Base> polymorphic(
+//            baseClass: KClass<Base>,
+//            actualClass: KClass<Sub>,
+//            actualSerializer: KSerializer<Sub>
+//        ) {
+//            if (baseClass == type) {
+//                send(actualSerializer.descriptor)
+//            }
+//        }
+//
+//    }
+//    dumpTo(enumerator)
+//    return list.asSequence()
+//}
+//
+///**
+// * Creates an [JsonObject] which contains Json Schema of given [descriptor].
+// *
+// * Schema can contain following fields:
+// * `description`, `type` for all descriptors;
+// * `properties` and `required` for objects;
+// * `enum` for enums;
+// * `items` for arrays.
+// *
+// * User can modify this schema to add additional validation keywords
+// * (as per [https://json-schema.org/latest/json-schema-validation.html])
+// * if they want.
+// */
+//private fun jsonSchema(descriptor: SerialDescriptor, context: SerialModule): JsonObject {
+//
+//    if (descriptor.serialName in arrayOf(
+//            "hep.dataforge.vision.solid.Point3D",
+//            "hep.dataforge.vision.solid.Point3D?",
+//            "hep.dataforge.vision.solid.Point2D",
+//            "hep.dataforge.vision.solid.Point2D?",
+//            "hep.dataforge.meta.Meta",
+//            "hep.dataforge.meta.Meta?"
+//        )
+//    ) return json {
+//        "\$ref" to "#/$definitionNode/${descriptor.serialName.replace("?", "")}"
+//    }
+//
+//
+//    val properties: MutableMap<String, JsonObject> = mutableMapOf()
+//    val requiredProperties: MutableSet<String> = mutableSetOf()
+//    val isEnum = descriptor.kind == UnionKind.ENUM_KIND
+//    val isPolymorphic = descriptor.kind is PolymorphicKind
+//
+//
+//    if (!isEnum && !isPolymorphic) descriptor.elementDescriptors().forEachIndexed { index, child ->
+//        val elementName = descriptor.getElementName(index)
+//
+//        val elementSchema = when (elementName) {
+//            "properties" -> buildJsonObject {
+//                put("\$ref", "#/$definitionNode/hep.dataforge.meta.Meta")
+//            }
+//            "first", "second" -> buildJsonObject {
+//                put("\$ref", "#/$definitionNode/children")
+//            }
+//            "styleSheet" -> buildJsonObject {
+//                put("type", "object")
+//                put("additionalProperties", buildJsonObject {
+//                    put("\$ref", "#/$definitionNode/hep.dataforge.meta.Meta")
+//                })
+//            }
+//            in arrayOf("children", "prototypes") -> buildJsonObject {
+//                put("type", "object")
+//                put("additionalProperties", buildJsonObject {
+//                    put("\$ref", "#/$definitionNode/children")
+//                })
+//            }
+//            else -> jsonSchema(child, context)
+//        }
+//        properties[elementName] = elementSchema
+//
+//        if (!descriptor.isElementOptional(index)) requiredProperties.add(elementName)
+//    }
+//
+//    val jsonType = descriptor.getJsonType()
+//    val objectData: MutableMap<String, JsonElement> = mutableMapOf(
+//        "description" to JsonLiteral(descriptor.serialName),
+//        "type" to JsonLiteral(jsonType)
+//    )
+//    if (isEnum) {
+//        val allElementNames = (0 until descriptor.elementsCount).map(descriptor::getElementName)
+//        objectData += "enum" to JsonArray(allElementNames.map(::JsonLiteral))
+//    }
+//    when (jsonType) {
+//        "object" -> {
+//            if(descriptor.isVisualObject()) {
+//                properties["type"] = json {
+//                    "const" to descriptor.serialName
+//                }
+//            }
+//            objectData["properties"] = JsonObject(properties)
+//            val required = requiredProperties.map { JsonLiteral(it) }
+//            if (required.isNotEmpty()) {
+//                objectData["required"] = JsonArray(required)
+//            }
+//        }
+//        "array" -> objectData["items"] = properties.values.let {
+//            check(it.size == 1) { "Array descriptor has returned inconsistent number of elements: expected 1, found ${it.size}" }
+//            it.first()
+//        }
+//        else -> { /* no-op */
+//        }
+//    }
+//    return JsonObject(objectData)
+//}
+//
+//fun main() {
+//    val context = SolidManager.serialModule
+//    val definitions = json {
+//        "children" to json {
+//            "anyOf" to jsonArray {
+//                context.enumerate(Solid::class).forEach {
+//                    if (it.serialName == "hep.dataforge.vis.spatial.SolidGroup") {
+//                        +json {
+//                            "\$ref" to "#/$definitionNode/${it.serialName}"
+//                        }
+//                    } else {
+//                        +jsonSchema(it, context)
+//                    }
+//                }
+//            }
+//        }
+//        "hep.dataforge.meta.Meta" to json {
+//            "type" to "object"
+//        }
+//        "hep.dataforge.vision.solid.Point3D" to json {
+//            "type" to "object"
+//            "properties" to json {
+//                "x" to json {
+//                    "type" to "number"
+//                }
+//                "y" to json {
+//                    "type" to "number"
+//                }
+//                "z" to json {
+//                    "type" to "number"
+//                }
+//            }
+//        }
+//        "hep.dataforge.vision.solid.Point2D" to json {
+//            "type" to "object"
+//            "properties" to json {
+//                "x" to json {
+//                    "type" to "number"
+//                }
+//                "y" to json {
+//                    "type" to "number"
+//                }
+//            }
+//        }
+//        "hep.dataforge.vision.solid.SolidGroup" to jsonSchema(
+//            SolidGroup.serializer().descriptor,
+//            context
+//        )
+//
+//    }
+//
+//    println(
+//        JSON_PRETTY.stringify(
+//            JsonObjectSerializer,
+//            json {
+//                "\$defs" to definitions
+//                "\$ref" to "#/$definitionNode/hep.dataforge.vision.solid.SolidGroup"
+//            }
+//        )
+//    )
+//}
+//
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/geometryJVM.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/geometryJVM.kt
index 96f40d81..153aace7 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/geometryJVM.kt
+++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/geometryJVM.kt
@@ -1,11 +1,11 @@
 package hep.dataforge.vision.solid
 import org.fxyz3d.geometry.Point3D as FXPoint3D
 
-actual data class Point2D(actual var x: Double, actual var y: Double) {
+public actual data class Point2D(public actual var x: Double, public actual var y: Double) {
     actual constructor(x: Number, y: Number) : this(x.toDouble(), y.toDouble())
 }
 
-actual class Point3D(val point: FXPoint3D) {
+public actual class Point3D(val point: FXPoint3D) {
     actual constructor(x: Number, y: Number, z: Number) : this(
         FXPoint3D(
             x.toFloat(),
@@ -14,19 +14,19 @@ actual class Point3D(val point: FXPoint3D) {
         )
     )
 
-    actual var x: Double
+    public actual var x: Double
         inline get() = point.x.toDouble()
         inline set(value) {
             point.x = value.toFloat()
         }
 
-    actual var y: Double
+    public actual var y: Double
         inline get() = point.y.toDouble()
         inline set(value) {
             point.y = value.toFloat()
         }
 
-    actual var z: Double
+    public actual var z: Double
         inline get() = point.z.toDouble()
         inline set(value) {
             point.z = value.toFloat()
@@ -45,6 +45,6 @@ actual class Point3D(val point: FXPoint3D) {
     }
 }
 
-actual operator fun Point3D.plus(other: Point3D): Point3D {
+public actual operator fun Point3D.plus(other: Point3D): Point3D {
     return Point3D(point.add(other.point))
 }
\ No newline at end of file

From c3001cd85897018cd2466ff3d0126de27998225a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 6 Oct 2020 17:33:13 +0300
Subject: [PATCH 011/151] Fix for https://youtrack.jetbrains.com/issue/KT-42427

---
 demo/gdml/build.gradle.kts                                   | 5 -----
 .../hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt       | 2 +-
 demo/muon-monitor/build.gradle.kts                           | 4 ----
 .../jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt | 3 ++-
 .../main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt   | 4 ++--
 .../src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt | 3 ++-
 .../src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt | 3 ++-
 .../main/kotlin/hep/dataforge/vision/react/valueChooser.kt   | 5 +++--
 .../hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt | 5 +++--
 9 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/demo/gdml/build.gradle.kts b/demo/gdml/build.gradle.kts
index b0a00e61..1824345c 100644
--- a/demo/gdml/build.gradle.kts
+++ b/demo/gdml/build.gradle.kts
@@ -20,11 +20,6 @@ kotlin {
             withJava()
         }
     }
-
-    js {
-        useCommonJs()
-    }
-
     sourceSets {
         commonMain {
             dependencies {
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index 2392e042..4b9a4e0d 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -31,7 +31,7 @@ import react.dom.h1
 import styled.css
 import kotlin.math.PI
 
-interface GDMLAppProps : RProps {
+external interface GDMLAppProps : RProps {
     var context: Context
     var rootObject: Vision?
     var selected: Name?
diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts
index f4ba471d..3e0cb8d9 100644
--- a/demo/muon-monitor/build.gradle.kts
+++ b/demo/muon-monitor/build.gradle.kts
@@ -31,10 +31,6 @@ kotlin {
         }
     }
 
-    js {
-        useCommonJs()
-    }
-
     sourceSets {
         commonMain {
             dependencies {
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
index 61deb655..a4540ebd 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
@@ -25,7 +25,7 @@ import react.RProps
 import react.dom.*
 import kotlin.math.PI
 
-interface MMAppProps : RProps {
+external interface MMAppProps : RProps {
     var model: Model
     var context: Context
     var connection: HttpClient
@@ -40,6 +40,7 @@ private val canvasConfig = Canvas3DOptions {
     }
 }
 
+@JsExport
 val MMApp = component<MMAppProps> { props ->
     var selected by state { props.selected }
     var canvas: ThreeCanvas? by state { null }
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
index b7c4407e..6669f491 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
@@ -14,7 +14,7 @@ import react.*
 import react.dom.render
 import styled.*
 
-interface ConfigEditorItemProps : RProps {
+public external interface ConfigEditorItemProps : RProps {
 
     /**
      * Root config object - always non null
@@ -190,7 +190,7 @@ private fun RFBuilder.configEditorItem(props: ConfigEditorItemProps) {
     }
 }
 
-interface ConfigEditorProps : RProps {
+public external interface ConfigEditorProps : RProps {
     var id: Name
     var root: Config
     var default: Meta?
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
index 5f98e40f..48e49a19 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
@@ -17,7 +17,7 @@ import react.*
 import react.dom.a
 import styled.*
 
-interface MetaViewerProps : RProps {
+public external interface MetaViewerProps : RProps {
     /**
      * Root meta
      */
@@ -136,6 +136,7 @@ private fun RFBuilder.metaViewerItem(props: MetaViewerProps) {
     }
 }
 
+@JsExport
 val MetaViewer = component<MetaViewerProps> { props ->
     child(MetaViewerItem) {
         attrs {
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt
index ece2a32b..91760b4a 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt
@@ -12,7 +12,7 @@ import org.w3c.dom.events.Event
 import react.*
 import styled.*
 
-interface ObjectTreeProps : RProps {
+public external interface ObjectTreeProps : RProps {
     var name: Name
     var selected: Name?
     var obj: Vision
@@ -102,6 +102,7 @@ private fun RFBuilder.objectTree(props: ObjectTreeProps): Unit {
     }
 }
 
+@JsExport
 val ObjectTree: FunctionalComponent<ObjectTreeProps> = component { props ->
     objectTree(props)
 }
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
index cf51b5aa..e0888a46 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
@@ -19,16 +19,17 @@ import react.dom.option
 import styled.styledInput
 import styled.styledSelect
 
-interface ValueChooserProps : RProps {
+public external interface ValueChooserProps : RProps {
     var item: MetaItem<*>?
     var descriptor: ValueDescriptor?
     var valueChanged: ((Value?) -> Unit)?
 }
 
-interface ValueChooserState : RState {
+public external interface ValueChooserState : RState {
     var rawInput: Boolean?
 }
 
+@JsExport
 class ValueChooserComponent(props: ValueChooserProps) : RComponent<ValueChooserProps, ValueChooserState>(props) {
     private val element = createRef<HTMLElement>()
 
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt
index eb9ed292..fbc90a62 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt
@@ -13,7 +13,7 @@ import react.RState
 import react.dom.div
 import react.dom.findDOMNode
 
-interface ThreeCanvasProps : RProps {
+public external interface ThreeCanvasProps : RProps {
     var context: Context
     var obj: Solid
     var options: Canvas3DOptions?
@@ -22,11 +22,12 @@ interface ThreeCanvasProps : RProps {
     var canvasCallback: ((ThreeCanvas?) -> Unit)?
 }
 
-interface ThreeCanvasState : RState {
+public external interface ThreeCanvasState : RState {
     var element: Element?
 //    var canvas: ThreeCanvas?
 }
 
+@JsExport
 class ThreeCanvasComponent : RComponent<ThreeCanvasProps, ThreeCanvasState>() {
 
     private var canvas: ThreeCanvas? = null

From f72d626b0b880c32dd4b005fcc0f50eb5c110a4d Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 6 Oct 2020 17:50:36 +0300
Subject: [PATCH 012/151] Fix build for ring-ui

---
 ui/ring/build.gradle.kts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ui/ring/build.gradle.kts b/ui/ring/build.gradle.kts
index 167743be..a14662c4 100644
--- a/ui/ring/build.gradle.kts
+++ b/ui/ring/build.gradle.kts
@@ -4,6 +4,12 @@ plugins {
 
 val dataforgeVersion: String by rootProject.extra
 
+kotlin{
+    js{
+        useCommonJs()
+    }
+}
+
 dependencies{
     api(project(":ui:react"))
 

From 072b036fa252a8bef01be92d0aac3f297a5b1c22 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 6 Oct 2020 18:45:58 +0300
Subject: [PATCH 013/151] Fix serializer module

---
 .../hep/dataforge/vision/gdml/TestConvertor.kt  |  2 +-
 .../hep/dataforge/vision/solid/SolidManager.kt  | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
index cf9fb7b4..2dac5a76 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
@@ -1,9 +1,9 @@
 package hep.dataforge.vision.gdml
 
 import hep.dataforge.vision.solid.encodeToString
+import kscience.gdml.GDML
 import nl.adaptivity.xmlutil.StAXReader
 import org.junit.jupiter.api.Test
-import kscience.gdml.GDML
 
 class TestConvertor {
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index 5cc3948c..676ee9ba 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -12,9 +12,7 @@ import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionForm
 import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.VisionManager.Companion.VISION_SERIAL_MODULE_TARGET
-import kotlinx.serialization.DeserializationStrategy
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KSerializer
+import kotlinx.serialization.*
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.modules.*
 import kotlin.reflect.KClass
@@ -114,6 +112,19 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
                 subclass(SolidLabel.serializer())
                 subclass(Sphere.serializer())
             }
+
+            polymorphic(Solid::class) {
+                subclass(SolidGroup.serializer())
+                subclass(Proxy.serializer())
+                subclass(Composite.serializer())
+                subclass(Tube.serializer())
+                subclass(Box.serializer())
+                subclass(Convex.serializer())
+                subclass(Extruded.serializer())
+                subclass(PolyLine.serializer())
+                subclass(SolidLabel.serializer())
+                subclass(Sphere.serializer())
+            }
         }
 
         val jsonForSolids = Json {

From 22c3521a9ec843768ff637eeffa29c49a69c989d Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 14 Oct 2020 22:20:42 +0300
Subject: [PATCH 014/151] add Dependency structure.vsdx

---
 doc/Dependency structure.vsdx | Bin 0 -> 26099 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 doc/Dependency structure.vsdx

diff --git a/doc/Dependency structure.vsdx b/doc/Dependency structure.vsdx
new file mode 100644
index 0000000000000000000000000000000000000000..6c7f1cf651e19f85f4661e91bc35a6623847f2cb
GIT binary patch
literal 26099
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
B`&s}1

literal 0
HcmV?d00001


From 3edb00b6bfe298e1d29829f1e9ce7f59f68f4779 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 28 Oct 2020 22:11:28 +0300
Subject: [PATCH 015/151] Remove bootstrap from solid

---
 build.gradle.kts                              |  2 +-
 demo/gdml/build.gradle.kts                    |  7 ++---
 .../vision/gdml/demo/GDMLAppComponent.kt      | 29 +++++++++----------
 demo/muon-monitor/build.gradle.kts            |  2 +-
 .../mipt/npm/muon/monitor/MMAppComponent.kt   | 20 +++++++------
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 settings.gradle.kts                           |  6 ++--
 ui/bootstrap/build.gradle.kts                 |  1 +
 .../vision/bootstrap}/outputConfig.kt         |  7 ++---
 ui/react/build.gradle.kts                     |  4 +--
 .../dataforge/vision/react/ConfigEditor.kt    | 19 ++++++------
 .../hep/dataforge/vision/react/MetaViewer.kt  |  2 +-
 .../hep/dataforge/vision/react/ObjectTree.kt  |  8 ++---
 .../hep/dataforge/vision/react/react.kt       | 24 ++++-----------
 visionforge-core/build.gradle.kts             |  2 +-
 visionforge-gdml/build.gradle.kts             |  2 +-
 .../dataforge/vision/gdml/GDMLTransformer.kt  | 23 +++++++--------
 visionforge-solid/build.gradle.kts            |  1 -
 .../hep/dataforge/vision/solid/ConvexTest.kt  |  2 +-
 .../solid/three/ThreeCanvasComponent.kt       |  4 +--
 20 files changed, 75 insertions(+), 92 deletions(-)
 rename {visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three => ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap}/outputConfig.kt (97%)

diff --git a/build.gradle.kts b/build.gradle.kts
index f2a94902..bc20d61f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     id("ru.mipt.npm.project")
 }
 
-val dataforgeVersion by extra("0.2.0-dev-3")
+val dataforgeVersion by extra("0.2.0-dev-4")
 val ktorVersion by extra("1.4.1")
 
 allprojects {
diff --git a/demo/gdml/build.gradle.kts b/demo/gdml/build.gradle.kts
index 1824345c..82e03364 100644
--- a/demo/gdml/build.gradle.kts
+++ b/demo/gdml/build.gradle.kts
@@ -14,11 +14,8 @@ kscience {
 }
 
 kotlin {
-
     jvm {
-        afterEvaluate {
-            withJava()
-        }
+        withJava()
     }
     sourceSets {
         commonMain {
@@ -37,7 +34,7 @@ kotlin {
 }
 
 application {
-    mainClassName = "hep.dataforge.vision.gdml.demo.GdmlFxDemoAppKt"
+    mainClass.set("hep.dataforge.vision.gdml.demo.GdmlFxDemoAppKt")
 }
 
 val convertGdmlToJson by tasks.creating(JavaExec::class) {
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index 4b9a4e0d..8624f141 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -9,14 +9,10 @@ import hep.dataforge.vision.bootstrap.*
 import hep.dataforge.vision.gdml.toVision
 import hep.dataforge.vision.react.component
 import hep.dataforge.vision.react.objectTree
-import hep.dataforge.vision.react.state
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.SolidGroup
-import hep.dataforge.vision.solid.specifications.Camera
-import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.solid.three.ThreeCanvas
 import hep.dataforge.vision.solid.three.ThreeCanvasComponent
-import hep.dataforge.vision.solid.three.canvasControls
 import kotlinx.browser.window
 import kotlinx.css.FlexBasis
 import kotlinx.css.Overflow
@@ -28,8 +24,10 @@ import org.w3c.files.FileReader
 import org.w3c.files.get
 import react.RProps
 import react.dom.h1
+import react.getValue
+import react.setValue
+import react.useState
 import styled.css
-import kotlin.math.PI
 
 external interface GDMLAppProps : RProps {
     var context: Context
@@ -37,18 +35,19 @@ external interface GDMLAppProps : RProps {
     var selected: Name?
 }
 
-private val canvasConfig = Canvas3DOptions {
-    camera = Camera {
-        distance = 2100.0
-        latitude = PI / 6
-        azimuth = PI + PI / 6
-    }
-}
+//private val canvasConfig = Canvas3DOptions {
+//    camera = Camera {
+//        distance = 2100.0
+//        latitude = PI / 6
+//        azimuth = PI + PI / 6
+//    }
+//}
 
+@JsExport
 val GDMLApp = component<GDMLAppProps> { props ->
-    var selected by state { props.selected }
-    var canvas: ThreeCanvas? by state { null }
-    var vision: Vision? by state { props.rootObject }
+    var selected by useState { props.selected }
+    var canvas: ThreeCanvas? by useState { null }
+    var vision: Vision? by useState { props.rootObject }
 
     val select: (Name?) -> Unit = {
         selected = it
diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts
index 3e0cb8d9..1f44169d 100644
--- a/demo/muon-monitor/build.gradle.kts
+++ b/demo/muon-monitor/build.gradle.kts
@@ -55,7 +55,7 @@ kotlin {
 }
 
 application {
-    mainClassName = "ru.mipt.npm.muon.monitor.server.MMServerKt"
+    mainClass.set("ru.mipt.npm.muon.monitor.server.MMServerKt")
 }
 
 distributions {
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
index a4540ebd..d492b325 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
@@ -6,16 +6,15 @@ import hep.dataforge.names.NameToken
 import hep.dataforge.names.isEmpty
 import hep.dataforge.names.length
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.bootstrap.canvasControls
 import hep.dataforge.vision.bootstrap.card
 import hep.dataforge.vision.react.component
 import hep.dataforge.vision.react.configEditor
 import hep.dataforge.vision.react.objectTree
-import hep.dataforge.vision.react.state
 import hep.dataforge.vision.solid.specifications.Camera
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.solid.three.ThreeCanvas
 import hep.dataforge.vision.solid.three.ThreeCanvasComponent
-import hep.dataforge.vision.solid.three.canvasControls
 import io.ktor.client.HttpClient
 import io.ktor.client.request.get
 import kotlinx.coroutines.GlobalScope
@@ -23,6 +22,9 @@ import kotlinx.coroutines.launch
 import kotlinx.html.js.onClickFunction
 import react.RProps
 import react.dom.*
+import react.getValue
+import react.setValue
+import react.useState
 import kotlin.math.PI
 
 external interface MMAppProps : RProps {
@@ -42,14 +44,14 @@ private val canvasConfig = Canvas3DOptions {
 
 @JsExport
 val MMApp = component<MMAppProps> { props ->
-    var selected by state { props.selected }
-    var canvas: ThreeCanvas? by state { null }
+    var selected by useState  { props.selected }
+    var canvas: ThreeCanvas? by useState { null }
 
     val select: (Name?) -> Unit = {
         selected = it
     }
 
-    val visual = props.model.root
+    val root = props.model.root
 
     div("row") {
         h1("mx-auto") {
@@ -60,7 +62,7 @@ val MMApp = component<MMAppProps> { props ->
         div("col-lg-3 px-0 overflow-auto") {
             //tree
             card("Object tree") {
-                objectTree(visual, selected, select)
+                objectTree(root, selected, select)
             }
         }
         div("col-lg-6") {
@@ -68,7 +70,7 @@ val MMApp = component<MMAppProps> { props ->
             child(ThreeCanvasComponent::class) {
                 attrs {
                     this.context = props.context
-                    this.obj = visual
+                    this.obj = root
                     this.options = canvasConfig
                     this.selected = selected
                     this.clickCallback = select
@@ -153,8 +155,8 @@ val MMApp = component<MMAppProps> { props ->
                     selected.let { selected ->
                         val selectedObject: Vision? = when {
                             selected == null -> null
-                            selected.isEmpty() -> visual
-                            else -> visual[selected]
+                            selected.isEmpty() -> root
+                            else -> root[selected]
                         }
                         if (selectedObject != null) {
                             configEditor(selectedObject, default = selectedObject.getAllProperties(), key = selected)
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 12d38de6..be52383e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 40fcab11..65690060 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,9 +1,9 @@
 pluginManagement {
-    val kotlinVersion = "1.4.20-M1"
-    val toolsVersion = "0.6.3-dev-1.4.20-M1"
+    val kotlinVersion = "1.4.20-M2"
+    val toolsVersion = "0.6.4-dev-1.4.20-M2"
 
     repositories {
-        mavenLocal()
+//        mavenLocal()
         jcenter()
         gradlePluginPortal()
         maven("https://dl.bintray.com/kotlin/kotlin-eap")
diff --git a/ui/bootstrap/build.gradle.kts b/ui/bootstrap/build.gradle.kts
index b2400d0c..1cdd834d 100644
--- a/ui/bootstrap/build.gradle.kts
+++ b/ui/bootstrap/build.gradle.kts
@@ -5,5 +5,6 @@ plugins {
 val dataforgeVersion: String by rootProject.extra
 
 dependencies{
+    api(project(":visionforge-solid"))
     api(project(":ui:react"))
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/outputConfig.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
similarity index 97%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/outputConfig.kt
rename to ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
index f4e65da1..b6326979 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/outputConfig.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
@@ -1,11 +1,11 @@
-package hep.dataforge.vision.solid.three
+package hep.dataforge.vision.bootstrap
 
 import hep.dataforge.js.requireJS
 import hep.dataforge.meta.DFExperimental
-import hep.dataforge.vision.bootstrap.accordion
-import hep.dataforge.vision.bootstrap.entry
 import hep.dataforge.vision.solid.SolidGroup
 import hep.dataforge.vision.solid.SolidManager
+import hep.dataforge.vision.solid.three.ThreeCanvas
+import kotlinx.dom.clear
 import kotlinx.html.*
 import kotlinx.html.dom.append
 import kotlinx.html.js.onChangeFunction
@@ -21,7 +21,6 @@ import react.dom.button
 import react.dom.div
 import react.dom.input
 import react.dom.label
-import kotlin.dom.clear
 
 private fun saveData(event: Event, fileName: String, mimeType: String = "text/plain", dataBuilder: () -> String) {
     event.stopPropagation();
diff --git a/ui/react/build.gradle.kts b/ui/react/build.gradle.kts
index 3fb049b5..8d541ffd 100644
--- a/ui/react/build.gradle.kts
+++ b/ui/react/build.gradle.kts
@@ -2,13 +2,13 @@ plugins {
     id("ru.mipt.npm.js")
 }
 
-val reactVersion by extra("16.13.1")
+val reactVersion by extra("17.0.0")
 
 dependencies{
     api(project(":visionforge-core"))
 
     //api("org.jetbrains:kotlin-react:16.13.1-pre.104-kotlin-1.3.72")
-    api("org.jetbrains:kotlin-react-dom:$reactVersion-pre.123-kotlin-1.4.10")
+    api("org.jetbrains:kotlin-react-dom:$reactVersion-pre.126-kotlin-1.4.10")
 
     api(npm("react", reactVersion))
     api(npm("react-dom", reactVersion))
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
index 6669f491..8c749d47 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
@@ -42,11 +42,11 @@ private val ConfigEditorItem: FunctionalComponent<ConfigEditorItemProps> = compo
 }
 
 private fun RFBuilder.configEditorItem(props: ConfigEditorItemProps) {
-    var expanded: Boolean by state { true }
-    var item: MetaItem<Config>? by state { props.root[props.name] }
+    var expanded: Boolean by useState { true }
+    var item: MetaItem<Config>? by useState { props.root[props.name] }
     val descriptorItem: ItemDescriptor? = props.descriptor?.get(props.name)
     val defaultItem = props.default?.get(props.name)
-    var actualItem: MetaItem<Meta>? by state { item ?: defaultItem ?: descriptorItem?.defaultItem() }
+    var actualItem: MetaItem<Meta>? by useState { item ?: defaultItem ?: descriptorItem?.defaultItem() }
 
     val token = props.name.lastOrNull()?.toString() ?: "Properties"
 
@@ -191,13 +191,14 @@ private fun RFBuilder.configEditorItem(props: ConfigEditorItemProps) {
 }
 
 public external interface ConfigEditorProps : RProps {
-    var id: Name
-    var root: Config
-    var default: Meta?
-    var descriptor: NodeDescriptor?
+    public var id: Name
+    public var root: Config
+    public var default: Meta?
+    public var descriptor: NodeDescriptor?
 }
 
-val ConfigEditor = component<ConfigEditorProps> { props ->
+@JsExport
+public val ConfigEditor: FunctionalComponent<ConfigEditorProps> = component { props ->
     child(ConfigEditorItem) {
         attrs {
             this.key = ""
@@ -209,7 +210,7 @@ val ConfigEditor = component<ConfigEditorProps> { props ->
     }
 }
 
-fun Element.configEditor(config: Config, descriptor: NodeDescriptor? = null, default: Meta? = null, key: Any? = null) {
+public fun Element.configEditor(config: Config, descriptor: NodeDescriptor? = null, default: Meta? = null, key: Any? = null) {
     render(this) {
         child(ConfigEditor) {
             attrs {
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
index 48e49a19..fbf6dcc5 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
@@ -39,7 +39,7 @@ private val MetaViewerItem: FunctionalComponent<MetaViewerProps> = component { p
 }
 
 private fun RFBuilder.metaViewerItem(props: MetaViewerProps) {
-    var expanded: Boolean by state { true }
+    var expanded: Boolean by useState { true }
     val item = props.root[props.name]
     val descriptorItem: ItemDescriptor? = props.descriptor?.get(props.name)
     val actualItem = item ?: descriptorItem?.defaultItem()
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt
index 91760b4a..053569d7 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt
@@ -13,10 +13,10 @@ import react.*
 import styled.*
 
 public external interface ObjectTreeProps : RProps {
-    var name: Name
-    var selected: Name?
-    var obj: Vision
-    var clickCallback: (Name) -> Unit
+    public var name: Name
+    public var selected: Name?
+    public var obj: Vision
+    public var clickCallback: (Name) -> Unit
 }
 
 private fun RFBuilder.objectTree(props: ObjectTreeProps): Unit {
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/react.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/react.kt
index 718a21b7..a0e2c787 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/react.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/react.kt
@@ -1,16 +1,14 @@
 package hep.dataforge.vision.react
 
 import react.*
-import kotlin.properties.ReadWriteProperty
-import kotlin.reflect.KProperty
 
-class RFBuilder : RBuilder()
+public class RFBuilder : RBuilder()
 
 /**
  * Get functional component from [func]
  */
-fun <P : RProps> component(
-    func: RFBuilder.(props: P) -> Unit
+public inline fun <P : RProps> component(
+    crossinline func: RFBuilder.(props: P) -> Unit,
 ): FunctionalComponent<P> {
     return { props: P ->
         val nodes = RFBuilder().apply { func(props) }.childList
@@ -21,18 +19,6 @@ fun <P : RProps> component(
         }
     }
 }
-
-fun <T> RFBuilder.state(init: () -> T): ReadWriteProperty<Any?, T> =
-    object : ReadWriteProperty<Any?, T> {
-        val pair = react.useState(init)
-        override fun getValue(thisRef: Any?, property: KProperty<*>): T {
-            return pair.first
-        }
-
-        override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
-            pair.second(value)
-        }
-    }
-
-fun <T> RFBuilder.memoize(vararg deps: dynamic, builder: () -> T): T = useMemo(builder, deps)
+//
+//public fun <T> RFBuilder.memoize(vararg deps: dynamic, builder: () -> T): T = useMemo(builder, deps)
 
diff --git a/visionforge-core/build.gradle.kts b/visionforge-core/build.gradle.kts
index 546587d2..2bf0b6e0 100644
--- a/visionforge-core/build.gradle.kts
+++ b/visionforge-core/build.gradle.kts
@@ -31,7 +31,7 @@ kotlin {
 
                 //api("org.jetbrains:kotlin-extensions:1.0.1-pre.105-kotlin-1.3.72")
                 //api("org.jetbrains:kotlin-css-js:1.0.0-pre.105-kotlin-1.3.72")
-                api("org.jetbrains:kotlin-styled:5.2.0-pre.123-kotlin-1.4.10")
+                api("org.jetbrains:kotlin-styled:5.2.0-pre.126-kotlin-1.4.10")
 
                 api(npm("core-js", "2.6.5"))
                 api(npm("inline-style-prefixer", "5.1.0"))
diff --git a/visionforge-gdml/build.gradle.kts b/visionforge-gdml/build.gradle.kts
index ebb6a865..d6456b16 100644
--- a/visionforge-gdml/build.gradle.kts
+++ b/visionforge-gdml/build.gradle.kts
@@ -7,7 +7,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 api(project(":visionforge-solid"))
-                api("kscience.gdml:gdml:0.2.0-dev-2")
+                api("kscience.gdml:gdml:0.2.0-dev-3")
             }
         }
     }
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
index 3995c92f..1374f70f 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
@@ -7,7 +7,6 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
 import hep.dataforge.names.toName
-import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.set
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
@@ -20,21 +19,21 @@ import kotlin.random.Random
 private val solidsName = "solids".asName()
 private val volumesName = "volumes".asName()
 
-public class GDMLTransformer internal constructor(val root: GDML) {
+public class GDMLTransformer internal constructor(public val root: GDML) {
     //private val materialCache = HashMap<GDMLMaterial, Meta>()
     private val random = Random(222)
 
-    enum class Action {
+    public enum class Action {
         ADD,
         REJECT,
         PROTOTYPE
     }
 
-    var lUnit: LUnit = LUnit.MM
-    var aUnit: AUnit = AUnit.RADIAN
+    public var lUnit: LUnit = LUnit.MM
+    public var aUnit: AUnit = AUnit.RADIAN
 
-    var solidAction: (GDMLSolid) -> Action = { Action.PROTOTYPE }
-    var volumeAction: (GDMLGroup) -> Action = { Action.PROTOTYPE }
+    public var solidAction: (GDMLSolid) -> Action = { Action.PROTOTYPE }
+    public var volumeAction: (GDMLGroup) -> Action = { Action.PROTOTYPE }
 
     /**
      * A special group for local templates
@@ -71,7 +70,7 @@ public class GDMLTransformer internal constructor(val root: GDML) {
 
     private val styleCache = HashMap<Name, Meta>()
 
-    var solidConfiguration: Solid.(parent: GDMLVolume, solid: GDMLSolid) -> Unit = { parent, _ ->
+    public var solidConfiguration: Solid.(parent: GDMLVolume, solid: GDMLSolid) -> Unit = { parent, _ ->
         lUnit = LUnit.CM
         if (parent.physVolumes.isNotEmpty()) {
             useStyle("opaque") {
@@ -101,7 +100,7 @@ public class GDMLTransformer internal constructor(val root: GDML) {
         obj.solidConfiguration(parent, solid)
     }
 
-    var onFinish: GDMLTransformer.() -> Unit = {}
+    public var onFinish: GDMLTransformer.() -> Unit = {}
 
 
     private fun <T : Solid> T.withPosition(
@@ -356,13 +355,13 @@ public class GDMLTransformer internal constructor(val root: GDML) {
         return final
     }
 
-    val result by lazy {
+    public val result: SolidGroup by lazy {
         finalize(volume(root.world))
     }
 }
 
 
-fun GDML.toVision(block: GDMLTransformer.() -> Unit = {}): SolidGroup {
+public fun GDML.toVision(block: GDMLTransformer.() -> Unit = {}): SolidGroup {
     val context = GDMLTransformer(this).apply(block)
     return context.result
 }
@@ -370,7 +369,7 @@ fun GDML.toVision(block: GDMLTransformer.() -> Unit = {}): SolidGroup {
 /**
  * Append gdml node to the group
  */
-fun SolidGroup.gdml(gdml: GDML, key: String = "", transformer: GDMLTransformer.() -> Unit = {}) {
+public fun SolidGroup.gdml(gdml: GDML, key: String = "", transformer: GDMLTransformer.() -> Unit = {}) {
     val visual = gdml.toVision(transformer)
     //println(Visual3DPlugin.json.stringify(VisualGroup3D.serializer(), visual))
     set(key, visual)
diff --git a/visionforge-solid/build.gradle.kts b/visionforge-solid/build.gradle.kts
index 7f08e038..aab7e547 100644
--- a/visionforge-solid/build.gradle.kts
+++ b/visionforge-solid/build.gradle.kts
@@ -29,7 +29,6 @@ kotlin {
         }
         jsMain {
             dependencies {
-                implementation(project(":ui:bootstrap"))//to be removed later
                 implementation(npm("three", "0.114.0"))
                 implementation(npm("three-csg-ts", "1.0.1"))
                 api(npm("file-saver", "2.0.2"))
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
index 7da077bd..d2dbc4b3 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
@@ -1,7 +1,7 @@
 package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.*
-import kotlinx.serialization.json.toJson
+
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt
index fbc90a62..ee033817 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt
@@ -28,7 +28,7 @@ public external interface ThreeCanvasState : RState {
 }
 
 @JsExport
-class ThreeCanvasComponent : RComponent<ThreeCanvasProps, ThreeCanvasState>() {
+public class ThreeCanvasComponent : RComponent<ThreeCanvasProps, ThreeCanvasState>() {
 
     private var canvas: ThreeCanvas? = null
 
@@ -62,7 +62,7 @@ class ThreeCanvasComponent : RComponent<ThreeCanvasProps, ThreeCanvasState>() {
     }
 }
 
-fun RBuilder.threeCanvas(object3D: Solid, options: Canvas3DOptions.() -> Unit = {}) {
+public fun RBuilder.threeCanvas(object3D: Solid, options: Canvas3DOptions.() -> Unit = {}) {
     child(ThreeCanvasComponent::class) {
         attrs {
             this.obj = object3D

From aaad8365677118fb6e7e93eb839993d11c5731e5 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 30 Oct 2020 10:02:49 +0300
Subject: [PATCH 016/151] Refactor react ThreeCanvas to functional component

---
 .../vision/gdml/demo/GDMLAppComponent.kt      |  26 ++--
 .../mipt/npm/muon/monitor/MMAppComponent.kt   |  21 ++--
 playground/src/jsMain/kotlin/PlayGroundApp.kt |  21 +++-
 .../dataforge/vision/react/ConfigEditor.kt    |  18 +--
 .../hep/dataforge/vision/react/MetaViewer.kt  |  14 +--
 .../hep/dataforge/vision/react/ObjectTree.kt  |   6 +-
 .../hep/dataforge/vision/react/TreeStyles.kt  |   6 +-
 .../hep/dataforge/vision/react/layout.kt      |   5 +-
 .../hep/dataforge/vision/react/react.kt       |  24 ----
 .../dataforge/vision/gdml/GdmlOptimizer.kt    |   6 +-
 .../hep/dataforge/vision/gdml/gdmlJs.kt       |   6 +-
 .../hep/dataforge/vision/gdml/gdmlJVM.kt      |   2 +-
 .../vision/solid/three/ThreeCanvas.kt         |  45 ++++---
 .../solid/three/ThreeCanvasComponent.kt       | 111 +++++++++++-------
 14 files changed, 162 insertions(+), 149 deletions(-)
 delete mode 100644 ui/react/src/main/kotlin/hep/dataforge/vision/react/react.kt

diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index 8624f141..f5704cb7 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -7,7 +7,6 @@ import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionGroup
 import hep.dataforge.vision.bootstrap.*
 import hep.dataforge.vision.gdml.toVision
-import hep.dataforge.vision.react.component
 import hep.dataforge.vision.react.objectTree
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.SolidGroup
@@ -22,11 +21,8 @@ import kscience.gdml.GDML
 import kscience.gdml.decodeFromString
 import org.w3c.files.FileReader
 import org.w3c.files.get
-import react.RProps
+import react.*
 import react.dom.h1
-import react.getValue
-import react.setValue
-import react.useState
 import styled.css
 
 external interface GDMLAppProps : RProps {
@@ -44,7 +40,7 @@ external interface GDMLAppProps : RProps {
 //}
 
 @JsExport
-val GDMLApp = component<GDMLAppProps> { props ->
+val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
     var selected by useState { props.selected }
     var canvas: ThreeCanvas? by useState { null }
     var vision: Vision? by useState { props.rootObject }
@@ -113,16 +109,14 @@ val GDMLApp = component<GDMLAppProps> { props ->
                     +"order-xl-2"
                 }
                 //canvas
-                (vision as? Solid)?.let { visual3D ->
-                    child(ThreeCanvasComponent::class) {
-                        attrs {
-                            this.context = props.context
-                            this.obj = visual3D
-                            this.selected = selected
-                            this.clickCallback = select
-                            this.canvasCallback = {
-                                canvas = it
-                            }
+                child(ThreeCanvasComponent) {
+                    attrs {
+                        this.context = props.context
+                        this.obj = vision as? Solid
+                        this.selected = selected
+                        this.clickCallback = select
+                        this.canvasCallback = {
+                            canvas = it
                         }
                     }
                 }
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
index d492b325..527c2b77 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
@@ -8,7 +8,6 @@ import hep.dataforge.names.length
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.bootstrap.canvasControls
 import hep.dataforge.vision.bootstrap.card
-import hep.dataforge.vision.react.component
 import hep.dataforge.vision.react.configEditor
 import hep.dataforge.vision.react.objectTree
 import hep.dataforge.vision.solid.specifications.Camera
@@ -20,11 +19,10 @@ import io.ktor.client.request.get
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.html.js.onClickFunction
-import react.RProps
+import react.*
 import react.dom.*
-import react.getValue
-import react.setValue
-import react.useState
+import styled.css
+import styled.styledDiv
 import kotlin.math.PI
 
 external interface MMAppProps : RProps {
@@ -43,8 +41,8 @@ private val canvasConfig = Canvas3DOptions {
 }
 
 @JsExport
-val MMApp = component<MMAppProps> { props ->
-    var selected by useState  { props.selected }
+val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
+    var selected by useState { props.selected }
     var canvas: ThreeCanvas? by useState { null }
 
     val select: (Name?) -> Unit = {
@@ -59,7 +57,12 @@ val MMApp = component<MMAppProps> { props ->
         }
     }
     div("row") {
-        div("col-lg-3 px-0 overflow-auto") {
+        styledDiv {
+            css {
+                +"col-lg-3"
+                +"px-0"
+                +"overflow-auto"
+            }
             //tree
             card("Object tree") {
                 objectTree(root, selected, select)
@@ -67,7 +70,7 @@ val MMApp = component<MMAppProps> { props ->
         }
         div("col-lg-6") {
             //canvas
-            child(ThreeCanvasComponent::class) {
+            child(ThreeCanvasComponent) {
                 attrs {
                     this.context = props.context
                     this.obj = root
diff --git a/playground/src/jsMain/kotlin/PlayGroundApp.kt b/playground/src/jsMain/kotlin/PlayGroundApp.kt
index ea95c926..72196672 100644
--- a/playground/src/jsMain/kotlin/PlayGroundApp.kt
+++ b/playground/src/jsMain/kotlin/PlayGroundApp.kt
@@ -3,16 +3,25 @@ import hep.dataforge.js.Application
 import hep.dataforge.js.startApplication
 import hep.dataforge.vision.bootstrap.visionPropertyEditor
 import hep.dataforge.vision.react.objectTree
-import hep.dataforge.vision.solid.Point3D
-import hep.dataforge.vision.solid.SolidGroup
-import hep.dataforge.vision.solid.box
-import hep.dataforge.vision.solid.group
+import hep.dataforge.vision.solid.*
+import hep.dataforge.vision.solid.specifications.Canvas3DOptions
+import hep.dataforge.vision.solid.three.ThreeCanvasComponent
 import hep.dataforge.vision.solid.three.ThreePlugin
-import hep.dataforge.vision.solid.three.threeCanvas
+import kotlinx.browser.document
 import org.w3c.dom.HTMLElement
+import react.RBuilder
+import react.child
 import react.dom.div
 import react.dom.render
-import kotlin.browser.document
+
+public fun RBuilder.threeCanvas(object3D: Solid, options: Canvas3DOptions.() -> Unit = {}) {
+    child(ThreeCanvasComponent) {
+        attrs {
+            this.obj = object3D
+            this.options = Canvas3DOptions.invoke(options)
+        }
+    }
+}
 
 private class PlayGroundApp : Application {
 
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
index 8c749d47..9d9078f7 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
@@ -19,29 +19,29 @@ public external interface ConfigEditorItemProps : RProps {
     /**
      * Root config object - always non null
      */
-    var root: Config
+    public var root: Config
 
     /**
      * Full path to the displayed node in [root]. Could be empty
      */
-    var name: Name
+    public var name: Name
 
     /**
      * Root default
      */
-    var default: Meta?
+    public var default: Meta?
 
     /**
      * Root descriptor
      */
-    var descriptor: NodeDescriptor?
+    public var descriptor: NodeDescriptor?
 }
 
-private val ConfigEditorItem: FunctionalComponent<ConfigEditorItemProps> = component { props ->
+private val ConfigEditorItem: FunctionalComponent<ConfigEditorItemProps> = functionalComponent("ConfigEditorItem") { props ->
     configEditorItem(props)
 }
 
-private fun RFBuilder.configEditorItem(props: ConfigEditorItemProps) {
+private fun RBuilder.configEditorItem(props: ConfigEditorItemProps) {
     var expanded: Boolean by useState { true }
     var item: MetaItem<Config>? by useState { props.root[props.name] }
     val descriptorItem: ItemDescriptor? = props.descriptor?.get(props.name)
@@ -198,7 +198,7 @@ public external interface ConfigEditorProps : RProps {
 }
 
 @JsExport
-public val ConfigEditor: FunctionalComponent<ConfigEditorProps> = component { props ->
+public val ConfigEditor: FunctionalComponent<ConfigEditorProps> = functionalComponent("ConfigEditor") { props ->
     child(ConfigEditorItem) {
         attrs {
             this.key = ""
@@ -223,7 +223,7 @@ public fun Element.configEditor(config: Config, descriptor: NodeDescriptor? = nu
     }
 }
 
-fun RBuilder.configEditor(config: Config, descriptor: NodeDescriptor? = null, default: Meta? = null, key: Any? = null) {
+public fun RBuilder.configEditor(config: Config, descriptor: NodeDescriptor? = null, default: Meta? = null, key: Any? = null) {
     child(ConfigEditor) {
         attrs {
             this.key = key?.toString() ?: ""
@@ -234,7 +234,7 @@ fun RBuilder.configEditor(config: Config, descriptor: NodeDescriptor? = null, de
     }
 }
 
-fun RBuilder.configEditor(
+public fun RBuilder.configEditor(
     obj: Configurable,
     descriptor: NodeDescriptor? = obj.descriptor,
     default: Meta? = null,
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
index fbf6dcc5..9c17206d 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
@@ -21,24 +21,24 @@ public external interface MetaViewerProps : RProps {
     /**
      * Root meta
      */
-    var root: Meta
+    public var root: Meta
 
     /**
      * Full path to the displayed node in [root]. Could be empty
      */
-    var name: Name
+    public var name: Name
 
     /**
      * Root descriptor
      */
-    var descriptor: NodeDescriptor?
+    public var descriptor: NodeDescriptor?
 }
 
-private val MetaViewerItem: FunctionalComponent<MetaViewerProps> = component { props ->
+private val MetaViewerItem: FunctionalComponent<MetaViewerProps> = functionalComponent("MetaViewerItem") { props ->
     metaViewerItem(props)
 }
 
-private fun RFBuilder.metaViewerItem(props: MetaViewerProps) {
+private fun RBuilder.metaViewerItem(props: MetaViewerProps) {
     var expanded: Boolean by useState { true }
     val item = props.root[props.name]
     val descriptorItem: ItemDescriptor? = props.descriptor?.get(props.name)
@@ -137,7 +137,7 @@ private fun RFBuilder.metaViewerItem(props: MetaViewerProps) {
 }
 
 @JsExport
-val MetaViewer = component<MetaViewerProps> { props ->
+public val MetaViewer:FunctionalComponent<MetaViewerProps>  = functionalComponent<MetaViewerProps>("MetaViewer") { props ->
     child(MetaViewerItem) {
         attrs {
             this.key = ""
@@ -148,7 +148,7 @@ val MetaViewer = component<MetaViewerProps> { props ->
     }
 }
 
-fun RBuilder.metaViewer(meta: Meta, descriptor: NodeDescriptor? = null, key: Any? = null) {
+public fun RBuilder.metaViewer(meta: Meta, descriptor: NodeDescriptor? = null, key: Any? = null) {
     child(MetaViewer) {
         attrs {
             this.key = key?.toString() ?: ""
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt
index 053569d7..5faab7ba 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt
@@ -19,7 +19,7 @@ public external interface ObjectTreeProps : RProps {
     public var clickCallback: (Name) -> Unit
 }
 
-private fun RFBuilder.objectTree(props: ObjectTreeProps): Unit {
+private fun RBuilder.objectTree(props: ObjectTreeProps): Unit {
     var expanded: Boolean by useState { props.selected?.startsWith(props.name) ?: false }
 
     val onClick: (Event) -> Unit = {
@@ -103,11 +103,11 @@ private fun RFBuilder.objectTree(props: ObjectTreeProps): Unit {
 }
 
 @JsExport
-val ObjectTree: FunctionalComponent<ObjectTreeProps> = component { props ->
+public val ObjectTree: FunctionalComponent<ObjectTreeProps> = functionalComponent("ObjectTree") { props ->
     objectTree(props)
 }
 
-fun RBuilder.objectTree(
+public fun RBuilder.objectTree(
     vision: Vision,
     selected: Name? = null,
     clickCallback: (Name) -> Unit = {}
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt
index ead7d577..7cfb7d48 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt
@@ -4,11 +4,11 @@ import kotlinx.css.*
 import kotlinx.css.properties.*
 import styled.StyleSheet
 
-object TreeStyles : StyleSheet("treeStyles", true) {
+public object TreeStyles : StyleSheet("treeStyles", true) {
     /**
      * Remove default bullets
      */
-    val tree by css {
+    public val tree by css {
         paddingLeft = 8.px
         marginLeft = 0.px
         listStyleType = ListStyleType.none
@@ -17,7 +17,7 @@ object TreeStyles : StyleSheet("treeStyles", true) {
     /**
      * Style the caret/arrow
      */
-    val treeCaret by css {
+    public val treeCaret by css {
         cursor = Cursor.pointer
         userSelect = UserSelect.none
         /* Create the caret/arrow with a unicode, and style it */
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/layout.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/layout.kt
index 5a13a089..cdafb527 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/layout.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/layout.kt
@@ -6,11 +6,12 @@ import kotlinx.css.display
 import kotlinx.css.flexDirection
 import kotlinx.html.DIV
 import react.RBuilder
+import react.ReactElement
 import styled.StyledDOMBuilder
 import styled.css
 import styled.styledDiv
 
-inline fun RBuilder.flexColumn(block: StyledDOMBuilder<DIV>.() -> Unit) =
+public inline fun RBuilder.flexColumn(block: StyledDOMBuilder<DIV>.() -> Unit): ReactElement =
     styledDiv {
         css {
             display = Display.flex
@@ -19,7 +20,7 @@ inline fun RBuilder.flexColumn(block: StyledDOMBuilder<DIV>.() -> Unit) =
         block()
     }
 
-inline fun RBuilder.flexRow(block: StyledDOMBuilder<DIV>.() -> Unit) =
+public inline fun RBuilder.flexRow(block: StyledDOMBuilder<DIV>.() -> Unit): ReactElement =
     styledDiv {
         css {
             display = Display.flex
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/react.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/react.kt
deleted file mode 100644
index a0e2c787..00000000
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/react.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package hep.dataforge.vision.react
-
-import react.*
-
-public class RFBuilder : RBuilder()
-
-/**
- * Get functional component from [func]
- */
-public inline fun <P : RProps> component(
-    crossinline func: RFBuilder.(props: P) -> Unit,
-): FunctionalComponent<P> {
-    return { props: P ->
-        val nodes = RFBuilder().apply { func(props) }.childList
-        when (nodes.size) {
-            0 -> null
-            1 -> nodes.first()
-            else -> createElement(Fragment, kotlinext.js.js {}, *nodes.toTypedArray())
-        }
-    }
-}
-//
-//public fun <T> RFBuilder.memoize(vararg deps: dynamic, builder: () -> T): T = useMemo(builder, deps)
-
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
index dba7e32f..692c334b 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
@@ -13,9 +13,9 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.coroutineScope
 import mu.KotlinLogging
 
-expect class Counter() {
-    fun get(): Int
-    fun incrementAndGet(): Int
+public expect class Counter() {
+    public fun get(): Int
+    public fun incrementAndGet(): Int
 }
 
 private fun Point3D?.safePlus(other: Point3D?): Point3D? = if (this == null && other == null) {
diff --git a/visionforge-gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/gdmlJs.kt b/visionforge-gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/gdmlJs.kt
index 44a36b6c..87b0f63c 100644
--- a/visionforge-gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/gdmlJs.kt
+++ b/visionforge-gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/gdmlJs.kt
@@ -1,8 +1,8 @@
 package hep.dataforge.vision.gdml
 
-actual class Counter {
+public actual class Counter {
     private var count: Int = 0
-    actual fun get(): Int = count
+    public actual fun get(): Int = count
 
-    actual fun incrementAndGet(): Int = count++
+    public actual fun incrementAndGet(): Int = count++
 }
\ No newline at end of file
diff --git a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt b/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
index ab58deb9..685708da 100644
--- a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
+++ b/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
@@ -7,7 +7,7 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.util.concurrent.atomic.AtomicInteger
 
-actual typealias Counter = AtomicInteger
+public actual typealias Counter = AtomicInteger
 
 fun GDML.Companion.readFile(file: Path): GDML {
     val xmlReader = StAXReader(Files.newInputStream(file), "UTF-8")
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
index a4e44f35..72db7ba4 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
@@ -29,11 +29,11 @@ import info.laht.threekt.math.Vector2
 import info.laht.threekt.objects.LineSegments
 import info.laht.threekt.objects.Mesh
 import info.laht.threekt.scenes.Scene
+import kotlinx.browser.window
+import kotlinx.dom.clear
 import org.w3c.dom.HTMLElement
 import org.w3c.dom.Node
 import org.w3c.dom.events.MouseEvent
-import kotlin.browser.window
-import kotlin.dom.clear
 import kotlin.math.cos
 import kotlin.math.max
 import kotlin.math.sin
@@ -41,11 +41,16 @@ import kotlin.math.sin
 /**
  *
  */
-class ThreeCanvas(element: HTMLElement, val three: ThreePlugin, val options: Canvas3DOptions) : Renderer<Solid> {
+public class ThreeCanvas(
+    element: HTMLElement,
+    public val three: ThreePlugin,
+    public val options: Canvas3DOptions,
+    public val onClick: ((Name?) -> Unit)? = null,
+) : Renderer<Solid> {
 
     override val context: Context get() = three.context
 
-    var content: Solid? = null
+    public var content: Solid? = null
         private set
 
     private var root: Object3D? = null
@@ -53,17 +58,15 @@ class ThreeCanvas(element: HTMLElement, val three: ThreePlugin, val options: Can
     private val raycaster = Raycaster()
     private val mousePosition: Vector2 = Vector2()
 
-    var onClick: ((Name?) -> Unit)? = null
-
-    val axes = AxesHelper(options.axes.size.toInt()).apply {
+    public val axes: AxesHelper = AxesHelper(options.axes.size.toInt()).apply {
         visible = options.axes.visible
     }
 
-    val scene: Scene = Scene().apply {
+    public val scene: Scene = Scene().apply {
         add(axes)
     }
 
-    val camera = buildCamera(options.camera)
+    public val camera: PerspectiveCamera = buildCamera(options.camera)
 
     private var picked: Object3D? = null
 
@@ -166,7 +169,7 @@ class ThreeCanvas(element: HTMLElement, val three: ThreePlugin, val options: Can
         }
     }
 
-    fun clear() {
+    public fun clear() {
         scene.children.find { it.name == "@root" }?.let {
             scene.remove(it)
         }
@@ -192,7 +195,7 @@ class ThreeCanvas(element: HTMLElement, val three: ThreePlugin, val options: Can
     private fun Object3D.toggleHighlight(
         highlight: Boolean,
         edgesName: String,
-        material: LineBasicMaterial = SELECTED_MATERIAL
+        material: LineBasicMaterial = SELECTED_MATERIAL,
     ) {
         if (userData[DO_NOT_HIGHLIGHT_TAG] == true) {
             return
@@ -220,7 +223,7 @@ class ThreeCanvas(element: HTMLElement, val three: ThreePlugin, val options: Can
     /**
      * Toggle highlight for element with given name
      */
-    fun select(name: Name?) {
+    public fun select(name: Name?) {
         if (name == null) {
             selected?.toggleHighlight(false, SELECT_NAME, SELECTED_MATERIAL)
             selected = null
@@ -234,15 +237,21 @@ class ThreeCanvas(element: HTMLElement, val three: ThreePlugin, val options: Can
         }
     }
 
-    companion object {
-        const val DO_NOT_HIGHLIGHT_TAG = "doNotHighlight"
+    public companion object {
+        public const val DO_NOT_HIGHLIGHT_TAG = "doNotHighlight"
         private const val HIGHLIGHT_NAME = "@highlight"
         private const val SELECT_NAME = "@select"
     }
 }
 
-fun ThreePlugin.output(element: HTMLElement, spec: Canvas3DOptions = Canvas3DOptions.empty()): ThreeCanvas =
-    ThreeCanvas(element, this, spec)
+public fun ThreePlugin.output(
+    element: HTMLElement,
+    spec: Canvas3DOptions = Canvas3DOptions.empty(),
+    onClick: ((Name?) -> Unit)? = null,
+): ThreeCanvas = ThreeCanvas(element, this, spec, onClick)
 
-fun ThreePlugin.render(element: HTMLElement, obj: Solid, spec: Canvas3DOptions = Canvas3DOptions.empty()): Unit =
-    output(element, spec).render(obj)
\ No newline at end of file
+public fun ThreePlugin.render(
+    element: HTMLElement, obj: Solid,
+    spec: Canvas3DOptions = Canvas3DOptions.empty(),
+    onClick: ((Name?) -> Unit)? = null,
+): Unit = output(element, spec, onClick).render(obj)
\ No newline at end of file
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt
index ee033817..9f335642 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt
@@ -6,67 +6,88 @@ import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
-import react.RBuilder
-import react.RComponent
-import react.RProps
-import react.RState
+import react.*
 import react.dom.div
-import react.dom.findDOMNode
 
 public external interface ThreeCanvasProps : RProps {
-    var context: Context
-    var obj: Solid
-    var options: Canvas3DOptions?
-    var selected: Name?
-    var clickCallback: (Name?) -> Unit
-    var canvasCallback: ((ThreeCanvas?) -> Unit)?
+    public var context: Context
+    public var obj: Solid?
+    public var options: Canvas3DOptions?
+    public var selected: Name?
+    public var clickCallback: (Name?) -> Unit
+    public var canvasCallback: ((ThreeCanvas?) -> Unit)?
 }
 
 public external interface ThreeCanvasState : RState {
-    var element: Element?
+    public var element: Element?
 //    var canvas: ThreeCanvas?
 }
 
-@JsExport
-public class ThreeCanvasComponent : RComponent<ThreeCanvasProps, ThreeCanvasState>() {
+public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functionalComponent(
+    "ThreeCanvasComponent"
+) { props ->
+    val elementRef = useRef<Element?>(null)
+    var canvas by useState<ThreeCanvas?>(null)
 
-    private var canvas: ThreeCanvas? = null
-
-    override fun componentDidMount() {
-        if(canvas == null) {
-            val element = state.element as? HTMLElement ?: error("Canvas element not found")
+    useEffect(listOf(props.context, props.obj, props.options, elementRef)) {
+        if (canvas == null) {
+            val element = elementRef.current as? HTMLElement ?: error("Canvas element not found")
             val three: ThreePlugin = props.context.plugins.fetch(ThreePlugin)
-            canvas = three.output(element, props.options ?: Canvas3DOptions.empty()).apply {
-                onClick = props.clickCallback
-            }
-            props.canvasCallback?.invoke(canvas)
-        }
-        canvas?.render(props.obj)
-    }
-
-    override fun componentDidUpdate(prevProps: ThreeCanvasProps, prevState: ThreeCanvasState, snapshot: Any) {
-        if (prevProps.obj != props.obj) {
-            componentDidMount()
-        }
-        if (prevProps.selected != props.selected) {
-            canvas?.select(props.selected)
+            val newCanvas = three.output(element, props.options ?: Canvas3DOptions.empty(), props.clickCallback)
+            props.canvasCallback?.invoke(newCanvas)
+            canvas = newCanvas
         }
     }
 
-    override fun RBuilder.render() {
-        div {
-            ref {
-                state.element = findDOMNode(it)
+    useEffect(listOf(canvas, props.obj)) {
+        props.obj?.let { obj ->
+            if (canvas?.content != obj) {
+                canvas?.render(obj)
             }
         }
     }
+
+    useEffect(listOf(canvas, props.selected)) {
+        canvas?.select(props.selected)
+    }
+
+    div {
+        ref = elementRef
+    }
 }
 
-public fun RBuilder.threeCanvas(object3D: Solid, options: Canvas3DOptions.() -> Unit = {}) {
-    child(ThreeCanvasComponent::class) {
-        attrs {
-            this.obj = object3D
-            this.options = Canvas3DOptions.invoke(options)
-        }
-    }
-}
\ No newline at end of file
+//public class ThreeCanvasComponent : RComponent<ThreeCanvasProps, ThreeCanvasState>() {
+//
+//    private var canvas: ThreeCanvas? = null
+//
+//    override fun componentDidMount() {
+//        props.obj?.let { obj ->
+//            if (canvas == null) {
+//                val element = state.element as? HTMLElement ?: error("Canvas element not found")
+//                val three: ThreePlugin = props.context.plugins.fetch(ThreePlugin)
+//                canvas = three.output(element, props.options ?: Canvas3DOptions.empty()).apply {
+//                    onClick = props.clickCallback
+//                }
+//                props.canvasCallback?.invoke(canvas)
+//            }
+//            canvas?.render(obj)
+//        }
+//    }
+//
+//    override fun componentDidUpdate(prevProps: ThreeCanvasProps, prevState: ThreeCanvasState, snapshot: Any) {
+//        if (prevProps.obj != props.obj) {
+//            componentDidMount()
+//        }
+//        if (prevProps.selected != props.selected) {
+//            canvas?.select(props.selected)
+//        }
+//    }
+//
+//    override fun RBuilder.render() {
+//        div {
+//            ref {
+//                state.element = findDOMNode(it)
+//            }
+//        }
+//    }
+//}
\ No newline at end of file

From 7571b58e99eafade5257209b33b37d2b30d78070 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 31 Oct 2020 10:04:23 +0300
Subject: [PATCH 017/151] Versions cleanup

---
 build.gradle.kts                              |   3 +-
 settings.gradle.kts                           |   1 +
 ui/bootstrap/build.gradle.kts                 |   3 +-
 .../vision/bootstrap/outputConfig.kt          |   5 +-
 ui/react/build.gradle.kts                     |   9 +-
 visionforge-core/build.gradle.kts             |  14 +-
 .../kotlin/hep/dataforge/vision/Colors.kt     |   3 +-
 .../vision/visitor/StatisticsVisitor.kt       |   8 +-
 .../dataforge/vision/visitor/VisionVisitor.kt |  12 +-
 .../kotlin/hep/dataforge/vision/FXPlugin.kt   |  20 +-
 visionforge-server/build.gradle.kts           |  66 +++
 visionforge-solid/build.gradle.kts            |   1 -
 wrappers/build.gradle.kts                     |  23 -
 wrappers/src/main/kotlin/dat.kt               | 102 -----
 wrappers/src/main/kotlin/eventemitter2.kt     |  65 ---
 wrappers/src/main/kotlin/inspire-tree-dom.kt  |  38 --
 wrappers/src/main/kotlin/inspire-tree.kt      | 417 ------------------
 wrappers/src/main/kotlin/jsoneditor.kt        | 185 --------
 18 files changed, 102 insertions(+), 873 deletions(-)
 create mode 100644 visionforge-server/build.gradle.kts
 delete mode 100644 wrappers/build.gradle.kts
 delete mode 100644 wrappers/src/main/kotlin/dat.kt
 delete mode 100644 wrappers/src/main/kotlin/eventemitter2.kt
 delete mode 100644 wrappers/src/main/kotlin/inspire-tree-dom.kt
 delete mode 100644 wrappers/src/main/kotlin/inspire-tree.kt
 delete mode 100644 wrappers/src/main/kotlin/jsoneditor.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index bc20d61f..25d9f4b9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
 
 val dataforgeVersion by extra("0.2.0-dev-4")
 val ktorVersion by extra("1.4.1")
+val kotlinWrappersVersion by extra("pre.129-kotlin-1.4.10")
 
 allprojects {
     repositories {
@@ -15,7 +16,7 @@ allprojects {
     }
 
     group = "hep.dataforge"
-    version = "0.2.0-dev-1"
+    version = "0.2.0-dev-2"
 }
 
 val githubProject by extra("visionforge")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 65690060..8ab3e4e4 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -39,6 +39,7 @@ include(
     ":visionforge-core",
     ":visionforge-solid",
     ":visionforge-gdml",
+    ":visionforge-server",
     ":demo:spatial-showcase",
     ":demo:gdml",
     ":demo:muon-monitor",
diff --git a/ui/bootstrap/build.gradle.kts b/ui/bootstrap/build.gradle.kts
index 1cdd834d..8d404277 100644
--- a/ui/bootstrap/build.gradle.kts
+++ b/ui/bootstrap/build.gradle.kts
@@ -4,7 +4,8 @@ plugins {
 
 val dataforgeVersion: String by rootProject.extra
 
-dependencies{
+dependencies {
     api(project(":visionforge-solid"))
     api(project(":ui:react"))
+    implementation(npm("file-saver", "2.0.2"))
 }
\ No newline at end of file
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
index b6326979..9e5e1a4b 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
@@ -17,6 +17,7 @@ import org.w3c.dom.events.Event
 import org.w3c.files.Blob
 import org.w3c.files.BlobPropertyBag
 import react.RBuilder
+import react.ReactElement
 import react.dom.button
 import react.dom.div
 import react.dom.input
@@ -32,7 +33,7 @@ private fun saveData(event: Event, fileName: String, mimeType: String = "text/pl
 }
 
 @OptIn(DFExperimental::class)
-fun RBuilder.canvasControls(canvas: ThreeCanvas) = accordion("controls") {
+public fun RBuilder.canvasControls(canvas: ThreeCanvas): ReactElement = accordion("controls") {
     entry("Settings") {
         div("row") {
             div("col-2") {
@@ -96,7 +97,7 @@ fun RBuilder.canvasControls(canvas: ThreeCanvas) = accordion("controls") {
 }
 
 
-fun Element.displayCanvasControls(canvas: ThreeCanvas, block: TagConsumer<HTMLElement>.() -> Unit = {}) {
+public fun Element.displayCanvasControls(canvas: ThreeCanvas, block: TagConsumer<HTMLElement>.() -> Unit = {}) {
     clear()
     append {
         accordion("controls") {
diff --git a/ui/react/build.gradle.kts b/ui/react/build.gradle.kts
index 8d541ffd..9389bd35 100644
--- a/ui/react/build.gradle.kts
+++ b/ui/react/build.gradle.kts
@@ -3,14 +3,9 @@ plugins {
 }
 
 val reactVersion by extra("17.0.0")
+val kotlinWrappersVersion: String by rootProject.extra
 
 dependencies{
     api(project(":visionforge-core"))
-
-    //api("org.jetbrains:kotlin-react:16.13.1-pre.104-kotlin-1.3.72")
-    api("org.jetbrains:kotlin-react-dom:$reactVersion-pre.126-kotlin-1.4.10")
-
-    api(npm("react", reactVersion))
-    api(npm("react-dom", reactVersion))
-    api(npm("react-is", reactVersion))
+    api("org.jetbrains:kotlin-react-dom:$reactVersion-$kotlinWrappersVersion")
 }
\ No newline at end of file
diff --git a/visionforge-core/build.gradle.kts b/visionforge-core/build.gradle.kts
index 2bf0b6e0..6e59b5da 100644
--- a/visionforge-core/build.gradle.kts
+++ b/visionforge-core/build.gradle.kts
@@ -3,6 +3,8 @@ plugins {
 }
 
 val dataforgeVersion: String by rootProject.extra
+val kotlinWrappersVersion: String by rootProject.extra
+
 
 kotlin {
 
@@ -27,16 +29,8 @@ kotlin {
         jsMain {
             dependencies {
                 api("hep.dataforge:dataforge-output-html:$dataforgeVersion")
-                api("org.jetbrains.kotlinx:kotlinx-html:0.7.2")
-
-                //api("org.jetbrains:kotlin-extensions:1.0.1-pre.105-kotlin-1.3.72")
-                //api("org.jetbrains:kotlin-css-js:1.0.0-pre.105-kotlin-1.3.72")
-                api("org.jetbrains:kotlin-styled:5.2.0-pre.126-kotlin-1.4.10")
-
-                api(npm("core-js", "2.6.5"))
-                api(npm("inline-style-prefixer", "5.1.0"))
-                api(npm("styled-components", "5.2.0"))
-                //api(project(":ringui-wrapper"))
+                api("org.jetbrains:kotlin-styled:5.2.0-$kotlinWrappersVersion")
+                api("org.jetbrains:kotlin-extensions:1.0.1-$kotlinWrappersVersion")
             }
         }
     }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
index 4918b6c5..1b3d4763 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
@@ -12,7 +12,8 @@ import kotlin.math.max
  * Definitions of common colors. Taken from
  * https://github.com/markaren/three.kt/blob/master/threejs-wrapper/src/main/kotlin/info/laht/threekt/math/ColorConstants.kt
  */
-object Colors {
+@Suppress("NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING", "NO_EXPLICIT_RETURN_TYPE_IN_API_MODE_WARNING")
+public object Colors {
     const val aliceblue = 0xF0F8FF
     const val antiquewhite = 0xFAEBD7
     const val aqua = 0x00FFFF
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/StatisticsVisitor.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/StatisticsVisitor.kt
index 89877fe6..e4a027c9 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/StatisticsVisitor.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/StatisticsVisitor.kt
@@ -12,7 +12,7 @@ import kotlin.reflect.KClass
 
 
 @OptIn(ExperimentalCoroutinesApi::class)
-suspend fun <T> Vision.flowStatistics(statistics: (Name, Vision) -> T): Flow<T> = callbackFlow<T> {
+public suspend fun <T> Vision.flowStatistics(statistics: (Name, Vision) -> T): Flow<T> = callbackFlow<T> {
     val visitor = object : VisionVisitor {
         override suspend fun visit(name: Name, vision: Vision){
             send(statistics(name, vision))
@@ -27,10 +27,10 @@ suspend fun <T> Vision.flowStatistics(statistics: (Name, Vision) -> T): Flow<T>
     }
 }
 
-data class DefaultVisionStatistics(val name: Name, val type: KClass<out Vision>) {
-    val depth get() = name.length
+public data class DefaultVisionStatistics(val name: Name, val type: KClass<out Vision>) {
+    val depth: Int get() = name.length
 }
 
-suspend fun Vision.flowStatistics(): Flow<DefaultVisionStatistics> = flowStatistics { name, vision ->
+public suspend fun Vision.flowStatistics(): Flow<DefaultVisionStatistics> = flowStatistics { name, vision ->
     DefaultVisionStatistics(name, vision::class)
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/VisionVisitor.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/VisionVisitor.kt
index 192e36a0..4b6e480e 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/VisionVisitor.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/VisionVisitor.kt
@@ -8,24 +8,24 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 
-interface VisionVisitor {
+public interface VisionVisitor {
     /**
      * Visit a vision possibly mutating in in the process. Should not rearrange children.
      * @param name full name of a [Vision] being visited
      * @param vision the visited [Vision]
      */
-    suspend fun visit(name: Name, vision: Vision)
+    public suspend fun visit(name: Name, vision: Vision)
 
     /**
      * Rearrange children of given group
      */
-    suspend fun visitChildren(name: Name, group: VisionGroup) {
+    public suspend fun visitChildren(name: Name, group: VisionGroup) {
         //Do nothing by default
     }
 
-    fun skip(name: Name, vision: Vision): Boolean = false
+    public fun skip(name: Name, vision: Vision): Boolean = false
 
-    companion object{
+    public companion object{
         private fun CoroutineScope.visitTreeAsync(
             visionVisitor: VisionVisitor,
             name: Name,
@@ -46,7 +46,7 @@ interface VisionVisitor {
         /**
          * Recursively visit this [Vision] and all children
          */
-        fun visitTree(visionVisitor: VisionVisitor, scope: CoroutineScope, root: Vision): Job =
+        public fun visitTree(visionVisitor: VisionVisitor, scope: CoroutineScope, root: Vision): Job =
             scope.visitTreeAsync(visionVisitor, Name.EMPTY, root)
 
 
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/FXPlugin.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/FXPlugin.kt
index 91d1f0c1..11176bf6 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/FXPlugin.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/FXPlugin.kt
@@ -19,12 +19,12 @@ import kotlin.reflect.KClass
 /**
  * Plugin holding JavaFX application instance and its root stage
  */
-class FXPlugin(meta: Meta = Meta.EMPTY) : AbstractPlugin(meta) {
+public class FXPlugin(meta: Meta = Meta.EMPTY) : AbstractPlugin(meta) {
     override val tag: PluginTag get() = Companion.tag
 
     private val stages: ObservableSet<Stage> = FXCollections.observableSet()
 
-    val consoleMode: Boolean by meta.boolean(true)
+    public val consoleMode: Boolean by meta.boolean(true)
 
     init {
         if (consoleMode) {
@@ -65,7 +65,7 @@ class FXPlugin(meta: Meta = Meta.EMPTY) : AbstractPlugin(meta) {
     /**
      * Define an application to use in this context
      */
-    fun setApp(app: Application, stage: Stage) {
+    public fun setApp(app: Application, stage: Stage) {
         FX.registerApplication(FX.defaultScope, app, stage)
     }
 
@@ -74,7 +74,7 @@ class FXPlugin(meta: Meta = Meta.EMPTY) : AbstractPlugin(meta) {
      *
      * @param cons
      */
-    fun display(action: Stage.() -> Unit) {
+    public fun display(action: Stage.() -> Unit) {
         runLater {
             val stage = Stage()
             stage.initOwner(FX.primaryStage)
@@ -85,14 +85,14 @@ class FXPlugin(meta: Meta = Meta.EMPTY) : AbstractPlugin(meta) {
         }
     }
 
-    fun display(component: UIComponent, width: Double = 800.0, height: Double = 600.0) {
+    public fun display(component: UIComponent, width: Double = 800.0, height: Double = 600.0) {
         display {
             scene = Scene(component.root, width, height)
             title = component.title
         }
     }
 
-    companion object : PluginFactory<FXPlugin> {
+    public companion object : PluginFactory<FXPlugin> {
         override val type: KClass<out FXPlugin> = FXPlugin::class
         override val tag: PluginTag = PluginTag("vis.fx", group = PluginTag.DATAFORGE_GROUP)
         override fun invoke(meta: Meta, context: Context): FXPlugin =
@@ -101,19 +101,19 @@ class FXPlugin(meta: Meta = Meta.EMPTY) : AbstractPlugin(meta) {
 
 }
 
-val dfIcon: Image = Image(Global::class.java.getResourceAsStream("/img/df.png"))
-val dfIconView = ImageView(dfIcon)
+public val dfIcon: Image = Image(Global::class.java.getResourceAsStream("/img/df.png"))
+public val dfIconView: ImageView = ImageView(dfIcon)
 
 /**
  * An application surrogate without any visible primary stage
  */
-class ApplicationSurrogate : App() {
+public class ApplicationSurrogate : App() {
     override fun start(stage: Stage) {
         FX.registerApplication(this, stage)
         FX.initialized.value = true
     }
 }
 
-fun Context.display(width: Double = 800.0, height: Double = 600.0, component: () -> UIComponent) {
+public fun Context.display(width: Double = 800.0, height: Double = 600.0, component: () -> UIComponent) {
     plugins.fetch(FXPlugin).display(component(), width, height)
 }
\ No newline at end of file
diff --git a/visionforge-server/build.gradle.kts b/visionforge-server/build.gradle.kts
new file mode 100644
index 00000000..0eec3285
--- /dev/null
+++ b/visionforge-server/build.gradle.kts
@@ -0,0 +1,66 @@
+import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME
+
+plugins {
+    id("ru.mipt.npm.mpp")
+    application
+}
+
+val ktorVersion: String by rootProject.extra
+
+kscience {
+    application()
+}
+
+kotlin {
+    afterEvaluate {
+        val jsBrowserDistribution by tasks.getting
+
+        jvm {
+            withJava()
+            compilations[MAIN_COMPILATION_NAME]?.apply {
+                tasks.getByName<ProcessResources>(processResourcesTaskName) {
+                    dependsOn(jsBrowserDistribution)
+                    afterEvaluate {
+                        from(jsBrowserDistribution)
+                    }
+                }
+            }
+
+        }
+    }
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation(project(":visionforge-solid"))
+            }
+        }
+        jvmMain {
+            dependencies {
+                implementation("io.ktor:ktor-server-cio:$ktorVersion")
+                implementation("io.ktor:ktor-serialization:$ktorVersion")
+            }
+        }
+        jsMain {
+            dependencies {
+                implementation("io.ktor:ktor-client-js:$ktorVersion")
+                implementation("io.ktor:ktor-client-serialization-js:$ktorVersion")
+            }
+        }
+    }
+}
+
+application {
+    mainClass.set("ru.mipt.npm.muon.monitor.server.MMServerKt")
+}
+
+//distributions {
+//    main {
+//        contents {
+//            from("$buildDir/libs") {
+//                rename("${rootProject.name}-jvm", rootProject.name)
+//                into("lib")
+//            }
+//        }
+//    }
+//}
\ No newline at end of file
diff --git a/visionforge-solid/build.gradle.kts b/visionforge-solid/build.gradle.kts
index aab7e547..3f7ac5dc 100644
--- a/visionforge-solid/build.gradle.kts
+++ b/visionforge-solid/build.gradle.kts
@@ -31,7 +31,6 @@ kotlin {
             dependencies {
                 implementation(npm("three", "0.114.0"))
                 implementation(npm("three-csg-ts", "1.0.1"))
-                api(npm("file-saver", "2.0.2"))
             }
         }
     }
diff --git a/wrappers/build.gradle.kts b/wrappers/build.gradle.kts
deleted file mode 100644
index 6baa876c..00000000
--- a/wrappers/build.gradle.kts
+++ /dev/null
@@ -1,23 +0,0 @@
-plugins {
-    id("scientifik.js")
-    //id("kotlin-dce-js")
-}
-
-dependencies {
-    api(project(":visionforge-common"))
-
-    testCompile(kotlin("test-js"))
-}
-
-kotlin{
-    sourceSets["main"].apply{
-        dependencies{
-            api(npm("style-loader"))
-//            api(npm("inspire-tree","6.0.1"))
-//            api(npm("inspire-tree-dom","4.0.6"))
-            api(npm("jsoneditor"))
-            api(npm("dat.gui"))
-            //api("org.jetbrains:kotlin-extensions:1.0.1-pre.83-kotlin-1.3.50")
-        }
-    }
-}
diff --git a/wrappers/src/main/kotlin/dat.kt b/wrappers/src/main/kotlin/dat.kt
deleted file mode 100644
index 7c56c20a..00000000
--- a/wrappers/src/main/kotlin/dat.kt
+++ /dev/null
@@ -1,102 +0,0 @@
-@file:Suppress(
-    "INTERFACE_WITH_SUPERCLASS",
-    "OVERRIDING_FINAL_MEMBER",
-    "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
-    "CONFLICTING_OVERLOADS",
-    "EXTERNAL_DELEGATION"
-)
-@file:JsModule("dat.gui")
-@file:JsNonModule
-
-package hep.dataforge.vis.spatial.editor
-
-import org.w3c.dom.HTMLElement
-
-external interface GUIParams {
-    var autoPlace: Boolean? get() = definedExternally; set(value) = definedExternally
-    var closed: Boolean? get() = definedExternally; set(value) = definedExternally
-    var closeOnTop: Boolean? get() = definedExternally; set(value) = definedExternally
-    var hideable: Boolean? get() = definedExternally; set(value) = definedExternally
-    var load: Any? get() = definedExternally; set(value) = definedExternally
-    var name: String? get() = definedExternally; set(value) = definedExternally
-    var preset: String? get() = definedExternally; set(value) = definedExternally
-    var width: Number? get() = definedExternally; set(value) = definedExternally
-}
-
-external open class GUI(option: GUIParams? = definedExternally /* null */) {
-    open var __controllers: Array<GUIController>
-    open var __folders: Array<GUI>
-    open var domElement: HTMLElement
-    open fun add(
-        target: Any,
-        propName: String,
-        min: Number? = definedExternally /* null */,
-        max: Number? = definedExternally /* null */,
-        step: Number? = definedExternally /* null */
-    ): GUIController
-
-    open fun add(target: Any, propName: String, status: Boolean): GUIController
-    open fun add(target: Any, propName: String, items: Array<String>): GUIController
-    open fun add(target: Any, propName: String, items: Array<Number>): GUIController
-    open fun add(target: Any, propName: String, items: Any): GUIController
-    open fun addColor(target: Any, propName: String): GUIController
-    open fun remove(controller: GUIController)
-    open fun destroy()
-    open fun addFolder(propName: String): GUI
-    open fun removeFolder(subFolder: GUI)
-    open fun open()
-    open fun close()
-    open fun hide()
-    open fun show()
-    open fun remember(target: Any, vararg additionalTargets: Any)
-    open fun getRoot(): GUI
-    open fun getSaveObject(): Any
-    open fun save()
-    open fun saveAs(presetName: String)
-    open fun revert(gui: GUI)
-    open fun listen(controller: GUIController)
-    open fun updateDisplay()
-    open var parent: GUI
-    open var scrollable: Boolean
-    open var autoPlace: Boolean
-    open var preset: String
-    open var width: Number
-    open var name: String
-    open var closed: Boolean
-    open var load: Any
-    open var useLocalStorage: Boolean
-
-    companion object {
-        var CLASS_AUTO_PLACE: String
-        var CLASS_AUTO_PLACE_CONTAINER: String
-        var CLASS_MAIN: String
-        var CLASS_CONTROLLER_ROW: String
-        var CLASS_TOO_TALL: String
-        var CLASS_CLOSED: String
-        var CLASS_CLOSE_BUTTON: String
-        var CLASS_CLOSE_TOP: String
-        var CLASS_CLOSE_BOTTOM: String
-        var CLASS_DRAG: String
-        var DEFAULT_WIDTH: Number
-        var TEXT_CLOSED: String
-        var TEXT_OPEN: String
-    }
-}
-
-external open class GUIController {
-    open fun destroy()
-    open var onChange: (value: Any? /* = null */) -> GUIController
-    open var onFinishChange: (value: Any? /* = null */) -> GUIController
-    open fun setValue(value: Any): GUIController
-    open fun getValue(): Any
-    open fun updateDisplay(): GUIController
-    open fun isModified(): Boolean
-    open fun min(n: Number): GUIController
-    open fun max(n: Number): GUIController
-    open fun step(n: Number): GUIController
-    open fun fire(): GUIController
-    open fun options(option: Any): GUIController
-    open fun name(s: String): GUIController
-    open fun listen(): GUIController
-    open fun remove(): GUIController
-}
\ No newline at end of file
diff --git a/wrappers/src/main/kotlin/eventemitter2.kt b/wrappers/src/main/kotlin/eventemitter2.kt
deleted file mode 100644
index 36b925f2..00000000
--- a/wrappers/src/main/kotlin/eventemitter2.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-@file:Suppress(
-    "INTERFACE_WITH_SUPERCLASS",
-    "OVERRIDING_FINAL_MEMBER",
-    "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
-    "CONFLICTING_OVERLOADS",
-    "EXTERNAL_DELEGATION"
-)
-@file:JsModule("eventemitter2")
-@file: JsNonModule
-
-package hep.dataforge.vis.spatial.editor
-
-import kotlin.js.Promise
-
-//typealias eventNS = Array<String>
-
-external interface ConstructorOptions {
-    var wildcard: Boolean? get() = definedExternally; set(value) = definedExternally
-    var delimiter: String? get() = definedExternally; set(value) = definedExternally
-    var newListener: Boolean? get() = definedExternally; set(value) = definedExternally
-    var maxListeners: Number? get() = definedExternally; set(value) = definedExternally
-    var verboseMemoryLeak: Boolean? get() = definedExternally; set(value) = definedExternally
-}
-
-external interface EventAndListener {
-    @nativeInvoke
-    operator fun invoke(event: String, vararg values: Any)
-
-    @nativeInvoke
-    operator fun invoke(event: Array<String>, vararg values: Any)
-}
-
-external open class EventEmitter2(options: ConstructorOptions? = definedExternally /* null */) {
-    open fun emit(event: String, vararg values: Any): Boolean
-    open fun emit(event: Array<String>, vararg values: Any): Boolean
-    open fun emitAsync(event: String, vararg values: Any): Promise<Array<Any>>
-    open fun emitAsync(event: Array<String>, vararg values: Any): Promise<Array<Any>>
-    open fun addListener(event: String, listener: Function<*>): EventEmitter2 /* this */
-    open fun on(event: String, listener: Function<*>): EventEmitter2 /* this */
-    open fun on(event: Array<String>, listener: Function<*>): EventEmitter2 /* this */
-    open fun prependListener(event: String, listener: Function<*>): EventEmitter2 /* this */
-    open fun prependListener(event: Array<String>, listener: Function<*>): EventEmitter2 /* this */
-    open fun once(event: String, listener: Function<*>): EventEmitter2 /* this */
-    open fun once(event: Array<String>, listener: Function<*>): EventEmitter2 /* this */
-    open fun prependOnceListener(event: String, listener: Function<*>): EventEmitter2 /* this */
-    open fun prependOnceListener(event: Array<String>, listener: Function<*>): EventEmitter2 /* this */
-    open fun many(event: String, timesToListen: Number, listener: Function<*>): EventEmitter2 /* this */
-    open fun many(event: Array<String>, timesToListen: Number, listener: Function<*>): EventEmitter2 /* this */
-    open fun prependMany(event: String, timesToListen: Number, listener: Function<*>): EventEmitter2 /* this */
-    open fun prependMany(event: Array<String>, timesToListen: Number, listener: Function<*>): EventEmitter2 /* this */
-    open fun onAny(listener: EventAndListener): EventEmitter2 /* this */
-    open fun prependAny(listener: EventAndListener): EventEmitter2 /* this */
-    open fun offAny(listener: Function<*>): EventEmitter2 /* this */
-    open fun removeListener(event: String, listener: Function<*>): EventEmitter2 /* this */
-    open fun removeListener(event: Array<String>, listener: Function<*>): EventEmitter2 /* this */
-    open fun off(event: String, listener: Function<*>): EventEmitter2 /* this */
-    open fun removeAllListeners(event: String? = definedExternally /* null */): EventEmitter2 /* this */
-    open fun removeAllListeners(event: Array<String>? = definedExternally /* null */): EventEmitter2 /* this */
-    open fun setMaxListeners(n: Number)
-    open fun eventNames(): Array<String>
-    open fun listeners(event: String): Array<Function<*>>
-    open fun listeners(event: Array<String>): Array<Function<*>>
-    open fun listenersAny(): Array<Function<*>>
-    open fun removeAllListeners(): EventEmitter2 /* this */
-}
\ No newline at end of file
diff --git a/wrappers/src/main/kotlin/inspire-tree-dom.kt b/wrappers/src/main/kotlin/inspire-tree-dom.kt
deleted file mode 100644
index f3e00d08..00000000
--- a/wrappers/src/main/kotlin/inspire-tree-dom.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-@file:Suppress(
-    "INTERFACE_WITH_SUPERCLASS",
-    "OVERRIDING_FINAL_MEMBER",
-    "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
-    "CONFLICTING_OVERLOADS",
-    "EXTERNAL_DELEGATION"
-)
-
-package hep.dataforge.vis.spatial.editor
-
-import org.w3c.dom.HTMLElement
-
-external interface DropTargetValidator {
-    @nativeInvoke
-    operator fun invoke(dragNode: TreeNode, targetNode: TreeNode): Boolean
-}
-
-external interface DragAndDrop {
-    var enabled: Boolean? get() = definedExternally; set(value) = definedExternally
-    var validateOn: String? get() = definedExternally; set(value) = definedExternally
-    var validate: DropTargetValidator
-}
-
-external interface DomConfig {
-    var autoLoadMore: Boolean? get() = definedExternally; set(value) = definedExternally
-    var deferredRendering: Boolean? get() = definedExternally; set(value) = definedExternally
-    var dragAndDrop: DragAndDrop? get() = definedExternally; set(value) = definedExternally
-    var nodeHeight: Number? get() = definedExternally; set(value) = definedExternally
-    var showCheckboxes: Boolean? get() = definedExternally; set(value) = definedExternally
-    var dragTargets: Array<String>? get() = definedExternally; set(value) = definedExternally
-    var tabindex: Number? get() = definedExternally; set(value) = definedExternally
-    var target: HTMLElement
-}
-
-
-@JsModule("inspire-tree-dom")
-@JsNonModule
-open external class InspireTreeDOM(tree: Any, opts: DomConfig)
\ No newline at end of file
diff --git a/wrappers/src/main/kotlin/inspire-tree.kt b/wrappers/src/main/kotlin/inspire-tree.kt
deleted file mode 100644
index 74887be7..00000000
--- a/wrappers/src/main/kotlin/inspire-tree.kt
+++ /dev/null
@@ -1,417 +0,0 @@
-@file:Suppress(
-    "INTERFACE_WITH_SUPERCLASS",
-    "OVERRIDING_FINAL_MEMBER",
-    "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
-    "CONFLICTING_OVERLOADS",
-    "EXTERNAL_DELEGATION",
-    "unused"
-)
-
-package hep.dataforge.vis.spatial.editor
-
-import kotlin.js.Promise
-import kotlin.js.RegExp
-
-external interface NodeIteratee {
-    @nativeInvoke
-    operator fun invoke(node: TreeNode): Any
-}
-
-external interface MatchProcessor {
-    @nativeInvoke
-    operator fun invoke(matches: TreeNodes): Any
-}
-
-external interface SearchMatcher {
-    @nativeInvoke
-    operator fun invoke(query: String, resolve: Any, reject: Any): Any
-}
-
-external interface `T$0` {
-    var add: Boolean? get() = definedExternally; set(value) = definedExternally
-    var edit: Boolean? get() = definedExternally; set(value) = definedExternally
-    var remove: Boolean? get() = definedExternally; set(value) = definedExternally
-}
-
-external interface `T$1` {
-    var resetStateOnRestore: Boolean? get() = definedExternally; set(value) = definedExternally
-}
-
-external interface `T$2` {
-    var limit: Number? get() = definedExternally; set(value) = definedExternally
-}
-
-external interface `T$3` {
-    var matcher: SearchMatcher
-    var matchProcess: MatchProcessor
-}
-
-external interface Selection {
-    var allow: NodeIteratee? get() = definedExternally; set(value) = definedExternally
-    var autoDeselect: Boolean? get() = definedExternally; set(value) = definedExternally
-    var autoSelectChildren: Boolean? get() = definedExternally; set(value) = definedExternally
-    var disableDirectDeselection: Boolean? get() = definedExternally; set(value) = definedExternally
-    var mode: String? get() = definedExternally; set(value) = definedExternally
-    var multiple: Boolean? get() = definedExternally; set(value) = definedExternally
-    var require: Boolean? get() = definedExternally; set(value) = definedExternally
-}
-
-external interface Config {
-    var allowLoadEvents: Array<String>? get() = definedExternally; set(value) = definedExternally
-//    var checkbox: dynamic get() = definedExternally; set(value) = definedExternally
-    var contextMenu: Boolean? get() = definedExternally; set(value) = definedExternally
-    val data: ((node: TreeNode, resolve: (nodes: Array<NodeConfig>) -> Any, reject: (err: Error) -> Any) -> dynamic)? get() = definedExternally
-    var deferredLoading: Boolean? get() = definedExternally; set(value) = definedExternally
-    var editable: Boolean? get() = definedExternally; set(value) = definedExternally
-    var editing: `T$0`? get() = definedExternally; set(value) = definedExternally
-    var nodes: `T$1`? get() = definedExternally; set(value) = definedExternally
-    var pagination: `T$2`? get() = definedExternally; set(value) = definedExternally
-    var renderer: Any? get() = definedExternally; set(value) = definedExternally
-    var search: `T$3`? get() = definedExternally; set(value) = definedExternally
-    var selection: Selection? get() = definedExternally; set(value) = definedExternally
-    var sort: String? get() = definedExternally; set(value) = definedExternally
-    var multiselect: Boolean? get() = definedExternally; set(value) = definedExternally
-}
-
-external interface State {
-    var checked: Boolean? get() = definedExternally; set(value) = definedExternally
-    var collapsed: Boolean? get() = definedExternally; set(value) = definedExternally
-    var draggable: Boolean? get() = definedExternally; set(value) = definedExternally
-    //var `drop-target`: Boolean? get() = definedExternally; set(value) = definedExternally
-    var editable: Boolean? get() = definedExternally; set(value) = definedExternally
-    var focused: Boolean? get() = definedExternally; set(value) = definedExternally
-    var hidden: Boolean? get() = definedExternally; set(value) = definedExternally
-    var indeterminate: Boolean? get() = definedExternally; set(value) = definedExternally
-    var loading: Boolean? get() = definedExternally; set(value) = definedExternally
-    var matched: Boolean? get() = definedExternally; set(value) = definedExternally
-    var removed: Boolean? get() = definedExternally; set(value) = definedExternally
-    var rendered: Boolean? get() = definedExternally; set(value) = definedExternally
-    var selectable: Boolean? get() = definedExternally; set(value) = definedExternally
-    var selected: Boolean? get() = definedExternally; set(value) = definedExternally
-}
-
-external interface InspireTag {
-    var attributes: Any? get() = definedExternally; set(value) = definedExternally
-}
-
-external interface ITree {
-    var a: InspireTag? get() = definedExternally; set(value) = definedExternally
-    var icon: String? get() = definedExternally; set(value) = definedExternally
-    var li: InspireTag? get() = definedExternally; set(value) = definedExternally
-    var state: State? get() = definedExternally; set(value) = definedExternally
-}
-
-external interface NodeConfig {
-    var children: dynamic /* Array<NodeConfig> | true */
-    var id: String? get() = definedExternally; set(value) = definedExternally
-    var text: String
-    @JsName("itree")
-    var itree: ITree? get() = definedExternally; set(value) = definedExternally
-}
-
-external interface Pagination {
-    var limit: Number
-    var total: Number
-}
-
-@JsModule("inspire-tree")
-@JsNonModule
-open external class InspireTree(opts: Config) : EventEmitter2 {
-    constructor(tree: InspireTree)
-    constructor(tree: InspireTree, array: Array<Any>)
-    constructor(tree: InspireTree, array: TreeNodes)
-
-    open fun addNode(node: NodeConfig): TreeNode
-    open fun addNodes(node: Array<NodeConfig>): TreeNodes
-    open fun available(): TreeNodes
-    open fun blur(): TreeNodes
-    open fun blurDeep(): TreeNodes
-    open fun boundingNodes(): Array<TreeNode>
-    open fun canAutoDeselect(): Boolean
-    open fun checked(): TreeNodes
-    open fun clean(): TreeNodes
-    open fun clearSearch(): InspireTree
-    open fun clone(): TreeNodes
-    open fun collapse(): TreeNodes
-    open fun collapsed(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun collapseDeep(): TreeNodes
-    open fun context(): TreeNode
-    open fun copy(
-        dest: InspireTree,
-        hierarchy: Boolean? = definedExternally /* null */,
-        includeState: Boolean? = definedExternally /* null */
-    ): TreeNodes
-
-    open fun createNode(obj: Any): TreeNode
-    open fun deepest(): TreeNodes
-    open fun deselect(): TreeNodes
-    open fun deselectDeep(): TreeNodes
-    open fun disableDeselection(): InspireTree
-    open fun each(iteratee: NodeIteratee): TreeNodes
-    open fun editable(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun editing(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun enableDeselection(): InspireTree
-    open fun expand(): Promise<TreeNodes>
-    open fun expandDeep(): TreeNodes
-    open fun expanded(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun expandParents(): TreeNodes
-    open fun extract(predicate: String): TreeNodes
-    open fun extract(predicate: NodeIteratee): TreeNodes
-    open fun filterBy(predicate: String): TreeNodes
-    open fun filterBy(predicate: NodeIteratee): TreeNodes
-    open fun find(
-        predicate: (node: TreeNode, index: Number? /* = null */, obj: Array<TreeNode>? /* = null */) -> Boolean,
-        thisArg: Any? = definedExternally /* null */
-    ): TreeNode
-
-    open fun first(predicate: (node: TreeNode) -> Boolean): TreeNode
-    open fun flatten(predicate: String): TreeNodes
-    open fun flatten(predicate: NodeIteratee): TreeNodes
-    open fun focused(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun get(index: Number): TreeNode
-    open fun hidden(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun hide(): TreeNodes
-    open fun hideDeep(): TreeNodes
-    open var id: dynamic /* String | Number */
-    open var config: Config
-    open var preventDeselection: Boolean
-    open fun indeterminate(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun insertAt(index: Number, `object`: Any): TreeNode
-    open fun invoke(methods: String): TreeNodes
-    open fun invoke(methods: Array<String>): TreeNodes
-    open fun invokeDeep(methods: String): TreeNodes
-    open fun invokeDeep(methods: Array<String>): TreeNodes
-    open fun isEventMuted(eventName: String): Boolean
-    open fun last(predicate: (node: TreeNode) -> Boolean): TreeNode
-    open fun lastSelectedNode(): TreeNode
-    open fun load(loader: Promise<TreeNodes>): Promise<TreeNodes>
-    open fun loading(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun matched(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun move(index: Number, newIndex: Number, target: TreeNodes): TreeNode
-    open fun mute(events: Array<String>): InspireTree
-    open fun muted(): Boolean
-    open fun node(id: String): TreeNode
-    open fun node(id: Number): TreeNode
-    open fun nodes(ids: Array<String>? = definedExternally /* null */): TreeNodes
-    open fun nodes(ids: Array<Number>? = definedExternally /* null */): TreeNodes
-    open fun pagination(): Pagination
-    open fun recurseDown(iteratee: NodeIteratee): TreeNodes
-    open fun reload(): Promise<TreeNodes>
-    open fun removeAll(): InspireTree
-    open fun removed(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun restore(): TreeNodes
-    open fun restoreDeep(): TreeNodes
-    open fun search(query: String): Promise<TreeNodes>
-    open fun search(query: RegExp): Promise<TreeNodes>
-    open fun search(query: NodeIteratee): Promise<TreeNodes>
-    open fun select(): TreeNodes
-    open fun selectable(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun selectBetween(start: TreeNode, end: TreeNode): InspireTree
-    open fun selectDeep(): TreeNodes
-    open fun selected(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun selectFirstAvailableNode(): TreeNode
-    open fun show(): TreeNodes
-    open fun showDeep(): TreeNodes
-    open fun softRemove(): TreeNodes
-    open fun sortBy(sorter: String): TreeNodes
-    open fun sortBy(sorter: NodeIteratee): TreeNodes
-    open fun state(key: String, `val`: Boolean): TreeNodes
-    open fun stateDeep(key: String, `val`: Boolean): TreeNodes
-    open fun swap(node1: TreeNode, node2: TreeNode): TreeNodes
-    open fun toArray(): Array<Any>
-    open fun toArray(): Array<Any>
-    open fun tree(): InspireTree
-    open fun unmute(events: Array<String>): InspireTree
-    open fun visible(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun nodes(): TreeNodes
-
-    companion object {
-        fun isTreeNode(`object`: Any): Boolean
-        fun isTreeNodes(`object`: Any): Boolean
-    }
-}
-
-open external class TreeNodes(tree: InspireTree) {
-    constructor(tree: InspireTree, array: Array<Any>)
-    constructor(tree: InspireTree, array: TreeNodes)
-
-    open fun addNode(node: NodeConfig): TreeNode
-    open fun available(): TreeNodes
-    open fun blur(): TreeNodes
-    open fun blurDeep(): TreeNodes
-    open fun checked(): TreeNodes
-    open fun clean(): TreeNodes
-    open fun clone(): TreeNodes
-    open fun collapse(): TreeNodes
-    open fun collapsed(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun collapseDeep(): TreeNodes
-    open fun context(): TreeNode
-    open fun copy(
-        dest: InspireTree,
-        hierarchy: Boolean? = definedExternally /* null */,
-        includeState: Boolean? = definedExternally /* null */
-    ): TreeNodes
-
-    open fun deepest(): TreeNodes
-    open fun deselect(): TreeNodes
-    open fun deselectDeep(): TreeNodes
-    open fun each(iteratee: NodeIteratee): TreeNodes
-    open fun editable(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun editing(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun expand(): TreeNodes
-    open fun expandDeep(): Promise<TreeNodes>
-    open fun expanded(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun expandParents(): TreeNodes
-    open fun extract(predicate: String): TreeNodes
-    open fun extract(predicate: NodeIteratee): TreeNodes
-    open fun filterBy(predicate: String): TreeNodes
-    open fun filterBy(predicate: NodeIteratee): TreeNodes
-    open fun find(
-        predicate: (node: TreeNode, index: Number? /* = null */, obj: Array<TreeNode>? /* = null */) -> Boolean,
-        thisArg: Any? = definedExternally /* null */
-    ): TreeNode
-
-    open fun flatten(predicate: String): TreeNodes
-    open fun flatten(predicate: NodeIteratee): TreeNodes
-    open fun focused(full: Boolean? = definedExternally /* null */): TreeNodes
-    operator fun get(index: Number): TreeNode
-    open fun hidden(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun hide(): TreeNodes
-    open fun hideDeep(): TreeNodes
-    open fun indeterminate(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun insertAt(index: Number, `object`: Any): TreeNode
-    open fun invoke(methods: String): TreeNodes
-    open fun invoke(methods: Array<String>): TreeNodes
-    open fun invokeDeep(methods: String): TreeNodes
-    open fun invokeDeep(methods: Array<String>): TreeNodes
-    open fun loading(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun matched(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun move(index: Number, newIndex: Number, target: TreeNodes): TreeNode
-    open fun node(id: String): TreeNode
-    open fun node(id: Number): TreeNode
-    open fun nodes(ids: Array<String>? = definedExternally /* null */): TreeNodes
-    open fun nodes(ids: Array<Number>? = definedExternally /* null */): TreeNodes
-    open fun pagination(): Pagination
-    open fun recurseDown(iteratee: NodeIteratee): TreeNodes
-    open fun removed(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun restore(): TreeNodes
-    open fun restoreDeep(): TreeNodes
-    open fun select(): TreeNodes
-    open fun selectable(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun selectBetween(start: TreeNode, end: TreeNode): InspireTree
-    open fun selectDeep(): TreeNodes
-    open fun selected(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun show(): TreeNodes
-    open fun showDeep(): TreeNodes
-    open fun softRemove(): TreeNodes
-    open fun sortBy(sorter: String): TreeNodes
-    open fun sortBy(sorter: NodeIteratee): TreeNodes
-    open fun state(key: String, `val`: Boolean): TreeNodes
-    open fun stateDeep(key: String, `val`: Boolean): TreeNodes
-    open fun swap(node1: TreeNode, node2: TreeNode): TreeNodes
-    open fun toArray(): Array<Any>
-    open fun tree(): InspireTree
-    open fun visible(full: Boolean? = definedExternally /* null */): TreeNodes
-    open fun nodes(): TreeNodes
-}
-
-open external class TreeNode(tree: InspireTree) {
-    constructor(tree: InspireTree, source: Any, excludeKeys: Array<String>)
-    constructor(tree: InspireTree, source: TreeNode, excludeKeys: Array<String>)
-    constructor(tree: InspireTree, source: Any)
-    constructor(tree: InspireTree, source: TreeNode)
-
-    open fun addChild(node: NodeConfig): TreeNode
-    open fun addChildren(nodes: Array<NodeConfig>): TreeNodes
-    open fun assign(vararg sources: Any?): TreeNode
-    open fun available(): Boolean
-    open fun blur(): TreeNode
-    open fun check(shallow: Boolean? = definedExternally /* null */): TreeNode
-    open fun checked(): Boolean
-    open fun clean(): TreeNode
-    open fun clone(excludeKeys: Array<String>? = definedExternally /* null */): TreeNode
-    open fun collapse(): TreeNode
-    open fun collapsed(): Boolean
-    open var text: String
-    open var id: String
-    open var itree: Any
-    open fun context(): TreeNodes
-    open fun copy(
-        dest: InspireTree,
-        hierarchy: Boolean? = definedExternally /* null */,
-        includeState: Boolean? = definedExternally /* null */
-    ): TreeNode
-
-    open fun copyHierarchy(
-        excludeNode: Boolean? = definedExternally /* null */,
-        includeState: Boolean? = definedExternally /* null */
-    ): TreeNode
-
-    open fun deselect(shallow: Boolean? = definedExternally /* null */): TreeNode
-    open fun editable(): Boolean
-    open fun editing(): Boolean
-    open fun expand(): Promise<TreeNode>
-    open fun expanded(): Boolean
-    open fun expandParents(): TreeNode
-    open fun focus(): TreeNode
-    open fun focused(): Boolean
-    open fun getChildren(): TreeNodes
-    open fun getParent(): TreeNode
-    open fun getParents(): TreeNodes
-    open fun getTextualHierarchy(): Array<String>
-    open fun hasAncestor(): Boolean
-    open fun hasChildren(): Boolean
-    open fun hasOrWillHaveChildren(): Boolean
-    open fun hasParent(): Boolean
-    open fun hasVisibleChildren(): Boolean
-    open fun hidden(): Boolean
-    open fun hide(): TreeNode
-    open fun indeterminate(): Boolean
-    open fun indexPath(): String
-    open fun isFirstRenderable(): Boolean
-    open fun isLastRenderable(): Boolean
-    open fun lastDeepestVisibleChild(): TreeNode
-    open fun loadChildren(): Promise<TreeNodes>
-    open fun loading(): Boolean
-    open fun markDirty(): TreeNode
-    open fun matched(): TreeNodes
-    open fun nextVisibleAncestralSiblingNode(): TreeNode
-    open fun nextVisibleChildNode(): TreeNode
-    open fun nextVisibleNode(): TreeNode
-    open fun nextVisibleSiblingNode(): TreeNode
-    open fun pagination(): Pagination
-    open fun previousVisibleNode(): TreeNode
-    open fun previousVisibleSiblingNode(): TreeNode
-    open fun recurseDown(iteratee: NodeIteratee): TreeNode
-    open fun recurseUp(iteratee: NodeIteratee): TreeNode
-    open fun refreshIndeterminateState(): TreeNode
-    open fun reload(): Promise<TreeNodes>
-    open fun remove(includeState: Boolean? = definedExternally /* null */): Any
-    open fun removed(): Boolean
-    open fun renderable(): Boolean
-    open fun rendered(): Boolean
-    open fun restore(): TreeNode
-    open fun select(shallow: Boolean? = definedExternally /* null */): TreeNode
-    open fun selectable(): Boolean
-    open fun selected(): Boolean
-    open fun set(key: Number, `val`: Any): TreeNode
-    open fun set(key: String, `val`: Any): TreeNode
-    open fun show(): TreeNode
-    open fun softRemove(): TreeNode
-    open fun state(key: Any?, `val`: Boolean? = definedExternally /* null */): dynamic /* Boolean | Any? */
-    open fun state(key: String, `val`: Boolean? = definedExternally /* null */): dynamic /* Boolean | Any? */
-    open fun states(keys: Array<String>, `val`: Boolean): Boolean
-    open fun toggleCheck(): TreeNode
-    open fun toggleCollapse(): TreeNode
-    open fun toggleEditing(): TreeNode
-    open fun toggleSelect(): TreeNode
-    open fun toObject(
-        excludeChildren: Boolean? = definedExternally /* null */,
-        includeState: Boolean? = definedExternally /* null */
-    ): Any
-
-    override fun toString(): String
-    open fun tree(): InspireTree
-    open fun uncheck(shallow: Boolean? = definedExternally /* null */): TreeNode
-    open fun visible(): Boolean
-}
\ No newline at end of file
diff --git a/wrappers/src/main/kotlin/jsoneditor.kt b/wrappers/src/main/kotlin/jsoneditor.kt
deleted file mode 100644
index a83f4b87..00000000
--- a/wrappers/src/main/kotlin/jsoneditor.kt
+++ /dev/null
@@ -1,185 +0,0 @@
-@file:Suppress(
-    "INTERFACE_WITH_SUPERCLASS",
-    "OVERRIDING_FINAL_MEMBER",
-    "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
-    "CONFLICTING_OVERLOADS",
-    "EXTERNAL_DELEGATION"
-)
-
-package hep.dataforge.vis.spatial.editor
-
-import org.w3c.dom.HTMLElement
-
-external interface Node {
-    var field: String
-    var value: String? get() = definedExternally; set(value) = definedExternally
-    var path: dynamic
-}
-
-external interface NodeName {
-    var path: Array<String>
-    var type: dynamic /* 'object' | 'array' */
-    var size: Number
-}
-
-external interface ValidationError {
-    var path: dynamic
-    var message: String
-}
-
-external interface Template {
-    var text: String
-    var title: String
-    var className: String? get() = definedExternally; set(value) = definedExternally
-    var field: String
-    var value: Any
-}
-
-external interface `T$6` {
-    var startFrom: Number
-    var options: Array<String>
-}
-
-external interface AutoCompleteOptions {
-    var confirmKeys: Array<Number>? get() = definedExternally; set(value) = definedExternally
-    var caseSensitive: Boolean? get() = definedExternally; set(value) = definedExternally
-//    var getOptions: AutoCompleteOptionsGetter? get() = definedExternally; set(value) = definedExternally
-}
-
-external interface SelectionPosition {
-    var row: Number
-    var column: Number
-}
-
-external interface SerializableNode {
-    var value: Any
-    var path: dynamic
-}
-
-external interface Color {
-    var rgba: Array<Number>
-    var hsla: Array<Number>
-    var rgbString: String
-    var rgbaString: String
-    var hslString: String
-    var hslaString: String
-    var hex: String
-}
-
-//external interface `T$0` {
-//    var field: Boolean
-//    var value: Boolean
-//}
-//
-//external interface `T$1` {
-//    @nativeGetter
-//    operator fun get(key: String): String?
-//
-//    @nativeSetter
-//    operator fun set(key: String, value: String)
-//}
-
-//external interface Languages {
-//    @nativeGetter
-//    operator fun get(lang: String): `T$1`?
-//
-//    @nativeSetter
-//    operator fun set(lang: String, value: `T$1`)
-//}
-
-external interface JSONEditorOptions {
-//    var ace: AceAjax.Ace? get() = definedExternally; set(value) = definedExternally
-//    var ajv: Ajv? get() = definedExternally; set(value) = definedExternally
-    var onChange: (() -> Unit)? get() = definedExternally; set(value) = definedExternally
-    var onChangeJSON: ((json: Any) -> Unit)? get() = definedExternally; set(value) = definedExternally
-    var onChangeText: ((jsonString: String) -> Unit)? get() = definedExternally; set(value) = definedExternally
-    var onEditable: ((node: Node) -> dynamic)? get() = definedExternally; set(value) = definedExternally
-    var onError: ((error: Error) -> Unit)? get() = definedExternally; set(value) = definedExternally
-    var onModeChange: ((newMode: dynamic /* 'tree' | 'view' | 'form' | 'code' | 'text' */, oldMode: dynamic /* 'tree' | 'view' | 'form' | 'code' | 'text' */) -> Unit)? get() = definedExternally; set(value) = definedExternally
-    var onNodeName: ((nodeName: NodeName) -> String?)? get() = definedExternally; set(value) = definedExternally
-    var onValidate: ((json: Any) -> dynamic)? get() = definedExternally; set(value) = definedExternally
-    var escapeUnicode: Boolean? get() = definedExternally; set(value) = definedExternally
-    var sortObjectKeys: Boolean? get() = definedExternally; set(value) = definedExternally
-    var history: Boolean? get() = definedExternally; set(value) = definedExternally
-    var mode: dynamic /* 'tree' | 'view' | 'form' | 'code' | 'text' */
-    var modes: Array<dynamic /* 'tree' | 'view' | 'form' | 'code' | 'text' */>? get() = definedExternally; set(value) = definedExternally
-    var name: String? get() = definedExternally; set(value) = definedExternally
-    var schema: Any? get() = definedExternally; set(value) = definedExternally
-    var schemaRefs: Any? get() = definedExternally; set(value) = definedExternally
-    var search: Boolean? get() = definedExternally; set(value) = definedExternally
-    var indentation: Number? get() = definedExternally; set(value) = definedExternally
-    var theme: String? get() = definedExternally; set(value) = definedExternally
-    var templates: Array<Template>? get() = definedExternally; set(value) = definedExternally
-    var autocomplete: AutoCompleteOptions? get() = definedExternally; set(value) = definedExternally
-    var mainMenuBar: Boolean? get() = definedExternally; set(value) = definedExternally
-    var navigationBar: Boolean? get() = definedExternally; set(value) = definedExternally
-    var statusBar: Boolean? get() = definedExternally; set(value) = definedExternally
-    var onTextSelectionChange: ((start: SelectionPosition, end: SelectionPosition, text: String) -> Unit)? get() = definedExternally; set(value) = definedExternally
-    var onSelectionChange: ((start: SerializableNode, end: SerializableNode) -> Unit)? get() = definedExternally; set(value) = definedExternally
-    var onEvent: ((node: Node, event: String) -> Unit)? get() = definedExternally; set(value) = definedExternally
-    var colorPicker: Boolean? get() = definedExternally; set(value) = definedExternally
-    var onColorPicker: ((parent: HTMLElement, color: String, onChange: (color: Color) -> Unit) -> Unit)? get() = definedExternally; set(value) = definedExternally
-    var timestampTag: Boolean? get() = definedExternally; set(value) = definedExternally
-    var language: String? get() = definedExternally; set(value) = definedExternally
-    //var languages: Languages? get() = definedExternally; set(value) = definedExternally
-    var modalAnchor: HTMLElement? get() = definedExternally; set(value) = definedExternally
-    var enableSort: Boolean? get() = definedExternally; set(value) = definedExternally
-    var enableTransform: Boolean? get() = definedExternally; set(value) = definedExternally
-    var maxVisibleChilds: Number? get() = definedExternally; set(value) = definedExternally
-}
-
-external interface JsonPath {
-    var path: dynamic
-}
-
-external interface EditorSelection {
-    var start: SerializableNode
-    var end: SerializableNode
-}
-
-external interface TextSelection {
-    var start: SelectionPosition
-    var end: SelectionPosition
-    var text: String
-}
-
-@JsModule("jsoneditor")
-@JsNonModule
-external open class JSONEditor(
-    container: HTMLElement,
-    options: JSONEditorOptions? = definedExternally /* null */,
-    json: dynamic = definedExternally /* null */
-) {
-    open fun collapseAll()
-    open fun destroy()
-    open fun expandAll()
-    open fun focus()
-    open fun get(): Any
-    open fun getMode(): dynamic /* 'tree' | 'view' | 'form' | 'code' | 'text' */
-    open fun getName(): String?
-    open fun getNodesByRange(start: JsonPath, end: JsonPath): Array<SerializableNode>
-    open fun getSelection(): EditorSelection
-    open fun getText(): String
-    open fun getTextSelection(): TextSelection
-    open fun refresh()
-    open fun set(json: Any)
-    open fun setMode(mode: String /* 'tree' */)
-    open fun setMode(mode: String /* 'view' */)
-    open fun setMode(mode: String /* 'form' */)
-    open fun setMode(mode: String /* 'code' */)
-    open fun setMode(mode: String /* 'text' */)
-    open fun setName(name: String? = definedExternally /* null */)
-    open fun setSchema(schema: Any?, schemaRefs: Any? = definedExternally /* null */)
-    open fun setSelection(start: JsonPath, end: JsonPath)
-    open fun setText(jsonString: String)
-    open fun setTextSelection(start: SelectionPosition, end: SelectionPosition)
-    open fun update(json: Any)
-    open fun updateText(jsonString: String)
-
-    companion object {
-        var VALID_OPTIONS: Array<String>
-//        var ace: AceAjax.Ace
-//        var Ajv: Ajv
-        var VanillaPicker: Any
-    }
-}
\ No newline at end of file

From 8f6c3822ffa8c851b8b9c52774110498ae46ab54 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 31 Oct 2020 12:10:03 +0300
Subject: [PATCH 018/151] Remove unnecessary coordinates and properties for
 solids after serialization fix.

---
 CHANGELOG.md                                  |  3 +
 .../ru/mipt/npm/muon/monitor/MMDemoApp.kt     |  2 +-
 .../ru/mipt/npm/muon/monitor/readResource.kt  |  4 +-
 .../vision/bootstrap/outputConfig.kt          |  3 +-
 .../vision/bootstrap/visionPropertyEditor.kt  |  4 +-
 ui/ring/src/main/kotlin/ringui/RingUI.kt      |  2 +-
 .../src/main/kotlin/ringui/header/Header.kt   |  2 +-
 ui/ring/src/main/kotlin/ringui/header/Logo.kt |  2 +-
 ui/ring/src/main/kotlin/ringui/header/Tray.kt |  2 +-
 visionforge-core/build.gradle.kts             |  1 -
 .../dataforge/properties/ConfigProperty.kt    | 23 -------
 .../hep/dataforge/properties/Property.kt      | 60 -------------------
 .../hep/dataforge/vision/AbstractVision.kt    |  6 +-
 .../kotlin/hep/dataforge/vision/Vision.kt     |  1 +
 .../kotlin/hep/dataforge/js/Application.kt    | 31 +++++-----
 .../kotlin/hep/dataforge/js/bindings.kt       | 33 ----------
 .../jsMain/kotlin/hep/dataforge/js/jsExtra.kt | 20 -------
 visionforge-server/build.gradle.kts           | 47 +++++++--------
 .../dataforge/vision/solid/AbstractSolid.kt   | 17 ++++++
 .../kotlin/hep/dataforge/vision/solid/Box.kt  |  8 +--
 .../hep/dataforge/vision/solid/Composite.kt   |  8 +--
 .../hep/dataforge/vision/solid/ConeSegment.kt |  8 +--
 .../hep/dataforge/vision/solid/Convex.kt      | 11 +---
 .../hep/dataforge/vision/solid/Extruded.kt    |  8 +--
 .../hep/dataforge/vision/solid/PolyLine.kt    | 16 ++---
 .../hep/dataforge/vision/solid/Proxy.kt       | 17 ++----
 .../hep/dataforge/vision/solid/Solid.kt       |  4 +-
 .../hep/dataforge/vision/solid/SolidGroup.kt  |  4 --
 .../hep/dataforge/vision/solid/SolidLabel.kt  | 19 ++----
 .../dataforge/vision/solid/SolidManager.kt    |  8 +--
 .../hep/dataforge/vision/solid/Sphere.kt      | 21 ++-----
 .../kotlin/hep/dataforge/vision/solid/Tube.kt | 18 +-----
 .../vision/solid/three/ThreeLabelFactory.kt   |  3 +-
 .../vision/solid/three/ThreeVision.kt         | 22 ++-----
 34 files changed, 111 insertions(+), 327 deletions(-)
 delete mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/properties/ConfigProperty.kt
 delete mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/properties/Property.kt
 delete mode 100644 visionforge-core/src/jsMain/kotlin/hep/dataforge/js/bindings.kt
 delete mode 100644 visionforge-core/src/jsMain/kotlin/hep/dataforge/js/jsExtra.kt
 create mode 100644 visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/AbstractSolid.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db566d2c..c3200775 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,13 +2,16 @@
 
 ## [Unreleased]
 ### Added
+- Server module
 
 ### Changed
 
 ### Deprecated
 
 ### Removed
+- Primary modules dependencies on UI
 
 ### Fixed
+- Version conflicts
 
 ### Security
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
index f4f93495..62b538ab 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
@@ -19,7 +19,7 @@ private class MMDemoApp : Application {
 
     private val connection = HttpClient {
         install(JsonFeature) {
-            serializer = KotlinxSerializer(Json { serializersModule = SolidManager.serialModule })
+            serializer = KotlinxSerializer(Json { serializersModule = SolidManager.serializersModule })
         }
     }
 
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/readResource.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/readResource.kt
index 46242a20..4fce1715 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/readResource.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/readResource.kt
@@ -1,9 +1,7 @@
 package ru.mipt.npm.muon.monitor
 
-import hep.dataforge.js.requireJS
-
 actual fun readResource(path: String): String {
-    return requireJS(path) as String
+    return kotlinext.js.require(path) as String
 }
 
 // TODO replace by resource
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
index 9e5e1a4b..e3579fc0 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
@@ -1,6 +1,5 @@
 package hep.dataforge.vision.bootstrap
 
-import hep.dataforge.js.requireJS
 import hep.dataforge.meta.DFExperimental
 import hep.dataforge.vision.solid.SolidGroup
 import hep.dataforge.vision.solid.SolidManager
@@ -27,7 +26,7 @@ private fun saveData(event: Event, fileName: String, mimeType: String = "text/pl
     event.stopPropagation();
     event.preventDefault();
 
-    val fileSaver = requireJS("file-saver")
+    val fileSaver = kotlinext.js.require("file-saver")
     val blob = Blob(arrayOf(dataBuilder()), BlobPropertyBag("$mimeType;charset=utf-8"))
     fileSaver.saveAs(blob, fileName)
 }
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
index 0c46e386..5651257b 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
@@ -10,7 +10,7 @@ import org.w3c.dom.Element
 import react.RBuilder
 import react.dom.render
 
-fun RBuilder.visionPropertyEditor(
+public fun RBuilder.visionPropertyEditor(
     item: Vision,
     descriptor: NodeDescriptor? = item.descriptor,
     default: Meta? = null,
@@ -36,7 +36,7 @@ fun RBuilder.visionPropertyEditor(
     }
 }
 
-fun Element.visionPropertyEditor(
+public fun Element.visionPropertyEditor(
     item: Vision,
     descriptor: NodeDescriptor? = item.descriptor,
     default: Meta? = null
diff --git a/ui/ring/src/main/kotlin/ringui/RingUI.kt b/ui/ring/src/main/kotlin/ringui/RingUI.kt
index c7d3b5ef..7d9a475c 100644
--- a/ui/ring/src/main/kotlin/ringui/RingUI.kt
+++ b/ui/ring/src/main/kotlin/ringui/RingUI.kt
@@ -1,7 +1,7 @@
 package ringui
 
-import ringui.header.HeaderProps
 import react.RClass
+import ringui.header.HeaderProps
 
 @JsModule("@jetbrains/ring-ui")
 external object RingUI {
diff --git a/ui/ring/src/main/kotlin/ringui/header/Header.kt b/ui/ring/src/main/kotlin/ringui/header/Header.kt
index e04635be..a9c9b1d6 100644
--- a/ui/ring/src/main/kotlin/ringui/header/Header.kt
+++ b/ui/ring/src/main/kotlin/ringui/header/Header.kt
@@ -1,10 +1,10 @@
 package ringui.header
 
-import ringui.RingUI
 import react.RBuilder
 import react.RClass
 import react.RHandler
 import react.dom.WithClassName
+import ringui.RingUI
 
 @JsModule("@jetbrains/ring-ui/components/header/header")
 internal external object HeaderModule {
diff --git a/ui/ring/src/main/kotlin/ringui/header/Logo.kt b/ui/ring/src/main/kotlin/ringui/header/Logo.kt
index 4a6b4472..f6fd40de 100644
--- a/ui/ring/src/main/kotlin/ringui/header/Logo.kt
+++ b/ui/ring/src/main/kotlin/ringui/header/Logo.kt
@@ -1,9 +1,9 @@
 package ringui.header
 
-import ringui.IconProps
 import kotlinx.html.A
 import react.RElementBuilder
 import react.RHandler
+import ringui.IconProps
 import styled.StyledDOMBuilder
 
 external interface HeaderLogoProps : IconProps
diff --git a/ui/ring/src/main/kotlin/ringui/header/Tray.kt b/ui/ring/src/main/kotlin/ringui/header/Tray.kt
index ce47a44d..cadac0ee 100644
--- a/ui/ring/src/main/kotlin/ringui/header/Tray.kt
+++ b/ui/ring/src/main/kotlin/ringui/header/Tray.kt
@@ -1,9 +1,9 @@
 package ringui.header
 
-import ringui.ButtonProps
 import react.RElementBuilder
 import react.RHandler
 import react.dom.WithClassName
+import ringui.ButtonProps
 
 // https://github.com/JetBrains/ring-ui/blob/master/components/header/tray.js
 external interface HeaderTrayProps : WithClassName
diff --git a/visionforge-core/build.gradle.kts b/visionforge-core/build.gradle.kts
index 6e59b5da..b878791b 100644
--- a/visionforge-core/build.gradle.kts
+++ b/visionforge-core/build.gradle.kts
@@ -7,7 +7,6 @@ val kotlinWrappersVersion: String by rootProject.extra
 
 
 kotlin {
-
     sourceSets {
         commonMain {
             dependencies {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/properties/ConfigProperty.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/properties/ConfigProperty.kt
deleted file mode 100644
index 550d39a7..00000000
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/properties/ConfigProperty.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package hep.dataforge.properties
-
-import hep.dataforge.meta.*
-import hep.dataforge.names.Name
-
-@DFExperimental
-internal class ConfigProperty(val config: Config, val name: Name) : Property<MetaItem<*>?> {
-    override var value: MetaItem<*>?
-        get() = config[name]
-        set(value) {
-            config[name] = value
-        }
-
-    override fun onChange(owner: Any?, callback: (MetaItem<*>?) -> Unit) {
-        config.onChange(owner) { name, oldItem, newItem ->
-            if (name == this.name && oldItem != newItem) callback(newItem)
-        }
-    }
-
-    override fun removeChangeListener(owner: Any?) {
-        config.removeListener(owner)
-    }
-}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/properties/Property.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/properties/Property.kt
deleted file mode 100644
index 540b0247..00000000
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/properties/Property.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package hep.dataforge.properties
-
-import hep.dataforge.meta.DFExperimental
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.launch
-
-//TODO move to core
-
-@DFExperimental
-interface Property<T> {
-    var value: T
-
-    fun onChange(owner: Any? = null, callback: (T) -> Unit)
-    fun removeChangeListener(owner: Any? = null)
-}
-
-@DFExperimental
-@OptIn(ExperimentalCoroutinesApi::class)
-fun <T> Property<T>.flow() = callbackFlow<T> {
-    send(value)
-    onChange(this) {
-        //TODO add exception handler?
-        launch {
-            send(it)
-        }
-    }
-    awaitClose { removeChangeListener(this) }
-}
-
-/**
- * Reflect all changes in the [source] property onto this property
- *
- * @return a mirroring job
- */
-@DFExperimental
-fun <T> Property<T>.mirror(source: Property<T>, scope: CoroutineScope): Job {
-    return scope.launch {
-        source.flow().collect {
-            value = it
-        }
-    }
-}
-
-/**
- * Bi-directional connection between properties
- */
-@DFExperimental
-fun <T> Property<T>.bind(other: Property<T>) {
-    onChange(other) {
-        other.value = it
-    }
-    other.onChange {
-        this.value = it
-    }
-}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt
index 68e6ee85..909d021d 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt
@@ -6,6 +6,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.values.ValueType
 import hep.dataforge.vision.Vision.Companion.STYLE_KEY
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 
 internal data class PropertyListener(
@@ -13,7 +14,8 @@ internal data class PropertyListener(
     val action: (name: Name) -> Unit
 )
 
-abstract class AbstractVision : Vision {
+@Serializable
+public open class AbstractVision : Vision {
 
     @Transient
     override var parent: VisionGroup? = null
@@ -21,7 +23,7 @@ abstract class AbstractVision : Vision {
     /**
      * Object own properties excluding styles and inheritance
      */
-    abstract override var properties: Config?
+    override var properties: Config? = null
         protected set
 
     protected fun updateStyles(names: List<String>) {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 7ccdd81e..01f33d9b 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -9,6 +9,7 @@ import hep.dataforge.values.asValue
 import hep.dataforge.vision.Vision.Companion.TYPE
 import hep.dataforge.vision.Vision.Companion.VISIBLE_KEY
 import kotlinx.serialization.PolymorphicSerializer
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 
 /**
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/js/Application.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/js/Application.kt
index 1d43aecd..92a55e20 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/js/Application.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/js/Application.kt
@@ -1,22 +1,23 @@
 package hep.dataforge.js
 
-import kotlin.browser.document
-import kotlin.dom.hasClass
+import kotlinx.browser.document
+import kotlinx.dom.hasClass
 
-external val module: Module
 
-external interface Hot {
-    val data: dynamic
+public external val module: Module
 
-    fun accept()
-    fun accept(dependency: String, callback: () -> Unit)
-    fun accept(dependencies: Array<String>, callback: (updated: Array<String>) -> Unit)
+public external interface Hot {
+    public val data: dynamic
 
-    fun dispose(callback: (data: dynamic) -> Unit)
+    public fun accept()
+    public fun accept(dependency: String, callback: () -> Unit)
+    public fun accept(dependencies: Array<String>, callback: (updated: Array<String>) -> Unit)
+
+    public fun dispose(callback: (data: dynamic) -> Unit)
 }
 
-external interface Module {
-    val hot: Hot?
+public external interface Module {
+    public val hot: Hot?
 }
 
 /**
@@ -24,21 +25,21 @@ external interface Module {
  *
  * Base interface for applications supporting Hot Module Replacement (HMR).
  */
-interface Application {
+public interface Application {
     /**
      * Starting point for an application.
      * @param state Initial state between Hot Module Replacement (HMR).
      */
-    fun start(state: Map<String, Any>)
+    public fun start(state: Map<String, Any>)
 
     /**
      * Ending point for an application.
      * @return final state for Hot Module Replacement (HMR).
      */
-    fun dispose(): Map<String, Any> = emptyMap()
+    public fun dispose(): Map<String, Any> = emptyMap()
 }
 
-fun startApplication(builder: () -> Application) {
+public fun startApplication(builder: () -> Application) {
     fun start(state: dynamic): Application? {
         return if (document.body?.hasClass("application") == true) {
             val application = builder()
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/js/bindings.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/js/bindings.kt
deleted file mode 100644
index c310fe6a..00000000
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/js/bindings.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package hep.dataforge.js
-
-import hep.dataforge.meta.DFExperimental
-import hep.dataforge.properties.Property
-import org.w3c.dom.HTMLInputElement
-
-@DFExperimental
-fun HTMLInputElement.bindValue(property: Property<String>) {
-    if (this.onchange != null) error("Input element already bound")
-    this.onchange = {
-        property.value = this.value
-        Unit
-    }
-    property.onChange(this) {
-        if (value != it) {
-            value = it
-        }
-    }
-}
-
-@DFExperimental
-fun HTMLInputElement.bindChecked(property: Property<Boolean>) {
-    if (this.onchange != null) error("Input element already bound")
-    this.onchange = {
-        property.value = this.checked
-        Unit
-    }
-    property.onChange(this) {
-        if (checked != it) {
-            checked = it
-        }
-    }
-}
\ No newline at end of file
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/js/jsExtra.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/js/jsExtra.kt
deleted file mode 100644
index e3105dd5..00000000
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/js/jsExtra.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package hep.dataforge.js
-
-@JsName("require")
-external fun requireJS(name: String): dynamic
-
-inline fun <T : Any> jsObject(builder: T.() -> Unit): T {
-    val obj: T = js("({})") as T
-    return obj.apply {
-        builder()
-    }
-}
-
-inline fun js(builder: dynamic.() -> Unit): dynamic = jsObject(builder)
-
-fun toPlainObjectStripNull(obj: Any) = js {
-    for (key in Object.keys(obj)) {
-        val value = obj.asDynamic()[key]
-        if (value != null) this[key] = value
-    }
-}
\ No newline at end of file
diff --git a/visionforge-server/build.gradle.kts b/visionforge-server/build.gradle.kts
index 0eec3285..60d5624b 100644
--- a/visionforge-server/build.gradle.kts
+++ b/visionforge-server/build.gradle.kts
@@ -1,38 +1,38 @@
-import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME
+//import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME
 
 plugins {
     id("ru.mipt.npm.mpp")
-    application
+//    application
 }
 
 val ktorVersion: String by rootProject.extra
 
-kscience {
-    application()
-}
+//kscience {
+//    application()
+//}
 
 kotlin {
-    afterEvaluate {
-        val jsBrowserDistribution by tasks.getting
-
-        jvm {
-            withJava()
-            compilations[MAIN_COMPILATION_NAME]?.apply {
-                tasks.getByName<ProcessResources>(processResourcesTaskName) {
-                    dependsOn(jsBrowserDistribution)
-                    afterEvaluate {
-                        from(jsBrowserDistribution)
-                    }
-                }
-            }
-
-        }
-    }
+//    afterEvaluate {
+//        val jsBrowserDistribution by tasks.getting
+//
+//        jvm {
+//            withJava()
+//            compilations[MAIN_COMPILATION_NAME]?.apply {
+//                tasks.getByName<ProcessResources>(processResourcesTaskName) {
+//                    dependsOn(jsBrowserDistribution)
+//                    afterEvaluate {
+//                        from(jsBrowserDistribution)
+//                    }
+//                }
+//            }
+//
+//        }
+//    }
 
     sourceSets {
         commonMain {
             dependencies {
-                implementation(project(":visionforge-solid"))
+                implementation(project(":visionforge-core"))
             }
         }
         jvmMain {
@@ -50,9 +50,6 @@ kotlin {
     }
 }
 
-application {
-    mainClass.set("ru.mipt.npm.muon.monitor.server.MMServerKt")
-}
 
 //distributions {
 //    main {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/AbstractSolid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/AbstractSolid.kt
new file mode 100644
index 00000000..109ec39e
--- /dev/null
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/AbstractSolid.kt
@@ -0,0 +1,17 @@
+package hep.dataforge.vision.solid
+
+import hep.dataforge.vision.AbstractVision
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.UseSerializers
+
+@Serializable
+public open class AbstractSolid: AbstractVision(), Solid {
+    @Serializable(Point3DSerializer::class)
+    override var position: Point3D? = null
+
+    @Serializable(Point3DSerializer::class)
+    override var rotation: Point3D? = null
+
+    @Serializable(Point3DSerializer::class)
+    override var scale: Point3D? = null
+}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
index 5bd6aef5..aa2e42f0 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
@@ -18,13 +18,7 @@ public class Box(
     public val xSize: Float,
     public val ySize: Float,
     public val zSize: Float
-) : AbstractVision(), GeometrySolid {
-
-    override var position: Point3D? = null
-    override var rotation: Point3D? = null
-    override var scale: Point3D? = null
-
-    override var properties: Config? = null
+) : AbstractSolid(), GeometrySolid {
 
     //TODO add helper for color configuration
     override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>) {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
index 06da6e07..a019e368 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
@@ -22,19 +22,13 @@ public class Composite(
     public val compositeType: CompositeType,
     public val first: Solid,
     public val second: Solid
-) : AbstractVision(), Solid, VisionGroup {
+) : AbstractSolid(), Solid, VisionGroup {
 
     init {
         first.parent = this
         second.parent = this
     }
 
-    override var position: Point3D? = null
-    override var rotation: Point3D? = null
-    override var scale: Point3D? = null
-
-    override var properties: Config? = null
-
     override val children: Map<NameToken, Vision>
         get() = mapOf(NameToken("first") to first, NameToken("second") to second)
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
index 428e6271..084f2f8e 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
@@ -24,13 +24,7 @@ public class ConeSegment(
     public var upperRadius: Float,
     public var startAngle: Float = 0f,
     public var angle: Float = PI2
-) : AbstractVision(), GeometrySolid {
-
-    override var properties: Config? = null
-
-    override var position: Point3D? = null
-    override var rotation: Point3D? = null
-    override var scale: Point3D? = null
+) : AbstractSolid(), GeometrySolid {
 
     override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>) {
         val segments = detail ?: 8
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
index fd2b0389..a96cc8bb 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
@@ -13,16 +13,7 @@ import kotlinx.serialization.UseSerializers
 
 @Serializable
 @SerialName("solid.convex")
-public class Convex(public val points: List<Point3D>) : AbstractVision(), Solid {
-
-    override var properties: Config? = null
-
-    override var position: Point3D? = null
-    override var rotation: Point3D? = null
-    override var scale: Point3D? = null
-
-
-}
+public class Convex(public val points: List<Point3D>) : AbstractSolid(), Solid
 
 public inline fun VisionContainerBuilder<Solid>.convex(name: String = "", action: ConvexBuilder.() -> Unit = {}): Convex =
     ConvexBuilder().apply(action).build().also { set(name, it) }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
index 8ca27740..afab61f9 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
@@ -44,13 +44,7 @@ public data class Layer(var x: Float, var y: Float, var z: Float, var scale: Flo
 public class Extruded(
     public var shape: List<Point2D> = ArrayList(),
     public var layers: MutableList<Layer> = ArrayList()
-) : AbstractVision(), GeometrySolid {
-
-    override var properties: Config? = null
-
-    override var position: Point3D? = null
-    override var rotation: Point3D? = null
-    override var scale: Point3D? = null
+) : AbstractSolid(), GeometrySolid {
 
     public fun shape(block: Shape2DBuilder.() -> Unit) {
         this.shape = Shape2DBuilder().apply(block).build()
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
index 67e22080..aac82df5 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
@@ -2,13 +2,10 @@
 
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.Config
 import hep.dataforge.meta.number
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
-import hep.dataforge.vision.AbstractVision
-import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
@@ -17,12 +14,7 @@ import kotlinx.serialization.UseSerializers
 
 @Serializable
 @SerialName("solid.line")
-public class PolyLine(public var points: List<Point3D>) : AbstractVision(), Solid {
-    override var properties: Config? = null
-
-    override var position: Point3D? = null
-    override var rotation: Point3D? = null
-    override var scale: Point3D? = null
+public class PolyLine(public var points: List<Point3D>) : AbstractSolid(), Solid {
 
     //var lineType by string()
     public var thickness: Number by number(1.0, key = SolidMaterial.MATERIAL_KEY + THICKNESS_KEY)
@@ -33,5 +25,9 @@ public class PolyLine(public var points: List<Point3D>) : AbstractVision(), Soli
 
 }
 
-public fun VisionContainerBuilder<Solid>.polyline(vararg points: Point3D, name: String = "", action: PolyLine.() -> Unit = {}): PolyLine =
+public fun VisionContainerBuilder<Solid>.polyline(
+    vararg points: Point3D,
+    name: String = "",
+    action: PolyLine.() -> Unit = {},
+): PolyLine =
     PolyLine(points.toList()).apply(action).also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
index cc56f827..2c75b669 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
@@ -1,5 +1,3 @@
-@file:UseSerializers(Point3DSerializer::class)
-
 package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.*
@@ -9,10 +7,9 @@ import hep.dataforge.vision.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import kotlinx.serialization.UseSerializers
 import kotlin.collections.set
 
-public abstract class AbstractProxy : AbstractVision(), VisionGroup {
+public abstract class AbstractProxy : AbstractSolid(), VisionGroup {
     public abstract val prototype: Vision
 
     override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? {
@@ -54,19 +51,13 @@ public abstract class AbstractProxy : AbstractVision(), VisionGroup {
 @Serializable
 @SerialName("solid.proxy")
 public class Proxy private constructor(
-    public val templateName: Name
+    public val templateName: Name,
 ) : AbstractProxy(), Solid {
 
     public constructor(parent: SolidGroup, templateName: Name) : this(templateName) {
         this.parent = parent
     }
 
-    override var position: Point3D? = null
-    override var rotation: Point3D? = null
-    override var scale: Point3D? = null
-
-    override var properties: Config? = null
-
     /**
      * Recursively search for defined template in the parent
      */
@@ -155,7 +146,7 @@ public val Vision.prototype: Vision
  */
 public fun SolidGroup.ref(
     templateName: Name,
-    name: String = ""
+    name: String = "",
 ): Proxy = Proxy(this, templateName).also { set(name, it) }
 
 /**
@@ -164,7 +155,7 @@ public fun SolidGroup.ref(
 public fun SolidGroup.proxy(
     name: String,
     obj: Solid,
-    templateName: Name = name.toName()
+    templateName: Name = name.toName(),
 ): Proxy {
     val existing = getPrototype(templateName)
     if (existing == null) {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
index fce83d6d..7e9c044b 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
@@ -1,5 +1,3 @@
-@file:UseSerializers(Point3DSerializer::class)
-
 package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.*
@@ -75,7 +73,7 @@ public interface Solid : Vision {
 
                 item(SolidMaterial.MATERIAL_KEY.toString(), SolidMaterial.descriptor)
 
-                enum<RotationOrder>(ROTATION_ORDER_KEY,default = RotationOrder.XYZ)
+                enum(ROTATION_ORDER_KEY,default = RotationOrder.XYZ)
             }
         }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index 1e2dd7a4..7c9f16fc 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -1,7 +1,3 @@
-@file:UseSerializers(
-    Point3DSerializer::class
-)
-
 package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.Config
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
index c7f459a5..a9740cb0 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
@@ -1,26 +1,17 @@
-@file:UseSerializers(Point3DSerializer::class)
-
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.Config
-import hep.dataforge.vision.AbstractVision
-import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
 
 @Serializable
 @SerialName("solid.label")
-public class SolidLabel(public var text: String, public var fontSize: Double, public var fontFamily: String) : AbstractVision(), Solid {
-    override var properties: Config? = null
-
-    override var position: Point3D? = null
-    override var rotation: Point3D? = null
-    override var scale: Point3D? = null
-
-}
+public class SolidLabel(
+    public var text: String,
+    public var fontSize: Double,
+    public var fontFamily: String,
+) : AbstractSolid(), Solid
 
 public fun VisionContainerBuilder<Solid>.label(
     text: String,
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index 676ee9ba..bdd83669 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -85,8 +85,8 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
     override val tag: PluginTag get() = Companion.tag
 
     override fun content(target: String): Map<Name, Any> = when (target) {
-        VisionForm.TYPE -> serialModule.extractFactories().associateBy { it.name }
-        VISION_SERIAL_MODULE_TARGET -> mapOf(tag.name.toName() to serialModule)
+        VisionForm.TYPE -> serializersModule.extractFactories().associateBy { it.name }
+        VISION_SERIAL_MODULE_TARGET -> mapOf(tag.name.toName() to serializersModule)
         else -> super.content(target)
     }
 
@@ -95,7 +95,7 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
         override val type: KClass<out SolidManager> = SolidManager::class
         override fun invoke(meta: Meta, context: Context): SolidManager = SolidManager(meta)
 
-        public val serialModule: SerializersModule = SerializersModule {
+        public val serializersModule: SerializersModule = SerializersModule {
             contextual(Point3DSerializer)
             contextual(Point2DSerializer)
 
@@ -132,7 +132,7 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
             useArrayPolymorphism = false
             encodeDefaults = false
             ignoreUnknownKeys = true
-            serializersModule = this@Companion.serialModule
+            serializersModule = this@Companion.serializersModule
         }
     }
 }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
index f21dfbc6..9a647155 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
@@ -1,15 +1,9 @@
-@file:UseSerializers(Point3DSerializer::class)
-
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.Config
-import hep.dataforge.vision.AbstractVision
-import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
 import kotlin.math.PI
 import kotlin.math.cos
 import kotlin.math.sin
@@ -21,23 +15,18 @@ public class Sphere(
     public var phiStart: Float = 0f,
     public var phi: Float = PI2,
     public var thetaStart: Float = 0f,
-    public var theta: Float = PI.toFloat()
-) : AbstractVision(), GeometrySolid {
-
-    override var properties: Config? = null
-
-    override var position: Point3D? = null
-    override var rotation: Point3D? = null
-    override var scale: Point3D? = null
+    public var theta: Float = PI.toFloat(),
+) : AbstractSolid(), GeometrySolid {
 
     override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>) {
         fun point3DfromSphCoord(r: Float, theta: Float, phi: Float): Point3D {
             // This transformation matches three.js sphere implementation
             val y = r * cos(theta)
             val z = r * sin(theta) * sin(phi)
-            val x = - r * sin(theta) * cos(phi)
+            val x = -r * sin(theta) * cos(phi)
             return Point3D(x, y, z)
         }
+
         val segments = this.detail ?: 8
         require(segments >= 4) { "The detail for sphere must be >= 4" }
         val phiStep = phi / segments
@@ -66,7 +55,7 @@ public inline fun VisionContainerBuilder<Solid>.sphere(
     phi: Number = 2 * PI,
     theta: Number = PI,
     name: String = "",
-    action: Sphere.() -> Unit = {}
+    action: Sphere.() -> Unit = {},
 ): Sphere = Sphere(
     radius.toFloat(),
     phi = phi.toFloat(),
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
index 9bc2add9..d03dfa98 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
@@ -1,15 +1,9 @@
-@file:UseSerializers(Point3DSerializer::class)
-
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.Config
-import hep.dataforge.vision.AbstractVision
-import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
 import kotlin.math.PI
 import kotlin.math.cos
 import kotlin.math.sin
@@ -24,14 +18,8 @@ public class Tube(
     public var height: Float,
     public var innerRadius: Float = 0f,
     public var startAngle: Float = 0f,
-    public var angle: Float = PI2
-) : AbstractVision(), GeometrySolid {
-
-    override var position: Point3D? = null
-    override var rotation: Point3D? = null
-    override var scale: Point3D? = null
-
-    override var properties: Config? = null
+    public var angle: Float = PI2,
+) : AbstractSolid(), GeometrySolid {
 
     init {
         require(radius > 0)
@@ -137,7 +125,7 @@ public inline fun VisionContainerBuilder<Solid>.tube(
     startAngle: Number = 0f,
     angle: Number = 2 * PI,
     name: String = "",
-    block: Tube.() -> Unit = {}
+    block: Tube.() -> Unit = {},
 ): Tube = Tube(
     r.toFloat(),
     height.toFloat(),
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
index f6c677c4..dad40782 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
@@ -1,11 +1,12 @@
 package hep.dataforge.vision.solid.three
 
-import hep.dataforge.js.jsObject
+
 import hep.dataforge.vision.solid.SolidLabel
 import hep.dataforge.vision.solid.three.ThreeMaterials.getMaterial
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.geometries.TextBufferGeometry
 import info.laht.threekt.objects.Mesh
+import kotlinext.js.jsObject
 import kotlin.reflect.KClass
 
 /**
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
index 9aeb96e0..fe3d1039 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
@@ -1,32 +1,18 @@
-@file:UseSerializers(Point3DSerializer::class)
-
 package hep.dataforge.vision.solid.three
 
-import hep.dataforge.meta.Config
-import hep.dataforge.vision.AbstractVision
-import hep.dataforge.vision.solid.Point3D
-import hep.dataforge.vision.solid.Point3DSerializer
+import hep.dataforge.vision.solid.AbstractSolid
 import hep.dataforge.vision.solid.Solid
 import info.laht.threekt.core.Object3D
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
 
 /**
  * A custom visual object that has its own Three.js renderer
  */
-interface ThreeVision : Solid {
-    fun toObject3D(): Object3D
+public interface ThreeVision : Solid {
+    public fun toObject3D(): Object3D
 }
 
 @Serializable
-class CustomThreeVision(val threeFactory: ThreeFactory<Solid>) : AbstractVision(),
-    ThreeVision {
-    override var position: Point3D? = null
-    override var rotation: Point3D? = null
-    override var scale: Point3D? = null
-
-    override var properties: Config? = null
-
+public class CustomThreeVision(public val threeFactory: ThreeFactory<Solid>) : AbstractSolid(), ThreeVision {
     override fun toObject3D(): Object3D = threeFactory(this)
-
 }
\ No newline at end of file

From 6b4bc6912f7fd799e79f9a157c3a0a970d31d58a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 31 Oct 2020 19:03:55 +0300
Subject: [PATCH 019/151] Refactor serialization

---
 .../vision/gdml/demo/GDMLAppComponent.kt      |   4 +-
 .../vision/gdml/demo/GdmlFxDemoApp.kt         |   5 +-
 .../dataforge/vision/gdml/demo/readFile.kt    |  12 +-
 .../dataforge/vision/gdml/demo/saveToJson.kt  |   6 +-
 .../vision/solid/FileSerializationTest.kt     |   2 +-
 .../ru/mipt/npm/muon/monitor/MMDemoApp.kt     |   2 +-
 .../mipt/npm/muon/monitor/server/MMServer.kt  |   8 +-
 .../hep/dataforge/vision/AbstractVision.kt    |   4 +
 .../kotlin/hep/dataforge/vision/Vision.kt     |   9 +-
 .../hep/dataforge/vision/VisionManager.kt     | 149 +++++++----------
 .../kotlin/hep/dataforge/vision/misc.kt       |   4 +-
 .../dataforge/vision/gdml/TestConvertor.kt    |   8 +-
 .../dataforge/vision/solid/AbstractSolid.kt   |  17 --
 .../hep/dataforge/vision/solid/BasicSolid.kt  |  34 ++++
 .../kotlin/hep/dataforge/vision/solid/Box.kt  |   5 +-
 .../hep/dataforge/vision/solid/Composite.kt   |   3 +-
 .../hep/dataforge/vision/solid/ConeSegment.kt |   5 +-
 .../hep/dataforge/vision/solid/Convex.kt      |   5 +-
 .../hep/dataforge/vision/solid/Extruded.kt    |   5 +-
 .../hep/dataforge/vision/solid/PolyLine.kt    |   2 +-
 .../hep/dataforge/vision/solid/Proxy.kt       |   2 +-
 .../hep/dataforge/vision/solid/SolidGroup.kt  |  11 +-
 .../hep/dataforge/vision/solid/SolidLabel.kt  |   2 +-
 .../dataforge/vision/solid/SolidManager.kt    | 151 ++++++++----------
 .../hep/dataforge/vision/solid/Sphere.kt      |   2 +-
 .../kotlin/hep/dataforge/vision/solid/Tube.kt |   2 +-
 .../dataforge/vision/solid/serialization.kt   |  10 --
 .../vision/solid/SerializationTest.kt         |   9 +-
 .../dataforge/vision/solid/SolidPluginTest.kt |   6 +-
 .../vision/solid/three/ThreeVision.kt         |   4 +-
 30 files changed, 221 insertions(+), 267 deletions(-)
 delete mode 100644 visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/AbstractSolid.kt
 create mode 100644 visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/BasicSolid.kt

diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index f5704cb7..828641d9 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -10,6 +10,7 @@ import hep.dataforge.vision.gdml.toVision
 import hep.dataforge.vision.react.objectTree
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.SolidGroup
+import hep.dataforge.vision.solid.SolidManager
 import hep.dataforge.vision.solid.three.ThreeCanvas
 import hep.dataforge.vision.solid.three.ThreeCanvasComponent
 import kotlinx.browser.window
@@ -50,12 +51,13 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
     }
 
     fun loadData(name: String, data: String) {
+        val visionManager = props.context.plugins.fetch(SolidManager).visionManager
         val parsedVision = when {
             name.endsWith(".gdml") || name.endsWith(".xml") -> {
                 val gdml = GDML.decodeFromString(data)
                 gdml.toVision()
             }
-            name.endsWith(".json") -> SolidGroup.decodeFromString(data)
+            name.endsWith(".json") -> visionManager.decodeFromString(data)
             else -> {
                 window.alert("File extension is not recognized: $name")
                 error("File extension is not recognized: $name")
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
index c69682b8..0ccf3c70 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
@@ -4,6 +4,8 @@ import hep.dataforge.context.Global
 import hep.dataforge.vision.editor.VisualObjectEditorFragment
 import hep.dataforge.vision.editor.VisualObjectTreeFragment
 import hep.dataforge.vision.gdml.toVision
+import hep.dataforge.vision.VisionManager
+import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.SolidManager
 import hep.dataforge.vision.solid.SolidMaterial
 import hep.dataforge.vision.solid.fx.FX3DPlugin
@@ -17,6 +19,7 @@ class GDMLDemoApp : App(GDMLView::class)
 
 class GDMLView : View() {
     private val fx3d = Global.plugins.fetch(FX3DPlugin)
+    private val visionManager = Global.plugins.fetch(VisionManager)
     private val canvas = FXCanvas3D(fx3d)
 
     private val treeFragment = VisualObjectTreeFragment().apply {
@@ -39,7 +42,7 @@ class GDMLView : View() {
                         val file = chooseFile("Select a GDML/json file", filters = fileNameFilter).firstOrNull()
                         if(file!= null) {
                             runAsync {
-                                SolidManager.readFile(file)
+                                visionManager.readFile(file) as Solid
                             } ui {
                                 canvas.render(it)
                             }
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
index e4344795..da958c46 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
@@ -8,13 +8,15 @@ import hep.dataforge.vision.gdml.toVision
 import hep.dataforge.vision.solid.SolidGroup
 import hep.dataforge.vision.solid.SolidManager
 import hep.dataforge.vision.solid.SolidMaterial
+import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionManager
 import kscience.gdml.GDML
 import java.io.File
 import java.util.zip.GZIPInputStream
 import java.util.zip.ZipInputStream
 
 @OptIn(DFExperimental::class)
-fun SolidManager.Companion.readFile(file: File): SolidGroup = when {
+fun VisionManager.readFile(file: File): Vision = when {
     file.extension == "gdml" || file.extension == "xml" -> {
         GDML.readFile(file.toPath()).toVision {
 //            lUnit = LUnit.CM
@@ -31,23 +33,23 @@ fun SolidManager.Companion.readFile(file: File): SolidGroup = when {
 //            }
         }
     }
-    file.extension == "json" -> SolidGroup.decodeFromString(file.readText())
+    file.extension == "json" -> decodeFromString(file.readText())
     file.name.endsWith("json.zip") -> {
         file.inputStream().use {
             val unzip = ZipInputStream(it, Charsets.UTF_8)
             val text = unzip.readBytes().decodeToString()
-            SolidGroup.decodeFromString(text)
+            decodeFromString(text)
         }
     }
     file.name.endsWith("json.gz") -> {
         file.inputStream().use {
             val unzip = GZIPInputStream(it)
             val text = unzip.readBytes().decodeToString()
-            SolidGroup.decodeFromString(text)
+            decodeFromString(text)
         }
     }
     else -> error("Unknown extension ${file.extension}")
 }
 
 @OptIn(DFExperimental::class)
-fun SolidManager.Companion.readFile(fileName: String): SolidGroup = readFile(File(fileName))
\ No newline at end of file
+fun VisionManager.readFile(fileName: String): Vision = readFile(File(fileName))
\ No newline at end of file
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt
index 798fd8b7..ccc7da85 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt
@@ -2,7 +2,7 @@ package hep.dataforge.vision.gdml.demo
 
 import hep.dataforge.vision.gdml.readFile
 import hep.dataforge.vision.gdml.toVision
-import hep.dataforge.vision.solid.encodeToString
+import hep.dataforge.vision.solid.SolidManager
 import kscience.gdml.GDML
 import kscience.gdml.LUnit
 import java.io.File
@@ -17,11 +17,11 @@ fun main(args: Array<String>) {
     val gdml = GDML.readFile(Paths.get(inputFileName))
         //GDML.readFile(Paths.get("D:\\Work\\Projects\\visionforge\\visionforge-spatial-gdml\\src\\jvmTest\\resources\\gdml\\simple1.gdml"))
 
-    val visual = gdml.toVision {
+    val vision = gdml.toVision {
         lUnit = LUnit.CM
     }
 
-    val json = visual.encodeToString()
+    val json = SolidManager.encodeToString(vision)
     println(json)
     File(outputFileName).writeText(json)
     //File("D:\\Work\\Projects\\gdml.kt\\gdml-source\\cubes.json").writeText(json)
diff --git a/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt b/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt
index a1f9bab9..4fe68578 100644
--- a/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt
+++ b/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt
@@ -9,7 +9,7 @@ class FileSerializationTest {
     @Ignore
     fun testFileRead(){
         val text = this::class.java.getResourceAsStream("/cubes.json").readBytes().decodeToString()
-        val visual = SolidGroup.decodeFromString(text)
+        val visual = SolidManager.decodeFromString(text) as SolidGroup
         visual["composite_001".asName()]
     }
 }
\ No newline at end of file
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
index 62b538ab..282050d2 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
@@ -19,7 +19,7 @@ private class MMDemoApp : Application {
 
     private val connection = HttpClient {
         install(JsonFeature) {
-            serializer = KotlinxSerializer(Json { serializersModule = SolidManager.serializersModule })
+            serializer = KotlinxSerializer(Json { serializersModule = SolidManager.serializersModuleForSolids })
         }
     }
 
diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
index 71d6b53a..b4a55ad5 100644
--- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
+++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
@@ -1,6 +1,8 @@
 package ru.mipt.npm.muon.monitor.server
 
 
+import hep.dataforge.context.Context
+import hep.dataforge.context.Global
 import hep.dataforge.meta.DFExperimental
 import hep.dataforge.vision.solid.SolidManager
 import io.ktor.application.Application
@@ -32,15 +34,15 @@ import java.net.URI
 private val generator = Cos2TrackGenerator(JDKRandomGenerator(223))
 
 @OptIn(DFExperimental::class)
-fun Application.module() {
+fun Application.module(context: Context = Global) {
     val currentDir = File(".").absoluteFile
     environment.log.info("Current directory: $currentDir")
-
+    val solidManager = context.plugins.load(SolidManager)
 
     install(DefaultHeaders)
     install(CallLogging)
     install(ContentNegotiation) {
-        json(Json { serializersModule = SolidManager.serialModule }, ContentType.Application.Json)
+        json(solidManager.visionManager.jsonFormat, ContentType.Application.Json)
     }
     install(Routing) {
         get("/event") {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt
index 909d021d..50bcc9b7 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt
@@ -94,6 +94,10 @@ public open class AbstractVision : Vision {
         properties = null
     }
 
+    override fun update(meta: Meta) {
+        meta[Vision::properties.name].node?.let { configure(it) }
+    }
+
     public companion object {
         public val descriptor: NodeDescriptor = NodeDescriptor {
             value(STYLE_KEY) {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 01f33d9b..2301ce54 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -68,13 +68,16 @@ public interface Vision : Configurable {
             config[STYLE_KEY] = value
         }
 
+    /**
+     * Update this vision using external meta.
+     */
+    public fun update(meta: Meta)
+
     public companion object {
         public const val TYPE: String = "vision"
         public val STYLE_KEY: Name = "@style".asName()
 
-        private val VISION_SERIALIZER = PolymorphicSerializer(Vision::class)
-
-        public fun serializer(): PolymorphicSerializer<Vision> = VISION_SERIALIZER
+        public fun serializer(): PolymorphicSerializer<Vision> = PolymorphicSerializer(Vision::class)
 
         public val VISIBLE_KEY: Name = "visible".asName()
     }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
index 39f7096f..a1e5170c 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
@@ -3,80 +3,21 @@ package hep.dataforge.vision
 import hep.dataforge.context.*
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.names.Name
-import hep.dataforge.names.toName
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KSerializer
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.modules.SerializersModule
 import kotlinx.serialization.modules.polymorphic
 import kotlinx.serialization.modules.subclass
 import kotlin.reflect.KClass
 
-
-@DFExperimental
-public interface VisionForm<T : Vision> {
-    public val type: KClass<out T>
-    public val serializer: KSerializer<T>
-
-    public val name: Name
-        get() = serializer.descriptor.serialName.toName()
-
-    /**
-     * Apply a patch to given [Vision]
-     */
-    public fun patch(obj: T, meta: Meta)
-
-    public companion object {
-        public const val TYPE: String = "visionForm"
-    }
-}
-
-@DFExperimental
-public object SimpleGroupForm : VisionForm<SimpleVisionGroup> {
-    override val type: KClass<out SimpleVisionGroup> = SimpleVisionGroup::class
-    override val serializer: KSerializer<SimpleVisionGroup> = SimpleVisionGroup.serializer()
-
-    override fun patch(obj: SimpleVisionGroup, meta: Meta) {
-        TODO("Not yet implemented")
-    }
-
-}
-
-@DFExperimental
-public fun <T : Vision> VisionForm<T>.visionToMeta(
-    vision: T,
-    module: SerializersModule,
-    descriptor: NodeDescriptor? = null,
-): Meta {
-    val engine = Json(VisionManager.jsonConfiguration) { serializersModule = module }
-    val json = engine.encodeToJsonElement(serializer, vision)
-    return json.toMetaItem(descriptor).node!!
-}
-
-@DFExperimental
-public fun <T : Vision> VisionForm<T>.buildVision(
-    meta: Meta,
-    module: SerializersModule,
-    descriptor: NodeDescriptor? = null,
-): T {
-    val engine = Json(VisionManager.jsonConfiguration) { serializersModule = module }
-    val json = meta.toJson(descriptor)
-    return engine.decodeFromJsonElement(serializer, json)
-}
-
 @DFExperimental
 public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
     override val tag: PluginTag get() = Companion.tag
 
     /**
-     * Create a list of factories on first call and cache it
+     * Combined [SerializersModule] for all registered visions
      */
-    private val forms by lazy {
-        context.gather<VisionForm<*>>(VisionForm.TYPE).mapKeys { it.value.type }
-    }
-
-    public val visionSerialModule: SerializersModule
+    public val serializersModule: SerializersModule
         get() = SerializersModule {
             include(defaultSerialModule)
             context.gather<SerializersModule>(VISION_SERIAL_MODULE_TARGET).values.forEach {
@@ -84,33 +25,60 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
             }
         }
 
-    @Suppress("UNCHECKED_CAST")
-    public fun <T : Vision> resolveVisionForm(type: KClass<out T>): VisionForm<T> =
-        forms[type] as VisionForm<T>
+    public val jsonFormat: Json
+        get() = Json {
+            prettyPrint = true
+            useArrayPolymorphism = false
+            encodeDefaults = false
+            ignoreUnknownKeys = true
+            serializersModule = this@VisionManager.serializersModule
+        }
+
+    public fun decodeFromString(string: String): Vision = jsonFormat.decodeFromString(Vision.serializer(), string)
+    public fun encodeToString(vision: Vision): String = jsonFormat.encodeToString(Vision.serializer(), vision)
+
+    public fun decodeFromJson(json: JsonElement): Vision = jsonFormat.decodeFromJsonElement(Vision.serializer(), json)
+    public fun encodeToJsonElement(vision: Vision): JsonElement =
+        jsonFormat.encodeToJsonElement(Vision.serializer(), vision)
+
+    //TODO remove double transformation with dedicated Meta serial format
+    public fun decodeFromMeta(meta: Meta, descriptor: NodeDescriptor? = null): Vision =
+        decodeFromJson(meta.toJson(descriptor))
+
+    public fun encodeToMeta(vision: Vision, descriptor: NodeDescriptor? = null): Meta =
+        encodeToJsonElement(vision).toMetaItem(descriptor).node
+            ?: error("Expected node, but value found. Check your serializer!")
+
+    public fun updateVision(vision: Vision, meta: Meta) {
 
-    public inline fun <reified T : Vision> buildSpecificVision(meta: Meta): T {
-        val factory = resolveVisionForm(T::class) ?: error("Could not resolve a form for ${meta["type"].string}")
-        return factory.buildVision(meta, visionSerialModule)
     }
 
-    @OptIn(ExperimentalSerializationApi::class)
-    public fun buildVision(meta: Meta): Vision {
-        val type = meta["type"].string ?: Vision.serializer().descriptor.serialName
-        val form = forms.values.find { it.name.toString() == type } ?: error("Could not resolve a form for type $type")
-        return form.buildVision(meta, visionSerialModule)
-    }
-
-    public fun <T : Vision> writeVisionToMeta(vision: T): Meta {
-        val form = resolveVisionForm(vision::class) ?: error("Could not resolve a form for $vision")
-        val engine = Json(jsonConfiguration) { serializersModule = visionSerialModule }
-        val json = engine.encodeToJsonElement(form.serializer, vision)
-        return json.toMetaItem().node!!
-    }
-
-    public fun patchVision(vision: Vision, meta: Meta) {
-        val form = resolveVisionForm(vision::class) ?: error("Could not resolve a form for $vision")
-        form.patch(vision, meta)
-    }
+//    public fun <T : Vision> VisionForm<T>.buildVision(meta: Meta, descriptor: NodeDescriptor? = null): T {
+//        val json = meta.toJson(descriptor)
+//        return jsonFormat.decodeFromJsonElement(serializer, json)
+//    }
+//
+//    @OptIn(ExperimentalSerializationApi::class)
+//    public fun buildVision(meta: Meta): Vision {
+//        val type = meta["type"].string ?: Vision.serializer().descriptor.serialName
+//        val form = forms.values.find { it.name.toString() == type } ?: error("Could not resolve a form for type $type")
+//        return form.buildVision(meta)
+//    }
+//
+//    public inline fun <reified T : Vision> buildSpecificVision(meta: Meta): T {
+//        val factory = resolveVisionForm(T::class)
+//        return factory.buildVision(meta)
+//    }
+//
+//    public fun <T : Vision> writeVisionToMeta(vision: T): Meta {
+//        val form = resolveVisionForm(vision::class) ?: error("Could not resolve a form for $vision")
+//        val json = jsonFormat.encodeToJsonElement(form.serializer, vision)
+//        return json.toMetaItem().node!!
+//    }
+//
+//    public fun updateVision(vision: Vision, meta: Meta) {
+//        resolveVisionForm(vision::class).patch(vision, meta)
+//    }
 
     public companion object : PluginFactory<VisionManager> {
         override val tag: PluginTag = PluginTag(name = "vision", group = PluginTag.DATAFORGE_GROUP)
@@ -120,14 +88,7 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
 
         override fun invoke(meta: Meta, context: Context): VisionManager = VisionManager(meta)
 
-        public val jsonConfiguration: Json = Json {
-            prettyPrint = true
-            useArrayPolymorphism = false
-            encodeDefaults = false
-            ignoreUnknownKeys = true
-        }
-
-        public val defaultSerialModule: SerializersModule = SerializersModule {
+        private val defaultSerialModule: SerializersModule = SerializersModule {
             polymorphic(Vision::class) {
                 subclass(SimpleVisionGroup.serializer())
             }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
index 6b2d5fc7..54e939a2 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
@@ -8,7 +8,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.asValue
 
-fun Sequence<MetaItem<*>?>.merge(): MetaItem<*>? {
+public fun Sequence<MetaItem<*>?>.merge(): MetaItem<*>? {
     return when (val first = firstOrNull { it != null }) {
         null -> null
         is MetaItem.ValueItem -> first //fast search for first entry if it is value
@@ -20,7 +20,7 @@ fun Sequence<MetaItem<*>?>.merge(): MetaItem<*>? {
     }
 }
 
-inline fun <reified E : Enum<E>> NodeDescriptor.enum(key: Name, default: E?) = value(key) {
+public inline fun <reified E : Enum<E>> NodeDescriptor.enum(key: Name, default: E?): Unit = value(key) {
     type(ValueType.STRING)
     default?.let {
         default(default)
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
index 2dac5a76..3f4df637 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
@@ -1,6 +1,6 @@
 package hep.dataforge.vision.gdml
 
-import hep.dataforge.vision.solid.encodeToString
+import hep.dataforge.vision.solid.SolidManager
 import kscience.gdml.GDML
 import nl.adaptivity.xmlutil.StAXReader
 import org.junit.jupiter.api.Test
@@ -13,7 +13,7 @@ class TestConvertor {
         val xmlReader = StAXReader(stream, "UTF-8")
         val xml = GDML.format.parse(GDML.serializer(), xmlReader)
         val vision = xml.toVision()
-        println(vision.encodeToString())
+        println(SolidManager.encodeToString(vision))
     }
 
     @Test
@@ -32,7 +32,7 @@ class TestConvertor {
 
         val xmlReader = StAXReader(stream, "UTF-8")
         val xml = GDML.format.parse(GDML.serializer(), xmlReader)
-        val visual = xml.toVision()
-        println(visual.encodeToString())
+        val vision = xml.toVision()
+        println(SolidManager.encodeToString(vision))
     }
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/AbstractSolid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/AbstractSolid.kt
deleted file mode 100644
index 109ec39e..00000000
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/AbstractSolid.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package hep.dataforge.vision.solid
-
-import hep.dataforge.vision.AbstractVision
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
-
-@Serializable
-public open class AbstractSolid: AbstractVision(), Solid {
-    @Serializable(Point3DSerializer::class)
-    override var position: Point3D? = null
-
-    @Serializable(Point3DSerializer::class)
-    override var rotation: Point3D? = null
-
-    @Serializable(Point3DSerializer::class)
-    override var scale: Point3D? = null
-}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/BasicSolid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/BasicSolid.kt
new file mode 100644
index 00000000..7cd198bb
--- /dev/null
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/BasicSolid.kt
@@ -0,0 +1,34 @@
+package hep.dataforge.vision.solid
+
+import hep.dataforge.meta.*
+import hep.dataforge.vision.AbstractVision
+import hep.dataforge.vision.Vision
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.UseSerializers
+
+@Serializable
+@SerialName("solid")
+public open class BasicSolid: AbstractVision(), Solid {
+    @Serializable(Point3DSerializer::class)
+    override var position: Point3D? = null
+
+    @Serializable(Point3DSerializer::class)
+    override var rotation: Point3D? = null
+
+    @Serializable(Point3DSerializer::class)
+    override var scale: Point3D? = null
+
+    override fun update(meta: Meta) {
+        fun Meta.toVector(default: Float = 0f) = Point3D(
+            this[Solid.X_KEY].float ?: default,
+            this[Solid.Y_KEY].float ?: default,
+            this[Solid.Z_KEY].float ?: default
+        )
+
+        meta[Solid.POSITION_KEY].node?.toVector()?.let { position = it }
+        meta[Solid.ROTATION].node?.toVector()?.let { rotation = it }
+        meta[Solid.SCALE_KEY].node?.toVector(1f)?.let { scale = it }
+        super.update(meta)
+    }
+}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
index aa2e42f0..31eca267 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
@@ -2,9 +2,6 @@
 
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.Config
-import hep.dataforge.vision.AbstractVision
-import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import hep.dataforge.vision.solid.Solid.Companion.solidEquals
@@ -18,7 +15,7 @@ public class Box(
     public val xSize: Float,
     public val ySize: Float,
     public val zSize: Float
-) : AbstractSolid(), GeometrySolid {
+) : BasicSolid(), GeometrySolid {
 
     //TODO add helper for color configuration
     override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>) {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
index a019e368..a293dc09 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
@@ -2,7 +2,6 @@
 
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.Config
 import hep.dataforge.meta.update
 import hep.dataforge.names.NameToken
 import hep.dataforge.vision.*
@@ -22,7 +21,7 @@ public class Composite(
     public val compositeType: CompositeType,
     public val first: Solid,
     public val second: Solid
-) : AbstractSolid(), Solid, VisionGroup {
+) : BasicSolid(), Solid, VisionGroup {
 
     init {
         first.parent = this
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
index 084f2f8e..31ca2786 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
@@ -2,9 +2,6 @@
 
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.Config
-import hep.dataforge.vision.AbstractVision
-import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
@@ -24,7 +21,7 @@ public class ConeSegment(
     public var upperRadius: Float,
     public var startAngle: Float = 0f,
     public var angle: Float = PI2
-) : AbstractSolid(), GeometrySolid {
+) : BasicSolid(), GeometrySolid {
 
     override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>) {
         val segments = detail ?: 8
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
index a96cc8bb..6a0b9de9 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
@@ -2,9 +2,6 @@
 
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.Config
-import hep.dataforge.vision.AbstractVision
-import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
@@ -13,7 +10,7 @@ import kotlinx.serialization.UseSerializers
 
 @Serializable
 @SerialName("solid.convex")
-public class Convex(public val points: List<Point3D>) : AbstractSolid(), Solid
+public class Convex(public val points: List<Point3D>) : BasicSolid(), Solid
 
 public inline fun VisionContainerBuilder<Solid>.convex(name: String = "", action: ConvexBuilder.() -> Unit = {}): Convex =
     ConvexBuilder().apply(action).build().also { set(name, it) }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
index afab61f9..f0f22814 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
@@ -1,9 +1,6 @@
 @file:UseSerializers(Point2DSerializer::class, Point3DSerializer::class)
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.Config
-import hep.dataforge.vision.AbstractVision
-import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
@@ -44,7 +41,7 @@ public data class Layer(var x: Float, var y: Float, var z: Float, var scale: Flo
 public class Extruded(
     public var shape: List<Point2D> = ArrayList(),
     public var layers: MutableList<Layer> = ArrayList()
-) : AbstractSolid(), GeometrySolid {
+) : BasicSolid(), GeometrySolid {
 
     public fun shape(block: Shape2DBuilder.() -> Unit) {
         this.shape = Shape2DBuilder().apply(block).build()
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
index aac82df5..1a6769b8 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
@@ -14,7 +14,7 @@ import kotlinx.serialization.UseSerializers
 
 @Serializable
 @SerialName("solid.line")
-public class PolyLine(public var points: List<Point3D>) : AbstractSolid(), Solid {
+public class PolyLine(public var points: List<Point3D>) : BasicSolid(), Solid {
 
     //var lineType by string()
     public var thickness: Number by number(1.0, key = SolidMaterial.MATERIAL_KEY + THICKNESS_KEY)
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
index 2c75b669..9f58912b 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
@@ -9,7 +9,7 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import kotlin.collections.set
 
-public abstract class AbstractProxy : AbstractSolid(), VisionGroup {
+public abstract class AbstractProxy : BasicSolid(), VisionGroup {
     public abstract val prototype: Vision
 
     override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index 7c9f16fc..6d787bb5 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -8,7 +8,9 @@ import hep.dataforge.names.asName
 import hep.dataforge.vision.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.Serializer
 import kotlinx.serialization.UseSerializers
+import kotlinx.serialization.json.Json
 import kotlin.collections.set
 
 public interface PrototypeHolder {
@@ -45,8 +47,13 @@ public class SolidGroup : AbstractVisionGroup(), Solid, PrototypeHolder {
     //FIXME to be lifted to AbstractVisualGroup after https://github.com/Kotlin/kotlinx.serialization/issues/378 is fixed
     override var properties: Config? = null
 
+    @Serializable(Point3DSerializer::class)
     override var position: Point3D? = null
+
+    @Serializable(Point3DSerializer::class)
     override var rotation: Point3D? = null
+
+    @Serializable(Point3DSerializer::class)
     override var scale: Point3D? = null
 
     @SerialName("children")
@@ -77,10 +84,6 @@ public class SolidGroup : AbstractVisionGroup(), Solid, PrototypeHolder {
 
     public companion object {
 //        val PROTOTYPES_KEY = NameToken("@prototypes")
-
-        @OptIn(DFExperimental::class)
-        public fun decodeFromString(json: String): SolidGroup =
-            SolidManager.jsonForSolids.decodeFromString(serializer(), json).also { it.attachChildren() }
     }
 }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
index a9740cb0..bb033215 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
@@ -11,7 +11,7 @@ public class SolidLabel(
     public var text: String,
     public var fontSize: Double,
     public var fontFamily: String,
-) : AbstractSolid(), Solid
+) : BasicSolid(), Solid
 
 public fun VisionContainerBuilder<Solid>.label(
     text: String,
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index bdd83669..dd070481 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -9,73 +9,48 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.toName
 import hep.dataforge.vision.SimpleVisionGroup
 import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionForm
+import hep.dataforge.vision.VisionGroup
 import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.VisionManager.Companion.VISION_SERIAL_MODULE_TARGET
-import kotlinx.serialization.*
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.modules.*
 import kotlin.reflect.KClass
 
-@DFExperimental
-private class SolidForm<T : Solid>(
-    override val type: KClass<T>,
-    override val serializer: KSerializer<T>,
-) : VisionForm<T> {
-
-    private fun Solid.update(meta: Meta) {
-        fun Meta.toVector(default: Float = 0f) = Point3D(
-            this[Solid.X_KEY].float ?: default,
-            this[Solid.Y_KEY].float ?: default,
-            this[Solid.Z_KEY].float ?: default
-        )
-
-        meta[Solid.POSITION_KEY].node?.toVector()?.let { position = it }
-        meta[Solid.ROTATION].node?.toVector()?.let { rotation = it }
-        meta[Solid.SCALE_KEY].node?.toVector(1f)?.let { scale = it }
-        meta["properties"].node?.let { configure(it) }
-    }
-
-    override fun patch(obj: T, meta: Meta) {
-        TODO("Not yet implemented")
-    }
-}
-
-@OptIn(ExperimentalSerializationApi::class)
-@DFExperimental
-private fun SerializersModule.extractFactories(): List<SolidForm<*>> {
-    val list = ArrayList<SolidForm<*>>()
-
-    val collector = object : SerializersModuleCollector {
-        override fun <T : Any> contextual(kClass: KClass<T>, serializer: KSerializer<T>) {
-            //Do nothing
-        }
-
-        override fun <Base : Any, Sub : Base> polymorphic(
-            baseClass: KClass<Base>,
-            actualClass: KClass<Sub>,
-            actualSerializer: KSerializer<Sub>,
-        ) {
-            if (baseClass == Vision::class) {
-                @Suppress("UNCHECKED_CAST") val factory = SolidForm<Solid>(
-                    actualClass as KClass<Solid>,
-                    actualSerializer as KSerializer<Solid>
-                )
-                list.add(factory)
-            }
-        }
-
-        override fun <Base : Any> polymorphicDefault(
-            baseClass: KClass<Base>,
-            defaultSerializerProvider: (className: String?) -> DeserializationStrategy<out Base>?,
-        ) {
-            TODO("Not yet implemented")
-        }
-
-    }
-    dumpTo(collector)
-    return list
-}
+//@OptIn(ExperimentalSerializationApi::class)
+//@DFExperimental
+//private fun SerializersModule.extractFactories(): List<SolidForm<*>> {
+//    val list = ArrayList<SolidForm<*>>()
+//
+//    val collector = object : SerializersModuleCollector {
+//        override fun <T : Any> contextual(kClass: KClass<T>, serializer: KSerializer<T>) {
+//            //Do nothing
+//        }
+//
+//        override fun <Base : Any, Sub : Base> polymorphic(
+//            baseClass: KClass<Base>,
+//            actualClass: KClass<Sub>,
+//            actualSerializer: KSerializer<Sub>,
+//        ) {
+//            if (baseClass == Vision::class) {
+//                @Suppress("UNCHECKED_CAST") val factory: SolidForm<Solid> = SolidForm(
+//                    actualClass as KClass<Solid>,
+//                    actualSerializer as KSerializer<Solid>
+//                )
+//                list.add(factory)
+//            }
+//        }
+//
+//        override fun <Base : Any> polymorphicDefault(
+//            baseClass: KClass<Base>,
+//            defaultSerializerProvider: (className: String?) -> DeserializationStrategy<out Base>?,
+//        ) {
+//            TODO("Not yet implemented")
+//        }
+//
+//    }
+//    dumpTo(collector)
+//    return list
+//}
 
 @DFExperimental
 public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
@@ -85,8 +60,7 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
     override val tag: PluginTag get() = Companion.tag
 
     override fun content(target: String): Map<Name, Any> = when (target) {
-        VisionForm.TYPE -> serializersModule.extractFactories().associateBy { it.name }
-        VISION_SERIAL_MODULE_TARGET -> mapOf(tag.name.toName() to serializersModule)
+        VISION_SERIAL_MODULE_TARGET -> mapOf(tag.name.toName() to serializersModuleForSolids)
         else -> super.content(target)
     }
 
@@ -95,44 +69,49 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
         override val type: KClass<out SolidManager> = SolidManager::class
         override fun invoke(meta: Meta, context: Context): SolidManager = SolidManager(meta)
 
-        public val serializersModule: SerializersModule = SerializersModule {
+        private fun PolymorphicModuleBuilder<Solid>.solids() {
+            subclass(SolidGroup.serializer())
+            subclass(Proxy.serializer())
+            subclass(Composite.serializer())
+            subclass(Tube.serializer())
+            subclass(Box.serializer())
+            subclass(Convex.serializer())
+            subclass(Extruded.serializer())
+            subclass(PolyLine.serializer())
+            subclass(SolidLabel.serializer())
+            subclass(Sphere.serializer())
+        }
+
+        public val serializersModuleForSolids: SerializersModule = SerializersModule {
             contextual(Point3DSerializer)
             contextual(Point2DSerializer)
 
             polymorphic(Vision::class) {
                 subclass(SimpleVisionGroup.serializer())
-                subclass(SolidGroup.serializer())
-                subclass(Proxy.serializer())
-                subclass(Composite.serializer())
-                subclass(Tube.serializer())
-                subclass(Box.serializer())
-                subclass(Convex.serializer())
-                subclass(Extruded.serializer())
-                subclass(PolyLine.serializer())
-                subclass(SolidLabel.serializer())
-                subclass(Sphere.serializer())
+                solids()
             }
 
             polymorphic(Solid::class) {
-                subclass(SolidGroup.serializer())
-                subclass(Proxy.serializer())
-                subclass(Composite.serializer())
-                subclass(Tube.serializer())
-                subclass(Box.serializer())
-                subclass(Convex.serializer())
-                subclass(Extruded.serializer())
-                subclass(PolyLine.serializer())
-                subclass(SolidLabel.serializer())
-                subclass(Sphere.serializer())
+                solids()
             }
         }
 
-        val jsonForSolids = Json {
+        public val jsonForSolids = Json{
             prettyPrint = true
             useArrayPolymorphism = false
             encodeDefaults = false
             ignoreUnknownKeys = true
-            serializersModule = this@Companion.serializersModule
+            serializersModule = SolidManager.serializersModuleForSolids
+        }
+
+        @OptIn(DFExperimental::class)
+        public fun encodeToString(solid: Solid): String = jsonForSolids.encodeToString(Vision.serializer(), solid)
+
+        @OptIn(DFExperimental::class)
+        public fun decodeFromString(str: String): Vision = jsonForSolids.decodeFromString(Vision.serializer(), str).also {
+            if(it is VisionGroup){
+                it.attachChildren()
+            }
         }
     }
 }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
index 9a647155..7a122c44 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
@@ -16,7 +16,7 @@ public class Sphere(
     public var phi: Float = PI2,
     public var thetaStart: Float = 0f,
     public var theta: Float = PI.toFloat(),
-) : AbstractSolid(), GeometrySolid {
+) : BasicSolid(), GeometrySolid {
 
     override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>) {
         fun point3DfromSphCoord(r: Float, theta: Float, phi: Float): Point3D {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
index d03dfa98..6d486da4 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
@@ -19,7 +19,7 @@ public class Tube(
     public var innerRadius: Float = 0f,
     public var startAngle: Float = 0f,
     public var angle: Float = PI2,
-) : AbstractSolid(), GeometrySolid {
+) : BasicSolid(), GeometrySolid {
 
     init {
         require(radius > 0)
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt
index 25724fab..e24ccc30 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt
@@ -105,14 +105,4 @@ internal object PrototypesSerializer : KSerializer<MutableVisionGroup> {
     override fun serialize(encoder: Encoder, value: MutableVisionGroup) {
         mapSerializer.serialize(encoder, value.children)
     }
-}
-
-@OptIn(DFExperimental::class)
-public fun Vision.encodeToString(): String = SolidManager.jsonForSolids.encodeToString(Vision.serializer(), this)
-
-@OptIn(DFExperimental::class)
-public fun Vision.Companion.decodeFromString(str: String): Vision = SolidManager.jsonForSolids.decodeFromString(serializer(), str).also {
-    if(it is VisionGroup){
-        it.attachChildren()
-    }
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
index 57b94441..c9abfce1 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
@@ -8,6 +8,7 @@ import hep.dataforge.vision.get
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
+
 /**
  * Create and attach new proxied group
  */
@@ -29,9 +30,9 @@ class SerializationTest {
             x = 100
             z = -100
         }
-        val string =  cube.encodeToString()
+        val string =  SolidManager.encodeToString(cube)
         println(string)
-        val newCube = Vision.decodeFromString(string)
+        val newCube = SolidManager.decodeFromString(string)
         assertEquals(cube.config, newCube.config)
     }
 
@@ -50,9 +51,9 @@ class SerializationTest {
                 }
             }
         }
-        val string = group.encodeToString()
+        val string = SolidManager.encodeToString(group)
         println(string)
-        val reconstructed = SolidGroup.decodeFromString(string)
+        val reconstructed = SolidManager.decodeFromString(string) as SolidGroup
         assertEquals(group["cube"]?.config, reconstructed["cube"]?.config)
     }
 
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt
index 7bbb5f4e..1361a2c7 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt
@@ -18,10 +18,10 @@ class SolidPluginTest {
     @DFExperimental
     @Test
     fun testPluginConverter(){
-        val plugin = Global.plugins.fetch(SolidManager).visionManager
-        val meta = plugin.writeVisionToMeta(vision)
+        val visionManager = Global.plugins.fetch(SolidManager).visionManager
+        val meta = visionManager.encodeToMeta(vision)
 
-        val reconstructed = plugin.buildSpecificVision<SolidGroup>(meta)
+        val reconstructed = visionManager.decodeFromMeta(meta) as SolidGroup
 
         assertEquals(vision["aBox"],reconstructed["aBox"])
     }
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
index fe3d1039..a96e39e4 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
@@ -1,6 +1,6 @@
 package hep.dataforge.vision.solid.three
 
-import hep.dataforge.vision.solid.AbstractSolid
+import hep.dataforge.vision.solid.BasicSolid
 import hep.dataforge.vision.solid.Solid
 import info.laht.threekt.core.Object3D
 import kotlinx.serialization.Serializable
@@ -13,6 +13,6 @@ public interface ThreeVision : Solid {
 }
 
 @Serializable
-public class CustomThreeVision(public val threeFactory: ThreeFactory<Solid>) : AbstractSolid(), ThreeVision {
+public class CustomThreeVision(public val threeFactory: ThreeFactory<Solid>) : BasicSolid(), ThreeVision {
     override fun toObject3D(): Object3D = threeFactory(this)
 }
\ No newline at end of file

From 5b8d298ac67aae91420f8a526b794c910c2f73c4 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 7 Nov 2020 17:32:18 +0300
Subject: [PATCH 020/151] Added satelite detector demo

---
 demo/sat-demo/build.gradle.kts                |  24 ++++
 .../kotlin/ru/mipt/npm/sat/geometry.kt        |  55 +++++++++
 .../kotlin/ru/mipt/npm/sat/SatDemoApp.kt      |  34 ++++++
 demo/sat-demo/src/jsMain/resources/index.html |  12 ++
 demo/spatial-showcase/build.gradle.kts        |   1 +
 .../vision/solid/demo/ThreeDemoApp.kt         |  49 ++++----
 .../vision/solid/demo/ThreeDemoGrid.kt        |   4 +-
 .../vision/solid/demo/VariableBox.kt          | 115 +++++++++---------
 settings.gradle.kts                           |   1 +
 .../vision/bootstrap/outputConfig.kt          | 110 +++++++++--------
 .../dataforge/vision/AbstractVisionGroup.kt   |  43 ++++---
 .../kotlin/hep/dataforge/vision/Colors.kt     |  16 +--
 .../hep/dataforge/vision/SimpleVisionGroup.kt |   5 +-
 .../kotlin/hep/dataforge/vision/StyleSheet.kt |   8 +-
 .../kotlin/hep/dataforge/vision/Vision.kt     |   2 +-
 .../hep/dataforge/vision/VisionChange.kt      |  50 ++++++++
 .../hep/dataforge/vision/VisionGroup.kt       |   2 +-
 .../hep/dataforge/vision/VisionManager.kt     |  55 ++++-----
 .../hep/dataforge/vision/solid/SolidGroup.kt  |   4 +-
 .../dataforge/vision/solid/SolidManager.kt    |  42 +------
 .../dataforge/vision/solid/SolidMaterial.kt   |   2 +-
 .../solid/specifications/Canvas3DOptions.kt   |  13 +-
 .../vision/solid/specifications/Controls.kt   |   4 +-
 .../solid/transform/RemoveSingleChild.kt      |   2 +-
 .../dataforge/vision/solid/transform/UnRef.kt |   2 +-
 .../solid/transform/VisualTreeTransform.kt    |   8 +-
 .../vision/solid/three/MeshThreeFactory.kt    |  21 ++--
 .../vision/solid/three/ThreeBoxFactory.kt     |   4 +-
 .../vision/solid/three/ThreeCanvas.kt         |  17 +--
 .../solid/three/ThreeCanvasLabelFactory.kt    |   4 +-
 .../solid/three/ThreeCompositeFactory.kt      |   2 +-
 .../vision/solid/three/ThreeConvexFactory.kt  |   2 +-
 .../solid/three/ThreeCylinderFactory.kt       |   2 +-
 .../vision/solid/three/ThreeFactory.kt        |  16 +--
 .../vision/solid/three/ThreeLabelFactory.kt   |   2 +-
 .../vision/solid/three/ThreeLineFactory.kt    |   2 +-
 .../vision/solid/three/ThreePlugin.kt         |  28 ++---
 .../vision/solid/three/ThreeProxyFactory.kt   |   2 +-
 .../vision/solid/three/ThreeSphereFactory.kt  |   2 +-
 .../vision/solid/three/ThreeVision.kt         |   9 +-
 40 files changed, 474 insertions(+), 302 deletions(-)
 create mode 100644 demo/sat-demo/build.gradle.kts
 create mode 100644 demo/sat-demo/src/commonMain/kotlin/ru/mipt/npm/sat/geometry.kt
 create mode 100644 demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
 create mode 100644 demo/sat-demo/src/jsMain/resources/index.html
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt

diff --git a/demo/sat-demo/build.gradle.kts b/demo/sat-demo/build.gradle.kts
new file mode 100644
index 00000000..0e623614
--- /dev/null
+++ b/demo/sat-demo/build.gradle.kts
@@ -0,0 +1,24 @@
+plugins {
+    id("ru.mipt.npm.mpp")
+}
+
+val kvisionVersion: String = "3.16.2"
+
+kscience{
+    application()
+}
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation(project(":visionforge-solid"))
+            }
+        }
+        jsMain {
+            dependencies {
+
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/demo/sat-demo/src/commonMain/kotlin/ru/mipt/npm/sat/geometry.kt b/demo/sat-demo/src/commonMain/kotlin/ru/mipt/npm/sat/geometry.kt
new file mode 100644
index 00000000..c9c1512f
--- /dev/null
+++ b/demo/sat-demo/src/commonMain/kotlin/ru/mipt/npm/sat/geometry.kt
@@ -0,0 +1,55 @@
+package ru.mipt.npm.sat
+
+import hep.dataforge.vision.solid.*
+import kotlin.math.PI
+
+internal fun visionOfSatellite(
+    layers: Int = 10,
+    layerHeight: Number = 10,
+    xSegments: Int = 3,
+    ySegments: Int = xSegments,
+    xSegmentSize: Number = 30,
+    ySegmentSize: Number = xSegmentSize,
+    fiberDiameter: Number = 1.0,
+): SolidGroup = SolidGroup {
+    opacity = 0.3
+    val totalXSize = xSegments * xSegmentSize.toDouble()
+    val totalYSize = ySegments * ySegmentSize.toDouble()
+    for (layer in 1..layers) {
+        group("layer[$layer]") {
+            for (i in 1..xSegments) {
+                for (j in 1..ySegments) {
+                    box(xSegmentSize, ySegmentSize, layerHeight, name = "segment[$i,$j]") {
+                        z = (layer - 0.5) * layerHeight.toDouble()
+                        x = (i - 0.5) * xSegmentSize.toDouble()
+                        y = (j - 0.5) * ySegmentSize.toDouble()
+                    }
+                }
+            }
+            group("fibers") {
+                for (i in 1..xSegments) {
+                    cylinder(fiberDiameter, totalYSize) {
+                        rotationX = PI / 2
+                        z = (layer - 1.0) * layerHeight.toDouble() + fiberDiameter.toDouble()
+                        x = (i - 0.5) * xSegmentSize.toDouble()
+                        y = totalYSize/2
+
+                        color("red")
+                    }
+                }
+
+                for (j in 1..ySegments) {
+                    cylinder(fiberDiameter, totalXSize) {
+                        rotationY = PI / 2
+                        z = (layer) * layerHeight.toDouble() - fiberDiameter.toDouble()
+                        y = (j - 0.5) * xSegmentSize.toDouble()
+                        x = totalXSize/2
+
+                        color("blue")
+                    }
+                }
+            }
+        }
+    }
+}
+
diff --git a/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt b/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
new file mode 100644
index 00000000..d3c03541
--- /dev/null
+++ b/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
@@ -0,0 +1,34 @@
+package ru.mipt.npm.sat
+
+import hep.dataforge.context.Global
+import hep.dataforge.js.Application
+import hep.dataforge.js.startApplication
+import hep.dataforge.vision.solid.three.ThreePlugin
+import hep.dataforge.vision.solid.three.render
+import kotlinx.browser.document
+import hep.dataforge.meta.invoke
+import org.w3c.dom.HTMLElement
+
+private class SatDemoApp : Application {
+
+    override fun start(state: Map<String, Any>) {
+        val element = document.getElementById("canvas") as? HTMLElement
+            ?: error("Element with id 'canvas' not found on page")
+        val three = Global.plugins.fetch(ThreePlugin)
+        val sat = visionOfSatellite(
+            ySegments = 5,
+        )
+        three.render(element, sat){
+            minSize = 500
+            axes {
+                size = 500.0
+                visible = true
+            }
+        }
+    }
+
+}
+
+fun main() {
+    startApplication(::SatDemoApp)
+}
\ No newline at end of file
diff --git a/demo/sat-demo/src/jsMain/resources/index.html b/demo/sat-demo/src/jsMain/resources/index.html
new file mode 100644
index 00000000..0fd32551
--- /dev/null
+++ b/demo/sat-demo/src/jsMain/resources/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <title>Three js demo for particle physics</title>
+    <script type="text/javascript" src="sat-demo.js"></script>
+</head>
+<body class="application">
+<div id="canvas"></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/demo/spatial-showcase/build.gradle.kts b/demo/spatial-showcase/build.gradle.kts
index 40c4b04d..87140138 100644
--- a/demo/spatial-showcase/build.gradle.kts
+++ b/demo/spatial-showcase/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
 }
 
 kscience {
+    useCoroutines()
     val fxVersion: String by rootProject.extra
     useFx(FXModule.CONTROLS, version = fxVersion, configuration = DependencyConfiguration.IMPLEMENTATION)
     application()
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
index 2be73f5e..0bcd047b 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
@@ -2,7 +2,14 @@ package hep.dataforge.vision.solid.demo
 
 import hep.dataforge.js.Application
 import hep.dataforge.js.startApplication
-import kotlin.browser.document
+import hep.dataforge.vision.solid.x
+import hep.dataforge.vision.solid.y
+import kotlinx.browser.document
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlin.random.Random
 
 private class ThreeDemoApp : Application {
 
@@ -13,27 +20,25 @@ private class ThreeDemoApp : Application {
         ThreeDemoGrid(element).run {
             showcase()
             showcaseCSG()
-//            demo("dynamicBox", "Dancing boxes") {
-//                val boxes = (-10..10).flatMap { i ->
-//                    (-10..10).map { j ->
-//                        varBox(10, 10, 0, name = "cell_${i}_${j}") {
-//                            x = i * 10
-//                            y = j * 10
-//                            value = 128
-//                            setProperty(EDGES_ENABLED_KEY, false)
-//                            setProperty(WIREFRAME_ENABLED_KEY, false)
-//                        }
-//                    }
-//                }
-//                GlobalScope.launch {
-//                    while (isActive) {
-//                        delay(500)
-//                        boxes.forEach { box ->
-//                            box.value = (box.value + Random.nextInt(-15, 15)).coerceIn(0..255)
-//                        }
-//                    }
-//                }
-//            }
+            demo("dynamicBox", "Dancing boxes") {
+                val boxes = (-10..10).flatMap { i ->
+                    (-10..10).map { j ->
+                        varBox(10, 10, 0, name = "cell_${i}_${j}") {
+                            x = i * 10
+                            y = j * 10
+                            value = 128
+                        }
+                    }
+                }
+                GlobalScope.launch {
+                    while (isActive) {
+                        delay(500)
+                        boxes.forEach { box ->
+                            box.value = (box.value + Random.nextInt(-15, 15)).coerceIn(1..255)
+                        }
+                    }
+                }
+            }
         }
 
 
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
index 84a73d0d..d8420d6f 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
@@ -11,6 +11,8 @@ import hep.dataforge.vision.Vision
 import hep.dataforge.vision.solid.three.ThreeCanvas
 import hep.dataforge.vision.solid.three.ThreePlugin
 import hep.dataforge.vision.solid.three.output
+import kotlinx.browser.document
+import kotlinx.dom.clear
 import kotlinx.html.dom.append
 import kotlinx.html.dom.create
 import kotlinx.html.h2
@@ -19,8 +21,6 @@ import kotlinx.html.id
 import kotlinx.html.js.div
 import kotlinx.html.span
 import org.w3c.dom.Element
-import kotlin.browser.document
-import kotlin.dom.clear
 import kotlin.reflect.KClass
 
 class ThreeDemoGrid(element: Element, meta: Meta = Meta.EMPTY) : OutputManager {
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
index abe6097b..c5f023ff 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
@@ -4,6 +4,7 @@ package hep.dataforge.vision.solid.demo
 
 import hep.dataforge.meta.int
 import hep.dataforge.meta.number
+import hep.dataforge.meta.set
 import hep.dataforge.meta.setItem
 import hep.dataforge.names.plus
 import hep.dataforge.names.startsWith
@@ -12,7 +13,6 @@ import hep.dataforge.vision.getProperty
 import hep.dataforge.vision.set
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.Solid.Companion.GEOMETRY_KEY
-import hep.dataforge.vision.solid.demo.VariableBoxThreeFactory.Z_SIZE_KEY
 import hep.dataforge.vision.solid.three.*
 import hep.dataforge.vision.solid.three.ThreeMaterials.getMaterial
 import info.laht.threekt.core.BufferGeometry
@@ -21,86 +21,89 @@ import info.laht.threekt.geometries.BoxBufferGeometry
 import info.laht.threekt.objects.Mesh
 import kotlinx.serialization.UseSerializers
 import kotlin.math.max
-import kotlin.reflect.KClass
 
-internal var Solid.variableZSize: Number
-    get() = getProperty(Z_SIZE_KEY, false).number ?: 0f
-    set(value) {
-        setItem(Z_SIZE_KEY, value.asValue())
-    }
-
-internal var Solid.value: Int
-    get() = getProperty("value", false).int ?: 0
-    set(value) {
-        setItem("value", value.asValue())
-        val size = value.toFloat() / 255f * 20f
-        scaleZ = size
-        z = -size / 2
-
-        val b = max(0, 255 - value)
-        val r = max(0, value - 255)
-        val g = 255 - b - r
-        color(r.toUByte(), g.toUByte(), b.toUByte())
-    }
-
-fun SolidGroup.varBox(
+internal fun SolidGroup.varBox(
     xSize: Number,
     ySize: Number,
     zSize: Number,
     name: String = "",
-    action: Solid.() -> Unit = {}
-) = CustomThreeVision(VariableBoxThreeFactory).apply {
-    scaleX = xSize
-    scaleY = ySize
-    scaleZ = zSize
-}.apply(action).also { set(name, it) }
+    action: VariableBox.() -> Unit = {},
+): VariableBox = VariableBox(xSize, ySize, zSize).apply(action).also { set(name, it) }
 
-private object VariableBoxThreeFactory : ThreeFactory<Solid> {
-    val X_SIZE_KEY = GEOMETRY_KEY + "xSize"
-    val Y_SIZE_KEY = GEOMETRY_KEY + "ySize"
-    val Z_SIZE_KEY = GEOMETRY_KEY + "zSize"
+internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeVision() {
+    init {
+        scaleX = xSize
+        scaleY = ySize
+        scaleZ = zSize
+        config[MeshThreeFactory.EDGES_ENABLED_KEY] = false
+        config[MeshThreeFactory.WIREFRAME_ENABLED_KEY] = false
+    }
 
-    override val type: KClass<in Solid> get() = Solid::class
-
-    override fun invoke(obj: Solid): Object3D {
-        val xSize = obj.getProperty(X_SIZE_KEY, false).number?.toDouble() ?: 1.0
-        val ySize = obj.getProperty(Y_SIZE_KEY, false).number?.toDouble() ?: 1.0
-        val zSize = obj.getProperty(Z_SIZE_KEY, false).number?.toDouble() ?: 1.0
+    override fun render(): Object3D {
+        val xSize = getProperty(X_SIZE_KEY, false).number?.toDouble() ?: 1.0
+        val ySize = getProperty(Y_SIZE_KEY, false).number?.toDouble() ?: 1.0
+        val zSize = getProperty(Z_SIZE_KEY, false).number?.toDouble() ?: 1.0
         val geometry = BoxBufferGeometry(1, 1, 1)
 
         //JS sometimes tries to pass Geometry as BufferGeometry
         @Suppress("USELESS_IS_CHECK") if (geometry !is BufferGeometry) error("BufferGeometry expected")
 
-        val mesh = Mesh(geometry, getMaterial(obj,true)).apply {
-            applyEdges(obj)
-            applyWireFrame(obj)
+        val mesh = Mesh(geometry, getMaterial(this@VariableBox, true)).apply {
+            applyEdges(this@VariableBox)
+            applyWireFrame(this@VariableBox)
 
             //set position for mesh
-            updatePosition(obj)
+            updatePosition(this@VariableBox)
 
-            layers.enable(obj.layer)
+            layers.enable(this@VariableBox.layer)
             children.forEach {
-                it.layers.enable(obj.layer)
+                it.layers.enable(this@VariableBox.layer)
             }
         }
 
         mesh.scale.set(xSize, ySize, zSize)
 
         //add listener to object properties
-        obj.onPropertyChange(this) { name ->
+        onPropertyChange(mesh) { name ->
             when {
-//                name.startsWith(GEOMETRY_KEY) -> {
-//                    val newXSize = obj.getProperty(X_SIZE_KEY, false).number?.toDouble() ?: 1.0
-//                    val newYSize = obj.getProperty(Y_SIZE_KEY, false).number?.toDouble() ?: 1.0
-//                    val newZSize = obj.getProperty(Z_SIZE_KEY, false).number?.toDouble() ?: 1.0
-//                    mesh.scale.set(newXSize, newYSize, newZSize)
-//                    mesh.updateMatrix()
-//                }
-                name.startsWith(MeshThreeFactory.WIREFRAME_KEY) -> mesh.applyWireFrame(obj)
-                name.startsWith(MeshThreeFactory.EDGES_KEY) -> mesh.applyEdges(obj)
-                else -> mesh.updateProperty(obj, name)
+                name.startsWith(GEOMETRY_KEY) -> {
+                    val newXSize = getProperty(X_SIZE_KEY, false).number?.toDouble() ?: 1.0
+                    val newYSize = getProperty(Y_SIZE_KEY, false).number?.toDouble() ?: 1.0
+                    val newZSize = getProperty(Z_SIZE_KEY, false).number?.toDouble() ?: 1.0
+                    mesh.scale.set(newXSize, newYSize, newZSize)
+                    mesh.updateMatrix()
+                }
+                name.startsWith(MeshThreeFactory.WIREFRAME_KEY) -> mesh.applyWireFrame(this@VariableBox)
+                name.startsWith(MeshThreeFactory.EDGES_KEY) -> mesh.applyEdges(this@VariableBox)
+                else -> mesh.updateProperty(this@VariableBox, name)
             }
         }
         return mesh
     }
+
+    var variableZSize: Number
+        get() = getProperty(Z_SIZE_KEY, false).number ?: 0f
+        set(value) {
+            setItem(Z_SIZE_KEY, value.asValue())
+        }
+
+    var value: Int
+        get() = getProperty("value", false).int ?: 0
+        set(value) {
+            setItem("value", value.asValue())
+            val size = value.toFloat() / 255f * 20f
+            scaleZ = size
+            z = size / 2
+
+            val b = max(0, 128 - value)
+            val r = max(0, value - 128)
+            val g = 255 - b - r
+            color(r.toUByte(), g.toUByte(), b.toUByte())
+        }
+
+    companion object{
+        private val X_SIZE_KEY = GEOMETRY_KEY + "xSize"
+        private val Y_SIZE_KEY = GEOMETRY_KEY + "ySize"
+        private val Z_SIZE_KEY = GEOMETRY_KEY + "zSize"
+    }
 }
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8ab3e4e4..55158bb5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -43,5 +43,6 @@ include(
     ":demo:spatial-showcase",
     ":demo:gdml",
     ":demo:muon-monitor",
+    ":demo:sat-demo",
     ":playground"
 )
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
index e3579fc0..4d039b92 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
@@ -1,6 +1,5 @@
 package hep.dataforge.vision.bootstrap
 
-import hep.dataforge.meta.DFExperimental
 import hep.dataforge.vision.solid.SolidGroup
 import hep.dataforge.vision.solid.SolidManager
 import hep.dataforge.vision.solid.three.ThreeCanvas
@@ -15,8 +14,7 @@ import org.w3c.dom.HTMLInputElement
 import org.w3c.dom.events.Event
 import org.w3c.files.Blob
 import org.w3c.files.BlobPropertyBag
-import react.RBuilder
-import react.ReactElement
+import react.*
 import react.dom.button
 import react.dom.div
 import react.dom.input
@@ -31,37 +29,51 @@ private fun saveData(event: Event, fileName: String, mimeType: String = "text/pl
     fileSaver.saveAs(blob, fileName)
 }
 
-@OptIn(DFExperimental::class)
-public fun RBuilder.canvasControls(canvas: ThreeCanvas): ReactElement = accordion("controls") {
-    entry("Settings") {
-        div("row") {
-            div("col-2") {
-                label("checkbox-inline") {
-                    input(type = InputType.checkBox) {
-                        attrs {
-                            defaultChecked = canvas.axes.visible
-                            onChangeFunction = {
-                                canvas.axes.visible = (it.target as HTMLInputElement).checked
+public fun RBuilder.canvasControls(canvas: ThreeCanvas): ReactElement {
+    return child(CanvasControls){
+        attrs{
+            this.canvas = canvas
+        }
+    }
+}
+
+public external interface CanvasControlsProps : RProps {
+    public var canvas: ThreeCanvas
+}
+
+public val CanvasControls: FunctionalComponent<CanvasControlsProps> = functionalComponent ("CanvasControls") { props ->
+    val visionManager = useMemo(
+        { props.canvas.context.plugins.fetch(SolidManager).visionManager },
+        arrayOf(props.canvas)
+    )
+    accordion("controls") {
+        entry("Settings") {
+            div("row") {
+                div("col-2") {
+                    label("checkbox-inline") {
+                        input(type = InputType.checkBox) {
+                            attrs {
+                                defaultChecked = props.canvas.axes.visible
+                                onChangeFunction = {
+                                    props.canvas.axes.visible = (it.target as HTMLInputElement).checked
+                                }
                             }
                         }
+                        +"Axes"
                     }
-                    +"Axes"
                 }
-            }
-            div("col-1") {
-                button {
-                    +"Export"
-                    attrs {
-                        onClickFunction = {
-                            val json = (canvas.content as? SolidGroup)?.let { group ->
-                                SolidManager.jsonForSolids.encodeToString(
-                                    SolidGroup.serializer(),
-                                    group
-                                )
-                            }
-                            if (json != null) {
-                                saveData(it, "object.json", "text/json") {
-                                    json
+                div("col-1") {
+                    button {
+                        +"Export"
+                        attrs {
+                            onClickFunction = {
+                                val json = (props.canvas.content as? SolidGroup)?.let { group ->
+                                    visionManager.encodeToString(group)
+                                }
+                                if (json != null) {
+                                    saveData(it, "object.json", "text/json") {
+                                        json
+                                    }
                                 }
                             }
                         }
@@ -69,22 +81,22 @@ public fun RBuilder.canvasControls(canvas: ThreeCanvas): ReactElement = accordio
                 }
             }
         }
-    }
-    entry("Layers") {
-        div("row") {
-            (0..11).forEach { layer ->
-                div("col-1") {
-                    label { +layer.toString() }
-                    input(type = InputType.checkBox) {
-                        attrs {
-                            if (layer == 0) {
-                                defaultChecked = true
-                            }
-                            onChangeFunction = {
-                                if ((it.target as HTMLInputElement).checked) {
-                                    canvas.camera.layers.enable(layer)
-                                } else {
-                                    canvas.camera.layers.disable(layer)
+        entry("Layers") {
+            div("row") {
+                (0..11).forEach { layer ->
+                    div("col-1") {
+                        label { +layer.toString() }
+                        input(type = InputType.checkBox) {
+                            attrs {
+                                if (layer == 0) {
+                                    defaultChecked = true
+                                }
+                                onChangeFunction = {
+                                    if ((it.target as HTMLInputElement).checked) {
+                                        props.canvas.camera.layers.enable(layer)
+                                    } else {
+                                        props.canvas.camera.layers.disable(layer)
+                                    }
                                 }
                             }
                         }
@@ -118,10 +130,8 @@ public fun Element.displayCanvasControls(canvas: ThreeCanvas, block: TagConsumer
                             +"Export"
                             onClickFunction = {
                                 val json = (canvas.content as? SolidGroup)?.let { group ->
-                                    SolidManager.jsonForSolids.encodeToString(
-                                        SolidGroup.serializer(),
-                                        group
-                                    )
+                                    val visionManager = canvas.context.plugins.fetch(SolidManager).visionManager
+                                    visionManager.encodeToString(group)
                                 }
                                 if (json != null) {
                                     saveData(it, "object.json", "text/json") {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt
index f2c343d6..c6d05e8c 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt
@@ -1,5 +1,8 @@
 package hep.dataforge.vision
 
+import hep.dataforge.meta.Meta
+import hep.dataforge.meta.get
+import hep.dataforge.meta.node
 import hep.dataforge.names.*
 import kotlinx.serialization.Transient
 
@@ -7,7 +10,7 @@ import kotlinx.serialization.Transient
 /**
  * Abstract implementation of mutable group of [Vision]
  */
-abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup {
+public abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup {
 
     //protected abstract val _children: MutableMap<NameToken, T>
 
@@ -22,30 +25,31 @@ abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup {
     /**
      * Update or create stylesheet
      */
-    fun styleSheet(block: StyleSheet.() -> Unit) {
-        val res = styleSheet ?: StyleSheet(this).also { styleSheet = it }
-        res.block()
+    public fun styleSheet(block: StyleSheet.() -> Unit) {
+        if (styleSheet == null) {
+            styleSheet = StyleSheet(this@AbstractVisionGroup)
+        }
+        styleSheet!!.block()
     }
 
     override fun propertyChanged(name: Name) {
         super.propertyChanged(name)
-        for(obj in this) {
+        for (obj in this) {
             obj.propertyChanged(name)
         }
     }
 
-    // TODO Consider renaming to `StructureChangeListener` (singular)
-    private data class StructureChangeListeners(val owner: Any?, val callback: (Name, Vision?) -> Unit)
+    private data class StructureChangeListener(val owner: Any?, val callback: (NameToken, Vision?) -> Unit)
 
     @Transient
-    private val structureChangeListeners = HashSet<StructureChangeListeners>()
+    private val structureChangeListeners = HashSet<StructureChangeListener>()
 
     /**
      * Add listener for children change
      */
-    override fun onChildrenChange(owner: Any?, action: (Name, Vision?) -> Unit) {
+    override fun onChildrenChange(owner: Any?, action: (NameToken, Vision?) -> Unit) {
         structureChangeListeners.add(
-            StructureChangeListeners(
+            StructureChangeListener(
                 owner,
                 action
             )
@@ -62,7 +66,7 @@ abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup {
     /**
      * Propagate children change event upwards
      */
-    protected fun childrenChanged(name: Name, child: Vision?) {
+    protected fun childrenChanged(name: NameToken, child: Vision?) {
         structureChangeListeners.forEach { it.callback(name, child) }
     }
 
@@ -77,10 +81,11 @@ abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup {
     protected abstract fun setChild(token: NameToken, child: Vision)
 
     /**
-     * Add a static child. Statics could not be found by name, removed or replaced
+     * Add a static child. Statics could not be found by name, removed or replaced. Changing statics also do not trigger events.
      */
-    protected open fun addStatic(child: Vision) =
-        set(NameToken("@static(${child.hashCode()})").asName(), child)
+    protected open fun addStatic(child: Vision): Unit {
+        setChild(NameToken("@static", index = child.hashCode().toString()), child)
+    }
 
     protected abstract fun createGroup(): AbstractVisionGroup
 
@@ -124,6 +129,7 @@ abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup {
         when {
             name.isEmpty() -> {
                 if (child != null) {
+                    attach(child)
                     addStatic(child)
                 }
             }
@@ -135,6 +141,7 @@ abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup {
                     attach(child)
                     setChild(token, child)
                 }
+                childrenChanged(token, child)
             }
             else -> {
                 //TODO add safety check
@@ -142,7 +149,13 @@ abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup {
                 parent[name.tokens.last().asName()] = child
             }
         }
-        childrenChanged(name, child)
     }
 
+    override fun update(meta: Meta) {
+        val styleMeta = meta.get("styleSheet").node
+        if (styleMeta != null) {
+            this.styleSheet?.update(styleMeta)
+        }
+        super.update(meta)
+    }
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
index 1b3d4763..c8d18a08 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
@@ -235,12 +235,12 @@ public object Colors {
         }
     }
 
-    /**
-     * Convert three bytes representing color to Meta
-     */
-    fun rgbToMeta(r: UByte, g: UByte, b: UByte): Meta = Meta {
-        RED_KEY put r.toInt()
-        GREEN_KEY put g.toInt()
-        BLUE_KEY put b.toInt()
-    }
+//    /**
+//     * Convert three bytes representing color to Meta
+//     */
+//    fun rgbToMeta(r: UByte, g: UByte, b: UByte): Meta = Meta {
+//        RED_KEY put r.toInt()
+//        GREEN_KEY put g.toInt()
+//        BLUE_KEY put b.toInt()
+//    }
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisionGroup.kt
index 4a73bd14..69a28f07 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisionGroup.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisionGroup.kt
@@ -8,13 +8,10 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 @SerialName("group")
-class SimpleVisionGroup : AbstractVisionGroup() {
+public class SimpleVisionGroup : AbstractVisionGroup() {
 
     override var styleSheet: StyleSheet? = null
 
-    //FIXME to be lifted to AbstractVisualGroup after https://github.com/Kotlin/kotlinx.serialization/issues/378 is fixed
-    override var properties: Config? = null
-
     @SerialName("children")
     private val _children = HashMap<NameToken, Vision>()
     override val children: Map<NameToken, Vision> get() = _children
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
index 0a5f27e5..fa5ef9e9 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
@@ -16,11 +16,11 @@ import kotlinx.serialization.encoding.Encoder
  * A container for styles
  */
 @Serializable
-public class StyleSheet private constructor(private val styleMap: MutableMap<String, Meta> = LinkedHashMap()) {
+public class StyleSheet private constructor(private val styleMap: MutableMap<String, Meta>) {
     @Transient
     internal var owner: Vision? = null
 
-    public constructor(owner: Vision) : this() {
+    public constructor(owner: Vision) : this(LinkedHashMap()) {
         this.owner = owner
     }
 
@@ -91,6 +91,10 @@ public class StyleSheet private constructor(private val styleMap: MutableMap<Str
     }
 }
 
+public fun StyleSheet.update(styleMeta: Meta){
+    TODO()
+}
+
 
 /**
  * Add style name to the list of styles to be resolved later. The style with given name does not necessary exist at the moment.
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 2301ce54..99840b92 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -69,7 +69,7 @@ public interface Vision : Configurable {
         }
 
     /**
-     * Update this vision using external meta.
+     * Update this vision using external meta. Children are not updated.
      */
     public fun update(meta: Meta)
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
new file mode 100644
index 00000000..20d28123
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
@@ -0,0 +1,50 @@
+package hep.dataforge.vision
+
+import hep.dataforge.meta.Config
+import hep.dataforge.meta.Meta
+import hep.dataforge.meta.get
+import hep.dataforge.meta.set
+import hep.dataforge.names.NameToken
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.sync.Mutex
+
+
+//public class VisionChange(public val properties: Meta, public val childrenChange: Map<NameToken, VisionChange>)
+
+public class VisionChangeCollector(
+    public val manager: VisionManager,
+    public val scope: CoroutineScope,
+    public val vision: Vision,
+    public val lock: Mutex = Mutex()
+) {
+    private val collector: Config = Config()
+    private val childrenCollectors = HashMap<NameToken, VisionChangeCollector>()
+
+    init {
+        vision.onPropertyChange(this) { propertyName ->
+            collector[propertyName] = vision.properties?.get(propertyName)
+        }
+        if (vision is VisionGroup) {
+            vision.children.forEach { (token, child) ->
+                childrenCollectors[token] = VisionChangeCollector(manager, scope, child, lock)
+            }
+        }
+        if (vision is MutableVisionGroup) {
+            TODO("Tread vision structure change")
+//            vision.onChildrenChange(this) { childName, child ->
+//                if(child == null){
+//                    childrenCollectors[childName] = null
+//                } else {
+//                    childrenCollectors[childName] = manager.encodeToMeta(child)
+//                }
+//            }
+        }
+    }
+}
+//
+//fun collectUpdates(manager: VisionManager, scope: CoroutineScope, vision: Vision): Flow<Meta> {
+//
+//
+//    vision.
+//}
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
index 3035e18d..004693a2 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
@@ -87,7 +87,7 @@ public interface MutableVisionGroup : VisionGroup, VisionContainerBuilder<Vision
      * @param owner the handler to properly remove listeners
      * @param action First argument of the action is the name of changed child. Second argument is the new value of the object.
      */
-    public fun onChildrenChange(owner: Any?, action: (Name, Vision?) -> Unit)
+    public fun onChildrenChange(owner: Any?, action: (NameToken, Vision?) -> Unit)
 
     /**
      * Remove children change listener
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
index a1e5170c..3e417935 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
@@ -3,6 +3,10 @@ package hep.dataforge.vision
 import hep.dataforge.context.*
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
+import hep.dataforge.names.asName
+import hep.dataforge.values.Null
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.modules.SerializersModule
@@ -10,7 +14,6 @@ import kotlinx.serialization.modules.polymorphic
 import kotlinx.serialization.modules.subclass
 import kotlin.reflect.KClass
 
-@DFExperimental
 public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
     override val tag: PluginTag get() = Companion.tag
 
@@ -50,36 +53,30 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
             ?: error("Expected node, but value found. Check your serializer!")
 
     public fun updateVision(vision: Vision, meta: Meta) {
-
+        vision.update(meta)
+        if (vision is MutableVisionGroup) {
+            val children by meta.node()
+            children?.items?.forEach { (token, item) ->
+                when {
+                    item.value == Null -> vision[token] = null //Null means removal
+                    item.node != null -> {
+                        val node = item.node!!
+                        val type by node.string()
+                        if (type != null) {
+                            //If the type is present considering it as new node, not an update
+                            vision[token.asName()] = decodeFromMeta(node)
+                        } else {
+                            val existing = vision.children[token]
+                            if (existing != null) {
+                                updateVision(existing, node)
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
 
-//    public fun <T : Vision> VisionForm<T>.buildVision(meta: Meta, descriptor: NodeDescriptor? = null): T {
-//        val json = meta.toJson(descriptor)
-//        return jsonFormat.decodeFromJsonElement(serializer, json)
-//    }
-//
-//    @OptIn(ExperimentalSerializationApi::class)
-//    public fun buildVision(meta: Meta): Vision {
-//        val type = meta["type"].string ?: Vision.serializer().descriptor.serialName
-//        val form = forms.values.find { it.name.toString() == type } ?: error("Could not resolve a form for type $type")
-//        return form.buildVision(meta)
-//    }
-//
-//    public inline fun <reified T : Vision> buildSpecificVision(meta: Meta): T {
-//        val factory = resolveVisionForm(T::class)
-//        return factory.buildVision(meta)
-//    }
-//
-//    public fun <T : Vision> writeVisionToMeta(vision: T): Meta {
-//        val form = resolveVisionForm(vision::class) ?: error("Could not resolve a form for $vision")
-//        val json = jsonFormat.encodeToJsonElement(form.serializer, vision)
-//        return json.toMetaItem().node!!
-//    }
-//
-//    public fun updateVision(vision: Vision, meta: Meta) {
-//        resolveVisionForm(vision::class).patch(vision, meta)
-//    }
-
     public companion object : PluginFactory<VisionManager> {
         override val tag: PluginTag = PluginTag(name = "vision", group = PluginTag.DATAFORGE_GROUP)
         override val type: KClass<out VisionManager> = VisionManager::class
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index 6d787bb5..f27ea3f3 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -57,7 +57,7 @@ public class SolidGroup : AbstractVisionGroup(), Solid, PrototypeHolder {
     override var scale: Point3D? = null
 
     @SerialName("children")
-    private val _children = HashMap<NameToken, Vision>()
+    private val _children = LinkedHashMap<NameToken, Vision>()
     override val children: Map<NameToken, Vision> get() = _children
 
     override fun attachChildren() {
@@ -122,7 +122,7 @@ internal class Prototypes(
 
     override fun removeChild(token: NameToken) {
         children.remove(token)
-        childrenChanged(token.asName(), null)
+        childrenChanged(token, null)
     }
 
     override fun setChild(token: NameToken, child: Vision) {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index dd070481..8db54e7e 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -16,43 +16,7 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.modules.*
 import kotlin.reflect.KClass
 
-//@OptIn(ExperimentalSerializationApi::class)
-//@DFExperimental
-//private fun SerializersModule.extractFactories(): List<SolidForm<*>> {
-//    val list = ArrayList<SolidForm<*>>()
-//
-//    val collector = object : SerializersModuleCollector {
-//        override fun <T : Any> contextual(kClass: KClass<T>, serializer: KSerializer<T>) {
-//            //Do nothing
-//        }
-//
-//        override fun <Base : Any, Sub : Base> polymorphic(
-//            baseClass: KClass<Base>,
-//            actualClass: KClass<Sub>,
-//            actualSerializer: KSerializer<Sub>,
-//        ) {
-//            if (baseClass == Vision::class) {
-//                @Suppress("UNCHECKED_CAST") val factory: SolidForm<Solid> = SolidForm(
-//                    actualClass as KClass<Solid>,
-//                    actualSerializer as KSerializer<Solid>
-//                )
-//                list.add(factory)
-//            }
-//        }
-//
-//        override fun <Base : Any> polymorphicDefault(
-//            baseClass: KClass<Base>,
-//            defaultSerializerProvider: (className: String?) -> DeserializationStrategy<out Base>?,
-//        ) {
-//            TODO("Not yet implemented")
-//        }
-//
-//    }
-//    dumpTo(collector)
-//    return list
-//}
 
-@DFExperimental
 public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
 
     public val visionManager: VisionManager by require(VisionManager)
@@ -96,18 +60,16 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
             }
         }
 
-        public val jsonForSolids = Json{
+        internal val jsonForSolids: Json = Json{
             prettyPrint = true
             useArrayPolymorphism = false
             encodeDefaults = false
             ignoreUnknownKeys = true
-            serializersModule = SolidManager.serializersModuleForSolids
+            serializersModule = serializersModuleForSolids
         }
 
-        @OptIn(DFExperimental::class)
         public fun encodeToString(solid: Solid): String = jsonForSolids.encodeToString(Vision.serializer(), solid)
 
-        @OptIn(DFExperimental::class)
         public fun decodeFromString(str: String): Vision = jsonForSolids.decodeFromString(Vision.serializer(), str).also {
             if(it is VisionGroup){
                 it.attachChildren()
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
index d1a9b121..50d7d508 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
@@ -91,7 +91,7 @@ public fun Solid.color(rgb: Int) {
 
 public fun Solid.color(r: UByte, g: UByte, b: UByte): Unit = setItem(
     MATERIAL_COLOR_KEY,
-    Colors.rgbToMeta(r, g, b)
+    Colors.rgbToString(r, g, b).asValue()
 )
 
 /**
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
index 33ba4bd0..0ef38797 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
@@ -1,15 +1,20 @@
 package hep.dataforge.vision.solid.specifications
 
-import hep.dataforge.meta.Scheme
-import hep.dataforge.meta.SchemeSpec
-import hep.dataforge.meta.int
-import hep.dataforge.meta.spec
+import hep.dataforge.meta.*
 
 public class Canvas3DOptions : Scheme() {
     public var axes: Axes by spec(Axes, Axes.empty())
     public var camera: Camera by spec(Camera, Camera.empty())
     public var controls: Controls by spec(Controls, Controls.empty())
+
     public var minSize: Int by int(300)
+    public var minWith: Number by number { minSize }
+    public var minHeight: Number by number { minSize }
+
+    public var maxSize: Int by int(Int.MAX_VALUE)
+    public var maxWith: Number by number { maxSize }
+    public var maxHeight: Number by number { maxSize }
+
 
     public companion object : SchemeSpec<Canvas3DOptions>(::Canvas3DOptions)
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Controls.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Controls.kt
index adc22cbf..90d024c3 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Controls.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Controls.kt
@@ -4,6 +4,6 @@ import hep.dataforge.meta.Scheme
 import hep.dataforge.meta.SchemeSpec
 
 
-class Controls : Scheme() {
-    companion object : SchemeSpec<Controls>(::Controls)
+public class Controls : Scheme() {
+    public companion object : SchemeSpec<Controls>(::Controls)
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
index 2fc1ffdb..3f205893 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
@@ -35,7 +35,7 @@ internal fun mergeChild(parent: VisionGroup, child: Vision): Vision {
 }
 
 @DFExperimental
-object RemoveSingleChild : VisualTreeTransform<SolidGroup>() {
+internal object RemoveSingleChild : VisualTreeTransform<SolidGroup>() {
 
     override fun SolidGroup.transformInPlace() {
         fun MutableVisionGroup.replaceChildren() {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
index 9028b667..c3f2109b 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
@@ -9,7 +9,7 @@ import hep.dataforge.vision.solid.Proxy
 import hep.dataforge.vision.solid.SolidGroup
 
 @DFExperimental
-object UnRef : VisualTreeTransform<SolidGroup>() {
+internal object UnRef : VisualTreeTransform<SolidGroup>() {
     private fun VisionGroup.countRefs(): Map<Name, Int> {
         return children.values.fold(HashMap()) { reducer, obj ->
             if (obj is VisionGroup) {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/VisualTreeTransform.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/VisualTreeTransform.kt
index 83d38baa..22825f6c 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/VisualTreeTransform.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/VisualTreeTransform.kt
@@ -5,11 +5,11 @@ import hep.dataforge.vision.Vision
 /**
  * A root class for [Vision] tree optimization
  */
-abstract class VisualTreeTransform<T : Vision> {
+public abstract class VisualTreeTransform<T : Vision> {
     protected abstract fun T.transformInPlace()
     protected abstract fun T.clone(): T
 
-    operator fun invoke(source: T, inPlace: Boolean = true): T {
+    public operator fun invoke(source: T, inPlace: Boolean = true): T {
         val newSource = if (inPlace) {
             source
         } else {
@@ -21,7 +21,7 @@ abstract class VisualTreeTransform<T : Vision> {
     }
 }
 
-fun <T : Vision> T.transform(vararg transform: VisualTreeTransform<T>): T {
+public fun <T : Vision> T.transform(vararg transform: VisualTreeTransform<T>): T {
     var res = this
     transform.forEach {
         res = it(res)
@@ -29,6 +29,6 @@ fun <T : Vision> T.transform(vararg transform: VisualTreeTransform<T>): T {
     return res
 }
 
-fun <T : Vision> T.transformInPlace(vararg transform: VisualTreeTransform<in T>) {
+public fun <T : Vision> T.transformInPlace(vararg transform: VisualTreeTransform<in T>) {
     transform.forEach { it(this) }
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
index ac153ab5..5cd52b01 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
@@ -2,6 +2,7 @@ package hep.dataforge.vision.solid.three
 
 import hep.dataforge.meta.boolean
 import hep.dataforge.meta.node
+import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
 import hep.dataforge.names.startsWith
@@ -19,13 +20,13 @@ import kotlin.reflect.KClass
 /**
  * Basic geometry-based factory
  */
-abstract class MeshThreeFactory<in T : Solid>(
+public abstract class MeshThreeFactory<in T : Solid>(
     override val type: KClass<in T>
 ) : ThreeFactory<T> {
     /**
      * Build a geometry for an object
      */
-    abstract fun buildGeometry(obj: T): BufferGeometry
+    public abstract fun buildGeometry(obj: T): BufferGeometry
 
     override fun invoke(obj: T): Mesh {
         val geometry = buildGeometry(obj)
@@ -60,14 +61,14 @@ abstract class MeshThreeFactory<in T : Solid>(
         return mesh
     }
 
-    companion object {
-        val EDGES_KEY = "edges".asName()
-        val WIREFRAME_KEY = "wireframe".asName()
-        val ENABLED_KEY = "enabled".asName()
-        val EDGES_ENABLED_KEY = EDGES_KEY + ENABLED_KEY
-        val EDGES_MATERIAL_KEY = EDGES_KEY + SolidMaterial.MATERIAL_KEY
-        val WIREFRAME_ENABLED_KEY = WIREFRAME_KEY + ENABLED_KEY
-        val WIREFRAME_MATERIAL_KEY = WIREFRAME_KEY + SolidMaterial.MATERIAL_KEY
+    public companion object {
+        public val EDGES_KEY: Name = "edges".asName()
+        public val WIREFRAME_KEY: Name = "wireframe".asName()
+        public val ENABLED_KEY: Name = "enabled".asName()
+        public val EDGES_ENABLED_KEY: Name = EDGES_KEY + ENABLED_KEY
+        public val EDGES_MATERIAL_KEY: Name = EDGES_KEY + SolidMaterial.MATERIAL_KEY
+        public val WIREFRAME_ENABLED_KEY: Name = WIREFRAME_KEY + ENABLED_KEY
+        public val WIREFRAME_MATERIAL_KEY: Name = WIREFRAME_KEY + SolidMaterial.MATERIAL_KEY
     }
 }
 
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt
index 18f98942..b1a3d07b 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt
@@ -4,8 +4,8 @@ import hep.dataforge.vision.solid.Box
 import hep.dataforge.vision.solid.detail
 import info.laht.threekt.geometries.BoxBufferGeometry
 
-object ThreeBoxFactory : MeshThreeFactory<Box>(Box::class) {
-    override fun buildGeometry(obj: Box) =
+public object ThreeBoxFactory : MeshThreeFactory<Box>(Box::class) {
+    override fun buildGeometry(obj: Box): BoxBufferGeometry =
         obj.detail?.let { detail ->
             BoxBufferGeometry(obj.xSize, obj.ySize, obj.zSize, detail, detail, detail)
         } ?: BoxBufferGeometry(obj.xSize, obj.ySize, obj.zSize)
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
index 72db7ba4..f7243194 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
@@ -35,7 +35,6 @@ import org.w3c.dom.HTMLElement
 import org.w3c.dom.Node
 import org.w3c.dom.events.MouseEvent
 import kotlin.math.cos
-import kotlin.math.max
 import kotlin.math.sin
 
 /**
@@ -112,7 +111,10 @@ public class ThreeCanvas(
 
         element.appendChild(renderer.domElement)
 
-        renderer.setSize(max(options.minSize, element.clientWidth), max(options.minSize, element.clientWidth))
+        renderer.setSize(
+            element.clientWidth.coerceIn(options.minWith.toInt()..options.maxWith.toInt()),
+            element.clientHeight.coerceIn(options.minHeight.toInt()..options.maxHeight.toInt())
+        )
 
         window.onresize = {
             renderer.setSize(element.clientWidth, element.clientWidth)
@@ -238,7 +240,7 @@ public class ThreeCanvas(
     }
 
     public companion object {
-        public const val DO_NOT_HIGHLIGHT_TAG = "doNotHighlight"
+        public const val DO_NOT_HIGHLIGHT_TAG: String = "doNotHighlight"
         private const val HIGHLIGHT_NAME = "@highlight"
         private const val SELECT_NAME = "@select"
     }
@@ -251,7 +253,8 @@ public fun ThreePlugin.output(
 ): ThreeCanvas = ThreeCanvas(element, this, spec, onClick)
 
 public fun ThreePlugin.render(
-    element: HTMLElement, obj: Solid,
-    spec: Canvas3DOptions = Canvas3DOptions.empty(),
-    onClick: ((Name?) -> Unit)? = null,
-): Unit = output(element, spec, onClick).render(obj)
\ No newline at end of file
+    element: HTMLElement,
+    obj: Solid,
+    onSelect: ((Name?) -> Unit)? = null,
+    options: Canvas3DOptions.() -> Unit = {},
+): Unit = output(element, Canvas3DOptions(options), onSelect).render(obj)
\ No newline at end of file
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt
index 793a3c1a..90027451 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt
@@ -9,17 +9,17 @@ import info.laht.threekt.geometries.PlaneBufferGeometry
 import info.laht.threekt.materials.MeshBasicMaterial
 import info.laht.threekt.objects.Mesh
 import info.laht.threekt.textures.Texture
+import kotlinx.browser.document
 import org.w3c.dom.CanvasRenderingContext2D
 import org.w3c.dom.CanvasTextBaseline
 import org.w3c.dom.HTMLCanvasElement
 import org.w3c.dom.MIDDLE
-import kotlin.browser.document
 import kotlin.reflect.KClass
 
 /**
  * Using example from http://stemkoski.github.io/Three.js/Texture-From-Canvas.html
  */
-object ThreeCanvasLabelFactory : ThreeFactory<SolidLabel> {
+public object ThreeCanvasLabelFactory : ThreeFactory<SolidLabel> {
     override val type: KClass<in SolidLabel> get() = SolidLabel::class
 
     override fun invoke(obj: SolidLabel): Object3D {
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt
index 59c513a5..ffe249d2 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt
@@ -8,7 +8,7 @@ import info.laht.threekt.objects.Mesh
 /**
  * This should be inner, because it uses object builder
  */
-class ThreeCompositeFactory(val three: ThreePlugin) : MeshThreeFactory<Composite>(Composite::class) {
+public class ThreeCompositeFactory(public val three: ThreePlugin) : MeshThreeFactory<Composite>(Composite::class) {
 
     override fun buildGeometry(obj: Composite): BufferGeometry {
         val first = three.buildObject3D(obj.first) as? Mesh ?: error("First part of composite is not a mesh")
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt
index 6652047e..0f5160f8 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt
@@ -4,7 +4,7 @@ import hep.dataforge.vision.solid.Convex
 import info.laht.threekt.external.geometries.ConvexBufferGeometry
 import info.laht.threekt.math.Vector3
 
-object ThreeConvexFactory : MeshThreeFactory<Convex>(Convex::class) {
+public object ThreeConvexFactory : MeshThreeFactory<Convex>(Convex::class) {
     override fun buildGeometry(obj: Convex): ConvexBufferGeometry {
         @Suppress("USELESS_CAST") val vectors = obj.points.toTypedArray() as Array<Vector3>
         return ConvexBufferGeometry(vectors)
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt
index 9ba89cbf..00154c88 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt
@@ -7,7 +7,7 @@ import info.laht.threekt.geometries.CylinderBufferGeometry
 import kotlin.math.PI
 import kotlin.math.pow
 
-object ThreeCylinderFactory : MeshThreeFactory<ConeSegment>(ConeSegment::class) {
+public object ThreeCylinderFactory : MeshThreeFactory<ConeSegment>(ConeSegment::class) {
     override fun buildGeometry(obj: ConeSegment): BufferGeometry {
         val cylinder =  obj.detail?.let {
             val segments = it.toDouble().pow(0.5).toInt()
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
index 28bb21d6..d01eed4c 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
@@ -18,21 +18,21 @@ import kotlin.reflect.KClass
  * Builder and updater for three.js object
  */
 @Type(TYPE)
-interface ThreeFactory<in T : Vision> {
+public interface ThreeFactory<in T : Vision> {
 
-    val type: KClass<in T>
+    public val type: KClass<in T>
 
-    operator fun invoke(obj: T): Object3D
+    public operator fun invoke(obj: T): Object3D
 
-    companion object {
-        const val TYPE = "threeFactory"
+    public companion object {
+        public const val TYPE: String = "threeFactory"
     }
 }
 
 /**
  * Update position, rotation and visibility
  */
-fun Object3D.updatePosition(obj: Vision) {
+public fun Object3D.updatePosition(obj: Vision) {
     visible = obj.visible ?: true
     if(obj is Solid) {
         position.set(obj.x, obj.y, obj.z)
@@ -45,7 +45,7 @@ fun Object3D.updatePosition(obj: Vision) {
 /**
  * Update non-position non-geometry property
  */
-fun Object3D.updateProperty(source: Vision, propertyName: Name) {
+public fun Object3D.updateProperty(source: Vision, propertyName: Name) {
     if (this is Mesh && propertyName.startsWith(MATERIAL_KEY)) {
         this.material = getMaterial(source, false)
     } else if (
@@ -63,7 +63,7 @@ fun Object3D.updateProperty(source: Vision, propertyName: Name) {
 /**
  * Generic factory for elements which provide inside geometry builder
  */
-object ThreeShapeFactory : MeshThreeFactory<GeometrySolid>(GeometrySolid::class) {
+public object ThreeShapeFactory : MeshThreeFactory<GeometrySolid>(GeometrySolid::class) {
     override fun buildGeometry(obj: GeometrySolid): BufferGeometry {
         return obj.run {
             ThreeGeometryBuilder().apply { toGeometry(this) }.build()
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
index dad40782..ecea5d23 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
@@ -12,7 +12,7 @@ import kotlin.reflect.KClass
 /**
  *
  */
-object ThreeLabelFactory : ThreeFactory<SolidLabel> {
+public object ThreeLabelFactory : ThreeFactory<SolidLabel> {
     override val type: KClass<in SolidLabel> get() = SolidLabel::class
 
     override fun invoke(obj: SolidLabel): Object3D {
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
index a032f527..5954a5a3 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
@@ -10,7 +10,7 @@ import info.laht.threekt.math.Color
 import info.laht.threekt.objects.LineSegments
 import kotlin.reflect.KClass
 
-object ThreeLineFactory : ThreeFactory<PolyLine> {
+public object ThreeLineFactory : ThreeFactory<PolyLine> {
     override val type: KClass<PolyLine> get() = PolyLine::class
 
     override fun invoke(obj: PolyLine): Object3D {
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index 546cb882..b3a9200e 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -11,7 +11,7 @@ import kotlin.collections.set
 import kotlin.reflect.KClass
 import info.laht.threekt.objects.Group as ThreeGroup
 
-class ThreePlugin : AbstractPlugin() {
+public class ThreePlugin : AbstractPlugin() {
     override val tag: PluginTag get() = Companion.tag
 
     private val objectFactories = HashMap<KClass<out Solid>, ThreeFactory<*>>()
@@ -35,9 +35,9 @@ class ThreePlugin : AbstractPlugin() {
                 as ThreeFactory<Solid>?
     }
 
-    fun buildObject3D(obj: Solid): Object3D {
+    public fun buildObject3D(obj: Solid): Object3D {
         return when (obj) {
-            is ThreeVision -> obj.toObject3D()
+            is ThreeVision -> obj.render()
             is Proxy -> proxyFactory(obj)
             is SolidGroup -> {
                 val group = ThreeGroup()
@@ -69,17 +69,17 @@ class ThreePlugin : AbstractPlugin() {
                         }
                     }
 
-                    obj.onChildrenChange(this) { name, child ->
-                        if (name.isEmpty()) {
-                            logger.error { "Children change with empty name on $group" }
-                            return@onChildrenChange
-                        }
+                    obj.onChildrenChange(this) { nameToken, child ->
+//                        if (name.isEmpty()) {
+//                            logger.error { "Children change with empty name on $group" }
+//                            return@onChildrenChange
+//                        }
 
 //                        val parentName = name.cutLast()
 //                        val childName = name.last()!!
 
                         //removing old object
-                        findChild(name)?.let { oldChild ->
+                        findChild(nameToken.asName())?.let { oldChild ->
                             oldChild.parent?.remove(oldChild)
                         }
 
@@ -87,7 +87,7 @@ class ThreePlugin : AbstractPlugin() {
                         if (child != null && child is Solid) {
                             try {
                                 val object3D = buildObject3D(child)
-                                set(name, object3D)
+                                set(nameToken, object3D)
                             } catch (ex: Throwable) {
                                 logger.error(ex) { "Failed to render $child" }
                             }
@@ -108,10 +108,10 @@ class ThreePlugin : AbstractPlugin() {
         }
     }
 
-    companion object : PluginFactory<ThreePlugin> {
-        override val tag = PluginTag("visual.three", PluginTag.DATAFORGE_GROUP)
-        override val type = ThreePlugin::class
-        override fun invoke(meta: Meta, context: Context) = ThreePlugin()
+    public companion object : PluginFactory<ThreePlugin> {
+        override val tag: PluginTag = PluginTag("visual.three", PluginTag.DATAFORGE_GROUP)
+        override val type: KClass<ThreePlugin> = ThreePlugin::class
+        override fun invoke(meta: Meta, context: Context): ThreePlugin = ThreePlugin()
     }
 }
 
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
index b6321d25..b1b17fe6 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
@@ -11,7 +11,7 @@ import info.laht.threekt.core.Object3D
 import info.laht.threekt.objects.Mesh
 import kotlin.reflect.KClass
 
-class ThreeProxyFactory(val three: ThreePlugin) : ThreeFactory<Proxy> {
+public class ThreeProxyFactory(public val three: ThreePlugin) : ThreeFactory<Proxy> {
     private val cache = HashMap<Solid, Object3D>()
 
     override val type: KClass<Proxy> = Proxy::class
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt
index ffed6a45..37910fc9 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt
@@ -5,7 +5,7 @@ import hep.dataforge.vision.solid.detail
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.geometries.SphereBufferGeometry
 
-object ThreeSphereFactory : MeshThreeFactory<Sphere>(Sphere::class) {
+public object ThreeSphereFactory : MeshThreeFactory<Sphere>(Sphere::class) {
     override fun buildGeometry(obj: Sphere): BufferGeometry {
         return obj.detail?.let {detail ->
             SphereBufferGeometry(
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
index a96e39e4..8c8362a0 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
@@ -8,11 +8,6 @@ import kotlinx.serialization.Serializable
 /**
  * A custom visual object that has its own Three.js renderer
  */
-public interface ThreeVision : Solid {
-    public fun toObject3D(): Object3D
+public abstract class ThreeVision : BasicSolid() {
+    public abstract fun render(): Object3D
 }
-
-@Serializable
-public class CustomThreeVision(public val threeFactory: ThreeFactory<Solid>) : BasicSolid(), ThreeVision {
-    override fun toObject3D(): Object3D = threeFactory(this)
-}
\ No newline at end of file

From fdc221dfa130239350163bae74d8ab8e76b5168d Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 9 Nov 2020 19:51:57 +0300
Subject: [PATCH 021/151] controls redesign

---
 .../vision/gdml/demo/GDMLAppComponent.kt      | 137 ++++---
 demo/gdml/src/jsMain/resources/index.html     |   2 +-
 demo/muon-monitor/build.gradle.kts            |   2 +-
 .../mipt/npm/muon/monitor/MMAppComponent.kt   |  16 +-
 .../ru/mipt/npm/muon/monitor/MMDemoApp.kt     |   6 +-
 playground/src/jsMain/kotlin/PlayGroundApp.kt |   2 +-
 .../dataforge/vision/bootstrap/bootstrap.kt   | 338 ++++++------------
 .../vision/bootstrap/outputConfig.kt          | 189 ++++------
 .../vision/bootstrap/reactBootstrap.kt        | 182 ++++++++++
 .../vision/bootstrap/tabComponent.kt          |  95 +++++
 .../vision/bootstrap/threeControls.kt         |  81 +++++
 ui/react/build.gradle.kts                     |   3 +-
 .../vision/react}/ThreeCanvasComponent.kt     |  58 +--
 .../hep/dataforge/vision/react/TreeStyles.kt  |   2 +-
 visionforge-core/build.gradle.kts             |   2 +-
 .../solid/specifications/Canvas3DOptions.kt   |  10 +-
 .../vision/solid/three/DatCanvasControls.kt   |   5 +
 .../vision/solid/three/ThreeCanvas.kt         |  50 ++-
 .../hep/dataforge/vision/solid/three/three.kt |   9 +-
 19 files changed, 687 insertions(+), 502 deletions(-)
 create mode 100644 ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/reactBootstrap.kt
 create mode 100644 ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt
 create mode 100644 ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
 rename {visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three => ui/react/src/main/kotlin/hep/dataforge/vision/react}/ThreeCanvasComponent.kt (52%)
 create mode 100644 visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/DatCanvasControls.kt

diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index 828641d9..f2c4864c 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -2,29 +2,31 @@ package hep.dataforge.vision.gdml.demo
 
 import hep.dataforge.context.Context
 import hep.dataforge.names.Name
-import hep.dataforge.names.isEmpty
 import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionGroup
-import hep.dataforge.vision.bootstrap.*
+import hep.dataforge.vision.bootstrap.card
+import hep.dataforge.vision.bootstrap.nameCrumbs
+import hep.dataforge.vision.bootstrap.threeControls
 import hep.dataforge.vision.gdml.toVision
-import hep.dataforge.vision.react.objectTree
+import hep.dataforge.vision.react.ThreeCanvasComponent
+import hep.dataforge.vision.react.flexColumn
+import hep.dataforge.vision.react.flexRow
 import hep.dataforge.vision.solid.Solid
-import hep.dataforge.vision.solid.SolidGroup
 import hep.dataforge.vision.solid.SolidManager
 import hep.dataforge.vision.solid.three.ThreeCanvas
-import hep.dataforge.vision.solid.three.ThreeCanvasComponent
 import kotlinx.browser.window
-import kotlinx.css.FlexBasis
-import kotlinx.css.Overflow
-import kotlinx.css.flex
-import kotlinx.css.overflow
+import kotlinx.css.*
+import kotlinx.css.properties.border
 import kscience.gdml.GDML
 import kscience.gdml.decodeFromString
 import org.w3c.files.FileReader
 import org.w3c.files.get
-import react.*
+import react.RProps
+import react.child
 import react.dom.h1
+import react.functionalComponent
+import react.useState
 import styled.css
+import styled.styledDiv
 
 external interface GDMLAppProps : RProps {
     var context: Context
@@ -46,7 +48,7 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
     var canvas: ThreeCanvas? by useState { null }
     var vision: Vision? by useState { props.rootObject }
 
-    val select: (Name?) -> Unit = {
+    val onSelect: (Name?) -> Unit = {
         selected = it
     }
 
@@ -67,20 +69,56 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
         vision = parsedVision
     }
 
-    gridColumn {
+    flexColumn {
         css {
-            flex(1.0, 1.0, FlexBasis.auto)
+            height = 100.pct
+            width = 100.pct
         }
-        h1 { +"GDML/JSON loader demo" }
-        gridRow {
+        styledDiv {
             css {
-                +"p-1"
-                overflow = Overflow.auto
+                +"page-header"
+                +"justify-content-center"
             }
-            gridColumn(3, maxSize = GridMaxSize.XL) {
+            h1 { +"GDML/JSON loader demo" }
+        }
+        flexRow {
+            css {
+                flex(1.0, 1.0, FlexBasis.auto)
+                flexWrap = FlexWrap.wrap
+            }
+
+            flexColumn {
                 css {
-                    +"order-2"
-                    +"order-xl-1"
+                    flex(1.0, 1.0, FlexBasis.auto)
+                    margin(10.px)
+                }
+                nameCrumbs(selected, "World", onSelect)
+
+                //canvas
+                styledDiv {
+                    css {
+                        flex(1.0, 1.0, FlexBasis.auto)
+                    }
+                    child(ThreeCanvasComponent) {
+                        attrs {
+                            this.context = props.context
+                            this.obj = vision as? Solid
+                            this.selected = selected
+                            this.clickCallback = onSelect
+                            this.canvasCallback = {
+                                canvas = it
+                            }
+                        }
+                    }
+                }
+            }
+            flexColumn {
+                css {
+                    minWidth = 500.px
+                    maxHeight = 100.pct
+                    flex(1.0, 1.0, FlexBasis.zero)
+                    margin(left = 4.px, right = 4.px)
+                    border(1.px, BorderStyle.solid, Color.lightGray)
                 }
                 card("Load data") {
                     fileDrop("(drag file here)") { files ->
@@ -97,61 +135,8 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
                         }
                     }
                 }
-                //tree
-                card("Object tree") {
-                    vision?.let {
-                        objectTree(it, selected, select)
-                    }
-                }
-            }
-
-            gridColumn(6, maxSize = GridMaxSize.XL) {
-                css {
-                    +"order-1"
-                    +"order-xl-2"
-                }
-                //canvas
-                child(ThreeCanvasComponent) {
-                    attrs {
-                        this.context = props.context
-                        this.obj = vision as? Solid
-                        this.selected = selected
-                        this.clickCallback = select
-                        this.canvasCallback = {
-                            canvas = it
-                        }
-                    }
-                }
-            }
-            gridColumn(3, maxSize = GridMaxSize.XL) {
-                css {
-                    +"order-3"
-                }
-                container {
-                    //settings
-                    canvas?.let {
-                        card("Canvas configuration") {
-                            canvasControls(it)
-                        }
-                    }
-                }
-                container {
-                    //properties
-                    namecrumbs(selected, "World") { selected = it }
-                    selected.let { selected ->
-                        val selectedObject: Vision? = when {
-                            selected == null -> null
-                            selected.isEmpty() -> vision
-                            else -> (vision as? VisionGroup)?.get(selected)
-                        }
-                        if (selectedObject != null) {
-                            visionPropertyEditor(
-                                selectedObject,
-                                default = selectedObject.getAllProperties(),
-                                key = selected
-                            )
-                        }
-                    }
+                canvas?.let {
+                    threeControls(it, selected, onSelect)
                 }
             }
         }
diff --git a/demo/gdml/src/jsMain/resources/index.html b/demo/gdml/src/jsMain/resources/index.html
index 14bb3178..74e27a96 100644
--- a/demo/gdml/src/jsMain/resources/index.html
+++ b/demo/gdml/src/jsMain/resources/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <!--    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">-->
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Three js demo for particle physics</title>
     <link rel="stylesheet" href="css/bootstrap.min.css">
     <link rel="stylesheet" href="css/main.css">
diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts
index 1f44169d..ba7092f0 100644
--- a/demo/muon-monitor/build.gradle.kts
+++ b/demo/muon-monitor/build.gradle.kts
@@ -48,7 +48,7 @@ kotlin {
             dependencies {
                 implementation(project(":ui:bootstrap"))
                 implementation("io.ktor:ktor-client-js:$ktorVersion")
-                implementation("io.ktor:ktor-client-serialization-js:$ktorVersion")
+                implementation("io.ktor:ktor-client-serialization:$ktorVersion")
             }
         }
     }
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
index 527c2b77..9917d75a 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
@@ -8,19 +8,24 @@ import hep.dataforge.names.length
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.bootstrap.canvasControls
 import hep.dataforge.vision.bootstrap.card
+import hep.dataforge.vision.react.ThreeCanvasComponent
 import hep.dataforge.vision.react.configEditor
 import hep.dataforge.vision.react.objectTree
 import hep.dataforge.vision.solid.specifications.Camera
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.solid.three.ThreeCanvas
-import hep.dataforge.vision.solid.three.ThreeCanvasComponent
 import io.ktor.client.HttpClient
 import io.ktor.client.request.get
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import kotlinx.css.height
+import kotlinx.css.pct
 import kotlinx.html.js.onClickFunction
-import react.*
+import react.RProps
+import react.child
 import react.dom.*
+import react.functionalComponent
+import react.useState
 import styled.css
 import styled.styledDiv
 import kotlin.math.PI
@@ -62,13 +67,18 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                 +"col-lg-3"
                 +"px-0"
                 +"overflow-auto"
+                +"h-100"
             }
             //tree
             card("Object tree") {
                 objectTree(root, selected, select)
             }
         }
-        div("col-lg-6") {
+        styledDiv {
+            css {
+                +"col-lg-6"
+                height = 100.pct
+            }
             //canvas
             child(ThreeCanvasComponent) {
                 attrs {
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
index 282050d2..2fabd0d8 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
@@ -3,12 +3,10 @@ package ru.mipt.npm.muon.monitor
 import hep.dataforge.context.Global
 import hep.dataforge.js.Application
 import hep.dataforge.js.startApplication
-import hep.dataforge.vision.solid.SolidManager
 import io.ktor.client.HttpClient
 import io.ktor.client.features.json.JsonFeature
 import io.ktor.client.features.json.serializer.KotlinxSerializer
 import kotlinx.browser.document
-import kotlinx.serialization.json.Json
 import react.child
 import react.dom.div
 import react.dom.render
@@ -19,12 +17,10 @@ private class MMDemoApp : Application {
 
     private val connection = HttpClient {
         install(JsonFeature) {
-            serializer = KotlinxSerializer(Json { serializersModule = SolidManager.serializersModuleForSolids })
+            serializer = KotlinxSerializer()
         }
     }
 
-    //TODO introduce react application
-
     override fun start(state: Map<String, Any>) {
 
         val context = Global.context("demo") {}
diff --git a/playground/src/jsMain/kotlin/PlayGroundApp.kt b/playground/src/jsMain/kotlin/PlayGroundApp.kt
index 72196672..4542a9e9 100644
--- a/playground/src/jsMain/kotlin/PlayGroundApp.kt
+++ b/playground/src/jsMain/kotlin/PlayGroundApp.kt
@@ -2,10 +2,10 @@ import hep.dataforge.context.Global
 import hep.dataforge.js.Application
 import hep.dataforge.js.startApplication
 import hep.dataforge.vision.bootstrap.visionPropertyEditor
+import hep.dataforge.vision.react.ThreeCanvasComponent
 import hep.dataforge.vision.react.objectTree
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
-import hep.dataforge.vision.solid.three.ThreeCanvasComponent
 import hep.dataforge.vision.solid.three.ThreePlugin
 import kotlinx.browser.document
 import org.w3c.dom.HTMLElement
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt
index 14efcccb..9ebdca64 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt
@@ -1,238 +1,116 @@
 package hep.dataforge.vision.bootstrap
 
-import hep.dataforge.names.Name
-import hep.dataforge.names.NameToken
-import hep.dataforge.names.length
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.react.ObjectTree
-import kotlinx.html.*
-import kotlinx.html.js.div
-import kotlinx.html.js.onClickFunction
-import org.w3c.dom.Element
-import org.w3c.dom.HTMLElement
-import react.RBuilder
-import react.ReactElement
-import react.child
-import react.dom.*
-import styled.StyledDOMBuilder
-import styled.css
-import styled.styledDiv
+//public inline fun TagConsumer<HTMLElement>.card(title: String, crossinline block: TagConsumer<HTMLElement>.() -> Unit) {
+//    div("card w-100") {
+//        div("card-body") {
+//            h3(classes = "card-title") { +title }
+//            block()
+//        }
+//    }
+//}
 
-public inline fun TagConsumer<HTMLElement>.card(title: String, crossinline block: TagConsumer<HTMLElement>.() -> Unit) {
-    div("card w-100") {
-        div("card-body") {
-            h3(classes = "card-title") { +title }
-            block()
-        }
-    }
-}
-
-public inline fun RBuilder.card(title: String, classes: String? = null, crossinline block: RBuilder.() -> Unit) {
-    div("card w-100 $classes") {
-        div("card-body") {
-            h3(classes = "card-title") {
-                +title
-            }
-            block()
-        }
-    }
-}
-
-public fun TagConsumer<HTMLElement>.accordion(id: String, elements: List<Pair<String, DIV.() -> Unit>>) {
-    div("container-fluid") {
-        div("accordion") {
-            this.id = id
-            elements.forEachIndexed { index, (title, builder) ->
-                val headerID = "${id}-${index}-heading"
-                val collapseID = "${id}-${index}-collapse"
-                div("card") {
-                    div("card-header") {
-                        this.id = headerID
-                        h5("mb-0") {
-                            button(classes = "btn btn-link collapsed", type = ButtonType.button) {
-                                attributes["data-toggle"] = "collapse"
-                                attributes["data-target"] = "#$collapseID"
-                                attributes["aria-expanded"] = "false"
-                                attributes["aria-controls"] = collapseID
-                                +title
-                            }
-                        }
-                    }
-                    div("collapse") {
-                        this.id = collapseID
-                        attributes["aria-labelledby"] = headerID
-                        attributes["data-parent"] = "#$id"
-                        div("card-body", block = builder)
-                    }
-                }
-            }
-        }
-    }
-}
-
-public typealias AccordionBuilder = MutableList<Pair<String, DIV.() -> Unit>>
-
-public fun AccordionBuilder.entry(title: String, builder: DIV.() -> Unit) {
-    add(title to builder)
-}
-
-public fun TagConsumer<HTMLElement>.accordion(id: String, builder: AccordionBuilder.() -> Unit) {
-    val list = ArrayList<Pair<String, DIV.() -> Unit>>().apply(builder)
-    accordion(id, list)
-}
-
-public fun RBuilder.accordion(id: String, elements: List<Pair<String, RDOMBuilder<DIV>.() -> Unit>>): ReactElement {
-    return div("container-fluid") {
-        div("accordion") {
-            attrs {
-                this.id = id
-            }
-            elements.forEachIndexed { index, (title, builder) ->
-                val headerID = "${id}-${index}-heading"
-                val collapseID = "${id}-${index}-collapse"
-                div("card p-0 m-0") {
-                    div("card-header") {
-                        attrs {
-                            this.id = headerID
-                        }
-                        h5("mb-0") {
-                            button(classes = "btn btn-link collapsed", type = ButtonType.button) {
-                                attrs {
-                                    attributes["data-toggle"] = "collapse"
-                                    attributes["data-target"] = "#$collapseID"
-                                    attributes["aria-expanded"] = "false"
-                                    attributes["aria-controls"] = collapseID
-                                }
-                                +title
-                            }
-                        }
-                    }
-                    div("collapse") {
-                        attrs {
-                            this.id = collapseID
-                            attributes["aria-labelledby"] = headerID
-                            attributes["data-parent"] = "#$id"
-                        }
-                        div("card-body", block = builder)
-                    }
-                }
-            }
-        }
-    }
-}
-
-public fun RBuilder.namecrumbs(name: Name?, rootTitle: String, link: (Name) -> Unit) {
-    div("container-fluid p-0") {
-        nav {
-            attrs {
-                attributes["aria-label"] = "breadcrumb"
-            }
-            ol("breadcrumb") {
-                li("breadcrumb-item") {
-                    button(classes = "btn btn-link p-0") {
-                        +rootTitle
-                        attrs {
-                            onClickFunction = {
-                                link(Name.EMPTY)
-                            }
-                        }
-                    }
-                }
-                if (name != null) {
-                    val tokens = ArrayList<NameToken>(name.length)
-                    name.tokens.forEach { token ->
-                        tokens.add(token)
-                        val fullName = Name(tokens.toList())
-                        li("breadcrumb-item") {
-                            button(classes = "btn btn-link p-0") {
-                                +token.toString()
-                                attrs {
-                                    onClickFunction = {
-                                        console.log("Selected = $fullName")
-                                        link(fullName)
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-public typealias RAccordionBuilder = MutableList<Pair<String, RDOMBuilder<DIV>.() -> Unit>>
-
-public fun RAccordionBuilder.entry(title: String, builder: RDOMBuilder<DIV>.() -> Unit) {
-    add(title to builder)
-}
-
-public fun RBuilder.accordion(id: String, builder: RAccordionBuilder.() -> Unit): ReactElement {
-    val list = ArrayList<Pair<String, RDOMBuilder<DIV>.() -> Unit>>().apply(builder)
-    return accordion(id, list)
-}
-
-public enum class ContainerSize(public val suffix: String) {
-    DEFAULT(""),
-    SM("-sm"),
-    MD("-md"),
-    LG("-lg"),
-    XL("-xl"),
-    FLUID("-fluid")
-}
-
-public inline fun RBuilder.container(
-    size: ContainerSize = ContainerSize.FLUID,
-    block: StyledDOMBuilder<DIV>.() -> Unit
-): ReactElement = styledDiv{
-    css{
-        classes.add("container${size.suffix}")
-    }
-    block()
-}
+//public typealias SectionsBuilder = MutableList<Pair<String, DIV.() -> Unit>>
+//
+//public fun SectionsBuilder.entry(title: String, builder: DIV.() -> Unit) {
+//    add(title to builder)
+//}
 
 
-public enum class GridMaxSize(public val suffix: String) {
-    NONE(""),
-    SM("-sm"),
-    MD("-md"),
-    LG("-lg"),
-    XL("-xl")
-}
+//public fun TagConsumer<HTMLElement>.accordion(id: String, elements: List<Pair<String, DIV.() -> Unit>>) {
+//    div("container-fluid") {
+//        div("accordion") {
+//            this.id = id
+//            elements.forEachIndexed { index, (title, builder) ->
+//                val headerID = "${id}-${index}-heading"
+//                val collapseID = "${id}-${index}-collapse"
+//                div("card") {
+//                    div("card-header") {
+//                        this.id = headerID
+//                        h5("mb-0") {
+//                            button(classes = "btn btn-link collapsed", type = ButtonType.button) {
+//                                attributes["data-toggle"] = "collapse"
+//                                attributes["data-target"] = "#$collapseID"
+//                                attributes["aria-expanded"] = "false"
+//                                attributes["aria-controls"] = collapseID
+//                                +title
+//                            }
+//                        }
+//                    }
+//                    div("collapse") {
+//                        this.id = collapseID
+//                        attributes["aria-labelledby"] = headerID
+//                        attributes["data-parent"] = "#$id"
+//                        div("card-body", block = builder)
+//                    }
+//                }
+//            }
+//        }
+//    }
+//}
 
-public inline fun RBuilder.gridColumn(
-    weight: Int? = null,
-    maxSize: GridMaxSize = GridMaxSize.NONE,
-    block: StyledDOMBuilder<DIV>.() -> Unit
-): ReactElement = styledDiv {
-    val weightSuffix = weight?.let { "-$it" } ?: ""
-    css {
-        classes.add("col${maxSize.suffix}$weightSuffix")
-    }
-    block()
-}
 
-public inline fun RBuilder.gridRow(
-    block: StyledDOMBuilder<DIV>.() -> Unit
-): ReactElement = styledDiv{
-    css{
-        classes.add("row")
-    }
-    block()
-}
+//public fun TagConsumer<HTMLElement>.accordion(id: String, builder: AccordionBuilder.() -> Unit) {
+//    val list = ArrayList<Pair<String, DIV.() -> Unit>>().apply(builder)
+//    accordion(id, list)
+//}
 
-public fun Element.renderObjectTree(
-    vision: Vision,
-    clickCallback: (Name) -> Unit = {}
-): Unit = render(this) {
-    card("Object tree") {
-        child(ObjectTree) {
-            attrs {
-                this.name = Name.EMPTY
-                this.obj = vision
-                this.selected = null
-                this.clickCallback = clickCallback
-            }
-        }
-    }
-}
\ No newline at end of file
+//public fun Element.displayCanvasControls(canvas: ThreeCanvas, block: TagConsumer<HTMLElement>.() -> Unit = {}) {
+//    clear()
+//    append {
+//        accordion("controls") {
+//            entry("Settings") {
+//                div("row") {
+//                    div("col-2") {
+//                        label("checkbox-inline") {
+//                            input(type = InputType.checkBox) {
+//                                checked = canvas.axes.visible
+//                                onChangeFunction = {
+//                                    canvas.axes.visible = checked
+//                                }
+//                            }
+//                            +"Axes"
+//                        }
+//                    }
+//                    div("col-1") {
+//                        button {
+//                            +"Export"
+//                            onClickFunction = {
+//                                val json = (canvas.content as? SolidGroup)?.let { group ->
+//                                    val visionManager = canvas.context.plugins.fetch(SolidManager).visionManager
+//                                    visionManager.encodeToString(group)
+//                                }
+//                                if (json != null) {
+//                                    saveData(it, "object.json", "text/json") {
+//                                        json
+//                                    }
+//                                }
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//            entry("Layers") {
+//                div("row") {
+//                    (0..11).forEach { layer ->
+//                        div("col-1") {
+//                            label { +layer.toString() }
+//                            input(type = InputType.checkBox) {
+//                                if (layer == 0) {
+//                                    checked = true
+//                                }
+//                                onChangeFunction = {
+//                                    if (checked) {
+//                                        canvas.camera.layers.enable(layer)
+//                                    } else {
+//                                        canvas.camera.layers.disable(layer)
+//                                    }
+//                                }
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//        block()
+//    }
+//}
\ No newline at end of file
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
index 4d039b92..3a64ef7f 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
@@ -1,24 +1,26 @@
 package hep.dataforge.vision.bootstrap
 
+import hep.dataforge.vision.react.flexColumn
+import hep.dataforge.vision.react.flexRow
 import hep.dataforge.vision.solid.SolidGroup
 import hep.dataforge.vision.solid.SolidManager
 import hep.dataforge.vision.solid.three.ThreeCanvas
-import kotlinx.dom.clear
-import kotlinx.html.*
-import kotlinx.html.dom.append
+import kotlinx.css.*
+import kotlinx.css.properties.border
+import kotlinx.html.InputType
 import kotlinx.html.js.onChangeFunction
 import kotlinx.html.js.onClickFunction
-import org.w3c.dom.Element
-import org.w3c.dom.HTMLElement
 import org.w3c.dom.HTMLInputElement
 import org.w3c.dom.events.Event
 import org.w3c.files.Blob
 import org.w3c.files.BlobPropertyBag
 import react.*
 import react.dom.button
-import react.dom.div
+import react.dom.h3
 import react.dom.input
 import react.dom.label
+import styled.css
+import styled.styledDiv
 
 private fun saveData(event: Event, fileName: String, mimeType: String = "text/plain", dataBuilder: () -> String) {
     event.stopPropagation();
@@ -30,8 +32,8 @@ private fun saveData(event: Event, fileName: String, mimeType: String = "text/pl
 }
 
 public fun RBuilder.canvasControls(canvas: ThreeCanvas): ReactElement {
-    return child(CanvasControls){
-        attrs{
+    return child(CanvasControls) {
+        attrs {
             this.canvas = canvas
         }
     }
@@ -41,39 +43,75 @@ public external interface CanvasControlsProps : RProps {
     public var canvas: ThreeCanvas
 }
 
-public val CanvasControls: FunctionalComponent<CanvasControlsProps> = functionalComponent ("CanvasControls") { props ->
+public val CanvasControls: FunctionalComponent<CanvasControlsProps> = functionalComponent("CanvasControls") { props ->
     val visionManager = useMemo(
         { props.canvas.context.plugins.fetch(SolidManager).visionManager },
         arrayOf(props.canvas)
     )
-    accordion("controls") {
-        entry("Settings") {
-            div("row") {
-                div("col-2") {
-                    label("checkbox-inline") {
-                        input(type = InputType.checkBox) {
-                            attrs {
-                                defaultChecked = props.canvas.axes.visible
-                                onChangeFunction = {
-                                    props.canvas.axes.visible = (it.target as HTMLInputElement).checked
-                                }
-                            }
+    flexColumn {
+        h3 { +"Axes" }
+        flexRow {
+            css{
+                border(1.px,BorderStyle.solid, Color.blue)
+                padding(4.px)
+            }
+            label("checkbox-inline") {
+                input(type = InputType.checkBox) {
+                    attrs {
+                        defaultChecked = props.canvas.axes.visible
+                        onChangeFunction = {
+                            props.canvas.axes.visible = (it.target as HTMLInputElement).checked
                         }
-                        +"Axes"
                     }
                 }
-                div("col-1") {
-                    button {
-                        +"Export"
+                +"Axes"
+            }
+        }
+        h3 { +"Export" }
+        flexRow {
+            css{
+                border(1.px,BorderStyle.solid, Color.blue)
+                padding(4.px)
+            }
+            button {
+                +"Export"
+                attrs {
+                    onClickFunction = {
+                        val json = (props.canvas.content as? SolidGroup)?.let { group ->
+                            visionManager.encodeToString(group)
+                        }
+                        if (json != null) {
+                            saveData(it, "object.json", "text/json") {
+                                json
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        h3 { +"Layers" }
+        flexRow {
+            css {
+                flexWrap = FlexWrap.wrap
+                border(1.px,BorderStyle.solid, Color.blue)
+                padding(4.px)
+            }
+            (0..31).forEach { layer ->
+                styledDiv {
+                    css{
+                        padding(4.px)
+                    }
+                    label { +layer.toString() }
+                    input(type = InputType.checkBox) {
                         attrs {
-                            onClickFunction = {
-                                val json = (props.canvas.content as? SolidGroup)?.let { group ->
-                                    visionManager.encodeToString(group)
-                                }
-                                if (json != null) {
-                                    saveData(it, "object.json", "text/json") {
-                                        json
-                                    }
+                            if (layer == 0) {
+                                defaultChecked = true
+                            }
+                            onChangeFunction = {
+                                if ((it.target as HTMLInputElement).checked) {
+                                    props.canvas.camera.layers.enable(layer)
+                                } else {
+                                    props.canvas.camera.layers.disable(layer)
                                 }
                             }
                         }
@@ -81,90 +119,5 @@ public val CanvasControls: FunctionalComponent<CanvasControlsProps> = functional
                 }
             }
         }
-        entry("Layers") {
-            div("row") {
-                (0..11).forEach { layer ->
-                    div("col-1") {
-                        label { +layer.toString() }
-                        input(type = InputType.checkBox) {
-                            attrs {
-                                if (layer == 0) {
-                                    defaultChecked = true
-                                }
-                                onChangeFunction = {
-                                    if ((it.target as HTMLInputElement).checked) {
-                                        props.canvas.camera.layers.enable(layer)
-                                    } else {
-                                        props.canvas.camera.layers.disable(layer)
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-
-public fun Element.displayCanvasControls(canvas: ThreeCanvas, block: TagConsumer<HTMLElement>.() -> Unit = {}) {
-    clear()
-    append {
-        accordion("controls") {
-            entry("Settings") {
-                div("row") {
-                    div("col-2") {
-                        label("checkbox-inline") {
-                            input(type = InputType.checkBox) {
-                                checked = canvas.axes.visible
-                                onChangeFunction = {
-                                    canvas.axes.visible = checked
-                                }
-                            }
-                            +"Axes"
-                        }
-                    }
-                    div("col-1") {
-                        button {
-                            +"Export"
-                            onClickFunction = {
-                                val json = (canvas.content as? SolidGroup)?.let { group ->
-                                    val visionManager = canvas.context.plugins.fetch(SolidManager).visionManager
-                                    visionManager.encodeToString(group)
-                                }
-                                if (json != null) {
-                                    saveData(it, "object.json", "text/json") {
-                                        json
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            entry("Layers") {
-                div("row") {
-                    (0..11).forEach { layer ->
-                        div("col-1") {
-                            label { +layer.toString() }
-                            input(type = InputType.checkBox) {
-                                if (layer == 0) {
-                                    checked = true
-                                }
-                                onChangeFunction = {
-                                    if (checked) {
-                                        canvas.camera.layers.enable(layer)
-                                    } else {
-                                        canvas.camera.layers.disable(layer)
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        block()
     }
 }
\ No newline at end of file
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/reactBootstrap.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/reactBootstrap.kt
new file mode 100644
index 00000000..d17dcac3
--- /dev/null
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/reactBootstrap.kt
@@ -0,0 +1,182 @@
+package hep.dataforge.vision.bootstrap
+
+import hep.dataforge.names.Name
+import hep.dataforge.names.NameToken
+import hep.dataforge.names.length
+import kotlinx.html.ButtonType
+import kotlinx.html.DIV
+import kotlinx.html.id
+import kotlinx.html.js.onClickFunction
+import react.RBuilder
+import react.ReactElement
+import react.dom.*
+import styled.StyledDOMBuilder
+import styled.css
+import styled.styledDiv
+import styled.styledNav
+
+
+public inline fun RBuilder.card(title: String, crossinline block: StyledDOMBuilder<DIV>.() -> Unit): ReactElement =
+    styledDiv {
+        css {
+            +"card"
+            +"w-100"
+        }
+        styledDiv {
+            css {
+                +"card-body"
+            }
+            h3(classes = "card-title") {
+                +title
+            }
+            block()
+        }
+    }
+
+public fun RBuilder.accordion(
+    id: String,
+    elements: List<Pair<String, StyledDOMBuilder<DIV>.() -> Unit>>,
+): ReactElement = styledDiv {
+    css {
+        +"accordion"
+        //+"p-1"
+    }
+    attrs {
+        this.id = id
+    }
+    elements.forEachIndexed { index, (title, builder) ->
+        val headerID = "${id}-${index}-heading"
+        val collapseID = "${id}-${index}-collapse"
+        div("card p-0 m-0") {
+            div("card-header") {
+                attrs {
+                    this.id = headerID
+                }
+                h5("mb-0") {
+                    button(classes = "btn btn-link collapsed", type = ButtonType.button) {
+                        attrs {
+                            attributes["data-toggle"] = "collapse"
+                            attributes["data-target"] = "#$collapseID"
+                            attributes["aria-expanded"] = "false"
+                            attributes["aria-controls"] = collapseID
+                        }
+                        +title
+                    }
+                }
+            }
+            div("collapse") {
+                attrs {
+                    this.id = collapseID
+                    attributes["aria-labelledby"] = headerID
+                    attributes["data-parent"] = "#$id"
+                }
+                styledDiv {
+                    css {
+                        +"card-body"
+                    }
+                    builder()
+                }
+            }
+        }
+    }
+}
+
+
+public fun RBuilder.nameCrumbs(name: Name?, rootTitle: String, link: (Name) -> Unit): ReactElement = styledNav {
+    css {
+        +"p-0"
+    }
+    attrs {
+        attributes["aria-label"] = "breadcrumb"
+    }
+    ol("breadcrumb") {
+        li("breadcrumb-item") {
+            button(classes = "btn btn-link p-0") {
+                +rootTitle
+                attrs {
+                    onClickFunction = {
+                        link(Name.EMPTY)
+                    }
+                }
+            }
+        }
+        if (name != null) {
+            val tokens = ArrayList<NameToken>(name.length)
+            name.tokens.forEach { token ->
+                tokens.add(token)
+                val fullName = Name(tokens.toList())
+                li("breadcrumb-item") {
+                    button(classes = "btn btn-link p-0") {
+                        +token.toString()
+                        attrs {
+                            onClickFunction = {
+                                console.log("Selected = $fullName")
+                                link(fullName)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+public typealias RSectionsBuilder = MutableList<Pair<String, StyledDOMBuilder<DIV>.() -> Unit>>
+
+public fun RSectionsBuilder.entry(title: String, builder: StyledDOMBuilder<DIV>.() -> Unit) {
+    add(title to builder)
+}
+
+public fun RBuilder.accordion(id: String, builder: RSectionsBuilder.() -> Unit): ReactElement {
+    val list = ArrayList<Pair<String, StyledDOMBuilder<DIV>.() -> Unit>>().apply(builder)
+    return accordion(id, list)
+}
+
+public enum class ContainerSize(public val suffix: String) {
+    DEFAULT(""),
+    SM("-sm"),
+    MD("-md"),
+    LG("-lg"),
+    XL("-xl"),
+    FLUID("-fluid")
+}
+
+public inline fun RBuilder.container(
+    size: ContainerSize = ContainerSize.FLUID,
+    block: StyledDOMBuilder<DIV>.() -> Unit,
+): ReactElement = 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<DIV>.() -> Unit,
+): ReactElement = styledDiv {
+    val weightSuffix = weight?.let { "-$it" } ?: ""
+    css {
+        classes.add("col${maxSize.suffix}$weightSuffix")
+    }
+    block()
+}
+
+public inline fun RBuilder.gridRow(
+    block: StyledDOMBuilder<DIV>.() -> Unit,
+): ReactElement = styledDiv {
+    css {
+        classes.add("row")
+    }
+    block()
+}
\ No newline at end of file
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt
new file mode 100644
index 00000000..5580b923
--- /dev/null
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt
@@ -0,0 +1,95 @@
+package hep.dataforge.vision.bootstrap
+
+import hep.dataforge.vision.react.flexColumn
+import kotlinx.css.Overflow
+import kotlinx.css.flexGrow
+import kotlinx.css.overflowY
+import kotlinx.html.DIV
+import kotlinx.html.classes
+import kotlinx.html.js.onClickFunction
+import react.*
+import react.dom.button
+import react.dom.li
+import react.dom.ul
+import styled.StyledDOMBuilder
+import styled.css
+import styled.styledDiv
+
+public external class TabProps : RProps {
+    public var id: String
+    public var title: String?
+}
+
+@JsExport
+public val Tab: FunctionalComponent<TabProps> = functionalComponent { props ->
+    props.children()
+}
+
+public external class TabPaneProps : RProps {
+    public var activeTab: String?
+}
+
+@JsExport
+public val TabPane: FunctionalComponent<TabPaneProps> = functionalComponent("TabPane") { props ->
+    var activeTab: String? by useState(props.activeTab)
+
+    val children: Array<out ReactElement?> = Children.map(props.children) {
+        it.asElementOrNull()
+    } ?: emptyArray()
+
+    val childrenProps = children.mapNotNull {
+        it?.props?.unsafeCast<TabProps>()
+    }
+
+    flexColumn {
+        css {
+            flexGrow = 1.0
+        }
+        ul("nav nav-tabs") {
+            childrenProps.forEach { cp ->
+                li("nav-item") {
+                    button(classes = "nav-link") {
+                        +(cp.title ?: cp.id)
+                        attrs {
+                            if (cp.id == activeTab) {
+                                classes += "active"
+                            }
+                            onClickFunction = {
+                                activeTab = cp.id
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        children.find { (it?.props?.unsafeCast<TabProps>())?.id == activeTab }?.let {
+            child(it)
+        }
+    }
+}
+
+public class TabBuilder(internal val parentBuilder: RBuilder) {
+    public fun tab(id: String, title: String? = null, builder: StyledDOMBuilder<DIV>.() -> Unit) {
+        parentBuilder.child(Tab) {
+            attrs {
+                this.id = id
+                this.title = title
+            }
+            styledDiv {
+                css {
+                    overflowY = Overflow.auto
+                }
+                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/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
new file mode 100644
index 00000000..ac0b5c33
--- /dev/null
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
@@ -0,0 +1,81 @@
+package hep.dataforge.vision.bootstrap
+
+import hep.dataforge.names.Name
+import hep.dataforge.names.isEmpty
+import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionGroup
+import hep.dataforge.vision.react.objectTree
+import hep.dataforge.vision.solid.three.ThreeCanvas
+import kotlinx.css.*
+import kotlinx.css.properties.border
+import react.*
+import react.dom.h2
+import styled.css
+import styled.styledDiv
+
+public external interface ThreeControlsProps : RProps {
+    public var canvas: ThreeCanvas
+    public var selected: Name?
+    public var onSelect: (Name) -> Unit
+}
+
+@JsExport
+public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalComponent { props ->
+    val vision = props.canvas.content
+    tabPane {
+        tab("Canvas") {
+            card("Canvas configuration") {
+                canvasControls(props.canvas)
+            }
+        }
+        tab("Tree") {
+            css {
+                border(1.px, BorderStyle.solid, Color.lightGray)
+                padding(10.px)
+            }
+            h2 { +"Object tree" }
+            styledDiv {
+                css {
+                    overflowY = Overflow.auto
+                    flex(1.0, 0.0, FlexBasis.auto)
+                }
+                props.canvas.content?.let {
+                    objectTree(it, props.selected, props.onSelect)
+                }
+            }
+        }
+        tab("Properties") {
+            props.selected.let { selected ->
+                val selectedObject: Vision? = when {
+                    selected == null -> null
+                    selected.isEmpty() -> vision
+                    else -> (vision as? VisionGroup)?.get(selected)
+                }
+                if (selectedObject != null) {
+                    visionPropertyEditor(
+                        selectedObject,
+                        default = selectedObject.getAllProperties(),
+                        key = selected
+                    )
+                }
+            }
+        }
+        this.parentBuilder.run {
+            props.children()
+        }
+    }
+}
+
+public fun RBuilder.threeControls(
+    canvas: ThreeCanvas,
+    selected: Name?,
+    onSelect: (Name) -> Unit = {},
+    builder: TabBuilder.() -> Unit = {}
+): ReactElement = child(ThreeControls) {
+    attrs {
+        this.canvas = canvas
+        this.selected = selected
+        this.onSelect = onSelect
+    }
+    TabBuilder(this).builder()
+}
\ No newline at end of file
diff --git a/ui/react/build.gradle.kts b/ui/react/build.gradle.kts
index 9389bd35..b57cba20 100644
--- a/ui/react/build.gradle.kts
+++ b/ui/react/build.gradle.kts
@@ -6,6 +6,7 @@ val reactVersion by extra("17.0.0")
 val kotlinWrappersVersion: String by rootProject.extra
 
 dependencies{
-    api(project(":visionforge-core"))
+    api(project(":visionforge-solid"))
+    api("org.jetbrains:kotlin-styled:5.2.0-$kotlinWrappersVersion")
     api("org.jetbrains:kotlin-react-dom:$reactVersion-$kotlinWrappersVersion")
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
similarity index 52%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt
rename to ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
index 9f335642..5d961741 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
@@ -1,13 +1,18 @@
-package hep.dataforge.vision.solid.three
+package hep.dataforge.vision.react
 
 import hep.dataforge.context.Context
 import hep.dataforge.names.Name
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
+import hep.dataforge.vision.solid.three.ThreeCanvas
+import hep.dataforge.vision.solid.three.ThreePlugin
+import hep.dataforge.vision.solid.three.output
+import kotlinx.css.*
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
 import react.*
-import react.dom.div
+import styled.css
+import styled.styledDiv
 
 public external interface ThreeCanvasProps : RProps {
     public var context: Context
@@ -33,7 +38,8 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
         if (canvas == null) {
             val element = elementRef.current as? HTMLElement ?: error("Canvas element not found")
             val three: ThreePlugin = props.context.plugins.fetch(ThreePlugin)
-            val newCanvas = three.output(element, props.options ?: Canvas3DOptions.empty(), props.clickCallback)
+            val newCanvas: ThreeCanvas =
+                three.output(element, props.options ?: Canvas3DOptions.empty(), props.clickCallback)
             props.canvasCallback?.invoke(newCanvas)
             canvas = newCanvas
         }
@@ -51,43 +57,13 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
         canvas?.select(props.selected)
     }
 
-    div {
+    styledDiv {
+        css {
+            minWidth = 500.px
+            minHeight = 500.px
+            display = Display.inherit
+            flex(1.0, 1.0, FlexBasis.auto)
+        }
         ref = elementRef
     }
-}
-
-//public class ThreeCanvasComponent : RComponent<ThreeCanvasProps, ThreeCanvasState>() {
-//
-//    private var canvas: ThreeCanvas? = null
-//
-//    override fun componentDidMount() {
-//        props.obj?.let { obj ->
-//            if (canvas == null) {
-//                val element = state.element as? HTMLElement ?: error("Canvas element not found")
-//                val three: ThreePlugin = props.context.plugins.fetch(ThreePlugin)
-//                canvas = three.output(element, props.options ?: Canvas3DOptions.empty()).apply {
-//                    onClick = props.clickCallback
-//                }
-//                props.canvasCallback?.invoke(canvas)
-//            }
-//            canvas?.render(obj)
-//        }
-//    }
-//
-//    override fun componentDidUpdate(prevProps: ThreeCanvasProps, prevState: ThreeCanvasState, snapshot: Any) {
-//        if (prevProps.obj != props.obj) {
-//            componentDidMount()
-//        }
-//        if (prevProps.selected != props.selected) {
-//            canvas?.select(props.selected)
-//        }
-//    }
-//
-//    override fun RBuilder.render() {
-//        div {
-//            ref {
-//                state.element = findDOMNode(it)
-//            }
-//        }
-//    }
-//}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt
index 7cfb7d48..eb0bb8b9 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt
@@ -8,7 +8,7 @@ public object TreeStyles : StyleSheet("treeStyles", true) {
     /**
      * Remove default bullets
      */
-    public val tree by css {
+    public val tree: RuleSet by css {
         paddingLeft = 8.px
         marginLeft = 0.px
         listStyleType = ListStyleType.none
diff --git a/visionforge-core/build.gradle.kts b/visionforge-core/build.gradle.kts
index b878791b..6eee3f0c 100644
--- a/visionforge-core/build.gradle.kts
+++ b/visionforge-core/build.gradle.kts
@@ -28,8 +28,8 @@ kotlin {
         jsMain {
             dependencies {
                 api("hep.dataforge:dataforge-output-html:$dataforgeVersion")
-                api("org.jetbrains:kotlin-styled:5.2.0-$kotlinWrappersVersion")
                 api("org.jetbrains:kotlin-extensions:1.0.1-$kotlinWrappersVersion")
+                api("org.jetbrains:kotlin-css:1.0.0-$kotlinWrappersVersion")
             }
         }
     }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
index 0ef38797..d39daaf0 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
@@ -7,7 +7,7 @@ public class Canvas3DOptions : Scheme() {
     public var camera: Camera by spec(Camera, Camera.empty())
     public var controls: Controls by spec(Controls, Controls.empty())
 
-    public var minSize: Int by int(300)
+    public var minSize: Int by int(400)
     public var minWith: Number by number { minSize }
     public var minHeight: Number by number { minSize }
 
@@ -17,4 +17,10 @@ public class Canvas3DOptions : Scheme() {
 
 
     public companion object : SchemeSpec<Canvas3DOptions>(::Canvas3DOptions)
-}
\ No newline at end of file
+}
+
+public fun Canvas3DOptions.computeWidth(external: Number): Int =
+    (external.toInt()).coerceIn(minWith.toInt()..maxWith.toInt())
+
+public fun Canvas3DOptions.computeHeight(external: Number): Int =
+    (external.toInt()).coerceIn(minHeight.toInt()..maxHeight.toInt())
\ No newline at end of file
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/DatCanvasControls.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/DatCanvasControls.kt
new file mode 100644
index 00000000..361e18e3
--- /dev/null
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/DatCanvasControls.kt
@@ -0,0 +1,5 @@
+package hep.dataforge.vision.solid.three
+
+fun createDataControls() {
+    val dat = kotlinext.js.require("dat.gui")
+}
\ No newline at end of file
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
index f7243194..33a86ebf 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
@@ -10,9 +10,7 @@ import hep.dataforge.names.toName
 import hep.dataforge.output.Renderer
 import hep.dataforge.vision.Colors
 import hep.dataforge.vision.solid.Solid
-import hep.dataforge.vision.solid.specifications.Camera
-import hep.dataforge.vision.solid.specifications.Canvas3DOptions
-import hep.dataforge.vision.solid.specifications.Controls
+import hep.dataforge.vision.solid.specifications.*
 import hep.dataforge.vision.solid.three.ThreeMaterials.HIGHLIGHT_MATERIAL
 import hep.dataforge.vision.solid.three.ThreeMaterials.SELECTED_MATERIAL
 import info.laht.threekt.WebGLRenderer
@@ -28,9 +26,11 @@ import info.laht.threekt.materials.LineBasicMaterial
 import info.laht.threekt.math.Vector2
 import info.laht.threekt.objects.LineSegments
 import info.laht.threekt.objects.Mesh
+import info.laht.threekt.renderers.WebGLRenderer
 import info.laht.threekt.scenes.Scene
 import kotlinx.browser.window
 import kotlinx.dom.clear
+import org.w3c.dom.HTMLCanvasElement
 import org.w3c.dom.HTMLElement
 import org.w3c.dom.Node
 import org.w3c.dom.events.MouseEvent
@@ -41,7 +41,6 @@ import kotlin.math.sin
  *
  */
 public class ThreeCanvas(
-    element: HTMLElement,
     public val three: ThreePlugin,
     public val options: Canvas3DOptions,
     public val onClick: ((Name?) -> Unit)? = null,
@@ -69,7 +68,24 @@ public class ThreeCanvas(
 
     private var picked: Object3D? = null
 
-    init {
+    /**
+     * Attach canvas to given [HTMLElement]
+     */
+    public fun attach(element: HTMLElement) {
+        fun WebGLRenderer.resize() {
+            val canvas = domElement as HTMLCanvasElement
+
+            val width = options.computeWidth(canvas.clientWidth)
+            val height = options.computeHeight(canvas.clientHeight)
+
+            canvas.width = width
+            canvas.height = height
+
+            setSize(width, height, false)
+            camera.aspect = width.toDouble() / height
+            camera.updateProjectionMatrix()
+        }
+
         element.clear()
 
         //Attach listener to track mouse changes
@@ -86,12 +102,18 @@ public class ThreeCanvas(
             onClick?.invoke(picked?.fullName())
         }, false)
 
-        camera.aspect = 1.0
-
         val renderer = WebGLRenderer { antialias = true }.apply {
             setClearColor(Colors.skyblue, 1)
         }
 
+        val canvas = renderer.domElement as HTMLCanvasElement
+
+        canvas.style.apply {
+            width = "100%"
+            height = "100%"
+            display = "block"
+        }
+
         addControls(renderer.domElement, options.controls)
 
         fun animate() {
@@ -106,19 +128,15 @@ public class ThreeCanvas(
             window.requestAnimationFrame {
                 animate()
             }
+
             renderer.render(scene, camera)
         }
 
         element.appendChild(renderer.domElement)
+        renderer.resize()
 
-        renderer.setSize(
-            element.clientWidth.coerceIn(options.minWith.toInt()..options.maxWith.toInt()),
-            element.clientHeight.coerceIn(options.minHeight.toInt()..options.maxHeight.toInt())
-        )
-
-        window.onresize = {
-            renderer.setSize(element.clientWidth, element.clientWidth)
-            camera.updateProjectionMatrix()
+        element.onresize = {
+            renderer.resize()
         }
 
         animate()
@@ -250,7 +268,7 @@ public fun ThreePlugin.output(
     element: HTMLElement,
     spec: Canvas3DOptions = Canvas3DOptions.empty(),
     onClick: ((Name?) -> Unit)? = null,
-): ThreeCanvas = ThreeCanvas(element, this, spec, onClick)
+): ThreeCanvas = ThreeCanvas(this, spec, onClick).apply { attach(element) }
 
 public fun ThreePlugin.render(
     element: HTMLElement,
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt
index fc497c11..2b35b7e7 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt
@@ -5,10 +5,7 @@ import hep.dataforge.meta.float
 import hep.dataforge.meta.get
 import hep.dataforge.meta.node
 import hep.dataforge.vision.solid.*
-import info.laht.threekt.core.BufferGeometry
-import info.laht.threekt.core.DirectGeometry
-import info.laht.threekt.core.Face3
-import info.laht.threekt.core.Geometry
+import info.laht.threekt.core.*
 import info.laht.threekt.external.controls.OrbitControls
 import info.laht.threekt.materials.Material
 import info.laht.threekt.math.Euler
@@ -76,4 +73,6 @@ internal fun Any.dispose() {
         is OrbitControls -> dispose()
         is Texture -> dispose()
     }
-}
\ No newline at end of file
+}
+
+public fun Layers.check(layer: Int): Boolean = (mask shr(layer) and 0x00000001) > 0
\ No newline at end of file

From dfac01d3524f4cddf1b2eee46ea46a81a34237fa Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 12 Nov 2020 12:05:43 +0300
Subject: [PATCH 022/151] Change collector update

---
 CHANGELOG.md                                  |   2 +
 build.gradle.kts                              |   4 +-
 .../dataforge/vision/AbstractVisionGroup.kt   |  47 ++++----
 .../hep/dataforge/vision/SimpleVisionGroup.kt |   6 +-
 .../kotlin/hep/dataforge/vision/StyleSheet.kt |  30 +++--
 .../kotlin/hep/dataforge/vision/Vision.kt     |  68 ++++++++---
 .../{AbstractVision.kt => VisionBase.kt}      |  18 ++-
 .../hep/dataforge/vision/VisionChange.kt      |  50 ---------
 .../hep/dataforge/vision/VisionManager.kt     |  52 ++++-----
 .../hep/dataforge/vision/collectChange.kt     | 106 ++++++++++++++++++
 visionforge-server/build.gradle.kts           |  57 +---------
 .../hep/dataforge/vision/solid/BasicSolid.kt  |  23 ++--
 .../hep/dataforge/vision/solid/PolyLine.kt    |   3 +-
 .../hep/dataforge/vision/solid/Proxy.kt       |  14 +--
 .../hep/dataforge/vision/solid/Solid.kt       |   9 +-
 .../hep/dataforge/vision/solid/SolidGroup.kt  |  21 +---
 .../dataforge/vision/solid/serialization.kt   |   8 --
 17 files changed, 283 insertions(+), 235 deletions(-)
 rename visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/{AbstractVision.kt => VisionBase.kt} (85%)
 delete mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/collectChange.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3200775..a158a449 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,10 @@
 ## [Unreleased]
 ### Added
 - Server module
+- Change collector
 
 ### Changed
+- Vision does not implement ItemProvider anymore. Property changes are done via `getProperty`/`setProperty` and `property` delegate.
 
 ### Deprecated
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 25d9f4b9..b793c216 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,8 +4,8 @@ plugins {
     id("ru.mipt.npm.project")
 }
 
-val dataforgeVersion by extra("0.2.0-dev-4")
-val ktorVersion by extra("1.4.1")
+val dataforgeVersion by extra("0.2.0-dev-7")
+val ktorVersion by extra("1.4.2")
 val kotlinWrappersVersion by extra("pre.129-kotlin-1.4.10")
 
 allprojects {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt
index c6d05e8c..aa43a14e 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt
@@ -1,8 +1,5 @@
 package hep.dataforge.vision
 
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.get
-import hep.dataforge.meta.node
 import hep.dataforge.names.*
 import kotlinx.serialization.Transient
 
@@ -10,7 +7,7 @@ import kotlinx.serialization.Transient
 /**
  * Abstract implementation of mutable group of [Vision]
  */
-public abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup {
+public abstract class AbstractVisionGroup : VisionBase(), MutableVisionGroup {
 
     //protected abstract val _children: MutableMap<NameToken, T>
 
@@ -19,13 +16,13 @@ public abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup
      */
     abstract override val children: Map<NameToken, Vision>
 
-    abstract override var styleSheet: StyleSheet?
-        protected set
+    final override var styleSheet: StyleSheet? = null
+        private set
 
     /**
      * Update or create stylesheet
      */
-    public fun styleSheet(block: StyleSheet.() -> Unit) {
+    public open fun styleSheet(block: StyleSheet.() -> Unit) {
         if (styleSheet == null) {
             styleSheet = StyleSheet(this@AbstractVisionGroup)
         }
@@ -84,17 +81,18 @@ public abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup
      * Add a static child. Statics could not be found by name, removed or replaced. Changing statics also do not trigger events.
      */
     protected open fun addStatic(child: Vision): Unit {
-        setChild(NameToken("@static", index = child.hashCode().toString()), child)
+        attach(NameToken("@static", index = child.hashCode().toString()), child)
     }
 
     protected abstract fun createGroup(): AbstractVisionGroup
 
     /**
-     * Set this node as parent for given node
+     * Set parent for given child and attach it
      */
-    protected fun attach(child: Vision) {
+    protected fun attach(token: NameToken, child: Vision) {
         if (child.parent == null) {
             child.parent = this
+            setChild(token, child)
         } else if (child.parent !== this) {
             error("Can't reassign existing parent for $child")
         }
@@ -110,8 +108,7 @@ public abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup
                 val token = name.tokens.first()
                 when (val current = children[token]) {
                     null -> createGroup().also { child ->
-                        attach(child)
-                        setChild(token, child)
+                        attach(token, child)
                     }
                     is AbstractVisionGroup -> current
                     else -> error("Can't create group with name $name because it exists and not a group")
@@ -129,7 +126,6 @@ public abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup
         when {
             name.isEmpty() -> {
                 if (child != null) {
-                    attach(child)
                     addStatic(child)
                 }
             }
@@ -138,8 +134,7 @@ public abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup
                 if (child == null) {
                     removeChild(token)
                 } else {
-                    attach(child)
-                    setChild(token, child)
+                    attach(token, child)
                 }
                 childrenChanged(token, child)
             }
@@ -151,11 +146,23 @@ public abstract class AbstractVisionGroup : AbstractVision(), MutableVisionGroup
         }
     }
 
-    override fun update(meta: Meta) {
-        val styleMeta = meta.get("styleSheet").node
-        if (styleMeta != null) {
-            this.styleSheet?.update(styleMeta)
+    override fun update(change: Vision) {
+        if (change is VisionGroup) {
+            //update stylesheet
+            val changeStyleSheet = change.styleSheet
+            if (changeStyleSheet != null) {
+                styleSheet {
+                    update(changeStyleSheet)
+                }
+            }
+            change.children.forEach { (token, child) ->
+                when {
+                    child is NullVision -> removeChild(token)
+                    children.containsKey(token) -> children[token]!!.update(child)
+                    else -> attach(token, child)
+                }
+            }
         }
-        super.update(meta)
+        super.update(change)
     }
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisionGroup.kt
index 69a28f07..96c2325c 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisionGroup.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisionGroup.kt
@@ -1,17 +1,13 @@
 package hep.dataforge.vision
 
-import hep.dataforge.meta.Config
 import hep.dataforge.names.NameToken
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 
 @Serializable
-@SerialName("group")
+@SerialName("vision.group")
 public class SimpleVisionGroup : AbstractVisionGroup() {
-
-    override var styleSheet: StyleSheet? = null
-
     @SerialName("children")
     private val _children = HashMap<NameToken, Vision>()
     override val children: Map<NameToken, Vision> get() = _children
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
index fa5ef9e9..d154efbd 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
@@ -5,7 +5,10 @@ package hep.dataforge.vision
 import hep.dataforge.meta.*
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
-import kotlinx.serialization.*
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import kotlinx.serialization.UseSerializers
 import kotlinx.serialization.builtins.MapSerializer
 import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.descriptors.SerialDescriptor
@@ -15,7 +18,7 @@ import kotlinx.serialization.encoding.Encoder
 /**
  * A container for styles
  */
-@Serializable
+@Serializable(StyleSheet.Companion::class)
 public class StyleSheet private constructor(private val styleMap: MutableMap<String, Meta>) {
     @Transient
     internal var owner: Vision? = null
@@ -30,8 +33,9 @@ public class StyleSheet private constructor(private val styleMap: MutableMap<Str
     private fun Vision.styleChanged(key: String, oldStyle: Meta?, newStyle: Meta?) {
         if (styles.contains(key)) {
             //TODO optimize set concatenation
-            val tokens: Collection<Name> = ((oldStyle?.items?.keys ?: emptySet()) + (newStyle?.items?.keys ?: emptySet()))
-                .map { it.asName() }
+            val tokens: Collection<Name> =
+                ((oldStyle?.items?.keys ?: emptySet()) + (newStyle?.items?.keys ?: emptySet()))
+                    .map { it.asName() }
             tokens.forEach { parent?.propertyChanged(it) }
         }
         if (this is VisionGroup) {
@@ -73,8 +77,17 @@ public class StyleSheet private constructor(private val styleMap: MutableMap<Str
         set(key, newStyle.seal())
     }
 
-    @ExperimentalSerializationApi
-    @Serializer(StyleSheet::class)
+    public fun update(key: String, meta: Meta) {
+        val existing = get(key)
+        set(key, existing?.edit { this.update(meta) } ?: meta)
+    }
+
+    public fun update(other: StyleSheet) {
+        other.items.forEach { (key, value) ->
+            update(key, value)
+        }
+    }
+
     public companion object : KSerializer<StyleSheet> {
         private val mapSerializer = MapSerializer(String.serializer(), MetaSerializer)
         override val descriptor: SerialDescriptor get() = mapSerializer.descriptor
@@ -91,11 +104,6 @@ public class StyleSheet private constructor(private val styleMap: MutableMap<Str
     }
 }
 
-public fun StyleSheet.update(styleMeta: Meta){
-    TODO()
-}
-
-
 /**
  * Add style name to the list of styles to be resolved later. The style with given name does not necessary exist at the moment.
  */
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 99840b92..3ceadc65 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -1,6 +1,7 @@
 package hep.dataforge.vision
 
 import hep.dataforge.meta.*
+import hep.dataforge.meta.descriptors.Described
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.toName
@@ -9,14 +10,15 @@ import hep.dataforge.values.asValue
 import hep.dataforge.vision.Vision.Companion.TYPE
 import hep.dataforge.vision.Vision.Companion.VISIBLE_KEY
 import kotlinx.serialization.PolymorphicSerializer
-import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
 
 /**
  * A root type for display hierarchy
  */
 @Type(TYPE)
-public interface Vision : Configurable {
+public interface Vision : Configurable, Described {
 
     /**
      * The parent object of this one. If null, this one is a root.
@@ -37,12 +39,7 @@ public interface Vision : Configurable {
     /**
      * Get property (including styles). [inherit] toggles parent node property lookup
      */
-    public fun getProperty(name: Name, inherit: Boolean): MetaItem<*>?
-
-    /**
-     * Ger a property including inherited values
-     */
-    override fun getItem(name: Name): MetaItem<*>? = getProperty(name, true)
+    public fun getProperty(name: Name, inherit: Boolean = true): MetaItem<*>?
 
     /**
      * Trigger property invalidation event. If [name] is empty, notify that the whole object is changed
@@ -63,7 +60,7 @@ public interface Vision : Configurable {
      * List of names of styles applied to this object. Order matters. Not inherited.
      */
     public var styles: List<String>
-        get() =  properties[STYLE_KEY]?.stringList?: emptyList()
+        get() = properties[STYLE_KEY]?.stringList ?: emptyList()
         set(value) {
             config[STYLE_KEY] = value
         }
@@ -71,7 +68,7 @@ public interface Vision : Configurable {
     /**
      * Update this vision using external meta. Children are not updated.
      */
-    public fun update(meta: Meta)
+    public fun update(change: Vision)
 
     public companion object {
         public const val TYPE: String = "vision"
@@ -89,16 +86,61 @@ public interface Vision : Configurable {
 public fun Vision.getProperty(key: String, inherit: Boolean = true): MetaItem<*>? =
     getProperty(key.toName(), inherit)
 
+/**
+ * A convenience method to pair [getProperty]
+ */
+public fun Vision.setProperty(key: Name, value: Any?) {
+    config[key] = value
+}
+
+/**
+ * A convenience method to pair [getProperty]
+ */
+public fun Vision.setProperty(key: String, value: Any?) {
+    config[key] = value
+}
+
 /**
  * Find a style with given name for given [Vision]. The style is not necessary applied to this [Vision].
  */
 public tailrec fun Vision.resolveStyle(name: String): Meta? =
     (this as? VisionGroup)?.styleSheet?.get(name) ?: parent?.resolveStyle(name)
 
-
 /**
  * Control visibility of the element
  */
 public var Vision.visible: Boolean?
-    get() = getItem(VISIBLE_KEY).boolean
-    set(value) = setItem(VISIBLE_KEY, value?.asValue())
+    get() = getProperty(VISIBLE_KEY).boolean
+    set(value) = config.setValue(VISIBLE_KEY, value?.asValue())
+
+/**
+ * Convinience delegate for properties
+ */
+public fun Vision.property(
+    default: MetaItem<*>? = null,
+    key: Name? = null,
+    inherit: Boolean = true,
+): MutableItemDelegate =
+    object : ReadWriteProperty<Any?, MetaItem<*>?> {
+        override fun getValue(thisRef: Any?, property: KProperty<*>): MetaItem<*>? {
+            val name = key ?: property.name.toName()
+            return getProperty(name, inherit) ?: default
+        }
+
+        override fun setValue(thisRef: Any?, property: KProperty<*>, value: MetaItem<*>?) {
+            val name = key ?: property.name.toName()
+            setProperty(name, value)
+        }
+    }
+
+//TODO replace by value
+fun Vision.properties(inherit: Boolean = true): MutableItemProvider = object : MutableItemProvider {
+    override fun getItem(name: Name): MetaItem<*>? {
+        return getProperty(name, inherit)
+    }
+
+    override fun setItem(name: Name, item: MetaItem<*>?) {
+        setProperty(name, item)
+    }
+
+}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
similarity index 85%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt
rename to visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index 50bcc9b7..d88aaffc 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -2,20 +2,24 @@ package hep.dataforge.vision
 
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
+import hep.dataforge.meta.descriptors.defaultItem
+import hep.dataforge.meta.descriptors.get
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.values.ValueType
 import hep.dataforge.vision.Vision.Companion.STYLE_KEY
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 
 internal data class PropertyListener(
     val owner: Any? = null,
-    val action: (name: Name) -> Unit
+    val action: (name: Name) -> Unit,
 )
 
 @Serializable
-public open class AbstractVision : Vision {
+@SerialName("vision")
+public open class VisionBase : Vision {
 
     @Transient
     override var parent: VisionGroup? = null
@@ -26,6 +30,8 @@ public open class AbstractVision : Vision {
     override var properties: Config? = null
         protected set
 
+    override val descriptor: NodeDescriptor? get() = null
+
     protected fun updateStyles(names: List<String>) {
         names.mapNotNull { resolveStyle(it) }.asSequence()
             .flatMap { it.items.asSequence() }
@@ -76,12 +82,14 @@ public open class AbstractVision : Vision {
             sequence {
                 yield(properties?.get(name))
                 yieldAll(getStyleItems(name))
+                yield(descriptor?.get(name)?.defaultItem())
                 yield(parent?.getProperty(name, inherit))
             }.merge()
         } else {
             sequence {
                 yield(properties?.get(name))
                 yieldAll(getStyleItems(name))
+                yield(descriptor?.get(name)?.defaultItem())
             }.merge()
         }
     }
@@ -94,8 +102,10 @@ public open class AbstractVision : Vision {
         properties = null
     }
 
-    override fun update(meta: Meta) {
-        meta[Vision::properties.name].node?.let { configure(it) }
+    override fun update(change: Vision) {
+        if (change.properties != null) {
+            config.update(change.config)
+        }
     }
 
     public companion object {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
deleted file mode 100644
index 20d28123..00000000
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package hep.dataforge.vision
-
-import hep.dataforge.meta.Config
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.get
-import hep.dataforge.meta.set
-import hep.dataforge.names.NameToken
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.sync.Mutex
-
-
-//public class VisionChange(public val properties: Meta, public val childrenChange: Map<NameToken, VisionChange>)
-
-public class VisionChangeCollector(
-    public val manager: VisionManager,
-    public val scope: CoroutineScope,
-    public val vision: Vision,
-    public val lock: Mutex = Mutex()
-) {
-    private val collector: Config = Config()
-    private val childrenCollectors = HashMap<NameToken, VisionChangeCollector>()
-
-    init {
-        vision.onPropertyChange(this) { propertyName ->
-            collector[propertyName] = vision.properties?.get(propertyName)
-        }
-        if (vision is VisionGroup) {
-            vision.children.forEach { (token, child) ->
-                childrenCollectors[token] = VisionChangeCollector(manager, scope, child, lock)
-            }
-        }
-        if (vision is MutableVisionGroup) {
-            TODO("Tread vision structure change")
-//            vision.onChildrenChange(this) { childName, child ->
-//                if(child == null){
-//                    childrenCollectors[childName] = null
-//                } else {
-//                    childrenCollectors[childName] = manager.encodeToMeta(child)
-//                }
-//            }
-        }
-    }
-}
-//
-//fun collectUpdates(manager: VisionManager, scope: CoroutineScope, vision: Vision): Flow<Meta> {
-//
-//
-//    vision.
-//}
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
index 3e417935..1078abd6 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
@@ -3,10 +3,6 @@ package hep.dataforge.vision
 import hep.dataforge.context.*
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.names.asName
-import hep.dataforge.values.Null
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.modules.SerializersModule
@@ -52,30 +48,30 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
         encodeToJsonElement(vision).toMetaItem(descriptor).node
             ?: error("Expected node, but value found. Check your serializer!")
 
-    public fun updateVision(vision: Vision, meta: Meta) {
-        vision.update(meta)
-        if (vision is MutableVisionGroup) {
-            val children by meta.node()
-            children?.items?.forEach { (token, item) ->
-                when {
-                    item.value == Null -> vision[token] = null //Null means removal
-                    item.node != null -> {
-                        val node = item.node!!
-                        val type by node.string()
-                        if (type != null) {
-                            //If the type is present considering it as new node, not an update
-                            vision[token.asName()] = decodeFromMeta(node)
-                        } else {
-                            val existing = vision.children[token]
-                            if (existing != null) {
-                                updateVision(existing, node)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
+//    public fun updateVision(vision: Vision, meta: Meta) {
+//        vision.update(meta)
+//        if (vision is MutableVisionGroup) {
+//            val children by meta.node()
+//            children?.items?.forEach { (token, item) ->
+//                when {
+//                    item.value == Null -> vision[token] = null //Null means removal
+//                    item.node != null -> {
+//                        val node = item.node!!
+//                        val type by node.string()
+//                        if (type != null) {
+//                            //If the type is present considering it as new node, not an update
+//                            vision[token.asName()] = decodeFromMeta(node)
+//                        } else {
+//                            val existing = vision.children[token]
+//                            if (existing != null) {
+//                                updateVision(existing, node)
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//    }
 
     public companion object : PluginFactory<VisionManager> {
         override val tag: PluginTag = PluginTag(name = "vision", group = PluginTag.DATAFORGE_GROUP)
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/collectChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/collectChange.kt
new file mode 100644
index 00000000..e2a128bc
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/collectChange.kt
@@ -0,0 +1,106 @@
+package hep.dataforge.vision
+
+import hep.dataforge.meta.*
+import hep.dataforge.meta.descriptors.ItemDescriptor
+import hep.dataforge.names.Name
+import hep.dataforge.names.NameToken
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.launch
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlin.time.Duration
+
+/**
+ * An empty vision existing only for Vision tree change representation. [NullVision] should not be used outside update logic.
+ */
+@Serializable
+@SerialName("vision.null")
+public object NullVision : Vision {
+
+    @Suppress("SetterBackingFieldAssignment")
+    override var parent: VisionGroup? = null
+        set(value) {
+            //do nothing
+        }
+
+    override val properties: Config? = null
+
+    override fun getAllProperties(): Laminate = Laminate(Meta.EMPTY)
+
+    override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? = null
+
+    override fun propertyChanged(name: Name) {}
+
+    override fun onPropertyChange(owner: Any?, action: (Name) -> Unit) {}
+
+    override fun removeChangeListener(owner: Any?) {}
+
+    override fun update(change: Vision) {
+        error("Null vision should be removed, not updated")
+    }
+
+    override val config: Config get() = Config()
+    override val descriptor: ItemDescriptor? get() = null
+}
+
+private fun Vision.collectChange(scope: CoroutineScope, collector: Vision): Job = scope.launch {
+    //Store job to be able to cancel collection jobs
+    //TODO add lock for concurrent modification protection?
+    val jobStore = HashMap<NameToken, Job>()
+
+    if (this is VisionGroup) {
+        check(collector is MutableVisionGroup) { "Collector for a group should be a group" }
+        //Subscribe for children changes
+        children.forEach { (token, child) ->
+            val childCollector: Vision = if (child is VisionGroup) {
+                SimpleVisionGroup()
+            } else {
+                VisionBase()
+            }
+            val job = child.collectChange(this, childCollector)
+            jobStore[token] = job
+            //TODO add lazy child addition
+            collector[token] = childCollector
+        }
+
+        //Subscribe for structure change
+        if (this is MutableVisionGroup) {
+            onChildrenChange(this) { token, child ->
+                //Cancel collector job to avoid leaking
+                jobStore[token]?.cancel()
+                if (child != null) {
+                    //Collect to existing Vision
+                    val job = child.collectChange(this, child)
+                    jobStore[token] = job
+                    collector[token] = child
+                } else{
+                    collector[token] = NullVision
+                }
+            }
+        }
+    }
+
+    //Collect properties change
+    collector.onPropertyChange(collector) { propertyName ->
+        collector.config[propertyName] = properties?.get(propertyName)
+    }
+}
+
+public fun Vision.flowChanges(scope: CoroutineScope, collectionDuration: Duration): Flow<Vision> = flow {
+    //emit initial visual tree
+    emit(this@flowChanges)
+    while (true) {
+        val collector: Vision = if (this is VisionGroup) {
+            SimpleVisionGroup()
+        } else {
+            VisionBase()
+        }
+        val collectorJob = collectChange(scope, collector)
+        kotlinx.coroutines.delay(collectionDuration)
+        emit(collector)
+        collectorJob.cancel()
+    }
+}
\ No newline at end of file
diff --git a/visionforge-server/build.gradle.kts b/visionforge-server/build.gradle.kts
index 60d5624b..17696344 100644
--- a/visionforge-server/build.gradle.kts
+++ b/visionforge-server/build.gradle.kts
@@ -1,63 +1,8 @@
 //import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME
 
 plugins {
-    id("ru.mipt.npm.mpp")
-//    application
+    id("ru.mipt.npm.jvm")
 }
 
 val ktorVersion: String by rootProject.extra
 
-//kscience {
-//    application()
-//}
-
-kotlin {
-//    afterEvaluate {
-//        val jsBrowserDistribution by tasks.getting
-//
-//        jvm {
-//            withJava()
-//            compilations[MAIN_COMPILATION_NAME]?.apply {
-//                tasks.getByName<ProcessResources>(processResourcesTaskName) {
-//                    dependsOn(jsBrowserDistribution)
-//                    afterEvaluate {
-//                        from(jsBrowserDistribution)
-//                    }
-//                }
-//            }
-//
-//        }
-//    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation(project(":visionforge-core"))
-            }
-        }
-        jvmMain {
-            dependencies {
-                implementation("io.ktor:ktor-server-cio:$ktorVersion")
-                implementation("io.ktor:ktor-serialization:$ktorVersion")
-            }
-        }
-        jsMain {
-            dependencies {
-                implementation("io.ktor:ktor-client-js:$ktorVersion")
-                implementation("io.ktor:ktor-client-serialization-js:$ktorVersion")
-            }
-        }
-    }
-}
-
-
-//distributions {
-//    main {
-//        contents {
-//            from("$buildDir/libs") {
-//                rename("${rootProject.name}-jvm", rootProject.name)
-//                into("lib")
-//            }
-//        }
-//    }
-//}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/BasicSolid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/BasicSolid.kt
index 7cd198bb..40f2543e 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/BasicSolid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/BasicSolid.kt
@@ -1,15 +1,20 @@
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.*
-import hep.dataforge.vision.AbstractVision
+import hep.dataforge.meta.Meta
+import hep.dataforge.meta.descriptors.NodeDescriptor
+import hep.dataforge.meta.float
+import hep.dataforge.meta.get
+import hep.dataforge.meta.node
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionBase
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
 
 @Serializable
 @SerialName("solid")
-public open class BasicSolid: AbstractVision(), Solid {
+public open class BasicSolid : VisionBase(), Solid {
+    override val descriptor: NodeDescriptor get() = Solid.descriptor
+
     @Serializable(Point3DSerializer::class)
     override var position: Point3D? = null
 
@@ -19,16 +24,16 @@ public open class BasicSolid: AbstractVision(), Solid {
     @Serializable(Point3DSerializer::class)
     override var scale: Point3D? = null
 
-    override fun update(meta: Meta) {
+    override fun update(change: Vision) {
         fun Meta.toVector(default: Float = 0f) = Point3D(
             this[Solid.X_KEY].float ?: default,
             this[Solid.Y_KEY].float ?: default,
             this[Solid.Z_KEY].float ?: default
         )
 
-        meta[Solid.POSITION_KEY].node?.toVector()?.let { position = it }
-        meta[Solid.ROTATION].node?.toVector()?.let { rotation = it }
-        meta[Solid.SCALE_KEY].node?.toVector(1f)?.let { scale = it }
-        super.update(meta)
+        change.properties[Solid.POSITION_KEY].node?.toVector()?.let { position = it }
+        change.properties[Solid.ROTATION].node?.toVector()?.let { rotation = it }
+        change.properties[Solid.SCALE_KEY].node?.toVector(1f)?.let { scale = it }
+        super.update(change)
     }
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
index 1a6769b8..957e4501 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
@@ -7,6 +7,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
 import hep.dataforge.vision.VisionContainerBuilder
+import hep.dataforge.vision.properties
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -17,7 +18,7 @@ import kotlinx.serialization.UseSerializers
 public class PolyLine(public var points: List<Point3D>) : BasicSolid(), Solid {
 
     //var lineType by string()
-    public var thickness: Number by number(1.0, key = SolidMaterial.MATERIAL_KEY + THICKNESS_KEY)
+    public var thickness: Number by properties().number(1.0, key = SolidMaterial.MATERIAL_KEY + THICKNESS_KEY)
 
     public companion object {
         public val THICKNESS_KEY: Name = "thickness".asName()
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
index 9f58912b..6bc250d8 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
@@ -10,14 +10,14 @@ import kotlinx.serialization.Transient
 import kotlin.collections.set
 
 public abstract class AbstractProxy : BasicSolid(), VisionGroup {
-    public abstract val prototype: Vision
+    public abstract val prototype: Solid
 
     override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? {
         return if (inherit) {
             sequence {
                 yield(properties?.get(name))
                 yieldAll(getStyleItems(name))
-                yield(prototype.getItem(name))
+                yield(prototype.getProperty(name))
                 yield(parent?.getProperty(name, inherit))
             }.merge()
         } else {
@@ -42,7 +42,7 @@ public abstract class AbstractProxy : BasicSolid(), VisionGroup {
         //do nothing
     }
 
-    override val descriptor: NodeDescriptor? get() = prototype.descriptor
+    override val descriptor: NodeDescriptor get() = prototype.descriptor
 }
 
 /**
@@ -82,13 +82,11 @@ public class Proxy private constructor(
         return NameToken(PROXY_CHILD_PROPERTY_PREFIX, childName.toString()) + propertyName
     }
 
-    private fun prototypeFor(name: Name): Vision {
-        return (prototype as? VisionGroup)?.get(name)
+    private fun prototypeFor(name: Name): Solid {
+        return (prototype as? SolidGroup)?.get(name) as? Solid
             ?: error("Prototype with name $name not found in $this")
     }
 
-    override val descriptor: NodeDescriptor? get() = prototype.descriptor
-
     //override fun findAllStyles(): Laminate = Laminate((styles + prototype.styles).mapNotNull { findStyle(it) })
 
     /**
@@ -97,7 +95,7 @@ public class Proxy private constructor(
      */
     public inner class ProxyChild(public val name: Name) : AbstractProxy() {
 
-        override val prototype: Vision get() = prototypeFor(name)
+        override val prototype: Solid get() = prototypeFor(name)
 
         override val styleSheet: StyleSheet get() = this@Proxy.styleSheet
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
index 7e9c044b..e7d3587f 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
@@ -14,7 +14,6 @@ import hep.dataforge.vision.enum
 import hep.dataforge.vision.solid.Solid.Companion.DETAIL_KEY
 import hep.dataforge.vision.solid.Solid.Companion.IGNORE_KEY
 import hep.dataforge.vision.solid.Solid.Companion.LAYER_KEY
-import kotlinx.serialization.UseSerializers
 
 /**
  * Interface for 3-dimensional [Vision]
@@ -24,7 +23,7 @@ public interface Solid : Vision {
     public var rotation: Point3D?
     public var scale: Point3D?
 
-    override val descriptor: NodeDescriptor? get() = Companion.descriptor
+    override val descriptor: NodeDescriptor get() = Companion.descriptor
 
     public companion object {
         //        val SELECTED_KEY = "selected".asName()
@@ -123,7 +122,7 @@ public enum class RotationOrder {
  */
 public var Solid.rotationOrder: RotationOrder
     get() = getItem(Solid.ROTATION_ORDER_KEY).enum<RotationOrder>() ?: RotationOrder.XYZ
-    set(value) = setItem(Solid.ROTATION_ORDER_KEY, value.name.asValue())
+    set(value) = setValue(Solid.ROTATION_ORDER_KEY, value.name.asValue())
 
 
 /**
@@ -131,7 +130,7 @@ public var Solid.rotationOrder: RotationOrder
  */
 public var Solid.detail: Int?
     get() = getProperty(DETAIL_KEY, false).int
-    set(value) = setItem(DETAIL_KEY, value?.asValue())
+    set(value) = setValue(DETAIL_KEY, value?.asValue())
 
 /**
  * If this property is true, the object will be ignored on render.
@@ -139,7 +138,7 @@ public var Solid.detail: Int?
  */
 public var Vision.ignore: Boolean?
     get() = getProperty(IGNORE_KEY, false).boolean
-    set(value) = setItem(IGNORE_KEY, value?.asValue())
+    set(value) = setValue(IGNORE_KEY, value?.asValue())
 
 //var VisualObject.selected: Boolean?
 //    get() = getProperty(SELECTED_KEY).boolean
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index f27ea3f3..381a2f5c 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -1,16 +1,12 @@
 package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.Config
-import hep.dataforge.meta.DFExperimental
+import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.names.Name
 import hep.dataforge.names.NameToken
-import hep.dataforge.names.asName
 import hep.dataforge.vision.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.Serializer
-import kotlinx.serialization.UseSerializers
-import kotlinx.serialization.json.Json
 import kotlin.collections.set
 
 public interface PrototypeHolder {
@@ -25,7 +21,7 @@ public interface PrototypeHolder {
 @SerialName("group.solid")
 public class SolidGroup : AbstractVisionGroup(), Solid, PrototypeHolder {
 
-    override var styleSheet: StyleSheet? = null
+    override val descriptor: NodeDescriptor get() = Solid.descriptor
 
     /**
      * A container for templates visible inside this group
@@ -44,9 +40,6 @@ public class SolidGroup : AbstractVisionGroup(), Solid, PrototypeHolder {
         }).run(builder)
     }
 
-    //FIXME to be lifted to AbstractVisualGroup after https://github.com/Kotlin/kotlinx.serialization/issues/378 is fixed
-    override var properties: Config? = null
-
     @Serializable(Point3DSerializer::class)
     override var position: Point3D? = null
 
@@ -111,14 +104,12 @@ public fun MutableVisionGroup.group(name: String, action: SolidGroup.() -> Unit
  * A special class which works as a holder for prototypes
  */
 internal class Prototypes(
-    override var children: MutableMap<NameToken, Vision> = LinkedHashMap()
+    override var children: MutableMap<NameToken, Vision> = LinkedHashMap(),
 ) : AbstractVisionGroup(), MutableVisionGroup, PrototypeHolder {
 
-    override var styleSheet: StyleSheet?
-        get() = null
-        set(_) {
-            error("Can't define stylesheet for prototypes block")
-        }
+    override fun styleSheet(block: StyleSheet.() -> Unit) {
+        error("Can't define stylesheet for prototypes block")
+    }
 
     override fun removeChild(token: NameToken) {
         children.remove(token)
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt
index e24ccc30..c5b0a435 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt
@@ -1,12 +1,8 @@
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.DFExperimental
-import hep.dataforge.meta.double
-import hep.dataforge.meta.transformations.MetaConverter.Companion.double
 import hep.dataforge.names.NameToken
 import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionGroup
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.MapSerializer
 import kotlinx.serialization.builtins.nullable
@@ -18,7 +14,6 @@ import kotlinx.serialization.encoding.*
 
 
 @OptIn(ExperimentalSerializationApi::class)
-@Serializer(Point3D::class)
 public object Point3DSerializer : KSerializer<Point3D> {
     override val descriptor: SerialDescriptor = buildClassSerialDescriptor("hep.dataforge.vis.spatial.Point3D") {
         element<Double>("x")
@@ -54,7 +49,6 @@ public object Point3DSerializer : KSerializer<Point3D> {
 }
 
 @OptIn(ExperimentalSerializationApi::class)
-@Serializer(Point2D::class)
 public object Point2DSerializer : KSerializer<Point2D> {
     override val descriptor: SerialDescriptor = buildClassSerialDescriptor("hep.dataforge.vis.spatial.Point2D") {
         element<Double>("x")
@@ -85,8 +79,6 @@ public object Point2DSerializer : KSerializer<Point2D> {
     }
 }
 
-@OptIn(ExperimentalSerializationApi::class)
-@Serializer(MutableVisionGroup::class)
 internal object PrototypesSerializer : KSerializer<MutableVisionGroup> {
 
     private val mapSerializer: KSerializer<Map<NameToken, Vision>> =

From 7e037b57fc27624300010806e6516e7cd999e29e Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 13 Nov 2020 09:57:46 +0300
Subject: [PATCH 023/151] Refactor Group hierarchy

---
 .../dataforge/vision/gdml/GDMLVisualTest.kt   |  9 ++++--
 .../kotlin/ru/mipt/npm/muon/monitor/Model.kt  |  3 +-
 .../mipt/npm/muon/monitor/MMAppComponent.kt   |  8 ++++-
 .../vision/solid/demo/VariableBox.kt          |  6 ++--
 playground/src/jsMain/kotlin/PlayGroundApp.kt |  3 +-
 .../vision/bootstrap/visionPropertyEditor.kt  |  4 +--
 .../dataforge/vision/react/ConfigEditor.kt    | 14 ++++----
 .../vision/react/ThreeCanvasComponent.kt      |  1 +
 .../hep/dataforge/vision/SimpleVisionGroup.kt | 24 --------------
 .../kotlin/hep/dataforge/vision/Vision.kt     |  6 ++--
 ...tractVisionGroup.kt => VisionGroupBase.kt} | 32 +++++++++++--------
 .../hep/dataforge/vision/VisionManager.kt     |  2 +-
 .../hep/dataforge/vision/collectChange.kt     |  8 ++---
 .../editor/VisualObjectEditorFragment.kt      |  3 +-
 .../hep/dataforge/vision/solid/Solid.kt       |  9 +++---
 .../hep/dataforge/vision/solid/SolidGroup.kt  | 30 +++--------------
 .../dataforge/vision/solid/SolidManager.kt    |  6 ++--
 .../dataforge/vision/solid/SolidMaterial.kt   | 19 +++++------
 .../dataforge/vision/solid/PropertyTest.kt    |  4 +--
 .../vision/solid/three/MeshThreeFactory.kt    |  8 ++---
 .../vision/solid/three/ThreeCanvas.kt         |  6 ++--
 .../vision/solid/three/ThreeLineFactory.kt    |  2 +-
 .../vision/solid/three/ThreeMaterials.kt      | 17 +++++-----
 .../dataforge/vision/solid/fx/FX3DPlugin.kt   |  2 +-
 .../dataforge/vision/solid/fx/FXCanvas3D.kt   |  1 +
 .../vision/solid/fx/VisualObjectFXBinding.kt  |  2 +-
 26 files changed, 101 insertions(+), 128 deletions(-)
 delete mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisionGroup.kt
 rename visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/{AbstractVisionGroup.kt => VisionGroupBase.kt} (84%)

diff --git a/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt b/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt
index 59545bdf..0fa982dc 100644
--- a/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt
+++ b/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt
@@ -1,13 +1,14 @@
 package hep.dataforge.vision.gdml
 
-import hep.dataforge.meta.setItem
 import hep.dataforge.meta.string
 import hep.dataforge.names.toName
 import hep.dataforge.values.asValue
 import hep.dataforge.vision.gdml.demo.cubes
+import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.SolidMaterial
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertTrue
 
 class GDMLVisualTest {
     val gdml = cubes()
@@ -24,7 +25,9 @@ class GDMLVisualTest {
     @Test
     fun testPrototypeProperty() {
         val visual = gdml.toVision()
-        visual["composite000.segment_0".toName()]?.setItem(SolidMaterial.MATERIAL_COLOR_KEY, "red".asValue())
-        assertEquals("red", visual["composite000.segment_0".toName()]?.getItem(SolidMaterial.MATERIAL_COLOR_KEY).string)
+        val child = visual["composite000.segment_0".toName()]
+        assertTrue { child!= null }
+        child?.setProperty(SolidMaterial.MATERIAL_COLOR_KEY, "red".asValue())
+        assertEquals("red", child?.getProperty(SolidMaterial.MATERIAL_COLOR_KEY).string)
     }
 }
\ No newline at end of file
diff --git a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt
index 55d88a11..2d731fe2 100644
--- a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt
+++ b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt
@@ -1,6 +1,7 @@
 package ru.mipt.npm.muon.monitor
 
 import hep.dataforge.vision.removeAll
+import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.*
 import ru.mipt.npm.muon.monitor.Monitor.CENTRAL_LAYER_Z
 import ru.mipt.npm.muon.monitor.Monitor.LOWER_LAYER_Z
@@ -63,7 +64,7 @@ class Model {
     fun reset() {
         map.values.forEach {
             it.config
-            it.setItem(SolidMaterial.MATERIAL_COLOR_KEY, null)
+            it.setProperty(SolidMaterial.MATERIAL_COLOR_KEY, null)
         }
         tracks.removeAll()
     }
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
index 9917d75a..aeb8d815 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
@@ -1,6 +1,7 @@
 package ru.mipt.npm.muon.monitor
 
 import hep.dataforge.context.Context
+import hep.dataforge.meta.invoke
 import hep.dataforge.names.Name
 import hep.dataforge.names.NameToken
 import hep.dataforge.names.isEmpty
@@ -172,7 +173,12 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                             else -> root[selected]
                         }
                         if (selectedObject != null) {
-                            configEditor(selectedObject, default = selectedObject.getAllProperties(), key = selected)
+                            configEditor(
+                                selectedObject.config,
+                                selectedObject.descriptor,
+                                default = selectedObject.getAllProperties(),
+                                key = selected
+                            )
                         }
                     }
                 }
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
index c5f023ff..08830f35 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
@@ -5,12 +5,12 @@ package hep.dataforge.vision.solid.demo
 import hep.dataforge.meta.int
 import hep.dataforge.meta.number
 import hep.dataforge.meta.set
-import hep.dataforge.meta.setItem
 import hep.dataforge.names.plus
 import hep.dataforge.names.startsWith
 import hep.dataforge.values.asValue
 import hep.dataforge.vision.getProperty
 import hep.dataforge.vision.set
+import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.Solid.Companion.GEOMETRY_KEY
 import hep.dataforge.vision.solid.three.*
@@ -84,13 +84,13 @@ internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeV
     var variableZSize: Number
         get() = getProperty(Z_SIZE_KEY, false).number ?: 0f
         set(value) {
-            setItem(Z_SIZE_KEY, value.asValue())
+            setProperty(Z_SIZE_KEY, value.asValue())
         }
 
     var value: Int
         get() = getProperty("value", false).int ?: 0
         set(value) {
-            setItem("value", value.asValue())
+            setProperty("value", value.asValue())
             val size = value.toFloat() / 255f * 20f
             scaleZ = size
             z = size / 2
diff --git a/playground/src/jsMain/kotlin/PlayGroundApp.kt b/playground/src/jsMain/kotlin/PlayGroundApp.kt
index 4542a9e9..d5d1ce13 100644
--- a/playground/src/jsMain/kotlin/PlayGroundApp.kt
+++ b/playground/src/jsMain/kotlin/PlayGroundApp.kt
@@ -1,6 +1,7 @@
 import hep.dataforge.context.Global
 import hep.dataforge.js.Application
 import hep.dataforge.js.startApplication
+import hep.dataforge.meta.invoke
 import hep.dataforge.vision.bootstrap.visionPropertyEditor
 import hep.dataforge.vision.react.ThreeCanvasComponent
 import hep.dataforge.vision.react.objectTree
@@ -18,7 +19,7 @@ public fun RBuilder.threeCanvas(object3D: Solid, options: Canvas3DOptions.() ->
     child(ThreeCanvasComponent) {
         attrs {
             this.obj = object3D
-            this.options = Canvas3DOptions.invoke(options)
+            this.options = Canvas3DOptions(options)
         }
     }
 }
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
index 5651257b..b69c631b 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
@@ -17,7 +17,7 @@ public fun RBuilder.visionPropertyEditor(
     key: Any? = null
 ) {
     card("Properties") {
-        configEditor(item, descriptor, default, key)
+        configEditor(item.config, descriptor, default, key)
     }
     val styles = item.styles
     if(styles.isNotEmpty()) {
@@ -40,6 +40,6 @@ public fun Element.visionPropertyEditor(
     item: Vision,
     descriptor: NodeDescriptor? = item.descriptor,
     default: Meta? = null
-) = render(this) {
+): Unit = render(this) {
     visionPropertyEditor(item, descriptor, default)
 }
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
index 9d9078f7..56bb24a6 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
@@ -233,10 +233,10 @@ public fun RBuilder.configEditor(config: Config, descriptor: NodeDescriptor? = n
         }
     }
 }
-
-public fun RBuilder.configEditor(
-    obj: Configurable,
-    descriptor: NodeDescriptor? = obj.descriptor,
-    default: Meta? = null,
-    key: Any? = null
-) = configEditor(obj.config,descriptor, default, key)
+//
+//public fun RBuilder.configEditor(
+//    obj: Configurable,
+//    descriptor: NodeDescriptor?,
+//    default: Meta? = null,
+//    key: Any? = null
+//): Unit = configEditor(obj.config, descriptor, default, key)
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
index 5d961741..da424bab 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
@@ -1,6 +1,7 @@
 package hep.dataforge.vision.react
 
 import hep.dataforge.context.Context
+import hep.dataforge.meta.empty
 import hep.dataforge.names.Name
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisionGroup.kt
deleted file mode 100644
index 96c2325c..00000000
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/SimpleVisionGroup.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package hep.dataforge.vision
-
-import hep.dataforge.names.NameToken
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-
-@Serializable
-@SerialName("vision.group")
-public class SimpleVisionGroup : AbstractVisionGroup() {
-    @SerialName("children")
-    private val _children = HashMap<NameToken, Vision>()
-    override val children: Map<NameToken, Vision> get() = _children
-
-    override fun removeChild(token: NameToken) {
-        _children.remove(token)?.apply { parent = null }
-    }
-
-    override fun setChild(token: NameToken, child: Vision) {
-        _children[token] = child
-    }
-
-    override fun createGroup(): SimpleVisionGroup = SimpleVisionGroup()
-}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 3ceadc65..3a9cc81c 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -2,6 +2,7 @@ package hep.dataforge.vision
 
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.Described
+import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.toName
@@ -70,6 +71,8 @@ public interface Vision : Configurable, Described {
      */
     public fun update(change: Vision)
 
+    override val descriptor: NodeDescriptor?
+
     public companion object {
         public const val TYPE: String = "vision"
         public val STYLE_KEY: Name = "@style".asName()
@@ -133,8 +136,7 @@ public fun Vision.property(
         }
     }
 
-//TODO replace by value
-fun Vision.properties(inherit: Boolean = true): MutableItemProvider = object : MutableItemProvider {
+public fun Vision.properties(inherit: Boolean = true): MutableItemProvider = object : MutableItemProvider {
     override fun getItem(name: Name): MetaItem<*>? {
         return getProperty(name, inherit)
     }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
similarity index 84%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt
rename to visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
index aa43a14e..af8fee4e 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/AbstractVisionGroup.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
@@ -1,20 +1,27 @@
 package hep.dataforge.vision
 
 import hep.dataforge.names.*
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 
 
 /**
  * Abstract implementation of mutable group of [Vision]
  */
-public abstract class AbstractVisionGroup : VisionBase(), MutableVisionGroup {
+@Serializable
+@SerialName("vision.group")
+public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
 
     //protected abstract val _children: MutableMap<NameToken, T>
 
+    @SerialName("children")
+    protected val childrenInternal = LinkedHashMap<NameToken, Vision>()
+
     /**
      * A map of top level named children
      */
-    abstract override val children: Map<NameToken, Vision>
+    override val children: Map<NameToken, Vision> get() = childrenInternal
 
     final override var styleSheet: StyleSheet? = null
         private set
@@ -24,7 +31,7 @@ public abstract class AbstractVisionGroup : VisionBase(), MutableVisionGroup {
      */
     public open fun styleSheet(block: StyleSheet.() -> Unit) {
         if (styleSheet == null) {
-            styleSheet = StyleSheet(this@AbstractVisionGroup)
+            styleSheet = StyleSheet(this@VisionGroupBase)
         }
         styleSheet!!.block()
     }
@@ -70,12 +77,9 @@ public abstract class AbstractVisionGroup : VisionBase(), MutableVisionGroup {
     /**
      * Remove a child with given name token
      */
-    protected abstract fun removeChild(token: NameToken)
-
-    /**
-     * Add, remove or replace child with given name
-     */
-    protected abstract fun setChild(token: NameToken, child: Vision)
+    public fun removeChild(token: NameToken) {
+        childrenInternal.remove(token)
+    }
 
     /**
      * Add a static child. Statics could not be found by name, removed or replaced. Changing statics also do not trigger events.
@@ -84,15 +88,15 @@ public abstract class AbstractVisionGroup : VisionBase(), MutableVisionGroup {
         attach(NameToken("@static", index = child.hashCode().toString()), child)
     }
 
-    protected abstract fun createGroup(): AbstractVisionGroup
+    protected open fun createGroup(): VisionGroupBase = VisionGroupBase()
 
     /**
      * Set parent for given child and attach it
      */
-    protected fun attach(token: NameToken, child: Vision) {
+    private fun attach(token: NameToken, child: Vision) {
         if (child.parent == null) {
             child.parent = this
-            setChild(token, child)
+            childrenInternal[token] = child
         } else if (child.parent !== this) {
             error("Can't reassign existing parent for $child")
         }
@@ -101,7 +105,7 @@ public abstract class AbstractVisionGroup : VisionBase(), MutableVisionGroup {
     /**
      * Recursively create a child group
      */
-    private fun createGroups(name: Name): AbstractVisionGroup {
+    private fun createGroups(name: Name): VisionGroupBase {
         return when {
             name.isEmpty() -> error("Should be unreachable")
             name.length == 1 -> {
@@ -110,7 +114,7 @@ public abstract class AbstractVisionGroup : VisionBase(), MutableVisionGroup {
                     null -> createGroup().also { child ->
                         attach(token, child)
                     }
-                    is AbstractVisionGroup -> current
+                    is VisionGroupBase -> current
                     else -> error("Can't create group with name $name because it exists and not a group")
                 }
             }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
index 1078abd6..63dc4930 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
@@ -83,7 +83,7 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
 
         private val defaultSerialModule: SerializersModule = SerializersModule {
             polymorphic(Vision::class) {
-                subclass(SimpleVisionGroup.serializer())
+                subclass(VisionGroupBase.serializer())
             }
         }
     }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/collectChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/collectChange.kt
index e2a128bc..cb61939f 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/collectChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/collectChange.kt
@@ -1,7 +1,7 @@
 package hep.dataforge.vision
 
 import hep.dataforge.meta.*
-import hep.dataforge.meta.descriptors.ItemDescriptor
+import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.names.Name
 import hep.dataforge.names.NameToken
 import kotlinx.coroutines.CoroutineScope
@@ -43,7 +43,7 @@ public object NullVision : Vision {
     }
 
     override val config: Config get() = Config()
-    override val descriptor: ItemDescriptor? get() = null
+    override val descriptor: NodeDescriptor? get() = null
 }
 
 private fun Vision.collectChange(scope: CoroutineScope, collector: Vision): Job = scope.launch {
@@ -56,7 +56,7 @@ private fun Vision.collectChange(scope: CoroutineScope, collector: Vision): Job
         //Subscribe for children changes
         children.forEach { (token, child) ->
             val childCollector: Vision = if (child is VisionGroup) {
-                SimpleVisionGroup()
+                VisionGroupBase()
             } else {
                 VisionBase()
             }
@@ -94,7 +94,7 @@ public fun Vision.flowChanges(scope: CoroutineScope, collectionDuration: Duratio
     emit(this@flowChanges)
     while (true) {
         val collector: Vision = if (this is VisionGroup) {
-            SimpleVisionGroup()
+            VisionGroupBase()
         } else {
             VisionBase()
         }
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
index 7da6885d..5a559d4f 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
@@ -6,6 +6,7 @@ import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.update
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.resolveStyle
+import hep.dataforge.vision.setProperty
 import javafx.beans.binding.Binding
 import javafx.beans.property.SimpleObjectProperty
 import javafx.scene.Node
@@ -36,7 +37,7 @@ class VisualObjectEditorFragment(val selector: (Vision) -> Meta) : Fragment() {
         val config = Config().apply {
             update(meta)
             onChange(this@VisualObjectEditorFragment) { key, _, after ->
-                visualObject.setItem(key, after)
+                visualObject.setProperty(key, after)
             }
         }
         //remember old config reference to cleanup listeners
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
index e7d3587f..6e176501 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
@@ -11,6 +11,7 @@ import hep.dataforge.values.asValue
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.Vision.Companion.VISIBLE_KEY
 import hep.dataforge.vision.enum
+import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.Solid.Companion.DETAIL_KEY
 import hep.dataforge.vision.solid.Solid.Companion.IGNORE_KEY
 import hep.dataforge.vision.solid.Solid.Companion.LAYER_KEY
@@ -121,8 +122,8 @@ public enum class RotationOrder {
  * Rotation order
  */
 public var Solid.rotationOrder: RotationOrder
-    get() = getItem(Solid.ROTATION_ORDER_KEY).enum<RotationOrder>() ?: RotationOrder.XYZ
-    set(value) = setValue(Solid.ROTATION_ORDER_KEY, value.name.asValue())
+    get() = getProperty(Solid.ROTATION_ORDER_KEY).enum<RotationOrder>() ?: RotationOrder.XYZ
+    set(value) = setProperty(Solid.ROTATION_ORDER_KEY, value.name.asValue())
 
 
 /**
@@ -130,7 +131,7 @@ public var Solid.rotationOrder: RotationOrder
  */
 public var Solid.detail: Int?
     get() = getProperty(DETAIL_KEY, false).int
-    set(value) = setValue(DETAIL_KEY, value?.asValue())
+    set(value) = setProperty(DETAIL_KEY, value?.asValue())
 
 /**
  * If this property is true, the object will be ignored on render.
@@ -138,7 +139,7 @@ public var Solid.detail: Int?
  */
 public var Vision.ignore: Boolean?
     get() = getProperty(IGNORE_KEY, false).boolean
-    set(value) = setValue(IGNORE_KEY, value?.asValue())
+    set(value) = setProperty(IGNORE_KEY, value?.asValue())
 
 //var VisualObject.selected: Boolean?
 //    get() = getProperty(SELECTED_KEY).boolean
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index 381a2f5c..d4c76661 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -7,7 +7,6 @@ import hep.dataforge.names.NameToken
 import hep.dataforge.vision.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlin.collections.set
 
 public interface PrototypeHolder {
     public val parent: VisionGroup?
@@ -19,7 +18,7 @@ public interface PrototypeHolder {
  */
 @Serializable
 @SerialName("group.solid")
-public class SolidGroup : AbstractVisionGroup(), Solid, PrototypeHolder {
+public class SolidGroup : VisionGroupBase(), Solid, PrototypeHolder {
 
     override val descriptor: NodeDescriptor get() = Solid.descriptor
 
@@ -36,7 +35,7 @@ public class SolidGroup : AbstractVisionGroup(), Solid, PrototypeHolder {
     public fun prototypes(builder: MutableVisionGroup.() -> Unit): Unit {
         (prototypes ?: Prototypes().also {
             prototypes = it
-            attach(it)
+            it.parent = this
         }).run(builder)
     }
 
@@ -49,23 +48,12 @@ public class SolidGroup : AbstractVisionGroup(), Solid, PrototypeHolder {
     @Serializable(Point3DSerializer::class)
     override var scale: Point3D? = null
 
-    @SerialName("children")
-    private val _children = LinkedHashMap<NameToken, Vision>()
-    override val children: Map<NameToken, Vision> get() = _children
-
     override fun attachChildren() {
         prototypes?.parent = this
         prototypes?.attachChildren()
         super.attachChildren()
     }
 
-    override fun removeChild(token: NameToken) {
-        _children.remove(token)?.apply { parent = null }
-    }
-
-    override fun setChild(token: NameToken, child: Vision) {
-        _children[token] = child
-    }
 
 //    /**
 //     * TODO add special static group to hold statics without propagation
@@ -103,25 +91,15 @@ public fun MutableVisionGroup.group(name: String, action: SolidGroup.() -> Unit
 /**
  * A special class which works as a holder for prototypes
  */
+@Serializable(PrototypesSerializer::class)
 internal class Prototypes(
     override var children: MutableMap<NameToken, Vision> = LinkedHashMap(),
-) : AbstractVisionGroup(), MutableVisionGroup, PrototypeHolder {
+) : VisionGroupBase(), PrototypeHolder {
 
     override fun styleSheet(block: StyleSheet.() -> Unit) {
         error("Can't define stylesheet for prototypes block")
     }
 
-    override fun removeChild(token: NameToken) {
-        children.remove(token)
-        childrenChanged(token, null)
-    }
-
-    override fun setChild(token: NameToken, child: Vision) {
-        children[token] = child
-    }
-
-    override fun createGroup() = SimpleVisionGroup()
-
     override var properties: Config?
         get() = null
         set(_) {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index 8db54e7e..be737599 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -4,12 +4,12 @@ import hep.dataforge.context.AbstractPlugin
 import hep.dataforge.context.Context
 import hep.dataforge.context.PluginFactory
 import hep.dataforge.context.PluginTag
-import hep.dataforge.meta.*
+import hep.dataforge.meta.Meta
 import hep.dataforge.names.Name
 import hep.dataforge.names.toName
-import hep.dataforge.vision.SimpleVisionGroup
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionGroup
+import hep.dataforge.vision.VisionGroupBase
 import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.VisionManager.Companion.VISION_SERIAL_MODULE_TARGET
 import kotlinx.serialization.json.Json
@@ -51,7 +51,7 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
             contextual(Point2DSerializer)
 
             polymorphic(Vision::class) {
-                subclass(SimpleVisionGroup.serializer())
+                subclass(VisionGroupBase.serializer())
                 solids()
             }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
index 50d7d508..34a12916 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
@@ -9,6 +9,7 @@ import hep.dataforge.names.plus
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.asValue
 import hep.dataforge.vision.Colors
+import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_OPACITY_KEY
@@ -48,7 +49,7 @@ public class SolidMaterial : Scheme() {
         internal val WIREFRAME_KEY = "wireframe".asName()
         public val MATERIAL_WIREFRAME_KEY: Name = MATERIAL_KEY + WIREFRAME_KEY
 
-        public val descriptor: NodeDescriptor by lazy {
+        public override val descriptor: NodeDescriptor by lazy {
             //must be lazy to avoid initialization bug
             NodeDescriptor {
                 value(COLOR_KEY) {
@@ -79,17 +80,17 @@ public class SolidMaterial : Scheme() {
  * Set color as web-color
  */
 public fun Solid.color(webColor: String) {
-    setItem(MATERIAL_COLOR_KEY, webColor.asValue())
+    setProperty(MATERIAL_COLOR_KEY, webColor.asValue())
 }
 
 /**
  * Set color as integer
  */
 public fun Solid.color(rgb: Int) {
-    setItem(MATERIAL_COLOR_KEY, rgb.asValue())
+    setProperty(MATERIAL_COLOR_KEY, rgb.asValue())
 }
 
-public fun Solid.color(r: UByte, g: UByte, b: UByte): Unit = setItem(
+public fun Solid.color(r: UByte, g: UByte, b: UByte): Unit = setProperty(
     MATERIAL_COLOR_KEY,
     Colors.rgbToString(r, g, b).asValue()
 )
@@ -98,13 +99,13 @@ public fun Solid.color(r: UByte, g: UByte, b: UByte): Unit = setItem(
  * Web colors representation of the color in `#rrggbb` format or HTML name
  */
 public var Solid.color: String?
-    get() = getItem(MATERIAL_COLOR_KEY)?.let { Colors.fromMeta(it) }
+    get() = getProperty(MATERIAL_COLOR_KEY)?.let { Colors.fromMeta(it) }
     set(value) {
-        setItem(MATERIAL_COLOR_KEY, value?.asValue())
+        setProperty(MATERIAL_COLOR_KEY, value?.asValue())
     }
 
 public val Solid.material: SolidMaterial?
-    get() = getItem(MATERIAL_KEY).node?.let { SolidMaterial.wrap(it) }
+    get() = getProperty(MATERIAL_KEY).node?.let { SolidMaterial.wrap(it) }
 
 public fun Solid.material(builder: SolidMaterial.() -> Unit) {
     val node = config[MATERIAL_KEY].node
@@ -116,7 +117,7 @@ public fun Solid.material(builder: SolidMaterial.() -> Unit) {
 }
 
 public var Solid.opacity: Double?
-    get() = getItem(MATERIAL_OPACITY_KEY).double
+    get() = getProperty(MATERIAL_OPACITY_KEY).double
     set(value) {
-        setItem(MATERIAL_OPACITY_KEY, value?.asValue())
+        setProperty(MATERIAL_OPACITY_KEY, value?.asValue())
     }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
index 48c7ec9d..a12679e5 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
@@ -18,7 +18,7 @@ class PropertyTest {
                 box = box(100, 100, 100)
             }
         }
-        assertEquals(22, box?.getItem("test".asName()).int)
+        assertEquals(22, box?.getProperty("test".asName()).int)
     }
 
     @Test
@@ -36,7 +36,7 @@ class PropertyTest {
                 }
             }
         }
-        assertEquals(22, box?.getItem("test".asName()).int)
+        assertEquals(22, box?.getProperty("test".asName()).int)
     }
 
     @Test
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
index 5cd52b01..44478c61 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
@@ -85,9 +85,9 @@ fun Mesh.applyProperties(obj: Solid): Mesh = apply{
 fun Mesh.applyEdges(obj: Solid) {
     val edges = children.find { it.name == "@edges" } as? LineSegments
     //inherited edges definition, enabled by default
-    if (obj.getItem(MeshThreeFactory.EDGES_ENABLED_KEY).boolean != false) {
+    if (obj.getProperty(MeshThreeFactory.EDGES_ENABLED_KEY).boolean != false) {
         val bufferGeometry = geometry as? BufferGeometry ?: return
-        val material = ThreeMaterials.getLineMaterial(obj.getItem(MeshThreeFactory.EDGES_MATERIAL_KEY).node, true)
+        val material = ThreeMaterials.getLineMaterial(obj.getProperty(MeshThreeFactory.EDGES_MATERIAL_KEY).node, true)
         if (edges == null) {
             add(
                 LineSegments(
@@ -114,9 +114,9 @@ fun Mesh.applyWireFrame(obj: Solid) {
         (it as LineSegments).dispose()
     }
     //inherited wireframe definition, disabled by default
-    if (obj.getItem(MeshThreeFactory.WIREFRAME_ENABLED_KEY).boolean == true) {
+    if (obj.getProperty(MeshThreeFactory.WIREFRAME_ENABLED_KEY).boolean == true) {
         val bufferGeometry = geometry as? BufferGeometry ?: return
-        val material = ThreeMaterials.getLineMaterial(obj.getItem(MeshThreeFactory.WIREFRAME_MATERIAL_KEY).node, true)
+        val material = ThreeMaterials.getLineMaterial(obj.getProperty(MeshThreeFactory.WIREFRAME_MATERIAL_KEY).node, true)
         add(
             LineSegments(
                 WireframeGeometry(bufferGeometry),
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
index 33a86ebf..14a5e12e 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
@@ -1,9 +1,7 @@
 package hep.dataforge.vision.solid.three
 
 import hep.dataforge.context.Context
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.getItem
-import hep.dataforge.meta.string
+import hep.dataforge.meta.*
 import hep.dataforge.names.Name
 import hep.dataforge.names.plus
 import hep.dataforge.names.toName
@@ -275,4 +273,4 @@ public fun ThreePlugin.render(
     obj: Solid,
     onSelect: ((Name?) -> Unit)? = null,
     options: Canvas3DOptions.() -> Unit = {},
-): Unit = output(element, Canvas3DOptions(options), onSelect).render(obj)
\ No newline at end of file
+): Unit = output(element, Canvas3DOptions.invoke(options), onSelect).render(obj)
\ No newline at end of file
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
index 5954a5a3..987f19b1 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
@@ -18,7 +18,7 @@ public object ThreeLineFactory : ThreeFactory<PolyLine> {
             vertices = obj.points.toTypedArray()
         }
 
-        val material = ThreeMaterials.getLineMaterial(obj.getItem(MeshThreeFactory.EDGES_MATERIAL_KEY).node, true)
+        val material = ThreeMaterials.getLineMaterial(obj.getProperty(MeshThreeFactory.EDGES_MATERIAL_KEY).node, true)
 
         material.linewidth = obj.thickness.toDouble()
         material.color = obj.color?.let { Color(it) } ?: DEFAULT_LINE_COLOR
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
index 7566e136..969e725f 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
@@ -12,23 +12,22 @@ import info.laht.threekt.materials.MeshPhongMaterial
 import info.laht.threekt.math.Color
 
 
-object ThreeMaterials {
-    val DEFAULT_COLOR = Color(Colors.darkgreen)
-    val DEFAULT = MeshBasicMaterial().apply {
+public object ThreeMaterials {
+    public val DEFAULT_COLOR: Color = Color(Colors.darkgreen)
+    public val DEFAULT: MeshBasicMaterial = MeshBasicMaterial().apply {
         color.set(DEFAULT_COLOR)
     }
-    val DEFAULT_LINE_COLOR = Color(Colors.black)
-    val DEFAULT_LINE = LineBasicMaterial().apply {
+    public val DEFAULT_LINE_COLOR: Color = Color(Colors.black)
+    public val DEFAULT_LINE: LineBasicMaterial = LineBasicMaterial().apply {
         color.set(DEFAULT_LINE_COLOR)
     }
 
-    val SELECTED_MATERIAL = LineBasicMaterial().apply {
+    public val SELECTED_MATERIAL: LineBasicMaterial = LineBasicMaterial().apply {
         color.set(Colors.ivory)
         linewidth = 8.0
     }
 
-
-    val HIGHLIGHT_MATERIAL = LineBasicMaterial().apply {
+    public val HIGHLIGHT_MATERIAL: LineBasicMaterial = LineBasicMaterial().apply {
         color.set(Colors.blue)
         linewidth = 8.0
     }
@@ -75,7 +74,7 @@ object ThreeMaterials {
     }
 
     fun getMaterial(vision3D: Vision, cache: Boolean): Material {
-        val meta = vision3D.getItem(SolidMaterial.MATERIAL_KEY).node ?: return DEFAULT
+        val meta = vision3D.getProperty(SolidMaterial.MATERIAL_KEY).node ?: return DEFAULT
         return if (cache) {
             materialCache.getOrPut(meta) { buildMaterial(meta) }
         } else {
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt
index 712b2b2e..8d90d3b2 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt
+++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt
@@ -71,7 +71,7 @@ class FX3DPlugin : AbstractPlugin() {
             is PolyLine -> PolyLine3D(
                 obj.points.map { it.point },
                 obj.thickness.toFloat(),
-                obj.getItem(SolidMaterial.MATERIAL_COLOR_KEY)?.color()
+                obj.getProperty(SolidMaterial.MATERIAL_COLOR_KEY)?.color()
             ).apply {
                 this.meshView.cullFace = CullFace.FRONT
             }
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCanvas3D.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCanvas3D.kt
index 996d4fe5..1c90819b 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCanvas3D.kt
+++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCanvas3D.kt
@@ -3,6 +3,7 @@ package hep.dataforge.vision.solid.fx
 import hep.dataforge.context.Context
 import hep.dataforge.context.ContextAware
 import hep.dataforge.meta.Meta
+import hep.dataforge.meta.empty
 import hep.dataforge.output.Renderer
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/VisualObjectFXBinding.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/VisualObjectFXBinding.kt
index 164110ad..0ba7af20 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/VisualObjectFXBinding.kt
+++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/VisualObjectFXBinding.kt
@@ -34,7 +34,7 @@ class VisualObjectFXBinding(val obj: Vision) {
     operator fun get(key: Name): ObjectBinding<MetaItem<*>?> {
         return bindings.getOrPut(key) {
             object : ObjectBinding<MetaItem<*>?>() {
-                override fun computeValue(): MetaItem<*>? = obj.getItem(key)
+                override fun computeValue(): MetaItem<*>? = obj.getProperty(key)
             }
         }
     }

From 62a76f2c868e9d142753075e7a319eed50e13753 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 13 Nov 2020 10:42:03 +0300
Subject: [PATCH 024/151] Fix serialization problems in Group

---
 .../kotlin/hep/dataforge/vision/VisionGroupBase.kt        | 8 +++++---
 .../kotlin/hep/dataforge/vision/solid/SolidGroup.kt       | 6 +++++-
 .../kotlin/hep/dataforge/vision/solid/serialization.kt    | 2 +-
 .../kotlin/hep/dataforge/vision/solid/PropertyTest.kt     | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
index af8fee4e..fa3567b6 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
@@ -13,10 +13,12 @@ import kotlinx.serialization.Transient
 @SerialName("vision.group")
 public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
 
-    //protected abstract val _children: MutableMap<NameToken, T>
-
+    /**
+     * Internal mutable container for group children
+     * TODO made protected due to https://github.com/Kotlin/kotlinx.serialization/issues/1200
+     */
     @SerialName("children")
-    protected val childrenInternal = LinkedHashMap<NameToken, Vision>()
+    protected open val childrenInternal: MutableMap<NameToken, Vision> = LinkedHashMap()
 
     /**
      * A map of top level named children
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index d4c76661..d441ab6c 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -93,13 +93,17 @@ public fun MutableVisionGroup.group(name: String, action: SolidGroup.() -> Unit
  */
 @Serializable(PrototypesSerializer::class)
 internal class Prototypes(
-    override var children: MutableMap<NameToken, Vision> = LinkedHashMap(),
+    children: Map<NameToken, Vision> = emptyMap(),
 ) : VisionGroupBase(), PrototypeHolder {
 
     override fun styleSheet(block: StyleSheet.() -> Unit) {
         error("Can't define stylesheet for prototypes block")
     }
 
+    init {
+        this.childrenInternal.putAll(children)
+    }
+
     override var properties: Config?
         get() = null
         set(_) {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt
index c5b0a435..fafc0c5c 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt
@@ -91,7 +91,7 @@ internal object PrototypesSerializer : KSerializer<MutableVisionGroup> {
 
     override fun deserialize(decoder: Decoder): MutableVisionGroup {
         val map = mapSerializer.deserialize(decoder)
-        return Prototypes(map as? MutableMap<NameToken, Vision> ?: LinkedHashMap(map))
+        return Prototypes(map)
     }
 
     override fun serialize(encoder: Encoder, value: MutableVisionGroup) {
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
index a12679e5..02a0b661 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
@@ -60,7 +60,7 @@ class PropertyTest {
     @Test
     fun testProxyStyleProperty() {
         var box: Proxy? = null
-        val group = SolidGroup().apply {
+        val group = SolidGroup{
             styleSheet {
                 set("testStyle") {
                     SolidMaterial.MATERIAL_COLOR_KEY put "#555555"

From 613624ff176cd76595dcf3a6aa30fba231484b24 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 13 Nov 2020 19:19:06 +0300
Subject: [PATCH 025/151] Fix GDML transformation

---
 .../dataforge/vision/gdml/GDMLTransformer.kt  | 152 +++++++++---------
 .../hep/dataforge/vision/gdml/gdmlJVM.kt      |   6 +-
 .../hep/dataforge/vision/solid/Proxy.kt       |   8 +-
 3 files changed, 81 insertions(+), 85 deletions(-)

diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
index 1374f70f..0c66ac59 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
@@ -19,59 +19,66 @@ import kotlin.random.Random
 private val solidsName = "solids".asName()
 private val volumesName = "volumes".asName()
 
-public class GDMLTransformer internal constructor(public val root: GDML) {
-    //private val materialCache = HashMap<GDMLMaterial, Meta>()
-    private val random = Random(222)
+@Suppress("NOTHING_TO_INLINE")
+private inline operator fun Number.times(d: Double) = toDouble() * d
 
+@Suppress("NOTHING_TO_INLINE")
+private inline operator fun Number.times(f: Float) = toFloat() * f
+
+public class GDMLTransformerSettings {
     public enum class Action {
         ADD,
         REJECT,
         PROTOTYPE
     }
 
-    public var lUnit: LUnit = LUnit.MM
+    public var lUnit: LUnit = LUnit.CM
     public var aUnit: AUnit = AUnit.RADIAN
 
     public var solidAction: (GDMLSolid) -> Action = { Action.PROTOTYPE }
     public var volumeAction: (GDMLGroup) -> Action = { Action.PROTOTYPE }
 
+}
+
+private class GDMLTransformer(val settings: GDMLTransformerSettings) {
+    //private val materialCache = HashMap<GDMLMaterial, Meta>()
+    private val random = Random(222)
+
     /**
      * A special group for local templates
      */
-    private val proto by lazy { SolidGroup() }
+    private val proto = SolidGroup()
 
-    private val solids by lazy {
-        proto.group(solidsName) {
-            config["edges.enabled"] = false
-        }
+    private val solids = proto.group(solidsName) {
+        config["edges.enabled"] = false
     }
 
+
     private val referenceStore = HashMap<Name, MutableList<Proxy>>()
 
-    private fun proxySolid(group: SolidGroup, solid: GDMLSolid, name: String): Proxy {
+    private fun proxySolid(root: GDML, group: SolidGroup, solid: GDMLSolid, name: String): Proxy {
         val templateName = solidsName + name
         if (proto[templateName] == null) {
-            solids.addSolid(solid, name)
+            solids.addSolid(root, solid, name)
         }
         val ref = group.ref(templateName, name)
         referenceStore.getOrPut(templateName) { ArrayList() }.add(ref)
         return ref
     }
 
-    private fun proxyVolume(group: SolidGroup, physVolume: GDMLPhysVolume, volume: GDMLGroup): Proxy {
+    private fun proxyVolume(root: GDML, group: SolidGroup, physVolume: GDMLPhysVolume, volume: GDMLGroup): Proxy {
         val templateName = volumesName + volume.name.asName()
         if (proto[templateName] == null) {
-            proto[templateName] = volume(volume)
+            proto[templateName] = volume(root, volume)
         }
-        val ref = group.ref(templateName, physVolume.name ?: "").withPosition(physVolume)
+        val ref = group.ref(templateName, physVolume.name ?: "").withPosition(root, physVolume)
         referenceStore.getOrPut(templateName) { ArrayList() }.add(ref)
         return ref
     }
 
     private val styleCache = HashMap<Name, Meta>()
 
-    public var solidConfiguration: Solid.(parent: GDMLVolume, solid: GDMLSolid) -> Unit = { parent, _ ->
-        lUnit = LUnit.CM
+    var solidConfiguration: Solid.(parent: GDMLVolume, solid: GDMLSolid) -> Unit = { parent, _ ->
         if (parent.physVolumes.isNotEmpty()) {
             useStyle("opaque") {
                 SolidMaterial.MATERIAL_OPACITY_KEY put 0.3
@@ -80,14 +87,14 @@ public class GDMLTransformer internal constructor(public val root: GDML) {
         }
     }
 
-    private fun Solid.useStyle(name: String, builder: MetaBuilder.() -> Unit) {
+    fun Solid.useStyle(name: String, builder: MetaBuilder.() -> Unit) {
         styleCache.getOrPut(name.toName()) {
             Meta(builder)
         }
         useStyle(name)
     }
 
-    private fun configureSolid(obj: Solid, parent: GDMLVolume, solid: GDMLSolid) {
+    fun configureSolid(root: GDML, obj: Solid, parent: GDMLVolume, solid: GDMLSolid) {
         val material = parent.materialref.resolve(root) ?: GDMLElement(parent.materialref.ref)
 
         val styleName = "material[${material.name}]"
@@ -100,22 +107,19 @@ public class GDMLTransformer internal constructor(public val root: GDML) {
         obj.solidConfiguration(parent, solid)
     }
 
-    public var onFinish: GDMLTransformer.() -> Unit = {}
-
-
-    private fun <T : Solid> T.withPosition(
+    fun <T : Solid> T.withPosition(
         newPos: GDMLPosition? = null,
         newRotation: GDMLRotation? = null,
-        newScale: GDMLScale? = null
+        newScale: GDMLScale? = null,
     ): T = apply {
         newPos?.let {
-            val point = Point3D(it.x(lUnit), it.y(lUnit), it.z(lUnit))
+            val point = Point3D(it.x(settings.lUnit), it.y(settings.lUnit), it.z(settings.lUnit))
             if (position != null || point != World.ZERO) {
                 position = point
             }
         }
         newRotation?.let {
-            val point = Point3D(it.x(aUnit), it.y(aUnit), it.z(aUnit))
+            val point = Point3D(it.x(settings.aUnit), it.y(settings.aUnit), it.z(settings.aUnit))
             if (rotation != null || point != World.ZERO) {
                 rotation = point
             }
@@ -130,24 +134,19 @@ public class GDMLTransformer internal constructor(public val root: GDML) {
         //TODO convert units if needed
     }
 
-    private fun <T : Solid> T.withPosition(physVolume: GDMLPhysVolume): T = withPosition(
+    fun <T : Solid> T.withPosition(root: GDML, physVolume: GDMLPhysVolume): T = withPosition(
         physVolume.resolvePosition(root),
         physVolume.resolveRotation(root),
         physVolume.resolveScale(root)
     )
 
-    @Suppress("NOTHING_TO_INLINE")
-    private inline operator fun Number.times(d: Double) = toDouble() * d
-
-    @Suppress("NOTHING_TO_INLINE")
-    private inline operator fun Number.times(f: Float) = toFloat() * f
-
-    private fun SolidGroup.addSolid(
+    fun SolidGroup.addSolid(
+        root: GDML,
         solid: GDMLSolid,
-        name: String = ""
+        name: String = "",
     ): Solid {
         //context.solidAdded(solid)
-        val lScale = solid.lscale(lUnit)
+        val lScale = solid.lscale(settings.lUnit)
         val aScale = solid.ascale()
         return when (solid) {
             is GDMLBox -> box(solid.x * lScale, solid.y * lScale, solid.z * lScale, name)
@@ -185,7 +184,7 @@ public class GDMLTransformer internal constructor(public val root: GDML) {
                 val innerSolid: GDMLSolid = solid.solidref.resolve(root)
                     ?: error("Solid with tag ${solid.solidref.ref} for scaled solid ${solid.name} not defined")
 
-                addSolid(innerSolid, name).apply {
+                addSolid(root, innerSolid, name).apply {
                     scaleX *= solid.scale.x.toFloat()
                     scaleY *= solid.scale.y.toFloat()
                     scaleZ = solid.scale.z.toFloat()
@@ -221,13 +220,13 @@ public class GDMLTransformer internal constructor(public val root: GDML) {
                 }
 
                 return composite(type, name) {
-                    addSolid(first).withPosition(
+                    addSolid(root, first).withPosition(
                         solid.resolveFirstPosition(root),
                         solid.resolveFirstRotation(root),
                         null
                     )
 
-                    addSolid(second).withPosition(
+                    addSolid(root, second).withPosition(
                         solid.resolvePosition(root),
                         solid.resolveRotation(root),
                         null
@@ -239,26 +238,28 @@ public class GDMLTransformer internal constructor(public val root: GDML) {
         }
     }
 
-    private fun SolidGroup.addSolidWithCaching(
+    fun SolidGroup.addSolidWithCaching(
+        root: GDML,
         solid: GDMLSolid,
-        name: String = solid.name
+        name: String = solid.name,
     ): Solid? {
-        return when (solidAction(solid)) {
-            Action.ADD -> {
-                addSolid(solid, name)
+        return when (settings.solidAction(solid)) {
+            GDMLTransformerSettings.Action.ADD -> {
+                addSolid(root, solid, name)
             }
-            Action.PROTOTYPE -> {
-                proxySolid(this, solid, name)
+            GDMLTransformerSettings.Action.PROTOTYPE -> {
+                proxySolid(root, this, solid, name)
             }
-            Action.REJECT -> {
+            GDMLTransformerSettings.Action.REJECT -> {
                 //ignore
                 null
             }
         }
     }
 
-    private fun SolidGroup.addPhysicalVolume(
-        physVolume: GDMLPhysVolume
+    fun SolidGroup.addPhysicalVolume(
+        root: GDML,
+        physVolume: GDMLPhysVolume,
     ) {
         val volume: GDMLGroup = physVolume.volumeref.resolve(root)
             ?: error("Volume with ref ${physVolume.volumeref.ref} could not be resolved")
@@ -267,60 +268,62 @@ public class GDMLTransformer internal constructor(public val root: GDML) {
         if (volume is GDMLVolume && volume.physVolumes.isEmpty() && volume.placement == null) {
             val solid = volume.solidref.resolve(root)
                 ?: error("Solid with tag ${volume.solidref.ref} for volume ${volume.name} not defined")
-            addSolidWithCaching(solid, physVolume.name ?: "")?.apply {
-                configureSolid(this, volume, solid)
-                withPosition(physVolume)
+            addSolidWithCaching(root, solid, physVolume.name ?: "")?.apply {
+                configureSolid(root, this, volume, solid)
+                withPosition(root, physVolume)
             }
             return
         }
 
-        when (volumeAction(volume)) {
-            Action.ADD -> {
-                val group: SolidGroup = volume(volume)
-                this[physVolume.name ?: ""] = group.withPosition(physVolume)
+        when (settings.volumeAction(volume)) {
+            GDMLTransformerSettings.Action.ADD -> {
+                val group: SolidGroup = volume(root, volume)
+                this[physVolume.name ?: ""] = group.withPosition(root, physVolume)
             }
-            Action.PROTOTYPE -> {
-                proxyVolume(this, physVolume, volume)
+            GDMLTransformerSettings.Action.PROTOTYPE -> {
+                proxyVolume(root, this, physVolume, volume)
             }
-            Action.REJECT -> {
+            GDMLTransformerSettings.Action.REJECT -> {
                 //ignore
             }
         }
     }
 
-    private fun SolidGroup.addDivisionVolume(
-        divisionVolume: GDMLDivisionVolume
+    fun SolidGroup.addDivisionVolume(
+        root: GDML,
+        divisionVolume: GDMLDivisionVolume,
     ) {
         val volume: GDMLGroup = divisionVolume.volumeref.resolve(root)
             ?: error("Volume with ref ${divisionVolume.volumeref.ref} could not be resolved")
 
         //TODO add divisions
-        set(Name.EMPTY, volume(volume))
+        set(Name.EMPTY, volume(root, volume))
     }
 
     private fun volume(
-        group: GDMLGroup
+        root: GDML,
+        group: GDMLGroup,
     ): SolidGroup = SolidGroup().apply {
         if (group is GDMLVolume) {
             val solid: GDMLSolid = group.solidref.resolve(root)
                 ?: error("Solid with tag ${group.solidref.ref} for volume ${group.name} not defined")
 
-            addSolidWithCaching(solid)?.apply {
-                configureSolid(this, group, solid)
+            addSolidWithCaching(root, solid)?.apply {
+                configureSolid(root, this, group, solid)
             }
 
             when (val vol: GDMLPlacement? = group.placement) {
-                is GDMLPhysVolume -> addPhysicalVolume(vol)
-                is GDMLDivisionVolume -> addDivisionVolume(vol)
+                is GDMLPhysVolume -> addPhysicalVolume(root, vol)
+                is GDMLDivisionVolume -> addDivisionVolume(root, vol)
             }
         }
 
         group.physVolumes.forEach { physVolume ->
-            addPhysicalVolume(physVolume)
+            addPhysicalVolume(root, physVolume)
         }
     }
 
-    private fun finalize(final: SolidGroup): SolidGroup {
+    fun finalize(final: SolidGroup): SolidGroup {
         //final.prototypes = proto
         final.useStyle("GDML") {
             Solid.ROTATION_ORDER_KEY put RotationOrder.ZXY
@@ -351,25 +354,22 @@ public class GDMLTransformer internal constructor(public val root: GDML) {
                 define(it.key.toString(), it.value)
             }
         }
-        onFinish(this@GDMLTransformer)
         return final
     }
 
-    public val result: SolidGroup by lazy {
-        finalize(volume(root.world))
-    }
+    fun transform(root: GDML): SolidGroup = finalize(volume(root, root.world))
 }
 
 
-public fun GDML.toVision(block: GDMLTransformer.() -> Unit = {}): SolidGroup {
-    val context = GDMLTransformer(this).apply(block)
-    return context.result
+public fun GDML.toVision(block: GDMLTransformerSettings.() -> Unit = {}): SolidGroup {
+    val context = GDMLTransformer(GDMLTransformerSettings().apply(block))
+    return context.transform(this)
 }
 
 /**
  * Append gdml node to the group
  */
-public fun SolidGroup.gdml(gdml: GDML, key: String = "", transformer: GDMLTransformer.() -> Unit = {}) {
+public fun SolidGroup.gdml(gdml: GDML, key: String = "", transformer: GDMLTransformerSettings.() -> Unit = {}) {
     val visual = gdml.toVision(transformer)
     //println(Visual3DPlugin.json.stringify(VisualGroup3D.serializer(), visual))
     set(key, visual)
diff --git a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt b/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
index 685708da..452bd0e1 100644
--- a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
+++ b/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
@@ -1,20 +1,20 @@
 package hep.dataforge.vision.gdml
 
 import hep.dataforge.vision.solid.SolidGroup
-import nl.adaptivity.xmlutil.StAXReader
 import kscience.gdml.GDML
+import nl.adaptivity.xmlutil.StAXReader
 import java.nio.file.Files
 import java.nio.file.Path
 import java.util.concurrent.atomic.AtomicInteger
 
 public actual typealias Counter = AtomicInteger
 
-fun GDML.Companion.readFile(file: Path): GDML {
+public fun GDML.Companion.readFile(file: Path): GDML {
     val xmlReader = StAXReader(Files.newInputStream(file), "UTF-8")
     return format.parse(GDML.serializer(), xmlReader)
 }
 
-fun SolidGroup.gdml(file: Path, key: String = "", transformer: GDMLTransformer.() -> Unit = {}) {
+public fun SolidGroup.gdml(file: Path, key: String = "", transformer: GDMLTransformerSettings.() -> Unit = {}) {
     val gdml = GDML.readFile(file)
     gdml(gdml, key, transformer)
 }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
index 6bc250d8..55946255 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
@@ -50,14 +50,10 @@ public abstract class AbstractProxy : BasicSolid(), VisionGroup {
  */
 @Serializable
 @SerialName("solid.proxy")
-public class Proxy private constructor(
+public class Proxy(
     public val templateName: Name,
 ) : AbstractProxy(), Solid {
 
-    public constructor(parent: SolidGroup, templateName: Name) : this(templateName) {
-        this.parent = parent
-    }
-
     /**
      * Recursively search for defined template in the parent
      */
@@ -145,7 +141,7 @@ public val Vision.prototype: Vision
 public fun SolidGroup.ref(
     templateName: Name,
     name: String = "",
-): Proxy = Proxy(this, templateName).also { set(name, it) }
+): Proxy = Proxy(templateName).also { set(name, it) }
 
 /**
  * Add new proxy wrapping given object and automatically adding it to the prototypes

From 6a48948c158580f145b3bf84d41f7ce266d3d34a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 15 Nov 2020 15:00:54 +0300
Subject: [PATCH 026/151] Remove dataforge-output.

---
 README.md                                     |   2 +-
 build.gradle.kts                              |   4 +-
 .../vision/solid/demo/ThreeDemoGrid.kt        |   7 +-
 .../vision/bootstrap/outputConfig.kt          |   3 +-
 .../vision/react/ThreeCanvasComponent.kt      |   3 +-
 visionforge-core/build.gradle.kts             |   5 +-
 .../kotlin/hep/dataforge/vision/Renderer.kt   |   5 +
 .../kotlin/hep/dataforge/vision/VisionBase.kt |   2 +-
 .../hep/dataforge/vision/VisionGroup.kt       |   4 +-
 .../hep/dataforge/vision/VisionGroupBase.kt   |  34 +--
 .../hep/dataforge/vision/VisionManager.kt     |  25 --
 .../hep/dataforge/vision/collectChange.kt     | 106 ---------
 .../hep/dataforge/vision/visionChange.kt      | 141 +++++++++++
 .../vision/rendering/HTMLVisionDisplay.kt     |  20 ++
 .../dataforge/vision/editor/ValueChooser.kt   |   2 +-
 .../dataforge/vision/gdml/GDMLTransformer.kt  |   6 +-
 .../dataforge/vision/gdml/bmanStatistics.kt   |   4 +-
 visionforge-server/build.gradle.kts           |   7 +
 .../dataforge/vision/server/VisionServer.kt   | 219 ++++++++++++++++++
 .../hep/dataforge/vision/server/html.kt       |  70 ++++++
 visionforge-solid/build.gradle.kts            |   2 +-
 .../hep/dataforge/vision/solid/Solid.kt       |  13 +-
 .../dataforge/vision/solid/SolidManager.kt    |   2 +-
 .../solid/{Proxy.kt => SolidReference.kt}     |  44 ++--
 .../solid/specifications/Canvas3DOptions.kt   |   3 +
 .../solid/transform/RemoveSingleChild.kt      |   2 +-
 .../dataforge/vision/solid/transform/UnRef.kt |  10 +-
 .../dataforge/vision/solid/PropertyTest.kt    |   4 +-
 .../vision/solid/SerializationTest.kt         |  11 +-
 .../vision/solid/three/DatCanvasControls.kt   |   5 -
 .../vision/solid/three/ThreeCanvas.kt         |  50 ++--
 .../solid/three/ThreeGeometryBuilder.kt       |   2 +-
 .../vision/solid/three/ThreePlugin.kt         |  34 ++-
 ...oxyFactory.kt => ThreeReferenceFactory.kt} |  18 +-
 .../hep/dataforge/vision/solid/three/three.kt |   8 +-
 .../dataforge/vision/solid/fx/FX3DPlugin.kt   |   4 +-
 .../dataforge/vision/solid/fx/FXCanvas3D.kt   |   7 +-
 ...XProxyFactory.kt => FXReferenceFactory.kt} |  16 +-
 38 files changed, 620 insertions(+), 284 deletions(-)
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Renderer.kt
 delete mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/collectChange.kt
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt
 create mode 100644 visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/rendering/HTMLVisionDisplay.kt
 create mode 100644 visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
 create mode 100644 visionforge-server/src/main/kotlin/hep/dataforge/vision/server/html.kt
 rename visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/{Proxy.kt => SolidReference.kt} (74%)
 delete mode 100644 visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/DatCanvasControls.kt
 rename visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/{ThreeProxyFactory.kt => ThreeReferenceFactory.kt} (69%)
 rename visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/{FXProxyFactory.kt => FXReferenceFactory.kt} (63%)

diff --git a/README.md b/README.md
index 45cd88af..156e2ae3 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ also referred to as templates). The idea is that prototype geometry can be rende
 for multiple objects. This helps to significantly decrease memory usage.
 
 The `prototypes` property tree is defined in `SolidGroup` class via `PrototypeHolder` interface, and 
-`Proxy` class helps to reuse a template object. 
+`SolidReference` class helps to reuse a template object.
 
 ##### Styles
 
diff --git a/build.gradle.kts b/build.gradle.kts
index b793c216..562b2092 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,10 @@ plugins {
 
 val dataforgeVersion by extra("0.2.0-dev-7")
 val ktorVersion by extra("1.4.2")
+val htmlVersion by extra("0.7.2")
 val kotlinWrappersVersion by extra("pre.129-kotlin-1.4.10")
+val fxVersion by extra("14")
+
 
 allprojects {
     repositories {
@@ -21,7 +24,6 @@ allprojects {
 
 val githubProject by extra("visionforge")
 val bintrayRepo by extra("dataforge")
-val fxVersion by extra("14")
 
 subprojects {
     if(name.startsWith("visionforge")) {
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
index d8420d6f..8ea0462d 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
@@ -5,12 +5,11 @@ import hep.dataforge.meta.Meta
 import hep.dataforge.meta.get
 import hep.dataforge.meta.string
 import hep.dataforge.names.Name
-import hep.dataforge.output.OutputManager
 import hep.dataforge.output.Renderer
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.solid.three.ThreeCanvas
 import hep.dataforge.vision.solid.three.ThreePlugin
-import hep.dataforge.vision.solid.three.output
+import hep.dataforge.vision.solid.three.attachRenderer
 import kotlinx.browser.document
 import kotlinx.dom.clear
 import kotlinx.html.dom.append
@@ -23,7 +22,7 @@ import kotlinx.html.span
 import org.w3c.dom.Element
 import kotlin.reflect.KClass
 
-class ThreeDemoGrid(element: Element, meta: Meta = Meta.EMPTY) : OutputManager {
+class ThreeDemoGrid(element: Element, meta: Meta = Meta.EMPTY) {
 
     private val gridRoot = document.create.div("row")
     private val outputs: MutableMap<Name, ThreeCanvas> = HashMap()
@@ -46,7 +45,7 @@ class ThreeDemoGrid(element: Element, meta: Meta = Meta.EMPTY) : OutputManager {
                 span("border") {
                     div("col-6") {
                         div { id = "output-$name" }.also {
-                            output = three.output(it, canvasOptions)
+                            output = three.attachRenderer(it, canvasOptions)
                             //output.attach(it)
                         }
                         hr()
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
index 3a64ef7f..9c17a6cd 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
@@ -3,7 +3,6 @@ package hep.dataforge.vision.bootstrap
 import hep.dataforge.vision.react.flexColumn
 import hep.dataforge.vision.react.flexRow
 import hep.dataforge.vision.solid.SolidGroup
-import hep.dataforge.vision.solid.SolidManager
 import hep.dataforge.vision.solid.three.ThreeCanvas
 import kotlinx.css.*
 import kotlinx.css.properties.border
@@ -45,7 +44,7 @@ public external interface CanvasControlsProps : RProps {
 
 public val CanvasControls: FunctionalComponent<CanvasControlsProps> = functionalComponent("CanvasControls") { props ->
     val visionManager = useMemo(
-        { props.canvas.context.plugins.fetch(SolidManager).visionManager },
+        { props.canvas.three.solidManager.visionManager },
         arrayOf(props.canvas)
     )
     flexColumn {
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
index da424bab..df52938d 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
@@ -7,7 +7,6 @@ import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.solid.three.ThreeCanvas
 import hep.dataforge.vision.solid.three.ThreePlugin
-import hep.dataforge.vision.solid.three.output
 import kotlinx.css.*
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
@@ -40,7 +39,7 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
             val element = elementRef.current as? HTMLElement ?: error("Canvas element not found")
             val three: ThreePlugin = props.context.plugins.fetch(ThreePlugin)
             val newCanvas: ThreeCanvas =
-                three.output(element, props.options ?: Canvas3DOptions.empty(), props.clickCallback)
+                three.attachRenderer(element, props.options ?: Canvas3DOptions.empty(), props.clickCallback)
             props.canvasCallback?.invoke(newCanvas)
             canvas = newCanvas
         }
diff --git a/visionforge-core/build.gradle.kts b/visionforge-core/build.gradle.kts
index 6eee3f0c..74ac090a 100644
--- a/visionforge-core/build.gradle.kts
+++ b/visionforge-core/build.gradle.kts
@@ -4,13 +4,15 @@ plugins {
 
 val dataforgeVersion: String by rootProject.extra
 val kotlinWrappersVersion: String by rootProject.extra
+val htmlVersion: String by rootProject.extra
 
 
 kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api("hep.dataforge:dataforge-output:$dataforgeVersion")
+                api("hep.dataforge:dataforge-context:$dataforgeVersion")
+                api("org.jetbrains.kotlinx:kotlinx-html:$htmlVersion")
             }
         }
         jvmMain {
@@ -27,7 +29,6 @@ kotlin {
         }
         jsMain {
             dependencies {
-                api("hep.dataforge:dataforge-output-html:$dataforgeVersion")
                 api("org.jetbrains:kotlin-extensions:1.0.1-$kotlinWrappersVersion")
                 api("org.jetbrains:kotlin-css:1.0.0-$kotlinWrappersVersion")
             }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Renderer.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Renderer.kt
new file mode 100644
index 00000000..820ac615
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Renderer.kt
@@ -0,0 +1,5 @@
+package hep.dataforge.vision
+
+public fun interface Renderer<in V: Vision> {
+    public fun render(vision: V)
+}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index d88aaffc..8a2918a1 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -69,7 +69,7 @@ public open class VisionBase : Vision {
     }
 
     override fun removeChangeListener(owner: Any?) {
-        listeners.removeAll { it.owner == owner }
+        listeners.removeAll { owner == null || it.owner == owner }
     }
 
     /**
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
index 004693a2..e2101b0c 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
@@ -87,12 +87,12 @@ public interface MutableVisionGroup : VisionGroup, VisionContainerBuilder<Vision
      * @param owner the handler to properly remove listeners
      * @param action First argument of the action is the name of changed child. Second argument is the new value of the object.
      */
-    public fun onChildrenChange(owner: Any?, action: (NameToken, Vision?) -> Unit)
+    public fun onStructureChange(owner: Any?, action: (token: NameToken, before: Vision?, after: Vision?) -> Unit)
 
     /**
      * Remove children change listener
      */
-    public fun removeChildrenChangeListener(owner: Any?)
+    public fun removeStructureChangeListener(owner: Any?)
 
 //    public operator fun set(name: Name, child: Vision?)
 }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
index fa3567b6..767f0e5a 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
@@ -45,7 +45,10 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
         }
     }
 
-    private data class StructureChangeListener(val owner: Any?, val callback: (NameToken, Vision?) -> Unit)
+    private data class StructureChangeListener(
+        val owner: Any?,
+        val callback: (token: NameToken, before: Vision?, after: Vision?) -> Unit,
+    )
 
     @Transient
     private val structureChangeListeners = HashSet<StructureChangeListener>()
@@ -53,7 +56,7 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
     /**
      * Add listener for children change
      */
-    override fun onChildrenChange(owner: Any?, action: (NameToken, Vision?) -> Unit) {
+    override fun onStructureChange(owner: Any?, action: (token: NameToken, before: Vision?, after: Vision?) -> Unit) {
         structureChangeListeners.add(
             StructureChangeListener(
                 owner,
@@ -65,29 +68,31 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
     /**
      * Remove children change listener
      */
-    override fun removeChildrenChangeListener(owner: Any?) {
-        structureChangeListeners.removeAll { it.owner === owner }
+    override fun removeStructureChangeListener(owner: Any?) {
+        structureChangeListeners.removeAll { owner == null || it.owner === owner }
     }
 
     /**
      * Propagate children change event upwards
      */
-    protected fun childrenChanged(name: NameToken, child: Vision?) {
-        structureChangeListeners.forEach { it.callback(name, child) }
+    protected fun childrenChanged(name: NameToken, before: Vision?, after: Vision?) {
+        structureChangeListeners.forEach { it.callback(name, before, after) }
     }
 
     /**
      * Remove a child with given name token
      */
-    public fun removeChild(token: NameToken) {
-        childrenInternal.remove(token)
+    public fun removeChild(token: NameToken): Vision? {
+        val removed = childrenInternal.remove(token)
+        removed?.parent = null
+        return removed
     }
 
     /**
      * Add a static child. Statics could not be found by name, removed or replaced. Changing statics also do not trigger events.
      */
     protected open fun addStatic(child: Vision): Unit {
-        attach(NameToken("@static", index = child.hashCode().toString()), child)
+        attachChild(NameToken("@static", index = child.hashCode().toString()), child)
     }
 
     protected open fun createGroup(): VisionGroupBase = VisionGroupBase()
@@ -95,7 +100,7 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
     /**
      * Set parent for given child and attach it
      */
-    private fun attach(token: NameToken, child: Vision) {
+    private fun attachChild(token: NameToken, child: Vision) {
         if (child.parent == null) {
             child.parent = this
             childrenInternal[token] = child
@@ -114,7 +119,7 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
                 val token = name.tokens.first()
                 when (val current = children[token]) {
                     null -> createGroup().also { child ->
-                        attach(token, child)
+                        attachChild(token, child)
                     }
                     is VisionGroupBase -> current
                     else -> error("Can't create group with name $name because it exists and not a group")
@@ -137,12 +142,13 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
             }
             name.length == 1 -> {
                 val token = name.tokens.first()
+                val before = children[token]
                 if (child == null) {
                     removeChild(token)
                 } else {
-                    attach(token, child)
+                    attachChild(token, child)
                 }
-                childrenChanged(token, child)
+                childrenChanged(token, before, child)
             }
             else -> {
                 //TODO add safety check
@@ -165,7 +171,7 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
                 when {
                     child is NullVision -> removeChild(token)
                     children.containsKey(token) -> children[token]!!.update(child)
-                    else -> attach(token, child)
+                    else -> attachChild(token, child)
                 }
             }
         }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
index 63dc4930..426644ca 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
@@ -48,31 +48,6 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
         encodeToJsonElement(vision).toMetaItem(descriptor).node
             ?: error("Expected node, but value found. Check your serializer!")
 
-//    public fun updateVision(vision: Vision, meta: Meta) {
-//        vision.update(meta)
-//        if (vision is MutableVisionGroup) {
-//            val children by meta.node()
-//            children?.items?.forEach { (token, item) ->
-//                when {
-//                    item.value == Null -> vision[token] = null //Null means removal
-//                    item.node != null -> {
-//                        val node = item.node!!
-//                        val type by node.string()
-//                        if (type != null) {
-//                            //If the type is present considering it as new node, not an update
-//                            vision[token.asName()] = decodeFromMeta(node)
-//                        } else {
-//                            val existing = vision.children[token]
-//                            if (existing != null) {
-//                                updateVision(existing, node)
-//                            }
-//                        }
-//                    }
-//                }
-//            }
-//        }
-//    }
-
     public companion object : PluginFactory<VisionManager> {
         override val tag: PluginTag = PluginTag(name = "vision", group = PluginTag.DATAFORGE_GROUP)
         override val type: KClass<out VisionManager> = VisionManager::class
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/collectChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/collectChange.kt
deleted file mode 100644
index cb61939f..00000000
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/collectChange.kt
+++ /dev/null
@@ -1,106 +0,0 @@
-package hep.dataforge.vision
-
-import hep.dataforge.meta.*
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.names.Name
-import hep.dataforge.names.NameToken
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.launch
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlin.time.Duration
-
-/**
- * An empty vision existing only for Vision tree change representation. [NullVision] should not be used outside update logic.
- */
-@Serializable
-@SerialName("vision.null")
-public object NullVision : Vision {
-
-    @Suppress("SetterBackingFieldAssignment")
-    override var parent: VisionGroup? = null
-        set(value) {
-            //do nothing
-        }
-
-    override val properties: Config? = null
-
-    override fun getAllProperties(): Laminate = Laminate(Meta.EMPTY)
-
-    override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? = null
-
-    override fun propertyChanged(name: Name) {}
-
-    override fun onPropertyChange(owner: Any?, action: (Name) -> Unit) {}
-
-    override fun removeChangeListener(owner: Any?) {}
-
-    override fun update(change: Vision) {
-        error("Null vision should be removed, not updated")
-    }
-
-    override val config: Config get() = Config()
-    override val descriptor: NodeDescriptor? get() = null
-}
-
-private fun Vision.collectChange(scope: CoroutineScope, collector: Vision): Job = scope.launch {
-    //Store job to be able to cancel collection jobs
-    //TODO add lock for concurrent modification protection?
-    val jobStore = HashMap<NameToken, Job>()
-
-    if (this is VisionGroup) {
-        check(collector is MutableVisionGroup) { "Collector for a group should be a group" }
-        //Subscribe for children changes
-        children.forEach { (token, child) ->
-            val childCollector: Vision = if (child is VisionGroup) {
-                VisionGroupBase()
-            } else {
-                VisionBase()
-            }
-            val job = child.collectChange(this, childCollector)
-            jobStore[token] = job
-            //TODO add lazy child addition
-            collector[token] = childCollector
-        }
-
-        //Subscribe for structure change
-        if (this is MutableVisionGroup) {
-            onChildrenChange(this) { token, child ->
-                //Cancel collector job to avoid leaking
-                jobStore[token]?.cancel()
-                if (child != null) {
-                    //Collect to existing Vision
-                    val job = child.collectChange(this, child)
-                    jobStore[token] = job
-                    collector[token] = child
-                } else{
-                    collector[token] = NullVision
-                }
-            }
-        }
-    }
-
-    //Collect properties change
-    collector.onPropertyChange(collector) { propertyName ->
-        collector.config[propertyName] = properties?.get(propertyName)
-    }
-}
-
-public fun Vision.flowChanges(scope: CoroutineScope, collectionDuration: Duration): Flow<Vision> = flow {
-    //emit initial visual tree
-    emit(this@flowChanges)
-    while (true) {
-        val collector: Vision = if (this is VisionGroup) {
-            VisionGroupBase()
-        } else {
-            VisionBase()
-        }
-        val collectorJob = collectChange(scope, collector)
-        kotlinx.coroutines.delay(collectionDuration)
-        emit(collector)
-        collectorJob.cancel()
-    }
-}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt
new file mode 100644
index 00000000..21434e80
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt
@@ -0,0 +1,141 @@
+package hep.dataforge.vision
+
+import hep.dataforge.meta.*
+import hep.dataforge.meta.descriptors.NodeDescriptor
+import hep.dataforge.names.Name
+import hep.dataforge.names.isEmpty
+import hep.dataforge.names.plus
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlin.time.Duration
+
+
+public abstract class EmptyVision : Vision {
+
+    @Suppress("SetterBackingFieldAssignment", "UNUSED_PARAMETER")
+    override var parent: VisionGroup? = null
+        set(value) {
+            //do nothing
+        }
+
+    override val properties: Config? = null
+
+    override fun getAllProperties(): Laminate = Laminate(Meta.EMPTY)
+
+    override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? = null
+
+    override fun propertyChanged(name: Name) {}
+
+    override fun onPropertyChange(owner: Any?, action: (Name) -> Unit) {}
+
+    override fun removeChangeListener(owner: Any?) {}
+
+    override fun update(change: Vision) {
+        error("Null vision should be removed, not updated")
+    }
+
+    override val config: Config get() = Config()
+    override val descriptor: NodeDescriptor? get() = null
+}
+
+/**
+ * An empty vision existing only for Vision tree change representation. [NullVision] should not be used outside update logic.
+ */
+@Serializable
+@SerialName("vision.null")
+public object NullVision : EmptyVision()
+
+@Serializable(VisionSerializationProxy.Companion::class)
+private class VisionSerializationProxy(val ref: Vision) : EmptyVision() {
+    companion object : KSerializer<VisionSerializationProxy> {
+        override val descriptor: SerialDescriptor = Vision.serializer().descriptor
+
+        @OptIn(ExperimentalSerializationApi::class)
+        override fun serialize(encoder: Encoder, value: VisionSerializationProxy) {
+            val serializer = encoder.serializersModule.getPolymorphic(Vision::class, value.ref)
+                ?: error("The polymorphic serializer is not provided for ")
+            serializer.serialize(encoder, value.ref)
+        }
+
+        override fun deserialize(decoder: Decoder): VisionSerializationProxy =
+            VisionSerializationProxy(Vision.serializer().deserialize(decoder))
+    }
+}
+
+
+private fun MutableVisionGroup.getOrCreate(name: Name): Vision {
+    if (name.isEmpty()) return this
+    val existing = get(name)
+    return existing ?: VisionGroupBase().also { set(name, it) }
+}
+
+private fun CoroutineScope.collectChange(
+    name: Name,
+    source: Vision,
+    mutex: Mutex,
+    target: () -> MutableVisionGroup,
+) {
+    val targetVision: () -> Vision = { target().getOrCreate(name) }
+    //Collect properties change
+    source.onPropertyChange(mutex) { propertyName ->
+        launch {
+            mutex.withLock {
+                targetVision().setProperty(propertyName, source.getProperty(propertyName))
+            }
+        }
+    }
+
+    if (source is VisionGroup) {
+        check(targetVision is MutableVisionGroup) { "Collector for a group should be a group" }
+        //Subscribe for children changes
+        source.children.forEach { (token, child) ->
+            collectChange(name + token, child, mutex, target)
+        }
+        //TODO update styles?
+
+        //Subscribe for structure change
+        if (source is MutableVisionGroup) {
+            source.onStructureChange(mutex) { token, before, after ->
+                before?.removeChangeListener(mutex)
+                (before as? MutableVisionGroup)?.removeStructureChangeListener(mutex)
+                if (after != null) {
+                    targetVision[token] = VisionSerializationProxy(after)
+                    collectChange(name + token, after, mutex, target)
+                } else {
+                    targetVision[token] = NullVision
+                }
+            }
+        }
+    }
+}
+
+@DFExperimental
+public fun Vision.flowChanges(scope: CoroutineScope, collectionDuration: Duration): Flow<Vision> = flow {
+    //emit initial visual tree
+    emit(this@flowChanges)
+
+    val mutex = Mutex()
+
+    var collector = VisionGroupBase()
+    scope.collectChange(Name.EMPTY, this@flowChanges, mutex) { collector }
+
+    while (true) {
+        //Wait for changes to accumulate
+        kotlinx.coroutines.delay(collectionDuration)
+        //Propagate updates only if something is changed
+        if (collector.children.isNotEmpty() || collector.properties?.isEmpty() != false) {
+            //emit changes
+            emit(collector)
+            //Reset the collector
+            collector = VisionGroupBase()
+        }
+    }
+}
\ No newline at end of file
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/rendering/HTMLVisionDisplay.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/rendering/HTMLVisionDisplay.kt
new file mode 100644
index 00000000..58f2b2b1
--- /dev/null
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/rendering/HTMLVisionDisplay.kt
@@ -0,0 +1,20 @@
+package hep.dataforge.vision.rendering
+
+import hep.dataforge.vision.Renderer
+import hep.dataforge.vision.Vision
+import org.w3c.dom.HTMLElement
+
+/**
+ * A display container factory for specific vision
+ * @param V type of [Vision] to be rendered
+ * @param C the specific type of the container
+ */
+public fun interface HTMLVisionDisplay<in V : Vision, C : Renderer<V>> {
+    public fun attachRenderer(element: HTMLElement): C
+}
+
+/**
+ * Render a specific element and return container for configuration
+ */
+public fun <V : Vision, C : Renderer<V>> HTMLVisionDisplay<V, C>.render(element: HTMLElement, vision: V): C =
+    attachRenderer(element).apply { render(vision)}
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueChooser.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueChooser.kt
index df270f35..e1049eef 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueChooser.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueChooser.kt
@@ -27,7 +27,7 @@ import tornadofx.*
  *
  * @author [Alexander Nozik](mailto:altavir@gmail.com)
  */
-interface ValueChooser {
+public interface ValueChooser {
 
     /**
      * Get or create a Node that could be later inserted into some parent
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
index 0c66ac59..75c93cc4 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
@@ -54,9 +54,9 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
     }
 
 
-    private val referenceStore = HashMap<Name, MutableList<Proxy>>()
+    private val referenceStore = HashMap<Name, MutableList<SolidReference>>()
 
-    private fun proxySolid(root: GDML, group: SolidGroup, solid: GDMLSolid, name: String): Proxy {
+    private fun proxySolid(root: GDML, group: SolidGroup, solid: GDMLSolid, name: String): SolidReference {
         val templateName = solidsName + name
         if (proto[templateName] == null) {
             solids.addSolid(root, solid, name)
@@ -66,7 +66,7 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
         return ref
     }
 
-    private fun proxyVolume(root: GDML, group: SolidGroup, physVolume: GDMLPhysVolume, volume: GDMLGroup): Proxy {
+    private fun proxyVolume(root: GDML, group: SolidGroup, physVolume: GDMLPhysVolume, volume: GDMLGroup): SolidReference {
         val templateName = volumesName + volume.name.asName()
         if (proto[templateName] == null) {
             proto[templateName] = volume(root, volume)
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
index 87b93093..c3e57a66 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
@@ -1,14 +1,12 @@
 package hep.dataforge.vision.gdml
 
-import hep.dataforge.vision.solid.AbstractProxy
 import hep.dataforge.vision.solid.prototype
 import hep.dataforge.vision.visitor.countDistinct
-import hep.dataforge.vision.visitor.countDistinctBy
 import hep.dataforge.vision.visitor.flowStatistics
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import nl.adaptivity.xmlutil.StAXReader
 import kscience.gdml.GDML
+import nl.adaptivity.xmlutil.StAXReader
 import java.io.File
 import kotlin.reflect.KClass
 
diff --git a/visionforge-server/build.gradle.kts b/visionforge-server/build.gradle.kts
index 17696344..ff726eb5 100644
--- a/visionforge-server/build.gradle.kts
+++ b/visionforge-server/build.gradle.kts
@@ -6,3 +6,10 @@ plugins {
 
 val ktorVersion: String by rootProject.extra
 
+dependencies {
+    api(project(":visionforge-core"))
+    api("io.ktor:ktor-server-cio:$ktorVersion")
+    //api("io.ktor:ktor-server-netty:$ktorVersion")
+    api("io.ktor:ktor-html-builder:$ktorVersion")
+    api("io.ktor:ktor-websockets:$ktorVersion")
+}
\ No newline at end of file
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
new file mode 100644
index 00000000..98894710
--- /dev/null
+++ b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
@@ -0,0 +1,219 @@
+package hep.dataforge.vision.server
+
+import hep.dataforge.meta.*
+import hep.dataforge.names.Name
+import hep.dataforge.names.toName
+import hep.dataforge.vision.server.VisionServer.Companion.DEFAULT_PAGE
+import io.ktor.application.Application
+import io.ktor.application.featureOrNull
+import io.ktor.application.install
+import io.ktor.features.CORS
+import io.ktor.http.content.resources
+import io.ktor.http.content.static
+import io.ktor.routing.Routing
+import io.ktor.routing.route
+import io.ktor.routing.routing
+import io.ktor.server.engine.ApplicationEngine
+import io.ktor.websocket.WebSockets
+import kotlinx.html.TagConsumer
+import java.awt.Desktop
+import java.net.URI
+import kotlin.text.get
+
+public enum class ServerUpdateMode {
+    NONE,
+    PUSH,
+    PULL
+}
+
+public class VisionServer internal constructor(
+    private val routing: Routing,
+    private val rootRoute: String,
+) : Configurable {
+    override val config: Config = Config()
+    public var updateMode: ServerUpdateMode by config.enum(ServerUpdateMode.NONE, key = UPDATE_MODE_KEY)
+    public var updateInterval: Long by config.long(300, key = UPDATE_INTERVAL_KEY)
+    public var embedData: Boolean by config.boolean(false)
+
+    /**
+     * a list of headers that should be applied to all pages
+     */
+    private val globalHeaders: ArrayList<HtmlFragment> = ArrayList<HtmlFragment>()
+
+    public fun header(block: TagConsumer<*>.() -> Unit) {
+        globalHeaders.add(HtmlFragment(block))
+    }
+
+    public fun page(
+        plotlyFragment: PlotlyFragment,
+        route: String = DEFAULT_PAGE,
+        title: String = "Plotly server page '$route'",
+        headers: List<HtmlFragment> = emptyList(),
+    ) {
+        routing.createRouteFromPath(rootRoute).apply {
+            val plots = HashMap<String, Plot>()
+            route(route) {
+                //Update websocket
+                webSocket("ws/{id}") {
+                    val plotId: String = call.parameters["id"] ?: error("Plot id not defined")
+
+                    application.log.debug("Opened server socket for $plotId")
+
+                    val plot = plots[plotId] ?: error("Plot with id='$plotId' not registered")
+
+                    try {
+                        plot.collectUpdates(plotId, this, updateInterval).collect { update ->
+                            val json = update.toJson()
+                            outgoing.send(Frame.Text(json.toString()))
+                        }
+                    } catch (ex: Exception) {
+                        application.log.debug("Closed server socket for $plotId")
+                    }
+                }
+                //Plots in their json representation
+                get("data/{id}") {
+                    val id: String = call.parameters["id"] ?: error("Plot id not defined")
+
+                    val plot: Plot? = plots[id]
+                    if (plot == null) {
+                        call.respond(HttpStatusCode.NotFound, "Plot with id = $id not found")
+                    } else {
+                        call.respondText(
+                            plot.toJsonString(),
+                            contentType = ContentType.Application.Json,
+                            status = HttpStatusCode.OK
+                        )
+                    }
+                }
+                //filled pages
+                get {
+                    val origin = call.request.origin
+                    val url = URLBuilder().apply {
+                        protocol = URLProtocol.createOrDefault(origin.scheme)
+                        //workaround for https://github.com/ktorio/ktor/issues/1663
+                        host = if (origin.host.startsWith("0:")) "[${origin.host}]" else origin.host
+                        port = origin.port
+                        encodedPath = origin.uri
+                    }.build()
+                    call.respondHtml {
+                        val normalizedRoute = if (rootRoute.endsWith("/")) {
+                            rootRoute
+                        } else {
+                            "$rootRoute/"
+                        }
+
+                        head {
+                            meta {
+                                charset = "utf-8"
+                                (globalHeaders + headers).forEach {
+                                    it.visit(consumer)
+                                }
+                                script {
+                                    type = "text/javascript"
+                                    src = "${normalizedRoute}js/plotly.min.js"
+                                }
+                                script {
+                                    type = "text/javascript"
+                                    src = "${normalizedRoute}js/plotlyConnect.js"
+                                }
+                            }
+                            title(title)
+                        }
+                        body {
+                            val container =
+                                ServerPlotlyRenderer(url, updateMode, updateInterval, embedData) { plotId, plot ->
+                                    plots[plotId] = plot
+                                }
+                            with(plotlyFragment) {
+                                render(container)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public fun page(
+        route: String = DEFAULT_PAGE,
+        title: String = "Plotly server page '$route'",
+        headers: List<HtmlFragment> = emptyList(),
+        content: FlowContent.(renderer: PlotlyRenderer) -> Unit,
+    ) {
+        page(PlotlyFragment(content), route, title, headers)
+    }
+
+
+    public companion object {
+        public const val DEFAULT_PAGE: String = "/"
+        public val UPDATE_MODE_KEY: Name = "update.mode".toName()
+        public val UPDATE_INTERVAL_KEY: Name = "update.interval".toName()
+    }
+}
+
+
+/**
+ * Attach plotly application to given server
+ */
+public fun Application.visionModule(route: String = DEFAULT_PAGE): VisionServer {
+    if (featureOrNull(WebSockets) == null) {
+        install(WebSockets)
+    }
+
+    if (featureOrNull(CORS) == null) {
+        install(CORS) {
+            anyHost()
+        }
+    }
+
+
+    val routing = routing {
+        route(route) {
+            static {
+                resources()
+            }
+        }
+    }
+
+    return VisionServer(routing, route)
+}
+
+
+/**
+ * Configure server to start sending updates in push mode. Does not affect loaded pages
+ */
+public fun VisionServer.pushUpdates(interval: Long = 100): VisionServer = apply {
+    updateMode = ServerUpdateMode.PUSH
+    updateInterval = interval
+}
+
+/**
+ * Configure client to request regular updates from server. Pull updates are more expensive than push updates since
+ * they contain the full plot data and server can't decide what to send.
+ */
+public fun VisionServer.pullUpdates(interval: Long = 1000): VisionServer = apply {
+    updateMode = ServerUpdateMode.PULL
+    updateInterval = interval
+}
+
+///**
+// * Start static server (updates via reload)
+// */
+//@OptIn(KtorExperimentalAPI::class)
+//public fun Plotly.serve(
+//    scope: CoroutineScope = GlobalScope,
+//    host: String = "localhost",
+//    port: Int = 7777,
+//    block: PlotlyServer.() -> Unit,
+//): ApplicationEngine = scope.embeddedServer(io.ktor.server.cio.CIO, port, host) {
+//    plotlyModule().apply(block)
+//}.start()
+
+
+public fun ApplicationEngine.show() {
+    val connector = environment.connectors.first()
+    val uri = URI("http", null, connector.host, connector.port, null, null, null)
+    Desktop.getDesktop().browse(uri)
+}
+
+public fun ApplicationEngine.close(): Unit = stop(1000, 5000)
\ No newline at end of file
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/html.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/html.kt
new file mode 100644
index 00000000..d6df7edc
--- /dev/null
+++ b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/html.kt
@@ -0,0 +1,70 @@
+package hep.dataforge.vision.server
+
+import kotlinx.html.*
+import kotlinx.html.stream.createHTML
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.StandardOpenOption
+
+public class HtmlFragment(public val visit: TagConsumer<*>.() -> Unit) {
+    override fun toString(): String {
+        return createHTML().also(visit).finalize()
+    }
+}
+
+public operator fun HtmlFragment.plus(other: HtmlFragment): HtmlFragment = HtmlFragment {
+    this@plus.run { visit() }
+    other.run { visit() }
+}
+
+/**
+ * Check if the asset exists in given local location and put it there if it does not
+ */
+internal fun checkOrStoreFile(basePath: Path, filePath: Path, resource: String): Path {
+    val fullPath = basePath.resolveSibling(filePath).toAbsolutePath()
+
+    if (Files.exists(fullPath)) {
+        //TODO checksum
+    } else {
+        //TODO add logging
+
+        val bytes = HtmlFragment::class.java.getResourceAsStream(resource).readAllBytes()
+        Files.createDirectories(fullPath.parent)
+        Files.write(fullPath, bytes, StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE)
+    }
+
+    return if (basePath.isAbsolute && fullPath.startsWith(basePath)) {
+        basePath.relativize(fullPath)
+    } else {
+        filePath
+    }
+}
+
+/**
+ * A header that automatically copies relevant scripts to given path
+ */
+public fun localScriptHeader(
+    basePath: Path,
+    scriptPath: Path,
+    resource: String
+): HtmlFragment = HtmlFragment {
+    val relativePath = checkOrStoreFile(basePath, scriptPath, resource)
+    script {
+        type = "text/javascript"
+        src = relativePath.toString()
+        attributes["onload"] = "console.log('Script successfully loaded from $relativePath')"
+        attributes["onerror"] = "console.log('Failed to load script from $relativePath')"
+    }
+}
+
+public fun localCssHeader(
+    basePath: Path,
+    cssPath: Path,
+    resource: String
+): HtmlFragment = HtmlFragment {
+    val relativePath = checkOrStoreFile(basePath, cssPath, resource)
+    link {
+        rel = "stylesheet"
+        href = relativePath.toString()
+    }
+}
\ No newline at end of file
diff --git a/visionforge-solid/build.gradle.kts b/visionforge-solid/build.gradle.kts
index 3f7ac5dc..a9569b76 100644
--- a/visionforge-solid/build.gradle.kts
+++ b/visionforge-solid/build.gradle.kts
@@ -29,7 +29,7 @@ kotlin {
         }
         jsMain {
             dependencies {
-                implementation(npm("three", "0.114.0"))
+                implementation(npm("three", "0.122.0"))
                 implementation(npm("three-csg-ts", "1.0.1"))
             }
         }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
index 6e176501..024f5215 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
@@ -5,9 +5,9 @@ import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
-import hep.dataforge.output.Renderer
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.asValue
+import hep.dataforge.vision.Renderer
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.Vision.Companion.VISIBLE_KEY
 import hep.dataforge.vision.enum
@@ -73,11 +73,11 @@ public interface Solid : Vision {
 
                 item(SolidMaterial.MATERIAL_KEY.toString(), SolidMaterial.descriptor)
 
-                enum(ROTATION_ORDER_KEY,default = RotationOrder.XYZ)
+                enum(ROTATION_ORDER_KEY, default = RotationOrder.XYZ)
             }
         }
 
-        internal fun solidEquals(first: Solid, second: Solid): Boolean{
+        internal fun solidEquals(first: Solid, second: Solid): Boolean {
             if (first.position != second.position) return false
             if (first.rotation != second.rotation) return false
             if (first.scale != second.scale) return false
@@ -85,8 +85,8 @@ public interface Solid : Vision {
             return true
         }
 
-        internal fun solidHashCode(solid: Solid): Int{
-            var result = + (solid.position?.hashCode() ?: 0)
+        internal fun solidHashCode(solid: Solid): Int {
+            var result = +(solid.position?.hashCode() ?: 0)
             result = 31 * result + (solid.rotation?.hashCode() ?: 0)
             result = 31 * result + (solid.scale?.hashCode() ?: 0)
             result = 31 * result + (solid.properties?.hashCode() ?: 0)
@@ -104,8 +104,7 @@ public var Solid.layer: Int
         config[LAYER_KEY] = value.asValue()
     }
 
-public fun Renderer<Solid>.render(meta: Meta = Meta.EMPTY, action: SolidGroup.() -> Unit): Unit =
-    render(SolidGroup().apply(action), meta)
+public fun Renderer<Solid>.render(action: SolidGroup.() -> Unit): Unit = render(SolidGroup().apply(action))
 
 // Common properties
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index be737599..319fffca 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -35,7 +35,7 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
 
         private fun PolymorphicModuleBuilder<Solid>.solids() {
             subclass(SolidGroup.serializer())
-            subclass(Proxy.serializer())
+            subclass(SolidReference.serializer())
             subclass(Composite.serializer())
             subclass(Tube.serializer())
             subclass(Box.serializer())
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
similarity index 74%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
index 55946255..266366ce 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Proxy.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
@@ -9,7 +9,7 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import kotlin.collections.set
 
-public abstract class AbstractProxy : BasicSolid(), VisionGroup {
+public abstract class AbstractReference : BasicSolid(), VisionGroup {
     public abstract val prototype: Solid
 
     override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? {
@@ -46,13 +46,13 @@ public abstract class AbstractProxy : BasicSolid(), VisionGroup {
 }
 
 /**
- * A proxy [Solid] to reuse a template object
+ * A reference [Solid] to reuse a template object
  */
 @Serializable
-@SerialName("solid.proxy")
-public class Proxy(
+@SerialName("solid.ref")
+public class SolidReference(
     public val templateName: Name,
-) : AbstractProxy(), Solid {
+) : AbstractReference(), Solid {
 
     /**
      * Recursively search for defined template in the parent
@@ -67,15 +67,15 @@ public class Proxy(
     private val propertyCache: HashMap<Name, Config> = HashMap()
 
 
-    override val children: Map<NameToken, Proxy.ProxyChild>
+    override val children: Map<NameToken, SolidReference.ReferenceChild>
         get() = (prototype as? VisionGroup)?.children
             ?.filter { !it.key.toString().startsWith("@") }
             ?.mapValues {
-                ProxyChild(it.key.asName())
+                ReferenceChild(it.key.asName())
             } ?: emptyMap()
 
     private fun childPropertyName(childName: Name, propertyName: Name): Name {
-        return NameToken(PROXY_CHILD_PROPERTY_PREFIX, childName.toString()) + propertyName
+        return NameToken(REFERENCE_CHILD_PROPERTY_PREFIX, childName.toString()) + propertyName
     }
 
     private fun prototypeFor(name: Name): Solid {
@@ -89,17 +89,17 @@ public class Proxy(
      * A ProxyChild is created temporarily only to interact with properties, it does not store any values
      * (properties are stored in external cache) and created and destroyed on-demand).
      */
-    public inner class ProxyChild(public val name: Name) : AbstractProxy() {
+    public inner class ReferenceChild(public val name: Name) : AbstractReference() {
 
         override val prototype: Solid get() = prototypeFor(name)
 
-        override val styleSheet: StyleSheet get() = this@Proxy.styleSheet
+        override val styleSheet: StyleSheet get() = this@SolidReference.styleSheet
 
         override val children: Map<NameToken, Vision>
             get() = (prototype as? VisionGroup)?.children
                 ?.filter { !it.key.toString().startsWith("@") }
                 ?.mapValues { (key, _) ->
-                    ProxyChild(name + key.asName())
+                    ReferenceChild(name + key.asName())
                 } ?: emptyMap()
 
         override var properties: Config?
@@ -108,12 +108,12 @@ public class Proxy(
                 if (value == null) {
                     propertyCache.remove(name)?.also {
                         //Removing listener if it is present
-                        removeChangeListener(this@Proxy)
+                        removeChangeListener(this@SolidReference)
                     }
                 } else {
                     propertyCache[name] = value.also {
-                        onPropertyChange(this@Proxy) { propertyName ->
-                            this@Proxy.propertyChanged(childPropertyName(name, propertyName))
+                        onPropertyChange(this@SolidReference) { propertyName ->
+                            this@SolidReference.propertyChanged(childPropertyName(name, propertyName))
                         }
                     }
                 }
@@ -122,16 +122,16 @@ public class Proxy(
     }
 
     public companion object {
-        public const val PROXY_CHILD_PROPERTY_PREFIX: String = "@child"
+        public const val REFERENCE_CHILD_PROPERTY_PREFIX: String = "@child"
     }
 }
 
 /**
- * Get a vision prototype if it is a [Proxy] or vision itself if it is not
+ * Get a vision prototype if it is a [SolidReference] or vision itself if it is not
  */
 public val Vision.prototype: Vision
     get() = when (this) {
-        is AbstractProxy -> prototype
+        is AbstractReference -> prototype
         else -> this
     }
 
@@ -141,16 +141,16 @@ public val Vision.prototype: Vision
 public fun SolidGroup.ref(
     templateName: Name,
     name: String = "",
-): Proxy = Proxy(templateName).also { set(name, it) }
+): SolidReference = SolidReference(templateName).also { set(name, it) }
 
 /**
- * Add new proxy wrapping given object and automatically adding it to the prototypes
+ * Add new [SolidReference] wrapping given object and automatically adding it to the prototypes
  */
-public fun SolidGroup.proxy(
+public fun SolidGroup.ref(
     name: String,
     obj: Solid,
     templateName: Name = name.toName(),
-): Proxy {
+): SolidReference {
     val existing = getPrototype(templateName)
     if (existing == null) {
         prototypes {
@@ -159,5 +159,5 @@ public fun SolidGroup.proxy(
     } else if (existing != obj) {
         error("Can't add different prototype on top of existing one")
     }
-    return ref(templateName, name)
+    return this@ref.ref(templateName, name)
 }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
index d39daaf0..b62ea275 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
@@ -1,6 +1,7 @@
 package hep.dataforge.vision.solid.specifications
 
 import hep.dataforge.meta.*
+import hep.dataforge.names.Name
 
 public class Canvas3DOptions : Scheme() {
     public var axes: Axes by spec(Axes, Axes.empty())
@@ -15,6 +16,8 @@ public class Canvas3DOptions : Scheme() {
     public var maxWith: Number by number { maxSize }
     public var maxHeight: Number by number { maxSize }
 
+    public var onSelect: ((Name?)->Unit)? = null
+
 
     public companion object : SchemeSpec<Canvas3DOptions>(::Canvas3DOptions)
 }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
index 3f205893..7bedebe4 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
@@ -40,7 +40,7 @@ internal object RemoveSingleChild : VisualTreeTransform<SolidGroup>() {
     override fun SolidGroup.transformInPlace() {
         fun MutableVisionGroup.replaceChildren() {
             children.forEach { (childName, parent) ->
-                if (parent is Proxy) return@forEach //ignore refs
+                if (parent is SolidReference) return@forEach //ignore refs
                 if (parent is MutableVisionGroup) {
                     parent.replaceChildren()
                 }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
index c3f2109b..d45c2ca2 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
@@ -5,8 +5,8 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.VisionGroup
-import hep.dataforge.vision.solid.Proxy
 import hep.dataforge.vision.solid.SolidGroup
+import hep.dataforge.vision.solid.SolidReference
 
 @DFExperimental
 internal object UnRef : VisualTreeTransform<SolidGroup>() {
@@ -17,7 +17,7 @@ internal object UnRef : VisualTreeTransform<SolidGroup>() {
                 counter.forEach { (key, value) ->
                     reducer[key] = (reducer[key] ?: 0) + value
                 }
-            } else if (obj is Proxy) {
+            } else if (obj is SolidReference) {
                 reducer[obj.templateName] = (reducer[obj.templateName] ?: 0) + 1
             }
 
@@ -27,9 +27,9 @@ internal object UnRef : VisualTreeTransform<SolidGroup>() {
 
     private fun MutableVisionGroup.unref(name: Name) {
         (this as? SolidGroup)?.prototypes?.set(name, null)
-        children.filter { (it.value as? Proxy)?.templateName == name }.forEach { (key, value) ->
-            val proxy = value as Proxy
-            val newChild = mergeChild(proxy, proxy.prototype)
+        children.filter { (it.value as? SolidReference)?.templateName == name }.forEach { (key, value) ->
+            val reference = value as SolidReference
+            val newChild = mergeChild(reference, reference.prototype)
             newChild.parent = null
             set(key.asName(), newChild) // replace proxy with merged object
         }
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
index 02a0b661..7c80a6fb 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
@@ -58,8 +58,8 @@ class PropertyTest {
     }
 
     @Test
-    fun testProxyStyleProperty() {
-        var box: Proxy? = null
+    fun testReferenceStyleProperty() {
+        var box: SolidReference? = null
         val group = SolidGroup{
             styleSheet {
                 set("testStyle") {
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
index c9abfce1..efef7fcd 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
@@ -3,7 +3,6 @@ package hep.dataforge.vision.solid
 import hep.dataforge.names.Name
 import hep.dataforge.names.toName
 import hep.dataforge.vision.MutableVisionGroup
-import hep.dataforge.vision.Vision
 import hep.dataforge.vision.get
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -12,13 +11,13 @@ import kotlin.test.assertEquals
 /**
  * Create and attach new proxied group
  */
-fun SolidGroup.proxyGroup(
+fun SolidGroup.refGroup(
     name: String,
     templateName: Name = name.toName(),
     block: MutableVisionGroup.() -> Unit
-): Proxy {
+): SolidReference {
     val group = SolidGroup().apply(block)
-    return proxy(name, group, templateName)
+    return ref(name, group, templateName)
 }
 
 
@@ -44,8 +43,8 @@ class SerializationTest {
             z = -100
         }
         val group = SolidGroup{
-            proxy("cube", cube)
-            proxyGroup("pg", "pg.content".toName()){
+            ref("cube", cube)
+            refGroup("pg", "pg.content".toName()){
                 sphere(50){
                     x = -100
                 }
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/DatCanvasControls.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/DatCanvasControls.kt
deleted file mode 100644
index 361e18e3..00000000
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/DatCanvasControls.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package hep.dataforge.vision.solid.three
-
-fun createDataControls() {
-    val dat = kotlinext.js.require("dat.gui")
-}
\ No newline at end of file
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
index 14a5e12e..834fcf70 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
@@ -1,12 +1,12 @@
 package hep.dataforge.vision.solid.three
 
-import hep.dataforge.context.Context
-import hep.dataforge.meta.*
+import hep.dataforge.meta.getItem
+import hep.dataforge.meta.string
 import hep.dataforge.names.Name
 import hep.dataforge.names.plus
 import hep.dataforge.names.toName
-import hep.dataforge.output.Renderer
 import hep.dataforge.vision.Colors
+import hep.dataforge.vision.Renderer
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.specifications.*
 import hep.dataforge.vision.solid.three.ThreeMaterials.HIGHLIGHT_MATERIAL
@@ -41,28 +41,24 @@ import kotlin.math.sin
 public class ThreeCanvas(
     public val three: ThreePlugin,
     public val options: Canvas3DOptions,
-    public val onClick: ((Name?) -> Unit)? = null,
 ) : Renderer<Solid> {
-
-    override val context: Context get() = three.context
-
-    public var content: Solid? = null
-        private set
-
     private var root: Object3D? = null
 
     private val raycaster = Raycaster()
     private val mousePosition: Vector2 = Vector2()
 
-    public val axes: AxesHelper = AxesHelper(options.axes.size.toInt()).apply {
-        visible = options.axes.visible
-    }
+    public var content: Solid? = null
+        private set
 
-    public val scene: Scene = Scene().apply {
+    public var axes: AxesHelper = AxesHelper(options.axes.size.toInt()).apply { visible = options.axes.visible }
+        private set
+
+    private val scene: Scene = Scene().apply {
         add(axes)
     }
 
-    public val camera: PerspectiveCamera = buildCamera(options.camera)
+    public var camera: PerspectiveCamera = buildCamera(options.camera)
+        private set
 
     private var picked: Object3D? = null
 
@@ -97,7 +93,7 @@ public class ThreeCanvas(
 
         element.addEventListener("mousedown", {
             val picked = pick()
-            onClick?.invoke(picked?.fullName())
+            options.onSelect?.invoke(picked?.fullName())
         }, false)
 
         val renderer = WebGLRenderer { antialias = true }.apply {
@@ -193,15 +189,14 @@ public class ThreeCanvas(
         }
     }
 
-    override fun render(obj: Solid, meta: Meta) {
+    public override fun render(vision: Solid) {
         //clear old root
         clear()
 
-
-        val object3D = three.buildObject3D(obj)
+        val object3D = three.buildObject3D(vision)
         object3D.name = "@root"
         scene.add(object3D)
-        content = obj
+        content = vision
         root = object3D
     }
 
@@ -260,17 +255,4 @@ public class ThreeCanvas(
         private const val HIGHLIGHT_NAME = "@highlight"
         private const val SELECT_NAME = "@select"
     }
-}
-
-public fun ThreePlugin.output(
-    element: HTMLElement,
-    spec: Canvas3DOptions = Canvas3DOptions.empty(),
-    onClick: ((Name?) -> Unit)? = null,
-): ThreeCanvas = ThreeCanvas(this, spec, onClick).apply { attach(element) }
-
-public fun ThreePlugin.render(
-    element: HTMLElement,
-    obj: Solid,
-    onSelect: ((Name?) -> Unit)? = null,
-    options: Canvas3DOptions.() -> Unit = {},
-): Unit = output(element, Canvas3DOptions.invoke(options), onSelect).render(obj)
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt
index 152af45a..c06a0ff6 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt
@@ -13,7 +13,7 @@ import info.laht.threekt.math.Vector3
 /**
  * An implementation of geometry builder for Three.js [BufferGeometry]
  */
-class ThreeGeometryBuilder : GeometryBuilder<BufferGeometry> {
+public class ThreeGeometryBuilder : GeometryBuilder<BufferGeometry> {
 
     private val vertices = ArrayList<Point3D>()
     private val faces = ArrayList<Face3>()
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index b3a9200e..6cbdcc10 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -2,21 +2,28 @@ package hep.dataforge.vision.solid.three
 
 import hep.dataforge.context.*
 import hep.dataforge.meta.Meta
+import hep.dataforge.meta.empty
+import hep.dataforge.meta.invoke
 import hep.dataforge.names.*
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.rendering.HTMLVisionDisplay
 import hep.dataforge.vision.solid.*
+import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.visible
 import info.laht.threekt.core.Object3D
+import org.w3c.dom.HTMLElement
 import kotlin.collections.set
 import kotlin.reflect.KClass
 import info.laht.threekt.objects.Group as ThreeGroup
 
-public class ThreePlugin : AbstractPlugin() {
+public class ThreePlugin : AbstractPlugin(), HTMLVisionDisplay<Solid, ThreeCanvas> {
     override val tag: PluginTag get() = Companion.tag
 
+    public val solidManager: SolidManager by require(SolidManager)
+
     private val objectFactories = HashMap<KClass<out Solid>, ThreeFactory<*>>()
     private val compositeFactory = ThreeCompositeFactory(this)
-    private val proxyFactory = ThreeProxyFactory(this)
+    private val refFactory = ThreeReferenceFactory(this)
 
     init {
         //Add specialized factories here
@@ -38,7 +45,7 @@ public class ThreePlugin : AbstractPlugin() {
     public fun buildObject3D(obj: Solid): Object3D {
         return when (obj) {
             is ThreeVision -> obj.render()
-            is Proxy -> proxyFactory(obj)
+            is SolidReference -> refFactory(obj)
             is SolidGroup -> {
                 val group = ThreeGroup()
                 obj.children.forEach { (token, child) ->
@@ -56,7 +63,7 @@ public class ThreePlugin : AbstractPlugin() {
                     updatePosition(obj)
                     //obj.onChildrenChange()
 
-                    obj.onPropertyChange(this) { name->
+                    obj.onPropertyChange(this) { name ->
                         if (
                             name.startsWith(Solid.POSITION_KEY) ||
                             name.startsWith(Solid.ROTATION) ||
@@ -69,7 +76,7 @@ public class ThreePlugin : AbstractPlugin() {
                         }
                     }
 
-                    obj.onChildrenChange(this) { nameToken, child ->
+                    obj.onStructureChange(this) { nameToken, _, child ->
 //                        if (name.isEmpty()) {
 //                            logger.error { "Children change with empty name on $group" }
 //                            return@onChildrenChange
@@ -108,6 +115,12 @@ public class ThreePlugin : AbstractPlugin() {
         }
     }
 
+    override fun attachRenderer(element: HTMLElement): ThreeCanvas {
+        return ThreeCanvas(this, Canvas3DOptions.empty()).apply {
+            attach(element)
+        }
+    }
+
     public companion object : PluginFactory<ThreePlugin> {
         override val tag: PluginTag = PluginTag("visual.three", PluginTag.DATAFORGE_GROUP)
         override val type: KClass<ThreePlugin> = ThreePlugin::class
@@ -115,6 +128,17 @@ public class ThreePlugin : AbstractPlugin() {
     }
 }
 
+public fun ThreePlugin.attachRenderer(
+    element: HTMLElement,
+    options: Canvas3DOptions = Canvas3DOptions.empty(),
+): ThreeCanvas = ThreeCanvas(this, options).apply { attach(element) }
+
+public fun ThreePlugin.render(
+    element: HTMLElement,
+    obj: Solid,
+    options: Canvas3DOptions.() -> Unit = {},
+): ThreeCanvas = attachRenderer(element, Canvas3DOptions(options)).apply { render(obj) }
+
 internal operator fun Object3D.set(token: NameToken, object3D: Object3D) {
     object3D.name = token.toString()
     add(object3D)
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
similarity index 69%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
rename to visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
index b1b17fe6..32ea564f 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeProxyFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
@@ -3,18 +3,18 @@ package hep.dataforge.vision.solid.three
 import hep.dataforge.names.cutFirst
 import hep.dataforge.names.firstOrNull
 import hep.dataforge.names.toName
-import hep.dataforge.vision.solid.Proxy
-import hep.dataforge.vision.solid.Proxy.Companion.PROXY_CHILD_PROPERTY_PREFIX
 import hep.dataforge.vision.solid.Solid
+import hep.dataforge.vision.solid.SolidReference
+import hep.dataforge.vision.solid.SolidReference.Companion.REFERENCE_CHILD_PROPERTY_PREFIX
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.objects.Mesh
 import kotlin.reflect.KClass
 
-public class ThreeProxyFactory(public val three: ThreePlugin) : ThreeFactory<Proxy> {
+public class ThreeReferenceFactory(public val three: ThreePlugin) : ThreeFactory<SolidReference> {
     private val cache = HashMap<Solid, Object3D>()
 
-    override val type: KClass<Proxy> = Proxy::class
+    override val type: KClass<SolidReference> = SolidReference::class
 
     private fun Object3D.replicate(): Object3D {
         return when (this) {
@@ -30,7 +30,7 @@ public class ThreeProxyFactory(public val three: ThreePlugin) : ThreeFactory<Pro
         }
     }
 
-    override fun invoke(obj: Proxy): Object3D {
+    override fun invoke(obj: SolidReference): Object3D {
         val template = obj.prototype
         val cachedObject = cache.getOrPut(template) {
             three.buildObject3D(template)
@@ -44,12 +44,12 @@ public class ThreeProxyFactory(public val three: ThreePlugin) : ThreeFactory<Pro
         }
 
         obj.onPropertyChange(this) { name ->
-            if (name.firstOrNull()?.body == PROXY_CHILD_PROPERTY_PREFIX) {
-                val childName = name.firstOrNull()?.index?.toName() ?: error("Wrong syntax for proxy child property: '$name'")
+            if (name.firstOrNull()?.body == REFERENCE_CHILD_PROPERTY_PREFIX) {
+                val childName = name.firstOrNull()?.index?.toName() ?: error("Wrong syntax for reference child property: '$name'")
                 val propertyName = name.cutFirst()
-                val proxyChild = obj[childName] ?: error("Proxy child with name '$childName' not found")
+                val referenceChild = obj[childName] ?: error("Reference child with name '$childName' not found")
                 val child = object3D.findChild(childName) ?: error("Object child with name '$childName' not found")
-                child.updateProperty(proxyChild, propertyName)
+                child.updateProperty(referenceChild, propertyName)
             } else {
                 object3D.updateProperty(obj, name)
             }
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt
index 2b35b7e7..b18cd2eb 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt
@@ -14,15 +14,15 @@ import info.laht.threekt.objects.Mesh
 import info.laht.threekt.textures.Texture
 import kotlin.math.PI
 
-val Solid.euler get() = Euler(rotationX, rotationY, rotationZ, rotationOrder.name)
+public val Solid.euler: Euler get() = Euler(rotationX, rotationY, rotationZ, rotationOrder.name)
 
-val MetaItem<*>.vector get() = Vector3(node["x"].float ?: 0f, node["y"].float ?: 0f, node["z"].float ?: 0f)
+public val MetaItem<*>.vector: Vector3 get() = Vector3(node["x"].float ?: 0f, node["y"].float ?: 0f, node["z"].float ?: 0f)
 
-fun Geometry.toBufferGeometry(): BufferGeometry = BufferGeometry().apply { fromGeometry(this@toBufferGeometry) }
+public fun Geometry.toBufferGeometry(): BufferGeometry = BufferGeometry().apply { fromGeometry(this@toBufferGeometry) }
 
 internal fun Double.toRadians() = this * PI / 180
 
-fun CSG.toGeometry(): Geometry {
+public fun CSG.toGeometry(): Geometry {
     val geom = Geometry()
 
     val vertices = ArrayList<Vector3>()
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt
index 8d90d3b2..be2f5788 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt
+++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt
@@ -28,7 +28,7 @@ class FX3DPlugin : AbstractPlugin() {
 
     private val objectFactories = HashMap<KClass<out Solid>, FX3DFactory<*>>()
     private val compositeFactory = FXCompositeFactory(this)
-    private val proxyFactory = FXProxyFactory(this)
+    private val referenceFactory = FXReferenceFactory(this)
 
     init {
         //Add specialized factories here
@@ -45,7 +45,7 @@ class FX3DPlugin : AbstractPlugin() {
     fun buildNode(obj: Solid): Node {
         val binding = VisualObjectFXBinding(obj)
         return when (obj) {
-            is Proxy -> proxyFactory(obj, binding)
+            is SolidReference -> referenceFactory(obj, binding)
             is SolidGroup -> {
                 Group(obj.children.mapNotNull { (token, obj) ->
                     (obj as? Solid)?.let {
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCanvas3D.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCanvas3D.kt
index 1c90819b..e8989840 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCanvas3D.kt
+++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCanvas3D.kt
@@ -2,9 +2,8 @@ package hep.dataforge.vision.solid.fx
 
 import hep.dataforge.context.Context
 import hep.dataforge.context.ContextAware
-import hep.dataforge.meta.Meta
 import hep.dataforge.meta.empty
-import hep.dataforge.output.Renderer
+import hep.dataforge.vision.Renderer
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import javafx.application.Platform
@@ -81,7 +80,7 @@ class FXCanvas3D(val plugin: FX3DPlugin, val spec: Canvas3DOptions = Canvas3DOpt
         }
     }
 
-    override fun render(obj: Solid, meta: Meta) {
-        rootObject = obj
+    override fun render(vision: Solid) {
+        rootObject = vision
     }
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXProxyFactory.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXReferenceFactory.kt
similarity index 63%
rename from visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXProxyFactory.kt
rename to visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXReferenceFactory.kt
index 3dca5113..6f6912e3 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXProxyFactory.kt
+++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXReferenceFactory.kt
@@ -2,25 +2,25 @@ package hep.dataforge.vision.solid.fx
 
 import hep.dataforge.names.*
 import hep.dataforge.vision.Vision
-import hep.dataforge.vision.solid.Proxy
+import hep.dataforge.vision.solid.SolidReference
 import javafx.scene.Group
 import javafx.scene.Node
 import kotlin.reflect.KClass
 
-class FXProxyFactory(val plugin: FX3DPlugin) : FX3DFactory<Proxy> {
-    override val type: KClass<in Proxy> get() = Proxy::class
+class FXReferenceFactory(val plugin: FX3DPlugin) : FX3DFactory<SolidReference> {
+    override val type: KClass<in SolidReference> get() = SolidReference::class
 
-    override fun invoke(obj: Proxy, binding: VisualObjectFXBinding): Node {
+    override fun invoke(obj: SolidReference, binding: VisualObjectFXBinding): Node {
         val prototype = obj.prototype
         val node = plugin.buildNode(prototype)
 
         obj.onPropertyChange(this) { name->
-            if (name.firstOrNull()?.body == Proxy.PROXY_CHILD_PROPERTY_PREFIX) {
-                val childName = name.firstOrNull()?.index?.toName() ?: error("Wrong syntax for proxy child property: '$name'")
+            if (name.firstOrNull()?.body == SolidReference.REFERENCE_CHILD_PROPERTY_PREFIX) {
+                val childName = name.firstOrNull()?.index?.toName() ?: error("Wrong syntax for reference child property: '$name'")
                 val propertyName = name.cutFirst()
-                val proxyChild = obj[childName] ?: error("Proxy child with name '$childName' not found")
+                val referenceChild = obj[childName] ?: error("Reference child with name '$childName' not found")
                 val child = node.findChild(childName) ?: error("Object child with name '$childName' not found")
-                child.updateProperty(proxyChild, propertyName)
+                child.updateProperty(referenceChild, propertyName)
             }
         }
         return node

From cae3ab00d92a01ec1330826e7b5e39a235b31663 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 19 Nov 2020 13:43:42 +0300
Subject: [PATCH 027/151] Fix a lot of bugs

---
 .../vision/gdml/demo/GDMLAppComponent.kt      |   6 +-
 .../vision/gdml/demo/GdmlFxDemoApp.kt         |   5 +-
 .../mipt/npm/muon/monitor/MMAppComponent.kt   |  11 +-
 demo/spatial-showcase/build.gradle.kts        |  13 +-
 .../hep/dataforge/vision/solid/demo/demo.kt   |  13 +-
 .../vision/solid/demo/ThreeDemoApp.kt         |   2 +-
 .../vision/solid/demo/ThreeDemoGrid.kt        |  86 ++--
 .../vision/solid/demo/VariableBox.kt          |   4 +
 .../src/jsMain/resources/index.html           |  17 +-
 .../dataforge/vision/solid/demo/FXDemoGrid.kt |  19 +-
 .../vision/bootstrap/threeControls.kt         |   2 +-
 .../vision/react/ThreeCanvasComponent.kt      |   3 +-
 .../kotlin/hep/dataforge/vision/Renderer.kt   |   5 -
 .../kotlin/hep/dataforge/vision/Vision.kt     |  44 +-
 .../kotlin/hep/dataforge/vision/VisionBase.kt |  31 +-
 .../hep/dataforge/vision/VisionManager.kt     |  19 +-
 .../vision/html/BindingHtmlOutputScope.kt     |  18 +
 .../dataforge/vision/html/HtmlOutputScope.kt  |  52 +++
 .../vision/html/HtmlVisionFragment.kt         |   8 +
 .../vision/html/StaticHtmlOutputScope.kt      |  28 ++
 .../hep/dataforge/vision/layout/Page.kt       |  16 +
 .../hep/dataforge/vision/visionChange.kt      |   3 +-
 .../hep/dataforge/vision/html/HtmlTagTest.kt  |  52 +++
 .../vision/html/DynamicHtmlOutputContext.kt   |  31 ++
 .../vision/rendering/HTMLVisionDisplay.kt     |  20 -
 .../dataforge/vision/server/VisionServer.kt   | 434 +++++++++---------
 .../hep/dataforge/vision/server/html.kt       |  70 ---
 .../hep/dataforge/vision/solid/PolyLine.kt    |   4 +-
 .../hep/dataforge/vision/solid/Solid.kt       |   4 +-
 .../dataforge/vision/solid/SolidManager.kt    |  10 +-
 .../dataforge/vision/solid/SolidMaterial.kt   |   1 -
 .../dataforge/vision/solid/SolidReference.kt  |  31 +-
 .../vision/solid/three/ThreeCanvas.kt         |  96 ++--
 .../vision/solid/three/ThreeMaterials.kt      |   6 +-
 .../vision/solid/three/ThreePlugin.kt         |  25 +-
 .../laht/threekt/renderers/WebGLRenderer.kt   |   9 +-
 .../dataforge/vision/solid/fx/FXCanvas3D.kt   |   4 +-
 37 files changed, 671 insertions(+), 531 deletions(-)
 delete mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Renderer.kt
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingHtmlOutputScope.kt
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticHtmlOutputScope.kt
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/layout/Page.kt
 create mode 100644 visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
 create mode 100644 visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/html/DynamicHtmlOutputContext.kt
 delete mode 100644 visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/rendering/HTMLVisionDisplay.kt
 delete mode 100644 visionforge-server/src/main/kotlin/hep/dataforge/vision/server/html.kt

diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index f2c4864c..3df7d3ca 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -1,6 +1,7 @@
 package hep.dataforge.vision.gdml.demo
 
 import hep.dataforge.context.Context
+import hep.dataforge.meta.invoke
 import hep.dataforge.names.Name
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.bootstrap.card
@@ -12,6 +13,7 @@ import hep.dataforge.vision.react.flexColumn
 import hep.dataforge.vision.react.flexRow
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.SolidManager
+import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.solid.three.ThreeCanvas
 import kotlinx.browser.window
 import kotlinx.css.*
@@ -104,7 +106,9 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
                             this.context = props.context
                             this.obj = vision as? Solid
                             this.selected = selected
-                            this.clickCallback = onSelect
+                            this.options = Canvas3DOptions.invoke{
+                                this.onSelect = onSelect
+                            }
                             this.canvasCallback = {
                                 canvas = it
                             }
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
index 0ccf3c70..de6968a7 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
@@ -1,12 +1,11 @@
 package hep.dataforge.vision.gdml.demo
 
 import hep.dataforge.context.Global
+import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.editor.VisualObjectEditorFragment
 import hep.dataforge.vision.editor.VisualObjectTreeFragment
 import hep.dataforge.vision.gdml.toVision
-import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.solid.Solid
-import hep.dataforge.vision.solid.SolidManager
 import hep.dataforge.vision.solid.SolidMaterial
 import hep.dataforge.vision.solid.fx.FX3DPlugin
 import hep.dataforge.vision.solid.fx.FXCanvas3D
@@ -27,7 +26,7 @@ class GDMLView : View() {
     }
 
     private val propertyEditor = VisualObjectEditorFragment {
-        it.getAllProperties()
+        it.allProperties
     }.apply {
         descriptorProperty.set(SolidMaterial.descriptor)
         itemProperty.bind(treeFragment.selectedProperty)
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
index aeb8d815..52c23c69 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
@@ -51,7 +51,7 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
     var selected by useState { props.selected }
     var canvas: ThreeCanvas? by useState { null }
 
-    val select: (Name?) -> Unit = {
+    val onSelect: (Name?) -> Unit = {
         selected = it
     }
 
@@ -72,7 +72,7 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
             }
             //tree
             card("Object tree") {
-                objectTree(root, selected, select)
+                objectTree(root, selected, onSelect)
             }
         }
         styledDiv {
@@ -85,9 +85,10 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                 attrs {
                     this.context = props.context
                     this.obj = root
-                    this.options = canvasConfig
+                    this.options = canvasConfig.apply {
+                        this.onSelect = onSelect
+                    }
                     this.selected = selected
-                    this.clickCallback = select
                     this.canvasCallback = {
                         canvas = it
                     }
@@ -176,7 +177,7 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                             configEditor(
                                 selectedObject.config,
                                 selectedObject.descriptor,
-                                default = selectedObject.getAllProperties(),
+                                default = selectedObject.allProperties,
                                 key = selected
                             )
                         }
diff --git a/demo/spatial-showcase/build.gradle.kts b/demo/spatial-showcase/build.gradle.kts
index 87140138..cd0a131f 100644
--- a/demo/spatial-showcase/build.gradle.kts
+++ b/demo/spatial-showcase/build.gradle.kts
@@ -1,4 +1,6 @@
-import ru.mipt.npm.gradle.*
+import ru.mipt.npm.gradle.DependencyConfiguration
+import ru.mipt.npm.gradle.FXModule
+import ru.mipt.npm.gradle.useFx
 
 plugins {
     id("ru.mipt.npm.mpp")
@@ -23,8 +25,13 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api(project(":visionforge-solid"))
-                api(project(":visionforge-gdml"))
+                implementation(project(":visionforge-solid"))
+                implementation(project(":visionforge-gdml"))
+            }
+        }
+        jsMain{
+            dependencies {
+                implementation("org.jetbrains:kotlin-css:1.0.0-pre.129-kotlin-1.4.10")
             }
         }
     }
diff --git a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
index 4f96f21b..1e962957 100644
--- a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
+++ b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
@@ -3,9 +3,8 @@ package hep.dataforge.vision.solid.demo
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.invoke
 import hep.dataforge.names.toName
-import hep.dataforge.output.OutputManager
 import hep.dataforge.vision.Colors
-import hep.dataforge.vision.Vision
+import hep.dataforge.vision.layout.Page
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.visible
@@ -16,12 +15,12 @@ import kotlin.math.sin
 import kotlin.random.Random
 
 
-fun OutputManager.demo(name: String, title: String = name, block: SolidGroup.() -> Unit) {
+fun Page<Solid>.demo(name: String, title: String = name, block: SolidGroup.() -> Unit) {
     val meta = Meta {
         "title" put title
     }
-    val output = get(Vision::class, name.toName(), meta = meta)
-    output.render (action = block)
+    val output = output(name.toName(), meta)?: error("Output with name $name not found")
+    output.solidGroup (builder = block)
 }
 
 val canvasOptions = Canvas3DOptions {
@@ -36,7 +35,7 @@ val canvasOptions = Canvas3DOptions {
     }
 }
 
-fun OutputManager.showcase() {
+fun Page<Solid>.showcase() {
     demo("shapes", "Basic shapes") {
         box(100.0, 100.0, 100.0) {
             z = -110.0
@@ -133,7 +132,7 @@ fun OutputManager.showcase() {
     }
 }
 
-fun OutputManager.showcaseCSG() {
+fun Page<Solid>.showcaseCSG() {
     demo("CSG.simple", "CSG operations") {
         composite(CompositeType.UNION) {
             box(100, 100, 100) {
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
index 0bcd047b..206dbb2b 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
@@ -15,7 +15,7 @@ private class ThreeDemoApp : Application {
 
     override fun start(state: Map<String, Any>) {
 
-        val element = document.getElementById("canvas") ?: error("Element with id 'canvas' not found on page")
+        val element = document.getElementById("demo") ?: error("Element with id 'demo' not found on page")
 
         ThreeDemoGrid(element).run {
             showcase()
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
index 8ea0462d..a12355a4 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
@@ -5,57 +5,75 @@ import hep.dataforge.meta.Meta
 import hep.dataforge.meta.get
 import hep.dataforge.meta.string
 import hep.dataforge.names.Name
-import hep.dataforge.output.Renderer
-import hep.dataforge.vision.Vision
+import hep.dataforge.vision.layout.Output
+import hep.dataforge.vision.layout.Page
+import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.three.ThreeCanvas
 import hep.dataforge.vision.solid.three.ThreePlugin
-import hep.dataforge.vision.solid.three.attachRenderer
-import kotlinx.browser.document
 import kotlinx.dom.clear
 import kotlinx.html.dom.append
-import kotlinx.html.dom.create
-import kotlinx.html.h2
-import kotlinx.html.hr
 import kotlinx.html.id
-import kotlinx.html.js.div
-import kotlinx.html.span
+import kotlinx.html.js.*
+import kotlinx.html.role
 import org.w3c.dom.Element
-import kotlin.reflect.KClass
+import org.w3c.dom.HTMLDivElement
+import org.w3c.dom.HTMLElement
 
-class ThreeDemoGrid(element: Element, meta: Meta = Meta.EMPTY) {
+class ThreeDemoGrid(element: Element, idPrefix: String = "") : Page<Solid> {
+
+
+    private lateinit var navigationElement: HTMLElement
+    private lateinit var contentElement: HTMLDivElement
 
-    private val gridRoot = document.create.div("row")
     private val outputs: MutableMap<Name, ThreeCanvas> = HashMap()
 
     private val three = Global.plugins.fetch(ThreePlugin)
 
     init {
         element.clear()
-        element.append(gridRoot)
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : Any> get(type: KClass<out T>, name: Name, stage: Name, meta: Meta): Renderer<T> {
-
-        return outputs.getOrPut(name) {
-            if (type != Vision::class) error("Supports only DisplayObject")
-            lateinit var output: ThreeCanvas
-            //TODO calculate cell width here using jquery
-            gridRoot.append {
-                span("border") {
-                    div("col-6") {
-                        div { id = "output-$name" }.also {
-                            output = three.attachRenderer(it, canvasOptions)
-                            //output.attach(it)
-                        }
-                        hr()
-                        h2 { +(meta["title"].string ?: name.toString()) }
-                    }
+        element.append {
+            div("container") {
+                navigationElement = ul("nav nav-tabs") {
+                    id = "${idPrefix}Tab"
+                    role = "tablist"
+                }
+                contentElement = div("tab-content") {
+                    id = "${idPrefix}TabContent"
                 }
             }
+        }
+    }
 
-            output
-        } as Renderer<T>
+
+    @Suppress("UNCHECKED_CAST")
+    override fun output(name: Name, meta: Meta): Output<Solid> = outputs.getOrPut(name) {
+        lateinit var output: ThreeCanvas
+        navigationElement.append {
+            li("nav-item") {
+                a(classes = "nav-link") {
+                    id = "tab[$name]"
+                    attributes["data-toggle"] = "tab"
+                    href = "#$name"
+                    role = "tab"
+                    attributes["aria-controls"] = "$name"
+                    attributes["aria-selected"] = "false"
+                    +name.toString()
+                }
+            }
+        }
+        contentElement.append {
+            div("tab-pane fade col h-100") {
+                id = name.toString()
+                role = "tabpanel"
+                attributes["aria-labelledby"] = "tab[$name]"
+                div("container w-100 h-100") { id = "output-$name" }.also {element->
+                    output = three.createCanvas(element, canvasOptions)
+                }
+                hr()
+                h2 { +(meta["title"].string ?: name.toString()) }
+            }
+        }
+        output
     }
 }
 
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
index 08830f35..8df28ddc 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
@@ -13,6 +13,7 @@ import hep.dataforge.vision.set
 import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.Solid.Companion.GEOMETRY_KEY
+import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
 import hep.dataforge.vision.solid.three.*
 import hep.dataforge.vision.solid.three.ThreeMaterials.getMaterial
 import info.laht.threekt.core.BufferGeometry
@@ -75,6 +76,9 @@ internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeV
                 }
                 name.startsWith(MeshThreeFactory.WIREFRAME_KEY) -> mesh.applyWireFrame(this@VariableBox)
                 name.startsWith(MeshThreeFactory.EDGES_KEY) -> mesh.applyEdges(this@VariableBox)
+                name.startsWith(MATERIAL_COLOR_KEY)->{
+                    mesh.material = getMaterial(this, true)
+                }
                 else -> mesh.updateProperty(this@VariableBox, name)
             }
         }
diff --git a/demo/spatial-showcase/src/jsMain/resources/index.html b/demo/spatial-showcase/src/jsMain/resources/index.html
index 278366e0..f3f04915 100644
--- a/demo/spatial-showcase/src/jsMain/resources/index.html
+++ b/demo/spatial-showcase/src/jsMain/resources/index.html
@@ -4,14 +4,25 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <title>Three js demo for particle physics</title>
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
-          integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+    <!-- CSS -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css"
+          integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
+
     <script type="text/javascript" src="spatial-showcase.js"></script>
 </head>
 <body class="application">
 <div class="container">
     <h1>Demo grid</h1>
 </div>
-<div class="container" id="canvas"></div>
+<div class="container" id="demo"></div>
+
+<!-- jQuery and JS bundle w/ Popper.js -->
+<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"
+        integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj"
+        crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js"
+        integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx"
+        crossorigin="anonymous"></script>
+
 </body>
 </html>
\ No newline at end of file
diff --git a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt b/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt
index 3fb8c1e5..ec0d5b0f 100644
--- a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt
+++ b/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt
@@ -3,18 +3,17 @@ package hep.dataforge.vision.solid.demo
 import hep.dataforge.context.Global
 import hep.dataforge.meta.Meta
 import hep.dataforge.names.Name
-import hep.dataforge.output.OutputManager
-import hep.dataforge.output.Renderer
-import hep.dataforge.vision.Vision
+import hep.dataforge.vision.layout.Output
+import hep.dataforge.vision.layout.Page
+import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.fx.FX3DPlugin
 import hep.dataforge.vision.solid.fx.FXCanvas3D
 import javafx.collections.FXCollections
 import javafx.scene.Parent
 import javafx.scene.control.Tab
 import tornadofx.*
-import kotlin.reflect.KClass
 
-class FXDemoGrid : View(title = "DataForge-vis FX demo"), OutputManager {
+class FXDemoGrid : View(title = "DataForge-vis FX demo"), Page<Solid> {
     private val outputs = FXCollections.observableHashMap<Name, FXCanvas3D>()
 
     override val root: Parent = borderpane {
@@ -27,14 +26,8 @@ class FXDemoGrid : View(title = "DataForge-vis FX demo"), OutputManager {
 
     private val fx3d = Global.plugins.fetch(FX3DPlugin)
 
-    @Suppress("UNCHECKED_CAST")
-    override fun <T : Any> get(type: KClass<out T>, name: Name, stage: Name, meta: Meta): Renderer<T> {
-        return outputs.getOrPut(name) {
-            if (type != Vision::class) kotlin.error("Supports only DisplayObject")
-            val output = FXCanvas3D(fx3d, canvasOptions)
-
-            output
-        } as Renderer<T>
+    override fun output(name: Name, meta: Meta): Output<Solid> = outputs.getOrPut(name) {
+        FXCanvas3D(fx3d, canvasOptions)
     }
 
 }
\ No newline at end of file
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
index ac0b5c33..839c35d3 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
@@ -54,7 +54,7 @@ public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalCo
                 if (selectedObject != null) {
                     visionPropertyEditor(
                         selectedObject,
-                        default = selectedObject.getAllProperties(),
+                        default = selectedObject.allProperties,
                         key = selected
                     )
                 }
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
index df52938d..bd0c8797 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
@@ -19,7 +19,6 @@ public external interface ThreeCanvasProps : RProps {
     public var obj: Solid?
     public var options: Canvas3DOptions?
     public var selected: Name?
-    public var clickCallback: (Name?) -> Unit
     public var canvasCallback: ((ThreeCanvas?) -> Unit)?
 }
 
@@ -39,7 +38,7 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
             val element = elementRef.current as? HTMLElement ?: error("Canvas element not found")
             val three: ThreePlugin = props.context.plugins.fetch(ThreePlugin)
             val newCanvas: ThreeCanvas =
-                three.attachRenderer(element, props.options ?: Canvas3DOptions.empty(), props.clickCallback)
+                three.createCanvas(element, props.options ?: Canvas3DOptions.empty())
             props.canvasCallback?.invoke(newCanvas)
             canvas = newCanvas
         }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Renderer.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Renderer.kt
deleted file mode 100644
index 820ac615..00000000
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Renderer.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package hep.dataforge.vision
-
-public fun interface Renderer<in V: Vision> {
-    public fun render(vision: V)
-}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 3a9cc81c..1ee5036e 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -12,8 +12,6 @@ import hep.dataforge.vision.Vision.Companion.TYPE
 import hep.dataforge.vision.Vision.Companion.VISIBLE_KEY
 import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.Transient
-import kotlin.properties.ReadWriteProperty
-import kotlin.reflect.KProperty
 
 /**
  * A root type for display hierarchy
@@ -35,7 +33,7 @@ public interface Vision : Configurable, Described {
     /**
      * All properties including styles and prototypes if present, including inherited ones
      */
-    public fun getAllProperties(): Laminate
+    public val allProperties: Laminate
 
     /**
      * Get property (including styles). [inherit] toggles parent node property lookup
@@ -116,27 +114,27 @@ public var Vision.visible: Boolean?
     get() = getProperty(VISIBLE_KEY).boolean
     set(value) = config.setValue(VISIBLE_KEY, value?.asValue())
 
-/**
- * Convinience delegate for properties
- */
-public fun Vision.property(
-    default: MetaItem<*>? = null,
-    key: Name? = null,
-    inherit: Boolean = true,
-): MutableItemDelegate =
-    object : ReadWriteProperty<Any?, MetaItem<*>?> {
-        override fun getValue(thisRef: Any?, property: KProperty<*>): MetaItem<*>? {
-            val name = key ?: property.name.toName()
-            return getProperty(name, inherit) ?: default
-        }
+///**
+// * Convenience delegate for properties
+// */
+//public fun Vision.property(
+//    default: MetaItem<*>? = null,
+//    key: Name? = null,
+//    inherit: Boolean = true,
+//): MutableItemDelegate =
+//    object : ReadWriteProperty<Any?, MetaItem<*>?> {
+//        override fun getValue(thisRef: Any?, property: KProperty<*>): MetaItem<*>? {
+//            val name = key ?: property.name.toName()
+//            return getProperty(name, inherit) ?: default
+//        }
+//
+//        override fun setValue(thisRef: Any?, property: KProperty<*>, value: MetaItem<*>?) {
+//            val name = key ?: property.name.toName()
+//            setProperty(name, value)
+//        }
+//    }
 
-        override fun setValue(thisRef: Any?, property: KProperty<*>, value: MetaItem<*>?) {
-            val name = key ?: property.name.toName()
-            setProperty(name, value)
-        }
-    }
-
-public fun Vision.properties(inherit: Boolean = true): MutableItemProvider = object : MutableItemProvider {
+public fun Vision.props(inherit: Boolean = true): MutableItemProvider = object : MutableItemProvider {
     override fun getItem(name: Name): MetaItem<*>? {
         return getProperty(name, inherit)
     }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index 8a2918a1..492fee47 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -3,6 +3,7 @@ package hep.dataforge.vision
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.descriptors.defaultItem
+import hep.dataforge.meta.descriptors.defaultMeta
 import hep.dataforge.meta.descriptors.get
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
@@ -75,24 +76,22 @@ public open class VisionBase : Vision {
     /**
      * All available properties in a layered form
      */
-    override fun getAllProperties(): Laminate = Laminate(properties, allStyles, parent?.getAllProperties())
+    override val allProperties: Laminate
+        get() = Laminate(
+            properties,
+            allStyles,
+            parent?.allProperties,
+            descriptor?.defaultMeta(),
+        )
 
-    override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? {
-        return if (inherit) {
-            sequence {
-                yield(properties?.get(name))
-                yieldAll(getStyleItems(name))
-                yield(descriptor?.get(name)?.defaultItem())
-                yield(parent?.getProperty(name, inherit))
-            }.merge()
-        } else {
-            sequence {
-                yield(properties?.get(name))
-                yieldAll(getStyleItems(name))
-                yield(descriptor?.get(name)?.defaultItem())
-            }.merge()
+    override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? = sequence {
+        yield(properties?.get(name))
+        yieldAll(getStyleItems(name))
+        if (inherit) {
+            yield(parent?.getProperty(name, inherit))
         }
-    }
+        yield(descriptor?.get(name)?.defaultItem())
+    }.merge()
 
     /**
      * Reset all properties to their default values
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
index 426644ca..14a72d2a 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
@@ -19,17 +19,13 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
     public val serializersModule: SerializersModule
         get() = SerializersModule {
             include(defaultSerialModule)
-            context.gather<SerializersModule>(VISION_SERIAL_MODULE_TARGET).values.forEach {
+            context.gather<SerializersModule>(VISION_SERIALIZER_MODULE_TARGET).values.forEach {
                 include(it)
             }
         }
 
     public val jsonFormat: Json
-        get() = Json {
-            prettyPrint = true
-            useArrayPolymorphism = false
-            encodeDefaults = false
-            ignoreUnknownKeys = true
+        get() = Json(defaultJson) {
             serializersModule = this@VisionManager.serializersModule
         }
 
@@ -52,14 +48,23 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
         override val tag: PluginTag = PluginTag(name = "vision", group = PluginTag.DATAFORGE_GROUP)
         override val type: KClass<out VisionManager> = VisionManager::class
 
-        public const val VISION_SERIAL_MODULE_TARGET: String = "visionSerialModule"
+        public const val VISION_SERIALIZER_MODULE_TARGET: String = "visionSerializerModule"
 
         override fun invoke(meta: Meta, context: Context): VisionManager = VisionManager(meta)
 
         private val defaultSerialModule: SerializersModule = SerializersModule {
             polymorphic(Vision::class) {
+                subclass(VisionBase.serializer())
                 subclass(VisionGroupBase.serializer())
             }
         }
+
+        public val defaultJson: Json = Json {
+            serializersModule = defaultSerialModule
+            prettyPrint = true
+            useArrayPolymorphism = false
+            encodeDefaults = false
+            ignoreUnknownKeys = true
+        }
     }
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingHtmlOutputScope.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingHtmlOutputScope.kt
new file mode 100644
index 00000000..069d5635
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingHtmlOutputScope.kt
@@ -0,0 +1,18 @@
+package hep.dataforge.vision.html
+
+import hep.dataforge.names.Name
+import hep.dataforge.vision.Vision
+import kotlinx.html.TagConsumer
+
+public class BindingHtmlOutputScope<T, V : Vision>(
+    root: TagConsumer<T>,
+    prefix: String? = null,
+) : HtmlOutputScope<T, V>(root,prefix) {
+
+    private val _bindings = HashMap<Name, V>()
+    public val bindings: Map<Name, V> get() = _bindings
+
+    override fun renderVision(htmlOutput: HtmlOutput<V>, vision: V) {
+        _bindings[htmlOutput.name] = vision
+    }
+}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt
new file mode 100644
index 00000000..28bd6c49
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt
@@ -0,0 +1,52 @@
+package hep.dataforge.vision.html
+
+import hep.dataforge.names.Name
+import hep.dataforge.names.toName
+import hep.dataforge.vision.Vision
+import kotlinx.html.DIV
+import kotlinx.html.TagConsumer
+import kotlinx.html.div
+import kotlinx.html.id
+
+public class HtmlOutput<V : Vision>(
+    public val outputScope: HtmlOutputScope<*, V>,
+    public val name: Name,
+    public val div: DIV,
+)
+
+public abstract class HtmlOutputScope<R, V : Vision>(
+    private val root: TagConsumer<R>,
+    public val prefix: String? = null,
+) : TagConsumer<R> by root {
+
+    public open fun resolveId(name: Name): String = (prefix ?: "output:") + name.toString()
+
+    /**
+     * Create a placeholder but do not attach any [Vision] to it
+     */
+    public inline fun <T> TagConsumer<T>.visionOutput(
+        name: Name,
+        crossinline block: HtmlOutput<V>.() -> Unit = {},
+    ): T = div {
+        this.id = resolveId(name)
+        @Suppress("UNCHECKED_CAST")
+        HtmlOutput(this@HtmlOutputScope, name, this).block()
+    }
+
+
+    public inline fun <T> TagConsumer<T>.visionOutput(
+        name: String,
+        crossinline block: HtmlOutput<V>.() -> Unit = {},
+    ): T = visionOutput(name.toName(), block)
+
+    /**
+     * Create a placeholder and put a [Vision] in it
+     */
+    public abstract fun renderVision(htmlOutput: HtmlOutput<V>, vision: V)
+
+    public fun <T> TagConsumer<T>.vision(name: Name, vision: V): Unit {
+        visionOutput(name) {
+            renderVision(this, vision)
+        }
+    }
+}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
new file mode 100644
index 00000000..d0140d39
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
@@ -0,0 +1,8 @@
+package hep.dataforge.vision.html
+
+import hep.dataforge.vision.Vision
+
+public class HtmlVisionFragment<V : Vision>(public val layout: HtmlOutputScope<out Any, V>.() -> Unit)
+
+public fun buildVisionFragment(visit: HtmlOutputScope<out Any, Vision>.() -> Unit): HtmlVisionFragment<Vision> =
+    HtmlVisionFragment(visit)
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticHtmlOutputScope.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticHtmlOutputScope.kt
new file mode 100644
index 00000000..02aea7d3
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticHtmlOutputScope.kt
@@ -0,0 +1,28 @@
+package hep.dataforge.vision.html
+
+import hep.dataforge.vision.Vision
+import kotlinx.html.FlowContent
+import kotlinx.html.TagConsumer
+import kotlinx.html.stream.createHTML
+
+public typealias HtmlVisionRenderer<V> = FlowContent.(V) -> Unit
+
+public class StaticHtmlOutputScope<R, V : Vision>(
+    root: TagConsumer<R>,
+    prefix: String? = null,
+    private val render: HtmlVisionRenderer<V>,
+) : HtmlOutputScope<R, V>(root, prefix) {
+
+    override fun renderVision(htmlOutput: HtmlOutput<V>, vision: V) {
+        htmlOutput.div.render(vision)
+    }
+}
+
+public fun <T : Any> HtmlVisionFragment<Vision>.renderToObject(
+    root: TagConsumer<T>,
+    prefix: String? = null,
+    renderer: HtmlVisionRenderer<Vision>,
+): T = StaticHtmlOutputScope(root, prefix, renderer).apply(layout).finalize()
+
+public fun HtmlVisionFragment<Vision>.renderToString(renderer: HtmlVisionRenderer<Vision>): String =
+    renderToObject(createHTML(), null, renderer)
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/layout/Page.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/layout/Page.kt
new file mode 100644
index 00000000..cd66a3d6
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/layout/Page.kt
@@ -0,0 +1,16 @@
+package hep.dataforge.vision.layout
+
+import hep.dataforge.meta.Meta
+import hep.dataforge.names.Name
+import hep.dataforge.vision.Vision
+
+public interface Output<in V : Vision> {
+    public fun render(vision: V)
+}
+
+public interface Page<in V : Vision> {
+    public fun output(name: Name, meta: Meta = Meta.EMPTY): Output<V>?
+}
+
+public fun <V : Vision> Page<V>.render(name: Name, vision: V): Unit =
+    output(name)?.render(vision) ?: error("Could not resolve renderer for name $name")
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt
index 21434e80..e0041bf5 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt
@@ -28,7 +28,8 @@ public abstract class EmptyVision : Vision {
 
     override val properties: Config? = null
 
-    override fun getAllProperties(): Laminate = Laminate(Meta.EMPTY)
+    override val allProperties: Laminate
+        get() = Laminate(Meta.EMPTY)
 
     override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? = null
 
diff --git a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
new file mode 100644
index 00000000..4c48fad7
--- /dev/null
+++ b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
@@ -0,0 +1,52 @@
+package hep.dataforge.vision.html
+
+import hep.dataforge.meta.configure
+import hep.dataforge.meta.set
+import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionBase
+import hep.dataforge.vision.VisionGroup
+import kotlinx.html.*
+import kotlin.test.Test
+
+class HtmlTagTest {
+
+    fun HtmlOutput<Vision>.vision(block: Vision.() -> Unit) =
+        outputScope.renderVision(this, VisionBase().apply(block))
+
+    val fragment = buildVisionFragment {
+        div {
+            h1 { +"Head" }
+            visionOutput("ddd") {
+                vision {
+                    configure {
+                        set("myProp", 82)
+                    }
+                }
+            }
+        }
+    }
+
+    val simpleVisionRenderer: HtmlVisionRenderer<Vision> = { vision ->
+        div {
+            h2 { +"Properties" }
+            ul {
+                vision.properties?.items?.forEach {
+                    li {
+                        a { +it.key.toString() }
+                        p { +it.value.toString() }
+                    }
+                }
+            }
+        }
+    }
+
+    val groupRenderer: HtmlVisionRenderer<VisionGroup> = { group ->
+        p { +"This is group" }
+    }
+
+
+    @Test
+    fun testStringRender() {
+        println(fragment.renderToString(simpleVisionRenderer))
+    }
+}
\ No newline at end of file
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/html/DynamicHtmlOutputContext.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/html/DynamicHtmlOutputContext.kt
new file mode 100644
index 00000000..573055a0
--- /dev/null
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/html/DynamicHtmlOutputContext.kt
@@ -0,0 +1,31 @@
+package hep.dataforge.vision.html
+
+import hep.dataforge.vision.Vision
+import kotlinx.browser.document
+import kotlinx.html.TagConsumer
+import org.w3c.dom.Element
+import org.w3c.dom.HTMLElement
+
+public interface HtmlVisionBinding<in V: Vision>{
+    public fun bind(element: Element, vision: V): Unit
+}
+
+public fun <V: Vision> Map<String, V>.bind(binder: HtmlVisionBinding<V>){
+    forEach { (id, vision) ->
+        val element = document.getElementById(id) ?: error("Could not find element with id $id")
+        binder.bind(element, vision)
+    }
+}
+
+public fun HtmlVisionFragment<Vision>.bindToDocument(
+    root: TagConsumer<HTMLElement>,
+    binder: HtmlVisionBinding<Vision>,
+): HTMLElement = BindingHtmlOutputScope<HTMLElement, Vision>(root).apply(layout).let { scope ->
+    scope.finalize().apply {
+        scope.bindings.forEach { (name, vision) ->
+            val id = scope.resolveId(name)
+            val element = document.getElementById(id) ?: error("Could not find element with name $name and id $id")
+            binder.bind(element, vision)
+        }
+    }
+}
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/rendering/HTMLVisionDisplay.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/rendering/HTMLVisionDisplay.kt
deleted file mode 100644
index 58f2b2b1..00000000
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/rendering/HTMLVisionDisplay.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package hep.dataforge.vision.rendering
-
-import hep.dataforge.vision.Renderer
-import hep.dataforge.vision.Vision
-import org.w3c.dom.HTMLElement
-
-/**
- * A display container factory for specific vision
- * @param V type of [Vision] to be rendered
- * @param C the specific type of the container
- */
-public fun interface HTMLVisionDisplay<in V : Vision, C : Renderer<V>> {
-    public fun attachRenderer(element: HTMLElement): C
-}
-
-/**
- * Render a specific element and return container for configuration
- */
-public fun <V : Vision, C : Renderer<V>> HTMLVisionDisplay<V, C>.render(element: HTMLElement, vision: V): C =
-    attachRenderer(element).apply { render(vision)}
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
index 98894710..32e3262a 100644
--- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
@@ -1,219 +1,219 @@
-package hep.dataforge.vision.server
-
-import hep.dataforge.meta.*
-import hep.dataforge.names.Name
-import hep.dataforge.names.toName
-import hep.dataforge.vision.server.VisionServer.Companion.DEFAULT_PAGE
-import io.ktor.application.Application
-import io.ktor.application.featureOrNull
-import io.ktor.application.install
-import io.ktor.features.CORS
-import io.ktor.http.content.resources
-import io.ktor.http.content.static
-import io.ktor.routing.Routing
-import io.ktor.routing.route
-import io.ktor.routing.routing
-import io.ktor.server.engine.ApplicationEngine
-import io.ktor.websocket.WebSockets
-import kotlinx.html.TagConsumer
-import java.awt.Desktop
-import java.net.URI
-import kotlin.text.get
-
-public enum class ServerUpdateMode {
-    NONE,
-    PUSH,
-    PULL
-}
-
-public class VisionServer internal constructor(
-    private val routing: Routing,
-    private val rootRoute: String,
-) : Configurable {
-    override val config: Config = Config()
-    public var updateMode: ServerUpdateMode by config.enum(ServerUpdateMode.NONE, key = UPDATE_MODE_KEY)
-    public var updateInterval: Long by config.long(300, key = UPDATE_INTERVAL_KEY)
-    public var embedData: Boolean by config.boolean(false)
-
-    /**
-     * a list of headers that should be applied to all pages
-     */
-    private val globalHeaders: ArrayList<HtmlFragment> = ArrayList<HtmlFragment>()
-
-    public fun header(block: TagConsumer<*>.() -> Unit) {
-        globalHeaders.add(HtmlFragment(block))
-    }
-
-    public fun page(
-        plotlyFragment: PlotlyFragment,
-        route: String = DEFAULT_PAGE,
-        title: String = "Plotly server page '$route'",
-        headers: List<HtmlFragment> = emptyList(),
-    ) {
-        routing.createRouteFromPath(rootRoute).apply {
-            val plots = HashMap<String, Plot>()
-            route(route) {
-                //Update websocket
-                webSocket("ws/{id}") {
-                    val plotId: String = call.parameters["id"] ?: error("Plot id not defined")
-
-                    application.log.debug("Opened server socket for $plotId")
-
-                    val plot = plots[plotId] ?: error("Plot with id='$plotId' not registered")
-
-                    try {
-                        plot.collectUpdates(plotId, this, updateInterval).collect { update ->
-                            val json = update.toJson()
-                            outgoing.send(Frame.Text(json.toString()))
-                        }
-                    } catch (ex: Exception) {
-                        application.log.debug("Closed server socket for $plotId")
-                    }
-                }
-                //Plots in their json representation
-                get("data/{id}") {
-                    val id: String = call.parameters["id"] ?: error("Plot id not defined")
-
-                    val plot: Plot? = plots[id]
-                    if (plot == null) {
-                        call.respond(HttpStatusCode.NotFound, "Plot with id = $id not found")
-                    } else {
-                        call.respondText(
-                            plot.toJsonString(),
-                            contentType = ContentType.Application.Json,
-                            status = HttpStatusCode.OK
-                        )
-                    }
-                }
-                //filled pages
-                get {
-                    val origin = call.request.origin
-                    val url = URLBuilder().apply {
-                        protocol = URLProtocol.createOrDefault(origin.scheme)
-                        //workaround for https://github.com/ktorio/ktor/issues/1663
-                        host = if (origin.host.startsWith("0:")) "[${origin.host}]" else origin.host
-                        port = origin.port
-                        encodedPath = origin.uri
-                    }.build()
-                    call.respondHtml {
-                        val normalizedRoute = if (rootRoute.endsWith("/")) {
-                            rootRoute
-                        } else {
-                            "$rootRoute/"
-                        }
-
-                        head {
-                            meta {
-                                charset = "utf-8"
-                                (globalHeaders + headers).forEach {
-                                    it.visit(consumer)
-                                }
-                                script {
-                                    type = "text/javascript"
-                                    src = "${normalizedRoute}js/plotly.min.js"
-                                }
-                                script {
-                                    type = "text/javascript"
-                                    src = "${normalizedRoute}js/plotlyConnect.js"
-                                }
-                            }
-                            title(title)
-                        }
-                        body {
-                            val container =
-                                ServerPlotlyRenderer(url, updateMode, updateInterval, embedData) { plotId, plot ->
-                                    plots[plotId] = plot
-                                }
-                            with(plotlyFragment) {
-                                render(container)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    public fun page(
-        route: String = DEFAULT_PAGE,
-        title: String = "Plotly server page '$route'",
-        headers: List<HtmlFragment> = emptyList(),
-        content: FlowContent.(renderer: PlotlyRenderer) -> Unit,
-    ) {
-        page(PlotlyFragment(content), route, title, headers)
-    }
-
-
-    public companion object {
-        public const val DEFAULT_PAGE: String = "/"
-        public val UPDATE_MODE_KEY: Name = "update.mode".toName()
-        public val UPDATE_INTERVAL_KEY: Name = "update.interval".toName()
-    }
-}
-
-
-/**
- * Attach plotly application to given server
- */
-public fun Application.visionModule(route: String = DEFAULT_PAGE): VisionServer {
-    if (featureOrNull(WebSockets) == null) {
-        install(WebSockets)
-    }
-
-    if (featureOrNull(CORS) == null) {
-        install(CORS) {
-            anyHost()
-        }
-    }
-
-
-    val routing = routing {
-        route(route) {
-            static {
-                resources()
-            }
-        }
-    }
-
-    return VisionServer(routing, route)
-}
-
-
-/**
- * Configure server to start sending updates in push mode. Does not affect loaded pages
- */
-public fun VisionServer.pushUpdates(interval: Long = 100): VisionServer = apply {
-    updateMode = ServerUpdateMode.PUSH
-    updateInterval = interval
-}
-
-/**
- * Configure client to request regular updates from server. Pull updates are more expensive than push updates since
- * they contain the full plot data and server can't decide what to send.
- */
-public fun VisionServer.pullUpdates(interval: Long = 1000): VisionServer = apply {
-    updateMode = ServerUpdateMode.PULL
-    updateInterval = interval
-}
-
+//package hep.dataforge.vision.server
+//
+//import hep.dataforge.meta.*
+//import hep.dataforge.names.Name
+//import hep.dataforge.names.toName
+//import hep.dataforge.vision.server.VisionServer.Companion.DEFAULT_PAGE
+//import io.ktor.application.Application
+//import io.ktor.application.featureOrNull
+//import io.ktor.application.install
+//import io.ktor.features.CORS
+//import io.ktor.http.content.resources
+//import io.ktor.http.content.static
+//import io.ktor.routing.Routing
+//import io.ktor.routing.route
+//import io.ktor.routing.routing
+//import io.ktor.server.engine.ApplicationEngine
+//import io.ktor.websocket.WebSockets
+//import kotlinx.html.TagConsumer
+//import java.awt.Desktop
+//import java.net.URI
+//import kotlin.text.get
+//
+//public enum class ServerUpdateMode {
+//    NONE,
+//    PUSH,
+//    PULL
+//}
+//
+//public class VisionServer internal constructor(
+//    private val routing: Routing,
+//    private val rootRoute: String,
+//) : Configurable {
+//    override val config: Config = Config()
+//    public var updateMode: ServerUpdateMode by config.enum(ServerUpdateMode.NONE, key = UPDATE_MODE_KEY)
+//    public var updateInterval: Long by config.long(300, key = UPDATE_INTERVAL_KEY)
+//    public var embedData: Boolean by config.boolean(false)
+//
+//    /**
+//     * a list of headers that should be applied to all pages
+//     */
+//    private val globalHeaders: ArrayList<HtmlFragment> = ArrayList<HtmlFragment>()
+//
+//    public fun header(block: TagConsumer<*>.() -> Unit) {
+//        globalHeaders.add(HtmlFragment(block))
+//    }
+//
+//    public fun page(
+//        plotlyFragment: PlotlyFragment,
+//        route: String = DEFAULT_PAGE,
+//        title: String = "Plotly server page '$route'",
+//        headers: List<HtmlFragment> = emptyList(),
+//    ) {
+//        routing.createRouteFromPath(rootRoute).apply {
+//            val plots = HashMap<String, Plot>()
+//            route(route) {
+//                //Update websocket
+//                webSocket("ws/{id}") {
+//                    val plotId: String = call.parameters["id"] ?: error("Plot id not defined")
+//
+//                    application.log.debug("Opened server socket for $plotId")
+//
+//                    val plot = plots[plotId] ?: error("Plot with id='$plotId' not registered")
+//
+//                    try {
+//                        plot.collectUpdates(plotId, this, updateInterval).collect { update ->
+//                            val json = update.toJson()
+//                            outgoing.send(Frame.Text(json.toString()))
+//                        }
+//                    } catch (ex: Exception) {
+//                        application.log.debug("Closed server socket for $plotId")
+//                    }
+//                }
+//                //Plots in their json representation
+//                get("data/{id}") {
+//                    val id: String = call.parameters["id"] ?: error("Plot id not defined")
+//
+//                    val plot: Plot? = plots[id]
+//                    if (plot == null) {
+//                        call.respond(HttpStatusCode.NotFound, "Plot with id = $id not found")
+//                    } else {
+//                        call.respondText(
+//                            plot.toJsonString(),
+//                            contentType = ContentType.Application.Json,
+//                            status = HttpStatusCode.OK
+//                        )
+//                    }
+//                }
+//                //filled pages
+//                get {
+//                    val origin = call.request.origin
+//                    val url = URLBuilder().apply {
+//                        protocol = URLProtocol.createOrDefault(origin.scheme)
+//                        //workaround for https://github.com/ktorio/ktor/issues/1663
+//                        host = if (origin.host.startsWith("0:")) "[${origin.host}]" else origin.host
+//                        port = origin.port
+//                        encodedPath = origin.uri
+//                    }.build()
+//                    call.respondHtml {
+//                        val normalizedRoute = if (rootRoute.endsWith("/")) {
+//                            rootRoute
+//                        } else {
+//                            "$rootRoute/"
+//                        }
+//
+//                        head {
+//                            meta {
+//                                charset = "utf-8"
+//                                (globalHeaders + headers).forEach {
+//                                    it.visit(consumer)
+//                                }
+//                                script {
+//                                    type = "text/javascript"
+//                                    src = "${normalizedRoute}js/plotly.min.js"
+//                                }
+//                                script {
+//                                    type = "text/javascript"
+//                                    src = "${normalizedRoute}js/plotlyConnect.js"
+//                                }
+//                            }
+//                            title(title)
+//                        }
+//                        body {
+//                            val container =
+//                                ServerPlotlyRenderer(url, updateMode, updateInterval, embedData) { plotId, plot ->
+//                                    plots[plotId] = plot
+//                                }
+//                            with(plotlyFragment) {
+//                                render(container)
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//    }
+//
+//    public fun page(
+//        route: String = DEFAULT_PAGE,
+//        title: String = "Plotly server page '$route'",
+//        headers: List<HtmlFragment> = emptyList(),
+//        content: FlowContent.(renderer: PlotlyRenderer) -> Unit,
+//    ) {
+//        page(PlotlyFragment(content), route, title, headers)
+//    }
+//
+//
+//    public companion object {
+//        public const val DEFAULT_PAGE: String = "/"
+//        public val UPDATE_MODE_KEY: Name = "update.mode".toName()
+//        public val UPDATE_INTERVAL_KEY: Name = "update.interval".toName()
+//    }
+//}
+//
+//
 ///**
-// * Start static server (updates via reload)
+// * Attach plotly application to given server
 // */
-//@OptIn(KtorExperimentalAPI::class)
-//public fun Plotly.serve(
-//    scope: CoroutineScope = GlobalScope,
-//    host: String = "localhost",
-//    port: Int = 7777,
-//    block: PlotlyServer.() -> Unit,
-//): ApplicationEngine = scope.embeddedServer(io.ktor.server.cio.CIO, port, host) {
-//    plotlyModule().apply(block)
-//}.start()
-
-
-public fun ApplicationEngine.show() {
-    val connector = environment.connectors.first()
-    val uri = URI("http", null, connector.host, connector.port, null, null, null)
-    Desktop.getDesktop().browse(uri)
-}
-
-public fun ApplicationEngine.close(): Unit = stop(1000, 5000)
\ No newline at end of file
+//public fun Application.visionModule(route: String = DEFAULT_PAGE): VisionServer {
+//    if (featureOrNull(WebSockets) == null) {
+//        install(WebSockets)
+//    }
+//
+//    if (featureOrNull(CORS) == null) {
+//        install(CORS) {
+//            anyHost()
+//        }
+//    }
+//
+//
+//    val routing = routing {
+//        route(route) {
+//            static {
+//                resources()
+//            }
+//        }
+//    }
+//
+//    return VisionServer(routing, route)
+//}
+//
+//
+///**
+// * Configure server to start sending updates in push mode. Does not affect loaded pages
+// */
+//public fun VisionServer.pushUpdates(interval: Long = 100): VisionServer = apply {
+//    updateMode = ServerUpdateMode.PUSH
+//    updateInterval = interval
+//}
+//
+///**
+// * Configure client to request regular updates from server. Pull updates are more expensive than push updates since
+// * they contain the full plot data and server can't decide what to send.
+// */
+//public fun VisionServer.pullUpdates(interval: Long = 1000): VisionServer = apply {
+//    updateMode = ServerUpdateMode.PULL
+//    updateInterval = interval
+//}
+//
+/////**
+//// * Start static server (updates via reload)
+//// */
+////@OptIn(KtorExperimentalAPI::class)
+////public fun Plotly.serve(
+////    scope: CoroutineScope = GlobalScope,
+////    host: String = "localhost",
+////    port: Int = 7777,
+////    block: PlotlyServer.() -> Unit,
+////): ApplicationEngine = scope.embeddedServer(io.ktor.server.cio.CIO, port, host) {
+////    plotlyModule().apply(block)
+////}.start()
+//
+//
+//public fun ApplicationEngine.show() {
+//    val connector = environment.connectors.first()
+//    val uri = URI("http", null, connector.host, connector.port, null, null, null)
+//    Desktop.getDesktop().browse(uri)
+//}
+//
+//public fun ApplicationEngine.close(): Unit = stop(1000, 5000)
\ No newline at end of file
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/html.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/html.kt
deleted file mode 100644
index d6df7edc..00000000
--- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/html.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-package hep.dataforge.vision.server
-
-import kotlinx.html.*
-import kotlinx.html.stream.createHTML
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.StandardOpenOption
-
-public class HtmlFragment(public val visit: TagConsumer<*>.() -> Unit) {
-    override fun toString(): String {
-        return createHTML().also(visit).finalize()
-    }
-}
-
-public operator fun HtmlFragment.plus(other: HtmlFragment): HtmlFragment = HtmlFragment {
-    this@plus.run { visit() }
-    other.run { visit() }
-}
-
-/**
- * Check if the asset exists in given local location and put it there if it does not
- */
-internal fun checkOrStoreFile(basePath: Path, filePath: Path, resource: String): Path {
-    val fullPath = basePath.resolveSibling(filePath).toAbsolutePath()
-
-    if (Files.exists(fullPath)) {
-        //TODO checksum
-    } else {
-        //TODO add logging
-
-        val bytes = HtmlFragment::class.java.getResourceAsStream(resource).readAllBytes()
-        Files.createDirectories(fullPath.parent)
-        Files.write(fullPath, bytes, StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE)
-    }
-
-    return if (basePath.isAbsolute && fullPath.startsWith(basePath)) {
-        basePath.relativize(fullPath)
-    } else {
-        filePath
-    }
-}
-
-/**
- * A header that automatically copies relevant scripts to given path
- */
-public fun localScriptHeader(
-    basePath: Path,
-    scriptPath: Path,
-    resource: String
-): HtmlFragment = HtmlFragment {
-    val relativePath = checkOrStoreFile(basePath, scriptPath, resource)
-    script {
-        type = "text/javascript"
-        src = relativePath.toString()
-        attributes["onload"] = "console.log('Script successfully loaded from $relativePath')"
-        attributes["onerror"] = "console.log('Failed to load script from $relativePath')"
-    }
-}
-
-public fun localCssHeader(
-    basePath: Path,
-    cssPath: Path,
-    resource: String
-): HtmlFragment = HtmlFragment {
-    val relativePath = checkOrStoreFile(basePath, cssPath, resource)
-    link {
-        rel = "stylesheet"
-        href = relativePath.toString()
-    }
-}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
index 957e4501..766eab08 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
@@ -7,7 +7,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
 import hep.dataforge.vision.VisionContainerBuilder
-import hep.dataforge.vision.properties
+import hep.dataforge.vision.props
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -18,7 +18,7 @@ import kotlinx.serialization.UseSerializers
 public class PolyLine(public var points: List<Point3D>) : BasicSolid(), Solid {
 
     //var lineType by string()
-    public var thickness: Number by properties().number(1.0, key = SolidMaterial.MATERIAL_KEY + THICKNESS_KEY)
+    public var thickness: Number by props().number(1.0, key = SolidMaterial.MATERIAL_KEY + THICKNESS_KEY)
 
     public companion object {
         public val THICKNESS_KEY: Name = "thickness".asName()
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
index 024f5215..f08211a0 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
@@ -7,10 +7,10 @@ import hep.dataforge.names.asName
 import hep.dataforge.names.plus
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.asValue
-import hep.dataforge.vision.Renderer
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.Vision.Companion.VISIBLE_KEY
 import hep.dataforge.vision.enum
+import hep.dataforge.vision.layout.Output
 import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.Solid.Companion.DETAIL_KEY
 import hep.dataforge.vision.solid.Solid.Companion.IGNORE_KEY
@@ -104,7 +104,7 @@ public var Solid.layer: Int
         config[LAYER_KEY] = value.asValue()
     }
 
-public fun Renderer<Solid>.render(action: SolidGroup.() -> Unit): Unit = render(SolidGroup().apply(action))
+public fun Output<Solid>.solidGroup(builder: SolidGroup.() -> Unit): Unit = render(SolidGroup().apply(builder))
 
 // Common properties
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index 319fffca..64b032d4 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -11,7 +11,7 @@ import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionGroup
 import hep.dataforge.vision.VisionGroupBase
 import hep.dataforge.vision.VisionManager
-import hep.dataforge.vision.VisionManager.Companion.VISION_SERIAL_MODULE_TARGET
+import hep.dataforge.vision.VisionManager.Companion.VISION_SERIALIZER_MODULE_TARGET
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.modules.*
 import kotlin.reflect.KClass
@@ -24,7 +24,7 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
     override val tag: PluginTag get() = Companion.tag
 
     override fun content(target: String): Map<Name, Any> = when (target) {
-        VISION_SERIAL_MODULE_TARGET -> mapOf(tag.name.toName() to serializersModuleForSolids)
+        VISION_SERIALIZER_MODULE_TARGET -> mapOf(tag.name.toName() to serializersModuleForSolids)
         else -> super.content(target)
     }
 
@@ -60,11 +60,7 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
             }
         }
 
-        internal val jsonForSolids: Json = Json{
-            prettyPrint = true
-            useArrayPolymorphism = false
-            encodeDefaults = false
-            ignoreUnknownKeys = true
+        internal val jsonForSolids: Json = Json(VisionManager.defaultJson){
             serializersModule = serializersModuleForSolids
         }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
index 34a12916..c26300d1 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
@@ -54,7 +54,6 @@ public class SolidMaterial : Scheme() {
             NodeDescriptor {
                 value(COLOR_KEY) {
                     type(ValueType.STRING, ValueType.NUMBER)
-                    default("#ffffff")
                     widgetType = "color"
                 }
                 value(OPACITY_KEY) {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
index 266366ce..cf652b8b 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
@@ -12,22 +12,14 @@ import kotlin.collections.set
 public abstract class AbstractReference : BasicSolid(), VisionGroup {
     public abstract val prototype: Solid
 
-    override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? {
-        return if (inherit) {
-            sequence {
-                yield(properties?.get(name))
-                yieldAll(getStyleItems(name))
-                yield(prototype.getProperty(name))
-                yield(parent?.getProperty(name, inherit))
-            }.merge()
-        } else {
-            sequence {
-                yield(properties?.get(name))
-                yieldAll(getStyleItems(name))
-                yield(prototype.getProperty(name, false))
-            }.merge()
+    override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? = sequence {
+        yield(properties?.get(name))
+        yieldAll(getStyleItems(name))
+        yield(prototype.getProperty(name))
+        if (inherit) {
+            yield(parent?.getProperty(name, inherit))
         }
-    }
+    }.merge()
 
     override var styles: List<String>
         get() = (properties[Vision.STYLE_KEY]?.stringList ?: emptyList()) + prototype.styles
@@ -35,8 +27,13 @@ public abstract class AbstractReference : BasicSolid(), VisionGroup {
             config[Vision.STYLE_KEY] = value
         }
 
-    override fun getAllProperties(): Laminate =
-        Laminate(properties, allStyles, prototype.getAllProperties(), parent?.getAllProperties())
+    override val allProperties: Laminate
+        get() = Laminate(
+            properties,
+            allStyles,
+            prototype.allProperties,
+            parent?.allProperties,
+        )
 
     override fun attachChildren() {
         //do nothing
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
index 834fcf70..ebdf950a 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
@@ -6,7 +6,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.plus
 import hep.dataforge.names.toName
 import hep.dataforge.vision.Colors
-import hep.dataforge.vision.Renderer
+import hep.dataforge.vision.layout.Output
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.specifications.*
 import hep.dataforge.vision.solid.three.ThreeMaterials.HIGHLIGHT_MATERIAL
@@ -24,12 +24,9 @@ import info.laht.threekt.materials.LineBasicMaterial
 import info.laht.threekt.math.Vector2
 import info.laht.threekt.objects.LineSegments
 import info.laht.threekt.objects.Mesh
-import info.laht.threekt.renderers.WebGLRenderer
 import info.laht.threekt.scenes.Scene
-import kotlinx.browser.window
-import kotlinx.dom.clear
+import org.w3c.dom.Element
 import org.w3c.dom.HTMLCanvasElement
-import org.w3c.dom.HTMLElement
 import org.w3c.dom.Node
 import org.w3c.dom.events.MouseEvent
 import kotlin.math.cos
@@ -41,7 +38,7 @@ import kotlin.math.sin
 public class ThreeCanvas(
     public val three: ThreePlugin,
     public val options: Canvas3DOptions,
-) : Renderer<Solid> {
+) : Output<Solid> {
     private var root: Object3D? = null
 
     private val raycaster = Raycaster()
@@ -62,55 +59,60 @@ public class ThreeCanvas(
 
     private var picked: Object3D? = null
 
+    private val renderer = WebGLRenderer { antialias = true }.apply {
+        setClearColor(Colors.skyblue, 1)
+    }
+
+    public val canvas: HTMLCanvasElement = renderer.domElement as HTMLCanvasElement
+
+    /**
+     * Force camera aspect ration and renderer size recalculation
+     */
+    public fun updateSize() {
+        val width = canvas.clientWidth
+        val height = canvas.clientHeight
+        renderer.setSize(width, height, false)
+        camera.aspect = width.toDouble() / height.toDouble()
+        camera.updateProjectionMatrix()
+    }
+
     /**
      * Attach canvas to given [HTMLElement]
      */
-    public fun attach(element: HTMLElement) {
-        fun WebGLRenderer.resize() {
-            val canvas = domElement as HTMLCanvasElement
-
-            val width = options.computeWidth(canvas.clientWidth)
-            val height = options.computeHeight(canvas.clientHeight)
-
-            canvas.width = width
-            canvas.height = height
-
-            setSize(width, height, false)
-            camera.aspect = width.toDouble() / height
-            camera.updateProjectionMatrix()
-        }
-
-        element.clear()
-
-        //Attach listener to track mouse changes
-        element.addEventListener("mousemove", { event ->
-            (event as? MouseEvent)?.run {
-                val rect = element.getBoundingClientRect()
-                mousePosition.x = ((event.clientX - rect.left) / element.clientWidth) * 2 - 1
-                mousePosition.y = -((event.clientY - rect.top) / element.clientHeight) * 2 + 1
-            }
-        }, false)
-
-        element.addEventListener("mousedown", {
+    init {
+        canvas.addEventListener("pointerdown", {
             val picked = pick()
             options.onSelect?.invoke(picked?.fullName())
         }, false)
 
-        val renderer = WebGLRenderer { antialias = true }.apply {
-            setClearColor(Colors.skyblue, 1)
-        }
+        //Attach listener to track mouse changes
+        canvas.addEventListener("mousemove", { event ->
+            (event as? MouseEvent)?.run {
+                val rect = canvas.getBoundingClientRect()
+                mousePosition.x = ((event.clientX - rect.left) / canvas.clientWidth) * 2 - 1
+                mousePosition.y = -((event.clientY - rect.top) / canvas.clientHeight) * 2 + 1
+            }
+        }, false)
 
-        val canvas = renderer.domElement as HTMLCanvasElement
 
         canvas.style.apply {
             width = "100%"
+            minWidth = "${options.minWith.toInt()}px"
+            maxWidth = "${options.maxWith.toInt()}px"
             height = "100%"
+            minHeight = "${options.minHeight.toInt()}px"
+            maxHeight = "${options.maxHeight.toInt()}px"
             display = "block"
         }
 
-        addControls(renderer.domElement, options.controls)
 
-        fun animate() {
+        canvas.onresize = {
+            updateSize()
+        }
+
+        addControls(canvas, options.controls)
+
+        renderer.setAnimationLoop {
             val picked = pick()
 
             if (picked != null && this.picked != picked) {
@@ -119,21 +121,13 @@ public class ThreeCanvas(
                 this.picked = picked
             }
 
-            window.requestAnimationFrame {
-                animate()
-            }
-
             renderer.render(scene, camera)
         }
+    }
 
-        element.appendChild(renderer.domElement)
-        renderer.resize()
-
-        element.onresize = {
-            renderer.resize()
-        }
-
-        animate()
+    public fun attach(element: Element) {
+        element.appendChild(canvas)
+        updateSize()
     }
 
     /**
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
index 969e725f..8f1dcbfa 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
@@ -41,7 +41,7 @@ public object ThreeMaterials {
         linewidth = meta["thickness"].double ?: 1.0
     }
 
-    fun getLineMaterial(meta: Meta?, cache: Boolean): LineBasicMaterial {
+    public fun getLineMaterial(meta: Meta?, cache: Boolean): LineBasicMaterial {
         if (meta == null) return DEFAULT_LINE
         return if (cache) {
             lineMaterialCache.getOrPut(meta) { buildLineMaterial(meta) }
@@ -73,7 +73,7 @@ public object ThreeMaterials {
         }
     }
 
-    fun getMaterial(vision3D: Vision, cache: Boolean): Material {
+    public fun getMaterial(vision3D: Vision, cache: Boolean): Material {
         val meta = vision3D.getProperty(SolidMaterial.MATERIAL_KEY).node ?: return DEFAULT
         return if (cache) {
             materialCache.getOrPut(meta) { buildMaterial(meta) }
@@ -87,7 +87,7 @@ public object ThreeMaterials {
 /**
  * Infer color based on meta item
  */
-fun MetaItem<*>.getColor(): Color {
+public fun MetaItem<*>.getColor(): Color {
     return when (this) {
         is MetaItem.ValueItem -> if (this.value.type == ValueType.NUMBER) {
             val int = value.number.toInt()
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index 6cbdcc10..628f7804 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -6,17 +6,18 @@ import hep.dataforge.meta.empty
 import hep.dataforge.meta.invoke
 import hep.dataforge.names.*
 import hep.dataforge.vision.Vision
-import hep.dataforge.vision.rendering.HTMLVisionDisplay
+import hep.dataforge.vision.html.HtmlVisionBinding
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.visible
 import info.laht.threekt.core.Object3D
+import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
 import kotlin.collections.set
 import kotlin.reflect.KClass
 import info.laht.threekt.objects.Group as ThreeGroup
 
-public class ThreePlugin : AbstractPlugin(), HTMLVisionDisplay<Solid, ThreeCanvas> {
+public class ThreePlugin : AbstractPlugin(), HtmlVisionBinding<Solid> {
     override val tag: PluginTag get() = Companion.tag
 
     public val solidManager: SolidManager by require(SolidManager)
@@ -115,10 +116,15 @@ public class ThreePlugin : AbstractPlugin(), HTMLVisionDisplay<Solid, ThreeCanva
         }
     }
 
-    override fun attachRenderer(element: HTMLElement): ThreeCanvas {
-        return ThreeCanvas(this, Canvas3DOptions.empty()).apply {
-            attach(element)
-        }
+    public fun createCanvas(
+        element: HTMLElement,
+        options: Canvas3DOptions = Canvas3DOptions.empty(),
+    ): ThreeCanvas = ThreeCanvas(this, options).apply {
+        attach(element)
+    }
+
+    override fun bind(element: Element, vision: Solid) {
+        TODO("Not yet implemented")
     }
 
     public companion object : PluginFactory<ThreePlugin> {
@@ -128,16 +134,11 @@ public class ThreePlugin : AbstractPlugin(), HTMLVisionDisplay<Solid, ThreeCanva
     }
 }
 
-public fun ThreePlugin.attachRenderer(
-    element: HTMLElement,
-    options: Canvas3DOptions = Canvas3DOptions.empty(),
-): ThreeCanvas = ThreeCanvas(this, options).apply { attach(element) }
-
 public fun ThreePlugin.render(
     element: HTMLElement,
     obj: Solid,
     options: Canvas3DOptions.() -> Unit = {},
-): ThreeCanvas = attachRenderer(element, Canvas3DOptions(options)).apply { render(obj) }
+): ThreeCanvas = createCanvas(element, Canvas3DOptions(options)).apply { render(obj) }
 
 internal operator fun Object3D.set(token: NameToken, object3D: Object3D) {
     object3D.name = token.toString()
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt
index c46e941e..80edbbca 100644
--- a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt
+++ b/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt
@@ -64,7 +64,7 @@ external class WebGLRenderer(params: WebGLRendererParams = definedExternally) {
     fun clear(
         color: Boolean = definedExternally,
         depth: Boolean = definedExternally,
-        stencil: Boolean = definedExternally
+        stencil: Boolean = definedExternally,
     )
 
     fun clearColor()
@@ -84,6 +84,11 @@ external class WebGLRenderer(params: WebGLRendererParams = definedExternally) {
      */
     fun setClearColor(color: Int, alpha: Number)
 
+    /**
+     * @param callback The function will be called every available frame. If `null` is passed it will stop any already ongoing animation.
+     */
+    fun setAnimationLoop(callback: () -> Unit)
+
     /**
      * Render a scene using a camera.
      * The render is done to the renderTarget (if specified) or to the canvas as usual.
@@ -94,7 +99,7 @@ external class WebGLRenderer(params: WebGLRendererParams = definedExternally) {
         scene: Scene,
         camera: Camera,
         renderTarget: dynamic = definedExternally,
-        forceClear: Boolean = definedExternally
+        forceClear: Boolean = definedExternally,
     )
 
     fun setPixelRatio(value: Number)
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCanvas3D.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCanvas3D.kt
index e8989840..4abc02b7 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCanvas3D.kt
+++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCanvas3D.kt
@@ -3,7 +3,7 @@ package hep.dataforge.vision.solid.fx
 import hep.dataforge.context.Context
 import hep.dataforge.context.ContextAware
 import hep.dataforge.meta.empty
-import hep.dataforge.vision.Renderer
+import hep.dataforge.vision.layout.Output
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import javafx.application.Platform
@@ -15,7 +15,7 @@ import org.fxyz3d.scene.Axes
 import tornadofx.*
 
 class FXCanvas3D(val plugin: FX3DPlugin, val spec: Canvas3DOptions = Canvas3DOptions.empty()) :
-    Fragment(), Renderer<Solid>, ContextAware {
+    Fragment(), Output<Solid>, ContextAware {
 
     override val context: Context get() = plugin.context
 

From e01a688664ed2eb298284d07a77f889a37464654 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 19 Nov 2020 15:22:42 +0300
Subject: [PATCH 028/151] Fix JS config editor for properties without defaults

---
 .../hep/dataforge/vision/solid/demo/demo.kt   |   2 +-
 .../vision/solid/demo/ThreeDemoGrid.kt        |   2 +-
 .../dataforge/vision/react/ConfigEditor.kt    | 196 +++++++++---------
 .../vision/react/ThreeCanvasComponent.kt      |   2 +
 .../vision/solid/three/ThreePlugin.kt         |   4 +-
 5 files changed, 109 insertions(+), 97 deletions(-)

diff --git a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
index 1e962957..f1618b8b 100644
--- a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
+++ b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
@@ -24,7 +24,7 @@ fun Page<Solid>.demo(name: String, title: String = name, block: SolidGroup.() ->
 }
 
 val canvasOptions = Canvas3DOptions {
-    minSize = 500
+    minSize = 600
     axes {
         size = 500.0
         visible = true
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
index a12355a4..a8d31a2d 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
@@ -66,7 +66,7 @@ class ThreeDemoGrid(element: Element, idPrefix: String = "") : Page<Solid> {
                 id = name.toString()
                 role = "tabpanel"
                 attributes["aria-labelledby"] = "tab[$name]"
-                div("container w-100 h-100") { id = "output-$name" }.also {element->
+                div("w-100 h-100") { id = "output-$name" }.also {element->
                     output = three.createCanvas(element, canvasOptions)
                 }
                 hr()
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
index 56bb24a6..a4ecce5e 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
@@ -37,9 +37,10 @@ public external interface ConfigEditorItemProps : RProps {
     public var descriptor: NodeDescriptor?
 }
 
-private val ConfigEditorItem: FunctionalComponent<ConfigEditorItemProps> = functionalComponent("ConfigEditorItem") { props ->
-    configEditorItem(props)
-}
+private val ConfigEditorItem: FunctionalComponent<ConfigEditorItemProps> =
+    functionalComponent("ConfigEditorItem") { props ->
+        configEditorItem(props)
+    }
 
 private fun RBuilder.configEditorItem(props: ConfigEditorItemProps) {
     var expanded: Boolean by useState { true }
@@ -82,26 +83,77 @@ private fun RBuilder.configEditorItem(props: ConfigEditorItemProps) {
         update()
     }
 
-    when (actualItem) {
-        is MetaItem.NodeItem -> {
+
+
+    if (actualItem is MetaItem.NodeItem) {
+        styledDiv {
+            css {
+                +TreeStyles.treeLeaf
+            }
+            styledSpan {
+                css {
+                    +TreeStyles.treeCaret
+                    if (expanded) {
+                        +TreeStyles.treeCaredDown
+                    }
+                }
+                attrs {
+                    onClickFunction = expanderClick
+                }
+            }
+            styledSpan {
+                css {
+                    +TreeStyles.treeLabel
+                    if (item == null) {
+                        +TreeStyles.treeLabelInactive
+                    }
+                }
+                +token
+            }
+        }
+        if (expanded) {
+            styledUl {
+                css {
+                    +TreeStyles.tree
+                }
+                val keys = buildSet {
+                    (descriptorItem as? NodeDescriptor)?.items?.keys?.forEach {
+                        add(NameToken(it))
+                    }
+                    item?.node?.items?.keys?.let { addAll(it) }
+                    defaultItem?.node?.items?.keys?.let { addAll(it) }
+                }
+
+                keys.filter { !it.body.startsWith("@") }.forEach { token ->
+                    styledLi {
+                        css {
+                            +TreeStyles.treeItem
+                        }
+                        child(ConfigEditorItem) {
+                            attrs {
+                                this.key = props.name.toString()
+                                this.root = props.root
+                                this.name = props.name + token
+                                this.default = props.default
+                                this.descriptor = props.descriptor
+                            }
+                        }
+                        //configEditor(props.root, props.name + token, props.descriptor, props.default)
+                    }
+                }
+            }
+        }
+    } else {
+        styledDiv {
+            css {
+                +TreeStyles.treeLeaf
+            }
             styledDiv {
                 css {
-                    +TreeStyles.treeLeaf
+                    +TreeStyles.treeLabel
                 }
                 styledSpan {
                     css {
-                        +TreeStyles.treeCaret
-                        if (expanded) {
-                            +TreeStyles.treeCaredDown
-                        }
-                    }
-                    attrs {
-                        onClickFunction = expanderClick
-                    }
-                }
-                styledSpan {
-                    css {
-                        +TreeStyles.treeLabel
                         if (item == null) {
                             +TreeStyles.treeLabelInactive
                         }
@@ -109,83 +161,31 @@ private fun RBuilder.configEditorItem(props: ConfigEditorItemProps) {
                     +token
                 }
             }
-            if (expanded) {
-                styledUl {
-                    css {
-                        +TreeStyles.tree
-                    }
-                    val keys = buildSet {
-                        (descriptorItem as? NodeDescriptor)?.items?.keys?.forEach {
-                            add(NameToken(it))
-                        }
-                        item?.node?.items?.keys?.let { addAll(it) }
-                        defaultItem?.node?.items?.keys?.let { addAll(it) }
-                    }
-
-                    keys.filter { !it.body.startsWith("@") }.forEach { token ->
-                        styledLi {
-                            css {
-                                +TreeStyles.treeItem
-                            }
-                            child(ConfigEditorItem) {
-                                attrs {
-                                    this.key = props.name.toString()
-                                    this.root = props.root
-                                    this.name = props.name + token
-                                    this.default = props.default
-                                    this.descriptor = props.descriptor
-                                }
-                            }
-                            //configEditor(props.root, props.name + token, props.descriptor, props.default)
-                        }
-                    }
-                }
-            }
-        }
-        is MetaItem.ValueItem -> {
             styledDiv {
                 css {
-                    +TreeStyles.treeLeaf
+                    +TreeStyles.resizeableInput
                 }
-                styledDiv {
-                    css {
-                        +TreeStyles.treeLabel
-                    }
-                    styledSpan {
-                        css {
-                            if (item == null) {
-                                +TreeStyles.treeLabelInactive
-                            }
-                        }
-                        +token
-                    }
-                }
-                styledDiv {
-                    css {
-                        +TreeStyles.resizeableInput
-                    }
-                    valueChooser(
-                        props.name,
-                        actualItem,
-                        descriptorItem as? ValueDescriptor,
-                        valueChanged
-                    )
-                }
-                styledButton {
-                    css {
-                        +TreeStyles.removeButton
-                    }
-                    +"\u00D7"
-                    attrs {
-                        if (item == null) {
-                            disabled = true
-                        } else {
-                            onClickFunction = removeClick
-                        }
-                    }
-                }
-
+                valueChooser(
+                    props.name,
+                    actualItem,
+                    descriptorItem as? ValueDescriptor,
+                    valueChanged
+                )
             }
+            styledButton {
+                css {
+                    +TreeStyles.removeButton
+                }
+                +"\u00D7"
+                attrs {
+                    if (item == null) {
+                        disabled = true
+                    } else {
+                        onClickFunction = removeClick
+                    }
+                }
+            }
+
         }
     }
 }
@@ -210,7 +210,12 @@ public val ConfigEditor: FunctionalComponent<ConfigEditorProps> = functionalComp
     }
 }
 
-public fun Element.configEditor(config: Config, descriptor: NodeDescriptor? = null, default: Meta? = null, key: Any? = null) {
+public fun Element.configEditor(
+    config: Config,
+    descriptor: NodeDescriptor? = null,
+    default: Meta? = null,
+    key: Any? = null,
+) {
     render(this) {
         child(ConfigEditor) {
             attrs {
@@ -223,7 +228,12 @@ public fun Element.configEditor(config: Config, descriptor: NodeDescriptor? = nu
     }
 }
 
-public fun RBuilder.configEditor(config: Config, descriptor: NodeDescriptor? = null, default: Meta? = null, key: Any? = null) {
+public fun RBuilder.configEditor(
+    config: Config,
+    descriptor: NodeDescriptor? = null,
+    default: Meta? = null,
+    key: Any? = null,
+) {
     child(ConfigEditor) {
         attrs {
             this.key = key?.toString() ?: ""
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
index bd0c8797..b9f81c4b 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
@@ -61,6 +61,8 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
             minWidth = 500.px
             minHeight = 500.px
             display = Display.inherit
+            width = 100.pct
+            height = 100.pct
             flex(1.0, 1.0, FlexBasis.auto)
         }
         ref = elementRef
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index 628f7804..cbe62240 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -117,14 +117,14 @@ public class ThreePlugin : AbstractPlugin(), HtmlVisionBinding<Solid> {
     }
 
     public fun createCanvas(
-        element: HTMLElement,
+        element: Element,
         options: Canvas3DOptions = Canvas3DOptions.empty(),
     ): ThreeCanvas = ThreeCanvas(this, options).apply {
         attach(element)
     }
 
     override fun bind(element: Element, vision: Solid) {
-        TODO("Not yet implemented")
+        createCanvas(element).render(vision)
     }
 
     public companion object : PluginFactory<ThreePlugin> {

From d2553d5b40aaf5404a5a4eec608bfd754fa425d9 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 19 Nov 2020 20:49:42 +0300
Subject: [PATCH 029/151] Fix muon monitor design

---
 .../mipt/npm/muon/monitor/MMAppComponent.kt   | 101 +++++++++++-------
 .../ru/mipt/npm/muon/monitor/MMDemoApp.kt     |  13 +--
 .../src/jsMain/resources/index.html           |   2 +-
 .../vision/react/ThreeCanvasComponent.kt      |   2 -
 4 files changed, 66 insertions(+), 52 deletions(-)

diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
index 52c23c69..a36379bf 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
@@ -19,8 +19,7 @@ import io.ktor.client.HttpClient
 import io.ktor.client.request.get
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import kotlinx.css.height
-import kotlinx.css.pct
+import kotlinx.css.*
 import kotlinx.html.js.onClickFunction
 import react.RProps
 import react.child
@@ -57,30 +56,36 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
 
     val root = props.model.root
 
-    div("row") {
-        h1("mx-auto") {
-            +"Muon monitor demo"
-        }
-    }
     div("row") {
         styledDiv {
             css {
                 +"col-lg-3"
-                +"px-0"
-                +"overflow-auto"
-                +"h-100"
+                padding(0.px)
+                overflowY = Overflow.auto
+                display = Display.flex
+                flexDirection = FlexDirection.column
+                height = 100.vh
             }
             //tree
             card("Object tree") {
+                css {
+                    flex(1.0, 1.0, FlexBasis.auto)
+                }
                 objectTree(root, selected, onSelect)
             }
         }
         styledDiv {
             css {
                 +"col-lg-6"
-                height = 100.pct
+                display = Display.flex
+                flexDirection = FlexDirection.column
+                height = 100.vh
+            }
+            h1("mx-auto") {
+                +"Muon monitor demo"
             }
             //canvas
+
             child(ThreeCanvasComponent) {
                 attrs {
                     this.context = props.context
@@ -95,8 +100,18 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                 }
             }
         }
-        div("col-lg-3") {
-            div("row") {
+        styledDiv {
+            css {
+                +"col-lg-3"
+                padding(0.px)
+                display = Display.flex
+                flexDirection = FlexDirection.column
+                height = 100.vh
+            }
+            styledDiv {
+                css{
+                    flex(0.0,1.0, FlexBasis.zero)
+                }
                 //settings
                 canvas?.let {
                     card("Canvas configuration") {
@@ -125,36 +140,37 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                     }
                 }
             }
-            div("row") {
-                div("container-fluid p-0") {
-                    nav {
-                        attrs {
-                            attributes["aria-label"] = "breadcrumb"
-                        }
-                        ol("breadcrumb") {
-                            li("breadcrumb-item") {
-                                button(classes = "btn btn-link p-0") {
-                                    +"World"
-                                    attrs {
-                                        onClickFunction = {
-                                            selected = hep.dataforge.names.Name.EMPTY
-                                        }
+            styledDiv{
+                css{
+                    padding(0.px)
+                }
+                nav {
+                    attrs {
+                        attributes["aria-label"] = "breadcrumb"
+                    }
+                    ol("breadcrumb") {
+                        li("breadcrumb-item") {
+                            button(classes = "btn btn-link p-0") {
+                                +"World"
+                                attrs {
+                                    onClickFunction = {
+                                        selected = hep.dataforge.names.Name.EMPTY
                                     }
                                 }
                             }
-                            if (selected != null) {
-                                val tokens = ArrayList<NameToken>(selected?.length ?: 1)
-                                selected?.tokens?.forEach { token ->
-                                    tokens.add(token)
-                                    val fullName = Name(tokens.toList())
-                                    li("breadcrumb-item") {
-                                        button(classes = "btn btn-link p-0") {
-                                            +token.toString()
-                                            attrs {
-                                                onClickFunction = {
-                                                    console.log("Selected = $fullName")
-                                                    selected = fullName
-                                                }
+                        }
+                        if (selected != null) {
+                            val tokens = ArrayList<NameToken>(selected?.length ?: 1)
+                            selected?.tokens?.forEach { token ->
+                                tokens.add(token)
+                                val fullName = Name(tokens.toList())
+                                li("breadcrumb-item") {
+                                    button(classes = "btn btn-link p-0") {
+                                        +token.toString()
+                                        attrs {
+                                            onClickFunction = {
+                                                console.log("Selected = $fullName")
+                                                selected = fullName
                                             }
                                         }
                                     }
@@ -164,7 +180,10 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                     }
                 }
             }
-            div("row") {
+           styledDiv{
+               css{
+                   overflowY = Overflow.auto
+               }
                 //properties
                 card("Properties") {
                     selected.let { selected ->
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
index 2fabd0d8..1d3ea8cd 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
@@ -8,7 +8,6 @@ import io.ktor.client.features.json.JsonFeature
 import io.ktor.client.features.json.serializer.KotlinxSerializer
 import kotlinx.browser.document
 import react.child
-import react.dom.div
 import react.dom.render
 
 private class MMDemoApp : Application {
@@ -27,13 +26,11 @@ private class MMDemoApp : Application {
         val element = document.getElementById("app") ?: error("Element with id 'app' not found on page")
 
         render(element) {
-            div("container-fluid h-100") {
-                child(MMApp) {
-                    attrs {
-                        this.model = this@MMDemoApp.model
-                        this.connection = this@MMDemoApp.connection
-                        this.context = context
-                    }
+            child(MMApp) {
+                attrs {
+                    this.model = this@MMDemoApp.model
+                    this.connection = this@MMDemoApp.connection
+                    this.context = context
                 }
             }
         }
diff --git a/demo/muon-monitor/src/jsMain/resources/index.html b/demo/muon-monitor/src/jsMain/resources/index.html
index 9044e628..f7d59058 100644
--- a/demo/muon-monitor/src/jsMain/resources/index.html
+++ b/demo/muon-monitor/src/jsMain/resources/index.html
@@ -11,6 +11,6 @@
     <script type="text/javascript" src ="js/bootstrap.bundle.min.js"></script>
 </head>
 <body class="application">
-<div class="container-fluid" id = "app"> </div>
+<div class="container-fluid min-vh-100" id = "app"> </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
index b9f81c4b..7b30b2c9 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
@@ -58,8 +58,6 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
 
     styledDiv {
         css {
-            minWidth = 500.px
-            minHeight = 500.px
             display = Display.inherit
             width = 100.pct
             height = 100.pct

From dc805228b4e38b56984d07f76bb3dc713a88eb6b Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 19 Nov 2020 21:55:54 +0300
Subject: [PATCH 030/151] GDML UI cleanup

---
 .../vision/gdml/demo/GDMLAppComponent.kt      | 104 ++++++++----------
 .../vision/solid/demo/ThreeDemoGrid.kt        |   4 +-
 .../vision/bootstrap/tabComponent.kt          |   5 +-
 .../vision/bootstrap/threeControls.kt         |   1 -
 4 files changed, 48 insertions(+), 66 deletions(-)

diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index 3df7d3ca..fd9beb97 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -4,7 +4,6 @@ import hep.dataforge.context.Context
 import hep.dataforge.meta.invoke
 import hep.dataforge.names.Name
 import hep.dataforge.vision.Vision
-import hep.dataforge.vision.bootstrap.card
 import hep.dataforge.vision.bootstrap.nameCrumbs
 import hep.dataforge.vision.bootstrap.threeControls
 import hep.dataforge.vision.gdml.toVision
@@ -71,77 +70,62 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
         vision = parsedVision
     }
 
-    flexColumn {
+    flexRow {
         css {
-            height = 100.pct
-            width = 100.pct
+            height = 100.vh - 35.px
+            width = 100.vw - 35.px
+            //flexWrap = FlexWrap.wrap
         }
-        styledDiv {
+        flexColumn {
             css {
-                +"page-header"
-                +"justify-content-center"
+                flex(10.0, 10.0, FlexBasis.zero)
             }
-            h1 { +"GDML/JSON loader demo" }
+            styledDiv {
+                css {
+                    +"page-header"
+                    +"justify-content-center"
+                }
+                h1 { +"GDML/JSON loader demo" }
+            }
+            nameCrumbs(selected, "World", onSelect)
+            //canvas
+            child(ThreeCanvasComponent) {
+                attrs {
+                    this.context = props.context
+                    this.obj = vision as? Solid
+                    this.selected = selected
+                    this.options = Canvas3DOptions.invoke {
+                        this.onSelect = onSelect
+                    }
+                    this.canvasCallback = {
+                        canvas = it
+                    }
+                }
+            }
+
         }
-        flexRow {
+        flexColumn {
             css {
-                flex(1.0, 1.0, FlexBasis.auto)
-                flexWrap = FlexWrap.wrap
+                minWidth = 500.px
+                height = 100.pct
+                margin(left = 4.px, right = 4.px, top = 4.px)
+                border(1.px, BorderStyle.solid, Color.lightGray)
             }
+            fileDrop("(drag file here)") { files ->
+                val file = files?.get(0)
+                if (file != null) {
 
-            flexColumn {
-                css {
-                    flex(1.0, 1.0, FlexBasis.auto)
-                    margin(10.px)
-                }
-                nameCrumbs(selected, "World", onSelect)
-
-                //canvas
-                styledDiv {
-                    css {
-                        flex(1.0, 1.0, FlexBasis.auto)
-                    }
-                    child(ThreeCanvasComponent) {
-                        attrs {
-                            this.context = props.context
-                            this.obj = vision as? Solid
-                            this.selected = selected
-                            this.options = Canvas3DOptions.invoke{
-                                this.onSelect = onSelect
-                            }
-                            this.canvasCallback = {
-                                canvas = it
-                            }
+                    FileReader().apply {
+                        onload = {
+                            val string = result as String
+                            loadData(file.name, string)
                         }
+                        readAsText(file)
                     }
                 }
             }
-            flexColumn {
-                css {
-                    minWidth = 500.px
-                    maxHeight = 100.pct
-                    flex(1.0, 1.0, FlexBasis.zero)
-                    margin(left = 4.px, right = 4.px)
-                    border(1.px, BorderStyle.solid, Color.lightGray)
-                }
-                card("Load data") {
-                    fileDrop("(drag file here)") { files ->
-                        val file = files?.get(0)
-                        if (file != null) {
-
-                            FileReader().apply {
-                                onload = {
-                                    val string = result as String
-                                    loadData(file.name, string)
-                                }
-                                readAsText(file)
-                            }
-                        }
-                    }
-                }
-                canvas?.let {
-                    threeControls(it, selected, onSelect)
-                }
+            canvas?.let {
+                threeControls(it, selected, onSelect)
             }
         }
     }
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
index a8d31a2d..10dde984 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
@@ -62,11 +62,11 @@ class ThreeDemoGrid(element: Element, idPrefix: String = "") : Page<Solid> {
             }
         }
         contentElement.append {
-            div("tab-pane fade col h-100") {
+            div("tab-pane fade col") {
                 id = name.toString()
                 role = "tabpanel"
                 attributes["aria-labelledby"] = "tab[$name]"
-                div("w-100 h-100") { id = "output-$name" }.also {element->
+                div { id = "output-$name" }.also { element ->
                     output = three.createCanvas(element, canvasOptions)
                 }
                 hr()
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt
index 5580b923..1b37644d 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt
@@ -1,9 +1,7 @@
 package hep.dataforge.vision.bootstrap
 
 import hep.dataforge.vision.react.flexColumn
-import kotlinx.css.Overflow
-import kotlinx.css.flexGrow
-import kotlinx.css.overflowY
+import kotlinx.css.*
 import kotlinx.html.DIV
 import kotlinx.html.classes
 import kotlinx.html.js.onClickFunction
@@ -77,6 +75,7 @@ public class TabBuilder(internal val parentBuilder: RBuilder) {
             }
             styledDiv {
                 css {
+                    height = 100.pct
                     overflowY = Overflow.auto
                 }
                 builder()
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
index 839c35d3..a7d67d63 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
@@ -36,7 +36,6 @@ public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalCo
             h2 { +"Object tree" }
             styledDiv {
                 css {
-                    overflowY = Overflow.auto
                     flex(1.0, 0.0, FlexBasis.auto)
                 }
                 props.canvas.content?.let {

From d1607459a120667f00f575949d7c92704072d475 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 21 Nov 2020 10:04:15 +0300
Subject: [PATCH 031/151] Move Vector3D to common instead of expect/actual

---
 .../vision/gdml/demo/GDMLAppComponent.kt      |   5 +-
 .../kotlin/ru/mipt/npm/muon/monitor/Event.kt  |   3 -
 .../vision/solid/demo/VariableBox.kt          |   3 -
 .../vision/bootstrap/tabComponent.kt          |   9 --
 .../vision/bootstrap/threeControls.kt         |   2 +-
 .../vision/editor/ColorValueChooser.kt        |   2 +-
 .../vision/editor/ComboBoxValueChooser.kt     |   2 +-
 .../dataforge/vision/gdml/GDMLTransformer.kt  |   6 +-
 .../hep/dataforge/vision/solid/BasicSolid.kt  |   3 -
 .../kotlin/hep/dataforge/vision/solid/Box.kt  |   3 -
 .../hep/dataforge/vision/solid/Composite.kt   |   2 -
 .../hep/dataforge/vision/solid/ConeSegment.kt |   3 -
 .../hep/dataforge/vision/solid/Convex.kt      |   3 -
 .../hep/dataforge/vision/solid/Extruded.kt    |   2 -
 .../hep/dataforge/vision/solid/PolyLine.kt    |   3 -
 .../hep/dataforge/vision/solid/SolidGroup.kt  |  32 +++++-
 .../dataforge/vision/solid/SolidManager.kt    |   8 +-
 .../hep/dataforge/vision/solid/geometry.kt    |  46 ++++----
 .../dataforge/vision/solid/serialization.kt   | 100 ------------------
 .../solid/transform/RemoveSingleChild.kt      |   4 +-
 .../hep/dataforge/vision/solid/geometryJs.kt  |  14 ---
 .../solid/three/ThreeGeometryBuilder.kt       |   8 +-
 .../vision/solid/three/ThreeLineFactory.kt    |   4 +-
 .../hep/dataforge/vision/solid/three/three.kt |   4 +-
 .../dataforge/vision/solid/fx/FX3DPlugin.kt   |   3 +-
 .../hep/dataforge/vision/solid/geometryJVM.kt |  50 ---------
 26 files changed, 78 insertions(+), 246 deletions(-)
 delete mode 100644 visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt
 delete mode 100644 visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/geometryJs.kt
 delete mode 100644 visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/geometryJVM.kt

diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index fd9beb97..09ae9a66 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -78,7 +78,7 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
         }
         flexColumn {
             css {
-                flex(10.0, 10.0, FlexBasis.zero)
+                flex(1.0, 1.0, FlexBasis.auto)
             }
             styledDiv {
                 css {
@@ -106,10 +106,11 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
         }
         flexColumn {
             css {
-                minWidth = 500.px
+                minWidth = 400.px
                 height = 100.pct
                 margin(left = 4.px, right = 4.px, top = 4.px)
                 border(1.px, BorderStyle.solid, Color.lightGray)
+                flex(0.0,1.0, FlexBasis.zero)
             }
             fileDrop("(drag file here)") { files ->
                 val file = files?.get(0)
diff --git a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Event.kt b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Event.kt
index b0f8ca04..3d64e67a 100644
--- a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Event.kt
+++ b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Event.kt
@@ -1,10 +1,7 @@
-@file:UseSerializers(Point3DSerializer::class)
 package ru.mipt.npm.muon.monitor
 
 import hep.dataforge.vision.solid.Point3D
-import hep.dataforge.vision.solid.Point3DSerializer
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
 
 typealias Track = List<Point3D>
 
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
index 8df28ddc..983b92b7 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
@@ -1,5 +1,3 @@
-@file:UseSerializers(Point3DSerializer::class)
-
 package hep.dataforge.vision.solid.demo
 
 import hep.dataforge.meta.int
@@ -20,7 +18,6 @@ import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.geometries.BoxBufferGeometry
 import info.laht.threekt.objects.Mesh
-import kotlinx.serialization.UseSerializers
 import kotlin.math.max
 
 internal fun SolidGroup.varBox(
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt
index 1b37644d..5f22a353 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt
@@ -1,7 +1,6 @@
 package hep.dataforge.vision.bootstrap
 
 import hep.dataforge.vision.react.flexColumn
-import kotlinx.css.*
 import kotlinx.html.DIV
 import kotlinx.html.classes
 import kotlinx.html.js.onClickFunction
@@ -10,7 +9,6 @@ import react.dom.button
 import react.dom.li
 import react.dom.ul
 import styled.StyledDOMBuilder
-import styled.css
 import styled.styledDiv
 
 public external class TabProps : RProps {
@@ -40,9 +38,6 @@ public val TabPane: FunctionalComponent<TabPaneProps> = functionalComponent("Tab
     }
 
     flexColumn {
-        css {
-            flexGrow = 1.0
-        }
         ul("nav nav-tabs") {
             childrenProps.forEach { cp ->
                 li("nav-item") {
@@ -74,10 +69,6 @@ public class TabBuilder(internal val parentBuilder: RBuilder) {
                 this.title = title
             }
             styledDiv {
-                css {
-                    height = 100.pct
-                    overflowY = Overflow.auto
-                }
                 builder()
             }
         }
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
index a7d67d63..68d90705 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
@@ -36,7 +36,7 @@ public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalCo
             h2 { +"Object tree" }
             styledDiv {
                 css {
-                    flex(1.0, 0.0, FlexBasis.auto)
+                    flex(1.0, 1.0, FlexBasis.inherit)
                 }
                 props.canvas.content?.let {
                     objectTree(it, props.selected, props.onSelect)
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
index fe2101ec..117210c1 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
@@ -14,7 +14,7 @@ import tornadofx.*
 /**
  * Created by darksnake on 01-May-17.
  */
-class ColorValueChooser : ValueChooserBase<ColorPicker>() {
+public class ColorValueChooser : ValueChooserBase<ColorPicker>() {
     private fun ColorPicker.setColor(value: Value?) {
         if (value != null && value != Null) {
             try {
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
index 72798444..051469c7 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
@@ -17,7 +17,7 @@ import javafx.scene.control.ComboBox
 import javafx.util.StringConverter
 import java.util.*
 
-class ComboBoxValueChooser(val values: Collection<Value>? = null) : ValueChooserBase<ComboBox<Value>>() {
+public class ComboBoxValueChooser(public val values: Collection<Value>? = null) : ValueChooserBase<ComboBox<Value>>() {
 
     //    @Override
     //    protected void displayError(String error) {
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
index 75c93cc4..a0607435 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
@@ -114,20 +114,20 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
     ): T = apply {
         newPos?.let {
             val point = Point3D(it.x(settings.lUnit), it.y(settings.lUnit), it.z(settings.lUnit))
-            if (position != null || point != World.ZERO) {
+            if (position != null || point != Point3D.ZERO) {
                 position = point
             }
         }
         newRotation?.let {
             val point = Point3D(it.x(settings.aUnit), it.y(settings.aUnit), it.z(settings.aUnit))
-            if (rotation != null || point != World.ZERO) {
+            if (rotation != null || point != Point3D.ZERO) {
                 rotation = point
             }
             //this@withPosition.rotationOrder = RotationOrder.ZXY
         }
         newScale?.let {
             val point = Point3D(it.x, it.y, it.z)
-            if (scale != null || point != World.ONE) {
+            if (scale != null || point != Point3D.ONE) {
                 scale = point
             }
         }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/BasicSolid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/BasicSolid.kt
index 40f2543e..93fef60f 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/BasicSolid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/BasicSolid.kt
@@ -15,13 +15,10 @@ import kotlinx.serialization.Serializable
 public open class BasicSolid : VisionBase(), Solid {
     override val descriptor: NodeDescriptor get() = Solid.descriptor
 
-    @Serializable(Point3DSerializer::class)
     override var position: Point3D? = null
 
-    @Serializable(Point3DSerializer::class)
     override var rotation: Point3D? = null
 
-    @Serializable(Point3DSerializer::class)
     override var scale: Point3D? = null
 
     override fun update(change: Vision) {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
index 31eca267..5bbbcc7d 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
@@ -1,5 +1,3 @@
-@file:UseSerializers(Point3DSerializer::class)
-
 package hep.dataforge.vision.solid
 
 import hep.dataforge.vision.VisionContainerBuilder
@@ -7,7 +5,6 @@ import hep.dataforge.vision.set
 import hep.dataforge.vision.solid.Solid.Companion.solidEquals
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
 
 @Serializable
 @SerialName("solid.box")
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
index a293dc09..ec036419 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
@@ -1,4 +1,3 @@
-@file:UseSerializers(Point3DSerializer::class)
 
 package hep.dataforge.vision.solid
 
@@ -7,7 +6,6 @@ import hep.dataforge.names.NameToken
 import hep.dataforge.vision.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
 
 public enum class CompositeType {
     UNION,
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
index 31ca2786..15116d93 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
@@ -1,12 +1,9 @@
-@file:UseSerializers(Point3DSerializer::class)
-
 package hep.dataforge.vision.solid
 
 import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
 import kotlin.math.cos
 import kotlin.math.sin
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
index 6a0b9de9..c6425d5c 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
@@ -1,12 +1,9 @@
-@file:UseSerializers(Point3DSerializer::class)
-
 package hep.dataforge.vision.solid
 
 import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
 
 @Serializable
 @SerialName("solid.convex")
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
index f0f22814..dc539387 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
@@ -1,11 +1,9 @@
-@file:UseSerializers(Point2DSerializer::class, Point3DSerializer::class)
 package hep.dataforge.vision.solid
 
 import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
 import kotlin.math.PI
 import kotlin.math.cos
 import kotlin.math.sin
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
index 766eab08..f55cc89a 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
@@ -1,5 +1,3 @@
-@file:UseSerializers(Point3DSerializer::class)
-
 package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.number
@@ -11,7 +9,6 @@ import hep.dataforge.vision.props
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
 
 @Serializable
 @SerialName("solid.line")
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index d441ab6c..991fc09b 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -5,8 +5,13 @@ import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.names.Name
 import hep.dataforge.names.NameToken
 import hep.dataforge.vision.*
+import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.MapSerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
 public interface PrototypeHolder {
     public val parent: VisionGroup?
@@ -25,7 +30,7 @@ public class SolidGroup : VisionGroupBase(), Solid, PrototypeHolder {
     /**
      * A container for templates visible inside this group
      */
-    @Serializable(PrototypesSerializer::class)
+    @Serializable(Prototypes.Companion::class)
     override var prototypes: MutableVisionGroup? = null
         private set
 
@@ -39,13 +44,10 @@ public class SolidGroup : VisionGroupBase(), Solid, PrototypeHolder {
         }).run(builder)
     }
 
-    @Serializable(Point3DSerializer::class)
     override var position: Point3D? = null
 
-    @Serializable(Point3DSerializer::class)
     override var rotation: Point3D? = null
 
-    @Serializable(Point3DSerializer::class)
     override var scale: Point3D? = null
 
     override fun attachChildren() {
@@ -91,7 +93,7 @@ public fun MutableVisionGroup.group(name: String, action: SolidGroup.() -> Unit
 /**
  * A special class which works as a holder for prototypes
  */
-@Serializable(PrototypesSerializer::class)
+@Serializable(Prototypes.Companion::class)
 internal class Prototypes(
     children: Map<NameToken, Vision> = emptyMap(),
 ) : VisionGroupBase(), PrototypeHolder {
@@ -118,4 +120,24 @@ internal class Prototypes(
             (it as? VisionGroup)?.attachChildren()
         }
     }
+
+    companion object : KSerializer<MutableVisionGroup> {
+
+        private val mapSerializer: KSerializer<Map<NameToken, Vision>> =
+            MapSerializer(
+                NameToken.serializer(),
+                Vision.serializer()
+            )
+
+        override val descriptor: SerialDescriptor get() = mapSerializer.descriptor
+
+        override fun deserialize(decoder: Decoder): MutableVisionGroup {
+            val map = mapSerializer.deserialize(decoder)
+            return Prototypes(map)
+        }
+
+        override fun serialize(encoder: Encoder, value: MutableVisionGroup) {
+            mapSerializer.serialize(encoder, value.children)
+        }
+    }
 }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index 64b032d4..1800865d 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -13,7 +13,10 @@ import hep.dataforge.vision.VisionGroupBase
 import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.VisionManager.Companion.VISION_SERIALIZER_MODULE_TARGET
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.modules.*
+import kotlinx.serialization.modules.PolymorphicModuleBuilder
+import kotlinx.serialization.modules.SerializersModule
+import kotlinx.serialization.modules.polymorphic
+import kotlinx.serialization.modules.subclass
 import kotlin.reflect.KClass
 
 
@@ -47,9 +50,6 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
         }
 
         public val serializersModuleForSolids: SerializersModule = SerializersModule {
-            contextual(Point3DSerializer)
-            contextual(Point2DSerializer)
-
             polymorphic(Vision::class) {
                 subclass(VisionGroupBase.serializer())
                 solids()
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt
index 1eb501b0..94c61da5 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt
@@ -2,45 +2,47 @@ package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.MetaBuilder
+import hep.dataforge.meta.double
 import hep.dataforge.meta.get
-import hep.dataforge.meta.number
+import kotlinx.serialization.Serializable
 import kotlin.math.PI
 
-public object World {
-    public val ZERO: Point3D = Point3D(0.0, 0.0, 0.0)
-    public val ONE: Point3D = Point3D(1.0, 1.0, 1.0)
-}
-
 public const val PI2: Float = 2 * PI.toFloat()
 
-public expect class Point2D(x: Number, y: Number) {
-    public var x: Double
-    public var y: Double
+@Serializable
+public data class Point2D(public var x: Double, public var y: Double){
+    public constructor(x: Number, y: Number) : this(x.toDouble(), y.toDouble())
 }
 
-public operator fun Point2D.component1(): Double = x
-public operator fun Point2D.component2(): Double = y
 
 public fun Point2D.toMeta(): Meta = Meta {
     Solid.X_KEY put x
     Solid.Y_KEY put y
 }
 
-internal fun Meta.point2D(): Point2D = Point2D(this["x"].number ?: 0, this["y"].number ?: 0)
+internal fun Meta.point2D(): Point2D = Point2D(this["x"].double ?: 0.0, this["y"].double ?: 0.0)
 
-public expect class Point3D(x: Number, y: Number, z: Number) {
-    public var x: Double
-    public var y: Double
-    public var z: Double
+@Serializable
+public data class Point3D(
+    public var x: Double,
+    public var y: Double,
+    public var z: Double,
+) {
+    public constructor(x: Number, y: Number, z: Number) : this(x.toDouble(), y.toDouble(), z.toDouble())
+
+    public companion object{
+        public val ZERO: Point3D = Point3D(0.0, 0.0, 0.0)
+        public val ONE: Point3D = Point3D(1.0, 1.0, 1.0)
+    }
 }
 
-public expect operator fun Point3D.plus(other: Point3D): Point3D
+public operator fun Point3D.plus(other: Point3D): Point3D = Point3D(
+    this.x + other.x,
+    this.y + other.y,
+    this.z + other.z
+)
 
-public operator fun Point3D.component1(): Double = x
-public operator fun Point3D.component2(): Double = y
-public operator fun Point3D.component3(): Double = z
-
-internal fun Meta.point3D() = Point3D(this["x"].number ?: 0, this["y"].number ?: 0, this["y"].number ?: 0)
+internal fun Meta.point3D() = Point3D(this["x"].double ?: 0.0, this["y"].double ?: 0.0, this["y"].double ?: 0.0)
 
 public fun Point3D.toMeta(): MetaBuilder = Meta {
     Solid.X_KEY put x
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt
deleted file mode 100644
index fafc0c5c..00000000
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/serialization.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-package hep.dataforge.vision.solid
-
-import hep.dataforge.names.NameToken
-import hep.dataforge.vision.MutableVisionGroup
-import hep.dataforge.vision.Vision
-import kotlinx.serialization.*
-import kotlinx.serialization.builtins.MapSerializer
-import kotlinx.serialization.builtins.nullable
-import kotlinx.serialization.builtins.serializer
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.descriptors.buildClassSerialDescriptor
-import kotlinx.serialization.descriptors.element
-import kotlinx.serialization.encoding.*
-
-
-@OptIn(ExperimentalSerializationApi::class)
-public object Point3DSerializer : KSerializer<Point3D> {
-    override val descriptor: SerialDescriptor = buildClassSerialDescriptor("hep.dataforge.vis.spatial.Point3D") {
-        element<Double>("x")
-        element<Double>("y")
-        element<Double>("z")
-    }
-
-    override fun deserialize(decoder: Decoder): Point3D {
-        var x: Double? = null
-        var y: Double? = null
-        var z: Double? = null
-        decoder.decodeStructure(descriptor) {
-            loop@ while (true) {
-                when (val i = decodeElementIndex(descriptor)) {
-                    CompositeDecoder.DECODE_DONE -> break@loop
-                    0 -> x = decodeNullableSerializableElement(descriptor, 0, Double.serializer().nullable) ?: 0.0
-                    1 -> y = decodeNullableSerializableElement(descriptor, 1, Double.serializer().nullable) ?: 0.0
-                    2 -> z = decodeNullableSerializableElement(descriptor, 2, Double.serializer().nullable) ?: 0.0
-                    else -> throw SerializationException("Unknown index $i")
-                }
-            }
-        }
-        return Point3D(x ?: 0.0, y ?: 0.0, z ?: 0.0)
-    }
-
-    override fun serialize(encoder: Encoder, value: Point3D) {
-        encoder.encodeStructure(descriptor) {
-            if (value.x != 0.0) encodeDoubleElement(descriptor, 0, value.x)
-            if (value.y != 0.0) encodeDoubleElement(descriptor, 1, value.y)
-            if (value.z != 0.0) encodeDoubleElement(descriptor, 2, value.z)
-        }
-    }
-}
-
-@OptIn(ExperimentalSerializationApi::class)
-public object Point2DSerializer : KSerializer<Point2D> {
-    override val descriptor: SerialDescriptor = buildClassSerialDescriptor("hep.dataforge.vis.spatial.Point2D") {
-        element<Double>("x")
-        element<Double>("y")
-    }
-
-    override fun deserialize(decoder: Decoder): Point2D {
-        var x: Double? = null
-        var y: Double? = null
-        decoder.decodeStructure(descriptor) {
-            loop@ while (true) {
-                when (val i = decodeElementIndex(descriptor)) {
-                    CompositeDecoder.DECODE_DONE -> break@loop
-                    0 -> x = decodeNullableSerializableElement(descriptor, 0, Double.serializer().nullable) ?: 0.0
-                    1 -> y = decodeNullableSerializableElement(descriptor, 1, Double.serializer().nullable) ?: 0.0
-                    else -> throw SerializationException("Unknown index $i")
-                }
-            }
-        }
-        return Point2D(x ?: 0.0, y ?: 0.0)
-    }
-
-    override fun serialize(encoder: Encoder, value: Point2D) {
-        encoder.encodeStructure(descriptor) {
-            if (value.x != 0.0) encodeDoubleElement(descriptor, 0, value.x)
-            if (value.y != 0.0) encodeDoubleElement(descriptor, 1, value.y)
-        }
-    }
-}
-
-internal object PrototypesSerializer : KSerializer<MutableVisionGroup> {
-
-    private val mapSerializer: KSerializer<Map<NameToken, Vision>> =
-        MapSerializer(
-            NameToken.serializer(),
-            Vision.serializer()
-        )
-
-    override val descriptor: SerialDescriptor get() = mapSerializer.descriptor
-
-    override fun deserialize(decoder: Decoder): MutableVisionGroup {
-        val map = mapSerializer.deserialize(decoder)
-        return Prototypes(map)
-    }
-
-    override fun serialize(encoder: Encoder, value: MutableVisionGroup) {
-        mapSerializer.serialize(encoder, value.children)
-    }
-}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
index 7bedebe4..ff879d7e 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
@@ -17,8 +17,8 @@ internal fun mergeChild(parent: VisionGroup, child: Vision): Vision {
         //parent.properties?.let { config.update(it) }
 
         if (this is Solid && parent is Solid) {
-            position = (position ?: World.ZERO) + (parent.position ?: World.ZERO)
-            rotation = (parent.rotation ?: World.ZERO) + (parent.rotation ?: World.ZERO)
+            position = (position ?: Point3D.ZERO) + (parent.position ?: Point3D.ZERO)
+            rotation = (parent.rotation ?: Point3D.ZERO) + (parent.rotation ?: Point3D.ZERO)
             scale = when {
                 scale == null && parent.scale == null -> null
                 scale == null -> parent.scale
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/geometryJs.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/geometryJs.kt
deleted file mode 100644
index 170e8249..00000000
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/geometryJs.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package hep.dataforge.vision.solid
-
-
-import info.laht.threekt.math.Vector2
-import info.laht.threekt.math.Vector3
-import info.laht.threekt.math.plus
-
-public actual typealias Point2D = Vector2
-
-public actual typealias Point3D = Vector3
-
-public actual operator fun Point3D.plus(other: Point3D): Point3D {
-    return this.plus(other)
-}
\ No newline at end of file
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt
index c06a0ff6..e0861f98 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt
@@ -10,12 +10,14 @@ import info.laht.threekt.core.Face3
 import info.laht.threekt.core.Geometry
 import info.laht.threekt.math.Vector3
 
+internal fun Point3D.toVector() = Vector3(x, y, z)
+
 /**
  * An implementation of geometry builder for Three.js [BufferGeometry]
  */
 public class ThreeGeometryBuilder : GeometryBuilder<BufferGeometry> {
 
-    private val vertices = ArrayList<Point3D>()
+    private val vertices = ArrayList<Vector3>()
     private val faces = ArrayList<Face3>()
 
     private val vertexCache = HashMap<Point3D, Int>()
@@ -25,14 +27,14 @@ public class ThreeGeometryBuilder : GeometryBuilder<BufferGeometry> {
         return if (index > 0) {
             index
         } else {
-            vertices.add(vertex)
+            vertices.add(vertex.toVector())
             vertexCache[vertex] = vertices.size - 1
             vertices.size - 1
         }
     }
 
     override fun face(vertex1: Point3D, vertex2: Point3D, vertex3: Point3D, normal: Point3D?, meta: Meta) {
-        val face = Face3(append(vertex1), append(vertex2), append(vertex3), normal ?: Vector3(0, 0, 0))
+        val face = Face3(append(vertex1), append(vertex2), append(vertex3), normal?.toVector() ?: Vector3(0, 0, 0))
         meta["materialIndex"].int?.let { face.materialIndex = it }
         meta["color"]?.getColor()?.let { face.color = it }
         faces.add(face)
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
index 987f19b1..974b0727 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
@@ -15,7 +15,7 @@ public object ThreeLineFactory : ThreeFactory<PolyLine> {
 
     override fun invoke(obj: PolyLine): Object3D {
         val geometry = Geometry().apply {
-            vertices = obj.points.toTypedArray()
+            vertices = Array(obj.points.size) { obj.points[it].toVector() }
         }
 
         val material = ThreeMaterials.getLineMaterial(obj.getProperty(MeshThreeFactory.EDGES_MATERIAL_KEY).node, true)
@@ -27,7 +27,7 @@ public object ThreeLineFactory : ThreeFactory<PolyLine> {
             updatePosition(obj)
             //layers.enable(obj.layer)
             //add listener to object properties
-            obj.onPropertyChange(this) { propertyName->
+            obj.onPropertyChange(this) { propertyName ->
                 updateProperty(obj, propertyName)
             }
         }
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt
index b18cd2eb..c0a739e9 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt
+++ b/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt
@@ -22,6 +22,8 @@ public fun Geometry.toBufferGeometry(): BufferGeometry = BufferGeometry().apply
 
 internal fun Double.toRadians() = this * PI / 180
 
+internal val ZERO = Vector3(0,0,0)
+
 public fun CSG.toGeometry(): Geometry {
     val geom = Geometry()
 
@@ -37,7 +39,7 @@ public fun CSG.toGeometry(): Geometry {
         }
 
         for (j in 3..polygon.vertices.size) {
-            val fc = Face3(v0, v0 + j - 2, v0 + j - 1, World.ZERO)
+            val fc = Face3(v0, v0 + j - 2, v0 + j - 1, ZERO)
             fc.vertexNormals = arrayOf(
                 Vector3().copy(pvs[0].normal),
                 Vector3().copy(pvs[j - 2].normal),
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt
index be2f5788..30b30a81 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt
+++ b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt
@@ -16,6 +16,7 @@ import javafx.scene.shape.Shape3D
 import javafx.scene.text.Font
 import javafx.scene.text.Text
 import javafx.scene.transform.Rotate
+import org.fxyz3d.geometry.Point3D
 import org.fxyz3d.shapes.composites.PolyLine3D
 import org.fxyz3d.shapes.primitives.CuboidMesh
 import org.fxyz3d.shapes.primitives.SpheroidMesh
@@ -69,7 +70,7 @@ class FX3DPlugin : AbstractPlugin() {
                 y = layoutBounds.height / 2
             }
             is PolyLine -> PolyLine3D(
-                obj.points.map { it.point },
+                obj.points.map { Point3D(it.x, it.y, it.z) },
                 obj.thickness.toFloat(),
                 obj.getProperty(SolidMaterial.MATERIAL_COLOR_KEY)?.color()
             ).apply {
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/geometryJVM.kt b/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/geometryJVM.kt
deleted file mode 100644
index 153aace7..00000000
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/geometryJVM.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package hep.dataforge.vision.solid
-import org.fxyz3d.geometry.Point3D as FXPoint3D
-
-public actual data class Point2D(public actual var x: Double, public actual var y: Double) {
-    actual constructor(x: Number, y: Number) : this(x.toDouble(), y.toDouble())
-}
-
-public actual class Point3D(val point: FXPoint3D) {
-    actual constructor(x: Number, y: Number, z: Number) : this(
-        FXPoint3D(
-            x.toFloat(),
-            y.toFloat(),
-            z.toFloat()
-        )
-    )
-
-    public actual var x: Double
-        inline get() = point.x.toDouble()
-        inline set(value) {
-            point.x = value.toFloat()
-        }
-
-    public actual var y: Double
-        inline get() = point.y.toDouble()
-        inline set(value) {
-            point.y = value.toFloat()
-        }
-
-    public actual var z: Double
-        inline get() = point.z.toDouble()
-        inline set(value) {
-            point.z = value.toFloat()
-        }
-
-    override fun equals(other: Any?): Boolean {
-        return this.point == (other as? Point3D)?.point
-    }
-
-    override fun hashCode(): Int {
-        return point.hashCode()
-    }
-
-    override fun toString(): String {
-        return point.toString()
-    }
-}
-
-public actual operator fun Point3D.plus(other: Point3D): Point3D {
-    return Point3D(point.add(other.point))
-}
\ No newline at end of file

From 698f74adaa41655d37d551ab790e125b5b62397b Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 21 Nov 2020 10:56:07 +0300
Subject: [PATCH 032/151] Moved FX to a separate module

---
 build.gradle.kts                              |  3 --
 demo/gdml/build.gradle.kts                    |  5 +++
 .../vision/gdml/demo/GdmlFxDemoApp.kt         |  4 +-
 demo/spatial-showcase/build.gradle.kts        |  5 +++
 .../dataforge/vision/solid/demo/FXDemoGrid.kt |  4 +-
 .../vision/solid}/demo/MetaEditorDemo.kt      |  0
 settings.gradle.kts                           |  1 +
 visionforge-core/build.gradle.kts             | 12 ------
 .../dataforge/vision/visitor/countDistinct.kt |  4 +-
 visionforge-fx/build.gradle.kts               | 37 +++++++++++++++++++
 .../kotlin/hep/dataforge/vision/FXPlugin.kt   |  0
 .../vision/editor/ColorValueChooser.kt        |  0
 .../vision/editor/ComboBoxValueChooser.kt     |  0
 .../dataforge/vision/editor/ConfigEditor.kt   |  0
 .../hep/dataforge/vision/editor/FXMeta.kt     |  0
 .../hep/dataforge/vision/editor/MetaViewer.kt |  0
 .../vision/editor/TextValueChooser.kt         |  0
 .../dataforge/vision/editor/ValueCallback.kt  |  0
 .../dataforge/vision/editor/ValueChooser.kt   |  0
 .../vision/editor/ValueChooserBase.kt         |  0
 .../editor/VisualObjectEditorFragment.kt      |  0
 .../vision/editor/VisualObjectTreeFragment.kt |  0
 .../hep/dataforge/vision/solid}/FX3DPlugin.kt |  5 +--
 .../hep/dataforge/vision/solid}/FXCanvas3D.kt |  3 +-
 .../vision/solid}/FXCompositeFactory.kt       |  4 +-
 .../vision/solid}/FXConvexFactory.kt          |  3 +-
 .../dataforge/vision/solid}/FXMaterials.kt    |  3 +-
 .../vision/solid}/FXReferenceFactory.kt       |  3 +-
 .../dataforge/vision/solid}/FXShapeFactory.kt |  5 +--
 .../dataforge/vision/solid}/OrbitControls.kt  |  2 +-
 .../vision/solid}/VisualObjectFXBinding.kt    |  2 +-
 visionforge-solid/build.gradle.kts            | 13 -------
 .../dataforge/vision/solid/SolidMaterial.kt   |  8 ++--
 33 files changed, 68 insertions(+), 58 deletions(-)
 rename {visionforge-core/src/jvmTest/kotlin/hep/dataforge/vision => demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid}/demo/MetaEditorDemo.kt (100%)
 create mode 100644 visionforge-fx/build.gradle.kts
 rename {visionforge-core/src/jvmMain => visionforge-fx/src/main}/kotlin/hep/dataforge/vision/FXPlugin.kt (100%)
 rename {visionforge-core/src/jvmMain => visionforge-fx/src/main}/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt (100%)
 rename {visionforge-core/src/jvmMain => visionforge-fx/src/main}/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt (100%)
 rename {visionforge-core/src/jvmMain => visionforge-fx/src/main}/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt (100%)
 rename {visionforge-core/src/jvmMain => visionforge-fx/src/main}/kotlin/hep/dataforge/vision/editor/FXMeta.kt (100%)
 rename {visionforge-core/src/jvmMain => visionforge-fx/src/main}/kotlin/hep/dataforge/vision/editor/MetaViewer.kt (100%)
 rename {visionforge-core/src/jvmMain => visionforge-fx/src/main}/kotlin/hep/dataforge/vision/editor/TextValueChooser.kt (100%)
 rename {visionforge-core/src/jvmMain => visionforge-fx/src/main}/kotlin/hep/dataforge/vision/editor/ValueCallback.kt (100%)
 rename {visionforge-core/src/jvmMain => visionforge-fx/src/main}/kotlin/hep/dataforge/vision/editor/ValueChooser.kt (100%)
 rename {visionforge-core/src/jvmMain => visionforge-fx/src/main}/kotlin/hep/dataforge/vision/editor/ValueChooserBase.kt (100%)
 rename {visionforge-core/src/jvmMain => visionforge-fx/src/main}/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt (100%)
 rename {visionforge-core/src/jvmMain => visionforge-fx/src/main}/kotlin/hep/dataforge/vision/editor/VisualObjectTreeFragment.kt (100%)
 rename {visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx => visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid}/FX3DPlugin.kt (97%)
 rename {visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx => visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid}/FXCanvas3D.kt (96%)
 rename {visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx => visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid}/FXCompositeFactory.kt (94%)
 rename {visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx => visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid}/FXConvexFactory.kt (86%)
 rename {visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx => visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid}/FXMaterials.kt (96%)
 rename {visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx => visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid}/FXReferenceFactory.kt (95%)
 rename {visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx => visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid}/FXShapeFactory.kt (90%)
 rename {visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx => visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid}/OrbitControls.kt (98%)
 rename {visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx => visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid}/VisualObjectFXBinding.kt (98%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 562b2092..e2a4a66a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,3 @@
-import ru.mipt.npm.gradle.useFx
-
 plugins {
     id("ru.mipt.npm.project")
 }
@@ -32,7 +30,6 @@ subprojects {
     afterEvaluate {
         extensions.findByType<ru.mipt.npm.gradle.KScienceExtension>()?.run {
             useSerialization()
-            useFx(ru.mipt.npm.gradle.FXModule.CONTROLS, version = fxVersion)
         }
     }
 }
diff --git a/demo/gdml/build.gradle.kts b/demo/gdml/build.gradle.kts
index 82e03364..a4870646 100644
--- a/demo/gdml/build.gradle.kts
+++ b/demo/gdml/build.gradle.kts
@@ -24,6 +24,11 @@ kotlin {
                 implementation(project(":visionforge-gdml"))
             }
         }
+        jvmMain{
+            dependencies{
+                implementation(project(":visionforge-fx"))
+            }
+        }
         jsMain {
             dependencies {
                 implementation(project(":ui:bootstrap"))
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
index de6968a7..1d5a4a89 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
@@ -5,10 +5,10 @@ import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.editor.VisualObjectEditorFragment
 import hep.dataforge.vision.editor.VisualObjectTreeFragment
 import hep.dataforge.vision.gdml.toVision
+import hep.dataforge.vision.solid.FX3DPlugin
+import hep.dataforge.vision.solid.FXCanvas3D
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.SolidMaterial
-import hep.dataforge.vision.solid.fx.FX3DPlugin
-import hep.dataforge.vision.solid.fx.FXCanvas3D
 import javafx.geometry.Orientation
 import javafx.scene.Parent
 import javafx.stage.FileChooser
diff --git a/demo/spatial-showcase/build.gradle.kts b/demo/spatial-showcase/build.gradle.kts
index cd0a131f..4502f7c0 100644
--- a/demo/spatial-showcase/build.gradle.kts
+++ b/demo/spatial-showcase/build.gradle.kts
@@ -29,6 +29,11 @@ kotlin {
                 implementation(project(":visionforge-gdml"))
             }
         }
+        jvmMain{
+            dependencies{
+                implementation(project(":visionforge-fx"))
+            }
+        }
         jsMain{
             dependencies {
                 implementation("org.jetbrains:kotlin-css:1.0.0-pre.129-kotlin-1.4.10")
diff --git a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt b/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt
index ec0d5b0f..6b5267ff 100644
--- a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt
+++ b/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt
@@ -5,9 +5,9 @@ import hep.dataforge.meta.Meta
 import hep.dataforge.names.Name
 import hep.dataforge.vision.layout.Output
 import hep.dataforge.vision.layout.Page
+import hep.dataforge.vision.solid.FX3DPlugin
+import hep.dataforge.vision.solid.FXCanvas3D
 import hep.dataforge.vision.solid.Solid
-import hep.dataforge.vision.solid.fx.FX3DPlugin
-import hep.dataforge.vision.solid.fx.FXCanvas3D
 import javafx.collections.FXCollections
 import javafx.scene.Parent
 import javafx.scene.control.Tab
diff --git a/visionforge-core/src/jvmTest/kotlin/hep/dataforge/vision/demo/MetaEditorDemo.kt b/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/MetaEditorDemo.kt
similarity index 100%
rename from visionforge-core/src/jvmTest/kotlin/hep/dataforge/vision/demo/MetaEditorDemo.kt
rename to demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/MetaEditorDemo.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 55158bb5..1a45cf80 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -38,6 +38,7 @@ include(
     ":ui:bootstrap",
     ":visionforge-core",
     ":visionforge-solid",
+    ":visionforge-fx",
     ":visionforge-gdml",
     ":visionforge-server",
     ":demo:spatial-showcase",
diff --git a/visionforge-core/build.gradle.kts b/visionforge-core/build.gradle.kts
index 74ac090a..7b2bd238 100644
--- a/visionforge-core/build.gradle.kts
+++ b/visionforge-core/build.gradle.kts
@@ -15,18 +15,6 @@ kotlin {
                 api("org.jetbrains.kotlinx:kotlinx-html:$htmlVersion")
             }
         }
-        jvmMain {
-            dependencies {
-                api("no.tornado:tornadofx:1.7.20")
-                //api("no.tornado:tornadofx-controlsfx:0.1.1")
-                api("de.jensd:fontawesomefx-fontawesome:4.7.0-11") {
-                    exclude(group = "org.openjfx")
-                }
-                api("de.jensd:fontawesomefx-commons:11.0") {
-                    exclude(group = "org.openjfx")
-                }
-            }
-        }
         jsMain {
             dependencies {
                 api("org.jetbrains:kotlin-extensions:1.0.1-$kotlinWrappersVersion")
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visitor/countDistinct.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visitor/countDistinct.kt
index 6f9594de..716f888e 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visitor/countDistinct.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visitor/countDistinct.kt
@@ -4,7 +4,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 import java.util.concurrent.atomic.AtomicInteger
 
-suspend fun <T, K> Flow<T>.countDistinctBy(selector: (T) -> K): Map<K, Int> {
+public suspend fun <T, K> Flow<T>.countDistinctBy(selector: (T) -> K): Map<K, Int> {
     val counter = LinkedHashMap<K, AtomicInteger>()
     collect {
         val key = selector(it)
@@ -13,4 +13,4 @@ suspend fun <T, K> Flow<T>.countDistinctBy(selector: (T) -> K): Map<K, Int> {
     return counter.mapValues { it.value.toInt() }
 }
 
-suspend fun <T> Flow<T>.countDistinct(): Map<T, Int> = countDistinctBy { it }
\ No newline at end of file
+public suspend fun <T> Flow<T>.countDistinct(): Map<T, Int> = countDistinctBy { it }
\ No newline at end of file
diff --git a/visionforge-fx/build.gradle.kts b/visionforge-fx/build.gradle.kts
new file mode 100644
index 00000000..52da9f01
--- /dev/null
+++ b/visionforge-fx/build.gradle.kts
@@ -0,0 +1,37 @@
+import ru.mipt.npm.gradle.useFx
+
+plugins {
+    id("ru.mipt.npm.jvm")
+}
+
+val dataforgeVersion: String by rootProject.extra
+val kotlinWrappersVersion: String by rootProject.extra
+val htmlVersion: String by rootProject.extra
+val fxVersion: String by rootProject.extra
+
+kscience{
+    useFx(ru.mipt.npm.gradle.FXModule.CONTROLS, version = fxVersion)
+}
+
+dependencies {
+    api(project(":visionforge-solid"))
+
+    api("no.tornado:tornadofx:1.7.20")
+
+    api("de.jensd:fontawesomefx-fontawesome:4.7.0-11") {
+        exclude(group = "org.openjfx")
+    }
+
+    api("de.jensd:fontawesomefx-commons:11.0") {
+        exclude(group = "org.openjfx")
+    }
+
+    api("org.fxyz3d:fxyz3d:0.5.2") {
+        exclude(module = "slf4j-simple")
+    }
+    api("org.jetbrains.kotlinx:kotlinx-coroutines-javafx:${ru.mipt.npm.gradle.KScienceVersions.coroutinesVersion}")
+
+    implementation("eu.mihosoft.vrl.jcsg:jcsg:0.5.7") {
+        exclude(module = "slf4j-simple")
+    }
+}
\ No newline at end of file
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/FXPlugin.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/FXPlugin.kt
similarity index 100%
rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/FXPlugin.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/FXPlugin.kt
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
similarity index 100%
rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
similarity index 100%
rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt
similarity index 100%
rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/FXMeta.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/FXMeta.kt
similarity index 100%
rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/FXMeta.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/FXMeta.kt
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/MetaViewer.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt
similarity index 100%
rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/MetaViewer.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/TextValueChooser.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/TextValueChooser.kt
similarity index 100%
rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/TextValueChooser.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/TextValueChooser.kt
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueCallback.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueCallback.kt
similarity index 100%
rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueCallback.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueCallback.kt
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueChooser.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooser.kt
similarity index 100%
rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueChooser.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooser.kt
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueChooserBase.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooserBase.kt
similarity index 100%
rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/ValueChooserBase.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooserBase.kt
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
similarity index 100%
rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectTreeFragment.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectTreeFragment.kt
similarity index 100%
rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/editor/VisualObjectTreeFragment.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectTreeFragment.kt
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
similarity index 97%
rename from visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
index 30b30a81..3f863a34 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FX3DPlugin.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
@@ -1,13 +1,12 @@
-package hep.dataforge.vision.solid.fx
+package hep.dataforge.vision.solid
 
 import hep.dataforge.context.*
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.boolean
 import hep.dataforge.provider.Type
-import hep.dataforge.vision.solid.*
+import hep.dataforge.vision.solid.FX3DFactory.Companion.TYPE
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_WIREFRAME_KEY
-import hep.dataforge.vision.solid.fx.FX3DFactory.Companion.TYPE
 import javafx.scene.Group
 import javafx.scene.Node
 import javafx.scene.shape.CullFace
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCanvas3D.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt
similarity index 96%
rename from visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCanvas3D.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt
index 4abc02b7..149f9d36 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCanvas3D.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt
@@ -1,10 +1,9 @@
-package hep.dataforge.vision.solid.fx
+package hep.dataforge.vision.solid
 
 import hep.dataforge.context.Context
 import hep.dataforge.context.ContextAware
 import hep.dataforge.meta.empty
 import hep.dataforge.vision.layout.Output
-import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import javafx.application.Platform
 import javafx.beans.property.ObjectProperty
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCompositeFactory.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCompositeFactory.kt
similarity index 94%
rename from visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCompositeFactory.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCompositeFactory.kt
index 8a97e3c3..4a485529 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXCompositeFactory.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCompositeFactory.kt
@@ -1,10 +1,8 @@
-package hep.dataforge.vision.solid.fx
+package hep.dataforge.vision.solid
 
 import eu.mihosoft.jcsg.CSG
 import eu.mihosoft.jcsg.Polygon
 import eu.mihosoft.vvecmath.Vector3d
-import hep.dataforge.vision.solid.Composite
-import hep.dataforge.vision.solid.CompositeType
 import javafx.scene.Group
 import javafx.scene.Node
 import javafx.scene.shape.MeshView
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXConvexFactory.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXConvexFactory.kt
similarity index 86%
rename from visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXConvexFactory.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXConvexFactory.kt
index f27d4edf..f8f6fc32 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXConvexFactory.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXConvexFactory.kt
@@ -1,9 +1,8 @@
-package hep.dataforge.vision.solid.fx
+package hep.dataforge.vision.solid
 
 import eu.mihosoft.jcsg.PropertyStorage
 import eu.mihosoft.jcsg.ext.quickhull3d.HullUtil
 import eu.mihosoft.vvecmath.Vector3d
-import hep.dataforge.vision.solid.Convex
 import javafx.scene.Node
 import kotlin.reflect.KClass
 
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXMaterials.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
similarity index 96%
rename from visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXMaterials.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
index bfd01745..eb50f306 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXMaterials.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.vision.solid.fx
+package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.MetaItem
 import hep.dataforge.meta.double
@@ -6,7 +6,6 @@ import hep.dataforge.meta.get
 import hep.dataforge.meta.int
 import hep.dataforge.values.ValueType
 import hep.dataforge.vision.Colors
-import hep.dataforge.vision.solid.SolidMaterial
 import javafx.scene.paint.Color
 import javafx.scene.paint.Material
 import javafx.scene.paint.PhongMaterial
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXReferenceFactory.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
similarity index 95%
rename from visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXReferenceFactory.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
index 6f6912e3..7c7258ac 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXReferenceFactory.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
@@ -1,8 +1,7 @@
-package hep.dataforge.vision.solid.fx
+package hep.dataforge.vision.solid
 
 import hep.dataforge.names.*
 import hep.dataforge.vision.Vision
-import hep.dataforge.vision.solid.SolidReference
 import javafx.scene.Group
 import javafx.scene.Node
 import kotlin.reflect.KClass
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXShapeFactory.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXShapeFactory.kt
similarity index 90%
rename from visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXShapeFactory.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXShapeFactory.kt
index a6ce41d1..fa8ce279 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/FXShapeFactory.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXShapeFactory.kt
@@ -1,9 +1,6 @@
-package hep.dataforge.vision.solid.fx
+package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.Meta
-import hep.dataforge.vision.solid.GeometryBuilder
-import hep.dataforge.vision.solid.GeometrySolid
-import hep.dataforge.vision.solid.Point3D
 import javafx.scene.shape.Mesh
 import javafx.scene.shape.MeshView
 import javafx.scene.shape.TriangleMesh
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/OrbitControls.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/OrbitControls.kt
similarity index 98%
rename from visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/OrbitControls.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/OrbitControls.kt
index b9bf8031..498c756f 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/OrbitControls.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/OrbitControls.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.vision.solid.fx
+package hep.dataforge.vision.solid
 
 import javafx.beans.InvalidationListener
 import javafx.beans.property.SimpleDoubleProperty
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/VisualObjectFXBinding.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
similarity index 98%
rename from visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/VisualObjectFXBinding.kt
rename to visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
index 0ba7af20..e5c19dd1 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/fx/VisualObjectFXBinding.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.vision.solid.fx
+package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.*
 import hep.dataforge.names.Name
diff --git a/visionforge-solid/build.gradle.kts b/visionforge-solid/build.gradle.kts
index a9569b76..b7b6daa8 100644
--- a/visionforge-solid/build.gradle.kts
+++ b/visionforge-solid/build.gradle.kts
@@ -1,5 +1,3 @@
-import ru.mipt.npm.gradle.KScienceVersions.coroutinesVersion
-
 plugins {
     id("ru.mipt.npm.mpp")
 }
@@ -16,17 +14,6 @@ kotlin {
                 api(project(":visionforge-core"))
             }
         }
-        jvmMain {
-            dependencies {
-                api("org.fxyz3d:fxyz3d:0.5.2") {
-                    exclude(module = "slf4j-simple")
-                }
-                api("org.jetbrains.kotlinx:kotlinx-coroutines-javafx:${coroutinesVersion}")
-                implementation("eu.mihosoft.vrl.jcsg:jcsg:0.5.7") {
-                    exclude(module = "slf4j-simple")
-                }
-            }
-        }
         jsMain {
             dependencies {
                 implementation(npm("three", "0.122.0"))
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
index c26300d1..34b7ca4d 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
@@ -40,13 +40,13 @@ public class SolidMaterial : Scheme() {
     public companion object : SchemeSpec<SolidMaterial>(::SolidMaterial) {
 
         public val MATERIAL_KEY: Name = "material".asName()
-        internal val COLOR_KEY = "color".asName()
+        public val COLOR_KEY: Name = "color".asName()
         public val MATERIAL_COLOR_KEY: Name = MATERIAL_KEY + COLOR_KEY
-        internal val SPECULAR_COLOR_KEY = "specularColor".asName()
+        public val SPECULAR_COLOR_KEY: Name = "specularColor".asName()
         public val MATERIAL_SPECULAR_COLOR_KEY: Name = MATERIAL_KEY + SPECULAR_COLOR_KEY
-        internal val OPACITY_KEY = "opacity".asName()
+        public val OPACITY_KEY: Name = "opacity".asName()
         public val MATERIAL_OPACITY_KEY: Name = MATERIAL_KEY + OPACITY_KEY
-        internal val WIREFRAME_KEY = "wireframe".asName()
+        public val WIREFRAME_KEY: Name = "wireframe".asName()
         public val MATERIAL_WIREFRAME_KEY: Name = MATERIAL_KEY + WIREFRAME_KEY
 
         public override val descriptor: NodeDescriptor by lazy {

From e44096e8446ca79d0ba174c5a8502c1c41b4d454 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 21 Nov 2020 11:17:18 +0300
Subject: [PATCH 033/151] Moved ThreeJS to a separate module

---
 CHANGELOG.md                                        |  3 +++
 build.gradle.kts                                    |  7 +------
 demo/gdml/build.gradle.kts                          |  1 +
 .../dataforge/vision/gdml/demo/GDMLAppComponent.kt  |  1 -
 demo/muon-monitor/build.gradle.kts                  |  1 +
 .../ru/mipt/npm/muon/monitor/MMAppComponent.kt      |  1 -
 demo/sat-demo/build.gradle.kts                      |  2 +-
 .../src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt |  4 ++--
 demo/spatial-showcase/build.gradle.kts              |  1 +
 .../hep/dataforge/vision/solid/demo/VariableBox.kt  |  4 +---
 playground/src/jsMain/kotlin/PlayGroundApp.kt       |  1 -
 settings.gradle.kts                                 |  1 +
 ui/react/build.gradle.kts                           |  1 +
 .../dataforge/vision/react/ThreeCanvasComponent.kt  |  1 -
 visionforge-core/build.gradle.kts                   |  3 +++
 visionforge-fx/build.gradle.kts                     |  1 +
 .../kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt |  1 -
 .../hep/dataforge/vision/solid/SolidMaterial.kt     |  2 +-
 visionforge-threejs/build.gradle.kts                | 13 +++++++++++++
 .../vision/solid/three/MeshThreeFactory.kt          |  0
 .../dataforge/vision/solid/three/ThreeBoxFactory.kt |  0
 .../hep/dataforge/vision/solid/three/ThreeCanvas.kt |  0
 .../vision/solid/three/ThreeCanvasLabelFactory.kt   |  0
 .../vision/solid/three/ThreeCompositeFactory.kt     |  0
 .../vision/solid/three/ThreeConvexFactory.kt        |  0
 .../vision/solid/three/ThreeCylinderFactory.kt      |  0
 .../dataforge/vision/solid/three/ThreeFactory.kt    |  0
 .../vision/solid/three/ThreeGeometryBuilder.kt      |  0
 .../vision/solid/three/ThreeLabelFactory.kt         |  0
 .../vision/solid/three/ThreeLineFactory.kt          |  0
 .../dataforge/vision/solid/three/ThreeMaterials.kt  |  0
 .../hep/dataforge/vision/solid/three/ThreePlugin.kt |  2 --
 .../vision/solid/three/ThreeReferenceFactory.kt     |  0
 .../vision/solid/three/ThreeSphereFactory.kt        |  0
 .../hep/dataforge/vision/solid/three/ThreeVision.kt |  2 --
 .../kotlin/hep/dataforge/vision/solid/three/csg.kt  |  0
 .../hep/dataforge/vision/solid/three/three.kt       |  0
 .../src/main}/kotlin/info/laht/threekt/THREE.kt     |  0
 .../info/laht/threekt/animation/AnimationAction.kt  |  0
 .../info/laht/threekt/animation/AnimationClip.kt    |  0
 .../info/laht/threekt/animation/AnimationMixer.kt   |  0
 .../info/laht/threekt/animation/AnimationUtils.kt   |  0
 .../info/laht/threekt/animation/KeyFrameTrack.kt    |  0
 .../main}/kotlin/info/laht/threekt/audio/Audio.kt   |  0
 .../kotlin/info/laht/threekt/audio/AudioContext.kt  |  0
 .../kotlin/info/laht/threekt/audio/AudioListener.kt |  0
 .../info/laht/threekt/audio/PositionalAudio.kt      |  0
 .../kotlin/info/laht/threekt/cameras/Camera.kt      |  0
 .../info/laht/threekt/cameras/OrthographicCamera.kt |  0
 .../info/laht/threekt/cameras/PerspectiveCamera.kt  |  0
 .../info/laht/threekt/core/BufferAttribute.kt       |  0
 .../kotlin/info/laht/threekt/core/BufferGeometry.kt |  0
 .../main}/kotlin/info/laht/threekt/core/Clock.kt    |  0
 .../kotlin/info/laht/threekt/core/DirectGeometry.kt |  0
 .../info/laht/threekt/core/EventDispatcher.kt       |  0
 .../main}/kotlin/info/laht/threekt/core/Face3.kt    |  0
 .../main}/kotlin/info/laht/threekt/core/Geometry.kt |  0
 .../laht/threekt/core/InstancedBufferGeometry.kt    |  0
 .../main}/kotlin/info/laht/threekt/core/Layers.kt   |  0
 .../main}/kotlin/info/laht/threekt/core/Object3D.kt |  0
 .../kotlin/info/laht/threekt/core/Raycaster.kt      |  0
 .../main}/kotlin/info/laht/threekt/core/Uniform.kt  |  0
 .../kotlin/info/laht/threekt/external/Detector.kt   |  0
 .../info/laht/threekt/external/ImprovedNoise.kt     |  0
 .../info/laht/threekt/external/SimplexNoise.kt      |  0
 .../laht/threekt/external/controls/FlyControls.kt   |  0
 .../laht/threekt/external/controls/OrbitControls.kt |  0
 .../threekt/external/controls/TrackballControls.kt  |  0
 .../threekt/external/controls/TransformControls.kt  |  0
 .../laht/threekt/external/exporters/OBJExporter.kt  |  0
 .../laht/threekt/external/exporters/STLExporter.kt  |  0
 .../threekt/external/geometries/ConvexGeometry.kt   |  0
 .../info/laht/threekt/external/libs/GUIParams.kt    |  0
 .../kotlin/info/laht/threekt/external/libs/Stats.kt |  0
 .../info/laht/threekt/external/libs/datgui.kt       |  0
 .../laht/threekt/external/loaders/BabylonLoader.kt  |  0
 .../laht/threekt/external/loaders/GLTFLoader.kt     |  0
 .../laht/threekt/external/loaders/LoaderSupport.kt  |  0
 .../info/laht/threekt/external/loaders/MTLLoader.kt |  0
 .../info/laht/threekt/external/loaders/OBJLoader.kt |  0
 .../laht/threekt/external/loaders/OBJLoader2.kt     |  0
 .../info/laht/threekt/external/loaders/STLLoader.kt |  0
 .../info/laht/threekt/external/objects/Sky.kt       |  0
 .../info/laht/threekt/external/objects/Water.kt     |  0
 .../laht/threekt/external/objects/WaterOptions.kt   |  0
 .../kotlin/info/laht/threekt/extras/SceneUtils.kt   |  0
 .../kotlin/info/laht/threekt/extras/core/Curve.kt   |  0
 .../info/laht/threekt/extras/core/CurvePath.kt      |  0
 .../kotlin/info/laht/threekt/extras/core/Path.kt    |  0
 .../kotlin/info/laht/threekt/extras/core/Shape.kt   |  0
 .../info/laht/threekt/extras/core/ShapePath.kt      |  0
 .../info/laht/threekt/extras/curves/ArcCurve.kt     |  0
 .../laht/threekt/extras/curves/CatmullRomCurve3.kt  |  0
 .../info/laht/threekt/extras/curves/EllipseCurve.kt |  0
 .../info/laht/threekt/extras/curves/LineCurve.kt    |  0
 .../info/laht/threekt/extras/curves/LineCurve3.kt   |  0
 .../threekt/extras/curves/QuadricBezierCurve.kt     |  0
 .../threekt/extras/curves/QuadricBezierCurve3.kt    |  0
 .../info/laht/threekt/extras/curves/SplineCurve.kt  |  0
 .../info/laht/threekt/geometries/BoxGeometry.kt     |  0
 .../info/laht/threekt/geometries/ConeGeometry.kt    |  0
 .../laht/threekt/geometries/CylinderGeometry.kt     |  0
 .../info/laht/threekt/geometries/EdgesGeometry.kt   |  0
 .../laht/threekt/geometries/ExtrudedGeometry.kt     |  0
 .../info/laht/threekt/geometries/PlaneGeometry.kt   |  0
 .../info/laht/threekt/geometries/SphereGeometry.kt  |  0
 .../laht/threekt/geometries/TextBufferGeometry.kt   |  0
 .../info/laht/threekt/geometries/TorusGeometry.kt   |  0
 .../info/laht/threekt/geometries/TubeGeometry.kt    |  0
 .../laht/threekt/geometries/WireframeGeometry.kt    |  0
 .../kotlin/info/laht/threekt/helpers/ArrowHelper.kt |  0
 .../kotlin/info/laht/threekt/helpers/AxesHelper.kt  |  0
 .../kotlin/info/laht/threekt/helpers/Box3Helper.kt  |  0
 .../info/laht/threekt/helpers/CameraHelper.kt       |  0
 .../kotlin/info/laht/threekt/helpers/GridHelper.kt  |  0
 .../laht/threekt/helpers/HemisphereLightHelper.kt   |  0
 .../src/main}/kotlin/info/laht/threekt/ktutils.kt   |  0
 .../kotlin/info/laht/threekt/lights/AmbientLight.kt |  0
 .../info/laht/threekt/lights/DirectionalLight.kt    |  0
 .../laht/threekt/lights/DirectionalLightShadow.kt   |  0
 .../info/laht/threekt/lights/HemiSphereLight.kt     |  0
 .../main}/kotlin/info/laht/threekt/lights/Light.kt  |  0
 .../kotlin/info/laht/threekt/lights/LightShadow.kt  |  0
 .../kotlin/info/laht/threekt/lights/PointLight.kt   |  0
 .../kotlin/info/laht/threekt/lights/SpotLight.kt    |  0
 .../info/laht/threekt/lights/SpotLightShadow.kt     |  0
 .../main}/kotlin/info/laht/threekt/loaders/Cache.kt |  0
 .../laht/threekt/loaders/CompressedTextureLoader.kt |  0
 .../kotlin/info/laht/threekt/loaders/ImageLoader.kt |  0
 .../kotlin/info/laht/threekt/loaders/JSONLoader.kt  |  0
 .../kotlin/info/laht/threekt/loaders/Loader.kt      |  0
 .../info/laht/threekt/loaders/LoadingManager.kt     |  0
 .../info/laht/threekt/loaders/MaterialLoader.kt     |  0
 .../info/laht/threekt/loaders/TextureLoader.kt      |  0
 .../laht/threekt/materials/LineBasicMaterial.kt     |  0
 .../laht/threekt/materials/LineDashedMaterial.kt    |  0
 .../kotlin/info/laht/threekt/materials/Material.kt  |  0
 .../laht/threekt/materials/MeshBasicMaterial.kt     |  0
 .../laht/threekt/materials/MeshDepthMaterial.kt     |  0
 .../laht/threekt/materials/MeshLambertMaterial.kt   |  0
 .../laht/threekt/materials/MeshNormalMaterial.kt    |  0
 .../laht/threekt/materials/MeshPhongMaterial.kt     |  0
 .../laht/threekt/materials/MeshPhysicalMaterial.kt  |  0
 .../laht/threekt/materials/MeshStandardMaterial.kt  |  0
 .../info/laht/threekt/materials/PointsMaterial.kt   |  0
 .../laht/threekt/materials/RawShaderMaterial.kt     |  0
 .../info/laht/threekt/materials/ShaderMaterial.kt   |  0
 .../info/laht/threekt/materials/SpriteMaterial.kt   |  0
 .../src/main}/kotlin/info/laht/threekt/math/Box2.kt |  0
 .../src/main}/kotlin/info/laht/threekt/math/Box3.kt |  0
 .../main}/kotlin/info/laht/threekt/math/Color.kt    |  0
 .../kotlin/info/laht/threekt/math/ColorConstants.kt |  0
 .../kotlin/info/laht/threekt/math/Cylindrical.kt    |  0
 .../main}/kotlin/info/laht/threekt/math/Euler.kt    |  0
 .../main}/kotlin/info/laht/threekt/math/Frustrum.kt |  0
 .../main}/kotlin/info/laht/threekt/math/Line3.kt    |  0
 .../src/main}/kotlin/info/laht/threekt/math/Math.kt |  0
 .../main}/kotlin/info/laht/threekt/math/Matrix3.kt  |  0
 .../main}/kotlin/info/laht/threekt/math/Matrix4.kt  |  0
 .../main}/kotlin/info/laht/threekt/math/Plane.kt    |  0
 .../kotlin/info/laht/threekt/math/Quaternion.kt     |  0
 .../src/main}/kotlin/info/laht/threekt/math/Ray.kt  |  0
 .../main}/kotlin/info/laht/threekt/math/Sphere.kt   |  0
 .../kotlin/info/laht/threekt/math/Spherical.kt      |  0
 .../main}/kotlin/info/laht/threekt/math/Triangle.kt |  0
 .../main}/kotlin/info/laht/threekt/math/Vector2.kt  |  0
 .../main}/kotlin/info/laht/threekt/math/Vector3.kt  |  0
 .../main}/kotlin/info/laht/threekt/math/Vector4.kt  |  0
 .../kotlin/info/laht/threekt/math/operators.kt      |  0
 .../main}/kotlin/info/laht/threekt/objects/Group.kt |  0
 .../main}/kotlin/info/laht/threekt/objects/LOD.kt   |  0
 .../main}/kotlin/info/laht/threekt/objects/Line.kt  |  0
 .../kotlin/info/laht/threekt/objects/LineLoop.kt    |  0
 .../info/laht/threekt/objects/LineSegments.kt       |  0
 .../main}/kotlin/info/laht/threekt/objects/Mesh.kt  |  0
 .../kotlin/info/laht/threekt/objects/Points.kt      |  0
 .../kotlin/info/laht/threekt/objects/Sprite.kt      |  0
 .../info/laht/threekt/renderers/WebGL2Renderer.kt   |  0
 .../laht/threekt/renderers/WebGL2RendererParams.kt  |  0
 .../laht/threekt/renderers/WebGLRenderTarget.kt     |  0
 .../threekt/renderers/WebGLRenderTargetOptions.kt   |  0
 .../info/laht/threekt/renderers/WebGLRenderer.kt    |  0
 .../laht/threekt/renderers/WebGLRendererParams.kt   |  0
 .../laht/threekt/renderers/shaders/ShaderChunk.kt   |  0
 .../laht/threekt/renderers/shaders/ShaderLib.kt     |  0
 .../laht/threekt/renderers/shaders/UniformsUtil.kt  |  0
 .../main}/kotlin/info/laht/threekt/scenes/Fog.kt    |  0
 .../kotlin/info/laht/threekt/scenes/FogExp2.kt      |  0
 .../main}/kotlin/info/laht/threekt/scenes/Scene.kt  |  0
 .../info/laht/threekt/textures/CompressedTexture.kt |  0
 .../info/laht/threekt/textures/CubeTexture.kt       |  0
 .../info/laht/threekt/textures/DepthTexture.kt      |  0
 .../kotlin/info/laht/threekt/textures/Texture.kt    |  0
 193 files changed, 31 insertions(+), 22 deletions(-)
 create mode 100644 visionforge-threejs/build.gradle.kts
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt (99%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt (78%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/csg.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/hep/dataforge/vision/solid/three/three.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/THREE.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/animation/AnimationAction.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/animation/AnimationClip.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/animation/AnimationMixer.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/animation/AnimationUtils.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/audio/Audio.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/audio/AudioContext.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/audio/AudioListener.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/audio/PositionalAudio.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/cameras/Camera.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/BufferAttribute.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/BufferGeometry.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/Clock.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/DirectGeometry.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/EventDispatcher.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/Face3.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/Geometry.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/Layers.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/Object3D.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/Raycaster.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/core/Uniform.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/Detector.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/ImprovedNoise.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/SimplexNoise.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/controls/FlyControls.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/controls/OrbitControls.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/controls/TrackballControls.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/controls/TransformControls.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/exporters/STLExporter.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/libs/GUIParams.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/libs/Stats.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/libs/datgui.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/loaders/STLLoader.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/objects/Sky.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/objects/Water.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/external/objects/WaterOptions.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/SceneUtils.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/core/Curve.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/core/CurvePath.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/core/Path.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/core/Shape.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/core/ShapePath.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/curves/LineCurve.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/BoxGeometry.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/ConeGeometry.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/SphereGeometry.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/TorusGeometry.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/TubeGeometry.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/helpers/ArrowHelper.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/helpers/AxesHelper.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/helpers/Box3Helper.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/helpers/CameraHelper.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/helpers/GridHelper.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/ktutils.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/lights/AmbientLight.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/lights/DirectionalLight.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/lights/HemiSphereLight.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/lights/Light.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/lights/LightShadow.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/lights/PointLight.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/lights/SpotLight.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/lights/SpotLightShadow.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/loaders/Cache.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/loaders/ImageLoader.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/loaders/JSONLoader.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/loaders/Loader.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/loaders/LoadingManager.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/loaders/MaterialLoader.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/loaders/TextureLoader.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/Material.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/PointsMaterial.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/ShaderMaterial.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/materials/SpriteMaterial.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Box2.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Box3.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Color.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/ColorConstants.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Cylindrical.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Euler.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Frustrum.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Line3.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Math.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Matrix3.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Matrix4.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Plane.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Quaternion.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Ray.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Sphere.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Spherical.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Triangle.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Vector2.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Vector3.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/Vector4.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/math/operators.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/objects/Group.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/objects/LOD.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/objects/Line.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/objects/LineLoop.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/objects/LineSegments.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/objects/Mesh.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/objects/Points.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/objects/Sprite.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/scenes/Fog.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/scenes/FogExp2.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/scenes/Scene.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/textures/CompressedTexture.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/textures/CubeTexture.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/textures/DepthTexture.kt (100%)
 rename {visionforge-solid/src/jsMain => visionforge-threejs/src/main}/kotlin/info/laht/threekt/textures/Texture.kt (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a158a449..a47fa13a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@
 
 ### Changed
 - Vision does not implement ItemProvider anymore. Property changes are done via `getProperty`/`setProperty` and `property` delegate.
+- Point3D and Point2D are made separate classes instead of expect/actual (to split up different engines.
+- JavaFX support moved to a separate module
+- Threejs support moved to a separate module
 
 ### Deprecated
 
diff --git a/build.gradle.kts b/build.gradle.kts
index e2a4a66a..9cc59d77 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     id("ru.mipt.npm.project")
 }
 
-val dataforgeVersion by extra("0.2.0-dev-7")
+val dataforgeVersion by extra("0.2.0-dev-8")
 val ktorVersion by extra("1.4.2")
 val htmlVersion by extra("0.7.2")
 val kotlinWrappersVersion by extra("pre.129-kotlin-1.4.10")
@@ -27,11 +27,6 @@ subprojects {
     if(name.startsWith("visionforge")) {
         apply<ru.mipt.npm.gradle.KSciencePublishPlugin>()
     }
-    afterEvaluate {
-        extensions.findByType<ru.mipt.npm.gradle.KScienceExtension>()?.run {
-            useSerialization()
-        }
-    }
 }
 
 apiValidation {
diff --git a/demo/gdml/build.gradle.kts b/demo/gdml/build.gradle.kts
index a4870646..86e8b80c 100644
--- a/demo/gdml/build.gradle.kts
+++ b/demo/gdml/build.gradle.kts
@@ -32,6 +32,7 @@ kotlin {
         jsMain {
             dependencies {
                 implementation(project(":ui:bootstrap"))
+                implementation(project(":visionforge-threejs"))
                 implementation(npm("react-file-drop", "3.0.6"))
             }
         }
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index 09ae9a66..041150c0 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -1,7 +1,6 @@
 package hep.dataforge.vision.gdml.demo
 
 import hep.dataforge.context.Context
-import hep.dataforge.meta.invoke
 import hep.dataforge.names.Name
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.bootstrap.nameCrumbs
diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts
index ba7092f0..7b4b09ef 100644
--- a/demo/muon-monitor/build.gradle.kts
+++ b/demo/muon-monitor/build.gradle.kts
@@ -49,6 +49,7 @@ kotlin {
                 implementation(project(":ui:bootstrap"))
                 implementation("io.ktor:ktor-client-js:$ktorVersion")
                 implementation("io.ktor:ktor-client-serialization:$ktorVersion")
+                implementation(project(":visionforge-threejs"))
             }
         }
     }
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
index a36379bf..8af687d9 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
@@ -1,7 +1,6 @@
 package ru.mipt.npm.muon.monitor
 
 import hep.dataforge.context.Context
-import hep.dataforge.meta.invoke
 import hep.dataforge.names.Name
 import hep.dataforge.names.NameToken
 import hep.dataforge.names.isEmpty
diff --git a/demo/sat-demo/build.gradle.kts b/demo/sat-demo/build.gradle.kts
index 0e623614..d3a7d140 100644
--- a/demo/sat-demo/build.gradle.kts
+++ b/demo/sat-demo/build.gradle.kts
@@ -17,7 +17,7 @@ kotlin {
         }
         jsMain {
             dependencies {
-
+                implementation(project(":visionforge-threejs"))
             }
         }
     }
diff --git a/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt b/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
index d3c03541..dad0e45f 100644
--- a/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
+++ b/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
@@ -3,10 +3,10 @@ package ru.mipt.npm.sat
 import hep.dataforge.context.Global
 import hep.dataforge.js.Application
 import hep.dataforge.js.startApplication
+import hep.dataforge.meta.invoke
 import hep.dataforge.vision.solid.three.ThreePlugin
 import hep.dataforge.vision.solid.three.render
 import kotlinx.browser.document
-import hep.dataforge.meta.invoke
 import org.w3c.dom.HTMLElement
 
 private class SatDemoApp : Application {
@@ -20,7 +20,7 @@ private class SatDemoApp : Application {
         )
         three.render(element, sat){
             minSize = 500
-            axes {
+            axes{
                 size = 500.0
                 visible = true
             }
diff --git a/demo/spatial-showcase/build.gradle.kts b/demo/spatial-showcase/build.gradle.kts
index 4502f7c0..f984b9b3 100644
--- a/demo/spatial-showcase/build.gradle.kts
+++ b/demo/spatial-showcase/build.gradle.kts
@@ -36,6 +36,7 @@ kotlin {
         }
         jsMain{
             dependencies {
+                implementation(project(":visionforge-threejs"))
                 implementation("org.jetbrains:kotlin-css:1.0.0-pre.129-kotlin-1.4.10")
             }
         }
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
index 983b92b7..ff610211 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
@@ -1,8 +1,6 @@
 package hep.dataforge.vision.solid.demo
 
-import hep.dataforge.meta.int
-import hep.dataforge.meta.number
-import hep.dataforge.meta.set
+import hep.dataforge.meta.*
 import hep.dataforge.names.plus
 import hep.dataforge.names.startsWith
 import hep.dataforge.values.asValue
diff --git a/playground/src/jsMain/kotlin/PlayGroundApp.kt b/playground/src/jsMain/kotlin/PlayGroundApp.kt
index d5d1ce13..a1e46705 100644
--- a/playground/src/jsMain/kotlin/PlayGroundApp.kt
+++ b/playground/src/jsMain/kotlin/PlayGroundApp.kt
@@ -1,7 +1,6 @@
 import hep.dataforge.context.Global
 import hep.dataforge.js.Application
 import hep.dataforge.js.startApplication
-import hep.dataforge.meta.invoke
 import hep.dataforge.vision.bootstrap.visionPropertyEditor
 import hep.dataforge.vision.react.ThreeCanvasComponent
 import hep.dataforge.vision.react.objectTree
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1a45cf80..b4de270e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -39,6 +39,7 @@ include(
     ":visionforge-core",
     ":visionforge-solid",
     ":visionforge-fx",
+    ":visionforge-threejs",
     ":visionforge-gdml",
     ":visionforge-server",
     ":demo:spatial-showcase",
diff --git a/ui/react/build.gradle.kts b/ui/react/build.gradle.kts
index b57cba20..ebfa3cdd 100644
--- a/ui/react/build.gradle.kts
+++ b/ui/react/build.gradle.kts
@@ -9,4 +9,5 @@ dependencies{
     api(project(":visionforge-solid"))
     api("org.jetbrains:kotlin-styled:5.2.0-$kotlinWrappersVersion")
     api("org.jetbrains:kotlin-react-dom:$reactVersion-$kotlinWrappersVersion")
+    implementation(project(":visionforge-threejs"))
 }
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
index 7b30b2c9..a0ef757f 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
@@ -1,7 +1,6 @@
 package hep.dataforge.vision.react
 
 import hep.dataforge.context.Context
-import hep.dataforge.meta.empty
 import hep.dataforge.names.Name
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
diff --git a/visionforge-core/build.gradle.kts b/visionforge-core/build.gradle.kts
index 7b2bd238..a12e4954 100644
--- a/visionforge-core/build.gradle.kts
+++ b/visionforge-core/build.gradle.kts
@@ -6,6 +6,9 @@ val dataforgeVersion: String by rootProject.extra
 val kotlinWrappersVersion: String by rootProject.extra
 val htmlVersion: String by rootProject.extra
 
+kscience{
+    useSerialization()
+}
 
 kotlin {
     sourceSets {
diff --git a/visionforge-fx/build.gradle.kts b/visionforge-fx/build.gradle.kts
index 52da9f01..c7626def 100644
--- a/visionforge-fx/build.gradle.kts
+++ b/visionforge-fx/build.gradle.kts
@@ -11,6 +11,7 @@ val fxVersion: String by rootProject.extra
 
 kscience{
     useFx(ru.mipt.npm.gradle.FXModule.CONTROLS, version = fxVersion)
+    useSerialization()
 }
 
 dependencies {
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt
index 149f9d36..69f484fd 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt
@@ -2,7 +2,6 @@ package hep.dataforge.vision.solid
 
 import hep.dataforge.context.Context
 import hep.dataforge.context.ContextAware
-import hep.dataforge.meta.empty
 import hep.dataforge.vision.layout.Output
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import javafx.application.Platform
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
index 34b7ca4d..3b7cee8a 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
@@ -104,7 +104,7 @@ public var Solid.color: String?
     }
 
 public val Solid.material: SolidMaterial?
-    get() = getProperty(MATERIAL_KEY).node?.let { SolidMaterial.wrap(it) }
+    get() = getProperty(MATERIAL_KEY).node?.let { SolidMaterial.read(it) }
 
 public fun Solid.material(builder: SolidMaterial.() -> Unit) {
     val node = config[MATERIAL_KEY].node
diff --git a/visionforge-threejs/build.gradle.kts b/visionforge-threejs/build.gradle.kts
new file mode 100644
index 00000000..612ad129
--- /dev/null
+++ b/visionforge-threejs/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+    id("ru.mipt.npm.js")
+}
+
+kscience {
+    useSerialization()
+}
+
+dependencies {
+    api(project(":visionforge-solid"))
+    implementation(npm("three", "0.122.0"))
+    implementation(npm("three-csg-ts", "1.0.6"))
+}
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt
rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt
rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt
rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt
rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt
rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt
rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
similarity index 99%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index cbe62240..fafaeb6c 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -2,8 +2,6 @@ package hep.dataforge.vision.solid.three
 
 import hep.dataforge.context.*
 import hep.dataforge.meta.Meta
-import hep.dataforge.meta.empty
-import hep.dataforge.meta.invoke
 import hep.dataforge.names.*
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.html.HtmlVisionBinding
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt
rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
similarity index 78%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
index 8c8362a0..16d90280 100644
--- a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
@@ -1,9 +1,7 @@
 package hep.dataforge.vision.solid.three
 
 import hep.dataforge.vision.solid.BasicSolid
-import hep.dataforge.vision.solid.Solid
 import info.laht.threekt.core.Object3D
-import kotlinx.serialization.Serializable
 
 /**
  * A custom visual object that has its own Three.js renderer
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/csg.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/csg.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/csg.kt
rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/csg.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/three.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/hep/dataforge/vision/solid/three/three.kt
rename to visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/three.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/THREE.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/THREE.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/THREE.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/THREE.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationAction.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationAction.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationAction.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationAction.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationClip.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationClip.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationClip.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationClip.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationMixer.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationMixer.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationMixer.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationMixer.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationUtils.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationUtils.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/AnimationUtils.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationUtils.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/KeyFrameTrack.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/Audio.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/audio/Audio.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/Audio.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/audio/Audio.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/AudioContext.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/audio/AudioContext.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/AudioContext.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/audio/AudioContext.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/AudioListener.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/audio/AudioListener.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/AudioListener.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/audio/AudioListener.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/PositionalAudio.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/audio/PositionalAudio.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/audio/PositionalAudio.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/audio/PositionalAudio.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/cameras/Camera.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/cameras/Camera.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/cameras/Camera.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/cameras/Camera.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/cameras/OrthographicCamera.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/cameras/PerspectiveCamera.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/BufferAttribute.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferAttribute.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/BufferAttribute.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferAttribute.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/BufferGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferGeometry.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/BufferGeometry.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferGeometry.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Clock.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Clock.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Clock.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Clock.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/DirectGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/DirectGeometry.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/DirectGeometry.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/DirectGeometry.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/EventDispatcher.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/EventDispatcher.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/EventDispatcher.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/EventDispatcher.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Face3.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Face3.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Face3.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Face3.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Geometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Geometry.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Geometry.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Geometry.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/InstancedBufferGeometry.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Layers.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Layers.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Layers.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Layers.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Object3D.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Object3D.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Object3D.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Object3D.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Raycaster.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Raycaster.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Raycaster.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Raycaster.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Uniform.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Uniform.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/core/Uniform.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Uniform.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/Detector.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/Detector.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/Detector.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/Detector.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/ImprovedNoise.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/ImprovedNoise.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/ImprovedNoise.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/ImprovedNoise.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/SimplexNoise.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/SimplexNoise.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/SimplexNoise.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/SimplexNoise.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/FlyControls.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/controls/FlyControls.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/FlyControls.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/controls/FlyControls.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/OrbitControls.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/controls/OrbitControls.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/OrbitControls.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/controls/OrbitControls.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/TrackballControls.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/controls/TrackballControls.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/TrackballControls.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/controls/TrackballControls.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/TransformControls.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/controls/TransformControls.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/controls/TransformControls.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/controls/TransformControls.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/exporters/OBJExporter.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/exporters/STLExporter.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/exporters/STLExporter.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/exporters/STLExporter.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/exporters/STLExporter.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/geometries/ConvexGeometry.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/libs/GUIParams.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/libs/GUIParams.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/libs/GUIParams.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/libs/GUIParams.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/libs/Stats.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/libs/Stats.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/libs/Stats.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/libs/Stats.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/libs/datgui.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/libs/datgui.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/libs/datgui.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/libs/datgui.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/BabylonLoader.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/GLTFLoader.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/LoaderSupport.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/MTLLoader.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/OBJLoader.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/OBJLoader2.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/STLLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/STLLoader.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/loaders/STLLoader.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/loaders/STLLoader.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/objects/Sky.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/objects/Sky.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/objects/Sky.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/objects/Sky.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/objects/Water.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/objects/Water.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/objects/Water.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/objects/Water.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/objects/WaterOptions.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/external/objects/WaterOptions.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/external/objects/WaterOptions.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/external/objects/WaterOptions.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/SceneUtils.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/SceneUtils.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/SceneUtils.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/SceneUtils.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/Curve.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/Curve.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/Curve.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/Curve.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/CurvePath.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/CurvePath.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/CurvePath.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/CurvePath.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/Path.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/Path.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/Path.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/Path.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/Shape.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/Shape.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/Shape.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/Shape.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/ShapePath.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/ShapePath.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/core/ShapePath.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/core/ShapePath.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/ArcCurve.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/CatmullRomCurve3.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/EllipseCurve.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/LineCurve.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/LineCurve.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/LineCurve3.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/QuadricBezierCurve3.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/extras/curves/SplineCurve.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/BoxGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/BoxGeometry.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/BoxGeometry.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/BoxGeometry.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/ConeGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/ConeGeometry.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/ConeGeometry.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/ConeGeometry.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/SphereGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/SphereGeometry.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/SphereGeometry.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/SphereGeometry.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/TorusGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TorusGeometry.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/TorusGeometry.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TorusGeometry.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/TubeGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TubeGeometry.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/TubeGeometry.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TubeGeometry.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/ArrowHelper.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/ArrowHelper.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/ArrowHelper.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/ArrowHelper.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/AxesHelper.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/AxesHelper.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/AxesHelper.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/AxesHelper.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/Box3Helper.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/Box3Helper.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/Box3Helper.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/Box3Helper.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/CameraHelper.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/CameraHelper.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/CameraHelper.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/CameraHelper.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/GridHelper.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/GridHelper.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/GridHelper.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/GridHelper.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/ktutils.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/ktutils.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/ktutils.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/ktutils.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/AmbientLight.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/AmbientLight.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/AmbientLight.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/AmbientLight.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLight.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/DirectionalLight.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLight.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/DirectionalLight.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/DirectionalLightShadow.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/HemiSphereLight.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/HemiSphereLight.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/HemiSphereLight.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/HemiSphereLight.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/Light.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/Light.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/Light.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/Light.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/LightShadow.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/LightShadow.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/LightShadow.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/LightShadow.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/PointLight.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/PointLight.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/PointLight.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/PointLight.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/SpotLight.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/SpotLight.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/SpotLight.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/SpotLight.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/SpotLightShadow.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/SpotLightShadow.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/lights/SpotLightShadow.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/SpotLightShadow.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/Cache.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/Cache.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/Cache.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/Cache.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/CompressedTextureLoader.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/ImageLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/ImageLoader.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/ImageLoader.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/ImageLoader.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/JSONLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/JSONLoader.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/JSONLoader.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/JSONLoader.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/Loader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/Loader.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/Loader.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/Loader.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/LoadingManager.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/LoadingManager.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/LoadingManager.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/LoadingManager.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/MaterialLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/MaterialLoader.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/MaterialLoader.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/MaterialLoader.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/TextureLoader.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/TextureLoader.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/loaders/TextureLoader.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/loaders/TextureLoader.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/LineBasicMaterial.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/LineDashedMaterial.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/Material.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/Material.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/Material.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/Material.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshBasicMaterial.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshDepthMaterial.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshLambertMaterial.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshNormalMaterial.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshPhongMaterial.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshPhysicalMaterial.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/MeshStandardMaterial.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/PointsMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/PointsMaterial.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/PointsMaterial.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/PointsMaterial.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/RawShaderMaterial.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/ShaderMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/ShaderMaterial.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/ShaderMaterial.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/ShaderMaterial.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/SpriteMaterial.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/SpriteMaterial.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/materials/SpriteMaterial.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/SpriteMaterial.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Box2.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Box2.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Box2.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Box2.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Box3.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Box3.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Box3.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Box3.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Color.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Color.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Color.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Color.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/ColorConstants.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/ColorConstants.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/ColorConstants.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/ColorConstants.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Cylindrical.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Cylindrical.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Cylindrical.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Cylindrical.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Euler.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Euler.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Euler.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Euler.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Frustrum.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Frustrum.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Frustrum.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Frustrum.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Line3.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Line3.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Line3.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Line3.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Math.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Math.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Math.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Math.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Matrix3.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Matrix3.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Matrix3.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Matrix3.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Matrix4.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Matrix4.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Matrix4.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Matrix4.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Plane.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Plane.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Plane.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Plane.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Quaternion.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Quaternion.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Quaternion.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Quaternion.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Ray.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Ray.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Ray.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Ray.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Sphere.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Sphere.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Sphere.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Sphere.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Spherical.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Spherical.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Spherical.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Spherical.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Triangle.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Triangle.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Triangle.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Triangle.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Vector2.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Vector2.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Vector2.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Vector2.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Vector3.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Vector3.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Vector3.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Vector3.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Vector4.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Vector4.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/Vector4.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Vector4.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/operators.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/operators.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/math/operators.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/math/operators.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Group.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Group.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Group.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Group.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LOD.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/LOD.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LOD.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/LOD.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Line.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Line.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Line.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Line.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LineLoop.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/LineLoop.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LineLoop.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/LineLoop.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LineSegments.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/LineSegments.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/LineSegments.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/LineSegments.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Mesh.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Mesh.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Mesh.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Mesh.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Points.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Points.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Points.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Points.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Sprite.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Sprite.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/objects/Sprite.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Sprite.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGL2Renderer.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGL2RendererParams.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRenderTarget.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRenderTargetOptions.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRendererParams.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/shaders/ShaderChunk.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/shaders/ShaderLib.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/shaders/UniformsUtil.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/scenes/Fog.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/scenes/Fog.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/scenes/Fog.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/scenes/Fog.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/scenes/FogExp2.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/scenes/FogExp2.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/scenes/FogExp2.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/scenes/FogExp2.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/scenes/Scene.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/scenes/Scene.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/scenes/Scene.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/scenes/Scene.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/CompressedTexture.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/textures/CompressedTexture.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/CompressedTexture.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/textures/CompressedTexture.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/CubeTexture.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/textures/CubeTexture.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/CubeTexture.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/textures/CubeTexture.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/DepthTexture.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/textures/DepthTexture.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/DepthTexture.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/textures/DepthTexture.kt
diff --git a/visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/Texture.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/textures/Texture.kt
similarity index 100%
rename from visionforge-solid/src/jsMain/kotlin/info/laht/threekt/textures/Texture.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/textures/Texture.kt

From a44e8091c86bc4e826952bac4225ff85226b71d2 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 21 Nov 2020 11:21:27 +0300
Subject: [PATCH 034/151] Fix serialization in MM demo

---
 demo/muon-monitor/build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts
index 7b4b09ef..57727447 100644
--- a/demo/muon-monitor/build.gradle.kts
+++ b/demo/muon-monitor/build.gradle.kts
@@ -10,6 +10,7 @@ group = "ru.mipt.npm"
 val ktorVersion: String by rootProject.extra
 
 kscience {
+    useSerialization()
     application()
 }
 

From 5e340aa1792ecce1317a0a4d7b7868c240a83e58 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 21 Nov 2020 14:47:29 +0300
Subject: [PATCH 035/151] Fix showcase-js

---
 .../vision/gdml/demo/GdmlJsDemoApp.kt         | 11 -----
 .../hep/dataforge/vision/solid/demo/demo.kt   |  2 +-
 .../vision/solid/demo/ThreeDemoApp.kt         |  3 --
 .../vision/solid/demo/ThreeDemoGrid.kt        | 42 +++++++++----------
 .../src/jsMain/resources/index.html           |  7 ++--
 .../src/jsMain/resources/styles.css           |  4 ++
 .../vision/solid/three/ThreeCanvas.kt         | 33 ++++++++-------
 7 files changed, 47 insertions(+), 55 deletions(-)
 create mode 100644 demo/spatial-showcase/src/jsMain/resources/styles.css

diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
index cfb23cd5..67df999f 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
@@ -5,25 +5,14 @@ import hep.dataforge.js.Application
 import hep.dataforge.js.startApplication
 import hep.dataforge.vision.gdml.toVision
 import kotlinx.browser.document
-import kotlinx.css.*
 import react.child
 import react.dom.render
-import styled.injectGlobal
 
 
 private class GDMLDemoApp : Application {
 
     override fun start(state: Map<String, Any>) {
 
-        injectGlobal {
-            body {
-                height = 100.pct
-                width = 100.pct
-                margin(0.px)
-                padding(0.px)
-            }
-        }
-
         val context = Global.context("demo") {}
         val element = document.getElementById("app") ?: error("Element with id 'app' not found on page")
 
diff --git a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
index f1618b8b..07f18e4d 100644
--- a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
+++ b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
@@ -24,7 +24,7 @@ fun Page<Solid>.demo(name: String, title: String = name, block: SolidGroup.() ->
 }
 
 val canvasOptions = Canvas3DOptions {
-    minSize = 600
+    minSize = 400
     axes {
         size = 500.0
         visible = true
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
index 206dbb2b..ba76b024 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
@@ -40,10 +40,7 @@ private class ThreeDemoApp : Application {
                 }
             }
         }
-
-
     }
-
 }
 
 fun main() {
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
index 10dde984..a53a4529 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
@@ -10,18 +10,17 @@ import hep.dataforge.vision.layout.Page
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.three.ThreeCanvas
 import hep.dataforge.vision.solid.three.ThreePlugin
+import kotlinx.browser.document
 import kotlinx.dom.clear
 import kotlinx.html.dom.append
 import kotlinx.html.id
 import kotlinx.html.js.*
-import kotlinx.html.role
+import kotlinx.html.style
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLDivElement
 import org.w3c.dom.HTMLElement
 
 class ThreeDemoGrid(element: Element, idPrefix: String = "") : Page<Solid> {
-
-
     private lateinit var navigationElement: HTMLElement
     private lateinit var contentElement: HTMLDivElement
 
@@ -32,48 +31,47 @@ class ThreeDemoGrid(element: Element, idPrefix: String = "") : Page<Solid> {
     init {
         element.clear()
         element.append {
-            div("container") {
-                navigationElement = ul("nav nav-tabs") {
-                    id = "${idPrefix}Tab"
-                    role = "tablist"
+            nav("navbar navbar-expand-md navbar-dark fixed-top bg-dark") {
+                a(classes = "navbar-brand") {
+                    href = "#"
+                    +"Demo grid"
                 }
-                contentElement = div("tab-content") {
-                    id = "${idPrefix}TabContent"
+                div("navbar-collapse collapse") {
+                    id = "navbar"
+                    navigationElement = ul("nav navbar-nav")
                 }
             }
+            contentElement = div {
+                id = "content"
+            }
         }
     }
 
 
     @Suppress("UNCHECKED_CAST")
     override fun output(name: Name, meta: Meta): Output<Solid> = outputs.getOrPut(name) {
-        lateinit var output: ThreeCanvas
         navigationElement.append {
             li("nav-item") {
                 a(classes = "nav-link") {
-                    id = "tab[$name]"
-                    attributes["data-toggle"] = "tab"
                     href = "#$name"
-                    role = "tab"
-                    attributes["aria-controls"] = "$name"
-                    attributes["aria-selected"] = "false"
                     +name.toString()
                 }
             }
         }
         contentElement.append {
-            div("tab-pane fade col") {
+            div("container") {
                 id = name.toString()
-                role = "tabpanel"
-                attributes["aria-labelledby"] = "tab[$name]"
-                div { id = "output-$name" }.also { element ->
-                    output = three.createCanvas(element, canvasOptions)
-                }
                 hr()
                 h2 { +(meta["title"].string ?: name.toString()) }
+                hr()
+                div {
+                    style = "height: 600px;"
+                    id = "output-$name"
+                }
             }
         }
-        output
+        val element = document.getElementById("output-$name") ?: error("Element not found")
+        three.createCanvas(element, canvasOptions)
     }
 }
 
diff --git a/demo/spatial-showcase/src/jsMain/resources/index.html b/demo/spatial-showcase/src/jsMain/resources/index.html
index f3f04915..fbdb962d 100644
--- a/demo/spatial-showcase/src/jsMain/resources/index.html
+++ b/demo/spatial-showcase/src/jsMain/resources/index.html
@@ -2,18 +2,17 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+<!--    <meta name="viewport" content="width=device-width,initial-scale=1, shrink-to-fit=no">-->
     <title>Three js demo for particle physics</title>
     <!-- CSS -->
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css"
           integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
 
+    <link rel="stylesheet" href="styles.css">
+
     <script type="text/javascript" src="spatial-showcase.js"></script>
 </head>
 <body class="application">
-<div class="container">
-    <h1>Demo grid</h1>
-</div>
 <div class="container" id="demo"></div>
 
 <!-- jQuery and JS bundle w/ Popper.js -->
diff --git a/demo/spatial-showcase/src/jsMain/resources/styles.css b/demo/spatial-showcase/src/jsMain/resources/styles.css
new file mode 100644
index 00000000..84f60dba
--- /dev/null
+++ b/demo/spatial-showcase/src/jsMain/resources/styles.css
@@ -0,0 +1,4 @@
+body{
+    min-height: 75rem;
+    padding-top: 4.5rem;
+}
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
index ebdf950a..11fffe88 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
@@ -59,11 +59,22 @@ public class ThreeCanvas(
 
     private var picked: Object3D? = null
 
-    private val renderer = WebGLRenderer { antialias = true }.apply {
+    private val renderer = WebGLRenderer {
+        antialias = true
+    }.apply {
         setClearColor(Colors.skyblue, 1)
     }
 
-    public val canvas: HTMLCanvasElement = renderer.domElement as HTMLCanvasElement
+    private val canvas = (renderer.domElement as HTMLCanvasElement).apply {
+        width = 600
+        height = 600
+        style.apply {
+            width = "100%"
+            height = "100%"
+            display = "block"
+        }
+    }
+
 
     /**
      * Force camera aspect ration and renderer size recalculation
@@ -71,6 +82,12 @@ public class ThreeCanvas(
     public fun updateSize() {
         val width = canvas.clientWidth
         val height = canvas.clientHeight
+        canvas.style.apply {
+            minWidth = "${options.minWith.toInt()}px"
+            maxWidth = "${options.maxWith.toInt()}px"
+            minHeight = "${options.minHeight.toInt()}px"
+            maxHeight = "${options.maxHeight.toInt()}px"
+        }
         renderer.setSize(width, height, false)
         camera.aspect = width.toDouble() / height.toDouble()
         camera.updateProjectionMatrix()
@@ -94,18 +111,6 @@ public class ThreeCanvas(
             }
         }, false)
 
-
-        canvas.style.apply {
-            width = "100%"
-            minWidth = "${options.minWith.toInt()}px"
-            maxWidth = "${options.maxWith.toInt()}px"
-            height = "100%"
-            minHeight = "${options.minHeight.toInt()}px"
-            maxHeight = "${options.maxHeight.toInt()}px"
-            display = "block"
-        }
-
-
         canvas.onresize = {
             updateSize()
         }

From 2be4576495c5f83739de09840bac4be2c6bf829d Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 21 Nov 2020 20:30:42 +0300
Subject: [PATCH 036/151] UI cleanup

---
 .../vision/gdml/demo/GDMLAppComponent.kt      | 28 ++++++-------
 .../vision/gdml/demo/GdmlJsDemoApp.kt         |  3 +-
 demo/gdml/src/jsMain/resources/index.html     |  7 ++--
 .../mipt/npm/muon/monitor/MMAppComponent.kt   | 25 ++++++------
 .../ru/mipt/npm/muon/monitor/MMDemoApp.kt     |  3 +-
 .../src/jsMain/resources/index.html           |  7 ++--
 .../vision/react/ThreeCanvasComponent.kt      |  8 ++--
 .../vision/solid/three/ThreePlugin.kt         |  1 +
 .../hep/dataforge/vision/solid/three/csg.kt   | 39 +++++++------------
 .../hep/dataforge/vision/solid/three/three.kt |  7 ++--
 10 files changed, 57 insertions(+), 71 deletions(-)

diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index 041150c0..e575e103 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -3,19 +3,18 @@ package hep.dataforge.vision.gdml.demo
 import hep.dataforge.context.Context
 import hep.dataforge.names.Name
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.bootstrap.gridRow
 import hep.dataforge.vision.bootstrap.nameCrumbs
 import hep.dataforge.vision.bootstrap.threeControls
 import hep.dataforge.vision.gdml.toVision
 import hep.dataforge.vision.react.ThreeCanvasComponent
 import hep.dataforge.vision.react.flexColumn
-import hep.dataforge.vision.react.flexRow
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.SolidManager
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.solid.three.ThreeCanvas
 import kotlinx.browser.window
 import kotlinx.css.*
-import kotlinx.css.properties.border
 import kscience.gdml.GDML
 import kscience.gdml.decodeFromString
 import org.w3c.files.FileReader
@@ -69,25 +68,22 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
         vision = parsedVision
     }
 
-    flexRow {
-        css {
-            height = 100.vh - 35.px
-            width = 100.vw - 35.px
-            //flexWrap = FlexWrap.wrap
-        }
+    gridRow {
         flexColumn {
-            css {
-                flex(1.0, 1.0, FlexBasis.auto)
+            css{
+                +"col-lg-9"
+                height = 100.vh
             }
             styledDiv {
                 css {
+                    +"mx-auto"
                     +"page-header"
-                    +"justify-content-center"
                 }
                 h1 { +"GDML/JSON loader demo" }
             }
             nameCrumbs(selected, "World", onSelect)
             //canvas
+
             child(ThreeCanvasComponent) {
                 attrs {
                     this.context = props.context
@@ -105,11 +101,11 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
         }
         flexColumn {
             css {
-                minWidth = 400.px
-                height = 100.pct
-                margin(left = 4.px, right = 4.px, top = 4.px)
-                border(1.px, BorderStyle.solid, Color.lightGray)
-                flex(0.0,1.0, FlexBasis.zero)
+                +"col-lg-3"
+                padding(top = 4.px)
+                //border(1.px, BorderStyle.solid, Color.lightGray)
+                height = 100.vh
+                overflowY = Overflow.auto
             }
             fileDrop("(drag file here)") { files ->
                 val file = files?.get(0)
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
index 67df999f..352d645c 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
@@ -12,10 +12,9 @@ import react.dom.render
 private class GDMLDemoApp : Application {
 
     override fun start(state: Map<String, Any>) {
-
-        val context = Global.context("demo") {}
         val element = document.getElementById("app") ?: error("Element with id 'app' not found on page")
 
+        val context = Global.context("demo") {}
         render(element) {
             child(GDMLApp) {
                 attrs {
diff --git a/demo/gdml/src/jsMain/resources/index.html b/demo/gdml/src/jsMain/resources/index.html
index 74e27a96..0e663f1d 100644
--- a/demo/gdml/src/jsMain/resources/index.html
+++ b/demo/gdml/src/jsMain/resources/index.html
@@ -8,10 +8,11 @@
     <link rel="stylesheet" href="css/main.css">
     <link rel="stylesheet" href="css/fileDrop.css">
     <script type="text/javascript" src="gdml.js"></script>
-    <script type="text/javascript" src ="js/jquery-3.4.1.min.js"></script>
-    <script type="text/javascript" src ="js/bootstrap.bundle.min.js"></script>
 </head>
 <body class="application">
-<div class="container-fluid" id = "app"> </div>
+<div class="container-fluid max-vh-100" id = "app"> </div>
+
+<script type="text/javascript" src ="js/jquery-3.4.1.min.js"></script>
+<script type="text/javascript" src ="js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
index 8af687d9..37220400 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
@@ -8,8 +8,10 @@ import hep.dataforge.names.length
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.bootstrap.canvasControls
 import hep.dataforge.vision.bootstrap.card
+import hep.dataforge.vision.bootstrap.gridRow
 import hep.dataforge.vision.react.ThreeCanvasComponent
 import hep.dataforge.vision.react.configEditor
+import hep.dataforge.vision.react.flexColumn
 import hep.dataforge.vision.react.objectTree
 import hep.dataforge.vision.solid.specifications.Camera
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
@@ -55,14 +57,14 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
 
     val root = props.model.root
 
-    div("row") {
-        styledDiv {
+    gridRow{
+        flexColumn {
             css {
                 +"col-lg-3"
+                +"order-lg-1"
+                +"order-2"
                 padding(0.px)
                 overflowY = Overflow.auto
-                display = Display.flex
-                flexDirection = FlexDirection.column
                 height = 100.vh
             }
             //tree
@@ -73,14 +75,14 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                 objectTree(root, selected, onSelect)
             }
         }
-        styledDiv {
+        flexColumn {
             css {
                 +"col-lg-6"
-                display = Display.flex
-                flexDirection = FlexDirection.column
+                +"order-lg-2"
+                +"order-1"
                 height = 100.vh
             }
-            h1("mx-auto") {
+            h1("mx-auto page-header") {
                 +"Muon monitor demo"
             }
             //canvas
@@ -89,22 +91,21 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                 attrs {
                     this.context = props.context
                     this.obj = root
+                    this.selected = selected
                     this.options = canvasConfig.apply {
                         this.onSelect = onSelect
                     }
-                    this.selected = selected
                     this.canvasCallback = {
                         canvas = it
                     }
                 }
             }
         }
-        styledDiv {
+        flexColumn {
             css {
                 +"col-lg-3"
+                +"order-3"
                 padding(0.px)
-                display = Display.flex
-                flexDirection = FlexDirection.column
                 height = 100.vh
             }
             styledDiv {
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
index 1d3ea8cd..0ca23130 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
@@ -21,10 +21,9 @@ private class MMDemoApp : Application {
     }
 
     override fun start(state: Map<String, Any>) {
-
-        val context = Global.context("demo") {}
         val element = document.getElementById("app") ?: error("Element with id 'app' not found on page")
 
+        val context = Global.context("demo") {}
         render(element) {
             child(MMApp) {
                 attrs {
diff --git a/demo/muon-monitor/src/jsMain/resources/index.html b/demo/muon-monitor/src/jsMain/resources/index.html
index f7d59058..4e8cf959 100644
--- a/demo/muon-monitor/src/jsMain/resources/index.html
+++ b/demo/muon-monitor/src/jsMain/resources/index.html
@@ -7,10 +7,11 @@
     <link rel="stylesheet" href="css/bootstrap.min.css">
     <link rel="stylesheet" href="css/main.css">
     <script type="text/javascript" src="muon-monitor.js"></script>
-    <script type="text/javascript" src ="js/jquery-3.4.1.min.js"></script>
-    <script type="text/javascript" src ="js/bootstrap.bundle.min.js"></script>
 </head>
 <body class="application">
-<div class="container-fluid min-vh-100" id = "app"> </div>
+<div class="container-fluid max-vh-100" id = "app"> </div>
+
+<script type="text/javascript" src ="js/jquery-3.4.1.min.js"></script>
+<script type="text/javascript" src ="js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
index a0ef757f..aa78a0fb 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
@@ -6,7 +6,8 @@ import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.solid.three.ThreeCanvas
 import hep.dataforge.vision.solid.three.ThreePlugin
-import kotlinx.css.*
+import kotlinx.css.Display
+import kotlinx.css.display
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
 import react.*
@@ -57,10 +58,7 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
 
     styledDiv {
         css {
-            display = Display.inherit
-            width = 100.pct
-            height = 100.pct
-            flex(1.0, 1.0, FlexBasis.auto)
+            display = Display.contents
         }
         ref = elementRef
     }
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index fafaeb6c..a0f173b9 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -54,6 +54,7 @@ public class ThreePlugin : AbstractPlugin(), HtmlVisionBinding<Solid> {
                             group[token] = object3D
                         } catch (ex: Throwable) {
                             logger.error(ex) { "Failed to render $child" }
+                            ex.printStackTrace()
                         }
                     }
                 }
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/csg.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/csg.kt
index a67d5439..af99f66e 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/csg.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/csg.kt
@@ -1,26 +1,17 @@
-@file:JsModule("three-csg-ts")
-@file:JsNonModule
-@file:Suppress(
-    "INTERFACE_WITH_SUPERCLASS",
+@file:Suppress("INTERFACE_WITH_SUPERCLASS",
     "OVERRIDING_FINAL_MEMBER",
     "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
     "CONFLICTING_OVERLOADS",
-    "EXTERNAL_DELEGATION",
-    "NESTED_CLASS_IN_EXTERNAL_INTERFACE"
-)
-
-package hep.dataforge.vision.solid.three
+    "EXTERNAL_DELEGATION")
 
+@file:JsModule("three-csg-ts")
+@file:JsNonModule
 
 import info.laht.threekt.math.Matrix4
 import info.laht.threekt.math.Vector3
 import info.laht.threekt.objects.Mesh
 
-/**
- * Constructive Solid Geometry
- */
-open external class CSG {
-    open var polygons: Array<Polygon>
+external open class CSG {
     open fun clone(): CSG
     open fun toPolygons(): Array<Polygon>
     open fun union(csg: CSG): CSG
@@ -33,7 +24,7 @@ open external class CSG {
         fun fromGeometry(geom: Any): CSG
         fun fromMesh(mesh: Mesh): CSG
         fun toMesh(csg: CSG, toMatrix: Matrix4): Mesh
-        fun iEval(tokens: Mesh, index: Number? = definedExternally /* null */): Unit
+        fun iEval(tokens: Mesh, index: Number? = definedExternally)
         fun eval(tokens: Mesh, doRemove: Boolean): Mesh
         var _tmpm3: Any
         var doRemove: Any
@@ -44,7 +35,7 @@ open external class CSG {
     }
 }
 
-open external class Vector(x: Number, y: Number, z: Number): Vector3 {
+external open class Vector(x: Number, y: Number, z: Number) : Vector3 {
     open fun negated(): Vector
     open fun plus(a: Vector): Vector
     open fun minus(a: Vector): Vector
@@ -61,27 +52,27 @@ external interface IVector {
     var z: Number
 }
 
-open external class Vertex(pos: IVector, normal: IVector, uv: IVector) {
+external open class Vertex(pos: IVector, normal: IVector, uv: IVector? = definedExternally) {
     open var pos: Vector
     open var normal: Vector
     open var uv: Vector
     open fun clone(): Vertex
-    open fun flip(): Unit
+    open fun flip()
     open fun interpolate(other: Vertex, t: Number): Vertex
 }
 
-open external class Plane(normal: Vector, w: Number) {
+external open class Plane(normal: Vector, w: Number) {
     open var normal: Vector
     open var w: Number
     open fun clone(): Plane
-    open fun flip(): Unit
+    open fun flip()
     open fun splitPolygon(
         polygon: Polygon,
         coplanarFront: Array<Polygon>,
         coplanarBack: Array<Polygon>,
         front: Array<Polygon>,
-        back: Array<Polygon>
-    ): Unit
+        back: Array<Polygon>,
+    )
 
     companion object {
         fun fromPoints(a: Vector, b: Vector, c: Vector): Plane
@@ -89,10 +80,10 @@ open external class Plane(normal: Vector, w: Number) {
     }
 }
 
-open external class Polygon(vertices: Array<Vertex>, shared: Any? = definedExternally /* null */) {
+external open class Polygon(vertices: Array<Vertex>, shared: Any? = definedExternally) {
     open var plane: Plane
     open var vertices: Array<Vertex>
     open var shared: Any
     open fun clone(): Polygon
-    open fun flip(): Unit
+    open fun flip()
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/three.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/three.kt
index c0a739e9..862960a9 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/three.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/three.kt
@@ -1,5 +1,6 @@
 package hep.dataforge.vision.solid.three
 
+import CSG
 import hep.dataforge.meta.MetaItem
 import hep.dataforge.meta.float
 import hep.dataforge.meta.get
@@ -22,15 +23,13 @@ public fun Geometry.toBufferGeometry(): BufferGeometry = BufferGeometry().apply
 
 internal fun Double.toRadians() = this * PI / 180
 
-internal val ZERO = Vector3(0,0,0)
-
 public fun CSG.toGeometry(): Geometry {
     val geom = Geometry()
 
     val vertices = ArrayList<Vector3>()
     val faces = ArrayList<Face3>()
 
-    for (polygon in polygons) {
+    for (polygon in toPolygons()) {
         val v0 = vertices.size
         val pvs = polygon.vertices
 
@@ -39,7 +38,7 @@ public fun CSG.toGeometry(): Geometry {
         }
 
         for (j in 3..polygon.vertices.size) {
-            val fc = Face3(v0, v0 + j - 2, v0 + j - 1, ZERO)
+            val fc = Face3(v0, v0 + j - 2, v0 + j - 1, Vector3())
             fc.vertexNormals = arrayOf(
                 Vector3().copy(pvs[0].normal),
                 Vector3().copy(pvs[j - 2].normal),

From ebb7bf72d124b4f391b71f7b47ec35f08cb022dd Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 22 Nov 2020 21:44:03 +0300
Subject: [PATCH 037/151] First server iteration.

---
 .../vision/html/BindingHtmlOutputScope.kt     |  11 +-
 .../dataforge/vision/html/HtmlOutputScope.kt  |  25 +-
 .../vision/html/HtmlVisionFragment.kt         |  18 +-
 .../vision/html/StaticHtmlOutputScope.kt      |   2 +-
 .../vision/html/DynamicHtmlOutputContext.kt   |  31 --
 .../dataforge/vision/html/elementOutput.kt    |  53 +++
 .../dataforge/vision/server/VisionServer.kt   | 410 +++++++++---------
 visionforge-solid/build.gradle.kts            |   6 -
 .../vision/solid/three/ThreePlugin.kt         |   6 +-
 9 files changed, 301 insertions(+), 261 deletions(-)
 delete mode 100644 visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/html/DynamicHtmlOutputContext.kt
 create mode 100644 visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/html/elementOutput.kt

diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingHtmlOutputScope.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingHtmlOutputScope.kt
index 069d5635..9ee0555c 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingHtmlOutputScope.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingHtmlOutputScope.kt
@@ -2,12 +2,13 @@ package hep.dataforge.vision.html
 
 import hep.dataforge.names.Name
 import hep.dataforge.vision.Vision
+import kotlinx.html.FlowContent
 import kotlinx.html.TagConsumer
 
 public class BindingHtmlOutputScope<T, V : Vision>(
     root: TagConsumer<T>,
     prefix: String? = null,
-) : HtmlOutputScope<T, V>(root,prefix) {
+) : HtmlOutputScope<T, V>(root, prefix) {
 
     private val _bindings = HashMap<Name, V>()
     public val bindings: Map<Name, V> get() = _bindings
@@ -15,4 +16,12 @@ public class BindingHtmlOutputScope<T, V : Vision>(
     override fun renderVision(htmlOutput: HtmlOutput<V>, vision: V) {
         _bindings[htmlOutput.name] = vision
     }
+}
+
+public fun <T : Any> TagConsumer<T>.visionFragment(fragment: HtmlVisionFragment<Vision>): Map<Name, Vision> {
+    return BindingHtmlOutputScope<T, Vision>(this).apply(fragment.content).bindings
+}
+
+public fun FlowContent.visionFragment(fragment: HtmlVisionFragment<Vision>): Map<Name, Vision> {
+    return BindingHtmlOutputScope<Any?, Vision>(consumer).apply(fragment.content).bindings
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt
index 28bd6c49..c04ef207 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt
@@ -3,10 +3,7 @@ package hep.dataforge.vision.html
 import hep.dataforge.names.Name
 import hep.dataforge.names.toName
 import hep.dataforge.vision.Vision
-import kotlinx.html.DIV
-import kotlinx.html.TagConsumer
-import kotlinx.html.div
-import kotlinx.html.id
+import kotlinx.html.*
 
 public class HtmlOutput<V : Vision>(
     public val outputScope: HtmlOutputScope<*, V>,
@@ -28,7 +25,9 @@ public abstract class HtmlOutputScope<R, V : Vision>(
         name: Name,
         crossinline block: HtmlOutput<V>.() -> Unit = {},
     ): T = div {
-        this.id = resolveId(name)
+        id = resolveId(name)
+        classes = setOf(OUTPUT_CLASS)
+        attributes[NAME_ATTRIBUTE] = name.toString()
         @Suppress("UNCHECKED_CAST")
         HtmlOutput(this@HtmlOutputScope, name, this).block()
     }
@@ -49,4 +48,20 @@ public abstract class HtmlOutputScope<R, V : Vision>(
             renderVision(this, vision)
         }
     }
+
+    /**
+     * Process the resulting object produced by [TagConsumer]
+     */
+    protected open fun processResult(result: R) {
+        //do nothing by default
+    }
+
+    override fun finalize(): R {
+        return root.finalize().also { processResult(it) }
+    }
+
+    public companion object {
+        public const val OUTPUT_CLASS: String = "visionforge-output"
+        public const val NAME_ATTRIBUTE: String = "data-output-name"
+    }
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
index d0140d39..bddff870 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
@@ -1,8 +1,20 @@
 package hep.dataforge.vision.html
 
 import hep.dataforge.vision.Vision
+import kotlinx.html.FlowContent
+import kotlinx.html.TagConsumer
 
-public class HtmlVisionFragment<V : Vision>(public val layout: HtmlOutputScope<out Any, V>.() -> Unit)
+public class HtmlFragment(public val content: TagConsumer<*>.() -> Unit)
 
-public fun buildVisionFragment(visit: HtmlOutputScope<out Any, Vision>.() -> Unit): HtmlVisionFragment<Vision> =
-    HtmlVisionFragment(visit)
+public fun TagConsumer<*>.fragment(fragment: HtmlFragment) {
+    fragment.content(this)
+}
+
+public fun FlowContent.fragment(fragment: HtmlFragment) {
+    fragment.content(consumer)
+}
+
+public class HtmlVisionFragment<V : Vision>(public val content: HtmlOutputScope<*, V>.() -> Unit)
+
+public fun buildVisionFragment(block: HtmlOutputScope<*, Vision>.() -> Unit): HtmlVisionFragment<Vision> =
+    HtmlVisionFragment(block)
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticHtmlOutputScope.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticHtmlOutputScope.kt
index 02aea7d3..b07c575c 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticHtmlOutputScope.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticHtmlOutputScope.kt
@@ -22,7 +22,7 @@ public fun <T : Any> HtmlVisionFragment<Vision>.renderToObject(
     root: TagConsumer<T>,
     prefix: String? = null,
     renderer: HtmlVisionRenderer<Vision>,
-): T = StaticHtmlOutputScope(root, prefix, renderer).apply(layout).finalize()
+): T = StaticHtmlOutputScope(root, prefix, renderer).apply(content).finalize()
 
 public fun HtmlVisionFragment<Vision>.renderToString(renderer: HtmlVisionRenderer<Vision>): String =
     renderToObject(createHTML(), null, renderer)
\ No newline at end of file
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/html/DynamicHtmlOutputContext.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/html/DynamicHtmlOutputContext.kt
deleted file mode 100644
index 573055a0..00000000
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/html/DynamicHtmlOutputContext.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package hep.dataforge.vision.html
-
-import hep.dataforge.vision.Vision
-import kotlinx.browser.document
-import kotlinx.html.TagConsumer
-import org.w3c.dom.Element
-import org.w3c.dom.HTMLElement
-
-public interface HtmlVisionBinding<in V: Vision>{
-    public fun bind(element: Element, vision: V): Unit
-}
-
-public fun <V: Vision> Map<String, V>.bind(binder: HtmlVisionBinding<V>){
-    forEach { (id, vision) ->
-        val element = document.getElementById(id) ?: error("Could not find element with id $id")
-        binder.bind(element, vision)
-    }
-}
-
-public fun HtmlVisionFragment<Vision>.bindToDocument(
-    root: TagConsumer<HTMLElement>,
-    binder: HtmlVisionBinding<Vision>,
-): HTMLElement = BindingHtmlOutputScope<HTMLElement, Vision>(root).apply(layout).let { scope ->
-    scope.finalize().apply {
-        scope.bindings.forEach { (name, vision) ->
-            val id = scope.resolveId(name)
-            val element = document.getElementById(id) ?: error("Could not find element with name $name and id $id")
-            binder.bind(element, vision)
-        }
-    }
-}
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/html/elementOutput.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/html/elementOutput.kt
new file mode 100644
index 00000000..2a9f60c0
--- /dev/null
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/html/elementOutput.kt
@@ -0,0 +1,53 @@
+package hep.dataforge.vision.html
+
+import hep.dataforge.names.Name
+import hep.dataforge.names.toName
+import hep.dataforge.vision.Vision
+import kotlinx.browser.document
+import kotlinx.html.TagConsumer
+import org.w3c.dom.*
+
+public interface ElementVisionRenderer<in V : Vision> {
+    public fun render(element: Element, vision: V): Unit
+}
+
+public fun <V : Vision> Map<String, V>.bind(renderer: ElementVisionRenderer<V>) {
+    forEach { (id, vision) ->
+        val element = document.getElementById(id) ?: error("Could not find element with id $id")
+        renderer.render(element, vision)
+    }
+}
+
+public fun <V : Vision> Element.renderVisions(renderer: ElementVisionRenderer<V>, visionProvider: (Name) -> V?) {
+    val elements = getElementsByClassName(HtmlOutputScope.OUTPUT_CLASS)
+    elements.asList().forEach { element ->
+        val name = element.attributes[HtmlOutputScope.NAME_ATTRIBUTE]?.value
+        if (name == null) {
+            console.error("Attribute ${HtmlOutputScope.NAME_ATTRIBUTE} not defined in the output element")
+            return@forEach
+        }
+        val vision = visionProvider(name.toName())
+        if (vision == null) {
+            console.error("Vision with name $name is not resolved")
+            return@forEach
+        }
+        renderer.render(element, vision)
+    }
+}
+
+public fun <V : Vision> Document.renderVisions(renderer: ElementVisionRenderer<V>, visionProvider: (Name) -> V?): Unit {
+    documentElement?.renderVisions(renderer, visionProvider)
+}
+
+public fun HtmlVisionFragment<Vision>.renderInDocument(
+    root: TagConsumer<HTMLElement>,
+    renderer: ElementVisionRenderer<Vision>,
+): HTMLElement = BindingHtmlOutputScope<HTMLElement, Vision>(root).apply(content).let { scope ->
+    scope.finalize().apply {
+        scope.bindings.forEach { (name, vision) ->
+            val id = scope.resolveId(name)
+            val element = document.getElementById(id) ?: error("Could not find element with name $name and id $id")
+            renderer.render(element, vision)
+        }
+    }
+}
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
index 32e3262a..aeb43f41 100644
--- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
@@ -1,92 +1,137 @@
-//package hep.dataforge.vision.server
-//
-//import hep.dataforge.meta.*
-//import hep.dataforge.names.Name
-//import hep.dataforge.names.toName
-//import hep.dataforge.vision.server.VisionServer.Companion.DEFAULT_PAGE
-//import io.ktor.application.Application
-//import io.ktor.application.featureOrNull
-//import io.ktor.application.install
-//import io.ktor.features.CORS
-//import io.ktor.http.content.resources
-//import io.ktor.http.content.static
-//import io.ktor.routing.Routing
-//import io.ktor.routing.route
-//import io.ktor.routing.routing
-//import io.ktor.server.engine.ApplicationEngine
-//import io.ktor.websocket.WebSockets
-//import kotlinx.html.TagConsumer
-//import java.awt.Desktop
-//import java.net.URI
-//import kotlin.text.get
-//
-//public enum class ServerUpdateMode {
-//    NONE,
-//    PUSH,
-//    PULL
-//}
-//
-//public class VisionServer internal constructor(
-//    private val routing: Routing,
-//    private val rootRoute: String,
-//) : Configurable {
-//    override val config: Config = Config()
-//    public var updateMode: ServerUpdateMode by config.enum(ServerUpdateMode.NONE, key = UPDATE_MODE_KEY)
-//    public var updateInterval: Long by config.long(300, key = UPDATE_INTERVAL_KEY)
-//    public var embedData: Boolean by config.boolean(false)
-//
-//    /**
-//     * a list of headers that should be applied to all pages
-//     */
-//    private val globalHeaders: ArrayList<HtmlFragment> = ArrayList<HtmlFragment>()
-//
-//    public fun header(block: TagConsumer<*>.() -> Unit) {
-//        globalHeaders.add(HtmlFragment(block))
-//    }
-//
-//    public fun page(
-//        plotlyFragment: PlotlyFragment,
-//        route: String = DEFAULT_PAGE,
-//        title: String = "Plotly server page '$route'",
-//        headers: List<HtmlFragment> = emptyList(),
-//    ) {
-//        routing.createRouteFromPath(rootRoute).apply {
-//            val plots = HashMap<String, Plot>()
-//            route(route) {
-//                //Update websocket
-//                webSocket("ws/{id}") {
-//                    val plotId: String = call.parameters["id"] ?: error("Plot id not defined")
-//
-//                    application.log.debug("Opened server socket for $plotId")
-//
-//                    val plot = plots[plotId] ?: error("Plot with id='$plotId' not registered")
-//
-//                    try {
-//                        plot.collectUpdates(plotId, this, updateInterval).collect { update ->
-//                            val json = update.toJson()
-//                            outgoing.send(Frame.Text(json.toString()))
-//                        }
-//                    } catch (ex: Exception) {
-//                        application.log.debug("Closed server socket for $plotId")
-//                    }
-//                }
-//                //Plots in their json representation
-//                get("data/{id}") {
-//                    val id: String = call.parameters["id"] ?: error("Plot id not defined")
-//
-//                    val plot: Plot? = plots[id]
-//                    if (plot == null) {
-//                        call.respond(HttpStatusCode.NotFound, "Plot with id = $id not found")
-//                    } else {
-//                        call.respondText(
-//                            plot.toJsonString(),
-//                            contentType = ContentType.Application.Json,
-//                            status = HttpStatusCode.OK
-//                        )
-//                    }
-//                }
-//                //filled pages
-//                get {
+package hep.dataforge.vision.server
+
+import hep.dataforge.context.Context
+import hep.dataforge.meta.*
+import hep.dataforge.names.Name
+import hep.dataforge.names.toName
+import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionManager
+import hep.dataforge.vision.flowChanges
+import hep.dataforge.vision.html.*
+import hep.dataforge.vision.server.VisionServer.Companion.DEFAULT_PAGE
+import io.ktor.application.*
+import io.ktor.features.CORS
+import io.ktor.html.respondHtml
+import io.ktor.http.*
+import io.ktor.http.cio.websocket.Frame
+import io.ktor.http.content.resources
+import io.ktor.http.content.static
+import io.ktor.response.respond
+import io.ktor.response.respondText
+import io.ktor.routing.*
+import io.ktor.server.engine.ApplicationEngine
+import io.ktor.websocket.WebSockets
+import io.ktor.websocket.webSocket
+import kotlinx.html.*
+import kotlinx.html.stream.createHTML
+import java.awt.Desktop
+import java.net.URI
+import kotlin.time.milliseconds
+
+public class VisionServer internal constructor(
+    private val visionManager: VisionManager,
+    private val routing: Routing,
+    private val rootRoute: String,
+) : Configurable {
+    override val config: Config = Config()
+    public var updateInterval: Long by config.long(300, key = UPDATE_INTERVAL_KEY)
+    public var cacheFragments: Boolean by config.boolean(true)
+
+    /**
+     * a list of headers that should be applied to all pages
+     */
+    private val globalHeaders: ArrayList<HtmlFragment> = ArrayList()
+
+    public fun header(block: TagConsumer<*>.() -> Unit) {
+        globalHeaders.add(HtmlFragment(block))
+    }
+
+    private fun HTML.buildPage(
+        visionFragment: HtmlVisionFragment<Vision>,
+        title: String,
+        headers: List<HtmlFragment>,
+    ): Map<Name, Vision> {
+        lateinit var result: Map<Name, Vision>
+
+        head {
+            meta {
+                charset = "utf-8"
+                (globalHeaders + headers).forEach {
+                    fragment(it)
+                }
+            }
+            title(title)
+        }
+        body {
+            result = visionFragment(visionFragment)
+            script {
+                type = "text/javascript"
+
+                val normalizedRoute = if (rootRoute.endsWith("/")) {
+                    rootRoute
+                } else {
+                    "$rootRoute/"
+                }
+
+                src = TODO()//"${normalizedRoute}js/plotlyConnect.js"
+            }
+        }
+
+        return result
+    }
+
+    public fun page(
+        visionFragment: HtmlVisionFragment<Vision>,
+        route: String = DEFAULT_PAGE,
+        title: String = "VisionForge server page '$route'",
+        headers: List<HtmlFragment> = emptyList(),
+    ) {
+        val visions = HashMap<Name, Vision>()
+
+        val cachedHtml: String? = if (cacheFragments) {
+            createHTML(true).html {
+                visions.putAll(buildPage(visionFragment, title, headers))
+            }
+        } else {
+            null
+        }
+
+        routing.createRouteFromPath(rootRoute).apply {
+            route(route) {
+                //Update websocket
+                webSocket("ws") {
+                    val name: String = call.request.queryParameters["name"]
+                        ?: error("Vision name is not defined in parameters")
+
+                    application.log.debug("Opened server socket for $name")
+                    val vision: Vision = visions[name.toName()] ?: error("Plot with id='$name' not registered")
+                    try {
+                        vision.flowChanges(this, updateInterval.milliseconds).collect { update ->
+                            val json = visionManager.encodeToString(update)
+                            outgoing.send(Frame.Text(json))
+                        }
+                    } catch (ex: Exception) {
+                        application.log.debug("Closed server socket for $name")
+                    }
+                }
+                //Plots in their json representation
+                get("vision") {
+                    val name: String = call.request.queryParameters["name"]
+                        ?: error("Vision name is not defined in parameters")
+
+                    val vision: Vision? = visions[name.toName()]
+                    if (vision == null) {
+                        call.respond(HttpStatusCode.NotFound, "Vision with name '$name' not found")
+                    } else {
+                        call.respondText(
+                            visionManager.encodeToString(vision),
+                            contentType = ContentType.Application.Json,
+                            status = HttpStatusCode.OK
+                        )
+                    }
+                }
+                //filled pages
+                get {
 //                    val origin = call.request.origin
 //                    val url = URLBuilder().apply {
 //                        protocol = URLProtocol.createOrDefault(origin.scheme)
@@ -95,125 +140,68 @@
 //                        port = origin.port
 //                        encodedPath = origin.uri
 //                    }.build()
-//                    call.respondHtml {
-//                        val normalizedRoute = if (rootRoute.endsWith("/")) {
-//                            rootRoute
-//                        } else {
-//                            "$rootRoute/"
-//                        }
-//
-//                        head {
-//                            meta {
-//                                charset = "utf-8"
-//                                (globalHeaders + headers).forEach {
-//                                    it.visit(consumer)
-//                                }
-//                                script {
-//                                    type = "text/javascript"
-//                                    src = "${normalizedRoute}js/plotly.min.js"
-//                                }
-//                                script {
-//                                    type = "text/javascript"
-//                                    src = "${normalizedRoute}js/plotlyConnect.js"
-//                                }
-//                            }
-//                            title(title)
-//                        }
-//                        body {
-//                            val container =
-//                                ServerPlotlyRenderer(url, updateMode, updateInterval, embedData) { plotId, plot ->
-//                                    plots[plotId] = plot
-//                                }
-//                            with(plotlyFragment) {
-//                                render(container)
-//                            }
-//                        }
-//                    }
-//                }
-//            }
-//        }
-//    }
-//
-//    public fun page(
-//        route: String = DEFAULT_PAGE,
-//        title: String = "Plotly server page '$route'",
-//        headers: List<HtmlFragment> = emptyList(),
-//        content: FlowContent.(renderer: PlotlyRenderer) -> Unit,
-//    ) {
-//        page(PlotlyFragment(content), route, title, headers)
-//    }
-//
-//
-//    public companion object {
-//        public const val DEFAULT_PAGE: String = "/"
-//        public val UPDATE_MODE_KEY: Name = "update.mode".toName()
-//        public val UPDATE_INTERVAL_KEY: Name = "update.interval".toName()
-//    }
-//}
-//
-//
-///**
-// * Attach plotly application to given server
-// */
-//public fun Application.visionModule(route: String = DEFAULT_PAGE): VisionServer {
-//    if (featureOrNull(WebSockets) == null) {
-//        install(WebSockets)
-//    }
-//
-//    if (featureOrNull(CORS) == null) {
-//        install(CORS) {
-//            anyHost()
-//        }
-//    }
-//
-//
-//    val routing = routing {
-//        route(route) {
-//            static {
-//                resources()
-//            }
-//        }
-//    }
-//
-//    return VisionServer(routing, route)
-//}
-//
-//
-///**
-// * Configure server to start sending updates in push mode. Does not affect loaded pages
-// */
-//public fun VisionServer.pushUpdates(interval: Long = 100): VisionServer = apply {
-//    updateMode = ServerUpdateMode.PUSH
-//    updateInterval = interval
-//}
-//
-///**
-// * Configure client to request regular updates from server. Pull updates are more expensive than push updates since
-// * they contain the full plot data and server can't decide what to send.
-// */
-//public fun VisionServer.pullUpdates(interval: Long = 1000): VisionServer = apply {
-//    updateMode = ServerUpdateMode.PULL
-//    updateInterval = interval
-//}
-//
-/////**
-//// * Start static server (updates via reload)
-//// */
-////@OptIn(KtorExperimentalAPI::class)
-////public fun Plotly.serve(
-////    scope: CoroutineScope = GlobalScope,
-////    host: String = "localhost",
-////    port: Int = 7777,
-////    block: PlotlyServer.() -> Unit,
-////): ApplicationEngine = scope.embeddedServer(io.ktor.server.cio.CIO, port, host) {
-////    plotlyModule().apply(block)
-////}.start()
-//
-//
-//public fun ApplicationEngine.show() {
-//    val connector = environment.connectors.first()
-//    val uri = URI("http", null, connector.host, connector.port, null, null, null)
-//    Desktop.getDesktop().browse(uri)
-//}
-//
-//public fun ApplicationEngine.close(): Unit = stop(1000, 5000)
\ No newline at end of file
+                    if (cachedHtml == null) {
+                        call.respondHtml {
+                            visions.putAll(buildPage(visionFragment, title, headers))
+                        }
+                    } else {
+                        call.respondText(cachedHtml, ContentType.Text.Html.withCharset(Charsets.UTF_8))
+                    }
+                }
+            }
+        }
+    }
+
+    public fun page(
+        route: String = DEFAULT_PAGE,
+        title: String = "Plotly server page '$route'",
+        headers: List<HtmlFragment> = emptyList(),
+        content: HtmlOutputScope<*, Vision>.() -> Unit,
+    ) {
+        page(buildVisionFragment(content), route, title, headers)
+    }
+
+
+    public companion object {
+        public const val DEFAULT_PAGE: String = "/"
+        public val UPDATE_MODE_KEY: Name = "update.mode".toName()
+        public val UPDATE_INTERVAL_KEY: Name = "update.interval".toName()
+    }
+}
+
+
+/**
+ * Attach plotly application to given server
+ */
+public fun Application.visionModule(context: Context, route: String = DEFAULT_PAGE): VisionServer {
+    if (featureOrNull(WebSockets) == null) {
+        install(WebSockets)
+    }
+
+    if (featureOrNull(CORS) == null) {
+        install(CORS) {
+            anyHost()
+        }
+    }
+
+
+    val routing = routing {
+        route(route) {
+            static {
+                resources()
+            }
+        }
+    }
+
+    val visionManager = context.plugins.fetch(VisionManager)
+
+    return VisionServer(visionManager, routing, route)
+}
+
+public fun ApplicationEngine.show() {
+    val connector = environment.connectors.first()
+    val uri = URI("http", null, connector.host, connector.port, null, null, null)
+    Desktop.getDesktop().browse(uri)
+}
+
+public fun ApplicationEngine.close(): Unit = stop(1000, 5000)
\ No newline at end of file
diff --git a/visionforge-solid/build.gradle.kts b/visionforge-solid/build.gradle.kts
index b7b6daa8..fde0d41d 100644
--- a/visionforge-solid/build.gradle.kts
+++ b/visionforge-solid/build.gradle.kts
@@ -14,11 +14,5 @@ kotlin {
                 api(project(":visionforge-core"))
             }
         }
-        jsMain {
-            dependencies {
-                implementation(npm("three", "0.122.0"))
-                implementation(npm("three-csg-ts", "1.0.1"))
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index a0f173b9..242edca9 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -4,7 +4,7 @@ import hep.dataforge.context.*
 import hep.dataforge.meta.Meta
 import hep.dataforge.names.*
 import hep.dataforge.vision.Vision
-import hep.dataforge.vision.html.HtmlVisionBinding
+import hep.dataforge.vision.html.ElementVisionRenderer
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.visible
@@ -15,7 +15,7 @@ import kotlin.collections.set
 import kotlin.reflect.KClass
 import info.laht.threekt.objects.Group as ThreeGroup
 
-public class ThreePlugin : AbstractPlugin(), HtmlVisionBinding<Solid> {
+public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer<Solid> {
     override val tag: PluginTag get() = Companion.tag
 
     public val solidManager: SolidManager by require(SolidManager)
@@ -122,7 +122,7 @@ public class ThreePlugin : AbstractPlugin(), HtmlVisionBinding<Solid> {
         attach(element)
     }
 
-    override fun bind(element: Element, vision: Solid) {
+    override fun render(element: Element, vision: Solid) {
         createCanvas(element).render(vision)
     }
 

From 9b42d4f186a01db5b66dabd15d2fc81fbaee2138 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 27 Nov 2020 22:43:48 +0300
Subject: [PATCH 038/151] Plugin to 0.7.0

---
 build.gradle.kts                              |  6 +--
 demo/gdml/build.gradle.kts                    |  5 +--
 .../vision/gdml/demo/GdmlJsDemoApp.kt         |  4 +-
 .../ru/mipt/npm/muon/monitor/MMDemoApp.kt     |  4 +-
 .../kotlin/ru/mipt/npm/sat/SatDemoApp.kt      |  6 +--
 demo/spatial-showcase/build.gradle.kts        |  1 -
 .../vision/solid/demo/ThreeDemoApp.kt         |  4 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 playground/src/jsMain/kotlin/PlayGroundApp.kt |  4 +-
 settings.gradle.kts                           |  6 +--
 .../dataforge/vision/html/HtmlOutputScope.kt  |  8 ++--
 .../hep/dataforge/{js => }/Application.kt     |  2 +-
 .../vision/client/ClientVisionManager.kt      | 43 +++++++++++++++++++
 .../vision/{html => client}/elementOutput.kt  |  9 ++--
 visionforge-fx/build.gradle.kts               |  2 -
 .../dataforge/vision/server/VisionServer.kt   | 12 ++++--
 .../vision/solid/three/ThreePlugin.kt         |  2 +-
 17 files changed, 84 insertions(+), 36 deletions(-)
 rename visionforge-core/src/jsMain/kotlin/hep/dataforge/{js => }/Application.kt (98%)
 create mode 100644 visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/ClientVisionManager.kt
 rename visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/{html => client}/elementOutput.kt (82%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9cc59d77..f3709349 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,10 +2,10 @@ plugins {
     id("ru.mipt.npm.project")
 }
 
-val dataforgeVersion by extra("0.2.0-dev-8")
+val dataforgeVersion by extra("0.2.0")
 val ktorVersion by extra("1.4.2")
 val htmlVersion by extra("0.7.2")
-val kotlinWrappersVersion by extra("pre.129-kotlin-1.4.10")
+val kotlinWrappersVersion by extra("pre.129-kotlin-1.4.20")
 val fxVersion by extra("14")
 
 
@@ -17,7 +17,7 @@ allprojects {
     }
 
     group = "hep.dataforge"
-    version = "0.2.0-dev-2"
+    version = "0.2.0-dev-3"
 }
 
 val githubProject by extra("visionforge")
diff --git a/demo/gdml/build.gradle.kts b/demo/gdml/build.gradle.kts
index 86e8b80c..ef958795 100644
--- a/demo/gdml/build.gradle.kts
+++ b/demo/gdml/build.gradle.kts
@@ -1,6 +1,5 @@
 import ru.mipt.npm.gradle.DependencyConfiguration
 import ru.mipt.npm.gradle.FXModule
-import ru.mipt.npm.gradle.useFx
 
 plugins {
     id("ru.mipt.npm.mpp")
@@ -24,8 +23,8 @@ kotlin {
                 implementation(project(":visionforge-gdml"))
             }
         }
-        jvmMain{
-            dependencies{
+        jvmMain {
+            dependencies {
                 implementation(project(":visionforge-fx"))
             }
         }
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
index 352d645c..7aa28b22 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
@@ -1,8 +1,8 @@
 package hep.dataforge.vision.gdml.demo
 
+import hep.dataforge.Application
 import hep.dataforge.context.Global
-import hep.dataforge.js.Application
-import hep.dataforge.js.startApplication
+import hep.dataforge.startApplication
 import hep.dataforge.vision.gdml.toVision
 import kotlinx.browser.document
 import react.child
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
index 0ca23130..7ac877f5 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
@@ -1,8 +1,8 @@
 package ru.mipt.npm.muon.monitor
 
+import hep.dataforge.Application
 import hep.dataforge.context.Global
-import hep.dataforge.js.Application
-import hep.dataforge.js.startApplication
+import hep.dataforge.startApplication
 import io.ktor.client.HttpClient
 import io.ktor.client.features.json.JsonFeature
 import io.ktor.client.features.json.serializer.KotlinxSerializer
diff --git a/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt b/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
index dad0e45f..39f2541d 100644
--- a/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
+++ b/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
@@ -1,9 +1,9 @@
 package ru.mipt.npm.sat
 
+import hep.dataforge.Application
 import hep.dataforge.context.Global
-import hep.dataforge.js.Application
-import hep.dataforge.js.startApplication
 import hep.dataforge.meta.invoke
+import hep.dataforge.startApplication
 import hep.dataforge.vision.solid.three.ThreePlugin
 import hep.dataforge.vision.solid.three.render
 import kotlinx.browser.document
@@ -16,7 +16,7 @@ private class SatDemoApp : Application {
             ?: error("Element with id 'canvas' not found on page")
         val three = Global.plugins.fetch(ThreePlugin)
         val sat = visionOfSatellite(
-            ySegments = 5,
+            ySegments = 3,
         )
         three.render(element, sat){
             minSize = 500
diff --git a/demo/spatial-showcase/build.gradle.kts b/demo/spatial-showcase/build.gradle.kts
index f984b9b3..e3b4d0f4 100644
--- a/demo/spatial-showcase/build.gradle.kts
+++ b/demo/spatial-showcase/build.gradle.kts
@@ -1,6 +1,5 @@
 import ru.mipt.npm.gradle.DependencyConfiguration
 import ru.mipt.npm.gradle.FXModule
-import ru.mipt.npm.gradle.useFx
 
 plugins {
     id("ru.mipt.npm.mpp")
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
index ba76b024..2e613622 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
@@ -1,7 +1,7 @@
 package hep.dataforge.vision.solid.demo
 
-import hep.dataforge.js.Application
-import hep.dataforge.js.startApplication
+import hep.dataforge.Application
+import hep.dataforge.startApplication
 import hep.dataforge.vision.solid.x
 import hep.dataforge.vision.solid.y
 import kotlinx.browser.document
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index be52383e..4d9ca164 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/playground/src/jsMain/kotlin/PlayGroundApp.kt b/playground/src/jsMain/kotlin/PlayGroundApp.kt
index a1e46705..33de3028 100644
--- a/playground/src/jsMain/kotlin/PlayGroundApp.kt
+++ b/playground/src/jsMain/kotlin/PlayGroundApp.kt
@@ -1,6 +1,6 @@
+import hep.dataforge.Application
 import hep.dataforge.context.Global
-import hep.dataforge.js.Application
-import hep.dataforge.js.startApplication
+import hep.dataforge.startApplication
 import hep.dataforge.vision.bootstrap.visionPropertyEditor
 import hep.dataforge.vision.react.ThreeCanvasComponent
 import hep.dataforge.vision.react.objectTree
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b4de270e..e21ae40c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,9 +1,9 @@
 pluginManagement {
-    val kotlinVersion = "1.4.20-M2"
-    val toolsVersion = "0.6.4-dev-1.4.20-M2"
+    val kotlinVersion = "1.4.20"
+    val toolsVersion = "0.7.0"
 
     repositories {
-//        mavenLocal()
+        mavenLocal()
         jcenter()
         gradlePluginPortal()
         maven("https://dl.bintray.com/kotlin/kotlin-eap")
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt
index c04ef207..0fcd81dd 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt
@@ -13,10 +13,10 @@ public class HtmlOutput<V : Vision>(
 
 public abstract class HtmlOutputScope<R, V : Vision>(
     private val root: TagConsumer<R>,
-    public val prefix: String? = null,
+    public val idPrefix: String? = null,
 ) : TagConsumer<R> by root {
 
-    public open fun resolveId(name: Name): String = (prefix ?: "output:") + name.toString()
+    public open fun resolveId(name: Name): String = (idPrefix ?: "output:") + name.toString()
 
     /**
      * Create a placeholder but do not attach any [Vision] to it
@@ -27,7 +27,7 @@ public abstract class HtmlOutputScope<R, V : Vision>(
     ): T = div {
         id = resolveId(name)
         classes = setOf(OUTPUT_CLASS)
-        attributes[NAME_ATTRIBUTE] = name.toString()
+        attributes[OUTPUT_NAME_ATTRIBUTE] = name.toString()
         @Suppress("UNCHECKED_CAST")
         HtmlOutput(this@HtmlOutputScope, name, this).block()
     }
@@ -62,6 +62,6 @@ public abstract class HtmlOutputScope<R, V : Vision>(
 
     public companion object {
         public const val OUTPUT_CLASS: String = "visionforge-output"
-        public const val NAME_ATTRIBUTE: String = "data-output-name"
+        public const val OUTPUT_NAME_ATTRIBUTE: String = "data-output-name"
     }
 }
\ No newline at end of file
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/js/Application.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/Application.kt
similarity index 98%
rename from visionforge-core/src/jsMain/kotlin/hep/dataforge/js/Application.kt
rename to visionforge-core/src/jsMain/kotlin/hep/dataforge/Application.kt
index 92a55e20..fb182522 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/js/Application.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/Application.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.js
+package hep.dataforge
 
 import kotlinx.browser.document
 import kotlinx.dom.hasClass
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/ClientVisionManager.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/ClientVisionManager.kt
new file mode 100644
index 00000000..7866c814
--- /dev/null
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/ClientVisionManager.kt
@@ -0,0 +1,43 @@
+package hep.dataforge.vision.client
+
+import hep.dataforge.context.Context
+import hep.dataforge.context.Global
+import hep.dataforge.vision.VisionManager
+import hep.dataforge.vision.html.HtmlOutputScope
+import kotlinx.browser.window
+import org.w3c.dom.Element
+import org.w3c.dom.get
+import org.w3c.dom.url.URL
+
+@JsExport
+public class ClientVisionManager {
+    private val visionForgeContext: Context = Global.context("client") {
+        plugin(VisionManager)
+    }
+
+    private val visionManager: VisionManager = visionForgeContext.plugins.fetch(VisionManager)
+
+    /**
+     * Up-going tree traversal in search for endpoint attribute
+     */
+    private fun resolveEndpoint(element: Element?): String {
+        if(element == null) return DEFAULT_ENDPOINT
+        val attribute = element.attributes[OUTPUT_ENDPOINT_ATTRIBUTE]
+        return attribute?.value ?: resolveEndpoint(element.parentElement)
+    }
+
+    public fun renderVision(element: Element){
+        if(!element.classList.contains(HtmlOutputScope.OUTPUT_CLASS)) error("The element $element is not an output element")
+        val endpoint = URL(resolveEndpoint(element))
+        window.fetch("$endpoint/vision").then {response->
+            TODO()
+        }
+    }
+
+    public companion object {
+        public const val OUTPUT_ENDPOINT_ATTRIBUTE: String = "data-output-endpoint"
+        public const val DEFAULT_ENDPOINT: String = ".."
+    }
+}
+
+
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/html/elementOutput.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
similarity index 82%
rename from visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/html/elementOutput.kt
rename to visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
index 2a9f60c0..9fe3b43e 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/html/elementOutput.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
@@ -1,8 +1,11 @@
-package hep.dataforge.vision.html
+package hep.dataforge.vision.client
 
 import hep.dataforge.names.Name
 import hep.dataforge.names.toName
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.html.BindingHtmlOutputScope
+import hep.dataforge.vision.html.HtmlOutputScope
+import hep.dataforge.vision.html.HtmlVisionFragment
 import kotlinx.browser.document
 import kotlinx.html.TagConsumer
 import org.w3c.dom.*
@@ -21,9 +24,9 @@ public fun <V : Vision> Map<String, V>.bind(renderer: ElementVisionRenderer<V>)
 public fun <V : Vision> Element.renderVisions(renderer: ElementVisionRenderer<V>, visionProvider: (Name) -> V?) {
     val elements = getElementsByClassName(HtmlOutputScope.OUTPUT_CLASS)
     elements.asList().forEach { element ->
-        val name = element.attributes[HtmlOutputScope.NAME_ATTRIBUTE]?.value
+        val name = element.attributes[HtmlOutputScope.OUTPUT_NAME_ATTRIBUTE]?.value
         if (name == null) {
-            console.error("Attribute ${HtmlOutputScope.NAME_ATTRIBUTE} not defined in the output element")
+            console.error("Attribute ${HtmlOutputScope.OUTPUT_NAME_ATTRIBUTE} not defined in the output element")
             return@forEach
         }
         val vision = visionProvider(name.toName())
diff --git a/visionforge-fx/build.gradle.kts b/visionforge-fx/build.gradle.kts
index c7626def..4cc5286d 100644
--- a/visionforge-fx/build.gradle.kts
+++ b/visionforge-fx/build.gradle.kts
@@ -1,5 +1,3 @@
-import ru.mipt.npm.gradle.useFx
-
 plugins {
     id("ru.mipt.npm.jvm")
 }
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
index aeb43f41..77f18d81 100644
--- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
@@ -1,7 +1,10 @@
 package hep.dataforge.vision.server
 
 import hep.dataforge.context.Context
-import hep.dataforge.meta.*
+import hep.dataforge.meta.Config
+import hep.dataforge.meta.Configurable
+import hep.dataforge.meta.boolean
+import hep.dataforge.meta.long
 import hep.dataforge.names.Name
 import hep.dataforge.names.toName
 import hep.dataforge.vision.Vision
@@ -12,16 +15,19 @@ import hep.dataforge.vision.server.VisionServer.Companion.DEFAULT_PAGE
 import io.ktor.application.*
 import io.ktor.features.CORS
 import io.ktor.html.respondHtml
-import io.ktor.http.*
+import io.ktor.http.ContentType
+import io.ktor.http.HttpStatusCode
 import io.ktor.http.cio.websocket.Frame
 import io.ktor.http.content.resources
 import io.ktor.http.content.static
+import io.ktor.http.withCharset
 import io.ktor.response.respond
 import io.ktor.response.respondText
 import io.ktor.routing.*
 import io.ktor.server.engine.ApplicationEngine
 import io.ktor.websocket.WebSockets
 import io.ktor.websocket.webSocket
+import kotlinx.coroutines.flow.collect
 import kotlinx.html.*
 import kotlinx.html.stream.createHTML
 import java.awt.Desktop
@@ -106,7 +112,7 @@ public class VisionServer internal constructor(
                     application.log.debug("Opened server socket for $name")
                     val vision: Vision = visions[name.toName()] ?: error("Plot with id='$name' not registered")
                     try {
-                        vision.flowChanges(this, updateInterval.milliseconds).collect { update ->
+                        vision.flowChanges(this, updateInterval.milliseconds).collect {  update ->
                             val json = visionManager.encodeToString(update)
                             outgoing.send(Frame.Text(json))
                         }
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index 242edca9..cd6c76c6 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -4,7 +4,7 @@ import hep.dataforge.context.*
 import hep.dataforge.meta.Meta
 import hep.dataforge.names.*
 import hep.dataforge.vision.Vision
-import hep.dataforge.vision.html.ElementVisionRenderer
+import hep.dataforge.vision.client.ElementVisionRenderer
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.visible

From a85cd828e6468df9b0486ce8278fc02540b509e1 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 6 Dec 2020 19:16:48 +0300
Subject: [PATCH 039/151] Working Server server provider.

---
 demo/sat-demo/build.gradle.kts                |  39 ++++-
 .../kotlin/ru/mipt/npm/sat/SatDemoApp.kt      |  58 ++++----
 .../kotlin/ru/mipt/npm/sat/satServer.kt       |  35 +++++
 playground/build.gradle.kts                   |  22 ++-
 .../dataforge/vision/solid/generateSchema.kt  |  20 ++-
 .../hep/dataforge/vision/VisionManager.kt     |   1 +
 .../dataforge/vision/html/HtmlOutputScope.kt  |   2 +
 .../vision/client/ClientVisionManager.kt      |  43 ------
 .../dataforge/vision/client/VisionClient.kt   | 124 ++++++++++++++++
 .../dataforge/vision/client/elementOutput.kt  |  52 +++++--
 .../dataforge/vision/server/VisionServer.kt   | 139 ++++++++++--------
 .../kotlin/hep/dataforge/vision/solid/Box.kt  |   2 +-
 .../hep/dataforge/vision/solid/Composite.kt   |   2 +-
 .../hep/dataforge/vision/solid/ConeSegment.kt |   2 +-
 .../hep/dataforge/vision/solid/Convex.kt      |   2 +-
 .../hep/dataforge/vision/solid/Extruded.kt    |   2 +-
 .../hep/dataforge/vision/solid/PolyLine.kt    |   2 +-
 .../solid/{BasicSolid.kt => SolidBase.kt}     |   2 +-
 .../hep/dataforge/vision/solid/SolidLabel.kt  |   2 +-
 .../dataforge/vision/solid/SolidManager.kt    |   8 +-
 .../dataforge/vision/solid/SolidReference.kt  |   2 +-
 .../hep/dataforge/vision/solid/Sphere.kt      |   2 +-
 .../kotlin/hep/dataforge/vision/solid/Tube.kt |   2 +-
 .../vision/solid/three/ThreePlugin.kt         |  17 ++-
 .../vision/solid/three/ThreeVision.kt         |   4 +-
 25 files changed, 409 insertions(+), 177 deletions(-)
 create mode 100644 demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
 rename {visionforge-solid => playground}/src/jvmMain/kotlin/hep/dataforge/vision/solid/generateSchema.kt (93%)
 delete mode 100644 visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/ClientVisionManager.kt
 create mode 100644 visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
 rename visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/{BasicSolid.kt => SolidBase.kt} (95%)

diff --git a/demo/sat-demo/build.gradle.kts b/demo/sat-demo/build.gradle.kts
index d3a7d140..efaaff60 100644
--- a/demo/sat-demo/build.gradle.kts
+++ b/demo/sat-demo/build.gradle.kts
@@ -1,24 +1,59 @@
 plugins {
     id("ru.mipt.npm.mpp")
+    application
 }
 
-val kvisionVersion: String = "3.16.2"
+
+group = "ru.mipt.npm"
+
+//val kvisionVersion: String = "3.16.2"
 
 kscience{
+    useSerialization{
+        json()
+    }
     application()
 }
 
+val ktorVersion: String by rootProject.extra
+
 kotlin {
+    afterEvaluate {
+        val jsBrowserDistribution by tasks.getting
+
+        jvm {
+            withJava()
+            compilations[org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME]?.apply {
+                tasks.getByName<ProcessResources>(processResourcesTaskName) {
+                    dependsOn(jsBrowserDistribution)
+                    afterEvaluate {
+                        from(jsBrowserDistribution)
+                    }
+                }
+            }
+
+        }
+    }
+
     sourceSets {
         commonMain {
             dependencies {
                 implementation(project(":visionforge-solid"))
             }
         }
+        jvmMain {
+            dependencies {
+                implementation(project(":visionforge-server"))
+            }
+        }
         jsMain {
             dependencies {
                 implementation(project(":visionforge-threejs"))
             }
         }
     }
-}
\ No newline at end of file
+}
+
+application {
+    mainClass.set("ru.mipt.npm.sat.SatServerKt")
+}
diff --git a/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt b/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
index 39f2541d..45e0283c 100644
--- a/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
+++ b/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
@@ -1,34 +1,40 @@
 package ru.mipt.npm.sat
 
-import hep.dataforge.Application
 import hep.dataforge.context.Global
-import hep.dataforge.meta.invoke
-import hep.dataforge.startApplication
+import hep.dataforge.vision.client.VisionClient
+import hep.dataforge.vision.client.fetchAndRenderAllVisions
 import hep.dataforge.vision.solid.three.ThreePlugin
-import hep.dataforge.vision.solid.three.render
-import kotlinx.browser.document
-import org.w3c.dom.HTMLElement
+import kotlinx.browser.window
 
-private class SatDemoApp : Application {
-
-    override fun start(state: Map<String, Any>) {
-        val element = document.getElementById("canvas") as? HTMLElement
-            ?: error("Element with id 'canvas' not found on page")
-        val three = Global.plugins.fetch(ThreePlugin)
-        val sat = visionOfSatellite(
-            ySegments = 3,
-        )
-        three.render(element, sat){
-            minSize = 500
-            axes{
-                size = 500.0
-                visible = true
-            }
-        }
-    }
-
-}
+//private class SatDemoApp : Application {
+//
+//    override fun start(state: Map<String, Any>) {
+//        val element = document.getElementById("canvas") as? HTMLElement
+//            ?: error("Element with id 'canvas' not found on page")
+//        val three = Global.plugins.fetch(ThreePlugin)
+//
+//        val sat = visionOfSatellite(
+//            ySegments = 3,
+//        )
+//        three.render(element, sat){
+//            minSize = 500
+//            axes{
+//                size = 500.0
+//                visible = true
+//            }
+//        }
+//    }
+//
+//}
+//
+//fun main() {
+//    startApplication(::SatDemoApp)
+//}
 
 fun main() {
-    startApplication(::SatDemoApp)
+    //Loading three-js renderer
+    Global.plugins.load(ThreePlugin)
+    window.onload = {
+        Global.plugins.fetch(VisionClient).fetchAndRenderAllVisions()
+    }
 }
\ No newline at end of file
diff --git a/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt b/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
new file mode 100644
index 00000000..6ac3e3c2
--- /dev/null
+++ b/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
@@ -0,0 +1,35 @@
+package ru.mipt.npm.sat
+
+
+import hep.dataforge.context.Global
+import hep.dataforge.names.asName
+import hep.dataforge.vision.server.visionModule
+import hep.dataforge.vision.solid.SolidManager
+import io.ktor.server.cio.CIO
+import io.ktor.server.engine.embeddedServer
+import io.ktor.util.KtorExperimentalAPI
+import kotlinx.html.script
+
+@OptIn(KtorExperimentalAPI::class)
+fun main() {
+    val sat = visionOfSatellite(
+        ySegments = 3,
+    )
+
+    val context = Global.context("SAT"){
+        plugin(SolidManager)
+    }
+
+    embeddedServer(CIO, 8080, host = "localhost"){
+        visionModule(context).apply {
+            header {
+                script {
+                    src = "sat-demo.js"
+                }
+            }
+            page {
+                vision("main".asName(), sat)
+            }
+        }
+    }.start(wait = true)
+}
\ No newline at end of file
diff --git a/playground/build.gradle.kts b/playground/build.gradle.kts
index 4eeabfa2..428bb779 100644
--- a/playground/build.gradle.kts
+++ b/playground/build.gradle.kts
@@ -12,16 +12,30 @@ repositories{
 }
 
 kotlin {
+    jvm()
     js(IR) {
-        browser {}
+        browser {
+        }
+        binaries.executable()
     }
 
     sourceSets {
         commonMain {
             dependencies {
-                api(project(":visionforge-solid"))
-                api(project(":visionforge-gdml"))
-                api(project(":ui:bootstrap"))
+                implementation(project(":visionforge-solid"))
+                implementation(project(":visionforge-gdml"))
+
+            }
+        }
+        val jsMain by getting{
+            dependencies {
+                implementation(project(":ui:bootstrap"))
+            }
+        }
+
+        val jvmMain by getting{
+            dependencies {
+                implementation("com.github.Ricky12Awesome:json-schema-serialization:0.6.6")
             }
         }
     }
diff --git a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/generateSchema.kt b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/generateSchema.kt
similarity index 93%
rename from visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/generateSchema.kt
rename to playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/generateSchema.kt
index 9d3c332b..a7ccea62 100644
--- a/visionforge-solid/src/jvmMain/kotlin/hep/dataforge/vision/solid/generateSchema.kt
+++ b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/generateSchema.kt
@@ -1,4 +1,22 @@
-//package hep.dataforge.vision.solid
+package hep.dataforge.vision.solid
+
+import com.github.ricky12awesome.jss.encodeToSchema
+import kotlinx.serialization.json.Json
+
+fun main() {
+    val schema = Json {
+        serializersModule = SolidManager.serializersModuleForSolids
+        prettyPrintIndent = "  "
+        prettyPrint = true
+        ignoreUnknownKeys = true
+        isLenient = true
+        coerceInputValues = true
+        encodeDefaults = true
+    }.encodeToSchema(SolidGroup.serializer(), generateDefinitions = false)
+    println(schema)
+}
+
+
 //
 //import hep.dataforge.meta.JSON_PRETTY
 //import kotlinx.serialization.*
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
index 14a72d2a..7c0e14f6 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
@@ -54,6 +54,7 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
 
         private val defaultSerialModule: SerializersModule = SerializersModule {
             polymorphic(Vision::class) {
+                default { VisionBase.serializer() }
                 subclass(VisionBase.serializer())
                 subclass(VisionGroupBase.serializer())
             }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt
index 0fcd81dd..87901ca9 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt
@@ -63,5 +63,7 @@ public abstract class HtmlOutputScope<R, V : Vision>(
     public companion object {
         public const val OUTPUT_CLASS: String = "visionforge-output"
         public const val OUTPUT_NAME_ATTRIBUTE: String = "data-output-name"
+        public const val OUTPUT_ENDPOINT_ATTRIBUTE: String = "data-output-endpoint"
+        public const val DEFAULT_ENDPOINT: String = "."
     }
 }
\ No newline at end of file
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/ClientVisionManager.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/ClientVisionManager.kt
deleted file mode 100644
index 7866c814..00000000
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/ClientVisionManager.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package hep.dataforge.vision.client
-
-import hep.dataforge.context.Context
-import hep.dataforge.context.Global
-import hep.dataforge.vision.VisionManager
-import hep.dataforge.vision.html.HtmlOutputScope
-import kotlinx.browser.window
-import org.w3c.dom.Element
-import org.w3c.dom.get
-import org.w3c.dom.url.URL
-
-@JsExport
-public class ClientVisionManager {
-    private val visionForgeContext: Context = Global.context("client") {
-        plugin(VisionManager)
-    }
-
-    private val visionManager: VisionManager = visionForgeContext.plugins.fetch(VisionManager)
-
-    /**
-     * Up-going tree traversal in search for endpoint attribute
-     */
-    private fun resolveEndpoint(element: Element?): String {
-        if(element == null) return DEFAULT_ENDPOINT
-        val attribute = element.attributes[OUTPUT_ENDPOINT_ATTRIBUTE]
-        return attribute?.value ?: resolveEndpoint(element.parentElement)
-    }
-
-    public fun renderVision(element: Element){
-        if(!element.classList.contains(HtmlOutputScope.OUTPUT_CLASS)) error("The element $element is not an output element")
-        val endpoint = URL(resolveEndpoint(element))
-        window.fetch("$endpoint/vision").then {response->
-            TODO()
-        }
-    }
-
-    public companion object {
-        public const val OUTPUT_ENDPOINT_ATTRIBUTE: String = "data-output-endpoint"
-        public const val DEFAULT_ENDPOINT: String = ".."
-    }
-}
-
-
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
new file mode 100644
index 00000000..ce74f85f
--- /dev/null
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
@@ -0,0 +1,124 @@
+package hep.dataforge.vision.client
+
+import hep.dataforge.context.*
+import hep.dataforge.meta.Meta
+import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionManager
+import hep.dataforge.vision.html.HtmlOutputScope
+import hep.dataforge.vision.html.HtmlOutputScope.Companion.OUTPUT_ENDPOINT_ATTRIBUTE
+import hep.dataforge.vision.html.HtmlOutputScope.Companion.OUTPUT_NAME_ATTRIBUTE
+import kotlinx.browser.document
+import kotlinx.browser.window
+import org.w3c.dom.Element
+import org.w3c.dom.WebSocket
+import org.w3c.dom.asList
+import org.w3c.dom.get
+import org.w3c.dom.url.URL
+import kotlin.reflect.KClass
+
+public class VisionClient : AbstractPlugin() {
+    override val tag: PluginTag get() = Companion.tag
+    private val visionManager: VisionManager by require(VisionManager)
+
+    /**
+     * Up-going tree traversal in search for endpoint attribute
+     */
+    private fun resolveEndpoint(element: Element?): String {
+        if (element == null) return window.location.href
+        val attribute = element.attributes[OUTPUT_ENDPOINT_ATTRIBUTE]
+        return attribute?.value ?: resolveEndpoint(element.parentElement)
+    }
+
+    private fun resolveName(element: Element): String? {
+        val attribute = element.attributes[OUTPUT_NAME_ATTRIBUTE]
+        return attribute?.value
+    }
+
+    private fun getRenderers() = context.gather<ElementVisionRenderer>(ElementVisionRenderer.TYPE).values
+
+    public fun findRendererFor(vision: Vision): ElementVisionRenderer? = getRenderers().maxByOrNull { it.rateVision(vision) }
+
+    /**
+     * Fetch from server and render a vision, described in a given with [HtmlOutputScope.OUTPUT_CLASS] class.
+     */
+    public fun fetchAndRenderVision(element: Element, requestUpdates: Boolean = true) {
+        val name = resolveName(element) ?: error("The element is not a vision output")
+        console.info("Found DF output with name $name")
+        if (!element.classList.contains(HtmlOutputScope.OUTPUT_CLASS)) error("The element $element is not an output element")
+        val endpoint = resolveEndpoint(element)
+        console.info("Vision server is resolved to $endpoint")
+        val fetchUrl = URL(endpoint).apply {
+            searchParams.append("name", name)
+            pathname += "/vision"
+        }
+        window.fetch(fetchUrl).then { response ->
+            if (response.ok) {
+                response.text().then { text ->
+                    val vision = visionManager.jsonFormat.decodeFromString(Vision.serializer(), text)
+
+                    val renderer = findRendererFor(vision) ?: error("Could nof find renderer for $vision")
+                    renderer.render(element, vision)
+                    if (requestUpdates) {
+                        val wsUrl = URL(endpoint).apply {
+                            pathname += "/ws"
+                            protocol = "ws"
+                            searchParams.append("name", name)
+                        }
+                        val ws = WebSocket(wsUrl.toString()).apply {
+                            onmessage = { messageEvent ->
+                                val stringData: String? = messageEvent.data as? String
+                                if (stringData != null) {
+                                    val update = visionManager.jsonFormat.decodeFromString(Vision.serializer(), text)
+                                    vision.update(update)
+                                } else {
+                                    console.error("WebSocket message data is not a string")
+                                }
+                            }
+                            onopen = {
+                                console.info("WebSocket update channel established for output '$name'")
+                            }
+                            onclose = {
+                                console.info("WebSocket update channel closed for output '$name'")
+                            }
+                            onerror = {
+                                console.error("WebSocket update channel error for output '$name'")
+                            }
+                        }
+
+                    }
+                }
+            } else {
+                console.error("Failed to fetch initial vision state from $endpoint")
+            }
+
+        }
+    }
+
+    public companion object : PluginFactory<VisionClient> {
+
+        override fun invoke(meta: Meta, context: Context): VisionClient = VisionClient()
+
+        override val tag: PluginTag = PluginTag(name = "vision.client", group = PluginTag.DATAFORGE_GROUP)
+
+        override val type: KClass<out VisionClient> = VisionClient::class
+    }
+}
+
+/**
+ * Fetch and render visions for all elements with [HtmlOutputScope.OUTPUT_CLASS] class inside given [element].
+ */
+public fun VisionClient.fetchVisionsInChildren(element: Element, requestUpdates: Boolean = true) {
+    val elements = element.getElementsByClassName(HtmlOutputScope.OUTPUT_CLASS)
+    console.info("Finished search for outputs. Found ${elements.length} items")
+    elements.asList().forEach { child ->
+        fetchAndRenderVision(child, requestUpdates)
+    }
+}
+
+/**
+ * Fetch visions from the server for all elements with [HtmlOutputScope.OUTPUT_CLASS] class in the document body
+ */
+public fun VisionClient.fetchAndRenderAllVisions(requestUpdates: Boolean = true){
+    val element = document.body ?: error("Document does not have a body")
+    fetchVisionsInChildren(element, requestUpdates)
+}
\ No newline at end of file
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
index 9fe3b43e..3673ecc2 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
@@ -1,7 +1,9 @@
 package hep.dataforge.vision.client
 
+import hep.dataforge.meta.DFExperimental
 import hep.dataforge.names.Name
 import hep.dataforge.names.toName
+import hep.dataforge.provider.Type
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.html.BindingHtmlOutputScope
 import hep.dataforge.vision.html.HtmlOutputScope
@@ -10,18 +12,38 @@ import kotlinx.browser.document
 import kotlinx.html.TagConsumer
 import org.w3c.dom.*
 
-public interface ElementVisionRenderer<in V : Vision> {
-    public fun render(element: Element, vision: V): Unit
-}
+@Type(ElementVisionRenderer.TYPE)
+public interface ElementVisionRenderer {
 
-public fun <V : Vision> Map<String, V>.bind(renderer: ElementVisionRenderer<V>) {
-    forEach { (id, vision) ->
-        val element = document.getElementById(id) ?: error("Could not find element with id $id")
-        renderer.render(element, vision)
+    /**
+     * Give a [vision] integer rating based on this renderer capabilities. [ZERO_RATING] or negative values means that this renderer
+     * can't process a vision. The value of [DEFAULT_RATING] used for default renderer. Specialized renderers could specify
+     * higher value in order to "steal" rendering job
+     */
+    public fun rateVision(vision: Vision): Int
+
+    /**
+     * Display the [vision] inside a given [element] replacing its current content
+     */
+    public fun render(element: Element, vision: Vision): Unit
+
+    public companion object {
+        public const val TYPE: String = "elementVisionRenderer"
+        public const val ZERO_RATING: Int = 0
+        public const val DEFAULT_RATING: Int = 10
     }
 }
 
-public fun <V : Vision> Element.renderVisions(renderer: ElementVisionRenderer<V>, visionProvider: (Name) -> V?) {
+@DFExperimental
+public fun Map<String, Vision>.bind(rendererFactory: (Vision) -> ElementVisionRenderer) {
+    forEach { (id, vision) ->
+        val element = document.getElementById(id) ?: error("Could not find element with id $id")
+        rendererFactory(vision).render(element, vision)
+    }
+}
+
+@DFExperimental
+public fun Element.renderAllVisions(visionProvider: (Name) -> Vision, rendererFactory: (Vision) -> ElementVisionRenderer) {
     val elements = getElementsByClassName(HtmlOutputScope.OUTPUT_CLASS)
     elements.asList().forEach { element ->
         val name = element.attributes[HtmlOutputScope.OUTPUT_NAME_ATTRIBUTE]?.value
@@ -30,21 +52,19 @@ public fun <V : Vision> Element.renderVisions(renderer: ElementVisionRenderer<V>
             return@forEach
         }
         val vision = visionProvider(name.toName())
-        if (vision == null) {
-            console.error("Vision with name $name is not resolved")
-            return@forEach
-        }
-        renderer.render(element, vision)
+        rendererFactory(vision).render(element, vision)
     }
 }
 
-public fun <V : Vision> Document.renderVisions(renderer: ElementVisionRenderer<V>, visionProvider: (Name) -> V?): Unit {
-    documentElement?.renderVisions(renderer, visionProvider)
+@DFExperimental
+public fun Document.renderAllVisions(visionProvider: (Name) -> Vision, rendererFactory: (Vision) -> ElementVisionRenderer): Unit {
+    documentElement?.renderAllVisions(visionProvider,rendererFactory)
 }
 
+@DFExperimental
 public fun HtmlVisionFragment<Vision>.renderInDocument(
     root: TagConsumer<HTMLElement>,
-    renderer: ElementVisionRenderer<Vision>,
+    renderer: ElementVisionRenderer,
 ): HTMLElement = BindingHtmlOutputScope<HTMLElement, Vision>(root).apply(content).let { scope ->
     scope.finalize().apply {
         scope.bindings.forEach { (name, vision) ->
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
index 77f18d81..c306fae4 100644
--- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
@@ -14,6 +14,7 @@ import hep.dataforge.vision.html.*
 import hep.dataforge.vision.server.VisionServer.Companion.DEFAULT_PAGE
 import io.ktor.application.*
 import io.ktor.features.CORS
+import io.ktor.features.CallLogging
 import io.ktor.html.respondHtml
 import io.ktor.http.ContentType
 import io.ktor.http.HttpStatusCode
@@ -23,7 +24,10 @@ import io.ktor.http.content.static
 import io.ktor.http.withCharset
 import io.ktor.response.respond
 import io.ktor.response.respondText
-import io.ktor.routing.*
+import io.ktor.routing.application
+import io.ktor.routing.get
+import io.ktor.routing.route
+import io.ktor.routing.routing
 import io.ktor.server.engine.ApplicationEngine
 import io.ktor.websocket.WebSockets
 import io.ktor.websocket.webSocket
@@ -34,9 +38,12 @@ import java.awt.Desktop
 import java.net.URI
 import kotlin.time.milliseconds
 
+/**
+ * A ktor plugin container with given [routing]
+ */
 public class VisionServer internal constructor(
     private val visionManager: VisionManager,
-    private val routing: Routing,
+    private val application: Application,
     private val rootRoute: String,
 ) : Configurable {
     override val config: Config = Config()
@@ -57,7 +64,7 @@ public class VisionServer internal constructor(
         title: String,
         headers: List<HtmlFragment>,
     ): Map<Name, Vision> {
-        lateinit var result: Map<Name, Vision>
+        lateinit var visionMap: Map<Name, Vision>
 
         head {
             meta {
@@ -69,21 +76,26 @@ public class VisionServer internal constructor(
             title(title)
         }
         body {
-            result = visionFragment(visionFragment)
-            script {
-                type = "text/javascript"
-
-                val normalizedRoute = if (rootRoute.endsWith("/")) {
-                    rootRoute
-                } else {
-                    "$rootRoute/"
-                }
-
-                src = TODO()//"${normalizedRoute}js/plotlyConnect.js"
-            }
+//            attributes[OUTPUT_ENDPOINT_ATTRIBUTE] = if (rootRoute.endsWith("/")) {
+//                rootRoute
+//            } else {
+//                "$rootRoute/"
+//            }
+            //Load the fragment and remember all loaded visions
+            visionMap = visionFragment(visionFragment)
+//            //The script runs when all headers already with required libraries are already loaded
+//            script {
+//                type = "text/javascript"
+//
+//                val normalizedRoute =
+//                unsafe {
+//                    //language=JavaScript
+//                    +"fetchAndRenderAllVisions()"
+//                }
+//            }
         }
 
-        return result
+        return visionMap
     }
 
     public fun page(
@@ -102,56 +114,50 @@ public class VisionServer internal constructor(
             null
         }
 
-        routing.createRouteFromPath(rootRoute).apply {
-            route(route) {
-                //Update websocket
-                webSocket("ws") {
-                    val name: String = call.request.queryParameters["name"]
-                        ?: error("Vision name is not defined in parameters")
+        application.routing {
+            route(rootRoute) {
+                route(route) {
+                    //Update websocket
+                    webSocket("ws") {
+                        val name: String = call.request.queryParameters["name"]
+                            ?: error("Vision name is not defined in parameters")
 
-                    application.log.debug("Opened server socket for $name")
-                    val vision: Vision = visions[name.toName()] ?: error("Plot with id='$name' not registered")
-                    try {
-                        vision.flowChanges(this, updateInterval.milliseconds).collect {  update ->
-                            val json = visionManager.encodeToString(update)
-                            outgoing.send(Frame.Text(json))
+                        application.log.debug("Opened server socket for $name")
+                        val vision: Vision = visions[name.toName()] ?: error("Plot with id='$name' not registered")
+                        try {
+                            vision.flowChanges(this, updateInterval.milliseconds).collect { update ->
+                                val json = visionManager.encodeToString(update)
+                                outgoing.send(Frame.Text(json))
+                            }
+                        } catch (ex: Exception) {
+                            application.log.debug("Closed server socket for $name")
                         }
-                    } catch (ex: Exception) {
-                        application.log.debug("Closed server socket for $name")
                     }
-                }
-                //Plots in their json representation
-                get("vision") {
-                    val name: String = call.request.queryParameters["name"]
-                        ?: error("Vision name is not defined in parameters")
+                    //Plots in their json representation
+                    get("vision") {
+                        val name: String = call.request.queryParameters["name"]
+                            ?: error("Vision name is not defined in parameters")
 
-                    val vision: Vision? = visions[name.toName()]
-                    if (vision == null) {
-                        call.respond(HttpStatusCode.NotFound, "Vision with name '$name' not found")
-                    } else {
-                        call.respondText(
-                            visionManager.encodeToString(vision),
-                            contentType = ContentType.Application.Json,
-                            status = HttpStatusCode.OK
-                        )
-                    }
-                }
-                //filled pages
-                get {
-//                    val origin = call.request.origin
-//                    val url = URLBuilder().apply {
-//                        protocol = URLProtocol.createOrDefault(origin.scheme)
-//                        //workaround for https://github.com/ktorio/ktor/issues/1663
-//                        host = if (origin.host.startsWith("0:")) "[${origin.host}]" else origin.host
-//                        port = origin.port
-//                        encodedPath = origin.uri
-//                    }.build()
-                    if (cachedHtml == null) {
-                        call.respondHtml {
-                            visions.putAll(buildPage(visionFragment, title, headers))
+                        val vision: Vision? = visions[name.toName()]
+                        if (vision == null) {
+                            call.respond(HttpStatusCode.NotFound, "Vision with name '$name' not found")
+                        } else {
+                            call.respondText(
+                                visionManager.encodeToString(vision),
+                                contentType = ContentType.Application.Json,
+                                status = HttpStatusCode.OK
+                            )
+                        }
+                    }
+                    //filled pages
+                    get {
+                        if (cachedHtml == null) {
+                            call.respondHtml {
+                                visions.putAll(buildPage(visionFragment, title, headers))
+                            }
+                        } else {
+                            call.respondText(cachedHtml, ContentType.Text.Html.withCharset(Charsets.UTF_8))
                         }
-                    } else {
-                        call.respondText(cachedHtml, ContentType.Text.Html.withCharset(Charsets.UTF_8))
                     }
                 }
             }
@@ -160,7 +166,7 @@ public class VisionServer internal constructor(
 
     public fun page(
         route: String = DEFAULT_PAGE,
-        title: String = "Plotly server page '$route'",
+        title: String = "VisionForge server page '$route'",
         headers: List<HtmlFragment> = emptyList(),
         content: HtmlOutputScope<*, Vision>.() -> Unit,
     ) {
@@ -170,7 +176,6 @@ public class VisionServer internal constructor(
 
     public companion object {
         public const val DEFAULT_PAGE: String = "/"
-        public val UPDATE_MODE_KEY: Name = "update.mode".toName()
         public val UPDATE_INTERVAL_KEY: Name = "update.interval".toName()
     }
 }
@@ -190,8 +195,12 @@ public fun Application.visionModule(context: Context, route: String = DEFAULT_PA
         }
     }
 
+    if(featureOrNull(CallLogging) == null){
+        install(CallLogging)
+    }
 
-    val routing = routing {
+
+    routing {
         route(route) {
             static {
                 resources()
@@ -201,7 +210,7 @@ public fun Application.visionModule(context: Context, route: String = DEFAULT_PA
 
     val visionManager = context.plugins.fetch(VisionManager)
 
-    return VisionServer(visionManager, routing, route)
+    return VisionServer(visionManager, this, route)
 }
 
 public fun ApplicationEngine.show() {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
index 5bbbcc7d..08d8199f 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
@@ -12,7 +12,7 @@ public class Box(
     public val xSize: Float,
     public val ySize: Float,
     public val zSize: Float
-) : BasicSolid(), GeometrySolid {
+) : SolidBase(), GeometrySolid {
 
     //TODO add helper for color configuration
     override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>) {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
index ec036419..566be58a 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
@@ -19,7 +19,7 @@ public class Composite(
     public val compositeType: CompositeType,
     public val first: Solid,
     public val second: Solid
-) : BasicSolid(), Solid, VisionGroup {
+) : SolidBase(), Solid, VisionGroup {
 
     init {
         first.parent = this
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
index 15116d93..ddd329e0 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
@@ -18,7 +18,7 @@ public class ConeSegment(
     public var upperRadius: Float,
     public var startAngle: Float = 0f,
     public var angle: Float = PI2
-) : BasicSolid(), GeometrySolid {
+) : SolidBase(), GeometrySolid {
 
     override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>) {
         val segments = detail ?: 8
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
index c6425d5c..7fac91c5 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
@@ -7,7 +7,7 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 @SerialName("solid.convex")
-public class Convex(public val points: List<Point3D>) : BasicSolid(), Solid
+public class Convex(public val points: List<Point3D>) : SolidBase(), Solid
 
 public inline fun VisionContainerBuilder<Solid>.convex(name: String = "", action: ConvexBuilder.() -> Unit = {}): Convex =
     ConvexBuilder().apply(action).build().also { set(name, it) }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
index dc539387..e9c0d3a1 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
@@ -39,7 +39,7 @@ public data class Layer(var x: Float, var y: Float, var z: Float, var scale: Flo
 public class Extruded(
     public var shape: List<Point2D> = ArrayList(),
     public var layers: MutableList<Layer> = ArrayList()
-) : BasicSolid(), GeometrySolid {
+) : SolidBase(), GeometrySolid {
 
     public fun shape(block: Shape2DBuilder.() -> Unit) {
         this.shape = Shape2DBuilder().apply(block).build()
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
index f55cc89a..7305011e 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
@@ -12,7 +12,7 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 @SerialName("solid.line")
-public class PolyLine(public var points: List<Point3D>) : BasicSolid(), Solid {
+public class PolyLine(public var points: List<Point3D>) : SolidBase(), Solid {
 
     //var lineType by string()
     public var thickness: Number by props().number(1.0, key = SolidMaterial.MATERIAL_KEY + THICKNESS_KEY)
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/BasicSolid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidBase.kt
similarity index 95%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/BasicSolid.kt
rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidBase.kt
index 93fef60f..f6d836a1 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/BasicSolid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidBase.kt
@@ -12,7 +12,7 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 @SerialName("solid")
-public open class BasicSolid : VisionBase(), Solid {
+public open class SolidBase : VisionBase(), Solid {
     override val descriptor: NodeDescriptor get() = Solid.descriptor
 
     override var position: Point3D? = null
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
index bb033215..b829c7e1 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
@@ -11,7 +11,7 @@ public class SolidLabel(
     public var text: String,
     public var fontSize: Double,
     public var fontFamily: String,
-) : BasicSolid(), Solid
+) : SolidBase(), Solid
 
 public fun VisionContainerBuilder<Solid>.label(
     text: String,
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index 1800865d..34bfed6b 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -7,10 +7,7 @@ import hep.dataforge.context.PluginTag
 import hep.dataforge.meta.Meta
 import hep.dataforge.names.Name
 import hep.dataforge.names.toName
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionGroup
-import hep.dataforge.vision.VisionGroupBase
-import hep.dataforge.vision.VisionManager
+import hep.dataforge.vision.*
 import hep.dataforge.vision.VisionManager.Companion.VISION_SERIALIZER_MODULE_TARGET
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.modules.PolymorphicModuleBuilder
@@ -42,6 +39,7 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
             subclass(Composite.serializer())
             subclass(Tube.serializer())
             subclass(Box.serializer())
+            subclass(ConeSegment.serializer())
             subclass(Convex.serializer())
             subclass(Extruded.serializer())
             subclass(PolyLine.serializer())
@@ -51,11 +49,13 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
 
         public val serializersModuleForSolids: SerializersModule = SerializersModule {
             polymorphic(Vision::class) {
+                subclass(VisionBase.serializer())
                 subclass(VisionGroupBase.serializer())
                 solids()
             }
 
             polymorphic(Solid::class) {
+                default { SolidBase.serializer() }
                 solids()
             }
         }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
index cf652b8b..3895171e 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
@@ -9,7 +9,7 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import kotlin.collections.set
 
-public abstract class AbstractReference : BasicSolid(), VisionGroup {
+public abstract class AbstractReference : SolidBase(), VisionGroup {
     public abstract val prototype: Solid
 
     override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? = sequence {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
index 7a122c44..b04eb76b 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
@@ -16,7 +16,7 @@ public class Sphere(
     public var phi: Float = PI2,
     public var thetaStart: Float = 0f,
     public var theta: Float = PI.toFloat(),
-) : BasicSolid(), GeometrySolid {
+) : SolidBase(), GeometrySolid {
 
     override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>) {
         fun point3DfromSphCoord(r: Float, theta: Float, phi: Float): Point3D {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
index 6d486da4..b48e7f6f 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
@@ -19,7 +19,7 @@ public class Tube(
     public var innerRadius: Float = 0f,
     public var startAngle: Float = 0f,
     public var angle: Float = PI2,
-) : BasicSolid(), GeometrySolid {
+) : SolidBase(), GeometrySolid {
 
     init {
         require(radius > 0)
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index cd6c76c6..63740483 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -15,7 +15,7 @@ import kotlin.collections.set
 import kotlin.reflect.KClass
 import info.laht.threekt.objects.Group as ThreeGroup
 
-public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer<Solid> {
+public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
     override val tag: PluginTag get() = Companion.tag
 
     public val solidManager: SolidManager by require(SolidManager)
@@ -122,8 +122,19 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer<Solid> {
         attach(element)
     }
 
-    override fun render(element: Element, vision: Solid) {
-        createCanvas(element).render(vision)
+    override fun content(target: String): Map<Name, Any> {
+        return when (target) {
+            ElementVisionRenderer.TYPE -> mapOf("three".asName() to this)
+            else -> super.content(target)
+        }
+    }
+
+    override fun rateVision(vision: Vision): Int {
+        return if (vision is Solid) ElementVisionRenderer.DEFAULT_RATING else ElementVisionRenderer.ZERO_RATING
+    }
+
+    override fun render(element: Element, vision: Vision) {
+        createCanvas(element).render(vision as? Solid ?: error("Only solids are rendered"))
     }
 
     public companion object : PluginFactory<ThreePlugin> {
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
index 16d90280..67870229 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
@@ -1,11 +1,11 @@
 package hep.dataforge.vision.solid.three
 
-import hep.dataforge.vision.solid.BasicSolid
+import hep.dataforge.vision.solid.SolidBase
 import info.laht.threekt.core.Object3D
 
 /**
  * A custom visual object that has its own Three.js renderer
  */
-public abstract class ThreeVision : BasicSolid() {
+public abstract class ThreeVision : SolidBase() {
     public abstract fun render(): Object3D
 }

From face7bfd0ce64227e5c278a0d82e685f264e59fc Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 6 Dec 2020 20:00:34 +0300
Subject: [PATCH 040/151] Fix attachment of children on Vision deserialization

---
 .../mipt/npm/sat/GeometrySerializationTest.kt | 17 ++++++++++++++++
 .../kotlin/hep/dataforge/vision/Vision.kt     |  3 ---
 .../hep/dataforge/vision/VisionManager.kt     | 20 ++++++++++++++-----
 .../hep/dataforge/vision/visionChange.kt      |  8 ++++++--
 .../dataforge/vision/client/VisionClient.kt   |  7 +++++--
 .../dataforge/vision/server/VisionServer.kt   |  2 +-
 .../hep/dataforge/vision/solid/SolidGroup.kt  |  3 ++-
 .../dataforge/vision/solid/SolidManager.kt    |  5 +++--
 8 files changed, 49 insertions(+), 16 deletions(-)
 create mode 100644 demo/sat-demo/src/commonTest/kotlin/ru/mipt/npm/sat/GeometrySerializationTest.kt

diff --git a/demo/sat-demo/src/commonTest/kotlin/ru/mipt/npm/sat/GeometrySerializationTest.kt b/demo/sat-demo/src/commonTest/kotlin/ru/mipt/npm/sat/GeometrySerializationTest.kt
new file mode 100644
index 00000000..8b9e3c23
--- /dev/null
+++ b/demo/sat-demo/src/commonTest/kotlin/ru/mipt/npm/sat/GeometrySerializationTest.kt
@@ -0,0 +1,17 @@
+package ru.mipt.npm.sat
+
+import hep.dataforge.context.Global
+import hep.dataforge.vision.solid.SolidManager
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class GeometrySerializationTest {
+    @Test
+    fun testSerialization(){
+        val geometry = visionOfSatellite()
+        val manager = Global.plugins.fetch(SolidManager)
+        val string = manager.visionManager.encodeToString(geometry)
+        val reconstructed = manager.visionManager.decodeFromString(string)
+        assertEquals(geometry.config,reconstructed.config)
+    }
+}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 1ee5036e..51110598 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -10,7 +10,6 @@ import hep.dataforge.provider.Type
 import hep.dataforge.values.asValue
 import hep.dataforge.vision.Vision.Companion.TYPE
 import hep.dataforge.vision.Vision.Companion.VISIBLE_KEY
-import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.Transient
 
 /**
@@ -75,8 +74,6 @@ public interface Vision : Configurable, Described {
         public const val TYPE: String = "vision"
         public val STYLE_KEY: Name = "@style".asName()
 
-        public fun serializer(): PolymorphicSerializer<Vision> = PolymorphicSerializer(Vision::class)
-
         public val VISIBLE_KEY: Name = "visible".asName()
     }
 }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
index 7c0e14f6..ffb26ccf 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
@@ -3,6 +3,7 @@ package hep.dataforge.vision
 import hep.dataforge.context.*
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
+import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.modules.SerializersModule
@@ -24,17 +25,24 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
             }
         }
 
-    public val jsonFormat: Json
+    private val jsonFormat: Json
         get() = Json(defaultJson) {
             serializersModule = this@VisionManager.serializersModule
         }
 
-    public fun decodeFromString(string: String): Vision = jsonFormat.decodeFromString(Vision.serializer(), string)
-    public fun encodeToString(vision: Vision): String = jsonFormat.encodeToString(Vision.serializer(), vision)
+    public fun decodeFromString(string: String): Vision = jsonFormat.decodeFromString(visionSerializer, string).also {
+        (it as? VisionGroup)?.attachChildren()
+    }
+
+    public fun encodeToString(vision: Vision): String = jsonFormat.encodeToString(visionSerializer, vision)
+
+    public fun decodeFromJson(json: JsonElement): Vision =
+        jsonFormat.decodeFromJsonElement(visionSerializer, json).also {
+            (it as? VisionGroup)?.attachChildren()
+        }
 
-    public fun decodeFromJson(json: JsonElement): Vision = jsonFormat.decodeFromJsonElement(Vision.serializer(), json)
     public fun encodeToJsonElement(vision: Vision): JsonElement =
-        jsonFormat.encodeToJsonElement(Vision.serializer(), vision)
+        jsonFormat.encodeToJsonElement(visionSerializer, vision)
 
     //TODO remove double transformation with dedicated Meta serial format
     public fun decodeFromMeta(meta: Meta, descriptor: NodeDescriptor? = null): Vision =
@@ -67,5 +75,7 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
             encodeDefaults = false
             ignoreUnknownKeys = true
         }
+
+        internal val visionSerializer: PolymorphicSerializer<Vision> = PolymorphicSerializer(Vision::class)
     }
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt
index e0041bf5..76bd6775 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt
@@ -5,6 +5,7 @@ import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.names.Name
 import hep.dataforge.names.isEmpty
 import hep.dataforge.names.plus
+import hep.dataforge.vision.VisionManager.Companion.visionSerializer
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
@@ -54,10 +55,13 @@ public abstract class EmptyVision : Vision {
 @SerialName("vision.null")
 public object NullVision : EmptyVision()
 
+/**
+ * Serialization proxy is used to create immutable reference for a given vision
+ */
 @Serializable(VisionSerializationProxy.Companion::class)
 private class VisionSerializationProxy(val ref: Vision) : EmptyVision() {
     companion object : KSerializer<VisionSerializationProxy> {
-        override val descriptor: SerialDescriptor = Vision.serializer().descriptor
+        override val descriptor: SerialDescriptor = visionSerializer.descriptor
 
         @OptIn(ExperimentalSerializationApi::class)
         override fun serialize(encoder: Encoder, value: VisionSerializationProxy) {
@@ -67,7 +71,7 @@ private class VisionSerializationProxy(val ref: Vision) : EmptyVision() {
         }
 
         override fun deserialize(decoder: Decoder): VisionSerializationProxy =
-            VisionSerializationProxy(Vision.serializer().deserialize(decoder))
+            VisionSerializationProxy(visionSerializer.deserialize(decoder))
     }
 }
 
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
index ce74f85f..d689e66f 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
@@ -47,14 +47,17 @@ public class VisionClient : AbstractPlugin() {
         if (!element.classList.contains(HtmlOutputScope.OUTPUT_CLASS)) error("The element $element is not an output element")
         val endpoint = resolveEndpoint(element)
         console.info("Vision server is resolved to $endpoint")
+
         val fetchUrl = URL(endpoint).apply {
             searchParams.append("name", name)
             pathname += "/vision"
         }
+
+        console.info("Fetching vision data from $fetchUrl")
         window.fetch(fetchUrl).then { response ->
             if (response.ok) {
                 response.text().then { text ->
-                    val vision = visionManager.jsonFormat.decodeFromString(Vision.serializer(), text)
+                    val vision = visionManager.decodeFromString(text)
 
                     val renderer = findRendererFor(vision) ?: error("Could nof find renderer for $vision")
                     renderer.render(element, vision)
@@ -68,7 +71,7 @@ public class VisionClient : AbstractPlugin() {
                             onmessage = { messageEvent ->
                                 val stringData: String? = messageEvent.data as? String
                                 if (stringData != null) {
-                                    val update = visionManager.jsonFormat.decodeFromString(Vision.serializer(), text)
+                                    val update = visionManager.decodeFromString(text)
                                     vision.update(update)
                                 } else {
                                     console.error("WebSocket message data is not a string")
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
index c306fae4..8b53dc90 100644
--- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
@@ -130,7 +130,7 @@ public class VisionServer internal constructor(
                                 outgoing.send(Frame.Text(json))
                             }
                         } catch (ex: Exception) {
-                            application.log.debug("Closed server socket for $name")
+                            application.log.debug("Closed server socket for $name with exception $ex")
                         }
                     }
                     //Plots in their json representation
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index 991fc09b..50b53cdc 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -6,6 +6,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.NameToken
 import hep.dataforge.vision.*
 import kotlinx.serialization.KSerializer
+import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.MapSerializer
@@ -126,7 +127,7 @@ internal class Prototypes(
         private val mapSerializer: KSerializer<Map<NameToken, Vision>> =
             MapSerializer(
                 NameToken.serializer(),
-                Vision.serializer()
+                PolymorphicSerializer(Vision::class)
             )
 
         override val descriptor: SerialDescriptor get() = mapSerializer.descriptor
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index 34bfed6b..d098a72b 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -9,6 +9,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.toName
 import hep.dataforge.vision.*
 import hep.dataforge.vision.VisionManager.Companion.VISION_SERIALIZER_MODULE_TARGET
+import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.modules.PolymorphicModuleBuilder
 import kotlinx.serialization.modules.SerializersModule
@@ -64,9 +65,9 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
             serializersModule = serializersModuleForSolids
         }
 
-        public fun encodeToString(solid: Solid): String = jsonForSolids.encodeToString(Vision.serializer(), solid)
+        internal fun encodeToString(solid: Solid): String = jsonForSolids.encodeToString(PolymorphicSerializer(Vision::class), solid)
 
-        public fun decodeFromString(str: String): Vision = jsonForSolids.decodeFromString(Vision.serializer(), str).also {
+        internal fun decodeFromString(str: String): Vision = jsonForSolids.decodeFromString(PolymorphicSerializer(Vision::class), str).also {
             if(it is VisionGroup){
                 it.attachChildren()
             }

From 8a4779e9c4d3df5e47cce3dd5c8100ba2e0acf1e Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 6 Dec 2020 21:14:28 +0300
Subject: [PATCH 041/151] Fix changesFlow issues

---
 .../kotlin/ru/mipt/npm/sat/satServer.kt       | 15 ++++++++++++
 .../hep/dataforge/vision/VisionGroup.kt       |  2 +-
 .../hep/dataforge/vision/VisionGroupBase.kt   |  4 ++--
 .../hep/dataforge/vision/visionChange.kt      | 23 ++++++++++++-------
 .../dataforge/vision/server/VisionServer.kt   |  6 +++--
 5 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt b/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
index 6ac3e3c2..eea0a4bb 100644
--- a/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
+++ b/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
@@ -3,12 +3,19 @@ package ru.mipt.npm.sat
 
 import hep.dataforge.context.Global
 import hep.dataforge.names.asName
+import hep.dataforge.vision.get
 import hep.dataforge.vision.server.visionModule
+import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.SolidManager
+import hep.dataforge.vision.solid.color
 import io.ktor.server.cio.CIO
 import io.ktor.server.engine.embeddedServer
 import io.ktor.util.KtorExperimentalAPI
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
 import kotlinx.html.script
+import kotlin.random.Random
 
 @OptIn(KtorExperimentalAPI::class)
 fun main() {
@@ -31,5 +38,13 @@ fun main() {
                 vision("main".asName(), sat)
             }
         }
+        launch {
+            while (isActive){
+                val currentLayer = Random.nextInt(10)
+                (sat["layer[$currentLayer]"] as? Solid)?.color(123)
+                delay(300)
+                (sat["layer[$currentLayer]"] as? Solid)?.color = null
+            }
+        }
     }.start(wait = true)
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
index e2101b0c..6fd1c559 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
@@ -97,7 +97,7 @@ public interface MutableVisionGroup : VisionGroup, VisionContainerBuilder<Vision
 //    public operator fun set(name: Name, child: Vision?)
 }
 
-public operator fun <V: Vision> VisionContainer<V>.get(str: String?): V? = get(str?.toName() ?: Name.EMPTY)
+public operator fun <V: Vision> VisionContainer<V>.get(str: String): V? = get(str.toName())
 
 public operator fun <V: Vision>  VisionContainerBuilder<V>.set(token: NameToken, child: V?): Unit = set(token.asName(), child)
 public operator fun <V: Vision>  VisionContainerBuilder<V>.set(key: String, child: V?): Unit = set(key.toName(), child)
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
index 767f0e5a..c7fb11c2 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
@@ -15,10 +15,10 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
 
     /**
      * Internal mutable container for group children
-     * TODO made protected due to https://github.com/Kotlin/kotlinx.serialization/issues/1200
+     * TODO made protected due to [https://github.com/Kotlin/kotlinx.serialization/issues/1200]
      */
     @SerialName("children")
-    protected open val childrenInternal: MutableMap<NameToken, Vision> = LinkedHashMap()
+    protected val childrenInternal: MutableMap<NameToken, Vision> = LinkedHashMap()
 
     /**
      * A map of top level named children
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt
index 76bd6775..9e8b2ad8 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt
@@ -88,15 +88,25 @@ private fun CoroutineScope.collectChange(
     mutex: Mutex,
     target: () -> MutableVisionGroup,
 ) {
-    val targetVision: () -> Vision = { target().getOrCreate(name) }
     //Collect properties change
-    source.onPropertyChange(mutex) { propertyName ->
-        launch {
-            mutex.withLock {
-                targetVision().setProperty(propertyName, source.getProperty(propertyName))
+    source.config.onChange(mutex){propertyName, oldItem, newItem->
+        if(oldItem!= newItem){
+            launch {
+                mutex.withLock {
+                    target().getOrCreate(name).setProperty(propertyName, newItem)
+                }
             }
         }
     }
+//    source.onPropertyChange(mutex) { propertyName ->
+//        launch {
+//            mutex.withLock {
+//                target().getOrCreate(name).setProperty(propertyName, source.getProperty(propertyName,false))
+//            }
+//        }
+//    }
+
+    val targetVision: Vision =  target().getOrCreate(name)
 
     if (source is VisionGroup) {
         check(targetVision is MutableVisionGroup) { "Collector for a group should be a group" }
@@ -124,9 +134,6 @@ private fun CoroutineScope.collectChange(
 
 @DFExperimental
 public fun Vision.flowChanges(scope: CoroutineScope, collectionDuration: Duration): Flow<Vision> = flow {
-    //emit initial visual tree
-    emit(this@flowChanges)
-
     val mutex = Mutex()
 
     var collector = VisionGroupBase()
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
index 8b53dc90..5ea07639 100644
--- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
@@ -29,6 +29,7 @@ import io.ktor.routing.get
 import io.ktor.routing.route
 import io.ktor.routing.routing
 import io.ktor.server.engine.ApplicationEngine
+import io.ktor.util.error
 import io.ktor.websocket.WebSockets
 import io.ktor.websocket.webSocket
 import kotlinx.coroutines.flow.collect
@@ -129,8 +130,9 @@ public class VisionServer internal constructor(
                                 val json = visionManager.encodeToString(update)
                                 outgoing.send(Frame.Text(json))
                             }
-                        } catch (ex: Exception) {
-                            application.log.debug("Closed server socket for $name with exception $ex")
+                        } catch (ex: Throwable) {
+                            application.log.error("Closed server socket for $name with exception $ex")
+                            application.log.error(ex)
                         }
                     }
                     //Plots in their json representation

From a7136d3eff0513a9702c523effc02d18476d6c21 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 8 Dec 2020 18:10:00 +0300
Subject: [PATCH 042/151] Using specialized VisionChange

---
 README.md                                     |   2 +
 .../mipt/npm/muon/monitor/server/MMServer.kt  |  10 +-
 .../kotlin/hep/dataforge/vision/Vision.kt     |   2 +-
 .../kotlin/hep/dataforge/vision/VisionBase.kt |  11 +-
 .../hep/dataforge/vision/VisionChange.kt      | 123 ++++++++++++++
 .../hep/dataforge/vision/VisionGroupBase.kt   |  33 ++--
 .../hep/dataforge/vision/VisionManager.kt     |   2 +-
 .../hep/dataforge/vision/visionChange.kt      | 153 ------------------
 .../dataforge/vision/client/VisionClient.kt   |  12 +-
 .../dataforge/vision/server/VisionServer.kt   |  10 +-
 .../hep/dataforge/vision/solid/Composite.kt   |   8 +-
 .../hep/dataforge/vision/solid/SolidBase.kt   |  26 +--
 .../hep/dataforge/vision/solid/SolidGroup.kt  |  10 +-
 .../vision/solid/VisionUpdateTest.kt          |  74 +++++++++
 14 files changed, 271 insertions(+), 205 deletions(-)
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
 delete mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt
 create mode 100644 visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt

diff --git a/README.md b/README.md
index 156e2ae3..fea0692c 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@
 
 ![Gradle build](https://github.com/mipt-npm/visionforge/workflows/Gradle%20build/badge.svg)
 
+[![Slack](https://img.shields.io/badge/slack-channel-green?logo=slack)](https://kotlinlang.slack.com/archives/CEXV2QWNM)
+
 # DataForge Visualization Platform
 
 ## Table of Contents
diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
index b4a55ad5..a4c6354a 100644
--- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
+++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
@@ -27,9 +27,11 @@ import org.apache.commons.math3.random.JDKRandomGenerator
 import ru.mipt.npm.muon.monitor.Model
 import ru.mipt.npm.muon.monitor.sim.Cos2TrackGenerator
 import ru.mipt.npm.muon.monitor.sim.simulateOne
+import io.ktor.response.respondText
 import java.awt.Desktop
 import java.io.File
 import java.net.URI
+import io.ktor.http.HttpStatusCode
 
 private val generator = Cos2TrackGenerator(JDKRandomGenerator(223))
 
@@ -42,7 +44,7 @@ fun Application.module(context: Context = Global) {
     install(DefaultHeaders)
     install(CallLogging)
     install(ContentNegotiation) {
-        json(solidManager.visionManager.jsonFormat, ContentType.Application.Json)
+        json()
     }
     install(Routing) {
         get("/event") {
@@ -50,7 +52,11 @@ fun Application.module(context: Context = Global) {
             call.respond(event)
         }
         get("/geometry") {
-            call.respond(Model.buildGeometry())
+            call.respondText(
+                solidManager.visionManager.encodeToString(Model.buildGeometry()),
+                contentType = ContentType.Application.Json,
+                status = HttpStatusCode.OK
+            )
         }
         static("/") {
             resources()
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 51110598..5de49992 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -66,7 +66,7 @@ public interface Vision : Configurable, Described {
     /**
      * Update this vision using external meta. Children are not updated.
      */
-    public fun update(change: Vision)
+    public fun update(change: VisionChange)
 
     override val descriptor: NodeDescriptor?
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index 492fee47..e52041fe 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -46,12 +46,13 @@ public open class VisionBase : Vision {
      * The config is initialized and assigned on-demand.
      * To avoid unnecessary allocations, one should access [getAllProperties] via [getProperty] instead.
      */
-    override val config: Config
-        get() = properties ?: Config().also { config ->
+    override val config: Config by lazy {
+        properties ?: Config().also { config ->
             properties = config.also {
                 it.onChange(this) { name, _, _ -> propertyChanged(name) }
             }
         }
+    }
 
     @Transient
     private val listeners = HashSet<PropertyListener>()
@@ -101,9 +102,9 @@ public open class VisionBase : Vision {
         properties = null
     }
 
-    override fun update(change: Vision) {
-        if (change.properties != null) {
-            config.update(change.config)
+    override fun update(change: VisionChange) {
+        change.propertyChange[Name.EMPTY]?.let {
+            config.update(it)
         }
     }
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
new file mode 100644
index 00000000..a51b4497
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
@@ -0,0 +1,123 @@
+package hep.dataforge.vision
+
+import hep.dataforge.meta.*
+import hep.dataforge.names.Name
+import hep.dataforge.names.plus
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.serialization.*
+import kotlin.time.Duration
+
+/**
+ * An update for a [Vision] or a [VisionGroup]
+ */
+public class VisionChangeBuilder: VisionContainerBuilder<Vision> {
+    private val propertyChange = HashMap<Name, Config>()
+    private val childrenChange = HashMap<Name, Vision?>()
+
+    public fun isEmpty(): Boolean = propertyChange.isEmpty() && childrenChange.isEmpty()
+
+    public fun propertyChanged(visionName: Name, propertyName: Name, item: MetaItem<*>?) {
+        propertyChange.getOrPut(visionName) { Config() }.setItem(propertyName, item)
+    }
+
+    override fun set(name: Name, child: Vision?) {
+        childrenChange[name] = child
+    }
+
+    /**
+     * Isolate collected changes by creating detached copies of given visions
+     */
+    public fun isolate(manager: VisionManager): VisionChange = VisionChange(
+        propertyChange,
+        childrenChange.mapValues { it.value?.isolate(manager) }
+    )
+}
+
+private fun Vision.isolate(manager: VisionManager): Vision {
+    //TODO replace by efficient deep copy
+    val json = manager.encodeToJsonElement(this)
+    return manager.decodeFromJson(json)
+}
+
+@Serializable
+public data class VisionChange(
+    val propertyChange: Map<Name, @Serializable(MetaSerializer::class) Meta>,
+    val childrenChange: Map<Name, Vision?>) {
+    public fun isEmpty(): Boolean = propertyChange.isEmpty() && childrenChange.isEmpty()
+
+    /**
+     * A shortcut to the top level property dif
+     */
+    public val properties: Meta? get() = propertyChange[Name.EMPTY]
+}
+
+public inline fun VisionChange(manager: VisionManager, block: VisionChangeBuilder.() -> Unit): VisionChange =
+    VisionChangeBuilder().apply(block).isolate(manager)
+
+
+private fun CoroutineScope.collectChange(
+    name: Name,
+    source: Vision,
+    mutex: Mutex,
+    collector: ()->VisionChangeBuilder,
+) {
+    //Collect properties change
+    source.config.onChange(mutex) { propertyName, oldItem, newItem ->
+        if (oldItem != newItem) {
+            launch {
+                mutex.withLock {
+                    collector().propertyChanged(name, propertyName, newItem)
+                }
+            }
+        }
+    }
+
+    if (source is VisionGroup) {
+        //Subscribe for children changes
+        source.children.forEach { (token, child) ->
+            collectChange(name + token, child, mutex, collector)
+        }
+        //TODO update styles?
+
+        //Subscribe for structure change
+        if (source is MutableVisionGroup) {
+            source.onStructureChange(mutex) { token, before, after ->
+                before?.removeChangeListener(mutex)
+                (before as? MutableVisionGroup)?.removeStructureChangeListener(mutex)
+                if (after != null) {
+                    collectChange(name + token, after, mutex, collector)
+                }
+                collector()[name + token] = after
+            }
+        }
+    }
+}
+
+@DFExperimental
+public fun Vision.flowChanges(
+    manager: VisionManager,
+    collectionDuration: Duration,
+    scope: CoroutineScope = manager.context,
+): Flow<VisionChange> = flow {
+    val mutex = Mutex()
+
+    var collector = VisionChangeBuilder()
+    scope.collectChange(Name.EMPTY, this@flowChanges, mutex){collector}
+
+    while (true) {
+        //Wait for changes to accumulate
+        kotlinx.coroutines.delay(collectionDuration)
+        //Propagate updates only if something is changed
+        if (!collector.isEmpty()) {
+            //emit changes
+            emit(collector.isolate(manager))
+            //Reset the collector
+            collector = VisionChangeBuilder()
+        }
+    }
+}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
index c7fb11c2..947adafd 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
@@ -1,5 +1,6 @@
 package hep.dataforge.vision
 
+import hep.dataforge.meta.configure
 import hep.dataforge.names.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -95,6 +96,9 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
         attachChild(NameToken("@static", index = child.hashCode().toString()), child)
     }
 
+    /**
+     * Create a vision group of the same type as this vision group. Do not attach it.
+     */
     protected open fun createGroup(): VisionGroupBase = VisionGroupBase()
 
     /**
@@ -158,22 +162,19 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
         }
     }
 
-    override fun update(change: Vision) {
-        if (change is VisionGroup) {
-            //update stylesheet
-            val changeStyleSheet = change.styleSheet
-            if (changeStyleSheet != null) {
-                styleSheet {
-                    update(changeStyleSheet)
-                }
-            }
-            change.children.forEach { (token, child) ->
-                when {
-                    child is NullVision -> removeChild(token)
-                    children.containsKey(token) -> children[token]!!.update(child)
-                    else -> attachChild(token, child)
-                }
-            }
+    override fun update(change: VisionChange) {
+        //update stylesheet
+//            val changeStyleSheet = change.styleSheet
+//            if (changeStyleSheet != null) {
+//                styleSheet {
+//                    update(changeStyleSheet)
+//                }
+//            }
+        change.propertyChange.forEach {(childName,configChange)->
+            get(childName)?.configure(configChange)
+        }
+        change.childrenChange.forEach { (name, child) ->
+            set(name, child)
         }
         super.update(change)
     }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
index ffb26ccf..c39eb3d9 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
@@ -25,7 +25,7 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
             }
         }
 
-    private val jsonFormat: Json
+    public val jsonFormat: Json
         get() = Json(defaultJson) {
             serializersModule = this@VisionManager.serializersModule
         }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt
deleted file mode 100644
index 9e8b2ad8..00000000
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionChange.kt
+++ /dev/null
@@ -1,153 +0,0 @@
-package hep.dataforge.vision
-
-import hep.dataforge.meta.*
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.names.Name
-import hep.dataforge.names.isEmpty
-import hep.dataforge.names.plus
-import hep.dataforge.vision.VisionManager.Companion.visionSerializer
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.serialization.*
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import kotlin.time.Duration
-
-
-public abstract class EmptyVision : Vision {
-
-    @Suppress("SetterBackingFieldAssignment", "UNUSED_PARAMETER")
-    override var parent: VisionGroup? = null
-        set(value) {
-            //do nothing
-        }
-
-    override val properties: Config? = null
-
-    override val allProperties: Laminate
-        get() = Laminate(Meta.EMPTY)
-
-    override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? = null
-
-    override fun propertyChanged(name: Name) {}
-
-    override fun onPropertyChange(owner: Any?, action: (Name) -> Unit) {}
-
-    override fun removeChangeListener(owner: Any?) {}
-
-    override fun update(change: Vision) {
-        error("Null vision should be removed, not updated")
-    }
-
-    override val config: Config get() = Config()
-    override val descriptor: NodeDescriptor? get() = null
-}
-
-/**
- * An empty vision existing only for Vision tree change representation. [NullVision] should not be used outside update logic.
- */
-@Serializable
-@SerialName("vision.null")
-public object NullVision : EmptyVision()
-
-/**
- * Serialization proxy is used to create immutable reference for a given vision
- */
-@Serializable(VisionSerializationProxy.Companion::class)
-private class VisionSerializationProxy(val ref: Vision) : EmptyVision() {
-    companion object : KSerializer<VisionSerializationProxy> {
-        override val descriptor: SerialDescriptor = visionSerializer.descriptor
-
-        @OptIn(ExperimentalSerializationApi::class)
-        override fun serialize(encoder: Encoder, value: VisionSerializationProxy) {
-            val serializer = encoder.serializersModule.getPolymorphic(Vision::class, value.ref)
-                ?: error("The polymorphic serializer is not provided for ")
-            serializer.serialize(encoder, value.ref)
-        }
-
-        override fun deserialize(decoder: Decoder): VisionSerializationProxy =
-            VisionSerializationProxy(visionSerializer.deserialize(decoder))
-    }
-}
-
-
-private fun MutableVisionGroup.getOrCreate(name: Name): Vision {
-    if (name.isEmpty()) return this
-    val existing = get(name)
-    return existing ?: VisionGroupBase().also { set(name, it) }
-}
-
-private fun CoroutineScope.collectChange(
-    name: Name,
-    source: Vision,
-    mutex: Mutex,
-    target: () -> MutableVisionGroup,
-) {
-    //Collect properties change
-    source.config.onChange(mutex){propertyName, oldItem, newItem->
-        if(oldItem!= newItem){
-            launch {
-                mutex.withLock {
-                    target().getOrCreate(name).setProperty(propertyName, newItem)
-                }
-            }
-        }
-    }
-//    source.onPropertyChange(mutex) { propertyName ->
-//        launch {
-//            mutex.withLock {
-//                target().getOrCreate(name).setProperty(propertyName, source.getProperty(propertyName,false))
-//            }
-//        }
-//    }
-
-    val targetVision: Vision =  target().getOrCreate(name)
-
-    if (source is VisionGroup) {
-        check(targetVision is MutableVisionGroup) { "Collector for a group should be a group" }
-        //Subscribe for children changes
-        source.children.forEach { (token, child) ->
-            collectChange(name + token, child, mutex, target)
-        }
-        //TODO update styles?
-
-        //Subscribe for structure change
-        if (source is MutableVisionGroup) {
-            source.onStructureChange(mutex) { token, before, after ->
-                before?.removeChangeListener(mutex)
-                (before as? MutableVisionGroup)?.removeStructureChangeListener(mutex)
-                if (after != null) {
-                    targetVision[token] = VisionSerializationProxy(after)
-                    collectChange(name + token, after, mutex, target)
-                } else {
-                    targetVision[token] = NullVision
-                }
-            }
-        }
-    }
-}
-
-@DFExperimental
-public fun Vision.flowChanges(scope: CoroutineScope, collectionDuration: Duration): Flow<Vision> = flow {
-    val mutex = Mutex()
-
-    var collector = VisionGroupBase()
-    scope.collectChange(Name.EMPTY, this@flowChanges, mutex) { collector }
-
-    while (true) {
-        //Wait for changes to accumulate
-        kotlinx.coroutines.delay(collectionDuration)
-        //Propagate updates only if something is changed
-        if (collector.children.isNotEmpty() || collector.properties?.isEmpty() != false) {
-            //emit changes
-            emit(collector)
-            //Reset the collector
-            collector = VisionGroupBase()
-        }
-    }
-}
\ No newline at end of file
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
index d689e66f..df61586f 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
@@ -3,6 +3,7 @@ package hep.dataforge.vision.client
 import hep.dataforge.context.*
 import hep.dataforge.meta.Meta
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionChange
 import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.html.HtmlOutputScope
 import hep.dataforge.vision.html.HtmlOutputScope.Companion.OUTPUT_ENDPOINT_ATTRIBUTE
@@ -36,7 +37,8 @@ public class VisionClient : AbstractPlugin() {
 
     private fun getRenderers() = context.gather<ElementVisionRenderer>(ElementVisionRenderer.TYPE).values
 
-    public fun findRendererFor(vision: Vision): ElementVisionRenderer? = getRenderers().maxByOrNull { it.rateVision(vision) }
+    public fun findRendererFor(vision: Vision): ElementVisionRenderer? =
+        getRenderers().maxByOrNull { it.rateVision(vision) }
 
     /**
      * Fetch from server and render a vision, described in a given with [HtmlOutputScope.OUTPUT_CLASS] class.
@@ -71,8 +73,10 @@ public class VisionClient : AbstractPlugin() {
                             onmessage = { messageEvent ->
                                 val stringData: String? = messageEvent.data as? String
                                 if (stringData != null) {
-                                    val update = visionManager.decodeFromString(text)
-                                    vision.update(update)
+//                                    console.info("Received WS update: $stringData")
+                                    val dif = visionManager.jsonFormat
+                                        .decodeFromString(VisionChange.serializer(), stringData)
+                                    vision.update(dif)
                                 } else {
                                     console.error("WebSocket message data is not a string")
                                 }
@@ -121,7 +125,7 @@ public fun VisionClient.fetchVisionsInChildren(element: Element, requestUpdates:
 /**
  * Fetch visions from the server for all elements with [HtmlOutputScope.OUTPUT_CLASS] class in the document body
  */
-public fun VisionClient.fetchAndRenderAllVisions(requestUpdates: Boolean = true){
+public fun VisionClient.fetchAndRenderAllVisions(requestUpdates: Boolean = true) {
     val element = document.body ?: error("Document does not have a body")
     fetchVisionsInChildren(element, requestUpdates)
 }
\ No newline at end of file
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
index 5ea07639..33b69d0c 100644
--- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
@@ -8,6 +8,7 @@ import hep.dataforge.meta.long
 import hep.dataforge.names.Name
 import hep.dataforge.names.toName
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionChange
 import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.flowChanges
 import hep.dataforge.vision.html.*
@@ -126,8 +127,8 @@ public class VisionServer internal constructor(
                         application.log.debug("Opened server socket for $name")
                         val vision: Vision = visions[name.toName()] ?: error("Plot with id='$name' not registered")
                         try {
-                            vision.flowChanges(this, updateInterval.milliseconds).collect { update ->
-                                val json = visionManager.encodeToString(update)
+                            vision.flowChanges(visionManager, updateInterval.milliseconds).collect { update ->
+                                val json = VisionManager.defaultJson.encodeToString(VisionChange.serializer(), update)
                                 outgoing.send(Frame.Text(json))
                             }
                         } catch (ex: Throwable) {
@@ -197,10 +198,11 @@ public fun Application.visionModule(context: Context, route: String = DEFAULT_PA
         }
     }
 
-    if(featureOrNull(CallLogging) == null){
+    if (featureOrNull(CallLogging) == null) {
         install(CallLogging)
     }
 
+    val visionManager = context.plugins.fetch(VisionManager)
 
     routing {
         route(route) {
@@ -210,8 +212,6 @@ public fun Application.visionModule(context: Context, route: String = DEFAULT_PA
         }
     }
 
-    val visionManager = context.plugins.fetch(VisionManager)
-
     return VisionServer(visionManager, this, route)
 }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
index 566be58a..b7e670d1 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
@@ -33,7 +33,7 @@ public class Composite(
         get() = null
 }
 
-public inline fun MutableVisionGroup.composite(
+public inline fun VisionContainerBuilder<Solid>.composite(
     type: CompositeType,
     name: String = "",
     builder: SolidGroup.() -> Unit
@@ -58,11 +58,11 @@ public inline fun MutableVisionGroup.composite(
     }
 }
 
-public inline fun MutableVisionGroup.union(name: String = "", builder: SolidGroup.() -> Unit): Composite =
+public inline fun VisionContainerBuilder<Solid>.union(name: String = "", builder: SolidGroup.() -> Unit): Composite =
     composite(CompositeType.UNION, name, builder = builder)
 
-public inline fun MutableVisionGroup.subtract(name: String = "", builder: SolidGroup.() -> Unit): Composite =
+public inline fun VisionContainerBuilder<Solid>.subtract(name: String = "", builder: SolidGroup.() -> Unit): Composite =
     composite(CompositeType.SUBTRACT, name, builder = builder)
 
-public inline fun MutableVisionGroup.intersect(name: String = "", builder: SolidGroup.() -> Unit): Composite =
+public inline fun VisionContainerBuilder<Solid>.intersect(name: String = "", builder: SolidGroup.() -> Unit): Composite =
     composite(CompositeType.INTERSECT, name, builder = builder)
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidBase.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidBase.kt
index f6d836a1..b9471724 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidBase.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidBase.kt
@@ -5,8 +5,8 @@ import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.float
 import hep.dataforge.meta.get
 import hep.dataforge.meta.node
-import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionBase
+import hep.dataforge.vision.VisionChange
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -21,16 +21,20 @@ public open class SolidBase : VisionBase(), Solid {
 
     override var scale: Point3D? = null
 
-    override fun update(change: Vision) {
-        fun Meta.toVector(default: Float = 0f) = Point3D(
-            this[Solid.X_KEY].float ?: default,
-            this[Solid.Y_KEY].float ?: default,
-            this[Solid.Z_KEY].float ?: default
-        )
-
-        change.properties[Solid.POSITION_KEY].node?.toVector()?.let { position = it }
-        change.properties[Solid.ROTATION].node?.toVector()?.let { rotation = it }
-        change.properties[Solid.SCALE_KEY].node?.toVector(1f)?.let { scale = it }
+    override fun update(change: VisionChange) {
+        updatePosition(change.properties)
         super.update(change)
     }
+}
+
+internal fun Meta.toVector(default: Float = 0f) = Point3D(
+    this[Solid.X_KEY].float ?: default,
+    this[Solid.Y_KEY].float ?: default,
+    this[Solid.Z_KEY].float ?: default
+)
+
+internal fun Solid.updatePosition(meta: Meta?) {
+    meta[Solid.POSITION_KEY].node?.toVector()?.let { position = it }
+    meta[Solid.ROTATION].node?.toVector()?.let { rotation = it }
+    meta[Solid.SCALE_KEY].node?.toVector(1f)?.let { scale = it }
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index 50b53cdc..3b58e11a 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -38,7 +38,7 @@ public class SolidGroup : VisionGroupBase(), Solid, PrototypeHolder {
     /**
      * Create or edit prototype node as a group
      */
-    public fun prototypes(builder: MutableVisionGroup.() -> Unit): Unit {
+    public fun prototypes(builder: VisionContainerBuilder<Solid>.() -> Unit): Unit {
         (prototypes ?: Prototypes().also {
             prototypes = it
             it.parent = this
@@ -65,6 +65,10 @@ public class SolidGroup : VisionGroupBase(), Solid, PrototypeHolder {
 
     override fun createGroup(): SolidGroup = SolidGroup()
 
+    override fun update(change: VisionChange) {
+        updatePosition(change.properties)
+        super.update(change)
+    }
 
     public companion object {
 //        val PROTOTYPES_KEY = NameToken("@prototypes")
@@ -82,13 +86,13 @@ public fun SolidGroup(block: SolidGroup.() -> Unit): SolidGroup {
 public tailrec fun PrototypeHolder.getPrototype(name: Name): Solid? =
     prototypes?.get(name) as? Solid ?: (parent as? PrototypeHolder)?.getPrototype(name)
 
-public fun MutableVisionGroup.group(name: Name = Name.EMPTY, action: SolidGroup.() -> Unit = {}): SolidGroup =
+public fun VisionContainerBuilder<Vision>.group(name: Name = Name.EMPTY, action: SolidGroup.() -> Unit = {}): SolidGroup =
     SolidGroup().apply(action).also { set(name, it) }
 
 /**
  * Define a group with given [name], attach it to this parent and return it.
  */
-public fun MutableVisionGroup.group(name: String, action: SolidGroup.() -> Unit = {}): SolidGroup =
+public fun VisionContainerBuilder<Vision>.group(name: String, action: SolidGroup.() -> Unit = {}): SolidGroup =
     SolidGroup().apply(action).also { set(name, it) }
 
 /**
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt
new file mode 100644
index 00000000..af8e49c7
--- /dev/null
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt
@@ -0,0 +1,74 @@
+package hep.dataforge.vision.solid
+
+import hep.dataforge.context.Global
+import hep.dataforge.meta.MetaItem
+import hep.dataforge.names.toName
+import hep.dataforge.vision.VisionChange
+import hep.dataforge.vision.get
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class VisionUpdateTest {
+    val solidManager = Global.plugins.fetch(SolidManager)
+    val visionManager = solidManager.visionManager
+
+    @Test
+    fun testVisionUpdate(){
+        val targetVision = SolidGroup {
+            box(200,200,200, name = "origin")
+        }
+        val dif = VisionChange(visionManager){
+            group("top") {
+                color(123)
+                box(100,100,100)
+            }
+            propertyChanged("top".toName(), SolidMaterial.MATERIAL_COLOR_KEY, MetaItem.of("red"))
+            propertyChanged("origin".toName(), SolidMaterial.MATERIAL_COLOR_KEY, MetaItem.of("red"))
+        }
+        targetVision.update(dif)
+        assertTrue { targetVision["top"] is SolidGroup }
+        assertEquals("red", (targetVision["origin"] as Solid).color) // Should work
+        assertEquals("#00007b", (targetVision["top"] as SolidGroup).color) // new item always takes precedence
+    }
+
+    @Test
+    fun testVisionChangeSerialization(){
+        val change = VisionChange(visionManager){
+            group("top") {
+                color(123)
+                box(100,100,100)
+            }
+            propertyChanged("top".toName(), SolidMaterial.MATERIAL_COLOR_KEY, MetaItem.of("red"))
+            propertyChanged("origin".toName(), SolidMaterial.MATERIAL_COLOR_KEY, MetaItem.of("red"))
+        }
+        val serialized = visionManager.jsonFormat.encodeToString(VisionChange.serializer(), change)
+        println(serialized)
+        val reconstructed = visionManager.jsonFormat.decodeFromString(VisionChange.serializer(), serialized)
+        assertEquals(change.propertyChange,reconstructed.propertyChange)
+    }
+
+    @Test
+    fun testDeserialization(){
+        val str = """
+            {
+                "propertyChange": {
+                    "layer[4]": {
+                        "material": {
+                            "color": 123
+                        }
+                    },
+                    "layer[2]": {
+                        "material": {
+                        }
+                    }
+                },
+                "childrenChange": {
+                }
+            }
+        """.trimIndent()
+
+        val reconstructed = visionManager.jsonFormat.decodeFromString(VisionChange.serializer(), str)
+    }
+
+}
\ No newline at end of file

From faddb8a39384a2bd39a1db4aab0050f9a0e70997 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 8 Dec 2020 22:42:08 +0300
Subject: [PATCH 043/151] Working server prototype

---
 .../kotlin/ru/mipt/npm/sat/satServer.kt       | 40 ++++++++++-------
 .../vision/solid/demo/ThreeDemoGrid.kt        |  2 +-
 ...utScope.kt => BindingOutputTagConsumer.kt} | 12 +++---
 .../vision/html/HtmlVisionFragment.kt         |  4 +-
 ...tmlOutputScope.kt => OutputTagConsumer.kt} | 43 +++++++++++--------
 ...putScope.kt => StaticOutputTagConsumer.kt} | 16 ++++---
 .../hep/dataforge/vision/html/HtmlTagTest.kt  |  7 +--
 .../dataforge/vision/client/VisionClient.kt   | 31 +++++++------
 .../dataforge/vision/client/elementOutput.kt  | 15 ++++---
 .../dataforge/vision/gdml/GDMLTransformer.kt  |  2 +-
 .../dataforge/vision/server/VisionServer.kt   | 32 +++++++-------
 .../dataforge/vision/solid/SolidManager.kt    |  4 +-
 .../vision/solid/three/ThreePlugin.kt         |  4 +-
 13 files changed, 117 insertions(+), 95 deletions(-)
 rename visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/{BindingHtmlOutputScope.kt => BindingOutputTagConsumer.kt} (58%)
 rename visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/{HtmlOutputScope.kt => OutputTagConsumer.kt} (60%)
 rename visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/{StaticHtmlOutputScope.kt => StaticOutputTagConsumer.kt} (53%)

diff --git a/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt b/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
index eea0a4bb..6605b17d 100644
--- a/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
+++ b/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
@@ -3,17 +3,19 @@ package ru.mipt.npm.sat
 
 import hep.dataforge.context.Global
 import hep.dataforge.names.asName
+import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.get
-import hep.dataforge.vision.server.visionModule
+import hep.dataforge.vision.server.close
+import hep.dataforge.vision.server.serve
+import hep.dataforge.vision.server.show
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.SolidManager
 import hep.dataforge.vision.solid.color
-import io.ktor.server.cio.CIO
-import io.ktor.server.engine.embeddedServer
 import io.ktor.util.KtorExperimentalAPI
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import kotlinx.html.h1
 import kotlinx.html.script
 import kotlin.random.Random
 
@@ -23,28 +25,36 @@ fun main() {
         ySegments = 3,
     )
 
-    val context = Global.context("SAT"){
+    val context = Global.context("SAT") {
         plugin(SolidManager)
     }
 
-    embeddedServer(CIO, 8080, host = "localhost"){
-        visionModule(context).apply {
-            header {
-                script {
-                    src = "sat-demo.js"
-                }
-            }
-            page {
-                vision("main".asName(), sat)
+    val server = context.plugins.fetch(VisionManager).serve {
+        header {
+            script {
+                src = "sat-demo.js"
             }
         }
+        page {
+            h1 { +"Satellite detector demo" }
+            vision("main".asName(), sat)
+        }
         launch {
-            while (isActive){
+            while (isActive) {
                 val currentLayer = Random.nextInt(10)
                 (sat["layer[$currentLayer]"] as? Solid)?.color(123)
                 delay(300)
                 (sat["layer[$currentLayer]"] as? Solid)?.color = null
             }
         }
-    }.start(wait = true)
+    }
+    server.show()
+
+    println("Press Enter to close server")
+    while (readLine()!="exit"){
+        //
+    }
+
+    server.close()
+
 }
\ No newline at end of file
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
index a53a4529..f7268a12 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
@@ -20,7 +20,7 @@ import org.w3c.dom.Element
 import org.w3c.dom.HTMLDivElement
 import org.w3c.dom.HTMLElement
 
-class ThreeDemoGrid(element: Element, idPrefix: String = "") : Page<Solid> {
+class ThreeDemoGrid(element: Element) : Page<Solid> {
     private lateinit var navigationElement: HTMLElement
     private lateinit var contentElement: HTMLDivElement
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingHtmlOutputScope.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingOutputTagConsumer.kt
similarity index 58%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingHtmlOutputScope.kt
rename to visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingOutputTagConsumer.kt
index 9ee0555c..445ffb0c 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingHtmlOutputScope.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingOutputTagConsumer.kt
@@ -5,23 +5,23 @@ import hep.dataforge.vision.Vision
 import kotlinx.html.FlowContent
 import kotlinx.html.TagConsumer
 
-public class BindingHtmlOutputScope<T, V : Vision>(
+public class BindingOutputTagConsumer<T, V : Vision>(
     root: TagConsumer<T>,
     prefix: String? = null,
-) : HtmlOutputScope<T, V>(root, prefix) {
+) : OutputTagConsumer<T, V>(root, prefix) {
 
     private val _bindings = HashMap<Name, V>()
     public val bindings: Map<Name, V> get() = _bindings
 
-    override fun renderVision(htmlOutput: HtmlOutput<V>, vision: V) {
-        _bindings[htmlOutput.name] = vision
+    override fun FlowContent.renderVision(name: Name, vision: V) {
+        _bindings[name] = vision
     }
 }
 
 public fun <T : Any> TagConsumer<T>.visionFragment(fragment: HtmlVisionFragment<Vision>): Map<Name, Vision> {
-    return BindingHtmlOutputScope<T, Vision>(this).apply(fragment.content).bindings
+    return BindingOutputTagConsumer<T, Vision>(this).apply(fragment.content).bindings
 }
 
 public fun FlowContent.visionFragment(fragment: HtmlVisionFragment<Vision>): Map<Name, Vision> {
-    return BindingHtmlOutputScope<Any?, Vision>(consumer).apply(fragment.content).bindings
+    return BindingOutputTagConsumer<Any?, Vision>(consumer).apply(fragment.content).bindings
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
index bddff870..6ae41f25 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
@@ -14,7 +14,7 @@ public fun FlowContent.fragment(fragment: HtmlFragment) {
     fragment.content(consumer)
 }
 
-public class HtmlVisionFragment<V : Vision>(public val content: HtmlOutputScope<*, V>.() -> Unit)
+public class HtmlVisionFragment<V : Vision>(public val content: OutputTagConsumer<*, V>.() -> Unit)
 
-public fun buildVisionFragment(block: HtmlOutputScope<*, Vision>.() -> Unit): HtmlVisionFragment<Vision> =
+public fun buildVisionFragment(block: OutputTagConsumer<*, Vision>.() -> Unit): HtmlVisionFragment<Vision> =
     HtmlVisionFragment(block)
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/OutputTagConsumer.kt
similarity index 60%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt
rename to visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/OutputTagConsumer.kt
index 87901ca9..5e402ab4 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlOutputScope.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/OutputTagConsumer.kt
@@ -5,47 +5,52 @@ import hep.dataforge.names.toName
 import hep.dataforge.vision.Vision
 import kotlinx.html.*
 
-public class HtmlOutput<V : Vision>(
-    public val outputScope: HtmlOutputScope<*, V>,
+/**
+ * An HTML div wrapper that includes the output [name] and inherited [render] function
+ */
+public class OutputDiv<in V : Vision>(
+    private val div: DIV,
     public val name: Name,
-    public val div: DIV,
-)
+    public val render: (V) -> Unit,
+) : HtmlBlockTag by div
 
-public abstract class HtmlOutputScope<R, V : Vision>(
+/**
+ * Modified  [TagConsumer] that allows rendering output fragments and visions in them
+ */
+public abstract class OutputTagConsumer<R, V : Vision>(
     private val root: TagConsumer<R>,
-    public val idPrefix: String? = null,
+    private val idPrefix: String? = null,
 ) : TagConsumer<R> by root {
 
     public open fun resolveId(name: Name): String = (idPrefix ?: "output:") + name.toString()
 
     /**
-     * Create a placeholder but do not attach any [Vision] to it
+     * Render a vision inside the output fragment
      */
-    public inline fun <T> TagConsumer<T>.visionOutput(
+    protected abstract fun FlowContent.renderVision(name: Name, vision: V)
+
+    /**
+     * Create a placeholder for an output window
+     */
+    public fun <T> TagConsumer<T>.visionOutput(
         name: Name,
-        crossinline block: HtmlOutput<V>.() -> Unit = {},
+        block: OutputDiv<V>.() -> Unit = {},
     ): T = div {
         id = resolveId(name)
         classes = setOf(OUTPUT_CLASS)
         attributes[OUTPUT_NAME_ATTRIBUTE] = name.toString()
-        @Suppress("UNCHECKED_CAST")
-        HtmlOutput(this@HtmlOutputScope, name, this).block()
+        OutputDiv<V>(this, name) { renderVision(name, it) }.block()
     }
 
-
-    public inline fun <T> TagConsumer<T>.visionOutput(
+    public fun <T> TagConsumer<T>.visionOutput(
         name: String,
-        crossinline block: HtmlOutput<V>.() -> Unit = {},
+        block: OutputDiv<V>.() -> Unit = {},
     ): T = visionOutput(name.toName(), block)
 
-    /**
-     * Create a placeholder and put a [Vision] in it
-     */
-    public abstract fun renderVision(htmlOutput: HtmlOutput<V>, vision: V)
 
     public fun <T> TagConsumer<T>.vision(name: Name, vision: V): Unit {
         visionOutput(name) {
-            renderVision(this, vision)
+            render(vision)
         }
     }
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticHtmlOutputScope.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticOutputTagConsumer.kt
similarity index 53%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticHtmlOutputScope.kt
rename to visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticOutputTagConsumer.kt
index b07c575c..401fe3f8 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticHtmlOutputScope.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticOutputTagConsumer.kt
@@ -1,5 +1,6 @@
 package hep.dataforge.vision.html
 
+import hep.dataforge.names.Name
 import hep.dataforge.vision.Vision
 import kotlinx.html.FlowContent
 import kotlinx.html.TagConsumer
@@ -7,22 +8,23 @@ import kotlinx.html.stream.createHTML
 
 public typealias HtmlVisionRenderer<V> = FlowContent.(V) -> Unit
 
-public class StaticHtmlOutputScope<R, V : Vision>(
+/**
+ * An [OutputTagConsumer] that directly renders given [Vision] using provided [renderer]
+ */
+public class StaticOutputTagConsumer<R, V : Vision>(
     root: TagConsumer<R>,
     prefix: String? = null,
-    private val render: HtmlVisionRenderer<V>,
-) : HtmlOutputScope<R, V>(root, prefix) {
+    private val renderer: HtmlVisionRenderer<V>,
+) : OutputTagConsumer<R, V>(root, prefix) {
 
-    override fun renderVision(htmlOutput: HtmlOutput<V>, vision: V) {
-        htmlOutput.div.render(vision)
-    }
+    override fun FlowContent.renderVision(name: Name, vision: V): Unit = renderer(vision)
 }
 
 public fun <T : Any> HtmlVisionFragment<Vision>.renderToObject(
     root: TagConsumer<T>,
     prefix: String? = null,
     renderer: HtmlVisionRenderer<Vision>,
-): T = StaticHtmlOutputScope(root, prefix, renderer).apply(content).finalize()
+): T = StaticOutputTagConsumer(root, prefix, renderer).apply(content).finalize()
 
 public fun HtmlVisionFragment<Vision>.renderToString(renderer: HtmlVisionRenderer<Vision>): String =
     renderToObject(createHTML(), null, renderer)
\ No newline at end of file
diff --git a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
index 4c48fad7..2b322c12 100644
--- a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
+++ b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
@@ -10,16 +10,17 @@ import kotlin.test.Test
 
 class HtmlTagTest {
 
-    fun HtmlOutput<Vision>.vision(block: Vision.() -> Unit) =
-        outputScope.renderVision(this, VisionBase().apply(block))
+    fun OutputDiv<Vision>.visionBase(block: VisionBase.() -> Unit) =
+        render(VisionBase().apply(block))
 
     val fragment = buildVisionFragment {
         div {
             h1 { +"Head" }
             visionOutput("ddd") {
-                vision {
+                visionBase {
                     configure {
                         set("myProp", 82)
+                        set("otherProp", false)
                     }
                 }
             }
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
index df61586f..ad022eee 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
@@ -2,12 +2,14 @@ package hep.dataforge.vision.client
 
 import hep.dataforge.context.*
 import hep.dataforge.meta.Meta
+import hep.dataforge.meta.get
+import hep.dataforge.meta.node
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionChange
 import hep.dataforge.vision.VisionManager
-import hep.dataforge.vision.html.HtmlOutputScope
-import hep.dataforge.vision.html.HtmlOutputScope.Companion.OUTPUT_ENDPOINT_ATTRIBUTE
-import hep.dataforge.vision.html.HtmlOutputScope.Companion.OUTPUT_NAME_ATTRIBUTE
+import hep.dataforge.vision.html.OutputTagConsumer
+import hep.dataforge.vision.html.OutputTagConsumer.Companion.OUTPUT_ENDPOINT_ATTRIBUTE
+import hep.dataforge.vision.html.OutputTagConsumer.Companion.OUTPUT_NAME_ATTRIBUTE
 import kotlinx.browser.document
 import kotlinx.browser.window
 import org.w3c.dom.Element
@@ -41,12 +43,12 @@ public class VisionClient : AbstractPlugin() {
         getRenderers().maxByOrNull { it.rateVision(vision) }
 
     /**
-     * Fetch from server and render a vision, described in a given with [HtmlOutputScope.OUTPUT_CLASS] class.
+     * Fetch from server and render a vision, described in a given with [OutputTagConsumer.OUTPUT_CLASS] class.
      */
     public fun fetchAndRenderVision(element: Element, requestUpdates: Boolean = true) {
         val name = resolveName(element) ?: error("The element is not a vision output")
         console.info("Found DF output with name $name")
-        if (!element.classList.contains(HtmlOutputScope.OUTPUT_CLASS)) error("The element $element is not an output element")
+        if (!element.classList.contains(OutputTagConsumer.OUTPUT_CLASS)) error("The element $element is not an output element")
         val endpoint = resolveEndpoint(element)
         console.info("Vision server is resolved to $endpoint")
 
@@ -60,9 +62,9 @@ public class VisionClient : AbstractPlugin() {
             if (response.ok) {
                 response.text().then { text ->
                     val vision = visionManager.decodeFromString(text)
-
                     val renderer = findRendererFor(vision) ?: error("Could nof find renderer for $vision")
-                    renderer.render(element, vision)
+                    val rendererConfiguration = vision.properties[RENDERER_CONFIGURATION_META_KEY].node ?: Meta.EMPTY
+                    renderer.render(element, vision, rendererConfiguration)
                     if (requestUpdates) {
                         val wsUrl = URL(endpoint).apply {
                             pathname += "/ws"
@@ -73,9 +75,10 @@ public class VisionClient : AbstractPlugin() {
                             onmessage = { messageEvent ->
                                 val stringData: String? = messageEvent.data as? String
                                 if (stringData != null) {
-//                                    console.info("Received WS update: $stringData")
-                                    val dif = visionManager.jsonFormat
-                                        .decodeFromString(VisionChange.serializer(), stringData)
+                                    val dif = visionManager.jsonFormat.decodeFromString(
+                                        VisionChange.serializer(),
+                                        stringData
+                                    )
                                     vision.update(dif)
                                 } else {
                                     console.error("WebSocket message data is not a string")
@@ -103,6 +106,8 @@ public class VisionClient : AbstractPlugin() {
 
     public companion object : PluginFactory<VisionClient> {
 
+        public const val RENDERER_CONFIGURATION_META_KEY: String = "@renderer"
+
         override fun invoke(meta: Meta, context: Context): VisionClient = VisionClient()
 
         override val tag: PluginTag = PluginTag(name = "vision.client", group = PluginTag.DATAFORGE_GROUP)
@@ -112,10 +117,10 @@ public class VisionClient : AbstractPlugin() {
 }
 
 /**
- * Fetch and render visions for all elements with [HtmlOutputScope.OUTPUT_CLASS] class inside given [element].
+ * Fetch and render visions for all elements with [OutputTagConsumer.OUTPUT_CLASS] class inside given [element].
  */
 public fun VisionClient.fetchVisionsInChildren(element: Element, requestUpdates: Boolean = true) {
-    val elements = element.getElementsByClassName(HtmlOutputScope.OUTPUT_CLASS)
+    val elements = element.getElementsByClassName(OutputTagConsumer.OUTPUT_CLASS)
     console.info("Finished search for outputs. Found ${elements.length} items")
     elements.asList().forEach { child ->
         fetchAndRenderVision(child, requestUpdates)
@@ -123,7 +128,7 @@ public fun VisionClient.fetchVisionsInChildren(element: Element, requestUpdates:
 }
 
 /**
- * Fetch visions from the server for all elements with [HtmlOutputScope.OUTPUT_CLASS] class in the document body
+ * Fetch visions from the server for all elements with [OutputTagConsumer.OUTPUT_CLASS] class in the document body
  */
 public fun VisionClient.fetchAndRenderAllVisions(requestUpdates: Boolean = true) {
     val element = document.body ?: error("Document does not have a body")
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
index 3673ecc2..745754dc 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
@@ -1,13 +1,14 @@
 package hep.dataforge.vision.client
 
 import hep.dataforge.meta.DFExperimental
+import hep.dataforge.meta.Meta
 import hep.dataforge.names.Name
 import hep.dataforge.names.toName
 import hep.dataforge.provider.Type
 import hep.dataforge.vision.Vision
-import hep.dataforge.vision.html.BindingHtmlOutputScope
-import hep.dataforge.vision.html.HtmlOutputScope
+import hep.dataforge.vision.html.BindingOutputTagConsumer
 import hep.dataforge.vision.html.HtmlVisionFragment
+import hep.dataforge.vision.html.OutputTagConsumer
 import kotlinx.browser.document
 import kotlinx.html.TagConsumer
 import org.w3c.dom.*
@@ -25,7 +26,7 @@ public interface ElementVisionRenderer {
     /**
      * Display the [vision] inside a given [element] replacing its current content
      */
-    public fun render(element: Element, vision: Vision): Unit
+    public fun render(element: Element, vision: Vision, meta: Meta = Meta.EMPTY): Unit
 
     public companion object {
         public const val TYPE: String = "elementVisionRenderer"
@@ -44,11 +45,11 @@ public fun Map<String, Vision>.bind(rendererFactory: (Vision) -> ElementVisionRe
 
 @DFExperimental
 public fun Element.renderAllVisions(visionProvider: (Name) -> Vision, rendererFactory: (Vision) -> ElementVisionRenderer) {
-    val elements = getElementsByClassName(HtmlOutputScope.OUTPUT_CLASS)
+    val elements = getElementsByClassName(OutputTagConsumer.OUTPUT_CLASS)
     elements.asList().forEach { element ->
-        val name = element.attributes[HtmlOutputScope.OUTPUT_NAME_ATTRIBUTE]?.value
+        val name = element.attributes[OutputTagConsumer.OUTPUT_NAME_ATTRIBUTE]?.value
         if (name == null) {
-            console.error("Attribute ${HtmlOutputScope.OUTPUT_NAME_ATTRIBUTE} not defined in the output element")
+            console.error("Attribute ${OutputTagConsumer.OUTPUT_NAME_ATTRIBUTE} not defined in the output element")
             return@forEach
         }
         val vision = visionProvider(name.toName())
@@ -65,7 +66,7 @@ public fun Document.renderAllVisions(visionProvider: (Name) -> Vision, rendererF
 public fun HtmlVisionFragment<Vision>.renderInDocument(
     root: TagConsumer<HTMLElement>,
     renderer: ElementVisionRenderer,
-): HTMLElement = BindingHtmlOutputScope<HTMLElement, Vision>(root).apply(content).let { scope ->
+): HTMLElement = BindingOutputTagConsumer<HTMLElement, Vision>(root).apply(content).let { scope ->
     scope.finalize().apply {
         scope.bindings.forEach { (name, vision) ->
             val id = scope.resolveId(name)
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
index a0607435..583bbb03 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
@@ -346,7 +346,7 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
         final.prototypes {
             proto.children.forEach { (token, item) ->
                 item.parent = null
-                set(token.asName(), item)
+                set(token.asName(), item as? Solid)
             }
         }
         styleCache.forEach {
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
index 33b69d0c..4eaf75ed 100644
--- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
@@ -29,10 +29,14 @@ import io.ktor.routing.application
 import io.ktor.routing.get
 import io.ktor.routing.route
 import io.ktor.routing.routing
+import io.ktor.server.cio.CIO
 import io.ktor.server.engine.ApplicationEngine
+import io.ktor.server.engine.embeddedServer
+import io.ktor.util.KtorExperimentalAPI
 import io.ktor.util.error
 import io.ktor.websocket.WebSockets
 import io.ktor.websocket.webSocket
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.collect
 import kotlinx.html.*
 import kotlinx.html.stream.createHTML
@@ -47,7 +51,7 @@ public class VisionServer internal constructor(
     private val visionManager: VisionManager,
     private val application: Application,
     private val rootRoute: String,
-) : Configurable {
+) : Configurable, CoroutineScope by application {
     override val config: Config = Config()
     public var updateInterval: Long by config.long(300, key = UPDATE_INTERVAL_KEY)
     public var cacheFragments: Boolean by config.boolean(true)
@@ -78,23 +82,8 @@ public class VisionServer internal constructor(
             title(title)
         }
         body {
-//            attributes[OUTPUT_ENDPOINT_ATTRIBUTE] = if (rootRoute.endsWith("/")) {
-//                rootRoute
-//            } else {
-//                "$rootRoute/"
-//            }
             //Load the fragment and remember all loaded visions
             visionMap = visionFragment(visionFragment)
-//            //The script runs when all headers already with required libraries are already loaded
-//            script {
-//                type = "text/javascript"
-//
-//                val normalizedRoute =
-//                unsafe {
-//                    //language=JavaScript
-//                    +"fetchAndRenderAllVisions()"
-//                }
-//            }
         }
 
         return visionMap
@@ -171,7 +160,7 @@ public class VisionServer internal constructor(
         route: String = DEFAULT_PAGE,
         title: String = "VisionForge server page '$route'",
         headers: List<HtmlFragment> = emptyList(),
-        content: HtmlOutputScope<*, Vision>.() -> Unit,
+        content: OutputTagConsumer<*, Vision>.() -> Unit,
     ) {
         page(buildVisionFragment(content), route, title, headers)
     }
@@ -215,6 +204,15 @@ public fun Application.visionModule(context: Context, route: String = DEFAULT_PA
     return VisionServer(visionManager, this, route)
 }
 
+@OptIn(KtorExperimentalAPI::class)
+public fun VisionManager.serve(
+    host: String = "localhost",
+    port: Int = 7777,
+    block: VisionServer.()->Unit
+): ApplicationEngine = context.embeddedServer(CIO, port, host) {
+    visionModule(context).apply(block)
+}.start()
+
 public fun ApplicationEngine.show() {
     val connector = environment.connectors.first()
     val uri = URI("http", null, connector.host, connector.port, null, null, null)
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index d098a72b..a01cc961 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -65,9 +65,9 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
             serializersModule = serializersModuleForSolids
         }
 
-        internal fun encodeToString(solid: Solid): String = jsonForSolids.encodeToString(PolymorphicSerializer(Vision::class), solid)
+        public fun encodeToString(solid: Solid): String = jsonForSolids.encodeToString(PolymorphicSerializer(Vision::class), solid)
 
-        internal fun decodeFromString(str: String): Vision = jsonForSolids.decodeFromString(PolymorphicSerializer(Vision::class), str).also {
+        fun decodeFromString(str: String): Solid = jsonForSolids.decodeFromString(PolymorphicSerializer(Solid::class), str).also {
             if(it is VisionGroup){
                 it.attachChildren()
             }
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index 63740483..c1926dcd 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -133,8 +133,8 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
         return if (vision is Solid) ElementVisionRenderer.DEFAULT_RATING else ElementVisionRenderer.ZERO_RATING
     }
 
-    override fun render(element: Element, vision: Vision) {
-        createCanvas(element).render(vision as? Solid ?: error("Only solids are rendered"))
+    override fun render(element: Element, vision: Vision, meta: Meta) {
+        createCanvas(element, Canvas3DOptions.read(meta)).render(vision as? Solid ?: error("Only solids are rendered"))
     }
 
     public companion object : PluginFactory<ThreePlugin> {

From 6a742658af1a318f22ec4da1c66088e5f56bd1dc Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 9 Dec 2020 19:06:17 +0300
Subject: [PATCH 044/151] Server is alive!

---
 build.gradle.kts                              |  2 +-
 .../kotlin/ru/mipt/npm/sat/satServer.kt       |  9 +++----
 .../kotlin/hep/dataforge/vision/Colors.kt     |  2 +-
 .../hep/dataforge/vision/VisionChange.kt      | 24 ++++++++++---------
 .../vision/editor/ColorValueChooser.kt        |  3 ++-
 .../vision/editor/ComboBoxValueChooser.kt     |  1 +
 .../hep/dataforge/vision/editor/MetaViewer.kt |  1 +
 .../hep/dataforge/vision/solid/FXMaterials.kt | 16 +++++++------
 .../dataforge/vision/server/VisionServer.kt   | 19 +++++++--------
 .../vision/solid/three/ThreeMaterials.kt      |  4 +++-
 10 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f3709349..6a5a615a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     id("ru.mipt.npm.project")
 }
 
-val dataforgeVersion by extra("0.2.0")
+val dataforgeVersion by extra("0.2.1-dev-4")
 val ktorVersion by extra("1.4.2")
 val htmlVersion by extra("0.7.2")
 val kotlinWrappersVersion by extra("pre.129-kotlin-1.4.20")
diff --git a/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt b/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
index 6605b17d..d834e433 100644
--- a/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
+++ b/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
@@ -3,8 +3,8 @@ package ru.mipt.npm.sat
 
 import hep.dataforge.context.Global
 import hep.dataforge.names.asName
+import hep.dataforge.names.toName
 import hep.dataforge.vision.VisionManager
-import hep.dataforge.vision.get
 import hep.dataforge.vision.server.close
 import hep.dataforge.vision.server.serve
 import hep.dataforge.vision.server.show
@@ -40,11 +40,12 @@ fun main() {
             vision("main".asName(), sat)
         }
         launch {
+            delay(1000)
             while (isActive) {
-                val currentLayer = Random.nextInt(10)
-                (sat["layer[$currentLayer]"] as? Solid)?.color(123)
+                val target = "layer[${Random.nextInt(1,10)}].segment[${Random.nextInt(3)},${Random.nextInt(3)}]".toName()
+                (sat[target] as? Solid)?.color("red")
                 delay(300)
-                (sat["layer[$currentLayer]"] as? Solid)?.color = null
+                (sat[target] as? Solid)?.color = "green"
             }
         }
     }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
index c8d18a08..7dc41632 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
@@ -1,11 +1,11 @@
 package hep.dataforge.vision
 
-import hep.dataforge.meta.Meta
 import hep.dataforge.meta.MetaItem
 import hep.dataforge.meta.get
 import hep.dataforge.meta.number
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.int
+import hep.dataforge.values.string
 import kotlin.math.max
 
 /**
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
index a51b4497..8c3fbf56 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
@@ -3,10 +3,9 @@ package hep.dataforge.vision
 import hep.dataforge.meta.*
 import hep.dataforge.names.Name
 import hep.dataforge.names.plus
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.serialization.*
@@ -15,7 +14,7 @@ import kotlin.time.Duration
 /**
  * An update for a [Vision] or a [VisionGroup]
  */
-public class VisionChangeBuilder: VisionContainerBuilder<Vision> {
+public class VisionChangeBuilder : VisionContainerBuilder<Vision> {
     private val propertyChange = HashMap<Name, Config>()
     private val childrenChange = HashMap<Name, Vision?>()
 
@@ -47,7 +46,8 @@ private fun Vision.isolate(manager: VisionManager): Vision {
 @Serializable
 public data class VisionChange(
     val propertyChange: Map<Name, @Serializable(MetaSerializer::class) Meta>,
-    val childrenChange: Map<Name, Vision?>) {
+    val childrenChange: Map<Name, Vision?>,
+) {
     public fun isEmpty(): Boolean = propertyChange.isEmpty() && childrenChange.isEmpty()
 
     /**
@@ -64,7 +64,7 @@ private fun CoroutineScope.collectChange(
     name: Name,
     source: Vision,
     mutex: Mutex,
-    collector: ()->VisionChangeBuilder,
+    collector: () -> VisionChangeBuilder,
 ) {
     //Collect properties change
     source.config.onChange(mutex) { propertyName, oldItem, newItem ->
@@ -107,17 +107,19 @@ public fun Vision.flowChanges(
     val mutex = Mutex()
 
     var collector = VisionChangeBuilder()
-    scope.collectChange(Name.EMPTY, this@flowChanges, mutex){collector}
+    scope.collectChange(Name.EMPTY, this@flowChanges, mutex) { collector }
 
-    while (true) {
+    while (currentCoroutineContext().isActive) {
         //Wait for changes to accumulate
-        kotlinx.coroutines.delay(collectionDuration)
+        delay(collectionDuration)
         //Propagate updates only if something is changed
         if (!collector.isEmpty()) {
             //emit changes
-            emit(collector.isolate(manager))
-            //Reset the collector
-            collector = VisionChangeBuilder()
+            mutex.withLock {
+                emit(collector.isolate(manager))
+                //Reset the collector
+                collector = VisionChangeBuilder()
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
index 117210c1..3487f95c 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
@@ -6,6 +6,7 @@ import hep.dataforge.names.asName
 import hep.dataforge.values.Null
 import hep.dataforge.values.Value
 import hep.dataforge.values.asValue
+import hep.dataforge.values.string
 import javafx.scene.control.ColorPicker
 import javafx.scene.paint.Color
 import org.slf4j.LoggerFactory
@@ -22,7 +23,7 @@ public class ColorValueChooser : ValueChooserBase<ColorPicker>() {
                     this.value = Color.valueOf(value.string)
                 }
             } catch (ex: Exception) {
-                LoggerFactory.getLogger(javaClass).warn("Invalid color field value: " + value.string)
+                LoggerFactory.getLogger(javaClass).warn("Invalid color field value: $value")
             }
         }
     }
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
index 051469c7..5ce3d960 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
@@ -12,6 +12,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.values.Value
 import hep.dataforge.values.parseValue
+import hep.dataforge.values.string
 import javafx.collections.FXCollections
 import javafx.scene.control.ComboBox
 import javafx.util.StringConverter
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt
index ca6edcc2..88079731 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt
@@ -17,6 +17,7 @@
 package hep.dataforge.vision.editor
 
 import hep.dataforge.meta.Meta
+import hep.dataforge.values.string
 import hep.dataforge.vision.dfIconView
 import javafx.beans.property.SimpleStringProperty
 import javafx.scene.control.TreeItem
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
index eb50f306..b42cd315 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
@@ -5,38 +5,40 @@ import hep.dataforge.meta.double
 import hep.dataforge.meta.get
 import hep.dataforge.meta.int
 import hep.dataforge.values.ValueType
+import hep.dataforge.values.int
+import hep.dataforge.values.string
 import hep.dataforge.vision.Colors
 import javafx.scene.paint.Color
 import javafx.scene.paint.Material
 import javafx.scene.paint.PhongMaterial
 
-object FXMaterials {
-    val RED = PhongMaterial().apply {
+public object FXMaterials {
+    public val RED: PhongMaterial = PhongMaterial().apply {
         diffuseColor = Color.DARKRED
         specularColor = Color.WHITE
     }
 
-    val WHITE = PhongMaterial().apply {
+    public val WHITE: PhongMaterial = PhongMaterial().apply {
         diffuseColor = Color.WHITE
         specularColor = Color.LIGHTBLUE
     }
 
-    val GREY = PhongMaterial().apply {
+    public val GREY: PhongMaterial = PhongMaterial().apply {
         diffuseColor = Color.DARKGREY
         specularColor = Color.WHITE
     }
 
-    val BLUE = PhongMaterial(Color.BLUE)
+    public val BLUE: PhongMaterial = PhongMaterial(Color.BLUE)
 }
 
 /**
  * Infer color based on meta item
  * @param opacity default opacity
  */
-fun MetaItem<*>.color(opacity: Double = 1.0): Color {
+public fun MetaItem<*>.color(opacity: Double = 1.0): Color {
     return when (this) {
         is MetaItem.ValueItem -> if (this.value.type == ValueType.NUMBER) {
-            val int = value.number.toInt()
+            val int = value.int
             val red = int and 0x00ff0000 shr 16
             val green = int and 0x0000ff00 shr 8
             val blue = int and 0x000000ff
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
index 4eaf75ed..0b4fb1c4 100644
--- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
@@ -37,7 +37,9 @@ import io.ktor.util.error
 import io.ktor.websocket.WebSockets
 import io.ktor.websocket.webSocket
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlinx.html.*
 import kotlinx.html.stream.createHTML
 import java.awt.Desktop
@@ -115,15 +117,12 @@ public class VisionServer internal constructor(
 
                         application.log.debug("Opened server socket for $name")
                         val vision: Vision = visions[name.toName()] ?: error("Plot with id='$name' not registered")
-                        try {
-                            vision.flowChanges(visionManager, updateInterval.milliseconds).collect { update ->
-                                val json = VisionManager.defaultJson.encodeToString(VisionChange.serializer(), update)
-                                outgoing.send(Frame.Text(json))
-                            }
-                        } catch (ex: Throwable) {
-                            application.log.error("Closed server socket for $name with exception $ex")
+                        vision.flowChanges(visionManager, updateInterval.milliseconds).onEach { update ->
+                            val json = VisionManager.defaultJson.encodeToString(VisionChange.serializer(), update)
+                            outgoing.send(Frame.Text(json))
+                        }.catch { ex ->
                             application.log.error(ex)
-                        }
+                        }.launchIn(visionManager.context).join()
                     }
                     //Plots in their json representation
                     get("vision") {
@@ -208,7 +207,7 @@ public fun Application.visionModule(context: Context, route: String = DEFAULT_PA
 public fun VisionManager.serve(
     host: String = "localhost",
     port: Int = 7777,
-    block: VisionServer.()->Unit
+    block: VisionServer.() -> Unit,
 ): ApplicationEngine = context.embeddedServer(CIO, port, host) {
     visionModule(context).apply(block)
 }.start()
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
index 8f1dcbfa..f7ec681d 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
@@ -2,6 +2,8 @@ package hep.dataforge.vision.solid.three
 
 import hep.dataforge.meta.*
 import hep.dataforge.values.ValueType
+import hep.dataforge.values.int
+import hep.dataforge.values.string
 import hep.dataforge.vision.Colors
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.solid.SolidMaterial
@@ -90,7 +92,7 @@ public object ThreeMaterials {
 public fun MetaItem<*>.getColor(): Color {
     return when (this) {
         is MetaItem.ValueItem -> if (this.value.type == ValueType.NUMBER) {
-            val int = value.number.toInt()
+            val int = value.int
             Color(int)
         } else {
             Color(this.value.string)

From a38d70badebf1597bf94e8255896209b2ceace99 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 10 Dec 2020 12:38:35 +0300
Subject: [PATCH 045/151] Stylesheets moved to properties

---
 CHANGELOG.md                                  |   1 +
 build.gradle.kts                              |   2 +-
 .../vision/bootstrap/visionPropertyEditor.kt  |   4 +-
 .../kotlin/hep/dataforge/vision/StyleSheet.kt | 105 +++++++-----------
 .../kotlin/hep/dataforge/vision/Vision.kt     |   6 -
 .../kotlin/hep/dataforge/vision/VisionBase.kt |   2 +-
 .../hep/dataforge/vision/VisionGroup.kt       |  21 ++--
 .../hep/dataforge/vision/VisionGroupBase.kt   |  13 ---
 .../editor/VisualObjectEditorFragment.kt      |   4 +-
 .../dataforge/vision/gdml/GDMLTransformer.kt  |   1 +
 .../hep/dataforge/vision/solid/Composite.kt   |   8 +-
 .../hep/dataforge/vision/solid/SolidGroup.kt  |   4 -
 .../dataforge/vision/solid/SolidReference.kt  |   4 -
 .../dataforge/vision/solid/PropertyTest.kt    |   1 +
 14 files changed, 62 insertions(+), 114 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a47fa13a..611e4c13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Point3D and Point2D are made separate classes instead of expect/actual (to split up different engines.
 - JavaFX support moved to a separate module
 - Threejs support moved to a separate module
+- \[Breaking change!\] Stylesheets are moved into properties under `@stylesheet` key
 
 ### Deprecated
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 6a5a615a..d4147448 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 val dataforgeVersion by extra("0.2.1-dev-4")
-val ktorVersion by extra("1.4.2")
+val ktorVersion by extra("1.4.3")
 val htmlVersion by extra("0.7.2")
 val kotlinWrappersVersion by extra("pre.129-kotlin-1.4.20")
 val fxVersion by extra("14")
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
index b69c631b..5bc10577 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
@@ -3,9 +3,9 @@ package hep.dataforge.vision.bootstrap
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.getStyle
 import hep.dataforge.vision.react.configEditor
 import hep.dataforge.vision.react.metaViewer
-import hep.dataforge.vision.resolveStyle
 import org.w3c.dom.Element
 import react.RBuilder
 import react.dom.render
@@ -24,7 +24,7 @@ public fun RBuilder.visionPropertyEditor(
         card("Styles") {
             accordion("styles") {
                 styles.forEach { styleName ->
-                    val style = item.resolveStyle(styleName)
+                    val style = item.getStyle(styleName)
                     if (style != null) {
                         entry(styleName) {
                             metaViewer(style)
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
index d154efbd..4d3ea1f3 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
@@ -1,62 +1,30 @@
-@file:UseSerializers(MetaSerializer::class)
-
 package hep.dataforge.vision
 
 import hep.dataforge.meta.*
 import hep.dataforge.names.Name
+import hep.dataforge.names.NameToken
 import hep.dataforge.names.asName
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
-import kotlinx.serialization.UseSerializers
-import kotlinx.serialization.builtins.MapSerializer
-import kotlinx.serialization.builtins.serializer
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
+import hep.dataforge.names.plus
 
 /**
  * A container for styles
  */
-@Serializable(StyleSheet.Companion::class)
-public class StyleSheet private constructor(private val styleMap: MutableMap<String, Meta>) {
-    @Transient
-    internal var owner: Vision? = null
+public inline class StyleSheet(private val owner: VisionGroup) {
 
-    public constructor(owner: Vision) : this(LinkedHashMap()) {
-        this.owner = owner
-    }
+    private val styleNode get() = owner.properties?.get(STYLESHEET_KEY).node
 
-    public val items: Map<String, Meta> get() = styleMap
+    public val items: Map<NameToken, Meta>? get() = styleNode?.items?.mapValues { it.value.node ?: Meta.EMPTY }
 
-
-    private fun Vision.styleChanged(key: String, oldStyle: Meta?, newStyle: Meta?) {
-        if (styles.contains(key)) {
-            //TODO optimize set concatenation
-            val tokens: Collection<Name> =
-                ((oldStyle?.items?.keys ?: emptySet()) + (newStyle?.items?.keys ?: emptySet()))
-                    .map { it.asName() }
-            tokens.forEach { parent?.propertyChanged(it) }
-        }
-        if (this is VisionGroup) {
-            for (obj in this) {
-                obj.styleChanged(key, oldStyle, newStyle)
-            }
-        }
-    }
-
-    public operator fun get(key: String): Meta? {
-        return styleMap[key] ?: owner?.parent?.styleSheet?.get(key)
-    }
+    public operator fun get(key: String): Meta? = owner.getStyle(key)
 
     /**
      * Define a style without notifying owner
      */
     public fun define(key: String, style: Meta?) {
         if (style == null) {
-            styleMap.remove(key)
+            styleNode?.remove(key)
         } else {
-            styleMap[key] = style
+            owner.config[STYLESHEET_KEY + key] = style
         }
     }
 
@@ -64,11 +32,13 @@ public class StyleSheet private constructor(private val styleMap: MutableMap<Str
      * Set or clear the style
      */
     public operator fun set(key: String, style: Meta?) {
-        val oldStyle = styleMap[key]
+        val oldStyle = get(key)
         define(key, style)
-        owner?.styleChanged(key, oldStyle, style)
+        owner.styleChanged(key, oldStyle, style)
     }
 
+    public inline operator fun invoke(block: StyleSheet.() -> Unit): Unit = this.block()
+
     /**
      * Create and set a style
      */
@@ -77,33 +47,33 @@ public class StyleSheet private constructor(private val styleMap: MutableMap<Str
         set(key, newStyle.seal())
     }
 
-    public fun update(key: String, meta: Meta) {
-        val existing = get(key)
-        set(key, existing?.edit { this.update(meta) } ?: meta)
+    public companion object {
+        public val STYLESHEET_KEY: Name = "@stylesheet".asName()
     }
+}
 
-    public fun update(other: StyleSheet) {
-        other.items.forEach { (key, value) ->
-            update(key, value)
-        }
+internal fun Vision.styleChanged(key: String, oldStyle: Meta?, newStyle: Meta?) {
+    if (styles.contains(key)) {
+        //TODO optimize set concatenation
+        val tokens: Collection<Name> =
+            ((oldStyle?.items?.keys ?: emptySet()) + (newStyle?.items?.keys ?: emptySet()))
+                .map { it.asName() }
+        tokens.forEach { parent?.propertyChanged(it) }
     }
-
-    public companion object : KSerializer<StyleSheet> {
-        private val mapSerializer = MapSerializer(String.serializer(), MetaSerializer)
-        override val descriptor: SerialDescriptor get() = mapSerializer.descriptor
-
-
-        override fun deserialize(decoder: Decoder): StyleSheet {
-            val map = mapSerializer.deserialize(decoder)
-            return StyleSheet(map as? MutableMap<String, Meta> ?: LinkedHashMap(map))
-        }
-
-        override fun serialize(encoder: Encoder, value: StyleSheet) {
-            mapSerializer.serialize(encoder, value.items)
+    if (this is VisionGroup) {
+        for (obj in this) {
+            obj.styleChanged(key, oldStyle, newStyle)
         }
     }
 }
 
+
+/**
+ * A stylesheet for this group and its descendants. Stylesheet is not applied directly,
+ * but instead is just a repository for named configurations.
+ */
+public val VisionGroup.styleSheet: StyleSheet get() = StyleSheet(this)
+
 /**
  * Add style name to the list of styles to be resolved later. The style with given name does not necessary exist at the moment.
  */
@@ -111,12 +81,19 @@ public fun Vision.useStyle(name: String) {
     styles = (properties[Vision.STYLE_KEY]?.stringList ?: emptyList()) + name
 }
 
+
+/**
+ * Find a style with given name for given [Vision]. The style is not necessary applied to this [Vision].
+ */
+public tailrec fun Vision.getStyle(name: String): Meta? =
+    properties?.get(StyleSheet.STYLESHEET_KEY + name).node ?: parent?.getStyle(name)
+
 /**
  * Resolve an item in all style layers
  */
 public fun Vision.getStyleItems(name: Name): Sequence<MetaItem<*>> {
     return styles.asSequence().map {
-        resolveStyle(it)
+        getStyle(it)
     }.map {
         it[name]
     }.filterNotNull()
@@ -125,4 +102,4 @@ public fun Vision.getStyleItems(name: Name): Sequence<MetaItem<*>> {
 /**
  * Collect all styles for this object in a single laminate
  */
-public val Vision.allStyles: Laminate get() = Laminate(styles.mapNotNull(::resolveStyle))
\ No newline at end of file
+public val Vision.allStyles: Laminate get() = Laminate(styles.mapNotNull(::getStyle))
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 5de49992..058a04b3 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -98,12 +98,6 @@ public fun Vision.setProperty(key: String, value: Any?) {
     config[key] = value
 }
 
-/**
- * Find a style with given name for given [Vision]. The style is not necessary applied to this [Vision].
- */
-public tailrec fun Vision.resolveStyle(name: String): Meta? =
-    (this as? VisionGroup)?.styleSheet?.get(name) ?: parent?.resolveStyle(name)
-
 /**
  * Control visibility of the element
  */
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index e52041fe..6127479c 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -34,7 +34,7 @@ public open class VisionBase : Vision {
     override val descriptor: NodeDescriptor? get() = null
 
     protected fun updateStyles(names: List<String>) {
-        names.mapNotNull { resolveStyle(it) }.asSequence()
+        names.mapNotNull { getStyle(it) }.asSequence()
             .flatMap { it.items.asSequence() }
             .distinctBy { it.key }
             .forEach {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
index 6fd1c559..fdfb9e7a 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
@@ -3,7 +3,7 @@ package hep.dataforge.vision
 import hep.dataforge.names.*
 import hep.dataforge.provider.Provider
 
-public interface VisionContainer<out V: Vision>{
+public interface VisionContainer<out V : Vision> {
     public operator fun get(name: Name): V?
 }
 
@@ -18,12 +18,6 @@ public interface VisionGroup : Provider, Vision, VisionContainer<Vision> {
 
     override val defaultTarget: String get() = Vision.TYPE
 
-    /**
-     * A stylesheet for this group and its descendants. Stylesheet is not applied directly,
-     * but instead is just a repository for named configurations.
-     */
-    public val styleSheet: StyleSheet?
-
     /**
      * A map of direct children for specific target
      * (currently "visual" or "style")
@@ -38,7 +32,7 @@ public interface VisionGroup : Provider, Vision, VisionContainer<Vision> {
                 }
                 res.entries
             }.associate { it.toPair() }
-            STYLE_TARGET -> styleSheet?.items?.mapKeys { it.key.toName() } ?: emptyMap()
+            STYLE_TARGET -> styleSheet.items?.mapKeys { it.key.asName() } ?: emptyMap()
             else -> emptyMap()
         }
 
@@ -54,7 +48,6 @@ public interface VisionGroup : Provider, Vision, VisionContainer<Vision> {
      * A fix for serialization bug that writes all proper parents inside the tree after deserialization
      */
     public fun attachChildren() {
-        styleSheet?.owner = this
         children.values.forEach {
             it.parent = this
             (it as? VisionGroup)?.attachChildren()
@@ -73,7 +66,7 @@ public operator fun VisionGroup.iterator(): Iterator<Vision> = children.values.i
 
 public val VisionGroup.isEmpty: Boolean get() = this.children.isEmpty()
 
-public interface VisionContainerBuilder<in V: Vision>{
+public interface VisionContainerBuilder<in V : Vision> {
     public operator fun set(name: Name, child: V?)
 }
 
@@ -97,9 +90,11 @@ public interface MutableVisionGroup : VisionGroup, VisionContainerBuilder<Vision
 //    public operator fun set(name: Name, child: Vision?)
 }
 
-public operator fun <V: Vision> VisionContainer<V>.get(str: String): V? = get(str.toName())
+public operator fun <V : Vision> VisionContainer<V>.get(str: String): V? = get(str.toName())
 
-public operator fun <V: Vision>  VisionContainerBuilder<V>.set(token: NameToken, child: V?): Unit = set(token.asName(), child)
-public operator fun <V: Vision>  VisionContainerBuilder<V>.set(key: String, child: V?): Unit = set(key.toName(), child)
+public operator fun <V : Vision> VisionContainerBuilder<V>.set(token: NameToken, child: V?): Unit =
+    set(token.asName(), child)
+
+public operator fun <V : Vision> VisionContainerBuilder<V>.set(key: String, child: V?): Unit = set(key.toName(), child)
 
 public fun MutableVisionGroup.removeAll(): Unit = children.keys.map { it.asName() }.forEach { this[it] = null }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
index 947adafd..996b0853 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
@@ -26,19 +26,6 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
      */
     override val children: Map<NameToken, Vision> get() = childrenInternal
 
-    final override var styleSheet: StyleSheet? = null
-        private set
-
-    /**
-     * Update or create stylesheet
-     */
-    public open fun styleSheet(block: StyleSheet.() -> Unit) {
-        if (styleSheet == null) {
-            styleSheet = StyleSheet(this@VisionGroupBase)
-        }
-        styleSheet!!.block()
-    }
-
     override fun propertyChanged(name: Name) {
         super.propertyChanged(name)
         for (obj in this) {
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
index 5a559d4f..251130c2 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
@@ -5,7 +5,7 @@ import hep.dataforge.meta.Meta
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.update
 import hep.dataforge.vision.Vision
-import hep.dataforge.vision.resolveStyle
+import hep.dataforge.vision.getStyle
 import hep.dataforge.vision.setProperty
 import javafx.beans.binding.Binding
 import javafx.beans.property.SimpleObjectProperty
@@ -55,7 +55,7 @@ class VisualObjectEditorFragment(val selector: (Vision) -> Meta) : Fragment() {
     private val styleBoxProperty: Binding<Node?> = configProperty.objectBinding() {
         VBox().apply {
             item?.styles?.forEach { styleName ->
-                val styleMeta = item?.resolveStyle(styleName)
+                val styleMeta = item?.getStyle(styleName)
                 if (styleMeta != null) {
                     titledpane(styleName, node = MetaViewer(styleMeta).root)
                 }
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
index 583bbb03..d3dd5b3a 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
@@ -10,6 +10,7 @@ import hep.dataforge.names.toName
 import hep.dataforge.vision.set
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
+import hep.dataforge.vision.styleSheet
 import hep.dataforge.vision.useStyle
 import kscience.gdml.*
 import kotlin.math.cos
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
index b7e670d1..75ce5b02 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
@@ -3,7 +3,10 @@ package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.update
 import hep.dataforge.names.NameToken
-import hep.dataforge.vision.*
+import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionContainerBuilder
+import hep.dataforge.vision.VisionGroup
+import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -28,9 +31,6 @@ public class Composite(
 
     override val children: Map<NameToken, Vision>
         get() = mapOf(NameToken("first") to first, NameToken("second") to second)
-
-    override val styleSheet: StyleSheet?
-        get() = null
 }
 
 public inline fun VisionContainerBuilder<Solid>.composite(
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index 3b58e11a..7829faef 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -103,10 +103,6 @@ internal class Prototypes(
     children: Map<NameToken, Vision> = emptyMap(),
 ) : VisionGroupBase(), PrototypeHolder {
 
-    override fun styleSheet(block: StyleSheet.() -> Unit) {
-        error("Can't define stylesheet for prototypes block")
-    }
-
     init {
         this.childrenInternal.putAll(children)
     }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
index 3895171e..4df85142 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
@@ -58,8 +58,6 @@ public class SolidReference(
         get() = (parent as? SolidGroup)?.getPrototype(templateName)
             ?: error("Prototype with name $templateName not found in $parent")
 
-    override val styleSheet: StyleSheet get() = parent?.styleSheet ?: StyleSheet(this)
-
     @Transient
     private val propertyCache: HashMap<Name, Config> = HashMap()
 
@@ -90,8 +88,6 @@ public class SolidReference(
 
         override val prototype: Solid get() = prototypeFor(name)
 
-        override val styleSheet: StyleSheet get() = this@SolidReference.styleSheet
-
         override val children: Map<NameToken, Vision>
             get() = (prototype as? VisionGroup)?.children
                 ?.filter { !it.key.toString().startsWith("@") }
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
index 7c80a6fb..3f89c024 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
@@ -3,6 +3,7 @@ package hep.dataforge.vision.solid
 import hep.dataforge.meta.int
 import hep.dataforge.meta.set
 import hep.dataforge.names.asName
+import hep.dataforge.vision.styleSheet
 import hep.dataforge.vision.useStyle
 import kotlin.test.Test
 import kotlin.test.assertEquals

From 734d1e116819a49e1a4717d1b12d31c30236b8ec Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 12 Dec 2020 10:44:45 +0300
Subject: [PATCH 046/151] A lot of small refactoring in html

---
 demo/sat-demo/build.gradle.kts                |   7 +
 .../kotlin/ru/mipt/npm/sat/SatDemoApp.kt      |  26 +---
 demo/sat-demo/src/jsMain/resources/index.html |  12 --
 .../kotlin/ru/mipt/npm/sat/satServer.kt       |  37 ++---
 .../src/jvmMain/resources/css/styles.css      |  16 ++
 visionforge-core/build.gradle.kts             |   2 +-
 .../hep/dataforge/vision/VisionChange.kt      |  38 +++--
 .../vision/html/BindingOutputTagConsumer.kt   |   3 +-
 .../vision/html/OutputTagConsumer.kt          |  74 ++++++---
 .../vision/html/StaticOutputTagConsumer.kt    |  36 ++++-
 .../hep/dataforge/vision/html/HtmlTagTest.kt  |  17 +-
 .../dataforge/vision/client/VisionClient.kt   |  29 ++--
 .../hep/dataforge/vision/export/htmlExport.kt |  67 ++++++++
 .../dataforge/vision/server/VisionServer.kt   | 147 ++++++++++++------
 14 files changed, 351 insertions(+), 160 deletions(-)
 delete mode 100644 demo/sat-demo/src/jsMain/resources/index.html
 create mode 100644 demo/sat-demo/src/jvmMain/resources/css/styles.css
 create mode 100644 visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/export/htmlExport.kt

diff --git a/demo/sat-demo/build.gradle.kts b/demo/sat-demo/build.gradle.kts
index efaaff60..f5b9ef31 100644
--- a/demo/sat-demo/build.gradle.kts
+++ b/demo/sat-demo/build.gradle.kts
@@ -18,6 +18,13 @@ kscience{
 val ktorVersion: String by rootProject.extra
 
 kotlin {
+    js{
+        browser {
+            webpackTask {
+                this.outputFileName = "visionforge-solid.js"
+            }
+        }
+    }
     afterEvaluate {
         val jsBrowserDistribution by tasks.getting
 
diff --git a/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt b/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
index 45e0283c..a3af18af 100644
--- a/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
+++ b/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
@@ -6,34 +6,10 @@ import hep.dataforge.vision.client.fetchAndRenderAllVisions
 import hep.dataforge.vision.solid.three.ThreePlugin
 import kotlinx.browser.window
 
-//private class SatDemoApp : Application {
-//
-//    override fun start(state: Map<String, Any>) {
-//        val element = document.getElementById("canvas") as? HTMLElement
-//            ?: error("Element with id 'canvas' not found on page")
-//        val three = Global.plugins.fetch(ThreePlugin)
-//
-//        val sat = visionOfSatellite(
-//            ySegments = 3,
-//        )
-//        three.render(element, sat){
-//            minSize = 500
-//            axes{
-//                size = 500.0
-//                visible = true
-//            }
-//        }
-//    }
-//
-//}
-//
-//fun main() {
-//    startApplication(::SatDemoApp)
-//}
-
 fun main() {
     //Loading three-js renderer
     Global.plugins.load(ThreePlugin)
+    //Fetch from server and render visions for all outputs
     window.onload = {
         Global.plugins.fetch(VisionClient).fetchAndRenderAllVisions()
     }
diff --git a/demo/sat-demo/src/jsMain/resources/index.html b/demo/sat-demo/src/jsMain/resources/index.html
deleted file mode 100644
index 0fd32551..00000000
--- a/demo/sat-demo/src/jsMain/resources/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>Three js demo for particle physics</title>
-    <script type="text/javascript" src="sat-demo.js"></script>
-</head>
-<body class="application">
-<div id="canvas"></div>
-</body>
-</html>
\ No newline at end of file
diff --git a/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt b/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
index d834e433..2e86ff22 100644
--- a/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
+++ b/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
@@ -2,12 +2,9 @@ package ru.mipt.npm.sat
 
 
 import hep.dataforge.context.Global
-import hep.dataforge.names.asName
 import hep.dataforge.names.toName
 import hep.dataforge.vision.VisionManager
-import hep.dataforge.vision.server.close
-import hep.dataforge.vision.server.serve
-import hep.dataforge.vision.server.show
+import hep.dataforge.vision.server.*
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.SolidManager
 import hep.dataforge.vision.solid.color
@@ -15,8 +12,8 @@ import io.ktor.util.KtorExperimentalAPI
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import kotlinx.html.div
 import kotlinx.html.h1
-import kotlinx.html.script
 import kotlin.random.Random
 
 @OptIn(KtorExperimentalAPI::class)
@@ -30,27 +27,27 @@ fun main() {
     }
 
     val server = context.plugins.fetch(VisionManager).serve {
-        header {
-            script {
-                src = "sat-demo.js"
-            }
-        }
+        useScript("visionforge-solid.js")
+        useCss("css/styles.css")
         page {
-            h1 { +"Satellite detector demo" }
-            vision("main".asName(), sat)
-        }
-        launch {
-            delay(1000)
-            while (isActive) {
-                val target = "layer[${Random.nextInt(1,10)}].segment[${Random.nextInt(3)},${Random.nextInt(3)}]".toName()
-                (sat[target] as? Solid)?.color("red")
-                delay(300)
-                (sat[target] as? Solid)?.color = "green"
+            div("flex-column") {
+                h1 { +"Satellite detector demo" }
+                vision(sat)
             }
         }
     }
     server.show()
 
+    context.launch {
+        while (isActive) {
+            val target = "layer[${Random.nextInt(1,11)}].segment[${Random.nextInt(3)},${Random.nextInt(3)}]".toName()
+            (sat[target] as? Solid)?.color("red")
+            delay(300)
+            (sat[target] as? Solid)?.color = "green"
+            delay(10)
+        }
+    }
+
     println("Press Enter to close server")
     while (readLine()!="exit"){
         //
diff --git a/demo/sat-demo/src/jvmMain/resources/css/styles.css b/demo/sat-demo/src/jvmMain/resources/css/styles.css
new file mode 100644
index 00000000..5f4ff253
--- /dev/null
+++ b/demo/sat-demo/src/jvmMain/resources/css/styles.css
@@ -0,0 +1,16 @@
+body{
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+}
+
+.flex-column{
+    width: calc(100% - 15px);
+    height: calc(100% - 15px);
+    display: flex;
+    flex-direction: column;
+}
+
+.visionforge-output{
+    flex-grow: 1;
+}
\ No newline at end of file
diff --git a/visionforge-core/build.gradle.kts b/visionforge-core/build.gradle.kts
index a12e4954..d888a4c3 100644
--- a/visionforge-core/build.gradle.kts
+++ b/visionforge-core/build.gradle.kts
@@ -16,12 +16,12 @@ kotlin {
             dependencies {
                 api("hep.dataforge:dataforge-context:$dataforgeVersion")
                 api("org.jetbrains.kotlinx:kotlinx-html:$htmlVersion")
+                api("org.jetbrains:kotlin-css:1.0.0-$kotlinWrappersVersion")
             }
         }
         jsMain {
             dependencies {
                 api("org.jetbrains:kotlin-extensions:1.0.1-$kotlinWrappersVersion")
-                api("org.jetbrains:kotlin-css:1.0.0-$kotlinWrappersVersion")
             }
         }
     }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
index 8c3fbf56..9a09e52e 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
@@ -35,6 +35,7 @@ public class VisionChangeBuilder : VisionContainerBuilder<Vision> {
         propertyChange,
         childrenChange.mapValues { it.value?.isolate(manager) }
     )
+    //TODO optimize isolation for visions without parents?
 }
 
 private fun Vision.isolate(manager: VisionManager): Vision {
@@ -77,12 +78,15 @@ private fun CoroutineScope.collectChange(
         }
     }
 
+    coroutineContext[Job]?.invokeOnCompletion {
+        source.config.removeListener(mutex)
+    }
+
     if (source is VisionGroup) {
         //Subscribe for children changes
         source.children.forEach { (token, child) ->
             collectChange(name + token, child, mutex, collector)
         }
-        //TODO update styles?
 
         //Subscribe for structure change
         if (source is MutableVisionGroup) {
@@ -94,6 +98,9 @@ private fun CoroutineScope.collectChange(
                 }
                 collector()[name + token] = after
             }
+            coroutineContext[Job]?.invokeOnCompletion {
+                source.removeStructureChangeListener(mutex)
+            }
         }
     }
 }
@@ -102,23 +109,24 @@ private fun CoroutineScope.collectChange(
 public fun Vision.flowChanges(
     manager: VisionManager,
     collectionDuration: Duration,
-    scope: CoroutineScope = manager.context,
 ): Flow<VisionChange> = flow {
-    val mutex = Mutex()
+    supervisorScope {
+        val mutex = Mutex()
 
-    var collector = VisionChangeBuilder()
-    scope.collectChange(Name.EMPTY, this@flowChanges, mutex) { collector }
+        var collector = VisionChangeBuilder()
+        collectChange(Name.EMPTY, this@flowChanges, mutex) { collector }
 
-    while (currentCoroutineContext().isActive) {
-        //Wait for changes to accumulate
-        delay(collectionDuration)
-        //Propagate updates only if something is changed
-        if (!collector.isEmpty()) {
-            //emit changes
-            mutex.withLock {
-                emit(collector.isolate(manager))
-                //Reset the collector
-                collector = VisionChangeBuilder()
+        while (currentCoroutineContext().isActive) {
+            //Wait for changes to accumulate
+            delay(collectionDuration)
+            //Propagate updates only if something is changed
+            if (!collector.isEmpty()) {
+                //emit changes
+                mutex.withLock {
+                    emit(collector.isolate(manager))
+                    //Reset the collector
+                    collector = VisionChangeBuilder()
+                }
             }
         }
     }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingOutputTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingOutputTagConsumer.kt
index 445ffb0c..9998c442 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingOutputTagConsumer.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingOutputTagConsumer.kt
@@ -1,5 +1,6 @@
 package hep.dataforge.vision.html
 
+import hep.dataforge.meta.Meta
 import hep.dataforge.names.Name
 import hep.dataforge.vision.Vision
 import kotlinx.html.FlowContent
@@ -13,7 +14,7 @@ public class BindingOutputTagConsumer<T, V : Vision>(
     private val _bindings = HashMap<Name, V>()
     public val bindings: Map<Name, V> get() = _bindings
 
-    override fun FlowContent.renderVision(name: Name, vision: V) {
+    override fun FlowContent.renderVision(name: Name, vision: V, outputMeta: Meta) {
         _bindings[name] = vision
     }
 }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/OutputTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/OutputTagConsumer.kt
index 5e402ab4..86ea51f6 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/OutputTagConsumer.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/OutputTagConsumer.kt
@@ -1,18 +1,24 @@
 package hep.dataforge.vision.html
 
+import hep.dataforge.meta.*
 import hep.dataforge.names.Name
 import hep.dataforge.names.toName
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionManager
 import kotlinx.html.*
 
+
 /**
- * An HTML div wrapper that includes the output [name] and inherited [render] function
+ * A placeholder object to attach inline vision builders.
  */
-public class OutputDiv<in V : Vision>(
-    private val div: DIV,
-    public val name: Name,
-    public val render: (V) -> Unit,
-) : HtmlBlockTag by div
+@DFExperimental
+public class VisionOutput {
+    public var meta: Meta = Meta.EMPTY
+
+    public inline fun meta(block: MetaBuilder.() -> Unit) {
+        this.meta = Meta(block)
+    }
+}
 
 /**
  * Modified  [TagConsumer] that allows rendering output fragments and visions in them
@@ -26,34 +32,55 @@ public abstract class OutputTagConsumer<R, V : Vision>(
 
     /**
      * Render a vision inside the output fragment
+     * @param name name of the output container
+     * @param vision an object to be rendered
+     * @param outputMeta optional configuration for the output container
      */
-    protected abstract fun FlowContent.renderVision(name: Name, vision: V)
+    protected abstract fun FlowContent.renderVision(name: Name, vision: V, outputMeta: Meta)
 
     /**
-     * Create a placeholder for an output window
+     * Create a placeholder for a vision output with optional [Vision] in it
      */
-    public fun <T> TagConsumer<T>.visionOutput(
+    public fun <T> TagConsumer<T>.vision(
         name: Name,
-        block: OutputDiv<V>.() -> Unit = {},
+        vision: V? = null,
+        outputMeta: Meta = Meta.EMPTY,
     ): T = div {
         id = resolveId(name)
         classes = setOf(OUTPUT_CLASS)
         attributes[OUTPUT_NAME_ATTRIBUTE] = name.toString()
-        OutputDiv<V>(this, name) { renderVision(name, it) }.block()
-    }
-
-    public fun <T> TagConsumer<T>.visionOutput(
-        name: String,
-        block: OutputDiv<V>.() -> Unit = {},
-    ): T = visionOutput(name.toName(), block)
-
-
-    public fun <T> TagConsumer<T>.vision(name: Name, vision: V): Unit {
-        visionOutput(name) {
-            render(vision)
+        if (!outputMeta.isEmpty()) {
+            //Hard-code output configuration
+            script {
+                attributes["class"] = OUTPUT_META_CLASS
+                unsafe {
+                    +VisionManager.defaultJson.encodeToString(MetaSerializer, outputMeta)
+                }
+            }
         }
+        vision?.let { renderVision(name, it, outputMeta) }
     }
 
+    @OptIn(DFExperimental::class)
+    public inline fun <T> TagConsumer<T>.vision(
+        name: Name,
+        visionProvider: VisionOutput.() -> V,
+    ): T {
+        val output = VisionOutput()
+        val vision = output.visionProvider()
+        return vision(name, vision, output.meta)
+    }
+
+    @OptIn(DFExperimental::class)
+    public inline fun <T> TagConsumer<T>.vision(
+        name: String,
+        visionProvider: VisionOutput.() -> V,
+    ): T = vision(name.toName(), visionProvider)
+
+    public inline fun <T> TagConsumer<T>.vision(
+        vision: V,
+    ): T = vision("vision[${vision.hashCode()}]".toName(), vision)
+
     /**
      * Process the resulting object produced by [TagConsumer]
      */
@@ -67,6 +94,9 @@ public abstract class OutputTagConsumer<R, V : Vision>(
 
     public companion object {
         public const val OUTPUT_CLASS: String = "visionforge-output"
+        public const val OUTPUT_META_CLASS: String = "visionforge-output-meta"
+        public const val OUTPUT_DATA_CLASS: String = "visionforge-output-data"
+
         public const val OUTPUT_NAME_ATTRIBUTE: String = "data-output-name"
         public const val OUTPUT_ENDPOINT_ATTRIBUTE: String = "data-output-endpoint"
         public const val DEFAULT_ENDPOINT: String = "."
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticOutputTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticOutputTagConsumer.kt
index 401fe3f8..0e045918 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticOutputTagConsumer.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticOutputTagConsumer.kt
@@ -1,12 +1,16 @@
 package hep.dataforge.vision.html
 
+import hep.dataforge.meta.Meta
 import hep.dataforge.names.Name
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionManager
 import kotlinx.html.FlowContent
 import kotlinx.html.TagConsumer
+import kotlinx.html.script
 import kotlinx.html.stream.createHTML
+import kotlinx.html.unsafe
 
-public typealias HtmlVisionRenderer<V> = FlowContent.(V) -> Unit
+public typealias HtmlVisionRenderer<V> = FlowContent.(V, Meta) -> Unit
 
 /**
  * An [OutputTagConsumer] that directly renders given [Vision] using provided [renderer]
@@ -16,8 +20,18 @@ public class StaticOutputTagConsumer<R, V : Vision>(
     prefix: String? = null,
     private val renderer: HtmlVisionRenderer<V>,
 ) : OutputTagConsumer<R, V>(root, prefix) {
+    override fun FlowContent.renderVision(name: Name, vision: V, outputMeta: Meta): Unit = renderer(vision, outputMeta)
 
-    override fun FlowContent.renderVision(name: Name, vision: V): Unit = renderer(vision)
+    public companion object {
+        public fun embed(manager: VisionManager): HtmlVisionRenderer<Vision> = { vision: Vision, _: Meta ->
+            script {
+                attributes["class"] = OUTPUT_DATA_CLASS
+                unsafe {
+                    +manager.encodeToString(vision)
+                }
+            }
+        }
+    }
 }
 
 public fun <T : Any> HtmlVisionFragment<Vision>.renderToObject(
@@ -26,5 +40,21 @@ public fun <T : Any> HtmlVisionFragment<Vision>.renderToObject(
     renderer: HtmlVisionRenderer<Vision>,
 ): T = StaticOutputTagConsumer(root, prefix, renderer).apply(content).finalize()
 
+/**
+ * Render an object to HTML embedding the data as script bodies
+ */
+public fun <T : Any> HtmlVisionFragment<Vision>.embedToObject(
+    manager: VisionManager,
+    root: TagConsumer<T>,
+    prefix: String? = null,
+): T = renderToObject(root, prefix, StaticOutputTagConsumer.embed(manager))
+
 public fun HtmlVisionFragment<Vision>.renderToString(renderer: HtmlVisionRenderer<Vision>): String =
-    renderToObject(createHTML(), null, renderer)
\ No newline at end of file
+    renderToObject(createHTML(), null, renderer)
+
+/**
+ * Convert a fragment to a string, embedding all visions data
+ */
+public fun HtmlVisionFragment<Vision>.embedToString(manager: VisionManager): String =
+    embedToObject(manager, createHTML())
+
diff --git a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
index 2b322c12..eac0a16a 100644
--- a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
+++ b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
@@ -1,5 +1,6 @@
 package hep.dataforge.vision.html
 
+import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.configure
 import hep.dataforge.meta.set
 import hep.dataforge.vision.Vision
@@ -10,14 +11,18 @@ import kotlin.test.Test
 
 class HtmlTagTest {
 
-    fun OutputDiv<Vision>.visionBase(block: VisionBase.() -> Unit) =
-        render(VisionBase().apply(block))
+    @OptIn(DFExperimental::class)
+    fun VisionOutput.base(block: VisionBase.() -> Unit) =
+        VisionBase().apply(block)
 
     val fragment = buildVisionFragment {
         div {
             h1 { +"Head" }
-            visionOutput("ddd") {
-                visionBase {
+            vision("ddd") {
+                meta{
+                    "metaProperty" put 87
+                }
+                base {
                     configure {
                         set("myProp", 82)
                         set("otherProp", false)
@@ -27,7 +32,7 @@ class HtmlTagTest {
         }
     }
 
-    val simpleVisionRenderer: HtmlVisionRenderer<Vision> = { vision ->
+    val simpleVisionRenderer: HtmlVisionRenderer<Vision> = { vision, _ ->
         div {
             h2 { +"Properties" }
             ul {
@@ -41,7 +46,7 @@ class HtmlTagTest {
         }
     }
 
-    val groupRenderer: HtmlVisionRenderer<VisionGroup> = { group ->
+    val groupRenderer: HtmlVisionRenderer<VisionGroup> = { group, _ ->
         p { +"This is group" }
     }
 
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
index ad022eee..5b51cacd 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
@@ -2,8 +2,7 @@ package hep.dataforge.vision.client
 
 import hep.dataforge.context.*
 import hep.dataforge.meta.Meta
-import hep.dataforge.meta.get
-import hep.dataforge.meta.node
+import hep.dataforge.meta.MetaSerializer
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionChange
 import hep.dataforge.vision.VisionManager
@@ -42,16 +41,31 @@ public class VisionClient : AbstractPlugin() {
     public fun findRendererFor(vision: Vision): ElementVisionRenderer? =
         getRenderers().maxByOrNull { it.rateVision(vision) }
 
+    private fun Element.getEmbeddedData(className: String): String? = getElementsByClassName(className)[0]?.innerHTML
+
     /**
      * Fetch from server and render a vision, described in a given with [OutputTagConsumer.OUTPUT_CLASS] class.
      */
-    public fun fetchAndRenderVision(element: Element, requestUpdates: Boolean = true) {
+    public fun renderVisionAt(element: Element, requestUpdates: Boolean = true) {
         val name = resolveName(element) ?: error("The element is not a vision output")
         console.info("Found DF output with name $name")
         if (!element.classList.contains(OutputTagConsumer.OUTPUT_CLASS)) error("The element $element is not an output element")
         val endpoint = resolveEndpoint(element)
         console.info("Vision server is resolved to $endpoint")
 
+        val outputMeta = element.getEmbeddedData(OutputTagConsumer.OUTPUT_META_CLASS)?.let {
+            VisionManager.defaultJson.decodeFromString(MetaSerializer, it)
+        } ?: Meta.EMPTY
+
+        //Trying to render embedded vision
+        val embeddedVision = element.getEmbeddedData(OutputTagConsumer.OUTPUT_DATA_CLASS)?.let {
+            visionManager.decodeFromString(it)
+        }
+        if (embeddedVision != null) {
+            val renderer = findRendererFor(embeddedVision) ?: error("Could nof find renderer for $embeddedVision")
+            renderer.render(element, embeddedVision, outputMeta)
+        }
+
         val fetchUrl = URL(endpoint).apply {
             searchParams.append("name", name)
             pathname += "/vision"
@@ -63,15 +77,14 @@ public class VisionClient : AbstractPlugin() {
                 response.text().then { text ->
                     val vision = visionManager.decodeFromString(text)
                     val renderer = findRendererFor(vision) ?: error("Could nof find renderer for $vision")
-                    val rendererConfiguration = vision.properties[RENDERER_CONFIGURATION_META_KEY].node ?: Meta.EMPTY
-                    renderer.render(element, vision, rendererConfiguration)
+                    renderer.render(element, vision, outputMeta)
                     if (requestUpdates) {
                         val wsUrl = URL(endpoint).apply {
                             pathname += "/ws"
                             protocol = "ws"
                             searchParams.append("name", name)
                         }
-                        val ws = WebSocket(wsUrl.toString()).apply {
+                        WebSocket(wsUrl.toString()).apply {
                             onmessage = { messageEvent ->
                                 val stringData: String? = messageEvent.data as? String
                                 if (stringData != null) {
@@ -106,8 +119,6 @@ public class VisionClient : AbstractPlugin() {
 
     public companion object : PluginFactory<VisionClient> {
 
-        public const val RENDERER_CONFIGURATION_META_KEY: String = "@renderer"
-
         override fun invoke(meta: Meta, context: Context): VisionClient = VisionClient()
 
         override val tag: PluginTag = PluginTag(name = "vision.client", group = PluginTag.DATAFORGE_GROUP)
@@ -123,7 +134,7 @@ public fun VisionClient.fetchVisionsInChildren(element: Element, requestUpdates:
     val elements = element.getElementsByClassName(OutputTagConsumer.OUTPUT_CLASS)
     console.info("Finished search for outputs. Found ${elements.length} items")
     elements.asList().forEach { child ->
-        fetchAndRenderVision(child, requestUpdates)
+        renderVisionAt(child, requestUpdates)
     }
 }
 
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/export/htmlExport.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/export/htmlExport.kt
new file mode 100644
index 00000000..c7e556ea
--- /dev/null
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/export/htmlExport.kt
@@ -0,0 +1,67 @@
+//package hep.dataforge.vision.export
+//
+//package kscience.plotly
+//
+//import kotlinx.html.*
+//import kotlinx.html.stream.createHTML
+//
+///**
+// * A custom HTML fragment including plotly container reference
+// */
+//public class PlotlyFragment(public val render: FlowContent.(renderer: PlotlyRenderer) -> Unit)
+//
+///**
+// * A complete page including headers and title
+// */
+//public data class PlotlyPage(
+//    val headers: Collection<HtmlFragment>,
+//    val fragment: PlotlyFragment,
+//    val title: String = "Plotly.kt",
+//    val renderer: PlotlyRenderer = StaticPlotlyRenderer
+//) {
+//    public fun render(): String = createHTML().html {
+//        head {
+//            meta {
+//                charset = "utf-8"
+//            }
+//            title(this@PlotlyPage.title)
+//            headers.distinct().forEach { it.visit(consumer) }
+//        }
+//        body {
+//            fragment.render(this, renderer)
+//        }
+//    }
+//}
+//
+//public fun Plotly.fragment(content: FlowContent.(renderer: PlotlyRenderer) -> Unit): PlotlyFragment = PlotlyFragment(content)
+//
+///**
+// * Create a complete page including plots
+// */
+//public fun Plotly.page(
+//    vararg headers: HtmlFragment = arrayOf(cdnPlotlyHeader),
+//    title: String = "Plotly.kt",
+//    renderer: PlotlyRenderer = StaticPlotlyRenderer,
+//    content: FlowContent.(renderer: PlotlyRenderer) -> Unit
+//): PlotlyPage = PlotlyPage(headers.toList(), fragment(content), title, renderer)
+//
+///**
+// * Convert an html plot fragment to page
+// */
+//public fun PlotlyFragment.toPage(
+//    vararg headers: HtmlFragment = arrayOf(cdnPlotlyHeader),
+//    title: String = "Plotly.kt",
+//    renderer: PlotlyRenderer = StaticPlotlyRenderer
+//): PlotlyPage = PlotlyPage(headers.toList(), this, title, renderer)
+//
+///**
+// * Convert a plot to the sigle-plot page
+// */
+//public fun Plot.toPage(
+//    vararg headers: HtmlFragment = arrayOf(cdnPlotlyHeader),
+//    config: PlotlyConfig = PlotlyConfig.empty(),
+//    title: String = "Plotly.kt",
+//    renderer: PlotlyRenderer = StaticPlotlyRenderer
+//): PlotlyPage = PlotlyFragment {
+//    plot(this@toPage, config = config, renderer = renderer)
+//}.toPage(*headers, title = title)
\ No newline at end of file
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
index 0b4fb1c4..477f48fa 100644
--- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
@@ -1,10 +1,7 @@
 package hep.dataforge.vision.server
 
 import hep.dataforge.context.Context
-import hep.dataforge.meta.Config
-import hep.dataforge.meta.Configurable
-import hep.dataforge.meta.boolean
-import hep.dataforge.meta.long
+import hep.dataforge.meta.*
 import hep.dataforge.names.Name
 import hep.dataforge.names.toName
 import hep.dataforge.vision.Vision
@@ -25,21 +22,16 @@ import io.ktor.http.content.static
 import io.ktor.http.withCharset
 import io.ktor.response.respond
 import io.ktor.response.respondText
-import io.ktor.routing.application
-import io.ktor.routing.get
-import io.ktor.routing.route
-import io.ktor.routing.routing
+import io.ktor.routing.*
 import io.ktor.server.cio.CIO
 import io.ktor.server.engine.ApplicationEngine
 import io.ktor.server.engine.embeddedServer
 import io.ktor.util.KtorExperimentalAPI
-import io.ktor.util.error
 import io.ktor.websocket.WebSockets
 import io.ktor.websocket.webSocket
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.withContext
 import kotlinx.html.*
 import kotlinx.html.stream.createHTML
 import java.awt.Desktop
@@ -91,7 +83,70 @@ public class VisionServer internal constructor(
         return visionMap
     }
 
-    public fun page(
+    /**
+     * Server a map of visions without providing explicit html page for them
+     */
+    @OptIn(DFExperimental::class)
+    public fun serveVisions(route: Route, visions: Map<Name, Vision>): Unit = route {
+        application.log.info("Serving visions $visions at $route")
+
+        //Update websocket
+        webSocket("ws") {
+            val name: String = call.request.queryParameters["name"]
+                ?: error("Vision name is not defined in parameters")
+
+            application.log.debug("Opened server socket for $name")
+            val vision: Vision = visions[name.toName()] ?: error("Plot with id='$name' not registered")
+            try {
+                withContext(visionManager.context.coroutineContext) {
+                    vision.flowChanges(visionManager, updateInterval.milliseconds).collect { update ->
+                        val json = VisionManager.defaultJson.encodeToString(
+                            VisionChange.serializer(),
+                            update
+                        )
+                        outgoing.send(Frame.Text(json))
+                    }
+                }
+            } catch (t: Throwable) {
+                application.log.info("WebSocket update channel for $name is closed with exception: $t")
+            }
+        }
+        //Plots in their json representation
+        get("vision") {
+            val name: String = call.request.queryParameters["name"]
+                ?: error("Vision name is not defined in parameters")
+
+            val vision: Vision? = visions[name.toName()]
+            if (vision == null) {
+                call.respond(HttpStatusCode.NotFound, "Vision with name '$name' not found")
+            } else {
+                call.respondText(
+                    visionManager.encodeToString(vision),
+                    contentType = ContentType.Application.Json,
+                    status = HttpStatusCode.OK
+                )
+            }
+        }
+    }
+
+    /**
+     * Serv visions in a given [route] without providing a page template
+     */
+    public fun serveVisions(route: String, visions: Map<Name, Vision>): Unit {
+        application.routing {
+            route(rootRoute) {
+                route(route) {
+                    serveVisions(this, visions)
+                }
+            }
+        }
+    }
+
+    /**
+     * Serve a page, potentially containing any number of visions at a given [route] with given [headers].
+     *
+     */
+    public fun servePage(
         visionFragment: HtmlVisionFragment<Vision>,
         route: String = DEFAULT_PAGE,
         title: String = "VisionForge server page '$route'",
@@ -100,6 +155,7 @@ public class VisionServer internal constructor(
         val visions = HashMap<Name, Vision>()
 
         val cachedHtml: String? = if (cacheFragments) {
+            //Create and cache page html and map of visions
             createHTML(true).html {
                 visions.putAll(buildPage(visionFragment, title, headers))
             }
@@ -110,43 +166,17 @@ public class VisionServer internal constructor(
         application.routing {
             route(rootRoute) {
                 route(route) {
-                    //Update websocket
-                    webSocket("ws") {
-                        val name: String = call.request.queryParameters["name"]
-                            ?: error("Vision name is not defined in parameters")
-
-                        application.log.debug("Opened server socket for $name")
-                        val vision: Vision = visions[name.toName()] ?: error("Plot with id='$name' not registered")
-                        vision.flowChanges(visionManager, updateInterval.milliseconds).onEach { update ->
-                            val json = VisionManager.defaultJson.encodeToString(VisionChange.serializer(), update)
-                            outgoing.send(Frame.Text(json))
-                        }.catch { ex ->
-                            application.log.error(ex)
-                        }.launchIn(visionManager.context).join()
-                    }
-                    //Plots in their json representation
-                    get("vision") {
-                        val name: String = call.request.queryParameters["name"]
-                            ?: error("Vision name is not defined in parameters")
-
-                        val vision: Vision? = visions[name.toName()]
-                        if (vision == null) {
-                            call.respond(HttpStatusCode.NotFound, "Vision with name '$name' not found")
-                        } else {
-                            call.respondText(
-                                visionManager.encodeToString(vision),
-                                contentType = ContentType.Application.Json,
-                                status = HttpStatusCode.OK
-                            )
-                        }
-                    }
+                    serveVisions(this, visions)
                     //filled pages
                     get {
                         if (cachedHtml == null) {
+                            //re-create html and vision list on each call
                             call.respondHtml {
+                                visions.clear()
                                 visions.putAll(buildPage(visionFragment, title, headers))
                             }
                         } else {
+                            //Use cached html
                             call.respondText(cachedHtml, ContentType.Text.Html.withCharset(Charsets.UTF_8))
                         }
                     }
@@ -155,13 +185,16 @@ public class VisionServer internal constructor(
         }
     }
 
+    /**
+     * A shortcut method to easily create Complete pages filled with visions
+     */
     public fun page(
         route: String = DEFAULT_PAGE,
         title: String = "VisionForge server page '$route'",
         headers: List<HtmlFragment> = emptyList(),
         content: OutputTagConsumer<*, Vision>.() -> Unit,
     ) {
-        page(buildVisionFragment(content), route, title, headers)
+        servePage(buildVisionFragment(content), route, title, headers)
     }
 
 
@@ -171,11 +204,33 @@ public class VisionServer internal constructor(
     }
 }
 
+/**
+ * Use a script with given [src] as a global header for all pages.
+ */
+public inline fun VisionServer.useScript(src: String, crossinline block: SCRIPT.() -> Unit = {}) {
+    header {
+        script {
+            type = "text/javascript"
+            this.src = src
+            block()
+        }
+    }
+}
+
+public inline fun VisionServer.useCss(href: String, crossinline block: LINK.() -> Unit = {}) {
+    header {
+        link {
+            rel = "stylesheet"
+            this.href = href
+            block()
+        }
+    }
+}
 
 /**
  * Attach plotly application to given server
  */
-public fun Application.visionModule(context: Context, route: String = DEFAULT_PAGE): VisionServer {
+public fun Application.visionServer(context: Context, route: String = DEFAULT_PAGE): VisionServer {
     if (featureOrNull(WebSockets) == null) {
         install(WebSockets)
     }
@@ -209,7 +264,7 @@ public fun VisionManager.serve(
     port: Int = 7777,
     block: VisionServer.() -> Unit,
 ): ApplicationEngine = context.embeddedServer(CIO, port, host) {
-    visionModule(context).apply(block)
+    visionServer(context).apply(block)
 }.start()
 
 public fun ApplicationEngine.show() {

From 70ac2c99dd88a43322ac8098ce45a34645268454 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 12 Dec 2020 18:27:36 +0300
Subject: [PATCH 047/151] Added file export

---
 .../kotlin/ru/mipt/npm/sat/SatDemoApp.kt      |   4 +-
 .../kotlin/ru/mipt/npm/sat/satServer.kt       |  20 ++-
 .../hep/dataforge/vision/VisionManager.kt     |   7 +-
 .../vision/html/BindingOutputTagConsumer.kt   |  28 ----
 .../vision/html/HtmlVisionFragment.kt         |  12 +-
 .../vision/html/StaticOutputTagConsumer.kt    |  60 --------
 ...putTagConsumer.kt => VisionTagConsumer.kt} |  17 ++-
 .../dataforge/vision/html/staticHtmlRender.kt |  42 ++++++
 .../hep/dataforge/vision/layout/Page.kt       |   2 +-
 .../hep/dataforge/vision/html/HtmlTagTest.kt  |  17 ++-
 .../dataforge/vision/client/VisionClient.kt   | 130 ++++++++--------
 .../dataforge/vision/client/elementOutput.kt  |  84 +++++------
 .../hep/dataforge/vision/export/htmlExport.kt |  67 ---------
 .../kotlin/hep/dataforge/vision/headers.kt    | 140 ++++++++++++++++++
 .../kotlin/hep/dataforge/vision/htmlExport.kt |  37 +++++
 .../dataforge/vision/server/VisionServer.kt   |  40 ++---
 16 files changed, 388 insertions(+), 319 deletions(-)
 delete mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingOutputTagConsumer.kt
 delete mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticOutputTagConsumer.kt
 rename visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/{OutputTagConsumer.kt => VisionTagConsumer.kt} (84%)
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/staticHtmlRender.kt
 delete mode 100644 visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/export/htmlExport.kt
 create mode 100644 visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt
 create mode 100644 visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt

diff --git a/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt b/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
index a3af18af..c30b2ef8 100644
--- a/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
+++ b/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
@@ -2,7 +2,7 @@ package ru.mipt.npm.sat
 
 import hep.dataforge.context.Global
 import hep.dataforge.vision.client.VisionClient
-import hep.dataforge.vision.client.fetchAndRenderAllVisions
+import hep.dataforge.vision.client.renderAllVisions
 import hep.dataforge.vision.solid.three.ThreePlugin
 import kotlinx.browser.window
 
@@ -11,6 +11,6 @@ fun main() {
     Global.plugins.load(ThreePlugin)
     //Fetch from server and render visions for all outputs
     window.onload = {
-        Global.plugins.fetch(VisionClient).fetchAndRenderAllVisions()
+        Global.plugins.fetch(VisionClient).renderAllVisions()
     }
 }
\ No newline at end of file
diff --git a/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt b/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
index 2e86ff22..067a06f0 100644
--- a/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
+++ b/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
@@ -3,11 +3,11 @@ package ru.mipt.npm.sat
 
 import hep.dataforge.context.Global
 import hep.dataforge.names.toName
-import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.server.*
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.SolidManager
 import hep.dataforge.vision.solid.color
+import hep.dataforge.vision.visionManager
 import io.ktor.util.KtorExperimentalAPI
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
@@ -18,16 +18,21 @@ import kotlin.random.Random
 
 @OptIn(KtorExperimentalAPI::class)
 fun main() {
-    val sat = visionOfSatellite(
-        ySegments = 3,
-    )
+    //Create a geometry
+    val sat = visionOfSatellite(ySegments = 3)
 
     val context = Global.context("SAT") {
+        //need to install solids extension, vision manager is installed automatically
         plugin(SolidManager)
     }
 
-    val server = context.plugins.fetch(VisionManager).serve {
+    // fetch vision manager
+    val visionManager = context.visionManager
+
+    val server = visionManager.serve {
+        //use client library
         useScript("visionforge-solid.js")
+        //use css
         useCss("css/styles.css")
         page {
             div("flex-column") {
@@ -36,11 +41,12 @@ fun main() {
             }
         }
     }
+
     server.show()
 
     context.launch {
         while (isActive) {
-            val target = "layer[${Random.nextInt(1,11)}].segment[${Random.nextInt(3)},${Random.nextInt(3)}]".toName()
+            val target = "layer[${Random.nextInt(1, 11)}].segment[${Random.nextInt(3)},${Random.nextInt(3)}]".toName()
             (sat[target] as? Solid)?.color("red")
             delay(300)
             (sat[target] as? Solid)?.color = "green"
@@ -49,7 +55,7 @@ fun main() {
     }
 
     println("Press Enter to close server")
-    while (readLine()!="exit"){
+    while (readLine() != "exit") {
         //
     }
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
index c39eb3d9..eb34ed84 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
@@ -78,4 +78,9 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
 
         internal val visionSerializer: PolymorphicSerializer<Vision> = PolymorphicSerializer(Vision::class)
     }
-}
\ No newline at end of file
+}
+
+/**
+ * Fetch a [VisionManager] from this plugin
+ */
+public val Context.visionManager: VisionManager get() = plugins.fetch(VisionManager)
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingOutputTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingOutputTagConsumer.kt
deleted file mode 100644
index 9998c442..00000000
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/BindingOutputTagConsumer.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package hep.dataforge.vision.html
-
-import hep.dataforge.meta.Meta
-import hep.dataforge.names.Name
-import hep.dataforge.vision.Vision
-import kotlinx.html.FlowContent
-import kotlinx.html.TagConsumer
-
-public class BindingOutputTagConsumer<T, V : Vision>(
-    root: TagConsumer<T>,
-    prefix: String? = null,
-) : OutputTagConsumer<T, V>(root, prefix) {
-
-    private val _bindings = HashMap<Name, V>()
-    public val bindings: Map<Name, V> get() = _bindings
-
-    override fun FlowContent.renderVision(name: Name, vision: V, outputMeta: Meta) {
-        _bindings[name] = vision
-    }
-}
-
-public fun <T : Any> TagConsumer<T>.visionFragment(fragment: HtmlVisionFragment<Vision>): Map<Name, Vision> {
-    return BindingOutputTagConsumer<T, Vision>(this).apply(fragment.content).bindings
-}
-
-public fun FlowContent.visionFragment(fragment: HtmlVisionFragment<Vision>): Map<Name, Vision> {
-    return BindingOutputTagConsumer<Any?, Vision>(consumer).apply(fragment.content).bindings
-}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
index 6ae41f25..9f3999e2 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
@@ -1,20 +1,16 @@
 package hep.dataforge.vision.html
 
-import hep.dataforge.vision.Vision
 import kotlinx.html.FlowContent
 import kotlinx.html.TagConsumer
 
-public class HtmlFragment(public val content: TagConsumer<*>.() -> Unit)
+public typealias HtmlFragment = TagConsumer<*>.()->Unit
 
 public fun TagConsumer<*>.fragment(fragment: HtmlFragment) {
-    fragment.content(this)
+    fragment()
 }
 
 public fun FlowContent.fragment(fragment: HtmlFragment) {
-    fragment.content(consumer)
+    fragment(consumer)
 }
 
-public class HtmlVisionFragment<V : Vision>(public val content: OutputTagConsumer<*, V>.() -> Unit)
-
-public fun buildVisionFragment(block: OutputTagConsumer<*, Vision>.() -> Unit): HtmlVisionFragment<Vision> =
-    HtmlVisionFragment(block)
+public typealias HtmlVisionFragment = VisionTagConsumer<*>.() -> Unit
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticOutputTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticOutputTagConsumer.kt
deleted file mode 100644
index 0e045918..00000000
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/StaticOutputTagConsumer.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package hep.dataforge.vision.html
-
-import hep.dataforge.meta.Meta
-import hep.dataforge.names.Name
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionManager
-import kotlinx.html.FlowContent
-import kotlinx.html.TagConsumer
-import kotlinx.html.script
-import kotlinx.html.stream.createHTML
-import kotlinx.html.unsafe
-
-public typealias HtmlVisionRenderer<V> = FlowContent.(V, Meta) -> Unit
-
-/**
- * An [OutputTagConsumer] that directly renders given [Vision] using provided [renderer]
- */
-public class StaticOutputTagConsumer<R, V : Vision>(
-    root: TagConsumer<R>,
-    prefix: String? = null,
-    private val renderer: HtmlVisionRenderer<V>,
-) : OutputTagConsumer<R, V>(root, prefix) {
-    override fun FlowContent.renderVision(name: Name, vision: V, outputMeta: Meta): Unit = renderer(vision, outputMeta)
-
-    public companion object {
-        public fun embed(manager: VisionManager): HtmlVisionRenderer<Vision> = { vision: Vision, _: Meta ->
-            script {
-                attributes["class"] = OUTPUT_DATA_CLASS
-                unsafe {
-                    +manager.encodeToString(vision)
-                }
-            }
-        }
-    }
-}
-
-public fun <T : Any> HtmlVisionFragment<Vision>.renderToObject(
-    root: TagConsumer<T>,
-    prefix: String? = null,
-    renderer: HtmlVisionRenderer<Vision>,
-): T = StaticOutputTagConsumer(root, prefix, renderer).apply(content).finalize()
-
-/**
- * Render an object to HTML embedding the data as script bodies
- */
-public fun <T : Any> HtmlVisionFragment<Vision>.embedToObject(
-    manager: VisionManager,
-    root: TagConsumer<T>,
-    prefix: String? = null,
-): T = renderToObject(root, prefix, StaticOutputTagConsumer.embed(manager))
-
-public fun HtmlVisionFragment<Vision>.renderToString(renderer: HtmlVisionRenderer<Vision>): String =
-    renderToObject(createHTML(), null, renderer)
-
-/**
- * Convert a fragment to a string, embedding all visions data
- */
-public fun HtmlVisionFragment<Vision>.embedToString(manager: VisionManager): String =
-    embedToObject(manager, createHTML())
-
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/OutputTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
similarity index 84%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/OutputTagConsumer.kt
rename to visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
index 86ea51f6..594011af 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/OutputTagConsumer.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
@@ -12,7 +12,7 @@ import kotlinx.html.*
  * A placeholder object to attach inline vision builders.
  */
 @DFExperimental
-public class VisionOutput {
+public class VisionOutput @PublishedApi internal constructor(){
     public var meta: Meta = Meta.EMPTY
 
     public inline fun meta(block: MetaBuilder.() -> Unit) {
@@ -23,7 +23,7 @@ public class VisionOutput {
 /**
  * Modified  [TagConsumer] that allows rendering output fragments and visions in them
  */
-public abstract class OutputTagConsumer<R, V : Vision>(
+public abstract class VisionTagConsumer<R>(
     private val root: TagConsumer<R>,
     private val idPrefix: String? = null,
 ) : TagConsumer<R> by root {
@@ -36,14 +36,14 @@ public abstract class OutputTagConsumer<R, V : Vision>(
      * @param vision an object to be rendered
      * @param outputMeta optional configuration for the output container
      */
-    protected abstract fun FlowContent.renderVision(name: Name, vision: V, outputMeta: Meta)
+    protected abstract fun DIV.renderVision(name: Name, vision: Vision, outputMeta: Meta)
 
     /**
      * Create a placeholder for a vision output with optional [Vision] in it
      */
     public fun <T> TagConsumer<T>.vision(
         name: Name,
-        vision: V? = null,
+        vision: Vision? = null,
         outputMeta: Meta = Meta.EMPTY,
     ): T = div {
         id = resolveId(name)
@@ -64,7 +64,7 @@ public abstract class OutputTagConsumer<R, V : Vision>(
     @OptIn(DFExperimental::class)
     public inline fun <T> TagConsumer<T>.vision(
         name: Name,
-        visionProvider: VisionOutput.() -> V,
+        visionProvider: VisionOutput.() -> Vision,
     ): T {
         val output = VisionOutput()
         val vision = output.visionProvider()
@@ -74,11 +74,11 @@ public abstract class OutputTagConsumer<R, V : Vision>(
     @OptIn(DFExperimental::class)
     public inline fun <T> TagConsumer<T>.vision(
         name: String,
-        visionProvider: VisionOutput.() -> V,
+        visionProvider: VisionOutput.() -> Vision,
     ): T = vision(name.toName(), visionProvider)
 
     public inline fun <T> TagConsumer<T>.vision(
-        vision: V,
+        vision: Vision,
     ): T = vision("vision[${vision.hashCode()}]".toName(), vision)
 
     /**
@@ -97,6 +97,9 @@ public abstract class OutputTagConsumer<R, V : Vision>(
         public const val OUTPUT_META_CLASS: String = "visionforge-output-meta"
         public const val OUTPUT_DATA_CLASS: String = "visionforge-output-data"
 
+        public const val OUTPUT_FETCH_VISION_ATTRIBUTE: String = "data-output-fetch-vision"
+        public const val OUTPUT_FETCH_UPDATE_ATTRIBUTE: String = "data-output-fetch-update"
+
         public const val OUTPUT_NAME_ATTRIBUTE: String = "data-output-name"
         public const val OUTPUT_ENDPOINT_ATTRIBUTE: String = "data-output-endpoint"
         public const val DEFAULT_ENDPOINT: String = "."
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/staticHtmlRender.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/staticHtmlRender.kt
new file mode 100644
index 00000000..1ecbdb8a
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/staticHtmlRender.kt
@@ -0,0 +1,42 @@
+package hep.dataforge.vision.html
+
+import hep.dataforge.meta.Meta
+import hep.dataforge.names.Name
+import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionManager
+import kotlinx.html.DIV
+import kotlinx.html.FlowContent
+import kotlinx.html.script
+import kotlinx.html.unsafe
+
+
+public fun FlowContent.embedVisionFragment(
+    manager: VisionManager,
+    idPrefix: String? = null,
+    fragment: HtmlVisionFragment,
+) {
+    val consumer = object : VisionTagConsumer<Any?>(consumer, idPrefix) {
+        override fun DIV.renderVision(name: Name, vision: Vision, outputMeta: Meta) {
+            script {
+                attributes["class"] = OUTPUT_DATA_CLASS
+                unsafe {
+                    +manager.encodeToString(vision)
+                }
+            }
+        }
+    }
+    fragment(consumer)
+}
+
+public typealias HtmlVisionRenderer = FlowContent.(name: Name, vision: Vision, meta: Meta) -> Unit
+
+public fun <R> FlowContent.renderVisionFragment(
+    renderer: DIV.(name: Name, vision: Vision, meta: Meta) -> Unit,
+    idPrefix: String? = null,
+    fragment: HtmlVisionFragment,
+) {
+    val consumer = object : VisionTagConsumer<Any?>(consumer, idPrefix) {
+        override fun DIV.renderVision(name: Name, vision: Vision, outputMeta: Meta) = renderer(name, vision, outputMeta)
+    }
+    fragment(consumer)
+}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/layout/Page.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/layout/Page.kt
index cd66a3d6..848e0dc7 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/layout/Page.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/layout/Page.kt
@@ -4,7 +4,7 @@ import hep.dataforge.meta.Meta
 import hep.dataforge.names.Name
 import hep.dataforge.vision.Vision
 
-public interface Output<in V : Vision> {
+public fun interface Output<in V : Vision> {
     public fun render(vision: V)
 }
 
diff --git a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
index eac0a16a..0d40205a 100644
--- a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
+++ b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
@@ -3,10 +3,9 @@ package hep.dataforge.vision.html
 import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.configure
 import hep.dataforge.meta.set
-import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionBase
-import hep.dataforge.vision.VisionGroup
 import kotlinx.html.*
+import kotlinx.html.stream.createHTML
 import kotlin.test.Test
 
 class HtmlTagTest {
@@ -15,11 +14,11 @@ class HtmlTagTest {
     fun VisionOutput.base(block: VisionBase.() -> Unit) =
         VisionBase().apply(block)
 
-    val fragment = buildVisionFragment {
+    val fragment: HtmlVisionFragment = {
         div {
             h1 { +"Head" }
             vision("ddd") {
-                meta{
+                meta {
                     "metaProperty" put 87
                 }
                 base {
@@ -32,7 +31,7 @@ class HtmlTagTest {
         }
     }
 
-    val simpleVisionRenderer: HtmlVisionRenderer<Vision> = { vision, _ ->
+    val simpleVisionRenderer: HtmlVisionRenderer = { _, vision, _ ->
         div {
             h2 { +"Properties" }
             ul {
@@ -46,13 +45,17 @@ class HtmlTagTest {
         }
     }
 
-    val groupRenderer: HtmlVisionRenderer<VisionGroup> = { group, _ ->
+    val groupRenderer: HtmlVisionRenderer = { _, group, _ ->
         p { +"This is group" }
     }
 
 
     @Test
     fun testStringRender() {
-        println(fragment.renderToString(simpleVisionRenderer))
+        println(
+            createHTML().div {
+                renderVisionFragment<String>(simpleVisionRenderer, fragment = fragment)
+            }
+        )
     }
 }
\ No newline at end of file
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
index 5b51cacd..72cf61f7 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
@@ -6,9 +6,10 @@ import hep.dataforge.meta.MetaSerializer
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionChange
 import hep.dataforge.vision.VisionManager
-import hep.dataforge.vision.html.OutputTagConsumer
-import hep.dataforge.vision.html.OutputTagConsumer.Companion.OUTPUT_ENDPOINT_ATTRIBUTE
-import hep.dataforge.vision.html.OutputTagConsumer.Companion.OUTPUT_NAME_ATTRIBUTE
+import hep.dataforge.vision.html.VisionTagConsumer
+import hep.dataforge.vision.html.VisionTagConsumer.Companion.OUTPUT_ENDPOINT_ATTRIBUTE
+import hep.dataforge.vision.html.VisionTagConsumer.Companion.OUTPUT_FETCH_UPDATE_ATTRIBUTE
+import hep.dataforge.vision.html.VisionTagConsumer.Companion.OUTPUT_NAME_ATTRIBUTE
 import kotlinx.browser.document
 import kotlinx.browser.window
 import org.w3c.dom.Element
@@ -43,22 +44,23 @@ public class VisionClient : AbstractPlugin() {
 
     private fun Element.getEmbeddedData(className: String): String? = getElementsByClassName(className)[0]?.innerHTML
 
+    private fun Element.getFlag(attribute: String): Boolean = attributes[attribute]?.value == "true"
+
     /**
-     * Fetch from server and render a vision, described in a given with [OutputTagConsumer.OUTPUT_CLASS] class.
+     * Fetch from server and render a vision, described in a given with [VisionTagConsumer.OUTPUT_CLASS] class.
      */
-    public fun renderVisionAt(element: Element, requestUpdates: Boolean = true) {
+    public fun renderVisionAt(element: Element) {
         val name = resolveName(element) ?: error("The element is not a vision output")
         console.info("Found DF output with name $name")
-        if (!element.classList.contains(OutputTagConsumer.OUTPUT_CLASS)) error("The element $element is not an output element")
-        val endpoint = resolveEndpoint(element)
-        console.info("Vision server is resolved to $endpoint")
+        if (!element.classList.contains(VisionTagConsumer.OUTPUT_CLASS)) error("The element $element is not an output element")
 
-        val outputMeta = element.getEmbeddedData(OutputTagConsumer.OUTPUT_META_CLASS)?.let {
+
+        val outputMeta = element.getEmbeddedData(VisionTagConsumer.OUTPUT_META_CLASS)?.let {
             VisionManager.defaultJson.decodeFromString(MetaSerializer, it)
         } ?: Meta.EMPTY
 
         //Trying to render embedded vision
-        val embeddedVision = element.getEmbeddedData(OutputTagConsumer.OUTPUT_DATA_CLASS)?.let {
+        val embeddedVision = element.getEmbeddedData(VisionTagConsumer.OUTPUT_DATA_CLASS)?.let {
             visionManager.decodeFromString(it)
         }
         if (embeddedVision != null) {
@@ -66,54 +68,60 @@ public class VisionClient : AbstractPlugin() {
             renderer.render(element, embeddedVision, outputMeta)
         }
 
-        val fetchUrl = URL(endpoint).apply {
-            searchParams.append("name", name)
-            pathname += "/vision"
-        }
+        if(element.getFlag(VisionTagConsumer.OUTPUT_FETCH_VISION_ATTRIBUTE)) {
 
-        console.info("Fetching vision data from $fetchUrl")
-        window.fetch(fetchUrl).then { response ->
-            if (response.ok) {
-                response.text().then { text ->
-                    val vision = visionManager.decodeFromString(text)
-                    val renderer = findRendererFor(vision) ?: error("Could nof find renderer for $vision")
-                    renderer.render(element, vision, outputMeta)
-                    if (requestUpdates) {
-                        val wsUrl = URL(endpoint).apply {
-                            pathname += "/ws"
-                            protocol = "ws"
-                            searchParams.append("name", name)
-                        }
-                        WebSocket(wsUrl.toString()).apply {
-                            onmessage = { messageEvent ->
-                                val stringData: String? = messageEvent.data as? String
-                                if (stringData != null) {
-                                    val dif = visionManager.jsonFormat.decodeFromString(
-                                        VisionChange.serializer(),
-                                        stringData
-                                    )
-                                    vision.update(dif)
-                                } else {
-                                    console.error("WebSocket message data is not a string")
-                                }
-                            }
-                            onopen = {
-                                console.info("WebSocket update channel established for output '$name'")
-                            }
-                            onclose = {
-                                console.info("WebSocket update channel closed for output '$name'")
-                            }
-                            onerror = {
-                                console.error("WebSocket update channel error for output '$name'")
-                            }
-                        }
+            val endpoint = resolveEndpoint(element)
+            console.info("Vision server is resolved to $endpoint")
 
-                    }
-                }
-            } else {
-                console.error("Failed to fetch initial vision state from $endpoint")
+            val fetchUrl = URL(endpoint).apply {
+                searchParams.append("name", name)
+                pathname += "/vision"
             }
 
+            console.info("Fetching vision data from $fetchUrl")
+            window.fetch(fetchUrl).then { response ->
+                if (response.ok) {
+                    response.text().then { text ->
+                        val vision = visionManager.decodeFromString(text)
+                        val renderer = findRendererFor(vision) ?: error("Could nof find renderer for $vision")
+                        renderer.render(element, vision, outputMeta)
+                        if (element.getFlag(OUTPUT_FETCH_UPDATE_ATTRIBUTE)) {
+                            val wsUrl = URL(endpoint).apply {
+                                pathname += "/ws"
+                                protocol = "ws"
+                                searchParams.append("name", name)
+                            }
+                            WebSocket(wsUrl.toString()).apply {
+                                onmessage = { messageEvent ->
+                                    val stringData: String? = messageEvent.data as? String
+                                    if (stringData != null) {
+                                        val dif = visionManager.jsonFormat.decodeFromString(
+                                            VisionChange.serializer(),
+                                            stringData
+                                        )
+                                        vision.update(dif)
+                                    } else {
+                                        console.error("WebSocket message data is not a string")
+                                    }
+                                }
+                                onopen = {
+                                    console.info("WebSocket update channel established for output '$name'")
+                                }
+                                onclose = {
+                                    console.info("WebSocket update channel closed for output '$name'")
+                                }
+                                onerror = {
+                                    console.error("WebSocket update channel error for output '$name'")
+                                }
+                            }
+
+                        }
+                    }
+                } else {
+                    console.error("Failed to fetch initial vision state from $endpoint")
+                }
+
+            }
         }
     }
 
@@ -128,20 +136,20 @@ public class VisionClient : AbstractPlugin() {
 }
 
 /**
- * Fetch and render visions for all elements with [OutputTagConsumer.OUTPUT_CLASS] class inside given [element].
+ * Fetch and render visions for all elements with [VisionTagConsumer.OUTPUT_CLASS] class inside given [element].
  */
-public fun VisionClient.fetchVisionsInChildren(element: Element, requestUpdates: Boolean = true) {
-    val elements = element.getElementsByClassName(OutputTagConsumer.OUTPUT_CLASS)
+public fun VisionClient.renderAllVisionsAt(element: Element) {
+    val elements = element.getElementsByClassName(VisionTagConsumer.OUTPUT_CLASS)
     console.info("Finished search for outputs. Found ${elements.length} items")
     elements.asList().forEach { child ->
-        renderVisionAt(child, requestUpdates)
+        renderVisionAt(child)
     }
 }
 
 /**
- * Fetch visions from the server for all elements with [OutputTagConsumer.OUTPUT_CLASS] class in the document body
+ * Fetch visions from the server for all elements with [VisionTagConsumer.OUTPUT_CLASS] class in the document body
  */
-public fun VisionClient.fetchAndRenderAllVisions(requestUpdates: Boolean = true) {
+public fun VisionClient.renderAllVisions() {
     val element = document.body ?: error("Document does not have a body")
-    fetchVisionsInChildren(element, requestUpdates)
+    renderAllVisionsAt(element)
 }
\ No newline at end of file
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
index 745754dc..72a80143 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
@@ -1,17 +1,9 @@
 package hep.dataforge.vision.client
 
-import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.Meta
-import hep.dataforge.names.Name
-import hep.dataforge.names.toName
 import hep.dataforge.provider.Type
 import hep.dataforge.vision.Vision
-import hep.dataforge.vision.html.BindingOutputTagConsumer
-import hep.dataforge.vision.html.HtmlVisionFragment
-import hep.dataforge.vision.html.OutputTagConsumer
-import kotlinx.browser.document
-import kotlinx.html.TagConsumer
-import org.w3c.dom.*
+import org.w3c.dom.Element
 
 @Type(ElementVisionRenderer.TYPE)
 public interface ElementVisionRenderer {
@@ -34,44 +26,36 @@ public interface ElementVisionRenderer {
         public const val DEFAULT_RATING: Int = 10
     }
 }
-
-@DFExperimental
-public fun Map<String, Vision>.bind(rendererFactory: (Vision) -> ElementVisionRenderer) {
-    forEach { (id, vision) ->
-        val element = document.getElementById(id) ?: error("Could not find element with id $id")
-        rendererFactory(vision).render(element, vision)
-    }
-}
-
-@DFExperimental
-public fun Element.renderAllVisions(visionProvider: (Name) -> Vision, rendererFactory: (Vision) -> ElementVisionRenderer) {
-    val elements = getElementsByClassName(OutputTagConsumer.OUTPUT_CLASS)
-    elements.asList().forEach { element ->
-        val name = element.attributes[OutputTagConsumer.OUTPUT_NAME_ATTRIBUTE]?.value
-        if (name == null) {
-            console.error("Attribute ${OutputTagConsumer.OUTPUT_NAME_ATTRIBUTE} not defined in the output element")
-            return@forEach
-        }
-        val vision = visionProvider(name.toName())
-        rendererFactory(vision).render(element, vision)
-    }
-}
-
-@DFExperimental
-public fun Document.renderAllVisions(visionProvider: (Name) -> Vision, rendererFactory: (Vision) -> ElementVisionRenderer): Unit {
-    documentElement?.renderAllVisions(visionProvider,rendererFactory)
-}
-
-@DFExperimental
-public fun HtmlVisionFragment<Vision>.renderInDocument(
-    root: TagConsumer<HTMLElement>,
-    renderer: ElementVisionRenderer,
-): HTMLElement = BindingOutputTagConsumer<HTMLElement, Vision>(root).apply(content).let { scope ->
-    scope.finalize().apply {
-        scope.bindings.forEach { (name, vision) ->
-            val id = scope.resolveId(name)
-            val element = document.getElementById(id) ?: error("Could not find element with name $name and id $id")
-            renderer.render(element, vision)
-        }
-    }
-}
+//
+//@DFExperimental
+//public fun Map<String, Vision>.bind(rendererFactory: (Vision) -> ElementVisionRenderer) {
+//    forEach { (id, vision) ->
+//        val element = document.getElementById(id) ?: error("Could not find element with id $id")
+//        rendererFactory(vision).render(element, vision)
+//    }
+//}
+//
+//@DFExperimental
+//public fun Element.renderAllVisions(
+//    visionProvider: (Name) -> Vision,
+//    rendererFactory: (Vision) -> ElementVisionRenderer,
+//) {
+//    val elements = getElementsByClassName(VisionTagConsumer.OUTPUT_CLASS)
+//    elements.asList().forEach { element ->
+//        val name = element.attributes[VisionTagConsumer.OUTPUT_NAME_ATTRIBUTE]?.value
+//        if (name == null) {
+//            console.error("Attribute ${VisionTagConsumer.OUTPUT_NAME_ATTRIBUTE} not defined in the output element")
+//            return@forEach
+//        }
+//        val vision = visionProvider(name.toName())
+//        rendererFactory(vision).render(element, vision)
+//    }
+//}
+//
+//@DFExperimental
+//public fun Document.renderAllVisions(
+//    visionProvider: (Name) -> Vision,
+//    rendererFactory: (Vision) -> ElementVisionRenderer,
+//): Unit {
+//    documentElement?.renderAllVisions(visionProvider, rendererFactory)
+//}
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/export/htmlExport.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/export/htmlExport.kt
deleted file mode 100644
index c7e556ea..00000000
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/export/htmlExport.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-//package hep.dataforge.vision.export
-//
-//package kscience.plotly
-//
-//import kotlinx.html.*
-//import kotlinx.html.stream.createHTML
-//
-///**
-// * A custom HTML fragment including plotly container reference
-// */
-//public class PlotlyFragment(public val render: FlowContent.(renderer: PlotlyRenderer) -> Unit)
-//
-///**
-// * A complete page including headers and title
-// */
-//public data class PlotlyPage(
-//    val headers: Collection<HtmlFragment>,
-//    val fragment: PlotlyFragment,
-//    val title: String = "Plotly.kt",
-//    val renderer: PlotlyRenderer = StaticPlotlyRenderer
-//) {
-//    public fun render(): String = createHTML().html {
-//        head {
-//            meta {
-//                charset = "utf-8"
-//            }
-//            title(this@PlotlyPage.title)
-//            headers.distinct().forEach { it.visit(consumer) }
-//        }
-//        body {
-//            fragment.render(this, renderer)
-//        }
-//    }
-//}
-//
-//public fun Plotly.fragment(content: FlowContent.(renderer: PlotlyRenderer) -> Unit): PlotlyFragment = PlotlyFragment(content)
-//
-///**
-// * Create a complete page including plots
-// */
-//public fun Plotly.page(
-//    vararg headers: HtmlFragment = arrayOf(cdnPlotlyHeader),
-//    title: String = "Plotly.kt",
-//    renderer: PlotlyRenderer = StaticPlotlyRenderer,
-//    content: FlowContent.(renderer: PlotlyRenderer) -> Unit
-//): PlotlyPage = PlotlyPage(headers.toList(), fragment(content), title, renderer)
-//
-///**
-// * Convert an html plot fragment to page
-// */
-//public fun PlotlyFragment.toPage(
-//    vararg headers: HtmlFragment = arrayOf(cdnPlotlyHeader),
-//    title: String = "Plotly.kt",
-//    renderer: PlotlyRenderer = StaticPlotlyRenderer
-//): PlotlyPage = PlotlyPage(headers.toList(), this, title, renderer)
-//
-///**
-// * Convert a plot to the sigle-plot page
-// */
-//public fun Plot.toPage(
-//    vararg headers: HtmlFragment = arrayOf(cdnPlotlyHeader),
-//    config: PlotlyConfig = PlotlyConfig.empty(),
-//    title: String = "Plotly.kt",
-//    renderer: PlotlyRenderer = StaticPlotlyRenderer
-//): PlotlyPage = PlotlyFragment {
-//    plot(this@toPage, config = config, renderer = renderer)
-//}.toPage(*headers, title = title)
\ No newline at end of file
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt
new file mode 100644
index 00000000..a7da3719
--- /dev/null
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt
@@ -0,0 +1,140 @@
+package hep.dataforge.vision
+
+import hep.dataforge.vision.html.HtmlFragment
+import kotlinx.html.link
+import kotlinx.html.script
+import kotlinx.html.unsafe
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.StandardOpenOption
+
+/**
+ * The location of resources for plot.
+ */
+public enum class ResourceLocation {
+//    /**
+//     * Use cdn or other remote source for assets
+//     */
+//    REMOTE,
+
+    /**
+     * Store assets in a sibling folder `.dataforge/assets` or in a system-wide folder if this is a default temporary file
+     */
+    LOCAL,
+
+    /**
+     * Store assets in a system-window `~/.dataforge/assets` folder
+     */
+    SYSTEM,
+
+    /**
+     * Embed the asset into the html. Could produce very large files.
+     */
+    EMBED
+}
+
+
+/**
+ * Check if the asset exists in given local location and put it there if it does not
+ * @param
+ */
+internal fun checkOrStoreFile(basePath: Path, filePath: Path, resource: String): Path {
+    val fullPath = basePath.resolveSibling(filePath).toAbsolutePath()
+
+    if (Files.exists(fullPath)) {
+        //TODO checksum
+    } else {
+        //TODO add logging
+
+        val bytes = VisionManager::class.java.getResourceAsStream(resource).readAllBytes()
+        Files.createDirectories(fullPath.parent)
+        Files.write(fullPath, bytes, StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE)
+    }
+
+    return if (basePath.isAbsolute && fullPath.startsWith(basePath)) {
+        basePath.relativize(fullPath)
+    } else {
+        filePath
+    }
+}
+
+/**
+ * A header that automatically copies relevant scripts to given path
+ */
+internal fun fileScriptHeader(
+    basePath: Path,
+    scriptPath: Path,
+    resource: String
+): HtmlFragment = {
+    val relativePath = checkOrStoreFile(basePath, scriptPath, resource)
+    script {
+        type = "text/javascript"
+        src = relativePath.toString()
+    }
+}
+
+internal fun embedScriptHeader(resource: String): HtmlFragment = {
+    script {
+        type = "text/javascript"
+        unsafe {
+            val bytes = VisionManager::class.java.getResourceAsStream(resource).readAllBytes()
+            +bytes.toString(Charsets.UTF_8)
+        }
+    }
+}
+
+internal fun fileCssHeader(
+    basePath: Path,
+    cssPath: Path,
+    resource: String
+): HtmlFragment = {
+    val relativePath = checkOrStoreFile(basePath, cssPath, resource)
+    link {
+        rel = "stylesheet"
+        href = relativePath.toString()
+    }
+}
+
+//
+///**
+// * A system-wide plotly store location
+// */
+//val systemHeader = HtmlFragment {
+//    val relativePath = checkOrStoreFile(
+//        Path.of("."),
+//        Path.of(System.getProperty("user.home")).resolve(".plotly/$assetsDirectory$PLOTLY_SCRIPT_PATH"),
+//        PLOTLY_SCRIPT_PATH
+//    )
+//    script {
+//        type = "text/javascript"
+//        src = relativePath.toString()
+//    }
+//}
+//
+//
+///**
+// * embedded plotly script
+// */
+//val embededHeader = HtmlFragment {
+//    script {
+//        unsafe {
+//            val bytes = HtmlFragment::class.java.getResourceAsStream(PLOTLY_SCRIPT_PATH).readAllBytes()
+//            +bytes.toString(Charsets.UTF_8)
+//        }
+//    }
+//}
+
+
+//internal fun inferPlotlyHeader(
+//    target: Path?,
+//    resourceLocation: ResourceLocation
+//): HtmlFragment = when (resourceLocation) {
+//    ResourceLocation.REMOTE -> cdnPlotlyHeader
+//    ResourceLocation.LOCAL -> if (target != null) {
+//        localHeader(target)
+//    } else {
+//        systemPlotlyHeader
+//    }
+//    ResourceLocation.SYSTEM -> systemPlotlyHeader
+//    ResourceLocation.EMBED -> embededPlotlyHeader
+//}
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt
new file mode 100644
index 00000000..328425ee
--- /dev/null
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt
@@ -0,0 +1,37 @@
+package hep.dataforge.vision
+
+import hep.dataforge.vision.html.*
+import kotlinx.html.*
+import kotlinx.html.stream.createHTML
+import java.awt.Desktop
+import java.nio.file.Files
+import java.nio.file.Path
+
+
+
+/**
+ * Make a file with the embedded vision data
+ */
+public fun HtmlVisionFragment.makeFile(manager: VisionManager, vararg headers: HtmlFragment, path: Path? = null, show: Boolean = true) {
+    val actualFile = path ?: Files.createTempFile("tempPlot", ".html")
+    Files.createDirectories(actualFile.parent)
+    val htmlString = createHTML().apply {
+        head {
+            meta {
+                charset = "utf-8"
+                headers.forEach {
+                    fragment(it)
+                }
+            }
+            title(title)
+        }
+        body {
+            embedVisionFragment(manager, fragment = this@makeFile)
+        }
+    }.finalize()
+
+    Files.writeString(actualFile, htmlString)
+    if (show) {
+        Desktop.getDesktop().browse(actualFile.toFile().toURI())
+    }
+}
\ No newline at end of file
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
index 477f48fa..d67ec24d 100644
--- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
@@ -8,7 +8,10 @@ import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionChange
 import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.flowChanges
-import hep.dataforge.vision.html.*
+import hep.dataforge.vision.html.HtmlFragment
+import hep.dataforge.vision.html.HtmlVisionFragment
+import hep.dataforge.vision.html.VisionTagConsumer
+import hep.dataforge.vision.html.fragment
 import hep.dataforge.vision.server.VisionServer.Companion.DEFAULT_PAGE
 import io.ktor.application.*
 import io.ktor.features.CORS
@@ -56,15 +59,25 @@ public class VisionServer internal constructor(
     private val globalHeaders: ArrayList<HtmlFragment> = ArrayList()
 
     public fun header(block: TagConsumer<*>.() -> Unit) {
-        globalHeaders.add(HtmlFragment(block))
+        globalHeaders.add(block)
     }
 
     private fun HTML.buildPage(
-        visionFragment: HtmlVisionFragment<Vision>,
+        visionFragment: HtmlVisionFragment,
         title: String,
         headers: List<HtmlFragment>,
     ): Map<Name, Vision> {
-        lateinit var visionMap: Map<Name, Vision>
+        val visionMap = HashMap<Name, Vision>()
+
+        val consumer = object : VisionTagConsumer<Any?>(consumer) {
+            override fun DIV.renderVision(name: Name, vision: Vision, outputMeta: Meta) {
+                visionMap[name] = vision
+
+                // Toggle updates
+                attributes[OUTPUT_FETCH_VISION_ATTRIBUTE] = "true"
+                attributes[OUTPUT_FETCH_UPDATE_ATTRIBUTE] = "true"
+            }
+        }
 
         head {
             meta {
@@ -77,7 +90,7 @@ public class VisionServer internal constructor(
         }
         body {
             //Load the fragment and remember all loaded visions
-            visionMap = visionFragment(visionFragment)
+            visionFragment(consumer)
         }
 
         return visionMap
@@ -146,11 +159,11 @@ public class VisionServer internal constructor(
      * Serve a page, potentially containing any number of visions at a given [route] with given [headers].
      *
      */
-    public fun servePage(
-        visionFragment: HtmlVisionFragment<Vision>,
+    public fun page(
         route: String = DEFAULT_PAGE,
         title: String = "VisionForge server page '$route'",
         headers: List<HtmlFragment> = emptyList(),
+        visionFragment: HtmlVisionFragment,
     ) {
         val visions = HashMap<Name, Vision>()
 
@@ -185,19 +198,6 @@ public class VisionServer internal constructor(
         }
     }
 
-    /**
-     * A shortcut method to easily create Complete pages filled with visions
-     */
-    public fun page(
-        route: String = DEFAULT_PAGE,
-        title: String = "VisionForge server page '$route'",
-        headers: List<HtmlFragment> = emptyList(),
-        content: OutputTagConsumer<*, Vision>.() -> Unit,
-    ) {
-        servePage(buildVisionFragment(content), route, title, headers)
-    }
-
-
     public companion object {
         public const val DEFAULT_PAGE: String = "/"
         public val UPDATE_INTERVAL_KEY: Name = "update.interval".toName()

From 651a875eee34a1b5f3ee9ce318bd76647b3b13f5 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 12 Dec 2020 21:19:41 +0300
Subject: [PATCH 048/151] Fully working file renderer.

---
 demo/sat-demo/build.gradle.kts                | 56 ++-----------------
 .../mipt/npm/sat/GeometrySerializationTest.kt | 17 ------
 .../kotlin/ru/mipt/npm/sat/SatDemoApp.kt      | 16 ------
 .../kotlin/ru/mipt/npm/sat/geometry.kt        |  0
 .../kotlin/ru/mipt/npm/sat/satServer.kt       | 27 +++------
 .../resources/css/styles.css                  |  0
 playground/build.gradle.kts                   | 10 +++-
 .../hep/dataforge/vision/solid/fileExport.kt  | 19 +++++++
 settings.gradle.kts                           |  1 +
 .../hep/dataforge/vision/VisionChange.kt      | 28 +++++-----
 .../vision/html/HtmlVisionFragment.kt         |  7 ++-
 .../kotlin/hep/dataforge/vision/headers.kt    | 44 +++++++++++++--
 .../kotlin/hep/dataforge/vision/htmlExport.kt | 11 +++-
 .../vision/{ => three}/server/VisionServer.kt |  4 +-
 .../vision/solid/three/ThreePlugin.kt         |  4 +-
 .../build.gradle.kts                          | 52 +++++++++++++++++
 .../vision/three/server/visionContext.kt      |  8 +++
 .../dataforge/vision/three/server/jsMain.kt   | 48 ++++++++++++++++
 .../vision/three/server/serverExtensions.kt   | 43 ++++++++++++++
 19 files changed, 266 insertions(+), 129 deletions(-)
 delete mode 100644 demo/sat-demo/src/commonTest/kotlin/ru/mipt/npm/sat/GeometrySerializationTest.kt
 delete mode 100644 demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
 rename demo/sat-demo/src/{commonMain => main}/kotlin/ru/mipt/npm/sat/geometry.kt (100%)
 rename demo/sat-demo/src/{jvmMain => main}/kotlin/ru/mipt/npm/sat/satServer.kt (57%)
 rename demo/sat-demo/src/{jvmMain => main}/resources/css/styles.css (100%)
 create mode 100644 playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/fileExport.kt
 rename visionforge-server/src/main/kotlin/hep/dataforge/vision/{ => three}/server/VisionServer.kt (97%)
 create mode 100644 visionforge-threejs/visionforge-threejs-server/build.gradle.kts
 create mode 100644 visionforge-threejs/visionforge-threejs-server/src/commonMain/kotlin/hep/dataforge/vision/three/server/visionContext.kt
 create mode 100644 visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
 create mode 100644 visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt

diff --git a/demo/sat-demo/build.gradle.kts b/demo/sat-demo/build.gradle.kts
index f5b9ef31..048ebd84 100644
--- a/demo/sat-demo/build.gradle.kts
+++ b/demo/sat-demo/build.gradle.kts
@@ -1,64 +1,20 @@
 plugins {
-    id("ru.mipt.npm.mpp")
+    id("ru.mipt.npm.jvm")
     application
 }
 
 
-group = "ru.mipt.npm"
-
-//val kvisionVersion: String = "3.16.2"
-
-kscience{
-    useSerialization{
+kscience {
+    useSerialization {
         json()
     }
     application()
 }
 
-val ktorVersion: String by rootProject.extra
+group = "ru.mipt.npm"
 
-kotlin {
-    js{
-        browser {
-            webpackTask {
-                this.outputFileName = "visionforge-solid.js"
-            }
-        }
-    }
-    afterEvaluate {
-        val jsBrowserDistribution by tasks.getting
-
-        jvm {
-            withJava()
-            compilations[org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME]?.apply {
-                tasks.getByName<ProcessResources>(processResourcesTaskName) {
-                    dependsOn(jsBrowserDistribution)
-                    afterEvaluate {
-                        from(jsBrowserDistribution)
-                    }
-                }
-            }
-
-        }
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation(project(":visionforge-solid"))
-            }
-        }
-        jvmMain {
-            dependencies {
-                implementation(project(":visionforge-server"))
-            }
-        }
-        jsMain {
-            dependencies {
-                implementation(project(":visionforge-threejs"))
-            }
-        }
-    }
+dependencies{
+    implementation(project(":visionforge-threejs:visionforge-threejs-server"))
 }
 
 application {
diff --git a/demo/sat-demo/src/commonTest/kotlin/ru/mipt/npm/sat/GeometrySerializationTest.kt b/demo/sat-demo/src/commonTest/kotlin/ru/mipt/npm/sat/GeometrySerializationTest.kt
deleted file mode 100644
index 8b9e3c23..00000000
--- a/demo/sat-demo/src/commonTest/kotlin/ru/mipt/npm/sat/GeometrySerializationTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package ru.mipt.npm.sat
-
-import hep.dataforge.context.Global
-import hep.dataforge.vision.solid.SolidManager
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class GeometrySerializationTest {
-    @Test
-    fun testSerialization(){
-        val geometry = visionOfSatellite()
-        val manager = Global.plugins.fetch(SolidManager)
-        val string = manager.visionManager.encodeToString(geometry)
-        val reconstructed = manager.visionManager.decodeFromString(string)
-        assertEquals(geometry.config,reconstructed.config)
-    }
-}
\ No newline at end of file
diff --git a/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt b/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
deleted file mode 100644
index c30b2ef8..00000000
--- a/demo/sat-demo/src/jsMain/kotlin/ru/mipt/npm/sat/SatDemoApp.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package ru.mipt.npm.sat
-
-import hep.dataforge.context.Global
-import hep.dataforge.vision.client.VisionClient
-import hep.dataforge.vision.client.renderAllVisions
-import hep.dataforge.vision.solid.three.ThreePlugin
-import kotlinx.browser.window
-
-fun main() {
-    //Loading three-js renderer
-    Global.plugins.load(ThreePlugin)
-    //Fetch from server and render visions for all outputs
-    window.onload = {
-        Global.plugins.fetch(VisionClient).renderAllVisions()
-    }
-}
\ No newline at end of file
diff --git a/demo/sat-demo/src/commonMain/kotlin/ru/mipt/npm/sat/geometry.kt b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt
similarity index 100%
rename from demo/sat-demo/src/commonMain/kotlin/ru/mipt/npm/sat/geometry.kt
rename to demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt
diff --git a/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
similarity index 57%
rename from demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
rename to demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
index 067a06f0..e65eb314 100644
--- a/demo/sat-demo/src/jvmMain/kotlin/ru/mipt/npm/sat/satServer.kt
+++ b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
@@ -1,14 +1,11 @@
 package ru.mipt.npm.sat
 
 
-import hep.dataforge.context.Global
 import hep.dataforge.names.toName
-import hep.dataforge.vision.server.*
 import hep.dataforge.vision.solid.Solid
-import hep.dataforge.vision.solid.SolidManager
 import hep.dataforge.vision.solid.color
-import hep.dataforge.vision.visionManager
-import io.ktor.util.KtorExperimentalAPI
+import hep.dataforge.vision.three.server.*
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
@@ -16,22 +13,13 @@ import kotlinx.html.div
 import kotlinx.html.h1
 import kotlin.random.Random
 
-@OptIn(KtorExperimentalAPI::class)
 fun main() {
     //Create a geometry
     val sat = visionOfSatellite(ySegments = 3)
 
-    val context = Global.context("SAT") {
-        //need to install solids extension, vision manager is installed automatically
-        plugin(SolidManager)
-    }
-
-    // fetch vision manager
-    val visionManager = context.visionManager
-
     val server = visionManager.serve {
         //use client library
-        useScript("visionforge-solid.js")
+        useThreeJs()
         //use css
         useCss("css/styles.css")
         page {
@@ -44,9 +32,12 @@ fun main() {
 
     server.show()
 
-    context.launch {
+    GlobalScope.launch {
         while (isActive) {
-            val target = "layer[${Random.nextInt(1, 11)}].segment[${Random.nextInt(3)},${Random.nextInt(3)}]".toName()
+            val randomLayer = Random.nextInt(1, 11)
+            val randomI = Random.nextInt(1, 4)
+            val randomJ = Random.nextInt(1, 4)
+            val target = "layer[$randomLayer].segment[$randomI,$randomJ]".toName()
             (sat[target] as? Solid)?.color("red")
             delay(300)
             (sat[target] as? Solid)?.color = "green"
@@ -54,7 +45,7 @@ fun main() {
         }
     }
 
-    println("Press Enter to close server")
+    println("Enter 'exit' to close server")
     while (readLine() != "exit") {
         //
     }
diff --git a/demo/sat-demo/src/jvmMain/resources/css/styles.css b/demo/sat-demo/src/main/resources/css/styles.css
similarity index 100%
rename from demo/sat-demo/src/jvmMain/resources/css/styles.css
rename to demo/sat-demo/src/main/resources/css/styles.css
diff --git a/playground/build.gradle.kts b/playground/build.gradle.kts
index 428bb779..45d20f6d 100644
--- a/playground/build.gradle.kts
+++ b/playground/build.gradle.kts
@@ -12,7 +12,14 @@ repositories{
 }
 
 kotlin {
-    jvm()
+    jvm{
+        compilations.all {
+            kotlinOptions.jvmTarget = "11"
+        }
+        testRuns["test"].executionTask.configure {
+            useJUnitPlatform()
+        }
+    }
     js(IR) {
         browser {
         }
@@ -36,6 +43,7 @@ kotlin {
         val jvmMain by getting{
             dependencies {
                 implementation("com.github.Ricky12Awesome:json-schema-serialization:0.6.6")
+                implementation(project(":visionforge-threejs:visionforge-threejs-server"))
             }
         }
     }
diff --git a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/fileExport.kt b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/fileExport.kt
new file mode 100644
index 00000000..3dc29df2
--- /dev/null
+++ b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/fileExport.kt
@@ -0,0 +1,19 @@
+package ru.mipt.npm.sat
+
+import hep.dataforge.vision.VisionManager
+import hep.dataforge.vision.html.fragment
+import hep.dataforge.vision.solid.box
+import hep.dataforge.vision.three.server.makeFile
+import hep.dataforge.vision.three.server.solid
+
+fun main() {
+    val fragment = VisionManager.fragment {
+        vision("canvas") {
+            solid {
+                box(100, 100, 100)
+            }
+        }
+    }
+
+    fragment.makeFile()
+}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e21ae40c..978abd5e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -40,6 +40,7 @@ include(
     ":visionforge-solid",
     ":visionforge-fx",
     ":visionforge-threejs",
+    ":visionforge-threejs:visionforge-threejs-server",
     ":visionforge-gdml",
     ":visionforge-server",
     ":demo:spatial-showcase",
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
index 9a09e52e..c800024f 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
@@ -110,23 +110,21 @@ public fun Vision.flowChanges(
     manager: VisionManager,
     collectionDuration: Duration,
 ): Flow<VisionChange> = flow {
-    supervisorScope {
-        val mutex = Mutex()
+    val mutex = Mutex()
 
-        var collector = VisionChangeBuilder()
-        collectChange(Name.EMPTY, this@flowChanges, mutex) { collector }
+    var collector = VisionChangeBuilder()
+    manager.context.collectChange(Name.EMPTY, this@flowChanges, mutex) { collector }
 
-        while (currentCoroutineContext().isActive) {
-            //Wait for changes to accumulate
-            delay(collectionDuration)
-            //Propagate updates only if something is changed
-            if (!collector.isEmpty()) {
-                //emit changes
-                mutex.withLock {
-                    emit(collector.isolate(manager))
-                    //Reset the collector
-                    collector = VisionChangeBuilder()
-                }
+    while (currentCoroutineContext().isActive) {
+        //Wait for changes to accumulate
+        delay(collectionDuration)
+        //Propagate updates only if something is changed
+        if (!collector.isEmpty()) {
+            //emit changes
+            mutex.withLock {
+                emit(collector.isolate(manager))
+                //Reset the collector
+                collector = VisionChangeBuilder()
             }
         }
     }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
index 9f3999e2..bdea12b4 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
@@ -1,5 +1,7 @@
 package hep.dataforge.vision.html
 
+import hep.dataforge.meta.DFExperimental
+import hep.dataforge.vision.VisionManager
 import kotlinx.html.FlowContent
 import kotlinx.html.TagConsumer
 
@@ -13,4 +15,7 @@ public fun FlowContent.fragment(fragment: HtmlFragment) {
     fragment(consumer)
 }
 
-public typealias HtmlVisionFragment = VisionTagConsumer<*>.() -> Unit
\ No newline at end of file
+public typealias HtmlVisionFragment = VisionTagConsumer<*>.() -> Unit
+
+@DFExperimental
+public fun VisionManager.Companion.fragment(content: HtmlVisionFragment): VisionTagConsumer<*>.() -> Unit = content
\ No newline at end of file
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt
index a7da3719..f8e138c5 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt
@@ -1,5 +1,7 @@
 package hep.dataforge.vision
 
+import hep.dataforge.context.Context
+import hep.dataforge.meta.DFExperimental
 import hep.dataforge.vision.html.HtmlFragment
 import kotlinx.html.link
 import kotlinx.html.script
@@ -33,6 +35,8 @@ public enum class ResourceLocation {
     EMBED
 }
 
+internal const val DATAFORGE_ASSETS_PATH = ".dataforge/assets"
+
 
 /**
  * Check if the asset exists in given local location and put it there if it does not
@@ -62,14 +66,11 @@ internal fun checkOrStoreFile(basePath: Path, filePath: Path, resource: String):
  * A header that automatically copies relevant scripts to given path
  */
 internal fun fileScriptHeader(
-    basePath: Path,
-    scriptPath: Path,
-    resource: String
+    path: Path,
 ): HtmlFragment = {
-    val relativePath = checkOrStoreFile(basePath, scriptPath, resource)
     script {
         type = "text/javascript"
-        src = relativePath.toString()
+        src = path.toString()
     }
 }
 
@@ -86,7 +87,7 @@ internal fun embedScriptHeader(resource: String): HtmlFragment = {
 internal fun fileCssHeader(
     basePath: Path,
     cssPath: Path,
-    resource: String
+    resource: String,
 ): HtmlFragment = {
     val relativePath = checkOrStoreFile(basePath, cssPath, resource)
     link {
@@ -95,6 +96,37 @@ internal fun fileCssHeader(
     }
 }
 
+/**
+ * Make a script header, automatically copying file to appropriate location
+ */
+@DFExperimental
+public fun Context.Companion.scriptHeader(
+    scriptResource: String,
+    basePath: Path?,
+    resourceLocation: ResourceLocation,
+): HtmlFragment {
+    val targetPath = if (basePath == null) null else {
+        when (resourceLocation) {
+            ResourceLocation.LOCAL -> checkOrStoreFile(
+                basePath,
+                Path.of(DATAFORGE_ASSETS_PATH),
+                scriptResource
+            )
+            ResourceLocation.SYSTEM -> checkOrStoreFile(
+                Path.of("."),
+                Path.of(System.getProperty("user.home")).resolve(DATAFORGE_ASSETS_PATH),
+                scriptResource
+            )
+            ResourceLocation.EMBED -> null
+        }
+    }
+    return if (targetPath == null) {
+        embedScriptHeader(scriptResource)
+    } else {
+        fileScriptHeader(targetPath)
+    }
+}
+
 //
 ///**
 // * A system-wide plotly store location
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt
index 328425ee..f7539a52 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt
@@ -1,5 +1,6 @@
 package hep.dataforge.vision
 
+import hep.dataforge.meta.DFExperimental
 import hep.dataforge.vision.html.*
 import kotlinx.html.*
 import kotlinx.html.stream.createHTML
@@ -8,11 +9,17 @@ import java.nio.file.Files
 import java.nio.file.Path
 
 
-
 /**
  * Make a file with the embedded vision data
  */
-public fun HtmlVisionFragment.makeFile(manager: VisionManager, vararg headers: HtmlFragment, path: Path? = null, show: Boolean = true) {
+@DFExperimental
+public fun HtmlVisionFragment.makeFile(
+    manager: VisionManager,
+    vararg headers: HtmlFragment,
+    path: Path? = null,
+    title: String = "VisionForge page",
+    show: Boolean = true,
+) {
     val actualFile = path ?: Files.createTempFile("tempPlot", ".html")
     Files.createDirectories(actualFile.parent)
     val htmlString = createHTML().apply {
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt
similarity index 97%
rename from visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
rename to visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt
index d67ec24d..680f0a37 100644
--- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.vision.server
+package hep.dataforge.vision.three.server
 
 import hep.dataforge.context.Context
 import hep.dataforge.meta.*
@@ -12,7 +12,7 @@ import hep.dataforge.vision.html.HtmlFragment
 import hep.dataforge.vision.html.HtmlVisionFragment
 import hep.dataforge.vision.html.VisionTagConsumer
 import hep.dataforge.vision.html.fragment
-import hep.dataforge.vision.server.VisionServer.Companion.DEFAULT_PAGE
+import hep.dataforge.vision.three.server.VisionServer.Companion.DEFAULT_PAGE
 import io.ktor.application.*
 import io.ktor.features.CORS
 import io.ktor.features.CallLogging
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index c1926dcd..bcf309bb 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -134,7 +134,9 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
     }
 
     override fun render(element: Element, vision: Vision, meta: Meta) {
-        createCanvas(element, Canvas3DOptions.read(meta)).render(vision as? Solid ?: error("Only solids are rendered"))
+        createCanvas(element, Canvas3DOptions.read(meta)).render(
+            vision as? Solid ?: error("Solid expected but ${vision::class} is found")
+        )
     }
 
     public companion object : PluginFactory<ThreePlugin> {
diff --git a/visionforge-threejs/visionforge-threejs-server/build.gradle.kts b/visionforge-threejs/visionforge-threejs-server/build.gradle.kts
new file mode 100644
index 00000000..2531a5e2
--- /dev/null
+++ b/visionforge-threejs/visionforge-threejs-server/build.gradle.kts
@@ -0,0 +1,52 @@
+plugins {
+    id("ru.mipt.npm.mpp")
+ }
+
+
+kscience{
+    useSerialization{
+        json()
+    }
+ }
+
+val ktorVersion: String by rootProject.extra
+
+kotlin {
+    js{
+        browser {
+            webpackTask {
+                this.outputFileName = "js/visionforge-three.js"
+            }
+        }
+        binaries.executable()
+    }
+
+    afterEvaluate {
+        val jsBrowserDistribution by tasks.getting
+
+        tasks.getByName<ProcessResources>("jvmProcessResources") {
+            dependsOn(jsBrowserDistribution)
+            afterEvaluate {
+                from(jsBrowserDistribution)
+            }
+        }
+    }
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                api(project(":visionforge-solid"))
+            }
+        }
+        jvmMain {
+            dependencies {
+                api(project(":visionforge-server"))
+            }
+        }
+        jsMain {
+            dependencies {
+                api(project(":visionforge-threejs"))
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/visionforge-threejs/visionforge-threejs-server/src/commonMain/kotlin/hep/dataforge/vision/three/server/visionContext.kt b/visionforge-threejs/visionforge-threejs-server/src/commonMain/kotlin/hep/dataforge/vision/three/server/visionContext.kt
new file mode 100644
index 00000000..c568d74a
--- /dev/null
+++ b/visionforge-threejs/visionforge-threejs-server/src/commonMain/kotlin/hep/dataforge/vision/three/server/visionContext.kt
@@ -0,0 +1,8 @@
+package hep.dataforge.vision.three.server
+
+import hep.dataforge.context.Context
+import hep.dataforge.vision.VisionManager
+
+public expect val visionContext: Context
+
+public val visionManager: VisionManager get() = visionContext.plugins.fetch(VisionManager)
\ No newline at end of file
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
new file mode 100644
index 00000000..f9505680
--- /dev/null
+++ b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
@@ -0,0 +1,48 @@
+package hep.dataforge.vision.three.server
+
+import hep.dataforge.context.Context
+import hep.dataforge.context.Global
+import hep.dataforge.vision.client.VisionClient
+import hep.dataforge.vision.client.renderAllVisions
+import hep.dataforge.vision.solid.three.ThreePlugin
+import kotlinx.browser.window
+
+//FIXME check plugin loading in JS
+//public actual val visionContext: Context = Global.context("vision-client") {
+//    //Loading three-js renderer
+//    plugin(ThreePlugin)
+//}
+
+public actual val visionContext: Context = Global.context("vision-client").apply {
+    //Loading three-js renderer
+    plugins.fetch(ThreePlugin)
+}
+
+public val clientManager: VisionClient get() = visionContext.plugins.fetch(VisionClient)
+
+
+///**
+// * Render all visions in the document using registered renderers
+// */
+//@JsExport
+//public fun renderVisions() {
+//    //Fetch from server and render visions for all outputs
+//    window.onload = {
+//        clientManager.renderAllVisions()
+//    }
+//}
+//
+///**
+// * Render all visions in a given element, using registered renderers
+// */
+//@JsExport
+//public fun renderAllVisionsAt(element: Element) {
+//    clientManager.renderAllVisionsAt(element)
+//}
+
+public fun main() {
+    //Fetch from server and render visions for all outputs
+    window.onload = {
+        clientManager.renderAllVisions()
+    }
+}
\ No newline at end of file
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
new file mode 100644
index 00000000..fa7a0488
--- /dev/null
+++ b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
@@ -0,0 +1,43 @@
+package hep.dataforge.vision.three.server
+
+import hep.dataforge.context.Context
+import hep.dataforge.context.Global
+import hep.dataforge.meta.DFExperimental
+import hep.dataforge.vision.ResourceLocation
+import hep.dataforge.vision.html.HtmlVisionFragment
+import hep.dataforge.vision.html.VisionOutput
+import hep.dataforge.vision.makeFile
+import hep.dataforge.vision.scriptHeader
+import hep.dataforge.vision.solid.SolidGroup
+import hep.dataforge.vision.solid.SolidManager
+import java.nio.file.Path
+
+public actual val visionContext: Context = Global.context("vision-server") {
+    //Loading solid manager for the backend (it does not know about three
+    plugin(SolidManager)
+}
+
+public fun VisionServer.useThreeJs(): Unit {
+    useScript("js/visionforge-three.js")
+//    header {
+//        script {
+//            unsafe {
+//                +"renderThreeVisions()"
+//            }
+//        }
+//    }
+}
+
+@DFExperimental
+public inline fun VisionOutput.solid(block: SolidGroup.() -> Unit): SolidGroup = SolidGroup().apply(block)
+
+@OptIn(DFExperimental::class)
+public fun HtmlVisionFragment.makeFile(
+    path: Path? = null,
+    title: String = "VisionForge page",
+    resourceLocation: ResourceLocation = ResourceLocation.SYSTEM,
+    show: Boolean = true,
+) {
+    val scriptHeader = Context.scriptHeader("/js/visionforge-three.js", path, resourceLocation)
+    makeFile(visionManager, path = path, show = show, title = title, headers = arrayOf(scriptHeader))
+}
\ No newline at end of file

From f4970955cb6c61a99d6b9d35edc8d4148ef8728d Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 12 Dec 2020 21:33:40 +0300
Subject: [PATCH 049/151] Fix local exports for temporary files.

---
 .../hep/dataforge/vision/solid/fileExport.kt  |  3 +-
 .../kotlin/hep/dataforge/vision/headers.kt    | 28 +++++++++----------
 .../vision/three/server/serverExtensions.kt   |  4 ++-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/fileExport.kt b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/fileExport.kt
index 3dc29df2..5471bb2e 100644
--- a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/fileExport.kt
+++ b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/fileExport.kt
@@ -1,5 +1,6 @@
 package ru.mipt.npm.sat
 
+import hep.dataforge.vision.ResourceLocation
 import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.html.fragment
 import hep.dataforge.vision.solid.box
@@ -15,5 +16,5 @@ fun main() {
         }
     }
 
-    fragment.makeFile()
+    fragment.makeFile(resourceLocation = ResourceLocation.LOCAL)
 }
\ No newline at end of file
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt
index f8e138c5..80e5b250 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt
@@ -102,23 +102,21 @@ internal fun fileCssHeader(
 @DFExperimental
 public fun Context.Companion.scriptHeader(
     scriptResource: String,
-    basePath: Path?,
+    basePath: Path,
     resourceLocation: ResourceLocation,
 ): HtmlFragment {
-    val targetPath = if (basePath == null) null else {
-        when (resourceLocation) {
-            ResourceLocation.LOCAL -> checkOrStoreFile(
-                basePath,
-                Path.of(DATAFORGE_ASSETS_PATH),
-                scriptResource
-            )
-            ResourceLocation.SYSTEM -> checkOrStoreFile(
-                Path.of("."),
-                Path.of(System.getProperty("user.home")).resolve(DATAFORGE_ASSETS_PATH),
-                scriptResource
-            )
-            ResourceLocation.EMBED -> null
-        }
+    val targetPath = when (resourceLocation) {
+        ResourceLocation.LOCAL -> checkOrStoreFile(
+            basePath,
+            Path.of(DATAFORGE_ASSETS_PATH),
+            scriptResource
+        )
+        ResourceLocation.SYSTEM -> checkOrStoreFile(
+            Path.of("."),
+            Path.of(System.getProperty("user.home")).resolve(DATAFORGE_ASSETS_PATH),
+            scriptResource
+        )
+        ResourceLocation.EMBED -> null
     }
     return if (targetPath == null) {
         embedScriptHeader(scriptResource)
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
index fa7a0488..a4d84a23 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
@@ -10,6 +10,7 @@ import hep.dataforge.vision.makeFile
 import hep.dataforge.vision.scriptHeader
 import hep.dataforge.vision.solid.SolidGroup
 import hep.dataforge.vision.solid.SolidManager
+import java.nio.file.Files
 import java.nio.file.Path
 
 public actual val visionContext: Context = Global.context("vision-server") {
@@ -38,6 +39,7 @@ public fun HtmlVisionFragment.makeFile(
     resourceLocation: ResourceLocation = ResourceLocation.SYSTEM,
     show: Boolean = true,
 ) {
-    val scriptHeader = Context.scriptHeader("/js/visionforge-three.js", path, resourceLocation)
+    val actualPath = path ?: Files.createTempFile("tempPlot", ".html")
+    val scriptHeader = Context.scriptHeader("/js/visionforge-three.js", actualPath, resourceLocation)
     makeFile(visionManager, path = path, show = show, title = title, headers = arrayOf(scriptHeader))
 }
\ No newline at end of file

From 382686b9aa815384769cb2be4c373a6505e075f9 Mon Sep 17 00:00:00 2001
From: darksnake <altavir@gmail.com>
Date: Sun, 13 Dec 2020 20:25:36 +0300
Subject: [PATCH 050/151] Refactor client

---
 .../hep/dataforge/vision/solid/fileExport.kt  |   5 +-
 .../hep/dataforge/vision/react/TreeStyles.kt  |   1 -
 .../kotlin/hep/dataforge/vision/Colors.kt     |   1 -
 .../hep/dataforge/vision/VisionChange.kt      |  42 ++++---
 .../vision/html/VisionTagConsumer.kt          |   4 +-
 .../dataforge/vision/client/VisionClient.kt   | 105 ++++++++++--------
 .../dataforge/vision/client/elementOutput.kt  |  35 +-----
 .../vision/editor/ColorValueChooser.kt        |   1 -
 .../vision/editor/ComboBoxValueChooser.kt     |   1 -
 .../hep/dataforge/vision/editor/MetaViewer.kt |   1 -
 .../hep/dataforge/vision/solid/FXMaterials.kt |   1 -
 .../vision/three/server/VisionServer.kt       |   4 +-
 .../vision/solid/three/ThreeMaterials.kt      |   1 -
 13 files changed, 88 insertions(+), 114 deletions(-)

diff --git a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/fileExport.kt b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/fileExport.kt
index 5471bb2e..f4558c23 100644
--- a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/fileExport.kt
+++ b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/fileExport.kt
@@ -1,12 +1,13 @@
-package ru.mipt.npm.sat
+package hep.dataforge.vision.solid
 
+import hep.dataforge.meta.DFExperimental
 import hep.dataforge.vision.ResourceLocation
 import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.html.fragment
-import hep.dataforge.vision.solid.box
 import hep.dataforge.vision.three.server.makeFile
 import hep.dataforge.vision.three.server.solid
 
+@OptIn(DFExperimental::class)
 fun main() {
     val fragment = VisionManager.fragment {
         vision("canvas") {
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt
index eb0bb8b9..5afcedac 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt
@@ -117,5 +117,4 @@ public object TreeStyles : StyleSheet("treeStyles", true) {
             width = 100.pct
         }
     }
-
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
index 7dc41632..9c76fd81 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
@@ -5,7 +5,6 @@ import hep.dataforge.meta.get
 import hep.dataforge.meta.number
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.int
-import hep.dataforge.values.string
 import kotlin.math.max
 
 /**
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
index c800024f..ca7396a7 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
@@ -6,8 +6,6 @@ import hep.dataforge.names.plus
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 import kotlinx.serialization.*
 import kotlin.time.Duration
 
@@ -15,13 +13,16 @@ import kotlin.time.Duration
  * An update for a [Vision] or a [VisionGroup]
  */
 public class VisionChangeBuilder : VisionContainerBuilder<Vision> {
+
     private val propertyChange = HashMap<Name, Config>()
     private val childrenChange = HashMap<Name, Vision?>()
 
     public fun isEmpty(): Boolean = propertyChange.isEmpty() && childrenChange.isEmpty()
 
     public fun propertyChanged(visionName: Name, propertyName: Name, item: MetaItem<*>?) {
-        propertyChange.getOrPut(visionName) { Config() }.setItem(propertyName, item)
+        propertyChange
+            .getOrPut(visionName) { Config() }
+            .setItem(propertyName, item)
     }
 
     override fun set(name: Name, child: Vision?) {
@@ -32,7 +33,7 @@ public class VisionChangeBuilder : VisionContainerBuilder<Vision> {
      * Isolate collected changes by creating detached copies of given visions
      */
     public fun isolate(manager: VisionManager): VisionChange = VisionChange(
-        propertyChange,
+        propertyChange.mapValues { it.value.seal() },
         childrenChange.mapValues { it.value?.isolate(manager) }
     )
     //TODO optimize isolation for visions without parents?
@@ -64,42 +65,40 @@ public inline fun VisionChange(manager: VisionManager, block: VisionChangeBuilde
 private fun CoroutineScope.collectChange(
     name: Name,
     source: Vision,
-    mutex: Mutex,
     collector: () -> VisionChangeBuilder,
 ) {
+
     //Collect properties change
-    source.config.onChange(mutex) { propertyName, oldItem, newItem ->
+    source.config.onChange(this) { propertyName, oldItem, newItem ->
         if (oldItem != newItem) {
             launch {
-                mutex.withLock {
-                    collector().propertyChanged(name, propertyName, newItem)
-                }
+                collector().propertyChanged(name, propertyName, newItem)
             }
         }
     }
 
     coroutineContext[Job]?.invokeOnCompletion {
-        source.config.removeListener(mutex)
+        source.config.removeListener(this)
     }
 
     if (source is VisionGroup) {
         //Subscribe for children changes
         source.children.forEach { (token, child) ->
-            collectChange(name + token, child, mutex, collector)
+            collectChange(name + token, child, collector)
         }
 
         //Subscribe for structure change
         if (source is MutableVisionGroup) {
-            source.onStructureChange(mutex) { token, before, after ->
-                before?.removeChangeListener(mutex)
-                (before as? MutableVisionGroup)?.removeStructureChangeListener(mutex)
+            source.onStructureChange(this) { token, before, after ->
+                before?.removeChangeListener(this)
+                (before as? MutableVisionGroup)?.removeStructureChangeListener(this)
                 if (after != null) {
-                    collectChange(name + token, after, mutex, collector)
+                    collectChange(name + token, after, collector)
                 }
                 collector()[name + token] = after
             }
             coroutineContext[Job]?.invokeOnCompletion {
-                source.removeStructureChangeListener(mutex)
+                source.removeStructureChangeListener(this)
             }
         }
     }
@@ -110,10 +109,9 @@ public fun Vision.flowChanges(
     manager: VisionManager,
     collectionDuration: Duration,
 ): Flow<VisionChange> = flow {
-    val mutex = Mutex()
 
     var collector = VisionChangeBuilder()
-    manager.context.collectChange(Name.EMPTY, this@flowChanges, mutex) { collector }
+    manager.context.collectChange(Name.EMPTY, this@flowChanges) { collector }
 
     while (currentCoroutineContext().isActive) {
         //Wait for changes to accumulate
@@ -121,11 +119,9 @@ public fun Vision.flowChanges(
         //Propagate updates only if something is changed
         if (!collector.isEmpty()) {
             //emit changes
-            mutex.withLock {
-                emit(collector.isolate(manager))
-                //Reset the collector
-                collector = VisionChangeBuilder()
-            }
+            emit(collector.isolate(manager))
+            //Reset the collector
+            collector = VisionChangeBuilder()
         }
     }
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
index 594011af..101bef5b 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
@@ -97,8 +97,8 @@ public abstract class VisionTagConsumer<R>(
         public const val OUTPUT_META_CLASS: String = "visionforge-output-meta"
         public const val OUTPUT_DATA_CLASS: String = "visionforge-output-data"
 
-        public const val OUTPUT_FETCH_VISION_ATTRIBUTE: String = "data-output-fetch-vision"
-        public const val OUTPUT_FETCH_UPDATE_ATTRIBUTE: String = "data-output-fetch-update"
+        public const val OUTPUT_FETCH_ATTRIBUTE: String = "data-output-fetch"
+        public const val OUTPUT_CONNECT_ATTRIBUTE: String = "data-output-connect"
 
         public const val OUTPUT_NAME_ATTRIBUTE: String = "data-output-name"
         public const val OUTPUT_ENDPOINT_ATTRIBUTE: String = "data-output-endpoint"
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
index 72cf61f7..8dda1ebf 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
@@ -7,8 +7,9 @@ import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionChange
 import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.html.VisionTagConsumer
+import hep.dataforge.vision.html.VisionTagConsumer.Companion.OUTPUT_CONNECT_ATTRIBUTE
 import hep.dataforge.vision.html.VisionTagConsumer.Companion.OUTPUT_ENDPOINT_ATTRIBUTE
-import hep.dataforge.vision.html.VisionTagConsumer.Companion.OUTPUT_FETCH_UPDATE_ATTRIBUTE
+import hep.dataforge.vision.html.VisionTagConsumer.Companion.OUTPUT_FETCH_ATTRIBUTE
 import hep.dataforge.vision.html.VisionTagConsumer.Companion.OUTPUT_NAME_ATTRIBUTE
 import kotlinx.browser.document
 import kotlinx.browser.window
@@ -23,6 +24,8 @@ public class VisionClient : AbstractPlugin() {
     override val tag: PluginTag get() = Companion.tag
     private val visionManager: VisionManager by require(VisionManager)
 
+    private val visionMap = HashMap<Element, Vision>()
+
     /**
      * Up-going tree traversal in search for endpoint attribute
      */
@@ -39,19 +42,27 @@ public class VisionClient : AbstractPlugin() {
 
     private fun getRenderers() = context.gather<ElementVisionRenderer>(ElementVisionRenderer.TYPE).values
 
-    public fun findRendererFor(vision: Vision): ElementVisionRenderer? =
+    private fun findRendererFor(vision: Vision): ElementVisionRenderer? =
         getRenderers().maxByOrNull { it.rateVision(vision) }
 
     private fun Element.getEmbeddedData(className: String): String? = getElementsByClassName(className)[0]?.innerHTML
 
-    private fun Element.getFlag(attribute: String): Boolean = attributes[attribute]?.value == "true"
+    private fun Element.getFlag(attribute: String): Boolean = attributes[attribute]?.value != null
+
+    private fun renderVision(element: Element, vision: Vision?, outputMeta: Meta) {
+        if (vision != null) {
+            visionMap[element] = vision
+            val renderer = findRendererFor(vision) ?: error("Could nof find renderer for $vision")
+            renderer.render(element, vision, outputMeta)
+        }
+    }
 
     /**
      * Fetch from server and render a vision, described in a given with [VisionTagConsumer.OUTPUT_CLASS] class.
      */
     public fun renderVisionAt(element: Element) {
         val name = resolveName(element) ?: error("The element is not a vision output")
-        console.info("Found DF output with name $name")
+        logger.info { "Found DF output with name $name" }
         if (!element.classList.contains(VisionTagConsumer.OUTPUT_CLASS)) error("The element $element is not an output element")
 
 
@@ -63,66 +74,72 @@ public class VisionClient : AbstractPlugin() {
         val embeddedVision = element.getEmbeddedData(VisionTagConsumer.OUTPUT_DATA_CLASS)?.let {
             visionManager.decodeFromString(it)
         }
+
         if (embeddedVision != null) {
-            val renderer = findRendererFor(embeddedVision) ?: error("Could nof find renderer for $embeddedVision")
-            renderer.render(element, embeddedVision, outputMeta)
+            logger.info { "Found embedded vision for output with name $name" }
+            renderVision(element, embeddedVision, outputMeta)
         }
 
-        if(element.getFlag(VisionTagConsumer.OUTPUT_FETCH_VISION_ATTRIBUTE)) {
+        val endpoint = resolveEndpoint(element)
+        logger.info { "Vision server is resolved to $endpoint" }
 
-            val endpoint = resolveEndpoint(element)
-            console.info("Vision server is resolved to $endpoint")
+        element.attributes[OUTPUT_FETCH_ATTRIBUTE]?.let {
 
             val fetchUrl = URL(endpoint).apply {
                 searchParams.append("name", name)
                 pathname += "/vision"
             }
 
-            console.info("Fetching vision data from $fetchUrl")
+            logger.info { "Fetching vision data from $fetchUrl" }
             window.fetch(fetchUrl).then { response ->
                 if (response.ok) {
                     response.text().then { text ->
                         val vision = visionManager.decodeFromString(text)
-                        val renderer = findRendererFor(vision) ?: error("Could nof find renderer for $vision")
-                        renderer.render(element, vision, outputMeta)
-                        if (element.getFlag(OUTPUT_FETCH_UPDATE_ATTRIBUTE)) {
-                            val wsUrl = URL(endpoint).apply {
-                                pathname += "/ws"
-                                protocol = "ws"
-                                searchParams.append("name", name)
-                            }
-                            WebSocket(wsUrl.toString()).apply {
-                                onmessage = { messageEvent ->
-                                    val stringData: String? = messageEvent.data as? String
-                                    if (stringData != null) {
-                                        val dif = visionManager.jsonFormat.decodeFromString(
-                                            VisionChange.serializer(),
-                                            stringData
-                                        )
-                                        vision.update(dif)
-                                    } else {
-                                        console.error("WebSocket message data is not a string")
-                                    }
-                                }
-                                onopen = {
-                                    console.info("WebSocket update channel established for output '$name'")
-                                }
-                                onclose = {
-                                    console.info("WebSocket update channel closed for output '$name'")
-                                }
-                                onerror = {
-                                    console.error("WebSocket update channel error for output '$name'")
-                                }
-                            }
-
-                        }
+                        renderVision(element, vision, outputMeta)
                     }
                 } else {
-                    console.error("Failed to fetch initial vision state from $endpoint")
+                    logger.error { "Failed to fetch initial vision state from $endpoint" }
                 }
 
             }
         }
+
+        element.attributes[OUTPUT_CONNECT_ATTRIBUTE]?.let {
+
+            val wsUrl = URL(endpoint).apply {
+                pathname += "/ws"
+                protocol = "ws"
+                searchParams.append("name", name)
+            }
+
+            logger.info { "Updating vision data from $wsUrl" }
+
+            val ws = WebSocket(wsUrl.toString()).apply {
+                onmessage = { messageEvent ->
+                    val stringData: String? = messageEvent.data as? String
+                    if (stringData != null) {
+                        val dif = visionManager.jsonFormat.decodeFromString(
+                            VisionChange.serializer(),
+                            stringData
+                        )
+                        logger.debug { "Got update $dif for output with name $name" }
+                        visionMap[element]?.update(dif)
+                            ?: logger.info { "Target vision for element $element with name $name not found" }
+                    } else {
+                        console.error("WebSocket message data is not a string")
+                    }
+                }
+                onopen = {
+                    console.info("WebSocket update channel established for output '$name'")
+                }
+                onclose = {
+                    console.info("WebSocket update channel closed for output '$name'")
+                }
+                onerror = {
+                    console.error("WebSocket update channel error for output '$name'")
+                }
+            }
+        }
     }
 
     public companion object : PluginFactory<VisionClient> {
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
index 72a80143..22e327a5 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
@@ -25,37 +25,4 @@ public interface ElementVisionRenderer {
         public const val ZERO_RATING: Int = 0
         public const val DEFAULT_RATING: Int = 10
     }
-}
-//
-//@DFExperimental
-//public fun Map<String, Vision>.bind(rendererFactory: (Vision) -> ElementVisionRenderer) {
-//    forEach { (id, vision) ->
-//        val element = document.getElementById(id) ?: error("Could not find element with id $id")
-//        rendererFactory(vision).render(element, vision)
-//    }
-//}
-//
-//@DFExperimental
-//public fun Element.renderAllVisions(
-//    visionProvider: (Name) -> Vision,
-//    rendererFactory: (Vision) -> ElementVisionRenderer,
-//) {
-//    val elements = getElementsByClassName(VisionTagConsumer.OUTPUT_CLASS)
-//    elements.asList().forEach { element ->
-//        val name = element.attributes[VisionTagConsumer.OUTPUT_NAME_ATTRIBUTE]?.value
-//        if (name == null) {
-//            console.error("Attribute ${VisionTagConsumer.OUTPUT_NAME_ATTRIBUTE} not defined in the output element")
-//            return@forEach
-//        }
-//        val vision = visionProvider(name.toName())
-//        rendererFactory(vision).render(element, vision)
-//    }
-//}
-//
-//@DFExperimental
-//public fun Document.renderAllVisions(
-//    visionProvider: (Name) -> Vision,
-//    rendererFactory: (Vision) -> ElementVisionRenderer,
-//): Unit {
-//    documentElement?.renderAllVisions(visionProvider, rendererFactory)
-//}
+}
\ No newline at end of file
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
index 3487f95c..5f4e2573 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
@@ -6,7 +6,6 @@ import hep.dataforge.names.asName
 import hep.dataforge.values.Null
 import hep.dataforge.values.Value
 import hep.dataforge.values.asValue
-import hep.dataforge.values.string
 import javafx.scene.control.ColorPicker
 import javafx.scene.paint.Color
 import org.slf4j.LoggerFactory
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
index 5ce3d960..051469c7 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
@@ -12,7 +12,6 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.values.Value
 import hep.dataforge.values.parseValue
-import hep.dataforge.values.string
 import javafx.collections.FXCollections
 import javafx.scene.control.ComboBox
 import javafx.util.StringConverter
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt
index 88079731..ca6edcc2 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt
@@ -17,7 +17,6 @@
 package hep.dataforge.vision.editor
 
 import hep.dataforge.meta.Meta
-import hep.dataforge.values.string
 import hep.dataforge.vision.dfIconView
 import javafx.beans.property.SimpleStringProperty
 import javafx.scene.control.TreeItem
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
index b42cd315..a8a62999 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
@@ -6,7 +6,6 @@ import hep.dataforge.meta.get
 import hep.dataforge.meta.int
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.int
-import hep.dataforge.values.string
 import hep.dataforge.vision.Colors
 import javafx.scene.paint.Color
 import javafx.scene.paint.Material
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt
index 680f0a37..eaa38618 100644
--- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt
@@ -74,8 +74,8 @@ public class VisionServer internal constructor(
                 visionMap[name] = vision
 
                 // Toggle updates
-                attributes[OUTPUT_FETCH_VISION_ATTRIBUTE] = "true"
-                attributes[OUTPUT_FETCH_UPDATE_ATTRIBUTE] = "true"
+                attributes[OUTPUT_FETCH_ATTRIBUTE] = "true"
+                attributes[OUTPUT_CONNECT_ATTRIBUTE] = "true"
             }
         }
 
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
index f7ec681d..16d24525 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
@@ -3,7 +3,6 @@ package hep.dataforge.vision.solid.three
 import hep.dataforge.meta.*
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.int
-import hep.dataforge.values.string
 import hep.dataforge.vision.Colors
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.solid.SolidMaterial

From 1ccd45d6c5371e461217913eca455b419db99e6c Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 14 Dec 2020 13:47:46 +0300
Subject: [PATCH 051/151] Refactored SolidMaterial to use color wrapper

---
 .../kotlin/ru/mipt/npm/muon/monitor/Model.kt  |  2 +-
 .../main/kotlin/ru/mipt/npm/sat/satServer.kt  |  3 +-
 .../hep/dataforge/vision/solid/demo/demo.kt   | 36 +++++----
 playground/src/jsMain/kotlin/PlayGroundApp.kt |  6 +-
 .../solid/{fileExport.kt => simpleCube.kt}    |  0
 .../kotlin/hep/dataforge/vision/misc.kt       |  4 +
 .../kotlin/hep/dataforge/vision/solid/Box.kt  |  2 +
 .../hep/dataforge/vision/solid/Composite.kt   |  9 ++-
 .../hep/dataforge/vision/solid/Extruded.kt    |  2 +
 .../hep/dataforge/vision/solid/PolyLine.kt    |  2 +
 .../hep/dataforge/vision/solid/Solid.kt       |  2 +
 .../hep/dataforge/vision/solid/SolidGroup.kt  |  1 +
 .../hep/dataforge/vision/solid/SolidLabel.kt  |  2 +
 .../dataforge/vision/solid/SolidMaterial.kt   | 80 +++++++++++--------
 .../hep/dataforge/vision/solid/Sphere.kt      |  2 +
 .../kotlin/hep/dataforge/vision/solid/Tube.kt |  2 +
 .../dataforge/vision/solid/PropertyTest.kt    |  4 +-
 .../vision/solid/VisionUpdateTest.kt          |  4 +-
 visionforge-threejs/build.gradle.kts          |  2 +-
 .../vision/solid/three/ThreeLineFactory.kt    |  3 +-
 20 files changed, 105 insertions(+), 63 deletions(-)
 rename playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/{fileExport.kt => simpleCube.kt} (100%)

diff --git a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt
index 2d731fe2..73af1875 100644
--- a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt
+++ b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt
@@ -58,7 +58,7 @@ class Model {
     }
 
     private fun highlight(pixel: String) {
-        map[pixel]?.color("blue")
+        map[pixel]?.color?.invoke("blue")
     }
 
     fun reset() {
diff --git a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
index e65eb314..685970bd 100644
--- a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
+++ b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
@@ -4,6 +4,7 @@ package ru.mipt.npm.sat
 import hep.dataforge.names.toName
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.color
+import hep.dataforge.vision.solid.invoke
 import hep.dataforge.vision.three.server.*
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
@@ -40,7 +41,7 @@ fun main() {
             val target = "layer[$randomLayer].segment[$randomI,$randomJ]".toName()
             (sat[target] as? Solid)?.color("red")
             delay(300)
-            (sat[target] as? Solid)?.color = "green"
+            (sat[target] as? Solid)?.color("green")
             delay(10)
         }
     }
diff --git a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
index 07f18e4d..76c871e6 100644
--- a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
+++ b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
@@ -134,31 +134,39 @@ fun Page<Solid>.showcase() {
 
 fun Page<Solid>.showcaseCSG() {
     demo("CSG.simple", "CSG operations") {
-        composite(CompositeType.UNION) {
-            box(100, 100, 100) {
-                z = 50
-            }
-            sphere(50)
-            material {
-                color(Colors.lightgreen)
-                opacity = 0.3f
-            }
-        }
         composite(CompositeType.INTERSECT) {
             y = 300
             box(100, 100, 100) {
                 z = 50
             }
-            sphere(50)
-            color(Colors.red)
+            sphere(50){
+                detail = 32
+            }
+            material {
+                color(Colors.red)
+                wireframe = false
+            }
+        }
+        composite(CompositeType.UNION) {
+            box(100, 100, 100) {
+                z = 50
+            }
+            sphere(50){
+                detail = 32
+            }
+            color(Colors.lightgreen)
+            opacity = 0.3
         }
         composite(CompositeType.SUBTRACT) {
             y = -300
             box(100, 100, 100) {
                 z = 50
             }
-            sphere(50)
-            color(Colors.blue)
+            sphere(50){
+                detail = 32
+            }
+            color(Colors.teal)
+            opacity = 0.7
         }
     }
 
diff --git a/playground/src/jsMain/kotlin/PlayGroundApp.kt b/playground/src/jsMain/kotlin/PlayGroundApp.kt
index 33de3028..a4635a04 100644
--- a/playground/src/jsMain/kotlin/PlayGroundApp.kt
+++ b/playground/src/jsMain/kotlin/PlayGroundApp.kt
@@ -1,12 +1,10 @@
 import hep.dataforge.Application
-import hep.dataforge.context.Global
 import hep.dataforge.startApplication
 import hep.dataforge.vision.bootstrap.visionPropertyEditor
 import hep.dataforge.vision.react.ThreeCanvasComponent
 import hep.dataforge.vision.react.objectTree
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
-import hep.dataforge.vision.solid.three.ThreePlugin
 import kotlinx.browser.document
 import org.w3c.dom.HTMLElement
 import react.RBuilder
@@ -14,7 +12,7 @@ import react.child
 import react.dom.div
 import react.dom.render
 
-public fun RBuilder.threeCanvas(object3D: Solid, options: Canvas3DOptions.() -> Unit = {}) {
+fun RBuilder.threeCanvas(object3D: Solid, options: Canvas3DOptions.() -> Unit = {}) {
     child(ThreeCanvasComponent) {
         attrs {
             this.obj = object3D
@@ -25,8 +23,6 @@ public fun RBuilder.threeCanvas(object3D: Solid, options: Canvas3DOptions.() ->
 
 private class PlayGroundApp : Application {
 
-    private val three = Global.plugins.fetch(ThreePlugin)
-
     override fun start(state: Map<String, Any>) {
 
         val element =
diff --git a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/fileExport.kt b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/simpleCube.kt
similarity index 100%
rename from playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/fileExport.kt
rename to playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/simpleCube.kt
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
index 54e939a2..0e17c123 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
@@ -8,6 +8,10 @@ import hep.dataforge.names.Name
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.asValue
 
+@DslMarker
+public annotation class VisionBuilder
+
+
 public fun Sequence<MetaItem<*>?>.merge(): MetaItem<*>? {
     return when (val first = firstOrNull { it != null }) {
         null -> null
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
index 08d8199f..adedccda 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
@@ -1,5 +1,6 @@
 package hep.dataforge.vision.solid
 
+import hep.dataforge.vision.VisionBuilder
 import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import hep.dataforge.vision.solid.Solid.Companion.solidEquals
@@ -61,6 +62,7 @@ public class Box(
     }
 }
 
+@VisionBuilder
 public inline fun VisionContainerBuilder<Solid>.box(
     xSize: Number,
     ySize: Number,
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
index 75ce5b02..9264ee99 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
@@ -3,10 +3,7 @@ package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.update
 import hep.dataforge.names.NameToken
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionContainerBuilder
-import hep.dataforge.vision.VisionGroup
-import hep.dataforge.vision.set
+import hep.dataforge.vision.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -33,6 +30,7 @@ public class Composite(
         get() = mapOf(NameToken("first") to first, NameToken("second") to second)
 }
 
+@VisionBuilder
 public inline fun VisionContainerBuilder<Solid>.composite(
     type: CompositeType,
     name: String = "",
@@ -58,11 +56,14 @@ public inline fun VisionContainerBuilder<Solid>.composite(
     }
 }
 
+@VisionBuilder
 public inline fun VisionContainerBuilder<Solid>.union(name: String = "", builder: SolidGroup.() -> Unit): Composite =
     composite(CompositeType.UNION, name, builder = builder)
 
+@VisionBuilder
 public inline fun VisionContainerBuilder<Solid>.subtract(name: String = "", builder: SolidGroup.() -> Unit): Composite =
     composite(CompositeType.SUBTRACT, name, builder = builder)
 
+@VisionBuilder
 public inline fun VisionContainerBuilder<Solid>.intersect(name: String = "", builder: SolidGroup.() -> Unit): Composite =
     composite(CompositeType.INTERSECT, name, builder = builder)
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
index e9c0d3a1..3c7ca6d1 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
@@ -1,5 +1,6 @@
 package hep.dataforge.vision.solid
 
+import hep.dataforge.vision.VisionBuilder
 import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
@@ -102,5 +103,6 @@ public class Extruded(
     }
 }
 
+@VisionBuilder
 public fun VisionContainerBuilder<Solid>.extrude(name: String = "", action: Extruded.() -> Unit = {}): Extruded =
     Extruded().apply(action).also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
index 7305011e..998f7f4f 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
@@ -4,6 +4,7 @@ import hep.dataforge.meta.number
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
+import hep.dataforge.vision.VisionBuilder
 import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.props
 import hep.dataforge.vision.set
@@ -23,6 +24,7 @@ public class PolyLine(public var points: List<Point3D>) : SolidBase(), Solid {
 
 }
 
+@VisionBuilder
 public fun VisionContainerBuilder<Solid>.polyline(
     vararg points: Point3D,
     name: String = "",
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
index f08211a0..278cc9e7 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
@@ -9,6 +9,7 @@ import hep.dataforge.values.ValueType
 import hep.dataforge.values.asValue
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.Vision.Companion.VISIBLE_KEY
+import hep.dataforge.vision.VisionBuilder
 import hep.dataforge.vision.enum
 import hep.dataforge.vision.layout.Output
 import hep.dataforge.vision.setProperty
@@ -104,6 +105,7 @@ public var Solid.layer: Int
         config[LAYER_KEY] = value.asValue()
     }
 
+@VisionBuilder
 public fun Output<Solid>.solidGroup(builder: SolidGroup.() -> Unit): Unit = render(SolidGroup().apply(builder))
 
 // Common properties
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index 7829faef..b87cdaab 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -86,6 +86,7 @@ public fun SolidGroup(block: SolidGroup.() -> Unit): SolidGroup {
 public tailrec fun PrototypeHolder.getPrototype(name: Name): Solid? =
     prototypes?.get(name) as? Solid ?: (parent as? PrototypeHolder)?.getPrototype(name)
 
+@VisionBuilder
 public fun VisionContainerBuilder<Vision>.group(name: Name = Name.EMPTY, action: SolidGroup.() -> Unit = {}): SolidGroup =
     SolidGroup().apply(action).also { set(name, it) }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
index b829c7e1..76a19979 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
@@ -1,5 +1,6 @@
 package hep.dataforge.vision.solid
 
+import hep.dataforge.vision.VisionBuilder
 import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
@@ -13,6 +14,7 @@ public class SolidLabel(
     public var fontFamily: String,
 ) : SolidBase(), Solid
 
+@VisionBuilder
 public fun VisionContainerBuilder<Solid>.label(
     text: String,
     fontSize: Number = 20,
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
index 3b7cee8a..aebd168d 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
@@ -6,26 +6,66 @@ import hep.dataforge.meta.descriptors.attributes
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
+import hep.dataforge.values.Value
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.asValue
+import hep.dataforge.values.string
 import hep.dataforge.vision.Colors
+import hep.dataforge.vision.VisionBuilder
 import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_OPACITY_KEY
 import hep.dataforge.vision.widgetType
 
+@VisionBuilder
+public class ColorAccessor(private val parent: MutableItemProvider, private val colorKey: Name) {
+    public var value: Value?
+        get() = parent.getItem(colorKey).value
+        set(value) {
+            parent[colorKey] = value
+        }
+}
+
+public var ColorAccessor?.string: String?
+    get() = this?.value?.string
+    set(value) {
+        this?.value = value?.asValue()
+    }
+
+/**
+ * Set [webcolor](https://en.wikipedia.org/wiki/Web_colors) as string
+ */
+public operator fun ColorAccessor?.invoke(webColor: String) {
+    this?.value = webColor.asValue()
+}
+
+/**
+ * Set color as RGB integer
+ */
+public operator fun ColorAccessor?.invoke(rgb: Int) {
+    this?.value = rgb.asValue()
+}
+
+/**
+ * Set color as RGB
+ */
+public operator fun ColorAccessor?.invoke(r: UByte, g: UByte, b: UByte) {
+    this?.value =  Colors.rgbToString(r, g, b).asValue()
+}
+
+@VisionBuilder
 public class SolidMaterial : Scheme() {
 
     /**
      * Primary web-color for the material
      */
-    public var color: String? by string(key = COLOR_KEY)
+    public var color: ColorAccessor = ColorAccessor(config, COLOR_KEY)
 
     /**
      * Specular color for phong material
      */
-    public var specularColor: String? by string(key = SPECULAR_COLOR_KEY)
+    public var specularColor: ColorAccessor = ColorAccessor(config, SPECULAR_COLOR_KEY)
 
     /**
      * Opacity
@@ -75,37 +115,13 @@ public class SolidMaterial : Scheme() {
     }
 }
 
-/**
- * Set color as web-color
- */
-public fun Solid.color(webColor: String) {
-    setProperty(MATERIAL_COLOR_KEY, webColor.asValue())
-}
+public val Solid.color: ColorAccessor get() = ColorAccessor(config, MATERIAL_COLOR_KEY)
 
-/**
- * Set color as integer
- */
-public fun Solid.color(rgb: Int) {
-    setProperty(MATERIAL_COLOR_KEY, rgb.asValue())
-}
-
-public fun Solid.color(r: UByte, g: UByte, b: UByte): Unit = setProperty(
-    MATERIAL_COLOR_KEY,
-    Colors.rgbToString(r, g, b).asValue()
-)
-
-/**
- * Web colors representation of the color in `#rrggbb` format or HTML name
- */
-public var Solid.color: String?
-    get() = getProperty(MATERIAL_COLOR_KEY)?.let { Colors.fromMeta(it) }
-    set(value) {
-        setProperty(MATERIAL_COLOR_KEY, value?.asValue())
-    }
-
-public val Solid.material: SolidMaterial?
+public var Solid.material: SolidMaterial?
     get() = getProperty(MATERIAL_KEY).node?.let { SolidMaterial.read(it) }
+    set(value) = setProperty(MATERIAL_KEY, value?.config)
 
+@VisionBuilder
 public fun Solid.material(builder: SolidMaterial.() -> Unit) {
     val node = config[MATERIAL_KEY].node
     if (node != null) {
@@ -115,8 +131,8 @@ public fun Solid.material(builder: SolidMaterial.() -> Unit) {
     }
 }
 
-public var Solid.opacity: Double?
-    get() = getProperty(MATERIAL_OPACITY_KEY).double
+public var Solid.opacity: Number?
+    get() = getProperty(MATERIAL_OPACITY_KEY).number
     set(value) {
         setProperty(MATERIAL_OPACITY_KEY, value?.asValue())
     }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
index b04eb76b..799d95d9 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
@@ -1,5 +1,6 @@
 package hep.dataforge.vision.solid
 
+import hep.dataforge.vision.VisionBuilder
 import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
@@ -50,6 +51,7 @@ public class Sphere(
     }
 }
 
+@VisionBuilder
 public inline fun VisionContainerBuilder<Solid>.sphere(
     radius: Number,
     phi: Number = 2 * PI,
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
index b48e7f6f..0ed4dea2 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
@@ -1,5 +1,6 @@
 package hep.dataforge.vision.solid
 
+import hep.dataforge.vision.VisionBuilder
 import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
@@ -118,6 +119,7 @@ public class Tube(
 
 }
 
+@VisionBuilder
 public inline fun VisionContainerBuilder<Solid>.tube(
     r: Number,
     height: Number,
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
index 3f89c024..907edf3e 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
@@ -55,7 +55,7 @@ class PropertyTest {
                 }
             }
         }
-        assertEquals("#555555", box?.color)
+        assertEquals("#555555", box?.color.string)
     }
 
     @Test
@@ -76,6 +76,6 @@ class PropertyTest {
                 box = ref("box".asName())
             }
         }
-        assertEquals("#555555", box?.color)
+        assertEquals("#555555", box?.color.string)
     }
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt
index af8e49c7..f5ff4f14 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt
@@ -28,8 +28,8 @@ class VisionUpdateTest {
         }
         targetVision.update(dif)
         assertTrue { targetVision["top"] is SolidGroup }
-        assertEquals("red", (targetVision["origin"] as Solid).color) // Should work
-        assertEquals("#00007b", (targetVision["top"] as SolidGroup).color) // new item always takes precedence
+        assertEquals("red", (targetVision["origin"] as Solid).color.string) // Should work
+        assertEquals("#00007b", (targetVision["top"] as SolidGroup).color.string) // new item always takes precedence
     }
 
     @Test
diff --git a/visionforge-threejs/build.gradle.kts b/visionforge-threejs/build.gradle.kts
index 612ad129..4075c8df 100644
--- a/visionforge-threejs/build.gradle.kts
+++ b/visionforge-threejs/build.gradle.kts
@@ -9,5 +9,5 @@ kscience {
 dependencies {
     api(project(":visionforge-solid"))
     implementation(npm("three", "0.122.0"))
-    implementation(npm("three-csg-ts", "1.0.6"))
+    implementation(npm("three-csg-ts", "2.0.0"))
 }
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
index 974b0727..b5ec871e 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
@@ -3,6 +3,7 @@ package hep.dataforge.vision.solid.three
 import hep.dataforge.meta.node
 import hep.dataforge.vision.solid.PolyLine
 import hep.dataforge.vision.solid.color
+import hep.dataforge.vision.solid.string
 import hep.dataforge.vision.solid.three.ThreeMaterials.DEFAULT_LINE_COLOR
 import info.laht.threekt.core.Geometry
 import info.laht.threekt.core.Object3D
@@ -21,7 +22,7 @@ public object ThreeLineFactory : ThreeFactory<PolyLine> {
         val material = ThreeMaterials.getLineMaterial(obj.getProperty(MeshThreeFactory.EDGES_MATERIAL_KEY).node, true)
 
         material.linewidth = obj.thickness.toDouble()
-        material.color = obj.color?.let { Color(it) } ?: DEFAULT_LINE_COLOR
+        material.color = obj.color.string?.let { Color(it) } ?: DEFAULT_LINE_COLOR
 
         return LineSegments(geometry, material).apply {
             updatePosition(obj)

From 85bb690699f2f5919345bf26dd98d1f3dd1a6780 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 14 Dec 2020 13:54:25 +0300
Subject: [PATCH 052/151] Fix after merge

---
 .../src/commonMain/kotlin/hep/dataforge/vision/Colors.kt       | 1 +
 .../kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt    | 1 +
 .../kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt | 1 +
 .../src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt  | 1 +
 .../src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt  | 3 ++-
 .../kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt  | 1 +
 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
index 9c76fd81..7dc41632 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
@@ -5,6 +5,7 @@ import hep.dataforge.meta.get
 import hep.dataforge.meta.number
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.int
+import hep.dataforge.values.string
 import kotlin.math.max
 
 /**
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
index 5f4e2573..3487f95c 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
@@ -6,6 +6,7 @@ import hep.dataforge.names.asName
 import hep.dataforge.values.Null
 import hep.dataforge.values.Value
 import hep.dataforge.values.asValue
+import hep.dataforge.values.string
 import javafx.scene.control.ColorPicker
 import javafx.scene.paint.Color
 import org.slf4j.LoggerFactory
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
index 051469c7..5ce3d960 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
@@ -12,6 +12,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.values.Value
 import hep.dataforge.values.parseValue
+import hep.dataforge.values.string
 import javafx.collections.FXCollections
 import javafx.scene.control.ComboBox
 import javafx.util.StringConverter
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt
index ca6edcc2..88079731 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt
@@ -17,6 +17,7 @@
 package hep.dataforge.vision.editor
 
 import hep.dataforge.meta.Meta
+import hep.dataforge.values.string
 import hep.dataforge.vision.dfIconView
 import javafx.beans.property.SimpleStringProperty
 import javafx.scene.control.TreeItem
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
index a8a62999..9ae8fcf3 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
@@ -6,6 +6,7 @@ import hep.dataforge.meta.get
 import hep.dataforge.meta.int
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.int
+import hep.dataforge.values.string
 import hep.dataforge.vision.Colors
 import javafx.scene.paint.Color
 import javafx.scene.paint.Material
@@ -59,7 +60,7 @@ public fun MetaItem<*>.color(opacity: Double = 1.0): Color {
 /**
  * Infer FX material based on meta item
  */
-fun MetaItem<*>?.material(): Material {
+public fun MetaItem<*>?.material(): Material {
     return when (this) {
         null -> FXMaterials.GREY
         is MetaItem.ValueItem -> PhongMaterial(color())
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
index 16d24525..f7ec681d 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
@@ -3,6 +3,7 @@ package hep.dataforge.vision.solid.three
 import hep.dataforge.meta.*
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.int
+import hep.dataforge.values.string
 import hep.dataforge.vision.Colors
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.solid.SolidMaterial

From b2ba92e745c10f9b1764fbf67f81ca042bf47140 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 15 Dec 2020 19:18:04 +0300
Subject: [PATCH 053/151] Change property and structure subscription to flows.

---
 CHANGELOG.md                                  |   3 +-
 .../kotlin/ru/mipt/npm/muon/monitor/Model.kt  |   2 -
 .../kotlin/hep/dataforge/vision/StyleSheet.kt |  14 +-
 .../kotlin/hep/dataforge/vision/Vision.kt     |  95 +++++----
 .../kotlin/hep/dataforge/vision/VisionBase.kt | 131 ++++++------
 .../hep/dataforge/vision/VisionChange.kt      |  94 ++++-----
 .../hep/dataforge/vision/VisionGroup.kt       |  14 +-
 .../hep/dataforge/vision/VisionGroupBase.kt   |  99 ++++-----
 .../kotlin/hep/dataforge/vision/misc.kt       |  22 +-
 .../hep/dataforge/vision/html/HtmlTagTest.kt  |   3 +-
 .../editor/VisualObjectEditorFragment.kt      |  12 +-
 .../hep/dataforge/vision/solid/FX3DPlugin.kt  |   2 +-
 .../vision/solid/FXReferenceFactory.kt        |   8 +-
 .../dataforge/vision/gdml/GDMLTransformer.kt  |  10 +-
 .../dataforge/vision/gdml/GdmlOptimizer.kt    |  19 +-
 .../hep/dataforge/vision/solid/Composite.kt   |  14 +-
 .../hep/dataforge/vision/solid/Solid.kt       |  33 ++-
 .../hep/dataforge/vision/solid/SolidGroup.kt  |  33 ++-
 .../dataforge/vision/solid/SolidManager.kt    |   2 +-
 .../dataforge/vision/solid/SolidMaterial.kt   |  11 +-
 .../dataforge/vision/solid/SolidReference.kt  | 156 ---------------
 .../vision/solid/SolidReferenceGroup.kt       | 189 ++++++++++++++++++
 .../solid/transform/RemoveSingleChild.kt      |   9 +-
 .../dataforge/vision/solid/transform/UnRef.kt |   8 +-
 .../dataforge/vision/solid/PropertyTest.kt    |   6 +-
 .../vision/solid/SerializationTest.kt         |   7 +-
 .../vision/solid/VisionUpdateTest.kt          |   2 +-
 .../vision/solid/three/MeshThreeFactory.kt    |  22 +-
 .../vision/solid/three/ThreeConvexFactory.kt  |   3 +-
 .../vision/solid/three/ThreeFactory.kt        |   2 +-
 .../vision/solid/three/ThreeLabelFactory.kt   |  12 +-
 .../vision/solid/three/ThreeLineFactory.kt    |   8 +-
 .../vision/solid/three/ThreePlugin.kt         |  16 +-
 .../solid/three/ThreeReferenceFactory.kt      |  19 +-
 34 files changed, 562 insertions(+), 518 deletions(-)
 delete mode 100644 visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
 create mode 100644 visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReferenceGroup.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 611e4c13..42282a71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,13 +4,14 @@
 ### Added
 - Server module
 - Change collector
+- Customizable accessors for colors
 
 ### Changed
 - Vision does not implement ItemProvider anymore. Property changes are done via `getProperty`/`setProperty` and `property` delegate.
 - Point3D and Point2D are made separate classes instead of expect/actual (to split up different engines.
 - JavaFX support moved to a separate module
 - Threejs support moved to a separate module
-- \[Breaking change!\] Stylesheets are moved into properties under `@stylesheet` key
+- \[Format breaking change!\] Stylesheets are moved into properties under `@stylesheet` key
 
 ### Deprecated
 
diff --git a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt
index 73af1875..9027b26a 100644
--- a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt
+++ b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt
@@ -1,7 +1,6 @@
 package ru.mipt.npm.muon.monitor
 
 import hep.dataforge.vision.removeAll
-import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.*
 import ru.mipt.npm.muon.monitor.Monitor.CENTRAL_LAYER_Z
 import ru.mipt.npm.muon.monitor.Monitor.LOWER_LAYER_Z
@@ -63,7 +62,6 @@ class Model {
 
     fun reset() {
         map.values.forEach {
-            it.config
             it.setProperty(SolidMaterial.MATERIAL_COLOR_KEY, null)
         }
         tracks.removeAll()
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
index 4d3ea1f3..e7a6d971 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
@@ -11,7 +11,7 @@ import hep.dataforge.names.plus
  */
 public inline class StyleSheet(private val owner: VisionGroup) {
 
-    private val styleNode get() = owner.properties?.get(STYLESHEET_KEY).node
+    private val styleNode get() = owner.getOwnProperty(STYLESHEET_KEY).node
 
     public val items: Map<NameToken, Meta>? get() = styleNode?.items?.mapValues { it.value.node ?: Meta.EMPTY }
 
@@ -21,11 +21,7 @@ public inline class StyleSheet(private val owner: VisionGroup) {
      * Define a style without notifying owner
      */
     public fun define(key: String, style: Meta?) {
-        if (style == null) {
-            styleNode?.remove(key)
-        } else {
-            owner.config[STYLESHEET_KEY + key] = style
-        }
+        owner.setProperty(STYLESHEET_KEY + key, style)
     }
 
     /**
@@ -58,7 +54,7 @@ internal fun Vision.styleChanged(key: String, oldStyle: Meta?, newStyle: Meta?)
         val tokens: Collection<Name> =
             ((oldStyle?.items?.keys ?: emptySet()) + (newStyle?.items?.keys ?: emptySet()))
                 .map { it.asName() }
-        tokens.forEach { parent?.propertyChanged(it) }
+        tokens.forEach { parent?.notifyPropertyChanged(it) }
     }
     if (this is VisionGroup) {
         for (obj in this) {
@@ -78,7 +74,7 @@ public val VisionGroup.styleSheet: StyleSheet get() = StyleSheet(this)
  * Add style name to the list of styles to be resolved later. The style with given name does not necessary exist at the moment.
  */
 public fun Vision.useStyle(name: String) {
-    styles = (properties[Vision.STYLE_KEY]?.stringList ?: emptyList()) + name
+    styles = (getOwnProperty(Vision.STYLE_KEY)?.stringList ?: emptyList()) + name
 }
 
 
@@ -86,7 +82,7 @@ public fun Vision.useStyle(name: String) {
  * Find a style with given name for given [Vision]. The style is not necessary applied to this [Vision].
  */
 public tailrec fun Vision.getStyle(name: String): Meta? =
-    properties?.get(StyleSheet.STYLESHEET_KEY + name).node ?: parent?.getStyle(name)
+    getOwnProperty(StyleSheet.STYLESHEET_KEY + name).node ?: parent?.getStyle(name)
 
 /**
  * Resolve an item in all style layers
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 058a04b3..4baa5b8a 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -10,13 +10,14 @@ import hep.dataforge.provider.Type
 import hep.dataforge.values.asValue
 import hep.dataforge.vision.Vision.Companion.TYPE
 import hep.dataforge.vision.Vision.Companion.VISIBLE_KEY
+import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.Transient
 
 /**
  * A root type for display hierarchy
  */
 @Type(TYPE)
-public interface Vision : Configurable, Described {
+public interface Vision : Described {
 
     /**
      * The parent object of this one. If null, this one is a root.
@@ -25,42 +26,52 @@ public interface Vision : Configurable, Described {
     public var parent: VisionGroup?
 
     /**
-     * Nullable version of [config] used to check if this [Vision] has custom properties
+     * A fast accessor method to get own property (no inheritance or styles
      */
-    public val properties: Config?
+    public fun getOwnProperty(name: Name): MetaItem<*>?
 
     /**
-     * All properties including styles and prototypes if present, including inherited ones
+     * Get property.
+     * @param inherit toggles parent node property lookup
+     * @param includeStyles toggles inclusion of
      */
-    public val allProperties: Laminate
+    public fun getProperty(
+        name: Name,
+        inherit: Boolean = true,
+        includeStyles: Boolean = true,
+        includeDefaults: Boolean = true,
+    ): MetaItem<*>?
+
 
     /**
-     * Get property (including styles). [inherit] toggles parent node property lookup
+     * Set the property value
      */
-    public fun getProperty(name: Name, inherit: Boolean = true): MetaItem<*>?
+    public fun setProperty(name: Name, item: MetaItem<*>?)
 
     /**
-     * Trigger property invalidation event. If [name] is empty, notify that the whole object is changed
+     * Flow of property invalidation events. It does not contain property values after invalidation since it is not clear
+     * if it should include inherited properties etc.
      */
-    public fun propertyChanged(name: Name): Unit
+    public val propertyInvalidated: Flow<Name>
+
 
     /**
-     * Add listener triggering on property change
+     * Notify all listeners that a property has been changed and should be invalidated
      */
-    public fun onPropertyChange(owner: Any?, action: (Name) -> Unit): Unit
-
-    /**
-     * Remove change listeners with given owner.
-     */
-    public fun removeChangeListener(owner: Any?)
+    public fun notifyPropertyChanged(propertyName: Name): Unit
 
     /**
      * List of names of styles applied to this object. Order matters. Not inherited.
      */
     public var styles: List<String>
-        get() = properties[STYLE_KEY]?.stringList ?: emptyList()
+        get() = getProperty(
+            STYLE_KEY,
+            inherit = false,
+            includeStyles = false,
+            includeDefaults = true
+        )?.stringList ?: emptyList()
         set(value) {
-            config[STYLE_KEY] = value
+            setProperty(STYLE_KEY, value)
         }
 
     /**
@@ -78,24 +89,42 @@ public interface Vision : Configurable, Described {
     }
 }
 
+/**
+ * Convenient accessor for all properties of a vision. Provided properties include styles and defaults, but do not inherit.
+ */
+public val Vision.properties: MutableItemProvider
+    get() = object : MutableItemProvider {
+        override fun getItem(name: Name): MetaItem<*>? = getProperty(name,
+            inherit = false,
+            includeStyles = true,
+            includeDefaults = true
+        )
+
+        override fun setItem(name: Name, item: MetaItem<*>?): Unit = setProperty(name, item)
+    }
+
 /**
  * Get [Vision] property using key as a String
  */
-public fun Vision.getProperty(key: String, inherit: Boolean = true): MetaItem<*>? =
-    getProperty(key.toName(), inherit)
+public fun Vision.getProperty(
+    key: String,
+    inherit: Boolean = true,
+    includeStyles: Boolean = true,
+    includeDefaults: Boolean = true,
+): MetaItem<*>? = getProperty(key.toName(), inherit, includeStyles, includeDefaults)
 
 /**
  * A convenience method to pair [getProperty]
  */
 public fun Vision.setProperty(key: Name, value: Any?) {
-    config[key] = value
+    properties[key] = value
 }
 
 /**
  * A convenience method to pair [getProperty]
  */
 public fun Vision.setProperty(key: String, value: Any?) {
-    config[key] = value
+    properties[key] = value
 }
 
 /**
@@ -103,27 +132,7 @@ public fun Vision.setProperty(key: String, value: Any?) {
  */
 public var Vision.visible: Boolean?
     get() = getProperty(VISIBLE_KEY).boolean
-    set(value) = config.setValue(VISIBLE_KEY, value?.asValue())
-
-///**
-// * Convenience delegate for properties
-// */
-//public fun Vision.property(
-//    default: MetaItem<*>? = null,
-//    key: Name? = null,
-//    inherit: Boolean = true,
-//): MutableItemDelegate =
-//    object : ReadWriteProperty<Any?, MetaItem<*>?> {
-//        override fun getValue(thisRef: Any?, property: KProperty<*>): MetaItem<*>? {
-//            val name = key ?: property.name.toName()
-//            return getProperty(name, inherit) ?: default
-//        }
-//
-//        override fun setValue(thisRef: Any?, property: KProperty<*>, value: MetaItem<*>?) {
-//            val name = key ?: property.name.toName()
-//            setProperty(name, value)
-//        }
-//    }
+    set(value) = setProperty(VISIBLE_KEY, value?.asValue())
 
 public fun Vision.props(inherit: Boolean = true): MutableItemProvider = object : MutableItemProvider {
     override fun getItem(name: Name): MetaItem<*>? {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index 6127479c..19080b67 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -3,15 +3,18 @@ package hep.dataforge.vision
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.descriptors.defaultItem
-import hep.dataforge.meta.descriptors.defaultMeta
 import hep.dataforge.meta.descriptors.get
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.values.ValueType
 import hep.dataforge.vision.Vision.Companion.STYLE_KEY
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
+import kotlin.jvm.Synchronized
 
 internal data class PropertyListener(
     val owner: Any? = null,
@@ -28,83 +31,89 @@ public open class VisionBase : Vision {
     /**
      * Object own properties excluding styles and inheritance
      */
-    override var properties: Config? = null
-        protected set
+    @SerialName("properties")
+    private var _properties: Config? = null
 
-    override val descriptor: NodeDescriptor? get() = null
+    /**
+     * All own properties as a read-only Meta
+     */
+    public val ownProperties: Meta get() = _properties?: Meta.EMPTY
 
-    protected fun updateStyles(names: List<String>) {
-        names.mapNotNull { getStyle(it) }.asSequence()
-            .flatMap { it.items.asSequence() }
-            .distinctBy { it.key }
-            .forEach {
-                propertyChanged(it.key.asName())
+    @Synchronized
+    private fun getOrCreateConfig(): Config {
+        if (_properties == null) {
+            val newProperties = Config()
+            _properties = newProperties
+            newProperties.onChange(this) { name, oldItem, newItem ->
+                if (oldItem != newItem) {
+                    notifyPropertyChanged(name)
+                }
             }
+        }
+        return _properties!!
     }
 
     /**
-     * The config is initialized and assigned on-demand.
-     * To avoid unnecessary allocations, one should access [getAllProperties] via [getProperty] instead.
+     * A fast accessor method to get own property (no inheritance or styles
      */
-    override val config: Config by lazy {
-        properties ?: Config().also { config ->
-            properties = config.also {
-                it.onChange(this) { name, _, _ -> propertyChanged(name) }
-            }
+    override fun getOwnProperty(name: Name): MetaItem<*>? {
+        return _properties?.getItem(name)
+    }
+
+    override fun getProperty(
+        name: Name,
+        inherit: Boolean,
+        includeStyles: Boolean,
+        includeDefaults: Boolean,
+    ): MetaItem<*>? = sequence {
+        yield(getOwnProperty(name))
+        if (includeStyles) {
+            yieldAll(getStyleItems(name))
         }
-    }
-
-    @Transient
-    private val listeners = HashSet<PropertyListener>()
-
-    override fun propertyChanged(name: Name) {
-        if (name == STYLE_KEY) {
-            updateStyles(properties?.get(STYLE_KEY)?.stringList ?: emptyList())
-        }
-        for (listener in listeners) {
-            listener.action(name)
-        }
-    }
-
-    override fun onPropertyChange(owner: Any?, action: (Name) -> Unit) {
-        listeners.add(PropertyListener(owner, action))
-    }
-
-    override fun removeChangeListener(owner: Any?) {
-        listeners.removeAll { owner == null || it.owner == owner }
-    }
-
-    /**
-     * All available properties in a layered form
-     */
-    override val allProperties: Laminate
-        get() = Laminate(
-            properties,
-            allStyles,
-            parent?.allProperties,
-            descriptor?.defaultMeta(),
-        )
-
-    override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? = sequence {
-        yield(properties?.get(name))
-        yieldAll(getStyleItems(name))
         if (inherit) {
             yield(parent?.getProperty(name, inherit))
         }
         yield(descriptor?.get(name)?.defaultItem())
     }.merge()
 
-    /**
-     * Reset all properties to their default values
-     */
-    public fun resetProperties() {
-        properties?.removeListener(this)
-        properties = null
+    @Synchronized
+    override fun setProperty(name: Name, item: MetaItem<*>?) {
+        getOrCreateConfig().setItem(name, item)
+        notifyPropertyChanged(name)
+    }
+
+    override val descriptor: NodeDescriptor? get() = null
+
+    private fun updateStyles(names: List<String>) {
+        names.mapNotNull { getStyle(it) }.asSequence()
+            .flatMap { it.items.asSequence() }
+            .distinctBy { it.key }
+            .forEach {
+                notifyPropertyChanged(it.key.asName())
+            }
+    }
+
+    private val _propertyInvalidationFlow: MutableSharedFlow<Name> = MutableSharedFlow(
+        onBufferOverflow = BufferOverflow.DROP_OLDEST
+    )
+
+    override val propertyInvalidated: SharedFlow<Name> get() = _propertyInvalidationFlow
+
+    override fun notifyPropertyChanged(propertyName: Name) {
+        if (propertyName == STYLE_KEY) {
+            updateStyles(properties.getItem(STYLE_KEY)?.stringList ?: emptyList())
+        }
+
+        _propertyInvalidationFlow.tryEmit(propertyName)
+    }
+
+    public fun configure(block: MutableMeta<*>.() -> Unit) {
+        getOrCreateConfig().block()
     }
 
     override fun update(change: VisionChange) {
-        change.propertyChange[Name.EMPTY]?.let {
-            config.update(it)
+        change.properties?.let {
+            getOrCreateConfig().update(it)
         }
     }
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
index ca7396a7..f2ac5d6b 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
@@ -6,7 +6,10 @@ import hep.dataforge.names.plus
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlinx.serialization.*
+import kotlin.jvm.Synchronized
 import kotlin.time.Duration
 
 /**
@@ -14,29 +17,41 @@ import kotlin.time.Duration
  */
 public class VisionChangeBuilder : VisionContainerBuilder<Vision> {
 
-    private val propertyChange = HashMap<Name, Config>()
-    private val childrenChange = HashMap<Name, Vision?>()
+    private var reset: Boolean = false
+    private var vision: Vision? = null
+    private val propertyChange = Config()
+    private val children: HashMap<Name, VisionChangeBuilder> = HashMap()
 
-    public fun isEmpty(): Boolean = propertyChange.isEmpty() && childrenChange.isEmpty()
+    public fun isEmpty(): Boolean = propertyChange.isEmpty() && propertyChange.isEmpty() && children.isEmpty()
+
+    @Synchronized
+    private fun getOrPutChild(visionName: Name): VisionChangeBuilder =
+        children.getOrPut(visionName) { VisionChangeBuilder() }
 
     public fun propertyChanged(visionName: Name, propertyName: Name, item: MetaItem<*>?) {
-        propertyChange
-            .getOrPut(visionName) { Config() }
-            .setItem(propertyName, item)
+        if (visionName == Name.EMPTY) {
+            propertyChange[propertyName] = item
+        } else {
+            getOrPutChild(visionName).propertyChanged(Name.EMPTY, propertyName, item)
+        }
     }
 
     override fun set(name: Name, child: Vision?) {
-        childrenChange[name] = child
+        getOrPutChild(name).apply {
+            vision = child
+            reset = vision == null
+        }
     }
 
     /**
      * Isolate collected changes by creating detached copies of given visions
      */
     public fun isolate(manager: VisionManager): VisionChange = VisionChange(
-        propertyChange.mapValues { it.value.seal() },
-        childrenChange.mapValues { it.value?.isolate(manager) }
+        reset,
+        vision?.isolate(manager),
+        if (propertyChange.isEmpty()) null else propertyChange.seal(),
+        if (children.isEmpty()) null else children.mapValues { it.value.isolate(manager) }
     )
-    //TODO optimize isolation for visions without parents?
 }
 
 private fun Vision.isolate(manager: VisionManager): Vision {
@@ -46,16 +61,13 @@ private fun Vision.isolate(manager: VisionManager): Vision {
 }
 
 @Serializable
-public data class VisionChange(
-    val propertyChange: Map<Name, @Serializable(MetaSerializer::class) Meta>,
-    val childrenChange: Map<Name, Vision?>,
+public class VisionChange(
+    public val reset: Boolean = false,
+    public val vision: Vision? = null,
+    public val properties: Meta? = null,
+    public val children: Map<Name, VisionChange>? = null,
 ) {
-    public fun isEmpty(): Boolean = propertyChange.isEmpty() && childrenChange.isEmpty()
 
-    /**
-     * A shortcut to the top level property dif
-     */
-    public val properties: Meta? get() = propertyChange[Name.EMPTY]
 }
 
 public inline fun VisionChange(manager: VisionManager, block: VisionChangeBuilder.() -> Unit): VisionChange =
@@ -69,17 +81,10 @@ private fun CoroutineScope.collectChange(
 ) {
 
     //Collect properties change
-    source.config.onChange(this) { propertyName, oldItem, newItem ->
-        if (oldItem != newItem) {
-            launch {
-                collector().propertyChanged(name, propertyName, newItem)
-            }
-        }
-    }
-
-    coroutineContext[Job]?.invokeOnCompletion {
-        source.config.removeListener(this)
-    }
+    source.propertyInvalidated.onEach { propertyName ->
+        val newItem = source.getProperty(propertyName, inherit = false, includeStyles = false, includeDefaults = false)
+        collector().propertyChanged(name, propertyName, newItem)
+    }.launchIn(this)
 
     if (source is VisionGroup) {
         //Subscribe for children changes
@@ -89,17 +94,12 @@ private fun CoroutineScope.collectChange(
 
         //Subscribe for structure change
         if (source is MutableVisionGroup) {
-            source.onStructureChange(this) { token, before, after ->
-                before?.removeChangeListener(this)
-                (before as? MutableVisionGroup)?.removeStructureChangeListener(this)
+            source.structureChanges.onEach { (token, _, after) ->
                 if (after != null) {
                     collectChange(name + token, after, collector)
                 }
                 collector()[name + token] = after
-            }
-            coroutineContext[Job]?.invokeOnCompletion {
-                source.removeStructureChangeListener(this)
-            }
+            }.launchIn(this)
         }
     }
 }
@@ -111,17 +111,19 @@ public fun Vision.flowChanges(
 ): Flow<VisionChange> = flow {
 
     var collector = VisionChangeBuilder()
-    manager.context.collectChange(Name.EMPTY, this@flowChanges) { collector }
+    coroutineScope {
+        collectChange(Name.EMPTY, this@flowChanges) { collector }
 
-    while (currentCoroutineContext().isActive) {
-        //Wait for changes to accumulate
-        delay(collectionDuration)
-        //Propagate updates only if something is changed
-        if (!collector.isEmpty()) {
-            //emit changes
-            emit(collector.isolate(manager))
-            //Reset the collector
-            collector = VisionChangeBuilder()
+        while (currentCoroutineContext().isActive) {
+            //Wait for changes to accumulate
+            delay(collectionDuration)
+            //Propagate updates only if something is changed
+            if (!collector.isEmpty()) {
+                //emit changes
+                emit(collector.isolate(manager))
+                //Reset the collector
+                collector = VisionChangeBuilder()
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
index fdfb9e7a..75855eb1 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
@@ -2,6 +2,7 @@ package hep.dataforge.vision
 
 import hep.dataforge.names.*
 import hep.dataforge.provider.Provider
+import kotlinx.coroutines.flow.Flow
 
 public interface VisionContainer<out V : Vision> {
     public operator fun get(name: Name): V?
@@ -75,19 +76,12 @@ public interface VisionContainerBuilder<in V : Vision> {
  */
 public interface MutableVisionGroup : VisionGroup, VisionContainerBuilder<Vision> {
 
-    /**
-     * Add listener for children structure change.
-     * @param owner the handler to properly remove listeners
-     * @param action First argument of the action is the name of changed child. Second argument is the new value of the object.
-     */
-    public fun onStructureChange(owner: Any?, action: (token: NameToken, before: Vision?, after: Vision?) -> Unit)
+    public data class StructureChange(val token: NameToken, val before: Vision?, val after: Vision?)
 
     /**
-     * Remove children change listener
+     * Flow structure changes of this group. Unconsumed changes are discarded
      */
-    public fun removeStructureChangeListener(owner: Any?)
-
-//    public operator fun set(name: Name, child: Vision?)
+    public val structureChanges: Flow<StructureChange>
 }
 
 public operator fun <V : Vision> VisionContainer<V>.get(str: String): V? = get(str.toName())
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
index 996b0853..a1170b48 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
@@ -1,7 +1,9 @@
 package hep.dataforge.vision
 
-import hep.dataforge.meta.configure
 import hep.dataforge.names.*
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
@@ -26,54 +28,25 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
      */
     override val children: Map<NameToken, Vision> get() = childrenInternal
 
-    override fun propertyChanged(name: Name) {
-        super.propertyChanged(name)
+    override fun notifyPropertyChanged(propertyName: Name) {
+        super.notifyPropertyChanged(propertyName)
         for (obj in this) {
-            obj.propertyChanged(name)
+            obj.notifyPropertyChanged(propertyName)
         }
     }
 
-    private data class StructureChangeListener(
-        val owner: Any?,
-        val callback: (token: NameToken, before: Vision?, after: Vision?) -> Unit,
+    @Transient
+    private val _structureChanges: MutableSharedFlow<MutableVisionGroup.StructureChange> = MutableSharedFlow(
+        onBufferOverflow = BufferOverflow.DROP_OLDEST
     )
 
-    @Transient
-    private val structureChangeListeners = HashSet<StructureChangeListener>()
-
-    /**
-     * Add listener for children change
-     */
-    override fun onStructureChange(owner: Any?, action: (token: NameToken, before: Vision?, after: Vision?) -> Unit) {
-        structureChangeListeners.add(
-            StructureChangeListener(
-                owner,
-                action
-            )
-        )
-    }
-
-    /**
-     * Remove children change listener
-     */
-    override fun removeStructureChangeListener(owner: Any?) {
-        structureChangeListeners.removeAll { owner == null || it.owner === owner }
-    }
+    override val structureChanges: SharedFlow<MutableVisionGroup.StructureChange> get() = _structureChanges
 
     /**
      * Propagate children change event upwards
      */
-    protected fun childrenChanged(name: NameToken, before: Vision?, after: Vision?) {
-        structureChangeListeners.forEach { it.callback(name, before, after) }
-    }
-
-    /**
-     * Remove a child with given name token
-     */
-    public fun removeChild(token: NameToken): Vision? {
-        val removed = childrenInternal.remove(token)
-        removed?.parent = null
-        return removed
+    private fun childrenChanged(name: NameToken, before: Vision?, after: Vision?) {
+        _structureChanges.tryEmit(MutableVisionGroup.StructureChange(name, before, after))
     }
 
     /**
@@ -91,12 +64,22 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
     /**
      * Set parent for given child and attach it
      */
-    private fun attachChild(token: NameToken, child: Vision) {
-        if (child.parent == null) {
-            child.parent = this
-            childrenInternal[token] = child
-        } else if (child.parent !== this) {
-            error("Can't reassign existing parent for $child")
+    private fun attachChild(token: NameToken, child: Vision?) {
+        val before = children[token]
+        when {
+            child == null -> {
+                childrenInternal.remove(token)
+            }
+            child.parent == null -> {
+                child.parent = this
+                childrenInternal[token] = child
+            }
+            child.parent !== this -> {
+                error("Can't reassign existing parent for $child")
+            }
+        }
+        if (before != child) {
+            childrenChanged(token, before, child)
         }
     }
 
@@ -133,13 +116,7 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
             }
             name.length == 1 -> {
                 val token = name.tokens.first()
-                val before = children[token]
-                if (child == null) {
-                    removeChild(token)
-                } else {
-                    attachChild(token, child)
-                }
-                childrenChanged(token, before, child)
+                attachChild(token, child)
             }
             else -> {
                 //TODO add safety check
@@ -150,18 +127,12 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
     }
 
     override fun update(change: VisionChange) {
-        //update stylesheet
-//            val changeStyleSheet = change.styleSheet
-//            if (changeStyleSheet != null) {
-//                styleSheet {
-//                    update(changeStyleSheet)
-//                }
-//            }
-        change.propertyChange.forEach {(childName,configChange)->
-            get(childName)?.configure(configChange)
-        }
-        change.childrenChange.forEach { (name, child) ->
-            set(name, child)
+        change.children?.forEach { (name, change) ->
+            when {
+                change.reset -> set(name, null)
+                change.vision != null -> set(name, change.vision)
+                else -> get(name)?.update(change)
+            }
         }
         super.update(change)
     }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
index 0e17c123..7c9a4521 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
@@ -1,9 +1,7 @@
 package hep.dataforge.vision
 
-import hep.dataforge.meta.Laminate
-import hep.dataforge.meta.MetaItem
+import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.meta.node
 import hep.dataforge.names.Name
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.asValue
@@ -30,4 +28,20 @@ public inline fun <reified E : Enum<E>> NodeDescriptor.enum(key: Name, default:
         default(default)
     }
     allowedValues = enumValues<E>().map { it.asValue() }
-}
\ No newline at end of file
+}
+
+@DFExperimental
+public val Vision.ownProperties: Meta?
+    get() = (this as? VisionBase)?.ownProperties
+
+@DFExperimental
+public val Vision.describedProperties: Meta
+    get() = Meta {
+        descriptor?.items?.forEach { (key, _) ->
+            key put getProperty(key)
+        }
+    }
+
+public fun Vision.configure(meta: Meta?): Unit = update(VisionChange(properties = meta))
+
+public fun Vision.configure(block: MutableMeta<*>.() -> Unit): Unit = configure(Meta(block))
\ No newline at end of file
diff --git a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
index 0d40205a..0937bd64 100644
--- a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
+++ b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
@@ -1,7 +1,6 @@
 package hep.dataforge.vision.html
 
 import hep.dataforge.meta.DFExperimental
-import hep.dataforge.meta.configure
 import hep.dataforge.meta.set
 import hep.dataforge.vision.VisionBase
 import kotlinx.html.*
@@ -35,7 +34,7 @@ class HtmlTagTest {
         div {
             h2 { +"Properties" }
             ul {
-                vision.properties?.items?.forEach {
+                (vision as? VisionBase)?.ownProperties?.items?.forEach {
                     li {
                         a { +it.key.toString() }
                         p { +it.value.toString() }
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
index 251130c2..e8b22dbe 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
@@ -1,12 +1,8 @@
 package hep.dataforge.vision.editor
 
-import hep.dataforge.meta.Config
-import hep.dataforge.meta.Meta
+import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.meta.update
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.getStyle
-import hep.dataforge.vision.setProperty
+import hep.dataforge.vision.*
 import javafx.beans.binding.Binding
 import javafx.beans.property.SimpleObjectProperty
 import javafx.scene.Node
@@ -23,8 +19,8 @@ class VisualObjectEditorFragment(val selector: (Vision) -> Meta) : Fragment() {
     constructor(
         item: Vision?,
         descriptor: NodeDescriptor?,
-        selector: (Vision) -> Config = { it.config }
-    ) : this(selector) {
+        selector: (Vision) -> MutableItemProvider = { it.properties }
+    ) : this({it.describedProperties}) {
         this.item = item
         this.descriptorProperty.set(descriptor)
     }
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
index 3f863a34..ce88a14c 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
@@ -45,7 +45,7 @@ class FX3DPlugin : AbstractPlugin() {
     fun buildNode(obj: Solid): Node {
         val binding = VisualObjectFXBinding(obj)
         return when (obj) {
-            is SolidReference -> referenceFactory(obj, binding)
+            is SolidReferenceGroup -> referenceFactory(obj, binding)
             is SolidGroup -> {
                 Group(obj.children.mapNotNull { (token, obj) ->
                     (obj as? Solid)?.let {
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
index 7c7258ac..77244de2 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
@@ -6,15 +6,15 @@ import javafx.scene.Group
 import javafx.scene.Node
 import kotlin.reflect.KClass
 
-class FXReferenceFactory(val plugin: FX3DPlugin) : FX3DFactory<SolidReference> {
-    override val type: KClass<in SolidReference> get() = SolidReference::class
+class FXReferenceFactory(val plugin: FX3DPlugin) : FX3DFactory<SolidReferenceGroup> {
+    override val type: KClass<in SolidReferenceGroup> get() = SolidReferenceGroup::class
 
-    override fun invoke(obj: SolidReference, binding: VisualObjectFXBinding): Node {
+    override fun invoke(obj: SolidReferenceGroup, binding: VisualObjectFXBinding): Node {
         val prototype = obj.prototype
         val node = plugin.buildNode(prototype)
 
         obj.onPropertyChange(this) { name->
-            if (name.firstOrNull()?.body == SolidReference.REFERENCE_CHILD_PROPERTY_PREFIX) {
+            if (name.firstOrNull()?.body == SolidReferenceGroup.REFERENCE_CHILD_PROPERTY_PREFIX) {
                 val childName = name.firstOrNull()?.index?.toName() ?: error("Wrong syntax for reference child property: '$name'")
                 val propertyName = name.cutFirst()
                 val referenceChild = obj[childName] ?: error("Reference child with name '$childName' not found")
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
index d3dd5b3a..58ec3b51 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
@@ -2,12 +2,12 @@ package hep.dataforge.vision.gdml
 
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.MetaBuilder
-import hep.dataforge.meta.set
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
 import hep.dataforge.names.toName
 import hep.dataforge.vision.set
+import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
 import hep.dataforge.vision.styleSheet
@@ -51,13 +51,13 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
     private val proto = SolidGroup()
 
     private val solids = proto.group(solidsName) {
-        config["edges.enabled"] = false
+        setProperty("edges.enabled", false)
     }
 
 
-    private val referenceStore = HashMap<Name, MutableList<SolidReference>>()
+    private val referenceStore = HashMap<Name, MutableList<SolidReferenceGroup>>()
 
-    private fun proxySolid(root: GDML, group: SolidGroup, solid: GDMLSolid, name: String): SolidReference {
+    private fun proxySolid(root: GDML, group: SolidGroup, solid: GDMLSolid, name: String): SolidReferenceGroup {
         val templateName = solidsName + name
         if (proto[templateName] == null) {
             solids.addSolid(root, solid, name)
@@ -67,7 +67,7 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
         return ref
     }
 
-    private fun proxyVolume(root: GDML, group: SolidGroup, physVolume: GDMLPhysVolume, volume: GDMLGroup): SolidReference {
+    private fun proxyVolume(root: GDML, group: SolidGroup, physVolume: GDMLPhysVolume, volume: GDMLGroup): SolidReferenceGroup {
         val templateName = volumesName + volume.name.asName()
         if (proto[templateName] == null) {
             proto[templateName] = volume(root, volume)
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
index 692c334b..bec3822c 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
@@ -2,16 +2,10 @@ package hep.dataforge.vision.gdml
 
 import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.sequence
-import hep.dataforge.meta.set
-import hep.dataforge.names.Name
-import hep.dataforge.names.toName
-import hep.dataforge.vision.*
+import hep.dataforge.vision.Vision
+import hep.dataforge.vision.ownProperties
+import hep.dataforge.vision.properties
 import hep.dataforge.vision.solid.*
-import hep.dataforge.vision.visitor.VisionVisitor
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.coroutineScope
-import mu.KotlinLogging
 
 public expect class Counter() {
     public fun get(): Int
@@ -24,6 +18,7 @@ private fun Point3D?.safePlus(other: Point3D?): Point3D? = if (this == null && o
     (this ?: Point3D(0, 0, 0)) + (other ?: Point3D(0, 0, 0))
 }
 
+@DFExperimental
 internal fun Vision.updateFrom(other: Vision): Vision {
     if (this is Solid && other is Solid) {
         position = position.safePlus(other.position)
@@ -33,9 +28,9 @@ internal fun Vision.updateFrom(other: Vision): Vision {
             scaleY = scaleY.toDouble() * other.scaleY.toDouble()
             scaleZ = scaleZ.toDouble() * other.scaleZ.toDouble()
         }
-        other.properties?.sequence()?.forEach { (name, item) ->
-            if (properties?.getItem(name) == null) {
-                config[name] = item
+        other.ownProperties?.sequence()?.forEach { (name, item) ->
+            if (properties.getItem(name) == null) {
+                setProperty(name, item)
             }
         }
     }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
index 9264ee99..dacc79bd 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
@@ -1,4 +1,3 @@
-
 package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.update
@@ -18,7 +17,7 @@ public enum class CompositeType {
 public class Composite(
     public val compositeType: CompositeType,
     public val first: Solid,
-    public val second: Solid
+    public val second: Solid,
 ) : SolidBase(), Solid, VisionGroup {
 
     init {
@@ -34,15 +33,13 @@ public class Composite(
 public inline fun VisionContainerBuilder<Solid>.composite(
     type: CompositeType,
     name: String = "",
-    builder: SolidGroup.() -> Unit
+    builder: SolidGroup.() -> Unit,
 ): Composite {
     val group = SolidGroup().apply(builder)
     val children = group.children.values.filterIsInstance<Solid>()
     if (children.size != 2) error("Composite requires exactly two children")
     return Composite(type, children[0], children[1]).also {
-        it.config.update(group.config)
-        //it.material = group.material
-
+        it.configure { update(group.ownProperties) }
         if (group.position != null) {
             it.position = group.position
         }
@@ -65,5 +62,8 @@ public inline fun VisionContainerBuilder<Solid>.subtract(name: String = "", buil
     composite(CompositeType.SUBTRACT, name, builder = builder)
 
 @VisionBuilder
-public inline fun VisionContainerBuilder<Solid>.intersect(name: String = "", builder: SolidGroup.() -> Unit): Composite =
+public inline fun VisionContainerBuilder<Solid>.intersect(
+    name: String = "",
+    builder: SolidGroup.() -> Unit,
+): Composite =
     composite(CompositeType.INTERSECT, name, builder = builder)
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
index 278cc9e7..a342c961 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
@@ -1,18 +1,17 @@
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.*
+import hep.dataforge.meta.boolean
 import hep.dataforge.meta.descriptors.NodeDescriptor
+import hep.dataforge.meta.enum
+import hep.dataforge.meta.int
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.asValue
-import hep.dataforge.vision.Vision
+import hep.dataforge.vision.*
 import hep.dataforge.vision.Vision.Companion.VISIBLE_KEY
-import hep.dataforge.vision.VisionBuilder
-import hep.dataforge.vision.enum
 import hep.dataforge.vision.layout.Output
-import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.Solid.Companion.DETAIL_KEY
 import hep.dataforge.vision.solid.Solid.Companion.IGNORE_KEY
 import hep.dataforge.vision.solid.Solid.Companion.LAYER_KEY
@@ -90,7 +89,7 @@ public interface Solid : Vision {
             var result = +(solid.position?.hashCode() ?: 0)
             result = 31 * result + (solid.rotation?.hashCode() ?: 0)
             result = 31 * result + (solid.scale?.hashCode() ?: 0)
-            result = 31 * result + (solid.properties?.hashCode() ?: 0)
+            result = 31 * result + solid.properties.hashCode()
             return result
         }
     }
@@ -100,9 +99,9 @@ public interface Solid : Vision {
  * Get the layer number this solid belongs to. Return 0 if layer is not defined.
  */
 public var Solid.layer: Int
-    get() = properties?.getItem(LAYER_KEY).int ?: 0
+    get() = properties.getItem(LAYER_KEY).int ?: 0
     set(value) {
-        config[LAYER_KEY] = value.asValue()
+        setProperty(LAYER_KEY, value)
     }
 
 @VisionBuilder
@@ -153,21 +152,21 @@ public var Solid.x: Number
     get() = position?.x ?: 0f
     set(value) {
         position().x = value.toDouble()
-        propertyChanged(Solid.X_POSITION_KEY)
+        notifyPropertyChanged(Solid.X_POSITION_KEY)
     }
 
 public var Solid.y: Number
     get() = position?.y ?: 0f
     set(value) {
         position().y = value.toDouble()
-        propertyChanged(Solid.Y_POSITION_KEY)
+        notifyPropertyChanged(Solid.Y_POSITION_KEY)
     }
 
 public var Solid.z: Number
     get() = position?.z ?: 0f
     set(value) {
         position().z = value.toDouble()
-        propertyChanged(Solid.Z_POSITION_KEY)
+        notifyPropertyChanged(Solid.Z_POSITION_KEY)
     }
 
 private fun Solid.rotation(): Point3D =
@@ -177,21 +176,21 @@ public var Solid.rotationX: Number
     get() = rotation?.x ?: 0f
     set(value) {
         rotation().x = value.toDouble()
-        propertyChanged(Solid.X_ROTATION_KEY)
+        notifyPropertyChanged(Solid.X_ROTATION_KEY)
     }
 
 public var Solid.rotationY: Number
     get() = rotation?.y ?: 0f
     set(value) {
         rotation().y = value.toDouble()
-        propertyChanged(Solid.Y_ROTATION_KEY)
+        notifyPropertyChanged(Solid.Y_ROTATION_KEY)
     }
 
 public var Solid.rotationZ: Number
     get() = rotation?.z ?: 0f
     set(value) {
         rotation().z = value.toDouble()
-        propertyChanged(Solid.Z_ROTATION_KEY)
+        notifyPropertyChanged(Solid.Z_ROTATION_KEY)
     }
 
 private fun Solid.scale(): Point3D =
@@ -201,19 +200,19 @@ public var Solid.scaleX: Number
     get() = scale?.x ?: 1f
     set(value) {
         scale().x = value.toDouble()
-        propertyChanged(Solid.X_SCALE_KEY)
+        notifyPropertyChanged(Solid.X_SCALE_KEY)
     }
 
 public var Solid.scaleY: Number
     get() = scale?.y ?: 1f
     set(value) {
         scale().y = value.toDouble()
-        propertyChanged(Solid.Y_SCALE_KEY)
+        notifyPropertyChanged(Solid.Y_SCALE_KEY)
     }
 
 public var Solid.scaleZ: Number
     get() = scale?.z ?: 1f
     set(value) {
         scale().z = value.toDouble()
-        propertyChanged(Solid.Z_SCALE_KEY)
+        notifyPropertyChanged(Solid.Z_SCALE_KEY)
     }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index b87cdaab..e4b9f0f7 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -1,6 +1,6 @@
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.Config
+import hep.dataforge.meta.MetaItem
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.names.Name
 import hep.dataforge.names.NameToken
@@ -87,7 +87,10 @@ public tailrec fun PrototypeHolder.getPrototype(name: Name): Solid? =
     prototypes?.get(name) as? Solid ?: (parent as? PrototypeHolder)?.getPrototype(name)
 
 @VisionBuilder
-public fun VisionContainerBuilder<Vision>.group(name: Name = Name.EMPTY, action: SolidGroup.() -> Unit = {}): SolidGroup =
+public fun VisionContainerBuilder<Vision>.group(
+    name: Name = Name.EMPTY,
+    action: SolidGroup.() -> Unit = {},
+): SolidGroup =
     SolidGroup().apply(action).also { set(name, it) }
 
 /**
@@ -104,15 +107,10 @@ internal class Prototypes(
     children: Map<NameToken, Vision> = emptyMap(),
 ) : VisionGroupBase(), PrototypeHolder {
 
-    init {
-        this.childrenInternal.putAll(children)
-    }
+    override var parent: VisionGroup? = null
 
-    override var properties: Config?
-        get() = null
-        set(_) {
-            error("Can't define properties for prototypes block")
-        }
+    private val _children = HashMap(children)
+    override val children: Map<NameToken, Vision> get() = _children
 
     override val prototypes: MutableVisionGroup get() = this
 
@@ -123,6 +121,21 @@ internal class Prototypes(
         }
     }
 
+    override fun getOwnProperty(name: Name): MetaItem<*>? = null
+
+    override fun getProperty(
+        name: Name,
+        inherit: Boolean,
+        includeStyles: Boolean,
+        includeDefaults: Boolean,
+    ): MetaItem<*>? = null
+
+    override fun setProperty(name: Name, item: MetaItem<*>?) {
+        TODO("Not yet implemented")
+    }
+
+    override val descriptor: NodeDescriptor? = null
+
     companion object : KSerializer<MutableVisionGroup> {
 
         private val mapSerializer: KSerializer<Map<NameToken, Vision>> =
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index a01cc961..5f3c59bc 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -36,7 +36,7 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
 
         private fun PolymorphicModuleBuilder<Solid>.solids() {
             subclass(SolidGroup.serializer())
-            subclass(SolidReference.serializer())
+            subclass(SolidReferenceGroup.serializer())
             subclass(Composite.serializer())
             subclass(Tube.serializer())
             subclass(Box.serializer())
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
index aebd168d..8cf8755c 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
@@ -10,13 +10,10 @@ import hep.dataforge.values.Value
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.asValue
 import hep.dataforge.values.string
-import hep.dataforge.vision.Colors
-import hep.dataforge.vision.VisionBuilder
-import hep.dataforge.vision.setProperty
+import hep.dataforge.vision.*
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_OPACITY_KEY
-import hep.dataforge.vision.widgetType
 
 @VisionBuilder
 public class ColorAccessor(private val parent: MutableItemProvider, private val colorKey: Name) {
@@ -115,7 +112,7 @@ public class SolidMaterial : Scheme() {
     }
 }
 
-public val Solid.color: ColorAccessor get() = ColorAccessor(config, MATERIAL_COLOR_KEY)
+public val Solid.color: ColorAccessor get() = ColorAccessor(properties, MATERIAL_COLOR_KEY)
 
 public var Solid.material: SolidMaterial?
     get() = getProperty(MATERIAL_KEY).node?.let { SolidMaterial.read(it) }
@@ -123,11 +120,11 @@ public var Solid.material: SolidMaterial?
 
 @VisionBuilder
 public fun Solid.material(builder: SolidMaterial.() -> Unit) {
-    val node = config[MATERIAL_KEY].node
+    val node = properties.getItem(MATERIAL_KEY).node
     if (node != null) {
         SolidMaterial.update(node, builder)
     } else {
-        config[MATERIAL_KEY] = SolidMaterial(builder)
+        setProperty(MATERIAL_KEY, SolidMaterial(builder))
     }
 }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
deleted file mode 100644
index 4df85142..00000000
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
+++ /dev/null
@@ -1,156 +0,0 @@
-package hep.dataforge.vision.solid
-
-import hep.dataforge.meta.*
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.names.*
-import hep.dataforge.vision.*
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
-import kotlin.collections.set
-
-public abstract class AbstractReference : SolidBase(), VisionGroup {
-    public abstract val prototype: Solid
-
-    override fun getProperty(name: Name, inherit: Boolean): MetaItem<*>? = sequence {
-        yield(properties?.get(name))
-        yieldAll(getStyleItems(name))
-        yield(prototype.getProperty(name))
-        if (inherit) {
-            yield(parent?.getProperty(name, inherit))
-        }
-    }.merge()
-
-    override var styles: List<String>
-        get() = (properties[Vision.STYLE_KEY]?.stringList ?: emptyList()) + prototype.styles
-        set(value) {
-            config[Vision.STYLE_KEY] = value
-        }
-
-    override val allProperties: Laminate
-        get() = Laminate(
-            properties,
-            allStyles,
-            prototype.allProperties,
-            parent?.allProperties,
-        )
-
-    override fun attachChildren() {
-        //do nothing
-    }
-
-    override val descriptor: NodeDescriptor get() = prototype.descriptor
-}
-
-/**
- * A reference [Solid] to reuse a template object
- */
-@Serializable
-@SerialName("solid.ref")
-public class SolidReference(
-    public val templateName: Name,
-) : AbstractReference(), Solid {
-
-    /**
-     * Recursively search for defined template in the parent
-     */
-    override val prototype: Solid
-        get() = (parent as? SolidGroup)?.getPrototype(templateName)
-            ?: error("Prototype with name $templateName not found in $parent")
-
-    @Transient
-    private val propertyCache: HashMap<Name, Config> = HashMap()
-
-
-    override val children: Map<NameToken, SolidReference.ReferenceChild>
-        get() = (prototype as? VisionGroup)?.children
-            ?.filter { !it.key.toString().startsWith("@") }
-            ?.mapValues {
-                ReferenceChild(it.key.asName())
-            } ?: emptyMap()
-
-    private fun childPropertyName(childName: Name, propertyName: Name): Name {
-        return NameToken(REFERENCE_CHILD_PROPERTY_PREFIX, childName.toString()) + propertyName
-    }
-
-    private fun prototypeFor(name: Name): Solid {
-        return (prototype as? SolidGroup)?.get(name) as? Solid
-            ?: error("Prototype with name $name not found in $this")
-    }
-
-    //override fun findAllStyles(): Laminate = Laminate((styles + prototype.styles).mapNotNull { findStyle(it) })
-
-    /**
-     * A ProxyChild is created temporarily only to interact with properties, it does not store any values
-     * (properties are stored in external cache) and created and destroyed on-demand).
-     */
-    public inner class ReferenceChild(public val name: Name) : AbstractReference() {
-
-        override val prototype: Solid get() = prototypeFor(name)
-
-        override val children: Map<NameToken, Vision>
-            get() = (prototype as? VisionGroup)?.children
-                ?.filter { !it.key.toString().startsWith("@") }
-                ?.mapValues { (key, _) ->
-                    ReferenceChild(name + key.asName())
-                } ?: emptyMap()
-
-        override var properties: Config?
-            get() = propertyCache[name]
-            set(value) {
-                if (value == null) {
-                    propertyCache.remove(name)?.also {
-                        //Removing listener if it is present
-                        removeChangeListener(this@SolidReference)
-                    }
-                } else {
-                    propertyCache[name] = value.also {
-                        onPropertyChange(this@SolidReference) { propertyName ->
-                            this@SolidReference.propertyChanged(childPropertyName(name, propertyName))
-                        }
-                    }
-                }
-            }
-
-    }
-
-    public companion object {
-        public const val REFERENCE_CHILD_PROPERTY_PREFIX: String = "@child"
-    }
-}
-
-/**
- * Get a vision prototype if it is a [SolidReference] or vision itself if it is not
- */
-public val Vision.prototype: Vision
-    get() = when (this) {
-        is AbstractReference -> prototype
-        else -> this
-    }
-
-/**
- * Create ref for existing prototype
- */
-public fun SolidGroup.ref(
-    templateName: Name,
-    name: String = "",
-): SolidReference = SolidReference(templateName).also { set(name, it) }
-
-/**
- * Add new [SolidReference] wrapping given object and automatically adding it to the prototypes
- */
-public fun SolidGroup.ref(
-    name: String,
-    obj: Solid,
-    templateName: Name = name.toName(),
-): SolidReference {
-    val existing = getPrototype(templateName)
-    if (existing == null) {
-        prototypes {
-            this[templateName] = obj
-        }
-    } else if (existing != obj) {
-        error("Can't add different prototype on top of existing one")
-    }
-    return this@ref.ref(templateName, name)
-}
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReferenceGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReferenceGroup.kt
new file mode 100644
index 00000000..efc7b1cb
--- /dev/null
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReferenceGroup.kt
@@ -0,0 +1,189 @@
+package hep.dataforge.vision.solid
+
+import hep.dataforge.meta.*
+import hep.dataforge.meta.descriptors.NodeDescriptor
+import hep.dataforge.names.*
+import hep.dataforge.vision.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.map
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+public interface SolidReference : Vision {
+    public val prototype: Solid
+}
+
+/**
+ * A reference [Solid] to reuse a template object
+ */
+@Serializable
+@SerialName("solid.ref")
+public class SolidReferenceGroup(
+    public val templateName: Name,
+) : SolidBase(), SolidReference, VisionGroup {
+
+    /**
+     * Recursively search for defined template in the parent
+     */
+    override val prototype: Solid
+        get() = (parent as? SolidGroup)?.getPrototype(templateName)
+            ?: error("Prototype with name $templateName not found in $parent")
+
+    override val children: Map<NameToken, Vision>
+        get() = (prototype as? VisionGroup)?.children
+            ?.filter { !it.key.toString().startsWith("@") }
+            ?.mapValues {
+                ReferenceChild(it.key.asName())
+            } ?: emptyMap()
+
+    private fun childToken(childName: Name): NameToken =
+        NameToken(REFERENCE_CHILD_PROPERTY_PREFIX, childName.toString())
+
+    private fun childPropertyName(childName: Name, propertyName: Name): Name =
+        childToken(childName) + propertyName
+
+    private fun getChildProperty(childName: Name, propertyName: Name): MetaItem<*>? {
+        return getOwnProperty(childPropertyName(childName, propertyName))
+    }
+
+    private fun setChildProperty(childName: Name, propertyName: Name, item: MetaItem<*>?) {
+        setProperty(childPropertyName(childName, propertyName), item)
+    }
+
+    private fun prototypeFor(name: Name): Solid {
+        return if(name.isEmpty()) prototype else {
+            (prototype as? SolidGroup)?.get(name) as? Solid
+                ?: error("Prototype with name $name not found in $this")
+        }
+    }
+
+    override fun getProperty(
+        name: Name,
+        inherit: Boolean,
+        includeStyles: Boolean,
+        includeDefaults: Boolean,
+    ): MetaItem<*>? = sequence {
+        yield(getOwnProperty(name))
+        if (includeStyles) {
+            yieldAll(getStyleItems(name))
+        }
+        yield(prototype.getProperty(name, inherit, includeStyles, includeDefaults))
+        if (inherit) {
+            yield(parent?.getProperty(name, inherit))
+        }
+    }.merge()
+
+    override fun attachChildren() {
+        //do nothing
+    }
+
+    override val descriptor: NodeDescriptor get() = prototype.descriptor
+
+
+    /**
+     * A ProxyChild is created temporarily only to interact with properties, it does not store any values
+     * (properties are stored in external cache) and created and destroyed on-demand).
+     */
+    private inner class ReferenceChild(private val childName: Name) : SolidReference, VisionGroup {
+
+        override val prototype: Solid get() = prototypeFor(childName)
+
+        override val children: Map<NameToken, Vision>
+            get() = (prototype as? VisionGroup)?.children
+                ?.filter { !it.key.toString().startsWith("@") }
+                ?.mapValues { (key, _) ->
+                    ReferenceChild(childName + key.asName())
+                } ?: emptyMap()
+
+        override fun getOwnProperty(name: Name): MetaItem<*>? = getChildProperty(childName, name)
+
+        override fun setProperty(name: Name, item: MetaItem<*>?) {
+            setChildProperty(childName, name, item)
+        }
+
+        override fun getProperty(
+            name: Name,
+            inherit: Boolean,
+            includeStyles: Boolean,
+            includeDefaults: Boolean,
+        ): MetaItem<*>? = sequence {
+            yield(getOwnProperty(name))
+            if (includeStyles) {
+                yieldAll(getStyleItems(name))
+            }
+            yield(prototype.getProperty(name, inherit, includeStyles, includeDefaults))
+            if (inherit) {
+                yield(parent?.getProperty(name, inherit))
+            }
+        }.merge()
+
+        override var parent: VisionGroup?
+            get(){
+                val parentName = childName.cutLast()
+                return if( parentName.isEmpty()) this@SolidReferenceGroup else ReferenceChild(parentName)
+            }
+            set(value) {
+                error("Setting a parent for a reference child is not possible")
+            }
+
+        override val propertyInvalidated: Flow<Name>
+            get() = this@SolidReferenceGroup.propertyInvalidated.filter { name ->
+                name.startsWith(childToken(childName))
+            }.map { name ->
+                name.cutFirst()
+            }
+
+        override fun notifyPropertyChanged(propertyName: Name) {
+            this@SolidReferenceGroup.notifyPropertyChanged(childPropertyName(childName, propertyName))
+        }
+
+        override fun update(change: VisionChange) {
+            TODO("Not yet implemented")
+        }
+
+        override fun attachChildren() {
+            //do nothing
+        }
+
+        override val descriptor: NodeDescriptor get() = prototype.descriptor
+
+    }
+
+    public companion object {
+        public const val REFERENCE_CHILD_PROPERTY_PREFIX: String = "@child"
+    }
+}
+
+/**
+ * Get a vision prototype if it is a [SolidReferenceGroup] or vision itself if it is not
+ */
+public val Vision.prototype: Vision
+    get() = if (this is SolidReference) prototype else this
+
+/**
+ * Create ref for existing prototype
+ */
+public fun SolidGroup.ref(
+    templateName: Name,
+    name: String = "",
+): SolidReferenceGroup = SolidReferenceGroup(templateName).also { set(name, it) }
+
+/**
+ * Add new [SolidReferenceGroup] wrapping given object and automatically adding it to the prototypes
+ */
+public fun SolidGroup.ref(
+    name: String,
+    obj: Solid,
+    templateName: Name = name.toName(),
+): SolidReferenceGroup {
+    val existing = getPrototype(templateName)
+    if (existing == null) {
+        prototypes {
+            this[templateName] = obj
+        }
+    } else if (existing != obj) {
+        error("Can't add different prototype on top of existing one")
+    }
+    return this@ref.ref(templateName, name)
+}
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
index ff879d7e..0b64a7b7 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
@@ -1,18 +1,15 @@
 package hep.dataforge.vision.solid.transform
 
 import hep.dataforge.meta.DFExperimental
-import hep.dataforge.meta.update
 import hep.dataforge.names.asName
-import hep.dataforge.vision.MutableVisionGroup
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionGroup
+import hep.dataforge.vision.*
 import hep.dataforge.vision.solid.*
 
 @DFExperimental
 internal fun mergeChild(parent: VisionGroup, child: Vision): Vision {
     return child.apply {
 
-        config.update(parent.config)
+        configure(parent.ownProperties)
 
         //parent.properties?.let { config.update(it) }
 
@@ -40,7 +37,7 @@ internal object RemoveSingleChild : VisualTreeTransform<SolidGroup>() {
     override fun SolidGroup.transformInPlace() {
         fun MutableVisionGroup.replaceChildren() {
             children.forEach { (childName, parent) ->
-                if (parent is SolidReference) return@forEach //ignore refs
+                if (parent is SolidReferenceGroup) return@forEach //ignore refs
                 if (parent is MutableVisionGroup) {
                     parent.replaceChildren()
                 }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
index d45c2ca2..cb0ac4e2 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
@@ -6,7 +6,7 @@ import hep.dataforge.names.asName
 import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.VisionGroup
 import hep.dataforge.vision.solid.SolidGroup
-import hep.dataforge.vision.solid.SolidReference
+import hep.dataforge.vision.solid.SolidReferenceGroup
 
 @DFExperimental
 internal object UnRef : VisualTreeTransform<SolidGroup>() {
@@ -17,7 +17,7 @@ internal object UnRef : VisualTreeTransform<SolidGroup>() {
                 counter.forEach { (key, value) ->
                     reducer[key] = (reducer[key] ?: 0) + value
                 }
-            } else if (obj is SolidReference) {
+            } else if (obj is SolidReferenceGroup) {
                 reducer[obj.templateName] = (reducer[obj.templateName] ?: 0) + 1
             }
 
@@ -27,8 +27,8 @@ internal object UnRef : VisualTreeTransform<SolidGroup>() {
 
     private fun MutableVisionGroup.unref(name: Name) {
         (this as? SolidGroup)?.prototypes?.set(name, null)
-        children.filter { (it.value as? SolidReference)?.templateName == name }.forEach { (key, value) ->
-            val reference = value as SolidReference
+        children.filter { (it.value as? SolidReferenceGroup)?.templateName == name }.forEach { (key, value) ->
+            val reference = value as SolidReferenceGroup
             val newChild = mergeChild(reference, reference.prototype)
             newChild.parent = null
             set(key.asName(), newChild) // replace proxy with merged object
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
index 907edf3e..6e045744 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
@@ -1,8 +1,8 @@
 package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.int
-import hep.dataforge.meta.set
 import hep.dataforge.names.asName
+import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.styleSheet
 import hep.dataforge.vision.useStyle
 import kotlin.test.Test
@@ -14,7 +14,7 @@ class PropertyTest {
     fun testInheritedProperty() {
         var box: Box? = null
         val group = SolidGroup().apply {
-            config["test"] = 22
+            setProperty("test", 22)
             group {
                 box = box(100, 100, 100)
             }
@@ -60,7 +60,7 @@ class PropertyTest {
 
     @Test
     fun testReferenceStyleProperty() {
-        var box: SolidReference? = null
+        var box: SolidReferenceGroup? = null
         val group = SolidGroup{
             styleSheet {
                 set("testStyle") {
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
index efef7fcd..017d4db3 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
@@ -4,6 +4,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.toName
 import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.get
+import hep.dataforge.vision.ownProperties
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -15,7 +16,7 @@ fun SolidGroup.refGroup(
     name: String,
     templateName: Name = name.toName(),
     block: MutableVisionGroup.() -> Unit
-): SolidReference {
+): SolidReferenceGroup {
     val group = SolidGroup().apply(block)
     return ref(name, group, templateName)
 }
@@ -32,7 +33,7 @@ class SerializationTest {
         val string =  SolidManager.encodeToString(cube)
         println(string)
         val newCube = SolidManager.decodeFromString(string)
-        assertEquals(cube.config, newCube.config)
+        assertEquals(cube.ownProperties, newCube.ownProperties)
     }
 
     @Test
@@ -53,7 +54,7 @@ class SerializationTest {
         val string = SolidManager.encodeToString(group)
         println(string)
         val reconstructed = SolidManager.decodeFromString(string) as SolidGroup
-        assertEquals(group["cube"]?.config, reconstructed["cube"]?.config)
+        assertEquals(group["cube"]?.ownProperties, reconstructed["cube"]?.ownProperties)
     }
 
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt
index f5ff4f14..79bba867 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt
@@ -45,7 +45,7 @@ class VisionUpdateTest {
         val serialized = visionManager.jsonFormat.encodeToString(VisionChange.serializer(), change)
         println(serialized)
         val reconstructed = visionManager.jsonFormat.decodeFromString(VisionChange.serializer(), serialized)
-        assertEquals(change.propertyChange,reconstructed.propertyChange)
+        assertEquals(change.properties,reconstructed.properties)
     }
 
     @Test
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
index 44478c61..519fa9b3 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
@@ -15,20 +15,22 @@ import info.laht.threekt.geometries.EdgesGeometry
 import info.laht.threekt.geometries.WireframeGeometry
 import info.laht.threekt.objects.LineSegments
 import info.laht.threekt.objects.Mesh
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlin.reflect.KClass
 
 /**
  * Basic geometry-based factory
  */
 public abstract class MeshThreeFactory<in T : Solid>(
-    override val type: KClass<in T>
+    override val type: KClass<in T>,
 ) : ThreeFactory<T> {
     /**
      * Build a geometry for an object
      */
     public abstract fun buildGeometry(obj: T): BufferGeometry
 
-    override fun invoke(obj: T): Mesh {
+    override fun invoke(three: ThreePlugin, obj: T): Mesh {
         val geometry = buildGeometry(obj)
 
         //JS sometimes tries to pass Geometry as BufferGeometry
@@ -36,14 +38,14 @@ public abstract class MeshThreeFactory<in T : Solid>(
 
         //val meshMeta: Meta = obj.properties[Material3D.MATERIAL_KEY]?.node ?: Meta.empty
 
-        val mesh = Mesh(geometry, null).apply{
+        val mesh = Mesh(geometry, null).apply {
             matrixAutoUpdate = false
             //set position for mesh
             updatePosition(obj)
         }.applyProperties(obj)
 
         //add listener to object properties
-        obj.onPropertyChange(this) { name ->
+        obj.propertyInvalidated.onEach { name ->
             when {
                 name.startsWith(Solid.GEOMETRY_KEY) -> {
                     val oldGeometry = mesh.geometry as BufferGeometry
@@ -57,7 +59,8 @@ public abstract class MeshThreeFactory<in T : Solid>(
                 name.startsWith(EDGES_KEY) -> mesh.applyEdges(obj)
                 else -> mesh.updateProperty(obj, name)
             }
-        }
+        }.launchIn(three.updateScope)
+
         return mesh
     }
 
@@ -72,7 +75,7 @@ public abstract class MeshThreeFactory<in T : Solid>(
     }
 }
 
-fun Mesh.applyProperties(obj: Solid): Mesh = apply{
+internal fun Mesh.applyProperties(obj: Solid): Mesh = apply {
     material = getMaterial(obj, true)
     applyEdges(obj)
     applyWireFrame(obj)
@@ -82,7 +85,7 @@ fun Mesh.applyProperties(obj: Solid): Mesh = apply{
     }
 }
 
-fun Mesh.applyEdges(obj: Solid) {
+internal fun Mesh.applyEdges(obj: Solid) {
     val edges = children.find { it.name == "@edges" } as? LineSegments
     //inherited edges definition, enabled by default
     if (obj.getProperty(MeshThreeFactory.EDGES_ENABLED_KEY).boolean != false) {
@@ -108,7 +111,7 @@ fun Mesh.applyEdges(obj: Solid) {
     }
 }
 
-fun Mesh.applyWireFrame(obj: Solid) {
+internal fun Mesh.applyWireFrame(obj: Solid) {
     children.find { it.name == "@wireframe" }?.let {
         remove(it)
         (it as LineSegments).dispose()
@@ -116,7 +119,8 @@ fun Mesh.applyWireFrame(obj: Solid) {
     //inherited wireframe definition, disabled by default
     if (obj.getProperty(MeshThreeFactory.WIREFRAME_ENABLED_KEY).boolean == true) {
         val bufferGeometry = geometry as? BufferGeometry ?: return
-        val material = ThreeMaterials.getLineMaterial(obj.getProperty(MeshThreeFactory.WIREFRAME_MATERIAL_KEY).node, true)
+        val material =
+            ThreeMaterials.getLineMaterial(obj.getProperty(MeshThreeFactory.WIREFRAME_MATERIAL_KEY).node, true)
         add(
             LineSegments(
                 WireframeGeometry(bufferGeometry),
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt
index 0f5160f8..e41035c9 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt
@@ -2,11 +2,10 @@ package hep.dataforge.vision.solid.three
 
 import hep.dataforge.vision.solid.Convex
 import info.laht.threekt.external.geometries.ConvexBufferGeometry
-import info.laht.threekt.math.Vector3
 
 public object ThreeConvexFactory : MeshThreeFactory<Convex>(Convex::class) {
     override fun buildGeometry(obj: Convex): ConvexBufferGeometry {
-        @Suppress("USELESS_CAST") val vectors = obj.points.toTypedArray() as Array<Vector3>
+        val vectors = obj.points.map { it.toVector() }.toTypedArray()
         return ConvexBufferGeometry(vectors)
     }
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
index d01eed4c..33cfcc60 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
@@ -22,7 +22,7 @@ public interface ThreeFactory<in T : Vision> {
 
     public val type: KClass<in T>
 
-    public operator fun invoke(obj: T): Object3D
+    public operator fun invoke(three: ThreePlugin, obj: T): Object3D
 
     public companion object {
         public const val TYPE: String = "threeFactory"
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
index ecea5d23..9ab3f401 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
@@ -1,12 +1,15 @@
 package hep.dataforge.vision.solid.three
 
 
+import hep.dataforge.context.logger
 import hep.dataforge.vision.solid.SolidLabel
 import hep.dataforge.vision.solid.three.ThreeMaterials.getMaterial
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.geometries.TextBufferGeometry
 import info.laht.threekt.objects.Mesh
 import kotlinext.js.jsObject
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlin.reflect.KClass
 
 /**
@@ -15,18 +18,19 @@ import kotlin.reflect.KClass
 public object ThreeLabelFactory : ThreeFactory<SolidLabel> {
     override val type: KClass<in SolidLabel> get() = SolidLabel::class
 
-    override fun invoke(obj: SolidLabel): Object3D {
+    override fun invoke(three: ThreePlugin, obj: SolidLabel): Object3D {
         val textGeo = TextBufferGeometry(obj.text, jsObject {
             font = obj.fontFamily
             size = 20
             height = 1
             curveSegments = 1
         })
-        return Mesh(textGeo, getMaterial(obj,true)).apply {
+        return Mesh(textGeo, getMaterial(obj, true)).apply {
             updatePosition(obj)
-            obj.onPropertyChange(this@ThreeLabelFactory) { _ ->
+            obj.propertyInvalidated.onEach { _ ->
                 //TODO
-            }
+                three.logger.warn{"Label parameter change not implemented"}
+            }.launchIn(three.updateScope)
         }
     }
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
index b5ec871e..199213ba 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
@@ -9,12 +9,14 @@ import info.laht.threekt.core.Geometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.math.Color
 import info.laht.threekt.objects.LineSegments
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlin.reflect.KClass
 
 public object ThreeLineFactory : ThreeFactory<PolyLine> {
     override val type: KClass<PolyLine> get() = PolyLine::class
 
-    override fun invoke(obj: PolyLine): Object3D {
+    override fun invoke(three: ThreePlugin, obj: PolyLine): Object3D {
         val geometry = Geometry().apply {
             vertices = Array(obj.points.size) { obj.points[it].toVector() }
         }
@@ -28,9 +30,9 @@ public object ThreeLineFactory : ThreeFactory<PolyLine> {
             updatePosition(obj)
             //layers.enable(obj.layer)
             //add listener to object properties
-            obj.onPropertyChange(this) { propertyName ->
+            obj.propertyInvalidated.onEach { propertyName ->
                 updateProperty(obj, propertyName)
-            }
+            }.launchIn(three.updateScope)
         }
     }
 
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index bcf309bb..9eacdea9 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -9,6 +9,9 @@ import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.visible
 import info.laht.threekt.core.Object3D
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
 import kotlin.collections.set
@@ -24,6 +27,9 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
     private val compositeFactory = ThreeCompositeFactory(this)
     private val refFactory = ThreeReferenceFactory(this)
 
+    //TODO generate a separate supervisor update scope
+    internal val updateScope: CoroutineScope get() = context
+
     init {
         //Add specialized factories here
         objectFactories[Box::class] = ThreeBoxFactory
@@ -44,7 +50,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
     public fun buildObject3D(obj: Solid): Object3D {
         return when (obj) {
             is ThreeVision -> obj.render()
-            is SolidReference -> refFactory(obj)
+            is SolidReferenceGroup -> refFactory(obj)
             is SolidGroup -> {
                 val group = ThreeGroup()
                 obj.children.forEach { (token, child) ->
@@ -63,7 +69,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
                     updatePosition(obj)
                     //obj.onChildrenChange()
 
-                    obj.onPropertyChange(this) { name ->
+                    obj.propertyInvalidated.onEach { name ->
                         if (
                             name.startsWith(Solid.POSITION_KEY) ||
                             name.startsWith(Solid.ROTATION) ||
@@ -74,9 +80,9 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
                         } else if (name == Vision.VISIBLE_KEY) {
                             visible = obj.visible ?: true
                         }
-                    }
+                    }.launchIn(updateScope)
 
-                    obj.onStructureChange(this) { nameToken, _, child ->
+                    obj.structureChanges.onEach { (nameToken, _, child) ->
 //                        if (name.isEmpty()) {
 //                            logger.error { "Children change with empty name on $group" }
 //                            return@onChildrenChange
@@ -99,7 +105,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
                                 logger.error(ex) { "Failed to render $child" }
                             }
                         }
-                    }
+                    }.launchIn(updateScope)
                 }
             }
             is Composite -> compositeFactory(obj)
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
index 32ea564f..02739b1c 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
@@ -4,17 +4,19 @@ import hep.dataforge.names.cutFirst
 import hep.dataforge.names.firstOrNull
 import hep.dataforge.names.toName
 import hep.dataforge.vision.solid.Solid
-import hep.dataforge.vision.solid.SolidReference
-import hep.dataforge.vision.solid.SolidReference.Companion.REFERENCE_CHILD_PROPERTY_PREFIX
+import hep.dataforge.vision.solid.SolidReferenceGroup
+import hep.dataforge.vision.solid.SolidReferenceGroup.Companion.REFERENCE_CHILD_PROPERTY_PREFIX
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.objects.Mesh
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlin.reflect.KClass
 
-public class ThreeReferenceFactory(public val three: ThreePlugin) : ThreeFactory<SolidReference> {
+public class ThreeReferenceFactory(public val three: ThreePlugin) : ThreeFactory<SolidReferenceGroup> {
     private val cache = HashMap<Solid, Object3D>()
 
-    override val type: KClass<SolidReference> = SolidReference::class
+    override val type: KClass<SolidReferenceGroup> = SolidReferenceGroup::class
 
     private fun Object3D.replicate(): Object3D {
         return when (this) {
@@ -30,7 +32,7 @@ public class ThreeReferenceFactory(public val three: ThreePlugin) : ThreeFactory
         }
     }
 
-    override fun invoke(obj: SolidReference): Object3D {
+    override fun invoke(obj: SolidReferenceGroup): Object3D {
         val template = obj.prototype
         val cachedObject = cache.getOrPut(template) {
             three.buildObject3D(template)
@@ -43,7 +45,9 @@ public class ThreeReferenceFactory(public val three: ThreePlugin) : ThreeFactory
             object3D.applyProperties(obj)
         }
 
-        obj.onPropertyChange(this) { name ->
+        //TODO apply child properties
+
+        obj.propertyInvalidated.onEach { name->
             if (name.firstOrNull()?.body == REFERENCE_CHILD_PROPERTY_PREFIX) {
                 val childName = name.firstOrNull()?.index?.toName() ?: error("Wrong syntax for reference child property: '$name'")
                 val propertyName = name.cutFirst()
@@ -53,7 +57,8 @@ public class ThreeReferenceFactory(public val three: ThreePlugin) : ThreeFactory
             } else {
                 object3D.updateProperty(obj, name)
             }
-        }
+        }.launchIn(three.updateScope)
+
 
         return object3D
     }

From 929832f3a5b1a63ceef4729305309093a2f5e2c7 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 15 Dec 2020 19:37:33 +0300
Subject: [PATCH 054/151] Change property and structure subscription to flows.

---
 .../hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt       | 3 ++-
 .../main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt  | 2 +-
 .../hep/dataforge/vision/solid/FXReferenceFactory.kt      | 6 ++++--
 .../hep/dataforge/vision/solid/VisualObjectFXBinding.kt   | 8 +++++---
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
index 1d5a4a89..03915243 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
@@ -2,6 +2,7 @@ package hep.dataforge.vision.gdml.demo
 
 import hep.dataforge.context.Global
 import hep.dataforge.vision.VisionManager
+import hep.dataforge.vision.describedProperties
 import hep.dataforge.vision.editor.VisualObjectEditorFragment
 import hep.dataforge.vision.editor.VisualObjectTreeFragment
 import hep.dataforge.vision.gdml.toVision
@@ -26,7 +27,7 @@ class GDMLView : View() {
     }
 
     private val propertyEditor = VisualObjectEditorFragment {
-        it.allProperties
+        it.describedProperties
     }.apply {
         descriptorProperty.set(SolidMaterial.descriptor)
         itemProperty.bind(treeFragment.selectedProperty)
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
index ce88a14c..b635485b 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
@@ -43,7 +43,7 @@ class FX3DPlugin : AbstractPlugin() {
     }
 
     fun buildNode(obj: Solid): Node {
-        val binding = VisualObjectFXBinding(obj)
+        val binding = VisualObjectFXBinding(this, obj)
         return when (obj) {
             is SolidReferenceGroup -> referenceFactory(obj, binding)
             is SolidGroup -> {
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
index 77244de2..2ffb2660 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
@@ -4,6 +4,8 @@ import hep.dataforge.names.*
 import hep.dataforge.vision.Vision
 import javafx.scene.Group
 import javafx.scene.Node
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlin.reflect.KClass
 
 class FXReferenceFactory(val plugin: FX3DPlugin) : FX3DFactory<SolidReferenceGroup> {
@@ -13,7 +15,7 @@ class FXReferenceFactory(val plugin: FX3DPlugin) : FX3DFactory<SolidReferenceGro
         val prototype = obj.prototype
         val node = plugin.buildNode(prototype)
 
-        obj.onPropertyChange(this) { name->
+        obj.propertyInvalidated.onEach {  name->
             if (name.firstOrNull()?.body == SolidReferenceGroup.REFERENCE_CHILD_PROPERTY_PREFIX) {
                 val childName = name.firstOrNull()?.index?.toName() ?: error("Wrong syntax for reference child property: '$name'")
                 val propertyName = name.cutFirst()
@@ -21,7 +23,7 @@ class FXReferenceFactory(val plugin: FX3DPlugin) : FX3DFactory<SolidReferenceGro
                 val child = node.findChild(childName) ?: error("Object child with name '$childName' not found")
                 child.updateProperty(referenceChild, propertyName)
             }
-        }
+        }.launchIn(plugin.context)
         return node
     }
 }
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
index e5c19dd1..8d19db59 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
@@ -7,16 +7,18 @@ import hep.dataforge.names.toName
 import hep.dataforge.vision.Vision
 import javafx.application.Platform
 import javafx.beans.binding.ObjectBinding
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import tornadofx.*
 
 /**
  * A caching binding collection for [Vision] properties
  */
-class VisualObjectFXBinding(val obj: Vision) {
+class VisualObjectFXBinding(val fx: FX3DPlugin, val obj: Vision) {
     private val bindings = HashMap<Name, ObjectBinding<MetaItem<*>?>>()
 
     init {
-        obj.onPropertyChange(this) { name ->
+        obj.propertyInvalidated.onEach { name ->
             bindings.filter { it.key.startsWith(name) }.forEach { entry ->
                 Platform.runLater {
                     entry.value.invalidate()
@@ -28,7 +30,7 @@ class VisualObjectFXBinding(val obj: Vision) {
 //                bindings[currentName]?.invalidate()
 //                currentName = currentName.cutLast()
 //            }
-        }
+        }.launchIn(fx.context)
     }
 
     operator fun get(key: Name): ObjectBinding<MetaItem<*>?> {

From 6a6d9659cac7ebc3f606877051e5401afe1e4274 Mon Sep 17 00:00:00 2001
From: darksnake <altavir@gmail.com>
Date: Wed, 16 Dec 2020 13:24:38 +0300
Subject: [PATCH 055/151] Fixing new property update model

---
 build.gradle.kts                              |  2 +-
 .../vision/solid/demo/VariableBox.kt          | 17 ++++++++++-------
 .../vision/bootstrap/threeControls.kt         |  3 ++-
 .../vision/bootstrap/visionPropertyEditor.kt  |  3 ++-
 .../dataforge/vision/react/ConfigEditor.kt    | 10 +++++-----
 .../kotlin/hep/dataforge/vision/VisionBase.kt | 19 +++++++++----------
 .../hep/dataforge/vision/VisionGroupBase.kt   |  5 +----
 .../dataforge/vision/client/VisionClient.kt   |  8 ++++++--
 .../hep/dataforge/vision/solid/Solid.kt       |  2 +-
 .../hep/dataforge/vision/solid/SolidGroup.kt  |  8 ++++----
 ...lidReferenceGroup.kt => SolidReference.kt} |  0
 .../dataforge/vision/solid/PropertyTest.kt    |  5 +++--
 .../vision/solid/three/MeshThreeFactory.kt    |  4 ++--
 .../solid/three/ThreeCanvasLabelFactory.kt    |  2 +-
 .../vision/solid/three/ThreePlugin.kt         | 11 +++++------
 .../solid/three/ThreeReferenceFactory.kt      |  4 ++--
 .../vision/solid/three/ThreeVision.kt         |  2 +-
 17 files changed, 55 insertions(+), 50 deletions(-)
 rename visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/{SolidReferenceGroup.kt => SolidReference.kt} (100%)

diff --git a/build.gradle.kts b/build.gradle.kts
index d4147448..38355ee0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     id("ru.mipt.npm.project")
 }
 
-val dataforgeVersion by extra("0.2.1-dev-4")
+val dataforgeVersion by extra("0.2.1-dev-5")
 val ktorVersion by extra("1.4.3")
 val htmlVersion by extra("0.7.2")
 val kotlinWrappersVersion by extra("pre.129-kotlin-1.4.20")
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
index ff610211..d4e8d833 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
@@ -5,6 +5,7 @@ import hep.dataforge.names.plus
 import hep.dataforge.names.startsWith
 import hep.dataforge.values.asValue
 import hep.dataforge.vision.getProperty
+import hep.dataforge.vision.properties
 import hep.dataforge.vision.set
 import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.*
@@ -16,6 +17,8 @@ import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.geometries.BoxBufferGeometry
 import info.laht.threekt.objects.Mesh
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlin.math.max
 
 internal fun SolidGroup.varBox(
@@ -31,11 +34,11 @@ internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeV
         scaleX = xSize
         scaleY = ySize
         scaleZ = zSize
-        config[MeshThreeFactory.EDGES_ENABLED_KEY] = false
-        config[MeshThreeFactory.WIREFRAME_ENABLED_KEY] = false
+        properties[MeshThreeFactory.EDGES_ENABLED_KEY] = false
+        properties[MeshThreeFactory.WIREFRAME_ENABLED_KEY] = false
     }
 
-    override fun render(): Object3D {
+    override fun render(three: ThreePlugin): Object3D {
         val xSize = getProperty(X_SIZE_KEY, false).number?.toDouble() ?: 1.0
         val ySize = getProperty(Y_SIZE_KEY, false).number?.toDouble() ?: 1.0
         val zSize = getProperty(Z_SIZE_KEY, false).number?.toDouble() ?: 1.0
@@ -60,7 +63,7 @@ internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeV
         mesh.scale.set(xSize, ySize, zSize)
 
         //add listener to object properties
-        onPropertyChange(mesh) { name ->
+        propertyInvalidated.onEach { name ->
             when {
                 name.startsWith(GEOMETRY_KEY) -> {
                     val newXSize = getProperty(X_SIZE_KEY, false).number?.toDouble() ?: 1.0
@@ -71,12 +74,12 @@ internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeV
                 }
                 name.startsWith(MeshThreeFactory.WIREFRAME_KEY) -> mesh.applyWireFrame(this@VariableBox)
                 name.startsWith(MeshThreeFactory.EDGES_KEY) -> mesh.applyEdges(this@VariableBox)
-                name.startsWith(MATERIAL_COLOR_KEY)->{
+                name.startsWith(MATERIAL_COLOR_KEY) -> {
                     mesh.material = getMaterial(this, true)
                 }
                 else -> mesh.updateProperty(this@VariableBox, name)
             }
-        }
+        }.launchIn(three.context)
         return mesh
     }
 
@@ -100,7 +103,7 @@ internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeV
             color(r.toUByte(), g.toUByte(), b.toUByte())
         }
 
-    companion object{
+    companion object {
         private val X_SIZE_KEY = GEOMETRY_KEY + "xSize"
         private val Y_SIZE_KEY = GEOMETRY_KEY + "ySize"
         private val Z_SIZE_KEY = GEOMETRY_KEY + "zSize"
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
index 68d90705..ea835f4f 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
@@ -4,6 +4,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.isEmpty
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionGroup
+import hep.dataforge.vision.describedProperties
 import hep.dataforge.vision.react.objectTree
 import hep.dataforge.vision.solid.three.ThreeCanvas
 import kotlinx.css.*
@@ -53,7 +54,7 @@ public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalCo
                 if (selectedObject != null) {
                     visionPropertyEditor(
                         selectedObject,
-                        default = selectedObject.allProperties,
+                        default = selectedObject.describedProperties,
                         key = selected
                     )
                 }
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
index 5bc10577..9734bc74 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
@@ -4,6 +4,7 @@ import hep.dataforge.meta.Meta
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.getStyle
+import hep.dataforge.vision.properties
 import hep.dataforge.vision.react.configEditor
 import hep.dataforge.vision.react.metaViewer
 import org.w3c.dom.Element
@@ -17,7 +18,7 @@ public fun RBuilder.visionPropertyEditor(
     key: Any? = null
 ) {
     card("Properties") {
-        configEditor(item.config, descriptor, default, key)
+        configEditor(item.properties, descriptor, default, key)
     }
     val styles = item.styles
     if(styles.isNotEmpty()) {
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
index a4ecce5e..b659452f 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
@@ -19,7 +19,7 @@ public external interface ConfigEditorItemProps : RProps {
     /**
      * Root config object - always non null
      */
-    public var root: Config
+    public var root: MutableItemProvider
 
     /**
      * Full path to the displayed node in [root]. Could be empty
@@ -44,7 +44,7 @@ private val ConfigEditorItem: FunctionalComponent<ConfigEditorItemProps> =
 
 private fun RBuilder.configEditorItem(props: ConfigEditorItemProps) {
     var expanded: Boolean by useState { true }
-    var item: MetaItem<Config>? by useState { props.root[props.name] }
+    var item: MetaItem<*>? by useState { props.root.getItem(props.name) }
     val descriptorItem: ItemDescriptor? = props.descriptor?.get(props.name)
     val defaultItem = props.default?.get(props.name)
     var actualItem: MetaItem<Meta>? by useState { item ?: defaultItem ?: descriptorItem?.defaultItem() }
@@ -52,7 +52,7 @@ private fun RBuilder.configEditorItem(props: ConfigEditorItemProps) {
     val token = props.name.lastOrNull()?.toString() ?: "Properties"
 
     fun update() {
-        item = props.root[props.name]
+        item = props.root.getItem(props.name)
         actualItem = item ?: defaultItem ?: descriptorItem?.defaultItem()
     }
 
@@ -192,7 +192,7 @@ private fun RBuilder.configEditorItem(props: ConfigEditorItemProps) {
 
 public external interface ConfigEditorProps : RProps {
     public var id: Name
-    public var root: Config
+    public var root: MutableItemProvider
     public var default: Meta?
     public var descriptor: NodeDescriptor?
 }
@@ -229,7 +229,7 @@ public fun Element.configEditor(
 }
 
 public fun RBuilder.configEditor(
-    config: Config,
+    config: MutableItemProvider,
     descriptor: NodeDescriptor? = null,
     default: Meta? = null,
     key: Any? = null,
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index 19080b67..aa1fcba2 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -8,7 +8,6 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.values.ValueType
 import hep.dataforge.vision.Vision.Companion.STYLE_KEY
-import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.serialization.SerialName
@@ -32,32 +31,33 @@ public open class VisionBase : Vision {
      * Object own properties excluding styles and inheritance
      */
     @SerialName("properties")
-    private var _properties: Config? = null
+    protected var innerProperties: Config? = null
+        private set
 
     /**
      * All own properties as a read-only Meta
      */
-    public val ownProperties: Meta get() = _properties?: Meta.EMPTY
+    public val ownProperties: Meta get() = innerProperties ?: Meta.EMPTY
 
     @Synchronized
     private fun getOrCreateConfig(): Config {
-        if (_properties == null) {
+        if (innerProperties == null) {
             val newProperties = Config()
-            _properties = newProperties
+            innerProperties = newProperties
             newProperties.onChange(this) { name, oldItem, newItem ->
                 if (oldItem != newItem) {
                     notifyPropertyChanged(name)
                 }
             }
         }
-        return _properties!!
+        return innerProperties!!
     }
 
     /**
      * A fast accessor method to get own property (no inheritance or styles
      */
     override fun getOwnProperty(name: Name): MetaItem<*>? {
-        return _properties?.getItem(name)
+        return innerProperties?.getItem(name)
     }
 
     override fun getProperty(
@@ -93,9 +93,8 @@ public open class VisionBase : Vision {
             }
     }
 
-    private val _propertyInvalidationFlow: MutableSharedFlow<Name> = MutableSharedFlow(
-        onBufferOverflow = BufferOverflow.DROP_OLDEST
-    )
+    @Transient
+    private val _propertyInvalidationFlow: MutableSharedFlow<Name> = MutableSharedFlow()
 
     override val propertyInvalidated: SharedFlow<Name> get() = _propertyInvalidationFlow
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
index a1170b48..0bb40007 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
@@ -1,7 +1,6 @@
 package hep.dataforge.vision
 
 import hep.dataforge.names.*
-import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.serialization.SerialName
@@ -36,9 +35,7 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
     }
 
     @Transient
-    private val _structureChanges: MutableSharedFlow<MutableVisionGroup.StructureChange> = MutableSharedFlow(
-        onBufferOverflow = BufferOverflow.DROP_OLDEST
-    )
+    private val _structureChanges: MutableSharedFlow<MutableVisionGroup.StructureChange> = MutableSharedFlow()
 
     override val structureChanges: SharedFlow<MutableVisionGroup.StructureChange> get() = _structureChanges
 
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
index 8dda1ebf..eefffc17 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
@@ -18,6 +18,10 @@ import org.w3c.dom.WebSocket
 import org.w3c.dom.asList
 import org.w3c.dom.get
 import org.w3c.dom.url.URL
+import kotlin.collections.HashMap
+import kotlin.collections.forEach
+import kotlin.collections.maxByOrNull
+import kotlin.collections.set
 import kotlin.reflect.KClass
 
 public class VisionClient : AbstractPlugin() {
@@ -124,9 +128,9 @@ public class VisionClient : AbstractPlugin() {
                         )
                         logger.debug { "Got update $dif for output with name $name" }
                         visionMap[element]?.update(dif)
-                            ?: logger.info { "Target vision for element $element with name $name not found" }
+                            ?: console.info("Target vision for element $element with name $name not found")
                     } else {
-                        console.error("WebSocket message data is not a string")
+                        console.error ("WebSocket message data is not a string")
                     }
                 }
                 onopen = {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
index a342c961..d690c6b1 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
@@ -81,7 +81,7 @@ public interface Solid : Vision {
             if (first.position != second.position) return false
             if (first.rotation != second.rotation) return false
             if (first.scale != second.scale) return false
-            if (first.properties != second.properties) return false
+            if (first.ownProperties != second.ownProperties) return false
             return true
         }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index e4b9f0f7..cc3b92e4 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -38,6 +38,7 @@ public class SolidGroup : VisionGroupBase(), Solid, PrototypeHolder {
     /**
      * Create or edit prototype node as a group
      */
+    @VisionBuilder
     public fun prototypes(builder: VisionContainerBuilder<Solid>.() -> Unit): Unit {
         (prototypes ?: Prototypes().also {
             prototypes = it
@@ -107,10 +108,9 @@ internal class Prototypes(
     children: Map<NameToken, Vision> = emptyMap(),
 ) : VisionGroupBase(), PrototypeHolder {
 
-    override var parent: VisionGroup? = null
-
-    private val _children = HashMap(children)
-    override val children: Map<NameToken, Vision> get() = _children
+    init {
+        childrenInternal.putAll(children)
+    }
 
     override val prototypes: MutableVisionGroup get() = this
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReferenceGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
similarity index 100%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReferenceGroup.kt
rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
index 6e045744..55efe64a 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
@@ -2,6 +2,7 @@ package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.int
 import hep.dataforge.names.asName
+import hep.dataforge.vision.getProperty
 import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.styleSheet
 import hep.dataforge.vision.useStyle
@@ -19,7 +20,7 @@ class PropertyTest {
                 box = box(100, 100, 100)
             }
         }
-        assertEquals(22, box?.getProperty("test".asName()).int)
+        assertEquals(22, box?.getProperty("test").int)
     }
 
     @Test
@@ -37,7 +38,7 @@ class PropertyTest {
                 }
             }
         }
-        assertEquals(22, box?.getProperty("test".asName()).int)
+        assertEquals(22, box?.getProperty("test").int)
     }
 
     @Test
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
index 519fa9b3..8a80527d 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
@@ -85,7 +85,7 @@ internal fun Mesh.applyProperties(obj: Solid): Mesh = apply {
     }
 }
 
-internal fun Mesh.applyEdges(obj: Solid) {
+public fun Mesh.applyEdges(obj: Solid) {
     val edges = children.find { it.name == "@edges" } as? LineSegments
     //inherited edges definition, enabled by default
     if (obj.getProperty(MeshThreeFactory.EDGES_ENABLED_KEY).boolean != false) {
@@ -111,7 +111,7 @@ internal fun Mesh.applyEdges(obj: Solid) {
     }
 }
 
-internal fun Mesh.applyWireFrame(obj: Solid) {
+public fun Mesh.applyWireFrame(obj: Solid) {
     children.find { it.name == "@wireframe" }?.let {
         remove(it)
         (it as LineSegments).dispose()
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt
index 90027451..f8d26cec 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt
@@ -22,7 +22,7 @@ import kotlin.reflect.KClass
 public object ThreeCanvasLabelFactory : ThreeFactory<SolidLabel> {
     override val type: KClass<in SolidLabel> get() = SolidLabel::class
 
-    override fun invoke(obj: SolidLabel): Object3D {
+    override fun invoke(three: ThreePlugin, obj: SolidLabel): Object3D {
         val canvas = document.createElement("canvas") as HTMLCanvasElement
         val context = canvas.getContext("2d") as CanvasRenderingContext2D
         context.font = "Bold ${obj.fontSize}pt ${obj.fontFamily}"
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index 9eacdea9..1bd46f37 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -25,7 +25,6 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
 
     private val objectFactories = HashMap<KClass<out Solid>, ThreeFactory<*>>()
     private val compositeFactory = ThreeCompositeFactory(this)
-    private val refFactory = ThreeReferenceFactory(this)
 
     //TODO generate a separate supervisor update scope
     internal val updateScope: CoroutineScope get() = context
@@ -49,8 +48,8 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
 
     public fun buildObject3D(obj: Solid): Object3D {
         return when (obj) {
-            is ThreeVision -> obj.render()
-            is SolidReferenceGroup -> refFactory(obj)
+            is ThreeVision -> obj.render(this)
+            is SolidReferenceGroup -> ThreeReferenceFactory(this, obj)
             is SolidGroup -> {
                 val group = ThreeGroup()
                 obj.children.forEach { (token, child) ->
@@ -108,13 +107,13 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
                     }.launchIn(updateScope)
                 }
             }
-            is Composite -> compositeFactory(obj)
+            is Composite -> compositeFactory(this, obj)
             else -> {
                 //find specialized factory for this type if it is present
                 val factory: ThreeFactory<Solid>? = findObjectFactory(obj::class)
                 when {
-                    factory != null -> factory(obj)
-                    obj is GeometrySolid -> ThreeShapeFactory(obj)
+                    factory != null -> factory(this, obj)
+                    obj is GeometrySolid -> ThreeShapeFactory(this, obj)
                     else -> error("Renderer for ${obj::class} not found")
                 }
             }
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
index 02739b1c..2374c05f 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlin.reflect.KClass
 
-public class ThreeReferenceFactory(public val three: ThreePlugin) : ThreeFactory<SolidReferenceGroup> {
+public object ThreeReferenceFactory : ThreeFactory<SolidReferenceGroup> {
     private val cache = HashMap<Solid, Object3D>()
 
     override val type: KClass<SolidReferenceGroup> = SolidReferenceGroup::class
@@ -32,7 +32,7 @@ public class ThreeReferenceFactory(public val three: ThreePlugin) : ThreeFactory
         }
     }
 
-    override fun invoke(obj: SolidReferenceGroup): Object3D {
+    override fun invoke(three: ThreePlugin, obj: SolidReferenceGroup): Object3D {
         val template = obj.prototype
         val cachedObject = cache.getOrPut(template) {
             three.buildObject3D(template)
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
index 67870229..8a6d2a52 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
@@ -7,5 +7,5 @@ import info.laht.threekt.core.Object3D
  * A custom visual object that has its own Three.js renderer
  */
 public abstract class ThreeVision : SolidBase() {
-    public abstract fun render(): Object3D
+    public abstract fun render(three: ThreePlugin): Object3D
 }

From 97cdfd3719e9001baf04d5fa22175da329dca0d8 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 17 Dec 2020 21:25:25 +0300
Subject: [PATCH 056/151] [WIP] Change property and structure subscription to
 flows.

---
 .../mipt/npm/muon/monitor/MMAppComponent.kt   |   4 +-
 .../vision/solid/demo/VariableBox.kt          |   7 +-
 settings.gradle.kts                           |   4 +-
 .../vision/bootstrap/visionPropertyEditor.kt  |  19 +-
 .../{ConfigEditor.kt => PropertyEditor.kt}    | 164 ++++++++++--------
 .../kotlin/hep/dataforge/vision/StyleSheet.kt |   9 +
 .../kotlin/hep/dataforge/vision/Vision.kt     |  79 +++------
 .../kotlin/hep/dataforge/vision/VisionBase.kt |  31 ++--
 .../hep/dataforge/vision/VisionChange.kt      |   4 +-
 .../kotlin/hep/dataforge/vision/misc.kt       |  17 +-
 .../hep/dataforge/vision/visionDescriptor.kt  |  25 +++
 .../editor/VisualObjectEditorFragment.kt      |   4 +-
 .../vision/solid/FXReferenceFactory.kt        |   2 +-
 .../vision/solid/VisualObjectFXBinding.kt     |   2 +-
 .../dataforge/vision/gdml/GDMLTransformer.kt  |   3 +-
 .../dataforge/vision/gdml/GdmlOptimizer.kt    |   5 +-
 .../hep/dataforge/vision/solid/Composite.kt   |   3 +-
 .../hep/dataforge/vision/solid/PolyLine.kt    |   4 +-
 .../hep/dataforge/vision/solid/Solid.kt       |   6 +-
 .../hep/dataforge/vision/solid/SolidGroup.kt  |   2 +-
 .../dataforge/vision/solid/SolidMaterial.kt   |  20 ++-
 .../dataforge/vision/solid/SolidReference.kt  |  18 +-
 .../solid/transform/RemoveSingleChild.kt      |   2 +-
 .../dataforge/vision/solid/PropertyTest.kt    |   5 +-
 .../vision/solid/SerializationTest.kt         |   6 +-
 .../vision/solid/VisionUpdateTest.kt          |   2 +-
 .../vision/solid/three/MeshThreeFactory.kt    |   2 +-
 .../vision/solid/three/ThreeLabelFactory.kt   |   2 +-
 .../vision/solid/three/ThreeLineFactory.kt    |   2 +-
 .../vision/solid/three/ThreePlugin.kt         |   2 +-
 .../solid/three/ThreeReferenceFactory.kt      |   2 +-
 31 files changed, 250 insertions(+), 207 deletions(-)
 rename ui/react/src/main/kotlin/hep/dataforge/vision/react/{ConfigEditor.kt => PropertyEditor.kt} (60%)
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionDescriptor.kt

diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
index 37220400..66a871cf 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
@@ -10,9 +10,9 @@ import hep.dataforge.vision.bootstrap.canvasControls
 import hep.dataforge.vision.bootstrap.card
 import hep.dataforge.vision.bootstrap.gridRow
 import hep.dataforge.vision.react.ThreeCanvasComponent
-import hep.dataforge.vision.react.configEditor
 import hep.dataforge.vision.react.flexColumn
 import hep.dataforge.vision.react.objectTree
+import hep.dataforge.vision.react.propertyEditor
 import hep.dataforge.vision.solid.specifications.Camera
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.solid.three.ThreeCanvas
@@ -193,7 +193,7 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                             else -> root[selected]
                         }
                         if (selectedObject != null) {
-                            configEditor(
+                            propertyEditor(
                                 selectedObject.config,
                                 selectedObject.descriptor,
                                 default = selectedObject.allProperties,
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
index d4e8d833..366acfc4 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
@@ -5,7 +5,6 @@ import hep.dataforge.names.plus
 import hep.dataforge.names.startsWith
 import hep.dataforge.values.asValue
 import hep.dataforge.vision.getProperty
-import hep.dataforge.vision.properties
 import hep.dataforge.vision.set
 import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.*
@@ -34,8 +33,8 @@ internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeV
         scaleX = xSize
         scaleY = ySize
         scaleZ = zSize
-        properties[MeshThreeFactory.EDGES_ENABLED_KEY] = false
-        properties[MeshThreeFactory.WIREFRAME_ENABLED_KEY] = false
+        getProperty(MeshThreeFactory.EDGES_ENABLED_KEY, false)
+        getProperty(MeshThreeFactory.WIREFRAME_ENABLED_KEY, false)
     }
 
     override fun render(three: ThreePlugin): Object3D {
@@ -63,7 +62,7 @@ internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeV
         mesh.scale.set(xSize, ySize, zSize)
 
         //add listener to object properties
-        propertyInvalidated.onEach { name ->
+        propertyNameFlow.onEach { name ->
             when {
                 name.startsWith(GEOMETRY_KEY) -> {
                     val newXSize = getProperty(X_SIZE_KEY, false).number?.toDouble() ?: 1.0
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 978abd5e..3877a947 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
-    val kotlinVersion = "1.4.20"
-    val toolsVersion = "0.7.0"
+    val kotlinVersion = "1.4.21"
+    val toolsVersion = "0.7.1"
 
     repositories {
         mavenLocal()
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
index 9734bc74..f172f113 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
@@ -3,29 +3,30 @@ package hep.dataforge.vision.bootstrap
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.allProperties
 import hep.dataforge.vision.getStyle
-import hep.dataforge.vision.properties
 import hep.dataforge.vision.react.configEditor
 import hep.dataforge.vision.react.metaViewer
+import hep.dataforge.vision.styles
 import org.w3c.dom.Element
 import react.RBuilder
 import react.dom.render
 
 public fun RBuilder.visionPropertyEditor(
-    item: Vision,
-    descriptor: NodeDescriptor? = item.descriptor,
+    vision: Vision,
+    descriptor: NodeDescriptor? = vision.descriptor,
     default: Meta? = null,
-    key: Any? = null
+    key: Any? = null,
 ) {
     card("Properties") {
-        configEditor(item.properties, descriptor, default, key)
+        configEditor(vision.allProperties(), descriptor, default, key)
     }
-    val styles = item.styles
-    if(styles.isNotEmpty()) {
+    val styles = vision.styles
+    if (styles.isNotEmpty()) {
         card("Styles") {
             accordion("styles") {
                 styles.forEach { styleName ->
-                    val style = item.getStyle(styleName)
+                    val style = vision.getStyle(styleName)
                     if (style != null) {
                         entry(styleName) {
                             metaViewer(style)
@@ -40,7 +41,7 @@ public fun RBuilder.visionPropertyEditor(
 public fun Element.visionPropertyEditor(
     item: Vision,
     descriptor: NodeDescriptor? = item.descriptor,
-    default: Meta? = null
+    default: Meta? = null,
 ): Unit = render(this) {
     visionPropertyEditor(item, descriptor, default)
 }
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
similarity index 60%
rename from ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
rename to ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
index b659452f..e88e42a1 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ConfigEditor.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
@@ -7,6 +7,14 @@ import hep.dataforge.names.NameToken
 import hep.dataforge.names.lastOrNull
 import hep.dataforge.names.plus
 import hep.dataforge.values.Value
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.channels.awaitClose
+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.html.js.onClickFunction
 import org.w3c.dom.Element
 import org.w3c.dom.events.Event
@@ -14,55 +22,59 @@ import react.*
 import react.dom.render
 import styled.*
 
-public external interface ConfigEditorItemProps : RProps {
+public external interface PropertyEditorItemProps : RProps {
 
     /**
      * Root config object - always non null
      */
-    public var root: MutableItemProvider
+    public var provider: MutableItemProvider
 
     /**
-     * Full path to the displayed node in [root]. Could be empty
+     * Full path to the displayed node in [provider]. Could be empty
      */
     public var name: Name
 
-    /**
-     * Root default
-     */
-    public var default: Meta?
-
     /**
      * Root descriptor
      */
     public var descriptor: NodeDescriptor?
+
+
+    public var scope: CoroutineScope?
+
+    /**
+     *
+     */
+    public var updateFlow: Flow<Name>?
 }
 
-private val ConfigEditorItem: FunctionalComponent<ConfigEditorItemProps> =
+private val PropertyEditorItem: FunctionalComponent<PropertyEditorItemProps> =
     functionalComponent("ConfigEditorItem") { props ->
-        configEditorItem(props)
+        propertyEditorItem(props)
     }
 
-private fun RBuilder.configEditorItem(props: ConfigEditorItemProps) {
+private fun RBuilder.propertyEditorItem(props: PropertyEditorItemProps) {
     var expanded: Boolean by useState { true }
-    var item: MetaItem<*>? by useState { props.root.getItem(props.name) }
+    var item: MetaItem<*>? by useState { props.provider.getItem(props.name) }
     val descriptorItem: ItemDescriptor? = props.descriptor?.get(props.name)
-    val defaultItem = props.default?.get(props.name)
-    var actualItem: MetaItem<Meta>? by useState { item ?: defaultItem ?: descriptorItem?.defaultItem() }
+    var actualItem: MetaItem<Meta>? by useState { item ?: descriptorItem?.defaultItem() }
 
     val token = props.name.lastOrNull()?.toString() ?: "Properties"
 
     fun update() {
-        item = props.root.getItem(props.name)
-        actualItem = item ?: defaultItem ?: descriptorItem?.defaultItem()
+        item = props.provider.getItem(props.name)
+        actualItem = item ?: descriptorItem?.defaultItem()
     }
 
-    useEffectWithCleanup(listOf(props.root)) {
-        props.root.onChange(this) { name, _, _ ->
-            if (name == props.name) {
-                update()
-            }
+    if (props.updateFlow != null) {
+        useEffectWithCleanup(listOf(props.provider, props.updateFlow)) {
+            val updateJob = props.updateFlow!!.onEach { updatedName ->
+                if (updatedName == props.name) {
+                    update()
+                }
+            }.launchIn(props.scope ?: GlobalScope)
+            return@useEffectWithCleanup { updateJob.cancel() }
         }
-        return@useEffectWithCleanup { props.root.removeListener(this) }
     }
 
     val expanderClick: (Event) -> Unit = {
@@ -71,15 +83,15 @@ private fun RBuilder.configEditorItem(props: ConfigEditorItemProps) {
 
     val valueChanged: (Value?) -> Unit = {
         if (it == null) {
-            props.root.remove(props.name)
+            props.provider.remove(props.name)
         } else {
-            props.root[props.name] = it
+            props.provider[props.name] = it
         }
         update()
     }
 
     val removeClick: (Event) -> Unit = {
-        props.root.remove(props.name)
+        props.provider.remove(props.name)
         update()
     }
 
@@ -121,7 +133,6 @@ private fun RBuilder.configEditorItem(props: ConfigEditorItemProps) {
                         add(NameToken(it))
                     }
                     item?.node?.items?.keys?.let { addAll(it) }
-                    defaultItem?.node?.items?.keys?.let { addAll(it) }
                 }
 
                 keys.filter { !it.body.startsWith("@") }.forEach { token ->
@@ -129,12 +140,11 @@ private fun RBuilder.configEditorItem(props: ConfigEditorItemProps) {
                         css {
                             +TreeStyles.treeItem
                         }
-                        child(ConfigEditorItem) {
+                        child(PropertyEditorItem) {
                             attrs {
                                 this.key = props.name.toString()
-                                this.root = props.root
+                                this.provider = props.provider
                                 this.name = props.name + token
-                                this.default = props.default
                                 this.descriptor = props.descriptor
                             }
                         }
@@ -190,63 +200,79 @@ private fun RBuilder.configEditorItem(props: ConfigEditorItemProps) {
     }
 }
 
-public external interface ConfigEditorProps : RProps {
-    public var id: Name
-    public var root: MutableItemProvider
-    public var default: Meta?
+public external interface PropertyEditorProps : RProps {
+    public var provider: MutableItemProvider
+    public var updateFlow: Flow<Name>?
     public var descriptor: NodeDescriptor?
+    public var scope: CoroutineScope?
 }
 
 @JsExport
-public val ConfigEditor: FunctionalComponent<ConfigEditorProps> = functionalComponent("ConfigEditor") { props ->
-    child(ConfigEditorItem) {
+public val PropertyEditor: FunctionalComponent<PropertyEditorProps> = functionalComponent("ConfigEditor") { props ->
+    child(PropertyEditorItem) {
         attrs {
             this.key = ""
-            this.root = props.root
+            this.provider = props.provider
             this.name = Name.EMPTY
-            this.default = props.default
             this.descriptor = props.descriptor
+            this.scope = props.scope
         }
     }
 }
 
+public fun RBuilder.propertyEditor(
+    provider: MutableItemProvider,
+    updateFlow: Flow<Name>? = null,
+    descriptor: NodeDescriptor? = null,
+    key: Any? = null,
+    scope: CoroutineScope? = null,
+) {
+    child(PropertyEditor) {
+        attrs {
+            this.key = key?.toString() ?: ""
+            this.provider = provider
+            this.updateFlow = updateFlow
+            this.descriptor = descriptor
+            this.scope = scope
+        }
+    }
+}
+
+private fun Config.flowUpdates(): Flow<Name> = callbackFlow {
+    onChange(this) { name, _, _ ->
+        launch {
+            send(name)
+        }
+    }
+    awaitClose {
+        removeListener(this)
+    }
+}
+
+public fun MutableItemProvider.withDefault(default: ItemProvider): MutableItemProvider = object : MutableItemProvider {
+    override fun getItem(name: Name): MetaItem<*>? = getItem(name) ?: default.getItem(name)
+
+    override fun setItem(name: Name, item: MetaItem<*>?) = this@withDefault.setItem(name, item)
+}
+
+
+
+public fun RBuilder.configEditor(
+    config: Config,
+    descriptor: NodeDescriptor? = null,
+    default: Meta? = null,
+    key: Any? = null,
+    scope: CoroutineScope? = null,
+) = propertyEditor(config.withDefault(default ?: ItemProvider.EMPTY), config.flowUpdates(), descriptor, key, scope)
+
 public fun Element.configEditor(
     config: Config,
     descriptor: NodeDescriptor? = null,
     default: Meta? = null,
     key: Any? = null,
+    scope: CoroutineScope? = null,
 ) {
     render(this) {
-        child(ConfigEditor) {
-            attrs {
-                this.key = key?.toString() ?: ""
-                this.root = config
-                this.descriptor = descriptor
-                this.default = default
-            }
-        }
+        configEditor(config,descriptor,default, key, scope)
     }
-}
-
-public fun RBuilder.configEditor(
-    config: MutableItemProvider,
-    descriptor: NodeDescriptor? = null,
-    default: Meta? = null,
-    key: Any? = null,
-) {
-    child(ConfigEditor) {
-        attrs {
-            this.key = key?.toString() ?: ""
-            this.root = config
-            this.descriptor = descriptor
-            this.default = default
-        }
-    }
-}
-//
-//public fun RBuilder.configEditor(
-//    obj: Configurable,
-//    descriptor: NodeDescriptor?,
-//    default: Meta? = null,
-//    key: Any? = null
-//): Unit = configEditor(obj.config, descriptor, default, key)
+}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
index e7a6d971..783b376c 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
@@ -64,6 +64,15 @@ internal fun Vision.styleChanged(key: String, oldStyle: Meta?, newStyle: Meta?)
 }
 
 
+/**
+ * List of names of styles applied to this object. Order matters. Not inherited.
+ */
+public var Vision.styles: List<String>
+    get() = getOwnProperty(Vision.STYLE_KEY)?.stringList ?: emptyList()
+    set(value) {
+        setProperty(Vision.STYLE_KEY, value)
+    }
+
 /**
  * A stylesheet for this group and its descendants. Stylesheet is not applied directly,
  * but instead is just a repository for named configurations.
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 4baa5b8a..e1e73800 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -1,15 +1,15 @@
 package hep.dataforge.vision
 
-import hep.dataforge.meta.*
+import hep.dataforge.meta.MetaItem
+import hep.dataforge.meta.MutableItemProvider
 import hep.dataforge.meta.descriptors.Described
 import hep.dataforge.meta.descriptors.NodeDescriptor
+import hep.dataforge.meta.descriptors.get
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.toName
 import hep.dataforge.provider.Type
-import hep.dataforge.values.asValue
 import hep.dataforge.vision.Vision.Companion.TYPE
-import hep.dataforge.vision.Vision.Companion.VISIBLE_KEY
 import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.Transient
 
@@ -26,7 +26,8 @@ public interface Vision : Described {
     public var parent: VisionGroup?
 
     /**
-     * A fast accessor method to get own property (no inheritance or styles
+     * A fast accessor method to get own property (no inheritance or styles).
+     * Should be equivalent to `getProperty(name,false,false,false)`.
      */
     public fun getOwnProperty(name: Name): MetaItem<*>?
 
@@ -46,13 +47,13 @@ public interface Vision : Described {
     /**
      * Set the property value
      */
-    public fun setProperty(name: Name, item: MetaItem<*>?)
+    public fun setProperty(name: Name, item: MetaItem<*>?, notify: Boolean = true)
 
     /**
      * Flow of property invalidation events. It does not contain property values after invalidation since it is not clear
      * if it should include inherited properties etc.
      */
-    public val propertyInvalidated: Flow<Name>
+    public val propertyNameFlow: Flow<Name>
 
 
     /**
@@ -60,20 +61,6 @@ public interface Vision : Described {
      */
     public fun notifyPropertyChanged(propertyName: Name): Unit
 
-    /**
-     * List of names of styles applied to this object. Order matters. Not inherited.
-     */
-    public var styles: List<String>
-        get() = getProperty(
-            STYLE_KEY,
-            inherit = false,
-            includeStyles = false,
-            includeDefaults = true
-        )?.stringList ?: emptyList()
-        set(value) {
-            setProperty(STYLE_KEY, value)
-        }
-
     /**
      * Update this vision using external meta. Children are not updated.
      */
@@ -90,19 +77,27 @@ public interface Vision : Described {
 }
 
 /**
- * Convenient accessor for all properties of a vision. Provided properties include styles and defaults, but do not inherit.
+ * Convenient accessor for all properties of a vision.
+ * @param inherit - inherit property value from the parent by default. If null, inheritance is inferred from descriptor
  */
-public val Vision.properties: MutableItemProvider
-    get() = object : MutableItemProvider {
-        override fun getItem(name: Name): MetaItem<*>? = getProperty(name,
-            inherit = false,
-            includeStyles = true,
-            includeDefaults = true
+public fun Vision.allProperties(
+    inherit: Boolean? = null,
+    includeStyles: Boolean = true,
+    includeDefaults: Boolean = true,
+): MutableItemProvider = object : MutableItemProvider {
+    override fun getItem(name: Name): MetaItem<*>? {
+        val actualInherit = inherit ?: descriptor?.get(name)?.inherited ?: false
+        return getProperty(
+            name,
+            inherit = actualInherit,
+            includeStyles = includeStyles,
+            includeDefaults = includeDefaults
         )
-
-        override fun setItem(name: Name, item: MetaItem<*>?): Unit = setProperty(name, item)
     }
 
+    override fun setItem(name: Name, item: MetaItem<*>?): Unit = setProperty(name, item)
+}
+
 /**
  * Get [Vision] property using key as a String
  */
@@ -116,31 +111,13 @@ public fun Vision.getProperty(
 /**
  * A convenience method to pair [getProperty]
  */
-public fun Vision.setProperty(key: Name, value: Any?) {
-    properties[key] = value
+public fun Vision.setProperty(key: Name, item: Any?) {
+    setProperty(key, MetaItem.of(item))
 }
 
 /**
  * A convenience method to pair [getProperty]
  */
-public fun Vision.setProperty(key: String, value: Any?) {
-    properties[key] = value
+public fun Vision.setProperty(key: String, item: Any?) {
+    setProperty(key.toName(), MetaItem.of(item))
 }
-
-/**
- * Control visibility of the element
- */
-public var Vision.visible: Boolean?
-    get() = getProperty(VISIBLE_KEY).boolean
-    set(value) = setProperty(VISIBLE_KEY, value?.asValue())
-
-public fun Vision.props(inherit: Boolean = true): MutableItemProvider = object : MutableItemProvider {
-    override fun getItem(name: Name): MetaItem<*>? {
-        return getProperty(name, inherit)
-    }
-
-    override fun setItem(name: Name, item: MetaItem<*>?) {
-        setProperty(name, item)
-    }
-
-}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index aa1fcba2..c608e4c4 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -1,9 +1,12 @@
 package hep.dataforge.vision
 
-import hep.dataforge.meta.*
+import hep.dataforge.meta.Config
+import hep.dataforge.meta.MetaItem
+import hep.dataforge.meta.MutableMeta
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.descriptors.defaultItem
 import hep.dataforge.meta.descriptors.get
+import hep.dataforge.meta.update
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.values.ValueType
@@ -30,34 +33,28 @@ public open class VisionBase : Vision {
     /**
      * Object own properties excluding styles and inheritance
      */
-    @SerialName("properties")
-    protected var innerProperties: Config? = null
+    public var properties: Config? = null
         private set
 
-    /**
-     * All own properties as a read-only Meta
-     */
-    public val ownProperties: Meta get() = innerProperties ?: Meta.EMPTY
-
     @Synchronized
     private fun getOrCreateConfig(): Config {
-        if (innerProperties == null) {
+        if (properties == null) {
             val newProperties = Config()
-            innerProperties = newProperties
+            properties = newProperties
             newProperties.onChange(this) { name, oldItem, newItem ->
                 if (oldItem != newItem) {
                     notifyPropertyChanged(name)
                 }
             }
         }
-        return innerProperties!!
+        return properties!!
     }
 
     /**
      * A fast accessor method to get own property (no inheritance or styles
      */
     override fun getOwnProperty(name: Name): MetaItem<*>? {
-        return innerProperties?.getItem(name)
+        return properties?.getItem(name)
     }
 
     override fun getProperty(
@@ -77,9 +74,11 @@ public open class VisionBase : Vision {
     }.merge()
 
     @Synchronized
-    override fun setProperty(name: Name, item: MetaItem<*>?) {
+    override fun setProperty(name: Name, item: MetaItem<*>?, notify: Boolean) {
         getOrCreateConfig().setItem(name, item)
-        notifyPropertyChanged(name)
+        if(notify) {
+            notifyPropertyChanged(name)
+        }
     }
 
     override val descriptor: NodeDescriptor? get() = null
@@ -96,11 +95,11 @@ public open class VisionBase : Vision {
     @Transient
     private val _propertyInvalidationFlow: MutableSharedFlow<Name> = MutableSharedFlow()
 
-    override val propertyInvalidated: SharedFlow<Name> get() = _propertyInvalidationFlow
+    override val propertyNameFlow: SharedFlow<Name> get() = _propertyInvalidationFlow
 
     override fun notifyPropertyChanged(propertyName: Name) {
         if (propertyName == STYLE_KEY) {
-            updateStyles(properties.getItem(STYLE_KEY)?.stringList ?: emptyList())
+            updateStyles(styles)
         }
 
         _propertyInvalidationFlow.tryEmit(propertyName)
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
index f2ac5d6b..c2717108 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
@@ -64,7 +64,7 @@ private fun Vision.isolate(manager: VisionManager): Vision {
 public class VisionChange(
     public val reset: Boolean = false,
     public val vision: Vision? = null,
-    public val properties: Meta? = null,
+    @Serializable(MetaSerializer::class) public val properties: Meta? = null,
     public val children: Map<Name, VisionChange>? = null,
 ) {
 
@@ -81,7 +81,7 @@ private fun CoroutineScope.collectChange(
 ) {
 
     //Collect properties change
-    source.propertyInvalidated.onEach { propertyName ->
+    source.propertyNameFlow.onEach { propertyName ->
         val newItem = source.getProperty(propertyName, inherit = false, includeStyles = false, includeDefaults = false)
         collector().propertyChanged(name, propertyName, newItem)
     }.launchIn(this)
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
index 7c9a4521..75cb8f40 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
@@ -31,16 +31,15 @@ public inline fun <reified E : Enum<E>> NodeDescriptor.enum(key: Name, default:
 }
 
 @DFExperimental
-public val Vision.ownProperties: Meta?
-    get() = (this as? VisionBase)?.ownProperties
+public val Vision.properties: Config?
+    get() = (this as? VisionBase)?.properties
 
-@DFExperimental
-public val Vision.describedProperties: Meta
-    get() = Meta {
-        descriptor?.items?.forEach { (key, _) ->
-            key put getProperty(key)
-        }
-    }
+/**
+ * Control visibility of the element
+ */
+public var Vision.visible: Boolean?
+    get() = getProperty(Vision.VISIBLE_KEY).boolean
+    set(value) = setProperty(Vision.VISIBLE_KEY, value?.asValue())
 
 public fun Vision.configure(meta: Meta?): Unit = update(VisionChange(properties = meta))
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionDescriptor.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionDescriptor.kt
new file mode 100644
index 00000000..3393c838
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionDescriptor.kt
@@ -0,0 +1,25 @@
+package hep.dataforge.vision
+
+import hep.dataforge.meta.Meta
+import hep.dataforge.meta.boolean
+import hep.dataforge.meta.descriptors.ItemDescriptor
+import hep.dataforge.meta.descriptors.attributes
+import hep.dataforge.meta.get
+import hep.dataforge.meta.set
+
+private const val INHERITED_DESCRIPTOR_ATTRIBUTE = "inherited"
+
+public var ItemDescriptor.inherited: Boolean
+    get() = attributes[INHERITED_DESCRIPTOR_ATTRIBUTE].boolean ?: false
+    set(value) = attributes {
+        set(INHERITED_DESCRIPTOR_ATTRIBUTE, value)
+    }
+
+
+public val Vision.describedProperties: Meta
+    get() = Meta {
+        descriptor?.items?.forEach { (key, descriptor) ->
+            key put getProperty(key, inherit = descriptor.inherited)
+        }
+    }
+
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
index e8b22dbe..762c8090 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
@@ -19,8 +19,8 @@ class VisualObjectEditorFragment(val selector: (Vision) -> Meta) : Fragment() {
     constructor(
         item: Vision?,
         descriptor: NodeDescriptor?,
-        selector: (Vision) -> MutableItemProvider = { it.properties }
-    ) : this({it.describedProperties}) {
+        selector: (Vision) -> MutableItemProvider = { it.allProperties() },
+    ) : this({ it.describedProperties }) {
         this.item = item
         this.descriptorProperty.set(descriptor)
     }
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
index 2ffb2660..9b15df72 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
@@ -15,7 +15,7 @@ class FXReferenceFactory(val plugin: FX3DPlugin) : FX3DFactory<SolidReferenceGro
         val prototype = obj.prototype
         val node = plugin.buildNode(prototype)
 
-        obj.propertyInvalidated.onEach {  name->
+        obj.propertyNameFlow.onEach { name->
             if (name.firstOrNull()?.body == SolidReferenceGroup.REFERENCE_CHILD_PROPERTY_PREFIX) {
                 val childName = name.firstOrNull()?.index?.toName() ?: error("Wrong syntax for reference child property: '$name'")
                 val propertyName = name.cutFirst()
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
index 8d19db59..30a8d6a8 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
@@ -18,7 +18,7 @@ class VisualObjectFXBinding(val fx: FX3DPlugin, val obj: Vision) {
     private val bindings = HashMap<Name, ObjectBinding<MetaItem<*>?>>()
 
     init {
-        obj.propertyInvalidated.onEach { name ->
+        obj.propertyNameFlow.onEach { name ->
             bindings.filter { it.key.startsWith(name) }.forEach { entry ->
                 Platform.runLater {
                     entry.value.invalidate()
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
index 58ec3b51..2ac28d6b 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
@@ -38,7 +38,6 @@ public class GDMLTransformerSettings {
 
     public var solidAction: (GDMLSolid) -> Action = { Action.PROTOTYPE }
     public var volumeAction: (GDMLGroup) -> Action = { Action.PROTOTYPE }
-
 }
 
 private class GDMLTransformer(val settings: GDMLTransformerSettings) {
@@ -324,7 +323,7 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
         }
     }
 
-    fun finalize(final: SolidGroup): SolidGroup {
+    private fun finalize(final: SolidGroup): SolidGroup {
         //final.prototypes = proto
         final.useStyle("GDML") {
             Solid.ROTATION_ORDER_KEY put RotationOrder.ZXY
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
index bec3822c..125614c6 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
@@ -3,7 +3,6 @@ package hep.dataforge.vision.gdml
 import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.sequence
 import hep.dataforge.vision.Vision
-import hep.dataforge.vision.ownProperties
 import hep.dataforge.vision.properties
 import hep.dataforge.vision.solid.*
 
@@ -28,8 +27,8 @@ internal fun Vision.updateFrom(other: Vision): Vision {
             scaleY = scaleY.toDouble() * other.scaleY.toDouble()
             scaleZ = scaleZ.toDouble() * other.scaleZ.toDouble()
         }
-        other.ownProperties?.sequence()?.forEach { (name, item) ->
-            if (properties.getItem(name) == null) {
+        other.properties?.sequence()?.forEach { (name, item) ->
+            if (getProperty(name) == null) {
                 setProperty(name, item)
             }
         }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
index dacc79bd..e1e79ef8 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
@@ -1,5 +1,6 @@
 package hep.dataforge.vision.solid
 
+import hep.dataforge.meta.Meta
 import hep.dataforge.meta.update
 import hep.dataforge.names.NameToken
 import hep.dataforge.vision.*
@@ -39,7 +40,7 @@ public inline fun VisionContainerBuilder<Solid>.composite(
     val children = group.children.values.filterIsInstance<Solid>()
     if (children.size != 2) error("Composite requires exactly two children")
     return Composite(type, children[0], children[1]).also {
-        it.configure { update(group.ownProperties) }
+        it.configure { update(group.properties ?: Meta.EMPTY) }
         if (group.position != null) {
             it.position = group.position
         }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
index 998f7f4f..28f4ad68 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
@@ -6,7 +6,7 @@ import hep.dataforge.names.asName
 import hep.dataforge.names.plus
 import hep.dataforge.vision.VisionBuilder
 import hep.dataforge.vision.VisionContainerBuilder
-import hep.dataforge.vision.props
+import hep.dataforge.vision.allProperties
 import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -16,7 +16,7 @@ import kotlinx.serialization.Serializable
 public class PolyLine(public var points: List<Point3D>) : SolidBase(), Solid {
 
     //var lineType by string()
-    public var thickness: Number by props().number(1.0, key = SolidMaterial.MATERIAL_KEY + THICKNESS_KEY)
+    public var thickness: Number by allProperties(inherit = false).number(1.0, key = SolidMaterial.MATERIAL_KEY + THICKNESS_KEY)
 
     public companion object {
         public val THICKNESS_KEY: Name = "thickness".asName()
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
index d690c6b1..65cf37e4 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
@@ -81,7 +81,7 @@ public interface Solid : Vision {
             if (first.position != second.position) return false
             if (first.rotation != second.rotation) return false
             if (first.scale != second.scale) return false
-            if (first.ownProperties != second.ownProperties) return false
+            if (first.properties != second.properties) return false
             return true
         }
 
@@ -89,7 +89,7 @@ public interface Solid : Vision {
             var result = +(solid.position?.hashCode() ?: 0)
             result = 31 * result + (solid.rotation?.hashCode() ?: 0)
             result = 31 * result + (solid.scale?.hashCode() ?: 0)
-            result = 31 * result + solid.properties.hashCode()
+            result = 31 * result + solid.allProperties().hashCode()
             return result
         }
     }
@@ -99,7 +99,7 @@ public interface Solid : Vision {
  * Get the layer number this solid belongs to. Return 0 if layer is not defined.
  */
 public var Solid.layer: Int
-    get() = properties.getItem(LAYER_KEY).int ?: 0
+    get() = allProperties().getItem(LAYER_KEY).int ?: 0
     set(value) {
         setProperty(LAYER_KEY, value)
     }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index cc3b92e4..77aa950c 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -130,7 +130,7 @@ internal class Prototypes(
         includeDefaults: Boolean,
     ): MetaItem<*>? = null
 
-    override fun setProperty(name: Name, item: MetaItem<*>?) {
+    override fun setProperty(name: Name, item: MetaItem<*>?, notify: Boolean) {
         TODO("Not yet implemented")
     }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
index 8cf8755c..f060afea 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
@@ -41,14 +41,14 @@ public operator fun ColorAccessor?.invoke(webColor: String) {
  * Set color as RGB integer
  */
 public operator fun ColorAccessor?.invoke(rgb: Int) {
-    this?.value = rgb.asValue()
+    this?.value = Colors.rgbToString(rgb).asValue()
 }
 
 /**
  * Set color as RGB
  */
 public operator fun ColorAccessor?.invoke(r: UByte, g: UByte, b: UByte) {
-    this?.value =  Colors.rgbToString(r, g, b).asValue()
+    this?.value = Colors.rgbToString(r, g, b).asValue()
 }
 
 @VisionBuilder
@@ -112,7 +112,15 @@ public class SolidMaterial : Scheme() {
     }
 }
 
-public val Solid.color: ColorAccessor get() = ColorAccessor(properties, MATERIAL_COLOR_KEY)
+public val Solid.color: ColorAccessor
+    get() = ColorAccessor(
+        allProperties(
+            inherit = true,
+            includeStyles = true,
+            includeDefaults = true
+        ),
+        MATERIAL_COLOR_KEY
+    )
 
 public var Solid.material: SolidMaterial?
     get() = getProperty(MATERIAL_KEY).node?.let { SolidMaterial.read(it) }
@@ -120,7 +128,11 @@ public var Solid.material: SolidMaterial?
 
 @VisionBuilder
 public fun Solid.material(builder: SolidMaterial.() -> Unit) {
-    val node = properties.getItem(MATERIAL_KEY).node
+    val node = allProperties(
+        inherit = true,
+        includeStyles = true,
+        includeDefaults = true
+    ).getItem(MATERIAL_KEY).node
     if (node != null) {
         SolidMaterial.update(node, builder)
     } else {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
index efc7b1cb..5378f71d 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
@@ -47,12 +47,12 @@ public class SolidReferenceGroup(
         return getOwnProperty(childPropertyName(childName, propertyName))
     }
 
-    private fun setChildProperty(childName: Name, propertyName: Name, item: MetaItem<*>?) {
-        setProperty(childPropertyName(childName, propertyName), item)
+    private fun setChildProperty(childName: Name, propertyName: Name, item: MetaItem<*>?, notify: Boolean) {
+        setProperty(childPropertyName(childName, propertyName), item, notify)
     }
 
     private fun prototypeFor(name: Name): Solid {
-        return if(name.isEmpty()) prototype else {
+        return if (name.isEmpty()) prototype else {
             (prototype as? SolidGroup)?.get(name) as? Solid
                 ?: error("Prototype with name $name not found in $this")
         }
@@ -98,8 +98,8 @@ public class SolidReferenceGroup(
 
         override fun getOwnProperty(name: Name): MetaItem<*>? = getChildProperty(childName, name)
 
-        override fun setProperty(name: Name, item: MetaItem<*>?) {
-            setChildProperty(childName, name, item)
+        override fun setProperty(name: Name, item: MetaItem<*>?, notify: Boolean) {
+            setChildProperty(childName, name, item, notify)
         }
 
         override fun getProperty(
@@ -119,16 +119,16 @@ public class SolidReferenceGroup(
         }.merge()
 
         override var parent: VisionGroup?
-            get(){
+            get() {
                 val parentName = childName.cutLast()
-                return if( parentName.isEmpty()) this@SolidReferenceGroup else ReferenceChild(parentName)
+                return if (parentName.isEmpty()) this@SolidReferenceGroup else ReferenceChild(parentName)
             }
             set(value) {
                 error("Setting a parent for a reference child is not possible")
             }
 
-        override val propertyInvalidated: Flow<Name>
-            get() = this@SolidReferenceGroup.propertyInvalidated.filter { name ->
+        override val propertyNameFlow: Flow<Name>
+            get() = this@SolidReferenceGroup.propertyNameFlow.filter { name ->
                 name.startsWith(childToken(childName))
             }.map { name ->
                 name.cutFirst()
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
index 0b64a7b7..a5b5f1ba 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
@@ -9,7 +9,7 @@ import hep.dataforge.vision.solid.*
 internal fun mergeChild(parent: VisionGroup, child: Vision): Vision {
     return child.apply {
 
-        configure(parent.ownProperties)
+        configure(parent.properties)
 
         //parent.properties?.let { config.update(it) }
 
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
index 55efe64a..30917b90 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
@@ -2,10 +2,7 @@ package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.int
 import hep.dataforge.names.asName
-import hep.dataforge.vision.getProperty
-import hep.dataforge.vision.setProperty
-import hep.dataforge.vision.styleSheet
-import hep.dataforge.vision.useStyle
+import hep.dataforge.vision.*
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
index 017d4db3..c7090eee 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
@@ -4,7 +4,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.toName
 import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.get
-import hep.dataforge.vision.ownProperties
+import hep.dataforge.vision.properties
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -33,7 +33,7 @@ class SerializationTest {
         val string =  SolidManager.encodeToString(cube)
         println(string)
         val newCube = SolidManager.decodeFromString(string)
-        assertEquals(cube.ownProperties, newCube.ownProperties)
+        assertEquals(cube.properties, newCube.properties)
     }
 
     @Test
@@ -54,7 +54,7 @@ class SerializationTest {
         val string = SolidManager.encodeToString(group)
         println(string)
         val reconstructed = SolidManager.decodeFromString(string) as SolidGroup
-        assertEquals(group["cube"]?.ownProperties, reconstructed["cube"]?.ownProperties)
+        assertEquals(group["cube"]?.properties, reconstructed["cube"]?.properties)
     }
 
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt
index 79bba867..17babd41 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt
@@ -29,7 +29,7 @@ class VisionUpdateTest {
         targetVision.update(dif)
         assertTrue { targetVision["top"] is SolidGroup }
         assertEquals("red", (targetVision["origin"] as Solid).color.string) // Should work
-        assertEquals("#00007b", (targetVision["top"] as SolidGroup).color.string) // new item always takes precedence
+        assertEquals("#00007b", (targetVision["top"] as Solid).color.string) // new item always takes precedence
     }
 
     @Test
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
index 8a80527d..3adaf603 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
@@ -45,7 +45,7 @@ public abstract class MeshThreeFactory<in T : Solid>(
         }.applyProperties(obj)
 
         //add listener to object properties
-        obj.propertyInvalidated.onEach { name ->
+        obj.propertyNameFlow.onEach { name ->
             when {
                 name.startsWith(Solid.GEOMETRY_KEY) -> {
                     val oldGeometry = mesh.geometry as BufferGeometry
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
index 9ab3f401..4d1c7d99 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
@@ -27,7 +27,7 @@ public object ThreeLabelFactory : ThreeFactory<SolidLabel> {
         })
         return Mesh(textGeo, getMaterial(obj, true)).apply {
             updatePosition(obj)
-            obj.propertyInvalidated.onEach { _ ->
+            obj.propertyNameFlow.onEach { _ ->
                 //TODO
                 three.logger.warn{"Label parameter change not implemented"}
             }.launchIn(three.updateScope)
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
index 199213ba..d914a218 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
@@ -30,7 +30,7 @@ public object ThreeLineFactory : ThreeFactory<PolyLine> {
             updatePosition(obj)
             //layers.enable(obj.layer)
             //add listener to object properties
-            obj.propertyInvalidated.onEach { propertyName ->
+            obj.propertyNameFlow.onEach { propertyName ->
                 updateProperty(obj, propertyName)
             }.launchIn(three.updateScope)
         }
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index 1bd46f37..2732d624 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -68,7 +68,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
                     updatePosition(obj)
                     //obj.onChildrenChange()
 
-                    obj.propertyInvalidated.onEach { name ->
+                    obj.propertyNameFlow.onEach { name ->
                         if (
                             name.startsWith(Solid.POSITION_KEY) ||
                             name.startsWith(Solid.ROTATION) ||
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
index 2374c05f..08866d46 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
@@ -47,7 +47,7 @@ public object ThreeReferenceFactory : ThreeFactory<SolidReferenceGroup> {
 
         //TODO apply child properties
 
-        obj.propertyInvalidated.onEach { name->
+        obj.propertyNameFlow.onEach { name->
             if (name.firstOrNull()?.body == REFERENCE_CHILD_PROPERTY_PREFIX) {
                 val childName = name.firstOrNull()?.index?.toName() ?: error("Wrong syntax for reference child property: '$name'")
                 val propertyName = name.cutFirst()

From be1d79c229b39b9f2c7f16d32423142895fc71c2 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 19 Dec 2020 12:33:29 +0300
Subject: [PATCH 057/151] Fix all compilations and errors.

---
 .../mipt/npm/muon/monitor/MMAppComponent.kt   | 27 ++++++++-----------
 .../vision/bootstrap/threeControls.kt         |  9 ++-----
 .../vision/bootstrap/visionPropertyEditor.kt  |  9 ++++---
 .../kotlin/hep/dataforge/vision/Vision.kt     |  5 ++--
 .../hep/dataforge/vision/visionDescriptor.kt  |  7 +++++
 .../hep/dataforge/vision/html/HtmlTagTest.kt  |  2 +-
 6 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
index 66a871cf..7e146287 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
@@ -9,10 +9,10 @@ import hep.dataforge.vision.Vision
 import hep.dataforge.vision.bootstrap.canvasControls
 import hep.dataforge.vision.bootstrap.card
 import hep.dataforge.vision.bootstrap.gridRow
+import hep.dataforge.vision.bootstrap.visionPropertyEditor
 import hep.dataforge.vision.react.ThreeCanvasComponent
 import hep.dataforge.vision.react.flexColumn
 import hep.dataforge.vision.react.objectTree
-import hep.dataforge.vision.react.propertyEditor
 import hep.dataforge.vision.solid.specifications.Camera
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.solid.three.ThreeCanvas
@@ -57,7 +57,7 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
 
     val root = props.model.root
 
-    gridRow{
+    gridRow {
         flexColumn {
             css {
                 +"col-lg-3"
@@ -109,8 +109,8 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                 height = 100.vh
             }
             styledDiv {
-                css{
-                    flex(0.0,1.0, FlexBasis.zero)
+                css {
+                    flex(0.0, 1.0, FlexBasis.zero)
                 }
                 //settings
                 canvas?.let {
@@ -140,8 +140,8 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                     }
                 }
             }
-            styledDiv{
-                css{
+            styledDiv {
+                css {
                     padding(0.px)
                 }
                 nav {
@@ -180,10 +180,10 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                     }
                 }
             }
-           styledDiv{
-               css{
-                   overflowY = Overflow.auto
-               }
+            styledDiv {
+                css {
+                    overflowY = Overflow.auto
+                }
                 //properties
                 card("Properties") {
                     selected.let { selected ->
@@ -193,12 +193,7 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                             else -> root[selected]
                         }
                         if (selectedObject != null) {
-                            propertyEditor(
-                                selectedObject.config,
-                                selectedObject.descriptor,
-                                default = selectedObject.allProperties,
-                                key = selected
-                            )
+                            visionPropertyEditor(selectedObject, key = selected)
                         }
                     }
                 }
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
index ea835f4f..7c26abbf 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
@@ -4,7 +4,6 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.isEmpty
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionGroup
-import hep.dataforge.vision.describedProperties
 import hep.dataforge.vision.react.objectTree
 import hep.dataforge.vision.solid.three.ThreeCanvas
 import kotlinx.css.*
@@ -52,11 +51,7 @@ public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalCo
                     else -> (vision as? VisionGroup)?.get(selected)
                 }
                 if (selectedObject != null) {
-                    visionPropertyEditor(
-                        selectedObject,
-                        default = selectedObject.describedProperties,
-                        key = selected
-                    )
+                    visionPropertyEditor(selectedObject, key = selected)
                 }
             }
         }
@@ -70,7 +65,7 @@ public fun RBuilder.threeControls(
     canvas: ThreeCanvas,
     selected: Name?,
     onSelect: (Name) -> Unit = {},
-    builder: TabBuilder.() -> Unit = {}
+    builder: TabBuilder.() -> Unit = {},
 ): ReactElement = child(ThreeControls) {
     attrs {
         this.canvas = canvas
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
index f172f113..9f4c3680 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
@@ -5,8 +5,8 @@ import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.allProperties
 import hep.dataforge.vision.getStyle
-import hep.dataforge.vision.react.configEditor
 import hep.dataforge.vision.react.metaViewer
+import hep.dataforge.vision.react.propertyEditor
 import hep.dataforge.vision.styles
 import org.w3c.dom.Element
 import react.RBuilder
@@ -15,11 +15,14 @@ import react.dom.render
 public fun RBuilder.visionPropertyEditor(
     vision: Vision,
     descriptor: NodeDescriptor? = vision.descriptor,
-    default: Meta? = null,
     key: Any? = null,
 ) {
     card("Properties") {
-        configEditor(vision.allProperties(), descriptor, default, key)
+        propertyEditor(
+            vision.allProperties(),
+            updateFlow = vision.propertyNameFlow,
+            descriptor = descriptor,
+            key = key)
     }
     val styles = vision.styles
     if (styles.isNotEmpty()) {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index e1e73800..7012698d 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -82,15 +82,16 @@ public interface Vision : Described {
  */
 public fun Vision.allProperties(
     inherit: Boolean? = null,
-    includeStyles: Boolean = true,
+    includeStyles: Boolean? = null,
     includeDefaults: Boolean = true,
 ): MutableItemProvider = object : MutableItemProvider {
     override fun getItem(name: Name): MetaItem<*>? {
         val actualInherit = inherit ?: descriptor?.get(name)?.inherited ?: false
+        val actualUseStyles = includeStyles ?: descriptor?.get(name)?.usesStyles ?: true
         return getProperty(
             name,
             inherit = actualInherit,
-            includeStyles = includeStyles,
+            includeStyles = actualUseStyles,
             includeDefaults = includeDefaults
         )
     }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionDescriptor.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionDescriptor.kt
index 3393c838..0e068827 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionDescriptor.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionDescriptor.kt
@@ -8,6 +8,7 @@ import hep.dataforge.meta.get
 import hep.dataforge.meta.set
 
 private const val INHERITED_DESCRIPTOR_ATTRIBUTE = "inherited"
+private const val STYLE_DESCRIPTOR_ATTRIBUTE = "useStyles"
 
 public var ItemDescriptor.inherited: Boolean
     get() = attributes[INHERITED_DESCRIPTOR_ATTRIBUTE].boolean ?: false
@@ -15,6 +16,12 @@ public var ItemDescriptor.inherited: Boolean
         set(INHERITED_DESCRIPTOR_ATTRIBUTE, value)
     }
 
+public var ItemDescriptor.usesStyles: Boolean
+    get() = attributes[STYLE_DESCRIPTOR_ATTRIBUTE].boolean ?: true
+    set(value) = attributes {
+        set(STYLE_DESCRIPTOR_ATTRIBUTE, value)
+    }
+
 
 public val Vision.describedProperties: Meta
     get() = Meta {
diff --git a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
index 0937bd64..c6efe090 100644
--- a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
+++ b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
@@ -34,7 +34,7 @@ class HtmlTagTest {
         div {
             h2 { +"Properties" }
             ul {
-                (vision as? VisionBase)?.ownProperties?.items?.forEach {
+                (vision as? VisionBase)?.properties?.items?.forEach {
                     li {
                         a { +it.key.toString() }
                         p { +it.value.toString() }

From 6939fba2926b11f34a2ed5302b0901504f58e4c7 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 19 Dec 2020 15:59:41 +0300
Subject: [PATCH 058/151] Fix getProperty defaults

---
 .../vision/bootstrap/visionPropertyEditor.kt  | 12 +--
 .../dataforge/vision/react/PropertyEditor.kt  | 73 +++++++++----------
 .../kotlin/hep/dataforge/vision/Vision.kt     | 39 +++++-----
 .../kotlin/hep/dataforge/vision/VisionBase.kt |  8 +-
 .../hep/dataforge/vision/solid/SolidGroup.kt  |  4 +-
 .../dataforge/vision/solid/SolidMaterial.kt   | 10 +--
 .../dataforge/vision/solid/SolidReference.kt  | 49 +++++++------
 .../dataforge/vision/solid/PropertyTest.kt    |  2 +-
 8 files changed, 97 insertions(+), 100 deletions(-)

diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
index 9f4c3680..14a93eb8 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
@@ -1,13 +1,9 @@
 package hep.dataforge.vision.bootstrap
 
-import hep.dataforge.meta.Meta
 import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.allProperties
-import hep.dataforge.vision.getStyle
+import hep.dataforge.vision.*
 import hep.dataforge.vision.react.metaViewer
 import hep.dataforge.vision.react.propertyEditor
-import hep.dataforge.vision.styles
 import org.w3c.dom.Element
 import react.RBuilder
 import react.dom.render
@@ -19,7 +15,8 @@ public fun RBuilder.visionPropertyEditor(
 ) {
     card("Properties") {
         propertyEditor(
-            vision.allProperties(),
+            provider = vision.ownProperties,
+            defaultProvider = vision.allProperties(),
             updateFlow = vision.propertyNameFlow,
             descriptor = descriptor,
             key = key)
@@ -44,7 +41,6 @@ public fun RBuilder.visionPropertyEditor(
 public fun Element.visionPropertyEditor(
     item: Vision,
     descriptor: NodeDescriptor? = item.descriptor,
-    default: Meta? = null,
 ): Unit = render(this) {
-    visionPropertyEditor(item, descriptor, default)
+    visionPropertyEditor(item, descriptor = descriptor)
 }
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
index e88e42a1..c730123b 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
@@ -22,17 +22,22 @@ import react.*
 import react.dom.render
 import styled.*
 
-public external interface PropertyEditorItemProps : RProps {
+public external interface PropertyEditorProps : RProps {
 
     /**
      * Root config object - always non null
      */
     public var provider: MutableItemProvider
 
+    /**
+     * Provide default item (greyed out if used
+     */
+    public var defaultProvider: ItemProvider?
+
     /**
      * Full path to the displayed node in [provider]. Could be empty
      */
-    public var name: Name
+    public var name: Name?
 
     /**
      * Root descriptor
@@ -40,29 +45,35 @@ public external interface PropertyEditorItemProps : RProps {
     public var descriptor: NodeDescriptor?
 
 
+    /**
+     * A coroutine scope for updates
+     */
     public var scope: CoroutineScope?
 
     /**
-     *
+     * Flow names of updated properties
      */
     public var updateFlow: Flow<Name>?
 }
 
-private val PropertyEditorItem: FunctionalComponent<PropertyEditorItemProps> =
+private val PropertyEditorItem: FunctionalComponent<PropertyEditorProps> =
     functionalComponent("ConfigEditorItem") { props ->
         propertyEditorItem(props)
     }
 
-private fun RBuilder.propertyEditorItem(props: PropertyEditorItemProps) {
+private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
     var expanded: Boolean by useState { true }
-    var item: MetaItem<*>? by useState { props.provider.getItem(props.name) }
-    val descriptorItem: ItemDescriptor? = props.descriptor?.get(props.name)
-    var actualItem: MetaItem<Meta>? by useState { item ?: descriptorItem?.defaultItem() }
+    val itemName by useState { props.name ?: Name.EMPTY }
+    var item: MetaItem<*>? by useState { props.provider.getItem(itemName) }
+    val descriptorItem: ItemDescriptor? = props.descriptor?.get(itemName)
+    var actualItem: MetaItem<Meta>? by useState {
+        item ?: props.defaultProvider?.getItem(itemName) ?: descriptorItem?.defaultItem()
+    }
 
-    val token = props.name.lastOrNull()?.toString() ?: "Properties"
+    val token = itemName.lastOrNull()?.toString() ?: "Properties"
 
     fun update() {
-        item = props.provider.getItem(props.name)
+        item = props.provider.getItem(itemName)
         actualItem = item ?: descriptorItem?.defaultItem()
     }
 
@@ -83,15 +94,15 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorItemProps) {
 
     val valueChanged: (Value?) -> Unit = {
         if (it == null) {
-            props.provider.remove(props.name)
+            props.provider.remove(itemName)
         } else {
-            props.provider[props.name] = it
+            props.provider[itemName] = it
         }
         update()
     }
 
     val removeClick: (Event) -> Unit = {
-        props.provider.remove(props.name)
+        props.provider.remove(itemName)
         update()
     }
 
@@ -144,7 +155,7 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorItemProps) {
                             attrs {
                                 this.key = props.name.toString()
                                 this.provider = props.provider
-                                this.name = props.name + token
+                                this.name = itemName + token
                                 this.descriptor = props.descriptor
                             }
                         }
@@ -176,7 +187,7 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorItemProps) {
                     +TreeStyles.resizeableInput
                 }
                 valueChooser(
-                    props.name,
+                    itemName,
                     actualItem,
                     descriptorItem as? ValueDescriptor,
                     valueChanged
@@ -200,19 +211,14 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorItemProps) {
     }
 }
 
-public external interface PropertyEditorProps : RProps {
-    public var provider: MutableItemProvider
-    public var updateFlow: Flow<Name>?
-    public var descriptor: NodeDescriptor?
-    public var scope: CoroutineScope?
-}
 
 @JsExport
-public val PropertyEditor: FunctionalComponent<PropertyEditorProps> = functionalComponent("ConfigEditor") { props ->
+public val PropertyEditor: FunctionalComponent<PropertyEditorProps> = functionalComponent("PropertyEditor") { props ->
     child(PropertyEditorItem) {
         attrs {
             this.key = ""
             this.provider = props.provider
+            this.defaultProvider = props.defaultProvider
             this.name = Name.EMPTY
             this.descriptor = props.descriptor
             this.scope = props.scope
@@ -222,17 +228,19 @@ public val PropertyEditor: FunctionalComponent<PropertyEditorProps> = functional
 
 public fun RBuilder.propertyEditor(
     provider: MutableItemProvider,
+    defaultProvider: ItemProvider?,
     updateFlow: Flow<Name>? = null,
     descriptor: NodeDescriptor? = null,
-    key: Any? = null,
     scope: CoroutineScope? = null,
+    key: Any? = null,
 ) {
     child(PropertyEditor) {
         attrs {
-            this.key = key?.toString() ?: ""
             this.provider = provider
+            this.defaultProvider = defaultProvider
             this.updateFlow = updateFlow
             this.descriptor = descriptor
+            this.key = key?.toString() ?: ""
             this.scope = scope
         }
     }
@@ -249,21 +257,14 @@ private fun Config.flowUpdates(): Flow<Name> = callbackFlow {
     }
 }
 
-public fun MutableItemProvider.withDefault(default: ItemProvider): MutableItemProvider = object : MutableItemProvider {
-    override fun getItem(name: Name): MetaItem<*>? = getItem(name) ?: default.getItem(name)
-
-    override fun setItem(name: Name, item: MetaItem<*>?) = this@withDefault.setItem(name, item)
-}
-
-
 
 public fun RBuilder.configEditor(
     config: Config,
+    default: ItemProvider? = null,
     descriptor: NodeDescriptor? = null,
-    default: Meta? = null,
     key: Any? = null,
     scope: CoroutineScope? = null,
-) = propertyEditor(config.withDefault(default ?: ItemProvider.EMPTY), config.flowUpdates(), descriptor, key, scope)
+): Unit = propertyEditor(config, default, config.flowUpdates(), descriptor, scope, key = key)
 
 public fun Element.configEditor(
     config: Config,
@@ -271,8 +272,6 @@ public fun Element.configEditor(
     default: Meta? = null,
     key: Any? = null,
     scope: CoroutineScope? = null,
-) {
-    render(this) {
-        configEditor(config,descriptor,default, key, scope)
-    }
+): Unit = render(this) {
+    configEditor(config, default, descriptor, key, scope)
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 7012698d..7363d67e 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -4,7 +4,6 @@ import hep.dataforge.meta.MetaItem
 import hep.dataforge.meta.MutableItemProvider
 import hep.dataforge.meta.descriptors.Described
 import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.meta.descriptors.get
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.toName
@@ -33,13 +32,13 @@ public interface Vision : Described {
 
     /**
      * Get property.
-     * @param inherit toggles parent node property lookup
-     * @param includeStyles toggles inclusion of
+     * @param inherit toggles parent node property lookup. Null means default inheritance.
+     * @param includeStyles toggles inclusion of. Null means default style inclusion.
      */
     public fun getProperty(
         name: Name,
-        inherit: Boolean = true,
-        includeStyles: Boolean = true,
+        inherit: Boolean? = null,
+        includeStyles: Boolean? = null,
         includeDefaults: Boolean = true,
     ): MetaItem<*>?
 
@@ -76,6 +75,16 @@ public interface Vision : Described {
     }
 }
 
+/**
+ * Own properties, excluding inheritance, styles and descriptor
+ */
+public val Vision.ownProperties: MutableItemProvider
+    get() = object : MutableItemProvider {
+        override fun getItem(name: Name): MetaItem<*>? = getOwnProperty(name)
+        override fun setItem(name: Name, item: MetaItem<*>?): Unit = setProperty(name, item)
+    }
+
+
 /**
  * Convenient accessor for all properties of a vision.
  * @param inherit - inherit property value from the parent by default. If null, inheritance is inferred from descriptor
@@ -85,16 +94,12 @@ public fun Vision.allProperties(
     includeStyles: Boolean? = null,
     includeDefaults: Boolean = true,
 ): MutableItemProvider = object : MutableItemProvider {
-    override fun getItem(name: Name): MetaItem<*>? {
-        val actualInherit = inherit ?: descriptor?.get(name)?.inherited ?: false
-        val actualUseStyles = includeStyles ?: descriptor?.get(name)?.usesStyles ?: true
-        return getProperty(
-            name,
-            inherit = actualInherit,
-            includeStyles = actualUseStyles,
-            includeDefaults = includeDefaults
-        )
-    }
+    override fun getItem(name: Name): MetaItem<*>? = getProperty(
+        name,
+        inherit = inherit,
+        includeStyles = includeStyles,
+        includeDefaults = includeDefaults
+    )
 
     override fun setItem(name: Name, item: MetaItem<*>?): Unit = setProperty(name, item)
 }
@@ -104,8 +109,8 @@ public fun Vision.allProperties(
  */
 public fun Vision.getProperty(
     key: String,
-    inherit: Boolean = true,
-    includeStyles: Boolean = true,
+    inherit: Boolean? = null,
+    includeStyles: Boolean? = null,
     includeDefaults: Boolean = true,
 ): MetaItem<*>? = getProperty(key.toName(), inherit, includeStyles, includeDefaults)
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index c608e4c4..17f08888 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -59,15 +59,15 @@ public open class VisionBase : Vision {
 
     override fun getProperty(
         name: Name,
-        inherit: Boolean,
-        includeStyles: Boolean,
+        inherit: Boolean?,
+        includeStyles: Boolean?,
         includeDefaults: Boolean,
     ): MetaItem<*>? = sequence {
         yield(getOwnProperty(name))
-        if (includeStyles) {
+        if (includeStyles ?: descriptor?.get(name)?.usesStyles != false) {
             yieldAll(getStyleItems(name))
         }
-        if (inherit) {
+        if (inherit ?: descriptor?.get(name)?.inherited == true) {
             yield(parent?.getProperty(name, inherit))
         }
         yield(descriptor?.get(name)?.defaultItem())
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index 77aa950c..355d2b7d 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -125,8 +125,8 @@ internal class Prototypes(
 
     override fun getProperty(
         name: Name,
-        inherit: Boolean,
-        includeStyles: Boolean,
+        inherit: Boolean?,
+        includeStyles: Boolean?,
         includeDefaults: Boolean,
     ): MetaItem<*>? = null
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
index f060afea..7c69d283 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
@@ -114,16 +114,12 @@ public class SolidMaterial : Scheme() {
 
 public val Solid.color: ColorAccessor
     get() = ColorAccessor(
-        allProperties(
-            inherit = true,
-            includeStyles = true,
-            includeDefaults = true
-        ),
+        allProperties(inherit = true),
         MATERIAL_COLOR_KEY
     )
 
 public var Solid.material: SolidMaterial?
-    get() = getProperty(MATERIAL_KEY).node?.let { SolidMaterial.read(it) }
+    get() = getProperty(MATERIAL_KEY, inherit = true).node?.let { SolidMaterial.read(it) }
     set(value) = setProperty(MATERIAL_KEY, value?.config)
 
 @VisionBuilder
@@ -141,7 +137,7 @@ public fun Solid.material(builder: SolidMaterial.() -> Unit) {
 }
 
 public var Solid.opacity: Number?
-    get() = getProperty(MATERIAL_OPACITY_KEY).number
+    get() = getProperty(MATERIAL_OPACITY_KEY, inherit = true).number
     set(value) {
         setProperty(MATERIAL_OPACITY_KEY, value?.asValue())
     }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
index 5378f71d..4512cf54 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
@@ -2,6 +2,7 @@ package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
+import hep.dataforge.meta.descriptors.get
 import hep.dataforge.names.*
 import hep.dataforge.vision.*
 import kotlinx.coroutines.flow.Flow
@@ -14,6 +15,24 @@ public interface SolidReference : Vision {
     public val prototype: Solid
 }
 
+private fun SolidReference.getRefProperty(
+    name: Name,
+    inherit: Boolean?,
+    includeStyles: Boolean?,
+    includeDefaults: Boolean,
+): MetaItem<*>? {
+    return sequence {
+        yield(getOwnProperty(name))
+        if (includeStyles ?: descriptor?.get(name)?.usesStyles != false) {
+            yieldAll(getStyleItems(name))
+        }
+        yield(prototype.getProperty(name, inherit, includeStyles, includeDefaults))
+        if (inherit ?: descriptor?.get(name)?.inherited == true) {
+            yield(parent?.getProperty(name, inherit))
+        }
+    }.merge()
+}
+
 /**
  * A reference [Solid] to reuse a template object
  */
@@ -60,19 +79,10 @@ public class SolidReferenceGroup(
 
     override fun getProperty(
         name: Name,
-        inherit: Boolean,
-        includeStyles: Boolean,
+        inherit: Boolean?,
+        includeStyles: Boolean?,
         includeDefaults: Boolean,
-    ): MetaItem<*>? = sequence {
-        yield(getOwnProperty(name))
-        if (includeStyles) {
-            yieldAll(getStyleItems(name))
-        }
-        yield(prototype.getProperty(name, inherit, includeStyles, includeDefaults))
-        if (inherit) {
-            yield(parent?.getProperty(name, inherit))
-        }
-    }.merge()
+    ): MetaItem<*>? = getRefProperty(name, inherit, includeStyles, includeDefaults)
 
     override fun attachChildren() {
         //do nothing
@@ -104,19 +114,10 @@ public class SolidReferenceGroup(
 
         override fun getProperty(
             name: Name,
-            inherit: Boolean,
-            includeStyles: Boolean,
+            inherit: Boolean?,
+            includeStyles: Boolean?,
             includeDefaults: Boolean,
-        ): MetaItem<*>? = sequence {
-            yield(getOwnProperty(name))
-            if (includeStyles) {
-                yieldAll(getStyleItems(name))
-            }
-            yield(prototype.getProperty(name, inherit, includeStyles, includeDefaults))
-            if (inherit) {
-                yield(parent?.getProperty(name, inherit))
-            }
-        }.merge()
+        ): MetaItem<*>? = getRefProperty(name, inherit, includeStyles, includeDefaults)
 
         override var parent: VisionGroup?
             get() {
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
index 30917b90..5f6fad96 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
@@ -17,7 +17,7 @@ class PropertyTest {
                 box = box(100, 100, 100)
             }
         }
-        assertEquals(22, box?.getProperty("test").int)
+        assertEquals(22, box?.getProperty("test", inherit = true).int)
     }
 
     @Test

From ccb916cff7c9f2cd041c411e8f451ebbf68948c9 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 19 Dec 2020 17:44:24 +0300
Subject: [PATCH 059/151] Encapsulate prototypes.

---
 .../main/kotlin/ru/mipt/npm/sat/satServer.kt  |   5 +-
 .../kotlin/hep/dataforge/vision/VisionBase.kt |   9 +-
 .../hep/dataforge/vision/VisionGroupBase.kt   |   6 +-
 .../hep/dataforge/vision/solid/SolidGroup.kt  |  32 +++---
 .../dataforge/vision/solid/SolidMaterial.kt   |  18 ++-
 .../vision/solid/three/ThreePlugin.kt         | 106 +++++++++---------
 6 files changed, 96 insertions(+), 80 deletions(-)

diff --git a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
index 685970bd..bd7abf90 100644
--- a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
+++ b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
@@ -39,9 +39,10 @@ fun main() {
             val randomI = Random.nextInt(1, 4)
             val randomJ = Random.nextInt(1, 4)
             val target = "layer[$randomLayer].segment[$randomI,$randomJ]".toName()
-            (sat[target] as? Solid)?.color("red")
+            val targetVision = sat[target] as Solid
+            targetVision.color("red")
             delay(300)
-            (sat[target] as? Solid)?.color("green")
+            targetVision.color("green")
             delay(10)
         }
     }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index 17f08888..94dbd2d8 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -11,8 +11,10 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.values.ValueType
 import hep.dataforge.vision.Vision.Companion.STYLE_KEY
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.launch
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
@@ -68,7 +70,7 @@ public open class VisionBase : Vision {
             yieldAll(getStyleItems(name))
         }
         if (inherit ?: descriptor?.get(name)?.inherited == true) {
-            yield(parent?.getProperty(name, inherit))
+            yield(parent?.getProperty(name, inherit, includeStyles, includeDefaults))
         }
         yield(descriptor?.get(name)?.defaultItem())
     }.merge()
@@ -101,8 +103,9 @@ public open class VisionBase : Vision {
         if (propertyName == STYLE_KEY) {
             updateStyles(styles)
         }
-
-        _propertyInvalidationFlow.tryEmit(propertyName)
+        GlobalScope.launch {
+            _propertyInvalidationFlow.emit(propertyName)
+        }
     }
 
     public fun configure(block: MutableMeta<*>.() -> Unit) {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
index 0bb40007..5162809e 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
@@ -1,8 +1,10 @@
 package hep.dataforge.vision
 
 import hep.dataforge.names.*
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.launch
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
@@ -43,7 +45,9 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
      * Propagate children change event upwards
      */
     private fun childrenChanged(name: NameToken, before: Vision?, after: Vision?) {
-        _structureChanges.tryEmit(MutableVisionGroup.StructureChange(name, before, after))
+        GlobalScope.launch {
+            _structureChanges.emit(MutableVisionGroup.StructureChange(name, before, after))
+        }
     }
 
     /**
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index 355d2b7d..baf79443 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -16,7 +16,11 @@ import kotlinx.serialization.encoding.Encoder
 
 public interface PrototypeHolder {
     public val parent: VisionGroup?
-    public val prototypes: MutableVisionGroup?
+
+    @VisionBuilder
+    public fun prototypes(builder: VisionContainerBuilder<Solid>.() -> Unit)
+
+    public fun getPrototype(name: Name): Solid?
 }
 
 /**
@@ -28,18 +32,24 @@ public class SolidGroup : VisionGroupBase(), Solid, PrototypeHolder {
 
     override val descriptor: NodeDescriptor get() = Solid.descriptor
 
+
     /**
      * A container for templates visible inside this group
      */
     @Serializable(Prototypes.Companion::class)
-    override var prototypes: MutableVisionGroup? = null
-        private set
+    @SerialName("prototypes")
+    internal var prototypes: MutableVisionGroup? = null
+
+    /**
+     * Ger a prototype redirecting the request to the parent if prototype is not found
+     */
+    override fun getPrototype(name: Name): Solid? =
+        prototypes?.get(name) as? Solid ?: (parent as? PrototypeHolder)?.getPrototype(name)
 
     /**
      * Create or edit prototype node as a group
      */
-    @VisionBuilder
-    public fun prototypes(builder: VisionContainerBuilder<Solid>.() -> Unit): Unit {
+    override fun prototypes(builder: VisionContainerBuilder<Solid>.() -> Unit): Unit {
         (prototypes ?: Prototypes().also {
             prototypes = it
             it.parent = this
@@ -81,12 +91,6 @@ public fun SolidGroup(block: SolidGroup.() -> Unit): SolidGroup {
     return SolidGroup().apply(block)
 }
 
-/**
- * Ger a prototype redirecting the request to the parent if prototype is not found
- */
-public tailrec fun PrototypeHolder.getPrototype(name: Name): Solid? =
-    prototypes?.get(name) as? Solid ?: (parent as? PrototypeHolder)?.getPrototype(name)
-
 @VisionBuilder
 public fun VisionContainerBuilder<Vision>.group(
     name: Name = Name.EMPTY,
@@ -106,14 +110,12 @@ public fun VisionContainerBuilder<Vision>.group(name: String, action: SolidGroup
 @Serializable(Prototypes.Companion::class)
 internal class Prototypes(
     children: Map<NameToken, Vision> = emptyMap(),
-) : VisionGroupBase(), PrototypeHolder {
+) : VisionGroupBase() {
 
     init {
         childrenInternal.putAll(children)
     }
 
-    override val prototypes: MutableVisionGroup get() = this
-
     override fun attachChildren() {
         children.values.forEach {
             it.parent = parent
@@ -131,7 +133,7 @@ internal class Prototypes(
     ): MetaItem<*>? = null
 
     override fun setProperty(name: Name, item: MetaItem<*>?, notify: Boolean) {
-        TODO("Not yet implemented")
+        error("Can't ser property of prototypes container")
     }
 
     override val descriptor: NodeDescriptor? = null
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
index 7c69d283..e1f2c940 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
@@ -90,10 +90,20 @@ public class SolidMaterial : Scheme() {
             //must be lazy to avoid initialization bug
             NodeDescriptor {
                 value(COLOR_KEY) {
+                    inherited = true
+                    usesStyles = true
                     type(ValueType.STRING, ValueType.NUMBER)
                     widgetType = "color"
                 }
+//                value(SPECULAR_COLOR_KEY) {
+//                    inherited = true
+//                    usesStyles = true
+//                    type(ValueType.STRING, ValueType.NUMBER)
+//                    widgetType = "color"
+//                }
                 value(OPACITY_KEY) {
+                    inherited = true
+                    usesStyles = true
                     type(ValueType.NUMBER)
                     default(1.0)
                     attributes {
@@ -104,6 +114,8 @@ public class SolidMaterial : Scheme() {
                     widgetType = "slider"
                 }
                 value(WIREFRAME_KEY) {
+                    inherited = true
+                    usesStyles = true
                     type(ValueType.BOOLEAN)
                     default(false)
                 }
@@ -124,11 +136,7 @@ public var Solid.material: SolidMaterial?
 
 @VisionBuilder
 public fun Solid.material(builder: SolidMaterial.() -> Unit) {
-    val node = allProperties(
-        inherit = true,
-        includeStyles = true,
-        includeDefaults = true
-    ).getItem(MATERIAL_KEY).node
+    val node = allProperties(inherit = true).getItem(MATERIAL_KEY).node
     if (node != null) {
         SolidMaterial.update(node, builder)
     } else {
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index 2732d624..834a56a7 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -46,42 +46,41 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
                 as ThreeFactory<Solid>?
     }
 
-    public fun buildObject3D(obj: Solid): Object3D {
-        return when (obj) {
-            is ThreeVision -> obj.render(this)
-            is SolidReferenceGroup -> ThreeReferenceFactory(this, obj)
-            is SolidGroup -> {
-                val group = ThreeGroup()
-                obj.children.forEach { (token, child) ->
-                    if (child is Solid && child.ignore != true) {
-                        try {
-                            val object3D = buildObject3D(child)
-                            group[token] = object3D
-                        } catch (ex: Throwable) {
-                            logger.error(ex) { "Failed to render $child" }
-                            ex.printStackTrace()
-                        }
+    public fun buildObject3D(obj: Solid): Object3D = when (obj) {
+        is ThreeVision -> obj.render(this)
+        is SolidReferenceGroup -> ThreeReferenceFactory(this, obj)
+        is SolidGroup -> {
+            val group = ThreeGroup()
+            obj.children.forEach { (token, child) ->
+                if (child is Solid && child.ignore != true) {
+                    try {
+                        val object3D = buildObject3D(child)
+                        group[token] = object3D
+                    } catch (ex: Throwable) {
+                        logger.error(ex) { "Failed to render $child" }
+                        ex.printStackTrace()
                     }
                 }
+            }
 
-                group.apply {
-                    updatePosition(obj)
-                    //obj.onChildrenChange()
+            group.apply {
+                updatePosition(obj)
+                //obj.onChildrenChange()
 
-                    obj.propertyNameFlow.onEach { name ->
-                        if (
-                            name.startsWith(Solid.POSITION_KEY) ||
-                            name.startsWith(Solid.ROTATION) ||
-                            name.startsWith(Solid.SCALE_KEY)
-                        ) {
-                            //update position of mesh using this object
-                            updatePosition(obj)
-                        } else if (name == Vision.VISIBLE_KEY) {
-                            visible = obj.visible ?: true
-                        }
-                    }.launchIn(updateScope)
+                obj.propertyNameFlow.onEach { name ->
+                    if (
+                        name.startsWith(Solid.POSITION_KEY) ||
+                        name.startsWith(Solid.ROTATION) ||
+                        name.startsWith(Solid.SCALE_KEY)
+                    ) {
+                        //update position of mesh using this object
+                        updatePosition(obj)
+                    } else if (name == Vision.VISIBLE_KEY) {
+                        visible = obj.visible ?: true
+                    }
+                }.launchIn(updateScope)
 
-                    obj.structureChanges.onEach { (nameToken, _, child) ->
+                obj.structureChanges.onEach { (nameToken, _, child) ->
 //                        if (name.isEmpty()) {
 //                            logger.error { "Children change with empty name on $group" }
 //                            return@onChildrenChange
@@ -90,32 +89,31 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
 //                        val parentName = name.cutLast()
 //                        val childName = name.last()!!
 
-                        //removing old object
-                        findChild(nameToken.asName())?.let { oldChild ->
-                            oldChild.parent?.remove(oldChild)
-                        }
+                    //removing old object
+                    findChild(nameToken.asName())?.let { oldChild ->
+                        oldChild.parent?.remove(oldChild)
+                    }
 
-                        //adding new object
-                        if (child != null && child is Solid) {
-                            try {
-                                val object3D = buildObject3D(child)
-                                set(nameToken, object3D)
-                            } catch (ex: Throwable) {
-                                logger.error(ex) { "Failed to render $child" }
-                            }
+                    //adding new object
+                    if (child != null && child is Solid) {
+                        try {
+                            val object3D = buildObject3D(child)
+                            set(nameToken, object3D)
+                        } catch (ex: Throwable) {
+                            logger.error(ex) { "Failed to render $child" }
                         }
-                    }.launchIn(updateScope)
-                }
+                    }
+                }.launchIn(updateScope)
             }
-            is Composite -> compositeFactory(this, obj)
-            else -> {
-                //find specialized factory for this type if it is present
-                val factory: ThreeFactory<Solid>? = findObjectFactory(obj::class)
-                when {
-                    factory != null -> factory(this, obj)
-                    obj is GeometrySolid -> ThreeShapeFactory(this, obj)
-                    else -> error("Renderer for ${obj::class} not found")
-                }
+        }
+        is Composite -> compositeFactory(this, obj)
+        else -> {
+            //find specialized factory for this type if it is present
+            val factory: ThreeFactory<Solid>? = findObjectFactory(obj::class)
+            when {
+                factory != null -> factory(this, obj)
+                obj is GeometrySolid -> ThreeShapeFactory(this, obj)
+                else -> error("Renderer for ${obj::class} not found")
             }
         }
     }

From 4c235b0f53faf1fb6776ec5249589da571269d55 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 19 Dec 2020 20:40:22 +0300
Subject: [PATCH 060/151] Fix color inheritance issues

---
 .../commonMain/kotlin/hep/dataforge/vision/Vision.kt  | 11 +++++++++--
 .../kotlin/hep/dataforge/vision/VisionBase.kt         |  3 +--
 .../kotlin/hep/dataforge/vision/VisionGroupBase.kt    |  3 +--
 .../kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt   |  2 +-
 .../kotlin/hep/dataforge/vision/solid/SolidGroup.kt   |  2 --
 .../dataforge/vision/solid/three/ThreeMaterials.kt    |  2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 7363d67e..abf24bc1 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -9,6 +9,8 @@ import hep.dataforge.names.asName
 import hep.dataforge.names.toName
 import hep.dataforge.provider.Type
 import hep.dataforge.vision.Vision.Companion.TYPE
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.Transient
 
@@ -24,6 +26,11 @@ public interface Vision : Described {
     @Transient
     public var parent: VisionGroup?
 
+    /**
+     * A coroutine scope for asynchronous calls and locks
+     */
+    public val scope: CoroutineScope get() = parent?.scope?: GlobalScope
+
     /**
      * A fast accessor method to get own property (no inheritance or styles).
      * Should be equivalent to `getProperty(name,false,false,false)`.
@@ -32,8 +39,8 @@ public interface Vision : Described {
 
     /**
      * Get property.
-     * @param inherit toggles parent node property lookup. Null means default inheritance.
-     * @param includeStyles toggles inclusion of. Null means default style inclusion.
+     * @param inherit toggles parent node property lookup. Null means inference from descriptor. Default is false.
+     * @param includeStyles toggles inclusion of. Null means inference from descriptor. Default is true.
      */
     public fun getProperty(
         name: Name,
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index 94dbd2d8..27c9c92e 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -11,7 +11,6 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.values.ValueType
 import hep.dataforge.vision.Vision.Companion.STYLE_KEY
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.launch
@@ -103,7 +102,7 @@ public open class VisionBase : Vision {
         if (propertyName == STYLE_KEY) {
             updateStyles(styles)
         }
-        GlobalScope.launch {
+        scope.launch {
             _propertyInvalidationFlow.emit(propertyName)
         }
     }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
index 5162809e..2d4f271f 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
@@ -1,7 +1,6 @@
 package hep.dataforge.vision
 
 import hep.dataforge.names.*
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.launch
@@ -45,7 +44,7 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
      * Propagate children change event upwards
      */
     private fun childrenChanged(name: NameToken, before: Vision?, after: Vision?) {
-        GlobalScope.launch {
+        scope.launch {
             _structureChanges.emit(MutableVisionGroup.StructureChange(name, before, after))
         }
     }
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
index b635485b..0032f83a 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
@@ -71,7 +71,7 @@ class FX3DPlugin : AbstractPlugin() {
             is PolyLine -> PolyLine3D(
                 obj.points.map { Point3D(it.x, it.y, it.z) },
                 obj.thickness.toFloat(),
-                obj.getProperty(SolidMaterial.MATERIAL_COLOR_KEY)?.color()
+                obj.getProperty(SolidMaterial.MATERIAL_COLOR_KEY, inherit = true)?.color()
             ).apply {
                 this.meshView.cullFace = CullFace.FRONT
             }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index baf79443..e472bbd0 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -15,8 +15,6 @@ import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 
 public interface PrototypeHolder {
-    public val parent: VisionGroup?
-
     @VisionBuilder
     public fun prototypes(builder: VisionContainerBuilder<Solid>.() -> Unit)
 
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
index f7ec681d..4401e8cd 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
@@ -76,7 +76,7 @@ public object ThreeMaterials {
     }
 
     public fun getMaterial(vision3D: Vision, cache: Boolean): Material {
-        val meta = vision3D.getProperty(SolidMaterial.MATERIAL_KEY).node ?: return DEFAULT
+        val meta = vision3D.getProperty(SolidMaterial.MATERIAL_KEY, inherit = true).node ?: return DEFAULT
         return if (cache) {
             materialCache.getOrPut(meta) { buildMaterial(meta) }
         } else {

From 0259d4eb152a7fdba2cd74bb1f998a0485cb230c Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 20 Dec 2020 21:43:29 +0300
Subject: [PATCH 061/151] Another huge refactoring of property updates

---
 .../main/kotlin/ru/mipt/npm/sat/satServer.kt  |  2 +-
 .../vision/solid/demo/VariableBox.kt          |  7 +--
 .../vision/bootstrap/visionPropertyEditor.kt  |  3 +-
 .../dataforge/vision/react/PropertyEditor.kt  |  6 +-
 .../kotlin/hep/dataforge/vision/StyleSheet.kt |  5 +-
 .../kotlin/hep/dataforge/vision/Vision.kt     | 26 +++++++--
 .../kotlin/hep/dataforge/vision/VisionBase.kt | 31 +++++++----
 .../hep/dataforge/vision/VisionChange.kt      |  7 ++-
 .../hep/dataforge/vision/VisionGroupBase.kt   |  2 +-
 .../kotlin/hep/dataforge/vision/misc.kt       | 12 ----
 .../hep/dataforge/vision/valueWidget.kt       | 27 ---------
 .../hep/dataforge/vision/visionDescriptor.kt  | 55 +++++++++++++++++--
 .../dataforge/vision/client/VisionClient.kt   | 48 ++++++++++------
 .../vision/solid/FXReferenceFactory.kt        |  6 +-
 .../vision/solid/VisualObjectFXBinding.kt     |  6 +-
 .../vision/three/server/VisionServer.kt       | 40 ++++++++++++--
 .../hep/dataforge/vision/solid/Solid.kt       | 24 ++++----
 .../hep/dataforge/vision/solid/SolidGroup.kt  | 10 +++-
 .../dataforge/vision/solid/SolidMaterial.kt   | 18 ++++--
 .../dataforge/vision/solid/SolidReference.kt  | 17 +++---
 .../vision/solid/three/MeshThreeFactory.kt    |  6 +-
 .../vision/solid/three/ThreeFactory.kt        |  2 +-
 .../vision/solid/three/ThreeLabelFactory.kt   |  6 +-
 .../vision/solid/three/ThreeLineFactory.kt    |  6 +-
 .../vision/solid/three/ThreeMaterials.kt      |  4 ++
 .../vision/solid/three/ThreePlugin.kt         |  4 +-
 .../solid/three/ThreeReferenceFactory.kt      |  6 +-
 27 files changed, 238 insertions(+), 148 deletions(-)
 delete mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/valueWidget.kt

diff --git a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
index bd7abf90..761cd982 100644
--- a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
+++ b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
@@ -42,7 +42,7 @@ fun main() {
             val targetVision = sat[target] as Solid
             targetVision.color("red")
             delay(300)
-            targetVision.color("green")
+            targetVision.color("darkgreen")
             delay(10)
         }
     }
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
index 366acfc4..2910e0d3 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
@@ -16,8 +16,6 @@ import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.geometries.BoxBufferGeometry
 import info.laht.threekt.objects.Mesh
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
 import kotlin.math.max
 
 internal fun SolidGroup.varBox(
@@ -62,7 +60,7 @@ internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeV
         mesh.scale.set(xSize, ySize, zSize)
 
         //add listener to object properties
-        propertyNameFlow.onEach { name ->
+        onPropertyChange(three.context) { name ->
             when {
                 name.startsWith(GEOMETRY_KEY) -> {
                     val newXSize = getProperty(X_SIZE_KEY, false).number?.toDouble() ?: 1.0
@@ -78,7 +76,8 @@ internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeV
                 }
                 else -> mesh.updateProperty(this@VariableBox, name)
             }
-        }.launchIn(three.context)
+        }
+
         return mesh
     }
 
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
index 14a93eb8..b9a30bc8 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
@@ -13,11 +13,12 @@ public fun RBuilder.visionPropertyEditor(
     descriptor: NodeDescriptor? = vision.descriptor,
     key: Any? = null,
 ) {
+
     card("Properties") {
         propertyEditor(
             provider = vision.ownProperties,
             defaultProvider = vision.allProperties(),
-            updateFlow = vision.propertyNameFlow,
+            updateFlow = vision.propertyChanges,
             descriptor = descriptor,
             key = key)
     }
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
index c730123b..ebd62473 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
@@ -7,6 +7,7 @@ import hep.dataforge.names.NameToken
 import hep.dataforge.names.lastOrNull
 import hep.dataforge.names.plus
 import hep.dataforge.values.Value
+import hep.dataforge.vision.hidden
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.channels.awaitClose
@@ -66,6 +67,9 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
     val itemName by useState { props.name ?: Name.EMPTY }
     var item: MetaItem<*>? by useState { props.provider.getItem(itemName) }
     val descriptorItem: ItemDescriptor? = props.descriptor?.get(itemName)
+
+    if(descriptorItem?.hidden == true) return //fail fast for hidden property
+
     var actualItem: MetaItem<Meta>? by useState {
         item ?: props.defaultProvider?.getItem(itemName) ?: descriptorItem?.defaultItem()
     }
@@ -106,8 +110,6 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
         update()
     }
 
-
-
     if (actualItem is MetaItem.NodeItem) {
         styledDiv {
             css {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
index 783b376c..d90fe655 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
@@ -5,6 +5,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.NameToken
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
+import kotlinx.coroutines.launch
 
 /**
  * A container for styles
@@ -54,7 +55,9 @@ internal fun Vision.styleChanged(key: String, oldStyle: Meta?, newStyle: Meta?)
         val tokens: Collection<Name> =
             ((oldStyle?.items?.keys ?: emptySet()) + (newStyle?.items?.keys ?: emptySet()))
                 .map { it.asName() }
-        tokens.forEach { parent?.notifyPropertyChanged(it) }
+        parent?.scope?.launch {
+            tokens.forEach { parent?.notifyPropertyChanged(it) }
+        }
     }
     if (this is VisionGroup) {
         for (obj in this) {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index abf24bc1..ba585b46 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -9,9 +9,10 @@ import hep.dataforge.names.asName
 import hep.dataforge.names.toName
 import hep.dataforge.provider.Type
 import hep.dataforge.vision.Vision.Companion.TYPE
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.*
+import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.serialization.Transient
 
 /**
@@ -29,7 +30,7 @@ public interface Vision : Described {
     /**
      * A coroutine scope for asynchronous calls and locks
      */
-    public val scope: CoroutineScope get() = parent?.scope?: GlobalScope
+    public val scope: CoroutineScope get() = parent?.scope ?: GlobalScope
 
     /**
      * A fast accessor method to get own property (no inheritance or styles).
@@ -55,17 +56,26 @@ public interface Vision : Described {
      */
     public fun setProperty(name: Name, item: MetaItem<*>?, notify: Boolean = true)
 
+    public fun onPropertyChange(scope: CoroutineScope, callback: suspend (Name) -> Unit)
+
     /**
      * Flow of property invalidation events. It does not contain property values after invalidation since it is not clear
      * if it should include inherited properties etc.
      */
-    public val propertyNameFlow: Flow<Name>
+    public val propertyChanges: Flow<Name> get() = callbackFlow<Name> {
+        coroutineScope {
+            onPropertyChange(this) {
+                send(it)
+            }
+            awaitClose { cancel() }
+        }
+    }
 
 
     /**
      * Notify all listeners that a property has been changed and should be invalidated
      */
-    public fun notifyPropertyChanged(propertyName: Name): Unit
+    public suspend fun notifyPropertyChanged(propertyName: Name): Unit
 
     /**
      * Update this vision using external meta. Children are not updated.
@@ -82,6 +92,12 @@ public interface Vision : Described {
     }
 }
 
+public fun Vision.asyncNotifyPropertyChange(propertyName: Name){
+    scope.launch {
+        notifyPropertyChanged(propertyName)
+    }
+}
+
 /**
  * Own properties, excluding inheritance, styles and descriptor
  */
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index 27c9c92e..141366d1 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -11,8 +11,11 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.values.ValueType
 import hep.dataforge.vision.Vision.Companion.STYLE_KEY
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -44,7 +47,9 @@ public open class VisionBase : Vision {
             properties = newProperties
             newProperties.onChange(this) { name, oldItem, newItem ->
                 if (oldItem != newItem) {
-                    notifyPropertyChanged(name)
+                    scope.launch {
+                        notifyPropertyChanged(name)
+                    }
                 }
             }
         }
@@ -77,14 +82,16 @@ public open class VisionBase : Vision {
     @Synchronized
     override fun setProperty(name: Name, item: MetaItem<*>?, notify: Boolean) {
         getOrCreateConfig().setItem(name, item)
-        if(notify) {
-            notifyPropertyChanged(name)
+        if (notify) {
+            scope.launch {
+                notifyPropertyChanged(name)
+            }
         }
     }
 
     override val descriptor: NodeDescriptor? get() = null
 
-    private fun updateStyles(names: List<String>) {
+    private suspend fun updateStyles(names: List<String>) {
         names.mapNotNull { getStyle(it) }.asSequence()
             .flatMap { it.items.asSequence() }
             .distinctBy { it.key }
@@ -94,17 +101,19 @@ public open class VisionBase : Vision {
     }
 
     @Transient
-    private val _propertyInvalidationFlow: MutableSharedFlow<Name> = MutableSharedFlow()
+    private val propertyInvalidationFlow: MutableSharedFlow<Name> = MutableSharedFlow()
 
-    override val propertyNameFlow: SharedFlow<Name> get() = _propertyInvalidationFlow
+    override val propertyChanges: Flow<Name> get() = propertyInvalidationFlow
 
-    override fun notifyPropertyChanged(propertyName: Name) {
+    override fun onPropertyChange(scope: CoroutineScope, callback: suspend (Name) -> Unit) {
+        propertyInvalidationFlow.onEach(callback).launchIn(scope)
+    }
+
+    override suspend fun notifyPropertyChanged(propertyName: Name) {
         if (propertyName == STYLE_KEY) {
             updateStyles(styles)
         }
-        scope.launch {
-            _propertyInvalidationFlow.emit(propertyName)
-        }
+        propertyInvalidationFlow.emit(propertyName)
     }
 
     public fun configure(block: MutableMeta<*>.() -> Unit) {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
index c2717108..7dddd655 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
@@ -67,6 +67,9 @@ public class VisionChange(
     @Serializable(MetaSerializer::class) public val properties: Meta? = null,
     public val children: Map<Name, VisionChange>? = null,
 ) {
+    init {
+        (vision as? VisionGroup)?.attachChildren()
+    }
 
 }
 
@@ -81,10 +84,10 @@ private fun CoroutineScope.collectChange(
 ) {
 
     //Collect properties change
-    source.propertyNameFlow.onEach { propertyName ->
+    source.onPropertyChange(this) { propertyName ->
         val newItem = source.getProperty(propertyName, inherit = false, includeStyles = false, includeDefaults = false)
         collector().propertyChanged(name, propertyName, newItem)
-    }.launchIn(this)
+    }
 
     if (source is VisionGroup) {
         //Subscribe for children changes
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
index 2d4f271f..0752b98b 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
@@ -28,7 +28,7 @@ public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
      */
     override val children: Map<NameToken, Vision> get() = childrenInternal
 
-    override fun notifyPropertyChanged(propertyName: Name) {
+    override suspend fun notifyPropertyChanged(propertyName: Name) {
         super.notifyPropertyChanged(propertyName)
         for (obj in this) {
             obj.notifyPropertyChanged(propertyName)
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
index 75cb8f40..ef1882fe 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
@@ -1,15 +1,11 @@
 package hep.dataforge.vision
 
 import hep.dataforge.meta.*
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.names.Name
-import hep.dataforge.values.ValueType
 import hep.dataforge.values.asValue
 
 @DslMarker
 public annotation class VisionBuilder
 
-
 public fun Sequence<MetaItem<*>?>.merge(): MetaItem<*>? {
     return when (val first = firstOrNull { it != null }) {
         null -> null
@@ -22,14 +18,6 @@ public fun Sequence<MetaItem<*>?>.merge(): MetaItem<*>? {
     }
 }
 
-public inline fun <reified E : Enum<E>> NodeDescriptor.enum(key: Name, default: E?): Unit = value(key) {
-    type(ValueType.STRING)
-    default?.let {
-        default(default)
-    }
-    allowedValues = enumValues<E>().map { it.asValue() }
-}
-
 @DFExperimental
 public val Vision.properties: Config?
     get() = (this as? VisionBase)?.properties
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/valueWidget.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/valueWidget.kt
deleted file mode 100644
index f563d87c..00000000
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/valueWidget.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package hep.dataforge.vision
-
-import hep.dataforge.meta.*
-import hep.dataforge.meta.descriptors.ValueDescriptor
-import hep.dataforge.meta.descriptors.attributes
-
-/**
- * Extension property to access the "widget" key of [ValueDescriptor]
- */
-public var ValueDescriptor.widget: Meta
-    get() = attributes["widget"].node ?: Meta.EMPTY
-    set(value) {
-        attributes {
-            set("widget", value)
-        }
-    }
-
-/**
- * Extension property to access the "widget.type" key of [ValueDescriptor]
- */
-public var ValueDescriptor.widgetType: String?
-    get() = attributes["widget.type"].string
-    set(value) {
-        attributes{
-            set("widget.type", value)
-        }
-    }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionDescriptor.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionDescriptor.kt
index 0e068827..59001d15 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionDescriptor.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionDescriptor.kt
@@ -1,11 +1,13 @@
 package hep.dataforge.vision
 
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.boolean
+import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.ItemDescriptor
+import hep.dataforge.meta.descriptors.NodeDescriptor
+import hep.dataforge.meta.descriptors.ValueDescriptor
 import hep.dataforge.meta.descriptors.attributes
-import hep.dataforge.meta.get
-import hep.dataforge.meta.set
+import hep.dataforge.names.Name
+import hep.dataforge.values.ValueType
+import hep.dataforge.values.asValue
 
 private const val INHERITED_DESCRIPTOR_ATTRIBUTE = "inherited"
 private const val STYLE_DESCRIPTOR_ATTRIBUTE = "useStyles"
@@ -30,3 +32,48 @@ public val Vision.describedProperties: Meta
         }
     }
 
+/**
+ * Extension property to access the "widget" key of [ValueDescriptor]
+ */
+public var ValueDescriptor.widget: Meta
+    get() = attributes["widget"].node ?: Meta.EMPTY
+    set(value) {
+        attributes {
+            set("widget", value)
+        }
+    }
+
+/**
+ * Extension property to access the "widget.type" key of [ValueDescriptor]
+ */
+public var ValueDescriptor.widgetType: String?
+    get() = attributes["widget.type"].string
+    set(value) {
+        attributes {
+            set("widget.type", value)
+        }
+    }
+
+/**
+ * If true, this item is hidden in property editor. Default is false
+ */
+public val ItemDescriptor.hidden: Boolean
+    get() = attributes["widget.hide"].boolean ?: false
+
+public fun ItemDescriptor.hide(): Unit = attributes {
+    set("widget.hide", true)
+}
+
+
+public inline fun <reified E : Enum<E>> NodeDescriptor.enum(
+    key: Name,
+    default: E?,
+    crossinline modifier: ValueDescriptor.() -> Unit = {},
+): Unit = value(key) {
+    type(ValueType.STRING)
+    default?.let {
+        default(default)
+    }
+    allowedValues = enumValues<E>().map { it.asValue() }
+    modifier()
+}
\ No newline at end of file
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
index eefffc17..36f0ee1f 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
@@ -18,9 +18,6 @@ import org.w3c.dom.WebSocket
 import org.w3c.dom.asList
 import org.w3c.dom.get
 import org.w3c.dom.url.URL
-import kotlin.collections.HashMap
-import kotlin.collections.forEach
-import kotlin.collections.maxByOrNull
 import kotlin.collections.set
 import kotlin.reflect.KClass
 
@@ -84,14 +81,18 @@ public class VisionClient : AbstractPlugin() {
             renderVision(element, embeddedVision, outputMeta)
         }
 
-        val endpoint = resolveEndpoint(element)
-        logger.info { "Vision server is resolved to $endpoint" }
+        element.attributes[OUTPUT_FETCH_ATTRIBUTE]?.let { attr ->
 
-        element.attributes[OUTPUT_FETCH_ATTRIBUTE]?.let {
-
-            val fetchUrl = URL(endpoint).apply {
+            val fetchUrl = if (attr.value.isBlank() || attr.value == "auto") {
+                val endpoint = resolveEndpoint(element)
+                logger.info { "Vision server is resolved to $endpoint" }
+                URL(endpoint).apply {
+                    pathname += "/vision"
+                }
+            } else {
+                URL(attr.value)
+            }.apply {
                 searchParams.append("name", name)
-                pathname += "/vision"
             }
 
             logger.info { "Fetching vision data from $fetchUrl" }
@@ -102,16 +103,22 @@ public class VisionClient : AbstractPlugin() {
                         renderVision(element, vision, outputMeta)
                     }
                 } else {
-                    logger.error { "Failed to fetch initial vision state from $endpoint" }
+                    logger.error { "Failed to fetch initial vision state from $fetchUrl" }
                 }
 
             }
         }
 
-        element.attributes[OUTPUT_CONNECT_ATTRIBUTE]?.let {
-
-            val wsUrl = URL(endpoint).apply {
-                pathname += "/ws"
+        element.attributes[OUTPUT_CONNECT_ATTRIBUTE]?.let { attr ->
+            val wsUrl = if (attr.value.isBlank() || attr.value == "auto") {
+                val endpoint = resolveEndpoint(element)
+                logger.info { "Vision server is resolved to $endpoint" }
+                URL(endpoint).apply {
+                    pathname += "/ws"
+                }
+            } else {
+                URL(attr.value)
+            }.apply {
                 protocol = "ws"
                 searchParams.append("name", name)
             }
@@ -122,15 +129,20 @@ public class VisionClient : AbstractPlugin() {
                 onmessage = { messageEvent ->
                     val stringData: String? = messageEvent.data as? String
                     if (stringData != null) {
-                        val dif = visionManager.jsonFormat.decodeFromString(
+                        val change = visionManager.jsonFormat.decodeFromString(
                             VisionChange.serializer(),
                             stringData
                         )
-                        logger.debug { "Got update $dif for output with name $name" }
-                        visionMap[element]?.update(dif)
+
+                        if(change.vision!= null){
+                            renderVision(element, change.vision, outputMeta)
+                        }
+
+                        logger.debug { "Got update $change for output with name $name" }
+                        visionMap[element]?.update(change)
                             ?: console.info("Target vision for element $element with name $name not found")
                     } else {
-                        console.error ("WebSocket message data is not a string")
+                        console.error("WebSocket message data is not a string")
                     }
                 }
                 onopen = {
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
index 9b15df72..14845845 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
@@ -4,8 +4,6 @@ import hep.dataforge.names.*
 import hep.dataforge.vision.Vision
 import javafx.scene.Group
 import javafx.scene.Node
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
 import kotlin.reflect.KClass
 
 class FXReferenceFactory(val plugin: FX3DPlugin) : FX3DFactory<SolidReferenceGroup> {
@@ -15,7 +13,7 @@ class FXReferenceFactory(val plugin: FX3DPlugin) : FX3DFactory<SolidReferenceGro
         val prototype = obj.prototype
         val node = plugin.buildNode(prototype)
 
-        obj.propertyNameFlow.onEach { name->
+        obj.onPropertyChange(plugin.context) { name->
             if (name.firstOrNull()?.body == SolidReferenceGroup.REFERENCE_CHILD_PROPERTY_PREFIX) {
                 val childName = name.firstOrNull()?.index?.toName() ?: error("Wrong syntax for reference child property: '$name'")
                 val propertyName = name.cutFirst()
@@ -23,7 +21,7 @@ class FXReferenceFactory(val plugin: FX3DPlugin) : FX3DFactory<SolidReferenceGro
                 val child = node.findChild(childName) ?: error("Object child with name '$childName' not found")
                 child.updateProperty(referenceChild, propertyName)
             }
-        }.launchIn(plugin.context)
+        }
         return node
     }
 }
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
index 30a8d6a8..75d9307c 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
@@ -7,8 +7,6 @@ import hep.dataforge.names.toName
 import hep.dataforge.vision.Vision
 import javafx.application.Platform
 import javafx.beans.binding.ObjectBinding
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
 import tornadofx.*
 
 /**
@@ -18,7 +16,7 @@ class VisualObjectFXBinding(val fx: FX3DPlugin, val obj: Vision) {
     private val bindings = HashMap<Name, ObjectBinding<MetaItem<*>?>>()
 
     init {
-        obj.propertyNameFlow.onEach { name ->
+        obj.onPropertyChange(fx.context) { name ->
             bindings.filter { it.key.startsWith(name) }.forEach { entry ->
                 Platform.runLater {
                     entry.value.invalidate()
@@ -30,7 +28,7 @@ class VisualObjectFXBinding(val fx: FX3DPlugin, val obj: Vision) {
 //                bindings[currentName]?.invalidate()
 //                currentName = currentName.cutLast()
 //            }
-        }.launchIn(fx.context)
+        }
     }
 
     operator fun get(key: Name): ObjectBinding<MetaItem<*>?> {
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt
index eaa38618..13528ff7 100644
--- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt
@@ -41,6 +41,13 @@ import java.awt.Desktop
 import java.net.URI
 import kotlin.time.milliseconds
 
+public enum class VisionServerDataMode {
+    EMBED,
+    FETCH,
+    CONNECT
+}
+
+
 /**
  * A ktor plugin container with given [routing]
  */
@@ -52,6 +59,7 @@ public class VisionServer internal constructor(
     override val config: Config = Config()
     public var updateInterval: Long by config.long(300, key = UPDATE_INTERVAL_KEY)
     public var cacheFragments: Boolean by config.boolean(true)
+    public var dataMode: VisionServerDataMode = VisionServerDataMode.CONNECT
 
     /**
      * a list of headers that should be applied to all pages
@@ -72,10 +80,23 @@ public class VisionServer internal constructor(
         val consumer = object : VisionTagConsumer<Any?>(consumer) {
             override fun DIV.renderVision(name: Name, vision: Vision, outputMeta: Meta) {
                 visionMap[name] = vision
-
-                // Toggle updates
-                attributes[OUTPUT_FETCH_ATTRIBUTE] = "true"
-                attributes[OUTPUT_CONNECT_ATTRIBUTE] = "true"
+                // Toggle update mode
+                when (dataMode) {
+                    VisionServerDataMode.EMBED -> {
+                        script {
+                            attributes["class"] = OUTPUT_DATA_CLASS
+                            unsafe {
+                                +visionManager.encodeToString(vision)
+                            }
+                        }
+                    }
+                    VisionServerDataMode.FETCH -> {
+                        attributes[OUTPUT_FETCH_ATTRIBUTE] = "auto"
+                    }
+                    VisionServerDataMode.CONNECT -> {
+                        attributes[OUTPUT_CONNECT_ATTRIBUTE] = "auto"
+                    }
+                }
             }
         }
 
@@ -110,10 +131,19 @@ public class VisionServer internal constructor(
 
             application.log.debug("Opened server socket for $name")
             val vision: Vision = visions[name.toName()] ?: error("Plot with id='$name' not registered")
+
             try {
                 withContext(visionManager.context.coroutineContext) {
+
+                    val initialVision = VisionChange(vision = vision)
+                    val initialJson =  visionManager.jsonFormat.encodeToString(
+                        VisionChange.serializer(),
+                        initialVision
+                    )
+                    outgoing.send(Frame.Text(initialJson))
+
                     vision.flowChanges(visionManager, updateInterval.milliseconds).collect { update ->
-                        val json = VisionManager.defaultJson.encodeToString(
+                        val json = visionManager.jsonFormat.encodeToString(
                             VisionChange.serializer(),
                             update
                         )
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
index 65cf37e4..987fec3c 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
@@ -61,6 +61,7 @@ public interface Solid : Vision {
         public val descriptor: NodeDescriptor by lazy {
             NodeDescriptor {
                 value(VISIBLE_KEY) {
+                    inherited = false
                     type(ValueType.BOOLEAN)
                     default(true)
                 }
@@ -69,11 +70,14 @@ public interface Solid : Vision {
                 value(Vision.STYLE_KEY) {
                     type(ValueType.STRING)
                     multiple = true
+                    hide()
                 }
 
                 item(SolidMaterial.MATERIAL_KEY.toString(), SolidMaterial.descriptor)
 
-                enum(ROTATION_ORDER_KEY, default = RotationOrder.XYZ)
+                enum(ROTATION_ORDER_KEY, default = RotationOrder.XYZ) {
+                    hide()
+                }
             }
         }
 
@@ -152,21 +156,21 @@ public var Solid.x: Number
     get() = position?.x ?: 0f
     set(value) {
         position().x = value.toDouble()
-        notifyPropertyChanged(Solid.X_POSITION_KEY)
+        asyncNotifyPropertyChange(Solid.X_POSITION_KEY)
     }
 
 public var Solid.y: Number
     get() = position?.y ?: 0f
     set(value) {
         position().y = value.toDouble()
-        notifyPropertyChanged(Solid.Y_POSITION_KEY)
+        asyncNotifyPropertyChange(Solid.Y_POSITION_KEY)
     }
 
 public var Solid.z: Number
     get() = position?.z ?: 0f
     set(value) {
         position().z = value.toDouble()
-        notifyPropertyChanged(Solid.Z_POSITION_KEY)
+        asyncNotifyPropertyChange(Solid.Z_POSITION_KEY)
     }
 
 private fun Solid.rotation(): Point3D =
@@ -176,21 +180,21 @@ public var Solid.rotationX: Number
     get() = rotation?.x ?: 0f
     set(value) {
         rotation().x = value.toDouble()
-        notifyPropertyChanged(Solid.X_ROTATION_KEY)
+        asyncNotifyPropertyChange(Solid.X_ROTATION_KEY)
     }
 
 public var Solid.rotationY: Number
     get() = rotation?.y ?: 0f
     set(value) {
         rotation().y = value.toDouble()
-        notifyPropertyChanged(Solid.Y_ROTATION_KEY)
+        asyncNotifyPropertyChange(Solid.Y_ROTATION_KEY)
     }
 
 public var Solid.rotationZ: Number
     get() = rotation?.z ?: 0f
     set(value) {
         rotation().z = value.toDouble()
-        notifyPropertyChanged(Solid.Z_ROTATION_KEY)
+        asyncNotifyPropertyChange(Solid.Z_ROTATION_KEY)
     }
 
 private fun Solid.scale(): Point3D =
@@ -200,19 +204,19 @@ public var Solid.scaleX: Number
     get() = scale?.x ?: 1f
     set(value) {
         scale().x = value.toDouble()
-        notifyPropertyChanged(Solid.X_SCALE_KEY)
+        asyncNotifyPropertyChange(Solid.X_SCALE_KEY)
     }
 
 public var Solid.scaleY: Number
     get() = scale?.y ?: 1f
     set(value) {
         scale().y = value.toDouble()
-        notifyPropertyChanged(Solid.Y_SCALE_KEY)
+        asyncNotifyPropertyChange(Solid.Y_SCALE_KEY)
     }
 
 public var Solid.scaleZ: Number
     get() = scale?.z ?: 1f
     set(value) {
         scale().z = value.toDouble()
-        notifyPropertyChanged(Solid.Z_SCALE_KEY)
+        asyncNotifyPropertyChange(Solid.Z_SCALE_KEY)
     }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index e472bbd0..c9d1654a 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -42,7 +42,7 @@ public class SolidGroup : VisionGroupBase(), Solid, PrototypeHolder {
      * Ger a prototype redirecting the request to the parent if prototype is not found
      */
     override fun getPrototype(name: Name): Solid? =
-        prototypes?.get(name) as? Solid ?: (parent as? PrototypeHolder)?.getPrototype(name)
+        (prototypes?.get(name) as? Solid) ?: (parent as? PrototypeHolder)?.getPrototype(name)
 
     /**
      * Create or edit prototype node as a group
@@ -108,7 +108,7 @@ public fun VisionContainerBuilder<Vision>.group(name: String, action: SolidGroup
 @Serializable(Prototypes.Companion::class)
 internal class Prototypes(
     children: Map<NameToken, Vision> = emptyMap(),
-) : VisionGroupBase() {
+) : VisionGroupBase(), PrototypeHolder {
 
     init {
         childrenInternal.putAll(children)
@@ -155,4 +155,10 @@ internal class Prototypes(
             mapSerializer.serialize(encoder, value.children)
         }
     }
+
+    override fun prototypes(builder: VisionContainerBuilder<Solid>.() -> Unit) {
+        apply(builder)
+    }
+
+    override fun getPrototype(name: Name): Solid? = get(name) as? Solid
 }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
index e1f2c940..d845df8b 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
@@ -89,18 +89,24 @@ public class SolidMaterial : Scheme() {
         public override val descriptor: NodeDescriptor by lazy {
             //must be lazy to avoid initialization bug
             NodeDescriptor {
+                inherited = true
+                usesStyles = true
+
                 value(COLOR_KEY) {
                     inherited = true
                     usesStyles = true
                     type(ValueType.STRING, ValueType.NUMBER)
                     widgetType = "color"
                 }
-//                value(SPECULAR_COLOR_KEY) {
-//                    inherited = true
-//                    usesStyles = true
-//                    type(ValueType.STRING, ValueType.NUMBER)
-//                    widgetType = "color"
-//                }
+
+                value(SPECULAR_COLOR_KEY) {
+                    inherited = true
+                    usesStyles = true
+                    type(ValueType.STRING, ValueType.NUMBER)
+                    widgetType = "color"
+                    hide()
+                }
+
                 value(OPACITY_KEY) {
                     inherited = true
                     usesStyles = true
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
index 4512cf54..6430fc3d 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
@@ -5,9 +5,7 @@ import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.descriptors.get
 import hep.dataforge.names.*
 import hep.dataforge.vision.*
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -128,14 +126,15 @@ public class SolidReferenceGroup(
                 error("Setting a parent for a reference child is not possible")
             }
 
-        override val propertyNameFlow: Flow<Name>
-            get() = this@SolidReferenceGroup.propertyNameFlow.filter { name ->
-                name.startsWith(childToken(childName))
-            }.map { name ->
-                name.cutFirst()
+        override fun onPropertyChange(scope: CoroutineScope, callback: suspend (Name) -> Unit) {
+            this@SolidReferenceGroup.onPropertyChange(scope) { name ->
+                if (name.startsWith(childToken(childName))) {
+                    callback(name.cutFirst())
+                }
             }
+        }
 
-        override fun notifyPropertyChanged(propertyName: Name) {
+        override suspend fun notifyPropertyChanged(propertyName: Name) {
             this@SolidReferenceGroup.notifyPropertyChanged(childPropertyName(childName, propertyName))
         }
 
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
index 3adaf603..813086fd 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
@@ -15,8 +15,6 @@ import info.laht.threekt.geometries.EdgesGeometry
 import info.laht.threekt.geometries.WireframeGeometry
 import info.laht.threekt.objects.LineSegments
 import info.laht.threekt.objects.Mesh
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
 import kotlin.reflect.KClass
 
 /**
@@ -45,7 +43,7 @@ public abstract class MeshThreeFactory<in T : Solid>(
         }.applyProperties(obj)
 
         //add listener to object properties
-        obj.propertyNameFlow.onEach { name ->
+        obj.onPropertyChange(three.updateScope) { name ->
             when {
                 name.startsWith(Solid.GEOMETRY_KEY) -> {
                     val oldGeometry = mesh.geometry as BufferGeometry
@@ -59,7 +57,7 @@ public abstract class MeshThreeFactory<in T : Solid>(
                 name.startsWith(EDGES_KEY) -> mesh.applyEdges(obj)
                 else -> mesh.updateProperty(obj, name)
             }
-        }.launchIn(three.updateScope)
+        }
 
         return mesh
     }
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
index 33cfcc60..d6be69e1 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
@@ -47,7 +47,7 @@ public fun Object3D.updatePosition(obj: Vision) {
  */
 public fun Object3D.updateProperty(source: Vision, propertyName: Name) {
     if (this is Mesh && propertyName.startsWith(MATERIAL_KEY)) {
-        this.material = getMaterial(source, false)
+        this.material = getMaterial(source, true)
     } else if (
         propertyName.startsWith(Solid.POSITION_KEY)
         || propertyName.startsWith(Solid.ROTATION)
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
index 4d1c7d99..258628bb 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
@@ -8,8 +8,6 @@ import info.laht.threekt.core.Object3D
 import info.laht.threekt.geometries.TextBufferGeometry
 import info.laht.threekt.objects.Mesh
 import kotlinext.js.jsObject
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
 import kotlin.reflect.KClass
 
 /**
@@ -27,10 +25,10 @@ public object ThreeLabelFactory : ThreeFactory<SolidLabel> {
         })
         return Mesh(textGeo, getMaterial(obj, true)).apply {
             updatePosition(obj)
-            obj.propertyNameFlow.onEach { _ ->
+            obj.onPropertyChange(three.updateScope){ _ ->
                 //TODO
                 three.logger.warn{"Label parameter change not implemented"}
-            }.launchIn(three.updateScope)
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
index d914a218..0d7a8e5c 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
@@ -9,8 +9,6 @@ import info.laht.threekt.core.Geometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.math.Color
 import info.laht.threekt.objects.LineSegments
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
 import kotlin.reflect.KClass
 
 public object ThreeLineFactory : ThreeFactory<PolyLine> {
@@ -30,9 +28,9 @@ public object ThreeLineFactory : ThreeFactory<PolyLine> {
             updatePosition(obj)
             //layers.enable(obj.layer)
             //add listener to object properties
-            obj.propertyNameFlow.onEach { propertyName ->
+            obj.onPropertyChange(three.updateScope) { propertyName ->
                 updateProperty(obj, propertyName)
-            }.launchIn(three.updateScope)
+            }
         }
     }
 
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
index 4401e8cd..1736ce82 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
@@ -59,6 +59,10 @@ public object ThreeMaterials {
             MeshPhongMaterial().apply {
                 color = meta[SolidMaterial.COLOR_KEY]?.getColor() ?: DEFAULT_COLOR
                 specular = meta[SolidMaterial.SPECULAR_COLOR_KEY]!!.getColor()
+                emissive = specular
+                reflectivity = 1.0
+                refractionRatio = 1.0
+                shininess = 100.0
                 opacity = meta[SolidMaterial.OPACITY_KEY]?.double ?: 1.0
                 transparent = opacity < 1.0
                 wireframe = meta[SolidMaterial.WIREFRAME_KEY].boolean ?: false
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index 834a56a7..a7a74ce3 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -67,7 +67,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
                 updatePosition(obj)
                 //obj.onChildrenChange()
 
-                obj.propertyNameFlow.onEach { name ->
+                obj.onPropertyChange(updateScope) { name ->
                     if (
                         name.startsWith(Solid.POSITION_KEY) ||
                         name.startsWith(Solid.ROTATION) ||
@@ -78,7 +78,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
                     } else if (name == Vision.VISIBLE_KEY) {
                         visible = obj.visible ?: true
                     }
-                }.launchIn(updateScope)
+                }
 
                 obj.structureChanges.onEach { (nameToken, _, child) ->
 //                        if (name.isEmpty()) {
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
index 08866d46..8ccbc37f 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
@@ -9,8 +9,6 @@ import hep.dataforge.vision.solid.SolidReferenceGroup.Companion.REFERENCE_CHILD_
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.objects.Mesh
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
 import kotlin.reflect.KClass
 
 public object ThreeReferenceFactory : ThreeFactory<SolidReferenceGroup> {
@@ -47,7 +45,7 @@ public object ThreeReferenceFactory : ThreeFactory<SolidReferenceGroup> {
 
         //TODO apply child properties
 
-        obj.propertyNameFlow.onEach { name->
+        obj.onPropertyChange(three.updateScope) { name->
             if (name.firstOrNull()?.body == REFERENCE_CHILD_PROPERTY_PREFIX) {
                 val childName = name.firstOrNull()?.index?.toName() ?: error("Wrong syntax for reference child property: '$name'")
                 val propertyName = name.cutFirst()
@@ -57,7 +55,7 @@ public object ThreeReferenceFactory : ThreeFactory<SolidReferenceGroup> {
             } else {
                 object3D.updateProperty(obj, name)
             }
-        }.launchIn(three.updateScope)
+        }
 
 
         return object3D

From eefc036dcb7b3174eef304b7feaf98f5c8f1674a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 21 Dec 2020 09:49:42 +0300
Subject: [PATCH 062/151] Remove `attachChildren`. Move group children to
 constructor

---
 .../kotlin/hep/dataforge/vision/Vision.kt     |  1 +
 .../hep/dataforge/vision/VisionChange.kt      |  7 +----
 .../hep/dataforge/vision/VisionGroup.kt       | 10 -------
 .../hep/dataforge/vision/VisionGroupBase.kt   | 19 ++++++++------
 .../hep/dataforge/vision/VisionManager.kt     |  9 ++-----
 .../hep/dataforge/vision/solid/SolidGroup.kt  | 26 ++++---------------
 .../dataforge/vision/solid/SolidManager.kt    | 11 ++++----
 .../dataforge/vision/solid/SolidReference.kt  |  8 ------
 .../dataforge/vision/solid/transform/UnRef.kt |  4 ++-
 9 files changed, 28 insertions(+), 67 deletions(-)

diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index ba585b46..eda9e70b 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -62,6 +62,7 @@ public interface Vision : Described {
      * Flow of property invalidation events. It does not contain property values after invalidation since it is not clear
      * if it should include inherited properties etc.
      */
+    @OptIn(ExperimentalCoroutinesApi::class)
     public val propertyChanges: Flow<Name> get() = callbackFlow<Name> {
         coroutineScope {
             onPropertyChange(this) {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
index 7dddd655..cbff844c 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
@@ -66,12 +66,7 @@ public class VisionChange(
     public val vision: Vision? = null,
     @Serializable(MetaSerializer::class) public val properties: Meta? = null,
     public val children: Map<Name, VisionChange>? = null,
-) {
-    init {
-        (vision as? VisionGroup)?.attachChildren()
-    }
-
-}
+)
 
 public inline fun VisionChange(manager: VisionManager, block: VisionChangeBuilder.() -> Unit): VisionChange =
     VisionChangeBuilder().apply(block).isolate(manager)
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
index 75855eb1..0f3967af 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
@@ -45,16 +45,6 @@ public interface VisionGroup : Provider, Vision, VisionContainer<Vision> {
         }
     }
 
-    /**
-     * A fix for serialization bug that writes all proper parents inside the tree after deserialization
-     */
-    public fun attachChildren() {
-        children.values.forEach {
-            it.parent = this
-            (it as? VisionGroup)?.attachChildren()
-        }
-    }
-
     public companion object {
         public const val STYLE_TARGET: String = "style"
     }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
index 0752b98b..6cc2b97b 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
@@ -11,23 +11,26 @@ import kotlinx.serialization.Transient
 
 /**
  * Abstract implementation of mutable group of [Vision]
+ *
+ * @param childrenInternal Internal mutable container for group children
  */
 @Serializable
 @SerialName("vision.group")
-public open class VisionGroupBase : VisionBase(), MutableVisionGroup {
-
-    /**
-     * Internal mutable container for group children
-     * TODO made protected due to [https://github.com/Kotlin/kotlinx.serialization/issues/1200]
-     */
-    @SerialName("children")
-    protected val childrenInternal: MutableMap<NameToken, Vision> = LinkedHashMap()
+public open class VisionGroupBase(
+    @SerialName("children") internal val childrenInternal: MutableMap<NameToken, Vision> = LinkedHashMap(),
+) : VisionBase(), MutableVisionGroup {
 
     /**
      * A map of top level named children
      */
     override val children: Map<NameToken, Vision> get() = childrenInternal
 
+    init {
+        childrenInternal.values.forEach {
+            it.parent = this
+        }
+    }
+
     override suspend fun notifyPropertyChanged(propertyName: Name) {
         super.notifyPropertyChanged(propertyName)
         for (obj in this) {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
index eb34ed84..9a831799 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
@@ -30,16 +30,11 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
             serializersModule = this@VisionManager.serializersModule
         }
 
-    public fun decodeFromString(string: String): Vision = jsonFormat.decodeFromString(visionSerializer, string).also {
-        (it as? VisionGroup)?.attachChildren()
-    }
+    public fun decodeFromString(string: String): Vision = jsonFormat.decodeFromString(visionSerializer, string)
 
     public fun encodeToString(vision: Vision): String = jsonFormat.encodeToString(visionSerializer, vision)
 
-    public fun decodeFromJson(json: JsonElement): Vision =
-        jsonFormat.decodeFromJsonElement(visionSerializer, json).also {
-            (it as? VisionGroup)?.attachChildren()
-        }
+    public fun decodeFromJson(json: JsonElement): Vision = jsonFormat.decodeFromJsonElement(visionSerializer, json)
 
     public fun encodeToJsonElement(vision: Vision): JsonElement =
         jsonFormat.encodeToJsonElement(visionSerializer, vision)
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index c9d1654a..e2abc4e8 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -23,21 +23,17 @@ public interface PrototypeHolder {
 
 /**
  * Represents 3-dimensional Visual Group
+ * @param prototypes A container for templates visible inside this group
  */
 @Serializable
 @SerialName("group.solid")
-public class SolidGroup : VisionGroupBase(), Solid, PrototypeHolder {
+public class SolidGroup(
+    @Serializable(Prototypes.Companion::class) @SerialName("prototypes") private var prototypes: MutableVisionGroup? = null,
+) : VisionGroupBase(), Solid, PrototypeHolder {
 
     override val descriptor: NodeDescriptor get() = Solid.descriptor
 
 
-    /**
-     * A container for templates visible inside this group
-     */
-    @Serializable(Prototypes.Companion::class)
-    @SerialName("prototypes")
-    internal var prototypes: MutableVisionGroup? = null
-
     /**
      * Ger a prototype redirecting the request to the parent if prototype is not found
      */
@@ -60,13 +56,6 @@ public class SolidGroup : VisionGroupBase(), Solid, PrototypeHolder {
 
     override var scale: Point3D? = null
 
-    override fun attachChildren() {
-        prototypes?.parent = this
-        prototypes?.attachChildren()
-        super.attachChildren()
-    }
-
-
 //    /**
 //     * TODO add special static group to hold statics without propagation
 //     */
@@ -108,16 +97,11 @@ public fun VisionContainerBuilder<Vision>.group(name: String, action: SolidGroup
 @Serializable(Prototypes.Companion::class)
 internal class Prototypes(
     children: Map<NameToken, Vision> = emptyMap(),
-) : VisionGroupBase(), PrototypeHolder {
+) : VisionGroupBase(children as? MutableMap<NameToken, Vision> ?: children.toMutableMap()), PrototypeHolder {
 
     init {
-        childrenInternal.putAll(children)
-    }
-
-    override fun attachChildren() {
         children.values.forEach {
             it.parent = parent
-            (it as? VisionGroup)?.attachChildren()
         }
     }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index 5f3c59bc..fa67fe5c 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -7,7 +7,10 @@ import hep.dataforge.context.PluginTag
 import hep.dataforge.meta.Meta
 import hep.dataforge.names.Name
 import hep.dataforge.names.toName
-import hep.dataforge.vision.*
+import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionBase
+import hep.dataforge.vision.VisionGroupBase
+import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.VisionManager.Companion.VISION_SERIALIZER_MODULE_TARGET
 import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.json.Json
@@ -67,10 +70,6 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
 
         public fun encodeToString(solid: Solid): String = jsonForSolids.encodeToString(PolymorphicSerializer(Vision::class), solid)
 
-        fun decodeFromString(str: String): Solid = jsonForSolids.decodeFromString(PolymorphicSerializer(Solid::class), str).also {
-            if(it is VisionGroup){
-                it.attachChildren()
-            }
-        }
+        public fun decodeFromString(str: String): Solid = jsonForSolids.decodeFromString(PolymorphicSerializer(Solid::class), str)
     }
 }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
index 6430fc3d..63cd0672 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
@@ -82,10 +82,6 @@ public class SolidReferenceGroup(
         includeDefaults: Boolean,
     ): MetaItem<*>? = getRefProperty(name, inherit, includeStyles, includeDefaults)
 
-    override fun attachChildren() {
-        //do nothing
-    }
-
     override val descriptor: NodeDescriptor get() = prototype.descriptor
 
 
@@ -142,10 +138,6 @@ public class SolidReferenceGroup(
             TODO("Not yet implemented")
         }
 
-        override fun attachChildren() {
-            //do nothing
-        }
-
         override val descriptor: NodeDescriptor get() = prototype.descriptor
 
     }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
index cb0ac4e2..8bc81ff1 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
@@ -26,7 +26,9 @@ internal object UnRef : VisualTreeTransform<SolidGroup>() {
     }
 
     private fun MutableVisionGroup.unref(name: Name) {
-        (this as? SolidGroup)?.prototypes?.set(name, null)
+        (this as? SolidGroup)?.prototypes{
+            set(name, null)
+        }
         children.filter { (it.value as? SolidReferenceGroup)?.templateName == name }.forEach { (key, value) ->
             val reference = value as SolidReferenceGroup
             val newChild = mergeChild(reference, reference.prototype)

From 66ea23ad60ec8366660930d4ede13b1b009e65be Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 21 Dec 2020 21:45:29 +0300
Subject: [PATCH 063/151] Optimized materials allocation

---
 .../vision/solid/demo/VariableBox.kt          |  14 +--
 .../kotlin/hep/dataforge/vision/Vision.kt     |  28 ++---
 .../kotlin/hep/dataforge/vision/VisionBase.kt |   8 +-
 .../kotlin/hep/dataforge/vision/misc.kt       |  16 ++-
 .../hep/dataforge/vision/solid/SolidGroup.kt  |   4 +-
 .../dataforge/vision/solid/SolidReference.kt  |  17 ++-
 .../vision/solid/three/MeshThreeFactory.kt    |  69 ++++++------
 .../vision/solid/three/ThreeFactory.kt        |   5 +-
 .../vision/solid/three/ThreeLabelFactory.kt   |   8 +-
 .../vision/solid/three/ThreeMaterials.kt      | 101 ++++++++++++++++--
 .../info/laht/threekt/materials/Material.kt   |   2 +-
 11 files changed, 181 insertions(+), 91 deletions(-)

diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
index 2910e0d3..4fbb0903 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
@@ -11,7 +11,6 @@ import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.Solid.Companion.GEOMETRY_KEY
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
 import hep.dataforge.vision.solid.three.*
-import hep.dataforge.vision.solid.three.ThreeMaterials.getMaterial
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.geometries.BoxBufferGeometry
@@ -31,8 +30,8 @@ internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeV
         scaleX = xSize
         scaleY = ySize
         scaleZ = zSize
-        getProperty(MeshThreeFactory.EDGES_ENABLED_KEY, false)
-        getProperty(MeshThreeFactory.WIREFRAME_ENABLED_KEY, false)
+//        getProperty(MeshThreeFactory.EDGES_ENABLED_KEY, inherit = false, includeStyles = false)
+//        getProperty(MeshThreeFactory.WIREFRAME_ENABLED_KEY, inherit = false, includeStyles = false)
     }
 
     override fun render(three: ThreePlugin): Object3D {
@@ -44,9 +43,10 @@ internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeV
         //JS sometimes tries to pass Geometry as BufferGeometry
         @Suppress("USELESS_IS_CHECK") if (geometry !is BufferGeometry) error("BufferGeometry expected")
 
-        val mesh = Mesh(geometry, getMaterial(this@VariableBox, true)).apply {
+        val mesh = Mesh(geometry, ThreeMaterials.DEFAULT).apply {
+            updateMaterial(this@VariableBox)
             applyEdges(this@VariableBox)
-            applyWireFrame(this@VariableBox)
+            //applyWireFrame(this@VariableBox)
 
             //set position for mesh
             updatePosition(this@VariableBox)
@@ -69,10 +69,10 @@ internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeV
                     mesh.scale.set(newXSize, newYSize, newZSize)
                     mesh.updateMatrix()
                 }
-                name.startsWith(MeshThreeFactory.WIREFRAME_KEY) -> mesh.applyWireFrame(this@VariableBox)
+                //name.startsWith(MeshThreeFactory.WIREFRAME_KEY) -> mesh.applyWireFrame(this@VariableBox)
                 name.startsWith(MeshThreeFactory.EDGES_KEY) -> mesh.applyEdges(this@VariableBox)
                 name.startsWith(MATERIAL_COLOR_KEY) -> {
-                    mesh.material = getMaterial(this, true)
+                    mesh.updateMaterial(this)
                 }
                 else -> mesh.updateProperty(this@VariableBox, name)
             }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index eda9e70b..28f6b988 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -4,6 +4,7 @@ import hep.dataforge.meta.MetaItem
 import hep.dataforge.meta.MutableItemProvider
 import hep.dataforge.meta.descriptors.Described
 import hep.dataforge.meta.descriptors.NodeDescriptor
+import hep.dataforge.meta.descriptors.get
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.toName
@@ -45,8 +46,8 @@ public interface Vision : Described {
      */
     public fun getProperty(
         name: Name,
-        inherit: Boolean? = null,
-        includeStyles: Boolean? = null,
+        inherit: Boolean = false,
+        includeStyles: Boolean = true,
         includeDefaults: Boolean = true,
     ): MetaItem<*>?
 
@@ -63,14 +64,15 @@ public interface Vision : Described {
      * if it should include inherited properties etc.
      */
     @OptIn(ExperimentalCoroutinesApi::class)
-    public val propertyChanges: Flow<Name> get() = callbackFlow<Name> {
-        coroutineScope {
-            onPropertyChange(this) {
-                send(it)
+    public val propertyChanges: Flow<Name>
+        get() = callbackFlow<Name> {
+            coroutineScope {
+                onPropertyChange(this) {
+                    send(it)
+                }
+                awaitClose { cancel() }
             }
-            awaitClose { cancel() }
         }
-    }
 
 
     /**
@@ -93,7 +95,7 @@ public interface Vision : Described {
     }
 }
 
-public fun Vision.asyncNotifyPropertyChange(propertyName: Name){
+public fun Vision.asyncNotifyPropertyChange(propertyName: Name) {
     scope.launch {
         notifyPropertyChanged(propertyName)
     }
@@ -120,8 +122,8 @@ public fun Vision.allProperties(
 ): MutableItemProvider = object : MutableItemProvider {
     override fun getItem(name: Name): MetaItem<*>? = getProperty(
         name,
-        inherit = inherit,
-        includeStyles = includeStyles,
+        inherit = inherit ?: (descriptor?.get(name)?.inherited != false),
+        includeStyles = includeStyles ?: (descriptor?.get(name)?.usesStyles == true),
         includeDefaults = includeDefaults
     )
 
@@ -133,8 +135,8 @@ public fun Vision.allProperties(
  */
 public fun Vision.getProperty(
     key: String,
-    inherit: Boolean? = null,
-    includeStyles: Boolean? = null,
+    inherit: Boolean = false,
+    includeStyles: Boolean = true,
     includeDefaults: Boolean = true,
 ): MetaItem<*>? = getProperty(key.toName(), inherit, includeStyles, includeDefaults)
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index 141366d1..fdd7feed 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -65,15 +65,15 @@ public open class VisionBase : Vision {
 
     override fun getProperty(
         name: Name,
-        inherit: Boolean?,
-        includeStyles: Boolean?,
+        inherit: Boolean,
+        includeStyles: Boolean,
         includeDefaults: Boolean,
     ): MetaItem<*>? = sequence {
         yield(getOwnProperty(name))
-        if (includeStyles ?: descriptor?.get(name)?.usesStyles != false) {
+        if (includeStyles) {
             yieldAll(getStyleItems(name))
         }
-        if (inherit ?: descriptor?.get(name)?.inherited == true) {
+        if (inherit) {
             yield(parent?.getProperty(name, inherit, includeStyles, includeDefaults))
         }
         yield(descriptor?.get(name)?.defaultItem())
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
index ef1882fe..047cd2fa 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
@@ -6,15 +6,13 @@ import hep.dataforge.values.asValue
 @DslMarker
 public annotation class VisionBuilder
 
-public fun Sequence<MetaItem<*>?>.merge(): MetaItem<*>? {
-    return when (val first = firstOrNull { it != null }) {
-        null -> null
-        is MetaItem.ValueItem -> first //fast search for first entry if it is value
-        is MetaItem.NodeItem -> {
-            //merge nodes if first encountered node is meta
-            val laminate: Laminate = Laminate(mapNotNull { it.node }.toList())
-            MetaItem.NodeItem(laminate)
-        }
+public fun Sequence<MetaItem<*>?>.merge(): MetaItem<*>? = when (val first = firstOrNull { it != null }) {
+    null -> null
+    is MetaItem.ValueItem -> first //fast search for first entry if it is value
+    is MetaItem.NodeItem -> {
+        //merge nodes if first encountered node is meta
+        val laminate: Laminate = Laminate(mapNotNull { it.node }.toList())
+        MetaItem.NodeItem(laminate)
     }
 }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index e2abc4e8..4ddfe548 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -109,8 +109,8 @@ internal class Prototypes(
 
     override fun getProperty(
         name: Name,
-        inherit: Boolean?,
-        includeStyles: Boolean?,
+        inherit: Boolean,
+        includeStyles: Boolean,
         includeDefaults: Boolean,
     ): MetaItem<*>? = null
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
index 63cd0672..d9fbdba0 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
@@ -2,7 +2,6 @@ package hep.dataforge.vision.solid
 
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.meta.descriptors.get
 import hep.dataforge.names.*
 import hep.dataforge.vision.*
 import kotlinx.coroutines.CoroutineScope
@@ -15,17 +14,17 @@ public interface SolidReference : Vision {
 
 private fun SolidReference.getRefProperty(
     name: Name,
-    inherit: Boolean?,
-    includeStyles: Boolean?,
+    inherit: Boolean,
+    includeStyles: Boolean,
     includeDefaults: Boolean,
 ): MetaItem<*>? {
     return sequence {
         yield(getOwnProperty(name))
-        if (includeStyles ?: descriptor?.get(name)?.usesStyles != false) {
+        if (includeStyles) {
             yieldAll(getStyleItems(name))
         }
         yield(prototype.getProperty(name, inherit, includeStyles, includeDefaults))
-        if (inherit ?: descriptor?.get(name)?.inherited == true) {
+        if (inherit) {
             yield(parent?.getProperty(name, inherit))
         }
     }.merge()
@@ -77,8 +76,8 @@ public class SolidReferenceGroup(
 
     override fun getProperty(
         name: Name,
-        inherit: Boolean?,
-        includeStyles: Boolean?,
+        inherit: Boolean,
+        includeStyles: Boolean,
         includeDefaults: Boolean,
     ): MetaItem<*>? = getRefProperty(name, inherit, includeStyles, includeDefaults)
 
@@ -108,8 +107,8 @@ public class SolidReferenceGroup(
 
         override fun getProperty(
             name: Name,
-            inherit: Boolean?,
-            includeStyles: Boolean?,
+            inherit: Boolean,
+            includeStyles: Boolean,
             includeDefaults: Boolean,
         ): MetaItem<*>? = getRefProperty(name, inherit, includeStyles, includeDefaults)
 
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
index 813086fd..f04e7a1a 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
@@ -9,10 +9,8 @@ import hep.dataforge.names.startsWith
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.SolidMaterial
 import hep.dataforge.vision.solid.layer
-import hep.dataforge.vision.solid.three.ThreeMaterials.getMaterial
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.geometries.EdgesGeometry
-import info.laht.threekt.geometries.WireframeGeometry
 import info.laht.threekt.objects.LineSegments
 import info.laht.threekt.objects.Mesh
 import kotlin.reflect.KClass
@@ -36,7 +34,7 @@ public abstract class MeshThreeFactory<in T : Solid>(
 
         //val meshMeta: Meta = obj.properties[Material3D.MATERIAL_KEY]?.node ?: Meta.empty
 
-        val mesh = Mesh(geometry, null).apply {
+        val mesh = Mesh(geometry, ThreeMaterials.DEFAULT).apply {
             matrixAutoUpdate = false
             //set position for mesh
             updatePosition(obj)
@@ -49,11 +47,11 @@ public abstract class MeshThreeFactory<in T : Solid>(
                     val oldGeometry = mesh.geometry as BufferGeometry
                     val newGeometry = buildGeometry(obj)
                     oldGeometry.attributes = newGeometry.attributes
-                    mesh.applyWireFrame(obj)
+                    //mesh.applyWireFrame(obj)
                     mesh.applyEdges(obj)
                     newGeometry.dispose()
                 }
-                name.startsWith(WIREFRAME_KEY) -> mesh.applyWireFrame(obj)
+                //name.startsWith(WIREFRAME_KEY) -> mesh.applyWireFrame(obj)
                 name.startsWith(EDGES_KEY) -> mesh.applyEdges(obj)
                 else -> mesh.updateProperty(obj, name)
             }
@@ -64,19 +62,19 @@ public abstract class MeshThreeFactory<in T : Solid>(
 
     public companion object {
         public val EDGES_KEY: Name = "edges".asName()
-        public val WIREFRAME_KEY: Name = "wireframe".asName()
+        //public val WIREFRAME_KEY: Name = "wireframe".asName()
         public val ENABLED_KEY: Name = "enabled".asName()
         public val EDGES_ENABLED_KEY: Name = EDGES_KEY + ENABLED_KEY
         public val EDGES_MATERIAL_KEY: Name = EDGES_KEY + SolidMaterial.MATERIAL_KEY
-        public val WIREFRAME_ENABLED_KEY: Name = WIREFRAME_KEY + ENABLED_KEY
-        public val WIREFRAME_MATERIAL_KEY: Name = WIREFRAME_KEY + SolidMaterial.MATERIAL_KEY
+        //public val WIREFRAME_ENABLED_KEY: Name = WIREFRAME_KEY + ENABLED_KEY
+        //public val WIREFRAME_MATERIAL_KEY: Name = WIREFRAME_KEY + SolidMaterial.MATERIAL_KEY
     }
 }
 
 internal fun Mesh.applyProperties(obj: Solid): Mesh = apply {
-    material = getMaterial(obj, true)
+    updateMaterial(obj)
     applyEdges(obj)
-    applyWireFrame(obj)
+    //applyWireFrame(obj)
     layers.enable(obj.layer)
     children.forEach {
         it.layers.enable(obj.layer)
@@ -86,9 +84,16 @@ internal fun Mesh.applyProperties(obj: Solid): Mesh = apply {
 public fun Mesh.applyEdges(obj: Solid) {
     val edges = children.find { it.name == "@edges" } as? LineSegments
     //inherited edges definition, enabled by default
-    if (obj.getProperty(MeshThreeFactory.EDGES_ENABLED_KEY).boolean != false) {
+    if (obj.getProperty(MeshThreeFactory.EDGES_ENABLED_KEY, inherit = true, includeStyles = true).boolean != false) {
         val bufferGeometry = geometry as? BufferGeometry ?: return
-        val material = ThreeMaterials.getLineMaterial(obj.getProperty(MeshThreeFactory.EDGES_MATERIAL_KEY).node, true)
+        val material = ThreeMaterials.getLineMaterial(
+            obj.getProperty(
+                MeshThreeFactory.EDGES_MATERIAL_KEY,
+                inherit = true,
+                includeStyles = true
+            ).node,
+            true
+        )
         if (edges == null) {
             add(
                 LineSegments(
@@ -109,23 +114,23 @@ public fun Mesh.applyEdges(obj: Solid) {
     }
 }
 
-public fun Mesh.applyWireFrame(obj: Solid) {
-    children.find { it.name == "@wireframe" }?.let {
-        remove(it)
-        (it as LineSegments).dispose()
-    }
-    //inherited wireframe definition, disabled by default
-    if (obj.getProperty(MeshThreeFactory.WIREFRAME_ENABLED_KEY).boolean == true) {
-        val bufferGeometry = geometry as? BufferGeometry ?: return
-        val material =
-            ThreeMaterials.getLineMaterial(obj.getProperty(MeshThreeFactory.WIREFRAME_MATERIAL_KEY).node, true)
-        add(
-            LineSegments(
-                WireframeGeometry(bufferGeometry),
-                material
-            ).apply {
-                name = "@wireframe"
-            }
-        )
-    }
-}
\ No newline at end of file
+//public fun Mesh.applyWireFrame(obj: Solid) {
+//    children.find { it.name == "@wireframe" }?.let {
+//        remove(it)
+//        (it as LineSegments).dispose()
+//    }
+//    //inherited wireframe definition, disabled by default
+//    if (obj.getProperty(MeshThreeFactory.WIREFRAME_ENABLED_KEY).boolean == true) {
+//        val bufferGeometry = geometry as? BufferGeometry ?: return
+//        val material =
+//            ThreeMaterials.getLineMaterial(obj.getProperty(MeshThreeFactory.WIREFRAME_MATERIAL_KEY).node, true)
+//        add(
+//            LineSegments(
+//                WireframeGeometry(bufferGeometry),
+//                material
+//            ).apply {
+//                name = "@wireframe"
+//            }
+//        )
+//    }
+//}
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
index d6be69e1..30fa1422 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
@@ -7,7 +7,6 @@ import hep.dataforge.vision.Vision
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY
 import hep.dataforge.vision.solid.three.ThreeFactory.Companion.TYPE
-import hep.dataforge.vision.solid.three.ThreeMaterials.getMaterial
 import hep.dataforge.vision.visible
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
@@ -34,7 +33,7 @@ public interface ThreeFactory<in T : Vision> {
  */
 public fun Object3D.updatePosition(obj: Vision) {
     visible = obj.visible ?: true
-    if(obj is Solid) {
+    if (obj is Solid) {
         position.set(obj.x, obj.y, obj.z)
         setRotationFromEuler(obj.euler)
         scale.set(obj.scaleX, obj.scaleY, obj.scaleZ)
@@ -47,7 +46,7 @@ public fun Object3D.updatePosition(obj: Vision) {
  */
 public fun Object3D.updateProperty(source: Vision, propertyName: Name) {
     if (this is Mesh && propertyName.startsWith(MATERIAL_KEY)) {
-        this.material = getMaterial(source, true)
+        updateMaterialProperty(source, propertyName)
     } else if (
         propertyName.startsWith(Solid.POSITION_KEY)
         || propertyName.startsWith(Solid.ROTATION)
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
index 258628bb..8809ea2d 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
@@ -3,7 +3,6 @@ package hep.dataforge.vision.solid.three
 
 import hep.dataforge.context.logger
 import hep.dataforge.vision.solid.SolidLabel
-import hep.dataforge.vision.solid.three.ThreeMaterials.getMaterial
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.geometries.TextBufferGeometry
 import info.laht.threekt.objects.Mesh
@@ -23,11 +22,12 @@ public object ThreeLabelFactory : ThreeFactory<SolidLabel> {
             height = 1
             curveSegments = 1
         })
-        return Mesh(textGeo, getMaterial(obj, true)).apply {
+        return Mesh(textGeo, ThreeMaterials.DEFAULT).apply {
+            updateMaterial(obj)
             updatePosition(obj)
-            obj.onPropertyChange(three.updateScope){ _ ->
+            obj.onPropertyChange(three.updateScope) { _ ->
                 //TODO
-                three.logger.warn{"Label parameter change not implemented"}
+                three.logger.warn { "Label parameter change not implemented" }
             }
         }
     }
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
index 1736ce82..e9471af8 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
@@ -1,23 +1,28 @@
 package hep.dataforge.vision.solid.three
 
 import hep.dataforge.meta.*
+import hep.dataforge.names.Name
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.int
 import hep.dataforge.values.string
 import hep.dataforge.vision.Colors
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.allStyles
+import hep.dataforge.vision.merge
 import hep.dataforge.vision.solid.SolidMaterial
 import info.laht.threekt.materials.LineBasicMaterial
 import info.laht.threekt.materials.Material
 import info.laht.threekt.materials.MeshBasicMaterial
 import info.laht.threekt.materials.MeshPhongMaterial
 import info.laht.threekt.math.Color
+import info.laht.threekt.objects.Mesh
 
 
 public object ThreeMaterials {
     public val DEFAULT_COLOR: Color = Color(Colors.darkgreen)
     public val DEFAULT: MeshBasicMaterial = MeshBasicMaterial().apply {
         color.set(DEFAULT_COLOR)
+        cached = true
     }
     public val DEFAULT_LINE_COLOR: Color = Color(Colors.black)
     public val DEFAULT_LINE: LineBasicMaterial = LineBasicMaterial().apply {
@@ -54,7 +59,7 @@ public object ThreeMaterials {
 
     private val materialCache = HashMap<Meta, Material>()
 
-    private fun buildMaterial(meta: Meta): Material {
+    internal fun buildMaterial(meta: Meta): Material {
         return if (meta[SolidMaterial.SPECULAR_COLOR_KEY] != null) {
             MeshPhongMaterial().apply {
                 color = meta[SolidMaterial.COLOR_KEY]?.getColor() ?: DEFAULT_COLOR
@@ -79,15 +84,26 @@ public object ThreeMaterials {
         }
     }
 
-    public fun getMaterial(vision3D: Vision, cache: Boolean): Material {
-        val meta = vision3D.getProperty(SolidMaterial.MATERIAL_KEY, inherit = true).node ?: return DEFAULT
-        return if (cache) {
-            materialCache.getOrPut(meta) { buildMaterial(meta) }
-        } else {
-            buildMaterial(meta)
+    internal fun cacheMeta(meta: Meta): Material = materialCache.getOrPut(meta) {
+        buildMaterial(meta).apply {
+            cached = true
         }
     }
 
+
+//    internal fun getMaterial(vision: Vision, cache: Boolean): Material {
+//        val meta = vision.getProperty(SolidMaterial.MATERIAL_KEY, inherit = true).node ?: return DEFAULT
+//        return if (cache) {
+//            materialCache.getOrPut(meta) {
+//                buildMaterial(meta).apply {
+//                    cached = true
+//                }
+//            }
+//        } else {
+//            buildMaterial(meta)
+//        }
+//    }
+
 }
 
 /**
@@ -111,3 +127,74 @@ public fun MetaItem<*>.getColor(): Color {
     }
 }
 
+private var Material.cached: Boolean
+    get() = userData["cached"] == true
+    set(value) {
+        userData["cached"] = value
+    }
+
+public fun Mesh.updateMaterial(vision: Vision) {
+    //val meta = vision.getProperty(SolidMaterial.MATERIAL_KEY, inherit = true).node
+    val ownMaterialMeta = vision.getOwnProperty(SolidMaterial.MATERIAL_KEY)
+    val stylesMaterialMeta = vision.allStyles[SolidMaterial.MATERIAL_KEY]
+    val parentMaterialMeta = vision.parent?.getProperty(
+        SolidMaterial.MATERIAL_KEY,
+        inherit = true,
+        includeStyles = false,
+        includeDefaults = false
+    )
+    material = when {
+        ownMaterialMeta == null && stylesMaterialMeta == null && parentMaterialMeta == null -> {
+            //use default is not material properties are defined
+            ThreeMaterials.DEFAULT
+        }
+        ownMaterialMeta == null && parentMaterialMeta == null -> {
+            //If material is style-based, use cached
+            ThreeMaterials.cacheMeta(stylesMaterialMeta.node ?: Meta.EMPTY)
+        }
+        else -> {
+            val merge = sequenceOf(ownMaterialMeta, stylesMaterialMeta, parentMaterialMeta).merge().node ?: Meta.EMPTY
+            ThreeMaterials.buildMaterial(merge)
+        }
+    }
+}
+
+public fun Mesh.updateMaterialProperty(vision: Vision, propertyName: Name) {
+    if (material.cached) {
+        //generate a new material since cached material should not be changed
+        updateMaterial(vision)
+    } else {
+        when (propertyName) {
+            SolidMaterial.MATERIAL_COLOR_KEY -> {
+                material.asDynamic().color = vision.getProperty(
+                    SolidMaterial.MATERIAL_COLOR_KEY,
+                    inherit = true,
+                    includeStyles = true,
+                    includeDefaults = false
+                )?.getColor() ?: ThreeMaterials.DEFAULT_COLOR
+                material.needsUpdate = true
+            }
+            SolidMaterial.MATERIAL_OPACITY_KEY -> {
+                val opacity = vision.getProperty(
+                    SolidMaterial.MATERIAL_OPACITY_KEY,
+                    inherit = true,
+                    includeStyles = true,
+                    includeDefaults = false
+                ).double ?: 1.0
+                material.asDynamic().opacity = opacity
+                material.transparent = opacity < 1.0
+                material.needsUpdate = true
+            }
+            SolidMaterial.MATERIAL_WIREFRAME_KEY -> {
+                material.asDynamic().wireframe = vision.getProperty(
+                    SolidMaterial.MATERIAL_WIREFRAME_KEY,
+                    inherit = true,
+                    includeStyles = true,
+                    includeDefaults = false
+                ).boolean ?: false
+                material.needsUpdate = true
+            }
+            else -> console.warn("Unrecognized material property: $propertyName")
+        }
+    }
+}
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/Material.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/Material.kt
index 3950c963..9a2b72d0 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/Material.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/materials/Material.kt
@@ -111,7 +111,7 @@ open external class Material {
 
     var visible: Boolean
 
-    var userData: Map<String, Any>
+    var userData: dynamic
 
     /**
      * Specifies that the material needs to be updated at the WebGL level. Set it to true if you made changes that need to be reflected in WebGL.

From 216be4a6a18dfedd348a991bd2ed48433825522f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 22 Dec 2020 13:33:05 +0300
Subject: [PATCH 064/151] Handle property clearing in updates.

---
 .../main/kotlin/ru/mipt/npm/sat/satServer.kt  |  3 +-
 .../kotlin/hep/dataforge/vision/Vision.kt     |  5 +-
 .../kotlin/hep/dataforge/vision/VisionBase.kt | 30 +++++++++--
 .../hep/dataforge/vision/VisionChange.kt      |  8 ++-
 .../vision/three/server/VisionServer.kt       |  8 ---
 .../dataforge/vision/solid/ColorAccessor.kt   | 51 +++++++++++++++++++
 .../dataforge/vision/solid/SolidMaterial.kt   | 38 --------------
 7 files changed, 90 insertions(+), 53 deletions(-)
 create mode 100644 visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ColorAccessor.kt

diff --git a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
index 761cd982..a605e717 100644
--- a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
+++ b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
@@ -3,6 +3,7 @@ package ru.mipt.npm.sat
 
 import hep.dataforge.names.toName
 import hep.dataforge.vision.solid.Solid
+import hep.dataforge.vision.solid.clear
 import hep.dataforge.vision.solid.color
 import hep.dataforge.vision.solid.invoke
 import hep.dataforge.vision.three.server.*
@@ -42,7 +43,7 @@ fun main() {
             val targetVision = sat[target] as Solid
             targetVision.color("red")
             delay(300)
-            targetVision.color("darkgreen")
+            targetVision.color.clear()
             delay(10)
         }
     }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 28f6b988..39d5ae5a 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -57,6 +57,9 @@ public interface Vision : Described {
      */
     public fun setProperty(name: Name, item: MetaItem<*>?, notify: Boolean = true)
 
+    /**
+     * Subscribe on property updates. The subscription is bound to the given [scope] and canceled when the scope is canceled
+     */
     public fun onPropertyChange(scope: CoroutineScope, callback: suspend (Name) -> Unit)
 
     /**
@@ -81,7 +84,7 @@ public interface Vision : Described {
     public suspend fun notifyPropertyChanged(propertyName: Name): Unit
 
     /**
-     * Update this vision using external meta. Children are not updated.
+     * Update this vision using a dif represented by [VisionChange].
      */
     public fun update(change: VisionChange)
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index fdd7feed..a70cdf21 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -3,12 +3,14 @@ package hep.dataforge.vision
 import hep.dataforge.meta.Config
 import hep.dataforge.meta.MetaItem
 import hep.dataforge.meta.MutableMeta
+import hep.dataforge.meta.asMetaItem
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.descriptors.defaultItem
 import hep.dataforge.meta.descriptors.get
-import hep.dataforge.meta.update
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
+import hep.dataforge.names.plus
+import hep.dataforge.values.Null
 import hep.dataforge.values.ValueType
 import hep.dataforge.vision.Vision.Companion.STYLE_KEY
 import kotlinx.coroutines.CoroutineScope
@@ -27,6 +29,7 @@ internal data class PropertyListener(
     val action: (name: Name) -> Unit,
 )
 
+
 @Serializable
 @SerialName("vision")
 public open class VisionBase : Vision {
@@ -100,6 +103,8 @@ public open class VisionBase : Vision {
             }
     }
 
+
+    //TODO check memory consumption for the flow
     @Transient
     private val propertyInvalidationFlow: MutableSharedFlow<Name> = MutableSharedFlow()
 
@@ -116,13 +121,30 @@ public open class VisionBase : Vision {
         propertyInvalidationFlow.emit(propertyName)
     }
 
-    public fun configure(block: MutableMeta<*>.() -> Unit) {
-        getOrCreateConfig().block()
+    public fun configure(block: suspend MutableMeta<*>.() -> Unit) {
+        scope.launch {
+            getOrCreateConfig().block()
+        }
     }
 
     override fun update(change: VisionChange) {
+
+        fun updateProperties(at: Name, item: MetaItem<*>) {
+            when (item) {
+                is MetaItem.ValueItem -> {
+                    if (item.value == Null) {
+                        setProperty(at, null)
+                    } else
+                        setProperty(at, item)
+                }
+                is MetaItem.NodeItem -> item.node.items.forEach { (token, childItem) ->
+                    updateProperties(at + token, childItem)
+                }
+            }
+        }
+
         change.properties?.let {
-            getOrCreateConfig().update(it)
+            updateProperties(Name.EMPTY, it.asMetaItem())
         }
     }
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
index cbff844c..c0cc594a 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
@@ -3,6 +3,7 @@ package hep.dataforge.vision
 import hep.dataforge.meta.*
 import hep.dataforge.names.Name
 import hep.dataforge.names.plus
+import hep.dataforge.values.Null
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
@@ -30,7 +31,8 @@ public class VisionChangeBuilder : VisionContainerBuilder<Vision> {
 
     public fun propertyChanged(visionName: Name, propertyName: Name, item: MetaItem<*>?) {
         if (visionName == Name.EMPTY) {
-            propertyChange[propertyName] = item
+            //Write property removal as [Null]
+            propertyChange[propertyName] = (item ?: Null.asMetaItem())
         } else {
             getOrPutChild(visionName).propertyChanged(Name.EMPTY, propertyName, item)
         }
@@ -112,6 +114,10 @@ public fun Vision.flowChanges(
     coroutineScope {
         collectChange(Name.EMPTY, this@flowChanges) { collector }
 
+        //Send initial vision state
+        val initialChange = VisionChange(vision = isolate(manager))
+        emit(initialChange)
+
         while (currentCoroutineContext().isActive) {
             //Wait for changes to accumulate
             delay(collectionDuration)
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt
index 13528ff7..5baf2643 100644
--- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt
@@ -134,14 +134,6 @@ public class VisionServer internal constructor(
 
             try {
                 withContext(visionManager.context.coroutineContext) {
-
-                    val initialVision = VisionChange(vision = vision)
-                    val initialJson =  visionManager.jsonFormat.encodeToString(
-                        VisionChange.serializer(),
-                        initialVision
-                    )
-                    outgoing.send(Frame.Text(initialJson))
-
                     vision.flowChanges(visionManager, updateInterval.milliseconds).collect { update ->
                         val json = visionManager.jsonFormat.encodeToString(
                             VisionChange.serializer(),
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ColorAccessor.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ColorAccessor.kt
new file mode 100644
index 00000000..3b78d7b5
--- /dev/null
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ColorAccessor.kt
@@ -0,0 +1,51 @@
+package hep.dataforge.vision.solid
+
+import hep.dataforge.meta.MutableItemProvider
+import hep.dataforge.meta.set
+import hep.dataforge.meta.value
+import hep.dataforge.names.Name
+import hep.dataforge.values.Value
+import hep.dataforge.values.asValue
+import hep.dataforge.values.string
+import hep.dataforge.vision.Colors
+import hep.dataforge.vision.VisionBuilder
+
+@VisionBuilder
+public class ColorAccessor(private val parent: MutableItemProvider, private val colorKey: Name) {
+    public var value: Value?
+        get() = parent.getItem(colorKey).value
+        set(value) {
+            parent[colorKey] = value
+        }
+}
+
+public var ColorAccessor?.string: String?
+    get() = this?.value?.string
+    set(value) {
+        this?.value = value?.asValue()
+    }
+
+/**
+ * Set [webcolor](https://en.wikipedia.org/wiki/Web_colors) as string
+ */
+public operator fun ColorAccessor?.invoke(webColor: String) {
+    this?.value = webColor.asValue()
+}
+
+/**
+ * Set color as RGB integer
+ */
+public operator fun ColorAccessor?.invoke(rgb: Int) {
+    this?.value = Colors.rgbToString(rgb).asValue()
+}
+
+/**
+ * Set color as RGB
+ */
+public operator fun ColorAccessor?.invoke(r: UByte, g: UByte, b: UByte) {
+    this?.value = Colors.rgbToString(r, g, b).asValue()
+}
+
+public fun ColorAccessor?.clear(){
+    this?.value = null
+}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
index d845df8b..2394030b 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
@@ -6,51 +6,13 @@ import hep.dataforge.meta.descriptors.attributes
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
-import hep.dataforge.values.Value
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.asValue
-import hep.dataforge.values.string
 import hep.dataforge.vision.*
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_OPACITY_KEY
 
-@VisionBuilder
-public class ColorAccessor(private val parent: MutableItemProvider, private val colorKey: Name) {
-    public var value: Value?
-        get() = parent.getItem(colorKey).value
-        set(value) {
-            parent[colorKey] = value
-        }
-}
-
-public var ColorAccessor?.string: String?
-    get() = this?.value?.string
-    set(value) {
-        this?.value = value?.asValue()
-    }
-
-/**
- * Set [webcolor](https://en.wikipedia.org/wiki/Web_colors) as string
- */
-public operator fun ColorAccessor?.invoke(webColor: String) {
-    this?.value = webColor.asValue()
-}
-
-/**
- * Set color as RGB integer
- */
-public operator fun ColorAccessor?.invoke(rgb: Int) {
-    this?.value = Colors.rgbToString(rgb).asValue()
-}
-
-/**
- * Set color as RGB
- */
-public operator fun ColorAccessor?.invoke(r: UByte, g: UByte, b: UByte) {
-    this?.value = Colors.rgbToString(r, g, b).asValue()
-}
-
 @VisionBuilder
 public class SolidMaterial : Scheme() {
 

From 3c0df98f501c22c1ff4bcd66152a5ee870f65deb Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 22 Dec 2020 17:48:14 +0300
Subject: [PATCH 065/151] Strict mode for Three canvas. Styles builders

---
 .../main/kotlin/ru/mipt/npm/sat/geometry.kt   | 27 +++++++++++----
 .../main/kotlin/ru/mipt/npm/sat/satServer.kt  |  4 +--
 .../vision/react/ThreeCanvasComponent.kt      |  3 +-
 .../hep/dataforge/vision/StyleReference.kt    | 33 +++++++++++++++++++
 .../kotlin/hep/dataforge/vision/StyleSheet.kt |  4 ++-
 .../hep/dataforge/vision/VisionChange.kt      |  2 +-
 .../vision/VisionPropertyContainer.kt         | 18 ++++++++++
 .../dataforge/vision/client/VisionClient.kt   |  2 +-
 .../hep/dataforge/vision/solid/SolidGroup.kt  |  1 +
 .../vision/solid/three/ThreeCanvas.kt         |  9 +++--
 .../vision/solid/three/ThreePlugin.kt         | 16 +++++++--
 11 files changed, 99 insertions(+), 20 deletions(-)
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleReference.kt
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionPropertyContainer.kt

diff --git a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt
index c9c1512f..283d31ef 100644
--- a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt
+++ b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt
@@ -1,6 +1,9 @@
 package ru.mipt.npm.sat
 
+import hep.dataforge.meta.set
 import hep.dataforge.vision.solid.*
+import hep.dataforge.vision.style
+import hep.dataforge.vision.useStyle
 import kotlin.math.PI
 
 internal fun visionOfSatellite(
@@ -12,7 +15,18 @@ internal fun visionOfSatellite(
     ySegmentSize: Number = xSegmentSize,
     fiberDiameter: Number = 1.0,
 ): SolidGroup = SolidGroup {
-    opacity = 0.3
+    val transparent by style {
+        this[SolidMaterial.MATERIAL_OPACITY_KEY] = 0.3
+    }
+
+    val red by style {
+        this[SolidMaterial.MATERIAL_COLOR_KEY] = "red"
+    }
+
+    val blue by style {
+        this[SolidMaterial.MATERIAL_COLOR_KEY] = "blue"
+    }
+
     val totalXSize = xSegments * xSegmentSize.toDouble()
     val totalYSize = ySegments * ySegmentSize.toDouble()
     for (layer in 1..layers) {
@@ -20,6 +34,7 @@ internal fun visionOfSatellite(
             for (i in 1..xSegments) {
                 for (j in 1..ySegments) {
                     box(xSegmentSize, ySegmentSize, layerHeight, name = "segment[$i,$j]") {
+                        useStyle(transparent)
                         z = (layer - 0.5) * layerHeight.toDouble()
                         x = (i - 0.5) * xSegmentSize.toDouble()
                         y = (j - 0.5) * ySegmentSize.toDouble()
@@ -29,23 +44,21 @@ internal fun visionOfSatellite(
             group("fibers") {
                 for (i in 1..xSegments) {
                     cylinder(fiberDiameter, totalYSize) {
+                        useStyle(red)
                         rotationX = PI / 2
                         z = (layer - 1.0) * layerHeight.toDouble() + fiberDiameter.toDouble()
                         x = (i - 0.5) * xSegmentSize.toDouble()
-                        y = totalYSize/2
-
-                        color("red")
+                        y = totalYSize / 2
                     }
                 }
 
                 for (j in 1..ySegments) {
                     cylinder(fiberDiameter, totalXSize) {
+                        useStyle(blue)
                         rotationY = PI / 2
                         z = (layer) * layerHeight.toDouble() - fiberDiameter.toDouble()
                         y = (j - 0.5) * xSegmentSize.toDouble()
-                        x = totalXSize/2
-
-                        color("blue")
+                        x = totalXSize / 2
                     }
                 }
             }
diff --git a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
index a605e717..a1f0dca1 100644
--- a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
+++ b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
@@ -42,9 +42,9 @@ fun main() {
             val target = "layer[$randomLayer].segment[$randomI,$randomJ]".toName()
             val targetVision = sat[target] as Solid
             targetVision.color("red")
-            delay(300)
+            delay(1000)
             targetVision.color.clear()
-            delay(10)
+            delay(500)
         }
     }
 
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
index aa78a0fb..877ce5bc 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
@@ -37,8 +37,7 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
         if (canvas == null) {
             val element = elementRef.current as? HTMLElement ?: error("Canvas element not found")
             val three: ThreePlugin = props.context.plugins.fetch(ThreePlugin)
-            val newCanvas: ThreeCanvas =
-                three.createCanvas(element, props.options ?: Canvas3DOptions.empty())
+            val newCanvas: ThreeCanvas = three.createCanvas(element, props.options ?: Canvas3DOptions.empty())
             props.canvasCallback?.invoke(newCanvas)
             canvas = newCanvas
         }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleReference.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleReference.kt
new file mode 100644
index 00000000..ac8da104
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleReference.kt
@@ -0,0 +1,33 @@
+package hep.dataforge.vision
+
+import hep.dataforge.meta.DFExperimental
+import hep.dataforge.meta.Meta
+import hep.dataforge.meta.MetaBuilder
+import kotlin.properties.ReadOnlyProperty
+
+/**
+ * A reference to a style defined in a specific container
+ */
+public class StyleReference(public val owner: VisionGroup, public val name: String)
+
+private tailrec fun styleIsDefined(vision: Vision, reference: StyleReference): Boolean = when {
+    reference.owner === vision -> true
+    vision.parent == null -> false
+    else -> styleIsDefined(vision.parent!!, reference)
+}
+
+@VisionBuilder
+public fun Vision.useStyle(reference: StyleReference) {
+    //check that style is defined in a parent
+    //check(styleIsDefined(this, reference)) { "Style reference does not belong to a Vision parent" }
+    useStyle(reference.name)
+}
+
+@DFExperimental
+@VisionBuilder
+public fun VisionGroup.style(builder: MetaBuilder.() -> Unit): ReadOnlyProperty<Any?, StyleReference> =
+    ReadOnlyProperty { _, property ->
+        val styleName = property.name
+        styleSheet.define(styleName, Meta(builder))
+        StyleReference(this, styleName)
+    }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
index d90fe655..a22ea6bb 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
@@ -110,4 +110,6 @@ public fun Vision.getStyleItems(name: Name): Sequence<MetaItem<*>> {
 /**
  * Collect all styles for this object in a single laminate
  */
-public val Vision.allStyles: Laminate get() = Laminate(styles.mapNotNull(::getStyle))
\ No newline at end of file
+public val Vision.allStyles: Laminate get() = Laminate(styles.mapNotNull(::getStyle))
+
+
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
index c0cc594a..2bfde782 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
@@ -63,7 +63,7 @@ private fun Vision.isolate(manager: VisionManager): Vision {
 }
 
 @Serializable
-public class VisionChange(
+public data class VisionChange(
     public val reset: Boolean = false,
     public val vision: Vision? = null,
     @Serializable(MetaSerializer::class) public val properties: Meta? = null,
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionPropertyContainer.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionPropertyContainer.kt
new file mode 100644
index 00000000..f206f063
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionPropertyContainer.kt
@@ -0,0 +1,18 @@
+package hep.dataforge.vision
+
+import hep.dataforge.meta.MetaItem
+import hep.dataforge.names.Name
+
+/**
+ * Property containers are used to create a symmetric behaviors for vision properties and style builders
+ */
+public interface VisionPropertyContainer<out T> {
+    public fun getProperty(
+        name: Name,
+        inherit: Boolean = false,
+        includeStyles: Boolean = true,
+        includeDefaults: Boolean = true,
+    ): MetaItem<*>?
+
+    public fun setProperty(name: Name, item: MetaItem<*>?, notify: Boolean = true)
+}
\ No newline at end of file
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
index 36f0ee1f..11eaa0e1 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
@@ -138,7 +138,7 @@ public class VisionClient : AbstractPlugin() {
                             renderVision(element, change.vision, outputMeta)
                         }
 
-                        logger.debug { "Got update $change for output with name $name" }
+                        logger.info { "Got update ${change.toString()} for output with name $name" }
                         visionMap[element]?.update(change)
                             ?: console.info("Target vision for element $element with name $name not found")
                     } else {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index 4ddfe548..b64074da 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -88,6 +88,7 @@ public fun VisionContainerBuilder<Vision>.group(
 /**
  * Define a group with given [name], attach it to this parent and return it.
  */
+@VisionBuilder
 public fun VisionContainerBuilder<Vision>.group(name: String, action: SolidGroup.() -> Unit = {}): SolidGroup =
     SolidGroup().apply(action).also { set(name, it) }
 
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
index 11fffe88..f5b679e5 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
@@ -130,7 +130,8 @@ public class ThreeCanvas(
         }
     }
 
-    public fun attach(element: Element) {
+    internal fun attach(element: Element) {
+        check(element.children.length == 0){"The element for Three canvas is not empty"}
         element.appendChild(canvas)
         updateSize()
     }
@@ -189,8 +190,10 @@ public class ThreeCanvas(
     }
 
     public override fun render(vision: Solid) {
-        //clear old root
-        clear()
+        scene.children.find { it.name == "@root" }?.let {
+            //Throw error is something is already rendered here
+            error("Root object already is present in the canvas")
+        }
 
         val object3D = three.buildObject3D(vision)
         object3D.name = "@root"
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index a7a74ce3..eaadc56a 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -136,9 +136,19 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
         return if (vision is Solid) ElementVisionRenderer.DEFAULT_RATING else ElementVisionRenderer.ZERO_RATING
     }
 
+    public fun renderSolid(
+        element: Element,
+        vision: Solid,
+        options: Canvas3DOptions,
+    ): ThreeCanvas = createCanvas(element, options).apply {
+        render(vision)
+    }
+
     override fun render(element: Element, vision: Vision, meta: Meta) {
-        createCanvas(element, Canvas3DOptions.read(meta)).render(
-            vision as? Solid ?: error("Solid expected but ${vision::class} is found")
+        renderSolid(
+            element,
+            vision as? Solid ?: error("Solid expected but ${vision::class} is found"),
+            Canvas3DOptions.read(meta)
         )
     }
 
@@ -153,7 +163,7 @@ public fun ThreePlugin.render(
     element: HTMLElement,
     obj: Solid,
     options: Canvas3DOptions.() -> Unit = {},
-): ThreeCanvas = createCanvas(element, Canvas3DOptions(options)).apply { render(obj) }
+): ThreeCanvas = renderSolid(element, obj, Canvas3DOptions(options))
 
 internal operator fun Object3D.set(token: NameToken, object3D: Object3D) {
     object3D.name = token.toString()

From 25a47a971942e6fadfacd88ec2c6b83c35955802 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 25 Dec 2020 15:28:33 +0300
Subject: [PATCH 066/151] Migrate to DF 0.3

---
 build.gradle.kts                              |  4 +--
 .../dataforge/vision/gdml/demo/readFile.kt    |  1 -
 .../hep/dataforge/vision/solid/demo/demo.kt   | 10 ++++--
 .../vision/solid/demo/VariableBox.kt          |  8 +----
 .../hep/dataforge/vision/react/MetaViewer.kt  |  7 ++--
 .../dataforge/vision/react/PropertyEditor.kt  |  8 +++--
 .../hep/dataforge/vision/react/TreeStyles.kt  | 20 +++++------
 .../dataforge/vision/react/valueChooser.kt    |  4 +--
 .../kotlin/hep/dataforge/vision/Colors.kt     | 10 +++---
 .../kotlin/hep/dataforge/vision/StyleSheet.kt |  4 +--
 .../kotlin/hep/dataforge/vision/Vision.kt     | 23 +++++++-----
 .../kotlin/hep/dataforge/vision/VisionBase.kt | 30 ++++++----------
 .../hep/dataforge/vision/VisionChange.kt      |  2 +-
 .../vision/VisionPropertyContainer.kt         |  4 +--
 .../kotlin/hep/dataforge/vision/misc.kt       | 14 +++-----
 .../hep/dataforge/vision/html/HtmlTagTest.kt  |  3 +-
 .../dataforge/vision/client/VisionClient.kt   |  4 +--
 .../hep/dataforge/vision/editor/FXMeta.kt     | 20 +++++------
 .../hep/dataforge/vision/solid/FXMaterials.kt | 17 ++++-----
 .../vision/solid/VisualObjectFXBinding.kt     | 36 +++++++++----------
 .../dataforge/vision/gdml/GdmlOptimizer.kt    |  5 ++-
 .../hep/dataforge/vision/solid/Composite.kt   | 15 ++++----
 .../hep/dataforge/vision/solid/Solid.kt       |  2 +-
 .../hep/dataforge/vision/solid/SolidGroup.kt  |  6 ++--
 .../dataforge/vision/solid/SolidMaterial.kt   | 19 +++++-----
 .../dataforge/vision/solid/SolidReference.kt  | 16 +++++----
 .../vision/solid/specifications/Axes.kt       |  2 +-
 .../solid/transform/RemoveSingleChild.kt      |  2 +-
 .../hep/dataforge/vision/solid/ConvexTest.kt  |  2 +-
 .../vision/solid/SerializationTest.kt         |  5 ++-
 .../vision/solid/three/ThreeCanvas.kt         |  4 +--
 .../vision/solid/three/ThreeMaterials.kt      |  8 ++---
 .../hep/dataforge/vision/solid/three/three.kt |  2 +-
 33 files changed, 156 insertions(+), 161 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 38355ee0..4589fe5e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,8 +2,8 @@ plugins {
     id("ru.mipt.npm.project")
 }
 
-val dataforgeVersion by extra("0.2.1-dev-5")
-val ktorVersion by extra("1.4.3")
+val dataforgeVersion by extra("0.3.0-dev")
+val ktorVersion by extra("1.5.0")
 val htmlVersion by extra("0.7.2")
 val kotlinWrappersVersion by extra("pre.129-kotlin-1.4.20")
 val fxVersion by extra("14")
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
index da958c46..bcf18e51 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
@@ -1,7 +1,6 @@
 package hep.dataforge.vision.gdml.demo
 
 import hep.dataforge.meta.DFExperimental
-import hep.dataforge.meta.setItem
 import hep.dataforge.values.asValue
 import hep.dataforge.vision.gdml.readFile
 import hep.dataforge.vision.gdml.toVision
diff --git a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
index 76c871e6..584a2b33 100644
--- a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
+++ b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
@@ -39,15 +39,18 @@ fun Page<Solid>.showcase() {
     demo("shapes", "Basic shapes") {
         box(100.0, 100.0, 100.0) {
             z = -110.0
+            color("teal")
         }
         sphere(50.0) {
             x = 110
             detail = 16
+            color("red")
         }
         tube(50, height = 10, innerRadius = 25, angle = PI) {
             y = 110
             detail = 16
             rotationX = PI / 4
+            color("blue")
         }
     }
 
@@ -55,6 +58,7 @@ fun Page<Solid>.showcase() {
         val group = group {
             box(100, 100, 100) {
                 z = 110.0
+                opacity = 0.5
             }
 
             box(100, 100, 100) {
@@ -155,7 +159,7 @@ fun Page<Solid>.showcaseCSG() {
                 detail = 32
             }
             color(Colors.lightgreen)
-            opacity = 0.3
+            opacity = 0.5
         }
         composite(CompositeType.SUBTRACT) {
             y = -300
@@ -173,9 +177,11 @@ fun Page<Solid>.showcaseCSG() {
     demo("CSG.custom", "CSG with manually created object") {
         intersect {
             tube(60, 10) {
-                detail = 64
+                detail = 32
             }
             box(100, 100, 100)
+            color("red")
+            opacity = 0.5
         }
     }
 }
\ No newline at end of file
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
index 4fbb0903..206f4f0c 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
@@ -9,7 +9,6 @@ import hep.dataforge.vision.set
 import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.Solid.Companion.GEOMETRY_KEY
-import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
 import hep.dataforge.vision.solid.three.*
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
@@ -30,8 +29,6 @@ internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeV
         scaleX = xSize
         scaleY = ySize
         scaleZ = zSize
-//        getProperty(MeshThreeFactory.EDGES_ENABLED_KEY, inherit = false, includeStyles = false)
-//        getProperty(MeshThreeFactory.WIREFRAME_ENABLED_KEY, inherit = false, includeStyles = false)
     }
 
     override fun render(three: ThreePlugin): Object3D {
@@ -69,11 +66,8 @@ internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeV
                     mesh.scale.set(newXSize, newYSize, newZSize)
                     mesh.updateMatrix()
                 }
-                //name.startsWith(MeshThreeFactory.WIREFRAME_KEY) -> mesh.applyWireFrame(this@VariableBox)
                 name.startsWith(MeshThreeFactory.EDGES_KEY) -> mesh.applyEdges(this@VariableBox)
-                name.startsWith(MATERIAL_COLOR_KEY) -> {
-                    mesh.updateMaterial(this)
-                }
+                //name.startsWith(MATERIAL_COLOR_KEY) -> mesh.updateMaterialProperty(this, name)
                 else -> mesh.updateProperty(this@VariableBox, name)
             }
         }
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
index 9c17206d..b3b1b25f 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
@@ -1,7 +1,8 @@
 package hep.dataforge.vision.react
 
 import hep.dataforge.meta.Meta
-import hep.dataforge.meta.MetaItem
+import hep.dataforge.meta.NodeItem
+import hep.dataforge.meta.ValueItem
 import hep.dataforge.meta.descriptors.ItemDescriptor
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.descriptors.defaultItem
@@ -51,7 +52,7 @@ private fun RBuilder.metaViewerItem(props: MetaViewerProps) {
     }
 
     when (actualItem) {
-        is MetaItem.NodeItem -> {
+        is NodeItem -> {
             styledDiv {
                 css {
                     +TreeStyles.treeLeaf
@@ -108,7 +109,7 @@ private fun RBuilder.metaViewerItem(props: MetaViewerProps) {
                 }
             }
         }
-        is MetaItem.ValueItem -> {
+        is ValueItem -> {
             styledDiv {
                 css {
                     +TreeStyles.treeLeaf
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
index ebd62473..c4eb03a0 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
@@ -9,6 +9,7 @@ import hep.dataforge.names.plus
 import hep.dataforge.values.Value
 import hep.dataforge.vision.hidden
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
@@ -65,12 +66,12 @@ private val PropertyEditorItem: FunctionalComponent<PropertyEditorProps> =
 private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
     var expanded: Boolean by useState { true }
     val itemName by useState { props.name ?: Name.EMPTY }
-    var item: MetaItem<*>? by useState { props.provider.getItem(itemName) }
+    var item: MetaItem? by useState { props.provider.getItem(itemName) }
     val descriptorItem: ItemDescriptor? = props.descriptor?.get(itemName)
 
     if(descriptorItem?.hidden == true) return //fail fast for hidden property
 
-    var actualItem: MetaItem<Meta>? by useState {
+    var actualItem: MetaItem? by useState {
         item ?: props.defaultProvider?.getItem(itemName) ?: descriptorItem?.defaultItem()
     }
 
@@ -110,7 +111,7 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
         update()
     }
 
-    if (actualItem is MetaItem.NodeItem) {
+    if (actualItem is NodeItem) {
         styledDiv {
             css {
                 +TreeStyles.treeLeaf
@@ -248,6 +249,7 @@ public fun RBuilder.propertyEditor(
     }
 }
 
+@OptIn(ExperimentalCoroutinesApi::class)
 private fun Config.flowUpdates(): Flow<Name> = callbackFlow {
     onChange(this) { name, _, _ ->
         launch {
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt
index 5afcedac..16602699 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt
@@ -17,7 +17,7 @@ public object TreeStyles : StyleSheet("treeStyles", true) {
     /**
      * Style the caret/arrow
      */
-    public val treeCaret by css {
+    public val treeCaret: RuleSet by css {
         cursor = Cursor.pointer
         userSelect = UserSelect.none
         /* Create the caret/arrow with a unicode, and style it */
@@ -32,7 +32,7 @@ public object TreeStyles : StyleSheet("treeStyles", true) {
     /**
      *  Rotate the caret/arrow icon when clicked on (using JavaScript)
      */
-    val treeCaredDown by css {
+    public val treeCaredDown:RuleSet by css {
         before {
             content = "\u25B6".quoted
             color = Color.black
@@ -42,7 +42,7 @@ public object TreeStyles : StyleSheet("treeStyles", true) {
         }
     }
 
-    val treeItem by css {
+    public val treeItem:RuleSet by css {
         alignItems = Align.center
         paddingLeft = 10.px
         borderLeftStyle = BorderStyle.dashed
@@ -53,27 +53,27 @@ public object TreeStyles : StyleSheet("treeStyles", true) {
         borderBottomColor = Color.lightGray
     }
 
-    val treeLeaf by css {
+    public val treeLeaf:RuleSet by css {
         display = Display.flex
         flexDirection = FlexDirection.row
         flexWrap = FlexWrap.nowrap
         //alignItems = Align.center
     }
 
-    val treeLabel by css {
+    public val treeLabel:RuleSet by css {
         overflow = Overflow.hidden
         flex(flexGrow = 1.0, flexShrink = 1.0)
     }
 
-    val treeLabelInactive by css {
+    public val treeLabelInactive: RuleSet by css {
         color = Color.lightGray
     }
 
-    val treeLabelSelected by css {
+    public val treeLabelSelected:RuleSet by css {
         backgroundColor = Color.lightBlue
     }
 
-    val linkButton by css {
+    public val linkButton:RuleSet by css {
         backgroundColor = Color.white
         border = "none"
         padding(left = 4.pt, right = 4.pt, top = 0.pt, bottom = 0.pt)
@@ -86,7 +86,7 @@ public object TreeStyles : StyleSheet("treeStyles", true) {
         }
     }
 
-    val removeButton by css {
+    public val removeButton:RuleSet by css {
         backgroundColor = Color.white
         borderStyle = BorderStyle.solid
         borderRadius = 2.px
@@ -104,7 +104,7 @@ public object TreeStyles : StyleSheet("treeStyles", true) {
         }
     }
 
-    val resizeableInput by css {
+    public val resizeableInput: RuleSet by css {
         overflow = Overflow.hidden
         maxWidth = 120.pt
         flex(flexGrow = 2.0, flexShrink = 2.0, flexBasis = 60.pt)
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
index e0888a46..884791b5 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
@@ -20,7 +20,7 @@ import styled.styledInput
 import styled.styledSelect
 
 public external interface ValueChooserProps : RProps {
-    var item: MetaItem<*>?
+    var item: MetaItem?
     var descriptor: ValueDescriptor?
     var valueChanged: ((Value?) -> Unit)?
 }
@@ -140,7 +140,7 @@ class ValueChooserComponent(props: ValueChooserProps) : RComponent<ValueChooserP
 
 internal fun RBuilder.valueChooser(
     name: Name,
-    item: MetaItem<*>?,
+    item: MetaItem?,
     descriptor: ValueDescriptor? = null,
     callback: (Value?) -> Unit
 ) {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
index 7dc41632..605f398c 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
@@ -1,8 +1,6 @@
 package hep.dataforge.vision
 
-import hep.dataforge.meta.MetaItem
-import hep.dataforge.meta.get
-import hep.dataforge.meta.number
+import hep.dataforge.meta.*
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.int
 import hep.dataforge.values.string
@@ -192,9 +190,9 @@ public object Colors {
     /**
      * Convert color represented as Meta to string of format #rrggbb
      */
-    fun fromMeta(item: MetaItem<*>): String {
+    fun fromMeta(item: MetaItem): String {
         return when (item) {
-            is MetaItem.NodeItem<*> -> {
+            is NodeItem -> {
                 val node = item.node
                 rgbToString(
                     node[RED_KEY].number?.toByte()?.toUByte() ?: 0u,
@@ -202,7 +200,7 @@ public object Colors {
                     node[BLUE_KEY].number?.toByte()?.toUByte() ?: 0u
                 )
             }
-            is MetaItem.ValueItem -> {
+            is ValueItem -> {
                 if (item.value.type == ValueType.NUMBER) {
                     rgbToString(item.value.int)
                 } else {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
index a22ea6bb..80d5cdd2 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
@@ -40,7 +40,7 @@ public inline class StyleSheet(private val owner: VisionGroup) {
      * Create and set a style
      */
     public operator fun set(key: String, builder: MetaBuilder.() -> Unit) {
-        val newStyle = get(key)?.edit(builder) ?: Meta(builder)
+        val newStyle = get(key)?.builder()?.apply(builder) ?: Meta(builder)
         set(key, newStyle.seal())
     }
 
@@ -99,7 +99,7 @@ public tailrec fun Vision.getStyle(name: String): Meta? =
 /**
  * Resolve an item in all style layers
  */
-public fun Vision.getStyleItems(name: Name): Sequence<MetaItem<*>> {
+public fun Vision.getStyleItems(name: Name): Sequence<MetaItem> {
     return styles.asSequence().map {
         getStyle(it)
     }.map {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 39d5ae5a..836d6f26 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -1,5 +1,6 @@
 package hep.dataforge.vision
 
+import hep.dataforge.meta.Meta
 import hep.dataforge.meta.MetaItem
 import hep.dataforge.meta.MutableItemProvider
 import hep.dataforge.meta.descriptors.Described
@@ -28,6 +29,12 @@ public interface Vision : Described {
     @Transient
     public var parent: VisionGroup?
 
+    /**
+     * Properties belonging to this [Vision] potentially including artificial properties
+     */
+    @Transient
+    public val meta: Meta
+
     /**
      * A coroutine scope for asynchronous calls and locks
      */
@@ -37,7 +44,7 @@ public interface Vision : Described {
      * A fast accessor method to get own property (no inheritance or styles).
      * Should be equivalent to `getProperty(name,false,false,false)`.
      */
-    public fun getOwnProperty(name: Name): MetaItem<*>?
+    public fun getOwnProperty(name: Name): MetaItem?
 
     /**
      * Get property.
@@ -49,13 +56,13 @@ public interface Vision : Described {
         inherit: Boolean = false,
         includeStyles: Boolean = true,
         includeDefaults: Boolean = true,
-    ): MetaItem<*>?
+    ): MetaItem?
 
 
     /**
      * Set the property value
      */
-    public fun setProperty(name: Name, item: MetaItem<*>?, notify: Boolean = true)
+    public fun setProperty(name: Name, item: MetaItem?, notify: Boolean = true)
 
     /**
      * Subscribe on property updates. The subscription is bound to the given [scope] and canceled when the scope is canceled
@@ -109,8 +116,8 @@ public fun Vision.asyncNotifyPropertyChange(propertyName: Name) {
  */
 public val Vision.ownProperties: MutableItemProvider
     get() = object : MutableItemProvider {
-        override fun getItem(name: Name): MetaItem<*>? = getOwnProperty(name)
-        override fun setItem(name: Name, item: MetaItem<*>?): Unit = setProperty(name, item)
+        override fun getItem(name: Name): MetaItem? = getOwnProperty(name)
+        override fun setItem(name: Name, item: MetaItem?): Unit = setProperty(name, item)
     }
 
 
@@ -123,14 +130,14 @@ public fun Vision.allProperties(
     includeStyles: Boolean? = null,
     includeDefaults: Boolean = true,
 ): MutableItemProvider = object : MutableItemProvider {
-    override fun getItem(name: Name): MetaItem<*>? = getProperty(
+    override fun getItem(name: Name): MetaItem? = getProperty(
         name,
         inherit = inherit ?: (descriptor?.get(name)?.inherited != false),
         includeStyles = includeStyles ?: (descriptor?.get(name)?.usesStyles == true),
         includeDefaults = includeDefaults
     )
 
-    override fun setItem(name: Name, item: MetaItem<*>?): Unit = setProperty(name, item)
+    override fun setItem(name: Name, item: MetaItem?): Unit = setProperty(name, item)
 }
 
 /**
@@ -141,7 +148,7 @@ public fun Vision.getProperty(
     inherit: Boolean = false,
     includeStyles: Boolean = true,
     includeDefaults: Boolean = true,
-): MetaItem<*>? = getProperty(key.toName(), inherit, includeStyles, includeDefaults)
+): MetaItem? = getProperty(key.toName(), inherit, includeStyles, includeDefaults)
 
 /**
  * A convenience method to pair [getProperty]
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index a70cdf21..753498f2 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -1,9 +1,6 @@
 package hep.dataforge.vision
 
-import hep.dataforge.meta.Config
-import hep.dataforge.meta.MetaItem
-import hep.dataforge.meta.MutableMeta
-import hep.dataforge.meta.asMetaItem
+import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.descriptors.defaultItem
 import hep.dataforge.meta.descriptors.get
@@ -40,14 +37,14 @@ public open class VisionBase : Vision {
     /**
      * Object own properties excluding styles and inheritance
      */
-    public var properties: Config? = null
-        private set
+    internal var properties: Config? = null
+
+    override val meta: Meta get() = properties ?: Meta.EMPTY
 
     @Synchronized
     private fun getOrCreateConfig(): Config {
         if (properties == null) {
             val newProperties = Config()
-            properties = newProperties
             newProperties.onChange(this) { name, oldItem, newItem ->
                 if (oldItem != newItem) {
                     scope.launch {
@@ -55,6 +52,7 @@ public open class VisionBase : Vision {
                     }
                 }
             }
+            properties = newProperties
         }
         return properties!!
     }
@@ -62,7 +60,7 @@ public open class VisionBase : Vision {
     /**
      * A fast accessor method to get own property (no inheritance or styles
      */
-    override fun getOwnProperty(name: Name): MetaItem<*>? {
+    override fun getOwnProperty(name: Name): MetaItem? {
         return properties?.getItem(name)
     }
 
@@ -71,7 +69,7 @@ public open class VisionBase : Vision {
         inherit: Boolean,
         includeStyles: Boolean,
         includeDefaults: Boolean,
-    ): MetaItem<*>? = sequence {
+    ): MetaItem? = sequence {
         yield(getOwnProperty(name))
         if (includeStyles) {
             yieldAll(getStyleItems(name))
@@ -83,7 +81,7 @@ public open class VisionBase : Vision {
     }.merge()
 
     @Synchronized
-    override fun setProperty(name: Name, item: MetaItem<*>?, notify: Boolean) {
+    override fun setProperty(name: Name, item: MetaItem?, notify: Boolean) {
         getOrCreateConfig().setItem(name, item)
         if (notify) {
             scope.launch {
@@ -121,23 +119,17 @@ public open class VisionBase : Vision {
         propertyInvalidationFlow.emit(propertyName)
     }
 
-    public fun configure(block: suspend MutableMeta<*>.() -> Unit) {
-        scope.launch {
-            getOrCreateConfig().block()
-        }
-    }
-
     override fun update(change: VisionChange) {
 
-        fun updateProperties(at: Name, item: MetaItem<*>) {
+        fun updateProperties(at: Name, item: MetaItem) {
             when (item) {
-                is MetaItem.ValueItem -> {
+                is ValueItem -> {
                     if (item.value == Null) {
                         setProperty(at, null)
                     } else
                         setProperty(at, item)
                 }
-                is MetaItem.NodeItem -> item.node.items.forEach { (token, childItem) ->
+                is NodeItem -> item.node.items.forEach { (token, childItem) ->
                     updateProperties(at + token, childItem)
                 }
             }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
index 2bfde782..8d799ef8 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
@@ -29,7 +29,7 @@ public class VisionChangeBuilder : VisionContainerBuilder<Vision> {
     private fun getOrPutChild(visionName: Name): VisionChangeBuilder =
         children.getOrPut(visionName) { VisionChangeBuilder() }
 
-    public fun propertyChanged(visionName: Name, propertyName: Name, item: MetaItem<*>?) {
+    public fun propertyChanged(visionName: Name, propertyName: Name, item: MetaItem?) {
         if (visionName == Name.EMPTY) {
             //Write property removal as [Null]
             propertyChange[propertyName] = (item ?: Null.asMetaItem())
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionPropertyContainer.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionPropertyContainer.kt
index f206f063..a8b3ecad 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionPropertyContainer.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionPropertyContainer.kt
@@ -12,7 +12,7 @@ public interface VisionPropertyContainer<out T> {
         inherit: Boolean = false,
         includeStyles: Boolean = true,
         includeDefaults: Boolean = true,
-    ): MetaItem<*>?
+    ): MetaItem?
 
-    public fun setProperty(name: Name, item: MetaItem<*>?, notify: Boolean = true)
+    public fun setProperty(name: Name, item: MetaItem?, notify: Boolean = true)
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
index 047cd2fa..fb070582 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
@@ -6,20 +6,16 @@ import hep.dataforge.values.asValue
 @DslMarker
 public annotation class VisionBuilder
 
-public fun Sequence<MetaItem<*>?>.merge(): MetaItem<*>? = when (val first = firstOrNull { it != null }) {
+public fun Sequence<MetaItem?>.merge(): MetaItem? = when (val first = firstOrNull { it != null }) {
     null -> null
-    is MetaItem.ValueItem -> first //fast search for first entry if it is value
-    is MetaItem.NodeItem -> {
+    is ValueItem -> first //fast search for first entry if it is value
+    is NodeItem -> {
         //merge nodes if first encountered node is meta
         val laminate: Laminate = Laminate(mapNotNull { it.node }.toList())
-        MetaItem.NodeItem(laminate)
+        NodeItem(laminate)
     }
 }
 
-@DFExperimental
-public val Vision.properties: Config?
-    get() = (this as? VisionBase)?.properties
-
 /**
  * Control visibility of the element
  */
@@ -29,4 +25,4 @@ public var Vision.visible: Boolean?
 
 public fun Vision.configure(meta: Meta?): Unit = update(VisionChange(properties = meta))
 
-public fun Vision.configure(block: MutableMeta<*>.() -> Unit): Unit = configure(Meta(block))
\ No newline at end of file
+public fun Vision.configure(block: MetaBuilder.() -> Unit): Unit = configure(Meta(block))
\ No newline at end of file
diff --git a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
index c6efe090..2d2ad125 100644
--- a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
+++ b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
@@ -3,6 +3,7 @@ package hep.dataforge.vision.html
 import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.set
 import hep.dataforge.vision.VisionBase
+import hep.dataforge.vision.configure
 import kotlinx.html.*
 import kotlinx.html.stream.createHTML
 import kotlin.test.Test
@@ -34,7 +35,7 @@ class HtmlTagTest {
         div {
             h2 { +"Properties" }
             ul {
-                (vision as? VisionBase)?.properties?.items?.forEach {
+                (vision as? VisionBase)?.meta?.items?.forEach {
                     li {
                         a { +it.key.toString() }
                         p { +it.value.toString() }
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
index 11eaa0e1..edd5ae4d 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
@@ -134,11 +134,11 @@ public class VisionClient : AbstractPlugin() {
                             stringData
                         )
 
-                        if(change.vision!= null){
+                        if (change.vision != null) {
                             renderVision(element, change.vision, outputMeta)
                         }
 
-                        logger.info { "Got update ${change.toString()} for output with name $name" }
+                        logger.debug { "Got update $change for output with name $name" }
                         visionMap[element]?.update(change)
                             ?: console.info("Target vision for element $element with name $name not found")
                     } else {
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/FXMeta.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/FXMeta.kt
index 84a286ed..c7460ff3 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/FXMeta.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/FXMeta.kt
@@ -18,7 +18,7 @@ import tornadofx.*
 /**
  * A display for meta and descriptor
  */
-sealed class FXMeta<M : MetaNode<M>> : Comparable<FXMeta<*>> {
+sealed class FXMeta<M : TypedMeta<M>> : Comparable<FXMeta<*>> {
     abstract val name: NameToken
     abstract val parent: FXMetaNode<M>?
     abstract val descriptionProperty: ObservableStringValue
@@ -35,7 +35,7 @@ sealed class FXMeta<M : MetaNode<M>> : Comparable<FXMeta<*>> {
     }
 
     companion object {
-        fun <M : MetaNode<M>> root(
+        fun <M : TypedMeta<M>> root(
             node: M,
             descriptor: NodeDescriptor? = null,
             rootName: String = "root"
@@ -47,7 +47,7 @@ sealed class FXMeta<M : MetaNode<M>> : Comparable<FXMeta<*>> {
     }
 }
 
-class FXMetaNode<M : MetaNode<M>>(
+class FXMetaNode<M : TypedMeta<M>>(
     override val name: NameToken,
     override val parent: FXMetaNode<M>?,
     nodeValue: M? = null,
@@ -89,7 +89,7 @@ class FXMetaNode<M : MetaNode<M>>(
         init {
             bind(nodeProperty, descriptorProperty)
 
-            val listener: (Name, MetaItem<*>?, MetaItem<*>?) -> Unit = { name, _, _ ->
+            val listener: (Name, MetaItem?, MetaItem?) -> Unit = { name, _, _ ->
                 if (name.length == 1) invalidate()
             }
 
@@ -115,7 +115,7 @@ class FXMetaNode<M : MetaNode<M>>(
                 val actualItem = node?.items?.get(token)
                 val actualDescriptor = descriptor?.items?.get(token.body)
 
-                if (actualItem is MetaItem.NodeItem || actualDescriptor is NodeDescriptor) {
+                if (actualItem is NodeItem || actualDescriptor is NodeDescriptor) {
                     FXMetaNode(token, this@FXMetaNode)
                 } else {
                     FXMetaValue(token, this@FXMetaNode)
@@ -134,7 +134,7 @@ class FXMetaNode<M : MetaNode<M>>(
     }
 }
 
-public class FXMetaValue<M : MetaNode<M>>(
+public class FXMetaValue<M : TypedMeta<M>>(
     override val name: NameToken,
     override val parent: FXMetaNode<M>
 ) : FXMeta<M>() {
@@ -151,10 +151,10 @@ public class FXMetaValue<M : MetaNode<M>>(
     //private val innerValueProperty = SimpleObjectProperty(value)
 
     public val valueProperty = descriptorProperty.objectBinding { descriptor ->
-        parent.node[name].value ?: descriptor?.default
+        parent.node?.get(name).value ?: descriptor?.default
     }
 
-    override val hasValue: ObservableBooleanValue = parent.nodeProperty.booleanBinding { it[name] != null }
+    override val hasValue: ObservableBooleanValue = parent.nodeProperty.booleanBinding { it?.get(name) != null }
 
     public val value by valueProperty
 
@@ -169,12 +169,12 @@ public fun <M : MutableMeta<M>> FXMetaNode<M>.remove(name: NameToken) {
 private fun <M : MutableMeta<M>> M.createEmptyNode(token: NameToken, append: Boolean): M {
     return if (append && token.hasIndex()) {
         val name = token.asName()
-        val index = (getIndexed(name).keys.mapNotNull { it.toIntOrNull() }.max() ?: -1) + 1
+        val index = (getIndexed(name).keys.mapNotNull { it?.toIntOrNull() }.maxOrNull() ?: -1) + 1
         val newName = name.withIndex(index.toString())
         set(newName, Meta.EMPTY)
         get(newName).node!!
     } else {
-        this.setNode(token.asName(), Meta.EMPTY)
+        this.set(token.asName(), Meta.EMPTY)
         //FIXME possible concurrency bug
         get(token).node!!
     }
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
index 9ae8fcf3..9e417438 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
@@ -1,9 +1,6 @@
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.MetaItem
-import hep.dataforge.meta.double
-import hep.dataforge.meta.get
-import hep.dataforge.meta.int
+import hep.dataforge.meta.*
 import hep.dataforge.values.ValueType
 import hep.dataforge.values.int
 import hep.dataforge.values.string
@@ -35,9 +32,9 @@ public object FXMaterials {
  * Infer color based on meta item
  * @param opacity default opacity
  */
-public fun MetaItem<*>.color(opacity: Double = 1.0): Color {
+public fun MetaItem.color(opacity: Double = 1.0): Color {
     return when (this) {
-        is MetaItem.ValueItem -> if (this.value.type == ValueType.NUMBER) {
+        is ValueItem -> if (this.value.type == ValueType.NUMBER) {
             val int = value.int
             val red = int and 0x00ff0000 shr 16
             val green = int and 0x0000ff00 shr 8
@@ -46,7 +43,7 @@ public fun MetaItem<*>.color(opacity: Double = 1.0): Color {
         } else {
             Color.web(this.value.string)
         }
-        is MetaItem.NodeItem -> {
+        is NodeItem -> {
             Color.rgb(
                 node[Colors.RED_KEY]?.int ?: 0,
                 node[Colors.GREEN_KEY]?.int ?: 0,
@@ -60,11 +57,11 @@ public fun MetaItem<*>.color(opacity: Double = 1.0): Color {
 /**
  * Infer FX material based on meta item
  */
-public fun MetaItem<*>?.material(): Material {
+public fun MetaItem?.material(): Material {
     return when (this) {
         null -> FXMaterials.GREY
-        is MetaItem.ValueItem -> PhongMaterial(color())
-        is MetaItem.NodeItem -> PhongMaterial().apply {
+        is ValueItem -> PhongMaterial(color())
+        is NodeItem -> PhongMaterial().apply {
             val opacity = node[SolidMaterial.OPACITY_KEY].double ?: 1.0
             diffuseColor = node[SolidMaterial.COLOR_KEY]?.color(opacity) ?: Color.DARKGREY
             specularColor = node[SolidMaterial.SPECULAR_COLOR_KEY]?.color(opacity) ?: Color.WHITE
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
index 75d9307c..f6f72e54 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
@@ -13,7 +13,7 @@ import tornadofx.*
  * A caching binding collection for [Vision] properties
  */
 class VisualObjectFXBinding(val fx: FX3DPlugin, val obj: Vision) {
-    private val bindings = HashMap<Name, ObjectBinding<MetaItem<*>?>>()
+    private val bindings = HashMap<Name, ObjectBinding<MetaItem?>>()
 
     init {
         obj.onPropertyChange(fx.context) { name ->
@@ -31,10 +31,10 @@ class VisualObjectFXBinding(val fx: FX3DPlugin, val obj: Vision) {
         }
     }
 
-    operator fun get(key: Name): ObjectBinding<MetaItem<*>?> {
+    operator fun get(key: Name): ObjectBinding<MetaItem?> {
         return bindings.getOrPut(key) {
-            object : ObjectBinding<MetaItem<*>?>() {
-                override fun computeValue(): MetaItem<*>? = obj.getProperty(key)
+            object : ObjectBinding<MetaItem?>() {
+                override fun computeValue(): MetaItem? = obj.getProperty(key)
             }
         }
     }
@@ -42,19 +42,19 @@ class VisualObjectFXBinding(val fx: FX3DPlugin, val obj: Vision) {
     operator fun get(key: String) = get(key.toName())
 }
 
-fun ObjectBinding<MetaItem<*>?>.value() = objectBinding { it.value }
-fun ObjectBinding<MetaItem<*>?>.string() = stringBinding { it.string }
-fun ObjectBinding<MetaItem<*>?>.number() = objectBinding { it.number }
-fun ObjectBinding<MetaItem<*>?>.double() = objectBinding { it.double }
-fun ObjectBinding<MetaItem<*>?>.float() = objectBinding { it.float }
-fun ObjectBinding<MetaItem<*>?>.int() = objectBinding { it.int }
-fun ObjectBinding<MetaItem<*>?>.long() = objectBinding { it.long }
-fun ObjectBinding<MetaItem<*>?>.node() = objectBinding { it.node }
+fun ObjectBinding<MetaItem?>.value() = objectBinding { it.value }
+fun ObjectBinding<MetaItem?>.string() = stringBinding { it.string }
+fun ObjectBinding<MetaItem?>.number() = objectBinding { it.number }
+fun ObjectBinding<MetaItem?>.double() = objectBinding { it.double }
+fun ObjectBinding<MetaItem?>.float() = objectBinding { it.float }
+fun ObjectBinding<MetaItem?>.int() = objectBinding { it.int }
+fun ObjectBinding<MetaItem?>.long() = objectBinding { it.long }
+fun ObjectBinding<MetaItem?>.node() = objectBinding { it.node }
 
-fun ObjectBinding<MetaItem<*>?>.string(default: String) = stringBinding { it.string ?: default }
-fun ObjectBinding<MetaItem<*>?>.double(default: Double) = doubleBinding { it.double ?: default }
-fun ObjectBinding<MetaItem<*>?>.float(default: Float) = floatBinding { it.float ?: default }
-fun ObjectBinding<MetaItem<*>?>.int(default: Int) = integerBinding { it.int ?: default }
-fun ObjectBinding<MetaItem<*>?>.long(default: Long) = longBinding { it.long ?: default }
+fun ObjectBinding<MetaItem?>.string(default: String) = stringBinding { it.string ?: default }
+fun ObjectBinding<MetaItem?>.double(default: Double) = doubleBinding { it.double ?: default }
+fun ObjectBinding<MetaItem?>.float(default: Float) = floatBinding { it.float ?: default }
+fun ObjectBinding<MetaItem?>.int(default: Int) = integerBinding { it.int ?: default }
+fun ObjectBinding<MetaItem?>.long(default: Long) = longBinding { it.long ?: default }
 
-fun <T> ObjectBinding<MetaItem<*>?>.transform(transform: (MetaItem<*>) -> T) = objectBinding { it?.let(transform) }
+fun <T> ObjectBinding<MetaItem?>.transform(transform: (MetaItem) -> T) = objectBinding { it?.let(transform) }
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
index 125614c6..a01e3db0 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
@@ -1,9 +1,8 @@
 package hep.dataforge.vision.gdml
 
 import hep.dataforge.meta.DFExperimental
-import hep.dataforge.meta.sequence
+import hep.dataforge.meta.itemSequence
 import hep.dataforge.vision.Vision
-import hep.dataforge.vision.properties
 import hep.dataforge.vision.solid.*
 
 public expect class Counter() {
@@ -27,7 +26,7 @@ internal fun Vision.updateFrom(other: Vision): Vision {
             scaleY = scaleY.toDouble() * other.scaleY.toDouble()
             scaleZ = scaleZ.toDouble() * other.scaleZ.toDouble()
         }
-        other.properties?.sequence()?.forEach { (name, item) ->
+        other.meta.itemSequence().forEach { (name, item) ->
             if (getProperty(name) == null) {
                 setProperty(name, item)
             }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
index e1e79ef8..6dc96076 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
@@ -1,6 +1,5 @@
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.Meta
 import hep.dataforge.meta.update
 import hep.dataforge.names.NameToken
 import hep.dataforge.vision.*
@@ -39,18 +38,20 @@ public inline fun VisionContainerBuilder<Solid>.composite(
     val group = SolidGroup().apply(builder)
     val children = group.children.values.filterIsInstance<Solid>()
     if (children.size != 2) error("Composite requires exactly two children")
-    return Composite(type, children[0], children[1]).also {
-        it.configure { update(group.properties ?: Meta.EMPTY) }
+    return Composite(type, children[0], children[1]).also { composite ->
+        composite.configure {
+            update(group.meta)
+        }
         if (group.position != null) {
-            it.position = group.position
+            composite.position = group.position
         }
         if (group.rotation != null) {
-            it.rotation = group.rotation
+            composite.rotation = group.rotation
         }
         if (group.scale != null) {
-            it.scale = group.scale
+            composite.scale = group.scale
         }
-        set(name, it)
+        set(name, composite)
     }
 }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
index 987fec3c..61710713 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
@@ -85,7 +85,7 @@ public interface Solid : Vision {
             if (first.position != second.position) return false
             if (first.rotation != second.rotation) return false
             if (first.scale != second.scale) return false
-            if (first.properties != second.properties) return false
+            if (first.meta != second.meta) return false
             return true
         }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index b64074da..3b49f2fa 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -106,16 +106,16 @@ internal class Prototypes(
         }
     }
 
-    override fun getOwnProperty(name: Name): MetaItem<*>? = null
+    override fun getOwnProperty(name: Name): MetaItem? = null
 
     override fun getProperty(
         name: Name,
         inherit: Boolean,
         includeStyles: Boolean,
         includeDefaults: Boolean,
-    ): MetaItem<*>? = null
+    ): MetaItem? = null
 
-    override fun setProperty(name: Name, item: MetaItem<*>?, notify: Boolean) {
+    override fun setProperty(name: Name, item: MetaItem?, notify: Boolean) {
         error("Can't ser property of prototypes container")
     }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
index 2394030b..3e81748e 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
@@ -19,12 +19,12 @@ public class SolidMaterial : Scheme() {
     /**
      * Primary web-color for the material
      */
-    public var color: ColorAccessor = ColorAccessor(config, COLOR_KEY)
+    public var color: ColorAccessor = ColorAccessor(items, COLOR_KEY)
 
     /**
      * Specular color for phong material
      */
-    public var specularColor: ColorAccessor = ColorAccessor(config, SPECULAR_COLOR_KEY)
+    public var specularColor: ColorAccessor = ColorAccessor(items, SPECULAR_COLOR_KEY)
 
     /**
      * Opacity
@@ -100,16 +100,17 @@ public val Solid.color: ColorAccessor
 
 public var Solid.material: SolidMaterial?
     get() = getProperty(MATERIAL_KEY, inherit = true).node?.let { SolidMaterial.read(it) }
-    set(value) = setProperty(MATERIAL_KEY, value?.config)
+    set(value) = setProperty(MATERIAL_KEY, value?.rootNode)
 
 @VisionBuilder
 public fun Solid.material(builder: SolidMaterial.() -> Unit) {
-    val node = allProperties(inherit = true).getItem(MATERIAL_KEY).node
-    if (node != null) {
-        SolidMaterial.update(node, builder)
-    } else {
-        setProperty(MATERIAL_KEY, SolidMaterial(builder))
-    }
+    setProperty(MATERIAL_KEY, SolidMaterial(builder))
+//    val node = getOwnProperty(MATERIAL_KEY).node
+//    if (node != null) {
+//        configure(SolidMaterial(builder).config)
+//    } else {
+//        setProperty(MATERIAL_KEY, SolidMaterial(builder))
+//    }
 }
 
 public var Solid.opacity: Number?
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
index d9fbdba0..261f16d8 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
@@ -17,7 +17,7 @@ private fun SolidReference.getRefProperty(
     inherit: Boolean,
     includeStyles: Boolean,
     includeDefaults: Boolean,
-): MetaItem<*>? {
+): MetaItem? {
     return sequence {
         yield(getOwnProperty(name))
         if (includeStyles) {
@@ -59,11 +59,11 @@ public class SolidReferenceGroup(
     private fun childPropertyName(childName: Name, propertyName: Name): Name =
         childToken(childName) + propertyName
 
-    private fun getChildProperty(childName: Name, propertyName: Name): MetaItem<*>? {
+    private fun getChildProperty(childName: Name, propertyName: Name): MetaItem? {
         return getOwnProperty(childPropertyName(childName, propertyName))
     }
 
-    private fun setChildProperty(childName: Name, propertyName: Name, item: MetaItem<*>?, notify: Boolean) {
+    private fun setChildProperty(childName: Name, propertyName: Name, item: MetaItem?, notify: Boolean) {
         setProperty(childPropertyName(childName, propertyName), item, notify)
     }
 
@@ -79,7 +79,7 @@ public class SolidReferenceGroup(
         inherit: Boolean,
         includeStyles: Boolean,
         includeDefaults: Boolean,
-    ): MetaItem<*>? = getRefProperty(name, inherit, includeStyles, includeDefaults)
+    ): MetaItem? = getRefProperty(name, inherit, includeStyles, includeDefaults)
 
     override val descriptor: NodeDescriptor get() = prototype.descriptor
 
@@ -99,9 +99,11 @@ public class SolidReferenceGroup(
                     ReferenceChild(childName + key.asName())
                 } ?: emptyMap()
 
-        override fun getOwnProperty(name: Name): MetaItem<*>? = getChildProperty(childName, name)
+        override val meta: Meta get() =TODO()// getChildProperty(childName, Name.EMPTY).node ?: Meta.EMPTY
 
-        override fun setProperty(name: Name, item: MetaItem<*>?, notify: Boolean) {
+        override fun getOwnProperty(name: Name): MetaItem? = getChildProperty(childName, name)
+
+        override fun setProperty(name: Name, item: MetaItem?, notify: Boolean) {
             setChildProperty(childName, name, item, notify)
         }
 
@@ -110,7 +112,7 @@ public class SolidReferenceGroup(
             inherit: Boolean,
             includeStyles: Boolean,
             includeDefaults: Boolean,
-        ): MetaItem<*>? = getRefProperty(name, inherit, includeStyles, includeDefaults)
+        ): MetaItem? = getRefProperty(name, inherit, includeStyles, includeDefaults)
 
         override var parent: VisionGroup?
             get() {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt
index 5e835c83..022fd028 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt
@@ -3,7 +3,7 @@ package hep.dataforge.vision.solid.specifications
 import hep.dataforge.meta.*
 
 public class Axes : Scheme() {
-    public var visible: Boolean by boolean(!config.isEmpty())
+    public var visible: Boolean by boolean(rootNode?.isEmpty() != false)
     public var size: Double by double(AXIS_SIZE)
     public var width: Double by double(AXIS_WIDTH)
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
index a5b5f1ba..0b69d23b 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
@@ -9,7 +9,7 @@ import hep.dataforge.vision.solid.*
 internal fun mergeChild(parent: VisionGroup, child: Vision): Vision {
     return child.apply {
 
-        configure(parent.properties)
+        configure(parent.meta)
 
         //parent.properties?.let { config.update(it) }
 
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
index d2dbc4b3..912e3b5a 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
@@ -28,7 +28,7 @@ class ConvexTest {
         val json = SolidManager.jsonForSolids.encodeToJsonElement(Convex.serializer(), convex)
         val meta = json.toMetaItem().node!!
 
-        val points = meta.getIndexed("points").values.map { (it as MetaItem.NodeItem<*>).node.point3D() }
+        val points = meta.getIndexed("points").values.map { (it as NodeItem<*>).node.point3D() }
         assertEquals(8, points.count())
 
         assertEquals(8, convex.points.size)
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
index c7090eee..10531796 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
@@ -4,7 +4,6 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.toName
 import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.get
-import hep.dataforge.vision.properties
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -33,7 +32,7 @@ class SerializationTest {
         val string =  SolidManager.encodeToString(cube)
         println(string)
         val newCube = SolidManager.decodeFromString(string)
-        assertEquals(cube.properties, newCube.properties)
+        assertEquals(cube.meta, newCube.meta)
     }
 
     @Test
@@ -54,7 +53,7 @@ class SerializationTest {
         val string = SolidManager.encodeToString(group)
         println(string)
         val reconstructed = SolidManager.decodeFromString(string) as SolidGroup
-        assertEquals(group["cube"]?.properties, reconstructed["cube"]?.properties)
+        assertEquals(group["cube"]?.meta, reconstructed["cube"]?.meta)
     }
 
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
index f5b679e5..a17ab549 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
@@ -1,6 +1,6 @@
 package hep.dataforge.vision.solid.three
 
-import hep.dataforge.meta.getItem
+import hep.dataforge.meta.get
 import hep.dataforge.meta.string
 import hep.dataforge.names.Name
 import hep.dataforge.names.plus
@@ -177,7 +177,7 @@ public class ThreeCanvas(
     }
 
     private fun addControls(element: Node, controls: Controls) {
-        when (controls.getItem("type").string) {
+        when (controls.get("type").string) {
             "trackball" -> TrackballControls(camera, element)
             else -> OrbitControls(camera, element)
         }
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
index e9471af8..2d459217 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
@@ -109,15 +109,15 @@ public object ThreeMaterials {
 /**
  * Infer color based on meta item
  */
-public fun MetaItem<*>.getColor(): Color {
+public fun MetaItem.getColor(): Color {
     return when (this) {
-        is MetaItem.ValueItem -> if (this.value.type == ValueType.NUMBER) {
+        is ValueItem -> if (this.value.type == ValueType.NUMBER) {
             val int = value.int
             Color(int)
         } else {
             Color(this.value.string)
         }
-        is MetaItem.NodeItem -> {
+        is NodeItem -> {
             Color(
                 node[Colors.RED_KEY]?.int ?: 0,
                 node[Colors.GREEN_KEY]?.int ?: 0,
@@ -160,7 +160,7 @@ public fun Mesh.updateMaterial(vision: Vision) {
 }
 
 public fun Mesh.updateMaterialProperty(vision: Vision, propertyName: Name) {
-    if (material.cached) {
+    if (material.cached || propertyName == SolidMaterial.MATERIAL_KEY) {
         //generate a new material since cached material should not be changed
         updateMaterial(vision)
     } else {
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/three.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/three.kt
index 862960a9..9a11c550 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/three.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/three.kt
@@ -17,7 +17,7 @@ import kotlin.math.PI
 
 public val Solid.euler: Euler get() = Euler(rotationX, rotationY, rotationZ, rotationOrder.name)
 
-public val MetaItem<*>.vector: Vector3 get() = Vector3(node["x"].float ?: 0f, node["y"].float ?: 0f, node["z"].float ?: 0f)
+public val MetaItem.vector: Vector3 get() = Vector3(node["x"].float ?: 0f, node["y"].float ?: 0f, node["z"].float ?: 0f)
 
 public fun Geometry.toBufferGeometry(): BufferGeometry = BufferGeometry().apply { fromGeometry(this@toBufferGeometry) }
 

From 2b02f151d283c9daeff8b9f228d3a508e17a64ce Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 25 Dec 2020 19:44:53 +0300
Subject: [PATCH 067/151] Migrate to DF 0.3

---
 .../kotlin/ru/mipt/npm/muon/monitor/Model.kt  |  1 -
 .../hep/dataforge/vision/solid/demo/demo.kt   |  9 +++---
 .../kotlin/hep/dataforge/vision/VisionBase.kt | 23 +++++++++++----
 .../dataforge/vision/solid/ColorAccessor.kt   |  2 +-
 .../hep/dataforge/vision/solid/SolidGroup.kt  |  1 +
 .../dataforge/vision/solid/SolidMaterial.kt   | 12 ++------
 .../solid/specifications/Canvas3DOptions.kt   |  6 ++--
 .../dataforge/vision/solid/CompositeTest.kt   | 29 +++++++++++++++++++
 8 files changed, 58 insertions(+), 25 deletions(-)
 create mode 100644 visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/CompositeTest.kt

diff --git a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt
index 9027b26a..b4b883fc 100644
--- a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt
+++ b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt
@@ -52,7 +52,6 @@ class Model {
                 detector(it)
             }
         }
-
         tracks = group("tracks")
     }
 
diff --git a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
index 584a2b33..2dacf455 100644
--- a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
+++ b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
@@ -147,8 +147,7 @@ fun Page<Solid>.showcaseCSG() {
                 detail = 32
             }
             material {
-                color(Colors.red)
-                wireframe = false
+                color(Colors.pink)
             }
         }
         composite(CompositeType.UNION) {
@@ -158,8 +157,8 @@ fun Page<Solid>.showcaseCSG() {
             sphere(50){
                 detail = 32
             }
-            color(Colors.lightgreen)
-            opacity = 0.5
+            color("lightgreen")
+            opacity = 0.7
         }
         composite(CompositeType.SUBTRACT) {
             y = -300
@@ -169,7 +168,7 @@ fun Page<Solid>.showcaseCSG() {
             sphere(50){
                 detail = 32
             }
-            color(Colors.teal)
+            color("teal")
             opacity = 0.7
         }
     }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index 753498f2..899c2877 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -16,6 +16,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
+import kotlinx.css.th
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
@@ -27,18 +28,28 @@ internal data class PropertyListener(
 )
 
 
+/**
+ * A full base implementation for a [Vision]
+ * @param properties Object own properties excluding styles and inheritance
+ */
 @Serializable
 @SerialName("vision")
-public open class VisionBase : Vision {
+public open class VisionBase(internal var properties: Config? = null) : Vision {
+
+    init {
+        //used during deserialization only
+        properties?.onChange(this) { name, oldItem, newItem ->
+            if (oldItem != newItem) {
+                scope.launch {
+                    notifyPropertyChanged(name)
+                }
+            }
+        }
+    }
 
     @Transient
     override var parent: VisionGroup? = null
 
-    /**
-     * Object own properties excluding styles and inheritance
-     */
-    internal var properties: Config? = null
-
     override val meta: Meta get() = properties ?: Meta.EMPTY
 
     @Synchronized
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ColorAccessor.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ColorAccessor.kt
index 3b78d7b5..05e8cad9 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ColorAccessor.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ColorAccessor.kt
@@ -46,6 +46,6 @@ public operator fun ColorAccessor?.invoke(r: UByte, g: UByte, b: UByte) {
     this?.value = Colors.rgbToString(r, g, b).asValue()
 }
 
-public fun ColorAccessor?.clear(){
+public fun ColorAccessor?.clear() {
     this?.value = null
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index 3b49f2fa..578a06e6 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -101,6 +101,7 @@ internal class Prototypes(
 ) : VisionGroupBase(children as? MutableMap<NameToken, Vision> ?: children.toMutableMap()), PrototypeHolder {
 
     init {
+        //used during deserialization only
         children.values.forEach {
             it.parent = parent
         }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
index 3e81748e..314ea57e 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
@@ -19,12 +19,12 @@ public class SolidMaterial : Scheme() {
     /**
      * Primary web-color for the material
      */
-    public var color: ColorAccessor = ColorAccessor(items, COLOR_KEY)
+    public var color: ColorAccessor = ColorAccessor(this, COLOR_KEY)
 
     /**
      * Specular color for phong material
      */
-    public var specularColor: ColorAccessor = ColorAccessor(items, SPECULAR_COLOR_KEY)
+    public var specularColor: ColorAccessor = ColorAccessor(this, SPECULAR_COLOR_KEY)
 
     /**
      * Opacity
@@ -104,13 +104,7 @@ public var Solid.material: SolidMaterial?
 
 @VisionBuilder
 public fun Solid.material(builder: SolidMaterial.() -> Unit) {
-    setProperty(MATERIAL_KEY, SolidMaterial(builder))
-//    val node = getOwnProperty(MATERIAL_KEY).node
-//    if (node != null) {
-//        configure(SolidMaterial(builder).config)
-//    } else {
-//        setProperty(MATERIAL_KEY, SolidMaterial(builder))
-//    }
+    ownProperties.getChild(MATERIAL_KEY).update(SolidMaterial, builder)
 }
 
 public var Solid.opacity: Number?
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
index b62ea275..cfe59171 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
@@ -4,9 +4,9 @@ import hep.dataforge.meta.*
 import hep.dataforge.names.Name
 
 public class Canvas3DOptions : Scheme() {
-    public var axes: Axes by spec(Axes, Axes.empty())
-    public var camera: Camera by spec(Camera, Camera.empty())
-    public var controls: Controls by spec(Controls, Controls.empty())
+    public var axes: Axes by spec(Axes)
+    public var camera: Camera by spec(Camera)
+    public var controls: Controls by spec(Controls)
 
     public var minSize: Int by int(400)
     public var minWith: Number by number { minSize }
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/CompositeTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/CompositeTest.kt
new file mode 100644
index 00000000..45cc6d49
--- /dev/null
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/CompositeTest.kt
@@ -0,0 +1,29 @@
+package hep.dataforge.vision.solid
+
+import hep.dataforge.vision.Colors
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class CompositeTest {
+
+    @Test
+    fun testCompositeBuilder(){
+        lateinit var composite: Composite
+        SolidGroup {
+            composite = composite(CompositeType.INTERSECT) {
+                y = 300
+                box(100, 100, 100) {
+                    z = 50
+                }
+                sphere(50) {
+                    detail = 32
+                }
+                material {
+                    color("pink")
+                }
+            }
+        }
+
+        assertEquals("pink", composite.color.string)
+    }
+}
\ No newline at end of file

From 346b61724f0101b601b16d630a86ce4861754141 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 26 Dec 2020 17:11:52 +0300
Subject: [PATCH 068/151] Fix material generations for SolidReference

---
 .../kotlin/hep/dataforge/vision/VisionBase.kt | 26 +++++++++----------
 .../dataforge/vision/solid/SolidReference.kt  |  7 +++--
 .../vision/solid/SolidReferenceTest.kt        | 26 +++++++++++++++++++
 .../vision/solid/three/ThreeMaterials.kt      |  7 ++---
 .../solid/three/ThreeReferenceFactory.kt      |  3 +++
 5 files changed, 51 insertions(+), 18 deletions(-)
 create mode 100644 visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt

diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index 899c2877..b5d03eb7 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -131,8 +131,20 @@ public open class VisionBase(internal var properties: Config? = null) : Vision {
     }
 
     override fun update(change: VisionChange) {
+        change.properties?.let {
+            updateProperties(Name.EMPTY, it.asMetaItem())
+        }
+    }
 
-        fun updateProperties(at: Name, item: MetaItem) {
+    public companion object {
+        public val descriptor: NodeDescriptor = NodeDescriptor {
+            value(STYLE_KEY) {
+                type(ValueType.STRING)
+                multiple = true
+            }
+        }
+
+        public fun Vision.updateProperties(at: Name, item: MetaItem) {
             when (item) {
                 is ValueItem -> {
                     if (item.value == Null) {
@@ -146,18 +158,6 @@ public open class VisionBase(internal var properties: Config? = null) : Vision {
             }
         }
 
-        change.properties?.let {
-            updateProperties(Name.EMPTY, it.asMetaItem())
-        }
-    }
-
-    public companion object {
-        public val descriptor: NodeDescriptor = NodeDescriptor {
-            value(STYLE_KEY) {
-                type(ValueType.STRING)
-                multiple = true
-            }
-        }
     }
 }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
index 261f16d8..e49d8d0f 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
@@ -3,6 +3,7 @@ package hep.dataforge.vision.solid
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.names.*
+import hep.dataforge.values.Null
 import hep.dataforge.vision.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.serialization.SerialName
@@ -99,7 +100,7 @@ public class SolidReferenceGroup(
                     ReferenceChild(childName + key.asName())
                 } ?: emptyMap()
 
-        override val meta: Meta get() =TODO()// getChildProperty(childName, Name.EMPTY).node ?: Meta.EMPTY
+        override val meta: Meta get() = TODO()// getChildProperty(childName, Name.EMPTY).node ?: Meta.EMPTY
 
         override fun getOwnProperty(name: Name): MetaItem? = getChildProperty(childName, name)
 
@@ -136,7 +137,9 @@ public class SolidReferenceGroup(
         }
 
         override fun update(change: VisionChange) {
-            TODO("Not yet implemented")
+            change.properties?.let {
+                updateProperties(Name.EMPTY, it.asMetaItem())
+            }
         }
 
         override val descriptor: NodeDescriptor get() = prototype.descriptor
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt
new file mode 100644
index 00000000..8b3c85e0
--- /dev/null
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt
@@ -0,0 +1,26 @@
+package hep.dataforge.vision.solid
+
+import hep.dataforge.vision.get
+import hep.dataforge.vision.style
+import hep.dataforge.vision.styles
+import hep.dataforge.vision.useStyle
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class SolidReferenceTest {
+    val groupWithReference = SolidGroup {
+        val referenceStyle by style {
+            SolidMaterial.MATERIAL_COLOR_KEY put "red"
+        }
+        ref("test", Box(100f,100f,100f).apply {
+            color("blue")
+            useStyle(referenceStyle)
+        })
+    }
+
+
+    @Test
+    fun testReferenceProperty(){
+        assertEquals("blue", (groupWithReference["test"] as Solid).color.string)
+    }
+}
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
index 2d459217..0403fdb9 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
@@ -8,7 +8,6 @@ import hep.dataforge.values.string
 import hep.dataforge.vision.Colors
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.allStyles
-import hep.dataforge.vision.merge
 import hep.dataforge.vision.solid.SolidMaterial
 import info.laht.threekt.materials.LineBasicMaterial
 import info.laht.threekt.materials.Material
@@ -143,6 +142,7 @@ public fun Mesh.updateMaterial(vision: Vision) {
         includeStyles = false,
         includeDefaults = false
     )
+
     material = when {
         ownMaterialMeta == null && stylesMaterialMeta == null && parentMaterialMeta == null -> {
             //use default is not material properties are defined
@@ -153,8 +153,9 @@ public fun Mesh.updateMaterial(vision: Vision) {
             ThreeMaterials.cacheMeta(stylesMaterialMeta.node ?: Meta.EMPTY)
         }
         else -> {
-            val merge = sequenceOf(ownMaterialMeta, stylesMaterialMeta, parentMaterialMeta).merge().node ?: Meta.EMPTY
-            ThreeMaterials.buildMaterial(merge)
+            vision.getProperty(SolidMaterial.MATERIAL_KEY).node?.let {
+                ThreeMaterials.buildMaterial(it)
+            } ?: ThreeMaterials.DEFAULT
         }
     }
 }
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
index 8ccbc37f..a1a98572 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
@@ -1,9 +1,11 @@
 package hep.dataforge.vision.solid.three
 
+import hep.dataforge.meta.node
 import hep.dataforge.names.cutFirst
 import hep.dataforge.names.firstOrNull
 import hep.dataforge.names.toName
 import hep.dataforge.vision.solid.Solid
+import hep.dataforge.vision.solid.SolidMaterial
 import hep.dataforge.vision.solid.SolidReferenceGroup
 import hep.dataforge.vision.solid.SolidReferenceGroup.Companion.REFERENCE_CHILD_PROPERTY_PREFIX
 import info.laht.threekt.core.BufferGeometry
@@ -40,6 +42,7 @@ public object ThreeReferenceFactory : ThreeFactory<SolidReferenceGroup> {
         object3D.updatePosition(obj)
 
         if(object3D is Mesh){
+            //object3D.material = ThreeMaterials.buildMaterial(obj.getProperty(SolidMaterial.MATERIAL_KEY).node!!)
             object3D.applyProperties(obj)
         }
 

From 1e183107cf9b8bc63a6ef7b02a1919a2d3ed8450 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 26 Dec 2020 17:48:18 +0300
Subject: [PATCH 069/151] Properly treat prototype styles in editor

---
 .../dataforge/vision/bootstrap/visionPropertyEditor.kt |  7 ++++++-
 .../hep/dataforge/vision/react/PropertyEditor.kt       |  9 +++++----
 .../kotlin/hep/dataforge/vision/react/valueChooser.kt  | 10 +++++-----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
index b9a30bc8..2d8b96f0 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
@@ -4,6 +4,7 @@ import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.vision.*
 import hep.dataforge.vision.react.metaViewer
 import hep.dataforge.vision.react.propertyEditor
+        import hep.dataforge.vision.solid.SolidReference
 import org.w3c.dom.Element
 import react.RBuilder
 import react.dom.render
@@ -22,7 +23,11 @@ public fun RBuilder.visionPropertyEditor(
             descriptor = descriptor,
             key = key)
     }
-    val styles = vision.styles
+    val styles = if (vision is SolidReference) {
+        (vision.styles + vision.prototype.styles).distinct()
+    } else {
+        vision.styles
+    }
     if (styles.isNotEmpty()) {
         card("Styles") {
             accordion("styles") {
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
index c4eb03a0..3eb1eb97 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
@@ -65,11 +65,12 @@ private val PropertyEditorItem: FunctionalComponent<PropertyEditorProps> =
 
 private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
     var expanded: Boolean by useState { true }
-    val itemName by useState { props.name ?: Name.EMPTY }
+    val itemName = useMemo( { props.name ?: Name.EMPTY }, arrayOf(props.name))
     var item: MetaItem? by useState { props.provider.getItem(itemName) }
-    val descriptorItem: ItemDescriptor? = props.descriptor?.get(itemName)
+    val descriptorItem: ItemDescriptor? =
+        useMemo({ props.descriptor?.get(itemName) }, arrayOf(props.descriptor, itemName))
 
-    if(descriptorItem?.hidden == true) return //fail fast for hidden property
+    if (descriptorItem?.hidden == true) return //fail fast for hidden property
 
     var actualItem: MetaItem? by useState {
         item ?: props.defaultProvider?.getItem(itemName) ?: descriptorItem?.defaultItem()
@@ -79,7 +80,7 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
 
     fun update() {
         item = props.provider.getItem(itemName)
-        actualItem = item ?: descriptorItem?.defaultItem()
+        actualItem = item ?: props.defaultProvider?.getItem(itemName) ?: descriptorItem?.defaultItem()
     }
 
     if (props.updateFlow != null) {
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
index 884791b5..68638e25 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
@@ -20,17 +20,17 @@ import styled.styledInput
 import styled.styledSelect
 
 public external interface ValueChooserProps : RProps {
-    var item: MetaItem?
-    var descriptor: ValueDescriptor?
-    var valueChanged: ((Value?) -> Unit)?
+        public var item: MetaItem?
+    public var descriptor: ValueDescriptor?
+    public var valueChanged: ((Value?) -> Unit)?
 }
 
 public external interface ValueChooserState : RState {
-    var rawInput: Boolean?
+    public var rawInput: Boolean?
 }
 
 @JsExport
-class ValueChooserComponent(props: ValueChooserProps) : RComponent<ValueChooserProps, ValueChooserState>(props) {
+public class ValueChooserComponent(props: ValueChooserProps) : RComponent<ValueChooserProps, ValueChooserState>(props) {
     private val element = createRef<HTMLElement>()
 
     private fun getValue(): Value? {

From 56481933ed287fba3e995496352d5d67f90b1e9a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 26 Dec 2020 22:46:01 +0300
Subject: [PATCH 070/151] Static export fix

---
 .../hep/dataforge/vision/solid/simpleCube.kt  |   2 +-
 .../hep/dataforge/vision/solid/stars.kt       |  37 +++
 .../dataforge/vision/react/PropertyEditor.kt  |   7 +-
 .../dataforge/vision/react/valueChooser.kt    | 222 ++++++++++--------
 .../kotlin/hep/dataforge/vision/Vision.kt     |   2 +
 .../vision/html/VisionTagConsumer.kt          |   4 +-
 .../dataforge/vision/html/staticHtmlRender.kt |   3 +-
 .../kotlin/hep/dataforge/vision/headers.kt    |  14 +-
 .../kotlin/hep/dataforge/vision/htmlExport.kt |   6 +-
 .../hep/dataforge/vision/solid/FX3DPlugin.kt  |   2 +-
 .../hep/dataforge/vision/solid/Solid.kt       |  10 +-
 .../hep/dataforge/vision/solid/SolidBase.kt   |   2 +-
 .../dataforge/vision/solid/SolidManager.kt    |   2 +-
 .../dataforge/vision/solid/SolidMaterial.kt   |   4 +-
 .../vision/solid/specifications/Axes.kt       |   7 +-
 .../vision/solid/three/ThreeCanvas.kt         |   7 +-
 .../vision/solid/three/ThreeFactory.kt        |   2 +-
 .../vision/solid/three/ThreePlugin.kt         |  12 +-
 .../vision/three/server/serverExtensions.kt   |   6 +-
 19 files changed, 211 insertions(+), 140 deletions(-)
 create mode 100644 playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/stars.kt

diff --git a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/simpleCube.kt b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/simpleCube.kt
index f4558c23..215e742c 100644
--- a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/simpleCube.kt
+++ b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/simpleCube.kt
@@ -17,5 +17,5 @@ fun main() {
         }
     }
 
-    fragment.makeFile(resourceLocation = ResourceLocation.LOCAL)
+    fragment.makeFile(resourceLocation = ResourceLocation.SYSTEM)
 }
\ No newline at end of file
diff --git a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/stars.kt b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/stars.kt
new file mode 100644
index 00000000..dcfd8bcc
--- /dev/null
+++ b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/stars.kt
@@ -0,0 +1,37 @@
+package hep.dataforge.vision.solid
+
+import hep.dataforge.meta.DFExperimental
+import hep.dataforge.vision.ResourceLocation
+import hep.dataforge.vision.VisionManager
+import hep.dataforge.vision.html.fragment
+import hep.dataforge.vision.three.server.makeFile
+import hep.dataforge.vision.three.server.solid
+import kotlinx.html.h1
+import java.nio.file.Paths
+import kotlin.random.Random
+
+@OptIn(DFExperimental::class)
+fun main() {
+    val random = Random(112233)
+    val fragment = VisionManager.fragment {
+        h1 { +"Happy new year!" }
+        vision {
+            solid {
+                repeat(100) {
+                    sphere(5) {
+                        x = random.nextDouble(-300.0, 300.0)
+                        y = random.nextDouble(-300.0, 300.0)
+                        z = random.nextDouble(-300.0, 300.0)
+                        material {
+                            color(random.nextInt())
+                            specularColor(random.nextInt())
+                        }
+                        detail = 16
+                    }
+                }
+            }
+        }
+    }
+
+    fragment.makeFile(Paths.get("stars.html"), resourceLocation = ResourceLocation.EMBED)
+}
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
index 3eb1eb97..bcc27f68 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
@@ -32,7 +32,7 @@ public external interface PropertyEditorProps : RProps {
     public var provider: MutableItemProvider
 
     /**
-     * Provide default item (greyed out if used
+     * Provide default item (greyed out if used)
      */
     public var defaultProvider: ItemProvider?
 
@@ -65,11 +65,12 @@ private val PropertyEditorItem: FunctionalComponent<PropertyEditorProps> =
 
 private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
     var expanded: Boolean by useState { true }
-    val itemName = useMemo( { props.name ?: Name.EMPTY }, arrayOf(props.name))
-    var item: MetaItem? by useState { props.provider.getItem(itemName) }
+    val itemName = props.name ?: Name.EMPTY
     val descriptorItem: ItemDescriptor? =
         useMemo({ props.descriptor?.get(itemName) }, arrayOf(props.descriptor, itemName))
 
+    var item: MetaItem? by useState { props.provider.getItem(itemName) }
+
     if (descriptorItem?.hidden == true) return //fail fast for hidden property
 
     var actualItem: MetaItem? by useState {
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
index 68638e25..86af2e4c 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
@@ -9,132 +9,156 @@ import hep.dataforge.vision.widgetType
 import kotlinx.html.InputType
 import kotlinx.html.js.onChangeFunction
 import kotlinx.html.js.onKeyDownFunction
-import org.w3c.dom.HTMLElement
 import org.w3c.dom.HTMLInputElement
 import org.w3c.dom.HTMLSelectElement
 import org.w3c.dom.events.Event
 import react.*
-import react.dom.defaultValue
 import react.dom.option
 import styled.styledInput
 import styled.styledSelect
 
 public external interface ValueChooserProps : RProps {
-        public var item: MetaItem?
+    public var item: MetaItem?
     public var descriptor: ValueDescriptor?
     public var valueChanged: ((Value?) -> Unit)?
 }
 
-public external interface ValueChooserState : RState {
-    public var rawInput: Boolean?
-}
+@JsExport
+public val StringValueChooser: FunctionalComponent<ValueChooserProps> =
+    functionalComponent("StringValueChooser") { props ->
+        var value by useState(props.item.string ?: "")
+        val keyDown: (Event) -> Unit = { event ->
+            if (event.type == "keydown" && event.asDynamic().key == "Enter") {
+                value = (event.target as HTMLInputElement).value
+                if(value!= props.item.string) {
+                    props.valueChanged?.invoke(value.asValue())
+                }
+            }
+        }
+        val handleChange: (Event) -> Unit = {
+            value = (it.target as HTMLInputElement).value
+        }
+        styledInput(type = InputType.text) {
+            attrs {
+                this.value = value
+                onKeyDownFunction = keyDown
+                onChangeFunction = handleChange
+            }
+        }
+    }
 
 @JsExport
-public class ValueChooserComponent(props: ValueChooserProps) : RComponent<ValueChooserProps, ValueChooserState>(props) {
-    private val element = createRef<HTMLElement>()
-
-    private fun getValue(): Value? {
-        val element = element.current ?: return null//state.element ?: return null
-        return when (element) {
-            is HTMLInputElement -> if (element.type == "checkbox") {
-                if (element.checked) True else False
-            } else {
-                element.value.asValue()
+public val BooleanValueChooser: FunctionalComponent<ValueChooserProps> =
+    functionalComponent("BooleanValueChooser") { props ->
+        var checkedValue by useState(props.item.boolean ?: false)
+        val handleChange: (Event) -> Unit = {
+            val newValue = (it.target as HTMLInputElement).checked
+            checkedValue = newValue
+            props.valueChanged?.invoke(newValue.asValue())
+        }
+        styledInput(type = InputType.checkBox) {
+            attrs {
+                this.attributes["indeterminate"] = (checkedValue == null).toString()
+                checked = checkedValue
+                onChangeFunction = handleChange
             }
-            is HTMLSelectElement -> element.value.asValue()
-            else -> error("Unknown event target: $element")
         }
     }
 
-    private val commit: (Event) -> Unit = { _ ->
-        props.valueChanged?.invoke(getValue())
-    }
-
-    private val keyDown: (Event) -> Unit = { event ->
-        if (event.type == "keydown" && event.asDynamic().key == "Enter") {
-            commit(event)
+@JsExport
+public val NumberValueChooser: FunctionalComponent<ValueChooserProps> =
+    functionalComponent("NumberValueChooser") { props ->
+        var value by useState(props.item.string ?: "")
+        val keyDown: (Event) -> Unit = { event ->
+            if (event.type == "keydown" && event.asDynamic().key == "Enter") {
+                value = (event.target as HTMLInputElement).value
+                val number = value.toDoubleOrNull()
+                if (number == null) {
+                    console.error("The input value $value is not a number")
+                } else {
+                    props.valueChanged?.invoke(number.asValue())
+                }
+            }
+        }
+        val handleChange: (Event) -> Unit = {
+            value = (it.target as HTMLInputElement).value
+        }
+        styledInput(type = InputType.number) {
+            attrs {
+                this.value = value
+                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
+                }
+            }
         }
     }
 
-    override fun shouldComponentUpdate(
-        nextProps: ValueChooserProps,
-        nextState: ValueChooserState
-    ): Boolean = nextProps.item !== props.item
-
-    override fun componentDidUpdate(prevProps: ValueChooserProps, prevState: ValueChooserState, snapshot: Any) {
-        (element.current as? HTMLInputElement)?.let { element ->
-            if (element.type == "checkbox") {
-                element.defaultChecked = props.item?.boolean ?: false
-            } else {
-                element.defaultValue = props.item?.string ?: ""
+@JsExport
+public val ComboValueChooser: FunctionalComponent<ValueChooserProps> =
+    functionalComponent("ComboValueChooser") { props ->
+        var selected by useState(props.item.string ?: "")
+        val handleChange: (Event) -> Unit = {
+            selected = (it.target as HTMLSelectElement).value
+            props.valueChanged?.invoke(selected.asValue())
+        }
+        styledSelect {
+            props.descriptor?.allowedValues?.forEach {
+                option {
+                    +it.string
+                }
+            }
+            attrs {
+                this.value = props.item?.string ?: ""
+                multiple = false
+                onChangeFunction = handleChange
             }
-            element.indeterminate = props.item == null
         }
     }
 
-    private fun RBuilder.stringInput() = styledInput(type = InputType.text) {
-        attrs {
-            this.defaultValue = props.item?.string ?: ""
-            onKeyDownFunction = keyDown
+@JsExport
+public val ColorValueChooser: FunctionalComponent<ValueChooserProps> =
+    functionalComponent("ColorValueChooser") { props ->
+        var value by useState(
+            props.item.value?.let { value ->
+                if (value.type == ValueType.NUMBER) Colors.rgbToString(value.int)
+                else value.string
+            } ?: "#000000"
+        )
+        val handleChange: (Event) -> Unit = {
+            value = (it.target as HTMLInputElement).value
+            props.valueChanged?.invoke(value.asValue())
+        }
+        styledInput(type = InputType.color) {
+            attrs {
+                this.value = value
+                onChangeFunction = handleChange
+            }
         }
-        ref = element
     }
 
-    override fun RBuilder.render() {
-        val descriptor = props.descriptor
-        val type = descriptor?.type?.firstOrNull()
-        when {
-            state.rawInput == true -> stringInput()
-            descriptor?.widgetType == "color" -> styledInput(type = InputType.color) {
-                ref = element
-                attrs {
-                    this.defaultValue = props.item?.value?.let { value ->
-                        if (value.type == ValueType.NUMBER) Colors.rgbToString(value.int)
-                        else value.string
-                    } ?: "#000000"
-                    onChangeFunction = commit
-                }
-            }
-            type == ValueType.BOOLEAN -> {
-                styledInput(type = InputType.checkBox) {
-                    ref = element
-                    attrs {
-                        defaultChecked = props.item?.boolean ?: false
-                        onChangeFunction = commit
-                    }
-                }
-            }
-            type == ValueType.NUMBER -> styledInput(type = InputType.number) {
-                ref = element
-                attrs {
-                    descriptor.attributes["step"].string?.let {
-                        step = it
-                    }
-                    descriptor.attributes["min"].string?.let {
-                        min = it
-                    }
-                    descriptor.attributes["max"].string?.let {
-                        max = it
-                    }
-                    defaultValue = props.item?.string ?: ""
-                    onKeyDownFunction = keyDown
-                }
-            }
-            descriptor?.allowedValues?.isNotEmpty() ?: false -> styledSelect {
-                descriptor!!.allowedValues.forEach {
-                    option {
-                        +it.string
-                    }
-                }
-                ref = element
-                attrs {
-                    this.value = props.item?.string ?: ""
-                    multiple = false
-                    onChangeFunction = commit
-                }
-            }
-            else -> stringInput()
-        }
+@JsExport
+public val ValueChooser: FunctionalComponent<ValueChooserProps> = functionalComponent("ValueChooser") { props ->
+    val rawInput by useState(false)
+
+    val descriptor = props.descriptor
+    val type = descriptor?.type?.firstOrNull()
+
+    when {
+        rawInput -> child(StringValueChooser, props)
+        descriptor?.widgetType == "color" -> child(ColorValueChooser, 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)
     }
 }
 
@@ -142,9 +166,9 @@ internal fun RBuilder.valueChooser(
     name: Name,
     item: MetaItem?,
     descriptor: ValueDescriptor? = null,
-    callback: (Value?) -> Unit
+    callback: (Value?) -> Unit,
 ) {
-    child(ValueChooserComponent::class) {
+    child(ValueChooser) {
         attrs {
             key = name.toString()
             this.item = item
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 836d6f26..4e3b65a1 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -1,5 +1,6 @@
 package hep.dataforge.vision
 
+import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.MetaItem
 import hep.dataforge.meta.MutableItemProvider
@@ -73,6 +74,7 @@ public interface Vision : Described {
      * Flow of property invalidation events. It does not contain property values after invalidation since it is not clear
      * if it should include inherited properties etc.
      */
+    @DFExperimental
     @OptIn(ExperimentalCoroutinesApi::class)
     public val propertyChanges: Flow<Name>
         get() = callbackFlow<Name> {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
index 101bef5b..5d0a7be7 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
@@ -73,7 +73,7 @@ public abstract class VisionTagConsumer<R>(
 
     @OptIn(DFExperimental::class)
     public inline fun <T> TagConsumer<T>.vision(
-        name: String,
+        name: String = DEFAULT_VISION_NAME,
         visionProvider: VisionOutput.() -> Vision,
     ): T = vision(name.toName(), visionProvider)
 
@@ -103,5 +103,7 @@ public abstract class VisionTagConsumer<R>(
         public const val OUTPUT_NAME_ATTRIBUTE: String = "data-output-name"
         public const val OUTPUT_ENDPOINT_ATTRIBUTE: String = "data-output-endpoint"
         public const val DEFAULT_ENDPOINT: String = "."
+
+        public  const val DEFAULT_VISION_NAME = "vision"
     }
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/staticHtmlRender.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/staticHtmlRender.kt
index 1ecbdb8a..5a275e82 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/staticHtmlRender.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/staticHtmlRender.kt
@@ -18,9 +18,10 @@ public fun FlowContent.embedVisionFragment(
     val consumer = object : VisionTagConsumer<Any?>(consumer, idPrefix) {
         override fun DIV.renderVision(name: Name, vision: Vision, outputMeta: Meta) {
             script {
+                type = "text/json"
                 attributes["class"] = OUTPUT_DATA_CLASS
                 unsafe {
-                    +manager.encodeToString(vision)
+                    +"\n${manager.encodeToString(vision)}\n"
                 }
             }
         }
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt
index 80e5b250..7fe87dbb 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt
@@ -35,7 +35,7 @@ public enum class ResourceLocation {
     EMBED
 }
 
-internal const val DATAFORGE_ASSETS_PATH = ".dataforge/assets"
+internal const val VISIONFORGE_ASSETS_PATH = ".dataforge/vision/assets"
 
 
 /**
@@ -43,14 +43,14 @@ internal const val DATAFORGE_ASSETS_PATH = ".dataforge/assets"
  * @param
  */
 internal fun checkOrStoreFile(basePath: Path, filePath: Path, resource: String): Path {
-    val fullPath = basePath.resolveSibling(filePath).toAbsolutePath()
+    val fullPath = basePath.resolveSibling(filePath).toAbsolutePath().resolve(resource)
 
     if (Files.exists(fullPath)) {
         //TODO checksum
     } else {
         //TODO add logging
 
-        val bytes = VisionManager::class.java.getResourceAsStream(resource).readAllBytes()
+        val bytes = VisionManager::class.java.getResourceAsStream("/$resource").readAllBytes()
         Files.createDirectories(fullPath.parent)
         Files.write(fullPath, bytes, StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE)
     }
@@ -58,7 +58,7 @@ internal fun checkOrStoreFile(basePath: Path, filePath: Path, resource: String):
     return if (basePath.isAbsolute && fullPath.startsWith(basePath)) {
         basePath.relativize(fullPath)
     } else {
-        filePath
+        fullPath
     }
 }
 
@@ -78,7 +78,7 @@ internal fun embedScriptHeader(resource: String): HtmlFragment = {
     script {
         type = "text/javascript"
         unsafe {
-            val bytes = VisionManager::class.java.getResourceAsStream(resource).readAllBytes()
+            val bytes = VisionManager::class.java.getResourceAsStream("/$resource").readAllBytes()
             +bytes.toString(Charsets.UTF_8)
         }
     }
@@ -108,12 +108,12 @@ public fun Context.Companion.scriptHeader(
     val targetPath = when (resourceLocation) {
         ResourceLocation.LOCAL -> checkOrStoreFile(
             basePath,
-            Path.of(DATAFORGE_ASSETS_PATH),
+            Path.of(VISIONFORGE_ASSETS_PATH),
             scriptResource
         )
         ResourceLocation.SYSTEM -> checkOrStoreFile(
             Path.of("."),
-            Path.of(System.getProperty("user.home")).resolve(DATAFORGE_ASSETS_PATH),
+            Path.of(System.getProperty("user.home")).resolve(VISIONFORGE_ASSETS_PATH),
             scriptResource
         )
         ResourceLocation.EMBED -> null
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt
index f7539a52..6ff99bcb 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt
@@ -20,8 +20,10 @@ public fun HtmlVisionFragment.makeFile(
     title: String = "VisionForge page",
     show: Boolean = true,
 ) {
-    val actualFile = path ?: Files.createTempFile("tempPlot", ".html")
-    Files.createDirectories(actualFile.parent)
+    val actualFile = path?.let {
+        Path.of(System.getProperty("user.home")).resolve(path)
+    } ?: Files.createTempFile("tempPlot", ".html")
+    //Files.createDirectories(actualFile.parent)
     val htmlString = createHTML().apply {
         head {
             meta {
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
index 0032f83a..35cd6806 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
@@ -130,7 +130,7 @@ class FX3DPlugin : AbstractPlugin() {
     }
 
     companion object : PluginFactory<FX3DPlugin> {
-        override val tag = PluginTag("visual.fx3D", PluginTag.DATAFORGE_GROUP)
+        override val tag = PluginTag("vision.fx3D", PluginTag.DATAFORGE_GROUP)
         override val type = FX3DPlugin::class
         override fun invoke(meta: Meta, context: Context) = FX3DPlugin()
     }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
index 61710713..1050dff1 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
@@ -44,13 +44,13 @@ public interface Solid : Vision {
         public val Y_POSITION_KEY: Name = POSITION_KEY + Y_KEY
         public val Z_POSITION_KEY: Name = POSITION_KEY + Z_KEY
 
-        public val ROTATION: Name = "rotation".asName()
+        public val ROTATION_KEY: Name = "rotation".asName()
 
-        public val X_ROTATION_KEY: Name = ROTATION + X_KEY
-        public val Y_ROTATION_KEY: Name = ROTATION + Y_KEY
-        public val Z_ROTATION_KEY: Name = ROTATION + Z_KEY
+        public val X_ROTATION_KEY: Name = ROTATION_KEY + X_KEY
+        public val Y_ROTATION_KEY: Name = ROTATION_KEY + Y_KEY
+        public val Z_ROTATION_KEY: Name = ROTATION_KEY + Z_KEY
 
-        public val ROTATION_ORDER_KEY: Name = ROTATION + "order"
+        public val ROTATION_ORDER_KEY: Name = ROTATION_KEY + "order"
 
         public val SCALE_KEY: Name = "scale".asName()
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidBase.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidBase.kt
index b9471724..21c8e5bf 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidBase.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidBase.kt
@@ -35,6 +35,6 @@ internal fun Meta.toVector(default: Float = 0f) = Point3D(
 
 internal fun Solid.updatePosition(meta: Meta?) {
     meta[Solid.POSITION_KEY].node?.toVector()?.let { position = it }
-    meta[Solid.ROTATION].node?.toVector()?.let { rotation = it }
+    meta[Solid.ROTATION_KEY].node?.toVector()?.let { rotation = it }
     meta[Solid.SCALE_KEY].node?.toVector(1f)?.let { scale = it }
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index fa67fe5c..e91757a4 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -33,7 +33,7 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
     }
 
     public companion object : PluginFactory<SolidManager> {
-        override val tag: PluginTag = PluginTag(name = "visual.spatial", group = PluginTag.DATAFORGE_GROUP)
+        override val tag: PluginTag = PluginTag(name = "vision.solid", group = PluginTag.DATAFORGE_GROUP)
         override val type: KClass<out SolidManager> = SolidManager::class
         override fun invoke(meta: Meta, context: Context): SolidManager = SolidManager(meta)
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
index 314ea57e..3062b0ad 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
@@ -19,12 +19,12 @@ public class SolidMaterial : Scheme() {
     /**
      * Primary web-color for the material
      */
-    public var color: ColorAccessor = ColorAccessor(this, COLOR_KEY)
+    public val color: ColorAccessor = ColorAccessor(this, COLOR_KEY)
 
     /**
      * Specular color for phong material
      */
-    public var specularColor: ColorAccessor = ColorAccessor(this, SPECULAR_COLOR_KEY)
+    public val specularColor: ColorAccessor = ColorAccessor(this, SPECULAR_COLOR_KEY)
 
     /**
      * Opacity
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt
index 022fd028..802bebd6 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt
@@ -1,9 +1,12 @@
 package hep.dataforge.vision.solid.specifications
 
-import hep.dataforge.meta.*
+import hep.dataforge.meta.Scheme
+import hep.dataforge.meta.SchemeSpec
+import hep.dataforge.meta.boolean
+import hep.dataforge.meta.double
 
 public class Axes : Scheme() {
-    public var visible: Boolean by boolean(rootNode?.isEmpty() != false)
+    public var visible: Boolean by boolean(false)
     public var size: Double by double(AXIS_SIZE)
     public var width: Double by double(AXIS_WIDTH)
 
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
index a17ab549..d58fba37 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
@@ -20,6 +20,7 @@ import info.laht.threekt.external.controls.OrbitControls
 import info.laht.threekt.external.controls.TrackballControls
 import info.laht.threekt.geometries.EdgesGeometry
 import info.laht.threekt.helpers.AxesHelper
+import info.laht.threekt.lights.AmbientLight
 import info.laht.threekt.materials.LineBasicMaterial
 import info.laht.threekt.math.Vector2
 import info.laht.threekt.objects.LineSegments
@@ -50,8 +51,11 @@ public class ThreeCanvas(
     public var axes: AxesHelper = AxesHelper(options.axes.size.toInt()).apply { visible = options.axes.visible }
         private set
 
+    private val light = AmbientLight(0x404040)
+
     private val scene: Scene = Scene().apply {
         add(axes)
+        add(light)
     }
 
     public var camera: PerspectiveCamera = buildCamera(options.camera)
@@ -66,6 +70,7 @@ public class ThreeCanvas(
     }
 
     private val canvas = (renderer.domElement as HTMLCanvasElement).apply {
+        className += "three-canvas"
         width = 600
         height = 600
         style.apply {
@@ -131,7 +136,7 @@ public class ThreeCanvas(
     }
 
     internal fun attach(element: Element) {
-        check(element.children.length == 0){"The element for Three canvas is not empty"}
+        check(element.getElementsByClassName("three-canvas").length == 0){"Three canvas already created in this element"}
         element.appendChild(canvas)
         updateSize()
     }
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
index 30fa1422..9113dbc8 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
@@ -49,7 +49,7 @@ public fun Object3D.updateProperty(source: Vision, propertyName: Name) {
         updateMaterialProperty(source, propertyName)
     } else if (
         propertyName.startsWith(Solid.POSITION_KEY)
-        || propertyName.startsWith(Solid.ROTATION)
+        || propertyName.startsWith(Solid.ROTATION_KEY)
         || propertyName.startsWith(Solid.SCALE_KEY)
     ) {
         //update position of mesh using this object
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index eaadc56a..080a71f7 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -70,7 +70,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
                 obj.onPropertyChange(updateScope) { name ->
                     if (
                         name.startsWith(Solid.POSITION_KEY) ||
-                        name.startsWith(Solid.ROTATION) ||
+                        name.startsWith(Solid.ROTATION_KEY) ||
                         name.startsWith(Solid.SCALE_KEY)
                     ) {
                         //update position of mesh using this object
@@ -81,14 +81,6 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
                 }
 
                 obj.structureChanges.onEach { (nameToken, _, child) ->
-//                        if (name.isEmpty()) {
-//                            logger.error { "Children change with empty name on $group" }
-//                            return@onChildrenChange
-//                        }
-
-//                        val parentName = name.cutLast()
-//                        val childName = name.last()!!
-
                     //removing old object
                     findChild(nameToken.asName())?.let { oldChild ->
                         oldChild.parent?.remove(oldChild)
@@ -153,7 +145,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
     }
 
     public companion object : PluginFactory<ThreePlugin> {
-        override val tag: PluginTag = PluginTag("visual.three", PluginTag.DATAFORGE_GROUP)
+        override val tag: PluginTag = PluginTag("vision.threejs", PluginTag.DATAFORGE_GROUP)
         override val type: KClass<ThreePlugin> = ThreePlugin::class
         override fun invoke(meta: Meta, context: Context): ThreePlugin = ThreePlugin()
     }
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
index a4d84a23..d37fabc3 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
@@ -39,7 +39,9 @@ public fun HtmlVisionFragment.makeFile(
     resourceLocation: ResourceLocation = ResourceLocation.SYSTEM,
     show: Boolean = true,
 ) {
-    val actualPath = path ?: Files.createTempFile("tempPlot", ".html")
-    val scriptHeader = Context.scriptHeader("/js/visionforge-three.js", actualPath, resourceLocation)
+    val actualPath = path?.let {
+        Path.of(System.getProperty("user.home")).resolve(path)
+    } ?: Files.createTempFile("tempPlot", ".html")
+    val scriptHeader = Context.scriptHeader("js/visionforge-three.js", actualPath, resourceLocation)
     makeFile(visionManager, path = path, show = show, title = title, headers = arrayOf(scriptHeader))
 }
\ No newline at end of file

From 51af6b9378da3a87ff397986d5be394620129c4c Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 28 Dec 2020 22:39:37 +0300
Subject: [PATCH 071/151] Refactor file generators

---
 .../main/kotlin/ru/mipt/npm/sat/satServer.kt  |  13 +-
 playground/build.gradle.kts                   |  31 ++++-
 .../src/commonMain/kotlin/visionContext.kt    |   2 +
 playground/src/jsMain/kotlin/PlayGroundApp.kt | 115 ++++++++++--------
 .../solid/{stars.kt => randomSpheres.kt}      |  11 +-
 .../vision/solid/serverExtensions.kt          |  38 ++++++
 .../hep/dataforge/vision/solid/simpleCube.kt  |   4 +-
 settings.gradle.kts                           |   3 +-
 .../kotlin/hep/dataforge/vision/VisionBase.kt |   6 +-
 .../kotlin/hep/dataforge/vision/headers.kt    |  14 +--
 .../kotlin/hep/dataforge/vision/htmlExport.kt |  23 ++--
 visionforge-plotly/build.gradle.kts           |  20 +++
 .../dataforge/vision/plotly/VisionOfPlotly.kt |  12 ++
 .../dataforge/vision/plotly/PlotlyPlugin.kt   |  33 +++++
 .../hep/dataforge/vision/plotly/jsMain.kt     |  15 +++
 .../dataforge/vision/solid/SolidManager.kt    |   5 +
 .../solid/specifications/Canvas3DOptions.kt   |   1 +
 .../vision/solid/specifications/Light.kt      |   8 ++
 .../vision/solid/three/ThreeCanvas.kt         |   3 +-
 .../threekt/helpers/HemisphereLightHelper.kt  |   4 +-
 ...{HemiSphereLight.kt => HemisphereLight.kt} |   4 +-
 .../vision/three/server/visionContext.kt      |   8 --
 .../dataforge/vision/three/server/jsMain.kt   |  40 +-----
 .../vision/three/server/serverExtensions.kt   |  32 +----
 24 files changed, 279 insertions(+), 166 deletions(-)
 create mode 100644 playground/src/commonMain/kotlin/visionContext.kt
 rename playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/{stars.kt => randomSpheres.kt} (81%)
 create mode 100644 playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/serverExtensions.kt
 create mode 100644 visionforge-plotly/build.gradle.kts
 create mode 100644 visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt
 create mode 100644 visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt
 create mode 100644 visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/jsMain.kt
 create mode 100644 visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Light.kt
 rename visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/{HemiSphereLight.kt => HemisphereLight.kt} (94%)
 delete mode 100644 visionforge-threejs/visionforge-threejs-server/src/commonMain/kotlin/hep/dataforge/vision/three/server/visionContext.kt

diff --git a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
index a1f0dca1..92b1b7d0 100644
--- a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
+++ b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
@@ -1,12 +1,11 @@
 package ru.mipt.npm.sat
 
 
+import hep.dataforge.context.Global
 import hep.dataforge.names.toName
-import hep.dataforge.vision.solid.Solid
-import hep.dataforge.vision.solid.clear
-import hep.dataforge.vision.solid.color
-import hep.dataforge.vision.solid.invoke
+import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.three.server.*
+import hep.dataforge.vision.visionManager
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
@@ -16,10 +15,14 @@ import kotlinx.html.h1
 import kotlin.random.Random
 
 fun main() {
+    val satContext = Global.context("sat") {
+        plugin(SolidManager)
+    }
+
     //Create a geometry
     val sat = visionOfSatellite(ySegments = 3)
 
-    val server = visionManager.serve {
+    val server = satContext.visionManager.serve {
         //use client library
         useThreeJs()
         //use css
diff --git a/playground/build.gradle.kts b/playground/build.gradle.kts
index 45d20f6d..4df93ed9 100644
--- a/playground/build.gradle.kts
+++ b/playground/build.gradle.kts
@@ -12,6 +12,16 @@ repositories{
 }
 
 kotlin {
+
+    js(IR) {
+        browser {
+            webpackTask {
+                this.outputFileName = "js/visionforge-playground.js"
+            }
+        }
+        binaries.executable()
+    }
+
     jvm{
         compilations.all {
             kotlinOptions.jvmTarget = "11"
@@ -20,30 +30,39 @@ kotlin {
             useJUnitPlatform()
         }
     }
-    js(IR) {
-        browser {
+
+    afterEvaluate {
+        val jsBrowserDistribution by tasks.getting
+
+        tasks.getByName<ProcessResources>("jvmProcessResources") {
+            dependsOn(jsBrowserDistribution)
+            afterEvaluate {
+                from(jsBrowserDistribution)
+            }
         }
-        binaries.executable()
     }
 
+
     sourceSets {
-        commonMain {
+        val commonMain by getting {
             dependencies {
                 implementation(project(":visionforge-solid"))
                 implementation(project(":visionforge-gdml"))
-
+                implementation(project(":visionforge-plotly"))
             }
         }
+
         val jsMain by getting{
             dependencies {
                 implementation(project(":ui:bootstrap"))
+                implementation(project(":visionforge-threejs"))
             }
         }
 
         val jvmMain by getting{
             dependencies {
+                implementation(project(":visionforge-server"))
                 implementation("com.github.Ricky12Awesome:json-schema-serialization:0.6.6")
-                implementation(project(":visionforge-threejs:visionforge-threejs-server"))
             }
         }
     }
diff --git a/playground/src/commonMain/kotlin/visionContext.kt b/playground/src/commonMain/kotlin/visionContext.kt
new file mode 100644
index 00000000..139597f9
--- /dev/null
+++ b/playground/src/commonMain/kotlin/visionContext.kt
@@ -0,0 +1,2 @@
+
+
diff --git a/playground/src/jsMain/kotlin/PlayGroundApp.kt b/playground/src/jsMain/kotlin/PlayGroundApp.kt
index a4635a04..4a3018a0 100644
--- a/playground/src/jsMain/kotlin/PlayGroundApp.kt
+++ b/playground/src/jsMain/kotlin/PlayGroundApp.kt
@@ -1,58 +1,67 @@
-import hep.dataforge.Application
-import hep.dataforge.startApplication
-import hep.dataforge.vision.bootstrap.visionPropertyEditor
-import hep.dataforge.vision.react.ThreeCanvasComponent
-import hep.dataforge.vision.react.objectTree
-import hep.dataforge.vision.solid.*
-import hep.dataforge.vision.solid.specifications.Canvas3DOptions
-import kotlinx.browser.document
-import org.w3c.dom.HTMLElement
-import react.RBuilder
-import react.child
-import react.dom.div
-import react.dom.render
-
-fun RBuilder.threeCanvas(object3D: Solid, options: Canvas3DOptions.() -> Unit = {}) {
-    child(ThreeCanvasComponent) {
-        attrs {
-            this.obj = object3D
-            this.options = Canvas3DOptions(options)
-        }
-    }
-}
-
-private class PlayGroundApp : Application {
-
-    override fun start(state: Map<String, Any>) {
-
-        val element =
-            document.getElementById("app") as? HTMLElement ?: error("Element with id 'canvas' not found on page")
-
-        val obj = SolidGroup().apply {
-            box(100, 100, 100, name = "A")
-            group("B") {
-                position = Point3D(120, 0, 0)
-                box(100, 100, 100, name = "C")
-            }
-        }
-
-        render(element) {
-            div("row") {
-                div("col-3") {
-                    objectTree(obj)
-                }
-                div("col-6") {
-                    threeCanvas(obj)
-                }
-                div("col-3") {
-                    visionPropertyEditor(obj)
-                }
-            }
-        }
-    }
+import hep.dataforge.context.Context
+import hep.dataforge.context.Global
+import hep.dataforge.meta.DFExperimental
+import hep.dataforge.vision.client.VisionClient
+import hep.dataforge.vision.client.renderAllVisions
+import hep.dataforge.vision.plotly.PlotlyPlugin
+import hep.dataforge.vision.solid.three.ThreePlugin
+import kotlinx.browser.window
 
+//fun RBuilder.threeCanvas(object3D: Solid, options: Canvas3DOptions.() -> Unit = {}) {
+//    child(ThreeCanvasComponent) {
+//        attrs {
+//            this.obj = object3D
+//            this.options = Canvas3DOptions(options)
+//        }
+//    }
+//}
+//
+//private class PlayGroundApp : Application {
+//
+//    override fun start(state: Map<String, Any>) {
+//
+//        val element =
+//            document.getElementById("app") as? HTMLElement ?: error("Element with id 'canvas' not found on page")
+//
+//        val obj = SolidGroup().apply {
+//            box(100, 100, 100, name = "A")
+//            group("B") {
+//                position = Point3D(120, 0, 0)
+//                box(100, 100, 100, name = "C")
+//            }
+//        }
+//
+//        render(element) {
+//            div("row") {
+//                div("col-3") {
+//                    objectTree(obj)
+//                }
+//                div("col-6") {
+//                    threeCanvas(obj)
+//                }
+//                div("col-3") {
+//                    visionPropertyEditor(obj)
+//                }
+//            }
+//        }
+//    }
+//
+//}
+
+public val visionContext: Context = Global.context("VISION") {
+    plugin(ThreePlugin)
+    plugin(PlotlyPlugin)
+    plugin(VisionClient)
 }
 
+@DFExperimental
 fun main() {
-    startApplication(::PlayGroundApp)
+    //Loading three-js renderer
+    val clientManager = visionContext.plugins.fetch(VisionClient)
+
+    //Fetch from server and render visions for all outputs
+    window.onload = {
+        clientManager.renderAllVisions()
+    }
+    //startApplication(::PlayGroundApp)
 }
\ No newline at end of file
diff --git a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/stars.kt b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/randomSpheres.kt
similarity index 81%
rename from playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/stars.kt
rename to playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/randomSpheres.kt
index dcfd8bcc..728714af 100644
--- a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/stars.kt
+++ b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/randomSpheres.kt
@@ -4,21 +4,20 @@ import hep.dataforge.meta.DFExperimental
 import hep.dataforge.vision.ResourceLocation
 import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.html.fragment
-import hep.dataforge.vision.three.server.makeFile
-import hep.dataforge.vision.three.server.solid
 import kotlinx.html.h1
 import java.nio.file.Paths
 import kotlin.random.Random
 
 @OptIn(DFExperimental::class)
 fun main() {
+
     val random = Random(112233)
     val fragment = VisionManager.fragment {
         h1 { +"Happy new year!" }
         vision {
             solid {
                 repeat(100) {
-                    sphere(5) {
+                    sphere(5, name = "sphere[$it]") {
                         x = random.nextDouble(-300.0, 300.0)
                         y = random.nextDouble(-300.0, 300.0)
                         z = random.nextDouble(-300.0, 300.0)
@@ -33,5 +32,9 @@ fun main() {
         }
     }
 
-    fragment.makeFile(Paths.get("stars.html"), resourceLocation = ResourceLocation.EMBED)
+    visionContext.makeVisionFile(
+        fragment,
+        Paths.get("randomSpheres.html"),
+        resourceLocation = ResourceLocation.EMBED
+    )
 }
\ No newline at end of file
diff --git a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/serverExtensions.kt b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/serverExtensions.kt
new file mode 100644
index 00000000..c1f3b273
--- /dev/null
+++ b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/serverExtensions.kt
@@ -0,0 +1,38 @@
+package hep.dataforge.vision.solid
+
+import hep.dataforge.context.Context
+import hep.dataforge.context.Global
+import hep.dataforge.meta.DFExperimental
+import hep.dataforge.vision.ResourceLocation
+import hep.dataforge.vision.VisionManager
+import hep.dataforge.vision.html.HtmlVisionFragment
+import hep.dataforge.vision.makeVisionFile
+import hep.dataforge.vision.scriptHeader
+import hep.dataforge.vision.three.server.VisionServer
+import hep.dataforge.vision.three.server.useScript
+import java.nio.file.Path
+
+
+/**
+ * A global vision context used to resolve different vision renderers
+ */
+@DFExperimental
+public val visionContext: Context = Global.context("VISION") {
+    plugin(VisionManager)
+    plugin(SolidManager)
+}
+
+public fun VisionServer.usePlayground(): Unit {
+    useScript("js/visionforge-playground.js")
+}
+
+@DFExperimental
+public fun Context.makeVisionFile(
+    fragment: HtmlVisionFragment,
+    path: Path? = null,
+    title: String = "VisionForge page",
+    resourceLocation: ResourceLocation = ResourceLocation.SYSTEM,
+    show: Boolean = true,
+): Unit = makeVisionFile(fragment, path = path, title = title, show = show) { actualPath ->
+    scriptHeader("js/visionforge-playground.js", actualPath, resourceLocation)
+}
diff --git a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/simpleCube.kt b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/simpleCube.kt
index 215e742c..ca8e70b5 100644
--- a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/simpleCube.kt
+++ b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/simpleCube.kt
@@ -4,8 +4,6 @@ import hep.dataforge.meta.DFExperimental
 import hep.dataforge.vision.ResourceLocation
 import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.html.fragment
-import hep.dataforge.vision.three.server.makeFile
-import hep.dataforge.vision.three.server.solid
 
 @OptIn(DFExperimental::class)
 fun main() {
@@ -17,5 +15,5 @@ fun main() {
         }
     }
 
-    fragment.makeFile(resourceLocation = ResourceLocation.SYSTEM)
+    visionContext.makeVisionFile(fragment = fragment, resourceLocation = ResourceLocation.SYSTEM)
 }
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3877a947..36931914 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -33,7 +33,7 @@ rootProject.name = "visionforge"
 include(
 //    ":ui",
     ":ui:react",
-    ":ui:ring",
+//    ":ui:ring",
 //    ":ui:material",
     ":ui:bootstrap",
     ":visionforge-core",
@@ -43,6 +43,7 @@ include(
     ":visionforge-threejs:visionforge-threejs-server",
     ":visionforge-gdml",
     ":visionforge-server",
+    ":visionforge-plotly",
     ":demo:spatial-showcase",
     ":demo:gdml",
     ":demo:muon-monitor",
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index b5d03eb7..dddcb377 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -16,7 +16,6 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import kotlinx.css.th
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
@@ -27,7 +26,6 @@ internal data class PropertyListener(
     val action: (name: Name) -> Unit,
 )
 
-
 /**
  * A full base implementation for a [Vision]
  * @param properties Object own properties excluding styles and inheritance
@@ -53,7 +51,7 @@ public open class VisionBase(internal var properties: Config? = null) : Vision {
     override val meta: Meta get() = properties ?: Meta.EMPTY
 
     @Synchronized
-    private fun getOrCreateConfig(): Config {
+    protected fun getOrCreateConfig(): Config {
         if (properties == null) {
             val newProperties = Config()
             newProperties.onChange(this) { name, oldItem, newItem ->
@@ -91,7 +89,6 @@ public open class VisionBase(internal var properties: Config? = null) : Vision {
         yield(descriptor?.get(name)?.defaultItem())
     }.merge()
 
-    @Synchronized
     override fun setProperty(name: Name, item: MetaItem?, notify: Boolean) {
         getOrCreateConfig().setItem(name, item)
         if (notify) {
@@ -117,6 +114,7 @@ public open class VisionBase(internal var properties: Config? = null) : Vision {
     @Transient
     private val propertyInvalidationFlow: MutableSharedFlow<Name> = MutableSharedFlow()
 
+    @DFExperimental
     override val propertyChanges: Flow<Name> get() = propertyInvalidationFlow
 
     override fun onPropertyChange(scope: CoroutineScope, callback: suspend (Name) -> Unit) {
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt
index 7fe87dbb..5dfb5352 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt
@@ -42,8 +42,8 @@ internal const val VISIONFORGE_ASSETS_PATH = ".dataforge/vision/assets"
  * Check if the asset exists in given local location and put it there if it does not
  * @param
  */
-internal fun checkOrStoreFile(basePath: Path, filePath: Path, resource: String): Path {
-    val fullPath = basePath.resolveSibling(filePath).toAbsolutePath().resolve(resource)
+internal fun checkOrStoreFile(htmlPath: Path, filePath: Path, resource: String): Path {
+    val fullPath = htmlPath.resolveSibling(filePath).toAbsolutePath().resolve(resource)
 
     if (Files.exists(fullPath)) {
         //TODO checksum
@@ -55,8 +55,8 @@ internal fun checkOrStoreFile(basePath: Path, filePath: Path, resource: String):
         Files.write(fullPath, bytes, StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE)
     }
 
-    return if (basePath.isAbsolute && fullPath.startsWith(basePath)) {
-        basePath.relativize(fullPath)
+    return if (htmlPath.isAbsolute && fullPath.startsWith(htmlPath.parent)) {
+        htmlPath.parent.relativize(fullPath)
     } else {
         fullPath
     }
@@ -100,14 +100,14 @@ internal fun fileCssHeader(
  * Make a script header, automatically copying file to appropriate location
  */
 @DFExperimental
-public fun Context.Companion.scriptHeader(
+public fun Context.scriptHeader(
     scriptResource: String,
-    basePath: Path,
+    htmlPath: Path,
     resourceLocation: ResourceLocation,
 ): HtmlFragment {
     val targetPath = when (resourceLocation) {
         ResourceLocation.LOCAL -> checkOrStoreFile(
-            basePath,
+            htmlPath,
             Path.of(VISIONFORGE_ASSETS_PATH),
             scriptResource
         )
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt
index 6ff99bcb..d560f46a 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt
@@ -1,9 +1,16 @@
 package hep.dataforge.vision
 
+import hep.dataforge.context.Context
 import hep.dataforge.meta.DFExperimental
-import hep.dataforge.vision.html.*
-import kotlinx.html.*
+import hep.dataforge.vision.html.HtmlFragment
+import hep.dataforge.vision.html.HtmlVisionFragment
+import hep.dataforge.vision.html.embedVisionFragment
+import hep.dataforge.vision.html.fragment
+import kotlinx.html.body
+import kotlinx.html.head
+import kotlinx.html.meta
 import kotlinx.html.stream.createHTML
+import kotlinx.html.title
 import java.awt.Desktop
 import java.nio.file.Files
 import java.nio.file.Path
@@ -13,12 +20,12 @@ import java.nio.file.Path
  * Make a file with the embedded vision data
  */
 @DFExperimental
-public fun HtmlVisionFragment.makeFile(
-    manager: VisionManager,
-    vararg headers: HtmlFragment,
+public fun Context.makeVisionFile(
+    fragment: HtmlVisionFragment,
     path: Path? = null,
     title: String = "VisionForge page",
     show: Boolean = true,
+    headerBuilder: (Path) -> HtmlFragment,
 ) {
     val actualFile = path?.let {
         Path.of(System.getProperty("user.home")).resolve(path)
@@ -28,14 +35,12 @@ public fun HtmlVisionFragment.makeFile(
         head {
             meta {
                 charset = "utf-8"
-                headers.forEach {
-                    fragment(it)
-                }
+                fragment(headerBuilder(actualFile))
             }
             title(title)
         }
         body {
-            embedVisionFragment(manager, fragment = this@makeFile)
+            embedVisionFragment(visionManager, fragment = fragment)
         }
     }.finalize()
 
diff --git a/visionforge-plotly/build.gradle.kts b/visionforge-plotly/build.gradle.kts
new file mode 100644
index 00000000..51419b1e
--- /dev/null
+++ b/visionforge-plotly/build.gradle.kts
@@ -0,0 +1,20 @@
+plugins {
+    id("ru.mipt.npm.mpp")
+}
+
+kscience {
+    useSerialization()
+}
+
+val plotlyVersion = "0.3.1-dev"
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                api(project(":visionforge-core"))
+                api("kscience.plotlykt:plotlykt-core:${plotlyVersion}")
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt
new file mode 100644
index 00000000..997a560a
--- /dev/null
+++ b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt
@@ -0,0 +1,12 @@
+package hep.dataforge.vision.plotly
+
+import hep.dataforge.meta.DFExperimental
+import hep.dataforge.vision.VisionBase
+import hep.dataforge.vision.html.VisionOutput
+import kscience.plotly.Plot
+import kscience.plotly.Plotly
+
+public class VisionOfPlotly(public val plot: Plot): VisionBase(plot.config)
+
+@DFExperimental
+public inline fun VisionOutput.plotly(block: Plot.() -> Unit): VisionOfPlotly = VisionOfPlotly(Plotly.plot(block))
\ No newline at end of file
diff --git a/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt b/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt
new file mode 100644
index 00000000..9e2793dc
--- /dev/null
+++ b/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt
@@ -0,0 +1,33 @@
+package hep.dataforge.vision.plotly
+
+import hep.dataforge.context.AbstractPlugin
+import hep.dataforge.context.Context
+import hep.dataforge.context.PluginFactory
+import hep.dataforge.context.PluginTag
+import hep.dataforge.meta.Meta
+import hep.dataforge.vision.Vision
+import hep.dataforge.vision.client.ElementVisionRenderer
+import kscience.plotly.PlotlyConfig
+import kscience.plotly.plot
+import org.w3c.dom.Element
+import kotlin.reflect.KClass
+
+public class PlotlyPlugin : AbstractPlugin(), ElementVisionRenderer {
+
+    override val tag: PluginTag get() = Companion.tag
+
+    override fun rateVision(vision: Vision): Int =
+        if (vision is VisionOfPlotly) ElementVisionRenderer.DEFAULT_RATING else ElementVisionRenderer.ZERO_RATING
+
+    override fun render(element: Element, vision: Vision, meta: Meta) {
+        val plot = (vision as? VisionOfPlotly)?.plot ?: error("Only VisionOfPlotly visions are supported")
+        val config = PlotlyConfig.read(meta)
+        element.plot(plot, config)
+    }
+
+    public companion object : PluginFactory<PlotlyPlugin> {
+        override val tag: PluginTag = PluginTag("vision.plotly", PluginTag.DATAFORGE_GROUP)
+        override val type: KClass<PlotlyPlugin> = PlotlyPlugin::class
+        override fun invoke(meta: Meta, context: Context): PlotlyPlugin = PlotlyPlugin()
+    }
+}
\ No newline at end of file
diff --git a/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/jsMain.kt b/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/jsMain.kt
new file mode 100644
index 00000000..ae0ffb37
--- /dev/null
+++ b/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/jsMain.kt
@@ -0,0 +1,15 @@
+package hep.dataforge.vision.plotly
+
+//public fun main() {
+//    val visionContext: Context = Global.context("vision-client")
+//
+//    //Loading three-js renderer
+//    val threePlugin = visionContext.plugins.fetch(PlotlyPlugin)
+//
+//    val clientManager = visionContext.plugins.fetch(VisionClient)
+//
+//    //Fetch from server and render visions for all outputs
+//    window.onload = {
+//        clientManager.renderAllVisions()
+//    }
+//}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index e91757a4..f55dc1f4 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -4,6 +4,7 @@ import hep.dataforge.context.AbstractPlugin
 import hep.dataforge.context.Context
 import hep.dataforge.context.PluginFactory
 import hep.dataforge.context.PluginTag
+import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.Meta
 import hep.dataforge.names.Name
 import hep.dataforge.names.toName
@@ -12,6 +13,7 @@ import hep.dataforge.vision.VisionBase
 import hep.dataforge.vision.VisionGroupBase
 import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.VisionManager.Companion.VISION_SERIALIZER_MODULE_TARGET
+import hep.dataforge.vision.html.VisionOutput
 import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.modules.PolymorphicModuleBuilder
@@ -73,3 +75,6 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
         public fun decodeFromString(str: String): Solid = jsonForSolids.decodeFromString(PolymorphicSerializer(Solid::class), str)
     }
 }
+
+@DFExperimental
+public inline fun VisionOutput.solid(block: SolidGroup.() -> Unit): SolidGroup = SolidGroup().apply(block)
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
index cfe59171..2a147100 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
@@ -5,6 +5,7 @@ import hep.dataforge.names.Name
 
 public class Canvas3DOptions : Scheme() {
     public var axes: Axes by spec(Axes)
+    public var light: Light by spec(Light)
     public var camera: Camera by spec(Camera)
     public var controls: Controls by spec(Controls)
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Light.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Light.kt
new file mode 100644
index 00000000..46ba8939
--- /dev/null
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Light.kt
@@ -0,0 +1,8 @@
+package hep.dataforge.vision.solid.specifications
+
+import hep.dataforge.meta.Scheme
+import hep.dataforge.meta.SchemeSpec
+
+public class Light : Scheme() {
+    public companion object : SchemeSpec<Light>(::Light)
+}
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
index d58fba37..6df44691 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
@@ -51,7 +51,7 @@ public class ThreeCanvas(
     public var axes: AxesHelper = AxesHelper(options.axes.size.toInt()).apply { visible = options.axes.visible }
         private set
 
-    private val light = AmbientLight(0x404040)
+    private var light = buildLight(options.light)
 
     private val scene: Scene = Scene().apply {
         add(axes)
@@ -169,6 +169,7 @@ public class ThreeCanvas(
         }
     }
 
+    private fun buildLight(spec: Light): info.laht.threekt.lights.Light = AmbientLight(0x404040)
 
     private fun buildCamera(spec: Camera) = PerspectiveCamera(
         spec.fov,
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt
index af7333d5..4351faa7 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/HemisphereLightHelper.kt
@@ -28,7 +28,7 @@
 package info.laht.threekt.helpers
 
 import info.laht.threekt.core.Object3D
-import info.laht.threekt.lights.HemiSphereLight
+import info.laht.threekt.lights.HemisphereLight
 import info.laht.threekt.lights.Light
 
 /**
@@ -39,7 +39,7 @@ import info.laht.threekt.lights.Light
  * @param color (optional) if this is not the set the helper will take the color of the light.
  */
 external class HemisphereLightHelper(
-    light: HemiSphereLight,
+    light: HemisphereLight,
     size: Number,
     color: Int = definedExternally
 ) : Object3D {
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/HemiSphereLight.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/HemisphereLight.kt
similarity index 94%
rename from visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/HemiSphereLight.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/HemisphereLight.kt
index 727a36a1..c98fbd5d 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/HemiSphereLight.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/lights/HemisphereLight.kt
@@ -34,7 +34,7 @@ import info.laht.threekt.math.Color
  *
  * This light cannot be used to cast shadows.
  */
-external class HemiSphereLight(
+external class HemisphereLight(
     skyColor: Int = definedExternally,
     groundColor: Int = definedExternally,
     intensity: Number = definedExternally
@@ -42,6 +42,6 @@ external class HemiSphereLight(
 
     var groundColor: Color
 
-    fun copy(light: HemiSphereLight): HemiSphereLight
+    fun copy(light: HemisphereLight): HemisphereLight
 
 }
\ No newline at end of file
diff --git a/visionforge-threejs/visionforge-threejs-server/src/commonMain/kotlin/hep/dataforge/vision/three/server/visionContext.kt b/visionforge-threejs/visionforge-threejs-server/src/commonMain/kotlin/hep/dataforge/vision/three/server/visionContext.kt
deleted file mode 100644
index c568d74a..00000000
--- a/visionforge-threejs/visionforge-threejs-server/src/commonMain/kotlin/hep/dataforge/vision/three/server/visionContext.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package hep.dataforge.vision.three.server
-
-import hep.dataforge.context.Context
-import hep.dataforge.vision.VisionManager
-
-public expect val visionContext: Context
-
-public val visionManager: VisionManager get() = visionContext.plugins.fetch(VisionManager)
\ No newline at end of file
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
index f9505680..86ad4ecc 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
@@ -1,46 +1,18 @@
 package hep.dataforge.vision.three.server
 
-import hep.dataforge.context.Context
 import hep.dataforge.context.Global
 import hep.dataforge.vision.client.VisionClient
 import hep.dataforge.vision.client.renderAllVisions
 import hep.dataforge.vision.solid.three.ThreePlugin
 import kotlinx.browser.window
 
-//FIXME check plugin loading in JS
-//public actual val visionContext: Context = Global.context("vision-client") {
-//    //Loading three-js renderer
-//    plugin(ThreePlugin)
-//}
-
-public actual val visionContext: Context = Global.context("vision-client").apply {
-    //Loading three-js renderer
-    plugins.fetch(ThreePlugin)
-}
-
-public val clientManager: VisionClient get() = visionContext.plugins.fetch(VisionClient)
-
-
-///**
-// * Render all visions in the document using registered renderers
-// */
-//@JsExport
-//public fun renderVisions() {
-//    //Fetch from server and render visions for all outputs
-//    window.onload = {
-//        clientManager.renderAllVisions()
-//    }
-//}
-//
-///**
-// * Render all visions in a given element, using registered renderers
-// */
-//@JsExport
-//public fun renderAllVisionsAt(element: Element) {
-//    clientManager.renderAllVisionsAt(element)
-//}
-
 public fun main() {
+    //Loading three-js renderer
+    val visionContext = Global.context("threejs") {
+        plugin(ThreePlugin)
+    }
+    val clientManager = visionContext.plugins.fetch(VisionClient)
+
     //Fetch from server and render visions for all outputs
     window.onload = {
         clientManager.renderAllVisions()
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
index d37fabc3..ca20c709 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
@@ -1,47 +1,25 @@
 package hep.dataforge.vision.three.server
 
 import hep.dataforge.context.Context
-import hep.dataforge.context.Global
 import hep.dataforge.meta.DFExperimental
 import hep.dataforge.vision.ResourceLocation
 import hep.dataforge.vision.html.HtmlVisionFragment
-import hep.dataforge.vision.html.VisionOutput
-import hep.dataforge.vision.makeFile
+import hep.dataforge.vision.makeVisionFile
 import hep.dataforge.vision.scriptHeader
-import hep.dataforge.vision.solid.SolidGroup
-import hep.dataforge.vision.solid.SolidManager
-import java.nio.file.Files
 import java.nio.file.Path
 
-public actual val visionContext: Context = Global.context("vision-server") {
-    //Loading solid manager for the backend (it does not know about three
-    plugin(SolidManager)
-}
 
 public fun VisionServer.useThreeJs(): Unit {
     useScript("js/visionforge-three.js")
-//    header {
-//        script {
-//            unsafe {
-//                +"renderThreeVisions()"
-//            }
-//        }
-//    }
 }
 
 @DFExperimental
-public inline fun VisionOutput.solid(block: SolidGroup.() -> Unit): SolidGroup = SolidGroup().apply(block)
-
-@OptIn(DFExperimental::class)
-public fun HtmlVisionFragment.makeFile(
+public fun Context.makeVisionFile(
+    fragment: HtmlVisionFragment,
     path: Path? = null,
     title: String = "VisionForge page",
     resourceLocation: ResourceLocation = ResourceLocation.SYSTEM,
     show: Boolean = true,
-) {
-    val actualPath = path?.let {
-        Path.of(System.getProperty("user.home")).resolve(path)
-    } ?: Files.createTempFile("tempPlot", ".html")
-    val scriptHeader = Context.scriptHeader("js/visionforge-three.js", actualPath, resourceLocation)
-    makeFile(visionManager, path = path, show = show, title = title, headers = arrayOf(scriptHeader))
+): Unit = makeVisionFile(fragment, path = path, title = title, show = show) { actualPath ->
+    scriptHeader("js/visionforge-three.js", actualPath, resourceLocation)
 }
\ No newline at end of file

From 3f9f2534164e299b41af33d1026a7e0ed7118737 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 29 Dec 2020 15:00:11 +0300
Subject: [PATCH 072/151] Minor playground renaming.

---
 playground/src/jsMain/kotlin/PlayGroundApp.kt | 67 -------------------
 .../src/jsMain/kotlin/playgroundMain.kt       | 27 ++++++++
 .../dataforge/vision/solid/randomSpheres.kt   |  2 +-
 .../vision/solid/serverExtensions.kt          |  2 +-
 .../hep/dataforge/vision/solid/simpleCube.kt  |  2 +-
 5 files changed, 30 insertions(+), 70 deletions(-)
 delete mode 100644 playground/src/jsMain/kotlin/PlayGroundApp.kt
 create mode 100644 playground/src/jsMain/kotlin/playgroundMain.kt

diff --git a/playground/src/jsMain/kotlin/PlayGroundApp.kt b/playground/src/jsMain/kotlin/PlayGroundApp.kt
deleted file mode 100644
index 4a3018a0..00000000
--- a/playground/src/jsMain/kotlin/PlayGroundApp.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-import hep.dataforge.context.Context
-import hep.dataforge.context.Global
-import hep.dataforge.meta.DFExperimental
-import hep.dataforge.vision.client.VisionClient
-import hep.dataforge.vision.client.renderAllVisions
-import hep.dataforge.vision.plotly.PlotlyPlugin
-import hep.dataforge.vision.solid.three.ThreePlugin
-import kotlinx.browser.window
-
-//fun RBuilder.threeCanvas(object3D: Solid, options: Canvas3DOptions.() -> Unit = {}) {
-//    child(ThreeCanvasComponent) {
-//        attrs {
-//            this.obj = object3D
-//            this.options = Canvas3DOptions(options)
-//        }
-//    }
-//}
-//
-//private class PlayGroundApp : Application {
-//
-//    override fun start(state: Map<String, Any>) {
-//
-//        val element =
-//            document.getElementById("app") as? HTMLElement ?: error("Element with id 'canvas' not found on page")
-//
-//        val obj = SolidGroup().apply {
-//            box(100, 100, 100, name = "A")
-//            group("B") {
-//                position = Point3D(120, 0, 0)
-//                box(100, 100, 100, name = "C")
-//            }
-//        }
-//
-//        render(element) {
-//            div("row") {
-//                div("col-3") {
-//                    objectTree(obj)
-//                }
-//                div("col-6") {
-//                    threeCanvas(obj)
-//                }
-//                div("col-3") {
-//                    visionPropertyEditor(obj)
-//                }
-//            }
-//        }
-//    }
-//
-//}
-
-public val visionContext: Context = Global.context("VISION") {
-    plugin(ThreePlugin)
-    plugin(PlotlyPlugin)
-    plugin(VisionClient)
-}
-
-@DFExperimental
-fun main() {
-    //Loading three-js renderer
-    val clientManager = visionContext.plugins.fetch(VisionClient)
-
-    //Fetch from server and render visions for all outputs
-    window.onload = {
-        clientManager.renderAllVisions()
-    }
-    //startApplication(::PlayGroundApp)
-}
\ No newline at end of file
diff --git a/playground/src/jsMain/kotlin/playgroundMain.kt b/playground/src/jsMain/kotlin/playgroundMain.kt
new file mode 100644
index 00000000..6c577e6f
--- /dev/null
+++ b/playground/src/jsMain/kotlin/playgroundMain.kt
@@ -0,0 +1,27 @@
+import hep.dataforge.context.Context
+import hep.dataforge.context.Global
+import hep.dataforge.meta.DFExperimental
+import hep.dataforge.vision.client.VisionClient
+import hep.dataforge.vision.client.renderAllVisions
+import hep.dataforge.vision.plotly.PlotlyPlugin
+import hep.dataforge.vision.solid.three.ThreePlugin
+import kotlinx.browser.window
+
+@DFExperimental
+fun main() {
+
+    val visionContext: Context = Global.context("VISION") {
+        plugin(ThreePlugin)
+        plugin(PlotlyPlugin)
+        plugin(VisionClient)
+    }
+
+    //Loading three-js renderer
+    val clientManager = visionContext.plugins.fetch(VisionClient)
+
+    //Fetch from server and render visions for all outputs
+    window.onload = {
+        clientManager.renderAllVisions()
+    }
+    //startApplication(::PlayGroundApp)
+}
\ No newline at end of file
diff --git a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/randomSpheres.kt b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/randomSpheres.kt
index 728714af..90031fd3 100644
--- a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/randomSpheres.kt
+++ b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/randomSpheres.kt
@@ -32,7 +32,7 @@ fun main() {
         }
     }
 
-    visionContext.makeVisionFile(
+    VisionForge.makeVisionFile(
         fragment,
         Paths.get("randomSpheres.html"),
         resourceLocation = ResourceLocation.EMBED
diff --git a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/serverExtensions.kt b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/serverExtensions.kt
index c1f3b273..2e365104 100644
--- a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/serverExtensions.kt
+++ b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/serverExtensions.kt
@@ -17,7 +17,7 @@ import java.nio.file.Path
  * A global vision context used to resolve different vision renderers
  */
 @DFExperimental
-public val visionContext: Context = Global.context("VISION") {
+public val VisionForge: Context = Global.context("VISION") {
     plugin(VisionManager)
     plugin(SolidManager)
 }
diff --git a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/simpleCube.kt b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/simpleCube.kt
index ca8e70b5..c1d20ef7 100644
--- a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/simpleCube.kt
+++ b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/simpleCube.kt
@@ -15,5 +15,5 @@ fun main() {
         }
     }
 
-    visionContext.makeVisionFile(fragment = fragment, resourceLocation = ResourceLocation.SYSTEM)
+    VisionForge.makeVisionFile(fragment = fragment, resourceLocation = ResourceLocation.SYSTEM)
 }
\ No newline at end of file

From 33146fef1b59f7fcf8dae6bdafbc8fb8face2773 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 2 Jan 2021 11:30:39 +0300
Subject: [PATCH 073/151] Fix persistent bug with sat-demo updates

---
 README.md                                                     | 4 ++++
 .../src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt  | 4 +++-
 .../commonMain/kotlin/hep/dataforge/vision/VisionChange.kt    | 2 +-
 .../kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt     | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index fea0692c..ad589f69 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@
 ## Table of Contents
 
 * [Introduction](#introduction)
+* [Requirements](#requirements)
 * [Features](#features)
 * [About DataForge](#about-dataforge)
 * [Modules contained in this repository](#modules-contained-in-this-repository)
@@ -34,6 +35,9 @@ Other applications including 2D plots are planned for the future.
 The project is developed as a [Kotlin multiplatform](https://kotlinlang.org/docs/reference/multiplatform.html) 
 application, currently targeting browser JavaScript and JVM.
 
+## Requirements
+
+JVM backend requires JDK 11 or later
 
 ## Features
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index dddcb377..e04be28f 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -86,7 +86,9 @@ public open class VisionBase(internal var properties: Config? = null) : Vision {
         if (inherit) {
             yield(parent?.getProperty(name, inherit, includeStyles, includeDefaults))
         }
-        yield(descriptor?.get(name)?.defaultItem())
+        if (includeDefaults) {
+            yield(descriptor?.get(name)?.defaultItem())
+        }
     }.merge()
 
     override fun setProperty(name: Name, item: MetaItem?, notify: Boolean) {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
index 8d799ef8..cb80fd7d 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
@@ -82,7 +82,7 @@ private fun CoroutineScope.collectChange(
 
     //Collect properties change
     source.onPropertyChange(this) { propertyName ->
-        val newItem = source.getProperty(propertyName, inherit = false, includeStyles = false, includeDefaults = false)
+        val newItem = source.getOwnProperty(propertyName)
         collector().propertyChanged(name, propertyName, newItem)
     }
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
index 5d0a7be7..84d73269 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
@@ -12,7 +12,7 @@ import kotlinx.html.*
  * A placeholder object to attach inline vision builders.
  */
 @DFExperimental
-public class VisionOutput @PublishedApi internal constructor(){
+public class VisionOutput @PublishedApi internal constructor() {
     public var meta: Meta = Meta.EMPTY
 
     public inline fun meta(block: MetaBuilder.() -> Unit) {
@@ -104,6 +104,6 @@ public abstract class VisionTagConsumer<R>(
         public const val OUTPUT_ENDPOINT_ATTRIBUTE: String = "data-output-endpoint"
         public const val DEFAULT_ENDPOINT: String = "."
 
-        public  const val DEFAULT_VISION_NAME = "vision"
+        public const val DEFAULT_VISION_NAME: String = "vision"
     }
 }
\ No newline at end of file

From 0c1d6139ae4193d865858cd9a7bab38054b65a82 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 12 Jan 2021 12:52:22 +0300
Subject: [PATCH 074/151] Fix after dev merge.

---
 .../vision/gdml/demo/GdmlJsDemoApp.kt         |  4 +-
 .../ru/mipt/npm/muon/monitor/MMDemoApp.kt     |  4 +-
 .../hep/dataforge/vision/solid/demo/demo.kt   | 18 ++--
 .../vision/solid/demo/ThreeDemoApp.kt         |  4 +-
 .../vision/solid/demo/ThreeDemoGrid.kt        | 47 +++++-----
 .../dataforge/vision/solid/demo/FXDemoGrid.kt |  9 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 .../src/commonMain/kotlin/visionContext.kt    |  2 -
 .../src/jsMain/kotlin/playgroundMain.kt       | 30 ++-----
 .../vision/solid => }/generateSchema.kt       |  4 +-
 .../vision/solid/serverExtensions.kt          | 38 --------
 .../hep/dataforge/vision/solid/simpleCube.kt  | 19 ----
 playground/src/jvmMain/kotlin/plotlyVision.kt | 25 ++++++
 .../vision/solid => }/randomSpheres.kt        |  6 +-
 .../src/jvmMain/kotlin/serverExtensions.kt    | 35 ++++++++
 playground/src/jvmMain/kotlin/simpleCube.kt   | 22 +++++
 .../hep/dataforge/vision/VisionForge.kt       |  5 ++
 .../hep/dataforge/vision/VisionLayout.kt      |  8 ++
 .../hep/dataforge/vision/VisionManager.kt     | 14 +++
 .../kotlin/hep/dataforge/vision/html/Page.kt  | 26 ++++++
 .../dataforge/vision/html/staticHtmlRender.kt | 31 ++++---
 .../hep/dataforge/vision/layout/Page.kt       | 16 ----
 .../hep/dataforge/vision/html/HtmlTagTest.kt  |  3 +-
 .../hep/dataforge/{ => vision}/Application.kt |  2 +-
 .../hep/dataforge/vision/VisionForge.kt       | 22 +++++
 .../hep/dataforge/vision/VisionForge.kt       |  8 ++
 .../dataforge/vision/{ => html}/headers.kt    | 11 ++-
 .../hep/dataforge/vision/html/htmlExport.kt   | 89 +++++++++++++++++++
 .../kotlin/hep/dataforge/vision/htmlExport.kt | 51 -----------
 .../hep/dataforge/vision/solid/FXCanvas3D.kt  |  9 +-
 visionforge-plotly/build.gradle.kts           | 21 +++++
 .../dataforge/vision/plotly/VisionOfPlotly.kt |  8 +-
 .../dataforge/vision/plotly/plotlyCommon.kt   | 15 ++++
 .../hep/dataforge/vision/plotly/jsMain.kt     | 15 ----
 .../plotly/{PlotlyPlugin.kt => plotlyJs.kt}   | 28 ++++--
 .../dataforge/vision/plotly/plotlyHeaders.kt  | 30 +++++++
 .../hep/dataforge/vision/plotly/plotlyJvm.kt  | 27 ++++++
 .../hep/dataforge/vision/solid/Solid.kt       |  4 -
 .../dataforge/vision/solid/SolidManager.kt    | 27 ++----
 .../hep/dataforge/vision/solid/geometry.kt    | 12 ++-
 visionforge-threejs/build.gradle.kts          |  6 ++
 .../vision/solid/three/ThreeCanvas.kt         |  7 +-
 .../vision/solid/three/ThreePlugin.kt         | 11 ++-
 .../dataforge/vision/three/server/jsMain.kt   | 19 +---
 .../vision/three/server/serverExtensions.kt   | 21 +++--
 45 files changed, 511 insertions(+), 304 deletions(-)
 delete mode 100644 playground/src/commonMain/kotlin/visionContext.kt
 rename playground/src/jvmMain/kotlin/{hep/dataforge/vision/solid => }/generateSchema.kt (98%)
 delete mode 100644 playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/serverExtensions.kt
 delete mode 100644 playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/simpleCube.kt
 create mode 100644 playground/src/jvmMain/kotlin/plotlyVision.kt
 rename playground/src/jvmMain/kotlin/{hep/dataforge/vision/solid => }/randomSpheres.kt (86%)
 create mode 100644 playground/src/jvmMain/kotlin/serverExtensions.kt
 create mode 100644 playground/src/jvmMain/kotlin/simpleCube.kt
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionLayout.kt
 create mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
 delete mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/layout/Page.kt
 rename visionforge-core/src/jsMain/kotlin/hep/dataforge/{ => vision}/Application.kt (98%)
 create mode 100644 visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionForge.kt
 create mode 100644 visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/VisionForge.kt
 rename visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/{ => html}/headers.kt (95%)
 create mode 100644 visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/htmlExport.kt
 delete mode 100644 visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt
 create mode 100644 visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/plotlyCommon.kt
 delete mode 100644 visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/jsMain.kt
 rename visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/{PlotlyPlugin.kt => plotlyJs.kt} (53%)
 create mode 100644 visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyHeaders.kt
 create mode 100644 visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyJvm.kt

diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
index 7aa28b22..f3aa4417 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
@@ -1,9 +1,9 @@
 package hep.dataforge.vision.gdml.demo
 
-import hep.dataforge.Application
 import hep.dataforge.context.Global
-import hep.dataforge.startApplication
+import hep.dataforge.vision.Application
 import hep.dataforge.vision.gdml.toVision
+import hep.dataforge.vision.startApplication
 import kotlinx.browser.document
 import react.child
 import react.dom.render
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
index 7ac877f5..9d66b314 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
@@ -1,8 +1,8 @@
 package ru.mipt.npm.muon.monitor
 
-import hep.dataforge.Application
 import hep.dataforge.context.Global
-import hep.dataforge.startApplication
+import hep.dataforge.vision.Application
+import hep.dataforge.vision.startApplication
 import io.ktor.client.HttpClient
 import io.ktor.client.features.json.JsonFeature
 import io.ktor.client.features.json.serializer.KotlinxSerializer
diff --git a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
index 2dacf455..c5d3db45 100644
--- a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
+++ b/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
@@ -4,7 +4,7 @@ import hep.dataforge.meta.Meta
 import hep.dataforge.meta.invoke
 import hep.dataforge.names.toName
 import hep.dataforge.vision.Colors
-import hep.dataforge.vision.layout.Page
+import hep.dataforge.vision.VisionLayout
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.visible
@@ -15,12 +15,12 @@ import kotlin.math.sin
 import kotlin.random.Random
 
 
-fun Page<Solid>.demo(name: String, title: String = name, block: SolidGroup.() -> Unit) {
+fun VisionLayout<Solid>.demo(name: String, title: String = name, block: SolidGroup.() -> Unit) {
     val meta = Meta {
         "title" put title
     }
-    val output = output(name.toName(), meta)?: error("Output with name $name not found")
-    output.solidGroup (builder = block)
+    val vision = SolidGroup(block)
+    render(name.toName(), vision)
 }
 
 val canvasOptions = Canvas3DOptions {
@@ -35,7 +35,7 @@ val canvasOptions = Canvas3DOptions {
     }
 }
 
-fun Page<Solid>.showcase() {
+fun VisionLayout<Solid>.showcase() {
     demo("shapes", "Basic shapes") {
         box(100.0, 100.0, 100.0) {
             z = -110.0
@@ -136,14 +136,14 @@ fun Page<Solid>.showcase() {
     }
 }
 
-fun Page<Solid>.showcaseCSG() {
+fun VisionLayout<Solid>.showcaseCSG() {
     demo("CSG.simple", "CSG operations") {
         composite(CompositeType.INTERSECT) {
             y = 300
             box(100, 100, 100) {
                 z = 50
             }
-            sphere(50){
+            sphere(50) {
                 detail = 32
             }
             material {
@@ -154,7 +154,7 @@ fun Page<Solid>.showcaseCSG() {
             box(100, 100, 100) {
                 z = 50
             }
-            sphere(50){
+            sphere(50) {
                 detail = 32
             }
             color("lightgreen")
@@ -165,7 +165,7 @@ fun Page<Solid>.showcaseCSG() {
             box(100, 100, 100) {
                 z = 50
             }
-            sphere(50){
+            sphere(50) {
                 detail = 32
             }
             color("teal")
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
index 2e613622..8a2bcdd0 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
@@ -1,9 +1,9 @@
 package hep.dataforge.vision.solid.demo
 
-import hep.dataforge.Application
-import hep.dataforge.startApplication
+import hep.dataforge.vision.Application
 import hep.dataforge.vision.solid.x
 import hep.dataforge.vision.solid.y
+import hep.dataforge.vision.startApplication
 import kotlinx.browser.document
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
index f7268a12..92d63d16 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
@@ -5,8 +5,7 @@ import hep.dataforge.meta.Meta
 import hep.dataforge.meta.get
 import hep.dataforge.meta.string
 import hep.dataforge.names.Name
-import hep.dataforge.vision.layout.Output
-import hep.dataforge.vision.layout.Page
+import hep.dataforge.vision.VisionLayout
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.three.ThreeCanvas
 import hep.dataforge.vision.solid.three.ThreePlugin
@@ -20,7 +19,7 @@ import org.w3c.dom.Element
 import org.w3c.dom.HTMLDivElement
 import org.w3c.dom.HTMLElement
 
-class ThreeDemoGrid(element: Element) : Page<Solid> {
+class ThreeDemoGrid(element: Element) : VisionLayout<Solid> {
     private lateinit var navigationElement: HTMLElement
     private lateinit var contentElement: HTMLDivElement
 
@@ -47,31 +46,31 @@ class ThreeDemoGrid(element: Element) : Page<Solid> {
         }
     }
 
-
-    @Suppress("UNCHECKED_CAST")
-    override fun output(name: Name, meta: Meta): Output<Solid> = outputs.getOrPut(name) {
-        navigationElement.append {
-            li("nav-item") {
-                a(classes = "nav-link") {
-                    href = "#$name"
-                    +name.toString()
+    override fun render(name: Name, vision: Solid, meta: Meta) {
+        outputs.getOrPut(name) {
+            navigationElement.append {
+                li("nav-item") {
+                    a(classes = "nav-link") {
+                        href = "#$name"
+                        +name.toString()
+                    }
                 }
             }
-        }
-        contentElement.append {
-            div("container") {
-                id = name.toString()
-                hr()
-                h2 { +(meta["title"].string ?: name.toString()) }
-                hr()
-                div {
-                    style = "height: 600px;"
-                    id = "output-$name"
+            contentElement.append {
+                div("container") {
+                    id = name.toString()
+                    hr()
+                    h2 { +(meta["title"].string ?: name.toString()) }
+                    hr()
+                    div {
+                        style = "height: 600px;"
+                        id = "output-$name"
+                    }
                 }
             }
-        }
-        val element = document.getElementById("output-$name") ?: error("Element not found")
-        three.createCanvas(element, canvasOptions)
+            val element = document.getElementById("output-$name") ?: error("Element not found")
+            three.createCanvas(element, canvasOptions)
+        }.render(vision)
     }
 }
 
diff --git a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt b/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt
index 6b5267ff..62b9cc20 100644
--- a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt
+++ b/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt
@@ -3,8 +3,7 @@ package hep.dataforge.vision.solid.demo
 import hep.dataforge.context.Global
 import hep.dataforge.meta.Meta
 import hep.dataforge.names.Name
-import hep.dataforge.vision.layout.Output
-import hep.dataforge.vision.layout.Page
+import hep.dataforge.vision.VisionLayout
 import hep.dataforge.vision.solid.FX3DPlugin
 import hep.dataforge.vision.solid.FXCanvas3D
 import hep.dataforge.vision.solid.Solid
@@ -13,7 +12,7 @@ import javafx.scene.Parent
 import javafx.scene.control.Tab
 import tornadofx.*
 
-class FXDemoGrid : View(title = "DataForge-vis FX demo"), Page<Solid> {
+class FXDemoGrid : View(title = "DataForge-vis FX demo"), VisionLayout<Solid> {
     private val outputs = FXCollections.observableHashMap<Name, FXCanvas3D>()
 
     override val root: Parent = borderpane {
@@ -26,8 +25,8 @@ class FXDemoGrid : View(title = "DataForge-vis FX demo"), Page<Solid> {
 
     private val fx3d = Global.plugins.fetch(FX3DPlugin)
 
-    override fun output(name: Name, meta: Meta): Output<Solid> = outputs.getOrPut(name) {
-        FXCanvas3D(fx3d, canvasOptions)
+    override fun render(name: Name, vision: Solid, meta: Meta) {
+        outputs.getOrPut(name) { FXCanvas3D(fx3d, canvasOptions) }.render(vision)
     }
 
 }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4d9ca164..da9702f9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/playground/src/commonMain/kotlin/visionContext.kt b/playground/src/commonMain/kotlin/visionContext.kt
deleted file mode 100644
index 139597f9..00000000
--- a/playground/src/commonMain/kotlin/visionContext.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/playground/src/jsMain/kotlin/playgroundMain.kt b/playground/src/jsMain/kotlin/playgroundMain.kt
index 6c577e6f..a2a4bd90 100644
--- a/playground/src/jsMain/kotlin/playgroundMain.kt
+++ b/playground/src/jsMain/kotlin/playgroundMain.kt
@@ -1,27 +1,9 @@
-import hep.dataforge.context.Context
-import hep.dataforge.context.Global
-import hep.dataforge.meta.DFExperimental
-import hep.dataforge.vision.client.VisionClient
-import hep.dataforge.vision.client.renderAllVisions
-import hep.dataforge.vision.plotly.PlotlyPlugin
-import hep.dataforge.vision.solid.three.ThreePlugin
-import kotlinx.browser.window
+import hep.dataforge.vision.plotly.withPlotly
+import hep.dataforge.vision.renderVisionsInWindow
+import hep.dataforge.vision.solid.three.loadThreeJs
 
-@DFExperimental
 fun main() {
-
-    val visionContext: Context = Global.context("VISION") {
-        plugin(ThreePlugin)
-        plugin(PlotlyPlugin)
-        plugin(VisionClient)
-    }
-
-    //Loading three-js renderer
-    val clientManager = visionContext.plugins.fetch(VisionClient)
-
-    //Fetch from server and render visions for all outputs
-    window.onload = {
-        clientManager.renderAllVisions()
-    }
-    //startApplication(::PlayGroundApp)
+    withPlotly()
+    loadThreeJs()
+    renderVisionsInWindow()
 }
\ No newline at end of file
diff --git a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/generateSchema.kt b/playground/src/jvmMain/kotlin/generateSchema.kt
similarity index 98%
rename from playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/generateSchema.kt
rename to playground/src/jvmMain/kotlin/generateSchema.kt
index a7ccea62..e3411516 100644
--- a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/generateSchema.kt
+++ b/playground/src/jvmMain/kotlin/generateSchema.kt
@@ -1,6 +1,8 @@
-package hep.dataforge.vision.solid
+package hep.dataforge.vision.examples
 
 import com.github.ricky12awesome.jss.encodeToSchema
+import hep.dataforge.vision.solid.SolidGroup
+import hep.dataforge.vision.solid.SolidManager
 import kotlinx.serialization.json.Json
 
 fun main() {
diff --git a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/serverExtensions.kt b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/serverExtensions.kt
deleted file mode 100644
index 2e365104..00000000
--- a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/serverExtensions.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package hep.dataforge.vision.solid
-
-import hep.dataforge.context.Context
-import hep.dataforge.context.Global
-import hep.dataforge.meta.DFExperimental
-import hep.dataforge.vision.ResourceLocation
-import hep.dataforge.vision.VisionManager
-import hep.dataforge.vision.html.HtmlVisionFragment
-import hep.dataforge.vision.makeVisionFile
-import hep.dataforge.vision.scriptHeader
-import hep.dataforge.vision.three.server.VisionServer
-import hep.dataforge.vision.three.server.useScript
-import java.nio.file.Path
-
-
-/**
- * A global vision context used to resolve different vision renderers
- */
-@DFExperimental
-public val VisionForge: Context = Global.context("VISION") {
-    plugin(VisionManager)
-    plugin(SolidManager)
-}
-
-public fun VisionServer.usePlayground(): Unit {
-    useScript("js/visionforge-playground.js")
-}
-
-@DFExperimental
-public fun Context.makeVisionFile(
-    fragment: HtmlVisionFragment,
-    path: Path? = null,
-    title: String = "VisionForge page",
-    resourceLocation: ResourceLocation = ResourceLocation.SYSTEM,
-    show: Boolean = true,
-): Unit = makeVisionFile(fragment, path = path, title = title, show = show) { actualPath ->
-    scriptHeader("js/visionforge-playground.js", actualPath, resourceLocation)
-}
diff --git a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/simpleCube.kt b/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/simpleCube.kt
deleted file mode 100644
index c1d20ef7..00000000
--- a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/simpleCube.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package hep.dataforge.vision.solid
-
-import hep.dataforge.meta.DFExperimental
-import hep.dataforge.vision.ResourceLocation
-import hep.dataforge.vision.VisionManager
-import hep.dataforge.vision.html.fragment
-
-@OptIn(DFExperimental::class)
-fun main() {
-    val fragment = VisionManager.fragment {
-        vision("canvas") {
-            solid {
-                box(100, 100, 100)
-            }
-        }
-    }
-
-    VisionForge.makeVisionFile(fragment = fragment, resourceLocation = ResourceLocation.SYSTEM)
-}
\ No newline at end of file
diff --git a/playground/src/jvmMain/kotlin/plotlyVision.kt b/playground/src/jvmMain/kotlin/plotlyVision.kt
new file mode 100644
index 00000000..ea4be39b
--- /dev/null
+++ b/playground/src/jvmMain/kotlin/plotlyVision.kt
@@ -0,0 +1,25 @@
+package hep.dataforge.vision.examples
+
+import hep.dataforge.meta.DFExperimental
+import hep.dataforge.vision.VisionForge
+import hep.dataforge.vision.VisionManager
+import hep.dataforge.vision.html.fragment
+import hep.dataforge.vision.plotly.plotly
+import hep.dataforge.vision.plotly.withPlotly
+import kscience.plotly.scatter
+
+@DFExperimental
+fun main() {
+    val fragment = VisionManager.fragment {
+        vision {
+            plotly {
+                scatter {
+                    x(1,2,3)
+                    y(5,8,7)
+                }
+            }
+        }
+    }
+
+    VisionForge.withPlotly().makeVisionFile(fragment)
+}
\ No newline at end of file
diff --git a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/randomSpheres.kt b/playground/src/jvmMain/kotlin/randomSpheres.kt
similarity index 86%
rename from playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/randomSpheres.kt
rename to playground/src/jvmMain/kotlin/randomSpheres.kt
index 90031fd3..4d3a773b 100644
--- a/playground/src/jvmMain/kotlin/hep/dataforge/vision/solid/randomSpheres.kt
+++ b/playground/src/jvmMain/kotlin/randomSpheres.kt
@@ -1,9 +1,11 @@
-package hep.dataforge.vision.solid
+package hep.dataforge.vision.examples
 
 import hep.dataforge.meta.DFExperimental
-import hep.dataforge.vision.ResourceLocation
+import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.VisionManager
+import hep.dataforge.vision.html.ResourceLocation
 import hep.dataforge.vision.html.fragment
+import hep.dataforge.vision.solid.*
 import kotlinx.html.h1
 import java.nio.file.Paths
 import kotlin.random.Random
diff --git a/playground/src/jvmMain/kotlin/serverExtensions.kt b/playground/src/jvmMain/kotlin/serverExtensions.kt
new file mode 100644
index 00000000..51aa23af
--- /dev/null
+++ b/playground/src/jvmMain/kotlin/serverExtensions.kt
@@ -0,0 +1,35 @@
+package hep.dataforge.vision.examples
+
+import hep.dataforge.context.Context
+import hep.dataforge.meta.DFExperimental
+import hep.dataforge.vision.html.HtmlVisionFragment
+import hep.dataforge.vision.html.ResourceLocation
+import hep.dataforge.vision.html.scriptHeader
+import hep.dataforge.vision.makeFile
+import hep.dataforge.vision.page
+import hep.dataforge.vision.three.server.VisionServer
+import hep.dataforge.vision.three.server.useScript
+import java.awt.Desktop
+import java.nio.file.Path
+
+
+public fun VisionServer.usePlayground(): Unit {
+    useScript("js/visionforge-playground.js")
+}
+
+@DFExperimental
+public fun Context.makeVisionFile(
+    content: HtmlVisionFragment,
+    path: Path? = null,
+    title: String = "VisionForge page",
+    resourceLocation: ResourceLocation = ResourceLocation.SYSTEM,
+    show: Boolean = true,
+): Unit {
+    val actualPath = page(title, content).makeFile(path) { actualPath ->
+        mapOf("threeJs" to scriptHeader("js/visionforge-playground.js", actualPath, resourceLocation))
+    }
+    if (show) Desktop.getDesktop().browse(actualPath.toFile().toURI())
+}
+//    makeVisionFile(fragment, path = path, title = title, show = show) { actualPath ->
+//    scriptHeader("js/visionforge-playground.js", actualPath, resourceLocation)
+//}
diff --git a/playground/src/jvmMain/kotlin/simpleCube.kt b/playground/src/jvmMain/kotlin/simpleCube.kt
new file mode 100644
index 00000000..b7ac54b9
--- /dev/null
+++ b/playground/src/jvmMain/kotlin/simpleCube.kt
@@ -0,0 +1,22 @@
+package hep.dataforge.vision.examples
+
+import hep.dataforge.meta.DFExperimental
+import hep.dataforge.vision.VisionForge
+import hep.dataforge.vision.VisionManager
+import hep.dataforge.vision.html.ResourceLocation
+import hep.dataforge.vision.html.fragment
+import hep.dataforge.vision.solid.box
+import hep.dataforge.vision.solid.solid
+
+@OptIn(DFExperimental::class)
+fun main() {
+    val content = VisionManager.fragment {
+        vision("canvas") {
+            solid {
+                box(100, 100, 100)
+            }
+        }
+    }
+
+    VisionForge.makeVisionFile(content, resourceLocation = ResourceLocation.SYSTEM)
+}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt
new file mode 100644
index 00000000..2058c3cf
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt
@@ -0,0 +1,5 @@
+package hep.dataforge.vision
+
+import hep.dataforge.context.Context
+
+public expect val VisionForge: Context
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionLayout.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionLayout.kt
new file mode 100644
index 00000000..ae86a0c8
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionLayout.kt
@@ -0,0 +1,8 @@
+package hep.dataforge.vision
+
+import hep.dataforge.meta.Meta
+import hep.dataforge.names.Name
+
+public interface VisionLayout<in V: Vision> {
+    public fun render(name: Name, vision: V, meta: Meta = Meta.EMPTY)
+}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
index 9a831799..ea106cab 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
@@ -3,6 +3,8 @@ package hep.dataforge.vision
 import hep.dataforge.context.*
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
+import hep.dataforge.names.Name
+import hep.dataforge.names.toName
 import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
@@ -75,6 +77,18 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
     }
 }
 
+public abstract class VisionPlugin(meta: Meta = Meta.EMPTY) : AbstractPlugin(meta) {
+    public val visionManager: VisionManager by require(VisionManager)
+
+    protected abstract val visionSerializersModule: SerializersModule
+
+    override fun content(target: String): Map<Name, Any> = when (target) {
+        VisionManager.VISION_SERIALIZER_MODULE_TARGET -> mapOf(tag.toString().toName() to visionSerializersModule)
+        else -> super.content(target)
+    }
+
+}
+
 /**
  * Fetch a [VisionManager] from this plugin
  */
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
new file mode 100644
index 00000000..942d5ff5
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
@@ -0,0 +1,26 @@
+package hep.dataforge.vision.html
+
+import hep.dataforge.context.Context
+import kotlinx.html.*
+
+public data class Page(
+    public val context: Context,
+    public val title: String,
+    public val headers: Map<String, HtmlFragment>,
+    public val content: HtmlVisionFragment
+) {
+    public fun <R> render(root: TagConsumer<R>): R = root.apply {
+        head {
+            meta {
+                charset = "utf-8"
+                headers.values.forEach {
+                    fragment(it)
+                }
+            }
+            title(title)
+        }
+        body {
+            embedVisionFragment(context.visionManager, fragment = content)
+        }
+    }.finalize()
+}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/staticHtmlRender.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/staticHtmlRender.kt
index 5a275e82..ebe63603 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/staticHtmlRender.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/staticHtmlRender.kt
@@ -4,19 +4,18 @@ import hep.dataforge.meta.Meta
 import hep.dataforge.names.Name
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionManager
-import kotlinx.html.DIV
-import kotlinx.html.FlowContent
-import kotlinx.html.script
-import kotlinx.html.unsafe
+import kotlinx.html.*
 
 
-public fun FlowContent.embedVisionFragment(
+public fun TagConsumer<*>.embedVisionFragment(
     manager: VisionManager,
     idPrefix: String? = null,
     fragment: HtmlVisionFragment,
-) {
-    val consumer = object : VisionTagConsumer<Any?>(consumer, idPrefix) {
+): Map<Name, Vision> {
+    val visionMap = HashMap<Name, Vision>()
+    val consumer = object : VisionTagConsumer<Any?>(this@embedVisionFragment, idPrefix) {
         override fun DIV.renderVision(name: Name, vision: Vision, outputMeta: Meta) {
+            visionMap[name] = vision
             script {
                 type = "text/json"
                 attributes["class"] = OUTPUT_DATA_CLASS
@@ -27,17 +26,29 @@ public fun FlowContent.embedVisionFragment(
         }
     }
     fragment(consumer)
+    return visionMap
 }
 
+public fun FlowContent.embedVisionFragment(
+    manager: VisionManager,
+    idPrefix: String? = null,
+    fragment: HtmlVisionFragment,
+): Map<Name, Vision>  = consumer.embedVisionFragment(manager, idPrefix, fragment)
+
 public typealias HtmlVisionRenderer = FlowContent.(name: Name, vision: Vision, meta: Meta) -> Unit
 
-public fun <R> FlowContent.renderVisionFragment(
+public fun FlowContent.renderVisionFragment(
     renderer: DIV.(name: Name, vision: Vision, meta: Meta) -> Unit,
     idPrefix: String? = null,
     fragment: HtmlVisionFragment,
-) {
+): Map<Name, Vision> {
+    val visionMap = HashMap<Name, Vision>()
     val consumer = object : VisionTagConsumer<Any?>(consumer, idPrefix) {
-        override fun DIV.renderVision(name: Name, vision: Vision, outputMeta: Meta) = renderer(name, vision, outputMeta)
+        override fun DIV.renderVision(name: Name, vision: Vision, outputMeta: Meta) {
+            visionMap[name] = vision
+            renderer(name, vision, outputMeta)
+        }
     }
     fragment(consumer)
+    return visionMap
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/layout/Page.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/layout/Page.kt
deleted file mode 100644
index 848e0dc7..00000000
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/layout/Page.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package hep.dataforge.vision.layout
-
-import hep.dataforge.meta.Meta
-import hep.dataforge.names.Name
-import hep.dataforge.vision.Vision
-
-public fun interface Output<in V : Vision> {
-    public fun render(vision: V)
-}
-
-public interface Page<in V : Vision> {
-    public fun output(name: Name, meta: Meta = Meta.EMPTY): Output<V>?
-}
-
-public fun <V : Vision> Page<V>.render(name: Name, vision: V): Unit =
-    output(name)?.render(vision) ?: error("Could not resolve renderer for name $name")
\ No newline at end of file
diff --git a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
index 2d2ad125..22008800 100644
--- a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
+++ b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
@@ -3,7 +3,6 @@ package hep.dataforge.vision.html
 import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.set
 import hep.dataforge.vision.VisionBase
-import hep.dataforge.vision.configure
 import kotlinx.html.*
 import kotlinx.html.stream.createHTML
 import kotlin.test.Test
@@ -54,7 +53,7 @@ class HtmlTagTest {
     fun testStringRender() {
         println(
             createHTML().div {
-                renderVisionFragment<String>(simpleVisionRenderer, fragment = fragment)
+                renderVisionFragment(simpleVisionRenderer, fragment = fragment)
             }
         )
     }
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/Application.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/Application.kt
similarity index 98%
rename from visionforge-core/src/jsMain/kotlin/hep/dataforge/Application.kt
rename to visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/Application.kt
index fb182522..78f6acc8 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/Application.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/Application.kt
@@ -1,4 +1,4 @@
-package hep.dataforge
+package hep.dataforge.vision
 
 import kotlinx.browser.document
 import kotlinx.dom.hasClass
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionForge.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionForge.kt
new file mode 100644
index 00000000..6f6ca28a
--- /dev/null
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionForge.kt
@@ -0,0 +1,22 @@
+package hep.dataforge.vision
+
+import hep.dataforge.context.Context
+import hep.dataforge.context.Global
+import hep.dataforge.vision.client.VisionClient
+import hep.dataforge.vision.client.renderAllVisions
+import kotlinx.browser.window
+
+public actual val VisionForge: Context = Global.context("VisionForge").apply{
+    plugins.fetch(VisionManager)
+    plugins.fetch(VisionClient)
+}
+
+/**
+ * Render all visions in this [window] using current global state of [VisionForge]
+ */
+@JsExport
+public fun renderVisionsInWindow(){
+    window.onload = {
+        VisionForge.plugins[VisionClient]?.renderAllVisions()
+    }
+}
\ No newline at end of file
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/VisionForge.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/VisionForge.kt
new file mode 100644
index 00000000..67b656b8
--- /dev/null
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/VisionForge.kt
@@ -0,0 +1,8 @@
+package hep.dataforge.vision
+
+import hep.dataforge.context.Context
+import hep.dataforge.context.Global
+
+public actual val VisionForge: Context = Global.context("VisionForge").apply{
+    plugins.fetch(VisionManager)
+}
\ No newline at end of file
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/headers.kt
similarity index 95%
rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt
rename to visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/headers.kt
index 5dfb5352..4c458b58 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/headers.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/headers.kt
@@ -1,8 +1,7 @@
-package hep.dataforge.vision
+package hep.dataforge.vision.html
 
-import hep.dataforge.context.Context
 import hep.dataforge.meta.DFExperimental
-import hep.dataforge.vision.html.HtmlFragment
+import hep.dataforge.vision.VisionManager
 import kotlinx.html.link
 import kotlinx.html.script
 import kotlinx.html.unsafe
@@ -100,14 +99,14 @@ internal fun fileCssHeader(
  * Make a script header, automatically copying file to appropriate location
  */
 @DFExperimental
-public fun Context.scriptHeader(
+public fun scriptHeader(
     scriptResource: String,
-    htmlPath: Path,
+    htmlPath: Path?,
     resourceLocation: ResourceLocation,
 ): HtmlFragment {
     val targetPath = when (resourceLocation) {
         ResourceLocation.LOCAL -> checkOrStoreFile(
-            htmlPath,
+            htmlPath ?: Path.of("."),
             Path.of(VISIONFORGE_ASSETS_PATH),
             scriptResource
         )
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/htmlExport.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/htmlExport.kt
new file mode 100644
index 00000000..337ecefc
--- /dev/null
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/htmlExport.kt
@@ -0,0 +1,89 @@
+package hep.dataforge.vision
+
+import hep.dataforge.context.Context
+import hep.dataforge.meta.DFExperimental
+import hep.dataforge.vision.html.HtmlFragment
+import hep.dataforge.vision.html.HtmlVisionFragment
+import hep.dataforge.vision.html.Page
+import kotlinx.html.stream.createHTML
+import java.awt.Desktop
+import java.nio.file.Files
+import java.nio.file.Path
+
+//
+///**
+// * Create a full html string (including the head) for a given [HtmlVisionFragment]
+// */
+//@DFExperimental
+//public fun Context.makeVisionString(
+//    fragment: HtmlVisionFragment,
+//    title: String = "VisionForge page",
+//    headerBuilder: () -> HtmlFragment,
+//): String = createHTML().apply {
+//    head {
+//        meta {
+//            charset = "utf-8"
+//            fragment(headerBuilder())
+//        }
+//        title(title)
+//    }
+//    body {
+//        embedVisionFragment(visionManager, fragment = fragment)
+//    }
+//}.finalize()
+//
+//
+///**
+// * Make a file with the embedded vision data
+// */
+//@DFExperimental
+//public fun Context.makeVisionFile(
+//    fragment: HtmlVisionFragment,
+//    path: Path? = null,
+//    title: String = "VisionForge page",
+//    show: Boolean = true,
+//    headerBuilder: (Path) -> HtmlFragment,
+//) {
+//    val actualFile = path?.let {
+//        Path.of(System.getProperty("user.home")).resolve(path)
+//    } ?: Files.createTempFile("tempPlot", ".html")
+//    //Files.createDirectories(actualFile.parent)
+//    val htmlString = makeVisionString(fragment, title) { headerBuilder(actualFile) }
+//
+//    Files.writeString(actualFile, htmlString)
+//    if (show) {
+//        Desktop.getDesktop().browse(actualFile.toFile().toURI())
+//    }
+//}
+
+@DFExperimental
+public fun Context.page(
+    title: String,
+    content: HtmlVisionFragment,
+    vararg headers: Pair<String, HtmlFragment>,
+): Page = Page(this, title, mapOf(*headers), content)
+
+
+@DFExperimental
+public fun Page.makeFile(
+    path: Path?,
+    defaultHeaders: ((Path) -> Map<String,HtmlFragment>)? = null,
+): Path {
+    val actualFile = path?.let {
+        Path.of(System.getProperty("user.home")).resolve(path)
+    } ?: Files.createTempFile("tempPlot", ".html")
+
+    val actualDefaultHeaders = defaultHeaders?.invoke(actualFile)
+    val actualPage = if(actualDefaultHeaders == null) this else copy(headers = actualDefaultHeaders + headers)
+
+    val htmlString = actualPage.render(createHTML())
+
+    Files.writeString(actualFile, htmlString)
+    return actualFile
+}
+
+@DFExperimental
+public fun Page.show(path: Path? = null) {
+    val actualPath = makeFile(path)
+    Desktop.getDesktop().browse(actualPath.toFile().toURI())
+}
\ No newline at end of file
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt
deleted file mode 100644
index d560f46a..00000000
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/htmlExport.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package hep.dataforge.vision
-
-import hep.dataforge.context.Context
-import hep.dataforge.meta.DFExperimental
-import hep.dataforge.vision.html.HtmlFragment
-import hep.dataforge.vision.html.HtmlVisionFragment
-import hep.dataforge.vision.html.embedVisionFragment
-import hep.dataforge.vision.html.fragment
-import kotlinx.html.body
-import kotlinx.html.head
-import kotlinx.html.meta
-import kotlinx.html.stream.createHTML
-import kotlinx.html.title
-import java.awt.Desktop
-import java.nio.file.Files
-import java.nio.file.Path
-
-
-/**
- * Make a file with the embedded vision data
- */
-@DFExperimental
-public fun Context.makeVisionFile(
-    fragment: HtmlVisionFragment,
-    path: Path? = null,
-    title: String = "VisionForge page",
-    show: Boolean = true,
-    headerBuilder: (Path) -> HtmlFragment,
-) {
-    val actualFile = path?.let {
-        Path.of(System.getProperty("user.home")).resolve(path)
-    } ?: Files.createTempFile("tempPlot", ".html")
-    //Files.createDirectories(actualFile.parent)
-    val htmlString = createHTML().apply {
-        head {
-            meta {
-                charset = "utf-8"
-                fragment(headerBuilder(actualFile))
-            }
-            title(title)
-        }
-        body {
-            embedVisionFragment(visionManager, fragment = fragment)
-        }
-    }.finalize()
-
-    Files.writeString(actualFile, htmlString)
-    if (show) {
-        Desktop.getDesktop().browse(actualFile.toFile().toURI())
-    }
-}
\ No newline at end of file
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt
index 69f484fd..8cef5208 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt
@@ -2,7 +2,6 @@ package hep.dataforge.vision.solid
 
 import hep.dataforge.context.Context
 import hep.dataforge.context.ContextAware
-import hep.dataforge.vision.layout.Output
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import javafx.application.Platform
 import javafx.beans.property.ObjectProperty
@@ -12,8 +11,10 @@ import javafx.scene.paint.Color
 import org.fxyz3d.scene.Axes
 import tornadofx.*
 
-class FXCanvas3D(val plugin: FX3DPlugin, val spec: Canvas3DOptions = Canvas3DOptions.empty()) :
-    Fragment(), Output<Solid>, ContextAware {
+class FXCanvas3D(
+    val plugin: FX3DPlugin,
+    val spec: Canvas3DOptions = Canvas3DOptions.empty(),
+) : Fragment(), ContextAware {
 
     override val context: Context get() = plugin.context
 
@@ -78,7 +79,7 @@ class FXCanvas3D(val plugin: FX3DPlugin, val spec: Canvas3DOptions = Canvas3DOpt
         }
     }
 
-    override fun render(vision: Solid) {
+    fun render(vision: Solid) {
         rootObject = vision
     }
 }
\ No newline at end of file
diff --git a/visionforge-plotly/build.gradle.kts b/visionforge-plotly/build.gradle.kts
index 51419b1e..66c1ca12 100644
--- a/visionforge-plotly/build.gradle.kts
+++ b/visionforge-plotly/build.gradle.kts
@@ -9,6 +9,27 @@ kscience {
 val plotlyVersion = "0.3.1-dev"
 
 kotlin {
+    js{
+        //binaries.library()
+        binaries.executable()
+        browser {
+            webpackTask {
+                this.outputFileName = "js/visionforge-three.js"
+            }
+        }
+    }
+
+    afterEvaluate {
+        val jsBrowserDistribution by tasks.getting
+
+        tasks.getByName<ProcessResources>("jvmProcessResources") {
+            dependsOn(jsBrowserDistribution)
+            afterEvaluate {
+                from(jsBrowserDistribution)
+            }
+        }
+    }
+
     sourceSets {
         commonMain {
             dependencies {
diff --git a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt
index 997a560a..4e81cd12 100644
--- a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt
+++ b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt
@@ -1,12 +1,16 @@
 package hep.dataforge.vision.plotly
 
+import hep.dataforge.meta.Config
 import hep.dataforge.meta.DFExperimental
 import hep.dataforge.vision.VisionBase
 import hep.dataforge.vision.html.VisionOutput
 import kscience.plotly.Plot
 import kscience.plotly.Plotly
 
-public class VisionOfPlotly(public val plot: Plot): VisionBase(plot.config)
+@Serializable
+public class VisionOfPlotly(private val plotConfig: Config) : VisionBase(plotConfig){
+    public val plot: Plot get() = Plot(plotConfig)
+}
 
 @DFExperimental
-public inline fun VisionOutput.plotly(block: Plot.() -> Unit): VisionOfPlotly = VisionOfPlotly(Plotly.plot(block))
\ No newline at end of file
+public inline fun VisionOutput.plotly(block: Plot.() -> Unit): VisionOfPlotly = VisionOfPlotly(Plotly.plot(block).config)
\ No newline at end of file
diff --git a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/plotlyCommon.kt b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/plotlyCommon.kt
new file mode 100644
index 00000000..f7a95f1f
--- /dev/null
+++ b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/plotlyCommon.kt
@@ -0,0 +1,15 @@
+package hep.dataforge.vision.plotly
+
+import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionPlugin
+import kotlinx.serialization.modules.SerializersModule
+import kotlinx.serialization.modules.polymorphic
+import kotlinx.serialization.modules.subclass
+
+public expect class PlotlyPlugin : VisionPlugin
+
+internal val plotlySerializersModule = SerializersModule {
+    polymorphic(Vision::class) {
+        subclass(VisionOfPlotly.serializer())
+    }
+}
\ No newline at end of file
diff --git a/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/jsMain.kt b/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/jsMain.kt
deleted file mode 100644
index ae0ffb37..00000000
--- a/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/jsMain.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package hep.dataforge.vision.plotly
-
-//public fun main() {
-//    val visionContext: Context = Global.context("vision-client")
-//
-//    //Loading three-js renderer
-//    val threePlugin = visionContext.plugins.fetch(PlotlyPlugin)
-//
-//    val clientManager = visionContext.plugins.fetch(VisionClient)
-//
-//    //Fetch from server and render visions for all outputs
-//    window.onload = {
-//        clientManager.renderAllVisions()
-//    }
-//}
\ No newline at end of file
diff --git a/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt b/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt
similarity index 53%
rename from visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt
rename to visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt
index 9e2793dc..097c7a54 100644
--- a/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt
+++ b/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt
@@ -1,23 +1,29 @@
 package hep.dataforge.vision.plotly
 
-import hep.dataforge.context.AbstractPlugin
-import hep.dataforge.context.Context
-import hep.dataforge.context.PluginFactory
-import hep.dataforge.context.PluginTag
+import hep.dataforge.context.*
 import hep.dataforge.meta.Meta
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionForge
+import hep.dataforge.vision.VisionPlugin
 import hep.dataforge.vision.client.ElementVisionRenderer
+import hep.dataforge.vision.client.VisionClient
+import kotlinx.serialization.modules.SerializersModule
 import kscience.plotly.PlotlyConfig
 import kscience.plotly.plot
 import org.w3c.dom.Element
 import kotlin.reflect.KClass
 
-public class PlotlyPlugin : AbstractPlugin(), ElementVisionRenderer {
+public actual class PlotlyPlugin : VisionPlugin(), ElementVisionRenderer {
+    public val visionClient: VisionClient by require(VisionClient)
 
     override val tag: PluginTag get() = Companion.tag
 
-    override fun rateVision(vision: Vision): Int =
-        if (vision is VisionOfPlotly) ElementVisionRenderer.DEFAULT_RATING else ElementVisionRenderer.ZERO_RATING
+    override val visionSerializersModule: SerializersModule get() = plotlySerializersModule
+
+    override fun rateVision(vision: Vision): Int = when (vision) {
+        is VisionOfPlotly -> ElementVisionRenderer.DEFAULT_RATING
+        else -> ElementVisionRenderer.ZERO_RATING
+    }
 
     override fun render(element: Element, vision: Vision, meta: Meta) {
         val plot = (vision as? VisionOfPlotly)?.plot ?: error("Only VisionOfPlotly visions are supported")
@@ -30,4 +36,12 @@ public class PlotlyPlugin : AbstractPlugin(), ElementVisionRenderer {
         override val type: KClass<PlotlyPlugin> = PlotlyPlugin::class
         override fun invoke(meta: Meta, context: Context): PlotlyPlugin = PlotlyPlugin()
     }
+}
+
+/**
+ * Ensure that [PlotlyPlugin] is loaded in the global [VisionForge] context
+ */
+@JsExport
+public fun withPlotly() {
+    VisionForge.plugins.fetch(PlotlyPlugin)
 }
\ No newline at end of file
diff --git a/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyHeaders.kt b/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyHeaders.kt
new file mode 100644
index 00000000..ecf32a1a
--- /dev/null
+++ b/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyHeaders.kt
@@ -0,0 +1,30 @@
+package hep.dataforge.vision.plotly
+
+import hep.dataforge.meta.DFExperimental
+import hep.dataforge.vision.html.HtmlFragment
+import hep.dataforge.vision.html.ResourceLocation
+import hep.dataforge.vision.html.scriptHeader
+import kotlinx.html.script
+import kotlinx.html.unsafe
+import java.nio.file.Path
+
+internal val plotlyScriptLocation = "js/visionforge-three.js"
+
+/**
+ * A header that stores/embeds plotly bundle and registers plotly renderer in the frontend
+ */
+@OptIn(DFExperimental::class)
+public fun plotlyHeader(location: ResourceLocation, filePath: Path? = null): HtmlFragment = {
+    scriptHeader(
+        plotlyScriptLocation,
+        filePath,
+        resourceLocation = location
+    ).invoke(this)
+    script {
+        type = "text/javascript"
+        unsafe {
+            //language=JavaScript
+            +"hep.dataforge.vision.plotly.loadPlotly()"
+        }
+    }
+}
diff --git a/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyJvm.kt b/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyJvm.kt
new file mode 100644
index 00000000..e0a2ec5b
--- /dev/null
+++ b/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyJvm.kt
@@ -0,0 +1,27 @@
+package hep.dataforge.vision.plotly
+
+import hep.dataforge.context.Context
+import hep.dataforge.context.Plugin
+import hep.dataforge.context.PluginFactory
+import hep.dataforge.context.PluginTag
+import hep.dataforge.meta.Meta
+import hep.dataforge.vision.VisionPlugin
+import kotlinx.serialization.modules.SerializersModule
+import kotlin.reflect.KClass
+
+public actual class PlotlyPlugin : VisionPlugin(), Plugin {
+
+    override val tag: PluginTag get() = Companion.tag
+
+    override val visionSerializersModule: SerializersModule get() = plotlySerializersModule
+
+    public companion object : PluginFactory<PlotlyPlugin> {
+        override val tag: PluginTag = PluginTag("vision.plotly", PluginTag.DATAFORGE_GROUP)
+        override val type: KClass<PlotlyPlugin> = PlotlyPlugin::class
+        override fun invoke(meta: Meta, context: Context): PlotlyPlugin = PlotlyPlugin()
+    }
+}
+
+public fun Context.withPlotly(): Context = apply {
+    plugins.fetch(PlotlyPlugin)
+}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
index 1050dff1..96e4f33a 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
@@ -11,7 +11,6 @@ import hep.dataforge.values.ValueType
 import hep.dataforge.values.asValue
 import hep.dataforge.vision.*
 import hep.dataforge.vision.Vision.Companion.VISIBLE_KEY
-import hep.dataforge.vision.layout.Output
 import hep.dataforge.vision.solid.Solid.Companion.DETAIL_KEY
 import hep.dataforge.vision.solid.Solid.Companion.IGNORE_KEY
 import hep.dataforge.vision.solid.Solid.Companion.LAYER_KEY
@@ -108,9 +107,6 @@ public var Solid.layer: Int
         setProperty(LAYER_KEY, value)
     }
 
-@VisionBuilder
-public fun Output<Solid>.solidGroup(builder: SolidGroup.() -> Unit): Unit = render(SolidGroup().apply(builder))
-
 // Common properties
 
 public enum class RotationOrder {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index f55dc1f4..c6d610cb 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -1,18 +1,11 @@
 package hep.dataforge.vision.solid
 
-import hep.dataforge.context.AbstractPlugin
 import hep.dataforge.context.Context
 import hep.dataforge.context.PluginFactory
 import hep.dataforge.context.PluginTag
 import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.Meta
-import hep.dataforge.names.Name
-import hep.dataforge.names.toName
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionBase
-import hep.dataforge.vision.VisionGroupBase
-import hep.dataforge.vision.VisionManager
-import hep.dataforge.vision.VisionManager.Companion.VISION_SERIALIZER_MODULE_TARGET
+import hep.dataforge.vision.*
 import hep.dataforge.vision.html.VisionOutput
 import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.json.Json
@@ -23,16 +16,11 @@ import kotlinx.serialization.modules.subclass
 import kotlin.reflect.KClass
 
 
-public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
-
-    public val visionManager: VisionManager by require(VisionManager)
+public class SolidManager(meta: Meta) : VisionPlugin(meta) {
 
     override val tag: PluginTag get() = Companion.tag
 
-    override fun content(target: String): Map<Name, Any> = when (target) {
-        VISION_SERIALIZER_MODULE_TARGET -> mapOf(tag.name.toName() to serializersModuleForSolids)
-        else -> super.content(target)
-    }
+    override val visionSerializersModule: SerializersModule get() = serializersModuleForSolids
 
     public companion object : PluginFactory<SolidManager> {
         override val tag: PluginTag = PluginTag(name = "vision.solid", group = PluginTag.DATAFORGE_GROUP)
@@ -66,15 +54,18 @@ public class SolidManager(meta: Meta) : AbstractPlugin(meta) {
             }
         }
 
-        internal val jsonForSolids: Json = Json(VisionManager.defaultJson){
+        internal val jsonForSolids: Json = Json(VisionManager.defaultJson) {
             serializersModule = serializersModuleForSolids
         }
 
-        public fun encodeToString(solid: Solid): String = jsonForSolids.encodeToString(PolymorphicSerializer(Vision::class), solid)
+        public fun encodeToString(solid: Solid): String =
+            jsonForSolids.encodeToString(PolymorphicSerializer(Vision::class), solid)
 
-        public fun decodeFromString(str: String): Solid = jsonForSolids.decodeFromString(PolymorphicSerializer(Solid::class), str)
+        public fun decodeFromString(str: String): Solid =
+            jsonForSolids.decodeFromString(PolymorphicSerializer(Solid::class), str)
     }
 }
 
+@VisionBuilder
 @DFExperimental
 public inline fun VisionOutput.solid(block: SolidGroup.() -> Unit): SolidGroup = SolidGroup().apply(block)
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt
index 94c61da5..ae28ca53 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt
@@ -4,16 +4,14 @@ import hep.dataforge.meta.Meta
 import hep.dataforge.meta.MetaBuilder
 import hep.dataforge.meta.double
 import hep.dataforge.meta.get
-import kotlinx.serialization.Serializable
 import kotlin.math.PI
 
 public const val PI2: Float = 2 * PI.toFloat()
 
 @Serializable
-public data class Point2D(public var x: Double, public var y: Double){
-    public constructor(x: Number, y: Number) : this(x.toDouble(), y.toDouble())
-}
+public data class Point2D(public var x: Double, public var y: Double)
 
+public fun Point2D(x: Number, y: Number): Point2D = Point2D(x.toDouble(), y.toDouble())
 
 public fun Point2D.toMeta(): Meta = Meta {
     Solid.X_KEY put x
@@ -28,14 +26,14 @@ public data class Point3D(
     public var y: Double,
     public var z: Double,
 ) {
-    public constructor(x: Number, y: Number, z: Number) : this(x.toDouble(), y.toDouble(), z.toDouble())
-
-    public companion object{
+    public companion object {
         public val ZERO: Point3D = Point3D(0.0, 0.0, 0.0)
         public val ONE: Point3D = Point3D(1.0, 1.0, 1.0)
     }
 }
 
+public fun Point3D(x: Number, y: Number, z: Number): Point3D = Point3D(x.toDouble(), y.toDouble(), z.toDouble())
+
 public operator fun Point3D.plus(other: Point3D): Point3D = Point3D(
     this.x + other.x,
     this.y + other.y,
diff --git a/visionforge-threejs/build.gradle.kts b/visionforge-threejs/build.gradle.kts
index 4075c8df..d692c548 100644
--- a/visionforge-threejs/build.gradle.kts
+++ b/visionforge-threejs/build.gradle.kts
@@ -6,6 +6,12 @@ kscience {
     useSerialization()
 }
 
+kotlin{
+    js{
+        binaries.library()
+    }
+}
+
 dependencies {
     api(project(":visionforge-solid"))
     implementation(npm("three", "0.122.0"))
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
index 6df44691..2a91b8cc 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
@@ -1,12 +1,9 @@
 package hep.dataforge.vision.solid.three
 
-import hep.dataforge.meta.get
-import hep.dataforge.meta.string
 import hep.dataforge.names.Name
 import hep.dataforge.names.plus
 import hep.dataforge.names.toName
 import hep.dataforge.vision.Colors
-import hep.dataforge.vision.layout.Output
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.specifications.*
 import hep.dataforge.vision.solid.three.ThreeMaterials.HIGHLIGHT_MATERIAL
@@ -39,7 +36,7 @@ import kotlin.math.sin
 public class ThreeCanvas(
     public val three: ThreePlugin,
     public val options: Canvas3DOptions,
-) : Output<Solid> {
+)  {
     private var root: Object3D? = null
 
     private val raycaster = Raycaster()
@@ -195,7 +192,7 @@ public class ThreeCanvas(
         }
     }
 
-    public override fun render(vision: Solid) {
+    public fun render(vision: Solid) {
         scene.children.find { it.name == "@root" }?.let {
             //Throw error is something is already rendered here
             error("Root object already is present in the canvas")
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index 080a71f7..8468ba53 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -4,14 +4,13 @@ import hep.dataforge.context.*
 import hep.dataforge.meta.Meta
 import hep.dataforge.names.*
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.client.ElementVisionRenderer
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.visible
 import info.laht.threekt.core.Object3D
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
 import kotlin.collections.set
@@ -151,6 +150,14 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
     }
 }
 
+/**
+ * Ensure that [ThreePlugin] is loaded in the global [VisionForge] context
+ */
+@JsExport
+public fun loadThreeJs(){
+    VisionForge.plugins.fetch(ThreePlugin)
+}
+
 public fun ThreePlugin.render(
     element: HTMLElement,
     obj: Solid,
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
index 86ad4ecc..ab4b5e46 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
@@ -1,20 +1,9 @@
 package hep.dataforge.vision.three.server
 
-import hep.dataforge.context.Global
-import hep.dataforge.vision.client.VisionClient
-import hep.dataforge.vision.client.renderAllVisions
-import hep.dataforge.vision.solid.three.ThreePlugin
-import kotlinx.browser.window
+import hep.dataforge.vision.renderVisionsInWindow
+import hep.dataforge.vision.solid.three.loadThreeJs
 
 public fun main() {
-    //Loading three-js renderer
-    val visionContext = Global.context("threejs") {
-        plugin(ThreePlugin)
-    }
-    val clientManager = visionContext.plugins.fetch(VisionClient)
-
-    //Fetch from server and render visions for all outputs
-    window.onload = {
-        clientManager.renderAllVisions()
-    }
+    loadThreeJs()
+    renderVisionsInWindow()
 }
\ No newline at end of file
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
index ca20c709..d44fa02e 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
@@ -2,10 +2,12 @@ package hep.dataforge.vision.three.server
 
 import hep.dataforge.context.Context
 import hep.dataforge.meta.DFExperimental
-import hep.dataforge.vision.ResourceLocation
 import hep.dataforge.vision.html.HtmlVisionFragment
-import hep.dataforge.vision.makeVisionFile
-import hep.dataforge.vision.scriptHeader
+import hep.dataforge.vision.html.ResourceLocation
+import hep.dataforge.vision.html.scriptHeader
+import hep.dataforge.vision.makeFile
+import hep.dataforge.vision.page
+import java.awt.Desktop
 import java.nio.file.Path
 
 
@@ -14,12 +16,15 @@ public fun VisionServer.useThreeJs(): Unit {
 }
 
 @DFExperimental
-public fun Context.makeVisionFile(
-    fragment: HtmlVisionFragment,
+public fun Context.makeThreeJsFile(
+    content: HtmlVisionFragment,
     path: Path? = null,
     title: String = "VisionForge page",
     resourceLocation: ResourceLocation = ResourceLocation.SYSTEM,
     show: Boolean = true,
-): Unit = makeVisionFile(fragment, path = path, title = title, show = show) { actualPath ->
-    scriptHeader("js/visionforge-three.js", actualPath, resourceLocation)
-}
\ No newline at end of file
+): Unit {
+    val actualPath = page(title, content).makeFile(path) { actualPath ->
+        mapOf("threeJs" to scriptHeader("js/visionforge-three.js", actualPath, resourceLocation))
+    }
+    if (show) Desktop.getDesktop().browse(actualPath.toFile().toURI())
+}

From bb6c6e2175ac83519c0dea267c0352df7eb8bdc9 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 12 Jan 2021 13:00:21 +0300
Subject: [PATCH 075/151] fix imports

---
 .../src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt   | 1 +
 .../kotlin/hep/dataforge/vision/html/HtmlTagTest.kt           | 1 +
 .../kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt      | 1 +
 .../commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt  | 1 +
 .../kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt    | 4 +++-
 .../kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt    | 4 +++-
 6 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
index 942d5ff5..7a12c2ac 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
@@ -1,6 +1,7 @@
 package hep.dataforge.vision.html
 
 import hep.dataforge.context.Context
+import hep.dataforge.vision.visionManager
 import kotlinx.html.*
 
 public data class Page(
diff --git a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
index 22008800..c9429a79 100644
--- a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
+++ b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
@@ -3,6 +3,7 @@ package hep.dataforge.vision.html
 import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.set
 import hep.dataforge.vision.VisionBase
+import hep.dataforge.vision.configure
 import kotlinx.html.*
 import kotlinx.html.stream.createHTML
 import kotlin.test.Test
diff --git a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt
index 4e81cd12..a295deb9 100644
--- a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt
+++ b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt
@@ -4,6 +4,7 @@ import hep.dataforge.meta.Config
 import hep.dataforge.meta.DFExperimental
 import hep.dataforge.vision.VisionBase
 import hep.dataforge.vision.html.VisionOutput
+import kotlinx.serialization.Serializable
 import kscience.plotly.Plot
 import kscience.plotly.Plotly
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt
index ae28ca53..8d4fb85a 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt
@@ -4,6 +4,7 @@ import hep.dataforge.meta.Meta
 import hep.dataforge.meta.MetaBuilder
 import hep.dataforge.meta.double
 import hep.dataforge.meta.get
+import kotlinx.serialization.Serializable
 import kotlin.math.PI
 
 public const val PI2: Float = 2 * PI.toFloat()
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
index 2a91b8cc..9562ddb2 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
@@ -1,5 +1,7 @@
 package hep.dataforge.vision.solid.three
 
+import hep.dataforge.meta.get
+import hep.dataforge.meta.string
 import hep.dataforge.names.Name
 import hep.dataforge.names.plus
 import hep.dataforge.names.toName
@@ -180,7 +182,7 @@ public class ThreeCanvas(
     }
 
     private fun addControls(element: Node, controls: Controls) {
-        when (controls.get("type").string) {
+        when (controls["type"].string) {
             "trackball" -> TrackballControls(camera, element)
             else -> OrbitControls(camera, element)
         }
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index 8468ba53..21afdedb 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -11,6 +11,8 @@ import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.visible
 import info.laht.threekt.core.Object3D
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
 import kotlin.collections.set
@@ -154,7 +156,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
  * Ensure that [ThreePlugin] is loaded in the global [VisionForge] context
  */
 @JsExport
-public fun loadThreeJs(){
+public fun loadThreeJs() {
     VisionForge.plugins.fetch(ThreePlugin)
 }
 

From 716487d70a78a872d7e18b2e3d902b1878e8d7c5 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 12 Jan 2021 13:06:13 +0300
Subject: [PATCH 076/151] Allow replacing root node in ThreeCanvas.kt

---
 .../hep/dataforge/vision/solid/three/ThreeCanvas.kt       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
index 9562ddb2..37e6f241 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
@@ -1,8 +1,10 @@
 package hep.dataforge.vision.solid.three
 
+import hep.dataforge.context.logger
 import hep.dataforge.meta.get
 import hep.dataforge.meta.string
 import hep.dataforge.names.Name
+import hep.dataforge.names.asName
 import hep.dataforge.names.plus
 import hep.dataforge.names.toName
 import hep.dataforge.vision.Colors
@@ -195,10 +197,8 @@ public class ThreeCanvas(
     }
 
     public fun render(vision: Solid) {
-        scene.children.find { it.name == "@root" }?.let {
-            //Throw error is something is already rendered here
-            error("Root object already is present in the canvas")
-        }
+        three.logger.info { "Replacing root node in $this" }
+        scene.findChild("@root".asName())?.let { scene.remove(it) }
 
         val object3D = three.buildObject3D(vision)
         object3D.name = "@root"

From 5eb9925d35bffb3c57cc598e6db0245301e3552e Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 12 Jan 2021 13:25:43 +0300
Subject: [PATCH 077/151] Add plugin updaters to playground examples.

---
 playground/src/jvmMain/kotlin/randomSpheres.kt              | 2 +-
 playground/src/jvmMain/kotlin/simpleCube.kt                 | 3 ++-
 .../commonMain/kotlin/hep/dataforge/vision/VisionManager.kt | 1 -
 .../src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt | 2 +-
 .../kotlin/hep/dataforge/vision/solid/SolidManager.kt       | 6 +++++-
 .../kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt  | 4 ++++
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/playground/src/jvmMain/kotlin/randomSpheres.kt b/playground/src/jvmMain/kotlin/randomSpheres.kt
index 4d3a773b..96431234 100644
--- a/playground/src/jvmMain/kotlin/randomSpheres.kt
+++ b/playground/src/jvmMain/kotlin/randomSpheres.kt
@@ -34,7 +34,7 @@ fun main() {
         }
     }
 
-    VisionForge.makeVisionFile(
+    VisionForge.withSolids().makeVisionFile(
         fragment,
         Paths.get("randomSpheres.html"),
         resourceLocation = ResourceLocation.EMBED
diff --git a/playground/src/jvmMain/kotlin/simpleCube.kt b/playground/src/jvmMain/kotlin/simpleCube.kt
index b7ac54b9..fbcb66e1 100644
--- a/playground/src/jvmMain/kotlin/simpleCube.kt
+++ b/playground/src/jvmMain/kotlin/simpleCube.kt
@@ -7,6 +7,7 @@ import hep.dataforge.vision.html.ResourceLocation
 import hep.dataforge.vision.html.fragment
 import hep.dataforge.vision.solid.box
 import hep.dataforge.vision.solid.solid
+import hep.dataforge.vision.solid.withSolids
 
 @OptIn(DFExperimental::class)
 fun main() {
@@ -18,5 +19,5 @@ fun main() {
         }
     }
 
-    VisionForge.makeVisionFile(content, resourceLocation = ResourceLocation.SYSTEM)
+    VisionForge.withSolids().makeVisionFile(content, resourceLocation = ResourceLocation.SYSTEM)
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
index ea106cab..2465c662 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
@@ -86,7 +86,6 @@ public abstract class VisionPlugin(meta: Meta = Meta.EMPTY) : AbstractPlugin(met
         VisionManager.VISION_SERIALIZER_MODULE_TARGET -> mapOf(tag.toString().toName() to visionSerializersModule)
         else -> super.content(target)
     }
-
 }
 
 /**
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
index 7a12c2ac..213710cf 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
@@ -18,7 +18,7 @@ public data class Page(
                     fragment(it)
                 }
             }
-            title(title)
+            title(this@Page.title)
         }
         body {
             embedVisionFragment(context.visionManager, fragment = content)
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index c6d610cb..db68b53c 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -68,4 +68,8 @@ public class SolidManager(meta: Meta) : VisionPlugin(meta) {
 
 @VisionBuilder
 @DFExperimental
-public inline fun VisionOutput.solid(block: SolidGroup.() -> Unit): SolidGroup = SolidGroup().apply(block)
\ No newline at end of file
+public inline fun VisionOutput.solid(block: SolidGroup.() -> Unit): SolidGroup = SolidGroup().apply(block)
+
+public fun Context.withSolids(): Context = apply {
+    plugins.fetch(SolidManager)
+}
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index 21afdedb..dc20bdce 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -199,4 +199,8 @@ internal fun Object3D.findChild(name: Name): Object3D? {
         name.length == 1 -> this.children.find { it.name == name.tokens.first().toString() }
         else -> findChild(name.tokens.first().asName())?.findChild(name.cutFirst())
     }
+}
+
+public fun Context.withThreeJs(): Context = apply {
+    plugins.fetch(ThreePlugin)
 }
\ No newline at end of file

From 18828e87f2bf1982b724697735061db2162d927c Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 12 Jan 2021 19:41:17 +0300
Subject: [PATCH 078/151] Fix style material bug

---
 .../vision/gdml/demo/GDMLAppComponent.kt      |  4 +-
 .../vision/gdml/demo/GdmlJsDemoApp.kt         |  9 ++++-
 .../kotlin/hep/dataforge/vision/StyleSheet.kt | 15 ++------
 .../hep/dataforge/vision/VisionManager.kt     |  1 +
 .../dataforge/vision/gdml/GDMLTransformer.kt  |  2 +-
 .../vision/solid/three/MeshThreeFactory.kt    |  1 +
 .../vision/solid/three/ThreeCanvas.kt         |  2 +-
 .../vision/solid/three/ThreeMaterials.kt      | 38 +++++++------------
 .../solid/three/ThreeReferenceFactory.kt      |  3 +-
 9 files changed, 31 insertions(+), 44 deletions(-)

diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index e575e103..f8cd3be7 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -29,7 +29,7 @@ import styled.styledDiv
 
 external interface GDMLAppProps : RProps {
     var context: Context
-    var rootObject: Vision?
+    var rootVision: Vision?
     var selected: Name?
 }
 
@@ -45,7 +45,7 @@ external interface GDMLAppProps : RProps {
 val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
     var selected by useState { props.selected }
     var canvas: ThreeCanvas? by useState { null }
-    var vision: Vision? by useState { props.rootObject }
+    var vision: Vision? by useState { props.rootVision }
 
     val onSelect: (Name?) -> Unit = {
         selected = it
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
index f3aa4417..6058db60 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
@@ -3,6 +3,7 @@ package hep.dataforge.vision.gdml.demo
 import hep.dataforge.context.Global
 import hep.dataforge.vision.Application
 import hep.dataforge.vision.gdml.toVision
+import hep.dataforge.vision.solid.three.ThreePlugin
 import hep.dataforge.vision.startApplication
 import kotlinx.browser.document
 import react.child
@@ -14,12 +15,16 @@ private class GDMLDemoApp : Application {
     override fun start(state: Map<String, Any>) {
         val element = document.getElementById("app") ?: error("Element with id 'app' not found on page")
 
-        val context = Global.context("demo") {}
+        val context = Global.context("demo") .apply{
+            plugins.fetch(ThreePlugin)
+        }
         render(element) {
             child(GDMLApp) {
+                val vision = cubes().toVision()
+                //println(context.plugins.fetch(VisionManager).encodeToString(vision))
                 attrs {
                     this.context = context
-                    this.rootObject = cubes().toVision()
+                    this.rootVision = vision
                 }
             }
         }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
index 80d5cdd2..3662be02 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
@@ -99,17 +99,8 @@ public tailrec fun Vision.getStyle(name: String): Meta? =
 /**
  * Resolve an item in all style layers
  */
-public fun Vision.getStyleItems(name: Name): Sequence<MetaItem> {
-    return styles.asSequence().map {
-        getStyle(it)
-    }.map {
-        it[name]
-    }.filterNotNull()
-}
-
-/**
- * Collect all styles for this object in a single laminate
- */
-public val Vision.allStyles: Laminate get() = Laminate(styles.mapNotNull(::getStyle))
+public fun Vision.getStyleItems(name: Name): Sequence<MetaItem> = styles.asSequence().map {
+    getStyle(it)[name]
+}.filterNotNull()
 
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
index 2465c662..210906f1 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
@@ -29,6 +29,7 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
 
     public val jsonFormat: Json
         get() = Json(defaultJson) {
+            encodeDefaults = false
             serializersModule = this@VisionManager.serializersModule
         }
 
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
index 2ac28d6b..a4008d2b 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
@@ -97,7 +97,7 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
     fun configureSolid(root: GDML, obj: Solid, parent: GDMLVolume, solid: GDMLSolid) {
         val material = parent.materialref.resolve(root) ?: GDMLElement(parent.materialref.ref)
 
-        val styleName = "material[${material.name}]"
+        val styleName = "materials.${material.name}"
 
         obj.useStyle(styleName) {
             MATERIAL_COLOR_KEY put random.nextInt(16777216)
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
index f04e7a1a..a9d405f2 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
@@ -42,6 +42,7 @@ public abstract class MeshThreeFactory<in T : Solid>(
 
         //add listener to object properties
         obj.onPropertyChange(three.updateScope) { name ->
+            println("Property $name of mesh ${mesh.name} updated")
             when {
                 name.startsWith(Solid.GEOMETRY_KEY) -> {
                     val oldGeometry = mesh.geometry as BufferGeometry
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
index 37e6f241..f6bec606 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
@@ -197,7 +197,7 @@ public class ThreeCanvas(
     }
 
     public fun render(vision: Solid) {
-        three.logger.info { "Replacing root node in $this" }
+        three.logger.info { "Replacing root node in three canvas" }
         scene.findChild("@root".asName())?.let { scene.remove(it) }
 
         val object3D = three.buildObject3D(vision)
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
index 0403fdb9..218533c6 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
@@ -7,7 +7,6 @@ import hep.dataforge.values.int
 import hep.dataforge.values.string
 import hep.dataforge.vision.Colors
 import hep.dataforge.vision.Vision
-import hep.dataforge.vision.allStyles
 import hep.dataforge.vision.solid.SolidMaterial
 import info.laht.threekt.materials.LineBasicMaterial
 import info.laht.threekt.materials.Material
@@ -83,26 +82,12 @@ public object ThreeMaterials {
         }
     }
 
-    internal fun cacheMeta(meta: Meta): Material = materialCache.getOrPut(meta) {
+    internal fun cacheMaterial(meta: Meta): Material = materialCache.getOrPut(meta) {
         buildMaterial(meta).apply {
             cached = true
         }
     }
 
-
-//    internal fun getMaterial(vision: Vision, cache: Boolean): Material {
-//        val meta = vision.getProperty(SolidMaterial.MATERIAL_KEY, inherit = true).node ?: return DEFAULT
-//        return if (cache) {
-//            materialCache.getOrPut(meta) {
-//                buildMaterial(meta).apply {
-//                    cached = true
-//                }
-//            }
-//        } else {
-//            buildMaterial(meta)
-//        }
-//    }
-
 }
 
 /**
@@ -135,7 +120,6 @@ private var Material.cached: Boolean
 public fun Mesh.updateMaterial(vision: Vision) {
     //val meta = vision.getProperty(SolidMaterial.MATERIAL_KEY, inherit = true).node
     val ownMaterialMeta = vision.getOwnProperty(SolidMaterial.MATERIAL_KEY)
-    val stylesMaterialMeta = vision.allStyles[SolidMaterial.MATERIAL_KEY]
     val parentMaterialMeta = vision.parent?.getProperty(
         SolidMaterial.MATERIAL_KEY,
         inherit = true,
@@ -144,16 +128,22 @@ public fun Mesh.updateMaterial(vision: Vision) {
     )
 
     material = when {
-        ownMaterialMeta == null && stylesMaterialMeta == null && parentMaterialMeta == null -> {
-            //use default is not material properties are defined
-            ThreeMaterials.DEFAULT
-        }
         ownMaterialMeta == null && parentMaterialMeta == null -> {
             //If material is style-based, use cached
-            ThreeMaterials.cacheMeta(stylesMaterialMeta.node ?: Meta.EMPTY)
+            vision.getProperty(
+                SolidMaterial.MATERIAL_KEY,
+                inherit = false,
+                includeStyles = true,
+                includeDefaults = false
+            ).node?.let {
+                ThreeMaterials.cacheMaterial(it)
+            } ?: ThreeMaterials.DEFAULT
         }
         else -> {
-            vision.getProperty(SolidMaterial.MATERIAL_KEY).node?.let {
+            vision.getProperty(
+                SolidMaterial.MATERIAL_KEY,
+                inherit = true
+            ).node?.let {
                 ThreeMaterials.buildMaterial(it)
             } ?: ThreeMaterials.DEFAULT
         }
@@ -182,7 +172,7 @@ public fun Mesh.updateMaterialProperty(vision: Vision, propertyName: Name) {
                     includeStyles = true,
                     includeDefaults = false
                 ).double ?: 1.0
-                material.asDynamic().opacity = opacity
+                material.opacity = opacity
                 material.transparent = opacity < 1.0
                 material.needsUpdate = true
             }
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
index a1a98572..34b1aebd 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
@@ -1,11 +1,9 @@
 package hep.dataforge.vision.solid.three
 
-import hep.dataforge.meta.node
 import hep.dataforge.names.cutFirst
 import hep.dataforge.names.firstOrNull
 import hep.dataforge.names.toName
 import hep.dataforge.vision.solid.Solid
-import hep.dataforge.vision.solid.SolidMaterial
 import hep.dataforge.vision.solid.SolidReferenceGroup
 import hep.dataforge.vision.solid.SolidReferenceGroup.Companion.REFERENCE_CHILD_PROPERTY_PREFIX
 import info.laht.threekt.core.BufferGeometry
@@ -49,6 +47,7 @@ public object ThreeReferenceFactory : ThreeFactory<SolidReferenceGroup> {
         //TODO apply child properties
 
         obj.onPropertyChange(three.updateScope) { name->
+            println("Property $name of reference ${object3D.name} updated")
             if (name.firstOrNull()?.body == REFERENCE_CHILD_PROPERTY_PREFIX) {
                 val childName = name.firstOrNull()?.index?.toName() ?: error("Wrong syntax for reference child property: '$name'")
                 val propertyName = name.cutFirst()

From f7301805fd1817c0756616c4730ab34ff91e1c54 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 13 Jan 2021 10:26:58 +0300
Subject: [PATCH 079/151] Fix property editor displayed properties

---
 .../vision/bootstrap/visionPropertyEditor.kt  |  7 ++-
 .../dataforge/vision/react/PropertyEditor.kt  | 61 +++++++++----------
 .../kotlin/hep/dataforge/vision/Vision.kt     |  4 +-
 3 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
index 2d8b96f0..8156c412 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
@@ -17,11 +17,12 @@ public fun RBuilder.visionPropertyEditor(
 
     card("Properties") {
         propertyEditor(
-            provider = vision.ownProperties,
-            defaultProvider = vision.allProperties(),
+            ownProperties = vision.ownProperties,
+            allProperties = vision.allProperties(),
             updateFlow = vision.propertyChanges,
             descriptor = descriptor,
-            key = key)
+            key = key
+        )
     }
     val styles = if (vision is SolidReference) {
         (vision.styles + vision.prototype.styles).distinct()
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
index bcc27f68..53678275 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
@@ -29,17 +29,17 @@ public external interface PropertyEditorProps : RProps {
     /**
      * Root config object - always non null
      */
-    public var provider: MutableItemProvider
+    public var ownProperties: MutableItemProvider
 
     /**
      * Provide default item (greyed out if used)
      */
-    public var defaultProvider: ItemProvider?
+    public var allProperties: ItemProvider?
 
     /**
-     * Full path to the displayed node in [provider]. Could be empty
+     * Full path to the displayed node in [ownProperties]. Could be empty
      */
-    public var name: Name?
+    public var name: Name
 
     /**
      * Root descriptor
@@ -65,27 +65,21 @@ private val PropertyEditorItem: FunctionalComponent<PropertyEditorProps> =
 
 private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
     var expanded: Boolean by useState { true }
-    val itemName = props.name ?: Name.EMPTY
-    val descriptorItem: ItemDescriptor? =
-        useMemo({ props.descriptor?.get(itemName) }, arrayOf(props.descriptor, itemName))
-
-    var item: MetaItem? by useState { props.provider.getItem(itemName) }
-
+    val descriptorItem: ItemDescriptor? = props.descriptor?.get(props.name)
     if (descriptorItem?.hidden == true) return //fail fast for hidden property
+    var ownProperty: MetaItem? by useState { props.ownProperties.getItem(props.name) }
+    val actualItem: MetaItem? = props.allProperties?.getItem(props.name)
 
-    var actualItem: MetaItem? by useState {
-        item ?: props.defaultProvider?.getItem(itemName) ?: descriptorItem?.defaultItem()
-    }
+    println("Actual item for ${props.name?.toString()} is ${actualItem.toString()}")
 
-    val token = itemName.lastOrNull()?.toString() ?: "Properties"
+    val token = props.name.lastOrNull()?.toString() ?: "Properties"
 
     fun update() {
-        item = props.provider.getItem(itemName)
-        actualItem = item ?: props.defaultProvider?.getItem(itemName) ?: descriptorItem?.defaultItem()
+        ownProperty = props.ownProperties.getItem(props.name)
     }
 
     if (props.updateFlow != null) {
-        useEffectWithCleanup(listOf(props.provider, props.updateFlow)) {
+        useEffectWithCleanup(listOf(props.ownProperties, props.updateFlow)) {
             val updateJob = props.updateFlow!!.onEach { updatedName ->
                 if (updatedName == props.name) {
                     update()
@@ -101,15 +95,15 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
 
     val valueChanged: (Value?) -> Unit = {
         if (it == null) {
-            props.provider.remove(itemName)
+            props.ownProperties.remove(props.name)
         } else {
-            props.provider[itemName] = it
+            props.ownProperties[props.name] = it
         }
         update()
     }
 
     val removeClick: (Event) -> Unit = {
-        props.provider.remove(itemName)
+        props.ownProperties.remove(props.name)
         update()
     }
 
@@ -132,7 +126,7 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
             styledSpan {
                 css {
                     +TreeStyles.treeLabel
-                    if (item == null) {
+                    if (ownProperty == null) {
                         +TreeStyles.treeLabelInactive
                     }
                 }
@@ -148,7 +142,7 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
                     (descriptorItem as? NodeDescriptor)?.items?.keys?.forEach {
                         add(NameToken(it))
                     }
-                    item?.node?.items?.keys?.let { addAll(it) }
+                    ownProperty?.node?.items?.keys?.let { addAll(it) }
                 }
 
                 keys.filter { !it.body.startsWith("@") }.forEach { token ->
@@ -159,8 +153,9 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
                         child(PropertyEditorItem) {
                             attrs {
                                 this.key = props.name.toString()
-                                this.provider = props.provider
-                                this.name = itemName + token
+                                this.ownProperties = props.ownProperties
+                                this.allProperties = props.allProperties
+                                this.name = props.name + token
                                 this.descriptor = props.descriptor
                             }
                         }
@@ -180,7 +175,7 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
                 }
                 styledSpan {
                     css {
-                        if (item == null) {
+                        if (ownProperty == null) {
                             +TreeStyles.treeLabelInactive
                         }
                     }
@@ -192,7 +187,7 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
                     +TreeStyles.resizeableInput
                 }
                 valueChooser(
-                    itemName,
+                    props.name,
                     actualItem,
                     descriptorItem as? ValueDescriptor,
                     valueChanged
@@ -204,7 +199,7 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
                 }
                 +"\u00D7"
                 attrs {
-                    if (item == null) {
+                    if (ownProperty == null) {
                         disabled = true
                     } else {
                         onClickFunction = removeClick
@@ -222,8 +217,8 @@ public val PropertyEditor: FunctionalComponent<PropertyEditorProps> = functional
     child(PropertyEditorItem) {
         attrs {
             this.key = ""
-            this.provider = props.provider
-            this.defaultProvider = props.defaultProvider
+            this.ownProperties = props.ownProperties
+            this.allProperties = props.allProperties
             this.name = Name.EMPTY
             this.descriptor = props.descriptor
             this.scope = props.scope
@@ -232,8 +227,8 @@ public val PropertyEditor: FunctionalComponent<PropertyEditorProps> = functional
 }
 
 public fun RBuilder.propertyEditor(
-    provider: MutableItemProvider,
-    defaultProvider: ItemProvider?,
+    ownProperties: MutableItemProvider,
+    allProperties: ItemProvider?,
     updateFlow: Flow<Name>? = null,
     descriptor: NodeDescriptor? = null,
     scope: CoroutineScope? = null,
@@ -241,8 +236,8 @@ public fun RBuilder.propertyEditor(
 ) {
     child(PropertyEditor) {
         attrs {
-            this.provider = provider
-            this.defaultProvider = defaultProvider
+            this.ownProperties = ownProperties
+            this.allProperties = allProperties
             this.updateFlow = updateFlow
             this.descriptor = descriptor
             this.key = key?.toString() ?: ""
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 4e3b65a1..503e9485 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -134,8 +134,8 @@ public fun Vision.allProperties(
 ): MutableItemProvider = object : MutableItemProvider {
     override fun getItem(name: Name): MetaItem? = getProperty(
         name,
-        inherit = inherit ?: (descriptor?.get(name)?.inherited != false),
-        includeStyles = includeStyles ?: (descriptor?.get(name)?.usesStyles == true),
+        inherit = inherit ?: (descriptor?.get(name)?.inherited == true),
+        includeStyles = includeStyles ?: (descriptor?.get(name)?.usesStyles != false),
         includeDefaults = includeDefaults
     )
 

From 4820082248cf39327f366a849e50ac0013020210 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 13 Jan 2021 10:58:50 +0300
Subject: [PATCH 080/151] Hide nodes without visible children in the property
 editor

---
 .../vision/bootstrap/tabComponent.kt          |  2 +-
 .../vision/bootstrap/threeControls.kt         |  2 +-
 .../dataforge/vision/react/PropertyEditor.kt  | 23 ++++++++++---------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt
index 5f22a353..fa61d3d4 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt
@@ -45,7 +45,7 @@ public val TabPane: FunctionalComponent<TabPaneProps> = functionalComponent("Tab
                         +(cp.title ?: cp.id)
                         attrs {
                             if (cp.id == activeTab) {
-                                classes += "active"
+                                classes = classes + "active"
                             }
                             onClickFunction = {
                                 activeTab = cp.id
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
index 7c26abbf..33b94244 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
@@ -22,7 +22,7 @@ public external interface ThreeControlsProps : RProps {
 @JsExport
 public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalComponent { props ->
     val vision = props.canvas.content
-    tabPane {
+    tabPane(if (props.selected != null) "Properties" else null) {
         tab("Canvas") {
             card("Canvas configuration") {
                 canvasControls(props.canvas)
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
index 53678275..28432ab0 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
@@ -66,12 +66,9 @@ private val PropertyEditorItem: FunctionalComponent<PropertyEditorProps> =
 private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
     var expanded: Boolean by useState { true }
     val descriptorItem: ItemDescriptor? = props.descriptor?.get(props.name)
-    if (descriptorItem?.hidden == true) return //fail fast for hidden property
     var ownProperty: MetaItem? by useState { props.ownProperties.getItem(props.name) }
     val actualItem: MetaItem? = props.allProperties?.getItem(props.name)
 
-    println("Actual item for ${props.name?.toString()} is ${actualItem.toString()}")
-
     val token = props.name.lastOrNull()?.toString() ?: "Properties"
 
     fun update() {
@@ -108,6 +105,17 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
     }
 
     if (actualItem is NodeItem) {
+        val keys = buildSet {
+            (descriptorItem as? NodeDescriptor)?.items?.filterNot {
+                it.key.startsWith("@")  || it.value.hidden
+            }?.forEach {
+                add(NameToken(it.key))
+            }
+            ownProperty?.node?.items?.keys?.filterNot { it.body.startsWith("@") }?.let { addAll(it) }
+        }
+        // Do not show nodes without visible children
+        if (keys.isEmpty()) return
+
         styledDiv {
             css {
                 +TreeStyles.treeLeaf
@@ -138,14 +146,7 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
                 css {
                     +TreeStyles.tree
                 }
-                val keys = buildSet {
-                    (descriptorItem as? NodeDescriptor)?.items?.keys?.forEach {
-                        add(NameToken(it))
-                    }
-                    ownProperty?.node?.items?.keys?.let { addAll(it) }
-                }
-
-                keys.filter { !it.body.startsWith("@") }.forEach { token ->
+                keys.forEach { token ->
                     styledLi {
                         css {
                             +TreeStyles.treeItem

From 19513656bd42a0dc10749cf35c7ccbf997024e28 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 13 Jan 2021 12:38:42 +0300
Subject: [PATCH 081/151] Remove duplicating property update notification in
 VisionBase

---
 .../dataforge/vision/react/valueChooser.kt    | 20 +++++------
 .../kotlin/hep/dataforge/vision/VisionBase.kt | 34 +++++++++----------
 .../vision/solid/three/MeshThreeFactory.kt    |  1 -
 .../solid/three/ThreeReferenceFactory.kt      |  1 -
 4 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
index 86af2e4c..6c043e19 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
@@ -30,7 +30,7 @@ public val StringValueChooser: FunctionalComponent<ValueChooserProps> =
         val keyDown: (Event) -> Unit = { event ->
             if (event.type == "keydown" && event.asDynamic().key == "Enter") {
                 value = (event.target as HTMLInputElement).value
-                if(value!= props.item.string) {
+                if (value != props.item.string) {
                     props.valueChanged?.invoke(value.asValue())
                 }
             }
@@ -50,16 +50,14 @@ public val StringValueChooser: FunctionalComponent<ValueChooserProps> =
 @JsExport
 public val BooleanValueChooser: FunctionalComponent<ValueChooserProps> =
     functionalComponent("BooleanValueChooser") { props ->
-        var checkedValue by useState(props.item.boolean ?: false)
         val handleChange: (Event) -> Unit = {
             val newValue = (it.target as HTMLInputElement).checked
-            checkedValue = newValue
             props.valueChanged?.invoke(newValue.asValue())
         }
         styledInput(type = InputType.checkBox) {
             attrs {
-                this.attributes["indeterminate"] = (checkedValue == null).toString()
-                checked = checkedValue
+                //this.attributes["indeterminate"] = (props.item == null).toString()
+                defaultChecked = props.item.boolean ?: false
                 onChangeFunction = handleChange
             }
         }
@@ -68,24 +66,24 @@ public val BooleanValueChooser: FunctionalComponent<ValueChooserProps> =
 @JsExport
 public val NumberValueChooser: FunctionalComponent<ValueChooserProps> =
     functionalComponent("NumberValueChooser") { props ->
-        var value by useState(props.item.string ?: "")
+        var innerValue by useState(props.item.string ?: "")
         val keyDown: (Event) -> Unit = { event ->
             if (event.type == "keydown" && event.asDynamic().key == "Enter") {
-                value = (event.target as HTMLInputElement).value
-                val number = value.toDoubleOrNull()
+                innerValue = (event.target as HTMLInputElement).value
+                val number = innerValue.toDoubleOrNull()
                 if (number == null) {
-                    console.error("The input value $value is not a number")
+                    console.error("The input value $innerValue is not a number")
                 } else {
                     props.valueChanged?.invoke(number.asValue())
                 }
             }
         }
         val handleChange: (Event) -> Unit = {
-            value = (it.target as HTMLInputElement).value
+            innerValue = (it.target as HTMLInputElement).value
         }
         styledInput(type = InputType.number) {
             attrs {
-                this.value = value
+                value = innerValue
                 onKeyDownFunction = keyDown
                 onChangeFunction = handleChange
                 props.descriptor?.attributes?.get("step").string?.let {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index e04be28f..b3a2fafa 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -34,16 +34,16 @@ internal data class PropertyListener(
 @SerialName("vision")
 public open class VisionBase(internal var properties: Config? = null) : Vision {
 
-    init {
-        //used during deserialization only
-        properties?.onChange(this) { name, oldItem, newItem ->
-            if (oldItem != newItem) {
-                scope.launch {
-                    notifyPropertyChanged(name)
-                }
-            }
-        }
-    }
+//    init {
+//        //used during deserialization only
+//        properties?.onChange(this) { name, oldItem, newItem ->
+//            if (oldItem != newItem) {
+//                scope.launch {
+//                    notifyPropertyChanged(name)
+//                }
+//            }
+//        }
+//    }
 
     @Transient
     override var parent: VisionGroup? = null
@@ -54,13 +54,13 @@ public open class VisionBase(internal var properties: Config? = null) : Vision {
     protected fun getOrCreateConfig(): Config {
         if (properties == null) {
             val newProperties = Config()
-            newProperties.onChange(this) { name, oldItem, newItem ->
-                if (oldItem != newItem) {
-                    scope.launch {
-                        notifyPropertyChanged(name)
-                    }
-                }
-            }
+//            newProperties.onChange(this) { name, oldItem, newItem ->
+//                if (oldItem != newItem) {
+//                    scope.launch {
+//                        notifyPropertyChanged(name)
+//                    }
+//                }
+//            }
             properties = newProperties
         }
         return properties!!
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
index a9d405f2..f04e7a1a 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
@@ -42,7 +42,6 @@ public abstract class MeshThreeFactory<in T : Solid>(
 
         //add listener to object properties
         obj.onPropertyChange(three.updateScope) { name ->
-            println("Property $name of mesh ${mesh.name} updated")
             when {
                 name.startsWith(Solid.GEOMETRY_KEY) -> {
                     val oldGeometry = mesh.geometry as BufferGeometry
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
index 34b1aebd..cbee5aa7 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
@@ -47,7 +47,6 @@ public object ThreeReferenceFactory : ThreeFactory<SolidReferenceGroup> {
         //TODO apply child properties
 
         obj.onPropertyChange(three.updateScope) { name->
-            println("Property $name of reference ${object3D.name} updated")
             if (name.firstOrNull()?.body == REFERENCE_CHILD_PROPERTY_PREFIX) {
                 val childName = name.firstOrNull()?.index?.toName() ?: error("Wrong syntax for reference child property: '$name'")
                 val propertyName = name.cutFirst()

From dab93fc136be370ff1bbef394232993cf8dd9b82 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 26 Jan 2021 21:05:56 +0300
Subject: [PATCH 082/151] [WIP] Documentation update

---
 README.md                                     |  10 ++--
 build.gradle.kts                              |   4 +-
 demo/gdml/README.md                           |   2 +-
 demo/muon-monitor/README.md                   |   2 +-
 demo/spatial-showcase/README.md               |   4 +-
 {doc => docs}/Dependency structure.vsdx       | Bin
 {doc => docs}/resources/class-diag-core.png   | Bin
 {doc => docs}/resources/class-diag-solid.png  | Bin
 {doc => docs}/resources/gdml-demo.png         | Bin
 {doc => docs}/resources/muon-monitor.png      | Bin
 .../resources/spatial-showcase-FX.png         | Bin
 {doc => docs}/resources/spatial-showcase.png  | Bin
 docs/uml/Vision.puml                          |  45 ++++++++++++++++++
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 .../src/jsMain/kotlin/playgroundMain.kt       |   1 +
 settings.gradle.kts                           |   4 +-
 .../hep/dataforge/vision/react/MetaViewer.kt  |   8 ++--
 .../dataforge/vision/react/PropertyEditor.kt  |   2 +-
 .../kotlin/hep/dataforge/vision/Colors.kt     |   6 +--
 .../kotlin/hep/dataforge/vision/StyleSheet.kt |   2 +-
 .../kotlin/hep/dataforge/vision/Vision.kt     |   2 +-
 .../kotlin/hep/dataforge/vision/VisionBase.kt |  22 +--------
 .../kotlin/hep/dataforge/vision/misc.kt       |   6 +--
 .../dataforge/vision/client/elementOutput.kt  |   2 +-
 .../hep/dataforge/vision/editor/FXMeta.kt     |   2 +-
 .../dataforge/vision/editor/ValueChooser.kt   |   6 +--
 .../hep/dataforge/vision/solid/FX3DPlugin.kt  |   2 +-
 .../hep/dataforge/vision/solid/FXMaterials.kt |   8 ++--
 .../hep/dataforge/vision/solid/ConvexTest.kt  |   2 +-
 visionforge-threejs/build.gradle.kts          |   4 +-
 .../vision/solid/three/ThreeFactory.kt        |   2 +-
 .../vision/solid/three/ThreeMaterials.kt      |   4 +-
 32 files changed, 91 insertions(+), 63 deletions(-)
 rename {doc => docs}/Dependency structure.vsdx (100%)
 rename {doc => docs}/resources/class-diag-core.png (100%)
 rename {doc => docs}/resources/class-diag-solid.png (100%)
 rename {doc => docs}/resources/gdml-demo.png (100%)
 rename {doc => docs}/resources/muon-monitor.png (100%)
 rename {doc => docs}/resources/spatial-showcase-FX.png (100%)
 rename {doc => docs}/resources/spatial-showcase.png (100%)
 create mode 100644 docs/uml/Vision.puml

diff --git a/README.md b/README.md
index ad589f69..df55c37c 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ The `visionforge-core` module also includes configuration editors for JS (in `js
 
 **Class diagram:**
 
-![](doc/resources/class-diag-core.png)
+![](docs/resources/class-diag-core.png)
 
 
 ### visionforge-solid
@@ -82,7 +82,7 @@ Includes common classes and serializers for 3D visualization, as well as Three.j
 
 **Class diagram:**
 
-![](doc/resources/class-diag-solid.png)
+![](docs/resources/class-diag-solid.png)
 
 ##### Prototypes
 
@@ -127,7 +127,7 @@ Some shapes will also periodically change their color and visibility.
 
 **Example view:**
 
-![](doc/resources/spatial-showcase.png)
+![](docs/resources/spatial-showcase.png)
 
 
 ### Full-Stack Application Example - Muon Monitor Visualization
@@ -139,7 +139,7 @@ A full-stack application example, showing the
 
 **Example view:**
 
-![](doc/resources/muon-monitor.png)
+![](docs/resources/muon-monitor.png)
 
 
 ### GDML Example
@@ -150,7 +150,7 @@ Visualization example for geometry defined as GDML file.
 
 ##### Example view:
 
-![](doc/resources/gdml-demo.png)
+![](docs/resources/gdml-demo.png)
 
 
 ## Thanks and references
diff --git a/build.gradle.kts b/build.gradle.kts
index 4589fe5e..1b60596b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     id("ru.mipt.npm.project")
 }
 
-val dataforgeVersion by extra("0.3.0-dev")
+val dataforgeVersion by extra("0.3.0-dev-1")
 val ktorVersion by extra("1.5.0")
 val htmlVersion by extra("0.7.2")
 val kotlinWrappersVersion by extra("pre.129-kotlin-1.4.20")
@@ -17,7 +17,7 @@ allprojects {
     }
 
     group = "hep.dataforge"
-    version = "0.2.0-dev-3"
+    version = "0.2.0-dev-4"
 }
 
 val githubProject by extra("visionforge")
diff --git a/demo/gdml/README.md b/demo/gdml/README.md
index 5bdee058..9a20ac55 100644
--- a/demo/gdml/README.md
+++ b/demo/gdml/README.md
@@ -12,4 +12,4 @@ drag-and-drop GDML file to the window to see visualization. For an example file,
 
 ##### Example view:
 
-![](../../doc/resources/gdml-demo.png)
+![](../../docs/resources/gdml-demo.png)
diff --git a/demo/muon-monitor/README.md b/demo/muon-monitor/README.md
index 739a4956..1949cb1e 100644
--- a/demo/muon-monitor/README.md
+++ b/demo/muon-monitor/README.md
@@ -30,5 +30,5 @@ run `demo/muon-monitor/application/run` task.
 
 ##### Example view:
 
-![](../../doc/resources/muon-monitor.png)
+![](../../docs/resources/muon-monitor.png)
 
diff --git a/demo/spatial-showcase/README.md b/demo/spatial-showcase/README.md
index 41d3a5e3..2b30ef3e 100644
--- a/demo/spatial-showcase/README.md
+++ b/demo/spatial-showcase/README.md
@@ -12,8 +12,8 @@ To see Java FX demo, run `demo/spatial-showcase/Tasks/application/run` Gradle ta
 
 ##### Example view for JS:
 
-![](../../doc/resources/spatial-showcase.png)
+![](../../docs/resources/spatial-showcase.png)
 
 ##### Example view for Java FX:
 
-![](../../doc/resources/spatial-showcase-FX.png)
+![](../../docs/resources/spatial-showcase-FX.png)
diff --git a/doc/Dependency structure.vsdx b/docs/Dependency structure.vsdx
similarity index 100%
rename from doc/Dependency structure.vsdx
rename to docs/Dependency structure.vsdx
diff --git a/doc/resources/class-diag-core.png b/docs/resources/class-diag-core.png
similarity index 100%
rename from doc/resources/class-diag-core.png
rename to docs/resources/class-diag-core.png
diff --git a/doc/resources/class-diag-solid.png b/docs/resources/class-diag-solid.png
similarity index 100%
rename from doc/resources/class-diag-solid.png
rename to docs/resources/class-diag-solid.png
diff --git a/doc/resources/gdml-demo.png b/docs/resources/gdml-demo.png
similarity index 100%
rename from doc/resources/gdml-demo.png
rename to docs/resources/gdml-demo.png
diff --git a/doc/resources/muon-monitor.png b/docs/resources/muon-monitor.png
similarity index 100%
rename from doc/resources/muon-monitor.png
rename to docs/resources/muon-monitor.png
diff --git a/doc/resources/spatial-showcase-FX.png b/docs/resources/spatial-showcase-FX.png
similarity index 100%
rename from doc/resources/spatial-showcase-FX.png
rename to docs/resources/spatial-showcase-FX.png
diff --git a/doc/resources/spatial-showcase.png b/docs/resources/spatial-showcase.png
similarity index 100%
rename from doc/resources/spatial-showcase.png
rename to docs/resources/spatial-showcase.png
diff --git a/docs/uml/Vision.puml b/docs/uml/Vision.puml
new file mode 100644
index 00000000..2028b097
--- /dev/null
+++ b/docs/uml/Vision.puml
@@ -0,0 +1,45 @@
+@startuml
+'https://plantuml.com/class-diagram
+
+interface Vision{
+    val parent: Vision?
+    fun getProperty(name): MetaItem?
+    fun setProperty(name, value)
+}
+
+class VisionBase{
+    basic vision
+    implementation
+}
+Vision <|-- VisionBase
+
+interface VisionGroup{
+    A group of Visions
+}
+Vision <|-- VisionGroup
+
+interface Solid{
+    The base for 3D geometry
+}
+
+Vision <|-- Solid
+
+class SolidGroup
+
+Solid <|-- SolidGroup
+VisionGroup <|-- SolidGroup
+
+class Composite
+Solid <|-- Composite
+VisionGroup <|-- Composite
+
+class Box
+Solid <|-- Box
+
+class Tube
+Solid <|-- Tube
+
+class Sphere
+Solid <|-- Sphere
+
+@enduml
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index da9702f9..28ff446a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/playground/src/jsMain/kotlin/playgroundMain.kt b/playground/src/jsMain/kotlin/playgroundMain.kt
index a2a4bd90..b69e8a65 100644
--- a/playground/src/jsMain/kotlin/playgroundMain.kt
+++ b/playground/src/jsMain/kotlin/playgroundMain.kt
@@ -1,3 +1,4 @@
+//import hep.dataforge.vision.plotly.withPlotly
 import hep.dataforge.vision.plotly.withPlotly
 import hep.dataforge.vision.renderVisionsInWindow
 import hep.dataforge.vision.solid.three.loadThreeJs
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 36931914..9da6e3f2 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
-    val kotlinVersion = "1.4.21"
-    val toolsVersion = "0.7.1"
+    val kotlinVersion = "1.4.30-RC"
+    val toolsVersion = "0.7.3-1.4.30-RC"
 
     repositories {
         mavenLocal()
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
index b3b1b25f..14cb4bc1 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
@@ -1,8 +1,8 @@
 package hep.dataforge.vision.react
 
 import hep.dataforge.meta.Meta
-import hep.dataforge.meta.NodeItem
-import hep.dataforge.meta.ValueItem
+import hep.dataforge.meta.MetaItemNode
+import hep.dataforge.meta.MetaItemValue
 import hep.dataforge.meta.descriptors.ItemDescriptor
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.descriptors.defaultItem
@@ -52,7 +52,7 @@ private fun RBuilder.metaViewerItem(props: MetaViewerProps) {
     }
 
     when (actualItem) {
-        is NodeItem -> {
+        is MetaItemNode -> {
             styledDiv {
                 css {
                     +TreeStyles.treeLeaf
@@ -109,7 +109,7 @@ private fun RBuilder.metaViewerItem(props: MetaViewerProps) {
                 }
             }
         }
-        is ValueItem -> {
+        is MetaItemValue -> {
             styledDiv {
                 css {
                     +TreeStyles.treeLeaf
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt b/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
index 28432ab0..dbee8a29 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
+++ b/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
@@ -104,7 +104,7 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
         update()
     }
 
-    if (actualItem is NodeItem) {
+    if (actualItem is MetaItemNode) {
         val keys = buildSet {
             (descriptorItem as? NodeDescriptor)?.items?.filterNot {
                 it.key.startsWith("@")  || it.value.hidden
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
index 605f398c..c69e69fa 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
@@ -10,7 +10,7 @@ import kotlin.math.max
  * Definitions of common colors. Taken from
  * https://github.com/markaren/three.kt/blob/master/threejs-wrapper/src/main/kotlin/info/laht/threekt/math/ColorConstants.kt
  */
-@Suppress("NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING", "NO_EXPLICIT_RETURN_TYPE_IN_API_MODE_WARNING")
+@Suppress("NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING", "NO_EXPLICIT_RETURN_TYPE_IN_API_MODE_WARNING", "unused")
 public object Colors {
     const val aliceblue = 0xF0F8FF
     const val antiquewhite = 0xFAEBD7
@@ -192,7 +192,7 @@ public object Colors {
      */
     fun fromMeta(item: MetaItem): String {
         return when (item) {
-            is NodeItem -> {
+            is MetaItemNode -> {
                 val node = item.node
                 rgbToString(
                     node[RED_KEY].number?.toByte()?.toUByte() ?: 0u,
@@ -200,7 +200,7 @@ public object Colors {
                     node[BLUE_KEY].number?.toByte()?.toUByte() ?: 0u
                 )
             }
-            is ValueItem -> {
+            is MetaItemValue -> {
                 if (item.value.type == ValueType.NUMBER) {
                     rgbToString(item.value.int)
                 } else {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
index 3662be02..233afde7 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
@@ -40,7 +40,7 @@ public inline class StyleSheet(private val owner: VisionGroup) {
      * Create and set a style
      */
     public operator fun set(key: String, builder: MetaBuilder.() -> Unit) {
-        val newStyle = get(key)?.builder()?.apply(builder) ?: Meta(builder)
+        val newStyle = get(key)?.toMutableMeta()?.apply(builder) ?: Meta(builder)
         set(key, newStyle.seal())
     }
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 503e9485..9aa3d90f 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -7,10 +7,10 @@ import hep.dataforge.meta.MutableItemProvider
 import hep.dataforge.meta.descriptors.Described
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.descriptors.get
+import hep.dataforge.misc.Type
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.toName
-import hep.dataforge.provider.Type
 import hep.dataforge.vision.Vision.Companion.TYPE
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.awaitClose
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index b3a2fafa..59f31c81 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -34,17 +34,6 @@ internal data class PropertyListener(
 @SerialName("vision")
 public open class VisionBase(internal var properties: Config? = null) : Vision {
 
-//    init {
-//        //used during deserialization only
-//        properties?.onChange(this) { name, oldItem, newItem ->
-//            if (oldItem != newItem) {
-//                scope.launch {
-//                    notifyPropertyChanged(name)
-//                }
-//            }
-//        }
-//    }
-
     @Transient
     override var parent: VisionGroup? = null
 
@@ -54,13 +43,6 @@ public open class VisionBase(internal var properties: Config? = null) : Vision {
     protected fun getOrCreateConfig(): Config {
         if (properties == null) {
             val newProperties = Config()
-//            newProperties.onChange(this) { name, oldItem, newItem ->
-//                if (oldItem != newItem) {
-//                    scope.launch {
-//                        notifyPropertyChanged(name)
-//                    }
-//                }
-//            }
             properties = newProperties
         }
         return properties!!
@@ -146,13 +128,13 @@ public open class VisionBase(internal var properties: Config? = null) : Vision {
 
         public fun Vision.updateProperties(at: Name, item: MetaItem) {
             when (item) {
-                is ValueItem -> {
+                is MetaItemValue -> {
                     if (item.value == Null) {
                         setProperty(at, null)
                     } else
                         setProperty(at, item)
                 }
-                is NodeItem -> item.node.items.forEach { (token, childItem) ->
+                is MetaItemNode -> item.node.items.forEach { (token, childItem) ->
                     updateProperties(at + token, childItem)
                 }
             }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
index fb070582..b4c3c326 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
@@ -8,11 +8,11 @@ public annotation class VisionBuilder
 
 public fun Sequence<MetaItem?>.merge(): MetaItem? = when (val first = firstOrNull { it != null }) {
     null -> null
-    is ValueItem -> first //fast search for first entry if it is value
-    is NodeItem -> {
+    is MetaItemValue -> first //fast search for first entry if it is value
+    is MetaItemNode -> {
         //merge nodes if first encountered node is meta
         val laminate: Laminate = Laminate(mapNotNull { it.node }.toList())
-        NodeItem(laminate)
+        MetaItemNode(laminate)
     }
 }
 
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
index 22e327a5..bd2e2554 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
@@ -1,7 +1,7 @@
 package hep.dataforge.vision.client
 
 import hep.dataforge.meta.Meta
-import hep.dataforge.provider.Type
+import hep.dataforge.misc.Type
 import hep.dataforge.vision.Vision
 import org.w3c.dom.Element
 
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/FXMeta.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/FXMeta.kt
index c7460ff3..150b5bb8 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/FXMeta.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/FXMeta.kt
@@ -115,7 +115,7 @@ class FXMetaNode<M : TypedMeta<M>>(
                 val actualItem = node?.items?.get(token)
                 val actualDescriptor = descriptor?.items?.get(token.body)
 
-                if (actualItem is NodeItem || actualDescriptor is NodeDescriptor) {
+                if (actualItem is MetaItemNode || actualDescriptor is NodeDescriptor) {
                     FXMetaNode(token, this@FXMetaNode)
                 } else {
                     FXMetaValue(token, this@FXMetaNode)
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooser.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooser.kt
index e1049eef..52d2a25e 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooser.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooser.kt
@@ -6,11 +6,11 @@
 package hep.dataforge.vision.editor
 
 import hep.dataforge.context.Context
-import hep.dataforge.context.Named
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.descriptors.ValueDescriptor
+import hep.dataforge.misc.Named
+import hep.dataforge.misc.Type
 import hep.dataforge.names.toName
-import hep.dataforge.provider.Type
 import hep.dataforge.provider.provideByType
 import hep.dataforge.values.Null
 import hep.dataforge.values.Value
@@ -105,7 +105,7 @@ public interface ValueChooser {
             context: Context,
             value: ObservableValue<Value?>,
             descriptor: ValueDescriptor? = null,
-            setter: (Value) -> Unit
+            setter: (Value) -> Unit,
         ): ValueChooser {
             val chooser = build(context, descriptor)
             chooser.setDisplayValue(value.value ?: Null)
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
index 35cd6806..3cf8dec4 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
@@ -3,7 +3,7 @@ package hep.dataforge.vision.solid
 import hep.dataforge.context.*
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.boolean
-import hep.dataforge.provider.Type
+import hep.dataforge.misc.Type
 import hep.dataforge.vision.solid.FX3DFactory.Companion.TYPE
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_WIREFRAME_KEY
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
index 9e417438..3f384f63 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
@@ -34,7 +34,7 @@ public object FXMaterials {
  */
 public fun MetaItem.color(opacity: Double = 1.0): Color {
     return when (this) {
-        is ValueItem -> if (this.value.type == ValueType.NUMBER) {
+        is MetaItemValue -> if (this.value.type == ValueType.NUMBER) {
             val int = value.int
             val red = int and 0x00ff0000 shr 16
             val green = int and 0x0000ff00 shr 8
@@ -43,7 +43,7 @@ public fun MetaItem.color(opacity: Double = 1.0): Color {
         } else {
             Color.web(this.value.string)
         }
-        is NodeItem -> {
+        is MetaItemNode -> {
             Color.rgb(
                 node[Colors.RED_KEY]?.int ?: 0,
                 node[Colors.GREEN_KEY]?.int ?: 0,
@@ -60,8 +60,8 @@ public fun MetaItem.color(opacity: Double = 1.0): Color {
 public fun MetaItem?.material(): Material {
     return when (this) {
         null -> FXMaterials.GREY
-        is ValueItem -> PhongMaterial(color())
-        is NodeItem -> PhongMaterial().apply {
+        is MetaItemValue -> PhongMaterial(color())
+        is MetaItemNode -> PhongMaterial().apply {
             val opacity = node[SolidMaterial.OPACITY_KEY].double ?: 1.0
             diffuseColor = node[SolidMaterial.COLOR_KEY]?.color(opacity) ?: Color.DARKGREY
             specularColor = node[SolidMaterial.SPECULAR_COLOR_KEY]?.color(opacity) ?: Color.WHITE
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
index 912e3b5a..e2496d9a 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
@@ -28,7 +28,7 @@ class ConvexTest {
         val json = SolidManager.jsonForSolids.encodeToJsonElement(Convex.serializer(), convex)
         val meta = json.toMetaItem().node!!
 
-        val points = meta.getIndexed("points").values.map { (it as NodeItem<*>).node.point3D() }
+        val points = meta.getIndexed("points").values.map { (it as MetaItemNode<*>).node.point3D() }
         assertEquals(8, points.count())
 
         assertEquals(8, convex.points.size)
diff --git a/visionforge-threejs/build.gradle.kts b/visionforge-threejs/build.gradle.kts
index d692c548..c893e845 100644
--- a/visionforge-threejs/build.gradle.kts
+++ b/visionforge-threejs/build.gradle.kts
@@ -14,6 +14,6 @@ kotlin{
 
 dependencies {
     api(project(":visionforge-solid"))
-    implementation(npm("three", "0.122.0"))
-    implementation(npm("three-csg-ts", "2.0.0"))
+    implementation(npm("three", "0.124.0"))
+    implementation(npm("three-csg-ts", "2.2.0"))
 }
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
index 9113dbc8..41cccd43 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
@@ -1,8 +1,8 @@
 package hep.dataforge.vision.solid.three
 
+import hep.dataforge.misc.Type
 import hep.dataforge.names.Name
 import hep.dataforge.names.startsWith
-import hep.dataforge.provider.Type
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
index 218533c6..e3905a21 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
@@ -95,13 +95,13 @@ public object ThreeMaterials {
  */
 public fun MetaItem.getColor(): Color {
     return when (this) {
-        is ValueItem -> if (this.value.type == ValueType.NUMBER) {
+        is MetaItemValue -> if (this.value.type == ValueType.NUMBER) {
             val int = value.int
             Color(int)
         } else {
             Color(this.value.string)
         }
-        is NodeItem -> {
+        is MetaItemNode -> {
             Color(
                 node[Colors.RED_KEY]?.int ?: 0,
                 node[Colors.GREEN_KEY]?.int ?: 0,

From 2b7971eeea7219ca1a3761821598f107de23b83f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 27 Jan 2021 15:41:46 +0300
Subject: [PATCH 083/151] API cleanup

---
 README.md                                     |  10 +--
 demo/gdml/README.md                           |   2 +-
 demo/muon-monitor/README.md                   |   2 +-
 demo/spatial-showcase/README.md               |   4 +-
 .../vision/solid/demo/VariableBox.kt          |   1 +
 docs/{ => diagrams}/Dependency structure.vsdx | Bin
 .../{resources => images}/class-diag-core.png | Bin
 .../class-diag-solid.png                      | Bin
 docs/{resources => images}/gdml-demo.png      | Bin
 docs/{resources => images}/muon-monitor.png   | Bin
 .../spatial-showcase-FX.png                   | Bin
 .../spatial-showcase.png                      | Bin
 .../kotlin/hep/dataforge/vision/StyleSheet.kt |  13 ++-
 .../kotlin/hep/dataforge/vision/Vision.kt     |  74 ++++++------------
 .../kotlin/hep/dataforge/vision/VisionBase.kt |  67 ++++++++--------
 .../hep/dataforge/vision/VisionChange.kt      |   2 +-
 .../hep/dataforge/vision/VisionGroupBase.kt   |   8 +-
 .../hep/dataforge/vision/html/HtmlTagTest.kt  |   1 +
 .../vision/solid/FXReferenceFactory.kt        |   1 +
 .../vision/solid/VisualObjectFXBinding.kt     |  11 ++-
 .../dataforge/vision/gdml/GdmlOptimizer.kt    |   1 +
 .../hep/dataforge/vision/solid/Solid.kt       |  18 ++---
 .../hep/dataforge/vision/solid/SolidGroup.kt  |   2 -
 .../dataforge/vision/solid/SolidReference.kt  |  48 ++++++------
 .../vision/solid/SerializationTest.kt         |   1 +
 .../vision/solid/SolidReferenceTest.kt        |   5 +-
 .../vision/solid/three/MeshThreeFactory.kt    |   1 +
 .../vision/solid/three/ThreeLabelFactory.kt   |   1 +
 .../vision/solid/three/ThreeLineFactory.kt    |   1 +
 .../vision/solid/three/ThreeMaterials.kt      |   3 +-
 .../vision/solid/three/ThreePlugin.kt         |   1 +
 .../solid/three/ThreeReferenceFactory.kt      |   1 +
 32 files changed, 135 insertions(+), 144 deletions(-)
 rename docs/{ => diagrams}/Dependency structure.vsdx (100%)
 rename docs/{resources => images}/class-diag-core.png (100%)
 rename docs/{resources => images}/class-diag-solid.png (100%)
 rename docs/{resources => images}/gdml-demo.png (100%)
 rename docs/{resources => images}/muon-monitor.png (100%)
 rename docs/{resources => images}/spatial-showcase-FX.png (100%)
 rename docs/{resources => images}/spatial-showcase.png (100%)

diff --git a/README.md b/README.md
index df55c37c..c9312320 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ The `visionforge-core` module also includes configuration editors for JS (in `js
 
 **Class diagram:**
 
-![](docs/resources/class-diag-core.png)
+![](docs/images/class-diag-core.png)
 
 
 ### visionforge-solid
@@ -82,7 +82,7 @@ Includes common classes and serializers for 3D visualization, as well as Three.j
 
 **Class diagram:**
 
-![](docs/resources/class-diag-solid.png)
+![](docs/images/class-diag-solid.png)
 
 ##### Prototypes
 
@@ -127,7 +127,7 @@ Some shapes will also periodically change their color and visibility.
 
 **Example view:**
 
-![](docs/resources/spatial-showcase.png)
+![](docs/images/spatial-showcase.png)
 
 
 ### Full-Stack Application Example - Muon Monitor Visualization
@@ -139,7 +139,7 @@ A full-stack application example, showing the
 
 **Example view:**
 
-![](docs/resources/muon-monitor.png)
+![](docs/images/muon-monitor.png)
 
 
 ### GDML Example
@@ -150,7 +150,7 @@ Visualization example for geometry defined as GDML file.
 
 ##### Example view:
 
-![](docs/resources/gdml-demo.png)
+![](docs/images/gdml-demo.png)
 
 
 ## Thanks and references
diff --git a/demo/gdml/README.md b/demo/gdml/README.md
index 9a20ac55..6ad546f1 100644
--- a/demo/gdml/README.md
+++ b/demo/gdml/README.md
@@ -12,4 +12,4 @@ drag-and-drop GDML file to the window to see visualization. For an example file,
 
 ##### Example view:
 
-![](../../docs/resources/gdml-demo.png)
+![](../../docs/images/gdml-demo.png)
diff --git a/demo/muon-monitor/README.md b/demo/muon-monitor/README.md
index 1949cb1e..87b3cf43 100644
--- a/demo/muon-monitor/README.md
+++ b/demo/muon-monitor/README.md
@@ -30,5 +30,5 @@ run `demo/muon-monitor/application/run` task.
 
 ##### Example view:
 
-![](../../docs/resources/muon-monitor.png)
+![](../../docs/images/muon-monitor.png)
 
diff --git a/demo/spatial-showcase/README.md b/demo/spatial-showcase/README.md
index 2b30ef3e..20866220 100644
--- a/demo/spatial-showcase/README.md
+++ b/demo/spatial-showcase/README.md
@@ -12,8 +12,8 @@ To see Java FX demo, run `demo/spatial-showcase/Tasks/application/run` Gradle ta
 
 ##### Example view for JS:
 
-![](../../docs/resources/spatial-showcase.png)
+![](../../docs/images/spatial-showcase.png)
 
 ##### Example view for Java FX:
 
-![](../../docs/resources/spatial-showcase-FX.png)
+![](../../docs/images/spatial-showcase-FX.png)
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
index 206f4f0c..e90cc845 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
+++ b/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
@@ -5,6 +5,7 @@ import hep.dataforge.names.plus
 import hep.dataforge.names.startsWith
 import hep.dataforge.values.asValue
 import hep.dataforge.vision.getProperty
+import hep.dataforge.vision.onPropertyChange
 import hep.dataforge.vision.set
 import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.*
diff --git a/docs/Dependency structure.vsdx b/docs/diagrams/Dependency structure.vsdx
similarity index 100%
rename from docs/Dependency structure.vsdx
rename to docs/diagrams/Dependency structure.vsdx
diff --git a/docs/resources/class-diag-core.png b/docs/images/class-diag-core.png
similarity index 100%
rename from docs/resources/class-diag-core.png
rename to docs/images/class-diag-core.png
diff --git a/docs/resources/class-diag-solid.png b/docs/images/class-diag-solid.png
similarity index 100%
rename from docs/resources/class-diag-solid.png
rename to docs/images/class-diag-solid.png
diff --git a/docs/resources/gdml-demo.png b/docs/images/gdml-demo.png
similarity index 100%
rename from docs/resources/gdml-demo.png
rename to docs/images/gdml-demo.png
diff --git a/docs/resources/muon-monitor.png b/docs/images/muon-monitor.png
similarity index 100%
rename from docs/resources/muon-monitor.png
rename to docs/images/muon-monitor.png
diff --git a/docs/resources/spatial-showcase-FX.png b/docs/images/spatial-showcase-FX.png
similarity index 100%
rename from docs/resources/spatial-showcase-FX.png
rename to docs/images/spatial-showcase-FX.png
diff --git a/docs/resources/spatial-showcase.png b/docs/images/spatial-showcase.png
similarity index 100%
rename from docs/resources/spatial-showcase.png
rename to docs/images/spatial-showcase.png
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
index 233afde7..e5f30854 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
@@ -5,14 +5,13 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.NameToken
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
-import kotlinx.coroutines.launch
 
 /**
  * A container for styles
  */
 public inline class StyleSheet(private val owner: VisionGroup) {
 
-    private val styleNode get() = owner.getOwnProperty(STYLESHEET_KEY).node
+    private val styleNode get() = owner.ownProperties[STYLESHEET_KEY].node
 
     public val items: Map<NameToken, Meta>? get() = styleNode?.items?.mapValues { it.value.node ?: Meta.EMPTY }
 
@@ -55,9 +54,7 @@ internal fun Vision.styleChanged(key: String, oldStyle: Meta?, newStyle: Meta?)
         val tokens: Collection<Name> =
             ((oldStyle?.items?.keys ?: emptySet()) + (newStyle?.items?.keys ?: emptySet()))
                 .map { it.asName() }
-        parent?.scope?.launch {
-            tokens.forEach { parent?.notifyPropertyChanged(it) }
-        }
+        tokens.forEach { parent?.invalidateProperty(it) }
     }
     if (this is VisionGroup) {
         for (obj in this) {
@@ -71,7 +68,7 @@ internal fun Vision.styleChanged(key: String, oldStyle: Meta?, newStyle: Meta?)
  * List of names of styles applied to this object. Order matters. Not inherited.
  */
 public var Vision.styles: List<String>
-    get() = getOwnProperty(Vision.STYLE_KEY)?.stringList ?: emptyList()
+    get() = ownProperties[Vision.STYLE_KEY]?.stringList ?: emptyList()
     set(value) {
         setProperty(Vision.STYLE_KEY, value)
     }
@@ -86,7 +83,7 @@ public val VisionGroup.styleSheet: StyleSheet get() = StyleSheet(this)
  * Add style name to the list of styles to be resolved later. The style with given name does not necessary exist at the moment.
  */
 public fun Vision.useStyle(name: String) {
-    styles = (getOwnProperty(Vision.STYLE_KEY)?.stringList ?: emptyList()) + name
+    styles = (ownProperties[Vision.STYLE_KEY]?.stringList ?: emptyList()) + name
 }
 
 
@@ -94,7 +91,7 @@ public fun Vision.useStyle(name: String) {
  * Find a style with given name for given [Vision]. The style is not necessary applied to this [Vision].
  */
 public tailrec fun Vision.getStyle(name: String): Meta? =
-    getOwnProperty(StyleSheet.STYLESHEET_KEY + name).node ?: parent?.getStyle(name)
+    ownProperties[StyleSheet.STYLESHEET_KEY + name].node ?: parent?.getStyle(name)
 
 /**
  * Resolve an item in all style layers
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
index 9aa3d90f..7314b6c2 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
@@ -1,9 +1,6 @@
 package hep.dataforge.vision
 
-import hep.dataforge.meta.DFExperimental
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.MetaItem
-import hep.dataforge.meta.MutableItemProvider
+import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.Described
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.descriptors.get
@@ -12,11 +9,10 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.toName
 import hep.dataforge.vision.Vision.Companion.TYPE
-import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.serialization.Transient
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 
 /**
  * A root type for display hierarchy
@@ -27,26 +23,8 @@ public interface Vision : Described {
     /**
      * The parent object of this one. If null, this one is a root.
      */
-    @Transient
     public var parent: VisionGroup?
 
-    /**
-     * Properties belonging to this [Vision] potentially including artificial properties
-     */
-    @Transient
-    public val meta: Meta
-
-    /**
-     * A coroutine scope for asynchronous calls and locks
-     */
-    public val scope: CoroutineScope get() = parent?.scope ?: GlobalScope
-
-    /**
-     * A fast accessor method to get own property (no inheritance or styles).
-     * Should be equivalent to `getProperty(name,false,false,false)`.
-     */
-    public fun getOwnProperty(name: Name): MetaItem?
-
     /**
      * Get property.
      * @param inherit toggles parent node property lookup. Null means inference from descriptor. Default is false.
@@ -59,38 +37,32 @@ public interface Vision : Described {
         includeDefaults: Boolean = true,
     ): MetaItem?
 
+    /**
+     * Get an intrinsic property of this Vision excluding any inheritance or defaults. In most cases should be the same as
+     * `getProperty(name, false, false, false`.
+     */
+    public fun getOwnProperty(name: Name): MetaItem? = getProperty(
+        name,
+        inherit = false,
+        includeStyles = false,
+        includeDefaults = false
+    )
 
     /**
      * Set the property value
      */
     public fun setProperty(name: Name, item: MetaItem?, notify: Boolean = true)
 
-    /**
-     * Subscribe on property updates. The subscription is bound to the given [scope] and canceled when the scope is canceled
-     */
-    public fun onPropertyChange(scope: CoroutineScope, callback: suspend (Name) -> Unit)
-
     /**
      * Flow of property invalidation events. It does not contain property values after invalidation since it is not clear
      * if it should include inherited properties etc.
      */
-    @DFExperimental
-    @OptIn(ExperimentalCoroutinesApi::class)
     public val propertyChanges: Flow<Name>
-        get() = callbackFlow<Name> {
-            coroutineScope {
-                onPropertyChange(this) {
-                    send(it)
-                }
-                awaitClose { cancel() }
-            }
-        }
-
 
     /**
      * Notify all listeners that a property has been changed and should be invalidated
      */
-    public suspend fun notifyPropertyChanged(propertyName: Name): Unit
+    public fun invalidateProperty(propertyName: Name): Unit
 
     /**
      * Update this vision using a dif represented by [VisionChange].
@@ -107,12 +79,19 @@ public interface Vision : Described {
     }
 }
 
-public fun Vision.asyncNotifyPropertyChange(propertyName: Name) {
-    scope.launch {
-        notifyPropertyChanged(propertyName)
-    }
+/**
+ * Root property node
+ */
+public val Vision.meta: Meta get() = ownProperties[Name.EMPTY]?.node ?: Meta.EMPTY
+
+/**
+ * Subscribe on property updates. The subscription is bound to the given [scope] and canceled when the scope is canceled
+ */
+public fun Vision.onPropertyChange(scope: CoroutineScope, callback: suspend (Name) -> Unit) {
+    propertyChanges.onEach(callback).launchIn(scope)
 }
 
+
 /**
  * Own properties, excluding inheritance, styles and descriptor
  */
@@ -122,7 +101,6 @@ public val Vision.ownProperties: MutableItemProvider
         override fun setItem(name: Name, item: MetaItem?): Unit = setProperty(name, item)
     }
 
-
 /**
  * Convenient accessor for all properties of a vision.
  * @param inherit - inherit property value from the parent by default. If null, inheritance is inferred from descriptor
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index 59f31c81..5dd8bf37 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -11,10 +11,9 @@ import hep.dataforge.values.Null
 import hep.dataforge.values.ValueType
 import hep.dataforge.vision.Vision.Companion.STYLE_KEY
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -32,13 +31,14 @@ internal data class PropertyListener(
  */
 @Serializable
 @SerialName("vision")
-public open class VisionBase(internal var properties: Config? = null) : Vision {
+public open class VisionBase(
+    internal var properties: Config? = null,
+    @Transient public val coroutineScope: CoroutineScope = GlobalScope,
+) : Vision {
 
     @Transient
     override var parent: VisionGroup? = null
 
-    override val meta: Meta get() = properties ?: Meta.EMPTY
-
     @Synchronized
     protected fun getOrCreateConfig(): Config {
         if (properties == null) {
@@ -51,8 +51,10 @@ public open class VisionBase(internal var properties: Config? = null) : Vision {
     /**
      * A fast accessor method to get own property (no inheritance or styles
      */
-    override fun getOwnProperty(name: Name): MetaItem? {
-        return properties?.getItem(name)
+    override fun getOwnProperty(name: Name): MetaItem? = if (name == Name.EMPTY) {
+        properties?.asMetaItem()
+    } else {
+        properties?.getItem(name)
     }
 
     override fun getProperty(
@@ -60,25 +62,27 @@ public open class VisionBase(internal var properties: Config? = null) : Vision {
         inherit: Boolean,
         includeStyles: Boolean,
         includeDefaults: Boolean,
-    ): MetaItem? = sequence {
-        yield(getOwnProperty(name))
-        if (includeStyles) {
-            yieldAll(getStyleItems(name))
-        }
-        if (inherit) {
-            yield(parent?.getProperty(name, inherit, includeStyles, includeDefaults))
-        }
-        if (includeDefaults) {
-            yield(descriptor?.get(name)?.defaultItem())
-        }
-    }.merge()
+    ): MetaItem? = if (!inherit && !includeStyles && !includeDefaults) {
+        getOwnProperty(name)
+    } else {
+        sequence {
+            yield(getOwnProperty(name))
+            if (includeStyles) {
+                yieldAll(getStyleItems(name))
+            }
+            if (inherit) {
+                yield(parent?.getProperty(name, inherit, includeStyles, includeDefaults))
+            }
+            if (includeDefaults) {
+                yield(descriptor?.get(name)?.defaultItem())
+            }
+        }.merge()
+    }
 
     override fun setProperty(name: Name, item: MetaItem?, notify: Boolean) {
         getOrCreateConfig().setItem(name, item)
         if (notify) {
-            scope.launch {
-                notifyPropertyChanged(name)
-            }
+            invalidateProperty(name)
         }
     }
 
@@ -89,7 +93,7 @@ public open class VisionBase(internal var properties: Config? = null) : Vision {
             .flatMap { it.items.asSequence() }
             .distinctBy { it.key }
             .forEach {
-                notifyPropertyChanged(it.key.asName())
+                invalidateProperty(it.key.asName())
             }
     }
 
@@ -99,17 +103,16 @@ public open class VisionBase(internal var properties: Config? = null) : Vision {
     private val propertyInvalidationFlow: MutableSharedFlow<Name> = MutableSharedFlow()
 
     @DFExperimental
-    override val propertyChanges: Flow<Name> get() = propertyInvalidationFlow
+    override val propertyChanges: Flow<Name>
+        get() = propertyInvalidationFlow
 
-    override fun onPropertyChange(scope: CoroutineScope, callback: suspend (Name) -> Unit) {
-        propertyInvalidationFlow.onEach(callback).launchIn(scope)
-    }
-
-    override suspend fun notifyPropertyChanged(propertyName: Name) {
-        if (propertyName == STYLE_KEY) {
-            updateStyles(styles)
+    override fun invalidateProperty(propertyName: Name) {
+        coroutineScope.launch {
+            if (propertyName == STYLE_KEY) {
+                updateStyles(styles)
+            }
+            propertyInvalidationFlow.emit(propertyName)
         }
-        propertyInvalidationFlow.emit(propertyName)
     }
 
     override fun update(change: VisionChange) {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
index cb80fd7d..b94e7984 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
@@ -82,7 +82,7 @@ private fun CoroutineScope.collectChange(
 
     //Collect properties change
     source.onPropertyChange(this) { propertyName ->
-        val newItem = source.getOwnProperty(propertyName)
+        val newItem = source.ownProperties[propertyName]
         collector().propertyChanged(name, propertyName, newItem)
     }
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
index 6cc2b97b..48ff4982 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
@@ -31,10 +31,10 @@ public open class VisionGroupBase(
         }
     }
 
-    override suspend fun notifyPropertyChanged(propertyName: Name) {
-        super.notifyPropertyChanged(propertyName)
+    override fun invalidateProperty(propertyName: Name) {
+        super.invalidateProperty(propertyName)
         for (obj in this) {
-            obj.notifyPropertyChanged(propertyName)
+            obj.invalidateProperty(propertyName)
         }
     }
 
@@ -47,7 +47,7 @@ public open class VisionGroupBase(
      * Propagate children change event upwards
      */
     private fun childrenChanged(name: NameToken, before: Vision?, after: Vision?) {
-        scope.launch {
+        coroutineScope.launch {
             _structureChanges.emit(MutableVisionGroup.StructureChange(name, before, after))
         }
     }
diff --git a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
index c9429a79..a5e08500 100644
--- a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
+++ b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
@@ -4,6 +4,7 @@ import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.set
 import hep.dataforge.vision.VisionBase
 import hep.dataforge.vision.configure
+import hep.dataforge.vision.meta
 import kotlinx.html.*
 import kotlinx.html.stream.createHTML
 import kotlin.test.Test
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
index 14845845..9b785323 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
@@ -2,6 +2,7 @@ package hep.dataforge.vision.solid
 
 import hep.dataforge.names.*
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.onPropertyChange
 import javafx.scene.Group
 import javafx.scene.Node
 import kotlin.reflect.KClass
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
index f6f72e54..2a47b447 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
@@ -4,15 +4,18 @@ import hep.dataforge.meta.*
 import hep.dataforge.names.Name
 import hep.dataforge.names.startsWith
 import hep.dataforge.names.toName
+import hep.dataforge.values.Value
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.onPropertyChange
 import javafx.application.Platform
+import javafx.beans.binding.Binding
 import javafx.beans.binding.ObjectBinding
 import tornadofx.*
 
 /**
  * A caching binding collection for [Vision] properties
  */
-class VisualObjectFXBinding(val fx: FX3DPlugin, val obj: Vision) {
+public class VisualObjectFXBinding(public val fx: FX3DPlugin, public val obj: Vision) {
     private val bindings = HashMap<Name, ObjectBinding<MetaItem?>>()
 
     init {
@@ -31,7 +34,7 @@ class VisualObjectFXBinding(val fx: FX3DPlugin, val obj: Vision) {
         }
     }
 
-    operator fun get(key: Name): ObjectBinding<MetaItem?> {
+    public operator fun get(key: Name): ObjectBinding<MetaItem?> {
         return bindings.getOrPut(key) {
             object : ObjectBinding<MetaItem?>() {
                 override fun computeValue(): MetaItem? = obj.getProperty(key)
@@ -39,10 +42,10 @@ class VisualObjectFXBinding(val fx: FX3DPlugin, val obj: Vision) {
         }
     }
 
-    operator fun get(key: String) = get(key.toName())
+    public operator fun get(key: String) = get(key.toName())
 }
 
-fun ObjectBinding<MetaItem?>.value() = objectBinding { it.value }
+public fun ObjectBinding<MetaItem?>.value(): Binding<Value?> = objectBinding { it.value }
 fun ObjectBinding<MetaItem?>.string() = stringBinding { it.string }
 fun ObjectBinding<MetaItem?>.number() = objectBinding { it.number }
 fun ObjectBinding<MetaItem?>.double() = objectBinding { it.double }
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
index a01e3db0..9670ea11 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
@@ -3,6 +3,7 @@ package hep.dataforge.vision.gdml
 import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.itemSequence
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.meta
 import hep.dataforge.vision.solid.*
 
 public expect class Counter() {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
index 96e4f33a..bb9a8867 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
@@ -152,21 +152,21 @@ public var Solid.x: Number
     get() = position?.x ?: 0f
     set(value) {
         position().x = value.toDouble()
-        asyncNotifyPropertyChange(Solid.X_POSITION_KEY)
+        invalidateProperty(Solid.X_POSITION_KEY)
     }
 
 public var Solid.y: Number
     get() = position?.y ?: 0f
     set(value) {
         position().y = value.toDouble()
-        asyncNotifyPropertyChange(Solid.Y_POSITION_KEY)
+        invalidateProperty(Solid.Y_POSITION_KEY)
     }
 
 public var Solid.z: Number
     get() = position?.z ?: 0f
     set(value) {
         position().z = value.toDouble()
-        asyncNotifyPropertyChange(Solid.Z_POSITION_KEY)
+        invalidateProperty(Solid.Z_POSITION_KEY)
     }
 
 private fun Solid.rotation(): Point3D =
@@ -176,21 +176,21 @@ public var Solid.rotationX: Number
     get() = rotation?.x ?: 0f
     set(value) {
         rotation().x = value.toDouble()
-        asyncNotifyPropertyChange(Solid.X_ROTATION_KEY)
+        invalidateProperty(Solid.X_ROTATION_KEY)
     }
 
 public var Solid.rotationY: Number
     get() = rotation?.y ?: 0f
     set(value) {
         rotation().y = value.toDouble()
-        asyncNotifyPropertyChange(Solid.Y_ROTATION_KEY)
+        invalidateProperty(Solid.Y_ROTATION_KEY)
     }
 
 public var Solid.rotationZ: Number
     get() = rotation?.z ?: 0f
     set(value) {
         rotation().z = value.toDouble()
-        asyncNotifyPropertyChange(Solid.Z_ROTATION_KEY)
+        invalidateProperty(Solid.Z_ROTATION_KEY)
     }
 
 private fun Solid.scale(): Point3D =
@@ -200,19 +200,19 @@ public var Solid.scaleX: Number
     get() = scale?.x ?: 1f
     set(value) {
         scale().x = value.toDouble()
-        asyncNotifyPropertyChange(Solid.X_SCALE_KEY)
+        invalidateProperty(Solid.X_SCALE_KEY)
     }
 
 public var Solid.scaleY: Number
     get() = scale?.y ?: 1f
     set(value) {
         scale().y = value.toDouble()
-        asyncNotifyPropertyChange(Solid.Y_SCALE_KEY)
+        invalidateProperty(Solid.Y_SCALE_KEY)
     }
 
 public var Solid.scaleZ: Number
     get() = scale?.z ?: 1f
     set(value) {
         scale().z = value.toDouble()
-        asyncNotifyPropertyChange(Solid.Z_SCALE_KEY)
+        invalidateProperty(Solid.Z_SCALE_KEY)
     }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index 578a06e6..1a9db779 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -107,8 +107,6 @@ internal class Prototypes(
         }
     }
 
-    override fun getOwnProperty(name: Name): MetaItem? = null
-
     override fun getProperty(
         name: Name,
         inherit: Boolean,
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
index e49d8d0f..a802b955 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
@@ -3,9 +3,9 @@ package hep.dataforge.vision.solid
 import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.names.*
-import hep.dataforge.values.Null
 import hep.dataforge.vision.*
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -18,18 +18,16 @@ private fun SolidReference.getRefProperty(
     inherit: Boolean,
     includeStyles: Boolean,
     includeDefaults: Boolean,
-): MetaItem? {
-    return sequence {
-        yield(getOwnProperty(name))
-        if (includeStyles) {
-            yieldAll(getStyleItems(name))
-        }
-        yield(prototype.getProperty(name, inherit, includeStyles, includeDefaults))
-        if (inherit) {
-            yield(parent?.getProperty(name, inherit))
-        }
-    }.merge()
-}
+): MetaItem? = sequence {
+    yield(getOwnProperty(name))
+    if (includeStyles) {
+        yieldAll(getStyleItems(name))
+    }
+    yield(prototype.getProperty(name, inherit, includeStyles, includeDefaults))
+    if (inherit) {
+        yield(parent?.getProperty(name, inherit))
+    }
+}.merge()
 
 /**
  * A reference [Solid] to reuse a template object
@@ -100,8 +98,6 @@ public class SolidReferenceGroup(
                     ReferenceChild(childName + key.asName())
                 } ?: emptyMap()
 
-        override val meta: Meta get() = TODO()// getChildProperty(childName, Name.EMPTY).node ?: Meta.EMPTY
-
         override fun getOwnProperty(name: Name): MetaItem? = getChildProperty(childName, name)
 
         override fun setProperty(name: Name, item: MetaItem?, notify: Boolean) {
@@ -113,7 +109,11 @@ public class SolidReferenceGroup(
             inherit: Boolean,
             includeStyles: Boolean,
             includeDefaults: Boolean,
-        ): MetaItem? = getRefProperty(name, inherit, includeStyles, includeDefaults)
+        ): MetaItem? = if (!inherit && !includeStyles && !includeDefaults) {
+            getOwnProperty(name)
+        } else {
+            getRefProperty(name, inherit, includeStyles, includeDefaults)
+        }
 
         override var parent: VisionGroup?
             get() {
@@ -124,16 +124,18 @@ public class SolidReferenceGroup(
                 error("Setting a parent for a reference child is not possible")
             }
 
-        override fun onPropertyChange(scope: CoroutineScope, callback: suspend (Name) -> Unit) {
-            this@SolidReferenceGroup.onPropertyChange(scope) { name ->
+        @DFExperimental
+        override val propertyChanges: Flow<Name>
+            get() = this@SolidReferenceGroup.propertyChanges.mapNotNull { name ->
                 if (name.startsWith(childToken(childName))) {
-                    callback(name.cutFirst())
+                    name.cutFirst()
+                } else {
+                    null
                 }
             }
-        }
 
-        override suspend fun notifyPropertyChanged(propertyName: Name) {
-            this@SolidReferenceGroup.notifyPropertyChanged(childPropertyName(childName, propertyName))
+        override fun invalidateProperty(propertyName: Name) {
+            this@SolidReferenceGroup.invalidateProperty(childPropertyName(childName, propertyName))
         }
 
         override fun update(change: VisionChange) {
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
index 10531796..bafe16a8 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
@@ -4,6 +4,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.toName
 import hep.dataforge.vision.MutableVisionGroup
 import hep.dataforge.vision.get
+import hep.dataforge.vision.meta
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt
index 8b3c85e0..1ac2738f 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt
@@ -2,19 +2,18 @@ package hep.dataforge.vision.solid
 
 import hep.dataforge.vision.get
 import hep.dataforge.vision.style
-import hep.dataforge.vision.styles
 import hep.dataforge.vision.useStyle
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class SolidReferenceTest {
     val groupWithReference = SolidGroup {
-        val referenceStyle by style {
+        val theStyle by style {
             SolidMaterial.MATERIAL_COLOR_KEY put "red"
         }
         ref("test", Box(100f,100f,100f).apply {
             color("blue")
-            useStyle(referenceStyle)
+            useStyle(theStyle)
         })
     }
 
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
index f04e7a1a..605c658f 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
@@ -6,6 +6,7 @@ import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
 import hep.dataforge.names.startsWith
+import hep.dataforge.vision.onPropertyChange
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.SolidMaterial
 import hep.dataforge.vision.solid.layer
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
index 8809ea2d..ebb6e76c 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
@@ -2,6 +2,7 @@ package hep.dataforge.vision.solid.three
 
 
 import hep.dataforge.context.logger
+import hep.dataforge.vision.onPropertyChange
 import hep.dataforge.vision.solid.SolidLabel
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.geometries.TextBufferGeometry
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
index 0d7a8e5c..655b3c38 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
@@ -1,6 +1,7 @@
 package hep.dataforge.vision.solid.three
 
 import hep.dataforge.meta.node
+import hep.dataforge.vision.onPropertyChange
 import hep.dataforge.vision.solid.PolyLine
 import hep.dataforge.vision.solid.color
 import hep.dataforge.vision.solid.string
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
index e3905a21..f41e9112 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
@@ -7,6 +7,7 @@ import hep.dataforge.values.int
 import hep.dataforge.values.string
 import hep.dataforge.vision.Colors
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.ownProperties
 import hep.dataforge.vision.solid.SolidMaterial
 import info.laht.threekt.materials.LineBasicMaterial
 import info.laht.threekt.materials.Material
@@ -119,7 +120,7 @@ private var Material.cached: Boolean
 
 public fun Mesh.updateMaterial(vision: Vision) {
     //val meta = vision.getProperty(SolidMaterial.MATERIAL_KEY, inherit = true).node
-    val ownMaterialMeta = vision.getOwnProperty(SolidMaterial.MATERIAL_KEY)
+    val ownMaterialMeta = vision.ownProperties[SolidMaterial.MATERIAL_KEY]
     val parentMaterialMeta = vision.parent?.getProperty(
         SolidMaterial.MATERIAL_KEY,
         inherit = true,
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index dc20bdce..95020784 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -6,6 +6,7 @@ import hep.dataforge.names.*
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.client.ElementVisionRenderer
+import hep.dataforge.vision.onPropertyChange
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.visible
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
index cbee5aa7..d245f846 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
@@ -3,6 +3,7 @@ package hep.dataforge.vision.solid.three
 import hep.dataforge.names.cutFirst
 import hep.dataforge.names.firstOrNull
 import hep.dataforge.names.toName
+import hep.dataforge.vision.onPropertyChange
 import hep.dataforge.vision.solid.Solid
 import hep.dataforge.vision.solid.SolidReferenceGroup
 import hep.dataforge.vision.solid.SolidReferenceGroup.Companion.REFERENCE_CHILD_PROPERTY_PREFIX

From e82ea7bb9429b8a303cf64a6e25e1d3b2c5c7c41 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 27 Jan 2021 15:42:01 +0300
Subject: [PATCH 084/151] Documentation

---
 docs/appendix.md |  5 +++++
 docs/design.md   | 13 +++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 docs/appendix.md
 create mode 100644 docs/design.md

diff --git a/docs/appendix.md b/docs/appendix.md
new file mode 100644
index 00000000..7d928911
--- /dev/null
+++ b/docs/appendix.md
@@ -0,0 +1,5 @@
+## Appendix
+
+### DataForge Name
+
+### DataForge Meta
\ No newline at end of file
diff --git a/docs/design.md b/docs/design.md
new file mode 100644
index 00000000..36764d30
--- /dev/null
+++ b/docs/design.md
@@ -0,0 +1,13 @@
+## Library design
+The central point of the library design is the `Vision` interface. The `Vision` stores an optional reference to its parent and is able to store a number of mutable or read-only properties. Each property is represented by its `Name`, and a `MetaItem` value-tree, both following DataForge library specification (discussed in the [Appendix](appendix.md)). The `Vision` objects are organized in a tree using `VisionGroup` as nodes. `VisionGroup` additionally to all `Vision` properties holds a `children` container that holds named references to its direct children `Vision`s. Thus, `Vision`s form a doubly linked tree (a parent stores references to all its children and children store a reference to the parent).
+
+An important concept using in the VisionForge is the property layering mechanism. It means that if the property with a given name is not found in the `Vision` it is requested from, it could be requested from the parent `Vision`, form the style declaration, the prototype for the vision or any other place defined by the component author. For example, let's take a `color` attribute used in 3D visualization. When one draws a group of objects, he usually wants to make the color of all objects in the group to be defined by a single handle in the group common ancestor. So when the parent color changes, all children color must follow suite, but we also want to change children color individually without changing the parent. In this case two property layers are defined:
+
+* own properties layer
+* parent properties layer
+
+When the user or a part of inner program mechanics requests a property, it searched in `Vision` own properties. If it is defined there, it is returned, if not, the search continues to the parent properties and up the parentage chain. So if the parent color is defined and children colors are blank, then the parent color will be used. If one of children redefines its own color, then this color is used for this specific color, and the parent color used for all other children. The change of parent property automatically propagated to all children.
+
+### Styling
+
+The actual layering scheme is more complicated. All objects support styling. The styles are named `Meta` nodes that could be used to define groups of properties together and use in different `Vision`s. The styles are defined as named `Meta` nodes in a `VisionGroup` `@stylesheet` property (DataForge states that names starting with `@` are reserved for system properties, not visible by default to the user). The style or a list of styles could be applied to a `Vision` by setting the reserved `@style` property to the name of the style being used or by using `Vision::style` extension property. The style name is then resolved to the nearest ancestor that defines it. The key difference from the CSS styling in HTML is that the stylesheets could be added to any node, not only to the hierarchy root. It allows to decouple the whole subtrees together with styles from the main `Vision` graph, or create stand-alone branches. One must note, that the same style could be defined on different levels of the tree, only the nearest ancestor is resolved, meaning that one can override styles for a sub-tree.

From 1da4381a4c1f564d0c1354749919dfd6ebedf225 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 16 Feb 2021 14:49:15 +0300
Subject: [PATCH 085/151] Documentation and refactoring

---
 build.gradle.kts                              |  6 +-
 .../dataforge/vision/gdml/demo/readFile.kt    |  2 +-
 demo/muon-monitor/build.gradle.kts            |  2 +-
 .../mipt/npm/muon/monitor/server/MMServer.kt  |  7 +-
 demo/sat-demo/build.gradle.kts                |  6 +-
 .../README.md                                 |  0
 .../build.gradle.kts                          |  5 +-
 .../hep/dataforge/vision/solid/demo/demo.kt   |  0
 .../vision/solid/demo/ThreeDemoApp.kt         |  0
 .../vision/solid/demo/ThreeDemoGrid.kt        |  0
 .../vision/solid/demo/VariableBox.kt          |  3 -
 .../src/jsMain/resources/index.html           |  0
 .../src/jsMain/resources/styles.css           |  0
 .../dataforge/vision/solid/demo/FXDemoApp.kt  | 22 ++++++
 .../dataforge/vision/solid/demo/FXDemoGrid.kt |  0
 .../vision/solid/demo/MetaEditorDemo.kt       |  0
 .../dataforge/vision/solid/demo/FXDemoApp.kt  | 35 ---------
 docs/appendix.md                              |  4 +-
 docs/design.md                                |  4 +
 docs/features.md                              |  5 ++
 docs/solids.md                                | 77 +++++++++++++++++++
 docs/uml/prototypes.puml                      | 14 ++++
 playground/src/jvmMain/kotlin/plotlyVision.kt |  4 +-
 .../src/jvmMain/kotlin/randomSpheres.kt       |  2 +-
 .../src/jvmMain/kotlin/serverExtensions.kt    |  2 +-
 playground/src/jvmMain/kotlin/simpleCube.kt   |  2 +-
 settings.gradle.kts                           | 12 +--
 .../hep/dataforge/vision/StyleReference.kt    |  2 +-
 .../kotlin/hep/dataforge/vision/VisionBase.kt |  1 +
 .../hep/dataforge/vision/VisionChange.kt      |  3 +-
 .../vision/html/HtmlVisionFragment.kt         |  2 +-
 .../vision/html/VisionTagConsumer.kt          |  8 +-
 .../hep/dataforge/vision/html/HtmlTagTest.kt  |  2 +-
 .../hep/dataforge/vision/html/headers.kt      |  2 +-
 .../hep/dataforge/vision/html/htmlExport.kt   |  2 +-
 visionforge-fx/build.gradle.kts               |  1 -
 visionforge-gdml/build.gradle.kts             |  2 +-
 .../dataforge/vision/gdml/GDMLTransformer.kt  |  9 ++-
 .../dataforge/vision/gdml/GdmlOptimizer.kt    |  2 +-
 visionforge-plotly/build.gradle.kts           |  6 +-
 .../dataforge/vision/plotly/VisionOfPlotly.kt |  2 +-
 .../dataforge/vision/plotly/plotlyHeaders.kt  |  2 +-
 .../vision/three/server/VisionServer.kt       |  1 +
 visionforge-solid/build.gradle.kts            |  2 +-
 .../kotlin/hep/dataforge/vision/solid/Box.kt  | 39 +++++-----
 .../hep/dataforge/vision/solid/SolidGroup.kt  |  3 +-
 .../dataforge/vision/solid/SolidManager.kt    |  2 +-
 .../dataforge/vision/solid/SolidReference.kt  | 10 ++-
 .../solid/transform/RemoveSingleChild.kt      |  2 +-
 .../dataforge/vision/solid/transform/UnRef.kt |  6 +-
 .../hep/dataforge/vision/solid/ConvexTest.kt  |  7 +-
 .../dataforge/vision/solid/SolidPluginTest.kt |  2 +-
 visionforge-threejs/build.gradle.kts          |  4 -
 .../build.gradle.kts                          |  7 --
 .../vision/three/server/serverExtensions.kt   |  2 +-
 55 files changed, 221 insertions(+), 126 deletions(-)
 rename demo/{spatial-showcase => solid-showcase}/README.md (100%)
 rename demo/{spatial-showcase => solid-showcase}/build.gradle.kts (86%)
 rename demo/{spatial-showcase => solid-showcase}/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt (100%)
 rename demo/{spatial-showcase => solid-showcase}/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt (100%)
 rename demo/{spatial-showcase => solid-showcase}/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt (100%)
 rename demo/{spatial-showcase => solid-showcase}/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt (96%)
 rename demo/{spatial-showcase => solid-showcase}/src/jsMain/resources/index.html (100%)
 rename demo/{spatial-showcase => solid-showcase}/src/jsMain/resources/styles.css (100%)
 create mode 100644 demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoApp.kt
 rename demo/{spatial-showcase => solid-showcase}/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt (100%)
 rename demo/{spatial-showcase => solid-showcase}/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/MetaEditorDemo.kt (100%)
 delete mode 100644 demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoApp.kt
 create mode 100644 docs/features.md
 create mode 100644 docs/solids.md
 create mode 100644 docs/uml/prototypes.puml

diff --git a/build.gradle.kts b/build.gradle.kts
index 1b60596b..3b6598a3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,16 +2,16 @@ plugins {
     id("ru.mipt.npm.project")
 }
 
-val dataforgeVersion by extra("0.3.0-dev-1")
-val ktorVersion by extra("1.5.0")
+val dataforgeVersion by extra("0.3.0")
+val ktorVersion by extra("1.5.1")
 val htmlVersion by extra("0.7.2")
 val kotlinWrappersVersion by extra("pre.129-kotlin-1.4.20")
 val fxVersion by extra("14")
 
-
 allprojects {
     repositories {
         mavenLocal()
+        jcenter()
         maven("https://dl.bintray.com/pdvrieze/maven")
         maven("http://maven.jzy3d.org/releases")
     }
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
index bcf18e51..0a8876b2 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
@@ -1,6 +1,6 @@
 package hep.dataforge.vision.gdml.demo
 
-import hep.dataforge.meta.DFExperimental
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.values.asValue
 import hep.dataforge.vision.gdml.readFile
 import hep.dataforge.vision.gdml.toVision
diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts
index 57727447..7665ce21 100644
--- a/demo/muon-monitor/build.gradle.kts
+++ b/demo/muon-monitor/build.gradle.kts
@@ -10,7 +10,7 @@ group = "ru.mipt.npm"
 val ktorVersion: String by rootProject.extra
 
 kscience {
-    useSerialization()
+//    useSerialization()
     application()
 }
 
diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
index a4c6354a..ada656cc 100644
--- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
+++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
@@ -3,7 +3,7 @@ package ru.mipt.npm.muon.monitor.server
 
 import hep.dataforge.context.Context
 import hep.dataforge.context.Global
-import hep.dataforge.meta.DFExperimental
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.solid.SolidManager
 import io.ktor.application.Application
 import io.ktor.application.call
@@ -13,25 +13,24 @@ import io.ktor.features.CallLogging
 import io.ktor.features.ContentNegotiation
 import io.ktor.features.DefaultHeaders
 import io.ktor.http.ContentType
+import io.ktor.http.HttpStatusCode
 import io.ktor.http.content.resources
 import io.ktor.http.content.static
 import io.ktor.response.respond
+import io.ktor.response.respondText
 import io.ktor.routing.Routing
 import io.ktor.routing.get
 import io.ktor.serialization.json
 import io.ktor.server.cio.CIO
 import io.ktor.server.engine.embeddedServer
 import io.ktor.util.KtorExperimentalAPI
-import kotlinx.serialization.json.Json
 import org.apache.commons.math3.random.JDKRandomGenerator
 import ru.mipt.npm.muon.monitor.Model
 import ru.mipt.npm.muon.monitor.sim.Cos2TrackGenerator
 import ru.mipt.npm.muon.monitor.sim.simulateOne
-import io.ktor.response.respondText
 import java.awt.Desktop
 import java.io.File
 import java.net.URI
-import io.ktor.http.HttpStatusCode
 
 private val generator = Cos2TrackGenerator(JDKRandomGenerator(223))
 
diff --git a/demo/sat-demo/build.gradle.kts b/demo/sat-demo/build.gradle.kts
index 048ebd84..16e5d24e 100644
--- a/demo/sat-demo/build.gradle.kts
+++ b/demo/sat-demo/build.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 
 
 kscience {
-    useSerialization {
-        json()
-    }
+//    useSerialization {
+//        json()
+//    }
     application()
 }
 
diff --git a/demo/spatial-showcase/README.md b/demo/solid-showcase/README.md
similarity index 100%
rename from demo/spatial-showcase/README.md
rename to demo/solid-showcase/README.md
diff --git a/demo/spatial-showcase/build.gradle.kts b/demo/solid-showcase/build.gradle.kts
similarity index 86%
rename from demo/spatial-showcase/build.gradle.kts
rename to demo/solid-showcase/build.gradle.kts
index e3b4d0f4..ff6e017c 100644
--- a/demo/spatial-showcase/build.gradle.kts
+++ b/demo/solid-showcase/build.gradle.kts
@@ -13,6 +13,8 @@ kscience {
     application()
 }
 
+val kotlinWrappersVersion: String by rootProject.extra
+
 kotlin {
 
     jvm {
@@ -25,7 +27,7 @@ kotlin {
         commonMain {
             dependencies {
                 implementation(project(":visionforge-solid"))
-                implementation(project(":visionforge-gdml"))
+//                implementation(project(":visionforge-gdml"))
             }
         }
         jvmMain{
@@ -36,7 +38,6 @@ kotlin {
         jsMain{
             dependencies {
                 implementation(project(":visionforge-threejs"))
-                implementation("org.jetbrains:kotlin-css:1.0.0-pre.129-kotlin-1.4.10")
             }
         }
     }
diff --git a/demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt b/demo/solid-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
similarity index 100%
rename from demo/spatial-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
rename to demo/solid-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt b/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
similarity index 100%
rename from demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
rename to demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt b/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
similarity index 100%
rename from demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
rename to demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
diff --git a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt b/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
similarity index 96%
rename from demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
rename to demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
index e90cc845..f9ed1443 100644
--- a/demo/spatial-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
+++ b/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
@@ -4,10 +4,7 @@ import hep.dataforge.meta.*
 import hep.dataforge.names.plus
 import hep.dataforge.names.startsWith
 import hep.dataforge.values.asValue
-import hep.dataforge.vision.getProperty
 import hep.dataforge.vision.onPropertyChange
-import hep.dataforge.vision.set
-import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.Solid.Companion.GEOMETRY_KEY
 import hep.dataforge.vision.solid.three.*
diff --git a/demo/spatial-showcase/src/jsMain/resources/index.html b/demo/solid-showcase/src/jsMain/resources/index.html
similarity index 100%
rename from demo/spatial-showcase/src/jsMain/resources/index.html
rename to demo/solid-showcase/src/jsMain/resources/index.html
diff --git a/demo/spatial-showcase/src/jsMain/resources/styles.css b/demo/solid-showcase/src/jsMain/resources/styles.css
similarity index 100%
rename from demo/spatial-showcase/src/jsMain/resources/styles.css
rename to demo/solid-showcase/src/jsMain/resources/styles.css
diff --git a/demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoApp.kt b/demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoApp.kt
new file mode 100644
index 00000000..0491941c
--- /dev/null
+++ b/demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoApp.kt
@@ -0,0 +1,22 @@
+package hep.dataforge.vision.solid.demo
+
+import javafx.stage.Stage
+import tornadofx.*
+
+class FXDemoApp : App(FXDemoGrid::class) {
+
+    val view: FXDemoGrid by inject()
+
+    override fun start(stage: Stage) {
+        super.start(stage)
+
+        stage.width = 600.0
+        stage.height = 600.0
+
+        view.showcase()
+    }
+}
+
+fun main() {
+    launch<FXDemoApp>()
+}
\ No newline at end of file
diff --git a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt b/demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt
similarity index 100%
rename from demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt
rename to demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt
diff --git a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/MetaEditorDemo.kt b/demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/MetaEditorDemo.kt
similarity index 100%
rename from demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/MetaEditorDemo.kt
rename to demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/MetaEditorDemo.kt
diff --git a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoApp.kt b/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoApp.kt
deleted file mode 100644
index 5b337ad9..00000000
--- a/demo/spatial-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoApp.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package hep.dataforge.vision.solid.demo
-
-import hep.dataforge.vision.gdml.gdml
-import javafx.stage.Stage
-import tornadofx.*
-import java.nio.file.NoSuchFileException
-import java.nio.file.Paths
-
-class FXDemoApp : App(FXDemoGrid::class) {
-
-    val view: FXDemoGrid by inject()
-
-    override fun start(stage: Stage) {
-        super.start(stage)
-
-        stage.width = 600.0
-        stage.height = 600.0
-
-        view.showcase()
-        try {
-            view.demo("gdml", "gdml-cubes") {
-                gdml(Paths.get("D:\\Work\\Projects\\gdml.kt\\gdml-source\\cubes.gdml"))
-                //setProperty(Material3D.MATERIAL_WIREFRAME_KEY, true)
-            }
-        }
-        catch (e: NoSuchFileException) {
-            println("GDML demo: Please specify the correct file path e.g. " +
-                    "visionforge\\demo\\gdml\\src\\commonMain\\resources\\cubes.gdml")
-        }
-    }
-}
-
-fun main() {
-    launch<FXDemoApp>()
-}
\ No newline at end of file
diff --git a/docs/appendix.md b/docs/appendix.md
index 7d928911..b42b2c13 100644
--- a/docs/appendix.md
+++ b/docs/appendix.md
@@ -2,4 +2,6 @@
 
 ### DataForge Name
 
-### DataForge Meta
\ No newline at end of file
+### DataForge Meta
+
+### DataForge Context
\ No newline at end of file
diff --git a/docs/design.md b/docs/design.md
index 36764d30..ca84e64f 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -11,3 +11,7 @@ When the user or a part of inner program mechanics requests a property, it searc
 ### Styling
 
 The actual layering scheme is more complicated. All objects support styling. The styles are named `Meta` nodes that could be used to define groups of properties together and use in different `Vision`s. The styles are defined as named `Meta` nodes in a `VisionGroup` `@stylesheet` property (DataForge states that names starting with `@` are reserved for system properties, not visible by default to the user). The style or a list of styles could be applied to a `Vision` by setting the reserved `@style` property to the name of the style being used or by using `Vision::style` extension property. The style name is then resolved to the nearest ancestor that defines it. The key difference from the CSS styling in HTML is that the stylesheets could be added to any node, not only to the hierarchy root. It allows to decouple the whole subtrees together with styles from the main `Vision` graph, or create stand-alone branches. One must note, that the same style could be defined on different levels of the tree, only the nearest ancestor is resolved, meaning that one can override styles for a sub-tree.
+
+### Intermediate representation
+
+### Kotlin DSL for creating vision-graphs
\ No newline at end of file
diff --git a/docs/features.md b/docs/features.md
new file mode 100644
index 00000000..2a426e07
--- /dev/null
+++ b/docs/features.md
@@ -0,0 +1,5 @@
+## Features
+
+### Customization and plugins
+
+### Full-stack development
\ No newline at end of file
diff --git a/docs/solids.md b/docs/solids.md
new file mode 100644
index 00000000..a5d9441c
--- /dev/null
+++ b/docs/solids.md
@@ -0,0 +1,77 @@
+## Solids
+
+The primary initial goal of creating the library was to provide a flexible API and rendering engine to draw solid geometric forms for so-called event display task in particle physics. Event display is used to provide visualization for particle hit events in both accelerator and non-accelerator experiments (see [add links here] for examples). The event display system must have a way to render basic 3D shapes like boxes, tubes and spheres and particle tracks. An additional requirement is to be able to change coloring and transparency of different elements as well as custom attributes specific to the problem.
+
+The `Solid` class inherits the `Vision` and has three additional nullable real vector properties: `position`, `rotation` and `scale`. Those properties are placed on the top level of the class instead of `properties` tree for performance optimization purposes. The `position` and `rotation` properties reflect the position offset in absolute units and rotation in radians relative to the parent and have defaults of `0.0`. Relativity means that if the parent `Vision` (`SolidGroup`) has `position = (1.0, 0.0, 1.0)` and a child has `position = (0.0, 2.0, 0.0)`, then the real offset of rendered object will be `(1.0, 2.0, 1.0)`. The same goes for the rotation. By default, the rotation uses intrinsic Cordan (Tait–Bryan) angles with `XYZ` order, but order could be changed with an inherited property `rotation.order`. The `scale` property is not inherited and represents local `Solid` scaling factor with default value of `1.0`.
+
+The `SolidGroup` represents the specific kind of `VisionGroup` that has properties of a `Solid` and has one additional special property: the prototype container.
+
+### Solid prototypes
+
+One of the important requirements for event display system is the ability to render a huge number of primitives (tens and hundreds of thousands). This is especially important for accelerator experiments with fine-grained calorimeter detectors ([ref here]). The most memory and CPU-consuming task to render such structures is computing the geometry o equal elements (like calorimeter cells). In order to optimize rendering and model representation for such cases, we introduced so-called prototypes. The idea is that multiple visions could have the same prototype and share the definition and actual rendered geometry. The prototypes are stored in a special container property called `prototypes` in a `SolidGroup` object. In order to access those prototypes there is a special `Solid` object called `SolidReference`. It inherits `Solid` (has properties container, position, rotation and scale), but does not define any geometry. Instead, it has a single `refName` property which stores a fully qualified DataForge `Name` (see [Appendix](appendix.md)) that designates the name of the prototype to be used. During rendering phase, the system searches for appropriate prototype in the nearest parent. If the prototype is not found, the search continues in the next parent in the chain. Like property resolution, the prototype resolution is fine-grained and local, meaning that a part of `Vision` graph could be self-contained together with prototypes.
+
+An important point is that prototypes are resolved in a parent vision container, and the parent vision container for prototypes is the vision group. It means that prototype itself could reference a prototype, or even in corner cases reference itself (such cases should be checked for infinite loops). The prototype relation example is shown in [prototypes.uml](uml/prototypes.puml). Here `Prototype Ref` vision references the `Prototype` vision by first seeking up to `VirionGroup`, the resolving the prototype with appropriate name. In theory, vision groups inside prototypes groups could contain the prototypes of their own, but such constructs should be used with care.
+
+### Solid definitions
+
+Solid models are defined as kotlin classes that also serve as builders for DSL and serialization models. For example, here is the definition for a `Box` class:
+
+```kotlin
+@Serializable
+@SerialName("solid.box")
+class Box(
+    val xSize: Float,
+    val ySize: Float,
+    val zSize: Float
+) : SolidBase(), GeometrySolid 
+```
+
+In general, one does not define how specific solid is rendered, it is done in the rendering back-end. It means that in general, there should be a specific renderer defined for each type of solids defined in the model. Some solids have additional mechanism to avoid providing renderers for each primitive. Classes that inherit `GeometrySolid` interface provide a way to define geometry via polygons like this:
+
+```kotlin
+    override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>) {
+        val dx = xSize / 2
+        val dy = ySize / 2
+        val dz = zSize / 2
+        val node1 = Point3D(-dx, -dy, -dz)
+        val node2 = Point3D(dx, -dy, -dz)
+        val node3 = Point3D(dx, dy, -dz)
+        val node4 = Point3D(-dx, dy, -dz)
+        val node5 = Point3D(-dx, -dy, dz)
+        val node6 = Point3D(dx, -dy, dz)
+        val node7 = Point3D(dx, dy, dz)
+        val node8 = Point3D(-dx, dy, dz)
+        geometryBuilder.face4(node1, node4, node3, node2)
+        geometryBuilder.face4(node1, node2, node6, node5)
+        geometryBuilder.face4(node2, node3, node7, node6)
+        geometryBuilder.face4(node4, node8, node7, node3)
+        geometryBuilder.face4(node1, node5, node8, node4)
+        geometryBuilder.face4(node8, node5, node6, node7)
+    }
+```
+
+The `GeometryBuilder` instance is provided by the specific rendering engine, so the polygons are generated for target engine without intermediate steps. If the renderer provides its own implementation for a solid renderer, it takes precedence over generic `GeometrySolid` definition.
+
+An important basic solid is the `Composite`. It is a primitive, that allows combine two (maybe more in future) primitives via [composite solid geometry or CSG](https://en.wikipedia.org/wiki/Constructive_solid_geometry) transformations (union, difference and subtraction). At this moment, the actual transformation is done on the renderer side.
+
+### GDML bindings
+
+VisionForge supports extensible geometry primitive list, but we've started with primitives needed to render BM@N ([ref]) GDML ([ref]) geometry. GDML files are read with [gdml.kt](https://github.com/mipt-npm/gdml.kt) package designed specifically for this purpose. The package uses [https://github.com/pdvrieze/xmlutil](https://github.com/pdvrieze/xmlutil) serialization plugin to parse GDML structure into the convenient object structure and has language definitions for all GDML primitives. The `visionforge-gdml` module contains a converter that transforms Gdml.kt structures into `Solid`.
+
+The GDML file definition contains several sections:
+
+* **defines** - Dimensions and numbers for geometries.
+* **materials** - Material definitions.
+* **solids** - Primitive definitions and their composition.
+* **structure** - Combinations of solids and groups used in geometry.
+* **setup** - Metadata and geometry entry point.
+
+GDML materials are currently used only for Solid coloring. The data from material is stored in the `Vision` properties. Solids section and structures are transformed into top level group prototypes, which allows not only to create a compact representation, but also optimize rendering. The gdml structure is not always flexible. For example, it is not possible to add a solid directly into a group, but instead one needs to add a group with a single element. Problems like this could be automatically optimized by the convertor.
+
+Not all GDML solids are currently supported by the converter, they could be added later on-demand. Current support covers all solids used in BM@N geometry.
+
+### ThreeJs renderer
+
+VisionForge is not tied to any single renderer. Right now the primary target is the Browser rendering with [Three.js library](https://threejs.org/). The Three.js supports different renderers including WebGL with hardware support and virtual reality.
+
+The bindings for three-js was implemented in kotlin-js based on a [work by Lars Ivar Hatledal](https://github.com/markaren/three-kt-wrapper). The wrapper allows seamless integration with a lot of different library APIs incliding custom cameras and CSG.
\ No newline at end of file
diff --git a/docs/uml/prototypes.puml b/docs/uml/prototypes.puml
new file mode 100644
index 00000000..784a8fc5
--- /dev/null
+++ b/docs/uml/prototypes.puml
@@ -0,0 +1,14 @@
+@startuml
+package "VisionGroup" {
+    package "Prototypes"{
+        [Prototype]
+        package "Prototype group"{
+            [Prototype Ref] --> [Prototype]
+        }
+    }
+
+    package "Child group"{
+      [Ref] --> [Prototype Ref]
+    }
+}
+@enduml
\ No newline at end of file
diff --git a/playground/src/jvmMain/kotlin/plotlyVision.kt b/playground/src/jvmMain/kotlin/plotlyVision.kt
index ea4be39b..9ce31eec 100644
--- a/playground/src/jvmMain/kotlin/plotlyVision.kt
+++ b/playground/src/jvmMain/kotlin/plotlyVision.kt
@@ -1,11 +1,13 @@
 package hep.dataforge.vision.examples
 
-import hep.dataforge.meta.DFExperimental
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.html.fragment
 import hep.dataforge.vision.plotly.plotly
 import hep.dataforge.vision.plotly.withPlotly
+import kotlinx.html.hr
+import kotlinx.html.p
 import kscience.plotly.scatter
 
 @DFExperimental
diff --git a/playground/src/jvmMain/kotlin/randomSpheres.kt b/playground/src/jvmMain/kotlin/randomSpheres.kt
index 96431234..3e971e24 100644
--- a/playground/src/jvmMain/kotlin/randomSpheres.kt
+++ b/playground/src/jvmMain/kotlin/randomSpheres.kt
@@ -1,6 +1,6 @@
 package hep.dataforge.vision.examples
 
-import hep.dataforge.meta.DFExperimental
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.html.ResourceLocation
diff --git a/playground/src/jvmMain/kotlin/serverExtensions.kt b/playground/src/jvmMain/kotlin/serverExtensions.kt
index 51aa23af..7e107f0e 100644
--- a/playground/src/jvmMain/kotlin/serverExtensions.kt
+++ b/playground/src/jvmMain/kotlin/serverExtensions.kt
@@ -1,7 +1,7 @@
 package hep.dataforge.vision.examples
 
 import hep.dataforge.context.Context
-import hep.dataforge.meta.DFExperimental
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.html.HtmlVisionFragment
 import hep.dataforge.vision.html.ResourceLocation
 import hep.dataforge.vision.html.scriptHeader
diff --git a/playground/src/jvmMain/kotlin/simpleCube.kt b/playground/src/jvmMain/kotlin/simpleCube.kt
index fbcb66e1..9b43ff90 100644
--- a/playground/src/jvmMain/kotlin/simpleCube.kt
+++ b/playground/src/jvmMain/kotlin/simpleCube.kt
@@ -1,6 +1,6 @@
 package hep.dataforge.vision.examples
 
-import hep.dataforge.meta.DFExperimental
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.html.ResourceLocation
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9da6e3f2..007af867 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
-    val kotlinVersion = "1.4.30-RC"
-    val toolsVersion = "0.7.3-1.4.30-RC"
+    val kotlinVersion = "1.4.30"
+    val toolsVersion = "0.7.6"
 
     repositories {
         mavenLocal()
@@ -44,9 +44,9 @@ include(
     ":visionforge-gdml",
     ":visionforge-server",
     ":visionforge-plotly",
-    ":demo:spatial-showcase",
-    ":demo:gdml",
+    ":demo:solid-showcase",
+//    ":demo:gdml",
     ":demo:muon-monitor",
-    ":demo:sat-demo",
-    ":playground"
+    ":demo:sat-demo"
+//    ":playground"
 )
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleReference.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleReference.kt
index ac8da104..045f7879 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleReference.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleReference.kt
@@ -1,8 +1,8 @@
 package hep.dataforge.vision
 
-import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.MetaBuilder
+import hep.dataforge.misc.DFExperimental
 import kotlin.properties.ReadOnlyProperty
 
 /**
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
index 5dd8bf37..f083e2c1 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
@@ -4,6 +4,7 @@ import hep.dataforge.meta.*
 import hep.dataforge.meta.descriptors.NodeDescriptor
 import hep.dataforge.meta.descriptors.defaultItem
 import hep.dataforge.meta.descriptors.get
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.names.plus
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
index b94e7984..08d44311 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
@@ -1,6 +1,7 @@
 package hep.dataforge.vision
 
 import hep.dataforge.meta.*
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.names.Name
 import hep.dataforge.names.plus
 import hep.dataforge.values.Null
@@ -9,7 +10,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import kotlinx.serialization.*
+import kotlinx.serialization.Serializable
 import kotlin.jvm.Synchronized
 import kotlin.time.Duration
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
index bdea12b4..debfe28e 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
@@ -1,6 +1,6 @@
 package hep.dataforge.vision.html
 
-import hep.dataforge.meta.DFExperimental
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.VisionManager
 import kotlinx.html.FlowContent
 import kotlinx.html.TagConsumer
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
index 84d73269..0a536c90 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
@@ -1,11 +1,17 @@
 package hep.dataforge.vision.html
 
-import hep.dataforge.meta.*
+import hep.dataforge.meta.Meta
+import hep.dataforge.meta.MetaBuilder
+import hep.dataforge.meta.MetaSerializer
+import hep.dataforge.meta.isEmpty
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.names.Name
 import hep.dataforge.names.toName
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionManager
 import kotlinx.html.*
+import kotlin.collections.set
+import kotlin.collections.setOf
 
 
 /**
diff --git a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
index a5e08500..7d558b45 100644
--- a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
+++ b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
@@ -1,7 +1,7 @@
 package hep.dataforge.vision.html
 
-import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.set
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.VisionBase
 import hep.dataforge.vision.configure
 import hep.dataforge.vision.meta
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/headers.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/headers.kt
index 4c458b58..45fde55a 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/headers.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/headers.kt
@@ -1,6 +1,6 @@
 package hep.dataforge.vision.html
 
-import hep.dataforge.meta.DFExperimental
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.VisionManager
 import kotlinx.html.link
 import kotlinx.html.script
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/htmlExport.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/htmlExport.kt
index 337ecefc..e18c65c3 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/htmlExport.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/htmlExport.kt
@@ -1,7 +1,7 @@
 package hep.dataforge.vision
 
 import hep.dataforge.context.Context
-import hep.dataforge.meta.DFExperimental
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.html.HtmlFragment
 import hep.dataforge.vision.html.HtmlVisionFragment
 import hep.dataforge.vision.html.Page
diff --git a/visionforge-fx/build.gradle.kts b/visionforge-fx/build.gradle.kts
index 4cc5286d..43a2d0ad 100644
--- a/visionforge-fx/build.gradle.kts
+++ b/visionforge-fx/build.gradle.kts
@@ -9,7 +9,6 @@ val fxVersion: String by rootProject.extra
 
 kscience{
     useFx(ru.mipt.npm.gradle.FXModule.CONTROLS, version = fxVersion)
-    useSerialization()
 }
 
 dependencies {
diff --git a/visionforge-gdml/build.gradle.kts b/visionforge-gdml/build.gradle.kts
index d6456b16..59f0f524 100644
--- a/visionforge-gdml/build.gradle.kts
+++ b/visionforge-gdml/build.gradle.kts
@@ -7,7 +7,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 api(project(":visionforge-solid"))
-                api("kscience.gdml:gdml:0.2.0-dev-3")
+                api("kscience.gdml:gdml:0.2.0")
             }
         }
     }
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
index a4008d2b..69a8dbbb 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
@@ -234,7 +234,14 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
 
                 }
             }
-            else -> error("Renderer for $solid not supported yet")
+            is GDMLEllipsoid -> TODO("Renderer for $solid not supported yet")
+            is GDMLElTube -> TODO("Renderer for $solid not supported yet")
+            is GDMLElCone -> TODO("Renderer for $solid not supported yet")
+            is GDMLParaboloid -> TODO("Renderer for $solid not supported yet")
+            is GDMLParallelepiped -> TODO("Renderer for $solid not supported yet")
+            is GDMLTorus -> TODO("Renderer for $solid not supported yet")
+            is GDMLTrapezoid -> TODO("Renderer for $solid not supported yet")
+            is GDMLPolycone -> TODO("Renderer for $solid not supported yet")
         }
     }
 
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
index 9670ea11..02915331 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
@@ -1,7 +1,7 @@
 package hep.dataforge.vision.gdml
 
-import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.itemSequence
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.meta
 import hep.dataforge.vision.solid.*
diff --git a/visionforge-plotly/build.gradle.kts b/visionforge-plotly/build.gradle.kts
index 66c1ca12..1eec1565 100644
--- a/visionforge-plotly/build.gradle.kts
+++ b/visionforge-plotly/build.gradle.kts
@@ -2,12 +2,12 @@ plugins {
     id("ru.mipt.npm.mpp")
 }
 
-kscience {
+val plotlyVersion = "0.3.1"
+
+kscience{
     useSerialization()
 }
 
-val plotlyVersion = "0.3.1-dev"
-
 kotlin {
     js{
         //binaries.library()
diff --git a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt
index a295deb9..3fd82a3a 100644
--- a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt
+++ b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt
@@ -1,7 +1,7 @@
 package hep.dataforge.vision.plotly
 
 import hep.dataforge.meta.Config
-import hep.dataforge.meta.DFExperimental
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.VisionBase
 import hep.dataforge.vision.html.VisionOutput
 import kotlinx.serialization.Serializable
diff --git a/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyHeaders.kt b/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyHeaders.kt
index ecf32a1a..65ad8a91 100644
--- a/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyHeaders.kt
+++ b/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyHeaders.kt
@@ -1,6 +1,6 @@
 package hep.dataforge.vision.plotly
 
-import hep.dataforge.meta.DFExperimental
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.html.HtmlFragment
 import hep.dataforge.vision.html.ResourceLocation
 import hep.dataforge.vision.html.scriptHeader
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt b/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt
index 5baf2643..5672bd00 100644
--- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt
@@ -2,6 +2,7 @@ package hep.dataforge.vision.three.server
 
 import hep.dataforge.context.Context
 import hep.dataforge.meta.*
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.names.Name
 import hep.dataforge.names.toName
 import hep.dataforge.vision.Vision
diff --git a/visionforge-solid/build.gradle.kts b/visionforge-solid/build.gradle.kts
index fde0d41d..843ae5dc 100644
--- a/visionforge-solid/build.gradle.kts
+++ b/visionforge-solid/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     id("ru.mipt.npm.mpp")
 }
 
-kscience {
+kscience{
     useSerialization()
 }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
index adedccda..c5a81fc6 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
@@ -3,7 +3,6 @@ package hep.dataforge.vision.solid
 import hep.dataforge.vision.VisionBuilder
 import hep.dataforge.vision.VisionContainerBuilder
 import hep.dataforge.vision.set
-import hep.dataforge.vision.solid.Solid.Companion.solidEquals
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -36,25 +35,25 @@ public class Box(
         geometryBuilder.face4(node8, node5, node6, node7)
     }
 
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other == null || this::class != other::class) return false
-
-        other as Box
-
-        if (xSize != other.xSize) return false
-        if (ySize != other.ySize) return false
-        if (zSize != other.zSize) return false
-
-        return solidEquals(this, other)
-    }
-
-    override fun hashCode(): Int {
-        var result = xSize.hashCode()
-        result = 31 * result + ySize.hashCode()
-        result = 31 * result + zSize.hashCode()
-        return 31 * result + Solid.solidHashCode(this)
-    }
+//    override fun equals(other: Any?): Boolean {
+//        if (this === other) return true
+//        if (other == null || this::class != other::class) return false
+//
+//        other as Box
+//
+//        if (xSize != other.xSize) return false
+//        if (ySize != other.ySize) return false
+//        if (zSize != other.zSize) return false
+//
+//        return solidEquals(this, other)
+//    }
+//
+//    override fun hashCode(): Int {
+//        var result = xSize.hashCode()
+//        result = 31 * result + ySize.hashCode()
+//        result = 31 * result + zSize.hashCode()
+//        return 31 * result + Solid.solidHashCode(this)
+//    }
 
 
     public companion object {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index 1a9db779..e7855cd5 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -33,7 +33,6 @@ public class SolidGroup(
 
     override val descriptor: NodeDescriptor get() = Solid.descriptor
 
-
     /**
      * Ger a prototype redirecting the request to the parent if prototype is not found
      */
@@ -69,7 +68,7 @@ public class SolidGroup(
     }
 
     public companion object {
-//        val PROTOTYPES_KEY = NameToken("@prototypes")
+        //public val PROTOTYPES_TOKEN = NameToken("@prototypes")
     }
 }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index db68b53c..442af1a5 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -3,8 +3,8 @@ package hep.dataforge.vision.solid
 import hep.dataforge.context.Context
 import hep.dataforge.context.PluginFactory
 import hep.dataforge.context.PluginTag
-import hep.dataforge.meta.DFExperimental
 import hep.dataforge.meta.Meta
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.*
 import hep.dataforge.vision.html.VisionOutput
 import kotlinx.serialization.PolymorphicSerializer
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
index a802b955..fd6ddbfa 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
@@ -1,7 +1,9 @@
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.*
+import hep.dataforge.meta.MetaItem
+import hep.dataforge.meta.asMetaItem
 import hep.dataforge.meta.descriptors.NodeDescriptor
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.names.*
 import hep.dataforge.vision.*
 import kotlinx.coroutines.flow.Flow
@@ -35,15 +37,15 @@ private fun SolidReference.getRefProperty(
 @Serializable
 @SerialName("solid.ref")
 public class SolidReferenceGroup(
-    public val templateName: Name,
+    public val refName: Name,
 ) : SolidBase(), SolidReference, VisionGroup {
 
     /**
      * Recursively search for defined template in the parent
      */
     override val prototype: Solid
-        get() = (parent as? SolidGroup)?.getPrototype(templateName)
-            ?: error("Prototype with name $templateName not found in $parent")
+        get() = (parent as? SolidGroup)?.getPrototype(refName)
+            ?: error("Prototype with name $refName not found in $parent")
 
     override val children: Map<NameToken, Vision>
         get() = (prototype as? VisionGroup)?.children
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
index 0b69d23b..72db9f97 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
@@ -1,6 +1,6 @@
 package hep.dataforge.vision.solid.transform
 
-import hep.dataforge.meta.DFExperimental
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.names.asName
 import hep.dataforge.vision.*
 import hep.dataforge.vision.solid.*
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
index 8bc81ff1..a9f22c1c 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
@@ -1,6 +1,6 @@
 package hep.dataforge.vision.solid.transform
 
-import hep.dataforge.meta.DFExperimental
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
 import hep.dataforge.vision.MutableVisionGroup
@@ -18,7 +18,7 @@ internal object UnRef : VisualTreeTransform<SolidGroup>() {
                     reducer[key] = (reducer[key] ?: 0) + value
                 }
             } else if (obj is SolidReferenceGroup) {
-                reducer[obj.templateName] = (reducer[obj.templateName] ?: 0) + 1
+                reducer[obj.refName] = (reducer[obj.refName] ?: 0) + 1
             }
 
             return reducer
@@ -29,7 +29,7 @@ internal object UnRef : VisualTreeTransform<SolidGroup>() {
         (this as? SolidGroup)?.prototypes{
             set(name, null)
         }
-        children.filter { (it.value as? SolidReferenceGroup)?.templateName == name }.forEach { (key, value) ->
+        children.filter { (it.value as? SolidReferenceGroup)?.refName == name }.forEach { (key, value) ->
             val reference = value as SolidReferenceGroup
             val newChild = mergeChild(reference, reference.prototype)
             newChild.parent = null
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
index e2496d9a..20062686 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
@@ -1,7 +1,10 @@
 package hep.dataforge.vision.solid
 
-import hep.dataforge.meta.*
-
+import hep.dataforge.meta.MetaItemNode
+import hep.dataforge.meta.getIndexed
+import hep.dataforge.meta.node
+import hep.dataforge.meta.toMetaItem
+import hep.dataforge.misc.DFExperimental
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt
index 1361a2c7..a18207c8 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt
@@ -1,7 +1,7 @@
 package hep.dataforge.vision.solid
 
 import hep.dataforge.context.Global
-import hep.dataforge.meta.DFExperimental
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.get
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/visionforge-threejs/build.gradle.kts b/visionforge-threejs/build.gradle.kts
index c893e845..c2ce0570 100644
--- a/visionforge-threejs/build.gradle.kts
+++ b/visionforge-threejs/build.gradle.kts
@@ -2,10 +2,6 @@ plugins {
     id("ru.mipt.npm.js")
 }
 
-kscience {
-    useSerialization()
-}
-
 kotlin{
     js{
         binaries.library()
diff --git a/visionforge-threejs/visionforge-threejs-server/build.gradle.kts b/visionforge-threejs/visionforge-threejs-server/build.gradle.kts
index 2531a5e2..ee0e74e9 100644
--- a/visionforge-threejs/visionforge-threejs-server/build.gradle.kts
+++ b/visionforge-threejs/visionforge-threejs-server/build.gradle.kts
@@ -2,13 +2,6 @@ plugins {
     id("ru.mipt.npm.mpp")
  }
 
-
-kscience{
-    useSerialization{
-        json()
-    }
- }
-
 val ktorVersion: String by rootProject.extra
 
 kotlin {
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
index d44fa02e..589ed03a 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
@@ -1,7 +1,7 @@
 package hep.dataforge.vision.three.server
 
 import hep.dataforge.context.Context
-import hep.dataforge.meta.DFExperimental
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.html.HtmlVisionFragment
 import hep.dataforge.vision.html.ResourceLocation
 import hep.dataforge.vision.html.scriptHeader

From 60906db32e04d54433f7ac5412131b8e3823dbdf Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 23 Feb 2021 21:47:18 +0300
Subject: [PATCH 086/151] Migrate to the new plugin

---
 build.gradle.kts                              |  18 ++-
 demo/gdml/build.gradle.kts                    |   2 +-
 .../hep/dataforge/vision/gdml/demo/cubes.kt   |  10 +-
 .../vision/gdml/demo/GDMLAppComponent.kt      |   6 +-
 .../dataforge/vision/gdml/demo/readFile.kt    |   4 +-
 .../dataforge/vision/gdml/demo/saveToJson.kt  |   6 +-
 demo/jupyter-playground/build.gradle.kts      |  36 +++++
 .../VisionForgePlayGroundForJupyter.kt        |  88 +++++++++++
 demo/muon-monitor/build.gradle.kts            |   4 +-
 .../playground}/build.gradle.kts              |  12 +-
 .../src/jsMain/kotlin/playgroundMain.kt       |   0
 .../src/jsMain/resources/css/common.css       |   0
 .../src/jsMain/resources/index.html           |   0
 .../src/jvmMain/kotlin/generateSchema.kt      |   0
 .../src/jvmMain/kotlin/plotlyVision.kt        |   2 -
 .../src/jvmMain/kotlin/randomSpheres.kt       |   0
 .../src/jvmMain/kotlin/serverExtensions.kt    |   2 +-
 .../src/jvmMain/kotlin/simpleCube.kt          |   0
 demo/sat-demo/build.gradle.kts                |   4 +-
 demo/solid-showcase/build.gradle.kts          |   2 +-
 .../vision/solid/demo/VariableBox.kt          |   3 +
 docs/design.md                                |   2 +
 docs/solids.md                                |   2 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 settings.gradle.kts                           |  27 ++--
 ui/bootstrap/build.gradle.kts                 |   2 +-
 ui/material/build.gradle.kts                  |   2 +-
 ui/react/build.gradle.kts                     |   6 +-
 ui/ring/build.gradle.kts                      |   2 +-
 visionforge-core/build.gradle.kts             |   2 +-
 .../kotlin/hep/dataforge/vision/html/Page.kt  |  12 +-
 .../hep/dataforge/vision/html/htmlExport.kt   |  12 +-
 visionforge-fx/build.gradle.kts               |   2 +-
 visionforge-gdml/build.gradle.kts             |   4 +-
 ...{GDMLTransformer.kt => GdmlTransformer.kt} | 138 +++++++++---------
 .../hep/dataforge/vision/gdml/gdmlJVM.kt      |  10 +-
 .../dataforge/vision/gdml/TestConvertor.kt    |   8 +-
 .../dataforge/vision/gdml/bmanStatistics.kt   |   4 +-
 visionforge-plotly/build.gradle.kts           |   2 +-
 visionforge-server/build.gradle.kts           |   4 +-
 visionforge-solid/build.gradle.kts            |   3 +-
 visionforge-threejs/build.gradle.kts          |   2 +-
 .../build.gradle.kts                          |   2 +-
 .../vision/three/server/serverExtensions.kt   |   2 +-
 44 files changed, 290 insertions(+), 161 deletions(-)
 create mode 100644 demo/jupyter-playground/build.gradle.kts
 create mode 100644 demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
 rename {playground => demo/playground}/build.gradle.kts (78%)
 rename {playground => demo/playground}/src/jsMain/kotlin/playgroundMain.kt (100%)
 rename {playground => demo/playground}/src/jsMain/resources/css/common.css (100%)
 rename {playground => demo/playground}/src/jsMain/resources/index.html (100%)
 rename {playground => demo/playground}/src/jvmMain/kotlin/generateSchema.kt (100%)
 rename {playground => demo/playground}/src/jvmMain/kotlin/plotlyVision.kt (93%)
 rename {playground => demo/playground}/src/jvmMain/kotlin/randomSpheres.kt (100%)
 rename {playground => demo/playground}/src/jvmMain/kotlin/serverExtensions.kt (97%)
 rename {playground => demo/playground}/src/jvmMain/kotlin/simpleCube.kt (100%)
 rename visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/{GDMLTransformer.kt => GdmlTransformer.kt} (73%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3b6598a3..5a0f3400 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,31 +1,35 @@
 plugins {
-    id("ru.mipt.npm.project")
+    id("ru.mipt.npm.gradle.project")
+    kotlin("jvm") apply false
+    kotlin("jupyter.api") apply false
 }
 
 val dataforgeVersion by extra("0.3.0")
-val ktorVersion by extra("1.5.1")
-val htmlVersion by extra("0.7.2")
-val kotlinWrappersVersion by extra("pre.129-kotlin-1.4.20")
+val ktorVersion by extra(ru.mipt.npm.gradle.KScienceVersions.ktorVersion)
+val htmlVersion by extra(ru.mipt.npm.gradle.KScienceVersions.htmlVersion)
+val kotlinWrappersVersion by extra("pre.148-kotlin-1.4.30")
 val fxVersion by extra("14")
 
 allprojects {
     repositories {
         mavenLocal()
+        mavenCentral()
         jcenter()
+        maven("https://kotlin.bintray.com/kotlin-js-wrappers")
         maven("https://dl.bintray.com/pdvrieze/maven")
         maven("http://maven.jzy3d.org/releases")
     }
 
     group = "hep.dataforge"
-    version = "0.2.0-dev-4"
+    version = "0.2.0-dev-5"
 }
 
 val githubProject by extra("visionforge")
 val bintrayRepo by extra("dataforge")
 
 subprojects {
-    if(name.startsWith("visionforge")) {
-        apply<ru.mipt.npm.gradle.KSciencePublishPlugin>()
+    if (name.startsWith("visionforge")) {
+        plugins.apply("ru.mipt.npm.gradle.publish")
     }
 }
 
diff --git a/demo/gdml/build.gradle.kts b/demo/gdml/build.gradle.kts
index ef958795..1246edad 100644
--- a/demo/gdml/build.gradle.kts
+++ b/demo/gdml/build.gradle.kts
@@ -2,7 +2,7 @@ import ru.mipt.npm.gradle.DependencyConfiguration
 import ru.mipt.npm.gradle.FXModule
 
 plugins {
-    id("ru.mipt.npm.mpp")
+    id("ru.mipt.npm.gradle.mpp")
     application
 }
 
diff --git a/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/demo/cubes.kt b/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/demo/cubes.kt
index e37ba142..1ddc853e 100644
--- a/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/demo/cubes.kt
+++ b/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/demo/cubes.kt
@@ -1,14 +1,14 @@
 package hep.dataforge.vision.gdml.demo
 
-import kscience.gdml.*
+import space.kscience.gdml.*
 
 
-fun cubes(): GDML = GDML {
+fun cubes(): Gdml = Gdml {
     val center = define.position("center")
     structure {
-        val air = ref<GDMLMaterial>("G4_AIR")
-        val tubeMaterial = ref<GDMLMaterial>("tube")
-        val boxMaterial = ref<GDMLMaterial>("box")
+        val air = ref<GdmlMaterial>("G4_AIR")
+        val tubeMaterial = ref<GdmlMaterial>("tube")
+        val boxMaterial = ref<GdmlMaterial>("box")
         val segment = solids.tube("segment", 20, 5.0) {
             rmin = 17
             deltaphi = 60
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index f8cd3be7..b0caeeb8 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -15,8 +15,8 @@ import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.solid.three.ThreeCanvas
 import kotlinx.browser.window
 import kotlinx.css.*
-import kscience.gdml.GDML
-import kscience.gdml.decodeFromString
+import space.kscience.gdml.Gdml
+import space.kscience.gdml.decodeFromString
 import org.w3c.files.FileReader
 import org.w3c.files.get
 import react.RProps
@@ -55,7 +55,7 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
         val visionManager = props.context.plugins.fetch(SolidManager).visionManager
         val parsedVision = when {
             name.endsWith(".gdml") || name.endsWith(".xml") -> {
-                val gdml = GDML.decodeFromString(data)
+                val gdml = Gdml.decodeFromString(data)
                 gdml.toVision()
             }
             name.endsWith(".json") -> visionManager.decodeFromString(data)
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
index 0a8876b2..e1756d51 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
@@ -9,7 +9,7 @@ import hep.dataforge.vision.solid.SolidManager
 import hep.dataforge.vision.solid.SolidMaterial
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionManager
-import kscience.gdml.GDML
+import space.kscience.gdml.Gdml
 import java.io.File
 import java.util.zip.GZIPInputStream
 import java.util.zip.ZipInputStream
@@ -17,7 +17,7 @@ import java.util.zip.ZipInputStream
 @OptIn(DFExperimental::class)
 fun VisionManager.readFile(file: File): Vision = when {
     file.extension == "gdml" || file.extension == "xml" -> {
-        GDML.readFile(file.toPath()).toVision {
+        Gdml.readFile(file.toPath()).toVision {
 //            lUnit = LUnit.CM
 //
 //            solidConfiguration = { parent, solid ->
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt
index ccc7da85..472d28cf 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt
@@ -3,8 +3,8 @@ package hep.dataforge.vision.gdml.demo
 import hep.dataforge.vision.gdml.readFile
 import hep.dataforge.vision.gdml.toVision
 import hep.dataforge.vision.solid.SolidManager
-import kscience.gdml.GDML
-import kscience.gdml.LUnit
+import space.kscience.gdml.Gdml
+import space.kscience.gdml.LUnit
 import java.io.File
 import java.nio.file.Paths
 
@@ -14,7 +14,7 @@ fun main(args: Array<String>) {
     require(inputFileName.endsWith(".gdml")){"GDML required"}
     val outputFileName = args.getOrNull(1)?:inputFileName.replace(".gdml",".json")
 
-    val gdml = GDML.readFile(Paths.get(inputFileName))
+    val gdml = Gdml.readFile(Paths.get(inputFileName))
         //GDML.readFile(Paths.get("D:\\Work\\Projects\\visionforge\\visionforge-spatial-gdml\\src\\jvmTest\\resources\\gdml\\simple1.gdml"))
 
     val vision = gdml.toVision {
diff --git a/demo/jupyter-playground/build.gradle.kts b/demo/jupyter-playground/build.gradle.kts
new file mode 100644
index 00000000..5dfb8fbb
--- /dev/null
+++ b/demo/jupyter-playground/build.gradle.kts
@@ -0,0 +1,36 @@
+plugins {
+    kotlin("jvm")
+    kotlin("jupyter.api")
+    id("com.github.johnrengelman.shadow") version "6.1.0"
+}
+
+repositories {
+    mavenCentral()
+    maven("https://repo.kotlin.link")
+    maven("https://dl.bintray.com/mipt-npm/dataforge")
+    maven("https://dl.bintray.com/mipt-npm/kscience")
+    maven("https://dl.bintray.com/mipt-npm/dev")
+}
+
+dependencies {
+    implementation(project(":demo:playground"))
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile> {
+    kotlinOptions {
+        useIR = true
+        jvmTarget = ru.mipt.npm.gradle.KScienceVersions.JVM_TARGET.toString()
+    }
+}
+
+extensions.findByType<JavaPluginExtension>()?.apply {
+    targetCompatibility = ru.mipt.npm.gradle.KScienceVersions.JVM_TARGET
+}
+
+tasks.withType<Test> {
+    useJUnitPlatform()
+}
+
+tasks.processJupyterApiResources {
+    libraryProducers = listOf("hep.dataforge.playground.VisionForgePlayGroundForJupyter")
+}
\ No newline at end of file
diff --git a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
new file mode 100644
index 00000000..95037870
--- /dev/null
+++ b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
@@ -0,0 +1,88 @@
+package hep.dataforge.playground
+
+import hep.dataforge.context.Context
+import hep.dataforge.vision.VisionManager
+import hep.dataforge.vision.gdml.gdml
+import hep.dataforge.vision.html.Page
+import hep.dataforge.vision.html.embedVisionFragment
+import hep.dataforge.vision.html.fragment
+import hep.dataforge.vision.html.scriptHeader
+import hep.dataforge.vision.plotly.PlotlyPlugin
+import hep.dataforge.vision.plotly.VisionOfPlotly
+import hep.dataforge.vision.solid.SolidManager
+import hep.dataforge.vision.solid.solid
+import hep.dataforge.vision.visionManager
+import kotlinx.html.div
+import kotlinx.html.stream.createHTML
+import kscience.plotly.Plot
+import kscience.plotly.PlotlyFragment
+import org.jetbrains.kotlinx.jupyter.api.HTML
+import org.jetbrains.kotlinx.jupyter.api.Notebook
+import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
+import org.jetbrains.kotlinx.jupyter.api.libraries.*
+import space.kscience.gdml.Gdml
+
+@JupyterLibrary
+internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
+
+    private val context = Context("Playground") {
+        plugin(SolidManager)
+        plugin(PlotlyPlugin)
+    }
+
+    val jsBundle = ResourceFallbacksBundle(listOf(ResourceLocation("js/visionforge-playground.js",
+        ResourcePathType.CLASSPATH_PATH)))
+    val jsResource = LibraryResource(name = "VisionForge", type = ResourceType.JS, bundles = listOf(jsBundle))
+
+    override fun Builder.onLoaded(notebook: Notebook?) {
+        resource(jsResource)
+
+        import("space.kscience.gdml.*", "kscience.plotly.*", "kscience.plotly.models.*")
+
+        onLoaded {
+            val header = scriptHeader("js/visionforge-playground.js", null, hep.dataforge.vision.html.ResourceLocation.EMBED)
+            display(HTML(createHTML().apply(header).finalize()))
+        }
+
+        render<Gdml> { gdmlModel ->
+            val fragment = VisionManager.fragment {
+                vision {
+                    solid {
+                        gdml(gdmlModel)
+                    }
+                }
+            }
+
+            val html = createHTML().div {
+                embedVisionFragment(context.visionManager, fragment = fragment)
+            }
+
+            HTML(html)
+        }
+
+        render<Plot> { plot ->
+            val fragment = VisionManager.fragment {
+                vision {
+                    VisionOfPlotly(plot.config)
+                }
+            }
+
+            val html = createHTML().div {
+                embedVisionFragment(context.visionManager, fragment = fragment)
+            }
+
+            HTML(html)
+        }
+
+        render<kscience.plotly.HtmlFragment> { fragment ->
+            HTML(createHTML().apply(fragment.visit).finalize())
+        }
+
+        render<Page> { page ->
+            HTML(page.render(createHTML()), true)
+        }
+
+
+    }
+
+}
diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts
index 7665ce21..8b51da72 100644
--- a/demo/muon-monitor/build.gradle.kts
+++ b/demo/muon-monitor/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME
 
 plugins {
-    id("ru.mipt.npm.mpp")
+    id("ru.mipt.npm.gradle.mpp")
     application
 }
 
@@ -57,7 +57,7 @@ kotlin {
 }
 
 application {
-    mainClass.set("ru.mipt.npm.muon.monitor.server.MMServerKt")
+    mainClass.set("ru.mipt.npm.gradle.muon.monitor.server.MMServerKt")
 }
 
 distributions {
diff --git a/playground/build.gradle.kts b/demo/playground/build.gradle.kts
similarity index 78%
rename from playground/build.gradle.kts
rename to demo/playground/build.gradle.kts
index 4df93ed9..3159194c 100644
--- a/playground/build.gradle.kts
+++ b/demo/playground/build.gradle.kts
@@ -46,22 +46,22 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation(project(":visionforge-solid"))
-                implementation(project(":visionforge-gdml"))
-                implementation(project(":visionforge-plotly"))
+                api(project(":visionforge-solid"))
+                api(project(":visionforge-gdml"))
+                api(project(":visionforge-plotly"))
             }
         }
 
         val jsMain by getting{
             dependencies {
-                implementation(project(":ui:bootstrap"))
-                implementation(project(":visionforge-threejs"))
+                api(project(":ui:bootstrap"))
+                api(project(":visionforge-threejs"))
             }
         }
 
         val jvmMain by getting{
             dependencies {
-                implementation(project(":visionforge-server"))
+                api(project(":visionforge-server"))
                 implementation("com.github.Ricky12Awesome:json-schema-serialization:0.6.6")
             }
         }
diff --git a/playground/src/jsMain/kotlin/playgroundMain.kt b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
similarity index 100%
rename from playground/src/jsMain/kotlin/playgroundMain.kt
rename to demo/playground/src/jsMain/kotlin/playgroundMain.kt
diff --git a/playground/src/jsMain/resources/css/common.css b/demo/playground/src/jsMain/resources/css/common.css
similarity index 100%
rename from playground/src/jsMain/resources/css/common.css
rename to demo/playground/src/jsMain/resources/css/common.css
diff --git a/playground/src/jsMain/resources/index.html b/demo/playground/src/jsMain/resources/index.html
similarity index 100%
rename from playground/src/jsMain/resources/index.html
rename to demo/playground/src/jsMain/resources/index.html
diff --git a/playground/src/jvmMain/kotlin/generateSchema.kt b/demo/playground/src/jvmMain/kotlin/generateSchema.kt
similarity index 100%
rename from playground/src/jvmMain/kotlin/generateSchema.kt
rename to demo/playground/src/jvmMain/kotlin/generateSchema.kt
diff --git a/playground/src/jvmMain/kotlin/plotlyVision.kt b/demo/playground/src/jvmMain/kotlin/plotlyVision.kt
similarity index 93%
rename from playground/src/jvmMain/kotlin/plotlyVision.kt
rename to demo/playground/src/jvmMain/kotlin/plotlyVision.kt
index 9ce31eec..22b0863b 100644
--- a/playground/src/jvmMain/kotlin/plotlyVision.kt
+++ b/demo/playground/src/jvmMain/kotlin/plotlyVision.kt
@@ -6,8 +6,6 @@ import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.html.fragment
 import hep.dataforge.vision.plotly.plotly
 import hep.dataforge.vision.plotly.withPlotly
-import kotlinx.html.hr
-import kotlinx.html.p
 import kscience.plotly.scatter
 
 @DFExperimental
diff --git a/playground/src/jvmMain/kotlin/randomSpheres.kt b/demo/playground/src/jvmMain/kotlin/randomSpheres.kt
similarity index 100%
rename from playground/src/jvmMain/kotlin/randomSpheres.kt
rename to demo/playground/src/jvmMain/kotlin/randomSpheres.kt
diff --git a/playground/src/jvmMain/kotlin/serverExtensions.kt b/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
similarity index 97%
rename from playground/src/jvmMain/kotlin/serverExtensions.kt
rename to demo/playground/src/jvmMain/kotlin/serverExtensions.kt
index 7e107f0e..7008e4f3 100644
--- a/playground/src/jvmMain/kotlin/serverExtensions.kt
+++ b/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
@@ -4,9 +4,9 @@ import hep.dataforge.context.Context
 import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.html.HtmlVisionFragment
 import hep.dataforge.vision.html.ResourceLocation
+import hep.dataforge.vision.html.page
 import hep.dataforge.vision.html.scriptHeader
 import hep.dataforge.vision.makeFile
-import hep.dataforge.vision.page
 import hep.dataforge.vision.three.server.VisionServer
 import hep.dataforge.vision.three.server.useScript
 import java.awt.Desktop
diff --git a/playground/src/jvmMain/kotlin/simpleCube.kt b/demo/playground/src/jvmMain/kotlin/simpleCube.kt
similarity index 100%
rename from playground/src/jvmMain/kotlin/simpleCube.kt
rename to demo/playground/src/jvmMain/kotlin/simpleCube.kt
diff --git a/demo/sat-demo/build.gradle.kts b/demo/sat-demo/build.gradle.kts
index 16e5d24e..c2d4c852 100644
--- a/demo/sat-demo/build.gradle.kts
+++ b/demo/sat-demo/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.jvm")
+    id("ru.mipt.npm.gradle.jvm")
     application
 }
 
@@ -18,5 +18,5 @@ dependencies{
 }
 
 application {
-    mainClass.set("ru.mipt.npm.sat.SatServerKt")
+    mainClass.set("ru.mipt.npm.gradle.sat.SatServerKt")
 }
diff --git a/demo/solid-showcase/build.gradle.kts b/demo/solid-showcase/build.gradle.kts
index ff6e017c..6cdec7f0 100644
--- a/demo/solid-showcase/build.gradle.kts
+++ b/demo/solid-showcase/build.gradle.kts
@@ -2,7 +2,7 @@ import ru.mipt.npm.gradle.DependencyConfiguration
 import ru.mipt.npm.gradle.FXModule
 
 plugins {
-    id("ru.mipt.npm.mpp")
+    id("ru.mipt.npm.gradle.mpp")
     application
 }
 
diff --git a/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt b/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
index f9ed1443..e90cc845 100644
--- a/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
+++ b/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
@@ -4,7 +4,10 @@ import hep.dataforge.meta.*
 import hep.dataforge.names.plus
 import hep.dataforge.names.startsWith
 import hep.dataforge.values.asValue
+import hep.dataforge.vision.getProperty
 import hep.dataforge.vision.onPropertyChange
+import hep.dataforge.vision.set
+import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.Solid.Companion.GEOMETRY_KEY
 import hep.dataforge.vision.solid.three.*
diff --git a/docs/design.md b/docs/design.md
index ca84e64f..79014d73 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -14,4 +14,6 @@ The actual layering scheme is more complicated. All objects support styling. The
 
 ### Intermediate representation
 
+An important thing about VisionForge is that it does not strictly bound to a single format representation. 
+
 ### Kotlin DSL for creating vision-graphs
\ No newline at end of file
diff --git a/docs/solids.md b/docs/solids.md
index a5d9441c..8f1b8e3f 100644
--- a/docs/solids.md
+++ b/docs/solids.md
@@ -74,4 +74,4 @@ Not all GDML solids are currently supported by the converter, they could be adde
 
 VisionForge is not tied to any single renderer. Right now the primary target is the Browser rendering with [Three.js library](https://threejs.org/). The Three.js supports different renderers including WebGL with hardware support and virtual reality.
 
-The bindings for three-js was implemented in kotlin-js based on a [work by Lars Ivar Hatledal](https://github.com/markaren/three-kt-wrapper). The wrapper allows seamless integration with a lot of different library APIs incliding custom cameras and CSG.
\ No newline at end of file
+The bindings for three-js was implemented in kotlin-js based on a [work by Lars Ivar Hatledal](https://github.com/markaren/three-kt-wrapper). The wrapper allows seamless integration with a lot of different library APIs including custom cameras and CSG.
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 28ff446a..442d9132 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 007af867..68836190 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,25 +1,23 @@
 pluginManagement {
     val kotlinVersion = "1.4.30"
-    val toolsVersion = "0.7.6"
+    val toolsVersion = "0.8.3"
 
     repositories {
         mavenLocal()
+        maven("https://repo.kotlin.link")
+        mavenCentral()
         jcenter()
         gradlePluginPortal()
-        maven("https://dl.bintray.com/kotlin/kotlin-eap")
-        maven("https://dl.bintray.com/kotlin/kotlinx")
-        maven("https://dl.bintray.com/mipt-npm/dataforge")
-        maven("https://dl.bintray.com/mipt-npm/kscience")
-        maven("https://dl.bintray.com/mipt-npm/dev")
     }
 
     plugins {
-        id("ru.mipt.npm.project") version toolsVersion
-        id("ru.mipt.npm.mpp") version toolsVersion
-        id("ru.mipt.npm.jvm") version toolsVersion
-        id("ru.mipt.npm.js") version toolsVersion
-        id("ru.mipt.npm.publish") version toolsVersion
+        id("ru.mipt.npm.gradle.project") version toolsVersion
+        id("ru.mipt.npm.gradle.mpp") version toolsVersion
+        id("ru.mipt.npm.gradle.jvm") version toolsVersion
+        id("ru.mipt.npm.gradle.js") version toolsVersion
+        id("ru.mipt.npm.gradle.publish") version toolsVersion
         kotlin("jvm") version kotlinVersion
+        kotlin("jupyter.api") version "0.8.3.218"
         kotlin("js") version kotlinVersion
         kotlin("multiplatform") version kotlinVersion
     }
@@ -45,8 +43,9 @@ include(
     ":visionforge-server",
     ":visionforge-plotly",
     ":demo:solid-showcase",
-//    ":demo:gdml",
+    ":demo:gdml",
     ":demo:muon-monitor",
-    ":demo:sat-demo"
-//    ":playground"
+    ":demo:sat-demo",
+    ":demo:playground",
+    ":demo:jupyter-playground"
 )
diff --git a/ui/bootstrap/build.gradle.kts b/ui/bootstrap/build.gradle.kts
index 8d404277..ed14f9c3 100644
--- a/ui/bootstrap/build.gradle.kts
+++ b/ui/bootstrap/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.js")
+    id("ru.mipt.npm.gradle.js")
 }
 
 val dataforgeVersion: String by rootProject.extra
diff --git a/ui/material/build.gradle.kts b/ui/material/build.gradle.kts
index 15eb5377..b68d5df2 100644
--- a/ui/material/build.gradle.kts
+++ b/ui/material/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.js")
+    id("ru.mipt.npm.gradle.js")
 }
 
 val dataforgeVersion: String by rootProject.extra
diff --git a/ui/react/build.gradle.kts b/ui/react/build.gradle.kts
index ebfa3cdd..b430a3d2 100644
--- a/ui/react/build.gradle.kts
+++ b/ui/react/build.gradle.kts
@@ -1,13 +1,13 @@
 plugins {
-    id("ru.mipt.npm.js")
+    id("ru.mipt.npm.gradle.js")
 }
 
-val reactVersion by extra("17.0.0")
+val reactVersion by extra("17.0.1")
 val kotlinWrappersVersion: String by rootProject.extra
 
 dependencies{
     api(project(":visionforge-solid"))
-    api("org.jetbrains:kotlin-styled:5.2.0-$kotlinWrappersVersion")
+    api("org.jetbrains:kotlin-styled:5.2.1-$kotlinWrappersVersion")
     api("org.jetbrains:kotlin-react-dom:$reactVersion-$kotlinWrappersVersion")
     implementation(project(":visionforge-threejs"))
 }
\ No newline at end of file
diff --git a/ui/ring/build.gradle.kts b/ui/ring/build.gradle.kts
index a14662c4..16aa8c92 100644
--- a/ui/ring/build.gradle.kts
+++ b/ui/ring/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.js")
+    id("ru.mipt.npm.gradle.js")
 }
 
 val dataforgeVersion: String by rootProject.extra
diff --git a/visionforge-core/build.gradle.kts b/visionforge-core/build.gradle.kts
index d888a4c3..05e9d619 100644
--- a/visionforge-core/build.gradle.kts
+++ b/visionforge-core/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.mpp")
+    id("ru.mipt.npm.gradle.mpp")
 }
 
 val dataforgeVersion: String by rootProject.extra
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
index 213710cf..c9feb965 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
@@ -1,8 +1,10 @@
 package hep.dataforge.vision.html
 
 import hep.dataforge.context.Context
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.visionManager
 import kotlinx.html.*
+import kotlinx.html.stream.createHTML
 
 public data class Page(
     public val context: Context,
@@ -24,4 +26,12 @@ public data class Page(
             embedVisionFragment(context.visionManager, fragment = content)
         }
     }.finalize()
-}
\ No newline at end of file
+}
+
+
+@DFExperimental
+public fun Context.page(
+    title: String,
+    content: HtmlVisionFragment,
+    vararg headers: Pair<String, HtmlFragment>,
+): Page = Page(this, title, mapOf(*headers), content)
\ No newline at end of file
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/htmlExport.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/htmlExport.kt
index e18c65c3..70fe0bab 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/htmlExport.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/htmlExport.kt
@@ -56,25 +56,17 @@ import java.nio.file.Path
 //    }
 //}
 
-@DFExperimental
-public fun Context.page(
-    title: String,
-    content: HtmlVisionFragment,
-    vararg headers: Pair<String, HtmlFragment>,
-): Page = Page(this, title, mapOf(*headers), content)
-
-
 @DFExperimental
 public fun Page.makeFile(
     path: Path?,
-    defaultHeaders: ((Path) -> Map<String,HtmlFragment>)? = null,
+    defaultHeaders: ((Path) -> Map<String, HtmlFragment>)? = null,
 ): Path {
     val actualFile = path?.let {
         Path.of(System.getProperty("user.home")).resolve(path)
     } ?: Files.createTempFile("tempPlot", ".html")
 
     val actualDefaultHeaders = defaultHeaders?.invoke(actualFile)
-    val actualPage = if(actualDefaultHeaders == null) this else copy(headers = actualDefaultHeaders + headers)
+    val actualPage = if (actualDefaultHeaders == null) this else copy(headers = actualDefaultHeaders + headers)
 
     val htmlString = actualPage.render(createHTML())
 
diff --git a/visionforge-fx/build.gradle.kts b/visionforge-fx/build.gradle.kts
index 43a2d0ad..2ba679a1 100644
--- a/visionforge-fx/build.gradle.kts
+++ b/visionforge-fx/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.jvm")
+    id("ru.mipt.npm.gradle.jvm")
 }
 
 val dataforgeVersion: String by rootProject.extra
diff --git a/visionforge-gdml/build.gradle.kts b/visionforge-gdml/build.gradle.kts
index 59f0f524..24090940 100644
--- a/visionforge-gdml/build.gradle.kts
+++ b/visionforge-gdml/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.mpp")
+    id("ru.mipt.npm.gradle.mpp")
 }
 
 kotlin {
@@ -7,7 +7,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 api(project(":visionforge-solid"))
-                api("kscience.gdml:gdml:0.2.0")
+                api("space.kscience:gdml:0.2.0")
             }
         }
     }
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt
similarity index 73%
rename from visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
rename to visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt
index 69a8dbbb..098edded 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GDMLTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt
@@ -12,7 +12,7 @@ import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
 import hep.dataforge.vision.styleSheet
 import hep.dataforge.vision.useStyle
-import kscience.gdml.*
+import space.kscience.gdml.*
 import kotlin.math.cos
 import kotlin.math.sin
 import kotlin.random.Random
@@ -26,7 +26,7 @@ private inline operator fun Number.times(d: Double) = toDouble() * d
 @Suppress("NOTHING_TO_INLINE")
 private inline operator fun Number.times(f: Float) = toFloat() * f
 
-public class GDMLTransformerSettings {
+public class GdmlTransformerSettings {
     public enum class Action {
         ADD,
         REJECT,
@@ -36,12 +36,12 @@ public class GDMLTransformerSettings {
     public var lUnit: LUnit = LUnit.CM
     public var aUnit: AUnit = AUnit.RADIAN
 
-    public var solidAction: (GDMLSolid) -> Action = { Action.PROTOTYPE }
-    public var volumeAction: (GDMLGroup) -> Action = { Action.PROTOTYPE }
+    public var solidAction: (GdmlSolid) -> Action = { Action.PROTOTYPE }
+    public var volumeAction: (GdmlGroup) -> Action = { Action.PROTOTYPE }
 }
 
-private class GDMLTransformer(val settings: GDMLTransformerSettings) {
-    //private val materialCache = HashMap<GDMLMaterial, Meta>()
+private class GdmlTransformer(val settings: GdmlTransformerSettings) {
+    //private val materialCache = HashMap<GdmlMaterial, Meta>()
     private val random = Random(222)
 
     /**
@@ -56,7 +56,7 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
 
     private val referenceStore = HashMap<Name, MutableList<SolidReferenceGroup>>()
 
-    private fun proxySolid(root: GDML, group: SolidGroup, solid: GDMLSolid, name: String): SolidReferenceGroup {
+    private fun proxySolid(root: Gdml, group: SolidGroup, solid: GdmlSolid, name: String): SolidReferenceGroup {
         val templateName = solidsName + name
         if (proto[templateName] == null) {
             solids.addSolid(root, solid, name)
@@ -66,7 +66,7 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
         return ref
     }
 
-    private fun proxyVolume(root: GDML, group: SolidGroup, physVolume: GDMLPhysVolume, volume: GDMLGroup): SolidReferenceGroup {
+    private fun proxyVolume(root: Gdml, group: SolidGroup, physVolume: GdmlPhysVolume, volume: GdmlGroup): SolidReferenceGroup {
         val templateName = volumesName + volume.name.asName()
         if (proto[templateName] == null) {
             proto[templateName] = volume(root, volume)
@@ -78,7 +78,7 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
 
     private val styleCache = HashMap<Name, Meta>()
 
-    var solidConfiguration: Solid.(parent: GDMLVolume, solid: GDMLSolid) -> Unit = { parent, _ ->
+    var solidConfiguration: Solid.(parent: GdmlVolume, solid: GdmlSolid) -> Unit = { parent, _ ->
         if (parent.physVolumes.isNotEmpty()) {
             useStyle("opaque") {
                 SolidMaterial.MATERIAL_OPACITY_KEY put 0.3
@@ -94,23 +94,23 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
         useStyle(name)
     }
 
-    fun configureSolid(root: GDML, obj: Solid, parent: GDMLVolume, solid: GDMLSolid) {
-        val material = parent.materialref.resolve(root) ?: GDMLElement(parent.materialref.ref)
+    fun configureSolid(root: Gdml, obj: Solid, parent: GdmlVolume, solid: GdmlSolid) {
+        val material = parent.materialref.resolve(root) ?: GdmlElement(parent.materialref.ref)
 
         val styleName = "materials.${material.name}"
 
         obj.useStyle(styleName) {
             MATERIAL_COLOR_KEY put random.nextInt(16777216)
-            "gdml.material" put material.name
+            "Gdml.material" put material.name
         }
 
         obj.solidConfiguration(parent, solid)
     }
 
     fun <T : Solid> T.withPosition(
-        newPos: GDMLPosition? = null,
-        newRotation: GDMLRotation? = null,
-        newScale: GDMLScale? = null,
+        newPos: GdmlPosition? = null,
+        newRotation: GdmlRotation? = null,
+        newScale: GdmlScale? = null,
     ): T = apply {
         newPos?.let {
             val point = Point3D(it.x(settings.lUnit), it.y(settings.lUnit), it.z(settings.lUnit))
@@ -134,23 +134,23 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
         //TODO convert units if needed
     }
 
-    fun <T : Solid> T.withPosition(root: GDML, physVolume: GDMLPhysVolume): T = withPosition(
+    fun <T : Solid> T.withPosition(root: Gdml, physVolume: GdmlPhysVolume): T = withPosition(
         physVolume.resolvePosition(root),
         physVolume.resolveRotation(root),
         physVolume.resolveScale(root)
     )
 
     fun SolidGroup.addSolid(
-        root: GDML,
-        solid: GDMLSolid,
+        root: Gdml,
+        solid: GdmlSolid,
         name: String = "",
     ): Solid {
         //context.solidAdded(solid)
         val lScale = solid.lscale(settings.lUnit)
         val aScale = solid.ascale()
         return when (solid) {
-            is GDMLBox -> box(solid.x * lScale, solid.y * lScale, solid.z * lScale, name)
-            is GDMLTube -> tube(
+            is GdmlBox -> box(solid.x * lScale, solid.y * lScale, solid.z * lScale, name)
+            is GdmlTube -> tube(
                 solid.rmax * lScale,
                 solid.z * lScale,
                 solid.rmin * lScale,
@@ -158,13 +158,13 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
                 solid.deltaphi * aScale,
                 name
             )
-            is GDMLCone -> cone(solid.rmax1, solid.z, solid.rmax2, name = name) {
+            is GdmlCone -> cone(solid.rmax1, solid.z, solid.rmax2, name = name) {
                 require(solid.rmin1 == 0.0) { "Empty cones are not supported" }
                 require(solid.rmin2 == 0.0) { "Empty cones are not supported" }
                 startAngle = solid.startphi.toFloat()
                 angle = solid.deltaphi.toFloat()
             }
-            is GDMLXtru -> extrude(name) {
+            is GdmlXtru -> extrude(name) {
                 shape {
                     solid.vertices.forEach {
                         point(it.x * lScale, it.y * lScale)
@@ -179,9 +179,9 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
                     )
                 }
             }
-            is GDMLScaledSolid -> {
+            is GdmlScaledSolid -> {
                 //Add solid with modified scale
-                val innerSolid: GDMLSolid = solid.solidref.resolve(root)
+                val innerSolid: GdmlSolid = solid.solidref.resolve(root)
                     ?: error("Solid with tag ${solid.solidref.ref} for scaled solid ${solid.name} not defined")
 
                 addSolid(root, innerSolid, name).apply {
@@ -190,12 +190,12 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
                     scaleZ = solid.scale.z.toFloat()
                 }
             }
-            is GDMLSphere -> sphere(solid.rmax * lScale, solid.deltaphi * aScale, solid.deltatheta * aScale, name) {
+            is GdmlSphere -> sphere(solid.rmax * lScale, solid.deltaphi * aScale, solid.deltatheta * aScale, name) {
                 phiStart = solid.startphi * aScale
                 thetaStart = solid.starttheta * aScale
             }
-            is GDMLOrb -> sphere(solid.r * lScale, name = name)
-            is GDMLPolyhedra -> extrude(name) {
+            is GdmlOrb -> sphere(solid.r * lScale, name = name)
+            is GdmlPolyhedra -> extrude(name) {
                 //getting the radius of first
                 require(solid.planes.size > 1) { "The polyhedron geometry requires at least two planes" }
                 val baseRadius = solid.planes.first().rmax * lScale
@@ -210,13 +210,13 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
                     layer(plane.z * lScale, scale = plane.rmax * lScale / baseRadius)
                 }
             }
-            is GDMLBoolSolid -> {
-                val first: GDMLSolid = solid.first.resolve(root) ?: error("")
-                val second: GDMLSolid = solid.second.resolve(root) ?: error("")
+            is GdmlBoolSolid -> {
+                val first: GdmlSolid = solid.first.resolve(root) ?: error("")
+                val second: GdmlSolid = solid.second.resolve(root) ?: error("")
                 val type: CompositeType = when (solid) {
-                    is GDMLUnion -> CompositeType.UNION
-                    is GDMLSubtraction -> CompositeType.SUBTRACT
-                    is GDMLIntersection -> CompositeType.INTERSECT
+                    is GdmlUnion -> CompositeType.UNION
+                    is GdmlSubtraction -> CompositeType.SUBTRACT
+                    is GdmlIntersection -> CompositeType.INTERSECT
                 }
 
                 return composite(type, name) {
@@ -234,30 +234,30 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
 
                 }
             }
-            is GDMLEllipsoid -> TODO("Renderer for $solid not supported yet")
-            is GDMLElTube -> TODO("Renderer for $solid not supported yet")
-            is GDMLElCone -> TODO("Renderer for $solid not supported yet")
-            is GDMLParaboloid -> TODO("Renderer for $solid not supported yet")
-            is GDMLParallelepiped -> TODO("Renderer for $solid not supported yet")
-            is GDMLTorus -> TODO("Renderer for $solid not supported yet")
-            is GDMLTrapezoid -> TODO("Renderer for $solid not supported yet")
-            is GDMLPolycone -> TODO("Renderer for $solid not supported yet")
+            is GdmlEllipsoid -> TODO("Renderer for $solid not supported yet")
+            is GdmlElTube -> TODO("Renderer for $solid not supported yet")
+            is GdmlElCone -> TODO("Renderer for $solid not supported yet")
+            is GdmlParaboloid -> TODO("Renderer for $solid not supported yet")
+            is GdmlParallelepiped -> TODO("Renderer for $solid not supported yet")
+            is GdmlTorus -> TODO("Renderer for $solid not supported yet")
+            is GdmlTrapezoid -> TODO("Renderer for $solid not supported yet")
+            is GdmlPolycone -> TODO("Renderer for $solid not supported yet")
         }
     }
 
     fun SolidGroup.addSolidWithCaching(
-        root: GDML,
-        solid: GDMLSolid,
+        root: Gdml,
+        solid: GdmlSolid,
         name: String = solid.name,
     ): Solid? {
         return when (settings.solidAction(solid)) {
-            GDMLTransformerSettings.Action.ADD -> {
+            GdmlTransformerSettings.Action.ADD -> {
                 addSolid(root, solid, name)
             }
-            GDMLTransformerSettings.Action.PROTOTYPE -> {
+            GdmlTransformerSettings.Action.PROTOTYPE -> {
                 proxySolid(root, this, solid, name)
             }
-            GDMLTransformerSettings.Action.REJECT -> {
+            GdmlTransformerSettings.Action.REJECT -> {
                 //ignore
                 null
             }
@@ -265,14 +265,14 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
     }
 
     fun SolidGroup.addPhysicalVolume(
-        root: GDML,
-        physVolume: GDMLPhysVolume,
+        root: Gdml,
+        physVolume: GdmlPhysVolume,
     ) {
-        val volume: GDMLGroup = physVolume.volumeref.resolve(root)
+        val volume: GdmlGroup = physVolume.volumeref.resolve(root)
             ?: error("Volume with ref ${physVolume.volumeref.ref} could not be resolved")
 
         // a special case for single solid volume
-        if (volume is GDMLVolume && volume.physVolumes.isEmpty() && volume.placement == null) {
+        if (volume is GdmlVolume && volume.physVolumes.isEmpty() && volume.placement == null) {
             val solid = volume.solidref.resolve(root)
                 ?: error("Solid with tag ${volume.solidref.ref} for volume ${volume.name} not defined")
             addSolidWithCaching(root, solid, physVolume.name ?: "")?.apply {
@@ -283,24 +283,24 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
         }
 
         when (settings.volumeAction(volume)) {
-            GDMLTransformerSettings.Action.ADD -> {
+            GdmlTransformerSettings.Action.ADD -> {
                 val group: SolidGroup = volume(root, volume)
                 this[physVolume.name ?: ""] = group.withPosition(root, physVolume)
             }
-            GDMLTransformerSettings.Action.PROTOTYPE -> {
+            GdmlTransformerSettings.Action.PROTOTYPE -> {
                 proxyVolume(root, this, physVolume, volume)
             }
-            GDMLTransformerSettings.Action.REJECT -> {
+            GdmlTransformerSettings.Action.REJECT -> {
                 //ignore
             }
         }
     }
 
     fun SolidGroup.addDivisionVolume(
-        root: GDML,
-        divisionVolume: GDMLDivisionVolume,
+        root: Gdml,
+        divisionVolume: GdmlDivisionVolume,
     ) {
-        val volume: GDMLGroup = divisionVolume.volumeref.resolve(root)
+        val volume: GdmlGroup = divisionVolume.volumeref.resolve(root)
             ?: error("Volume with ref ${divisionVolume.volumeref.ref} could not be resolved")
 
         //TODO add divisions
@@ -308,20 +308,20 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
     }
 
     private fun volume(
-        root: GDML,
-        group: GDMLGroup,
+        root: Gdml,
+        group: GdmlGroup,
     ): SolidGroup = SolidGroup().apply {
-        if (group is GDMLVolume) {
-            val solid: GDMLSolid = group.solidref.resolve(root)
+        if (group is GdmlVolume) {
+            val solid: GdmlSolid = group.solidref.resolve(root)
                 ?: error("Solid with tag ${group.solidref.ref} for volume ${group.name} not defined")
 
             addSolidWithCaching(root, solid)?.apply {
                 configureSolid(root, this, group, solid)
             }
 
-            when (val vol: GDMLPlacement? = group.placement) {
-                is GDMLPhysVolume -> addPhysicalVolume(root, vol)
-                is GDMLDivisionVolume -> addDivisionVolume(root, vol)
+            when (val vol: GdmlPlacement? = group.placement) {
+                is GdmlPhysVolume -> addPhysicalVolume(root, vol)
+                is GdmlDivisionVolume -> addDivisionVolume(root, vol)
             }
         }
 
@@ -332,7 +332,7 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
 
     private fun finalize(final: SolidGroup): SolidGroup {
         //final.prototypes = proto
-        final.useStyle("GDML") {
+        final.useStyle("Gdml") {
             Solid.ROTATION_ORDER_KEY put RotationOrder.ZXY
         }
 
@@ -364,19 +364,19 @@ private class GDMLTransformer(val settings: GDMLTransformerSettings) {
         return final
     }
 
-    fun transform(root: GDML): SolidGroup = finalize(volume(root, root.world))
+    fun transform(root: Gdml): SolidGroup = finalize(volume(root, root.world))
 }
 
 
-public fun GDML.toVision(block: GDMLTransformerSettings.() -> Unit = {}): SolidGroup {
-    val context = GDMLTransformer(GDMLTransformerSettings().apply(block))
+public fun Gdml.toVision(block: GdmlTransformerSettings.() -> Unit = {}): SolidGroup {
+    val context = GdmlTransformer(GdmlTransformerSettings().apply(block))
     return context.transform(this)
 }
 
 /**
- * Append gdml node to the group
+ * Append Gdml node to the group
  */
-public fun SolidGroup.gdml(gdml: GDML, key: String = "", transformer: GDMLTransformerSettings.() -> Unit = {}) {
+public fun SolidGroup.gdml(gdml: Gdml, key: String = "", transformer: GdmlTransformerSettings.() -> Unit = {}) {
     val visual = gdml.toVision(transformer)
     //println(Visual3DPlugin.json.stringify(VisualGroup3D.serializer(), visual))
     set(key, visual)
diff --git a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt b/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
index 452bd0e1..14de5dcb 100644
--- a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
+++ b/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
@@ -1,20 +1,20 @@
 package hep.dataforge.vision.gdml
 
 import hep.dataforge.vision.solid.SolidGroup
-import kscience.gdml.GDML
 import nl.adaptivity.xmlutil.StAXReader
+import space.kscience.gdml.Gdml
 import java.nio.file.Files
 import java.nio.file.Path
 import java.util.concurrent.atomic.AtomicInteger
 
 public actual typealias Counter = AtomicInteger
 
-public fun GDML.Companion.readFile(file: Path): GDML {
+public fun Gdml.Companion.readFile(file: Path): Gdml {
     val xmlReader = StAXReader(Files.newInputStream(file), "UTF-8")
-    return format.parse(GDML.serializer(), xmlReader)
+    return format.parse(Gdml.serializer(), xmlReader)
 }
 
-public fun SolidGroup.gdml(file: Path, key: String = "", transformer: GDMLTransformerSettings.() -> Unit = {}) {
-    val gdml = GDML.readFile(file)
+public fun SolidGroup.gdml(file: Path, key: String = "", transformer: GdmlTransformerSettings.() -> Unit = {}) {
+    val gdml = Gdml.readFile(file)
     gdml(gdml, key, transformer)
 }
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
index 3f4df637..f5e22263 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
@@ -1,7 +1,7 @@
 package hep.dataforge.vision.gdml
 
 import hep.dataforge.vision.solid.SolidManager
-import kscience.gdml.GDML
+import space.kscience.gdml.Gdml
 import nl.adaptivity.xmlutil.StAXReader
 import org.junit.jupiter.api.Test
 
@@ -11,7 +11,7 @@ class TestConvertor {
     fun testBMNGeometry() {
         val stream = javaClass.getResourceAsStream("/gdml/BM@N.gdml")
         val xmlReader = StAXReader(stream, "UTF-8")
-        val xml = GDML.format.parse(GDML.serializer(), xmlReader)
+        val xml = Gdml.format.parse(Gdml.serializer(), xmlReader)
         val vision = xml.toVision()
         println(SolidManager.encodeToString(vision))
     }
@@ -21,7 +21,7 @@ class TestConvertor {
         val stream = javaClass.getResourceAsStream("/gdml/cubes.gdml")
 
         val xmlReader = StAXReader(stream, "UTF-8")
-        val xml = GDML.format.parse(GDML.serializer(), xmlReader)
+        val xml = Gdml.format.parse(Gdml.serializer(), xmlReader)
         val visual = xml.toVision()
      //   println(visual)
     }
@@ -31,7 +31,7 @@ class TestConvertor {
         val stream = javaClass.getResourceAsStream("/gdml/simple1.gdml")
 
         val xmlReader = StAXReader(stream, "UTF-8")
-        val xml = GDML.format.parse(GDML.serializer(), xmlReader)
+        val xml = Gdml.format.parse(Gdml.serializer(), xmlReader)
         val vision = xml.toVision()
         println(SolidManager.encodeToString(vision))
     }
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
index c3e57a66..f5d42074 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
@@ -5,7 +5,7 @@ import hep.dataforge.vision.visitor.countDistinct
 import hep.dataforge.vision.visitor.flowStatistics
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import kscience.gdml.GDML
+import space.kscience.gdml.Gdml
 import nl.adaptivity.xmlutil.StAXReader
 import java.io.File
 import kotlin.reflect.KClass
@@ -17,7 +17,7 @@ suspend fun main() {
             File("D:\\Work\\Projects\\dataforge-vis\\visionforge-gdml\\src\\jvmTest\\resources\\gdml\\BM@N.gdml").inputStream()
 
         val xmlReader = StAXReader(stream, "UTF-8")
-        val xml = GDML.format.parse(GDML.serializer(), xmlReader)
+        val xml = Gdml.format.parse(Gdml.serializer(), xmlReader)
         val vision = xml.toVision()
 
 
diff --git a/visionforge-plotly/build.gradle.kts b/visionforge-plotly/build.gradle.kts
index 1eec1565..3e197394 100644
--- a/visionforge-plotly/build.gradle.kts
+++ b/visionforge-plotly/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.mpp")
+    id("ru.mipt.npm.gradle.mpp")
 }
 
 val plotlyVersion = "0.3.1"
diff --git a/visionforge-server/build.gradle.kts b/visionforge-server/build.gradle.kts
index ff726eb5..8c98f498 100644
--- a/visionforge-server/build.gradle.kts
+++ b/visionforge-server/build.gradle.kts
@@ -1,7 +1,5 @@
-//import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME
-
 plugins {
-    id("ru.mipt.npm.jvm")
+    id("ru.mipt.npm.gradle.jvm")
 }
 
 val ktorVersion: String by rootProject.extra
diff --git a/visionforge-solid/build.gradle.kts b/visionforge-solid/build.gradle.kts
index 843ae5dc..8b0b1dc2 100644
--- a/visionforge-solid/build.gradle.kts
+++ b/visionforge-solid/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.mpp")
+    id("ru.mipt.npm.gradle.mpp")
 }
 
 kscience{
@@ -7,7 +7,6 @@ kscience{
 }
 
 kotlin {
-
     sourceSets {
         commonMain {
             dependencies {
diff --git a/visionforge-threejs/build.gradle.kts b/visionforge-threejs/build.gradle.kts
index c2ce0570..c9f20e92 100644
--- a/visionforge-threejs/build.gradle.kts
+++ b/visionforge-threejs/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.js")
+    id("ru.mipt.npm.gradle.js")
 }
 
 kotlin{
diff --git a/visionforge-threejs/visionforge-threejs-server/build.gradle.kts b/visionforge-threejs/visionforge-threejs-server/build.gradle.kts
index ee0e74e9..696b30cf 100644
--- a/visionforge-threejs/visionforge-threejs-server/build.gradle.kts
+++ b/visionforge-threejs/visionforge-threejs-server/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.mpp")
+    id("ru.mipt.npm.gradle.mpp")
  }
 
 val ktorVersion: String by rootProject.extra
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
index 589ed03a..80948c67 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
@@ -4,9 +4,9 @@ import hep.dataforge.context.Context
 import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.html.HtmlVisionFragment
 import hep.dataforge.vision.html.ResourceLocation
+import hep.dataforge.vision.html.page
 import hep.dataforge.vision.html.scriptHeader
 import hep.dataforge.vision.makeFile
-import hep.dataforge.vision.page
 import java.awt.Desktop
 import java.nio.file.Path
 

From 5d0ceb8e506266b03e4ddb7e09ce829a8814ab8b Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 24 Feb 2021 13:42:55 +0300
Subject: [PATCH 087/151] Fix plotly renderer and resource serialization

---
 .../VisionForgePlayGroundForJupyter.kt        | 40 +++++-----
 .../src/jsMain/kotlin/playgroundMain.kt       |  8 +-
 .../src/jvmMain/kotlin/gdmlCubes.kt           | 74 +++++++++++++++++++
 .../src/jvmMain/kotlin/plotlyVision.kt        |  3 +-
 .../src/jvmMain/kotlin/simpleCube.kt          |  2 +-
 .../vision/html/VisionTagConsumer.kt          |  2 +-
 .../hep/dataforge/vision/VisionForge.kt       | 17 ++++-
 .../dataforge/vision/client/VisionClient.kt   | 12 ++-
 .../hep/dataforge/vision/html/headers.kt      | 24 ++++--
 .../dataforge/vision/gdml/TestConvertor.kt    | 28 ++++---
 .../hep/dataforge/vision/gdml/TestCubes.kt    | 74 +++++++++++++++++++
 .../hep/dataforge/vision/plotly/plotlyJs.kt   | 11 ++-
 .../kotlin/hep/dataforge/vision/solid/Box.kt  | 21 ------
 .../hep/dataforge/vision/solid/SolidGroup.kt  |  6 +-
 .../dataforge/vision/solid/SolidPluginTest.kt |  8 +-
 .../vision/solid/SolidReferenceTest.kt        |  9 +++
 .../vision/solid/three/ThreePlugin.kt         |  9 +--
 .../dataforge/vision/three/server/jsMain.kt   |  4 +-
 18 files changed, 269 insertions(+), 83 deletions(-)
 create mode 100644 demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
 create mode 100644 visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestCubes.kt

diff --git a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
index 95037870..42bc2bc1 100644
--- a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
+++ b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
@@ -3,23 +3,24 @@ package hep.dataforge.playground
 import hep.dataforge.context.Context
 import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.gdml.gdml
-import hep.dataforge.vision.html.Page
-import hep.dataforge.vision.html.embedVisionFragment
-import hep.dataforge.vision.html.fragment
-import hep.dataforge.vision.html.scriptHeader
+import hep.dataforge.vision.html.*
 import hep.dataforge.vision.plotly.PlotlyPlugin
 import hep.dataforge.vision.plotly.VisionOfPlotly
 import hep.dataforge.vision.solid.SolidManager
 import hep.dataforge.vision.solid.solid
 import hep.dataforge.vision.visionManager
 import kotlinx.html.div
+import kotlinx.html.id
+import kotlinx.html.script
 import kotlinx.html.stream.createHTML
+import kotlinx.html.unsafe
 import kscience.plotly.Plot
 import kscience.plotly.PlotlyFragment
 import org.jetbrains.kotlinx.jupyter.api.HTML
 import org.jetbrains.kotlinx.jupyter.api.Notebook
 import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
 import org.jetbrains.kotlinx.jupyter.api.libraries.*
+import org.jetbrains.kotlinx.jupyter.api.libraries.ResourceLocation
 import space.kscience.gdml.Gdml
 
 @JupyterLibrary
@@ -34,16 +35,25 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
         ResourcePathType.CLASSPATH_PATH)))
     val jsResource = LibraryResource(name = "VisionForge", type = ResourceType.JS, bundles = listOf(jsBundle))
 
+    private var counter = 0
+
+    private fun produceHtmlVisionString(fragment: HtmlVisionFragment) = createHTML().div {
+        val id = "visionforge.vision[${counter++}]"
+        div {
+            this.id = id
+            embedVisionFragment(context.visionManager, fragment = fragment)
+        }
+        script {
+            type = "text/javascript"
+            unsafe { +"window.renderVisionsAt(\"$id\");" }
+        }
+    }
+
     override fun Builder.onLoaded(notebook: Notebook?) {
         resource(jsResource)
 
         import("space.kscience.gdml.*", "kscience.plotly.*", "kscience.plotly.models.*")
 
-        onLoaded {
-            val header = scriptHeader("js/visionforge-playground.js", null, hep.dataforge.vision.html.ResourceLocation.EMBED)
-            display(HTML(createHTML().apply(header).finalize()))
-        }
-
         render<Gdml> { gdmlModel ->
             val fragment = VisionManager.fragment {
                 vision {
@@ -53,11 +63,7 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
                 }
             }
 
-            val html = createHTML().div {
-                embedVisionFragment(context.visionManager, fragment = fragment)
-            }
-
-            HTML(html)
+            HTML(produceHtmlVisionString(fragment))
         }
 
         render<Plot> { plot ->
@@ -67,11 +73,7 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
                 }
             }
 
-            val html = createHTML().div {
-                embedVisionFragment(context.visionManager, fragment = fragment)
-            }
-
-            HTML(html)
+            HTML( produceHtmlVisionString(fragment))
         }
 
         render<kscience.plotly.HtmlFragment> { fragment ->
diff --git a/demo/playground/src/jsMain/kotlin/playgroundMain.kt b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
index b69e8a65..26397ad4 100644
--- a/demo/playground/src/jsMain/kotlin/playgroundMain.kt
+++ b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
@@ -1,10 +1,14 @@
 //import hep.dataforge.vision.plotly.withPlotly
 import hep.dataforge.vision.plotly.withPlotly
+import hep.dataforge.vision.renderVisionsAt
 import hep.dataforge.vision.renderVisionsInWindow
-import hep.dataforge.vision.solid.three.loadThreeJs
+import hep.dataforge.vision.solid.three.withThreeJs
+import kotlinx.browser.window
 
 fun main() {
     withPlotly()
-    loadThreeJs()
+    withThreeJs()
     renderVisionsInWindow()
+    window.asDynamic()["renderVisionsInWindow"] = ::renderVisionsInWindow
+    window.asDynamic()["renderVisionsAt"] = ::renderVisionsAt
 }
\ No newline at end of file
diff --git a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
new file mode 100644
index 00000000..8a2d609f
--- /dev/null
+++ b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
@@ -0,0 +1,74 @@
+package hep.dataforge.vision.examples
+
+import hep.dataforge.misc.DFExperimental
+import hep.dataforge.vision.VisionForge
+import hep.dataforge.vision.VisionManager
+import hep.dataforge.vision.gdml.gdml
+import hep.dataforge.vision.html.ResourceLocation
+import hep.dataforge.vision.html.fragment
+import hep.dataforge.vision.solid.solid
+import hep.dataforge.vision.solid.withSolids
+import space.kscience.gdml.*
+
+internal val cubes = Gdml {
+    val center = define.position("center")
+    structure {
+        val air = ref<GdmlMaterial>("G4_AIR")
+        val tubeMaterial = ref<GdmlMaterial>("tube")
+        val boxMaterial = ref<GdmlMaterial>("box")
+
+        val segment = solids.tube("segment", 20, 5.0) {
+            rmin = 17
+            deltaphi = 60
+            aunit = AUnit.DEG.title
+        }
+        val worldBox = solids.box("largeBox", 200, 200, 200)
+        val smallBox = solids.box("smallBox", 30, 30, 30)
+        val segmentVolume = volume("segment", tubeMaterial, segment.ref()) {}
+        val circle = volume("composite", boxMaterial, smallBox.ref()) {
+            for (i in 0 until 6) {
+                physVolume(segmentVolume) {
+                    positionref = center.ref()
+                    rotation {
+                        z = 60 * i
+                        unit = AUnit.DEG.title
+                    }
+                }
+            }
+        }
+
+        world = volume("world", air, worldBox.ref()) {
+            for (i in 0 until 3) {
+                for (j in 0 until 3) {
+                    for (k in 0 until 3) {
+                        physVolume(circle) {
+                            position {
+                                x = (-50 + i * 50)
+                                y = (-50 + j * 50)
+                                z = (-50 + k * 50)
+                            }
+                            rotation {
+                                x = i * 120
+                                y = j * 120
+                                z = 120 * k
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@DFExperimental
+fun main() {
+    val content = VisionManager.fragment {
+        vision("canvas") {
+            solid {
+                gdml(cubes)
+            }
+        }
+    }
+
+    VisionForge.withSolids().makeVisionFile(content, resourceLocation = ResourceLocation.SYSTEM)
+}
\ No newline at end of file
diff --git a/demo/playground/src/jvmMain/kotlin/plotlyVision.kt b/demo/playground/src/jvmMain/kotlin/plotlyVision.kt
index 22b0863b..93f79ace 100644
--- a/demo/playground/src/jvmMain/kotlin/plotlyVision.kt
+++ b/demo/playground/src/jvmMain/kotlin/plotlyVision.kt
@@ -3,6 +3,7 @@ package hep.dataforge.vision.examples
 import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.VisionManager
+import hep.dataforge.vision.html.ResourceLocation
 import hep.dataforge.vision.html.fragment
 import hep.dataforge.vision.plotly.plotly
 import hep.dataforge.vision.plotly.withPlotly
@@ -21,5 +22,5 @@ fun main() {
         }
     }
 
-    VisionForge.withPlotly().makeVisionFile(fragment)
+    VisionForge.withPlotly().makeVisionFile(fragment, resourceLocation = ResourceLocation.SYSTEM)
 }
\ No newline at end of file
diff --git a/demo/playground/src/jvmMain/kotlin/simpleCube.kt b/demo/playground/src/jvmMain/kotlin/simpleCube.kt
index 9b43ff90..159e908b 100644
--- a/demo/playground/src/jvmMain/kotlin/simpleCube.kt
+++ b/demo/playground/src/jvmMain/kotlin/simpleCube.kt
@@ -9,7 +9,7 @@ import hep.dataforge.vision.solid.box
 import hep.dataforge.vision.solid.solid
 import hep.dataforge.vision.solid.withSolids
 
-@OptIn(DFExperimental::class)
+@DFExperimental
 fun main() {
     val content = VisionManager.fragment {
         vision("canvas") {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
index 0a536c90..9f3db8c1 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
@@ -83,7 +83,7 @@ public abstract class VisionTagConsumer<R>(
         visionProvider: VisionOutput.() -> Vision,
     ): T = vision(name.toName(), visionProvider)
 
-    public inline fun <T> TagConsumer<T>.vision(
+    public fun <T> TagConsumer<T>.vision(
         vision: Vision,
     ): T = vision("vision[${vision.hashCode()}]".toName(), vision)
 
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionForge.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionForge.kt
index 6f6ca28a..fc3cd8a6 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionForge.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionForge.kt
@@ -4,19 +4,32 @@ import hep.dataforge.context.Context
 import hep.dataforge.context.Global
 import hep.dataforge.vision.client.VisionClient
 import hep.dataforge.vision.client.renderAllVisions
+import hep.dataforge.vision.client.renderAllVisionsAt
+import kotlinx.browser.document
 import kotlinx.browser.window
 
-public actual val VisionForge: Context = Global.context("VisionForge").apply{
+public actual val VisionForge: Context = Global.context("VisionForge").apply {
     plugins.fetch(VisionManager)
     plugins.fetch(VisionClient)
 }
 
+
 /**
  * Render all visions in this [window] using current global state of [VisionForge]
  */
 @JsExport
-public fun renderVisionsInWindow(){
+public fun renderVisionsInWindow() {
     window.onload = {
         VisionForge.plugins[VisionClient]?.renderAllVisions()
     }
+}
+
+@JsExport
+public fun renderVisionsAt(id: String) {
+    val element = document.getElementById(id)
+    if (element != null) {
+        VisionForge.plugins[VisionClient]?.renderAllVisionsAt(element)
+    } else {
+        console.warn("Element with id $id not found")
+    }
 }
\ No newline at end of file
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
index edd5ae4d..f6799fc0 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
@@ -43,8 +43,16 @@ public class VisionClient : AbstractPlugin() {
 
     private fun getRenderers() = context.gather<ElementVisionRenderer>(ElementVisionRenderer.TYPE).values
 
-    private fun findRendererFor(vision: Vision): ElementVisionRenderer? =
-        getRenderers().maxByOrNull { it.rateVision(vision) }
+    private fun findRendererFor(vision: Vision): ElementVisionRenderer? {
+        return getRenderers().mapNotNull {
+            val rating = it.rateVision(vision)
+            if (rating > 0) {
+                rating to it
+            } else {
+                null
+            }
+        }.maxByOrNull { it.first }?.second
+    }
 
     private fun Element.getEmbeddedData(className: String): String? = getElementsByClassName(className)[0]?.innerHTML
 
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/headers.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/headers.kt
index 45fde55a..ac9f7127 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/headers.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/headers.kt
@@ -8,6 +8,10 @@ import kotlinx.html.unsafe
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.StandardOpenOption
+import java.security.MessageDigest
+import kotlin.io.path.ExperimentalPathApi
+import kotlin.io.path.readText
+
 
 /**
  * The location of resources for plot.
@@ -37,21 +41,29 @@ public enum class ResourceLocation {
 internal const val VISIONFORGE_ASSETS_PATH = ".dataforge/vision/assets"
 
 
+private fun ByteArray.toHexString() = asUByteArray().joinToString("") { it.toString(16).padStart(2, '0') }
+
 /**
  * Check if the asset exists in given local location and put it there if it does not
  * @param
  */
+@OptIn(ExperimentalPathApi::class)
 internal fun checkOrStoreFile(htmlPath: Path, filePath: Path, resource: String): Path {
+    //TODO add logging
     val fullPath = htmlPath.resolveSibling(filePath).toAbsolutePath().resolve(resource)
 
-    if (Files.exists(fullPath)) {
-        //TODO checksum
-    } else {
-        //TODO add logging
+    val bytes = VisionManager::class.java.getResourceAsStream("/$resource").readAllBytes()
+    val md = MessageDigest.getInstance("MD5")
 
-        val bytes = VisionManager::class.java.getResourceAsStream("/$resource").readAllBytes()
+    val checksum = md.digest(bytes).toHexString()
+
+    val md5File = fullPath.resolveSibling(fullPath.fileName.toString() + ".md5")
+    val skip: Boolean = Files.exists(fullPath) && Files.exists(md5File) && md5File.readText() == checksum
+
+    if (!skip) {
         Files.createDirectories(fullPath.parent)
-        Files.write(fullPath, bytes, StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE)
+        Files.write(fullPath, bytes, StandardOpenOption.CREATE, StandardOpenOption.WRITE)
+        Files.write(md5File, checksum.encodeToByteArray(), StandardOpenOption.CREATE, StandardOpenOption.WRITE)
     }
 
     return if (htmlPath.isAbsolute && fullPath.startsWith(htmlPath.parent)) {
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
index f5e22263..d599cf07 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
@@ -1,38 +1,36 @@
 package hep.dataforge.vision.gdml
 
+import hep.dataforge.names.toName
 import hep.dataforge.vision.solid.SolidManager
 import space.kscience.gdml.Gdml
-import nl.adaptivity.xmlutil.StAXReader
 import org.junit.jupiter.api.Test
+import space.kscience.gdml.decodeFromStream
+import kotlin.test.assertNotNull
 
 class TestConvertor {
 
     @Test
     fun testBMNGeometry() {
         val stream = javaClass.getResourceAsStream("/gdml/BM@N.gdml")
-        val xmlReader = StAXReader(stream, "UTF-8")
-        val xml = Gdml.format.parse(Gdml.serializer(), xmlReader)
-        val vision = xml.toVision()
-        println(SolidManager.encodeToString(vision))
+        val gdml = Gdml.decodeFromStream(stream)
+        val vision = gdml.toVision()
+        //println(SolidManager.encodeToString(vision))
     }
 
     @Test
     fun testCubes() {
         val stream = javaClass.getResourceAsStream("/gdml/cubes.gdml")
-
-        val xmlReader = StAXReader(stream, "UTF-8")
-        val xml = Gdml.format.parse(Gdml.serializer(), xmlReader)
-        val visual = xml.toVision()
-     //   println(visual)
+        val gdml = Gdml.decodeFromStream(stream)
+        val vision = gdml.toVision()
+        assertNotNull(vision.getPrototype("solids.box".toName()))
+        //println(SolidManager.encodeToString(vision))
     }
 
     @Test
     fun testSimple() {
         val stream = javaClass.getResourceAsStream("/gdml/simple1.gdml")
-
-        val xmlReader = StAXReader(stream, "UTF-8")
-        val xml = Gdml.format.parse(Gdml.serializer(), xmlReader)
-        val vision = xml.toVision()
-        println(SolidManager.encodeToString(vision))
+        val gdml = Gdml.decodeFromStream(stream)
+        val vision = gdml.toVision()
+        //println(SolidManager.encodeToString(vision))
     }
 }
\ No newline at end of file
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestCubes.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestCubes.kt
new file mode 100644
index 00000000..adaca24a
--- /dev/null
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestCubes.kt
@@ -0,0 +1,74 @@
+package hep.dataforge.vision.gdml
+
+import hep.dataforge.names.toName
+import hep.dataforge.vision.solid.SolidGroup
+import hep.dataforge.vision.solid.SolidManager
+import org.junit.jupiter.api.Test
+import space.kscience.gdml.*
+import kotlin.test.assertNotNull
+
+class TestCubes {
+    internal val cubes = Gdml {
+        val center = define.position("center")
+        structure {
+            val air = ref<GdmlMaterial>("G4_AIR")
+            val tubeMaterial = ref<GdmlMaterial>("tube")
+            val boxMaterial = ref<GdmlMaterial>("box")
+
+            val segment = solids.tube("segment", 20, 5.0) {
+                rmin = 17
+                deltaphi = 60
+                aunit = AUnit.DEG.title
+            }
+            val worldBox = solids.box("largeBox", 200, 200, 200)
+            val smallBox = solids.box("smallBox", 30, 30, 30)
+            val segmentVolume = volume("segment", tubeMaterial, segment.ref()) {}
+            val circle = volume("composite", boxMaterial, smallBox.ref()) {
+                for (i in 0 until 6) {
+                    physVolume(segmentVolume) {
+                        positionref = center.ref()
+                        rotation {
+                            z = 60 * i
+                            unit = AUnit.DEG.title
+                        }
+                    }
+                }
+            }
+
+            world = volume("world", air, worldBox.ref()) {
+                for (i in 0 until 3) {
+                    for (j in 0 until 3) {
+                        for (k in 0 until 3) {
+                            physVolume(circle) {
+                                position {
+                                    x = (-50 + i * 50)
+                                    y = (-50 + j * 50)
+                                    z = (-50 + k * 50)
+                                }
+                                rotation {
+                                    x = i * 120
+                                    y = j * 120
+                                    z = 120 * k
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @Test
+    fun testCubesDirect(){
+        val vision = cubes.toVision()
+        assertNotNull(vision.getPrototype("solids.smallBox".toName()))
+    }
+
+    @Test
+    fun testCubesReSerialize(){
+        val vision = cubes.toVision()
+        val serialized = SolidManager.encodeToString(vision)
+        val deserialized = SolidManager.decodeFromString(serialized) as SolidGroup
+        assertNotNull(deserialized.getPrototype("solids.smallBox".toName()))
+    }
+}
\ No newline at end of file
diff --git a/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt b/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt
index 097c7a54..601c255f 100644
--- a/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt
+++ b/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt
@@ -2,6 +2,8 @@ package hep.dataforge.vision.plotly
 
 import hep.dataforge.context.*
 import hep.dataforge.meta.Meta
+import hep.dataforge.names.Name
+import hep.dataforge.names.asName
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.VisionPlugin
@@ -26,11 +28,18 @@ public actual class PlotlyPlugin : VisionPlugin(), ElementVisionRenderer {
     }
 
     override fun render(element: Element, vision: Vision, meta: Meta) {
-        val plot = (vision as? VisionOfPlotly)?.plot ?: error("Only VisionOfPlotly visions are supported")
+        val plot = (vision as? VisionOfPlotly)?.plot ?: error("VisionOfPlotly expected but ${vision::class} found")
         val config = PlotlyConfig.read(meta)
         element.plot(plot, config)
     }
 
+    override fun content(target: String): Map<Name, Any> {
+        return when (target) {
+            ElementVisionRenderer.TYPE -> mapOf("plotly".asName() to this)
+            else -> super.content(target)
+        }
+    }
+
     public companion object : PluginFactory<PlotlyPlugin> {
         override val tag: PluginTag = PluginTag("vision.plotly", PluginTag.DATAFORGE_GROUP)
         override val type: KClass<PlotlyPlugin> = PlotlyPlugin::class
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
index c5a81fc6..9f13216b 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
@@ -35,27 +35,6 @@ public class Box(
         geometryBuilder.face4(node8, node5, node6, node7)
     }
 
-//    override fun equals(other: Any?): Boolean {
-//        if (this === other) return true
-//        if (other == null || this::class != other::class) return false
-//
-//        other as Box
-//
-//        if (xSize != other.xSize) return false
-//        if (ySize != other.ySize) return false
-//        if (zSize != other.zSize) return false
-//
-//        return solidEquals(this, other)
-//    }
-//
-//    override fun hashCode(): Int {
-//        var result = xSize.hashCode()
-//        result = 31 * result + ySize.hashCode()
-//        result = 31 * result + zSize.hashCode()
-//        return 31 * result + Solid.solidHashCode(this)
-//    }
-
-
     public companion object {
 
     }
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index e7855cd5..28e0e4e3 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -28,9 +28,13 @@ public interface PrototypeHolder {
 @Serializable
 @SerialName("group.solid")
 public class SolidGroup(
-    @Serializable(Prototypes.Companion::class) @SerialName("prototypes") private var prototypes: MutableVisionGroup? = null,
+    @Serializable(Prototypes.Companion::class) @SerialName("prototypes") internal var prototypes: MutableVisionGroup? = null,
 ) : VisionGroupBase(), Solid, PrototypeHolder {
 
+    init {
+        prototypes?.parent = this
+    }
+
     override val descriptor: NodeDescriptor get() = Solid.descriptor
 
     /**
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt
index a18207c8..1da06a02 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt
@@ -8,21 +8,21 @@ import kotlin.test.assertEquals
 
 class SolidPluginTest {
     val vision = SolidGroup {
-        box(100,100,100, name = "aBox")
+        box(100, 100, 100, name = "aBox")
 
-        sphere(100,name = "aSphere"){
+        sphere(100, name = "aSphere") {
             z = 200
         }
     }
 
     @DFExperimental
     @Test
-    fun testPluginConverter(){
+    fun testPluginConverter() {
         val visionManager = Global.plugins.fetch(SolidManager).visionManager
         val meta = visionManager.encodeToMeta(vision)
 
         val reconstructed = visionManager.decodeFromMeta(meta) as SolidGroup
 
-        assertEquals(vision["aBox"],reconstructed["aBox"])
+        assertEquals(visionManager.encodeToJsonElement(vision["aBox"]!!), visionManager.encodeToJsonElement(reconstructed["aBox"]!!))
     }
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt
index 1ac2738f..bb38316e 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt
@@ -3,6 +3,8 @@ package hep.dataforge.vision.solid
 import hep.dataforge.vision.get
 import hep.dataforge.vision.style
 import hep.dataforge.vision.useStyle
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.encodeToJsonElement
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -22,4 +24,11 @@ class SolidReferenceTest {
     fun testReferenceProperty(){
         assertEquals("blue", (groupWithReference["test"] as Solid).color.string)
     }
+
+    @Test
+    fun testReferenceSerialization(){
+        val serialized = SolidManager.jsonForSolids.encodeToJsonElement(groupWithReference)
+        val deserialized = SolidManager.jsonForSolids.decodeFromJsonElement(SolidGroup.serializer(), serialized)
+        assertEquals("blue", (deserialized["test"] as Solid).color.string)
+    }
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index 95020784..246e90dd 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -126,9 +126,8 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
         }
     }
 
-    override fun rateVision(vision: Vision): Int {
-        return if (vision is Solid) ElementVisionRenderer.DEFAULT_RATING else ElementVisionRenderer.ZERO_RATING
-    }
+    override fun rateVision(vision: Vision): Int =
+        if (vision is Solid) ElementVisionRenderer.DEFAULT_RATING else ElementVisionRenderer.ZERO_RATING
 
     public fun renderSolid(
         element: Element,
@@ -141,7 +140,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
     override fun render(element: Element, vision: Vision, meta: Meta) {
         renderSolid(
             element,
-            vision as? Solid ?: error("Solid expected but ${vision::class} is found"),
+            vision as? Solid ?: error("Solid expected but ${vision::class} found"),
             Canvas3DOptions.read(meta)
         )
     }
@@ -157,7 +156,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
  * Ensure that [ThreePlugin] is loaded in the global [VisionForge] context
  */
 @JsExport
-public fun loadThreeJs() {
+public fun withThreeJs() {
     VisionForge.plugins.fetch(ThreePlugin)
 }
 
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
index ab4b5e46..268e1a8e 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
@@ -1,9 +1,9 @@
 package hep.dataforge.vision.three.server
 
 import hep.dataforge.vision.renderVisionsInWindow
-import hep.dataforge.vision.solid.three.loadThreeJs
+import hep.dataforge.vision.solid.three.withThreeJs
 
 public fun main() {
-    loadThreeJs()
+    withThreeJs()
     renderVisionsInWindow()
 }
\ No newline at end of file

From 27fe492ab73e1a0ed58e46a7a2682efadb98900c Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 24 Feb 2021 18:26:15 +0300
Subject: [PATCH 088/151] Complete playfround jupyter demo

---
 .../VisionForgePlayGroundForJupyter.kt        | 60 ++++++++++---------
 .../src/jvmMain/kotlin/gdmlCubes.kt           |  9 ++-
 .../src/jvmMain/kotlin/serverExtensions.kt    | 13 +++-
 .../vision/html/VisionTagConsumer.kt          |  2 +-
 .../dataforge/vision/gdml/GdmlTransformer.kt  |  2 +-
 .../dataforge/vision/gdml/TestConvertor.kt    | 10 ++--
 .../hep/dataforge/vision/gdml/TestCubes.kt    | 24 +++++++-
 .../dataforge/vision/plotly/VisionOfPlotly.kt |  2 +
 .../dataforge/vision/solid/SolidReference.kt  | 10 +++-
 9 files changed, 86 insertions(+), 46 deletions(-)

diff --git a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
index 42bc2bc1..cd485580 100644
--- a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
+++ b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
@@ -1,13 +1,17 @@
 package hep.dataforge.playground
 
-import hep.dataforge.context.Context
+import hep.dataforge.misc.DFExperimental
+import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.VisionManager
-import hep.dataforge.vision.gdml.gdml
-import hep.dataforge.vision.html.*
-import hep.dataforge.vision.plotly.PlotlyPlugin
-import hep.dataforge.vision.plotly.VisionOfPlotly
-import hep.dataforge.vision.solid.SolidManager
-import hep.dataforge.vision.solid.solid
+import hep.dataforge.vision.gdml.toVision
+import hep.dataforge.vision.html.HtmlVisionFragment
+import hep.dataforge.vision.html.Page
+import hep.dataforge.vision.html.embedVisionFragment
+import hep.dataforge.vision.html.fragment
+import hep.dataforge.vision.plotly.toVision
+import hep.dataforge.vision.plotly.withPlotly
+import hep.dataforge.vision.solid.withSolids
 import hep.dataforge.vision.visionManager
 import kotlinx.html.div
 import kotlinx.html.id
@@ -15,22 +19,16 @@ import kotlinx.html.script
 import kotlinx.html.stream.createHTML
 import kotlinx.html.unsafe
 import kscience.plotly.Plot
-import kscience.plotly.PlotlyFragment
 import org.jetbrains.kotlinx.jupyter.api.HTML
 import org.jetbrains.kotlinx.jupyter.api.Notebook
 import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
 import org.jetbrains.kotlinx.jupyter.api.libraries.*
-import org.jetbrains.kotlinx.jupyter.api.libraries.ResourceLocation
 import space.kscience.gdml.Gdml
 
 @JupyterLibrary
+@DFExperimental
 internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
 
-    private val context = Context("Playground") {
-        plugin(SolidManager)
-        plugin(PlotlyPlugin)
-    }
-
     val jsBundle = ResourceFallbacksBundle(listOf(ResourceLocation("js/visionforge-playground.js",
         ResourcePathType.CLASSPATH_PATH)))
     val jsResource = LibraryResource(name = "VisionForge", type = ResourceType.JS, bundles = listOf(jsBundle))
@@ -41,7 +39,7 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
         val id = "visionforge.vision[${counter++}]"
         div {
             this.id = id
-            embedVisionFragment(context.visionManager, fragment = fragment)
+            embedVisionFragment(VisionForge.visionManager, fragment = fragment)
         }
         script {
             type = "text/javascript"
@@ -52,15 +50,27 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
     override fun Builder.onLoaded(notebook: Notebook?) {
         resource(jsResource)
 
-        import("space.kscience.gdml.*", "kscience.plotly.*", "kscience.plotly.models.*")
+        onLoaded {
+            VisionForge.withPlotly().withSolids()
+        }
 
+        import("space.kscience.gdml.*",
+            "kscience.plotly.*",
+            "kscience.plotly.models.*",
+            "kotlinx.html.*",
+            "hep.dataforge.vision.solid.*")
+        import("hep.dataforge.vision.VisionForge")
         render<Gdml> { gdmlModel ->
             val fragment = VisionManager.fragment {
-                vision {
-                    solid {
-                        gdml(gdmlModel)
-                    }
-                }
+                vision(gdmlModel.toVision())
+            }
+
+            HTML(produceHtmlVisionString(fragment))
+        }
+
+        render<Vision> { vision ->
+            val fragment = VisionManager.fragment {
+                vision(vision)
             }
 
             HTML(produceHtmlVisionString(fragment))
@@ -68,12 +78,10 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
 
         render<Plot> { plot ->
             val fragment = VisionManager.fragment {
-                vision {
-                    VisionOfPlotly(plot.config)
-                }
+                vision(plot.toVision())
             }
 
-            HTML( produceHtmlVisionString(fragment))
+            HTML(produceHtmlVisionString(fragment))
         }
 
         render<kscience.plotly.HtmlFragment> { fragment ->
@@ -83,8 +91,6 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
         render<Page> { page ->
             HTML(page.render(createHTML()), true)
         }
-
-
     }
 
 }
diff --git a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
index 8a2d609f..a3d27b5f 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
@@ -3,10 +3,9 @@ package hep.dataforge.vision.examples
 import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.VisionManager
-import hep.dataforge.vision.gdml.gdml
+import hep.dataforge.vision.gdml.toVision
 import hep.dataforge.vision.html.ResourceLocation
 import hep.dataforge.vision.html.fragment
-import hep.dataforge.vision.solid.solid
 import hep.dataforge.vision.solid.withSolids
 import space.kscience.gdml.*
 
@@ -62,11 +61,11 @@ internal val cubes = Gdml {
 
 @DFExperimental
 fun main() {
+    println(cubes.encodeToString())
+
     val content = VisionManager.fragment {
         vision("canvas") {
-            solid {
-                gdml(cubes)
-            }
+            cubes.toVision()
         }
     }
 
diff --git a/demo/playground/src/jvmMain/kotlin/serverExtensions.kt b/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
index 7008e4f3..eb26d5e4 100644
--- a/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
+++ b/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
@@ -2,6 +2,7 @@ package hep.dataforge.vision.examples
 
 import hep.dataforge.context.Context
 import hep.dataforge.misc.DFExperimental
+import hep.dataforge.vision.Vision
 import hep.dataforge.vision.html.HtmlVisionFragment
 import hep.dataforge.vision.html.ResourceLocation
 import hep.dataforge.vision.html.page
@@ -30,6 +31,12 @@ public fun Context.makeVisionFile(
     }
     if (show) Desktop.getDesktop().browse(actualPath.toFile().toURI())
 }
-//    makeVisionFile(fragment, path = path, title = title, show = show) { actualPath ->
-//    scriptHeader("js/visionforge-playground.js", actualPath, resourceLocation)
-//}
+
+@DFExperimental
+public fun Context.makeVisionFile(
+    vision: Vision,
+    path: Path? = null,
+    title: String = "VisionForge page",
+    resourceLocation: ResourceLocation = ResourceLocation.SYSTEM,
+    show: Boolean = true,
+): Unit = makeVisionFile({ vision(vision) }, path, title, resourceLocation, show)
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
index 9f3db8c1..4a279f3b 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
@@ -11,7 +11,6 @@ import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionManager
 import kotlinx.html.*
 import kotlin.collections.set
-import kotlin.collections.setOf
 
 
 /**
@@ -46,6 +45,7 @@ public abstract class VisionTagConsumer<R>(
 
     /**
      * Create a placeholder for a vision output with optional [Vision] in it
+     * TODO with multi-receivers could be replaced by [VisionTagConsumer, TagConsumer] extension
      */
     public fun <T> TagConsumer<T>.vision(
         name: Name,
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt
index 098edded..c1fef40b 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt
@@ -332,7 +332,7 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
 
     private fun finalize(final: SolidGroup): SolidGroup {
         //final.prototypes = proto
-        final.useStyle("Gdml") {
+        final.useStyle("gdml") {
             Solid.ROTATION_ORDER_KEY put RotationOrder.ZXY
         }
 
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
index d599cf07..16a1e202 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
@@ -2,8 +2,8 @@ package hep.dataforge.vision.gdml
 
 import hep.dataforge.names.toName
 import hep.dataforge.vision.solid.SolidManager
-import space.kscience.gdml.Gdml
 import org.junit.jupiter.api.Test
+import space.kscience.gdml.Gdml
 import space.kscience.gdml.decodeFromStream
 import kotlin.test.assertNotNull
 
@@ -11,7 +11,7 @@ class TestConvertor {
 
     @Test
     fun testBMNGeometry() {
-        val stream = javaClass.getResourceAsStream("/gdml/BM@N.gdml")
+        val stream = javaClass.getResourceAsStream("/gdml/BM@N.gdml")!!
         val gdml = Gdml.decodeFromStream(stream)
         val vision = gdml.toVision()
         //println(SolidManager.encodeToString(vision))
@@ -19,16 +19,16 @@ class TestConvertor {
 
     @Test
     fun testCubes() {
-        val stream = javaClass.getResourceAsStream("/gdml/cubes.gdml")
+        val stream = javaClass.getResourceAsStream("/gdml/cubes.gdml")!!
         val gdml = Gdml.decodeFromStream(stream)
         val vision = gdml.toVision()
         assertNotNull(vision.getPrototype("solids.box".toName()))
-        //println(SolidManager.encodeToString(vision))
+        println(SolidManager.encodeToString(vision))
     }
 
     @Test
     fun testSimple() {
-        val stream = javaClass.getResourceAsStream("/gdml/simple1.gdml")
+        val stream = javaClass.getResourceAsStream("/gdml/simple1.gdml")!!
         val gdml = Gdml.decodeFromStream(stream)
         val vision = gdml.toVision()
         //println(SolidManager.encodeToString(vision))
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestCubes.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestCubes.kt
index adaca24a..4d451ddb 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestCubes.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestCubes.kt
@@ -1,13 +1,23 @@
 package hep.dataforge.vision.gdml
 
+import hep.dataforge.context.Context
 import hep.dataforge.names.toName
+import hep.dataforge.vision.Vision
 import hep.dataforge.vision.solid.SolidGroup
 import hep.dataforge.vision.solid.SolidManager
+import hep.dataforge.vision.solid.SolidReference
+import hep.dataforge.vision.visionManager
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertDoesNotThrow
 import space.kscience.gdml.*
 import kotlin.test.assertNotNull
 
+internal val testContext = Context("TEST"){
+    plugin(SolidManager)
+}
+
 class TestCubes {
+
     internal val cubes = Gdml {
         val center = define.position("center")
         structure {
@@ -68,7 +78,19 @@ class TestCubes {
     fun testCubesReSerialize(){
         val vision = cubes.toVision()
         val serialized = SolidManager.encodeToString(vision)
-        val deserialized = SolidManager.decodeFromString(serialized) as SolidGroup
+        val deserialized = testContext.visionManager.decodeFromString(serialized) as SolidGroup
         assertNotNull(deserialized.getPrototype("solids.smallBox".toName()))
+        //println(testContext.visionManager.encodeToString(deserialized))
+        fun Vision.checkPrototypes(){
+            if(this is SolidReference){
+                assertDoesNotThrow { this.prototype }
+            }
+            if(this is SolidGroup){
+                children.forEach {
+                    it.value.checkPrototypes()
+                }
+            }
+        }
+        deserialized.checkPrototypes()
     }
 }
\ No newline at end of file
diff --git a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt
index 3fd82a3a..7c6f527b 100644
--- a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt
+++ b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt
@@ -13,5 +13,7 @@ public class VisionOfPlotly(private val plotConfig: Config) : VisionBase(plotCon
     public val plot: Plot get() = Plot(plotConfig)
 }
 
+public fun Plot.toVision(): VisionOfPlotly = VisionOfPlotly(config)
+
 @DFExperimental
 public inline fun VisionOutput.plotly(block: Plot.() -> Unit): VisionOfPlotly = VisionOfPlotly(Plotly.plot(block).config)
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
index fd6ddbfa..c70db5f8 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
@@ -44,8 +44,12 @@ public class SolidReferenceGroup(
      * Recursively search for defined template in the parent
      */
     override val prototype: Solid
-        get() = (parent as? SolidGroup)?.getPrototype(refName)
-            ?: error("Prototype with name $refName not found in $parent")
+        get() {
+            if(parent == null) error("No parent is present for SolidReferenceGroup")
+            if(parent !is SolidGroup) error("Reference parent is not a group")
+            return (parent as? SolidGroup)?.getPrototype(refName)
+                ?: error("Prototype with name $refName not found")
+        }
 
     override val children: Map<NameToken, Vision>
         get() = (prototype as? VisionGroup)?.children
@@ -71,7 +75,7 @@ public class SolidReferenceGroup(
     private fun prototypeFor(name: Name): Solid {
         return if (name.isEmpty()) prototype else {
             (prototype as? SolidGroup)?.get(name) as? Solid
-                ?: error("Prototype with name $name not found in $this")
+                ?: error("Prototype with name $name not found in SolidReferenceGroup $refName")
         }
     }
 

From a5bfa0f14738549c6de55cf7ad5cfab225e758b8 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 24 Feb 2021 22:48:17 +0300
Subject: [PATCH 089/151] Complete playfround jupyter demo

---
 .../VisionForgePlayGroundForJupyter.kt        |  18 +-
 .../src/jsMain/kotlin/playgroundMain.kt       |  12 +-
 .../src/jvmMain/kotlin/gdmlCubes.kt           |   2 -
 .../src/jvmMain/kotlin/generateSchema.kt      | 213 +-----------------
 .../hep/dataforge/vision/VisionForge.kt       |   3 +
 .../hep/dataforge/vision/VisionForge.kt       |   3 +
 .../hep/dataforge/vision/plotly/plotlyJs.kt   |   6 +-
 .../vision/solid/three/ThreePlugin.kt         |   2 +-
 .../dataforge/vision/three/server/jsMain.kt   |   4 +-
 9 files changed, 31 insertions(+), 232 deletions(-)

diff --git a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
index cd485580..c1228ce1 100644
--- a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
+++ b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
@@ -29,9 +29,10 @@ import space.kscience.gdml.Gdml
 @DFExperimental
 internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
 
-    val jsBundle = ResourceFallbacksBundle(listOf(ResourceLocation("js/visionforge-playground.js",
-        ResourcePathType.CLASSPATH_PATH)))
-    val jsResource = LibraryResource(name = "VisionForge", type = ResourceType.JS, bundles = listOf(jsBundle))
+    private val jsBundle = ResourceFallbacksBundle(listOf(
+        ResourceLocation("js/visionforge-playground.js", ResourcePathType.CLASSPATH_PATH))
+    )
+    private val jsResource = LibraryResource(name = "VisionForge", type = ResourceType.JS, bundles = listOf(jsBundle))
 
     private var counter = 0
 
@@ -43,7 +44,7 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
         }
         script {
             type = "text/javascript"
-            unsafe { +"window.renderVisionsAt(\"$id\");" }
+            unsafe { +"renderVisionsAt(\"$id\");" }
         }
     }
 
@@ -54,17 +55,20 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
             VisionForge.withPlotly().withSolids()
         }
 
-        import("space.kscience.gdml.*",
+        import(
+            "space.kscience.gdml.*",
             "kscience.plotly.*",
             "kscience.plotly.models.*",
             "kotlinx.html.*",
-            "hep.dataforge.vision.solid.*")
+            "hep.dataforge.vision.solid.*"
+        )
+
         import("hep.dataforge.vision.VisionForge")
+
         render<Gdml> { gdmlModel ->
             val fragment = VisionManager.fragment {
                 vision(gdmlModel.toVision())
             }
-
             HTML(produceHtmlVisionString(fragment))
         }
 
diff --git a/demo/playground/src/jsMain/kotlin/playgroundMain.kt b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
index 26397ad4..de1b2fb4 100644
--- a/demo/playground/src/jsMain/kotlin/playgroundMain.kt
+++ b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
@@ -1,14 +1,10 @@
 //import hep.dataforge.vision.plotly.withPlotly
-import hep.dataforge.vision.plotly.withPlotly
-import hep.dataforge.vision.renderVisionsAt
+import hep.dataforge.vision.plotly.usePlotly
 import hep.dataforge.vision.renderVisionsInWindow
-import hep.dataforge.vision.solid.three.withThreeJs
-import kotlinx.browser.window
+import hep.dataforge.vision.solid.three.useThreeJs
 
 fun main() {
-    withPlotly()
-    withThreeJs()
+    usePlotly()
+    useThreeJs()
     renderVisionsInWindow()
-    window.asDynamic()["renderVisionsInWindow"] = ::renderVisionsInWindow
-    window.asDynamic()["renderVisionsAt"] = ::renderVisionsAt
 }
\ No newline at end of file
diff --git a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
index a3d27b5f..29dff01a 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
@@ -61,8 +61,6 @@ internal val cubes = Gdml {
 
 @DFExperimental
 fun main() {
-    println(cubes.encodeToString())
-
     val content = VisionManager.fragment {
         vision("canvas") {
             cubes.toVision()
diff --git a/demo/playground/src/jvmMain/kotlin/generateSchema.kt b/demo/playground/src/jvmMain/kotlin/generateSchema.kt
index e3411516..25f82ea1 100644
--- a/demo/playground/src/jvmMain/kotlin/generateSchema.kt
+++ b/demo/playground/src/jvmMain/kotlin/generateSchema.kt
@@ -3,8 +3,10 @@ package hep.dataforge.vision.examples
 import com.github.ricky12awesome.jss.encodeToSchema
 import hep.dataforge.vision.solid.SolidGroup
 import hep.dataforge.vision.solid.SolidManager
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 
+@ExperimentalSerializationApi
 fun main() {
     val schema = Json {
         serializersModule = SolidManager.serializersModuleForSolids
@@ -16,213 +18,4 @@ fun main() {
         encodeDefaults = true
     }.encodeToSchema(SolidGroup.serializer(), generateDefinitions = false)
     println(schema)
-}
-
-
-//
-//import hep.dataforge.meta.JSON_PRETTY
-//import kotlinx.serialization.*
-//import kotlinx.serialization.descriptors.PrimitiveKind
-//import kotlinx.serialization.descriptors.SerialDescriptor
-//import kotlinx.serialization.descriptors.StructureKind
-//import kotlinx.serialization.descriptors.UnionKind
-//import kotlinx.serialization.json.*
-//import kotlinx.serialization.modules.SerialModule
-//import kotlin.reflect.KClass
-//
-//private fun SerialDescriptor.getJsonType() = when (this.kind) {
-//    StructureKind.LIST -> "array"
-//    PrimitiveKind.BYTE, PrimitiveKind.SHORT, PrimitiveKind.INT, PrimitiveKind.LONG,
-//    PrimitiveKind.FLOAT, PrimitiveKind.DOUBLE -> "number"
-//    PrimitiveKind.STRING, PrimitiveKind.CHAR, UnionKind.ENUM_KIND -> "string"
-//    PrimitiveKind.BOOLEAN -> "boolean"
-//    else -> "object"
-//}
-//
-//private fun SerialDescriptor.isVisualObject() = serialName.startsWith("solid")||serialName.startsWith("group.solid")
-//
-//private const val definitionNode = "\$defs"
-//
-//private fun SerialModule.enumerate(type: KClass<*>): Sequence<SerialDescriptor> {
-//    val list = ArrayList<SerialDescriptor>()
-//    fun send(descriptor: SerialDescriptor) = list.add(descriptor)
-//
-//    val enumerator = object : SerialModuleCollector {
-//        override fun <T : Any> contextual(kClass: KClass<T>, serializer: KSerializer<T>) {
-//            if (kClass == type) {
-//                send(serializer.descriptor)
-//            }
-//        }
-//
-//        override fun <Base : Any, Sub : Base> polymorphic(
-//            baseClass: KClass<Base>,
-//            actualClass: KClass<Sub>,
-//            actualSerializer: KSerializer<Sub>
-//        ) {
-//            if (baseClass == type) {
-//                send(actualSerializer.descriptor)
-//            }
-//        }
-//
-//    }
-//    dumpTo(enumerator)
-//    return list.asSequence()
-//}
-//
-///**
-// * Creates an [JsonObject] which contains Json Schema of given [descriptor].
-// *
-// * Schema can contain following fields:
-// * `description`, `type` for all descriptors;
-// * `properties` and `required` for objects;
-// * `enum` for enums;
-// * `items` for arrays.
-// *
-// * User can modify this schema to add additional validation keywords
-// * (as per [https://json-schema.org/latest/json-schema-validation.html])
-// * if they want.
-// */
-//private fun jsonSchema(descriptor: SerialDescriptor, context: SerialModule): JsonObject {
-//
-//    if (descriptor.serialName in arrayOf(
-//            "hep.dataforge.vision.solid.Point3D",
-//            "hep.dataforge.vision.solid.Point3D?",
-//            "hep.dataforge.vision.solid.Point2D",
-//            "hep.dataforge.vision.solid.Point2D?",
-//            "hep.dataforge.meta.Meta",
-//            "hep.dataforge.meta.Meta?"
-//        )
-//    ) return json {
-//        "\$ref" to "#/$definitionNode/${descriptor.serialName.replace("?", "")}"
-//    }
-//
-//
-//    val properties: MutableMap<String, JsonObject> = mutableMapOf()
-//    val requiredProperties: MutableSet<String> = mutableSetOf()
-//    val isEnum = descriptor.kind == UnionKind.ENUM_KIND
-//    val isPolymorphic = descriptor.kind is PolymorphicKind
-//
-//
-//    if (!isEnum && !isPolymorphic) descriptor.elementDescriptors().forEachIndexed { index, child ->
-//        val elementName = descriptor.getElementName(index)
-//
-//        val elementSchema = when (elementName) {
-//            "properties" -> buildJsonObject {
-//                put("\$ref", "#/$definitionNode/hep.dataforge.meta.Meta")
-//            }
-//            "first", "second" -> buildJsonObject {
-//                put("\$ref", "#/$definitionNode/children")
-//            }
-//            "styleSheet" -> buildJsonObject {
-//                put("type", "object")
-//                put("additionalProperties", buildJsonObject {
-//                    put("\$ref", "#/$definitionNode/hep.dataforge.meta.Meta")
-//                })
-//            }
-//            in arrayOf("children", "prototypes") -> buildJsonObject {
-//                put("type", "object")
-//                put("additionalProperties", buildJsonObject {
-//                    put("\$ref", "#/$definitionNode/children")
-//                })
-//            }
-//            else -> jsonSchema(child, context)
-//        }
-//        properties[elementName] = elementSchema
-//
-//        if (!descriptor.isElementOptional(index)) requiredProperties.add(elementName)
-//    }
-//
-//    val jsonType = descriptor.getJsonType()
-//    val objectData: MutableMap<String, JsonElement> = mutableMapOf(
-//        "description" to JsonLiteral(descriptor.serialName),
-//        "type" to JsonLiteral(jsonType)
-//    )
-//    if (isEnum) {
-//        val allElementNames = (0 until descriptor.elementsCount).map(descriptor::getElementName)
-//        objectData += "enum" to JsonArray(allElementNames.map(::JsonLiteral))
-//    }
-//    when (jsonType) {
-//        "object" -> {
-//            if(descriptor.isVisualObject()) {
-//                properties["type"] = json {
-//                    "const" to descriptor.serialName
-//                }
-//            }
-//            objectData["properties"] = JsonObject(properties)
-//            val required = requiredProperties.map { JsonLiteral(it) }
-//            if (required.isNotEmpty()) {
-//                objectData["required"] = JsonArray(required)
-//            }
-//        }
-//        "array" -> objectData["items"] = properties.values.let {
-//            check(it.size == 1) { "Array descriptor has returned inconsistent number of elements: expected 1, found ${it.size}" }
-//            it.first()
-//        }
-//        else -> { /* no-op */
-//        }
-//    }
-//    return JsonObject(objectData)
-//}
-//
-//fun main() {
-//    val context = SolidManager.serialModule
-//    val definitions = json {
-//        "children" to json {
-//            "anyOf" to jsonArray {
-//                context.enumerate(Solid::class).forEach {
-//                    if (it.serialName == "hep.dataforge.vis.spatial.SolidGroup") {
-//                        +json {
-//                            "\$ref" to "#/$definitionNode/${it.serialName}"
-//                        }
-//                    } else {
-//                        +jsonSchema(it, context)
-//                    }
-//                }
-//            }
-//        }
-//        "hep.dataforge.meta.Meta" to json {
-//            "type" to "object"
-//        }
-//        "hep.dataforge.vision.solid.Point3D" to json {
-//            "type" to "object"
-//            "properties" to json {
-//                "x" to json {
-//                    "type" to "number"
-//                }
-//                "y" to json {
-//                    "type" to "number"
-//                }
-//                "z" to json {
-//                    "type" to "number"
-//                }
-//            }
-//        }
-//        "hep.dataforge.vision.solid.Point2D" to json {
-//            "type" to "object"
-//            "properties" to json {
-//                "x" to json {
-//                    "type" to "number"
-//                }
-//                "y" to json {
-//                    "type" to "number"
-//                }
-//            }
-//        }
-//        "hep.dataforge.vision.solid.SolidGroup" to jsonSchema(
-//            SolidGroup.serializer().descriptor,
-//            context
-//        )
-//
-//    }
-//
-//    println(
-//        JSON_PRETTY.stringify(
-//            JsonObjectSerializer,
-//            json {
-//                "\$defs" to definitions
-//                "\$ref" to "#/$definitionNode/hep.dataforge.vision.solid.SolidGroup"
-//            }
-//        )
-//    )
-//}
-//
+}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt
index 2058c3cf..b9c98d93 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt
@@ -2,4 +2,7 @@ package hep.dataforge.vision
 
 import hep.dataforge.context.Context
 
+/**
+ * A drop-in replacement for [Global] for VisionForge activities
+ */
 public expect val VisionForge: Context
\ No newline at end of file
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionForge.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionForge.kt
index fc3cd8a6..9f478b34 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionForge.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionForge.kt
@@ -24,6 +24,9 @@ public fun renderVisionsInWindow() {
     }
 }
 
+/**
+ * Render all visions in an element with a given [id]
+ */
 @JsExport
 public fun renderVisionsAt(id: String) {
     val element = document.getElementById(id)
diff --git a/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt b/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt
index 601c255f..27f13860 100644
--- a/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt
+++ b/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt
@@ -1,6 +1,8 @@
 package hep.dataforge.vision.plotly
 
-import hep.dataforge.context.*
+import hep.dataforge.context.Context
+import hep.dataforge.context.PluginFactory
+import hep.dataforge.context.PluginTag
 import hep.dataforge.meta.Meta
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
@@ -51,6 +53,6 @@ public actual class PlotlyPlugin : VisionPlugin(), ElementVisionRenderer {
  * Ensure that [PlotlyPlugin] is loaded in the global [VisionForge] context
  */
 @JsExport
-public fun withPlotly() {
+public fun usePlotly() {
     VisionForge.plugins.fetch(PlotlyPlugin)
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index 246e90dd..b00a6cac 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -156,7 +156,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
  * Ensure that [ThreePlugin] is loaded in the global [VisionForge] context
  */
 @JsExport
-public fun withThreeJs() {
+public fun useThreeJs() {
     VisionForge.plugins.fetch(ThreePlugin)
 }
 
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
index 268e1a8e..069eb073 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
@@ -1,9 +1,9 @@
 package hep.dataforge.vision.three.server
 
 import hep.dataforge.vision.renderVisionsInWindow
-import hep.dataforge.vision.solid.three.withThreeJs
+import hep.dataforge.vision.solid.three.useThreeJs
 
 public fun main() {
-    withThreeJs()
+    useThreeJs()
     renderVisionsInWindow()
 }
\ No newline at end of file

From bc15d9241b4853201407dd1bd7e2827d7bf57cba Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 26 Feb 2021 13:03:40 +0300
Subject: [PATCH 090/151] Refactor VisionForge global

---
 build.gradle.kts                              |  1 -
 .../VisionForgePlayGroundForJupyter.kt        | 16 ++++----
 .../src/jsMain/kotlin/playgroundMain.kt       |  5 +--
 .../src/jvmMain/kotlin/gdmlCubes.kt           | 12 +++---
 .../src/jvmMain/kotlin/plotlyVision.kt        | 16 ++++----
 .../src/jvmMain/kotlin/randomSpheres.kt       | 10 ++---
 .../src/jvmMain/kotlin/serverExtensions.kt    |  6 +--
 .../src/jvmMain/kotlin/simpleCube.kt          | 12 +++---
 settings.gradle.kts                           |  2 -
 .../hep/dataforge/vision/VisionForge.kt       | 12 ++++--
 .../hep/dataforge/vision/VisionGroupBase.kt   |  7 ++--
 .../vision/html/HtmlVisionFragment.kt         |  4 +-
 .../kotlin/hep/dataforge/vision/html/Page.kt  |  7 ++--
 .../vision/{client => }/VisionClient.kt       |  5 +--
 .../hep/dataforge/vision/VisionForge.kt       | 38 -------------------
 .../vision/{client => }/elementOutput.kt      |  3 +-
 .../hep/dataforge/vision/visionForgeJs.kt     | 37 ++++++++++++++++++
 .../hep/dataforge/vision/VisionForge.kt       |  8 ----
 .../hep/dataforge/vision/visionForgeJvm.kt    | 13 +++++++
 .../{plotlyCommon.kt => PlotlyPlugin.kt}      | 14 ++++++-
 .../hep/dataforge/vision/plotly/plotlyJs.kt   | 15 ++------
 .../hep/dataforge/vision/plotly/plotlyJvm.kt  |  6 +--
 .../dataforge/vision/solid/SolidManager.kt    |  5 ++-
 .../vision/solid/three/ThreePlugin.kt         | 12 ++----
 .../dataforge/vision/three/server/jsMain.kt   |  4 +-
 .../vision/three/server/serverExtensions.kt   |  4 +-
 26 files changed, 136 insertions(+), 138 deletions(-)
 rename visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/{client => }/VisionClient.kt (98%)
 delete mode 100644 visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionForge.kt
 rename visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/{client => }/elementOutput.kt (92%)
 create mode 100644 visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt
 delete mode 100644 visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/VisionForge.kt
 create mode 100644 visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visionForgeJvm.kt
 rename visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/{plotlyCommon.kt => PlotlyPlugin.kt} (51%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 5a0f3400..949d00a6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,7 +12,6 @@ val fxVersion by extra("14")
 
 allprojects {
     repositories {
-        mavenLocal()
         mavenCentral()
         jcenter()
         maven("https://kotlin.bintray.com/kotlin-js-wrappers")
diff --git a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
index c1228ce1..4ae7cf4b 100644
--- a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
+++ b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
@@ -3,15 +3,14 @@ package hep.dataforge.playground
 import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionForge
-import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.gdml.toVision
 import hep.dataforge.vision.html.HtmlVisionFragment
 import hep.dataforge.vision.html.Page
 import hep.dataforge.vision.html.embedVisionFragment
 import hep.dataforge.vision.html.fragment
 import hep.dataforge.vision.plotly.toVision
-import hep.dataforge.vision.plotly.withPlotly
-import hep.dataforge.vision.solid.withSolids
+import hep.dataforge.vision.plotly.usePlotly
+import hep.dataforge.vision.solid.useSolids
 import hep.dataforge.vision.visionManager
 import kotlinx.html.div
 import kotlinx.html.id
@@ -44,7 +43,7 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
         }
         script {
             type = "text/javascript"
-            unsafe { +"renderVisionsAt(\"$id\");" }
+            unsafe { +"VisionForge.renderVisionsAt(\"$id\");" }
         }
     }
 
@@ -52,7 +51,8 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
         resource(jsResource)
 
         onLoaded {
-            VisionForge.withPlotly().withSolids()
+            VisionForge.useSolids()
+            VisionForge.usePlotly()
         }
 
         import(
@@ -66,14 +66,14 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
         import("hep.dataforge.vision.VisionForge")
 
         render<Gdml> { gdmlModel ->
-            val fragment = VisionManager.fragment {
+            val fragment = VisionForge.fragment {
                 vision(gdmlModel.toVision())
             }
             HTML(produceHtmlVisionString(fragment))
         }
 
         render<Vision> { vision ->
-            val fragment = VisionManager.fragment {
+            val fragment = VisionForge.fragment {
                 vision(vision)
             }
 
@@ -81,7 +81,7 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
         }
 
         render<Plot> { plot ->
-            val fragment = VisionManager.fragment {
+            val fragment = VisionForge.fragment {
                 vision(plot.toVision())
             }
 
diff --git a/demo/playground/src/jsMain/kotlin/playgroundMain.kt b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
index de1b2fb4..6c3bb939 100644
--- a/demo/playground/src/jsMain/kotlin/playgroundMain.kt
+++ b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
@@ -1,9 +1,8 @@
-//import hep.dataforge.vision.plotly.withPlotly
+import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.plotly.usePlotly
-import hep.dataforge.vision.renderVisionsInWindow
 import hep.dataforge.vision.solid.three.useThreeJs
 
-fun main() {
+fun main(): Unit = VisionForge.run{
     usePlotly()
     useThreeJs()
     renderVisionsInWindow()
diff --git a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
index 29dff01a..2caefaaa 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
@@ -2,11 +2,11 @@ package hep.dataforge.vision.examples
 
 import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.VisionForge
-import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.gdml.toVision
 import hep.dataforge.vision.html.ResourceLocation
 import hep.dataforge.vision.html.fragment
-import hep.dataforge.vision.solid.withSolids
+import hep.dataforge.vision.invoke
+import hep.dataforge.vision.solid.useSolids
 import space.kscience.gdml.*
 
 internal val cubes = Gdml {
@@ -60,12 +60,12 @@ internal val cubes = Gdml {
 }
 
 @DFExperimental
-fun main() {
-    val content = VisionManager.fragment {
+fun main() = VisionForge {
+    val content = VisionForge.fragment {
         vision("canvas") {
             cubes.toVision()
         }
     }
-
-    VisionForge.withSolids().makeVisionFile(content, resourceLocation = ResourceLocation.SYSTEM)
+    useSolids()
+    makeVisionFile(content, resourceLocation = ResourceLocation.SYSTEM)
 }
\ No newline at end of file
diff --git a/demo/playground/src/jvmMain/kotlin/plotlyVision.kt b/demo/playground/src/jvmMain/kotlin/plotlyVision.kt
index 93f79ace..0058232d 100644
--- a/demo/playground/src/jvmMain/kotlin/plotlyVision.kt
+++ b/demo/playground/src/jvmMain/kotlin/plotlyVision.kt
@@ -2,25 +2,25 @@ package hep.dataforge.vision.examples
 
 import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.VisionForge
-import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.html.ResourceLocation
 import hep.dataforge.vision.html.fragment
+import hep.dataforge.vision.invoke
 import hep.dataforge.vision.plotly.plotly
-import hep.dataforge.vision.plotly.withPlotly
+import hep.dataforge.vision.plotly.usePlotly
 import kscience.plotly.scatter
 
 @DFExperimental
-fun main() {
-    val fragment = VisionManager.fragment {
+fun main() = VisionForge {
+    val fragment = fragment {
         vision {
             plotly {
                 scatter {
-                    x(1,2,3)
-                    y(5,8,7)
+                    x(1, 2, 3)
+                    y(5, 8, 7)
                 }
             }
         }
     }
-
-    VisionForge.withPlotly().makeVisionFile(fragment, resourceLocation = ResourceLocation.SYSTEM)
+    usePlotly()
+    makeVisionFile(fragment, resourceLocation = ResourceLocation.SYSTEM)
 }
\ No newline at end of file
diff --git a/demo/playground/src/jvmMain/kotlin/randomSpheres.kt b/demo/playground/src/jvmMain/kotlin/randomSpheres.kt
index 3e971e24..bed0ebbf 100644
--- a/demo/playground/src/jvmMain/kotlin/randomSpheres.kt
+++ b/demo/playground/src/jvmMain/kotlin/randomSpheres.kt
@@ -2,19 +2,19 @@ package hep.dataforge.vision.examples
 
 import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.VisionForge
-import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.html.ResourceLocation
 import hep.dataforge.vision.html.fragment
+import hep.dataforge.vision.invoke
 import hep.dataforge.vision.solid.*
 import kotlinx.html.h1
 import java.nio.file.Paths
 import kotlin.random.Random
 
 @OptIn(DFExperimental::class)
-fun main() {
+fun main() = VisionForge.invoke {
 
     val random = Random(112233)
-    val fragment = VisionManager.fragment {
+    val fragment = fragment {
         h1 { +"Happy new year!" }
         vision {
             solid {
@@ -33,8 +33,8 @@ fun main() {
             }
         }
     }
-
-    VisionForge.withSolids().makeVisionFile(
+    useSolids()
+    makeVisionFile(
         fragment,
         Paths.get("randomSpheres.html"),
         resourceLocation = ResourceLocation.EMBED
diff --git a/demo/playground/src/jvmMain/kotlin/serverExtensions.kt b/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
index eb26d5e4..fe77564d 100644
--- a/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
+++ b/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
@@ -1,8 +1,8 @@
 package hep.dataforge.vision.examples
 
-import hep.dataforge.context.Context
 import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.html.HtmlVisionFragment
 import hep.dataforge.vision.html.ResourceLocation
 import hep.dataforge.vision.html.page
@@ -19,7 +19,7 @@ public fun VisionServer.usePlayground(): Unit {
 }
 
 @DFExperimental
-public fun Context.makeVisionFile(
+public fun VisionForge.makeVisionFile(
     content: HtmlVisionFragment,
     path: Path? = null,
     title: String = "VisionForge page",
@@ -33,7 +33,7 @@ public fun Context.makeVisionFile(
 }
 
 @DFExperimental
-public fun Context.makeVisionFile(
+public fun VisionForge.makeVisionFile(
     vision: Vision,
     path: Path? = null,
     title: String = "VisionForge page",
diff --git a/demo/playground/src/jvmMain/kotlin/simpleCube.kt b/demo/playground/src/jvmMain/kotlin/simpleCube.kt
index 159e908b..e8dc6cf5 100644
--- a/demo/playground/src/jvmMain/kotlin/simpleCube.kt
+++ b/demo/playground/src/jvmMain/kotlin/simpleCube.kt
@@ -2,22 +2,22 @@ package hep.dataforge.vision.examples
 
 import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.VisionForge
-import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.html.ResourceLocation
 import hep.dataforge.vision.html.fragment
+import hep.dataforge.vision.invoke
 import hep.dataforge.vision.solid.box
 import hep.dataforge.vision.solid.solid
-import hep.dataforge.vision.solid.withSolids
+import hep.dataforge.vision.solid.useSolids
 
 @DFExperimental
-fun main() {
-    val content = VisionManager.fragment {
+fun main() = VisionForge.invoke {
+    val content = fragment {
         vision("canvas") {
             solid {
                 box(100, 100, 100)
             }
         }
     }
-
-    VisionForge.withSolids().makeVisionFile(content, resourceLocation = ResourceLocation.SYSTEM)
+    useSolids()
+    makeVisionFile(content, resourceLocation = ResourceLocation.SYSTEM)
 }
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 68836190..0df27ede 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,10 +3,8 @@ pluginManagement {
     val toolsVersion = "0.8.3"
 
     repositories {
-        mavenLocal()
         maven("https://repo.kotlin.link")
         mavenCentral()
-        jcenter()
         gradlePluginPortal()
     }
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt
index b9c98d93..ae42bf02 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt
@@ -1,8 +1,12 @@
 package hep.dataforge.vision
 
 import hep.dataforge.context.Context
+import hep.dataforge.context.PluginManager
 
-/**
- * A drop-in replacement for [Global] for VisionForge activities
- */
-public expect val VisionForge: Context
\ No newline at end of file
+public expect object VisionForge
+
+public expect val VisionForge.context: Context
+
+public val VisionForge.plugins: PluginManager get() = context.plugins
+
+public val VisionForge.visionManager: VisionManager get() = plugins.fetch(VisionManager)
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
index 48ff4982..e26cc212 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
@@ -26,8 +26,9 @@ public open class VisionGroupBase(
     override val children: Map<NameToken, Vision> get() = childrenInternal
 
     init {
-        childrenInternal.values.forEach {
-            it.parent = this
+        childrenInternal.forEach { (token, child) ->
+            if (child.parent != null && child.parent != this) error("Can't reassign existing parent for child $token")
+            child.parent = this
         }
     }
 
@@ -78,7 +79,7 @@ public open class VisionGroupBase(
                 childrenInternal[token] = child
             }
             child.parent !== this -> {
-                error("Can't reassign existing parent for $child")
+                error("Can't reassign existing parent for child $token")
             }
         }
         if (before != child) {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
index debfe28e..31239c71 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
@@ -1,7 +1,7 @@
 package hep.dataforge.vision.html
 
 import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.VisionManager
+import hep.dataforge.vision.VisionForge
 import kotlinx.html.FlowContent
 import kotlinx.html.TagConsumer
 
@@ -18,4 +18,4 @@ public fun FlowContent.fragment(fragment: HtmlFragment) {
 public typealias HtmlVisionFragment = VisionTagConsumer<*>.() -> Unit
 
 @DFExperimental
-public fun VisionManager.Companion.fragment(content: HtmlVisionFragment): VisionTagConsumer<*>.() -> Unit = content
\ No newline at end of file
+public fun VisionForge.fragment(content: HtmlVisionFragment): VisionTagConsumer<*>.() -> Unit = content
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
index c9feb965..86ce5140 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
@@ -2,9 +2,10 @@ package hep.dataforge.vision.html
 
 import hep.dataforge.context.Context
 import hep.dataforge.misc.DFExperimental
+import hep.dataforge.vision.VisionForge
+import hep.dataforge.vision.context
 import hep.dataforge.vision.visionManager
 import kotlinx.html.*
-import kotlinx.html.stream.createHTML
 
 public data class Page(
     public val context: Context,
@@ -30,8 +31,8 @@ public data class Page(
 
 
 @DFExperimental
-public fun Context.page(
+public fun VisionForge.page(
     title: String,
     content: HtmlVisionFragment,
     vararg headers: Pair<String, HtmlFragment>,
-): Page = Page(this, title, mapOf(*headers), content)
\ No newline at end of file
+): Page = Page(context, title, mapOf(*headers), content)
\ No newline at end of file
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionClient.kt
similarity index 98%
rename from visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
rename to visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionClient.kt
index f6799fc0..2933f01d 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionClient.kt
@@ -1,11 +1,8 @@
-package hep.dataforge.vision.client
+package hep.dataforge.vision
 
 import hep.dataforge.context.*
 import hep.dataforge.meta.Meta
 import hep.dataforge.meta.MetaSerializer
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionChange
-import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.html.VisionTagConsumer
 import hep.dataforge.vision.html.VisionTagConsumer.Companion.OUTPUT_CONNECT_ATTRIBUTE
 import hep.dataforge.vision.html.VisionTagConsumer.Companion.OUTPUT_ENDPOINT_ATTRIBUTE
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionForge.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionForge.kt
deleted file mode 100644
index 9f478b34..00000000
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionForge.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package hep.dataforge.vision
-
-import hep.dataforge.context.Context
-import hep.dataforge.context.Global
-import hep.dataforge.vision.client.VisionClient
-import hep.dataforge.vision.client.renderAllVisions
-import hep.dataforge.vision.client.renderAllVisionsAt
-import kotlinx.browser.document
-import kotlinx.browser.window
-
-public actual val VisionForge: Context = Global.context("VisionForge").apply {
-    plugins.fetch(VisionManager)
-    plugins.fetch(VisionClient)
-}
-
-
-/**
- * Render all visions in this [window] using current global state of [VisionForge]
- */
-@JsExport
-public fun renderVisionsInWindow() {
-    window.onload = {
-        VisionForge.plugins[VisionClient]?.renderAllVisions()
-    }
-}
-
-/**
- * Render all visions in an element with a given [id]
- */
-@JsExport
-public fun renderVisionsAt(id: String) {
-    val element = document.getElementById(id)
-    if (element != null) {
-        VisionForge.plugins[VisionClient]?.renderAllVisionsAt(element)
-    } else {
-        console.warn("Element with id $id not found")
-    }
-}
\ No newline at end of file
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/elementOutput.kt
similarity index 92%
rename from visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
rename to visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/elementOutput.kt
index bd2e2554..809f60ef 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/client/elementOutput.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/elementOutput.kt
@@ -1,8 +1,7 @@
-package hep.dataforge.vision.client
+package hep.dataforge.vision
 
 import hep.dataforge.meta.Meta
 import hep.dataforge.misc.Type
-import hep.dataforge.vision.Vision
 import org.w3c.dom.Element
 
 @Type(ElementVisionRenderer.TYPE)
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt
new file mode 100644
index 00000000..119bfe50
--- /dev/null
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt
@@ -0,0 +1,37 @@
+package hep.dataforge.vision
+
+import hep.dataforge.context.Context
+import kotlinx.browser.document
+import kotlinx.browser.window
+
+@JsExport
+public actual object VisionForge{
+    /**
+     * Render all visions in this [window] using current global state of [VisionForge]
+     */
+    public fun renderVisionsInWindow() {
+        window.onload = {
+            visionClient.renderAllVisions()
+        }
+    }
+
+    /**
+     * Render all visions in an element with a given [id]
+     */
+    public fun renderVisionsAt(id: String) {
+        val element = document.getElementById(id)
+        if (element != null) {
+            visionClient.renderAllVisionsAt(element)
+        } else {
+            console.warn("Element with id $id not found")
+        }
+    }
+}
+
+private val visionForgeContext = Context("VisionForge"){
+    plugin(VisionClient)
+}
+
+public actual val VisionForge.context: Context get() = visionForgeContext
+
+public val VisionForge.visionClient: VisionClient get() = plugins.fetch(VisionClient)
\ No newline at end of file
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/VisionForge.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/VisionForge.kt
deleted file mode 100644
index 67b656b8..00000000
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/VisionForge.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package hep.dataforge.vision
-
-import hep.dataforge.context.Context
-import hep.dataforge.context.Global
-
-public actual val VisionForge: Context = Global.context("VisionForge").apply{
-    plugins.fetch(VisionManager)
-}
\ No newline at end of file
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visionForgeJvm.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visionForgeJvm.kt
new file mode 100644
index 00000000..42c1d67b
--- /dev/null
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visionForgeJvm.kt
@@ -0,0 +1,13 @@
+package hep.dataforge.vision
+
+import hep.dataforge.context.Context
+import hep.dataforge.misc.DFExperimental
+
+public actual object VisionForge
+
+private val visionForgeContext = Context("VisionForge")
+
+public actual val VisionForge.context: Context get() = visionForgeContext
+
+@DFExperimental
+public operator fun VisionForge.invoke(block: VisionForge.() -> Unit): Unit = run(block)
\ No newline at end of file
diff --git a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/plotlyCommon.kt b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt
similarity index 51%
rename from visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/plotlyCommon.kt
rename to visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt
index f7a95f1f..cba38c85 100644
--- a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/plotlyCommon.kt
+++ b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt
@@ -1,15 +1,27 @@
 package hep.dataforge.vision.plotly
 
+import hep.dataforge.context.PluginFactory
 import hep.dataforge.vision.Vision
+import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.VisionPlugin
+import hep.dataforge.vision.plugins
 import kotlinx.serialization.modules.SerializersModule
 import kotlinx.serialization.modules.polymorphic
 import kotlinx.serialization.modules.subclass
 
-public expect class PlotlyPlugin : VisionPlugin
+public expect class PlotlyPlugin : VisionPlugin{
+    public companion object: PluginFactory<PlotlyPlugin>
+}
 
 internal val plotlySerializersModule = SerializersModule {
     polymorphic(Vision::class) {
         subclass(VisionOfPlotly.serializer())
     }
+}
+
+/**
+ * Ensure that [PlotlyPlugin] is loaded in the global [VisionForge] context
+ */
+public fun VisionForge.usePlotly() {
+    plugins.fetch(PlotlyPlugin)
 }
\ No newline at end of file
diff --git a/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt b/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt
index 27f13860..790844b6 100644
--- a/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt
+++ b/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt
@@ -6,11 +6,10 @@ import hep.dataforge.context.PluginTag
 import hep.dataforge.meta.Meta
 import hep.dataforge.names.Name
 import hep.dataforge.names.asName
+import hep.dataforge.vision.ElementVisionRenderer
 import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionForge
+import hep.dataforge.vision.VisionClient
 import hep.dataforge.vision.VisionPlugin
-import hep.dataforge.vision.client.ElementVisionRenderer
-import hep.dataforge.vision.client.VisionClient
 import kotlinx.serialization.modules.SerializersModule
 import kscience.plotly.PlotlyConfig
 import kscience.plotly.plot
@@ -42,17 +41,9 @@ public actual class PlotlyPlugin : VisionPlugin(), ElementVisionRenderer {
         }
     }
 
-    public companion object : PluginFactory<PlotlyPlugin> {
+    public actual companion object : PluginFactory<PlotlyPlugin> {
         override val tag: PluginTag = PluginTag("vision.plotly", PluginTag.DATAFORGE_GROUP)
         override val type: KClass<PlotlyPlugin> = PlotlyPlugin::class
         override fun invoke(meta: Meta, context: Context): PlotlyPlugin = PlotlyPlugin()
     }
-}
-
-/**
- * Ensure that [PlotlyPlugin] is loaded in the global [VisionForge] context
- */
-@JsExport
-public fun usePlotly() {
-    VisionForge.plugins.fetch(PlotlyPlugin)
 }
\ No newline at end of file
diff --git a/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyJvm.kt b/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyJvm.kt
index e0a2ec5b..29687288 100644
--- a/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyJvm.kt
+++ b/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyJvm.kt
@@ -15,13 +15,9 @@ public actual class PlotlyPlugin : VisionPlugin(), Plugin {
 
     override val visionSerializersModule: SerializersModule get() = plotlySerializersModule
 
-    public companion object : PluginFactory<PlotlyPlugin> {
+    public actual companion object : PluginFactory<PlotlyPlugin> {
         override val tag: PluginTag = PluginTag("vision.plotly", PluginTag.DATAFORGE_GROUP)
         override val type: KClass<PlotlyPlugin> = PlotlyPlugin::class
         override fun invoke(meta: Meta, context: Context): PlotlyPlugin = PlotlyPlugin()
     }
-}
-
-public fun Context.withPlotly(): Context = apply {
-    plugins.fetch(PlotlyPlugin)
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
index 442af1a5..d716442b 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
@@ -70,6 +70,7 @@ public class SolidManager(meta: Meta) : VisionPlugin(meta) {
 @DFExperimental
 public inline fun VisionOutput.solid(block: SolidGroup.() -> Unit): SolidGroup = SolidGroup().apply(block)
 
-public fun Context.withSolids(): Context = apply {
+@DFExperimental
+public fun VisionForge.useSolids(): Unit{
     plugins.fetch(SolidManager)
-}
\ No newline at end of file
+}
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index b00a6cac..6baab0ba 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -3,13 +3,10 @@ package hep.dataforge.vision.solid.three
 import hep.dataforge.context.*
 import hep.dataforge.meta.Meta
 import hep.dataforge.names.*
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionForge
-import hep.dataforge.vision.client.ElementVisionRenderer
-import hep.dataforge.vision.onPropertyChange
+import hep.dataforge.vision.*
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
-import hep.dataforge.vision.visible
+import hep.dataforge.vision.solid.three.set
 import info.laht.threekt.core.Object3D
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.launchIn
@@ -155,9 +152,8 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
 /**
  * Ensure that [ThreePlugin] is loaded in the global [VisionForge] context
  */
-@JsExport
-public fun useThreeJs() {
-    VisionForge.plugins.fetch(ThreePlugin)
+public fun VisionForge.useThreeJs() {
+    plugins.fetch(ThreePlugin)
 }
 
 public fun ThreePlugin.render(
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
index 069eb073..07bdcb4a 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
@@ -1,9 +1,9 @@
 package hep.dataforge.vision.three.server
 
-import hep.dataforge.vision.renderVisionsInWindow
+import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.solid.three.useThreeJs
 
-public fun main() {
+public fun main(): Unit = VisionForge.run {
     useThreeJs()
     renderVisionsInWindow()
 }
\ No newline at end of file
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
index 80948c67..7d78e2ea 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
@@ -1,7 +1,7 @@
 package hep.dataforge.vision.three.server
 
-import hep.dataforge.context.Context
 import hep.dataforge.misc.DFExperimental
+import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.html.HtmlVisionFragment
 import hep.dataforge.vision.html.ResourceLocation
 import hep.dataforge.vision.html.page
@@ -16,7 +16,7 @@ public fun VisionServer.useThreeJs(): Unit {
 }
 
 @DFExperimental
-public fun Context.makeThreeJsFile(
+public fun VisionForge.makeThreeJsFile(
     content: HtmlVisionFragment,
     path: Path? = null,
     title: String = "VisionForge page",

From 7c9315b0297c2df46ffa990cba23728bdb06ff94 Mon Sep 17 00:00:00 2001
From: darksnake <altavir@gmail.com>
Date: Sat, 27 Feb 2021 21:40:58 +0300
Subject: [PATCH 091/151] Module loading refactor

---
 .../vision/gdml/demo/GDMLAppComponent.kt      |  8 +--
 .../dataforge/vision/gdml/demo/readFile.kt    |  8 +--
 .../dataforge/vision/gdml/demo/saveToJson.kt  |  4 +-
 .../vision/solid/FileSerializationTest.kt     |  2 +-
 .../VisionForgePlayGroundForJupyter.kt        |  5 +-
 demo/muon-monitor/build.gradle.kts            |  1 +
 .../mipt/npm/muon/monitor/server/MMServer.kt  |  4 +-
 .../src/jvmMain/kotlin/gdmlCubes.kt           |  5 +-
 .../src/jvmMain/kotlin/generateSchema.kt      |  4 +-
 .../src/jvmMain/kotlin/plotlyVision.kt        |  5 +-
 .../src/jvmMain/kotlin/randomSpheres.kt       |  3 +-
 .../src/jvmMain/kotlin/simpleCube.kt          |  5 +-
 .../main/kotlin/ru/mipt/npm/sat/satServer.kt  |  2 +-
 .../vision/bootstrap/outputConfig.kt          |  2 +-
 .../hep/dataforge/vision/VisionForge.kt       |  5 ++
 .../vision/html/VisionTagConsumer.kt          |  2 +
 .../hep/dataforge/vision/visionForgeJs.kt     |  4 ++
 .../hep/dataforge/vision/visionForgeJvm.kt    | 11 +++-
 .../dataforge/vision/gdml/TestConvertor.kt    |  4 +-
 .../hep/dataforge/vision/gdml/TestCubes.kt    |  6 +-
 .../hep/dataforge/vision/solid/SolidGroup.kt  | 56 ++++++++-----------
 .../solid/{SolidManager.kt => Solids.kt}      | 13 ++---
 .../hep/dataforge/vision/solid/ConvexTest.kt  |  2 +-
 .../vision/solid/SerializationTest.kt         |  8 +--
 .../dataforge/vision/solid/SolidPluginTest.kt |  2 +-
 .../vision/solid/SolidReferenceTest.kt        |  5 +-
 .../vision/solid/VisionUpdateTest.kt          |  2 +-
 .../vision/solid/three/ThreePlugin.kt         |  3 +-
 28 files changed, 90 insertions(+), 91 deletions(-)
 rename visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/{SolidManager.kt => Solids.kt} (88%)

diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
index b0caeeb8..13d68ab2 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
@@ -10,13 +10,11 @@ import hep.dataforge.vision.gdml.toVision
 import hep.dataforge.vision.react.ThreeCanvasComponent
 import hep.dataforge.vision.react.flexColumn
 import hep.dataforge.vision.solid.Solid
-import hep.dataforge.vision.solid.SolidManager
+import hep.dataforge.vision.solid.Solids
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import hep.dataforge.vision.solid.three.ThreeCanvas
 import kotlinx.browser.window
 import kotlinx.css.*
-import space.kscience.gdml.Gdml
-import space.kscience.gdml.decodeFromString
 import org.w3c.files.FileReader
 import org.w3c.files.get
 import react.RProps
@@ -24,6 +22,8 @@ import react.child
 import react.dom.h1
 import react.functionalComponent
 import react.useState
+import space.kscience.gdml.Gdml
+import space.kscience.gdml.decodeFromString
 import styled.css
 import styled.styledDiv
 
@@ -52,7 +52,7 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
     }
 
     fun loadData(name: String, data: String) {
-        val visionManager = props.context.plugins.fetch(SolidManager).visionManager
+        val visionManager = props.context.plugins.fetch(Solids).visionManager
         val parsedVision = when {
             name.endsWith(".gdml") || name.endsWith(".xml") -> {
                 val gdml = Gdml.decodeFromString(data)
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
index e1756d51..754de41f 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
@@ -1,14 +1,10 @@
 package hep.dataforge.vision.gdml.demo
 
 import hep.dataforge.misc.DFExperimental
-import hep.dataforge.values.asValue
-import hep.dataforge.vision.gdml.readFile
-import hep.dataforge.vision.gdml.toVision
-import hep.dataforge.vision.solid.SolidGroup
-import hep.dataforge.vision.solid.SolidManager
-import hep.dataforge.vision.solid.SolidMaterial
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionManager
+import hep.dataforge.vision.gdml.readFile
+import hep.dataforge.vision.gdml.toVision
 import space.kscience.gdml.Gdml
 import java.io.File
 import java.util.zip.GZIPInputStream
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt
index 472d28cf..9f99aec3 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt
@@ -2,7 +2,7 @@ package hep.dataforge.vision.gdml.demo
 
 import hep.dataforge.vision.gdml.readFile
 import hep.dataforge.vision.gdml.toVision
-import hep.dataforge.vision.solid.SolidManager
+import hep.dataforge.vision.solid.Solids
 import space.kscience.gdml.Gdml
 import space.kscience.gdml.LUnit
 import java.io.File
@@ -21,7 +21,7 @@ fun main(args: Array<String>) {
         lUnit = LUnit.CM
     }
 
-    val json = SolidManager.encodeToString(vision)
+    val json = Solids.encodeToString(vision)
     println(json)
     File(outputFileName).writeText(json)
     //File("D:\\Work\\Projects\\gdml.kt\\gdml-source\\cubes.json").writeText(json)
diff --git a/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt b/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt
index 4fe68578..1d3c686e 100644
--- a/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt
+++ b/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt
@@ -9,7 +9,7 @@ class FileSerializationTest {
     @Ignore
     fun testFileRead(){
         val text = this::class.java.getResourceAsStream("/cubes.json").readBytes().decodeToString()
-        val visual = SolidManager.decodeFromString(text) as SolidGroup
+        val visual = Solids.decodeFromString(text) as SolidGroup
         visual["composite_001".asName()]
     }
 }
\ No newline at end of file
diff --git a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
index 4ae7cf4b..d7764b81 100644
--- a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
+++ b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
@@ -10,7 +10,8 @@ import hep.dataforge.vision.html.embedVisionFragment
 import hep.dataforge.vision.html.fragment
 import hep.dataforge.vision.plotly.toVision
 import hep.dataforge.vision.plotly.usePlotly
-import hep.dataforge.vision.solid.useSolids
+import hep.dataforge.vision.plugins
+import hep.dataforge.vision.solid.Solids
 import hep.dataforge.vision.visionManager
 import kotlinx.html.div
 import kotlinx.html.id
@@ -51,7 +52,7 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
         resource(jsResource)
 
         onLoaded {
-            VisionForge.useSolids()
+            VisionForge.plugins.fetch(Solids)
             VisionForge.usePlotly()
         }
 
diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts
index 8b51da72..ce4ea12a 100644
--- a/demo/muon-monitor/build.gradle.kts
+++ b/demo/muon-monitor/build.gradle.kts
@@ -51,6 +51,7 @@ kotlin {
                 implementation("io.ktor:ktor-client-js:$ktorVersion")
                 implementation("io.ktor:ktor-client-serialization:$ktorVersion")
                 implementation(project(":visionforge-threejs"))
+                implementation(devNpm("webpack-bundle-analyzer", "4.4.0"))
             }
         }
     }
diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
index ada656cc..0b66e091 100644
--- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
+++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
@@ -4,7 +4,7 @@ package ru.mipt.npm.muon.monitor.server
 import hep.dataforge.context.Context
 import hep.dataforge.context.Global
 import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.solid.SolidManager
+import hep.dataforge.vision.solid.Solids
 import io.ktor.application.Application
 import io.ktor.application.call
 import io.ktor.application.install
@@ -38,7 +38,7 @@ private val generator = Cos2TrackGenerator(JDKRandomGenerator(223))
 fun Application.module(context: Context = Global) {
     val currentDir = File(".").absoluteFile
     environment.log.info("Current directory: $currentDir")
-    val solidManager = context.plugins.load(SolidManager)
+    val solidManager = context.plugins.load(Solids)
 
     install(DefaultHeaders)
     install(CallLogging)
diff --git a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
index 2caefaaa..b5a10dc5 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
@@ -6,7 +6,7 @@ import hep.dataforge.vision.gdml.toVision
 import hep.dataforge.vision.html.ResourceLocation
 import hep.dataforge.vision.html.fragment
 import hep.dataforge.vision.invoke
-import hep.dataforge.vision.solid.useSolids
+import hep.dataforge.vision.solid.Solids
 import space.kscience.gdml.*
 
 internal val cubes = Gdml {
@@ -60,12 +60,11 @@ internal val cubes = Gdml {
 }
 
 @DFExperimental
-fun main() = VisionForge {
+fun main() = VisionForge(Solids) {
     val content = VisionForge.fragment {
         vision("canvas") {
             cubes.toVision()
         }
     }
-    useSolids()
     makeVisionFile(content, resourceLocation = ResourceLocation.SYSTEM)
 }
\ No newline at end of file
diff --git a/demo/playground/src/jvmMain/kotlin/generateSchema.kt b/demo/playground/src/jvmMain/kotlin/generateSchema.kt
index 25f82ea1..1b48dbc8 100644
--- a/demo/playground/src/jvmMain/kotlin/generateSchema.kt
+++ b/demo/playground/src/jvmMain/kotlin/generateSchema.kt
@@ -2,14 +2,14 @@ package hep.dataforge.vision.examples
 
 import com.github.ricky12awesome.jss.encodeToSchema
 import hep.dataforge.vision.solid.SolidGroup
-import hep.dataforge.vision.solid.SolidManager
+import hep.dataforge.vision.solid.Solids
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 
 @ExperimentalSerializationApi
 fun main() {
     val schema = Json {
-        serializersModule = SolidManager.serializersModuleForSolids
+        serializersModule = Solids.serializersModuleForSolids
         prettyPrintIndent = "  "
         prettyPrint = true
         ignoreUnknownKeys = true
diff --git a/demo/playground/src/jvmMain/kotlin/plotlyVision.kt b/demo/playground/src/jvmMain/kotlin/plotlyVision.kt
index 0058232d..0341e73f 100644
--- a/demo/playground/src/jvmMain/kotlin/plotlyVision.kt
+++ b/demo/playground/src/jvmMain/kotlin/plotlyVision.kt
@@ -5,12 +5,12 @@ import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.html.ResourceLocation
 import hep.dataforge.vision.html.fragment
 import hep.dataforge.vision.invoke
+import hep.dataforge.vision.plotly.PlotlyPlugin
 import hep.dataforge.vision.plotly.plotly
-import hep.dataforge.vision.plotly.usePlotly
 import kscience.plotly.scatter
 
 @DFExperimental
-fun main() = VisionForge {
+fun main() = VisionForge(PlotlyPlugin) {
     val fragment = fragment {
         vision {
             plotly {
@@ -21,6 +21,5 @@ fun main() = VisionForge {
             }
         }
     }
-    usePlotly()
     makeVisionFile(fragment, resourceLocation = ResourceLocation.SYSTEM)
 }
\ No newline at end of file
diff --git a/demo/playground/src/jvmMain/kotlin/randomSpheres.kt b/demo/playground/src/jvmMain/kotlin/randomSpheres.kt
index bed0ebbf..9526d318 100644
--- a/demo/playground/src/jvmMain/kotlin/randomSpheres.kt
+++ b/demo/playground/src/jvmMain/kotlin/randomSpheres.kt
@@ -11,7 +11,7 @@ import java.nio.file.Paths
 import kotlin.random.Random
 
 @OptIn(DFExperimental::class)
-fun main() = VisionForge.invoke {
+fun main() = VisionForge(Solids) {
 
     val random = Random(112233)
     val fragment = fragment {
@@ -33,7 +33,6 @@ fun main() = VisionForge.invoke {
             }
         }
     }
-    useSolids()
     makeVisionFile(
         fragment,
         Paths.get("randomSpheres.html"),
diff --git a/demo/playground/src/jvmMain/kotlin/simpleCube.kt b/demo/playground/src/jvmMain/kotlin/simpleCube.kt
index e8dc6cf5..519738d7 100644
--- a/demo/playground/src/jvmMain/kotlin/simpleCube.kt
+++ b/demo/playground/src/jvmMain/kotlin/simpleCube.kt
@@ -5,12 +5,12 @@ import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.html.ResourceLocation
 import hep.dataforge.vision.html.fragment
 import hep.dataforge.vision.invoke
+import hep.dataforge.vision.solid.Solids
 import hep.dataforge.vision.solid.box
 import hep.dataforge.vision.solid.solid
-import hep.dataforge.vision.solid.useSolids
 
 @DFExperimental
-fun main() = VisionForge.invoke {
+fun main() = VisionForge(Solids) {
     val content = fragment {
         vision("canvas") {
             solid {
@@ -18,6 +18,5 @@ fun main() = VisionForge.invoke {
             }
         }
     }
-    useSolids()
     makeVisionFile(content, resourceLocation = ResourceLocation.SYSTEM)
 }
\ No newline at end of file
diff --git a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
index 92b1b7d0..242d29d5 100644
--- a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
+++ b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
@@ -16,7 +16,7 @@ import kotlin.random.Random
 
 fun main() {
     val satContext = Global.context("sat") {
-        plugin(SolidManager)
+        plugin(Solids)
     }
 
     //Create a geometry
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
index 9c17a6cd..69585627 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
@@ -44,7 +44,7 @@ public external interface CanvasControlsProps : RProps {
 
 public val CanvasControls: FunctionalComponent<CanvasControlsProps> = functionalComponent("CanvasControls") { props ->
     val visionManager = useMemo(
-        { props.canvas.three.solidManager.visionManager },
+        { props.canvas.three.solids.visionManager },
         arrayOf(props.canvas)
     )
     flexColumn {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt
index ae42bf02..00ce9715 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt
@@ -2,11 +2,16 @@ package hep.dataforge.vision
 
 import hep.dataforge.context.Context
 import hep.dataforge.context.PluginManager
+import hep.dataforge.misc.DFExperimental
 
+@DFExperimental
 public expect object VisionForge
 
+@DFExperimental
 public expect val VisionForge.context: Context
 
+@DFExperimental
 public val VisionForge.plugins: PluginManager get() = context.plugins
 
+@DFExperimental
 public val VisionForge.visionManager: VisionManager get() = plugins.fetch(VisionManager)
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
index 4a279f3b..c1c26818 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
@@ -20,6 +20,8 @@ import kotlin.collections.set
 public class VisionOutput @PublishedApi internal constructor() {
     public var meta: Meta = Meta.EMPTY
 
+    //TODO expose a way to define required plugins.
+
     public inline fun meta(block: MetaBuilder.() -> Unit) {
         this.meta = Meta(block)
     }
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt
index 119bfe50..f66bbc84 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt
@@ -1,10 +1,12 @@
 package hep.dataforge.vision
 
 import hep.dataforge.context.Context
+import hep.dataforge.misc.DFExperimental
 import kotlinx.browser.document
 import kotlinx.browser.window
 
 @JsExport
+@DFExperimental
 public actual object VisionForge{
     /**
      * Render all visions in this [window] using current global state of [VisionForge]
@@ -32,6 +34,8 @@ private val visionForgeContext = Context("VisionForge"){
     plugin(VisionClient)
 }
 
+@DFExperimental
 public actual val VisionForge.context: Context get() = visionForgeContext
 
+@DFExperimental
 public val VisionForge.visionClient: VisionClient get() = plugins.fetch(VisionClient)
\ No newline at end of file
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visionForgeJvm.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visionForgeJvm.kt
index 42c1d67b..ba71e312 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visionForgeJvm.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visionForgeJvm.kt
@@ -1,13 +1,22 @@
 package hep.dataforge.vision
 
 import hep.dataforge.context.Context
+import hep.dataforge.context.PluginFactory
 import hep.dataforge.misc.DFExperimental
 
+@DFExperimental
 public actual object VisionForge
 
+@DFExperimental
 private val visionForgeContext = Context("VisionForge")
 
+@DFExperimental
 public actual val VisionForge.context: Context get() = visionForgeContext
 
 @DFExperimental
-public operator fun VisionForge.invoke(block: VisionForge.() -> Unit): Unit = run(block)
\ No newline at end of file
+public operator fun VisionForge.invoke(vararg modules: PluginFactory<out VisionPlugin>, block: VisionForge.() -> Unit): Unit {
+    modules.forEach {
+        plugins.fetch(it)
+    }
+    run(block)
+}
\ No newline at end of file
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
index 16a1e202..76929d46 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
@@ -1,7 +1,7 @@
 package hep.dataforge.vision.gdml
 
 import hep.dataforge.names.toName
-import hep.dataforge.vision.solid.SolidManager
+import hep.dataforge.vision.solid.Solids
 import org.junit.jupiter.api.Test
 import space.kscience.gdml.Gdml
 import space.kscience.gdml.decodeFromStream
@@ -23,7 +23,7 @@ class TestConvertor {
         val gdml = Gdml.decodeFromStream(stream)
         val vision = gdml.toVision()
         assertNotNull(vision.getPrototype("solids.box".toName()))
-        println(SolidManager.encodeToString(vision))
+        println(Solids.encodeToString(vision))
     }
 
     @Test
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestCubes.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestCubes.kt
index 4d451ddb..d0d0f054 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestCubes.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestCubes.kt
@@ -4,8 +4,8 @@ import hep.dataforge.context.Context
 import hep.dataforge.names.toName
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.solid.SolidGroup
-import hep.dataforge.vision.solid.SolidManager
 import hep.dataforge.vision.solid.SolidReference
+import hep.dataforge.vision.solid.Solids
 import hep.dataforge.vision.visionManager
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertDoesNotThrow
@@ -13,7 +13,7 @@ import space.kscience.gdml.*
 import kotlin.test.assertNotNull
 
 internal val testContext = Context("TEST"){
-    plugin(SolidManager)
+    plugin(Solids)
 }
 
 class TestCubes {
@@ -77,7 +77,7 @@ class TestCubes {
     @Test
     fun testCubesReSerialize(){
         val vision = cubes.toVision()
-        val serialized = SolidManager.encodeToString(vision)
+        val serialized = Solids.encodeToString(vision)
         val deserialized = testContext.visionManager.decodeFromString(serialized) as SolidGroup
         assertNotNull(deserialized.getPrototype("solids.smallBox".toName()))
         //println(testContext.visionManager.encodeToString(deserialized))
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index 28e0e4e3..55dfd65b 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -28,7 +28,7 @@ public interface PrototypeHolder {
 @Serializable
 @SerialName("group.solid")
 public class SolidGroup(
-    @Serializable(Prototypes.Companion::class) @SerialName("prototypes") internal var prototypes: MutableVisionGroup? = null,
+    @Serializable(PrototypeSerializer::class) internal var prototypes: MutableVisionGroup? = null,
 ) : VisionGroupBase(), Solid, PrototypeHolder {
 
     init {
@@ -98,17 +98,9 @@ public fun VisionContainerBuilder<Vision>.group(name: String, action: SolidGroup
 /**
  * A special class which works as a holder for prototypes
  */
-@Serializable(Prototypes.Companion::class)
 internal class Prototypes(
-    children: Map<NameToken, Vision> = emptyMap(),
-) : VisionGroupBase(children as? MutableMap<NameToken, Vision> ?: children.toMutableMap()), PrototypeHolder {
-
-    init {
-        //used during deserialization only
-        children.values.forEach {
-            it.parent = parent
-        }
-    }
+    children: MutableMap<NameToken, Vision> = hashMapOf(),
+) : VisionGroupBase(children), PrototypeHolder {
 
     override fun getProperty(
         name: Name,
@@ -118,34 +110,34 @@ internal class Prototypes(
     ): MetaItem? = null
 
     override fun setProperty(name: Name, item: MetaItem?, notify: Boolean) {
-        error("Can't ser property of prototypes container")
+        error("Can't set property of a prototypes container")
     }
 
     override val descriptor: NodeDescriptor? = null
 
-    companion object : KSerializer<MutableVisionGroup> {
-
-        private val mapSerializer: KSerializer<Map<NameToken, Vision>> =
-            MapSerializer(
-                NameToken.serializer(),
-                PolymorphicSerializer(Vision::class)
-            )
-
-        override val descriptor: SerialDescriptor get() = mapSerializer.descriptor
-
-        override fun deserialize(decoder: Decoder): MutableVisionGroup {
-            val map = mapSerializer.deserialize(decoder)
-            return Prototypes(map)
-        }
-
-        override fun serialize(encoder: Encoder, value: MutableVisionGroup) {
-            mapSerializer.serialize(encoder, value.children)
-        }
-    }
-
     override fun prototypes(builder: VisionContainerBuilder<Solid>.() -> Unit) {
         apply(builder)
     }
 
     override fun getPrototype(name: Name): Solid? = get(name) as? Solid
 }
+
+internal class PrototypeSerializer : KSerializer<MutableVisionGroup> {
+
+    private val mapSerializer: KSerializer<Map<NameToken, Vision>> =
+        MapSerializer(
+            NameToken.serializer(),
+            PolymorphicSerializer(Vision::class)
+        )
+
+    override val descriptor: SerialDescriptor get() = mapSerializer.descriptor
+
+    override fun deserialize(decoder: Decoder): MutableVisionGroup {
+        val map = mapSerializer.deserialize(decoder)
+        return Prototypes(map.toMutableMap())
+    }
+
+    override fun serialize(encoder: Encoder, value: MutableVisionGroup) {
+        mapSerializer.serialize(encoder, value.children)
+    }
+}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solids.kt
similarity index 88%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
rename to visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solids.kt
index d716442b..02c88bcc 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidManager.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solids.kt
@@ -16,16 +16,16 @@ import kotlinx.serialization.modules.subclass
 import kotlin.reflect.KClass
 
 
-public class SolidManager(meta: Meta) : VisionPlugin(meta) {
+public class Solids(meta: Meta) : VisionPlugin(meta) {
 
     override val tag: PluginTag get() = Companion.tag
 
     override val visionSerializersModule: SerializersModule get() = serializersModuleForSolids
 
-    public companion object : PluginFactory<SolidManager> {
+    public companion object : PluginFactory<Solids> {
         override val tag: PluginTag = PluginTag(name = "vision.solid", group = PluginTag.DATAFORGE_GROUP)
-        override val type: KClass<out SolidManager> = SolidManager::class
-        override fun invoke(meta: Meta, context: Context): SolidManager = SolidManager(meta)
+        override val type: KClass<out Solids> = Solids::class
+        override fun invoke(meta: Meta, context: Context): Solids = Solids(meta)
 
         private fun PolymorphicModuleBuilder<Solid>.solids() {
             subclass(SolidGroup.serializer())
@@ -69,8 +69,3 @@ public class SolidManager(meta: Meta) : VisionPlugin(meta) {
 @VisionBuilder
 @DFExperimental
 public inline fun VisionOutput.solid(block: SolidGroup.() -> Unit): SolidGroup = SolidGroup().apply(block)
-
-@DFExperimental
-public fun VisionForge.useSolids(): Unit{
-    plugins.fetch(SolidManager)
-}
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
index 20062686..16b4c6d6 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
@@ -28,7 +28,7 @@ class ConvexTest {
 
         val convex = group.children.values.first() as Convex
 
-        val json = SolidManager.jsonForSolids.encodeToJsonElement(Convex.serializer(), convex)
+        val json = Solids.jsonForSolids.encodeToJsonElement(Convex.serializer(), convex)
         val meta = json.toMetaItem().node!!
 
         val points = meta.getIndexed("points").values.map { (it as MetaItemNode<*>).node.point3D() }
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
index bafe16a8..90a158de 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
@@ -30,9 +30,9 @@ class SerializationTest {
             x = 100
             z = -100
         }
-        val string =  SolidManager.encodeToString(cube)
+        val string =  Solids.encodeToString(cube)
         println(string)
-        val newCube = SolidManager.decodeFromString(string)
+        val newCube = Solids.decodeFromString(string)
         assertEquals(cube.meta, newCube.meta)
     }
 
@@ -51,9 +51,9 @@ class SerializationTest {
                 }
             }
         }
-        val string = SolidManager.encodeToString(group)
+        val string = Solids.encodeToString(group)
         println(string)
-        val reconstructed = SolidManager.decodeFromString(string) as SolidGroup
+        val reconstructed = Solids.decodeFromString(string) as SolidGroup
         assertEquals(group["cube"]?.meta, reconstructed["cube"]?.meta)
     }
 
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt
index 1da06a02..9613fb9b 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt
@@ -18,7 +18,7 @@ class SolidPluginTest {
     @DFExperimental
     @Test
     fun testPluginConverter() {
-        val visionManager = Global.plugins.fetch(SolidManager).visionManager
+        val visionManager = Global.plugins.fetch(Solids).visionManager
         val meta = visionManager.encodeToMeta(vision)
 
         val reconstructed = visionManager.decodeFromMeta(meta) as SolidGroup
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt
index bb38316e..04bb38e5 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt
@@ -3,7 +3,6 @@ package hep.dataforge.vision.solid
 import hep.dataforge.vision.get
 import hep.dataforge.vision.style
 import hep.dataforge.vision.useStyle
-import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.encodeToJsonElement
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -27,8 +26,8 @@ class SolidReferenceTest {
 
     @Test
     fun testReferenceSerialization(){
-        val serialized = SolidManager.jsonForSolids.encodeToJsonElement(groupWithReference)
-        val deserialized = SolidManager.jsonForSolids.decodeFromJsonElement(SolidGroup.serializer(), serialized)
+        val serialized = Solids.jsonForSolids.encodeToJsonElement(groupWithReference)
+        val deserialized = Solids.jsonForSolids.decodeFromJsonElement(SolidGroup.serializer(), serialized)
         assertEquals("blue", (deserialized["test"] as Solid).color.string)
     }
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt
index 17babd41..2b8502e5 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt
@@ -10,7 +10,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
 class VisionUpdateTest {
-    val solidManager = Global.plugins.fetch(SolidManager)
+    val solidManager = Global.plugins.fetch(Solids)
     val visionManager = solidManager.visionManager
 
     @Test
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index 6baab0ba..1e8427bd 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -6,7 +6,6 @@ import hep.dataforge.names.*
 import hep.dataforge.vision.*
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.solid.specifications.Canvas3DOptions
-import hep.dataforge.vision.solid.three.set
 import info.laht.threekt.core.Object3D
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.launchIn
@@ -20,7 +19,7 @@ import info.laht.threekt.objects.Group as ThreeGroup
 public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
     override val tag: PluginTag get() = Companion.tag
 
-    public val solidManager: SolidManager by require(SolidManager)
+    public val solids: Solids by require(Solids)
 
     private val objectFactories = HashMap<KClass<out Solid>, ThreeFactory<*>>()
     private val compositeFactory = ThreeCompositeFactory(this)

From 720555a9429dcfb03c20a6f90336835c904f6bc8 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 28 Feb 2021 15:01:36 +0300
Subject: [PATCH 092/151] Fix MM build

---
 demo/muon-monitor/build.gradle.kts                            | 4 ++--
 .../kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt        | 2 ++
 .../kotlin/hep/dataforge/vision/solid/SolidGroup.kt           | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts
index ce4ea12a..0e0d1dab 100644
--- a/demo/muon-monitor/build.gradle.kts
+++ b/demo/muon-monitor/build.gradle.kts
@@ -10,7 +10,7 @@ group = "ru.mipt.npm"
 val ktorVersion: String by rootProject.extra
 
 kscience {
-//    useSerialization()
+    useSerialization()
     application()
 }
 
@@ -58,7 +58,7 @@ kotlin {
 }
 
 application {
-    mainClass.set("ru.mipt.npm.gradle.muon.monitor.server.MMServerKt")
+    mainClass.set("ru.mipt.npm.muon.monitor.server.MMServerKt")
 }
 
 distributions {
diff --git a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt
index cba38c85..58f39f52 100644
--- a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt
+++ b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt
@@ -1,6 +1,7 @@
 package hep.dataforge.vision.plotly
 
 import hep.dataforge.context.PluginFactory
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.VisionPlugin
@@ -22,6 +23,7 @@ internal val plotlySerializersModule = SerializersModule {
 /**
  * Ensure that [PlotlyPlugin] is loaded in the global [VisionForge] context
  */
+@DFExperimental
 public fun VisionForge.usePlotly() {
     plugins.fetch(PlotlyPlugin)
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index 55dfd65b..77d4ee13 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -72,7 +72,7 @@ public class SolidGroup(
     }
 
     public companion object {
-        //public val PROTOTYPES_TOKEN = NameToken("@prototypes")
+        public val PROTOTYPES_TOKEN: NameToken = NameToken("@prototypes")
     }
 }
 

From 78a04728ba4ba2182bc610e8724a0aada1ff5165 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 1 Mar 2021 19:10:15 +0300
Subject: [PATCH 093/151] A lot of small fixes

---
 build.gradle.kts                              |  2 +
 .../hep/dataforge/vision/gdml/demo/cubes.kt   | 54 -----------
 .../dataforge/vision/gdml/GDMLVisualTest.kt   |  7 +-
 .../vision/gdml/demo/GdmlJsDemoApp.kt         |  3 +-
 .../vision/gdml/demo/GdmlFxDemoApp.kt         |  3 +-
 .../src/jvmMain/kotlin/gdmlCubes.kt           | 14 +--
 .../main/kotlin/ru/mipt/npm/sat/geometry.kt   |  2 +
 .../hep/dataforge/vision/html/HtmlTagTest.kt  |  4 +-
 .../vision/editor/ColorValueChooser.kt        |  2 +-
 .../vision/editor/ComboBoxValueChooser.kt     |  2 +-
 .../dataforge/vision/editor/ConfigEditor.kt   | 11 ++-
 .../dataforge/vision/editor/ValueChooser.kt   | 22 ++---
 visionforge-gdml/build.gradle.kts             |  2 +-
 .../hep/dataforge/vision/gdml/GdmlShowcase.kt | 57 +++++++++++
 .../dataforge/vision/gdml/GdmlTransformer.kt  |  7 +-
 .../src/commonTest/kotlin/TestCubes.kt        | 66 +++++++++++++
 .../hep/dataforge/vision/gdml/TestCubes.kt    | 96 -------------------
 .../dataforge/vision/solid/SolidReference.kt  |  2 +-
 .../vision/solid/SolidReferenceTest.kt        |  2 +
 .../vision/solid/three/ThreePlugin.kt         |  4 +-
 .../dataforge/vision/three/server/jsMain.kt   |  2 +
 21 files changed, 177 insertions(+), 187 deletions(-)
 delete mode 100644 demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/demo/cubes.kt
 create mode 100644 visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlShowcase.kt
 create mode 100644 visionforge-gdml/src/commonTest/kotlin/TestCubes.kt
 delete mode 100644 visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestCubes.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 949d00a6..5d5b70f3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,8 +12,10 @@ val fxVersion by extra("14")
 
 allprojects {
     repositories {
+        mavenLocal()
         mavenCentral()
         jcenter()
+        maven("https://repo.kotlin.link")
         maven("https://kotlin.bintray.com/kotlin-js-wrappers")
         maven("https://dl.bintray.com/pdvrieze/maven")
         maven("http://maven.jzy3d.org/releases")
diff --git a/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/demo/cubes.kt b/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/demo/cubes.kt
deleted file mode 100644
index 1ddc853e..00000000
--- a/demo/gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/demo/cubes.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package hep.dataforge.vision.gdml.demo
-
-import space.kscience.gdml.*
-
-
-fun cubes(): Gdml = Gdml {
-    val center = define.position("center")
-    structure {
-        val air = ref<GdmlMaterial>("G4_AIR")
-        val tubeMaterial = ref<GdmlMaterial>("tube")
-        val boxMaterial = ref<GdmlMaterial>("box")
-        val segment = solids.tube("segment", 20, 5.0) {
-            rmin = 17
-            deltaphi = 60
-            aunit = AUnit.DEG.title
-        }
-        val worldBox = solids.box("LargeBox", 200, 200, 200)
-        val smallBox = solids.box("smallBox", 30, 30, 30)
-        val segmentVolume = volume("segment", tubeMaterial, segment.ref()) {}
-        val circle = volume("composite", boxMaterial, smallBox.ref()) {
-            for (i in 0 until 6) {
-                physVolume(segmentVolume) {
-                    name = "segment_$i"
-                    positionref = center.ref()
-                    rotation {
-                        z = 60 * i
-                        unit = AUnit.DEG.title
-                    }
-                }
-            }
-        }
-        world = volume("world", air, worldBox.ref()) {
-            for (i in 0 until 3) {
-                for (j in 0 until 3) {
-                    for (k in 0 until 3) {
-                        physVolume(circle) {
-                            name = "composite$i$j$k"
-                            position {
-                                x = (-50 + i * 50)
-                                y = (-50 + j * 50)
-                                z = (-50 + k * 50)
-                            }
-                            rotation {
-                                x = i * 120
-                                y = j * 120
-                                z = 120 * k
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt b/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt
index 0fa982dc..728c592c 100644
--- a/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt
+++ b/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt
@@ -3,7 +3,7 @@ package hep.dataforge.vision.gdml
 import hep.dataforge.meta.string
 import hep.dataforge.names.toName
 import hep.dataforge.values.asValue
-import hep.dataforge.vision.gdml.demo.cubes
+import hep.dataforge.vision.gdml.GdmlShowcase.cubes
 import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.SolidMaterial
 import kotlin.test.Test
@@ -11,7 +11,6 @@ import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
 class GDMLVisualTest {
-    val gdml = cubes()
 
 //    @Test
 //    fun testCubesStyles(){
@@ -24,8 +23,8 @@ class GDMLVisualTest {
 
     @Test
     fun testPrototypeProperty() {
-        val visual = gdml.toVision()
-        val child = visual["composite000.segment_0".toName()]
+        val visual = cubes.toVision()
+        val child = visual["composite[0,0,0].segment[0]".toName()]
         assertTrue { child!= null }
         child?.setProperty(SolidMaterial.MATERIAL_COLOR_KEY, "red".asValue())
         assertEquals("red", child?.getProperty(SolidMaterial.MATERIAL_COLOR_KEY).string)
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
index 6058db60..9591c475 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
@@ -2,6 +2,7 @@ package hep.dataforge.vision.gdml.demo
 
 import hep.dataforge.context.Global
 import hep.dataforge.vision.Application
+import hep.dataforge.vision.gdml.GdmlShowcase
 import hep.dataforge.vision.gdml.toVision
 import hep.dataforge.vision.solid.three.ThreePlugin
 import hep.dataforge.vision.startApplication
@@ -20,7 +21,7 @@ private class GDMLDemoApp : Application {
         }
         render(element) {
             child(GDMLApp) {
-                val vision = cubes().toVision()
+                val vision = GdmlShowcase.cubes.toVision()
                 //println(context.plugins.fetch(VisionManager).encodeToString(vision))
                 attrs {
                     this.context = context
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
index 03915243..a4a75780 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
@@ -5,6 +5,7 @@ import hep.dataforge.vision.VisionManager
 import hep.dataforge.vision.describedProperties
 import hep.dataforge.vision.editor.VisualObjectEditorFragment
 import hep.dataforge.vision.editor.VisualObjectTreeFragment
+import hep.dataforge.vision.gdml.GdmlShowcase.cubes
 import hep.dataforge.vision.gdml.toVision
 import hep.dataforge.vision.solid.FX3DPlugin
 import hep.dataforge.vision.solid.FXCanvas3D
@@ -60,7 +61,7 @@ class GDMLView : View() {
 
     init {
         runAsync {
-            cubes().toVision()
+            cubes.toVision()
         } ui {
             canvas.render(it)
         }
diff --git a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
index b5a10dc5..090a1a61 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
@@ -12,9 +12,9 @@ import space.kscience.gdml.*
 internal val cubes = Gdml {
     val center = define.position("center")
     structure {
-        val air = ref<GdmlMaterial>("G4_AIR")
-        val tubeMaterial = ref<GdmlMaterial>("tube")
-        val boxMaterial = ref<GdmlMaterial>("box")
+        val air = materials.composite("G4_AIR") {}
+        val tubeMaterial = materials.composite("tube") {}
+        val boxMaterial = materials.composite("box") {}
 
         val segment = solids.tube("segment", 20, 5.0) {
             rmin = 17
@@ -23,11 +23,11 @@ internal val cubes = Gdml {
         }
         val worldBox = solids.box("largeBox", 200, 200, 200)
         val smallBox = solids.box("smallBox", 30, 30, 30)
-        val segmentVolume = volume("segment", tubeMaterial, segment.ref()) {}
-        val circle = volume("composite", boxMaterial, smallBox.ref()) {
+        val segmentVolume = volume("segment", tubeMaterial, segment) {}
+        val circle = volume("composite", boxMaterial, smallBox) {
             for (i in 0 until 6) {
                 physVolume(segmentVolume) {
-                    positionref = center.ref()
+                    positionref = center
                     rotation {
                         z = 60 * i
                         unit = AUnit.DEG.title
@@ -36,7 +36,7 @@ internal val cubes = Gdml {
             }
         }
 
-        world = volume("world", air, worldBox.ref()) {
+        world = volume("world", air, worldBox) {
             for (i in 0 until 3) {
                 for (j in 0 until 3) {
                     for (k in 0 until 3) {
diff --git a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt
index 283d31ef..76ac5391 100644
--- a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt
+++ b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt
@@ -1,11 +1,13 @@
 package ru.mipt.npm.sat
 
 import hep.dataforge.meta.set
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.solid.*
 import hep.dataforge.vision.style
 import hep.dataforge.vision.useStyle
 import kotlin.math.PI
 
+@DFExperimental
 internal fun visionOfSatellite(
     layers: Int = 10,
     layerHeight: Number = 10,
diff --git a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
index 7d558b45..ae19ab16 100644
--- a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
+++ b/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
@@ -9,13 +9,13 @@ import kotlinx.html.*
 import kotlinx.html.stream.createHTML
 import kotlin.test.Test
 
+@DFExperimental
 class HtmlTagTest {
 
-    @OptIn(DFExperimental::class)
     fun VisionOutput.base(block: VisionBase.() -> Unit) =
         VisionBase().apply(block)
 
-    val fragment: HtmlVisionFragment = {
+     val fragment: HtmlVisionFragment = {
         div {
             h1 { +"Head" }
             vision("ddd") {
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
index 3487f95c..3fb053e5 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
@@ -42,7 +42,7 @@ public class ColorValueChooser : ValueChooserBase<ColorPicker>() {
         return node
     }
 
-    companion object : ValueChooser.Factory {
+    public companion object : ValueChooser.Factory {
         override val name: Name = "color".asName()
 
         override fun invoke(meta: Meta): ValueChooser =
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
index 5ce3d960..dc1e80ac 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
@@ -52,7 +52,7 @@ public class ComboBoxValueChooser(public val values: Collection<Value>? = null)
         node.selectionModel.select(value)
     }
 
-    companion object : ValueChooser.Factory {
+    public companion object : ValueChooser.Factory {
         override val name: Name = "combo".asName()
 
         override fun invoke(meta: Meta): ValueChooser =
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt
index bff11a59..2d48b5d1 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt
@@ -15,6 +15,7 @@ import hep.dataforge.vision.dfIconView
 import javafx.scene.Node
 import javafx.scene.control.*
 import javafx.scene.control.cell.TextFieldTreeTableCell
+import javafx.scene.layout.BorderPane
 import javafx.scene.layout.HBox
 import javafx.scene.layout.Priority
 import javafx.scene.paint.Color
@@ -26,17 +27,17 @@ import tornadofx.*
  *
  * @author Alexander Nozik
  */
-class ConfigEditor(
-    val rootNode: FXMetaNode<Config>,
-    val allowNew: Boolean = true,
+public class ConfigEditor(
+    public val rootNode: FXMetaNode<Config>,
+    public val allowNew: Boolean = true,
     title: String = "Configuration editor"
 ) : Fragment(title = title, icon = dfIconView) {
     //TODO replace parameters by properties
 
-    constructor(config: Config, descriptor: NodeDescriptor?, title: String = "Configuration editor") :
+    public constructor(config: Config, descriptor: NodeDescriptor?, title: String = "Configuration editor") :
             this(FXMeta.root(config, descriptor = descriptor), title = title)
 
-    override val root = borderpane {
+    override val root: BorderPane = borderpane {
         center = treetableview<FXMeta<Config>> {
             root = TreeItem(rootNode)
             root.isExpanded = true
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooser.kt b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooser.kt
index 52d2a25e..1530484a 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooser.kt
+++ b/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooser.kt
@@ -35,18 +35,18 @@ public interface ValueChooser {
      *
      * @return
      */
-    val node: Node
+    public val node: Node
 
     /**
      * The descriptor property for this value. Could be null
      *
      * @return
      */
-    val descriptorProperty: ObjectProperty<ValueDescriptor?>
-    var descriptor: ValueDescriptor?
+    public val descriptorProperty: ObjectProperty<ValueDescriptor?>
+    public var descriptor: ValueDescriptor?
 
-    val valueProperty: ObjectProperty<Value?>
-    var value: Value?
+    public val valueProperty: ObjectProperty<Value?>
+    public var value: Value?
 
 
     /**
@@ -54,21 +54,21 @@ public interface ValueChooser {
      *
      * @param value
      */
-    fun setDisplayValue(value: Value)
+    public fun setDisplayValue(value: Value)
 
 
-    fun setDisabled(disabled: Boolean) {
+    public fun setDisabled(disabled: Boolean) {
         //TODO replace by property
     }
 
-    fun setCallback(callback: ValueCallback)
+    public fun setCallback(callback: ValueCallback)
 
     @Type("hep.dataforge.vis.fx.valueChooserFactory")
-    interface Factory : Named {
-        operator fun invoke(meta: Meta = Meta.EMPTY): ValueChooser
+    public interface Factory : Named {
+        public operator fun invoke(meta: Meta = Meta.EMPTY): ValueChooser
     }
 
-    companion object {
+    public companion object {
 
         private fun findWidgetByType(context: Context, type: String): Factory? {
             return when (type.toName()) {
diff --git a/visionforge-gdml/build.gradle.kts b/visionforge-gdml/build.gradle.kts
index 24090940..b1ee36ce 100644
--- a/visionforge-gdml/build.gradle.kts
+++ b/visionforge-gdml/build.gradle.kts
@@ -7,7 +7,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 api(project(":visionforge-solid"))
-                api("space.kscience:gdml:0.2.0")
+                api("space.kscience:gdml:0.3.0-dev")
             }
         }
     }
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlShowcase.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlShowcase.kt
new file mode 100644
index 00000000..1d845619
--- /dev/null
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlShowcase.kt
@@ -0,0 +1,57 @@
+package hep.dataforge.vision.gdml
+
+import space.kscience.gdml.*
+
+public object GdmlShowcase {
+    public val cubes = Gdml {
+        val center = define.position("center")
+        structure {
+            val air = materials.composite("G4_AIR") {}
+            val tubeMaterial = materials.composite("tube") {}
+            val boxMaterial = materials.composite("box") {}
+
+            val segment = solids.tube("segment", 20, 5.0) {
+                rmin = 17
+                deltaphi = 60
+                aunit = AUnit.DEG.title
+            }
+            val worldBox = solids.box("largeBox", 200, 200, 200)
+            val smallBox = solids.box("smallBox", 30, 30, 30)
+            val segmentVolume = volume("segment", tubeMaterial, segment) {}
+            val circle = volume("composite", boxMaterial, smallBox) {
+                for (i in 0 until 6) {
+                    physVolume(segmentVolume) {
+                        name = "segment[$i]"
+                        positionref = center
+                        rotation {
+                            z = 60 * i
+                            unit = AUnit.DEG.title
+                        }
+                    }
+                }
+            }
+
+            world = volume("world", air, worldBox) {
+                for (i in 0 until 3) {
+                    for (j in 0 until 3) {
+                        for (k in 0 until 3) {
+                            physVolume(circle) {
+                                name = "composite[$i,$j,$k]"
+                                position {
+                                    x = (-50 + i * 50)
+                                    y = (-50 + j * 50)
+                                    z = (-50 + k * 50)
+                                }
+                                rotation {
+                                    x = i * 120
+                                    y = j * 120
+                                    z = 120 * k
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt
index c1fef40b..23b6d690 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt
@@ -66,7 +66,12 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
         return ref
     }
 
-    private fun proxyVolume(root: Gdml, group: SolidGroup, physVolume: GdmlPhysVolume, volume: GdmlGroup): SolidReferenceGroup {
+    private fun proxyVolume(
+        root: Gdml,
+        group: SolidGroup,
+        physVolume: GdmlPhysVolume,
+        volume: GdmlGroup,
+    ): SolidReferenceGroup {
         val templateName = volumesName + volume.name.asName()
         if (proto[templateName] == null) {
             proto[templateName] = volume(root, volume)
diff --git a/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt b/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt
new file mode 100644
index 00000000..ca6f71ab
--- /dev/null
+++ b/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt
@@ -0,0 +1,66 @@
+package hep.dataforge.vision.gdml
+
+import hep.dataforge.context.Context
+import hep.dataforge.names.toName
+import hep.dataforge.vision.Vision
+import hep.dataforge.vision.gdml.GdmlShowcase.cubes
+import hep.dataforge.vision.get
+import hep.dataforge.vision.solid.*
+import hep.dataforge.vision.visionManager
+import space.kscience.gdml.Gdml
+import space.kscience.gdml.GdmlBox
+import space.kscience.gdml.decodeFromString
+import space.kscience.gdml.encodeToString
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+internal val testContext = Context("TEST") {
+    plugin(Solids)
+}
+
+class TestCubes {
+
+    @Test
+    fun testCubesDirect() {
+        val vision = cubes.toVision()
+        val smallBoxPrototype = vision.getPrototype("solids.smallBox".toName()) as? Box
+        assertNotNull(smallBoxPrototype)
+        assertEquals(30.0, smallBoxPrototype.xSize.toDouble())
+        val smallBoxVision = vision["composite[1,1,1].smallBox"]?.prototype as? Box
+        assertNotNull(smallBoxVision)
+        assertEquals(30.0, smallBoxVision.xSize.toDouble())
+    }
+
+    @Test
+    fun testGdmlExport() {
+        val xml = cubes.encodeToString()
+        //println(xml)
+        val gdml = Gdml.decodeFromString(xml)
+        val smallBox = gdml.getSolid<GdmlBox>("smallBox")
+        assertNotNull(smallBox)
+        assertEquals(30.0, smallBox.x.toDouble())
+    }
+
+    @Test
+    fun testCubesReSerialize() {
+        val vision = cubes.toVision()
+        val serialized = Solids.encodeToString(vision)
+        val deserialized = testContext.visionManager.decodeFromString(serialized) as SolidGroup
+        val smallBox = deserialized.getPrototype("solids.smallBox".toName()) as? Box
+        assertNotNull(smallBox)
+        assertEquals(30.0, smallBox.xSize.toDouble())
+        //println(testContext.visionManager.encodeToString(deserialized))
+        fun Vision.checkPrototypes() {
+            if (this is SolidReference) {
+                assertNotNull(this.prototype)
+            }
+            if (this is SolidGroup) {
+                children.forEach {
+                    it.value.checkPrototypes()
+                }
+            }
+        }
+        deserialized.checkPrototypes()
+    }
+}
\ No newline at end of file
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestCubes.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestCubes.kt
deleted file mode 100644
index d0d0f054..00000000
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestCubes.kt
+++ /dev/null
@@ -1,96 +0,0 @@
-package hep.dataforge.vision.gdml
-
-import hep.dataforge.context.Context
-import hep.dataforge.names.toName
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.solid.SolidGroup
-import hep.dataforge.vision.solid.SolidReference
-import hep.dataforge.vision.solid.Solids
-import hep.dataforge.vision.visionManager
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertDoesNotThrow
-import space.kscience.gdml.*
-import kotlin.test.assertNotNull
-
-internal val testContext = Context("TEST"){
-    plugin(Solids)
-}
-
-class TestCubes {
-
-    internal val cubes = Gdml {
-        val center = define.position("center")
-        structure {
-            val air = ref<GdmlMaterial>("G4_AIR")
-            val tubeMaterial = ref<GdmlMaterial>("tube")
-            val boxMaterial = ref<GdmlMaterial>("box")
-
-            val segment = solids.tube("segment", 20, 5.0) {
-                rmin = 17
-                deltaphi = 60
-                aunit = AUnit.DEG.title
-            }
-            val worldBox = solids.box("largeBox", 200, 200, 200)
-            val smallBox = solids.box("smallBox", 30, 30, 30)
-            val segmentVolume = volume("segment", tubeMaterial, segment.ref()) {}
-            val circle = volume("composite", boxMaterial, smallBox.ref()) {
-                for (i in 0 until 6) {
-                    physVolume(segmentVolume) {
-                        positionref = center.ref()
-                        rotation {
-                            z = 60 * i
-                            unit = AUnit.DEG.title
-                        }
-                    }
-                }
-            }
-
-            world = volume("world", air, worldBox.ref()) {
-                for (i in 0 until 3) {
-                    for (j in 0 until 3) {
-                        for (k in 0 until 3) {
-                            physVolume(circle) {
-                                position {
-                                    x = (-50 + i * 50)
-                                    y = (-50 + j * 50)
-                                    z = (-50 + k * 50)
-                                }
-                                rotation {
-                                    x = i * 120
-                                    y = j * 120
-                                    z = 120 * k
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Test
-    fun testCubesDirect(){
-        val vision = cubes.toVision()
-        assertNotNull(vision.getPrototype("solids.smallBox".toName()))
-    }
-
-    @Test
-    fun testCubesReSerialize(){
-        val vision = cubes.toVision()
-        val serialized = Solids.encodeToString(vision)
-        val deserialized = testContext.visionManager.decodeFromString(serialized) as SolidGroup
-        assertNotNull(deserialized.getPrototype("solids.smallBox".toName()))
-        //println(testContext.visionManager.encodeToString(deserialized))
-        fun Vision.checkPrototypes(){
-            if(this is SolidReference){
-                assertDoesNotThrow { this.prototype }
-            }
-            if(this is SolidGroup){
-                children.forEach {
-                    it.value.checkPrototypes()
-                }
-            }
-        }
-        deserialized.checkPrototypes()
-    }
-}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
index c70db5f8..c5b3554c 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
@@ -163,7 +163,7 @@ public class SolidReferenceGroup(
  * Get a vision prototype if it is a [SolidReferenceGroup] or vision itself if it is not
  */
 public val Vision.prototype: Vision
-    get() = if (this is SolidReference) prototype else this
+    get() = if (this is SolidReference) prototype.prototype else this
 
 /**
  * Create ref for existing prototype
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt
index 04bb38e5..bb84eb31 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt
@@ -1,5 +1,6 @@
 package hep.dataforge.vision.solid
 
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.get
 import hep.dataforge.vision.style
 import hep.dataforge.vision.useStyle
@@ -7,6 +8,7 @@ import kotlinx.serialization.json.encodeToJsonElement
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
+@DFExperimental
 class SolidReferenceTest {
     val groupWithReference = SolidGroup {
         val theStyle by style {
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
index 1e8427bd..63eb4e28 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
@@ -2,6 +2,7 @@ package hep.dataforge.vision.solid.three
 
 import hep.dataforge.context.*
 import hep.dataforge.meta.Meta
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.names.*
 import hep.dataforge.vision.*
 import hep.dataforge.vision.solid.*
@@ -50,7 +51,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
         is SolidGroup -> {
             val group = ThreeGroup()
             obj.children.forEach { (token, child) ->
-                if (child is Solid && child.ignore != true) {
+                if (child is Solid && token != SolidGroup.PROTOTYPES_TOKEN && child.ignore != true) {
                     try {
                         val object3D = buildObject3D(child)
                         group[token] = object3D
@@ -151,6 +152,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
 /**
  * Ensure that [ThreePlugin] is loaded in the global [VisionForge] context
  */
+@DFExperimental
 public fun VisionForge.useThreeJs() {
     plugins.fetch(ThreePlugin)
 }
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
index 07bdcb4a..9fd1ebf4 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
@@ -1,8 +1,10 @@
 package hep.dataforge.vision.three.server
 
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.solid.three.useThreeJs
 
+@DFExperimental
 public fun main(): Unit = VisionForge.run {
     useThreeJs()
     renderVisionsInWindow()

From 0e488563a9268d2dd5b19d1329da81233f3c92e9 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 1 Mar 2021 21:09:53 +0300
Subject: [PATCH 094/151] Replace empty names by nulls in vision group builders

---
 CHANGELOG.md                                  |  1 +
 demo/jupyter-playground/build.gradle.kts      |  4 +-
 .../VisionForgePlayGroundForJupyter.kt        |  5 +-
 .../src/jvmMain/kotlin/gdmlCubes.kt           | 52 +------------------
 settings.gradle.kts                           |  2 +-
 .../hep/dataforge/vision/VisionChange.kt      |  3 +-
 .../hep/dataforge/vision/VisionForge.kt       |  1 -
 .../hep/dataforge/vision/VisionGroup.kt       |  4 +-
 .../hep/dataforge/vision/VisionGroupBase.kt   |  5 +-
 .../hep/dataforge/vision/visionForgeJs.kt     | 26 ++++++++--
 .../hep/dataforge/vision/visionForgeJvm.kt    |  1 -
 visionforge-gdml/build.gradle.kts             |  2 +-
 .../hep/dataforge/vision/gdml/GdmlShowcase.kt |  2 +-
 .../dataforge/vision/gdml/GdmlTransformer.kt  | 17 +++---
 .../hep/dataforge/vision/gdml/gdmlJVM.kt      |  2 +-
 .../dataforge/vision/gdml/TestConvertor.kt    |  1 +
 .../kotlin/hep/dataforge/vision/solid/Box.kt  |  2 +-
 .../hep/dataforge/vision/solid/Composite.kt   |  8 +--
 .../hep/dataforge/vision/solid/ConeSegment.kt |  4 +-
 .../hep/dataforge/vision/solid/Convex.kt      |  2 +-
 .../hep/dataforge/vision/solid/Extruded.kt    |  2 +-
 .../hep/dataforge/vision/solid/PolyLine.kt    |  8 +--
 .../hep/dataforge/vision/solid/SolidGroup.kt  |  5 +-
 .../hep/dataforge/vision/solid/SolidLabel.kt  |  2 +-
 .../dataforge/vision/solid/SolidReference.kt  |  2 +-
 .../hep/dataforge/vision/solid/Sphere.kt      |  2 +-
 .../kotlin/hep/dataforge/vision/solid/Tube.kt |  2 +-
 27 files changed, 69 insertions(+), 98 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42282a71..ef4acdcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - JavaFX support moved to a separate module
 - Threejs support moved to a separate module
 - \[Format breaking change!\] Stylesheets are moved into properties under `@stylesheet` key
+- VisionGroup builder accepts `null` as name for statics instead of `""`
 
 ### Deprecated
 
diff --git a/demo/jupyter-playground/build.gradle.kts b/demo/jupyter-playground/build.gradle.kts
index 5dfb8fbb..3f4206af 100644
--- a/demo/jupyter-playground/build.gradle.kts
+++ b/demo/jupyter-playground/build.gradle.kts
@@ -33,4 +33,6 @@ tasks.withType<Test> {
 
 tasks.processJupyterApiResources {
     libraryProducers = listOf("hep.dataforge.playground.VisionForgePlayGroundForJupyter")
-}
\ No newline at end of file
+}
+
+tasks.findByName("shadowJar")?.dependsOn("processJupyterApiResources")
\ No newline at end of file
diff --git a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
index d7764b81..b24a1eb2 100644
--- a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
+++ b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
@@ -20,7 +20,6 @@ import kotlinx.html.stream.createHTML
 import kotlinx.html.unsafe
 import kscience.plotly.Plot
 import org.jetbrains.kotlinx.jupyter.api.HTML
-import org.jetbrains.kotlinx.jupyter.api.Notebook
 import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
 import org.jetbrains.kotlinx.jupyter.api.libraries.*
 import space.kscience.gdml.Gdml
@@ -44,11 +43,11 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
         }
         script {
             type = "text/javascript"
-            unsafe { +"VisionForge.renderVisionsAt(\"$id\");" }
+            unsafe { +"renderVisionsAt(\"$id\");" }
         }
     }
 
-    override fun Builder.onLoaded(notebook: Notebook?) {
+    override fun Builder.onLoaded() {
         resource(jsResource)
 
         onLoaded {
diff --git a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
index 090a1a61..a486511b 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
@@ -2,62 +2,12 @@ package hep.dataforge.vision.examples
 
 import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.VisionForge
+import hep.dataforge.vision.gdml.GdmlShowcase.cubes
 import hep.dataforge.vision.gdml.toVision
 import hep.dataforge.vision.html.ResourceLocation
 import hep.dataforge.vision.html.fragment
 import hep.dataforge.vision.invoke
 import hep.dataforge.vision.solid.Solids
-import space.kscience.gdml.*
-
-internal val cubes = Gdml {
-    val center = define.position("center")
-    structure {
-        val air = materials.composite("G4_AIR") {}
-        val tubeMaterial = materials.composite("tube") {}
-        val boxMaterial = materials.composite("box") {}
-
-        val segment = solids.tube("segment", 20, 5.0) {
-            rmin = 17
-            deltaphi = 60
-            aunit = AUnit.DEG.title
-        }
-        val worldBox = solids.box("largeBox", 200, 200, 200)
-        val smallBox = solids.box("smallBox", 30, 30, 30)
-        val segmentVolume = volume("segment", tubeMaterial, segment) {}
-        val circle = volume("composite", boxMaterial, smallBox) {
-            for (i in 0 until 6) {
-                physVolume(segmentVolume) {
-                    positionref = center
-                    rotation {
-                        z = 60 * i
-                        unit = AUnit.DEG.title
-                    }
-                }
-            }
-        }
-
-        world = volume("world", air, worldBox) {
-            for (i in 0 until 3) {
-                for (j in 0 until 3) {
-                    for (k in 0 until 3) {
-                        physVolume(circle) {
-                            position {
-                                x = (-50 + i * 50)
-                                y = (-50 + j * 50)
-                                z = (-50 + k * 50)
-                            }
-                            rotation {
-                                x = i * 120
-                                y = j * 120
-                                z = 120 * k
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
 
 @DFExperimental
 fun main() = VisionForge(Solids) {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 0df27ede..817e2525 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,7 +15,7 @@ pluginManagement {
         id("ru.mipt.npm.gradle.js") version toolsVersion
         id("ru.mipt.npm.gradle.publish") version toolsVersion
         kotlin("jvm") version kotlinVersion
-        kotlin("jupyter.api") version "0.8.3.218"
+        kotlin("jupyter.api") version "0.8.3.236"
         kotlin("js") version kotlinVersion
         kotlin("multiplatform") version kotlinVersion
     }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
index 08d44311..9943b6aa 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
@@ -39,7 +39,8 @@ public class VisionChangeBuilder : VisionContainerBuilder<Vision> {
         }
     }
 
-    override fun set(name: Name, child: Vision?) {
+    override fun set(name: Name?, child: Vision?) {
+        if(name == null) error("Static children are not allowed in VisionChange")
         getOrPutChild(name).apply {
             vision = child
             reset = vision == null
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt
index 00ce9715..54332115 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt
@@ -4,7 +4,6 @@ import hep.dataforge.context.Context
 import hep.dataforge.context.PluginManager
 import hep.dataforge.misc.DFExperimental
 
-@DFExperimental
 public expect object VisionForge
 
 @DFExperimental
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
index 0f3967af..de33a779 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
@@ -58,7 +58,7 @@ public operator fun VisionGroup.iterator(): Iterator<Vision> = children.values.i
 public val VisionGroup.isEmpty: Boolean get() = this.children.isEmpty()
 
 public interface VisionContainerBuilder<in V : Vision> {
-    public operator fun set(name: Name, child: V?)
+    public operator fun set(name: Name?, child: V?)
 }
 
 /**
@@ -79,6 +79,6 @@ public operator fun <V : Vision> VisionContainer<V>.get(str: String): V? = get(s
 public operator fun <V : Vision> VisionContainerBuilder<V>.set(token: NameToken, child: V?): Unit =
     set(token.asName(), child)
 
-public operator fun <V : Vision> VisionContainerBuilder<V>.set(key: String, child: V?): Unit = set(key.toName(), child)
+public operator fun <V : Vision> VisionContainerBuilder<V>.set(key: String?, child: V?): Unit = set(key?.toName(), child)
 
 public fun MutableVisionGroup.removeAll(): Unit = children.keys.map { it.asName() }.forEach { this[it] = null }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
index e26cc212..3525ac88 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
@@ -111,13 +111,14 @@ public open class VisionGroupBase(
      * Add named or unnamed child to the group. If key is null the child is considered unnamed. Both key and value are not
      * allowed to be null in the same time. If name is present and [child] is null, the appropriate element is removed.
      */
-    override fun set(name: Name, child: Vision?): Unit {
+    override fun set(name: Name?, child: Vision?): Unit {
         when {
-            name.isEmpty() -> {
+            name == null -> {
                 if (child != null) {
                     addStatic(child)
                 }
             }
+            name.isEmpty() -> error("Empty names are not allowed in VisionGroup::set")
             name.length == 1 -> {
                 val token = name.tokens.first()
                 attachChild(token, child)
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt
index f66bbc84..32eb9a62 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt
@@ -7,7 +7,7 @@ import kotlinx.browser.window
 
 @JsExport
 @DFExperimental
-public actual object VisionForge{
+public actual object VisionForge {
     /**
      * Render all visions in this [window] using current global state of [VisionForge]
      */
@@ -30,12 +30,30 @@ public actual object VisionForge{
     }
 }
 
-private val visionForgeContext = Context("VisionForge"){
+private val visionForgeContext = Context("VisionForge") {
     plugin(VisionClient)
 }
 
 @DFExperimental
-public actual val VisionForge.context: Context get() = visionForgeContext
+public actual val VisionForge.context: Context
+    get() = visionForgeContext
 
 @DFExperimental
-public val VisionForge.visionClient: VisionClient get() = plugins.fetch(VisionClient)
\ No newline at end of file
+public val VisionForge.visionClient: VisionClient
+    get() = plugins.fetch(VisionClient)
+
+
+
+/**
+ * Render all visions in this [window] using current global state of [VisionForge]
+ */
+@DFExperimental
+@JsExport
+public fun renderVisionsInWindow(): Unit = VisionForge.renderVisionsInWindow()
+
+/**
+ * Render all visions in an element with a given [id]
+ */
+@DFExperimental
+@JsExport
+public fun renderVisionsAt(id: String): Unit = VisionForge.renderVisionsAt(id)
\ No newline at end of file
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visionForgeJvm.kt b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visionForgeJvm.kt
index ba71e312..be2533cc 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visionForgeJvm.kt
+++ b/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visionForgeJvm.kt
@@ -4,7 +4,6 @@ import hep.dataforge.context.Context
 import hep.dataforge.context.PluginFactory
 import hep.dataforge.misc.DFExperimental
 
-@DFExperimental
 public actual object VisionForge
 
 @DFExperimental
diff --git a/visionforge-gdml/build.gradle.kts b/visionforge-gdml/build.gradle.kts
index b1ee36ce..b99fef45 100644
--- a/visionforge-gdml/build.gradle.kts
+++ b/visionforge-gdml/build.gradle.kts
@@ -7,7 +7,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 api(project(":visionforge-solid"))
-                api("space.kscience:gdml:0.3.0-dev")
+                api("space.kscience:gdml:0.3.0")
             }
         }
     }
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlShowcase.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlShowcase.kt
index 1d845619..ae253996 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlShowcase.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlShowcase.kt
@@ -3,7 +3,7 @@ package hep.dataforge.vision.gdml
 import space.kscience.gdml.*
 
 public object GdmlShowcase {
-    public val cubes = Gdml {
+    public val cubes: Gdml = Gdml {
         val center = define.position("center")
         structure {
             val air = materials.composite("G4_AIR") {}
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt
index 23b6d690..8f2898d2 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt
@@ -76,7 +76,7 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
         if (proto[templateName] == null) {
             proto[templateName] = volume(root, volume)
         }
-        val ref = group.ref(templateName, physVolume.name ?: "").withPosition(root, physVolume)
+        val ref = group.ref(templateName, physVolume.name).withPosition(root, physVolume)
         referenceStore.getOrPut(templateName) { ArrayList() }.add(ref)
         return ref
     }
@@ -148,7 +148,7 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
     fun SolidGroup.addSolid(
         root: Gdml,
         solid: GdmlSolid,
-        name: String = "",
+        name: String? = null,
     ): Solid {
         //context.solidAdded(solid)
         val lScale = solid.lscale(settings.lUnit)
@@ -253,14 +253,15 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
     fun SolidGroup.addSolidWithCaching(
         root: Gdml,
         solid: GdmlSolid,
-        name: String = solid.name,
+        name: String?,
     ): Solid? {
+        require(name != ""){"Can't use empty solid name. Use null instead."}
         return when (settings.solidAction(solid)) {
             GdmlTransformerSettings.Action.ADD -> {
                 addSolid(root, solid, name)
             }
             GdmlTransformerSettings.Action.PROTOTYPE -> {
-                proxySolid(root, this, solid, name)
+                proxySolid(root, this, solid, name ?: solid.name)
             }
             GdmlTransformerSettings.Action.REJECT -> {
                 //ignore
@@ -280,7 +281,7 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
         if (volume is GdmlVolume && volume.physVolumes.isEmpty() && volume.placement == null) {
             val solid = volume.solidref.resolve(root)
                 ?: error("Solid with tag ${volume.solidref.ref} for volume ${volume.name} not defined")
-            addSolidWithCaching(root, solid, physVolume.name ?: "")?.apply {
+            addSolidWithCaching(root, solid, physVolume.name)?.apply {
                 configureSolid(root, this, volume, solid)
                 withPosition(root, physVolume)
             }
@@ -309,7 +310,7 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
             ?: error("Volume with ref ${divisionVolume.volumeref.ref} could not be resolved")
 
         //TODO add divisions
-        set(Name.EMPTY, volume(root, volume))
+        set(null, volume(root, volume))
     }
 
     private fun volume(
@@ -320,7 +321,7 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
             val solid: GdmlSolid = group.solidref.resolve(root)
                 ?: error("Solid with tag ${group.solidref.ref} for volume ${group.name} not defined")
 
-            addSolidWithCaching(root, solid)?.apply {
+            addSolidWithCaching(root, solid, null)?.apply {
                 configureSolid(root, this, group, solid)
             }
 
@@ -381,7 +382,7 @@ public fun Gdml.toVision(block: GdmlTransformerSettings.() -> Unit = {}): SolidG
 /**
  * Append Gdml node to the group
  */
-public fun SolidGroup.gdml(gdml: Gdml, key: String = "", transformer: GdmlTransformerSettings.() -> Unit = {}) {
+public fun SolidGroup.gdml(gdml: Gdml, key: String? = null, transformer: GdmlTransformerSettings.() -> Unit = {}) {
     val visual = gdml.toVision(transformer)
     //println(Visual3DPlugin.json.stringify(VisualGroup3D.serializer(), visual))
     set(key, visual)
diff --git a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt b/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
index 14de5dcb..9227c699 100644
--- a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
+++ b/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
@@ -11,7 +11,7 @@ public actual typealias Counter = AtomicInteger
 
 public fun Gdml.Companion.readFile(file: Path): Gdml {
     val xmlReader = StAXReader(Files.newInputStream(file), "UTF-8")
-    return format.parse(Gdml.serializer(), xmlReader)
+    return format.decodeFromReader(Gdml.serializer(), xmlReader)
 }
 
 public fun SolidGroup.gdml(file: Path, key: String = "", transformer: GdmlTransformerSettings.() -> Unit = {}) {
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
index 76929d46..7ee583f0 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
@@ -7,6 +7,7 @@ import space.kscience.gdml.Gdml
 import space.kscience.gdml.decodeFromStream
 import kotlin.test.assertNotNull
 
+@Suppress("UNUSED_VARIABLE")
 class TestConvertor {
 
     @Test
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
index 9f13216b..1a0eab5d 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
@@ -45,6 +45,6 @@ public inline fun VisionContainerBuilder<Solid>.box(
     xSize: Number,
     ySize: Number,
     zSize: Number,
-    name: String = "",
+    name: String? = null,
     action: Box.() -> Unit = {}
 ): Box = Box(xSize.toFloat(), ySize.toFloat(), zSize.toFloat()).apply(action).also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
index 6dc96076..cee7928d 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
@@ -32,7 +32,7 @@ public class Composite(
 @VisionBuilder
 public inline fun VisionContainerBuilder<Solid>.composite(
     type: CompositeType,
-    name: String = "",
+    name: String? = null,
     builder: SolidGroup.() -> Unit,
 ): Composite {
     val group = SolidGroup().apply(builder)
@@ -56,16 +56,16 @@ public inline fun VisionContainerBuilder<Solid>.composite(
 }
 
 @VisionBuilder
-public inline fun VisionContainerBuilder<Solid>.union(name: String = "", builder: SolidGroup.() -> Unit): Composite =
+public inline fun VisionContainerBuilder<Solid>.union(name: String? = null, builder: SolidGroup.() -> Unit): Composite =
     composite(CompositeType.UNION, name, builder = builder)
 
 @VisionBuilder
-public inline fun VisionContainerBuilder<Solid>.subtract(name: String = "", builder: SolidGroup.() -> Unit): Composite =
+public inline fun VisionContainerBuilder<Solid>.subtract(name: String? = null, builder: SolidGroup.() -> Unit): Composite =
     composite(CompositeType.SUBTRACT, name, builder = builder)
 
 @VisionBuilder
 public inline fun VisionContainerBuilder<Solid>.intersect(
-    name: String = "",
+    name: String? = null,
     builder: SolidGroup.() -> Unit,
 ): Composite =
     composite(CompositeType.INTERSECT, name, builder = builder)
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
index ddd329e0..a04594b6 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
@@ -67,7 +67,7 @@ public class ConeSegment(
 public inline fun VisionContainerBuilder<Solid>.cylinder(
     r: Number,
     height: Number,
-    name: String = "",
+    name: String? = null,
     block: ConeSegment.() -> Unit = {}
 ): ConeSegment = ConeSegment(
     r.toFloat(),
@@ -80,7 +80,7 @@ public inline fun VisionContainerBuilder<Solid>.cone(
     bottomRadius: Number,
     height: Number,
     upperRadius: Number = 0.0,
-    name: String = "",
+    name: String? = null,
     block: ConeSegment.() -> Unit = {}
 ): ConeSegment = ConeSegment(
     bottomRadius.toFloat(),
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
index 7fac91c5..af26fa6f 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
@@ -9,7 +9,7 @@ import kotlinx.serialization.Serializable
 @SerialName("solid.convex")
 public class Convex(public val points: List<Point3D>) : SolidBase(), Solid
 
-public inline fun VisionContainerBuilder<Solid>.convex(name: String = "", action: ConvexBuilder.() -> Unit = {}): Convex =
+public inline fun VisionContainerBuilder<Solid>.convex(name: String? = null, action: ConvexBuilder.() -> Unit = {}): Convex =
     ConvexBuilder().apply(action).build().also { set(name, it) }
 
 public class ConvexBuilder {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
index 3c7ca6d1..96c6802a 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
@@ -104,5 +104,5 @@ public class Extruded(
 }
 
 @VisionBuilder
-public fun VisionContainerBuilder<Solid>.extrude(name: String = "", action: Extruded.() -> Unit = {}): Extruded =
+public fun VisionContainerBuilder<Solid>.extrude(name: String? = null, action: Extruded.() -> Unit = {}): Extruded =
     Extruded().apply(action).also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
index 28f4ad68..9c46fb05 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
@@ -16,7 +16,8 @@ import kotlinx.serialization.Serializable
 public class PolyLine(public var points: List<Point3D>) : SolidBase(), Solid {
 
     //var lineType by string()
-    public var thickness: Number by allProperties(inherit = false).number(1.0, key = SolidMaterial.MATERIAL_KEY + THICKNESS_KEY)
+    public var thickness: Number by allProperties(inherit = false).number(1.0,
+        key = SolidMaterial.MATERIAL_KEY + THICKNESS_KEY)
 
     public companion object {
         public val THICKNESS_KEY: Name = "thickness".asName()
@@ -27,7 +28,6 @@ public class PolyLine(public var points: List<Point3D>) : SolidBase(), Solid {
 @VisionBuilder
 public fun VisionContainerBuilder<Solid>.polyline(
     vararg points: Point3D,
-    name: String = "",
+    name: String? = null,
     action: PolyLine.() -> Unit = {},
-): PolyLine =
-    PolyLine(points.toList()).apply(action).also { set(name, it) }
\ No newline at end of file
+): PolyLine = PolyLine(points.toList()).apply(action).also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
index 77d4ee13..8f51a612 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
@@ -83,10 +83,9 @@ public fun SolidGroup(block: SolidGroup.() -> Unit): SolidGroup {
 
 @VisionBuilder
 public fun VisionContainerBuilder<Vision>.group(
-    name: Name = Name.EMPTY,
+    name: Name? = null,
     action: SolidGroup.() -> Unit = {},
-): SolidGroup =
-    SolidGroup().apply(action).also { set(name, it) }
+): SolidGroup = SolidGroup().apply(action).also { set(name, it) }
 
 /**
  * Define a group with given [name], attach it to this parent and return it.
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
index 76a19979..c628a4f0 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
@@ -19,6 +19,6 @@ public fun VisionContainerBuilder<Solid>.label(
     text: String,
     fontSize: Number = 20,
     fontFamily: String = "Arial",
-    name: String = "",
+    name: String? = null,
     action: SolidLabel.() -> Unit = {},
 ): SolidLabel = SolidLabel(text, fontSize.toDouble(), fontFamily).apply(action).also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
index c5b3554c..5008abc2 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
@@ -170,7 +170,7 @@ public val Vision.prototype: Vision
  */
 public fun SolidGroup.ref(
     templateName: Name,
-    name: String = "",
+    name: String? = null,
 ): SolidReferenceGroup = SolidReferenceGroup(templateName).also { set(name, it) }
 
 /**
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
index 799d95d9..5fc30a60 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
@@ -56,7 +56,7 @@ public inline fun VisionContainerBuilder<Solid>.sphere(
     radius: Number,
     phi: Number = 2 * PI,
     theta: Number = PI,
-    name: String = "",
+    name: String? = null,
     action: Sphere.() -> Unit = {},
 ): Sphere = Sphere(
     radius.toFloat(),
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
index 0ed4dea2..165c2b8c 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
@@ -126,7 +126,7 @@ public inline fun VisionContainerBuilder<Solid>.tube(
     innerRadius: Number = 0f,
     startAngle: Number = 0f,
     angle: Number = 2 * PI,
-    name: String = "",
+    name: String? = null,
     block: Tube.() -> Unit = {},
 ): Tube = Tube(
     r.toFloat(),

From 30e637020423eed521fb129786635782868dc1ce Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 1 Mar 2021 21:33:25 +0300
Subject: [PATCH 095/151] Fix all gdml

---
 .../VisionForgePlayGroundForJupyter.kt        |  4 +--
 .../src/jsMain/kotlin/playgroundMain.kt       |  5 +++
 .../hep/dataforge/vision/visionForgeJs.kt     | 31 ++++++++++---------
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
index b24a1eb2..f9b33877 100644
--- a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
+++ b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
@@ -43,7 +43,7 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
         }
         script {
             type = "text/javascript"
-            unsafe { +"renderVisionsAt(\"$id\");" }
+            unsafe { +"window.renderVisionsAt(\"$id\");" }
         }
     }
 
@@ -63,7 +63,7 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
             "hep.dataforge.vision.solid.*"
         )
 
-        import("hep.dataforge.vision.VisionForge")
+        import<VisionForge>()
 
         render<Gdml> { gdmlModel ->
             val fragment = VisionForge.fragment {
diff --git a/demo/playground/src/jsMain/kotlin/playgroundMain.kt b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
index 6c3bb939..6f397312 100644
--- a/demo/playground/src/jsMain/kotlin/playgroundMain.kt
+++ b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
@@ -1,9 +1,14 @@
+import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.VisionForge
 import hep.dataforge.vision.plotly.usePlotly
 import hep.dataforge.vision.solid.three.useThreeJs
+import kotlinx.browser.window
 
+@DFExperimental
 fun main(): Unit = VisionForge.run{
     usePlotly()
     useThreeJs()
     renderVisionsInWindow()
+    window.asDynamic()["renderVisionsAt"] = ::renderVisionsAt
+    window.asDynamic()["renderVisionsInWindow"] = ::renderVisionsInWindow
 }
\ No newline at end of file
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt
index 32eb9a62..a1f40a4d 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt
+++ b/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt
@@ -43,17 +43,20 @@ public val VisionForge.visionClient: VisionClient
     get() = plugins.fetch(VisionClient)
 
 
-
-/**
- * Render all visions in this [window] using current global state of [VisionForge]
- */
-@DFExperimental
-@JsExport
-public fun renderVisionsInWindow(): Unit = VisionForge.renderVisionsInWindow()
-
-/**
- * Render all visions in an element with a given [id]
- */
-@DFExperimental
-@JsExport
-public fun renderVisionsAt(id: String): Unit = VisionForge.renderVisionsAt(id)
\ No newline at end of file
+///**
+// * Render all visions in this [window] using current global state of [VisionForge]
+// */
+//@DFExperimental
+//@JsExport
+//public fun renderVisionsInWindow(): Unit {
+//    VisionForge.renderVisionsInWindow()
+//}
+//
+///**
+// * Render all visions in an element with a given [id]
+// */
+//@DFExperimental
+//@JsExport
+//public fun renderVisionsAt(id: String): Unit {
+//    VisionForge.renderVisionsAt(id)
+//}
\ No newline at end of file

From 545753b14b798ce1629e0afc3643510cdda9935c Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 2 Mar 2021 16:33:29 +0300
Subject: [PATCH 096/151] cleanup

---
 build.gradle.kts                              |    2 +-
 .../dataforge/vision/gdml/demo/readFile.kt    |   17 +-
 .../dataforge/vision/gdml/demo/saveToJson.kt  |   12 +-
 .../VisionForgePlayGroundForJupyter.kt        |    4 +-
 .../src/jvmMain/kotlin/serverExtensions.kt    |    2 +-
 .../vision/html/HtmlVisionFragment.kt         |    2 +-
 .../kotlin/hep/dataforge/vision/html/Page.kt  |    4 +-
 .../hep/dataforge/vision/gdml/gdmlJVM.kt      |   17 +-
 .../dataforge/vision/gdml/TestConvertor.kt    |    8 +
 .../src/jvmTest/resources/gdml/babyIAXO.gdml  | 1065 +++++++++++++++++
 .../vision/three/server/serverExtensions.kt   |    2 +-
 11 files changed, 1098 insertions(+), 37 deletions(-)
 create mode 100644 visionforge-gdml/src/jvmTest/resources/gdml/babyIAXO.gdml

diff --git a/build.gradle.kts b/build.gradle.kts
index 5d5b70f3..47055ee3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,7 +22,7 @@ allprojects {
     }
 
     group = "hep.dataforge"
-    version = "0.2.0-dev-5"
+    version = "0.2.0-dev-6"
 }
 
 val githubProject by extra("visionforge")
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
index 754de41f..2f8ec999 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
@@ -3,9 +3,9 @@ package hep.dataforge.vision.gdml.demo
 import hep.dataforge.misc.DFExperimental
 import hep.dataforge.vision.Vision
 import hep.dataforge.vision.VisionManager
-import hep.dataforge.vision.gdml.readFile
 import hep.dataforge.vision.gdml.toVision
 import space.kscience.gdml.Gdml
+import space.kscience.gdml.decodeFromFile
 import java.io.File
 import java.util.zip.GZIPInputStream
 import java.util.zip.ZipInputStream
@@ -13,20 +13,7 @@ import java.util.zip.ZipInputStream
 @OptIn(DFExperimental::class)
 fun VisionManager.readFile(file: File): Vision = when {
     file.extension == "gdml" || file.extension == "xml" -> {
-        Gdml.readFile(file.toPath()).toVision {
-//            lUnit = LUnit.CM
-//
-//            solidConfiguration = { parent, solid ->
-//                if (solid.name == "cave") {
-//                    setItem(SolidMaterial.MATERIAL_WIREFRAME_KEY, true.asValue())
-//                }
-//                if (parent.physVolumes.isNotEmpty()) {
-//                    useStyle("opaque") {
-//                        SolidMaterial.MATERIAL_OPACITY_KEY put 0.3
-//                    }
-//                }
-//            }
-        }
+        Gdml.decodeFromFile(file.toPath(),true).toVision()
     }
     file.extension == "json" -> decodeFromString(file.readText())
     file.name.endsWith("json.zip") -> {
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt
index 9f99aec3..09568da2 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt
+++ b/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt
@@ -1,21 +1,21 @@
 package hep.dataforge.vision.gdml.demo
 
-import hep.dataforge.vision.gdml.readFile
 import hep.dataforge.vision.gdml.toVision
 import hep.dataforge.vision.solid.Solids
 import space.kscience.gdml.Gdml
 import space.kscience.gdml.LUnit
+import space.kscience.gdml.decodeFromFile
 import java.io.File
 import java.nio.file.Paths
 
 fun main(args: Array<String>) {
-    require(args.isNotEmpty()){"At least one argument is required"}
+    require(args.isNotEmpty()) { "At least one argument is required" }
     val inputFileName = args[0]
-    require(inputFileName.endsWith(".gdml")){"GDML required"}
-    val outputFileName = args.getOrNull(1)?:inputFileName.replace(".gdml",".json")
+    require(inputFileName.endsWith(".gdml")) { "GDML required" }
+    val outputFileName = args.getOrNull(1) ?: inputFileName.replace(".gdml", ".json")
 
-    val gdml = Gdml.readFile(Paths.get(inputFileName))
-        //GDML.readFile(Paths.get("D:\\Work\\Projects\\visionforge\\visionforge-spatial-gdml\\src\\jvmTest\\resources\\gdml\\simple1.gdml"))
+    val gdml = Gdml.decodeFromFile(Paths.get(inputFileName), true)
+    //GDML.readFile(Paths.get("D:\\Work\\Projects\\visionforge\\visionforge-spatial-gdml\\src\\jvmTest\\resources\\gdml\\simple1.gdml"))
 
     val vision = gdml.toVision {
         lUnit = LUnit.CM
diff --git a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
index f9b33877..f9ddea35 100644
--- a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
+++ b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
@@ -60,7 +60,9 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
             "kscience.plotly.*",
             "kscience.plotly.models.*",
             "kotlinx.html.*",
-            "hep.dataforge.vision.solid.*"
+            "hep.dataforge.vision.solid.*",
+            "hep.dataforge.vision.html.Page",
+            "hep.dataforge.vision.html.page"
         )
 
         import<VisionForge>()
diff --git a/demo/playground/src/jvmMain/kotlin/serverExtensions.kt b/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
index fe77564d..d5bfc0b4 100644
--- a/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
+++ b/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
@@ -26,7 +26,7 @@ public fun VisionForge.makeVisionFile(
     resourceLocation: ResourceLocation = ResourceLocation.SYSTEM,
     show: Boolean = true,
 ): Unit {
-    val actualPath = page(title, content).makeFile(path) { actualPath ->
+    val actualPath = page(title, content = content).makeFile(path) { actualPath ->
         mapOf("threeJs" to scriptHeader("js/visionforge-playground.js", actualPath, resourceLocation))
     }
     if (show) Desktop.getDesktop().browse(actualPath.toFile().toURI())
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
index 31239c71..4de488c8 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
@@ -5,7 +5,7 @@ import hep.dataforge.vision.VisionForge
 import kotlinx.html.FlowContent
 import kotlinx.html.TagConsumer
 
-public typealias HtmlFragment = TagConsumer<*>.()->Unit
+public typealias HtmlFragment = TagConsumer<*>.() -> Unit
 
 public fun TagConsumer<*>.fragment(fragment: HtmlFragment) {
     fragment()
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
index 86ce5140..f66d38be 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
+++ b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
@@ -32,7 +32,7 @@ public data class Page(
 
 @DFExperimental
 public fun VisionForge.page(
-    title: String,
-    content: HtmlVisionFragment,
+    title: String = "VisionForge page",
     vararg headers: Pair<String, HtmlFragment>,
+    content: HtmlVisionFragment,
 ): Page = Page(context, title, mapOf(*headers), content)
\ No newline at end of file
diff --git a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt b/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
index 9227c699..e9fd2a58 100644
--- a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
+++ b/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
@@ -1,20 +1,19 @@
 package hep.dataforge.vision.gdml
 
 import hep.dataforge.vision.solid.SolidGroup
-import nl.adaptivity.xmlutil.StAXReader
 import space.kscience.gdml.Gdml
-import java.nio.file.Files
+import space.kscience.gdml.decodeFromFile
 import java.nio.file.Path
 import java.util.concurrent.atomic.AtomicInteger
 
 public actual typealias Counter = AtomicInteger
 
-public fun Gdml.Companion.readFile(file: Path): Gdml {
-    val xmlReader = StAXReader(Files.newInputStream(file), "UTF-8")
-    return format.decodeFromReader(Gdml.serializer(), xmlReader)
-}
-
-public fun SolidGroup.gdml(file: Path, key: String = "", transformer: GdmlTransformerSettings.() -> Unit = {}) {
-    val gdml = Gdml.readFile(file)
+public fun SolidGroup.gdml(
+    file: Path,
+    key: String = "",
+    usePreprocessor: Boolean = false,
+    transformer: GdmlTransformerSettings.() -> Unit = {},
+) {
+    val gdml = Gdml.decodeFromFile(file, usePreprocessor)
     gdml(gdml, key, transformer)
 }
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
index 7ee583f0..1d199c0d 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
@@ -34,4 +34,12 @@ class TestConvertor {
         val vision = gdml.toVision()
         //println(SolidManager.encodeToString(vision))
     }
+
+    @Test
+    fun testIaxo() {
+        val stream = javaClass.getResourceAsStream("/gdml/babyIAXO.gdml")!!
+        val gdml = Gdml.decodeFromStream(stream, true)
+        val vision = gdml.toVision()
+        println(Solids.encodeToString(vision))
+     }
 }
\ No newline at end of file
diff --git a/visionforge-gdml/src/jvmTest/resources/gdml/babyIAXO.gdml b/visionforge-gdml/src/jvmTest/resources/gdml/babyIAXO.gdml
new file mode 100644
index 00000000..35fd1d7a
--- /dev/null
+++ b/visionforge-gdml/src/jvmTest/resources/gdml/babyIAXO.gdml
@@ -0,0 +1,1065 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+
+<!DOCTYPE gdml [
+    <!ENTITY materials SYSTEM "../../miscellaneous/materials.xml">
+]>
+
+<gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://service-spi.web.cern.ch/service-spi/app/releases/Gdml/schema/gdml.xsd">
+    <!-- ********************* -->
+    <!-- ***BEGIN DEFINE*** -->
+    <!-- GLOBAL -->
+    <define>
+        <!-- variables used for looping -->
+        <constant name="PI" value="3.14159265358979323846264" />
+        <constant name="degToRad" value="PI/180." />
+
+        <!-- World -->
+        <constant name="world_size" value="3500" />
+        <!-- try to keep that small to avoid interactions inside -->
+
+        <!-- Target gas -->
+        <variable name="target_pressure" value="1.4" />
+        <!-- pressure in bar -->
+        <variable name="target_temperature" value="300.0" />
+        <!-- temperature in K -->
+        <variable name="target_quencher" value="2" />
+        <!-- percentage of quencher gas in target gas (e.g. 2% -> 98%target + 2% quencher) -->
+    </define>
+    <!-- CHAMBER -->
+    <define>
+        <!-- Chamber -->
+        <variable name="chamberLength" value="30" />
+        <variable name="chamberRadius" value="50" />
+        <variable name="copperChamberThickness" value="18.5" />
+        <variable name="teflonChamberThickness" value="2" />
+        <variable name="copperChamberTopThickness" value="17" />
+        <variable name="copperChamberTopInnerRadius" value="30" />
+
+        <!-- Readout -->
+        <variable name="kaptonReadoutThickness" value="0.5" />
+        <variable name="copperReadoutThickness" value="0.2" />
+        <variable name="copperReadoutSide" value="60" />
+        <position name="kaptonReadoutPosition" unit="mm" x="0" y="0" z="-chamberLength/2.-kaptonReadoutThickness/2." />
+        <position name="copperReadoutPosition" unit="mm" x="0" y="0" z="-chamberLength/2.-kaptonReadoutThickness - copperReadoutThickness/2." />
+
+        <!-- Backplate (old raquette) -->
+        <variable name="backplateThickness" value="12" />
+
+        <!-- Cathode -->
+        <variable name="cathodeThickness" value="15" />
+        <variable name="cathodeHole" value="15" />
+        <variable name="mylarThickness" value="0.004" />
+        <variable name="copperCathodeThickness" value="15" />
+        <position name="mylarCathodePosition" unit="mm" x="0" y="0" z="chamberLength/2.-mylarThickness/2." />
+        <variable name="mylarCathodePositionZ" value="chamberLength/2.-mylarThickness/2." />
+
+        <variable name="cathodePatternThickness" value="3" />
+        <variable name="cathodePattern0Rad" value="4.25" />
+        <variable name="cathodePattern0Width" value="0.3" />
+        <variable name="cathodePattern1Rad" value="8.5" />
+        <variable name="cathodePattern1Width" value="1" />
+        <variable name="cathodePattern2Rad" value="12.5" />
+        <variable name="cathodePattern2Width" value="2.5" />
+        <variable name="cathodePattern2LineWidth" value="2" />
+
+        <rotation name="rotation0" unit="deg" x="0" y="0" z="22.5" />
+        <rotation name="rotation1" unit="deg" x="0" y="0" z="67.5" />
+        <rotation name="rotation2" unit="deg" x="0" y="0" z="112.5" />
+        <rotation name="rotation3" unit="deg" x="0" y="0" z="157.5" />
+        <rotation name="copperReadoutRotation" unit="deg" x="0" y="0" z="45." />
+
+        <!-- Pipe -->
+        <variable name="teflonThickness" value="3" />
+        <variable name="copperFlangeThickness" value="20" />
+        <variable name="copperFlangeHole" value="12.5" />
+        <variable name="copperTubeThickness" value="10" />
+        <variable name="copperFlangeExtRad" value="57.5" />
+        <variable name="pipeLength" value="400" />
+        <variable name="pipeThickness" value="10" />
+        <position name="teflonCover2Position" unit="mm" x="0" y="0" z="chamberLength/2.-teflonThickness/2." />
+        <position name="pipePos0" unit="mm" x="0" y="0" z="-pipeLength/2.+copperFlangeThickness/2." />
+        <position name="pipePos1" unit="mm" x="0" y="0" z="pipeLength/2.-copperFlangeThickness/2." />
+    </define>
+    <!-- PIPE -->
+    <define>
+        <!-- teflon -->
+        <variable name="teflonPipeCylinder1of4Length" value="23.9" />
+        <variable name="teflonPipeCylinder1of4Radius" value="10.0" />
+
+        <variable name="teflonPipeCylinder2of4Length" value="28.4" />
+        <variable name="teflonPipeCylinder2of4Radius" value="12.0" />
+
+        <variable name="teflonPipeCylinder3of4Length" value="40.2" />
+        <variable name="teflonPipeCylinder3of4Radius" value="15.0" />
+
+        <variable name="teflonPipeCylinder4of4Length" value="20.4" />
+        <variable name="teflonPipeCylinder4of4Radius" value="16.5" />
+
+        <variable name="teflonPipeCylinderTotalLength" value="teflonPipeCylinder1of4Length + teflonPipeCylinder2of4Length + teflonPipeCylinder3of4Length + teflonPipeCylinder4of4Length" />
+        <variable name="teflonPipeCylinderOutterRadius" value="21.5" />
+
+        <position name="teflonCylinder1of4Position" x="0" y="0" z="0" unit="mm" />
+        <position name="teflonCylinder2of4Position" x="0" y="0" z="teflonPipeCylinder1of4Length/2 + teflonPipeCylinder2of4Length/2" unit="mm" />
+        <position name="teflonCylinder3of4Position" x="0" y="0" z="teflonPipeCylinder1of4Length/2 + teflonPipeCylinder2of4Length/2 + teflonPipeCylinder2of4Length/2 + teflonPipeCylinder3of4Length/2" unit="mm" />
+        <position name="teflonCylinder4of4Position" x="0" y="0" z="teflonPipeCylinder1of4Length/2 + teflonPipeCylinder2of4Length/2 + teflonPipeCylinder2of4Length/2 + teflonPipeCylinder3of4Length/2 + teflonPipeCylinder3of4Length/2 + teflonPipeCylinder4of4Length/2" unit="mm" />
+
+        <!-- copper pipe outsie -->
+        <variable name="copperPipeDetectorFlangeOutterRadius" value="135.0/2.0" />
+        <variable name="copperPipeDetectorFlangeLength" value="17.0" />
+
+        <variable name="copperPipeDetectorToCentralTubeOutterRadius" value="80.0/2.0" />
+        <variable name="copperPipeDetectorToCentralTubeLength" value="45" />
+
+        <variable name="copperPipeCentralPieceOutterRadius" value="150.0/2.0" />
+        <variable name="copperPipeCentralPieceLength" value="355.0" />
+        <variable name="copperPipeCentralPieceSquareSide" value="119.0" />
+
+        <variable name="copperPipeCentralToOutTubeOutterRadius" value="108.0/2.0" />
+        <variable name="copperPipeCentralToOutTubeLength" value="59.0" />
+
+        <variable name="copperPipeOutFlangeOutterRadius" value="150.0/2.0" />
+        <variable name="copperPipeOutFlangeLength" value="19.0" />
+
+        <variable name="copperPipeUnion1Z" value="copperPipeDetectorFlangeLength/2.0 + copperPipeDetectorToCentralTubeLength/2.0" />
+        <position name="copperPipeUnion1Position" x="0" y="0" z="copperPipeUnion1Z" unit="mm" />
+        <variable name="copperPipeUnion2Z" value="copperPipeUnion1Z + copperPipeDetectorToCentralTubeLength/2.0 + copperPipeCentralPieceLength/2.0" />
+        <position name="copperPipeUnion2Position" x="0" y="0" z="copperPipeUnion2Z" unit="mm" />
+        <variable name="copperPipeUnion3Z" value="copperPipeUnion2Z + copperPipeCentralPieceLength/2.0 + copperPipeCentralToOutTubeLength/2.0" />
+        <position name="copperPipeUnion3Position" x="0" y="0" z="copperPipeUnion3Z" unit="mm" />
+        <variable name="copperPipeUnion4Z" value="copperPipeUnion3Z + copperPipeCentralToOutTubeLength/2.0 + copperPipeOutFlangeLength/2.0" />
+        <position name="copperPipeUnion4Position" x="0" y="0" z="copperPipeUnion4Z" unit="mm" />
+
+        <variable name="copperPipeTotalLength" value="copperPipeDetectorFlangeLength + copperPipeDetectorToCentralTubeLength + copperPipeCentralPieceLength + copperPipeCentralToOutTubeLength + copperPipeOutFlangeLength" />
+
+        <!-- copper pipe inside (we add some neglectable offset to be able to view the substraction, but no need for it to work, can be set to 0 on simulations) -->
+        <variable name="copperPipeInsideOffset" value="0.005" />
+        <variable name="copperPipeInsideCylinder1Length" value="262.5 + copperPipeInsideOffset" />
+        <variable name="copperPipeInsideCylinder1Radius" value="43.0/2.0" />
+        <variable name="copperPipeInsideConeUnion1Length" value="12.5" />
+        <variable name="copperPipeInsideCylinder2Length" value="210.0" />
+        <variable name="copperPipeInsideCylinder2Radius" value="68.0/2.0" />
+        <variable name="copperPipeInsideConeUnion2Length" value="10.0 + copperPipeInsideOffset" />
+        <variable name="copperPipeInsideCylinder3Radius" value="88.0/2.0" />
+
+        <variable name="copperPipeInnerUnion1Z" value="copperPipeInsideCylinder1Length/2.0 + copperPipeInsideConeUnion1Length/2.0" />
+        <position name="copperPipeInnerUnion1Position" x="0" y="0" z="copperPipeInnerUnion1Z" unit="mm" />
+        <variable name="copperPipeInnerUnion2Z" value="copperPipeInnerUnion1Z + copperPipeInsideConeUnion1Length/2.0 + copperPipeInsideCylinder2Length/2.0" />
+        <position name="copperPipeInnerUnion2Position" x="0" y="0" z="copperPipeInnerUnion2Z" unit="mm" />
+        <variable name="copperPipeInnerUnion3Z" value="copperPipeInnerUnion2Z + copperPipeInsideCylinder2Length/2.0 + copperPipeInsideConeUnion2Length/2.0" />
+        <position name="copperPipeInnerUnion3Position" x="0" y="0" z="copperPipeInnerUnion3Z" unit="mm" />
+
+        <!-- copper pipe outside - inner (final) -->
+        <position name="copperPipeOutterInnerSubsPosition" x="0" y="0" z="copperPipeInsideCylinder1Length/2.0 - copperPipeDetectorFlangeLength/2.0 - copperPipeInsideOffset" unit="mm" />
+
+        <position name="vacuumPipeTeflonSubsPosition" x="0" y="0" z="-copperPipeInsideCylinder1Length/2.0 + teflonPipeCylinder1of4Length/2.0 - 0*copperPipeInsideOffset" unit="mm" />
+
+        <!-- offsets to help positioning and position in world-->
+        <variable name="teflonWithRespectToPipeOffset" value="teflonPipeCylinder1of4Length/2.0 - copperPipeDetectorFlangeLength/2.0" />
+        <variable name="vacuumWithRespectToPipeOffset" value="copperPipeInsideCylinder1Length/2.0 - copperPipeDetectorFlangeLength/2.0 - copperPipeInsideOffset" />
+
+        <variable name="copperPipeZInWorld" value="chamberLength/2. + copperCathodeThickness + copperChamberTopThickness/2. + copperPipeDetectorFlangeLength" />
+        <position name="copperPipeTeflonHoleSubsPosition" unit="mm" x="0" y="0" z="teflonPipeCylinderTotalLength / 2 - copperPipeDetectorFlangeLength/2.0" />
+
+    </define>
+    <!-- SHIELDING -->
+    <define>
+        <variable name="leadBoxSize" value="550" />
+        <variable name="leadBoxShaftShortSide" value="150" />
+        <variable name="leadBoxShaftLongSide" value="(leadBoxSize - leadBoxShaftShortSide)/2 + leadBoxShaftShortSide + 10" />
+        <!-- we add an offset to make sure the substraction is done correctly -->
+
+        <position name="leadBoxShaftPosition" x="0" y="0" z="leadBoxShaftLongSide/2 - leadBoxShaftShortSide/2" unit="mm" />
+
+        <variable name="detectorToShieldingSeparation" value="16" />
+        <variable name="shieldingOffset" value="-leadBoxShaftShortSide/2.0 + detectorToShieldingSeparation + chamberLength/2. + backplateThickness" />
+
+    </define>
+    <!-- STEEL TUBE -->
+    <define>
+        <variable name="steelPipeFlangeHeigth" value="10.0" />
+        <variable name="steelPipeFlangeGenericRadiusOffset" value="10.0" />
+
+        <variable name="steelPipeCylinder1Length" value="120.0" />
+        <variable name="steelPipeCylinder1InnerRadius" value="104.0/2.0" />
+        <variable name="steelPipeCylinder1OutterRadius" value="108.0/2.0" />
+
+        <position name="steelPipe1Flange1Position" x="0" y="0" z="-steelPipeCylinder1Length/2.0 + steelPipeFlangeHeigth/2.0" unit="mm" />
+        <position name="steelPipe1Flange2Position" x="0" y="0" z="+steelPipeCylinder1Length/2.0 - steelPipeFlangeHeigth/2.0" unit="mm" />
+
+        <variable name="steelPipeCylinder2Length" value="525.0" />
+        <variable name="steelPipeCylinder2InnerRadius" value="155.0/2.0" />
+        <variable name="steelPipeCylinder2OutterRadius" value="159.0/2.0" />
+
+        <position name="steelPipe2Flange1Position" x="0" y="0" z="-steelPipeCylinder2Length/2.0 + steelPipeFlangeHeigth/2.0" unit="mm" />
+        <position name="steelPipe2Flange2Position" x="0" y="0" z="+steelPipeCylinder2Length/2.0 - steelPipeFlangeHeigth/2.0" unit="mm" />
+
+        <position name="steelPipe2WithRespectTo1Position" x="0" y="0" z="steelPipeCylinder1Length/2.0 + steelPipeCylinder2Length/2.0" unit="mm" />
+
+        <variable name="steelPipeCylinder3Length" value="67.0" />
+        <variable name="steelPipeCylinder3InnerRadius" value="150.0/2.0" />
+        <variable name="steelPipeCylinder3OutterRadius" value="steelPipeCylinder3InnerRadius + steelPipeFlangeGenericRadiusOffset/2.0" />
+
+        <position name="steelPipe3Flange1Position" x="0" y="0" z="-steelPipeCylinder3Length/2.0 + steelPipeFlangeHeigth/2.0" unit="mm" />
+        <position name="steelPipe3Flange2Position" x="0" y="0" z="+steelPipeCylinder3Length/2.0 - steelPipeFlangeHeigth/2.0" unit="mm" />
+
+        <position name="steelPipe3WithRespectTo1Position" x="0" y="0" z="steelPipeCylinder1Length/2.0 + steelPipeCylinder2Length + steelPipeCylinder3Length/2.0" unit="mm" />
+
+        <variable name="steelPipeCone1Length" value="2229.0" />
+        <variable name="steelPipeCone1Thickness" value="2.0" />
+        <variable name="steelPipeCone1InnerRadius1" value="150.0/2.0" />
+        <variable name="steelPipeCone1InnerRadius2" value="381.0/2.0" />
+
+        <position name="steelPipeCone1WithRespectTo1Position" x="0" y="0" z="steelPipeCylinder1Length/2.0 + steelPipeCylinder2Length + steelPipeCylinder3Length + steelPipeCone1Length/2.0" unit="mm" />
+
+        <variable name="steelPipeCone2Length" value="3545.0" />
+        <variable name="steelPipeCone2Thickness" value="2.0" />
+        <variable name="steelPipeCone2InnerRadius1" value="steelPipeCone1InnerRadius2" />
+        <variable name="steelPipeCone2InnerRadius2" value="800.0/2.0" />
+
+        <position name="steelPipeCone2WithRespectTo1Position" x="0" y="0" z="steelPipeCylinder1Length/2.0 + steelPipeCylinder2Length + steelPipeCylinder3Length + steelPipeCone1Length + steelPipeCone2Length/2.0" unit="mm" />
+
+
+        <!-- position in world -->
+        <variable name="steelPipeWithRespectToCopperPipeOffset" value="copperPipeTotalLength + steelPipeCylinder1Length/2.0 - copperPipeDetectorFlangeLength/2.0" />
+    </define>
+    <!-- VETOES -->
+    <define>
+        <variable name="scintillatorThickness" value="50" />
+        <variable name="scintillatorLongSide" value="750" />
+        <variable name="scintillatorShortSide" value="200" />
+        <variable name="scintillatorHoleDiameter" value="150" />
+
+        <variable name="scintillatorLongSideNonSensitive" value="0.005*scintillatorLongSide" />
+        <variable name="scintillatorShortSideNonSensitive" value="0.005*scintillatorShortSide" />
+        <!-- TODO: explanation of "non sensitive" -->
+
+        <position name="scintillatorBoxSolidWithHoleRightHolePosition" x="scintillatorShortSide/2" y="-100" z="0" unit="mm" />
+        <position name="scintillatorBoxSolidWithHoleLeftHolePosition" x="-scintillatorShortSide/2" y="-100" z="0" unit="mm" />
+
+        <!-- actual scintillator positions in world-->
+        <variable name="vetoFrontPosX" value="0" />
+        <variable name="vetoFrontPosY" value="100" />
+        <variable name="vetoFrontPosZ" value="350 + scintillatorThickness/2" />
+        <rotation name="vetoFrontRotation" unit="deg" x="0" y="0" z="0" />
+
+        <variable name="vetoBackPosX" value="-25 - scintillatorThickness" />
+        <variable name="vetoBackPosY" value="50 - scintillatorThickness/2" />
+        <variable name="vetoBackPosZ" value="-(350 + scintillatorThickness/2)" />
+        <rotation name="vetoBackRotation" unit="deg" x="0" y="0" z="-90" />
+
+        <variable name="vetoTopPosX" value="-scintillatorThickness" />
+        <variable name="vetoTopPosY" value="325 + scintillatorThickness/2" />
+        <variable name="vetoTopPosZ" value="-scintillatorThickness/2" />
+        <rotation name="vetoTopRotation" unit="deg" x="90" y="0" z="0" />
+
+        <variable name="vetoBottomPosX" value="-scintillatorThickness" />
+        <variable name="vetoBottomPosY" value="-(330 + scintillatorThickness/2)" />
+        <variable name="vetoBottomPosZ" value="-scintillatorThickness/2" />
+        <rotation name="vetoBottomRotation" unit="deg" x="90" y="0" z="0" />
+
+        <variable name="vetoWestPosX" value="300 + scintillatorThickness/2" />
+        <variable name="vetoWestPosY" value="50 - scintillatorThickness/2" />
+        <variable name="vetoWestPosZ" value="-scintillatorThickness/2" />
+        <rotation name="vetoWestRotation" unit="deg" x="90" y="90" z="0" />
+
+        <variable name="vetoEastPosX" value="-(400 + scintillatorThickness/2)" />
+        <variable name="vetoEastPosY" value="50 - scintillatorThickness/2" />
+        <variable name="vetoEastPosZ" value="scintillatorThickness/2" />
+        <rotation name="vetoEastRotation" unit="deg" x="-90" y="90" z="0" />
+    </define>
+    <!-- ***END DEFINE*** -->
+    <!-- ********************* -->
+    <!-- ***BEGIN MATERIALS*** -->
+    <!-- &materials; -->
+    <!-- ***END MATERIALS*** -->
+    <!-- ********************* -->
+    <!-- ***BEGIN SOLIDS*** -->
+    <!-- WORLD -->
+    <solids>
+        <box name="WorldSolid" x="world_size" y="world_size" z="world_size" lunit="mm" />
+    </solids>
+    <!-- CHAMBER -->
+    <solids>
+        <!-- Target gas -->
+        <tube name="gasSolidFull" startphi="0" deltaphi="360" rmin="0" rmax="chamberRadius-teflonChamberThickness" z="chamberLength" aunit="deg" lunit="mm" />
+
+        <!-- Readout -->
+        <tube name="kaptonReadout" startphi="0" deltaphi="360" rmin="0" rmax="chamberRadius-teflonChamberThickness" z="kaptonReadoutThickness" aunit="deg" lunit="mm" />
+        <box name="copperReadout" x="copperReadoutSide" y="copperReadoutSide" z="copperReadoutThickness" lunit="mm" />
+
+        <!-- Raquette -->
+        <tube name="backplate" startphi="0" deltaphi="360" rmin="0" rmax="chamberRadius+copperChamberThickness" z="backplateThickness" aunit="deg" lunit="mm" />
+
+        <!-- Chamber -->
+        <tube name="copperChamber" startphi="0" deltaphi="360" rmin="chamberRadius" rmax="copperChamberThickness+chamberRadius" z="chamberLength+cathodeThickness" aunit="deg" lunit="mm" />
+        <tube name="teflonCoverChamber" startphi="0" deltaphi="360" rmin="chamberRadius-teflonChamberThickness" rmax="chamberRadius" z="chamberLength+copperCathodeThickness" aunit="deg" lunit="mm" />
+        <tube name="mylarCathode" startphi="0" deltaphi="360" rmin="0" rmax="cathodeHole" z="mylarThickness" aunit="deg" lunit="mm" />
+        <tube name="copperCathode" startphi="0" deltaphi="360" rmin="cathodeHole" rmax="chamberRadius-teflonChamberThickness" z="copperCathodeThickness" aunit="deg" lunit="mm" />
+        <tube name="copperChamberTop" startphi="0" deltaphi="360" rmin="copperChamberTopInnerRadius" rmax="copperChamberThickness+chamberRadius" z="copperChamberTopThickness" aunit="deg" lunit="mm" />
+        <tube name="copperFlangeDetector" startphi="0" deltaphi="360" rmin="copperFlangeHole" rmax="copperChamberThickness+chamberRadius" z="copperFlangeThickness" aunit="deg" lunit="mm" />
+        <tube name="copperTube" startphi="0" deltaphi="360" rmin="copperFlangeHole" rmax="copperTubeThickness+copperFlangeHole" z="pipeLength" aunit="deg" lunit="mm" />
+        <tube name="copperFlangeExt" startphi="0" deltaphi="360" rmin="copperFlangeHole" rmax="copperFlangeExtRad" z="copperFlangeThickness" aunit="deg" lunit="mm" />
+        <tube name="teflonPipe" startphi="0" deltaphi="360" rmin="copperFlangeHole-teflonThickness" rmax="copperFlangeHole" z="pipeLength" aunit="deg" lunit="mm" />
+        <tube name="teflonCoverCathode" startphi="0" deltaphi="360" rmin="copperFlangeHole-teflonThickness" rmax="cathodeHole" z="copperCathodeThickness+copperChamberTopThickness-cathodePatternThickness " aunit="deg" lunit="mm" />
+        <tube name="VacuumPipe" startphi="0" deltaphi="360" rmin="0" rmax="copperFlangeHole-teflonThickness" z="copperCathodeThickness+copperChamberTopThickness-cathodePatternThickness+pipeLength" aunit="deg" lunit="mm" />
+
+        <!-- Cathode Pattern -->
+        <tube name="Ring0" startphi="0" deltaphi="360" rmin="cathodePattern0Rad" rmax="cathodePattern0Rad+cathodePattern0Width" z="cathodePatternThickness" aunit="deg" lunit="mm" />
+        <box name="line0" x="cathodePattern2Rad*2" y="cathodePattern0Width" z="cathodePatternThickness" lunit="mm" />
+        <tube name="Ring1" startphi="0" deltaphi="360" rmin="cathodePattern1Rad" rmax="cathodePattern1Rad+cathodePattern1Width" z="cathodePatternThickness" aunit="deg" lunit="mm" />
+        <box name="line1" x="cathodePattern2Rad*2" y="cathodePattern2LineWidth" z="cathodePatternThickness" lunit="mm" />
+        <tube name="Ring2" startphi="0" deltaphi="360" rmin="cathodePattern2Rad" rmax="cathodePattern2Rad+cathodePattern2Width" z="cathodePatternThickness" aunit="deg" lunit="mm" />
+        <tube name="Hole0" startphi="0" deltaphi="360" rmin="0" rmax="cathodePattern0Rad+cathodePattern0Width" z="cathodePatternThickness+2" aunit="deg" lunit="mm" />
+        <tube name="Hole1" startphi="0" deltaphi="360" rmin="0" rmax="cathodePattern1Rad+cathodePattern1Width" z="cathodePatternThickness+2" aunit="deg" lunit="mm" />
+
+        <tube name="vacuumCathode" startphi="0" deltaphi="360" rmin="0" rmax="cathodePattern2Rad" z="cathodePatternThickness" aunit="deg" lunit="mm" />
+
+        <union name="copperPipe0">
+            <first ref="copperTube" />
+            <second ref="copperFlangeDetector" />
+            <positionref ref="pipePos0" />
+        </union>
+
+        <union name="copperPipe">
+            <first ref="copperPipe0" />
+            <second ref="copperFlangeExt" />
+            <positionref ref="pipePos1" />
+        </union>
+
+        <subtraction name="gasSolid1">
+            <first ref="gasSolidFull" />
+            <second ref="mylarCathode" />
+            <positionref ref="mylarCathodePosition" />
+        </subtraction>
+
+        <subtraction name="gasSolid2">
+            <first ref="gasSolid1" />
+            <second ref="kaptonReadout" />
+            <positionref ref="kaptonReadoutPosition" />
+        </subtraction>
+
+        <subtraction name="gasSolid">
+            <first ref="gasSolid2" />
+            <second ref="copperReadout" />
+            <positionref ref="copperReadoutPosition" />
+            <rotationref ref="copperReadoutRotation" />
+        </subtraction>
+
+        <union name="cathodePattern1">
+            <first ref="Ring2" />
+            <second ref="line1" />
+            <rotationref ref="rotation0" />
+        </union>
+
+        <union name="cathodePattern2">
+            <first ref="cathodePattern1" />
+            <second ref="line1" />
+            <rotationref ref="rotation1" />
+        </union>
+
+        <union name="cathodePattern3">
+            <first ref="cathodePattern2" />
+            <second ref="line1" />
+            <rotationref ref="rotation2" />
+        </union>
+
+        <union name="cathodePattern4">
+            <first ref="cathodePattern3" />
+            <second ref="line1" />
+            <rotationref ref="rotation3" />
+        </union>
+
+        <subtraction name="cathodePattern5">
+            <first ref="cathodePattern4" />
+            <second ref="Hole1" />
+        </subtraction>
+
+        <union name="cathodePattern6">
+            <first ref="cathodePattern5" />
+            <second ref="Ring1" />
+        </union>
+
+        <union name="cathodePattern7">
+            <first ref="cathodePattern6" />
+            <second ref="line0" />
+            <rotationref ref="rotation0" />
+        </union>
+
+        <union name="cathodePattern8">
+            <first ref="cathodePattern7" />
+            <second ref="line0" />
+            <rotationref ref="rotation1" />
+        </union>
+
+        <union name="cathodePattern9">
+            <first ref="cathodePattern8" />
+            <second ref="line0" />
+            <rotationref ref="rotation2" />
+        </union>
+
+        <union name="cathodePattern10">
+            <first ref="cathodePattern9" />
+            <second ref="line0" />
+            <rotationref ref="rotation3" />
+        </union>
+
+        <subtraction name="cathodePattern11">
+            <first ref="cathodePattern10" />
+            <second ref="Hole0" />
+        </subtraction>
+
+        <union name="cathodePattern">
+            <first ref="cathodePattern11" />
+            <second ref="Ring0" />
+        </union>
+
+        <subtraction name="vacuumCathodePattern">
+            <first ref="vacuumCathode" />
+            <second ref="cathodePattern" />
+        </subtraction>
+
+    </solids>
+    <!-- PIPE -->
+    <solids>
+        <!-- teflon -->
+        <tube name="teflonCylinder1of4" rmin="teflonPipeCylinder1of4Radius" rmax="teflonPipeCylinderOutterRadius" z="teflonPipeCylinder1of4Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="teflonCylinder2of4" rmin="teflonPipeCylinder2of4Radius" rmax="teflonPipeCylinderOutterRadius" z="teflonPipeCylinder2of4Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="teflonCylinder3of4" rmin="teflonPipeCylinder3of4Radius" rmax="teflonPipeCylinderOutterRadius" z="teflonPipeCylinder3of4Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="teflonCylinder4of4" rmin="teflonPipeCylinder4of4Radius" rmax="teflonPipeCylinderOutterRadius" z="teflonPipeCylinder4of4Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <union name="teflonPipeSolid_v1">
+            <first ref="teflonCylinder1of4" />
+            <second ref="teflonCylinder2of4" />
+            <positionref ref="teflonCylinder2of4Position" />
+        </union>
+
+        <union name="teflonPipeSolid_v2">
+            <first ref="teflonPipeSolid_v1" />
+            <second ref="teflonCylinder3of4" />
+            <positionref ref="teflonCylinder3of4Position" />
+        </union>
+
+        <union name="teflonPipeSolid">
+            <first ref="teflonPipeSolid_v2" />
+            <second ref="teflonCylinder4of4" />
+            <positionref ref="teflonCylinder4of4Position" />
+        </union>
+
+        <!-- copper pipe outsie -->
+        <tube name="copperPipeDetectorFlangeTube" rmin="0" rmax="copperPipeDetectorFlangeOutterRadius" z="copperPipeDetectorFlangeLength" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="copperPipeDetectorToCentralTube" rmin="0" rmax="copperPipeDetectorToCentralTubeOutterRadius" z="copperPipeDetectorToCentralTubeLength" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <union name="copperPipeSolid_v1">
+            <first ref="copperPipeDetectorFlangeTube" />
+            <second ref="copperPipeDetectorToCentralTube" />
+            <positionref ref="copperPipeUnion1Position" />
+        </union>
+
+        <tube name="copperPipeCentralPieceSolid_v1" rmin="0" rmax="copperPipeCentralPieceOutterRadius" z="copperPipeCentralPieceLength" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <box name="copperPipeCentralPieceBox_v1" x="copperPipeCentralPieceOutterRadius*2.1" y="copperPipeCentralPieceOutterRadius*2.1" z="copperPipeCentralPieceLength + 10" lunit="mm" />
+        <box name="copperPipeCentralPieceBoxToSubs" x="copperPipeCentralPieceSquareSide" y="copperPipeCentralPieceSquareSide" z="copperPipeCentralPieceLength + 10" lunit="mm" />
+        <subtraction name="copperPipeCentralPieceBox">
+            <first ref="copperPipeCentralPieceBox_v1" />
+            <second ref="copperPipeCentralPieceBoxToSubs" />
+        </subtraction>
+
+        <subtraction name="copperPipeCentralPieceSolid_v2">
+            <first ref="copperPipeCentralPieceSolid_v1" />
+            <second ref="copperPipeCentralPieceBox" />
+        </subtraction>
+
+        <union name="copperPipeSolid_v2">
+            <first ref="copperPipeSolid_v1" />
+            <second ref="copperPipeCentralPieceSolid_v2" />
+            <positionref ref="copperPipeUnion2Position" />
+        </union>
+
+        <tube name="copperPipeCentralToOutTube" rmin="0" rmax="copperPipeCentralToOutTubeOutterRadius" z="copperPipeCentralToOutTubeLength" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="copperPipeOutFlangeTube" rmin="0" rmax="copperPipeOutFlangeOutterRadius" z="copperPipeOutFlangeLength" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <union name="copperPipeSolid_v3">
+            <first ref="copperPipeSolid_v2" />
+            <second ref="copperPipeCentralToOutTube" />
+            <positionref ref="copperPipeUnion3Position" />
+        </union>
+
+        <union name="copperPipeSolid_v4">
+            <first ref="copperPipeSolid_v3" />
+            <second ref="copperPipeOutFlangeTube" />
+            <positionref ref="copperPipeUnion4Position" />
+        </union>
+
+        <!-- copper pipe inside -->
+        <tube name="copperPipeInsideCylinder1Solid" rmin="0" rmax="copperPipeInsideCylinder1Radius" z="copperPipeInsideCylinder1Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <cone name="copperPipeInsideConeUnion1Solid" rmin1="0" rmax1="copperPipeInsideCylinder1Radius" rmin2="0" rmax2="copperPipeInsideCylinder2Radius" z="copperPipeInsideConeUnion1Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="copperPipeInsideCylinder2Solid" rmin="0" rmax="copperPipeInsideCylinder2Radius" z="copperPipeInsideCylinder2Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <cone name="copperPipeInsideConeUnion2Solid" rmin1="0" rmax1="copperPipeInsideCylinder2Radius" rmin2="0" rmax2="copperPipeInsideCylinder3Radius" z="copperPipeInsideConeUnion2Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <union name="copperPipeInsideSolid_v1">
+            <first ref="copperPipeInsideCylinder1Solid" />
+            <second ref="copperPipeInsideConeUnion1Solid" />
+            <positionref ref="copperPipeInnerUnion1Position" />
+        </union>
+
+        <union name="copperPipeInsideSolid_v2">
+            <first ref="copperPipeInsideSolid_v1" />
+            <second ref="copperPipeInsideCylinder2Solid" />
+            <positionref ref="copperPipeInnerUnion2Position" />
+        </union>
+
+        <union name="copperPipeInsideSolid">
+            <first ref="copperPipeInsideSolid_v2" />
+            <second ref="copperPipeInsideConeUnion2Solid" />
+            <positionref ref="copperPipeInnerUnion3Position" />
+        </union>
+
+        <!-- copper pipe outside - inner (final) -->
+        <subtraction name="copperPipeCentralPieceSolid_v3">
+            <first ref="copperPipeSolid_v4" />
+            <second ref="copperPipeInsideSolid" />
+            <positionref ref="copperPipeOutterInnerSubsPosition" />
+        </subtraction>
+        <!-- vacuum/air/gas pipe filling -->
+        <subtraction name="pipeFillingSolid">
+            <first ref="copperPipeInsideSolid" />
+            <second ref="teflonPipeSolid" />
+            <positionref ref="vacuumPipeTeflonSubsPosition" />
+        </subtraction>
+
+        <subtraction name="copperPipeCentralPieceSolid">
+            <first ref="copperPipeSolid_v4" />
+            <second ref="copperPipeInsideSolid" />
+            <positionref ref="copperPipeOutterInnerSubsPosition" />
+        </subtraction>
+
+        <tube name="teflonHoleSolid" rmin="0" rmax="teflonPipeCylinderOutterRadius" z="teflonPipeCylinderTotalLength" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <subtraction name="copperPipeHollowPre">
+            <first ref="copperPipeSolid_v4" />
+            <second ref="teflonHoleSolid" />
+            <positionref ref="copperPipeTeflonHoleSubsPosition" />
+        </subtraction>
+
+        <subtraction name="copperPipeHollow">
+            <first ref="copperPipeHollowPre" />
+            <second ref="pipeFillingSolid" />
+            <positionref ref="copperPipeOutterInnerSubsPosition" />
+        </subtraction>
+    </solids>
+    <!-- SHIELDING -->
+    <solids>
+        <box name="leadBoxSolid" x="leadBoxSize" y="leadBoxSize" z="leadBoxSize" lunit="mm" />
+        <box name="leadBoxShaft" x="leadBoxShaftShortSide" y="leadBoxShaftShortSide" z="leadBoxShaftLongSide" lunit="mm" />
+
+        <subtraction name="leadBoxWithShaft">
+            <first ref="leadBoxSolid" />
+            <second ref="leadBoxShaft" />
+            <positionref ref="leadBoxShaftPosition" />
+        </subtraction>
+
+    </solids>
+    <!-- STEEL PIPE -->
+    <solids>
+        <!-- steel pipe segment 1 -->
+        <tube name="steelPipe1Tube" rmin="steelPipeCylinder1InnerRadius" rmax="steelPipeCylinder1OutterRadius" z="steelPipeCylinder1Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="steelPipe1Flange1" rmin="steelPipeCylinder1OutterRadius" rmax="copperPipeOutFlangeOutterRadius" z="steelPipeFlangeHeigth" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="steelPipe1Flange2" rmin="steelPipeCylinder1OutterRadius" rmax="steelPipeCylinder2OutterRadius + steelPipeFlangeGenericRadiusOffset" z="steelPipeFlangeHeigth" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <union name="steelPipe1WithFlange_v1">
+            <first ref="steelPipe1Tube" />
+            <second ref="steelPipe1Flange1" />
+            <positionref ref="steelPipe1Flange1Position" />
+        </union>
+        <union name="steelPipe1WithFlange">
+            <first ref="steelPipe1WithFlange_v1" />
+            <second ref="steelPipe1Flange2" />
+            <positionref ref="steelPipe1Flange2Position" />
+        </union>
+
+        <!-- steel pipe segment 2 -->
+        <tube name="steelPipe2Tube" rmin="steelPipeCylinder2InnerRadius" rmax="steelPipeCylinder2OutterRadius" z="steelPipeCylinder2Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="steelPipe2Flange1" rmin="steelPipeCylinder2OutterRadius" rmax="steelPipeCylinder2OutterRadius + steelPipeFlangeGenericRadiusOffset" z="steelPipeFlangeHeigth" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="steelPipe2Flange2" rmin="steelPipeCylinder2OutterRadius" rmax="steelPipeCylinder3OutterRadius + steelPipeFlangeGenericRadiusOffset" z="steelPipeFlangeHeigth" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <union name="steelPipe2WithFlange_v1">
+            <first ref="steelPipe2Tube" />
+            <second ref="steelPipe2Flange1" />
+            <positionref ref="steelPipe2Flange1Position" />
+        </union>
+        <union name="steelPipe2WithFlange">
+            <first ref="steelPipe2WithFlange_v1" />
+            <second ref="steelPipe2Flange2" />
+            <positionref ref="steelPipe2Flange2Position" />
+        </union>
+
+        <!-- steel pipe segment 3 -->
+        <tube name="steelPipe3Tube" rmin="steelPipeCylinder3InnerRadius" rmax="steelPipeCylinder3OutterRadius" z="steelPipeCylinder3Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="steelPipe3Flange1" rmin="steelPipeCylinder3OutterRadius" rmax="steelPipeCylinder3OutterRadius + steelPipeFlangeGenericRadiusOffset" z="steelPipeFlangeHeigth" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="steelPipe3Flange2" rmin="steelPipeCylinder3OutterRadius" rmax="steelPipeCylinder3OutterRadius + steelPipeFlangeGenericRadiusOffset" z="steelPipeFlangeHeigth" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <union name="steelPipe3WithFlange_v1">
+            <first ref="steelPipe3Tube" />
+            <second ref="steelPipe3Flange1" />
+            <positionref ref="steelPipe3Flange1Position" />
+        </union>
+        <union name="steelPipe3WithFlange">
+            <first ref="steelPipe3WithFlange_v1" />
+            <second ref="steelPipe3Flange2" />
+            <positionref ref="steelPipe3Flange2Position" />
+        </union>
+
+        <!-- steel pipe segment 4 / cone (first part) -->
+        <cone name="steelPipeCone1" rmin1="steelPipeCone1InnerRadius1" rmax1="steelPipeCone1InnerRadius1 + steelPipeCone1Thickness" rmin2="steelPipeCone1InnerRadius2" rmax2="steelPipeCone1InnerRadius2 + steelPipeCone1Thickness" z="steelPipeCone1Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <!-- steel pipe segment 5 / cone (second/final part) -->
+        <cone name="steelPipeCone2" rmin1="steelPipeCone2InnerRadius1" rmax1="steelPipeCone2InnerRadius1 + steelPipeCone2Thickness" rmin2="steelPipeCone2InnerRadius2" rmax2="steelPipeCone2InnerRadius2 + steelPipeCone2Thickness" z="steelPipeCone2Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <!-- steel pipe complete -->
+        <union name="steelPipe_v1">
+            <first ref="steelPipe1WithFlange" />
+            <second ref="steelPipe2WithFlange" />
+            <positionref ref="steelPipe2WithRespectTo1Position" />
+        </union>
+        <union name="steelPipe">
+            <first ref="steelPipe_v1" />
+            <second ref="steelPipe3WithFlange" />
+            <positionref ref="steelPipe3WithRespectTo1Position" />
+        </union>
+        <!-- 
+        CHECK NO REPEATING NAMES!
+        <union name="steelPipe">
+            <first ref="steelPipe" />
+            <second ref="steelPipeCone1" />
+            <positionref ref="steelPipeCone1WithRespectTo1Position" />
+        </union>
+        <union name="steelPipe">
+            <first ref="steelPipe" />
+            <second ref="steelPipeCone2" />
+            <positionref ref="steelPipeCone2WithRespectTo1Position" />
+        </union>
+        -->
+        <!-- steel pipe vacuum/air/gas filling -->
+        <tube name="steelPipe1TubeFilling" rmin="0" rmax="steelPipeCylinder1InnerRadius" z="steelPipeCylinder1Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="steelPipe2TubeFilling" rmin="0" rmax="steelPipeCylinder2InnerRadius" z="steelPipeCylinder2Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="steelPipe3TubeFilling" rmin="0" rmax="steelPipeCylinder3InnerRadius" z="steelPipeCylinder3Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <cone name="steelPipeCone1Filling" rmin1="0" rmax1="steelPipeCone1InnerRadius1" rmin2="0" rmax2="steelPipeCone1InnerRadius2" z="steelPipeCone1Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <cone name="steelPipeCone2Filling" rmin1="0" rmax1="steelPipeCone2InnerRadius1" rmin2="0" rmax2="steelPipeCone2InnerRadius2" z="steelPipeCone2Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <union name="steelPipeFilling_v1">
+            <first ref="steelPipe1TubeFilling" />
+            <second ref="steelPipe2TubeFilling" />
+            <positionref ref="steelPipe2WithRespectTo1Position" />
+        </union>
+        <union name="steelPipeFilling">
+            <first ref="steelPipeFilling_v1" />
+            <second ref="steelPipe3TubeFilling" />
+            <positionref ref="steelPipe3WithRespectTo1Position" />
+        </union>
+        <!-- 
+        <union name="steelPipeFilling">
+            <first ref="steelPipeFilling" />
+            <second ref="steelPipeCone1Filling" />
+            <positionref ref="steelPipeCone1WithRespectTo1Position" />
+        </union>
+        <union name="steelPipeFilling">
+            <first ref="steelPipeFilling" />
+            <second ref="steelPipeCone2Filling" />
+            <positionref ref="steelPipeCone2WithRespectTo1Position" />
+        </union>
+        -->
+
+    </solids>
+    <!-- VETOES -->
+    <solids>
+        <box name="scintillatorBoxSolid" x="scintillatorShortSide-2*scintillatorShortSideNonSensitive" y="scintillatorLongSide-2*scintillatorLongSideNonSensitive" z="scintillatorThickness" lunit="mm" />
+        <tube name="photoMultiplierTube" z="scintillatorThickness" startphi="0" deltaphi="360" rmin="0" rmax="scintillatorThickness*0.4" aunit="deg" lunit="mm" />
+
+        <!-- the following instruction can be used to draw the scintillator tube for display pourposes to check orientation and to take pictures, it should be commented on simulations -->
+        <!--
+            <union name="scintillatorBoxSolid">
+                <first ref="scintillatorBoxSolid"/>
+                <second ref="photoMultiplierTube"/>
+                <rotation name="photoMultiplierTubeRotation" unit="deg" x="90" y="0" z="0"/>
+                <position name="photoMultiplierTubePosition" x="0" y="scintillatorLongSide/2 + scintillatorThickness/2 - scintillatorLongSideNonSensitive" z="0" unit="mm"/>
+            </union>
+            -->
+
+        <tube name="scintillatorHoleCircular" x="scintillatorShortSide/2" y="scintillatorLongSide/2" z="scintillatorThickness*1.20" startphi="0" deltaphi="360" rmin="0" rmax="scintillatorHoleDiameter/2" aunit="deg" lunit="mm" />
+        <box name="scintillatorHoleSquare" x="scintillatorHoleDiameter" y="scintillatorHoleDiameter" z="scintillatorThickness*1.20" lunit="mm" />
+        <subtraction name="scintillatorBoxSolidWithRightHole">
+            <first ref="scintillatorBoxSolid" />
+            <second ref="scintillatorHoleSquare" />
+            <positionref ref="scintillatorBoxSolidWithHoleRightHolePosition" />
+        </subtraction>
+        <subtraction name="scintillatorBoxSolidWithLeftHole">
+            <first ref="scintillatorBoxSolid" />
+            <second ref="scintillatorHoleSquare" />
+            <positionref ref="scintillatorBoxSolidWithHoleLeftHolePosition" />
+        </subtraction>
+
+
+    </solids>
+    <!-- ***END SOLIDS*** -->
+    <!-- ********************* -->
+    <!-- ***BEGIN STRUCTURE*** -->
+    <!-- CHAMBER -->
+    <structure>
+        <volume name="gasVolume">
+            <materialref ref="Ar_iC4H10" />
+            <solidref ref="gasSolid" />
+        </volume>
+
+        <volume name="kaptonReadoutVolume">
+            <materialref ref="Kapton" />
+            <solidref ref="kaptonReadout" />
+        </volume>
+
+        <volume name="copperReadoutVolume">
+            <materialref ref="Copper" />
+            <solidref ref="copperReadout" />
+        </volume>
+
+        <volume name="mylarCathodeVolume">
+            <materialref ref="Mylar" />
+            <solidref ref="mylarCathode" />
+        </volume>
+
+        <volume name="backplateVolume">
+            <materialref ref="Copper" />
+            <solidref ref="backplate" />
+        </volume>
+
+        <volume name="copperChamberVolume">
+            <materialref ref="Copper" />
+            <solidref ref="copperChamber" />
+        </volume>
+
+        <volume name="teflonCoverChamberVolume">
+            <materialref ref="PTFE" />
+            <solidref ref="teflonCoverChamber" />
+        </volume>
+
+        <volume name="copperCathodeVolume">
+            <materialref ref="Copper" />
+            <solidref ref="copperCathode" />
+        </volume>
+
+        <volume name="copperChamberTopVolume">
+            <materialref ref="Copper" />
+            <solidref ref="copperChamberTop" />
+        </volume>
+
+        <volume name="copperPipeVolume">
+            <materialref ref="Copper" />
+            <solidref ref="copperPipe" />
+        </volume>
+
+        <volume name="teflonPipeVolume">
+            <materialref ref="PTFE" />
+            <solidref ref="teflonPipe" />
+        </volume>
+
+        <volume name="teflonCoverCathodeVolume">
+            <materialref ref="PTFE" />
+            <solidref ref="teflonCoverCathode" />
+        </volume>
+
+        <volume name="VacuumPipeVolume">
+            <materialref ref="Vacuum" />
+            <solidref ref="VacuumPipe" />
+        </volume>
+
+        <volume name="cathodePatternVolume">
+            <materialref ref="Copper" />
+            <solidref ref="cathodePattern" />
+        </volume>
+
+        <volume name="vacuumCathodePatternVolume">
+            <materialref ref="Vacuum" />
+            <solidref ref="vacuumCathodePattern" />
+        </volume>
+    </structure>
+    <!-- PIPE -->
+    <structure>
+        <volume name="detectorCopperPipe">
+            <materialref ref="Copper" />
+            <solidref ref="copperPipeHollow" />
+        </volume>
+
+        <volume name="teflonPipeInCopper">
+            <materialref ref="PTFE" />
+            <solidref ref="teflonPipeSolid" />
+        </volume>
+
+        <volume name="pipeFilling">
+            <materialref ref="Vacuum" />
+            <solidref ref="pipeFillingSolid" />
+        </volume>
+    </structure>
+    <!-- SHIELDING -->
+    <structure>
+        <volume name="leadBoxVolume">
+            <materialref ref="Lead" />
+            <solidref ref="leadBoxWithShaft" />
+        </volume>
+    </structure>
+    <!-- STEEL PIPE -->
+    <structure>
+        <volume name="steelPipeVolume">
+            <materialref ref="Stainlesssteel" />
+            <solidref ref="steelPipe" />
+        </volume>
+        <volume name="steelPipeVacuum">
+            <materialref ref="Vacuum" />
+            <solidref ref="steelPipeFilling" />
+        </volume>
+    </structure>
+    <!-- VETOES -->
+    <structure>
+        <volume name="scintillatorVolume">
+            <materialref ref="BC408" />
+            <solidref ref="scintillatorBoxSolid" />
+        </volume>
+
+        <volume name="scintillatorVolumeWithRightHole">
+            <materialref ref="BC408" />
+            <solidref ref="scintillatorBoxSolidWithRightHole" />
+        </volume>
+
+        <volume name="scintillatorVolumeWithLeftHole">
+            <materialref ref="BC408" />
+            <solidref ref="scintillatorBoxSolidWithLeftHole" />
+        </volume>
+
+    </structure>
+    <!-- WORLD (physical volumes) -->
+    <structure>
+        <volume name="World">
+            <!-- WORLD -->
+            <materialref ref="Air" />
+            <solidref ref="WorldSolid" />
+            <!-- CHAMBER -->
+            <physvol name="gas">
+                <volumeref ref="gasVolume" />
+                <position name="gasPosition" unit="mm" x="0" y="0" z="0" />
+            </physvol>
+
+            <physvol name="kapton4Readout">
+                <volumeref ref="kaptonReadoutVolume" />
+                <positionref ref="kaptonReadoutPosition" />
+            </physvol>
+
+            <physvol name="CuReadout">
+                <volumeref ref="copperReadoutVolume" />
+                <positionref ref="copperReadoutPosition" />
+                <rotationref ref="copperReadoutRotation" />
+            </physvol>
+
+            <physvol name="CuBackplate">
+                <volumeref ref="backplateVolume" />
+                <position name="backplatePosition" unit="mm" x="0" y="0" z="-chamberLength/2. - backplateThickness/2." />
+            </physvol>
+
+            <physvol name="CuChamber">
+                <volumeref ref="copperChamberVolume" />
+                <position name="copperChamberPosition" unit="mm" x="0" y="0" z="cathodeThickness/2." />
+            </physvol>
+
+            <physvol name="PTFECoverChamber">
+                <volumeref ref="teflonCoverChamberVolume" />
+                <position name="teflonCoverChamberPosition" unit="mm" x="0" y="0" z="copperCathodeThickness/2." />
+            </physvol>
+
+            <physvol name="mylarCat">
+                <volumeref ref="mylarCathodeVolume" />
+                <position name="mylarCathodePositionVolume" unit="mm" x="0" y="0" z="mylarCathodePositionZ" />
+            </physvol>
+
+            <physvol name="CuCathode">
+                <volumeref ref="copperCathodeVolume" />
+                <position name="copperCathodePosition" unit="mm" x="0" y="0" z="chamberLength/2.+copperCathodeThickness/2." />
+            </physvol>
+
+            <physvol name="CuChamberTop">
+                <volumeref ref="copperChamberTopVolume" />
+                <position name="copperChamberTopPosition" unit="mm" x="0" y="0" z="chamberLength/2.+copperCathodeThickness+copperChamberTopThickness/2." />
+            </physvol>
+
+
+            <physvol name="PTFECoverCathode">
+                <volumeref ref="teflonCoverCathodeVolume" />
+                <position name="teflonCoverCathodePosition" unit="mm" x="0" y="0" z="chamberLength/2.+ cathodePatternThickness/2.+copperCathodeThickness/2.+copperChamberTopThickness/2." />
+            </physvol>
+
+            <physvol name="CuCathodePattern">
+                <volumeref ref="cathodePatternVolume" />
+                <position name="cathodePatternPosition" unit="mm" x="0" y="0" z="chamberLength/2.+cathodePatternThickness/2." />
+            </physvol>
+
+            <physvol name="VacCathodePattern">
+                <volumeref ref="vacuumCathodePatternVolume" />
+                <position name="vacuumCathodePatternPosition" unit="mm" x="0" y="0" z="chamberLength/2.+cathodePatternThickness/2." />
+            </physvol>
+            <!-- PIPE -->
+            <physvol name="DetectorTeflonPipe">
+                <volumeref ref="teflonPipeInCopper" />
+                <position name="detectorTeflonPipePosition" unit="mm" x="0" y="0" z="copperPipeZInWorld + teflonWithRespectToPipeOffset" />
+            </physvol>
+
+            <physvol name="DetectorCopperPipe">
+                <volumeref ref="detectorCopperPipe" />
+                <position name="detectorCopperPipePosition" unit="mm" x="0" y="0" z="copperPipeZInWorld" />
+            </physvol>
+
+            <physvol name="PipeFilling">
+                <volumeref ref="pipeFilling" />
+                <position name="detectorFillingPipePosition" unit="mm" x="0" y="0" z="copperPipeZInWorld + vacuumWithRespectToPipeOffset" />
+            </physvol>
+            <!-- SHIELDING -->
+            <physvol name="LeadShielding">
+                <volumeref ref="leadBoxVolume" />
+                <position name="leadBoxPosition" unit="mm" x="0" y="0" z="0 - shieldingOffset" />
+            </physvol>
+            <!-- STEEL PIPE -->
+            <physvol name="SteelPipe">
+                <volumeref ref="steelPipeVolume" />
+                <position name="steelPipePosition" unit="mm" x="0" y="0" z="copperPipeZInWorld + steelPipeWithRespectToCopperPipeOffset" />
+            </physvol>
+            <physvol name="SteelPipeVacuum">
+                <volumeref ref="steelPipeVacuum" />
+                <position name="steelPipePositionVacuum" unit="mm" x="0" y="0" z="copperPipeZInWorld + steelPipeWithRespectToCopperPipeOffset" />
+            </physvol>
+            <!-- BEGIN VETOES -->
+            <!-- BEGIN veto front-->
+            <physvol name="vetoFront1of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoFront1of4Position" unit="mm" x="vetoFrontPosX - 1.5*scintillatorShortSide" y="vetoFrontPosY" z="vetoFrontPosZ - shieldingOffset" />
+                <rotationref ref="vetoFrontRotation" />
+            </physvol>
+            <physvol name="vetoFront2of4">
+                <volumeref ref="scintillatorVolumeWithRightHole" />
+                <position name="vetoFront2of4Position" unit="mm" x="vetoFrontPosX - 0.5*scintillatorShortSide" y="vetoFrontPosY" z="vetoFrontPosZ - shieldingOffset" />
+                <rotationref ref="vetoFrontRotation" />
+            </physvol>
+            <physvol name="vetoFront3of4">
+                <volumeref ref="scintillatorVolumeWithLeftHole" />
+                <position name="vetoFront3of4Position" unit="mm" x="vetoFrontPosX + 0.5*scintillatorShortSide" y="vetoFrontPosY" z="vetoFrontPosZ - shieldingOffset" />
+                <rotationref ref="vetoFrontRotation" />
+            </physvol>
+            <physvol name="vetoFront4of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoFront4of4Position" unit="mm" x="vetoFrontPosX + 1.5*scintillatorShortSide" y="vetoFrontPosY" z="vetoFrontPosZ - shieldingOffset" />
+                <rotationref ref="vetoFrontRotation" />
+            </physvol>
+            <!-- END veto front-->
+
+            <!-- BEGIN veto back-->
+            <physvol name="vetoBack1of3">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoBack1of3Position" unit="mm" x="vetoBackPosX" y="vetoBackPosY - 1*scintillatorShortSide" z="vetoBackPosZ - shieldingOffset" />
+                <rotationref ref="vetoBackRotation" />
+            </physvol>
+            <physvol name="vetoBack2of3">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoBack2of3Position" unit="mm" x="vetoBackPosX" y="vetoBackPosY - 0*scintillatorShortSide" z="vetoBackPosZ - shieldingOffset" />
+                <rotationref ref="vetoBackRotation" />
+            </physvol>
+            <physvol name="vetoBack3of3">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoBack3of3Position" unit="mm" x="vetoBackPosX" y="vetoBackPosY + 1*scintillatorShortSide" z="vetoBackPosZ - shieldingOffset" />
+                <rotationref ref="vetoBackRotation" />
+            </physvol>
+            <!-- END veto back-->
+
+            <!-- BEGIN veto top-->
+            <physvol name="vetoTop1of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoTop1of4Position" unit="mm" x="vetoTopPosX - 1.5*scintillatorShortSide" y="vetoTopPosY" z="vetoTopPosZ - shieldingOffset" />
+                <rotationref ref="vetoTopRotation" />
+            </physvol>
+            <physvol name="vetoTop2of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoTop2of4Position" unit="mm" x="vetoTopPosX - 0.5*scintillatorShortSide" y="vetoTopPosY" z="vetoTopPosZ - shieldingOffset" />
+                <rotationref ref="vetoTopRotation" />
+            </physvol>
+            <physvol name="vetoTop3of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoTop3of4Position" unit="mm" x="vetoTopPosX + 0.5*scintillatorShortSide" y="vetoTopPosY" z="vetoTopPosZ - shieldingOffset" />
+                <rotationref ref="vetoTopRotation" />
+            </physvol>
+            <physvol name="vetoTop4of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoTop4of4Position" unit="mm" x="vetoTopPosX + 1.5*scintillatorShortSide" y="vetoTopPosY" z="vetoTopPosZ - shieldingOffset" />
+                <rotationref ref="vetoTopRotation" />
+            </physvol>
+            <!-- END veto top-->
+
+            <!-- BEGIN veto bottom-->
+            <physvol name="vetoBottom1of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoBottom1of4Position" unit="mm" x="vetoBottomPosX - 1.5*scintillatorShortSide" y="vetoBottomPosY" z="vetoBottomPosZ - shieldingOffset" />
+                <rotationref ref="vetoBottomRotation" />
+            </physvol>
+            <physvol name="vetoBottom2of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoBottom2of4Position" unit="mm" x="vetoBottomPosX - 0.5*scintillatorShortSide" y="vetoBottomPosY" z="vetoBottomPosZ - shieldingOffset" />
+                <rotationref ref="vetoBottomRotation" />
+            </physvol>
+            <physvol name="vetoBottom3of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoBottom3of4Position" unit="mm" x="vetoBottomPosX + 0.5*scintillatorShortSide" y="vetoBottomPosY" z="vetoBottomPosZ - shieldingOffset" />
+                <rotationref ref="vetoBottomRotation" />
+            </physvol>
+            <physvol name="vetoBottom4of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoBottom4of4Position" unit="mm" x="vetoBottomPosX + 1.5*scintillatorShortSide" y="vetoBottomPosY" z="vetoBottomPosZ - shieldingOffset" />
+                <rotationref ref="vetoBottomRotation" />
+            </physvol>
+            <!-- END veto bottom-->
+
+            <!-- BEGIN veto east-->
+            <physvol name="vetoEast1of3">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoEast1of3Position" unit="mm" x="vetoEastPosX" y="vetoEastPosY - 1*scintillatorShortSide" z="vetoEastPosZ - shieldingOffset" />
+                <rotationref ref="vetoEastRotation" />
+            </physvol>
+            <physvol name="vetoEast2of3">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoEast2of3Position" unit="mm" x="vetoEastPosX" y="vetoEastPosY + 0*scintillatorShortSide" z="vetoEastPosZ - shieldingOffset" />
+                <rotationref ref="vetoEastRotation" />
+            </physvol>
+            <physvol name="vetoEast3of3">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoEast3of3Position" unit="mm" x="vetoEastPosX" y="vetoEastPosY  + 1*scintillatorShortSide" z="vetoEastPosZ - shieldingOffset" />
+                <rotationref ref="vetoEastRotation" />
+            </physvol>
+            <!-- END veto east-->
+
+            <!-- BEGIN veto west-->
+            <physvol name="vetoWest1of3">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoWest1of3Position" unit="mm" x="vetoWestPosX" y="vetoWestPosY - 1*scintillatorShortSide" z="vetoWestPosZ - shieldingOffset" />
+                <rotationref ref="vetoWestRotation" />
+            </physvol>
+            <physvol name="vetoWest2of3">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoWest2of3Position" unit="mm" x="vetoWestPosX" y="vetoWestPosY + 0*scintillatorShortSide" z="vetoWestPosZ - shieldingOffset" />
+                <rotationref ref="vetoWestRotation" />
+            </physvol>
+            <physvol name="vetoWest3of3">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoWest3of3Position" unit="mm" x="vetoWestPosX" y="vetoWestPosY  + 1*scintillatorShortSide" z="vetoWestPosZ - shieldingOffset" />
+                <rotationref ref="vetoWestRotation" />
+            </physvol>
+            <!-- END veto west-->
+            <!-- END VETOES -->
+        </volume>
+    </structure>
+    <!-- ***END STRUCTURE*** -->
+    <!-- ********************* -->
+    <!-- ***BEGIN SETUP*** -->
+    <setup name="Default" version="1.0">
+        <world ref="World" />
+    </setup>
+    <!-- ***END SETUP*** -->
+
+</gdml><?xml version="1.0" encoding="UTF-8" standalone="no" ?>
\ No newline at end of file
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
index 7d78e2ea..1a7639d9 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
@@ -23,7 +23,7 @@ public fun VisionForge.makeThreeJsFile(
     resourceLocation: ResourceLocation = ResourceLocation.SYSTEM,
     show: Boolean = true,
 ): Unit {
-    val actualPath = page(title, content).makeFile(path) { actualPath ->
+    val actualPath = page(title, content = content).makeFile(path) { actualPath ->
         mapOf("threeJs" to scriptHeader("js/visionforge-three.js", actualPath, resourceLocation))
     }
     if (show) Desktop.getDesktop().browse(actualPath.toFile().toURI())

From 3f6e39b18d25e73f52bd48d7f0f6e2088b744194 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 4 Mar 2021 09:47:41 +0300
Subject: [PATCH 097/151] SphereLayer

---
 CHANGELOG.md                                  |    2 +
 .../vision/gdml/demo/GdmlJsDemoApp.kt         |    3 +
 demo/gdml/src/jsMain/resources/index.html     |    8 +-
 .../ru/mipt/npm/muon/monitor/MMDemoApp.kt     |    3 +
 .../src/jsMain/resources/index.html           |    6 +-
 .../playground/src/jvmMain/kotlin/gdmlIaxo.kt |   24 +
 .../src/jvmMain/resources/gdml/babyIAXO.gdml  | 1065 +++++++++++++++++
 .../hep/dataforge/vision/solid/demo/demo.kt   |    6 +
 .../src/jsMain/resources/index.html           |    2 +-
 ui/bootstrap/build.gradle.kts                 |    3 +
 .../dataforge/vision/bootstrap/bootstrap.kt   |    5 +
 .../src/main/resources/css/bootstrap.min.css  |    7 -
 .../main/resources/css/bootstrap.min.css.map  |    1 -
 .../css/{main.css => custom-bootstrap.css}    |    0
 .../main/resources/js/bootstrap.bundle.min.js |    7 -
 .../resources/js/bootstrap.bundle.min.js.map  |    1 -
 .../src/main/resources/js/jquery-3.4.1.min.js |    2 -
 .../dataforge/vision/gdml/GdmlTransformer.kt  |   18 +-
 .../dataforge/vision/gdml/bmanStatistics.kt   |    4 +-
 .../hep/dataforge/vision/solid/Sphere.kt      |    4 -
 .../hep/dataforge/vision/solid/SphereLayer.kt |   77 ++
 21 files changed, 1207 insertions(+), 41 deletions(-)
 create mode 100644 demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
 create mode 100644 demo/playground/src/jvmMain/resources/gdml/babyIAXO.gdml
 delete mode 100644 ui/bootstrap/src/main/resources/css/bootstrap.min.css
 delete mode 100644 ui/bootstrap/src/main/resources/css/bootstrap.min.css.map
 rename ui/bootstrap/src/main/resources/css/{main.css => custom-bootstrap.css} (100%)
 delete mode 100644 ui/bootstrap/src/main/resources/js/bootstrap.bundle.min.js
 delete mode 100644 ui/bootstrap/src/main/resources/js/bootstrap.bundle.min.js.map
 delete mode 100644 ui/bootstrap/src/main/resources/js/jquery-3.4.1.min.js
 create mode 100644 visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SphereLayer.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef4acdcb..5dc2ab31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Server module
 - Change collector
 - Customizable accessors for colors
+- SphereLayer solid
 
 ### Changed
 - Vision does not implement ItemProvider anymore. Property changes are done via `getProperty`/`setProperty` and `property` delegate.
@@ -13,6 +14,7 @@
 - Threejs support moved to a separate module
 - \[Format breaking change!\] Stylesheets are moved into properties under `@stylesheet` key
 - VisionGroup builder accepts `null` as name for statics instead of `""`
+- gdml sphere is rendered as a SphereLayer instead of Sphere (#35)
 
 ### Deprecated
 
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
index 9591c475..93c5e0bf 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
+++ b/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
@@ -2,6 +2,7 @@ package hep.dataforge.vision.gdml.demo
 
 import hep.dataforge.context.Global
 import hep.dataforge.vision.Application
+import hep.dataforge.vision.bootstrap.useBootstrap
 import hep.dataforge.vision.gdml.GdmlShowcase
 import hep.dataforge.vision.gdml.toVision
 import hep.dataforge.vision.solid.three.ThreePlugin
@@ -14,6 +15,8 @@ import react.dom.render
 private class GDMLDemoApp : Application {
 
     override fun start(state: Map<String, Any>) {
+        useBootstrap()
+
         val element = document.getElementById("app") ?: error("Element with id 'app' not found on page")
 
         val context = Global.context("demo") .apply{
diff --git a/demo/gdml/src/jsMain/resources/index.html b/demo/gdml/src/jsMain/resources/index.html
index 0e663f1d..ba6c6868 100644
--- a/demo/gdml/src/jsMain/resources/index.html
+++ b/demo/gdml/src/jsMain/resources/index.html
@@ -4,15 +4,11 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Three js demo for particle physics</title>
-    <link rel="stylesheet" href="css/bootstrap.min.css">
-    <link rel="stylesheet" href="css/main.css">
-    <link rel="stylesheet" href="css/fileDrop.css">
     <script type="text/javascript" src="gdml.js"></script>
+    <link rel="stylesheet" href="css/custom-bootstrap.css">
+    <link rel="stylesheet" href="css/fileDrop.css">
 </head>
 <body class="application">
 <div class="container-fluid max-vh-100" id = "app"> </div>
-
-<script type="text/javascript" src ="js/jquery-3.4.1.min.js"></script>
-<script type="text/javascript" src ="js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
index 9d66b314..0ec1c8a3 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
@@ -2,6 +2,7 @@ package ru.mipt.npm.muon.monitor
 
 import hep.dataforge.context.Global
 import hep.dataforge.vision.Application
+import hep.dataforge.vision.bootstrap.useBootstrap
 import hep.dataforge.vision.startApplication
 import io.ktor.client.HttpClient
 import io.ktor.client.features.json.JsonFeature
@@ -21,6 +22,8 @@ private class MMDemoApp : Application {
     }
 
     override fun start(state: Map<String, Any>) {
+        useBootstrap()
+
         val element = document.getElementById("app") ?: error("Element with id 'app' not found on page")
 
         val context = Global.context("demo") {}
diff --git a/demo/muon-monitor/src/jsMain/resources/index.html b/demo/muon-monitor/src/jsMain/resources/index.html
index 4e8cf959..dbca2406 100644
--- a/demo/muon-monitor/src/jsMain/resources/index.html
+++ b/demo/muon-monitor/src/jsMain/resources/index.html
@@ -4,14 +4,10 @@
     <meta charset="utf-8">
     <!--    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">-->
     <title>Three js demo for particle physics</title>
-    <link rel="stylesheet" href="css/bootstrap.min.css">
-    <link rel="stylesheet" href="css/main.css">
     <script type="text/javascript" src="muon-monitor.js"></script>
+    <link rel="stylesheet" href="css/custom-bootstrap.css">
 </head>
 <body class="application">
 <div class="container-fluid max-vh-100" id = "app"> </div>
-
-<script type="text/javascript" src ="js/jquery-3.4.1.min.js"></script>
-<script type="text/javascript" src ="js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
new file mode 100644
index 00000000..416e83d1
--- /dev/null
+++ b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
@@ -0,0 +1,24 @@
+package hep.dataforge.vision.examples
+
+import hep.dataforge.misc.DFExperimental
+import hep.dataforge.vision.VisionForge
+import hep.dataforge.vision.gdml.toVision
+import hep.dataforge.vision.html.ResourceLocation
+import hep.dataforge.vision.html.fragment
+import hep.dataforge.vision.invoke
+import hep.dataforge.vision.solid.Solids
+import space.kscience.gdml.Gdml
+import space.kscience.gdml.LUnit
+import space.kscience.gdml.decodeFromStream
+
+@DFExperimental
+fun main() = VisionForge(Solids) {
+    val content = VisionForge.fragment {
+        vision("canvas") {
+            Gdml.decodeFromStream(Gdml.javaClass.getResourceAsStream("/gdml/babyIAXO.gdml")!!, true).toVision {
+                lUnit = LUnit.MM
+            }
+        }
+    }
+    makeVisionFile(content, resourceLocation = ResourceLocation.EMBED)
+}
\ No newline at end of file
diff --git a/demo/playground/src/jvmMain/resources/gdml/babyIAXO.gdml b/demo/playground/src/jvmMain/resources/gdml/babyIAXO.gdml
new file mode 100644
index 00000000..35fd1d7a
--- /dev/null
+++ b/demo/playground/src/jvmMain/resources/gdml/babyIAXO.gdml
@@ -0,0 +1,1065 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+
+<!DOCTYPE gdml [
+    <!ENTITY materials SYSTEM "../../miscellaneous/materials.xml">
+]>
+
+<gdml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://service-spi.web.cern.ch/service-spi/app/releases/Gdml/schema/gdml.xsd">
+    <!-- ********************* -->
+    <!-- ***BEGIN DEFINE*** -->
+    <!-- GLOBAL -->
+    <define>
+        <!-- variables used for looping -->
+        <constant name="PI" value="3.14159265358979323846264" />
+        <constant name="degToRad" value="PI/180." />
+
+        <!-- World -->
+        <constant name="world_size" value="3500" />
+        <!-- try to keep that small to avoid interactions inside -->
+
+        <!-- Target gas -->
+        <variable name="target_pressure" value="1.4" />
+        <!-- pressure in bar -->
+        <variable name="target_temperature" value="300.0" />
+        <!-- temperature in K -->
+        <variable name="target_quencher" value="2" />
+        <!-- percentage of quencher gas in target gas (e.g. 2% -> 98%target + 2% quencher) -->
+    </define>
+    <!-- CHAMBER -->
+    <define>
+        <!-- Chamber -->
+        <variable name="chamberLength" value="30" />
+        <variable name="chamberRadius" value="50" />
+        <variable name="copperChamberThickness" value="18.5" />
+        <variable name="teflonChamberThickness" value="2" />
+        <variable name="copperChamberTopThickness" value="17" />
+        <variable name="copperChamberTopInnerRadius" value="30" />
+
+        <!-- Readout -->
+        <variable name="kaptonReadoutThickness" value="0.5" />
+        <variable name="copperReadoutThickness" value="0.2" />
+        <variable name="copperReadoutSide" value="60" />
+        <position name="kaptonReadoutPosition" unit="mm" x="0" y="0" z="-chamberLength/2.-kaptonReadoutThickness/2." />
+        <position name="copperReadoutPosition" unit="mm" x="0" y="0" z="-chamberLength/2.-kaptonReadoutThickness - copperReadoutThickness/2." />
+
+        <!-- Backplate (old raquette) -->
+        <variable name="backplateThickness" value="12" />
+
+        <!-- Cathode -->
+        <variable name="cathodeThickness" value="15" />
+        <variable name="cathodeHole" value="15" />
+        <variable name="mylarThickness" value="0.004" />
+        <variable name="copperCathodeThickness" value="15" />
+        <position name="mylarCathodePosition" unit="mm" x="0" y="0" z="chamberLength/2.-mylarThickness/2." />
+        <variable name="mylarCathodePositionZ" value="chamberLength/2.-mylarThickness/2." />
+
+        <variable name="cathodePatternThickness" value="3" />
+        <variable name="cathodePattern0Rad" value="4.25" />
+        <variable name="cathodePattern0Width" value="0.3" />
+        <variable name="cathodePattern1Rad" value="8.5" />
+        <variable name="cathodePattern1Width" value="1" />
+        <variable name="cathodePattern2Rad" value="12.5" />
+        <variable name="cathodePattern2Width" value="2.5" />
+        <variable name="cathodePattern2LineWidth" value="2" />
+
+        <rotation name="rotation0" unit="deg" x="0" y="0" z="22.5" />
+        <rotation name="rotation1" unit="deg" x="0" y="0" z="67.5" />
+        <rotation name="rotation2" unit="deg" x="0" y="0" z="112.5" />
+        <rotation name="rotation3" unit="deg" x="0" y="0" z="157.5" />
+        <rotation name="copperReadoutRotation" unit="deg" x="0" y="0" z="45." />
+
+        <!-- Pipe -->
+        <variable name="teflonThickness" value="3" />
+        <variable name="copperFlangeThickness" value="20" />
+        <variable name="copperFlangeHole" value="12.5" />
+        <variable name="copperTubeThickness" value="10" />
+        <variable name="copperFlangeExtRad" value="57.5" />
+        <variable name="pipeLength" value="400" />
+        <variable name="pipeThickness" value="10" />
+        <position name="teflonCover2Position" unit="mm" x="0" y="0" z="chamberLength/2.-teflonThickness/2." />
+        <position name="pipePos0" unit="mm" x="0" y="0" z="-pipeLength/2.+copperFlangeThickness/2." />
+        <position name="pipePos1" unit="mm" x="0" y="0" z="pipeLength/2.-copperFlangeThickness/2." />
+    </define>
+    <!-- PIPE -->
+    <define>
+        <!-- teflon -->
+        <variable name="teflonPipeCylinder1of4Length" value="23.9" />
+        <variable name="teflonPipeCylinder1of4Radius" value="10.0" />
+
+        <variable name="teflonPipeCylinder2of4Length" value="28.4" />
+        <variable name="teflonPipeCylinder2of4Radius" value="12.0" />
+
+        <variable name="teflonPipeCylinder3of4Length" value="40.2" />
+        <variable name="teflonPipeCylinder3of4Radius" value="15.0" />
+
+        <variable name="teflonPipeCylinder4of4Length" value="20.4" />
+        <variable name="teflonPipeCylinder4of4Radius" value="16.5" />
+
+        <variable name="teflonPipeCylinderTotalLength" value="teflonPipeCylinder1of4Length + teflonPipeCylinder2of4Length + teflonPipeCylinder3of4Length + teflonPipeCylinder4of4Length" />
+        <variable name="teflonPipeCylinderOutterRadius" value="21.5" />
+
+        <position name="teflonCylinder1of4Position" x="0" y="0" z="0" unit="mm" />
+        <position name="teflonCylinder2of4Position" x="0" y="0" z="teflonPipeCylinder1of4Length/2 + teflonPipeCylinder2of4Length/2" unit="mm" />
+        <position name="teflonCylinder3of4Position" x="0" y="0" z="teflonPipeCylinder1of4Length/2 + teflonPipeCylinder2of4Length/2 + teflonPipeCylinder2of4Length/2 + teflonPipeCylinder3of4Length/2" unit="mm" />
+        <position name="teflonCylinder4of4Position" x="0" y="0" z="teflonPipeCylinder1of4Length/2 + teflonPipeCylinder2of4Length/2 + teflonPipeCylinder2of4Length/2 + teflonPipeCylinder3of4Length/2 + teflonPipeCylinder3of4Length/2 + teflonPipeCylinder4of4Length/2" unit="mm" />
+
+        <!-- copper pipe outsie -->
+        <variable name="copperPipeDetectorFlangeOutterRadius" value="135.0/2.0" />
+        <variable name="copperPipeDetectorFlangeLength" value="17.0" />
+
+        <variable name="copperPipeDetectorToCentralTubeOutterRadius" value="80.0/2.0" />
+        <variable name="copperPipeDetectorToCentralTubeLength" value="45" />
+
+        <variable name="copperPipeCentralPieceOutterRadius" value="150.0/2.0" />
+        <variable name="copperPipeCentralPieceLength" value="355.0" />
+        <variable name="copperPipeCentralPieceSquareSide" value="119.0" />
+
+        <variable name="copperPipeCentralToOutTubeOutterRadius" value="108.0/2.0" />
+        <variable name="copperPipeCentralToOutTubeLength" value="59.0" />
+
+        <variable name="copperPipeOutFlangeOutterRadius" value="150.0/2.0" />
+        <variable name="copperPipeOutFlangeLength" value="19.0" />
+
+        <variable name="copperPipeUnion1Z" value="copperPipeDetectorFlangeLength/2.0 + copperPipeDetectorToCentralTubeLength/2.0" />
+        <position name="copperPipeUnion1Position" x="0" y="0" z="copperPipeUnion1Z" unit="mm" />
+        <variable name="copperPipeUnion2Z" value="copperPipeUnion1Z + copperPipeDetectorToCentralTubeLength/2.0 + copperPipeCentralPieceLength/2.0" />
+        <position name="copperPipeUnion2Position" x="0" y="0" z="copperPipeUnion2Z" unit="mm" />
+        <variable name="copperPipeUnion3Z" value="copperPipeUnion2Z + copperPipeCentralPieceLength/2.0 + copperPipeCentralToOutTubeLength/2.0" />
+        <position name="copperPipeUnion3Position" x="0" y="0" z="copperPipeUnion3Z" unit="mm" />
+        <variable name="copperPipeUnion4Z" value="copperPipeUnion3Z + copperPipeCentralToOutTubeLength/2.0 + copperPipeOutFlangeLength/2.0" />
+        <position name="copperPipeUnion4Position" x="0" y="0" z="copperPipeUnion4Z" unit="mm" />
+
+        <variable name="copperPipeTotalLength" value="copperPipeDetectorFlangeLength + copperPipeDetectorToCentralTubeLength + copperPipeCentralPieceLength + copperPipeCentralToOutTubeLength + copperPipeOutFlangeLength" />
+
+        <!-- copper pipe inside (we add some neglectable offset to be able to view the substraction, but no need for it to work, can be set to 0 on simulations) -->
+        <variable name="copperPipeInsideOffset" value="0.005" />
+        <variable name="copperPipeInsideCylinder1Length" value="262.5 + copperPipeInsideOffset" />
+        <variable name="copperPipeInsideCylinder1Radius" value="43.0/2.0" />
+        <variable name="copperPipeInsideConeUnion1Length" value="12.5" />
+        <variable name="copperPipeInsideCylinder2Length" value="210.0" />
+        <variable name="copperPipeInsideCylinder2Radius" value="68.0/2.0" />
+        <variable name="copperPipeInsideConeUnion2Length" value="10.0 + copperPipeInsideOffset" />
+        <variable name="copperPipeInsideCylinder3Radius" value="88.0/2.0" />
+
+        <variable name="copperPipeInnerUnion1Z" value="copperPipeInsideCylinder1Length/2.0 + copperPipeInsideConeUnion1Length/2.0" />
+        <position name="copperPipeInnerUnion1Position" x="0" y="0" z="copperPipeInnerUnion1Z" unit="mm" />
+        <variable name="copperPipeInnerUnion2Z" value="copperPipeInnerUnion1Z + copperPipeInsideConeUnion1Length/2.0 + copperPipeInsideCylinder2Length/2.0" />
+        <position name="copperPipeInnerUnion2Position" x="0" y="0" z="copperPipeInnerUnion2Z" unit="mm" />
+        <variable name="copperPipeInnerUnion3Z" value="copperPipeInnerUnion2Z + copperPipeInsideCylinder2Length/2.0 + copperPipeInsideConeUnion2Length/2.0" />
+        <position name="copperPipeInnerUnion3Position" x="0" y="0" z="copperPipeInnerUnion3Z" unit="mm" />
+
+        <!-- copper pipe outside - inner (final) -->
+        <position name="copperPipeOutterInnerSubsPosition" x="0" y="0" z="copperPipeInsideCylinder1Length/2.0 - copperPipeDetectorFlangeLength/2.0 - copperPipeInsideOffset" unit="mm" />
+
+        <position name="vacuumPipeTeflonSubsPosition" x="0" y="0" z="-copperPipeInsideCylinder1Length/2.0 + teflonPipeCylinder1of4Length/2.0 - 0*copperPipeInsideOffset" unit="mm" />
+
+        <!-- offsets to help positioning and position in world-->
+        <variable name="teflonWithRespectToPipeOffset" value="teflonPipeCylinder1of4Length/2.0 - copperPipeDetectorFlangeLength/2.0" />
+        <variable name="vacuumWithRespectToPipeOffset" value="copperPipeInsideCylinder1Length/2.0 - copperPipeDetectorFlangeLength/2.0 - copperPipeInsideOffset" />
+
+        <variable name="copperPipeZInWorld" value="chamberLength/2. + copperCathodeThickness + copperChamberTopThickness/2. + copperPipeDetectorFlangeLength" />
+        <position name="copperPipeTeflonHoleSubsPosition" unit="mm" x="0" y="0" z="teflonPipeCylinderTotalLength / 2 - copperPipeDetectorFlangeLength/2.0" />
+
+    </define>
+    <!-- SHIELDING -->
+    <define>
+        <variable name="leadBoxSize" value="550" />
+        <variable name="leadBoxShaftShortSide" value="150" />
+        <variable name="leadBoxShaftLongSide" value="(leadBoxSize - leadBoxShaftShortSide)/2 + leadBoxShaftShortSide + 10" />
+        <!-- we add an offset to make sure the substraction is done correctly -->
+
+        <position name="leadBoxShaftPosition" x="0" y="0" z="leadBoxShaftLongSide/2 - leadBoxShaftShortSide/2" unit="mm" />
+
+        <variable name="detectorToShieldingSeparation" value="16" />
+        <variable name="shieldingOffset" value="-leadBoxShaftShortSide/2.0 + detectorToShieldingSeparation + chamberLength/2. + backplateThickness" />
+
+    </define>
+    <!-- STEEL TUBE -->
+    <define>
+        <variable name="steelPipeFlangeHeigth" value="10.0" />
+        <variable name="steelPipeFlangeGenericRadiusOffset" value="10.0" />
+
+        <variable name="steelPipeCylinder1Length" value="120.0" />
+        <variable name="steelPipeCylinder1InnerRadius" value="104.0/2.0" />
+        <variable name="steelPipeCylinder1OutterRadius" value="108.0/2.0" />
+
+        <position name="steelPipe1Flange1Position" x="0" y="0" z="-steelPipeCylinder1Length/2.0 + steelPipeFlangeHeigth/2.0" unit="mm" />
+        <position name="steelPipe1Flange2Position" x="0" y="0" z="+steelPipeCylinder1Length/2.0 - steelPipeFlangeHeigth/2.0" unit="mm" />
+
+        <variable name="steelPipeCylinder2Length" value="525.0" />
+        <variable name="steelPipeCylinder2InnerRadius" value="155.0/2.0" />
+        <variable name="steelPipeCylinder2OutterRadius" value="159.0/2.0" />
+
+        <position name="steelPipe2Flange1Position" x="0" y="0" z="-steelPipeCylinder2Length/2.0 + steelPipeFlangeHeigth/2.0" unit="mm" />
+        <position name="steelPipe2Flange2Position" x="0" y="0" z="+steelPipeCylinder2Length/2.0 - steelPipeFlangeHeigth/2.0" unit="mm" />
+
+        <position name="steelPipe2WithRespectTo1Position" x="0" y="0" z="steelPipeCylinder1Length/2.0 + steelPipeCylinder2Length/2.0" unit="mm" />
+
+        <variable name="steelPipeCylinder3Length" value="67.0" />
+        <variable name="steelPipeCylinder3InnerRadius" value="150.0/2.0" />
+        <variable name="steelPipeCylinder3OutterRadius" value="steelPipeCylinder3InnerRadius + steelPipeFlangeGenericRadiusOffset/2.0" />
+
+        <position name="steelPipe3Flange1Position" x="0" y="0" z="-steelPipeCylinder3Length/2.0 + steelPipeFlangeHeigth/2.0" unit="mm" />
+        <position name="steelPipe3Flange2Position" x="0" y="0" z="+steelPipeCylinder3Length/2.0 - steelPipeFlangeHeigth/2.0" unit="mm" />
+
+        <position name="steelPipe3WithRespectTo1Position" x="0" y="0" z="steelPipeCylinder1Length/2.0 + steelPipeCylinder2Length + steelPipeCylinder3Length/2.0" unit="mm" />
+
+        <variable name="steelPipeCone1Length" value="2229.0" />
+        <variable name="steelPipeCone1Thickness" value="2.0" />
+        <variable name="steelPipeCone1InnerRadius1" value="150.0/2.0" />
+        <variable name="steelPipeCone1InnerRadius2" value="381.0/2.0" />
+
+        <position name="steelPipeCone1WithRespectTo1Position" x="0" y="0" z="steelPipeCylinder1Length/2.0 + steelPipeCylinder2Length + steelPipeCylinder3Length + steelPipeCone1Length/2.0" unit="mm" />
+
+        <variable name="steelPipeCone2Length" value="3545.0" />
+        <variable name="steelPipeCone2Thickness" value="2.0" />
+        <variable name="steelPipeCone2InnerRadius1" value="steelPipeCone1InnerRadius2" />
+        <variable name="steelPipeCone2InnerRadius2" value="800.0/2.0" />
+
+        <position name="steelPipeCone2WithRespectTo1Position" x="0" y="0" z="steelPipeCylinder1Length/2.0 + steelPipeCylinder2Length + steelPipeCylinder3Length + steelPipeCone1Length + steelPipeCone2Length/2.0" unit="mm" />
+
+
+        <!-- position in world -->
+        <variable name="steelPipeWithRespectToCopperPipeOffset" value="copperPipeTotalLength + steelPipeCylinder1Length/2.0 - copperPipeDetectorFlangeLength/2.0" />
+    </define>
+    <!-- VETOES -->
+    <define>
+        <variable name="scintillatorThickness" value="50" />
+        <variable name="scintillatorLongSide" value="750" />
+        <variable name="scintillatorShortSide" value="200" />
+        <variable name="scintillatorHoleDiameter" value="150" />
+
+        <variable name="scintillatorLongSideNonSensitive" value="0.005*scintillatorLongSide" />
+        <variable name="scintillatorShortSideNonSensitive" value="0.005*scintillatorShortSide" />
+        <!-- TODO: explanation of "non sensitive" -->
+
+        <position name="scintillatorBoxSolidWithHoleRightHolePosition" x="scintillatorShortSide/2" y="-100" z="0" unit="mm" />
+        <position name="scintillatorBoxSolidWithHoleLeftHolePosition" x="-scintillatorShortSide/2" y="-100" z="0" unit="mm" />
+
+        <!-- actual scintillator positions in world-->
+        <variable name="vetoFrontPosX" value="0" />
+        <variable name="vetoFrontPosY" value="100" />
+        <variable name="vetoFrontPosZ" value="350 + scintillatorThickness/2" />
+        <rotation name="vetoFrontRotation" unit="deg" x="0" y="0" z="0" />
+
+        <variable name="vetoBackPosX" value="-25 - scintillatorThickness" />
+        <variable name="vetoBackPosY" value="50 - scintillatorThickness/2" />
+        <variable name="vetoBackPosZ" value="-(350 + scintillatorThickness/2)" />
+        <rotation name="vetoBackRotation" unit="deg" x="0" y="0" z="-90" />
+
+        <variable name="vetoTopPosX" value="-scintillatorThickness" />
+        <variable name="vetoTopPosY" value="325 + scintillatorThickness/2" />
+        <variable name="vetoTopPosZ" value="-scintillatorThickness/2" />
+        <rotation name="vetoTopRotation" unit="deg" x="90" y="0" z="0" />
+
+        <variable name="vetoBottomPosX" value="-scintillatorThickness" />
+        <variable name="vetoBottomPosY" value="-(330 + scintillatorThickness/2)" />
+        <variable name="vetoBottomPosZ" value="-scintillatorThickness/2" />
+        <rotation name="vetoBottomRotation" unit="deg" x="90" y="0" z="0" />
+
+        <variable name="vetoWestPosX" value="300 + scintillatorThickness/2" />
+        <variable name="vetoWestPosY" value="50 - scintillatorThickness/2" />
+        <variable name="vetoWestPosZ" value="-scintillatorThickness/2" />
+        <rotation name="vetoWestRotation" unit="deg" x="90" y="90" z="0" />
+
+        <variable name="vetoEastPosX" value="-(400 + scintillatorThickness/2)" />
+        <variable name="vetoEastPosY" value="50 - scintillatorThickness/2" />
+        <variable name="vetoEastPosZ" value="scintillatorThickness/2" />
+        <rotation name="vetoEastRotation" unit="deg" x="-90" y="90" z="0" />
+    </define>
+    <!-- ***END DEFINE*** -->
+    <!-- ********************* -->
+    <!-- ***BEGIN MATERIALS*** -->
+    <!-- &materials; -->
+    <!-- ***END MATERIALS*** -->
+    <!-- ********************* -->
+    <!-- ***BEGIN SOLIDS*** -->
+    <!-- WORLD -->
+    <solids>
+        <box name="WorldSolid" x="world_size" y="world_size" z="world_size" lunit="mm" />
+    </solids>
+    <!-- CHAMBER -->
+    <solids>
+        <!-- Target gas -->
+        <tube name="gasSolidFull" startphi="0" deltaphi="360" rmin="0" rmax="chamberRadius-teflonChamberThickness" z="chamberLength" aunit="deg" lunit="mm" />
+
+        <!-- Readout -->
+        <tube name="kaptonReadout" startphi="0" deltaphi="360" rmin="0" rmax="chamberRadius-teflonChamberThickness" z="kaptonReadoutThickness" aunit="deg" lunit="mm" />
+        <box name="copperReadout" x="copperReadoutSide" y="copperReadoutSide" z="copperReadoutThickness" lunit="mm" />
+
+        <!-- Raquette -->
+        <tube name="backplate" startphi="0" deltaphi="360" rmin="0" rmax="chamberRadius+copperChamberThickness" z="backplateThickness" aunit="deg" lunit="mm" />
+
+        <!-- Chamber -->
+        <tube name="copperChamber" startphi="0" deltaphi="360" rmin="chamberRadius" rmax="copperChamberThickness+chamberRadius" z="chamberLength+cathodeThickness" aunit="deg" lunit="mm" />
+        <tube name="teflonCoverChamber" startphi="0" deltaphi="360" rmin="chamberRadius-teflonChamberThickness" rmax="chamberRadius" z="chamberLength+copperCathodeThickness" aunit="deg" lunit="mm" />
+        <tube name="mylarCathode" startphi="0" deltaphi="360" rmin="0" rmax="cathodeHole" z="mylarThickness" aunit="deg" lunit="mm" />
+        <tube name="copperCathode" startphi="0" deltaphi="360" rmin="cathodeHole" rmax="chamberRadius-teflonChamberThickness" z="copperCathodeThickness" aunit="deg" lunit="mm" />
+        <tube name="copperChamberTop" startphi="0" deltaphi="360" rmin="copperChamberTopInnerRadius" rmax="copperChamberThickness+chamberRadius" z="copperChamberTopThickness" aunit="deg" lunit="mm" />
+        <tube name="copperFlangeDetector" startphi="0" deltaphi="360" rmin="copperFlangeHole" rmax="copperChamberThickness+chamberRadius" z="copperFlangeThickness" aunit="deg" lunit="mm" />
+        <tube name="copperTube" startphi="0" deltaphi="360" rmin="copperFlangeHole" rmax="copperTubeThickness+copperFlangeHole" z="pipeLength" aunit="deg" lunit="mm" />
+        <tube name="copperFlangeExt" startphi="0" deltaphi="360" rmin="copperFlangeHole" rmax="copperFlangeExtRad" z="copperFlangeThickness" aunit="deg" lunit="mm" />
+        <tube name="teflonPipe" startphi="0" deltaphi="360" rmin="copperFlangeHole-teflonThickness" rmax="copperFlangeHole" z="pipeLength" aunit="deg" lunit="mm" />
+        <tube name="teflonCoverCathode" startphi="0" deltaphi="360" rmin="copperFlangeHole-teflonThickness" rmax="cathodeHole" z="copperCathodeThickness+copperChamberTopThickness-cathodePatternThickness " aunit="deg" lunit="mm" />
+        <tube name="VacuumPipe" startphi="0" deltaphi="360" rmin="0" rmax="copperFlangeHole-teflonThickness" z="copperCathodeThickness+copperChamberTopThickness-cathodePatternThickness+pipeLength" aunit="deg" lunit="mm" />
+
+        <!-- Cathode Pattern -->
+        <tube name="Ring0" startphi="0" deltaphi="360" rmin="cathodePattern0Rad" rmax="cathodePattern0Rad+cathodePattern0Width" z="cathodePatternThickness" aunit="deg" lunit="mm" />
+        <box name="line0" x="cathodePattern2Rad*2" y="cathodePattern0Width" z="cathodePatternThickness" lunit="mm" />
+        <tube name="Ring1" startphi="0" deltaphi="360" rmin="cathodePattern1Rad" rmax="cathodePattern1Rad+cathodePattern1Width" z="cathodePatternThickness" aunit="deg" lunit="mm" />
+        <box name="line1" x="cathodePattern2Rad*2" y="cathodePattern2LineWidth" z="cathodePatternThickness" lunit="mm" />
+        <tube name="Ring2" startphi="0" deltaphi="360" rmin="cathodePattern2Rad" rmax="cathodePattern2Rad+cathodePattern2Width" z="cathodePatternThickness" aunit="deg" lunit="mm" />
+        <tube name="Hole0" startphi="0" deltaphi="360" rmin="0" rmax="cathodePattern0Rad+cathodePattern0Width" z="cathodePatternThickness+2" aunit="deg" lunit="mm" />
+        <tube name="Hole1" startphi="0" deltaphi="360" rmin="0" rmax="cathodePattern1Rad+cathodePattern1Width" z="cathodePatternThickness+2" aunit="deg" lunit="mm" />
+
+        <tube name="vacuumCathode" startphi="0" deltaphi="360" rmin="0" rmax="cathodePattern2Rad" z="cathodePatternThickness" aunit="deg" lunit="mm" />
+
+        <union name="copperPipe0">
+            <first ref="copperTube" />
+            <second ref="copperFlangeDetector" />
+            <positionref ref="pipePos0" />
+        </union>
+
+        <union name="copperPipe">
+            <first ref="copperPipe0" />
+            <second ref="copperFlangeExt" />
+            <positionref ref="pipePos1" />
+        </union>
+
+        <subtraction name="gasSolid1">
+            <first ref="gasSolidFull" />
+            <second ref="mylarCathode" />
+            <positionref ref="mylarCathodePosition" />
+        </subtraction>
+
+        <subtraction name="gasSolid2">
+            <first ref="gasSolid1" />
+            <second ref="kaptonReadout" />
+            <positionref ref="kaptonReadoutPosition" />
+        </subtraction>
+
+        <subtraction name="gasSolid">
+            <first ref="gasSolid2" />
+            <second ref="copperReadout" />
+            <positionref ref="copperReadoutPosition" />
+            <rotationref ref="copperReadoutRotation" />
+        </subtraction>
+
+        <union name="cathodePattern1">
+            <first ref="Ring2" />
+            <second ref="line1" />
+            <rotationref ref="rotation0" />
+        </union>
+
+        <union name="cathodePattern2">
+            <first ref="cathodePattern1" />
+            <second ref="line1" />
+            <rotationref ref="rotation1" />
+        </union>
+
+        <union name="cathodePattern3">
+            <first ref="cathodePattern2" />
+            <second ref="line1" />
+            <rotationref ref="rotation2" />
+        </union>
+
+        <union name="cathodePattern4">
+            <first ref="cathodePattern3" />
+            <second ref="line1" />
+            <rotationref ref="rotation3" />
+        </union>
+
+        <subtraction name="cathodePattern5">
+            <first ref="cathodePattern4" />
+            <second ref="Hole1" />
+        </subtraction>
+
+        <union name="cathodePattern6">
+            <first ref="cathodePattern5" />
+            <second ref="Ring1" />
+        </union>
+
+        <union name="cathodePattern7">
+            <first ref="cathodePattern6" />
+            <second ref="line0" />
+            <rotationref ref="rotation0" />
+        </union>
+
+        <union name="cathodePattern8">
+            <first ref="cathodePattern7" />
+            <second ref="line0" />
+            <rotationref ref="rotation1" />
+        </union>
+
+        <union name="cathodePattern9">
+            <first ref="cathodePattern8" />
+            <second ref="line0" />
+            <rotationref ref="rotation2" />
+        </union>
+
+        <union name="cathodePattern10">
+            <first ref="cathodePattern9" />
+            <second ref="line0" />
+            <rotationref ref="rotation3" />
+        </union>
+
+        <subtraction name="cathodePattern11">
+            <first ref="cathodePattern10" />
+            <second ref="Hole0" />
+        </subtraction>
+
+        <union name="cathodePattern">
+            <first ref="cathodePattern11" />
+            <second ref="Ring0" />
+        </union>
+
+        <subtraction name="vacuumCathodePattern">
+            <first ref="vacuumCathode" />
+            <second ref="cathodePattern" />
+        </subtraction>
+
+    </solids>
+    <!-- PIPE -->
+    <solids>
+        <!-- teflon -->
+        <tube name="teflonCylinder1of4" rmin="teflonPipeCylinder1of4Radius" rmax="teflonPipeCylinderOutterRadius" z="teflonPipeCylinder1of4Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="teflonCylinder2of4" rmin="teflonPipeCylinder2of4Radius" rmax="teflonPipeCylinderOutterRadius" z="teflonPipeCylinder2of4Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="teflonCylinder3of4" rmin="teflonPipeCylinder3of4Radius" rmax="teflonPipeCylinderOutterRadius" z="teflonPipeCylinder3of4Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="teflonCylinder4of4" rmin="teflonPipeCylinder4of4Radius" rmax="teflonPipeCylinderOutterRadius" z="teflonPipeCylinder4of4Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <union name="teflonPipeSolid_v1">
+            <first ref="teflonCylinder1of4" />
+            <second ref="teflonCylinder2of4" />
+            <positionref ref="teflonCylinder2of4Position" />
+        </union>
+
+        <union name="teflonPipeSolid_v2">
+            <first ref="teflonPipeSolid_v1" />
+            <second ref="teflonCylinder3of4" />
+            <positionref ref="teflonCylinder3of4Position" />
+        </union>
+
+        <union name="teflonPipeSolid">
+            <first ref="teflonPipeSolid_v2" />
+            <second ref="teflonCylinder4of4" />
+            <positionref ref="teflonCylinder4of4Position" />
+        </union>
+
+        <!-- copper pipe outsie -->
+        <tube name="copperPipeDetectorFlangeTube" rmin="0" rmax="copperPipeDetectorFlangeOutterRadius" z="copperPipeDetectorFlangeLength" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="copperPipeDetectorToCentralTube" rmin="0" rmax="copperPipeDetectorToCentralTubeOutterRadius" z="copperPipeDetectorToCentralTubeLength" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <union name="copperPipeSolid_v1">
+            <first ref="copperPipeDetectorFlangeTube" />
+            <second ref="copperPipeDetectorToCentralTube" />
+            <positionref ref="copperPipeUnion1Position" />
+        </union>
+
+        <tube name="copperPipeCentralPieceSolid_v1" rmin="0" rmax="copperPipeCentralPieceOutterRadius" z="copperPipeCentralPieceLength" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <box name="copperPipeCentralPieceBox_v1" x="copperPipeCentralPieceOutterRadius*2.1" y="copperPipeCentralPieceOutterRadius*2.1" z="copperPipeCentralPieceLength + 10" lunit="mm" />
+        <box name="copperPipeCentralPieceBoxToSubs" x="copperPipeCentralPieceSquareSide" y="copperPipeCentralPieceSquareSide" z="copperPipeCentralPieceLength + 10" lunit="mm" />
+        <subtraction name="copperPipeCentralPieceBox">
+            <first ref="copperPipeCentralPieceBox_v1" />
+            <second ref="copperPipeCentralPieceBoxToSubs" />
+        </subtraction>
+
+        <subtraction name="copperPipeCentralPieceSolid_v2">
+            <first ref="copperPipeCentralPieceSolid_v1" />
+            <second ref="copperPipeCentralPieceBox" />
+        </subtraction>
+
+        <union name="copperPipeSolid_v2">
+            <first ref="copperPipeSolid_v1" />
+            <second ref="copperPipeCentralPieceSolid_v2" />
+            <positionref ref="copperPipeUnion2Position" />
+        </union>
+
+        <tube name="copperPipeCentralToOutTube" rmin="0" rmax="copperPipeCentralToOutTubeOutterRadius" z="copperPipeCentralToOutTubeLength" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="copperPipeOutFlangeTube" rmin="0" rmax="copperPipeOutFlangeOutterRadius" z="copperPipeOutFlangeLength" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <union name="copperPipeSolid_v3">
+            <first ref="copperPipeSolid_v2" />
+            <second ref="copperPipeCentralToOutTube" />
+            <positionref ref="copperPipeUnion3Position" />
+        </union>
+
+        <union name="copperPipeSolid_v4">
+            <first ref="copperPipeSolid_v3" />
+            <second ref="copperPipeOutFlangeTube" />
+            <positionref ref="copperPipeUnion4Position" />
+        </union>
+
+        <!-- copper pipe inside -->
+        <tube name="copperPipeInsideCylinder1Solid" rmin="0" rmax="copperPipeInsideCylinder1Radius" z="copperPipeInsideCylinder1Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <cone name="copperPipeInsideConeUnion1Solid" rmin1="0" rmax1="copperPipeInsideCylinder1Radius" rmin2="0" rmax2="copperPipeInsideCylinder2Radius" z="copperPipeInsideConeUnion1Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="copperPipeInsideCylinder2Solid" rmin="0" rmax="copperPipeInsideCylinder2Radius" z="copperPipeInsideCylinder2Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <cone name="copperPipeInsideConeUnion2Solid" rmin1="0" rmax1="copperPipeInsideCylinder2Radius" rmin2="0" rmax2="copperPipeInsideCylinder3Radius" z="copperPipeInsideConeUnion2Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <union name="copperPipeInsideSolid_v1">
+            <first ref="copperPipeInsideCylinder1Solid" />
+            <second ref="copperPipeInsideConeUnion1Solid" />
+            <positionref ref="copperPipeInnerUnion1Position" />
+        </union>
+
+        <union name="copperPipeInsideSolid_v2">
+            <first ref="copperPipeInsideSolid_v1" />
+            <second ref="copperPipeInsideCylinder2Solid" />
+            <positionref ref="copperPipeInnerUnion2Position" />
+        </union>
+
+        <union name="copperPipeInsideSolid">
+            <first ref="copperPipeInsideSolid_v2" />
+            <second ref="copperPipeInsideConeUnion2Solid" />
+            <positionref ref="copperPipeInnerUnion3Position" />
+        </union>
+
+        <!-- copper pipe outside - inner (final) -->
+        <subtraction name="copperPipeCentralPieceSolid_v3">
+            <first ref="copperPipeSolid_v4" />
+            <second ref="copperPipeInsideSolid" />
+            <positionref ref="copperPipeOutterInnerSubsPosition" />
+        </subtraction>
+        <!-- vacuum/air/gas pipe filling -->
+        <subtraction name="pipeFillingSolid">
+            <first ref="copperPipeInsideSolid" />
+            <second ref="teflonPipeSolid" />
+            <positionref ref="vacuumPipeTeflonSubsPosition" />
+        </subtraction>
+
+        <subtraction name="copperPipeCentralPieceSolid">
+            <first ref="copperPipeSolid_v4" />
+            <second ref="copperPipeInsideSolid" />
+            <positionref ref="copperPipeOutterInnerSubsPosition" />
+        </subtraction>
+
+        <tube name="teflonHoleSolid" rmin="0" rmax="teflonPipeCylinderOutterRadius" z="teflonPipeCylinderTotalLength" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <subtraction name="copperPipeHollowPre">
+            <first ref="copperPipeSolid_v4" />
+            <second ref="teflonHoleSolid" />
+            <positionref ref="copperPipeTeflonHoleSubsPosition" />
+        </subtraction>
+
+        <subtraction name="copperPipeHollow">
+            <first ref="copperPipeHollowPre" />
+            <second ref="pipeFillingSolid" />
+            <positionref ref="copperPipeOutterInnerSubsPosition" />
+        </subtraction>
+    </solids>
+    <!-- SHIELDING -->
+    <solids>
+        <box name="leadBoxSolid" x="leadBoxSize" y="leadBoxSize" z="leadBoxSize" lunit="mm" />
+        <box name="leadBoxShaft" x="leadBoxShaftShortSide" y="leadBoxShaftShortSide" z="leadBoxShaftLongSide" lunit="mm" />
+
+        <subtraction name="leadBoxWithShaft">
+            <first ref="leadBoxSolid" />
+            <second ref="leadBoxShaft" />
+            <positionref ref="leadBoxShaftPosition" />
+        </subtraction>
+
+    </solids>
+    <!-- STEEL PIPE -->
+    <solids>
+        <!-- steel pipe segment 1 -->
+        <tube name="steelPipe1Tube" rmin="steelPipeCylinder1InnerRadius" rmax="steelPipeCylinder1OutterRadius" z="steelPipeCylinder1Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="steelPipe1Flange1" rmin="steelPipeCylinder1OutterRadius" rmax="copperPipeOutFlangeOutterRadius" z="steelPipeFlangeHeigth" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="steelPipe1Flange2" rmin="steelPipeCylinder1OutterRadius" rmax="steelPipeCylinder2OutterRadius + steelPipeFlangeGenericRadiusOffset" z="steelPipeFlangeHeigth" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <union name="steelPipe1WithFlange_v1">
+            <first ref="steelPipe1Tube" />
+            <second ref="steelPipe1Flange1" />
+            <positionref ref="steelPipe1Flange1Position" />
+        </union>
+        <union name="steelPipe1WithFlange">
+            <first ref="steelPipe1WithFlange_v1" />
+            <second ref="steelPipe1Flange2" />
+            <positionref ref="steelPipe1Flange2Position" />
+        </union>
+
+        <!-- steel pipe segment 2 -->
+        <tube name="steelPipe2Tube" rmin="steelPipeCylinder2InnerRadius" rmax="steelPipeCylinder2OutterRadius" z="steelPipeCylinder2Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="steelPipe2Flange1" rmin="steelPipeCylinder2OutterRadius" rmax="steelPipeCylinder2OutterRadius + steelPipeFlangeGenericRadiusOffset" z="steelPipeFlangeHeigth" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="steelPipe2Flange2" rmin="steelPipeCylinder2OutterRadius" rmax="steelPipeCylinder3OutterRadius + steelPipeFlangeGenericRadiusOffset" z="steelPipeFlangeHeigth" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <union name="steelPipe2WithFlange_v1">
+            <first ref="steelPipe2Tube" />
+            <second ref="steelPipe2Flange1" />
+            <positionref ref="steelPipe2Flange1Position" />
+        </union>
+        <union name="steelPipe2WithFlange">
+            <first ref="steelPipe2WithFlange_v1" />
+            <second ref="steelPipe2Flange2" />
+            <positionref ref="steelPipe2Flange2Position" />
+        </union>
+
+        <!-- steel pipe segment 3 -->
+        <tube name="steelPipe3Tube" rmin="steelPipeCylinder3InnerRadius" rmax="steelPipeCylinder3OutterRadius" z="steelPipeCylinder3Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="steelPipe3Flange1" rmin="steelPipeCylinder3OutterRadius" rmax="steelPipeCylinder3OutterRadius + steelPipeFlangeGenericRadiusOffset" z="steelPipeFlangeHeigth" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="steelPipe3Flange2" rmin="steelPipeCylinder3OutterRadius" rmax="steelPipeCylinder3OutterRadius + steelPipeFlangeGenericRadiusOffset" z="steelPipeFlangeHeigth" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <union name="steelPipe3WithFlange_v1">
+            <first ref="steelPipe3Tube" />
+            <second ref="steelPipe3Flange1" />
+            <positionref ref="steelPipe3Flange1Position" />
+        </union>
+        <union name="steelPipe3WithFlange">
+            <first ref="steelPipe3WithFlange_v1" />
+            <second ref="steelPipe3Flange2" />
+            <positionref ref="steelPipe3Flange2Position" />
+        </union>
+
+        <!-- steel pipe segment 4 / cone (first part) -->
+        <cone name="steelPipeCone1" rmin1="steelPipeCone1InnerRadius1" rmax1="steelPipeCone1InnerRadius1 + steelPipeCone1Thickness" rmin2="steelPipeCone1InnerRadius2" rmax2="steelPipeCone1InnerRadius2 + steelPipeCone1Thickness" z="steelPipeCone1Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <!-- steel pipe segment 5 / cone (second/final part) -->
+        <cone name="steelPipeCone2" rmin1="steelPipeCone2InnerRadius1" rmax1="steelPipeCone2InnerRadius1 + steelPipeCone2Thickness" rmin2="steelPipeCone2InnerRadius2" rmax2="steelPipeCone2InnerRadius2 + steelPipeCone2Thickness" z="steelPipeCone2Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <!-- steel pipe complete -->
+        <union name="steelPipe_v1">
+            <first ref="steelPipe1WithFlange" />
+            <second ref="steelPipe2WithFlange" />
+            <positionref ref="steelPipe2WithRespectTo1Position" />
+        </union>
+        <union name="steelPipe">
+            <first ref="steelPipe_v1" />
+            <second ref="steelPipe3WithFlange" />
+            <positionref ref="steelPipe3WithRespectTo1Position" />
+        </union>
+        <!-- 
+        CHECK NO REPEATING NAMES!
+        <union name="steelPipe">
+            <first ref="steelPipe" />
+            <second ref="steelPipeCone1" />
+            <positionref ref="steelPipeCone1WithRespectTo1Position" />
+        </union>
+        <union name="steelPipe">
+            <first ref="steelPipe" />
+            <second ref="steelPipeCone2" />
+            <positionref ref="steelPipeCone2WithRespectTo1Position" />
+        </union>
+        -->
+        <!-- steel pipe vacuum/air/gas filling -->
+        <tube name="steelPipe1TubeFilling" rmin="0" rmax="steelPipeCylinder1InnerRadius" z="steelPipeCylinder1Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="steelPipe2TubeFilling" rmin="0" rmax="steelPipeCylinder2InnerRadius" z="steelPipeCylinder2Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <tube name="steelPipe3TubeFilling" rmin="0" rmax="steelPipeCylinder3InnerRadius" z="steelPipeCylinder3Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <cone name="steelPipeCone1Filling" rmin1="0" rmax1="steelPipeCone1InnerRadius1" rmin2="0" rmax2="steelPipeCone1InnerRadius2" z="steelPipeCone1Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+        <cone name="steelPipeCone2Filling" rmin1="0" rmax1="steelPipeCone2InnerRadius1" rmin2="0" rmax2="steelPipeCone2InnerRadius2" z="steelPipeCone2Length" startphi="0" deltaphi="360" aunit="deg" lunit="mm" />
+
+        <union name="steelPipeFilling_v1">
+            <first ref="steelPipe1TubeFilling" />
+            <second ref="steelPipe2TubeFilling" />
+            <positionref ref="steelPipe2WithRespectTo1Position" />
+        </union>
+        <union name="steelPipeFilling">
+            <first ref="steelPipeFilling_v1" />
+            <second ref="steelPipe3TubeFilling" />
+            <positionref ref="steelPipe3WithRespectTo1Position" />
+        </union>
+        <!-- 
+        <union name="steelPipeFilling">
+            <first ref="steelPipeFilling" />
+            <second ref="steelPipeCone1Filling" />
+            <positionref ref="steelPipeCone1WithRespectTo1Position" />
+        </union>
+        <union name="steelPipeFilling">
+            <first ref="steelPipeFilling" />
+            <second ref="steelPipeCone2Filling" />
+            <positionref ref="steelPipeCone2WithRespectTo1Position" />
+        </union>
+        -->
+
+    </solids>
+    <!-- VETOES -->
+    <solids>
+        <box name="scintillatorBoxSolid" x="scintillatorShortSide-2*scintillatorShortSideNonSensitive" y="scintillatorLongSide-2*scintillatorLongSideNonSensitive" z="scintillatorThickness" lunit="mm" />
+        <tube name="photoMultiplierTube" z="scintillatorThickness" startphi="0" deltaphi="360" rmin="0" rmax="scintillatorThickness*0.4" aunit="deg" lunit="mm" />
+
+        <!-- the following instruction can be used to draw the scintillator tube for display pourposes to check orientation and to take pictures, it should be commented on simulations -->
+        <!--
+            <union name="scintillatorBoxSolid">
+                <first ref="scintillatorBoxSolid"/>
+                <second ref="photoMultiplierTube"/>
+                <rotation name="photoMultiplierTubeRotation" unit="deg" x="90" y="0" z="0"/>
+                <position name="photoMultiplierTubePosition" x="0" y="scintillatorLongSide/2 + scintillatorThickness/2 - scintillatorLongSideNonSensitive" z="0" unit="mm"/>
+            </union>
+            -->
+
+        <tube name="scintillatorHoleCircular" x="scintillatorShortSide/2" y="scintillatorLongSide/2" z="scintillatorThickness*1.20" startphi="0" deltaphi="360" rmin="0" rmax="scintillatorHoleDiameter/2" aunit="deg" lunit="mm" />
+        <box name="scintillatorHoleSquare" x="scintillatorHoleDiameter" y="scintillatorHoleDiameter" z="scintillatorThickness*1.20" lunit="mm" />
+        <subtraction name="scintillatorBoxSolidWithRightHole">
+            <first ref="scintillatorBoxSolid" />
+            <second ref="scintillatorHoleSquare" />
+            <positionref ref="scintillatorBoxSolidWithHoleRightHolePosition" />
+        </subtraction>
+        <subtraction name="scintillatorBoxSolidWithLeftHole">
+            <first ref="scintillatorBoxSolid" />
+            <second ref="scintillatorHoleSquare" />
+            <positionref ref="scintillatorBoxSolidWithHoleLeftHolePosition" />
+        </subtraction>
+
+
+    </solids>
+    <!-- ***END SOLIDS*** -->
+    <!-- ********************* -->
+    <!-- ***BEGIN STRUCTURE*** -->
+    <!-- CHAMBER -->
+    <structure>
+        <volume name="gasVolume">
+            <materialref ref="Ar_iC4H10" />
+            <solidref ref="gasSolid" />
+        </volume>
+
+        <volume name="kaptonReadoutVolume">
+            <materialref ref="Kapton" />
+            <solidref ref="kaptonReadout" />
+        </volume>
+
+        <volume name="copperReadoutVolume">
+            <materialref ref="Copper" />
+            <solidref ref="copperReadout" />
+        </volume>
+
+        <volume name="mylarCathodeVolume">
+            <materialref ref="Mylar" />
+            <solidref ref="mylarCathode" />
+        </volume>
+
+        <volume name="backplateVolume">
+            <materialref ref="Copper" />
+            <solidref ref="backplate" />
+        </volume>
+
+        <volume name="copperChamberVolume">
+            <materialref ref="Copper" />
+            <solidref ref="copperChamber" />
+        </volume>
+
+        <volume name="teflonCoverChamberVolume">
+            <materialref ref="PTFE" />
+            <solidref ref="teflonCoverChamber" />
+        </volume>
+
+        <volume name="copperCathodeVolume">
+            <materialref ref="Copper" />
+            <solidref ref="copperCathode" />
+        </volume>
+
+        <volume name="copperChamberTopVolume">
+            <materialref ref="Copper" />
+            <solidref ref="copperChamberTop" />
+        </volume>
+
+        <volume name="copperPipeVolume">
+            <materialref ref="Copper" />
+            <solidref ref="copperPipe" />
+        </volume>
+
+        <volume name="teflonPipeVolume">
+            <materialref ref="PTFE" />
+            <solidref ref="teflonPipe" />
+        </volume>
+
+        <volume name="teflonCoverCathodeVolume">
+            <materialref ref="PTFE" />
+            <solidref ref="teflonCoverCathode" />
+        </volume>
+
+        <volume name="VacuumPipeVolume">
+            <materialref ref="Vacuum" />
+            <solidref ref="VacuumPipe" />
+        </volume>
+
+        <volume name="cathodePatternVolume">
+            <materialref ref="Copper" />
+            <solidref ref="cathodePattern" />
+        </volume>
+
+        <volume name="vacuumCathodePatternVolume">
+            <materialref ref="Vacuum" />
+            <solidref ref="vacuumCathodePattern" />
+        </volume>
+    </structure>
+    <!-- PIPE -->
+    <structure>
+        <volume name="detectorCopperPipe">
+            <materialref ref="Copper" />
+            <solidref ref="copperPipeHollow" />
+        </volume>
+
+        <volume name="teflonPipeInCopper">
+            <materialref ref="PTFE" />
+            <solidref ref="teflonPipeSolid" />
+        </volume>
+
+        <volume name="pipeFilling">
+            <materialref ref="Vacuum" />
+            <solidref ref="pipeFillingSolid" />
+        </volume>
+    </structure>
+    <!-- SHIELDING -->
+    <structure>
+        <volume name="leadBoxVolume">
+            <materialref ref="Lead" />
+            <solidref ref="leadBoxWithShaft" />
+        </volume>
+    </structure>
+    <!-- STEEL PIPE -->
+    <structure>
+        <volume name="steelPipeVolume">
+            <materialref ref="Stainlesssteel" />
+            <solidref ref="steelPipe" />
+        </volume>
+        <volume name="steelPipeVacuum">
+            <materialref ref="Vacuum" />
+            <solidref ref="steelPipeFilling" />
+        </volume>
+    </structure>
+    <!-- VETOES -->
+    <structure>
+        <volume name="scintillatorVolume">
+            <materialref ref="BC408" />
+            <solidref ref="scintillatorBoxSolid" />
+        </volume>
+
+        <volume name="scintillatorVolumeWithRightHole">
+            <materialref ref="BC408" />
+            <solidref ref="scintillatorBoxSolidWithRightHole" />
+        </volume>
+
+        <volume name="scintillatorVolumeWithLeftHole">
+            <materialref ref="BC408" />
+            <solidref ref="scintillatorBoxSolidWithLeftHole" />
+        </volume>
+
+    </structure>
+    <!-- WORLD (physical volumes) -->
+    <structure>
+        <volume name="World">
+            <!-- WORLD -->
+            <materialref ref="Air" />
+            <solidref ref="WorldSolid" />
+            <!-- CHAMBER -->
+            <physvol name="gas">
+                <volumeref ref="gasVolume" />
+                <position name="gasPosition" unit="mm" x="0" y="0" z="0" />
+            </physvol>
+
+            <physvol name="kapton4Readout">
+                <volumeref ref="kaptonReadoutVolume" />
+                <positionref ref="kaptonReadoutPosition" />
+            </physvol>
+
+            <physvol name="CuReadout">
+                <volumeref ref="copperReadoutVolume" />
+                <positionref ref="copperReadoutPosition" />
+                <rotationref ref="copperReadoutRotation" />
+            </physvol>
+
+            <physvol name="CuBackplate">
+                <volumeref ref="backplateVolume" />
+                <position name="backplatePosition" unit="mm" x="0" y="0" z="-chamberLength/2. - backplateThickness/2." />
+            </physvol>
+
+            <physvol name="CuChamber">
+                <volumeref ref="copperChamberVolume" />
+                <position name="copperChamberPosition" unit="mm" x="0" y="0" z="cathodeThickness/2." />
+            </physvol>
+
+            <physvol name="PTFECoverChamber">
+                <volumeref ref="teflonCoverChamberVolume" />
+                <position name="teflonCoverChamberPosition" unit="mm" x="0" y="0" z="copperCathodeThickness/2." />
+            </physvol>
+
+            <physvol name="mylarCat">
+                <volumeref ref="mylarCathodeVolume" />
+                <position name="mylarCathodePositionVolume" unit="mm" x="0" y="0" z="mylarCathodePositionZ" />
+            </physvol>
+
+            <physvol name="CuCathode">
+                <volumeref ref="copperCathodeVolume" />
+                <position name="copperCathodePosition" unit="mm" x="0" y="0" z="chamberLength/2.+copperCathodeThickness/2." />
+            </physvol>
+
+            <physvol name="CuChamberTop">
+                <volumeref ref="copperChamberTopVolume" />
+                <position name="copperChamberTopPosition" unit="mm" x="0" y="0" z="chamberLength/2.+copperCathodeThickness+copperChamberTopThickness/2." />
+            </physvol>
+
+
+            <physvol name="PTFECoverCathode">
+                <volumeref ref="teflonCoverCathodeVolume" />
+                <position name="teflonCoverCathodePosition" unit="mm" x="0" y="0" z="chamberLength/2.+ cathodePatternThickness/2.+copperCathodeThickness/2.+copperChamberTopThickness/2." />
+            </physvol>
+
+            <physvol name="CuCathodePattern">
+                <volumeref ref="cathodePatternVolume" />
+                <position name="cathodePatternPosition" unit="mm" x="0" y="0" z="chamberLength/2.+cathodePatternThickness/2." />
+            </physvol>
+
+            <physvol name="VacCathodePattern">
+                <volumeref ref="vacuumCathodePatternVolume" />
+                <position name="vacuumCathodePatternPosition" unit="mm" x="0" y="0" z="chamberLength/2.+cathodePatternThickness/2." />
+            </physvol>
+            <!-- PIPE -->
+            <physvol name="DetectorTeflonPipe">
+                <volumeref ref="teflonPipeInCopper" />
+                <position name="detectorTeflonPipePosition" unit="mm" x="0" y="0" z="copperPipeZInWorld + teflonWithRespectToPipeOffset" />
+            </physvol>
+
+            <physvol name="DetectorCopperPipe">
+                <volumeref ref="detectorCopperPipe" />
+                <position name="detectorCopperPipePosition" unit="mm" x="0" y="0" z="copperPipeZInWorld" />
+            </physvol>
+
+            <physvol name="PipeFilling">
+                <volumeref ref="pipeFilling" />
+                <position name="detectorFillingPipePosition" unit="mm" x="0" y="0" z="copperPipeZInWorld + vacuumWithRespectToPipeOffset" />
+            </physvol>
+            <!-- SHIELDING -->
+            <physvol name="LeadShielding">
+                <volumeref ref="leadBoxVolume" />
+                <position name="leadBoxPosition" unit="mm" x="0" y="0" z="0 - shieldingOffset" />
+            </physvol>
+            <!-- STEEL PIPE -->
+            <physvol name="SteelPipe">
+                <volumeref ref="steelPipeVolume" />
+                <position name="steelPipePosition" unit="mm" x="0" y="0" z="copperPipeZInWorld + steelPipeWithRespectToCopperPipeOffset" />
+            </physvol>
+            <physvol name="SteelPipeVacuum">
+                <volumeref ref="steelPipeVacuum" />
+                <position name="steelPipePositionVacuum" unit="mm" x="0" y="0" z="copperPipeZInWorld + steelPipeWithRespectToCopperPipeOffset" />
+            </physvol>
+            <!-- BEGIN VETOES -->
+            <!-- BEGIN veto front-->
+            <physvol name="vetoFront1of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoFront1of4Position" unit="mm" x="vetoFrontPosX - 1.5*scintillatorShortSide" y="vetoFrontPosY" z="vetoFrontPosZ - shieldingOffset" />
+                <rotationref ref="vetoFrontRotation" />
+            </physvol>
+            <physvol name="vetoFront2of4">
+                <volumeref ref="scintillatorVolumeWithRightHole" />
+                <position name="vetoFront2of4Position" unit="mm" x="vetoFrontPosX - 0.5*scintillatorShortSide" y="vetoFrontPosY" z="vetoFrontPosZ - shieldingOffset" />
+                <rotationref ref="vetoFrontRotation" />
+            </physvol>
+            <physvol name="vetoFront3of4">
+                <volumeref ref="scintillatorVolumeWithLeftHole" />
+                <position name="vetoFront3of4Position" unit="mm" x="vetoFrontPosX + 0.5*scintillatorShortSide" y="vetoFrontPosY" z="vetoFrontPosZ - shieldingOffset" />
+                <rotationref ref="vetoFrontRotation" />
+            </physvol>
+            <physvol name="vetoFront4of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoFront4of4Position" unit="mm" x="vetoFrontPosX + 1.5*scintillatorShortSide" y="vetoFrontPosY" z="vetoFrontPosZ - shieldingOffset" />
+                <rotationref ref="vetoFrontRotation" />
+            </physvol>
+            <!-- END veto front-->
+
+            <!-- BEGIN veto back-->
+            <physvol name="vetoBack1of3">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoBack1of3Position" unit="mm" x="vetoBackPosX" y="vetoBackPosY - 1*scintillatorShortSide" z="vetoBackPosZ - shieldingOffset" />
+                <rotationref ref="vetoBackRotation" />
+            </physvol>
+            <physvol name="vetoBack2of3">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoBack2of3Position" unit="mm" x="vetoBackPosX" y="vetoBackPosY - 0*scintillatorShortSide" z="vetoBackPosZ - shieldingOffset" />
+                <rotationref ref="vetoBackRotation" />
+            </physvol>
+            <physvol name="vetoBack3of3">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoBack3of3Position" unit="mm" x="vetoBackPosX" y="vetoBackPosY + 1*scintillatorShortSide" z="vetoBackPosZ - shieldingOffset" />
+                <rotationref ref="vetoBackRotation" />
+            </physvol>
+            <!-- END veto back-->
+
+            <!-- BEGIN veto top-->
+            <physvol name="vetoTop1of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoTop1of4Position" unit="mm" x="vetoTopPosX - 1.5*scintillatorShortSide" y="vetoTopPosY" z="vetoTopPosZ - shieldingOffset" />
+                <rotationref ref="vetoTopRotation" />
+            </physvol>
+            <physvol name="vetoTop2of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoTop2of4Position" unit="mm" x="vetoTopPosX - 0.5*scintillatorShortSide" y="vetoTopPosY" z="vetoTopPosZ - shieldingOffset" />
+                <rotationref ref="vetoTopRotation" />
+            </physvol>
+            <physvol name="vetoTop3of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoTop3of4Position" unit="mm" x="vetoTopPosX + 0.5*scintillatorShortSide" y="vetoTopPosY" z="vetoTopPosZ - shieldingOffset" />
+                <rotationref ref="vetoTopRotation" />
+            </physvol>
+            <physvol name="vetoTop4of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoTop4of4Position" unit="mm" x="vetoTopPosX + 1.5*scintillatorShortSide" y="vetoTopPosY" z="vetoTopPosZ - shieldingOffset" />
+                <rotationref ref="vetoTopRotation" />
+            </physvol>
+            <!-- END veto top-->
+
+            <!-- BEGIN veto bottom-->
+            <physvol name="vetoBottom1of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoBottom1of4Position" unit="mm" x="vetoBottomPosX - 1.5*scintillatorShortSide" y="vetoBottomPosY" z="vetoBottomPosZ - shieldingOffset" />
+                <rotationref ref="vetoBottomRotation" />
+            </physvol>
+            <physvol name="vetoBottom2of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoBottom2of4Position" unit="mm" x="vetoBottomPosX - 0.5*scintillatorShortSide" y="vetoBottomPosY" z="vetoBottomPosZ - shieldingOffset" />
+                <rotationref ref="vetoBottomRotation" />
+            </physvol>
+            <physvol name="vetoBottom3of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoBottom3of4Position" unit="mm" x="vetoBottomPosX + 0.5*scintillatorShortSide" y="vetoBottomPosY" z="vetoBottomPosZ - shieldingOffset" />
+                <rotationref ref="vetoBottomRotation" />
+            </physvol>
+            <physvol name="vetoBottom4of4">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoBottom4of4Position" unit="mm" x="vetoBottomPosX + 1.5*scintillatorShortSide" y="vetoBottomPosY" z="vetoBottomPosZ - shieldingOffset" />
+                <rotationref ref="vetoBottomRotation" />
+            </physvol>
+            <!-- END veto bottom-->
+
+            <!-- BEGIN veto east-->
+            <physvol name="vetoEast1of3">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoEast1of3Position" unit="mm" x="vetoEastPosX" y="vetoEastPosY - 1*scintillatorShortSide" z="vetoEastPosZ - shieldingOffset" />
+                <rotationref ref="vetoEastRotation" />
+            </physvol>
+            <physvol name="vetoEast2of3">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoEast2of3Position" unit="mm" x="vetoEastPosX" y="vetoEastPosY + 0*scintillatorShortSide" z="vetoEastPosZ - shieldingOffset" />
+                <rotationref ref="vetoEastRotation" />
+            </physvol>
+            <physvol name="vetoEast3of3">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoEast3of3Position" unit="mm" x="vetoEastPosX" y="vetoEastPosY  + 1*scintillatorShortSide" z="vetoEastPosZ - shieldingOffset" />
+                <rotationref ref="vetoEastRotation" />
+            </physvol>
+            <!-- END veto east-->
+
+            <!-- BEGIN veto west-->
+            <physvol name="vetoWest1of3">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoWest1of3Position" unit="mm" x="vetoWestPosX" y="vetoWestPosY - 1*scintillatorShortSide" z="vetoWestPosZ - shieldingOffset" />
+                <rotationref ref="vetoWestRotation" />
+            </physvol>
+            <physvol name="vetoWest2of3">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoWest2of3Position" unit="mm" x="vetoWestPosX" y="vetoWestPosY + 0*scintillatorShortSide" z="vetoWestPosZ - shieldingOffset" />
+                <rotationref ref="vetoWestRotation" />
+            </physvol>
+            <physvol name="vetoWest3of3">
+                <volumeref ref="scintillatorVolume" />
+                <position name="vetoWest3of3Position" unit="mm" x="vetoWestPosX" y="vetoWestPosY  + 1*scintillatorShortSide" z="vetoWestPosZ - shieldingOffset" />
+                <rotationref ref="vetoWestRotation" />
+            </physvol>
+            <!-- END veto west-->
+            <!-- END VETOES -->
+        </volume>
+    </structure>
+    <!-- ***END STRUCTURE*** -->
+    <!-- ********************* -->
+    <!-- ***BEGIN SETUP*** -->
+    <setup name="Default" version="1.0">
+        <world ref="World" />
+    </setup>
+    <!-- ***END SETUP*** -->
+
+</gdml><?xml version="1.0" encoding="UTF-8" standalone="no" ?>
\ No newline at end of file
diff --git a/demo/solid-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt b/demo/solid-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
index c5d3db45..6ede2c08 100644
--- a/demo/solid-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
+++ b/demo/solid-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
@@ -52,6 +52,12 @@ fun VisionLayout<Solid>.showcase() {
             rotationX = PI / 4
             color("blue")
         }
+        sphereLayer(50,40){
+            theta = (PI/2).toFloat()
+            rotationX = - PI * 3 / 4
+            z = 110
+            color(Colors.pink)
+        }
     }
 
     demo("dynamic", "Dynamic properties") {
diff --git a/demo/solid-showcase/src/jsMain/resources/index.html b/demo/solid-showcase/src/jsMain/resources/index.html
index fbdb962d..45b6c1f3 100644
--- a/demo/solid-showcase/src/jsMain/resources/index.html
+++ b/demo/solid-showcase/src/jsMain/resources/index.html
@@ -10,7 +10,7 @@
 
     <link rel="stylesheet" href="styles.css">
 
-    <script type="text/javascript" src="spatial-showcase.js"></script>
+    <script type="text/javascript" src="solid-showcase.js"></script>
 </head>
 <body class="application">
 <div class="container" id="demo"></div>
diff --git a/ui/bootstrap/build.gradle.kts b/ui/bootstrap/build.gradle.kts
index ed14f9c3..50873978 100644
--- a/ui/bootstrap/build.gradle.kts
+++ b/ui/bootstrap/build.gradle.kts
@@ -8,4 +8,7 @@ dependencies {
     api(project(":visionforge-solid"))
     api(project(":ui:react"))
     implementation(npm("file-saver", "2.0.2"))
+    implementation(npm("bootstrap","4.6.0"))
+    implementation(npm("jquery","3.5.1"))
+    implementation(npm("popper.js","1.16.1"))
 }
\ No newline at end of file
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt
index 9ebdca64..aa9ac5e1 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt
+++ b/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt
@@ -1,5 +1,10 @@
 package hep.dataforge.vision.bootstrap
 
+public fun useBootstrap(){
+    kotlinext.js.require("bootstrap/dist/css/bootstrap.min.css")
+    kotlinext.js.require("bootstrap")
+}
+
 //public inline fun TagConsumer<HTMLElement>.card(title: String, crossinline block: TagConsumer<HTMLElement>.() -> Unit) {
 //    div("card w-100") {
 //        div("card-body") {
diff --git a/ui/bootstrap/src/main/resources/css/bootstrap.min.css b/ui/bootstrap/src/main/resources/css/bootstrap.min.css
deleted file mode 100644
index 86b6845b..00000000
--- a/ui/bootstrap/src/main/resources/css/bootstrap.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Bootstrap v4.4.1 (https://getbootstrap.com/)
- * Copyright 2011-2019 The Bootstrap Authors
- * Copyright 2011-2019 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";--font-family-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace}*,::after,::before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus:not(:focus-visible){outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0;-webkit-text-decoration-skip-ink:none;text-decoration-skip-ink:none}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent}a:hover{color:#0056b3;text-decoration:underline}a:not([href]){color:inherit;text-decoration:none}a:not([href]):hover{color:inherit;text-decoration:none}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg{overflow:hidden;vertical-align:middle}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}select{word-wrap:normal}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{margin-bottom:.5rem;font-weight:500;line-height:1.2}.h1,h1{font-size:2.5rem}.h2,h2{font-size:2rem}.h3,h3{font-size:1.75rem}.h4,h4{font-size:1.5rem}.h5,h5{font-size:1.25rem}.h6,h6{font-size:1rem}.lead{font-size:1.25rem;font-weight:300}.display-1{font-size:6rem;font-weight:300;line-height:1.2}.display-2{font-size:5.5rem;font-weight:300;line-height:1.2}.display-3{font-size:4.5rem;font-weight:300;line-height:1.2}.display-4{font-size:3.5rem;font-weight:300;line-height:1.2}hr{margin-top:1rem;margin-bottom:1rem;border:0;border-top:1px solid rgba(0,0,0,.1)}.small,small{font-size:80%;font-weight:400}.mark,mark{padding:.2em;background-color:#fcf8e3}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline-item{display:inline-block}.list-inline-item:not(:last-child){margin-right:.5rem}.initialism{font-size:90%;text-transform:uppercase}.blockquote{margin-bottom:1rem;font-size:1.25rem}.blockquote-footer{display:block;font-size:80%;color:#6c757d}.blockquote-footer::before{content:"\2014\00A0"}.img-fluid{max-width:100%;height:auto}.img-thumbnail{padding:.25rem;background-color:#fff;border:1px solid #dee2e6;border-radius:.25rem;max-width:100%;height:auto}.figure{display:inline-block}.figure-img{margin-bottom:.5rem;line-height:1}.figure-caption{font-size:90%;color:#6c757d}code{font-size:87.5%;color:#e83e8c;word-wrap:break-word}a>code{color:inherit}kbd{padding:.2rem .4rem;font-size:87.5%;color:#fff;background-color:#212529;border-radius:.2rem}kbd kbd{padding:0;font-size:100%;font-weight:700}pre{display:block;font-size:87.5%;color:#212529}pre code{font-size:inherit;color:inherit;word-break:normal}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:576px){.container{max-width:540px}}@media (min-width:768px){.container{max-width:720px}}@media (min-width:992px){.container{max-width:960px}}@media (min-width:1200px){.container{max-width:1140px}}.container-fluid,.container-lg,.container-md,.container-sm,.container-xl{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:576px){.container,.container-sm{max-width:540px}}@media (min-width:768px){.container,.container-md,.container-sm{max-width:720px}}@media (min-width:992px){.container,.container-lg,.container-md,.container-sm{max-width:960px}}@media (min-width:1200px){.container,.container-lg,.container-md,.container-sm,.container-xl{max-width:1140px}}.row{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-15px;margin-left:-15px}.no-gutters{margin-right:0;margin-left:0}.no-gutters>.col,.no-gutters>[class*=col-]{padding-right:0;padding-left:0}.col,.col-1,.col-10,.col-11,.col-12,.col-2,.col-3,.col-4,.col-5,.col-6,.col-7,.col-8,.col-9,.col-auto,.col-lg,.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-auto,.col-md,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-auto,.col-sm,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-auto,.col-xl,.col-xl-1,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9,.col-xl-auto{position:relative;width:100%;padding-right:15px;padding-left:15px}.col{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}.row-cols-1>*{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.row-cols-2>*{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.row-cols-3>*{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.row-cols-4>*{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.row-cols-5>*{-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}.row-cols-6>*{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}.col-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-first{-ms-flex-order:-1;order:-1}.order-last{-ms-flex-order:13;order:13}.order-0{-ms-flex-order:0;order:0}.order-1{-ms-flex-order:1;order:1}.order-2{-ms-flex-order:2;order:2}.order-3{-ms-flex-order:3;order:3}.order-4{-ms-flex-order:4;order:4}.order-5{-ms-flex-order:5;order:5}.order-6{-ms-flex-order:6;order:6}.order-7{-ms-flex-order:7;order:7}.order-8{-ms-flex-order:8;order:8}.order-9{-ms-flex-order:9;order:9}.order-10{-ms-flex-order:10;order:10}.order-11{-ms-flex-order:11;order:11}.order-12{-ms-flex-order:12;order:12}.offset-1{margin-left:8.333333%}.offset-2{margin-left:16.666667%}.offset-3{margin-left:25%}.offset-4{margin-left:33.333333%}.offset-5{margin-left:41.666667%}.offset-6{margin-left:50%}.offset-7{margin-left:58.333333%}.offset-8{margin-left:66.666667%}.offset-9{margin-left:75%}.offset-10{margin-left:83.333333%}.offset-11{margin-left:91.666667%}@media (min-width:576px){.col-sm{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}.row-cols-sm-1>*{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.row-cols-sm-2>*{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.row-cols-sm-3>*{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.row-cols-sm-4>*{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.row-cols-sm-5>*{-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}.row-cols-sm-6>*{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-sm-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}.col-sm-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-sm-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-sm-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-sm-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-sm-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-sm-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-sm-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-sm-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-sm-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-sm-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-sm-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-sm-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-sm-first{-ms-flex-order:-1;order:-1}.order-sm-last{-ms-flex-order:13;order:13}.order-sm-0{-ms-flex-order:0;order:0}.order-sm-1{-ms-flex-order:1;order:1}.order-sm-2{-ms-flex-order:2;order:2}.order-sm-3{-ms-flex-order:3;order:3}.order-sm-4{-ms-flex-order:4;order:4}.order-sm-5{-ms-flex-order:5;order:5}.order-sm-6{-ms-flex-order:6;order:6}.order-sm-7{-ms-flex-order:7;order:7}.order-sm-8{-ms-flex-order:8;order:8}.order-sm-9{-ms-flex-order:9;order:9}.order-sm-10{-ms-flex-order:10;order:10}.order-sm-11{-ms-flex-order:11;order:11}.order-sm-12{-ms-flex-order:12;order:12}.offset-sm-0{margin-left:0}.offset-sm-1{margin-left:8.333333%}.offset-sm-2{margin-left:16.666667%}.offset-sm-3{margin-left:25%}.offset-sm-4{margin-left:33.333333%}.offset-sm-5{margin-left:41.666667%}.offset-sm-6{margin-left:50%}.offset-sm-7{margin-left:58.333333%}.offset-sm-8{margin-left:66.666667%}.offset-sm-9{margin-left:75%}.offset-sm-10{margin-left:83.333333%}.offset-sm-11{margin-left:91.666667%}}@media (min-width:768px){.col-md{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}.row-cols-md-1>*{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.row-cols-md-2>*{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.row-cols-md-3>*{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.row-cols-md-4>*{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.row-cols-md-5>*{-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}.row-cols-md-6>*{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-md-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}.col-md-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-md-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-md-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-md-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-md-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-md-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-md-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-md-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-md-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-md-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-md-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-md-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-md-first{-ms-flex-order:-1;order:-1}.order-md-last{-ms-flex-order:13;order:13}.order-md-0{-ms-flex-order:0;order:0}.order-md-1{-ms-flex-order:1;order:1}.order-md-2{-ms-flex-order:2;order:2}.order-md-3{-ms-flex-order:3;order:3}.order-md-4{-ms-flex-order:4;order:4}.order-md-5{-ms-flex-order:5;order:5}.order-md-6{-ms-flex-order:6;order:6}.order-md-7{-ms-flex-order:7;order:7}.order-md-8{-ms-flex-order:8;order:8}.order-md-9{-ms-flex-order:9;order:9}.order-md-10{-ms-flex-order:10;order:10}.order-md-11{-ms-flex-order:11;order:11}.order-md-12{-ms-flex-order:12;order:12}.offset-md-0{margin-left:0}.offset-md-1{margin-left:8.333333%}.offset-md-2{margin-left:16.666667%}.offset-md-3{margin-left:25%}.offset-md-4{margin-left:33.333333%}.offset-md-5{margin-left:41.666667%}.offset-md-6{margin-left:50%}.offset-md-7{margin-left:58.333333%}.offset-md-8{margin-left:66.666667%}.offset-md-9{margin-left:75%}.offset-md-10{margin-left:83.333333%}.offset-md-11{margin-left:91.666667%}}@media (min-width:992px){.col-lg{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}.row-cols-lg-1>*{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.row-cols-lg-2>*{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.row-cols-lg-3>*{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.row-cols-lg-4>*{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.row-cols-lg-5>*{-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}.row-cols-lg-6>*{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-lg-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}.col-lg-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-lg-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-lg-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-lg-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-lg-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-lg-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-lg-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-lg-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-lg-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-lg-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-lg-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-lg-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-lg-first{-ms-flex-order:-1;order:-1}.order-lg-last{-ms-flex-order:13;order:13}.order-lg-0{-ms-flex-order:0;order:0}.order-lg-1{-ms-flex-order:1;order:1}.order-lg-2{-ms-flex-order:2;order:2}.order-lg-3{-ms-flex-order:3;order:3}.order-lg-4{-ms-flex-order:4;order:4}.order-lg-5{-ms-flex-order:5;order:5}.order-lg-6{-ms-flex-order:6;order:6}.order-lg-7{-ms-flex-order:7;order:7}.order-lg-8{-ms-flex-order:8;order:8}.order-lg-9{-ms-flex-order:9;order:9}.order-lg-10{-ms-flex-order:10;order:10}.order-lg-11{-ms-flex-order:11;order:11}.order-lg-12{-ms-flex-order:12;order:12}.offset-lg-0{margin-left:0}.offset-lg-1{margin-left:8.333333%}.offset-lg-2{margin-left:16.666667%}.offset-lg-3{margin-left:25%}.offset-lg-4{margin-left:33.333333%}.offset-lg-5{margin-left:41.666667%}.offset-lg-6{margin-left:50%}.offset-lg-7{margin-left:58.333333%}.offset-lg-8{margin-left:66.666667%}.offset-lg-9{margin-left:75%}.offset-lg-10{margin-left:83.333333%}.offset-lg-11{margin-left:91.666667%}}@media (min-width:1200px){.col-xl{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}.row-cols-xl-1>*{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.row-cols-xl-2>*{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.row-cols-xl-3>*{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.row-cols-xl-4>*{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.row-cols-xl-5>*{-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}.row-cols-xl-6>*{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-xl-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}.col-xl-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-xl-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-xl-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-xl-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-xl-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-xl-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-xl-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-xl-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-xl-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-xl-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-xl-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-xl-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-xl-first{-ms-flex-order:-1;order:-1}.order-xl-last{-ms-flex-order:13;order:13}.order-xl-0{-ms-flex-order:0;order:0}.order-xl-1{-ms-flex-order:1;order:1}.order-xl-2{-ms-flex-order:2;order:2}.order-xl-3{-ms-flex-order:3;order:3}.order-xl-4{-ms-flex-order:4;order:4}.order-xl-5{-ms-flex-order:5;order:5}.order-xl-6{-ms-flex-order:6;order:6}.order-xl-7{-ms-flex-order:7;order:7}.order-xl-8{-ms-flex-order:8;order:8}.order-xl-9{-ms-flex-order:9;order:9}.order-xl-10{-ms-flex-order:10;order:10}.order-xl-11{-ms-flex-order:11;order:11}.order-xl-12{-ms-flex-order:12;order:12}.offset-xl-0{margin-left:0}.offset-xl-1{margin-left:8.333333%}.offset-xl-2{margin-left:16.666667%}.offset-xl-3{margin-left:25%}.offset-xl-4{margin-left:33.333333%}.offset-xl-5{margin-left:41.666667%}.offset-xl-6{margin-left:50%}.offset-xl-7{margin-left:58.333333%}.offset-xl-8{margin-left:66.666667%}.offset-xl-9{margin-left:75%}.offset-xl-10{margin-left:83.333333%}.offset-xl-11{margin-left:91.666667%}}.table{width:100%;margin-bottom:1rem;color:#212529}.table td,.table th{padding:.75rem;vertical-align:top;border-top:1px solid #dee2e6}.table thead th{vertical-align:bottom;border-bottom:2px solid #dee2e6}.table tbody+tbody{border-top:2px solid #dee2e6}.table-sm td,.table-sm th{padding:.3rem}.table-bordered{border:1px solid #dee2e6}.table-bordered td,.table-bordered th{border:1px solid #dee2e6}.table-bordered thead td,.table-bordered thead th{border-bottom-width:2px}.table-borderless tbody+tbody,.table-borderless td,.table-borderless th,.table-borderless thead th{border:0}.table-striped tbody tr:nth-of-type(odd){background-color:rgba(0,0,0,.05)}.table-hover tbody tr:hover{color:#212529;background-color:rgba(0,0,0,.075)}.table-primary,.table-primary>td,.table-primary>th{background-color:#b8daff}.table-primary tbody+tbody,.table-primary td,.table-primary th,.table-primary thead th{border-color:#7abaff}.table-hover .table-primary:hover{background-color:#9fcdff}.table-hover .table-primary:hover>td,.table-hover .table-primary:hover>th{background-color:#9fcdff}.table-secondary,.table-secondary>td,.table-secondary>th{background-color:#d6d8db}.table-secondary tbody+tbody,.table-secondary td,.table-secondary th,.table-secondary thead th{border-color:#b3b7bb}.table-hover .table-secondary:hover{background-color:#c8cbcf}.table-hover .table-secondary:hover>td,.table-hover .table-secondary:hover>th{background-color:#c8cbcf}.table-success,.table-success>td,.table-success>th{background-color:#c3e6cb}.table-success tbody+tbody,.table-success td,.table-success th,.table-success thead th{border-color:#8fd19e}.table-hover .table-success:hover{background-color:#b1dfbb}.table-hover .table-success:hover>td,.table-hover .table-success:hover>th{background-color:#b1dfbb}.table-info,.table-info>td,.table-info>th{background-color:#bee5eb}.table-info tbody+tbody,.table-info td,.table-info th,.table-info thead th{border-color:#86cfda}.table-hover .table-info:hover{background-color:#abdde5}.table-hover .table-info:hover>td,.table-hover .table-info:hover>th{background-color:#abdde5}.table-warning,.table-warning>td,.table-warning>th{background-color:#ffeeba}.table-warning tbody+tbody,.table-warning td,.table-warning th,.table-warning thead th{border-color:#ffdf7e}.table-hover .table-warning:hover{background-color:#ffe8a1}.table-hover .table-warning:hover>td,.table-hover .table-warning:hover>th{background-color:#ffe8a1}.table-danger,.table-danger>td,.table-danger>th{background-color:#f5c6cb}.table-danger tbody+tbody,.table-danger td,.table-danger th,.table-danger thead th{border-color:#ed969e}.table-hover .table-danger:hover{background-color:#f1b0b7}.table-hover .table-danger:hover>td,.table-hover .table-danger:hover>th{background-color:#f1b0b7}.table-light,.table-light>td,.table-light>th{background-color:#fdfdfe}.table-light tbody+tbody,.table-light td,.table-light th,.table-light thead th{border-color:#fbfcfc}.table-hover .table-light:hover{background-color:#ececf6}.table-hover .table-light:hover>td,.table-hover .table-light:hover>th{background-color:#ececf6}.table-dark,.table-dark>td,.table-dark>th{background-color:#c6c8ca}.table-dark tbody+tbody,.table-dark td,.table-dark th,.table-dark thead th{border-color:#95999c}.table-hover .table-dark:hover{background-color:#b9bbbe}.table-hover .table-dark:hover>td,.table-hover .table-dark:hover>th{background-color:#b9bbbe}.table-active,.table-active>td,.table-active>th{background-color:rgba(0,0,0,.075)}.table-hover .table-active:hover{background-color:rgba(0,0,0,.075)}.table-hover .table-active:hover>td,.table-hover .table-active:hover>th{background-color:rgba(0,0,0,.075)}.table .thead-dark th{color:#fff;background-color:#343a40;border-color:#454d55}.table .thead-light th{color:#495057;background-color:#e9ecef;border-color:#dee2e6}.table-dark{color:#fff;background-color:#343a40}.table-dark td,.table-dark th,.table-dark thead th{border-color:#454d55}.table-dark.table-bordered{border:0}.table-dark.table-striped tbody tr:nth-of-type(odd){background-color:rgba(255,255,255,.05)}.table-dark.table-hover tbody tr:hover{color:#fff;background-color:rgba(255,255,255,.075)}@media (max-width:575.98px){.table-responsive-sm{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-sm>.table-bordered{border:0}}@media (max-width:767.98px){.table-responsive-md{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-md>.table-bordered{border:0}}@media (max-width:991.98px){.table-responsive-lg{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-lg>.table-bordered{border:0}}@media (max-width:1199.98px){.table-responsive-xl{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-xl>.table-bordered{border:0}}.table-responsive{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive>.table-bordered{border:0}.form-control{display:block;width:100%;height:calc(1.5em + .75rem + 2px);padding:.375rem .75rem;font-size:1rem;font-weight:400;line-height:1.5;color:#495057;background-color:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.form-control{transition:none}}.form-control::-ms-expand{background-color:transparent;border:0}.form-control:-moz-focusring{color:transparent;text-shadow:0 0 0 #495057}.form-control:focus{color:#495057;background-color:#fff;border-color:#80bdff;outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.form-control::-webkit-input-placeholder{color:#6c757d;opacity:1}.form-control::-moz-placeholder{color:#6c757d;opacity:1}.form-control:-ms-input-placeholder{color:#6c757d;opacity:1}.form-control::-ms-input-placeholder{color:#6c757d;opacity:1}.form-control::placeholder{color:#6c757d;opacity:1}.form-control:disabled,.form-control[readonly]{background-color:#e9ecef;opacity:1}select.form-control:focus::-ms-value{color:#495057;background-color:#fff}.form-control-file,.form-control-range{display:block;width:100%}.col-form-label{padding-top:calc(.375rem + 1px);padding-bottom:calc(.375rem + 1px);margin-bottom:0;font-size:inherit;line-height:1.5}.col-form-label-lg{padding-top:calc(.5rem + 1px);padding-bottom:calc(.5rem + 1px);font-size:1.25rem;line-height:1.5}.col-form-label-sm{padding-top:calc(.25rem + 1px);padding-bottom:calc(.25rem + 1px);font-size:.875rem;line-height:1.5}.form-control-plaintext{display:block;width:100%;padding:.375rem 0;margin-bottom:0;font-size:1rem;line-height:1.5;color:#212529;background-color:transparent;border:solid transparent;border-width:1px 0}.form-control-plaintext.form-control-lg,.form-control-plaintext.form-control-sm{padding-right:0;padding-left:0}.form-control-sm{height:calc(1.5em + .5rem + 2px);padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:.2rem}.form-control-lg{height:calc(1.5em + 1rem + 2px);padding:.5rem 1rem;font-size:1.25rem;line-height:1.5;border-radius:.3rem}select.form-control[multiple],select.form-control[size]{height:auto}textarea.form-control{height:auto}.form-group{margin-bottom:1rem}.form-text{display:block;margin-top:.25rem}.form-row{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-5px;margin-left:-5px}.form-row>.col,.form-row>[class*=col-]{padding-right:5px;padding-left:5px}.form-check{position:relative;display:block;padding-left:1.25rem}.form-check-input{position:absolute;margin-top:.3rem;margin-left:-1.25rem}.form-check-input:disabled~.form-check-label,.form-check-input[disabled]~.form-check-label{color:#6c757d}.form-check-label{margin-bottom:0}.form-check-inline{display:-ms-inline-flexbox;display:inline-flex;-ms-flex-align:center;align-items:center;padding-left:0;margin-right:.75rem}.form-check-inline .form-check-input{position:static;margin-top:0;margin-right:.3125rem;margin-left:0}.valid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#28a745}.valid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.25rem .5rem;margin-top:.1rem;font-size:.875rem;line-height:1.5;color:#fff;background-color:rgba(40,167,69,.9);border-radius:.25rem}.is-valid~.valid-feedback,.is-valid~.valid-tooltip,.was-validated :valid~.valid-feedback,.was-validated :valid~.valid-tooltip{display:block}.form-control.is-valid,.was-validated .form-control:valid{border-color:#28a745;padding-right:calc(1.5em + .75rem);background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");background-repeat:no-repeat;background-position:right calc(.375em + .1875rem) center;background-size:calc(.75em + .375rem) calc(.75em + .375rem)}.form-control.is-valid:focus,.was-validated .form-control:valid:focus{border-color:#28a745;box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.was-validated textarea.form-control:valid,textarea.form-control.is-valid{padding-right:calc(1.5em + .75rem);background-position:top calc(.375em + .1875rem) right calc(.375em + .1875rem)}.custom-select.is-valid,.was-validated .custom-select:valid{border-color:#28a745;padding-right:calc(.75em + 2.3125rem);background:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right .75rem center/8px 10px,url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e") #fff no-repeat center right 1.75rem/calc(.75em + .375rem) calc(.75em + .375rem)}.custom-select.is-valid:focus,.was-validated .custom-select:valid:focus{border-color:#28a745;box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.form-check-input.is-valid~.form-check-label,.was-validated .form-check-input:valid~.form-check-label{color:#28a745}.form-check-input.is-valid~.valid-feedback,.form-check-input.is-valid~.valid-tooltip,.was-validated .form-check-input:valid~.valid-feedback,.was-validated .form-check-input:valid~.valid-tooltip{display:block}.custom-control-input.is-valid~.custom-control-label,.was-validated .custom-control-input:valid~.custom-control-label{color:#28a745}.custom-control-input.is-valid~.custom-control-label::before,.was-validated .custom-control-input:valid~.custom-control-label::before{border-color:#28a745}.custom-control-input.is-valid:checked~.custom-control-label::before,.was-validated .custom-control-input:valid:checked~.custom-control-label::before{border-color:#34ce57;background-color:#34ce57}.custom-control-input.is-valid:focus~.custom-control-label::before,.was-validated .custom-control-input:valid:focus~.custom-control-label::before{box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.custom-control-input.is-valid:focus:not(:checked)~.custom-control-label::before,.was-validated .custom-control-input:valid:focus:not(:checked)~.custom-control-label::before{border-color:#28a745}.custom-file-input.is-valid~.custom-file-label,.was-validated .custom-file-input:valid~.custom-file-label{border-color:#28a745}.custom-file-input.is-valid:focus~.custom-file-label,.was-validated .custom-file-input:valid:focus~.custom-file-label{border-color:#28a745;box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.invalid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#dc3545}.invalid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.25rem .5rem;margin-top:.1rem;font-size:.875rem;line-height:1.5;color:#fff;background-color:rgba(220,53,69,.9);border-radius:.25rem}.is-invalid~.invalid-feedback,.is-invalid~.invalid-tooltip,.was-validated :invalid~.invalid-feedback,.was-validated :invalid~.invalid-tooltip{display:block}.form-control.is-invalid,.was-validated .form-control:invalid{border-color:#dc3545;padding-right:calc(1.5em + .75rem);background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e");background-repeat:no-repeat;background-position:right calc(.375em + .1875rem) center;background-size:calc(.75em + .375rem) calc(.75em + .375rem)}.form-control.is-invalid:focus,.was-validated .form-control:invalid:focus{border-color:#dc3545;box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.was-validated textarea.form-control:invalid,textarea.form-control.is-invalid{padding-right:calc(1.5em + .75rem);background-position:top calc(.375em + .1875rem) right calc(.375em + .1875rem)}.custom-select.is-invalid,.was-validated .custom-select:invalid{border-color:#dc3545;padding-right:calc(.75em + 2.3125rem);background:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right .75rem center/8px 10px,url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e") #fff no-repeat center right 1.75rem/calc(.75em + .375rem) calc(.75em + .375rem)}.custom-select.is-invalid:focus,.was-validated .custom-select:invalid:focus{border-color:#dc3545;box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.form-check-input.is-invalid~.form-check-label,.was-validated .form-check-input:invalid~.form-check-label{color:#dc3545}.form-check-input.is-invalid~.invalid-feedback,.form-check-input.is-invalid~.invalid-tooltip,.was-validated .form-check-input:invalid~.invalid-feedback,.was-validated .form-check-input:invalid~.invalid-tooltip{display:block}.custom-control-input.is-invalid~.custom-control-label,.was-validated .custom-control-input:invalid~.custom-control-label{color:#dc3545}.custom-control-input.is-invalid~.custom-control-label::before,.was-validated .custom-control-input:invalid~.custom-control-label::before{border-color:#dc3545}.custom-control-input.is-invalid:checked~.custom-control-label::before,.was-validated .custom-control-input:invalid:checked~.custom-control-label::before{border-color:#e4606d;background-color:#e4606d}.custom-control-input.is-invalid:focus~.custom-control-label::before,.was-validated .custom-control-input:invalid:focus~.custom-control-label::before{box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.custom-control-input.is-invalid:focus:not(:checked)~.custom-control-label::before,.was-validated .custom-control-input:invalid:focus:not(:checked)~.custom-control-label::before{border-color:#dc3545}.custom-file-input.is-invalid~.custom-file-label,.was-validated .custom-file-input:invalid~.custom-file-label{border-color:#dc3545}.custom-file-input.is-invalid:focus~.custom-file-label,.was-validated .custom-file-input:invalid:focus~.custom-file-label{border-color:#dc3545;box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.form-inline{display:-ms-flexbox;display:flex;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-align:center;align-items:center}.form-inline .form-check{width:100%}@media (min-width:576px){.form-inline label{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;margin-bottom:0}.form-inline .form-group{display:-ms-flexbox;display:flex;-ms-flex:0 0 auto;flex:0 0 auto;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-align:center;align-items:center;margin-bottom:0}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-plaintext{display:inline-block}.form-inline .custom-select,.form-inline .input-group{width:auto}.form-inline .form-check{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;width:auto;padding-left:0}.form-inline .form-check-input{position:relative;-ms-flex-negative:0;flex-shrink:0;margin-top:0;margin-right:.25rem;margin-left:0}.form-inline .custom-control{-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center}.form-inline .custom-control-label{margin-bottom:0}}.btn{display:inline-block;font-weight:400;color:#212529;text-align:center;vertical-align:middle;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:transparent;border:1px solid transparent;padding:.375rem .75rem;font-size:1rem;line-height:1.5;border-radius:.25rem;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.btn{transition:none}}.btn:hover{color:#212529;text-decoration:none}.btn.focus,.btn:focus{outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.btn.disabled,.btn:disabled{opacity:.65}a.btn.disabled,fieldset:disabled a.btn{pointer-events:none}.btn-primary{color:#fff;background-color:#007bff;border-color:#007bff}.btn-primary:hover{color:#fff;background-color:#0069d9;border-color:#0062cc}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#0069d9;border-color:#0062cc;box-shadow:0 0 0 .2rem rgba(38,143,255,.5)}.btn-primary.disabled,.btn-primary:disabled{color:#fff;background-color:#007bff;border-color:#007bff}.btn-primary:not(:disabled):not(.disabled).active,.btn-primary:not(:disabled):not(.disabled):active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#0062cc;border-color:#005cbf}.btn-primary:not(:disabled):not(.disabled).active:focus,.btn-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(38,143,255,.5)}.btn-secondary{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-secondary:hover{color:#fff;background-color:#5a6268;border-color:#545b62}.btn-secondary.focus,.btn-secondary:focus{color:#fff;background-color:#5a6268;border-color:#545b62;box-shadow:0 0 0 .2rem rgba(130,138,145,.5)}.btn-secondary.disabled,.btn-secondary:disabled{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-secondary:not(:disabled):not(.disabled).active,.btn-secondary:not(:disabled):not(.disabled):active,.show>.btn-secondary.dropdown-toggle{color:#fff;background-color:#545b62;border-color:#4e555b}.btn-secondary:not(:disabled):not(.disabled).active:focus,.btn-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-secondary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(130,138,145,.5)}.btn-success{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success:hover{color:#fff;background-color:#218838;border-color:#1e7e34}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#218838;border-color:#1e7e34;box-shadow:0 0 0 .2rem rgba(72,180,97,.5)}.btn-success.disabled,.btn-success:disabled{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success:not(:disabled):not(.disabled).active,.btn-success:not(:disabled):not(.disabled):active,.show>.btn-success.dropdown-toggle{color:#fff;background-color:#1e7e34;border-color:#1c7430}.btn-success:not(:disabled):not(.disabled).active:focus,.btn-success:not(:disabled):not(.disabled):active:focus,.show>.btn-success.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(72,180,97,.5)}.btn-info{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info:hover{color:#fff;background-color:#138496;border-color:#117a8b}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#138496;border-color:#117a8b;box-shadow:0 0 0 .2rem rgba(58,176,195,.5)}.btn-info.disabled,.btn-info:disabled{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info:not(:disabled):not(.disabled).active,.btn-info:not(:disabled):not(.disabled):active,.show>.btn-info.dropdown-toggle{color:#fff;background-color:#117a8b;border-color:#10707f}.btn-info:not(:disabled):not(.disabled).active:focus,.btn-info:not(:disabled):not(.disabled):active:focus,.show>.btn-info.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(58,176,195,.5)}.btn-warning{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-warning:hover{color:#212529;background-color:#e0a800;border-color:#d39e00}.btn-warning.focus,.btn-warning:focus{color:#212529;background-color:#e0a800;border-color:#d39e00;box-shadow:0 0 0 .2rem rgba(222,170,12,.5)}.btn-warning.disabled,.btn-warning:disabled{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-warning:not(:disabled):not(.disabled).active,.btn-warning:not(:disabled):not(.disabled):active,.show>.btn-warning.dropdown-toggle{color:#212529;background-color:#d39e00;border-color:#c69500}.btn-warning:not(:disabled):not(.disabled).active:focus,.btn-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-warning.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(222,170,12,.5)}.btn-danger{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger:hover{color:#fff;background-color:#c82333;border-color:#bd2130}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c82333;border-color:#bd2130;box-shadow:0 0 0 .2rem rgba(225,83,97,.5)}.btn-danger.disabled,.btn-danger:disabled{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger:not(:disabled):not(.disabled).active,.btn-danger:not(:disabled):not(.disabled):active,.show>.btn-danger.dropdown-toggle{color:#fff;background-color:#bd2130;border-color:#b21f2d}.btn-danger:not(:disabled):not(.disabled).active:focus,.btn-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-danger.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(225,83,97,.5)}.btn-light{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-light:hover{color:#212529;background-color:#e2e6ea;border-color:#dae0e5}.btn-light.focus,.btn-light:focus{color:#212529;background-color:#e2e6ea;border-color:#dae0e5;box-shadow:0 0 0 .2rem rgba(216,217,219,.5)}.btn-light.disabled,.btn-light:disabled{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-light:not(:disabled):not(.disabled).active,.btn-light:not(:disabled):not(.disabled):active,.show>.btn-light.dropdown-toggle{color:#212529;background-color:#dae0e5;border-color:#d3d9df}.btn-light:not(:disabled):not(.disabled).active:focus,.btn-light:not(:disabled):not(.disabled):active:focus,.show>.btn-light.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(216,217,219,.5)}.btn-dark{color:#fff;background-color:#343a40;border-color:#343a40}.btn-dark:hover{color:#fff;background-color:#23272b;border-color:#1d2124}.btn-dark.focus,.btn-dark:focus{color:#fff;background-color:#23272b;border-color:#1d2124;box-shadow:0 0 0 .2rem rgba(82,88,93,.5)}.btn-dark.disabled,.btn-dark:disabled{color:#fff;background-color:#343a40;border-color:#343a40}.btn-dark:not(:disabled):not(.disabled).active,.btn-dark:not(:disabled):not(.disabled):active,.show>.btn-dark.dropdown-toggle{color:#fff;background-color:#1d2124;border-color:#171a1d}.btn-dark:not(:disabled):not(.disabled).active:focus,.btn-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-dark.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(82,88,93,.5)}.btn-outline-primary{color:#007bff;border-color:#007bff}.btn-outline-primary:hover{color:#fff;background-color:#007bff;border-color:#007bff}.btn-outline-primary.focus,.btn-outline-primary:focus{box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-outline-primary.disabled,.btn-outline-primary:disabled{color:#007bff;background-color:transparent}.btn-outline-primary:not(:disabled):not(.disabled).active,.btn-outline-primary:not(:disabled):not(.disabled):active,.show>.btn-outline-primary.dropdown-toggle{color:#fff;background-color:#007bff;border-color:#007bff}.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.btn-outline-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-outline-secondary{color:#6c757d;border-color:#6c757d}.btn-outline-secondary:hover{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-outline-secondary.focus,.btn-outline-secondary:focus{box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}.btn-outline-secondary.disabled,.btn-outline-secondary:disabled{color:#6c757d;background-color:transparent}.btn-outline-secondary:not(:disabled):not(.disabled).active,.btn-outline-secondary:not(:disabled):not(.disabled):active,.show>.btn-outline-secondary.dropdown-toggle{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-outline-secondary:not(:disabled):not(.disabled).active:focus,.btn-outline-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-secondary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}.btn-outline-success{color:#28a745;border-color:#28a745}.btn-outline-success:hover{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success.focus,.btn-outline-success:focus{box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-outline-success.disabled,.btn-outline-success:disabled{color:#28a745;background-color:transparent}.btn-outline-success:not(:disabled):not(.disabled).active,.btn-outline-success:not(:disabled):not(.disabled):active,.show>.btn-outline-success.dropdown-toggle{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success:not(:disabled):not(.disabled).active:focus,.btn-outline-success:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-success.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-outline-info{color:#17a2b8;border-color:#17a2b8}.btn-outline-info:hover{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info.focus,.btn-outline-info:focus{box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-outline-info.disabled,.btn-outline-info:disabled{color:#17a2b8;background-color:transparent}.btn-outline-info:not(:disabled):not(.disabled).active,.btn-outline-info:not(:disabled):not(.disabled):active,.show>.btn-outline-info.dropdown-toggle{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info:not(:disabled):not(.disabled).active:focus,.btn-outline-info:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-info.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-outline-warning{color:#ffc107;border-color:#ffc107}.btn-outline-warning:hover{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning.focus,.btn-outline-warning:focus{box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-outline-warning.disabled,.btn-outline-warning:disabled{color:#ffc107;background-color:transparent}.btn-outline-warning:not(:disabled):not(.disabled).active,.btn-outline-warning:not(:disabled):not(.disabled):active,.show>.btn-outline-warning.dropdown-toggle{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning:not(:disabled):not(.disabled).active:focus,.btn-outline-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-warning.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-outline-danger{color:#dc3545;border-color:#dc3545}.btn-outline-danger:hover{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger.focus,.btn-outline-danger:focus{box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-outline-danger.disabled,.btn-outline-danger:disabled{color:#dc3545;background-color:transparent}.btn-outline-danger:not(:disabled):not(.disabled).active,.btn-outline-danger:not(:disabled):not(.disabled):active,.show>.btn-outline-danger.dropdown-toggle{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger:not(:disabled):not(.disabled).active:focus,.btn-outline-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-danger.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-outline-light{color:#f8f9fa;border-color:#f8f9fa}.btn-outline-light:hover{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-outline-light.focus,.btn-outline-light:focus{box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-outline-light.disabled,.btn-outline-light:disabled{color:#f8f9fa;background-color:transparent}.btn-outline-light:not(:disabled):not(.disabled).active,.btn-outline-light:not(:disabled):not(.disabled):active,.show>.btn-outline-light.dropdown-toggle{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-outline-light:not(:disabled):not(.disabled).active:focus,.btn-outline-light:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-outline-dark{color:#343a40;border-color:#343a40}.btn-outline-dark:hover{color:#fff;background-color:#343a40;border-color:#343a40}.btn-outline-dark.focus,.btn-outline-dark:focus{box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-outline-dark.disabled,.btn-outline-dark:disabled{color:#343a40;background-color:transparent}.btn-outline-dark:not(:disabled):not(.disabled).active,.btn-outline-dark:not(:disabled):not(.disabled):active,.show>.btn-outline-dark.dropdown-toggle{color:#fff;background-color:#343a40;border-color:#343a40}.btn-outline-dark:not(:disabled):not(.disabled).active:focus,.btn-outline-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-dark.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-link{font-weight:400;color:#007bff;text-decoration:none}.btn-link:hover{color:#0056b3;text-decoration:underline}.btn-link.focus,.btn-link:focus{text-decoration:underline;box-shadow:none}.btn-link.disabled,.btn-link:disabled{color:#6c757d;pointer-events:none}.btn-group-lg>.btn,.btn-lg{padding:.5rem 1rem;font-size:1.25rem;line-height:1.5;border-radius:.3rem}.btn-group-sm>.btn,.btn-sm{padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:.2rem}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:.5rem}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{transition:opacity .15s linear}@media (prefers-reduced-motion:reduce){.fade{transition:none}}.fade:not(.show){opacity:0}.collapse:not(.show){display:none}.collapsing{position:relative;height:0;overflow:hidden;transition:height .35s ease}@media (prefers-reduced-motion:reduce){.collapsing{transition:none}}.dropdown,.dropleft,.dropright,.dropup{position:relative}.dropdown-toggle{white-space:nowrap}.dropdown-toggle::after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid;border-right:.3em solid transparent;border-bottom:0;border-left:.3em solid transparent}.dropdown-toggle:empty::after{margin-left:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:10rem;padding:.5rem 0;margin:.125rem 0 0;font-size:1rem;color:#212529;text-align:left;list-style:none;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.15);border-radius:.25rem}.dropdown-menu-left{right:auto;left:0}.dropdown-menu-right{right:0;left:auto}@media (min-width:576px){.dropdown-menu-sm-left{right:auto;left:0}.dropdown-menu-sm-right{right:0;left:auto}}@media (min-width:768px){.dropdown-menu-md-left{right:auto;left:0}.dropdown-menu-md-right{right:0;left:auto}}@media (min-width:992px){.dropdown-menu-lg-left{right:auto;left:0}.dropdown-menu-lg-right{right:0;left:auto}}@media (min-width:1200px){.dropdown-menu-xl-left{right:auto;left:0}.dropdown-menu-xl-right{right:0;left:auto}}.dropup .dropdown-menu{top:auto;bottom:100%;margin-top:0;margin-bottom:.125rem}.dropup .dropdown-toggle::after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:0;border-right:.3em solid transparent;border-bottom:.3em solid;border-left:.3em solid transparent}.dropup .dropdown-toggle:empty::after{margin-left:0}.dropright .dropdown-menu{top:0;right:auto;left:100%;margin-top:0;margin-left:.125rem}.dropright .dropdown-toggle::after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:0;border-bottom:.3em solid transparent;border-left:.3em solid}.dropright .dropdown-toggle:empty::after{margin-left:0}.dropright .dropdown-toggle::after{vertical-align:0}.dropleft .dropdown-menu{top:0;right:100%;left:auto;margin-top:0;margin-right:.125rem}.dropleft .dropdown-toggle::after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:""}.dropleft .dropdown-toggle::after{display:none}.dropleft .dropdown-toggle::before{display:inline-block;margin-right:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:.3em solid;border-bottom:.3em solid transparent}.dropleft .dropdown-toggle:empty::after{margin-left:0}.dropleft .dropdown-toggle::before{vertical-align:0}.dropdown-menu[x-placement^=bottom],.dropdown-menu[x-placement^=left],.dropdown-menu[x-placement^=right],.dropdown-menu[x-placement^=top]{right:auto;bottom:auto}.dropdown-divider{height:0;margin:.5rem 0;overflow:hidden;border-top:1px solid #e9ecef}.dropdown-item{display:block;width:100%;padding:.25rem 1.5rem;clear:both;font-weight:400;color:#212529;text-align:inherit;white-space:nowrap;background-color:transparent;border:0}.dropdown-item:focus,.dropdown-item:hover{color:#16181b;text-decoration:none;background-color:#f8f9fa}.dropdown-item.active,.dropdown-item:active{color:#fff;text-decoration:none;background-color:#007bff}.dropdown-item.disabled,.dropdown-item:disabled{color:#6c757d;pointer-events:none;background-color:transparent}.dropdown-menu.show{display:block}.dropdown-header{display:block;padding:.5rem 1.5rem;margin-bottom:0;font-size:.875rem;color:#6c757d;white-space:nowrap}.dropdown-item-text{display:block;padding:.25rem 1.5rem;color:#212529}.btn-group,.btn-group-vertical{position:relative;display:-ms-inline-flexbox;display:inline-flex;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;-ms-flex:1 1 auto;flex:1 1 auto}.btn-group-vertical>.btn:hover,.btn-group>.btn:hover{z-index:1}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus{z-index:1}.btn-toolbar{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-pack:start;justify-content:flex-start}.btn-toolbar .input-group{width:auto}.btn-group>.btn-group:not(:first-child),.btn-group>.btn:not(:first-child){margin-left:-1px}.btn-group>.btn-group:not(:last-child)>.btn,.btn-group>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:not(:first-child)>.btn,.btn-group>.btn:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.dropdown-toggle-split{padding-right:.5625rem;padding-left:.5625rem}.dropdown-toggle-split::after,.dropright .dropdown-toggle-split::after,.dropup .dropdown-toggle-split::after{margin-left:0}.dropleft .dropdown-toggle-split::before{margin-right:0}.btn-group-sm>.btn+.dropdown-toggle-split,.btn-sm+.dropdown-toggle-split{padding-right:.375rem;padding-left:.375rem}.btn-group-lg>.btn+.dropdown-toggle-split,.btn-lg+.dropdown-toggle-split{padding-right:.75rem;padding-left:.75rem}.btn-group-vertical{-ms-flex-direction:column;flex-direction:column;-ms-flex-align:start;align-items:flex-start;-ms-flex-pack:center;justify-content:center}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group{width:100%}.btn-group-vertical>.btn-group:not(:first-child),.btn-group-vertical>.btn:not(:first-child){margin-top:-1px}.btn-group-vertical>.btn-group:not(:last-child)>.btn,.btn-group-vertical>.btn:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child)>.btn,.btn-group-vertical>.btn:not(:first-child){border-top-left-radius:0;border-top-right-radius:0}.btn-group-toggle>.btn,.btn-group-toggle>.btn-group>.btn{margin-bottom:0}.btn-group-toggle>.btn input[type=checkbox],.btn-group-toggle>.btn input[type=radio],.btn-group-toggle>.btn-group>.btn input[type=checkbox],.btn-group-toggle>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-align:stretch;align-items:stretch;width:100%}.input-group>.custom-file,.input-group>.custom-select,.input-group>.form-control,.input-group>.form-control-plaintext{position:relative;-ms-flex:1 1 0%;flex:1 1 0%;min-width:0;margin-bottom:0}.input-group>.custom-file+.custom-file,.input-group>.custom-file+.custom-select,.input-group>.custom-file+.form-control,.input-group>.custom-select+.custom-file,.input-group>.custom-select+.custom-select,.input-group>.custom-select+.form-control,.input-group>.form-control+.custom-file,.input-group>.form-control+.custom-select,.input-group>.form-control+.form-control,.input-group>.form-control-plaintext+.custom-file,.input-group>.form-control-plaintext+.custom-select,.input-group>.form-control-plaintext+.form-control{margin-left:-1px}.input-group>.custom-file .custom-file-input:focus~.custom-file-label,.input-group>.custom-select:focus,.input-group>.form-control:focus{z-index:3}.input-group>.custom-file .custom-file-input:focus{z-index:4}.input-group>.custom-select:not(:last-child),.input-group>.form-control:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-select:not(:first-child),.input-group>.form-control:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.input-group>.custom-file{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center}.input-group>.custom-file:not(:last-child) .custom-file-label,.input-group>.custom-file:not(:last-child) .custom-file-label::after{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-file:not(:first-child) .custom-file-label{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-append,.input-group-prepend{display:-ms-flexbox;display:flex}.input-group-append .btn,.input-group-prepend .btn{position:relative;z-index:2}.input-group-append .btn:focus,.input-group-prepend .btn:focus{z-index:3}.input-group-append .btn+.btn,.input-group-append .btn+.input-group-text,.input-group-append .input-group-text+.btn,.input-group-append .input-group-text+.input-group-text,.input-group-prepend .btn+.btn,.input-group-prepend .btn+.input-group-text,.input-group-prepend .input-group-text+.btn,.input-group-prepend .input-group-text+.input-group-text{margin-left:-1px}.input-group-prepend{margin-right:-1px}.input-group-append{margin-left:-1px}.input-group-text{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;padding:.375rem .75rem;margin-bottom:0;font-size:1rem;font-weight:400;line-height:1.5;color:#495057;text-align:center;white-space:nowrap;background-color:#e9ecef;border:1px solid #ced4da;border-radius:.25rem}.input-group-text input[type=checkbox],.input-group-text input[type=radio]{margin-top:0}.input-group-lg>.custom-select,.input-group-lg>.form-control:not(textarea){height:calc(1.5em + 1rem + 2px)}.input-group-lg>.custom-select,.input-group-lg>.form-control,.input-group-lg>.input-group-append>.btn,.input-group-lg>.input-group-append>.input-group-text,.input-group-lg>.input-group-prepend>.btn,.input-group-lg>.input-group-prepend>.input-group-text{padding:.5rem 1rem;font-size:1.25rem;line-height:1.5;border-radius:.3rem}.input-group-sm>.custom-select,.input-group-sm>.form-control:not(textarea){height:calc(1.5em + .5rem + 2px)}.input-group-sm>.custom-select,.input-group-sm>.form-control,.input-group-sm>.input-group-append>.btn,.input-group-sm>.input-group-append>.input-group-text,.input-group-sm>.input-group-prepend>.btn,.input-group-sm>.input-group-prepend>.input-group-text{padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:.2rem}.input-group-lg>.custom-select,.input-group-sm>.custom-select{padding-right:1.75rem}.input-group>.input-group-append:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group>.input-group-append:last-child>.input-group-text:not(:last-child),.input-group>.input-group-append:not(:last-child)>.btn,.input-group>.input-group-append:not(:last-child)>.input-group-text,.input-group>.input-group-prepend>.btn,.input-group>.input-group-prepend>.input-group-text{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0;border-bottom-left-radius:0}.custom-control{position:relative;display:block;min-height:1.5rem;padding-left:1.5rem}.custom-control-inline{display:-ms-inline-flexbox;display:inline-flex;margin-right:1rem}.custom-control-input{position:absolute;left:0;z-index:-1;width:1rem;height:1.25rem;opacity:0}.custom-control-input:checked~.custom-control-label::before{color:#fff;border-color:#007bff;background-color:#007bff}.custom-control-input:focus~.custom-control-label::before{box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.custom-control-input:focus:not(:checked)~.custom-control-label::before{border-color:#80bdff}.custom-control-input:not(:disabled):active~.custom-control-label::before{color:#fff;background-color:#b3d7ff;border-color:#b3d7ff}.custom-control-input:disabled~.custom-control-label,.custom-control-input[disabled]~.custom-control-label{color:#6c757d}.custom-control-input:disabled~.custom-control-label::before,.custom-control-input[disabled]~.custom-control-label::before{background-color:#e9ecef}.custom-control-label{position:relative;margin-bottom:0;vertical-align:top}.custom-control-label::before{position:absolute;top:.25rem;left:-1.5rem;display:block;width:1rem;height:1rem;pointer-events:none;content:"";background-color:#fff;border:#adb5bd solid 1px}.custom-control-label::after{position:absolute;top:.25rem;left:-1.5rem;display:block;width:1rem;height:1rem;content:"";background:no-repeat 50%/50% 50%}.custom-checkbox .custom-control-label::before{border-radius:.25rem}.custom-checkbox .custom-control-input:checked~.custom-control-label::after{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26l2.974 2.99L8 2.193z'/%3e%3c/svg%3e")}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before{border-color:#007bff;background-color:#007bff}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::after{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='4' viewBox='0 0 4 4'%3e%3cpath stroke='%23fff' d='M0 2h4'/%3e%3c/svg%3e")}.custom-checkbox .custom-control-input:disabled:checked~.custom-control-label::before{background-color:rgba(0,123,255,.5)}.custom-checkbox .custom-control-input:disabled:indeterminate~.custom-control-label::before{background-color:rgba(0,123,255,.5)}.custom-radio .custom-control-label::before{border-radius:50%}.custom-radio .custom-control-input:checked~.custom-control-label::after{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23fff'/%3e%3c/svg%3e")}.custom-radio .custom-control-input:disabled:checked~.custom-control-label::before{background-color:rgba(0,123,255,.5)}.custom-switch{padding-left:2.25rem}.custom-switch .custom-control-label::before{left:-2.25rem;width:1.75rem;pointer-events:all;border-radius:.5rem}.custom-switch .custom-control-label::after{top:calc(.25rem + 2px);left:calc(-2.25rem + 2px);width:calc(1rem - 4px);height:calc(1rem - 4px);background-color:#adb5bd;border-radius:.5rem;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out,-webkit-transform .15s ease-in-out;transition:transform .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:transform .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out,-webkit-transform .15s ease-in-out}@media (prefers-reduced-motion:reduce){.custom-switch .custom-control-label::after{transition:none}}.custom-switch .custom-control-input:checked~.custom-control-label::after{background-color:#fff;-webkit-transform:translateX(.75rem);transform:translateX(.75rem)}.custom-switch .custom-control-input:disabled:checked~.custom-control-label::before{background-color:rgba(0,123,255,.5)}.custom-select{display:inline-block;width:100%;height:calc(1.5em + .75rem + 2px);padding:.375rem 1.75rem .375rem .75rem;font-size:1rem;font-weight:400;line-height:1.5;color:#495057;vertical-align:middle;background:#fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right .75rem center/8px 10px;border:1px solid #ced4da;border-radius:.25rem;-webkit-appearance:none;-moz-appearance:none;appearance:none}.custom-select:focus{border-color:#80bdff;outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.custom-select:focus::-ms-value{color:#495057;background-color:#fff}.custom-select[multiple],.custom-select[size]:not([size="1"]){height:auto;padding-right:.75rem;background-image:none}.custom-select:disabled{color:#6c757d;background-color:#e9ecef}.custom-select::-ms-expand{display:none}.custom-select:-moz-focusring{color:transparent;text-shadow:0 0 0 #495057}.custom-select-sm{height:calc(1.5em + .5rem + 2px);padding-top:.25rem;padding-bottom:.25rem;padding-left:.5rem;font-size:.875rem}.custom-select-lg{height:calc(1.5em + 1rem + 2px);padding-top:.5rem;padding-bottom:.5rem;padding-left:1rem;font-size:1.25rem}.custom-file{position:relative;display:inline-block;width:100%;height:calc(1.5em + .75rem + 2px);margin-bottom:0}.custom-file-input{position:relative;z-index:2;width:100%;height:calc(1.5em + .75rem + 2px);margin:0;opacity:0}.custom-file-input:focus~.custom-file-label{border-color:#80bdff;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.custom-file-input:disabled~.custom-file-label,.custom-file-input[disabled]~.custom-file-label{background-color:#e9ecef}.custom-file-input:lang(en)~.custom-file-label::after{content:"Browse"}.custom-file-input~.custom-file-label[data-browse]::after{content:attr(data-browse)}.custom-file-label{position:absolute;top:0;right:0;left:0;z-index:1;height:calc(1.5em + .75rem + 2px);padding:.375rem .75rem;font-weight:400;line-height:1.5;color:#495057;background-color:#fff;border:1px solid #ced4da;border-radius:.25rem}.custom-file-label::after{position:absolute;top:0;right:0;bottom:0;z-index:3;display:block;height:calc(1.5em + .75rem);padding:.375rem .75rem;line-height:1.5;color:#495057;content:"Browse";background-color:#e9ecef;border-left:inherit;border-radius:0 .25rem .25rem 0}.custom-range{width:100%;height:1.4rem;padding:0;background-color:transparent;-webkit-appearance:none;-moz-appearance:none;appearance:none}.custom-range:focus{outline:0}.custom-range:focus::-webkit-slider-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(0,123,255,.25)}.custom-range:focus::-moz-range-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(0,123,255,.25)}.custom-range:focus::-ms-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(0,123,255,.25)}.custom-range::-moz-focus-outer{border:0}.custom-range::-webkit-slider-thumb{width:1rem;height:1rem;margin-top:-.25rem;background-color:#007bff;border:0;border-radius:1rem;-webkit-transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;-webkit-appearance:none;appearance:none}@media (prefers-reduced-motion:reduce){.custom-range::-webkit-slider-thumb{-webkit-transition:none;transition:none}}.custom-range::-webkit-slider-thumb:active{background-color:#b3d7ff}.custom-range::-webkit-slider-runnable-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:#dee2e6;border-color:transparent;border-radius:1rem}.custom-range::-moz-range-thumb{width:1rem;height:1rem;background-color:#007bff;border:0;border-radius:1rem;-moz-transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;-moz-appearance:none;appearance:none}@media (prefers-reduced-motion:reduce){.custom-range::-moz-range-thumb{-moz-transition:none;transition:none}}.custom-range::-moz-range-thumb:active{background-color:#b3d7ff}.custom-range::-moz-range-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:#dee2e6;border-color:transparent;border-radius:1rem}.custom-range::-ms-thumb{width:1rem;height:1rem;margin-top:0;margin-right:.2rem;margin-left:.2rem;background-color:#007bff;border:0;border-radius:1rem;-ms-transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;appearance:none}@media (prefers-reduced-motion:reduce){.custom-range::-ms-thumb{-ms-transition:none;transition:none}}.custom-range::-ms-thumb:active{background-color:#b3d7ff}.custom-range::-ms-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:transparent;border-color:transparent;border-width:.5rem}.custom-range::-ms-fill-lower{background-color:#dee2e6;border-radius:1rem}.custom-range::-ms-fill-upper{margin-right:15px;background-color:#dee2e6;border-radius:1rem}.custom-range:disabled::-webkit-slider-thumb{background-color:#adb5bd}.custom-range:disabled::-webkit-slider-runnable-track{cursor:default}.custom-range:disabled::-moz-range-thumb{background-color:#adb5bd}.custom-range:disabled::-moz-range-track{cursor:default}.custom-range:disabled::-ms-thumb{background-color:#adb5bd}.custom-control-label::before,.custom-file-label,.custom-select{transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.custom-control-label::before,.custom-file-label,.custom-select{transition:none}}.nav{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding-left:0;margin-bottom:0;list-style:none}.nav-link{display:block;padding:.5rem 1rem}.nav-link:focus,.nav-link:hover{text-decoration:none}.nav-link.disabled{color:#6c757d;pointer-events:none;cursor:default}.nav-tabs{border-bottom:1px solid #dee2e6}.nav-tabs .nav-item{margin-bottom:-1px}.nav-tabs .nav-link{border:1px solid transparent;border-top-left-radius:.25rem;border-top-right-radius:.25rem}.nav-tabs .nav-link:focus,.nav-tabs .nav-link:hover{border-color:#e9ecef #e9ecef #dee2e6}.nav-tabs .nav-link.disabled{color:#6c757d;background-color:transparent;border-color:transparent}.nav-tabs .nav-item.show .nav-link,.nav-tabs .nav-link.active{color:#495057;background-color:#fff;border-color:#dee2e6 #dee2e6 #fff}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.nav-pills .nav-link{border-radius:.25rem}.nav-pills .nav-link.active,.nav-pills .show>.nav-link{color:#fff;background-color:#007bff}.nav-fill .nav-item{-ms-flex:1 1 auto;flex:1 1 auto;text-align:center}.nav-justified .nav-item{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;text-align:center}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.navbar{position:relative;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-align:center;align-items:center;-ms-flex-pack:justify;justify-content:space-between;padding:.5rem 1rem}.navbar .container,.navbar .container-fluid,.navbar .container-lg,.navbar .container-md,.navbar .container-sm,.navbar .container-xl{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-align:center;align-items:center;-ms-flex-pack:justify;justify-content:space-between}.navbar-brand{display:inline-block;padding-top:.3125rem;padding-bottom:.3125rem;margin-right:1rem;font-size:1.25rem;line-height:inherit;white-space:nowrap}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-nav{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0;list-style:none}.navbar-nav .nav-link{padding-right:0;padding-left:0}.navbar-nav .dropdown-menu{position:static;float:none}.navbar-text{display:inline-block;padding-top:.5rem;padding-bottom:.5rem}.navbar-collapse{-ms-flex-preferred-size:100%;flex-basis:100%;-ms-flex-positive:1;flex-grow:1;-ms-flex-align:center;align-items:center}.navbar-toggler{padding:.25rem .75rem;font-size:1.25rem;line-height:1;background-color:transparent;border:1px solid transparent;border-radius:.25rem}.navbar-toggler:focus,.navbar-toggler:hover{text-decoration:none}.navbar-toggler-icon{display:inline-block;width:1.5em;height:1.5em;vertical-align:middle;content:"";background:no-repeat center center;background-size:100% 100%}@media (max-width:575.98px){.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid,.navbar-expand-sm>.container-lg,.navbar-expand-sm>.container-md,.navbar-expand-sm>.container-sm,.navbar-expand-sm>.container-xl{padding-right:0;padding-left:0}}@media (min-width:576px){.navbar-expand-sm{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-sm .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-sm .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-sm .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid,.navbar-expand-sm>.container-lg,.navbar-expand-sm>.container-md,.navbar-expand-sm>.container-sm,.navbar-expand-sm>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-sm .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-sm .navbar-toggler{display:none}}@media (max-width:767.98px){.navbar-expand-md>.container,.navbar-expand-md>.container-fluid,.navbar-expand-md>.container-lg,.navbar-expand-md>.container-md,.navbar-expand-md>.container-sm,.navbar-expand-md>.container-xl{padding-right:0;padding-left:0}}@media (min-width:768px){.navbar-expand-md{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-md .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-md .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-md .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-md>.container,.navbar-expand-md>.container-fluid,.navbar-expand-md>.container-lg,.navbar-expand-md>.container-md,.navbar-expand-md>.container-sm,.navbar-expand-md>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-md .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-md .navbar-toggler{display:none}}@media (max-width:991.98px){.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid,.navbar-expand-lg>.container-lg,.navbar-expand-lg>.container-md,.navbar-expand-lg>.container-sm,.navbar-expand-lg>.container-xl{padding-right:0;padding-left:0}}@media (min-width:992px){.navbar-expand-lg{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-lg .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-lg .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-lg .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid,.navbar-expand-lg>.container-lg,.navbar-expand-lg>.container-md,.navbar-expand-lg>.container-sm,.navbar-expand-lg>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-lg .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-lg .navbar-toggler{display:none}}@media (max-width:1199.98px){.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid,.navbar-expand-xl>.container-lg,.navbar-expand-xl>.container-md,.navbar-expand-xl>.container-sm,.navbar-expand-xl>.container-xl{padding-right:0;padding-left:0}}@media (min-width:1200px){.navbar-expand-xl{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-xl .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand-xl .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-xl .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid,.navbar-expand-xl>.container-lg,.navbar-expand-xl>.container-md,.navbar-expand-xl>.container-sm,.navbar-expand-xl>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-xl .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-xl .navbar-toggler{display:none}}.navbar-expand{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand>.container,.navbar-expand>.container-fluid,.navbar-expand>.container-lg,.navbar-expand>.container-md,.navbar-expand>.container-sm,.navbar-expand>.container-xl{padding-right:0;padding-left:0}.navbar-expand .navbar-nav{-ms-flex-direction:row;flex-direction:row}.navbar-expand .navbar-nav .dropdown-menu{position:absolute}.navbar-expand .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand>.container,.navbar-expand>.container-fluid,.navbar-expand>.container-lg,.navbar-expand>.container-md,.navbar-expand>.container-sm,.navbar-expand>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand .navbar-toggler{display:none}.navbar-light .navbar-brand{color:rgba(0,0,0,.9)}.navbar-light .navbar-brand:focus,.navbar-light .navbar-brand:hover{color:rgba(0,0,0,.9)}.navbar-light .navbar-nav .nav-link{color:rgba(0,0,0,.5)}.navbar-light .navbar-nav .nav-link:focus,.navbar-light .navbar-nav .nav-link:hover{color:rgba(0,0,0,.7)}.navbar-light .navbar-nav .nav-link.disabled{color:rgba(0,0,0,.3)}.navbar-light .navbar-nav .active>.nav-link,.navbar-light .navbar-nav .nav-link.active,.navbar-light .navbar-nav .nav-link.show,.navbar-light .navbar-nav .show>.nav-link{color:rgba(0,0,0,.9)}.navbar-light .navbar-toggler{color:rgba(0,0,0,.5);border-color:rgba(0,0,0,.1)}.navbar-light .navbar-toggler-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(0, 0, 0, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e")}.navbar-light .navbar-text{color:rgba(0,0,0,.5)}.navbar-light .navbar-text a{color:rgba(0,0,0,.9)}.navbar-light .navbar-text a:focus,.navbar-light .navbar-text a:hover{color:rgba(0,0,0,.9)}.navbar-dark .navbar-brand{color:#fff}.navbar-dark .navbar-brand:focus,.navbar-dark .navbar-brand:hover{color:#fff}.navbar-dark .navbar-nav .nav-link{color:rgba(255,255,255,.5)}.navbar-dark .navbar-nav .nav-link:focus,.navbar-dark .navbar-nav .nav-link:hover{color:rgba(255,255,255,.75)}.navbar-dark .navbar-nav .nav-link.disabled{color:rgba(255,255,255,.25)}.navbar-dark .navbar-nav .active>.nav-link,.navbar-dark .navbar-nav .nav-link.active,.navbar-dark .navbar-nav .nav-link.show,.navbar-dark .navbar-nav .show>.nav-link{color:#fff}.navbar-dark .navbar-toggler{color:rgba(255,255,255,.5);border-color:rgba(255,255,255,.1)}.navbar-dark .navbar-toggler-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(255, 255, 255, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e")}.navbar-dark .navbar-text{color:rgba(255,255,255,.5)}.navbar-dark .navbar-text a{color:#fff}.navbar-dark .navbar-text a:focus,.navbar-dark .navbar-text a:hover{color:#fff}.card{position:relative;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;min-width:0;word-wrap:break-word;background-color:#fff;background-clip:border-box;border:1px solid rgba(0,0,0,.125);border-radius:.25rem}.card>hr{margin-right:0;margin-left:0}.card>.list-group:first-child .list-group-item:first-child{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.card>.list-group:last-child .list-group-item:last-child{border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.card-body{-ms-flex:1 1 auto;flex:1 1 auto;min-height:1px;padding:1.25rem}.card-title{margin-bottom:.75rem}.card-subtitle{margin-top:-.375rem;margin-bottom:0}.card-text:last-child{margin-bottom:0}.card-link:hover{text-decoration:none}.card-link+.card-link{margin-left:1.25rem}.card-header{padding:.75rem 1.25rem;margin-bottom:0;background-color:rgba(0,0,0,.03);border-bottom:1px solid rgba(0,0,0,.125)}.card-header:first-child{border-radius:calc(.25rem - 1px) calc(.25rem - 1px) 0 0}.card-header+.list-group .list-group-item:first-child{border-top:0}.card-footer{padding:.75rem 1.25rem;background-color:rgba(0,0,0,.03);border-top:1px solid rgba(0,0,0,.125)}.card-footer:last-child{border-radius:0 0 calc(.25rem - 1px) calc(.25rem - 1px)}.card-header-tabs{margin-right:-.625rem;margin-bottom:-.75rem;margin-left:-.625rem;border-bottom:0}.card-header-pills{margin-right:-.625rem;margin-left:-.625rem}.card-img-overlay{position:absolute;top:0;right:0;bottom:0;left:0;padding:1.25rem}.card-img,.card-img-bottom,.card-img-top{-ms-flex-negative:0;flex-shrink:0;width:100%}.card-img,.card-img-top{border-top-left-radius:calc(.25rem - 1px);border-top-right-radius:calc(.25rem - 1px)}.card-img,.card-img-bottom{border-bottom-right-radius:calc(.25rem - 1px);border-bottom-left-radius:calc(.25rem - 1px)}.card-deck .card{margin-bottom:15px}@media (min-width:576px){.card-deck{display:-ms-flexbox;display:flex;-ms-flex-flow:row wrap;flex-flow:row wrap;margin-right:-15px;margin-left:-15px}.card-deck .card{-ms-flex:1 0 0%;flex:1 0 0%;margin-right:15px;margin-bottom:0;margin-left:15px}}.card-group>.card{margin-bottom:15px}@media (min-width:576px){.card-group{display:-ms-flexbox;display:flex;-ms-flex-flow:row wrap;flex-flow:row wrap}.card-group>.card{-ms-flex:1 0 0%;flex:1 0 0%;margin-bottom:0}.card-group>.card+.card{margin-left:0;border-left:0}.card-group>.card:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.card-group>.card:not(:last-child) .card-header,.card-group>.card:not(:last-child) .card-img-top{border-top-right-radius:0}.card-group>.card:not(:last-child) .card-footer,.card-group>.card:not(:last-child) .card-img-bottom{border-bottom-right-radius:0}.card-group>.card:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.card-group>.card:not(:first-child) .card-header,.card-group>.card:not(:first-child) .card-img-top{border-top-left-radius:0}.card-group>.card:not(:first-child) .card-footer,.card-group>.card:not(:first-child) .card-img-bottom{border-bottom-left-radius:0}}.card-columns .card{margin-bottom:.75rem}@media (min-width:576px){.card-columns{-webkit-column-count:3;-moz-column-count:3;column-count:3;-webkit-column-gap:1.25rem;-moz-column-gap:1.25rem;column-gap:1.25rem;orphans:1;widows:1}.card-columns .card{display:inline-block;width:100%}}.accordion>.card{overflow:hidden}.accordion>.card:not(:last-of-type){border-bottom:0;border-bottom-right-radius:0;border-bottom-left-radius:0}.accordion>.card:not(:first-of-type){border-top-left-radius:0;border-top-right-radius:0}.accordion>.card>.card-header{border-radius:0;margin-bottom:-1px}.breadcrumb{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:.75rem 1rem;margin-bottom:1rem;list-style:none;background-color:#e9ecef;border-radius:.25rem}.breadcrumb-item+.breadcrumb-item{padding-left:.5rem}.breadcrumb-item+.breadcrumb-item::before{display:inline-block;padding-right:.5rem;color:#6c757d;content:"/"}.breadcrumb-item+.breadcrumb-item:hover::before{text-decoration:underline}.breadcrumb-item+.breadcrumb-item:hover::before{text-decoration:none}.breadcrumb-item.active{color:#6c757d}.pagination{display:-ms-flexbox;display:flex;padding-left:0;list-style:none;border-radius:.25rem}.page-link{position:relative;display:block;padding:.5rem .75rem;margin-left:-1px;line-height:1.25;color:#007bff;background-color:#fff;border:1px solid #dee2e6}.page-link:hover{z-index:2;color:#0056b3;text-decoration:none;background-color:#e9ecef;border-color:#dee2e6}.page-link:focus{z-index:3;outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.page-item:first-child .page-link{margin-left:0;border-top-left-radius:.25rem;border-bottom-left-radius:.25rem}.page-item:last-child .page-link{border-top-right-radius:.25rem;border-bottom-right-radius:.25rem}.page-item.active .page-link{z-index:3;color:#fff;background-color:#007bff;border-color:#007bff}.page-item.disabled .page-link{color:#6c757d;pointer-events:none;cursor:auto;background-color:#fff;border-color:#dee2e6}.pagination-lg .page-link{padding:.75rem 1.5rem;font-size:1.25rem;line-height:1.5}.pagination-lg .page-item:first-child .page-link{border-top-left-radius:.3rem;border-bottom-left-radius:.3rem}.pagination-lg .page-item:last-child .page-link{border-top-right-radius:.3rem;border-bottom-right-radius:.3rem}.pagination-sm .page-link{padding:.25rem .5rem;font-size:.875rem;line-height:1.5}.pagination-sm .page-item:first-child .page-link{border-top-left-radius:.2rem;border-bottom-left-radius:.2rem}.pagination-sm .page-item:last-child .page-link{border-top-right-radius:.2rem;border-bottom-right-radius:.2rem}.badge{display:inline-block;padding:.25em .4em;font-size:75%;font-weight:700;line-height:1;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25rem;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.badge{transition:none}}a.badge:focus,a.badge:hover{text-decoration:none}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.badge-pill{padding-right:.6em;padding-left:.6em;border-radius:10rem}.badge-primary{color:#fff;background-color:#007bff}a.badge-primary:focus,a.badge-primary:hover{color:#fff;background-color:#0062cc}a.badge-primary.focus,a.badge-primary:focus{outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.badge-secondary{color:#fff;background-color:#6c757d}a.badge-secondary:focus,a.badge-secondary:hover{color:#fff;background-color:#545b62}a.badge-secondary.focus,a.badge-secondary:focus{outline:0;box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}.badge-success{color:#fff;background-color:#28a745}a.badge-success:focus,a.badge-success:hover{color:#fff;background-color:#1e7e34}a.badge-success.focus,a.badge-success:focus{outline:0;box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.badge-info{color:#fff;background-color:#17a2b8}a.badge-info:focus,a.badge-info:hover{color:#fff;background-color:#117a8b}a.badge-info.focus,a.badge-info:focus{outline:0;box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.badge-warning{color:#212529;background-color:#ffc107}a.badge-warning:focus,a.badge-warning:hover{color:#212529;background-color:#d39e00}a.badge-warning.focus,a.badge-warning:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.badge-danger{color:#fff;background-color:#dc3545}a.badge-danger:focus,a.badge-danger:hover{color:#fff;background-color:#bd2130}a.badge-danger.focus,a.badge-danger:focus{outline:0;box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.badge-light{color:#212529;background-color:#f8f9fa}a.badge-light:focus,a.badge-light:hover{color:#212529;background-color:#dae0e5}a.badge-light.focus,a.badge-light:focus{outline:0;box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.badge-dark{color:#fff;background-color:#343a40}a.badge-dark:focus,a.badge-dark:hover{color:#fff;background-color:#1d2124}a.badge-dark.focus,a.badge-dark:focus{outline:0;box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.jumbotron{padding:2rem 1rem;margin-bottom:2rem;background-color:#e9ecef;border-radius:.3rem}@media (min-width:576px){.jumbotron{padding:4rem 2rem}}.jumbotron-fluid{padding-right:0;padding-left:0;border-radius:0}.alert{position:relative;padding:.75rem 1.25rem;margin-bottom:1rem;border:1px solid transparent;border-radius:.25rem}.alert-heading{color:inherit}.alert-link{font-weight:700}.alert-dismissible{padding-right:4rem}.alert-dismissible .close{position:absolute;top:0;right:0;padding:.75rem 1.25rem;color:inherit}.alert-primary{color:#004085;background-color:#cce5ff;border-color:#b8daff}.alert-primary hr{border-top-color:#9fcdff}.alert-primary .alert-link{color:#002752}.alert-secondary{color:#383d41;background-color:#e2e3e5;border-color:#d6d8db}.alert-secondary hr{border-top-color:#c8cbcf}.alert-secondary .alert-link{color:#202326}.alert-success{color:#155724;background-color:#d4edda;border-color:#c3e6cb}.alert-success hr{border-top-color:#b1dfbb}.alert-success .alert-link{color:#0b2e13}.alert-info{color:#0c5460;background-color:#d1ecf1;border-color:#bee5eb}.alert-info hr{border-top-color:#abdde5}.alert-info .alert-link{color:#062c33}.alert-warning{color:#856404;background-color:#fff3cd;border-color:#ffeeba}.alert-warning hr{border-top-color:#ffe8a1}.alert-warning .alert-link{color:#533f03}.alert-danger{color:#721c24;background-color:#f8d7da;border-color:#f5c6cb}.alert-danger hr{border-top-color:#f1b0b7}.alert-danger .alert-link{color:#491217}.alert-light{color:#818182;background-color:#fefefe;border-color:#fdfdfe}.alert-light hr{border-top-color:#ececf6}.alert-light .alert-link{color:#686868}.alert-dark{color:#1b1e21;background-color:#d6d8d9;border-color:#c6c8ca}.alert-dark hr{border-top-color:#b9bbbe}.alert-dark .alert-link{color:#040505}@-webkit-keyframes progress-bar-stripes{from{background-position:1rem 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:1rem 0}to{background-position:0 0}}.progress{display:-ms-flexbox;display:flex;height:1rem;overflow:hidden;font-size:.75rem;background-color:#e9ecef;border-radius:.25rem}.progress-bar{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;-ms-flex-pack:center;justify-content:center;overflow:hidden;color:#fff;text-align:center;white-space:nowrap;background-color:#007bff;transition:width .6s ease}@media (prefers-reduced-motion:reduce){.progress-bar{transition:none}}.progress-bar-striped{background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-size:1rem 1rem}.progress-bar-animated{-webkit-animation:progress-bar-stripes 1s linear infinite;animation:progress-bar-stripes 1s linear infinite}@media (prefers-reduced-motion:reduce){.progress-bar-animated{-webkit-animation:none;animation:none}}.media{display:-ms-flexbox;display:flex;-ms-flex-align:start;align-items:flex-start}.media-body{-ms-flex:1;flex:1}.list-group{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0}.list-group-item-action{width:100%;color:#495057;text-align:inherit}.list-group-item-action:focus,.list-group-item-action:hover{z-index:1;color:#495057;text-decoration:none;background-color:#f8f9fa}.list-group-item-action:active{color:#212529;background-color:#e9ecef}.list-group-item{position:relative;display:block;padding:.75rem 1.25rem;background-color:#fff;border:1px solid rgba(0,0,0,.125)}.list-group-item:first-child{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.list-group-item:last-child{border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.list-group-item.disabled,.list-group-item:disabled{color:#6c757d;pointer-events:none;background-color:#fff}.list-group-item.active{z-index:2;color:#fff;background-color:#007bff;border-color:#007bff}.list-group-item+.list-group-item{border-top-width:0}.list-group-item+.list-group-item.active{margin-top:-1px;border-top-width:1px}.list-group-horizontal{-ms-flex-direction:row;flex-direction:row}.list-group-horizontal .list-group-item:first-child{border-bottom-left-radius:.25rem;border-top-right-radius:0}.list-group-horizontal .list-group-item:last-child{border-top-right-radius:.25rem;border-bottom-left-radius:0}.list-group-horizontal .list-group-item.active{margin-top:0}.list-group-horizontal .list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal .list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}@media (min-width:576px){.list-group-horizontal-sm{-ms-flex-direction:row;flex-direction:row}.list-group-horizontal-sm .list-group-item:first-child{border-bottom-left-radius:.25rem;border-top-right-radius:0}.list-group-horizontal-sm .list-group-item:last-child{border-top-right-radius:.25rem;border-bottom-left-radius:0}.list-group-horizontal-sm .list-group-item.active{margin-top:0}.list-group-horizontal-sm .list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-sm .list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}@media (min-width:768px){.list-group-horizontal-md{-ms-flex-direction:row;flex-direction:row}.list-group-horizontal-md .list-group-item:first-child{border-bottom-left-radius:.25rem;border-top-right-radius:0}.list-group-horizontal-md .list-group-item:last-child{border-top-right-radius:.25rem;border-bottom-left-radius:0}.list-group-horizontal-md .list-group-item.active{margin-top:0}.list-group-horizontal-md .list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-md .list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}@media (min-width:992px){.list-group-horizontal-lg{-ms-flex-direction:row;flex-direction:row}.list-group-horizontal-lg .list-group-item:first-child{border-bottom-left-radius:.25rem;border-top-right-radius:0}.list-group-horizontal-lg .list-group-item:last-child{border-top-right-radius:.25rem;border-bottom-left-radius:0}.list-group-horizontal-lg .list-group-item.active{margin-top:0}.list-group-horizontal-lg .list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-lg .list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}@media (min-width:1200px){.list-group-horizontal-xl{-ms-flex-direction:row;flex-direction:row}.list-group-horizontal-xl .list-group-item:first-child{border-bottom-left-radius:.25rem;border-top-right-radius:0}.list-group-horizontal-xl .list-group-item:last-child{border-top-right-radius:.25rem;border-bottom-left-radius:0}.list-group-horizontal-xl .list-group-item.active{margin-top:0}.list-group-horizontal-xl .list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-xl .list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}.list-group-flush .list-group-item{border-right-width:0;border-left-width:0;border-radius:0}.list-group-flush .list-group-item:first-child{border-top-width:0}.list-group-flush:last-child .list-group-item:last-child{border-bottom-width:0}.list-group-item-primary{color:#004085;background-color:#b8daff}.list-group-item-primary.list-group-item-action:focus,.list-group-item-primary.list-group-item-action:hover{color:#004085;background-color:#9fcdff}.list-group-item-primary.list-group-item-action.active{color:#fff;background-color:#004085;border-color:#004085}.list-group-item-secondary{color:#383d41;background-color:#d6d8db}.list-group-item-secondary.list-group-item-action:focus,.list-group-item-secondary.list-group-item-action:hover{color:#383d41;background-color:#c8cbcf}.list-group-item-secondary.list-group-item-action.active{color:#fff;background-color:#383d41;border-color:#383d41}.list-group-item-success{color:#155724;background-color:#c3e6cb}.list-group-item-success.list-group-item-action:focus,.list-group-item-success.list-group-item-action:hover{color:#155724;background-color:#b1dfbb}.list-group-item-success.list-group-item-action.active{color:#fff;background-color:#155724;border-color:#155724}.list-group-item-info{color:#0c5460;background-color:#bee5eb}.list-group-item-info.list-group-item-action:focus,.list-group-item-info.list-group-item-action:hover{color:#0c5460;background-color:#abdde5}.list-group-item-info.list-group-item-action.active{color:#fff;background-color:#0c5460;border-color:#0c5460}.list-group-item-warning{color:#856404;background-color:#ffeeba}.list-group-item-warning.list-group-item-action:focus,.list-group-item-warning.list-group-item-action:hover{color:#856404;background-color:#ffe8a1}.list-group-item-warning.list-group-item-action.active{color:#fff;background-color:#856404;border-color:#856404}.list-group-item-danger{color:#721c24;background-color:#f5c6cb}.list-group-item-danger.list-group-item-action:focus,.list-group-item-danger.list-group-item-action:hover{color:#721c24;background-color:#f1b0b7}.list-group-item-danger.list-group-item-action.active{color:#fff;background-color:#721c24;border-color:#721c24}.list-group-item-light{color:#818182;background-color:#fdfdfe}.list-group-item-light.list-group-item-action:focus,.list-group-item-light.list-group-item-action:hover{color:#818182;background-color:#ececf6}.list-group-item-light.list-group-item-action.active{color:#fff;background-color:#818182;border-color:#818182}.list-group-item-dark{color:#1b1e21;background-color:#c6c8ca}.list-group-item-dark.list-group-item-action:focus,.list-group-item-dark.list-group-item-action:hover{color:#1b1e21;background-color:#b9bbbe}.list-group-item-dark.list-group-item-action.active{color:#fff;background-color:#1b1e21;border-color:#1b1e21}.close{float:right;font-size:1.5rem;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.5}.close:hover{color:#000;text-decoration:none}.close:not(:disabled):not(.disabled):focus,.close:not(:disabled):not(.disabled):hover{opacity:.75}button.close{padding:0;background-color:transparent;border:0;-webkit-appearance:none;-moz-appearance:none;appearance:none}a.close.disabled{pointer-events:none}.toast{max-width:350px;overflow:hidden;font-size:.875rem;background-color:rgba(255,255,255,.85);background-clip:padding-box;border:1px solid rgba(0,0,0,.1);box-shadow:0 .25rem .75rem rgba(0,0,0,.1);-webkit-backdrop-filter:blur(10px);backdrop-filter:blur(10px);opacity:0;border-radius:.25rem}.toast:not(:last-child){margin-bottom:.75rem}.toast.showing{opacity:1}.toast.show{display:block;opacity:1}.toast.hide{display:none}.toast-header{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;padding:.25rem .75rem;color:#6c757d;background-color:rgba(255,255,255,.85);background-clip:padding-box;border-bottom:1px solid rgba(0,0,0,.05)}.toast-body{padding:.75rem}.modal-open{overflow:hidden}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal{position:fixed;top:0;left:0;z-index:1050;display:none;width:100%;height:100%;overflow:hidden;outline:0}.modal-dialog{position:relative;width:auto;margin:.5rem;pointer-events:none}.modal.fade .modal-dialog{transition:-webkit-transform .3s ease-out;transition:transform .3s ease-out;transition:transform .3s ease-out,-webkit-transform .3s ease-out;-webkit-transform:translate(0,-50px);transform:translate(0,-50px)}@media (prefers-reduced-motion:reduce){.modal.fade .modal-dialog{transition:none}}.modal.show .modal-dialog{-webkit-transform:none;transform:none}.modal.modal-static .modal-dialog{-webkit-transform:scale(1.02);transform:scale(1.02)}.modal-dialog-scrollable{display:-ms-flexbox;display:flex;max-height:calc(100% - 1rem)}.modal-dialog-scrollable .modal-content{max-height:calc(100vh - 1rem);overflow:hidden}.modal-dialog-scrollable .modal-footer,.modal-dialog-scrollable .modal-header{-ms-flex-negative:0;flex-shrink:0}.modal-dialog-scrollable .modal-body{overflow-y:auto}.modal-dialog-centered{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;min-height:calc(100% - 1rem)}.modal-dialog-centered::before{display:block;height:calc(100vh - 1rem);content:""}.modal-dialog-centered.modal-dialog-scrollable{-ms-flex-direction:column;flex-direction:column;-ms-flex-pack:center;justify-content:center;height:100%}.modal-dialog-centered.modal-dialog-scrollable .modal-content{max-height:none}.modal-dialog-centered.modal-dialog-scrollable::before{content:none}.modal-content{position:relative;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;width:100%;pointer-events:auto;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem;outline:0}.modal-backdrop{position:fixed;top:0;left:0;z-index:1040;width:100vw;height:100vh;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop.show{opacity:.5}.modal-header{display:-ms-flexbox;display:flex;-ms-flex-align:start;align-items:flex-start;-ms-flex-pack:justify;justify-content:space-between;padding:1rem 1rem;border-bottom:1px solid #dee2e6;border-top-left-radius:calc(.3rem - 1px);border-top-right-radius:calc(.3rem - 1px)}.modal-header .close{padding:1rem 1rem;margin:-1rem -1rem -1rem auto}.modal-title{margin-bottom:0;line-height:1.5}.modal-body{position:relative;-ms-flex:1 1 auto;flex:1 1 auto;padding:1rem}.modal-footer{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-align:center;align-items:center;-ms-flex-pack:end;justify-content:flex-end;padding:.75rem;border-top:1px solid #dee2e6;border-bottom-right-radius:calc(.3rem - 1px);border-bottom-left-radius:calc(.3rem - 1px)}.modal-footer>*{margin:.25rem}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:576px){.modal-dialog{max-width:500px;margin:1.75rem auto}.modal-dialog-scrollable{max-height:calc(100% - 3.5rem)}.modal-dialog-scrollable .modal-content{max-height:calc(100vh - 3.5rem)}.modal-dialog-centered{min-height:calc(100% - 3.5rem)}.modal-dialog-centered::before{height:calc(100vh - 3.5rem)}.modal-sm{max-width:300px}}@media (min-width:992px){.modal-lg,.modal-xl{max-width:800px}}@media (min-width:1200px){.modal-xl{max-width:1140px}}.tooltip{position:absolute;z-index:1070;display:block;margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.875rem;word-wrap:break-word;opacity:0}.tooltip.show{opacity:.9}.tooltip .arrow{position:absolute;display:block;width:.8rem;height:.4rem}.tooltip .arrow::before{position:absolute;content:"";border-color:transparent;border-style:solid}.bs-tooltip-auto[x-placement^=top],.bs-tooltip-top{padding:.4rem 0}.bs-tooltip-auto[x-placement^=top] .arrow,.bs-tooltip-top .arrow{bottom:0}.bs-tooltip-auto[x-placement^=top] .arrow::before,.bs-tooltip-top .arrow::before{top:0;border-width:.4rem .4rem 0;border-top-color:#000}.bs-tooltip-auto[x-placement^=right],.bs-tooltip-right{padding:0 .4rem}.bs-tooltip-auto[x-placement^=right] .arrow,.bs-tooltip-right .arrow{left:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=right] .arrow::before,.bs-tooltip-right .arrow::before{right:0;border-width:.4rem .4rem .4rem 0;border-right-color:#000}.bs-tooltip-auto[x-placement^=bottom],.bs-tooltip-bottom{padding:.4rem 0}.bs-tooltip-auto[x-placement^=bottom] .arrow,.bs-tooltip-bottom .arrow{top:0}.bs-tooltip-auto[x-placement^=bottom] .arrow::before,.bs-tooltip-bottom .arrow::before{bottom:0;border-width:0 .4rem .4rem;border-bottom-color:#000}.bs-tooltip-auto[x-placement^=left],.bs-tooltip-left{padding:0 .4rem}.bs-tooltip-auto[x-placement^=left] .arrow,.bs-tooltip-left .arrow{right:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=left] .arrow::before,.bs-tooltip-left .arrow::before{left:0;border-width:.4rem 0 .4rem .4rem;border-left-color:#000}.tooltip-inner{max-width:200px;padding:.25rem .5rem;color:#fff;text-align:center;background-color:#000;border-radius:.25rem}.popover{position:absolute;top:0;left:0;z-index:1060;display:block;max-width:276px;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.875rem;word-wrap:break-word;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem}.popover .arrow{position:absolute;display:block;width:1rem;height:.5rem;margin:0 .3rem}.popover .arrow::after,.popover .arrow::before{position:absolute;display:block;content:"";border-color:transparent;border-style:solid}.bs-popover-auto[x-placement^=top],.bs-popover-top{margin-bottom:.5rem}.bs-popover-auto[x-placement^=top]>.arrow,.bs-popover-top>.arrow{bottom:calc(-.5rem - 1px)}.bs-popover-auto[x-placement^=top]>.arrow::before,.bs-popover-top>.arrow::before{bottom:0;border-width:.5rem .5rem 0;border-top-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=top]>.arrow::after,.bs-popover-top>.arrow::after{bottom:1px;border-width:.5rem .5rem 0;border-top-color:#fff}.bs-popover-auto[x-placement^=right],.bs-popover-right{margin-left:.5rem}.bs-popover-auto[x-placement^=right]>.arrow,.bs-popover-right>.arrow{left:calc(-.5rem - 1px);width:.5rem;height:1rem;margin:.3rem 0}.bs-popover-auto[x-placement^=right]>.arrow::before,.bs-popover-right>.arrow::before{left:0;border-width:.5rem .5rem .5rem 0;border-right-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=right]>.arrow::after,.bs-popover-right>.arrow::after{left:1px;border-width:.5rem .5rem .5rem 0;border-right-color:#fff}.bs-popover-auto[x-placement^=bottom],.bs-popover-bottom{margin-top:.5rem}.bs-popover-auto[x-placement^=bottom]>.arrow,.bs-popover-bottom>.arrow{top:calc(-.5rem - 1px)}.bs-popover-auto[x-placement^=bottom]>.arrow::before,.bs-popover-bottom>.arrow::before{top:0;border-width:0 .5rem .5rem .5rem;border-bottom-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=bottom]>.arrow::after,.bs-popover-bottom>.arrow::after{top:1px;border-width:0 .5rem .5rem .5rem;border-bottom-color:#fff}.bs-popover-auto[x-placement^=bottom] .popover-header::before,.bs-popover-bottom .popover-header::before{position:absolute;top:0;left:50%;display:block;width:1rem;margin-left:-.5rem;content:"";border-bottom:1px solid #f7f7f7}.bs-popover-auto[x-placement^=left],.bs-popover-left{margin-right:.5rem}.bs-popover-auto[x-placement^=left]>.arrow,.bs-popover-left>.arrow{right:calc(-.5rem - 1px);width:.5rem;height:1rem;margin:.3rem 0}.bs-popover-auto[x-placement^=left]>.arrow::before,.bs-popover-left>.arrow::before{right:0;border-width:.5rem 0 .5rem .5rem;border-left-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=left]>.arrow::after,.bs-popover-left>.arrow::after{right:1px;border-width:.5rem 0 .5rem .5rem;border-left-color:#fff}.popover-header{padding:.5rem .75rem;margin-bottom:0;font-size:1rem;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-top-left-radius:calc(.3rem - 1px);border-top-right-radius:calc(.3rem - 1px)}.popover-header:empty{display:none}.popover-body{padding:.5rem .75rem;color:#212529}.carousel{position:relative}.carousel.pointer-event{-ms-touch-action:pan-y;touch-action:pan-y}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner::after{display:block;clear:both;content:""}.carousel-item{position:relative;display:none;float:left;width:100%;margin-right:-100%;-webkit-backface-visibility:hidden;backface-visibility:hidden;transition:-webkit-transform .6s ease-in-out;transition:transform .6s ease-in-out;transition:transform .6s ease-in-out,-webkit-transform .6s ease-in-out}@media (prefers-reduced-motion:reduce){.carousel-item{transition:none}}.carousel-item-next,.carousel-item-prev,.carousel-item.active{display:block}.active.carousel-item-right,.carousel-item-next:not(.carousel-item-left){-webkit-transform:translateX(100%);transform:translateX(100%)}.active.carousel-item-left,.carousel-item-prev:not(.carousel-item-right){-webkit-transform:translateX(-100%);transform:translateX(-100%)}.carousel-fade .carousel-item{opacity:0;transition-property:opacity;-webkit-transform:none;transform:none}.carousel-fade .carousel-item-next.carousel-item-left,.carousel-fade .carousel-item-prev.carousel-item-right,.carousel-fade .carousel-item.active{z-index:1;opacity:1}.carousel-fade .active.carousel-item-left,.carousel-fade .active.carousel-item-right{z-index:0;opacity:0;transition:opacity 0s .6s}@media (prefers-reduced-motion:reduce){.carousel-fade .active.carousel-item-left,.carousel-fade .active.carousel-item-right{transition:none}}.carousel-control-next,.carousel-control-prev{position:absolute;top:0;bottom:0;z-index:1;display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;width:15%;color:#fff;text-align:center;opacity:.5;transition:opacity .15s ease}@media (prefers-reduced-motion:reduce){.carousel-control-next,.carousel-control-prev{transition:none}}.carousel-control-next:focus,.carousel-control-next:hover,.carousel-control-prev:focus,.carousel-control-prev:hover{color:#fff;text-decoration:none;outline:0;opacity:.9}.carousel-control-prev{left:0}.carousel-control-next{right:0}.carousel-control-next-icon,.carousel-control-prev-icon{display:inline-block;width:20px;height:20px;background:no-repeat 50%/100% 100%}.carousel-control-prev-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath d='M5.25 0l-4 4 4 4 1.5-1.5L4.25 4l2.5-2.5L5.25 0z'/%3e%3c/svg%3e")}.carousel-control-next-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath d='M2.75 0l-1.5 1.5L3.75 4l-2.5 2.5L2.75 8l4-4-4-4z'/%3e%3c/svg%3e")}.carousel-indicators{position:absolute;right:0;bottom:0;left:0;z-index:15;display:-ms-flexbox;display:flex;-ms-flex-pack:center;justify-content:center;padding-left:0;margin-right:15%;margin-left:15%;list-style:none}.carousel-indicators li{box-sizing:content-box;-ms-flex:0 1 auto;flex:0 1 auto;width:30px;height:3px;margin-right:3px;margin-left:3px;text-indent:-999px;cursor:pointer;background-color:#fff;background-clip:padding-box;border-top:10px solid transparent;border-bottom:10px solid transparent;opacity:.5;transition:opacity .6s ease}@media (prefers-reduced-motion:reduce){.carousel-indicators li{transition:none}}.carousel-indicators .active{opacity:1}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center}@-webkit-keyframes spinner-border{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes spinner-border{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.spinner-border{display:inline-block;width:2rem;height:2rem;vertical-align:text-bottom;border:.25em solid currentColor;border-right-color:transparent;border-radius:50%;-webkit-animation:spinner-border .75s linear infinite;animation:spinner-border .75s linear infinite}.spinner-border-sm{width:1rem;height:1rem;border-width:.2em}@-webkit-keyframes spinner-grow{0%{-webkit-transform:scale(0);transform:scale(0)}50%{opacity:1}}@keyframes spinner-grow{0%{-webkit-transform:scale(0);transform:scale(0)}50%{opacity:1}}.spinner-grow{display:inline-block;width:2rem;height:2rem;vertical-align:text-bottom;background-color:currentColor;border-radius:50%;opacity:0;-webkit-animation:spinner-grow .75s linear infinite;animation:spinner-grow .75s linear infinite}.spinner-grow-sm{width:1rem;height:1rem}.align-baseline{vertical-align:baseline!important}.align-top{vertical-align:top!important}.align-middle{vertical-align:middle!important}.align-bottom{vertical-align:bottom!important}.align-text-bottom{vertical-align:text-bottom!important}.align-text-top{vertical-align:text-top!important}.bg-primary{background-color:#007bff!important}a.bg-primary:focus,a.bg-primary:hover,button.bg-primary:focus,button.bg-primary:hover{background-color:#0062cc!important}.bg-secondary{background-color:#6c757d!important}a.bg-secondary:focus,a.bg-secondary:hover,button.bg-secondary:focus,button.bg-secondary:hover{background-color:#545b62!important}.bg-success{background-color:#28a745!important}a.bg-success:focus,a.bg-success:hover,button.bg-success:focus,button.bg-success:hover{background-color:#1e7e34!important}.bg-info{background-color:#17a2b8!important}a.bg-info:focus,a.bg-info:hover,button.bg-info:focus,button.bg-info:hover{background-color:#117a8b!important}.bg-warning{background-color:#ffc107!important}a.bg-warning:focus,a.bg-warning:hover,button.bg-warning:focus,button.bg-warning:hover{background-color:#d39e00!important}.bg-danger{background-color:#dc3545!important}a.bg-danger:focus,a.bg-danger:hover,button.bg-danger:focus,button.bg-danger:hover{background-color:#bd2130!important}.bg-light{background-color:#f8f9fa!important}a.bg-light:focus,a.bg-light:hover,button.bg-light:focus,button.bg-light:hover{background-color:#dae0e5!important}.bg-dark{background-color:#343a40!important}a.bg-dark:focus,a.bg-dark:hover,button.bg-dark:focus,button.bg-dark:hover{background-color:#1d2124!important}.bg-white{background-color:#fff!important}.bg-transparent{background-color:transparent!important}.border{border:1px solid #dee2e6!important}.border-top{border-top:1px solid #dee2e6!important}.border-right{border-right:1px solid #dee2e6!important}.border-bottom{border-bottom:1px solid #dee2e6!important}.border-left{border-left:1px solid #dee2e6!important}.border-0{border:0!important}.border-top-0{border-top:0!important}.border-right-0{border-right:0!important}.border-bottom-0{border-bottom:0!important}.border-left-0{border-left:0!important}.border-primary{border-color:#007bff!important}.border-secondary{border-color:#6c757d!important}.border-success{border-color:#28a745!important}.border-info{border-color:#17a2b8!important}.border-warning{border-color:#ffc107!important}.border-danger{border-color:#dc3545!important}.border-light{border-color:#f8f9fa!important}.border-dark{border-color:#343a40!important}.border-white{border-color:#fff!important}.rounded-sm{border-radius:.2rem!important}.rounded{border-radius:.25rem!important}.rounded-top{border-top-left-radius:.25rem!important;border-top-right-radius:.25rem!important}.rounded-right{border-top-right-radius:.25rem!important;border-bottom-right-radius:.25rem!important}.rounded-bottom{border-bottom-right-radius:.25rem!important;border-bottom-left-radius:.25rem!important}.rounded-left{border-top-left-radius:.25rem!important;border-bottom-left-radius:.25rem!important}.rounded-lg{border-radius:.3rem!important}.rounded-circle{border-radius:50%!important}.rounded-pill{border-radius:50rem!important}.rounded-0{border-radius:0!important}.clearfix::after{display:block;clear:both;content:""}.d-none{display:none!important}.d-inline{display:inline!important}.d-inline-block{display:inline-block!important}.d-block{display:block!important}.d-table{display:table!important}.d-table-row{display:table-row!important}.d-table-cell{display:table-cell!important}.d-flex{display:-ms-flexbox!important;display:flex!important}.d-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}@media (min-width:576px){.d-sm-none{display:none!important}.d-sm-inline{display:inline!important}.d-sm-inline-block{display:inline-block!important}.d-sm-block{display:block!important}.d-sm-table{display:table!important}.d-sm-table-row{display:table-row!important}.d-sm-table-cell{display:table-cell!important}.d-sm-flex{display:-ms-flexbox!important;display:flex!important}.d-sm-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:768px){.d-md-none{display:none!important}.d-md-inline{display:inline!important}.d-md-inline-block{display:inline-block!important}.d-md-block{display:block!important}.d-md-table{display:table!important}.d-md-table-row{display:table-row!important}.d-md-table-cell{display:table-cell!important}.d-md-flex{display:-ms-flexbox!important;display:flex!important}.d-md-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:992px){.d-lg-none{display:none!important}.d-lg-inline{display:inline!important}.d-lg-inline-block{display:inline-block!important}.d-lg-block{display:block!important}.d-lg-table{display:table!important}.d-lg-table-row{display:table-row!important}.d-lg-table-cell{display:table-cell!important}.d-lg-flex{display:-ms-flexbox!important;display:flex!important}.d-lg-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:1200px){.d-xl-none{display:none!important}.d-xl-inline{display:inline!important}.d-xl-inline-block{display:inline-block!important}.d-xl-block{display:block!important}.d-xl-table{display:table!important}.d-xl-table-row{display:table-row!important}.d-xl-table-cell{display:table-cell!important}.d-xl-flex{display:-ms-flexbox!important;display:flex!important}.d-xl-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}@media print{.d-print-none{display:none!important}.d-print-inline{display:inline!important}.d-print-inline-block{display:inline-block!important}.d-print-block{display:block!important}.d-print-table{display:table!important}.d-print-table-row{display:table-row!important}.d-print-table-cell{display:table-cell!important}.d-print-flex{display:-ms-flexbox!important;display:flex!important}.d-print-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}}.embed-responsive{position:relative;display:block;width:100%;padding:0;overflow:hidden}.embed-responsive::before{display:block;content:""}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-21by9::before{padding-top:42.857143%}.embed-responsive-16by9::before{padding-top:56.25%}.embed-responsive-4by3::before{padding-top:75%}.embed-responsive-1by1::before{padding-top:100%}.flex-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-center{-ms-flex-align:center!important;align-items:center!important}.align-items-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}@media (min-width:576px){.flex-sm-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-sm-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-sm-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-sm-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-sm-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-sm-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-sm-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-sm-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-sm-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-sm-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-sm-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-sm-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-sm-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-sm-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-sm-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-sm-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-sm-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-sm-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-sm-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-sm-center{-ms-flex-align:center!important;align-items:center!important}.align-items-sm-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-sm-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-sm-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-sm-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-sm-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-sm-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-sm-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-sm-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-sm-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-sm-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-sm-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-sm-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-sm-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-sm-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:768px){.flex-md-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-md-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-md-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-md-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-md-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-md-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-md-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-md-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-md-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-md-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-md-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-md-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-md-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-md-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-md-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-md-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-md-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-md-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-md-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-md-center{-ms-flex-align:center!important;align-items:center!important}.align-items-md-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-md-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-md-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-md-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-md-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-md-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-md-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-md-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-md-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-md-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-md-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-md-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-md-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-md-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:992px){.flex-lg-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-lg-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-lg-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-lg-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-lg-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-lg-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-lg-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-lg-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-lg-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-lg-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-lg-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-lg-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-lg-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-lg-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-lg-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-lg-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-lg-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-lg-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-lg-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-lg-center{-ms-flex-align:center!important;align-items:center!important}.align-items-lg-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-lg-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-lg-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-lg-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-lg-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-lg-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-lg-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-lg-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-lg-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-lg-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-lg-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-lg-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-lg-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-lg-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:1200px){.flex-xl-row{-ms-flex-direction:row!important;flex-direction:row!important}.flex-xl-column{-ms-flex-direction:column!important;flex-direction:column!important}.flex-xl-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-xl-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-xl-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-xl-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-xl-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.flex-xl-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}.flex-xl-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}.flex-xl-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}.flex-xl-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}.flex-xl-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}.justify-content-xl-start{-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-xl-end{-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-xl-center{-ms-flex-pack:center!important;justify-content:center!important}.justify-content-xl-between{-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-xl-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-xl-start{-ms-flex-align:start!important;align-items:flex-start!important}.align-items-xl-end{-ms-flex-align:end!important;align-items:flex-end!important}.align-items-xl-center{-ms-flex-align:center!important;align-items:center!important}.align-items-xl-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-xl-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-xl-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-xl-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-xl-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-xl-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-xl-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-xl-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-xl-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-xl-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-xl-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-xl-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-xl-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-xl-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}.float-left{float:left!important}.float-right{float:right!important}.float-none{float:none!important}@media (min-width:576px){.float-sm-left{float:left!important}.float-sm-right{float:right!important}.float-sm-none{float:none!important}}@media (min-width:768px){.float-md-left{float:left!important}.float-md-right{float:right!important}.float-md-none{float:none!important}}@media (min-width:992px){.float-lg-left{float:left!important}.float-lg-right{float:right!important}.float-lg-none{float:none!important}}@media (min-width:1200px){.float-xl-left{float:left!important}.float-xl-right{float:right!important}.float-xl-none{float:none!important}}.overflow-auto{overflow:auto!important}.overflow-hidden{overflow:hidden!important}.position-static{position:static!important}.position-relative{position:relative!important}.position-absolute{position:absolute!important}.position-fixed{position:fixed!important}.position-sticky{position:-webkit-sticky!important;position:sticky!important}.fixed-top{position:fixed;top:0;right:0;left:0;z-index:1030}.fixed-bottom{position:fixed;right:0;bottom:0;left:0;z-index:1030}@supports ((position:-webkit-sticky) or (position:sticky)){.sticky-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;overflow:visible;clip:auto;white-space:normal}.shadow-sm{box-shadow:0 .125rem .25rem rgba(0,0,0,.075)!important}.shadow{box-shadow:0 .5rem 1rem rgba(0,0,0,.15)!important}.shadow-lg{box-shadow:0 1rem 3rem rgba(0,0,0,.175)!important}.shadow-none{box-shadow:none!important}.w-25{width:25%!important}.w-50{width:50%!important}.w-75{width:75%!important}.w-100{width:100%!important}.w-auto{width:auto!important}.h-25{height:25%!important}.h-50{height:50%!important}.h-75{height:75%!important}.h-100{height:100%!important}.h-auto{height:auto!important}.mw-100{max-width:100%!important}.mh-100{max-height:100%!important}.min-vw-100{min-width:100vw!important}.min-vh-100{min-height:100vh!important}.vw-100{width:100vw!important}.vh-100{height:100vh!important}.stretched-link::after{position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;pointer-events:auto;content:"";background-color:rgba(0,0,0,0)}.m-0{margin:0!important}.mt-0,.my-0{margin-top:0!important}.mr-0,.mx-0{margin-right:0!important}.mb-0,.my-0{margin-bottom:0!important}.ml-0,.mx-0{margin-left:0!important}.m-1{margin:.25rem!important}.mt-1,.my-1{margin-top:.25rem!important}.mr-1,.mx-1{margin-right:.25rem!important}.mb-1,.my-1{margin-bottom:.25rem!important}.ml-1,.mx-1{margin-left:.25rem!important}.m-2{margin:.5rem!important}.mt-2,.my-2{margin-top:.5rem!important}.mr-2,.mx-2{margin-right:.5rem!important}.mb-2,.my-2{margin-bottom:.5rem!important}.ml-2,.mx-2{margin-left:.5rem!important}.m-3{margin:1rem!important}.mt-3,.my-3{margin-top:1rem!important}.mr-3,.mx-3{margin-right:1rem!important}.mb-3,.my-3{margin-bottom:1rem!important}.ml-3,.mx-3{margin-left:1rem!important}.m-4{margin:1.5rem!important}.mt-4,.my-4{margin-top:1.5rem!important}.mr-4,.mx-4{margin-right:1.5rem!important}.mb-4,.my-4{margin-bottom:1.5rem!important}.ml-4,.mx-4{margin-left:1.5rem!important}.m-5{margin:3rem!important}.mt-5,.my-5{margin-top:3rem!important}.mr-5,.mx-5{margin-right:3rem!important}.mb-5,.my-5{margin-bottom:3rem!important}.ml-5,.mx-5{margin-left:3rem!important}.p-0{padding:0!important}.pt-0,.py-0{padding-top:0!important}.pr-0,.px-0{padding-right:0!important}.pb-0,.py-0{padding-bottom:0!important}.pl-0,.px-0{padding-left:0!important}.p-1{padding:.25rem!important}.pt-1,.py-1{padding-top:.25rem!important}.pr-1,.px-1{padding-right:.25rem!important}.pb-1,.py-1{padding-bottom:.25rem!important}.pl-1,.px-1{padding-left:.25rem!important}.p-2{padding:.5rem!important}.pt-2,.py-2{padding-top:.5rem!important}.pr-2,.px-2{padding-right:.5rem!important}.pb-2,.py-2{padding-bottom:.5rem!important}.pl-2,.px-2{padding-left:.5rem!important}.p-3{padding:1rem!important}.pt-3,.py-3{padding-top:1rem!important}.pr-3,.px-3{padding-right:1rem!important}.pb-3,.py-3{padding-bottom:1rem!important}.pl-3,.px-3{padding-left:1rem!important}.p-4{padding:1.5rem!important}.pt-4,.py-4{padding-top:1.5rem!important}.pr-4,.px-4{padding-right:1.5rem!important}.pb-4,.py-4{padding-bottom:1.5rem!important}.pl-4,.px-4{padding-left:1.5rem!important}.p-5{padding:3rem!important}.pt-5,.py-5{padding-top:3rem!important}.pr-5,.px-5{padding-right:3rem!important}.pb-5,.py-5{padding-bottom:3rem!important}.pl-5,.px-5{padding-left:3rem!important}.m-n1{margin:-.25rem!important}.mt-n1,.my-n1{margin-top:-.25rem!important}.mr-n1,.mx-n1{margin-right:-.25rem!important}.mb-n1,.my-n1{margin-bottom:-.25rem!important}.ml-n1,.mx-n1{margin-left:-.25rem!important}.m-n2{margin:-.5rem!important}.mt-n2,.my-n2{margin-top:-.5rem!important}.mr-n2,.mx-n2{margin-right:-.5rem!important}.mb-n2,.my-n2{margin-bottom:-.5rem!important}.ml-n2,.mx-n2{margin-left:-.5rem!important}.m-n3{margin:-1rem!important}.mt-n3,.my-n3{margin-top:-1rem!important}.mr-n3,.mx-n3{margin-right:-1rem!important}.mb-n3,.my-n3{margin-bottom:-1rem!important}.ml-n3,.mx-n3{margin-left:-1rem!important}.m-n4{margin:-1.5rem!important}.mt-n4,.my-n4{margin-top:-1.5rem!important}.mr-n4,.mx-n4{margin-right:-1.5rem!important}.mb-n4,.my-n4{margin-bottom:-1.5rem!important}.ml-n4,.mx-n4{margin-left:-1.5rem!important}.m-n5{margin:-3rem!important}.mt-n5,.my-n5{margin-top:-3rem!important}.mr-n5,.mx-n5{margin-right:-3rem!important}.mb-n5,.my-n5{margin-bottom:-3rem!important}.ml-n5,.mx-n5{margin-left:-3rem!important}.m-auto{margin:auto!important}.mt-auto,.my-auto{margin-top:auto!important}.mr-auto,.mx-auto{margin-right:auto!important}.mb-auto,.my-auto{margin-bottom:auto!important}.ml-auto,.mx-auto{margin-left:auto!important}@media (min-width:576px){.m-sm-0{margin:0!important}.mt-sm-0,.my-sm-0{margin-top:0!important}.mr-sm-0,.mx-sm-0{margin-right:0!important}.mb-sm-0,.my-sm-0{margin-bottom:0!important}.ml-sm-0,.mx-sm-0{margin-left:0!important}.m-sm-1{margin:.25rem!important}.mt-sm-1,.my-sm-1{margin-top:.25rem!important}.mr-sm-1,.mx-sm-1{margin-right:.25rem!important}.mb-sm-1,.my-sm-1{margin-bottom:.25rem!important}.ml-sm-1,.mx-sm-1{margin-left:.25rem!important}.m-sm-2{margin:.5rem!important}.mt-sm-2,.my-sm-2{margin-top:.5rem!important}.mr-sm-2,.mx-sm-2{margin-right:.5rem!important}.mb-sm-2,.my-sm-2{margin-bottom:.5rem!important}.ml-sm-2,.mx-sm-2{margin-left:.5rem!important}.m-sm-3{margin:1rem!important}.mt-sm-3,.my-sm-3{margin-top:1rem!important}.mr-sm-3,.mx-sm-3{margin-right:1rem!important}.mb-sm-3,.my-sm-3{margin-bottom:1rem!important}.ml-sm-3,.mx-sm-3{margin-left:1rem!important}.m-sm-4{margin:1.5rem!important}.mt-sm-4,.my-sm-4{margin-top:1.5rem!important}.mr-sm-4,.mx-sm-4{margin-right:1.5rem!important}.mb-sm-4,.my-sm-4{margin-bottom:1.5rem!important}.ml-sm-4,.mx-sm-4{margin-left:1.5rem!important}.m-sm-5{margin:3rem!important}.mt-sm-5,.my-sm-5{margin-top:3rem!important}.mr-sm-5,.mx-sm-5{margin-right:3rem!important}.mb-sm-5,.my-sm-5{margin-bottom:3rem!important}.ml-sm-5,.mx-sm-5{margin-left:3rem!important}.p-sm-0{padding:0!important}.pt-sm-0,.py-sm-0{padding-top:0!important}.pr-sm-0,.px-sm-0{padding-right:0!important}.pb-sm-0,.py-sm-0{padding-bottom:0!important}.pl-sm-0,.px-sm-0{padding-left:0!important}.p-sm-1{padding:.25rem!important}.pt-sm-1,.py-sm-1{padding-top:.25rem!important}.pr-sm-1,.px-sm-1{padding-right:.25rem!important}.pb-sm-1,.py-sm-1{padding-bottom:.25rem!important}.pl-sm-1,.px-sm-1{padding-left:.25rem!important}.p-sm-2{padding:.5rem!important}.pt-sm-2,.py-sm-2{padding-top:.5rem!important}.pr-sm-2,.px-sm-2{padding-right:.5rem!important}.pb-sm-2,.py-sm-2{padding-bottom:.5rem!important}.pl-sm-2,.px-sm-2{padding-left:.5rem!important}.p-sm-3{padding:1rem!important}.pt-sm-3,.py-sm-3{padding-top:1rem!important}.pr-sm-3,.px-sm-3{padding-right:1rem!important}.pb-sm-3,.py-sm-3{padding-bottom:1rem!important}.pl-sm-3,.px-sm-3{padding-left:1rem!important}.p-sm-4{padding:1.5rem!important}.pt-sm-4,.py-sm-4{padding-top:1.5rem!important}.pr-sm-4,.px-sm-4{padding-right:1.5rem!important}.pb-sm-4,.py-sm-4{padding-bottom:1.5rem!important}.pl-sm-4,.px-sm-4{padding-left:1.5rem!important}.p-sm-5{padding:3rem!important}.pt-sm-5,.py-sm-5{padding-top:3rem!important}.pr-sm-5,.px-sm-5{padding-right:3rem!important}.pb-sm-5,.py-sm-5{padding-bottom:3rem!important}.pl-sm-5,.px-sm-5{padding-left:3rem!important}.m-sm-n1{margin:-.25rem!important}.mt-sm-n1,.my-sm-n1{margin-top:-.25rem!important}.mr-sm-n1,.mx-sm-n1{margin-right:-.25rem!important}.mb-sm-n1,.my-sm-n1{margin-bottom:-.25rem!important}.ml-sm-n1,.mx-sm-n1{margin-left:-.25rem!important}.m-sm-n2{margin:-.5rem!important}.mt-sm-n2,.my-sm-n2{margin-top:-.5rem!important}.mr-sm-n2,.mx-sm-n2{margin-right:-.5rem!important}.mb-sm-n2,.my-sm-n2{margin-bottom:-.5rem!important}.ml-sm-n2,.mx-sm-n2{margin-left:-.5rem!important}.m-sm-n3{margin:-1rem!important}.mt-sm-n3,.my-sm-n3{margin-top:-1rem!important}.mr-sm-n3,.mx-sm-n3{margin-right:-1rem!important}.mb-sm-n3,.my-sm-n3{margin-bottom:-1rem!important}.ml-sm-n3,.mx-sm-n3{margin-left:-1rem!important}.m-sm-n4{margin:-1.5rem!important}.mt-sm-n4,.my-sm-n4{margin-top:-1.5rem!important}.mr-sm-n4,.mx-sm-n4{margin-right:-1.5rem!important}.mb-sm-n4,.my-sm-n4{margin-bottom:-1.5rem!important}.ml-sm-n4,.mx-sm-n4{margin-left:-1.5rem!important}.m-sm-n5{margin:-3rem!important}.mt-sm-n5,.my-sm-n5{margin-top:-3rem!important}.mr-sm-n5,.mx-sm-n5{margin-right:-3rem!important}.mb-sm-n5,.my-sm-n5{margin-bottom:-3rem!important}.ml-sm-n5,.mx-sm-n5{margin-left:-3rem!important}.m-sm-auto{margin:auto!important}.mt-sm-auto,.my-sm-auto{margin-top:auto!important}.mr-sm-auto,.mx-sm-auto{margin-right:auto!important}.mb-sm-auto,.my-sm-auto{margin-bottom:auto!important}.ml-sm-auto,.mx-sm-auto{margin-left:auto!important}}@media (min-width:768px){.m-md-0{margin:0!important}.mt-md-0,.my-md-0{margin-top:0!important}.mr-md-0,.mx-md-0{margin-right:0!important}.mb-md-0,.my-md-0{margin-bottom:0!important}.ml-md-0,.mx-md-0{margin-left:0!important}.m-md-1{margin:.25rem!important}.mt-md-1,.my-md-1{margin-top:.25rem!important}.mr-md-1,.mx-md-1{margin-right:.25rem!important}.mb-md-1,.my-md-1{margin-bottom:.25rem!important}.ml-md-1,.mx-md-1{margin-left:.25rem!important}.m-md-2{margin:.5rem!important}.mt-md-2,.my-md-2{margin-top:.5rem!important}.mr-md-2,.mx-md-2{margin-right:.5rem!important}.mb-md-2,.my-md-2{margin-bottom:.5rem!important}.ml-md-2,.mx-md-2{margin-left:.5rem!important}.m-md-3{margin:1rem!important}.mt-md-3,.my-md-3{margin-top:1rem!important}.mr-md-3,.mx-md-3{margin-right:1rem!important}.mb-md-3,.my-md-3{margin-bottom:1rem!important}.ml-md-3,.mx-md-3{margin-left:1rem!important}.m-md-4{margin:1.5rem!important}.mt-md-4,.my-md-4{margin-top:1.5rem!important}.mr-md-4,.mx-md-4{margin-right:1.5rem!important}.mb-md-4,.my-md-4{margin-bottom:1.5rem!important}.ml-md-4,.mx-md-4{margin-left:1.5rem!important}.m-md-5{margin:3rem!important}.mt-md-5,.my-md-5{margin-top:3rem!important}.mr-md-5,.mx-md-5{margin-right:3rem!important}.mb-md-5,.my-md-5{margin-bottom:3rem!important}.ml-md-5,.mx-md-5{margin-left:3rem!important}.p-md-0{padding:0!important}.pt-md-0,.py-md-0{padding-top:0!important}.pr-md-0,.px-md-0{padding-right:0!important}.pb-md-0,.py-md-0{padding-bottom:0!important}.pl-md-0,.px-md-0{padding-left:0!important}.p-md-1{padding:.25rem!important}.pt-md-1,.py-md-1{padding-top:.25rem!important}.pr-md-1,.px-md-1{padding-right:.25rem!important}.pb-md-1,.py-md-1{padding-bottom:.25rem!important}.pl-md-1,.px-md-1{padding-left:.25rem!important}.p-md-2{padding:.5rem!important}.pt-md-2,.py-md-2{padding-top:.5rem!important}.pr-md-2,.px-md-2{padding-right:.5rem!important}.pb-md-2,.py-md-2{padding-bottom:.5rem!important}.pl-md-2,.px-md-2{padding-left:.5rem!important}.p-md-3{padding:1rem!important}.pt-md-3,.py-md-3{padding-top:1rem!important}.pr-md-3,.px-md-3{padding-right:1rem!important}.pb-md-3,.py-md-3{padding-bottom:1rem!important}.pl-md-3,.px-md-3{padding-left:1rem!important}.p-md-4{padding:1.5rem!important}.pt-md-4,.py-md-4{padding-top:1.5rem!important}.pr-md-4,.px-md-4{padding-right:1.5rem!important}.pb-md-4,.py-md-4{padding-bottom:1.5rem!important}.pl-md-4,.px-md-4{padding-left:1.5rem!important}.p-md-5{padding:3rem!important}.pt-md-5,.py-md-5{padding-top:3rem!important}.pr-md-5,.px-md-5{padding-right:3rem!important}.pb-md-5,.py-md-5{padding-bottom:3rem!important}.pl-md-5,.px-md-5{padding-left:3rem!important}.m-md-n1{margin:-.25rem!important}.mt-md-n1,.my-md-n1{margin-top:-.25rem!important}.mr-md-n1,.mx-md-n1{margin-right:-.25rem!important}.mb-md-n1,.my-md-n1{margin-bottom:-.25rem!important}.ml-md-n1,.mx-md-n1{margin-left:-.25rem!important}.m-md-n2{margin:-.5rem!important}.mt-md-n2,.my-md-n2{margin-top:-.5rem!important}.mr-md-n2,.mx-md-n2{margin-right:-.5rem!important}.mb-md-n2,.my-md-n2{margin-bottom:-.5rem!important}.ml-md-n2,.mx-md-n2{margin-left:-.5rem!important}.m-md-n3{margin:-1rem!important}.mt-md-n3,.my-md-n3{margin-top:-1rem!important}.mr-md-n3,.mx-md-n3{margin-right:-1rem!important}.mb-md-n3,.my-md-n3{margin-bottom:-1rem!important}.ml-md-n3,.mx-md-n3{margin-left:-1rem!important}.m-md-n4{margin:-1.5rem!important}.mt-md-n4,.my-md-n4{margin-top:-1.5rem!important}.mr-md-n4,.mx-md-n4{margin-right:-1.5rem!important}.mb-md-n4,.my-md-n4{margin-bottom:-1.5rem!important}.ml-md-n4,.mx-md-n4{margin-left:-1.5rem!important}.m-md-n5{margin:-3rem!important}.mt-md-n5,.my-md-n5{margin-top:-3rem!important}.mr-md-n5,.mx-md-n5{margin-right:-3rem!important}.mb-md-n5,.my-md-n5{margin-bottom:-3rem!important}.ml-md-n5,.mx-md-n5{margin-left:-3rem!important}.m-md-auto{margin:auto!important}.mt-md-auto,.my-md-auto{margin-top:auto!important}.mr-md-auto,.mx-md-auto{margin-right:auto!important}.mb-md-auto,.my-md-auto{margin-bottom:auto!important}.ml-md-auto,.mx-md-auto{margin-left:auto!important}}@media (min-width:992px){.m-lg-0{margin:0!important}.mt-lg-0,.my-lg-0{margin-top:0!important}.mr-lg-0,.mx-lg-0{margin-right:0!important}.mb-lg-0,.my-lg-0{margin-bottom:0!important}.ml-lg-0,.mx-lg-0{margin-left:0!important}.m-lg-1{margin:.25rem!important}.mt-lg-1,.my-lg-1{margin-top:.25rem!important}.mr-lg-1,.mx-lg-1{margin-right:.25rem!important}.mb-lg-1,.my-lg-1{margin-bottom:.25rem!important}.ml-lg-1,.mx-lg-1{margin-left:.25rem!important}.m-lg-2{margin:.5rem!important}.mt-lg-2,.my-lg-2{margin-top:.5rem!important}.mr-lg-2,.mx-lg-2{margin-right:.5rem!important}.mb-lg-2,.my-lg-2{margin-bottom:.5rem!important}.ml-lg-2,.mx-lg-2{margin-left:.5rem!important}.m-lg-3{margin:1rem!important}.mt-lg-3,.my-lg-3{margin-top:1rem!important}.mr-lg-3,.mx-lg-3{margin-right:1rem!important}.mb-lg-3,.my-lg-3{margin-bottom:1rem!important}.ml-lg-3,.mx-lg-3{margin-left:1rem!important}.m-lg-4{margin:1.5rem!important}.mt-lg-4,.my-lg-4{margin-top:1.5rem!important}.mr-lg-4,.mx-lg-4{margin-right:1.5rem!important}.mb-lg-4,.my-lg-4{margin-bottom:1.5rem!important}.ml-lg-4,.mx-lg-4{margin-left:1.5rem!important}.m-lg-5{margin:3rem!important}.mt-lg-5,.my-lg-5{margin-top:3rem!important}.mr-lg-5,.mx-lg-5{margin-right:3rem!important}.mb-lg-5,.my-lg-5{margin-bottom:3rem!important}.ml-lg-5,.mx-lg-5{margin-left:3rem!important}.p-lg-0{padding:0!important}.pt-lg-0,.py-lg-0{padding-top:0!important}.pr-lg-0,.px-lg-0{padding-right:0!important}.pb-lg-0,.py-lg-0{padding-bottom:0!important}.pl-lg-0,.px-lg-0{padding-left:0!important}.p-lg-1{padding:.25rem!important}.pt-lg-1,.py-lg-1{padding-top:.25rem!important}.pr-lg-1,.px-lg-1{padding-right:.25rem!important}.pb-lg-1,.py-lg-1{padding-bottom:.25rem!important}.pl-lg-1,.px-lg-1{padding-left:.25rem!important}.p-lg-2{padding:.5rem!important}.pt-lg-2,.py-lg-2{padding-top:.5rem!important}.pr-lg-2,.px-lg-2{padding-right:.5rem!important}.pb-lg-2,.py-lg-2{padding-bottom:.5rem!important}.pl-lg-2,.px-lg-2{padding-left:.5rem!important}.p-lg-3{padding:1rem!important}.pt-lg-3,.py-lg-3{padding-top:1rem!important}.pr-lg-3,.px-lg-3{padding-right:1rem!important}.pb-lg-3,.py-lg-3{padding-bottom:1rem!important}.pl-lg-3,.px-lg-3{padding-left:1rem!important}.p-lg-4{padding:1.5rem!important}.pt-lg-4,.py-lg-4{padding-top:1.5rem!important}.pr-lg-4,.px-lg-4{padding-right:1.5rem!important}.pb-lg-4,.py-lg-4{padding-bottom:1.5rem!important}.pl-lg-4,.px-lg-4{padding-left:1.5rem!important}.p-lg-5{padding:3rem!important}.pt-lg-5,.py-lg-5{padding-top:3rem!important}.pr-lg-5,.px-lg-5{padding-right:3rem!important}.pb-lg-5,.py-lg-5{padding-bottom:3rem!important}.pl-lg-5,.px-lg-5{padding-left:3rem!important}.m-lg-n1{margin:-.25rem!important}.mt-lg-n1,.my-lg-n1{margin-top:-.25rem!important}.mr-lg-n1,.mx-lg-n1{margin-right:-.25rem!important}.mb-lg-n1,.my-lg-n1{margin-bottom:-.25rem!important}.ml-lg-n1,.mx-lg-n1{margin-left:-.25rem!important}.m-lg-n2{margin:-.5rem!important}.mt-lg-n2,.my-lg-n2{margin-top:-.5rem!important}.mr-lg-n2,.mx-lg-n2{margin-right:-.5rem!important}.mb-lg-n2,.my-lg-n2{margin-bottom:-.5rem!important}.ml-lg-n2,.mx-lg-n2{margin-left:-.5rem!important}.m-lg-n3{margin:-1rem!important}.mt-lg-n3,.my-lg-n3{margin-top:-1rem!important}.mr-lg-n3,.mx-lg-n3{margin-right:-1rem!important}.mb-lg-n3,.my-lg-n3{margin-bottom:-1rem!important}.ml-lg-n3,.mx-lg-n3{margin-left:-1rem!important}.m-lg-n4{margin:-1.5rem!important}.mt-lg-n4,.my-lg-n4{margin-top:-1.5rem!important}.mr-lg-n4,.mx-lg-n4{margin-right:-1.5rem!important}.mb-lg-n4,.my-lg-n4{margin-bottom:-1.5rem!important}.ml-lg-n4,.mx-lg-n4{margin-left:-1.5rem!important}.m-lg-n5{margin:-3rem!important}.mt-lg-n5,.my-lg-n5{margin-top:-3rem!important}.mr-lg-n5,.mx-lg-n5{margin-right:-3rem!important}.mb-lg-n5,.my-lg-n5{margin-bottom:-3rem!important}.ml-lg-n5,.mx-lg-n5{margin-left:-3rem!important}.m-lg-auto{margin:auto!important}.mt-lg-auto,.my-lg-auto{margin-top:auto!important}.mr-lg-auto,.mx-lg-auto{margin-right:auto!important}.mb-lg-auto,.my-lg-auto{margin-bottom:auto!important}.ml-lg-auto,.mx-lg-auto{margin-left:auto!important}}@media (min-width:1200px){.m-xl-0{margin:0!important}.mt-xl-0,.my-xl-0{margin-top:0!important}.mr-xl-0,.mx-xl-0{margin-right:0!important}.mb-xl-0,.my-xl-0{margin-bottom:0!important}.ml-xl-0,.mx-xl-0{margin-left:0!important}.m-xl-1{margin:.25rem!important}.mt-xl-1,.my-xl-1{margin-top:.25rem!important}.mr-xl-1,.mx-xl-1{margin-right:.25rem!important}.mb-xl-1,.my-xl-1{margin-bottom:.25rem!important}.ml-xl-1,.mx-xl-1{margin-left:.25rem!important}.m-xl-2{margin:.5rem!important}.mt-xl-2,.my-xl-2{margin-top:.5rem!important}.mr-xl-2,.mx-xl-2{margin-right:.5rem!important}.mb-xl-2,.my-xl-2{margin-bottom:.5rem!important}.ml-xl-2,.mx-xl-2{margin-left:.5rem!important}.m-xl-3{margin:1rem!important}.mt-xl-3,.my-xl-3{margin-top:1rem!important}.mr-xl-3,.mx-xl-3{margin-right:1rem!important}.mb-xl-3,.my-xl-3{margin-bottom:1rem!important}.ml-xl-3,.mx-xl-3{margin-left:1rem!important}.m-xl-4{margin:1.5rem!important}.mt-xl-4,.my-xl-4{margin-top:1.5rem!important}.mr-xl-4,.mx-xl-4{margin-right:1.5rem!important}.mb-xl-4,.my-xl-4{margin-bottom:1.5rem!important}.ml-xl-4,.mx-xl-4{margin-left:1.5rem!important}.m-xl-5{margin:3rem!important}.mt-xl-5,.my-xl-5{margin-top:3rem!important}.mr-xl-5,.mx-xl-5{margin-right:3rem!important}.mb-xl-5,.my-xl-5{margin-bottom:3rem!important}.ml-xl-5,.mx-xl-5{margin-left:3rem!important}.p-xl-0{padding:0!important}.pt-xl-0,.py-xl-0{padding-top:0!important}.pr-xl-0,.px-xl-0{padding-right:0!important}.pb-xl-0,.py-xl-0{padding-bottom:0!important}.pl-xl-0,.px-xl-0{padding-left:0!important}.p-xl-1{padding:.25rem!important}.pt-xl-1,.py-xl-1{padding-top:.25rem!important}.pr-xl-1,.px-xl-1{padding-right:.25rem!important}.pb-xl-1,.py-xl-1{padding-bottom:.25rem!important}.pl-xl-1,.px-xl-1{padding-left:.25rem!important}.p-xl-2{padding:.5rem!important}.pt-xl-2,.py-xl-2{padding-top:.5rem!important}.pr-xl-2,.px-xl-2{padding-right:.5rem!important}.pb-xl-2,.py-xl-2{padding-bottom:.5rem!important}.pl-xl-2,.px-xl-2{padding-left:.5rem!important}.p-xl-3{padding:1rem!important}.pt-xl-3,.py-xl-3{padding-top:1rem!important}.pr-xl-3,.px-xl-3{padding-right:1rem!important}.pb-xl-3,.py-xl-3{padding-bottom:1rem!important}.pl-xl-3,.px-xl-3{padding-left:1rem!important}.p-xl-4{padding:1.5rem!important}.pt-xl-4,.py-xl-4{padding-top:1.5rem!important}.pr-xl-4,.px-xl-4{padding-right:1.5rem!important}.pb-xl-4,.py-xl-4{padding-bottom:1.5rem!important}.pl-xl-4,.px-xl-4{padding-left:1.5rem!important}.p-xl-5{padding:3rem!important}.pt-xl-5,.py-xl-5{padding-top:3rem!important}.pr-xl-5,.px-xl-5{padding-right:3rem!important}.pb-xl-5,.py-xl-5{padding-bottom:3rem!important}.pl-xl-5,.px-xl-5{padding-left:3rem!important}.m-xl-n1{margin:-.25rem!important}.mt-xl-n1,.my-xl-n1{margin-top:-.25rem!important}.mr-xl-n1,.mx-xl-n1{margin-right:-.25rem!important}.mb-xl-n1,.my-xl-n1{margin-bottom:-.25rem!important}.ml-xl-n1,.mx-xl-n1{margin-left:-.25rem!important}.m-xl-n2{margin:-.5rem!important}.mt-xl-n2,.my-xl-n2{margin-top:-.5rem!important}.mr-xl-n2,.mx-xl-n2{margin-right:-.5rem!important}.mb-xl-n2,.my-xl-n2{margin-bottom:-.5rem!important}.ml-xl-n2,.mx-xl-n2{margin-left:-.5rem!important}.m-xl-n3{margin:-1rem!important}.mt-xl-n3,.my-xl-n3{margin-top:-1rem!important}.mr-xl-n3,.mx-xl-n3{margin-right:-1rem!important}.mb-xl-n3,.my-xl-n3{margin-bottom:-1rem!important}.ml-xl-n3,.mx-xl-n3{margin-left:-1rem!important}.m-xl-n4{margin:-1.5rem!important}.mt-xl-n4,.my-xl-n4{margin-top:-1.5rem!important}.mr-xl-n4,.mx-xl-n4{margin-right:-1.5rem!important}.mb-xl-n4,.my-xl-n4{margin-bottom:-1.5rem!important}.ml-xl-n4,.mx-xl-n4{margin-left:-1.5rem!important}.m-xl-n5{margin:-3rem!important}.mt-xl-n5,.my-xl-n5{margin-top:-3rem!important}.mr-xl-n5,.mx-xl-n5{margin-right:-3rem!important}.mb-xl-n5,.my-xl-n5{margin-bottom:-3rem!important}.ml-xl-n5,.mx-xl-n5{margin-left:-3rem!important}.m-xl-auto{margin:auto!important}.mt-xl-auto,.my-xl-auto{margin-top:auto!important}.mr-xl-auto,.mx-xl-auto{margin-right:auto!important}.mb-xl-auto,.my-xl-auto{margin-bottom:auto!important}.ml-xl-auto,.mx-xl-auto{margin-left:auto!important}}.text-monospace{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace!important}.text-justify{text-align:justify!important}.text-wrap{white-space:normal!important}.text-nowrap{white-space:nowrap!important}.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-left{text-align:left!important}.text-right{text-align:right!important}.text-center{text-align:center!important}@media (min-width:576px){.text-sm-left{text-align:left!important}.text-sm-right{text-align:right!important}.text-sm-center{text-align:center!important}}@media (min-width:768px){.text-md-left{text-align:left!important}.text-md-right{text-align:right!important}.text-md-center{text-align:center!important}}@media (min-width:992px){.text-lg-left{text-align:left!important}.text-lg-right{text-align:right!important}.text-lg-center{text-align:center!important}}@media (min-width:1200px){.text-xl-left{text-align:left!important}.text-xl-right{text-align:right!important}.text-xl-center{text-align:center!important}}.text-lowercase{text-transform:lowercase!important}.text-uppercase{text-transform:uppercase!important}.text-capitalize{text-transform:capitalize!important}.font-weight-light{font-weight:300!important}.font-weight-lighter{font-weight:lighter!important}.font-weight-normal{font-weight:400!important}.font-weight-bold{font-weight:700!important}.font-weight-bolder{font-weight:bolder!important}.font-italic{font-style:italic!important}.text-white{color:#fff!important}.text-primary{color:#007bff!important}a.text-primary:focus,a.text-primary:hover{color:#0056b3!important}.text-secondary{color:#6c757d!important}a.text-secondary:focus,a.text-secondary:hover{color:#494f54!important}.text-success{color:#28a745!important}a.text-success:focus,a.text-success:hover{color:#19692c!important}.text-info{color:#17a2b8!important}a.text-info:focus,a.text-info:hover{color:#0f6674!important}.text-warning{color:#ffc107!important}a.text-warning:focus,a.text-warning:hover{color:#ba8b00!important}.text-danger{color:#dc3545!important}a.text-danger:focus,a.text-danger:hover{color:#a71d2a!important}.text-light{color:#f8f9fa!important}a.text-light:focus,a.text-light:hover{color:#cbd3da!important}.text-dark{color:#343a40!important}a.text-dark:focus,a.text-dark:hover{color:#121416!important}.text-body{color:#212529!important}.text-muted{color:#6c757d!important}.text-black-50{color:rgba(0,0,0,.5)!important}.text-white-50{color:rgba(255,255,255,.5)!important}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.text-decoration-none{text-decoration:none!important}.text-break{word-break:break-word!important;overflow-wrap:break-word!important}.text-reset{color:inherit!important}.visible{visibility:visible!important}.invisible{visibility:hidden!important}@media print{*,::after,::before{text-shadow:none!important;box-shadow:none!important}a:not(.btn){text-decoration:underline}abbr[title]::after{content:" (" attr(title) ")"}pre{white-space:pre-wrap!important}blockquote,pre{border:1px solid #adb5bd;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}@page{size:a3}body{min-width:992px!important}.container{min-width:992px!important}.navbar{display:none}.badge{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #dee2e6!important}.table-dark{color:inherit}.table-dark tbody+tbody,.table-dark td,.table-dark th,.table-dark thead th{border-color:#dee2e6}.table .thead-dark th{color:inherit;border-color:#dee2e6}}
-/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
diff --git a/ui/bootstrap/src/main/resources/css/bootstrap.min.css.map b/ui/bootstrap/src/main/resources/css/bootstrap.min.css.map
deleted file mode 100644
index b939eb6f..00000000
--- a/ui/bootstrap/src/main/resources/css/bootstrap.min.css.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["../../scss/bootstrap.scss","../../scss/_root.scss","../../scss/_reboot.scss","dist/css/bootstrap.css","../../scss/vendor/_rfs.scss","bootstrap.css","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixins/_grid-framework.scss","../../scss/_tables.scss","../../scss/mixins/_table-row.scss","../../scss/_forms.scss","../../scss/mixins/_transition.scss","../../scss/mixins/_forms.scss","../../scss/mixins/_gradients.scss","../../scss/_buttons.scss","../../scss/mixins/_buttons.scss","../../scss/_transitions.scss","../../scss/_dropdown.scss","../../scss/mixins/_caret.scss","../../scss/mixins/_nav-divider.scss","../../scss/_button-group.scss","../../scss/_input-group.scss","../../scss/_custom-forms.scss","../../scss/_nav.scss","../../scss/_navbar.scss","../../scss/_card.scss","../../scss/_breadcrumb.scss","../../scss/_pagination.scss","../../scss/mixins/_pagination.scss","../../scss/_badge.scss","../../scss/mixins/_badge.scss","../../scss/_jumbotron.scss","../../scss/_alert.scss","../../scss/mixins/_alert.scss","../../scss/_progress.scss","../../scss/_media.scss","../../scss/_list-group.scss","../../scss/mixins/_list-group.scss","../../scss/_close.scss","../../scss/_toasts.scss","../../scss/_modal.scss","../../scss/_tooltip.scss","../../scss/mixins/_reset-text.scss","../../scss/_popover.scss","../../scss/_carousel.scss","../../scss/mixins/_clearfix.scss","../../scss/_spinners.scss","../../scss/utilities/_align.scss","../../scss/mixins/_background-variant.scss","../../scss/utilities/_background.scss","../../scss/utilities/_borders.scss","../../scss/utilities/_display.scss","../../scss/utilities/_embed.scss","../../scss/utilities/_flex.scss","../../scss/utilities/_float.scss","../../scss/utilities/_overflow.scss","../../scss/utilities/_position.scss","../../scss/utilities/_screenreaders.scss","../../scss/mixins/_screen-reader.scss","../../scss/utilities/_shadows.scss","../../scss/utilities/_sizing.scss","../../scss/utilities/_stretched-link.scss","../../scss/utilities/_spacing.scss","../../scss/utilities/_text.scss","../../scss/mixins/_text-truncate.scss","../../scss/mixins/_text-emphasis.scss","../../scss/mixins/_text-hide.scss","../../scss/utilities/_visibility.scss","../../scss/_print.scss"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Bootstrap v4.4.1 (https://getbootstrap.com/)\n * Copyright 2011-2019 The Bootstrap Authors\n * Copyright 2011-2019 Twitter, Inc.\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n */\n\n@import \"functions\";\n@import \"variables\";\n@import \"mixins\";\n@import \"root\";\n@import \"reboot\";\n@import \"type\";\n@import \"images\";\n@import \"code\";\n@import \"grid\";\n@import \"tables\";\n@import \"forms\";\n@import \"buttons\";\n@import \"transitions\";\n@import \"dropdown\";\n@import \"button-group\";\n@import \"input-group\";\n@import \"custom-forms\";\n@import \"nav\";\n@import \"navbar\";\n@import \"card\";\n@import \"breadcrumb\";\n@import \"pagination\";\n@import \"badge\";\n@import \"jumbotron\";\n@import \"alert\";\n@import \"progress\";\n@import \"media\";\n@import \"list-group\";\n@import \"close\";\n@import \"toasts\";\n@import \"modal\";\n@import \"tooltip\";\n@import \"popover\";\n@import \"carousel\";\n@import \"spinners\";\n@import \"utilities\";\n@import \"print\";\n","// Do not forget to update getting-started/theming.md!\n:root {\n  // Custom variable values only support SassScript inside `#{}`.\n  @each $color, $value in $colors {\n    --#{$color}: #{$value};\n  }\n\n  @each $color, $value in $theme-colors {\n    --#{$color}: #{$value};\n  }\n\n  @each $bp, $value in $grid-breakpoints {\n    --breakpoint-#{$bp}: #{$value};\n  }\n\n  // Use `inspect` for lists so that quoted items keep the quotes.\n  // See https://github.com/sass/sass/issues/2383#issuecomment-336349172\n  --font-family-sans-serif: #{inspect($font-family-sans-serif)};\n  --font-family-monospace: #{inspect($font-family-monospace)};\n}\n","// stylelint-disable at-rule-no-vendor-prefix, declaration-no-important, selector-no-qualifying-type, property-no-vendor-prefix\n\n// Reboot\n//\n// Normalization of HTML elements, manually forked from Normalize.css to remove\n// styles targeting irrelevant browsers while applying new styles.\n//\n// Normalize is licensed MIT. https://github.com/necolas/normalize.css\n\n\n// Document\n//\n// 1. Change from `box-sizing: content-box` so that `width` is not affected by `padding` or `border`.\n// 2. Change the default font family in all browsers.\n// 3. Correct the line height in all browsers.\n// 4. Prevent adjustments of font size after orientation changes in IE on Windows Phone and in iOS.\n// 5. Change the default tap highlight to be completely transparent in iOS.\n\n*,\n*::before,\n*::after {\n  box-sizing: border-box; // 1\n}\n\nhtml {\n  font-family: sans-serif; // 2\n  line-height: 1.15; // 3\n  -webkit-text-size-adjust: 100%; // 4\n  -webkit-tap-highlight-color: rgba($black, 0); // 5\n}\n\n// Shim for \"new\" HTML5 structural elements to display correctly (IE10, older browsers)\n// TODO: remove in v5\n// stylelint-disable-next-line selector-list-comma-newline-after\narticle, aside, figcaption, figure, footer, header, hgroup, main, nav, section {\n  display: block;\n}\n\n// Body\n//\n// 1. Remove the margin in all browsers.\n// 2. As a best practice, apply a default `background-color`.\n// 3. Set an explicit initial text-align value so that we can later use\n//    the `inherit` value on things like `<th>` elements.\n\nbody {\n  margin: 0; // 1\n  font-family: $font-family-base;\n  @include font-size($font-size-base);\n  font-weight: $font-weight-base;\n  line-height: $line-height-base;\n  color: $body-color;\n  text-align: left; // 3\n  background-color: $body-bg; // 2\n}\n\n// Future-proof rule: in browsers that support :focus-visible, suppress the focus outline\n// on elements that programmatically receive focus but wouldn't normally show a visible\n// focus outline. In general, this would mean that the outline is only applied if the\n// interaction that led to the element receiving programmatic focus was a keyboard interaction,\n// or the browser has somehow determined that the user is primarily a keyboard user and/or\n// wants focus outlines to always be presented.\n//\n// See https://developer.mozilla.org/en-US/docs/Web/CSS/:focus-visible\n// and https://developer.paciellogroup.com/blog/2018/03/focus-visible-and-backwards-compatibility/\n[tabindex=\"-1\"]:focus:not(:focus-visible) {\n  outline: 0 !important;\n}\n\n\n// Content grouping\n//\n// 1. Add the correct box sizing in Firefox.\n// 2. Show the overflow in Edge and IE.\n\nhr {\n  box-sizing: content-box; // 1\n  height: 0; // 1\n  overflow: visible; // 2\n}\n\n\n//\n// Typography\n//\n\n// Remove top margins from headings\n//\n// By default, `<h1>`-`<h6>` all receive top and bottom margins. We nuke the top\n// margin for easier control within type scales as it avoids margin collapsing.\n// stylelint-disable-next-line selector-list-comma-newline-after\nh1, h2, h3, h4, h5, h6 {\n  margin-top: 0;\n  margin-bottom: $headings-margin-bottom;\n}\n\n// Reset margins on paragraphs\n//\n// Similarly, the top margin on `<p>`s get reset. However, we also reset the\n// bottom margin to use `rem` units instead of `em`.\np {\n  margin-top: 0;\n  margin-bottom: $paragraph-margin-bottom;\n}\n\n// Abbreviations\n//\n// 1. Duplicate behavior to the data-* attribute for our tooltip plugin\n// 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.\n// 3. Add explicit cursor to indicate changed behavior.\n// 4. Remove the bottom border in Firefox 39-.\n// 5. Prevent the text-decoration to be skipped.\n\nabbr[title],\nabbr[data-original-title] { // 1\n  text-decoration: underline; // 2\n  text-decoration: underline dotted; // 2\n  cursor: help; // 3\n  border-bottom: 0; // 4\n  text-decoration-skip-ink: none; // 5\n}\n\naddress {\n  margin-bottom: 1rem;\n  font-style: normal;\n  line-height: inherit;\n}\n\nol,\nul,\ndl {\n  margin-top: 0;\n  margin-bottom: 1rem;\n}\n\nol ol,\nul ul,\nol ul,\nul ol {\n  margin-bottom: 0;\n}\n\ndt {\n  font-weight: $dt-font-weight;\n}\n\ndd {\n  margin-bottom: .5rem;\n  margin-left: 0; // Undo browser default\n}\n\nblockquote {\n  margin: 0 0 1rem;\n}\n\nb,\nstrong {\n  font-weight: $font-weight-bolder; // Add the correct font weight in Chrome, Edge, and Safari\n}\n\nsmall {\n  @include font-size(80%); // Add the correct font size in all browsers\n}\n\n//\n// Prevent `sub` and `sup` elements from affecting the line height in\n// all browsers.\n//\n\nsub,\nsup {\n  position: relative;\n  @include font-size(75%);\n  line-height: 0;\n  vertical-align: baseline;\n}\n\nsub { bottom: -.25em; }\nsup { top: -.5em; }\n\n\n//\n// Links\n//\n\na {\n  color: $link-color;\n  text-decoration: $link-decoration;\n  background-color: transparent; // Remove the gray background on active links in IE 10.\n\n  @include hover() {\n    color: $link-hover-color;\n    text-decoration: $link-hover-decoration;\n  }\n}\n\n// And undo these styles for placeholder links/named anchors (without href).\n// It would be more straightforward to just use a[href] in previous block, but that\n// causes specificity issues in many other styles that are too complex to fix.\n// See https://github.com/twbs/bootstrap/issues/19402\n\na:not([href]) {\n  color: inherit;\n  text-decoration: none;\n\n  @include hover() {\n    color: inherit;\n    text-decoration: none;\n  }\n}\n\n\n//\n// Code\n//\n\npre,\ncode,\nkbd,\nsamp {\n  font-family: $font-family-monospace;\n  @include font-size(1em); // Correct the odd `em` font sizing in all browsers.\n}\n\npre {\n  // Remove browser default top margin\n  margin-top: 0;\n  // Reset browser default of `1em` to use `rem`s\n  margin-bottom: 1rem;\n  // Don't allow content to break outside\n  overflow: auto;\n}\n\n\n//\n// Figures\n//\n\nfigure {\n  // Apply a consistent margin strategy (matches our type styles).\n  margin: 0 0 1rem;\n}\n\n\n//\n// Images and content\n//\n\nimg {\n  vertical-align: middle;\n  border-style: none; // Remove the border on images inside links in IE 10-.\n}\n\nsvg {\n  // Workaround for the SVG overflow bug in IE10/11 is still required.\n  // See https://github.com/twbs/bootstrap/issues/26878\n  overflow: hidden;\n  vertical-align: middle;\n}\n\n\n//\n// Tables\n//\n\ntable {\n  border-collapse: collapse; // Prevent double borders\n}\n\ncaption {\n  padding-top: $table-cell-padding;\n  padding-bottom: $table-cell-padding;\n  color: $table-caption-color;\n  text-align: left;\n  caption-side: bottom;\n}\n\nth {\n  // Matches default `<td>` alignment by inheriting from the `<body>`, or the\n  // closest parent with a set `text-align`.\n  text-align: inherit;\n}\n\n\n//\n// Forms\n//\n\nlabel {\n  // Allow labels to use `margin` for spacing.\n  display: inline-block;\n  margin-bottom: $label-margin-bottom;\n}\n\n// Remove the default `border-radius` that macOS Chrome adds.\n//\n// Details at https://github.com/twbs/bootstrap/issues/24093\nbutton {\n  // stylelint-disable-next-line property-blacklist\n  border-radius: 0;\n}\n\n// Work around a Firefox/IE bug where the transparent `button` background\n// results in a loss of the default `button` focus styles.\n//\n// Credit: https://github.com/suitcss/base/\nbutton:focus {\n  outline: 1px dotted;\n  outline: 5px auto -webkit-focus-ring-color;\n}\n\ninput,\nbutton,\nselect,\noptgroup,\ntextarea {\n  margin: 0; // Remove the margin in Firefox and Safari\n  font-family: inherit;\n  @include font-size(inherit);\n  line-height: inherit;\n}\n\nbutton,\ninput {\n  overflow: visible; // Show the overflow in Edge\n}\n\nbutton,\nselect {\n  text-transform: none; // Remove the inheritance of text transform in Firefox\n}\n\n// Remove the inheritance of word-wrap in Safari.\n//\n// Details at https://github.com/twbs/bootstrap/issues/24990\nselect {\n  word-wrap: normal;\n}\n\n\n// 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`\n//    controls in Android 4.\n// 2. Correct the inability to style clickable types in iOS and Safari.\nbutton,\n[type=\"button\"], // 1\n[type=\"reset\"],\n[type=\"submit\"] {\n  -webkit-appearance: button; // 2\n}\n\n// Opinionated: add \"hand\" cursor to non-disabled button elements.\n@if $enable-pointer-cursor-for-buttons {\n  button,\n  [type=\"button\"],\n  [type=\"reset\"],\n  [type=\"submit\"] {\n    &:not(:disabled) {\n      cursor: pointer;\n    }\n  }\n}\n\n// Remove inner border and padding from Firefox, but don't restore the outline like Normalize.\nbutton::-moz-focus-inner,\n[type=\"button\"]::-moz-focus-inner,\n[type=\"reset\"]::-moz-focus-inner,\n[type=\"submit\"]::-moz-focus-inner {\n  padding: 0;\n  border-style: none;\n}\n\ninput[type=\"radio\"],\ninput[type=\"checkbox\"] {\n  box-sizing: border-box; // 1. Add the correct box sizing in IE 10-\n  padding: 0; // 2. Remove the padding in IE 10-\n}\n\n\ninput[type=\"date\"],\ninput[type=\"time\"],\ninput[type=\"datetime-local\"],\ninput[type=\"month\"] {\n  // Remove the default appearance of temporal inputs to avoid a Mobile Safari\n  // bug where setting a custom line-height prevents text from being vertically\n  // centered within the input.\n  // See https://bugs.webkit.org/show_bug.cgi?id=139848\n  // and https://github.com/twbs/bootstrap/issues/11266\n  -webkit-appearance: listbox;\n}\n\ntextarea {\n  overflow: auto; // Remove the default vertical scrollbar in IE.\n  // Textareas should really only resize vertically so they don't break their (horizontal) containers.\n  resize: vertical;\n}\n\nfieldset {\n  // Browsers set a default `min-width: min-content;` on fieldsets,\n  // unlike e.g. `<div>`s, which have `min-width: 0;` by default.\n  // So we reset that to ensure fieldsets behave more like a standard block element.\n  // See https://github.com/twbs/bootstrap/issues/12359\n  // and https://html.spec.whatwg.org/multipage/#the-fieldset-and-legend-elements\n  min-width: 0;\n  // Reset the default outline behavior of fieldsets so they don't affect page layout.\n  padding: 0;\n  margin: 0;\n  border: 0;\n}\n\n// 1. Correct the text wrapping in Edge and IE.\n// 2. Correct the color inheritance from `fieldset` elements in IE.\nlegend {\n  display: block;\n  width: 100%;\n  max-width: 100%; // 1\n  padding: 0;\n  margin-bottom: .5rem;\n  @include font-size(1.5rem);\n  line-height: inherit;\n  color: inherit; // 2\n  white-space: normal; // 1\n}\n\nprogress {\n  vertical-align: baseline; // Add the correct vertical alignment in Chrome, Firefox, and Opera.\n}\n\n// Correct the cursor style of increment and decrement buttons in Chrome.\n[type=\"number\"]::-webkit-inner-spin-button,\n[type=\"number\"]::-webkit-outer-spin-button {\n  height: auto;\n}\n\n[type=\"search\"] {\n  // This overrides the extra rounded corners on search inputs in iOS so that our\n  // `.form-control` class can properly style them. Note that this cannot simply\n  // be added to `.form-control` as it's not specific enough. For details, see\n  // https://github.com/twbs/bootstrap/issues/11586.\n  outline-offset: -2px; // 2. Correct the outline style in Safari.\n  -webkit-appearance: none;\n}\n\n//\n// Remove the inner padding in Chrome and Safari on macOS.\n//\n\n[type=\"search\"]::-webkit-search-decoration {\n  -webkit-appearance: none;\n}\n\n//\n// 1. Correct the inability to style clickable types in iOS and Safari.\n// 2. Change font properties to `inherit` in Safari.\n//\n\n::-webkit-file-upload-button {\n  font: inherit; // 2\n  -webkit-appearance: button; // 1\n}\n\n//\n// Correct element displays\n//\n\noutput {\n  display: inline-block;\n}\n\nsummary {\n  display: list-item; // Add the correct display in all browsers\n  cursor: pointer;\n}\n\ntemplate {\n  display: none; // Add the correct display in IE\n}\n\n// Always hide an element with the `hidden` HTML attribute (from PureCSS).\n// Needed for proper display in IE 10-.\n[hidden] {\n  display: none !important;\n}\n","/*!\n * Bootstrap v4.4.1 (https://getbootstrap.com/)\n * Copyright 2011-2019 The Bootstrap Authors\n * Copyright 2011-2019 Twitter, Inc.\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n */\n:root {\n  --blue: #007bff;\n  --indigo: #6610f2;\n  --purple: #6f42c1;\n  --pink: #e83e8c;\n  --red: #dc3545;\n  --orange: #fd7e14;\n  --yellow: #ffc107;\n  --green: #28a745;\n  --teal: #20c997;\n  --cyan: #17a2b8;\n  --white: #fff;\n  --gray: #6c757d;\n  --gray-dark: #343a40;\n  --primary: #007bff;\n  --secondary: #6c757d;\n  --success: #28a745;\n  --info: #17a2b8;\n  --warning: #ffc107;\n  --danger: #dc3545;\n  --light: #f8f9fa;\n  --dark: #343a40;\n  --breakpoint-xs: 0;\n  --breakpoint-sm: 576px;\n  --breakpoint-md: 768px;\n  --breakpoint-lg: 992px;\n  --breakpoint-xl: 1200px;\n  --font-family-sans-serif: -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, \"Helvetica Neue\", Arial, \"Noto Sans\", sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\", \"Noto Color Emoji\";\n  --font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace;\n}\n\n*,\n*::before,\n*::after {\n  box-sizing: border-box;\n}\n\nhtml {\n  font-family: sans-serif;\n  line-height: 1.15;\n  -webkit-text-size-adjust: 100%;\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n}\n\narticle, aside, figcaption, figure, footer, header, hgroup, main, nav, section {\n  display: block;\n}\n\nbody {\n  margin: 0;\n  font-family: -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, \"Helvetica Neue\", Arial, \"Noto Sans\", sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\", \"Noto Color Emoji\";\n  font-size: 1rem;\n  font-weight: 400;\n  line-height: 1.5;\n  color: #212529;\n  text-align: left;\n  background-color: #fff;\n}\n\n[tabindex=\"-1\"]:focus:not(:focus-visible) {\n  outline: 0 !important;\n}\n\nhr {\n  box-sizing: content-box;\n  height: 0;\n  overflow: visible;\n}\n\nh1, h2, h3, h4, h5, h6 {\n  margin-top: 0;\n  margin-bottom: 0.5rem;\n}\n\np {\n  margin-top: 0;\n  margin-bottom: 1rem;\n}\n\nabbr[title],\nabbr[data-original-title] {\n  text-decoration: underline;\n  -webkit-text-decoration: underline dotted;\n  text-decoration: underline dotted;\n  cursor: help;\n  border-bottom: 0;\n  -webkit-text-decoration-skip-ink: none;\n  text-decoration-skip-ink: none;\n}\n\naddress {\n  margin-bottom: 1rem;\n  font-style: normal;\n  line-height: inherit;\n}\n\nol,\nul,\ndl {\n  margin-top: 0;\n  margin-bottom: 1rem;\n}\n\nol ol,\nul ul,\nol ul,\nul ol {\n  margin-bottom: 0;\n}\n\ndt {\n  font-weight: 700;\n}\n\ndd {\n  margin-bottom: .5rem;\n  margin-left: 0;\n}\n\nblockquote {\n  margin: 0 0 1rem;\n}\n\nb,\nstrong {\n  font-weight: bolder;\n}\n\nsmall {\n  font-size: 80%;\n}\n\nsub,\nsup {\n  position: relative;\n  font-size: 75%;\n  line-height: 0;\n  vertical-align: baseline;\n}\n\nsub {\n  bottom: -.25em;\n}\n\nsup {\n  top: -.5em;\n}\n\na {\n  color: #007bff;\n  text-decoration: none;\n  background-color: transparent;\n}\n\na:hover {\n  color: #0056b3;\n  text-decoration: underline;\n}\n\na:not([href]) {\n  color: inherit;\n  text-decoration: none;\n}\n\na:not([href]):hover {\n  color: inherit;\n  text-decoration: none;\n}\n\npre,\ncode,\nkbd,\nsamp {\n  font-family: SFMono-Regular, Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace;\n  font-size: 1em;\n}\n\npre {\n  margin-top: 0;\n  margin-bottom: 1rem;\n  overflow: auto;\n}\n\nfigure {\n  margin: 0 0 1rem;\n}\n\nimg {\n  vertical-align: middle;\n  border-style: none;\n}\n\nsvg {\n  overflow: hidden;\n  vertical-align: middle;\n}\n\ntable {\n  border-collapse: collapse;\n}\n\ncaption {\n  padding-top: 0.75rem;\n  padding-bottom: 0.75rem;\n  color: #6c757d;\n  text-align: left;\n  caption-side: bottom;\n}\n\nth {\n  text-align: inherit;\n}\n\nlabel {\n  display: inline-block;\n  margin-bottom: 0.5rem;\n}\n\nbutton {\n  border-radius: 0;\n}\n\nbutton:focus {\n  outline: 1px dotted;\n  outline: 5px auto -webkit-focus-ring-color;\n}\n\ninput,\nbutton,\nselect,\noptgroup,\ntextarea {\n  margin: 0;\n  font-family: inherit;\n  font-size: inherit;\n  line-height: inherit;\n}\n\nbutton,\ninput {\n  overflow: visible;\n}\n\nbutton,\nselect {\n  text-transform: none;\n}\n\nselect {\n  word-wrap: normal;\n}\n\nbutton,\n[type=\"button\"],\n[type=\"reset\"],\n[type=\"submit\"] {\n  -webkit-appearance: button;\n}\n\nbutton:not(:disabled),\n[type=\"button\"]:not(:disabled),\n[type=\"reset\"]:not(:disabled),\n[type=\"submit\"]:not(:disabled) {\n  cursor: pointer;\n}\n\nbutton::-moz-focus-inner,\n[type=\"button\"]::-moz-focus-inner,\n[type=\"reset\"]::-moz-focus-inner,\n[type=\"submit\"]::-moz-focus-inner {\n  padding: 0;\n  border-style: none;\n}\n\ninput[type=\"radio\"],\ninput[type=\"checkbox\"] {\n  box-sizing: border-box;\n  padding: 0;\n}\n\ninput[type=\"date\"],\ninput[type=\"time\"],\ninput[type=\"datetime-local\"],\ninput[type=\"month\"] {\n  -webkit-appearance: listbox;\n}\n\ntextarea {\n  overflow: auto;\n  resize: vertical;\n}\n\nfieldset {\n  min-width: 0;\n  padding: 0;\n  margin: 0;\n  border: 0;\n}\n\nlegend {\n  display: block;\n  width: 100%;\n  max-width: 100%;\n  padding: 0;\n  margin-bottom: .5rem;\n  font-size: 1.5rem;\n  line-height: inherit;\n  color: inherit;\n  white-space: normal;\n}\n\nprogress {\n  vertical-align: baseline;\n}\n\n[type=\"number\"]::-webkit-inner-spin-button,\n[type=\"number\"]::-webkit-outer-spin-button {\n  height: auto;\n}\n\n[type=\"search\"] {\n  outline-offset: -2px;\n  -webkit-appearance: none;\n}\n\n[type=\"search\"]::-webkit-search-decoration {\n  -webkit-appearance: none;\n}\n\n::-webkit-file-upload-button {\n  font: inherit;\n  -webkit-appearance: button;\n}\n\noutput {\n  display: inline-block;\n}\n\nsummary {\n  display: list-item;\n  cursor: pointer;\n}\n\ntemplate {\n  display: none;\n}\n\n[hidden] {\n  display: none !important;\n}\n\nh1, h2, h3, h4, h5, h6,\n.h1, .h2, .h3, .h4, .h5, .h6 {\n  margin-bottom: 0.5rem;\n  font-weight: 500;\n  line-height: 1.2;\n}\n\nh1, .h1 {\n  font-size: 2.5rem;\n}\n\nh2, .h2 {\n  font-size: 2rem;\n}\n\nh3, .h3 {\n  font-size: 1.75rem;\n}\n\nh4, .h4 {\n  font-size: 1.5rem;\n}\n\nh5, .h5 {\n  font-size: 1.25rem;\n}\n\nh6, .h6 {\n  font-size: 1rem;\n}\n\n.lead {\n  font-size: 1.25rem;\n  font-weight: 300;\n}\n\n.display-1 {\n  font-size: 6rem;\n  font-weight: 300;\n  line-height: 1.2;\n}\n\n.display-2 {\n  font-size: 5.5rem;\n  font-weight: 300;\n  line-height: 1.2;\n}\n\n.display-3 {\n  font-size: 4.5rem;\n  font-weight: 300;\n  line-height: 1.2;\n}\n\n.display-4 {\n  font-size: 3.5rem;\n  font-weight: 300;\n  line-height: 1.2;\n}\n\nhr {\n  margin-top: 1rem;\n  margin-bottom: 1rem;\n  border: 0;\n  border-top: 1px solid rgba(0, 0, 0, 0.1);\n}\n\nsmall,\n.small {\n  font-size: 80%;\n  font-weight: 400;\n}\n\nmark,\n.mark {\n  padding: 0.2em;\n  background-color: #fcf8e3;\n}\n\n.list-unstyled {\n  padding-left: 0;\n  list-style: none;\n}\n\n.list-inline {\n  padding-left: 0;\n  list-style: none;\n}\n\n.list-inline-item {\n  display: inline-block;\n}\n\n.list-inline-item:not(:last-child) {\n  margin-right: 0.5rem;\n}\n\n.initialism {\n  font-size: 90%;\n  text-transform: uppercase;\n}\n\n.blockquote {\n  margin-bottom: 1rem;\n  font-size: 1.25rem;\n}\n\n.blockquote-footer {\n  display: block;\n  font-size: 80%;\n  color: #6c757d;\n}\n\n.blockquote-footer::before {\n  content: \"\\2014\\00A0\";\n}\n\n.img-fluid {\n  max-width: 100%;\n  height: auto;\n}\n\n.img-thumbnail {\n  padding: 0.25rem;\n  background-color: #fff;\n  border: 1px solid #dee2e6;\n  border-radius: 0.25rem;\n  max-width: 100%;\n  height: auto;\n}\n\n.figure {\n  display: inline-block;\n}\n\n.figure-img {\n  margin-bottom: 0.5rem;\n  line-height: 1;\n}\n\n.figure-caption {\n  font-size: 90%;\n  color: #6c757d;\n}\n\ncode {\n  font-size: 87.5%;\n  color: #e83e8c;\n  word-wrap: break-word;\n}\n\na > code {\n  color: inherit;\n}\n\nkbd {\n  padding: 0.2rem 0.4rem;\n  font-size: 87.5%;\n  color: #fff;\n  background-color: #212529;\n  border-radius: 0.2rem;\n}\n\nkbd kbd {\n  padding: 0;\n  font-size: 100%;\n  font-weight: 700;\n}\n\npre {\n  display: block;\n  font-size: 87.5%;\n  color: #212529;\n}\n\npre code {\n  font-size: inherit;\n  color: inherit;\n  word-break: normal;\n}\n\n.pre-scrollable {\n  max-height: 340px;\n  overflow-y: scroll;\n}\n\n.container {\n  width: 100%;\n  padding-right: 15px;\n  padding-left: 15px;\n  margin-right: auto;\n  margin-left: auto;\n}\n\n@media (min-width: 576px) {\n  .container {\n    max-width: 540px;\n  }\n}\n\n@media (min-width: 768px) {\n  .container {\n    max-width: 720px;\n  }\n}\n\n@media (min-width: 992px) {\n  .container {\n    max-width: 960px;\n  }\n}\n\n@media (min-width: 1200px) {\n  .container {\n    max-width: 1140px;\n  }\n}\n\n.container-fluid, .container-sm, .container-md, .container-lg, .container-xl {\n  width: 100%;\n  padding-right: 15px;\n  padding-left: 15px;\n  margin-right: auto;\n  margin-left: auto;\n}\n\n@media (min-width: 576px) {\n  .container, .container-sm {\n    max-width: 540px;\n  }\n}\n\n@media (min-width: 768px) {\n  .container, .container-sm, .container-md {\n    max-width: 720px;\n  }\n}\n\n@media (min-width: 992px) {\n  .container, .container-sm, .container-md, .container-lg {\n    max-width: 960px;\n  }\n}\n\n@media (min-width: 1200px) {\n  .container, .container-sm, .container-md, .container-lg, .container-xl {\n    max-width: 1140px;\n  }\n}\n\n.row {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-wrap: wrap;\n  flex-wrap: wrap;\n  margin-right: -15px;\n  margin-left: -15px;\n}\n\n.no-gutters {\n  margin-right: 0;\n  margin-left: 0;\n}\n\n.no-gutters > .col,\n.no-gutters > [class*=\"col-\"] {\n  padding-right: 0;\n  padding-left: 0;\n}\n\n.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col,\n.col-auto, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm,\n.col-sm-auto, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md,\n.col-md-auto, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg,\n.col-lg-auto, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl,\n.col-xl-auto {\n  position: relative;\n  width: 100%;\n  padding-right: 15px;\n  padding-left: 15px;\n}\n\n.col {\n  -ms-flex-preferred-size: 0;\n  flex-basis: 0;\n  -ms-flex-positive: 1;\n  flex-grow: 1;\n  max-width: 100%;\n}\n\n.row-cols-1 > * {\n  -ms-flex: 0 0 100%;\n  flex: 0 0 100%;\n  max-width: 100%;\n}\n\n.row-cols-2 > * {\n  -ms-flex: 0 0 50%;\n  flex: 0 0 50%;\n  max-width: 50%;\n}\n\n.row-cols-3 > * {\n  -ms-flex: 0 0 33.333333%;\n  flex: 0 0 33.333333%;\n  max-width: 33.333333%;\n}\n\n.row-cols-4 > * {\n  -ms-flex: 0 0 25%;\n  flex: 0 0 25%;\n  max-width: 25%;\n}\n\n.row-cols-5 > * {\n  -ms-flex: 0 0 20%;\n  flex: 0 0 20%;\n  max-width: 20%;\n}\n\n.row-cols-6 > * {\n  -ms-flex: 0 0 16.666667%;\n  flex: 0 0 16.666667%;\n  max-width: 16.666667%;\n}\n\n.col-auto {\n  -ms-flex: 0 0 auto;\n  flex: 0 0 auto;\n  width: auto;\n  max-width: 100%;\n}\n\n.col-1 {\n  -ms-flex: 0 0 8.333333%;\n  flex: 0 0 8.333333%;\n  max-width: 8.333333%;\n}\n\n.col-2 {\n  -ms-flex: 0 0 16.666667%;\n  flex: 0 0 16.666667%;\n  max-width: 16.666667%;\n}\n\n.col-3 {\n  -ms-flex: 0 0 25%;\n  flex: 0 0 25%;\n  max-width: 25%;\n}\n\n.col-4 {\n  -ms-flex: 0 0 33.333333%;\n  flex: 0 0 33.333333%;\n  max-width: 33.333333%;\n}\n\n.col-5 {\n  -ms-flex: 0 0 41.666667%;\n  flex: 0 0 41.666667%;\n  max-width: 41.666667%;\n}\n\n.col-6 {\n  -ms-flex: 0 0 50%;\n  flex: 0 0 50%;\n  max-width: 50%;\n}\n\n.col-7 {\n  -ms-flex: 0 0 58.333333%;\n  flex: 0 0 58.333333%;\n  max-width: 58.333333%;\n}\n\n.col-8 {\n  -ms-flex: 0 0 66.666667%;\n  flex: 0 0 66.666667%;\n  max-width: 66.666667%;\n}\n\n.col-9 {\n  -ms-flex: 0 0 75%;\n  flex: 0 0 75%;\n  max-width: 75%;\n}\n\n.col-10 {\n  -ms-flex: 0 0 83.333333%;\n  flex: 0 0 83.333333%;\n  max-width: 83.333333%;\n}\n\n.col-11 {\n  -ms-flex: 0 0 91.666667%;\n  flex: 0 0 91.666667%;\n  max-width: 91.666667%;\n}\n\n.col-12 {\n  -ms-flex: 0 0 100%;\n  flex: 0 0 100%;\n  max-width: 100%;\n}\n\n.order-first {\n  -ms-flex-order: -1;\n  order: -1;\n}\n\n.order-last {\n  -ms-flex-order: 13;\n  order: 13;\n}\n\n.order-0 {\n  -ms-flex-order: 0;\n  order: 0;\n}\n\n.order-1 {\n  -ms-flex-order: 1;\n  order: 1;\n}\n\n.order-2 {\n  -ms-flex-order: 2;\n  order: 2;\n}\n\n.order-3 {\n  -ms-flex-order: 3;\n  order: 3;\n}\n\n.order-4 {\n  -ms-flex-order: 4;\n  order: 4;\n}\n\n.order-5 {\n  -ms-flex-order: 5;\n  order: 5;\n}\n\n.order-6 {\n  -ms-flex-order: 6;\n  order: 6;\n}\n\n.order-7 {\n  -ms-flex-order: 7;\n  order: 7;\n}\n\n.order-8 {\n  -ms-flex-order: 8;\n  order: 8;\n}\n\n.order-9 {\n  -ms-flex-order: 9;\n  order: 9;\n}\n\n.order-10 {\n  -ms-flex-order: 10;\n  order: 10;\n}\n\n.order-11 {\n  -ms-flex-order: 11;\n  order: 11;\n}\n\n.order-12 {\n  -ms-flex-order: 12;\n  order: 12;\n}\n\n.offset-1 {\n  margin-left: 8.333333%;\n}\n\n.offset-2 {\n  margin-left: 16.666667%;\n}\n\n.offset-3 {\n  margin-left: 25%;\n}\n\n.offset-4 {\n  margin-left: 33.333333%;\n}\n\n.offset-5 {\n  margin-left: 41.666667%;\n}\n\n.offset-6 {\n  margin-left: 50%;\n}\n\n.offset-7 {\n  margin-left: 58.333333%;\n}\n\n.offset-8 {\n  margin-left: 66.666667%;\n}\n\n.offset-9 {\n  margin-left: 75%;\n}\n\n.offset-10 {\n  margin-left: 83.333333%;\n}\n\n.offset-11 {\n  margin-left: 91.666667%;\n}\n\n@media (min-width: 576px) {\n  .col-sm {\n    -ms-flex-preferred-size: 0;\n    flex-basis: 0;\n    -ms-flex-positive: 1;\n    flex-grow: 1;\n    max-width: 100%;\n  }\n  .row-cols-sm-1 > * {\n    -ms-flex: 0 0 100%;\n    flex: 0 0 100%;\n    max-width: 100%;\n  }\n  .row-cols-sm-2 > * {\n    -ms-flex: 0 0 50%;\n    flex: 0 0 50%;\n    max-width: 50%;\n  }\n  .row-cols-sm-3 > * {\n    -ms-flex: 0 0 33.333333%;\n    flex: 0 0 33.333333%;\n    max-width: 33.333333%;\n  }\n  .row-cols-sm-4 > * {\n    -ms-flex: 0 0 25%;\n    flex: 0 0 25%;\n    max-width: 25%;\n  }\n  .row-cols-sm-5 > * {\n    -ms-flex: 0 0 20%;\n    flex: 0 0 20%;\n    max-width: 20%;\n  }\n  .row-cols-sm-6 > * {\n    -ms-flex: 0 0 16.666667%;\n    flex: 0 0 16.666667%;\n    max-width: 16.666667%;\n  }\n  .col-sm-auto {\n    -ms-flex: 0 0 auto;\n    flex: 0 0 auto;\n    width: auto;\n    max-width: 100%;\n  }\n  .col-sm-1 {\n    -ms-flex: 0 0 8.333333%;\n    flex: 0 0 8.333333%;\n    max-width: 8.333333%;\n  }\n  .col-sm-2 {\n    -ms-flex: 0 0 16.666667%;\n    flex: 0 0 16.666667%;\n    max-width: 16.666667%;\n  }\n  .col-sm-3 {\n    -ms-flex: 0 0 25%;\n    flex: 0 0 25%;\n    max-width: 25%;\n  }\n  .col-sm-4 {\n    -ms-flex: 0 0 33.333333%;\n    flex: 0 0 33.333333%;\n    max-width: 33.333333%;\n  }\n  .col-sm-5 {\n    -ms-flex: 0 0 41.666667%;\n    flex: 0 0 41.666667%;\n    max-width: 41.666667%;\n  }\n  .col-sm-6 {\n    -ms-flex: 0 0 50%;\n    flex: 0 0 50%;\n    max-width: 50%;\n  }\n  .col-sm-7 {\n    -ms-flex: 0 0 58.333333%;\n    flex: 0 0 58.333333%;\n    max-width: 58.333333%;\n  }\n  .col-sm-8 {\n    -ms-flex: 0 0 66.666667%;\n    flex: 0 0 66.666667%;\n    max-width: 66.666667%;\n  }\n  .col-sm-9 {\n    -ms-flex: 0 0 75%;\n    flex: 0 0 75%;\n    max-width: 75%;\n  }\n  .col-sm-10 {\n    -ms-flex: 0 0 83.333333%;\n    flex: 0 0 83.333333%;\n    max-width: 83.333333%;\n  }\n  .col-sm-11 {\n    -ms-flex: 0 0 91.666667%;\n    flex: 0 0 91.666667%;\n    max-width: 91.666667%;\n  }\n  .col-sm-12 {\n    -ms-flex: 0 0 100%;\n    flex: 0 0 100%;\n    max-width: 100%;\n  }\n  .order-sm-first {\n    -ms-flex-order: -1;\n    order: -1;\n  }\n  .order-sm-last {\n    -ms-flex-order: 13;\n    order: 13;\n  }\n  .order-sm-0 {\n    -ms-flex-order: 0;\n    order: 0;\n  }\n  .order-sm-1 {\n    -ms-flex-order: 1;\n    order: 1;\n  }\n  .order-sm-2 {\n    -ms-flex-order: 2;\n    order: 2;\n  }\n  .order-sm-3 {\n    -ms-flex-order: 3;\n    order: 3;\n  }\n  .order-sm-4 {\n    -ms-flex-order: 4;\n    order: 4;\n  }\n  .order-sm-5 {\n    -ms-flex-order: 5;\n    order: 5;\n  }\n  .order-sm-6 {\n    -ms-flex-order: 6;\n    order: 6;\n  }\n  .order-sm-7 {\n    -ms-flex-order: 7;\n    order: 7;\n  }\n  .order-sm-8 {\n    -ms-flex-order: 8;\n    order: 8;\n  }\n  .order-sm-9 {\n    -ms-flex-order: 9;\n    order: 9;\n  }\n  .order-sm-10 {\n    -ms-flex-order: 10;\n    order: 10;\n  }\n  .order-sm-11 {\n    -ms-flex-order: 11;\n    order: 11;\n  }\n  .order-sm-12 {\n    -ms-flex-order: 12;\n    order: 12;\n  }\n  .offset-sm-0 {\n    margin-left: 0;\n  }\n  .offset-sm-1 {\n    margin-left: 8.333333%;\n  }\n  .offset-sm-2 {\n    margin-left: 16.666667%;\n  }\n  .offset-sm-3 {\n    margin-left: 25%;\n  }\n  .offset-sm-4 {\n    margin-left: 33.333333%;\n  }\n  .offset-sm-5 {\n    margin-left: 41.666667%;\n  }\n  .offset-sm-6 {\n    margin-left: 50%;\n  }\n  .offset-sm-7 {\n    margin-left: 58.333333%;\n  }\n  .offset-sm-8 {\n    margin-left: 66.666667%;\n  }\n  .offset-sm-9 {\n    margin-left: 75%;\n  }\n  .offset-sm-10 {\n    margin-left: 83.333333%;\n  }\n  .offset-sm-11 {\n    margin-left: 91.666667%;\n  }\n}\n\n@media (min-width: 768px) {\n  .col-md {\n    -ms-flex-preferred-size: 0;\n    flex-basis: 0;\n    -ms-flex-positive: 1;\n    flex-grow: 1;\n    max-width: 100%;\n  }\n  .row-cols-md-1 > * {\n    -ms-flex: 0 0 100%;\n    flex: 0 0 100%;\n    max-width: 100%;\n  }\n  .row-cols-md-2 > * {\n    -ms-flex: 0 0 50%;\n    flex: 0 0 50%;\n    max-width: 50%;\n  }\n  .row-cols-md-3 > * {\n    -ms-flex: 0 0 33.333333%;\n    flex: 0 0 33.333333%;\n    max-width: 33.333333%;\n  }\n  .row-cols-md-4 > * {\n    -ms-flex: 0 0 25%;\n    flex: 0 0 25%;\n    max-width: 25%;\n  }\n  .row-cols-md-5 > * {\n    -ms-flex: 0 0 20%;\n    flex: 0 0 20%;\n    max-width: 20%;\n  }\n  .row-cols-md-6 > * {\n    -ms-flex: 0 0 16.666667%;\n    flex: 0 0 16.666667%;\n    max-width: 16.666667%;\n  }\n  .col-md-auto {\n    -ms-flex: 0 0 auto;\n    flex: 0 0 auto;\n    width: auto;\n    max-width: 100%;\n  }\n  .col-md-1 {\n    -ms-flex: 0 0 8.333333%;\n    flex: 0 0 8.333333%;\n    max-width: 8.333333%;\n  }\n  .col-md-2 {\n    -ms-flex: 0 0 16.666667%;\n    flex: 0 0 16.666667%;\n    max-width: 16.666667%;\n  }\n  .col-md-3 {\n    -ms-flex: 0 0 25%;\n    flex: 0 0 25%;\n    max-width: 25%;\n  }\n  .col-md-4 {\n    -ms-flex: 0 0 33.333333%;\n    flex: 0 0 33.333333%;\n    max-width: 33.333333%;\n  }\n  .col-md-5 {\n    -ms-flex: 0 0 41.666667%;\n    flex: 0 0 41.666667%;\n    max-width: 41.666667%;\n  }\n  .col-md-6 {\n    -ms-flex: 0 0 50%;\n    flex: 0 0 50%;\n    max-width: 50%;\n  }\n  .col-md-7 {\n    -ms-flex: 0 0 58.333333%;\n    flex: 0 0 58.333333%;\n    max-width: 58.333333%;\n  }\n  .col-md-8 {\n    -ms-flex: 0 0 66.666667%;\n    flex: 0 0 66.666667%;\n    max-width: 66.666667%;\n  }\n  .col-md-9 {\n    -ms-flex: 0 0 75%;\n    flex: 0 0 75%;\n    max-width: 75%;\n  }\n  .col-md-10 {\n    -ms-flex: 0 0 83.333333%;\n    flex: 0 0 83.333333%;\n    max-width: 83.333333%;\n  }\n  .col-md-11 {\n    -ms-flex: 0 0 91.666667%;\n    flex: 0 0 91.666667%;\n    max-width: 91.666667%;\n  }\n  .col-md-12 {\n    -ms-flex: 0 0 100%;\n    flex: 0 0 100%;\n    max-width: 100%;\n  }\n  .order-md-first {\n    -ms-flex-order: -1;\n    order: -1;\n  }\n  .order-md-last {\n    -ms-flex-order: 13;\n    order: 13;\n  }\n  .order-md-0 {\n    -ms-flex-order: 0;\n    order: 0;\n  }\n  .order-md-1 {\n    -ms-flex-order: 1;\n    order: 1;\n  }\n  .order-md-2 {\n    -ms-flex-order: 2;\n    order: 2;\n  }\n  .order-md-3 {\n    -ms-flex-order: 3;\n    order: 3;\n  }\n  .order-md-4 {\n    -ms-flex-order: 4;\n    order: 4;\n  }\n  .order-md-5 {\n    -ms-flex-order: 5;\n    order: 5;\n  }\n  .order-md-6 {\n    -ms-flex-order: 6;\n    order: 6;\n  }\n  .order-md-7 {\n    -ms-flex-order: 7;\n    order: 7;\n  }\n  .order-md-8 {\n    -ms-flex-order: 8;\n    order: 8;\n  }\n  .order-md-9 {\n    -ms-flex-order: 9;\n    order: 9;\n  }\n  .order-md-10 {\n    -ms-flex-order: 10;\n    order: 10;\n  }\n  .order-md-11 {\n    -ms-flex-order: 11;\n    order: 11;\n  }\n  .order-md-12 {\n    -ms-flex-order: 12;\n    order: 12;\n  }\n  .offset-md-0 {\n    margin-left: 0;\n  }\n  .offset-md-1 {\n    margin-left: 8.333333%;\n  }\n  .offset-md-2 {\n    margin-left: 16.666667%;\n  }\n  .offset-md-3 {\n    margin-left: 25%;\n  }\n  .offset-md-4 {\n    margin-left: 33.333333%;\n  }\n  .offset-md-5 {\n    margin-left: 41.666667%;\n  }\n  .offset-md-6 {\n    margin-left: 50%;\n  }\n  .offset-md-7 {\n    margin-left: 58.333333%;\n  }\n  .offset-md-8 {\n    margin-left: 66.666667%;\n  }\n  .offset-md-9 {\n    margin-left: 75%;\n  }\n  .offset-md-10 {\n    margin-left: 83.333333%;\n  }\n  .offset-md-11 {\n    margin-left: 91.666667%;\n  }\n}\n\n@media (min-width: 992px) {\n  .col-lg {\n    -ms-flex-preferred-size: 0;\n    flex-basis: 0;\n    -ms-flex-positive: 1;\n    flex-grow: 1;\n    max-width: 100%;\n  }\n  .row-cols-lg-1 > * {\n    -ms-flex: 0 0 100%;\n    flex: 0 0 100%;\n    max-width: 100%;\n  }\n  .row-cols-lg-2 > * {\n    -ms-flex: 0 0 50%;\n    flex: 0 0 50%;\n    max-width: 50%;\n  }\n  .row-cols-lg-3 > * {\n    -ms-flex: 0 0 33.333333%;\n    flex: 0 0 33.333333%;\n    max-width: 33.333333%;\n  }\n  .row-cols-lg-4 > * {\n    -ms-flex: 0 0 25%;\n    flex: 0 0 25%;\n    max-width: 25%;\n  }\n  .row-cols-lg-5 > * {\n    -ms-flex: 0 0 20%;\n    flex: 0 0 20%;\n    max-width: 20%;\n  }\n  .row-cols-lg-6 > * {\n    -ms-flex: 0 0 16.666667%;\n    flex: 0 0 16.666667%;\n    max-width: 16.666667%;\n  }\n  .col-lg-auto {\n    -ms-flex: 0 0 auto;\n    flex: 0 0 auto;\n    width: auto;\n    max-width: 100%;\n  }\n  .col-lg-1 {\n    -ms-flex: 0 0 8.333333%;\n    flex: 0 0 8.333333%;\n    max-width: 8.333333%;\n  }\n  .col-lg-2 {\n    -ms-flex: 0 0 16.666667%;\n    flex: 0 0 16.666667%;\n    max-width: 16.666667%;\n  }\n  .col-lg-3 {\n    -ms-flex: 0 0 25%;\n    flex: 0 0 25%;\n    max-width: 25%;\n  }\n  .col-lg-4 {\n    -ms-flex: 0 0 33.333333%;\n    flex: 0 0 33.333333%;\n    max-width: 33.333333%;\n  }\n  .col-lg-5 {\n    -ms-flex: 0 0 41.666667%;\n    flex: 0 0 41.666667%;\n    max-width: 41.666667%;\n  }\n  .col-lg-6 {\n    -ms-flex: 0 0 50%;\n    flex: 0 0 50%;\n    max-width: 50%;\n  }\n  .col-lg-7 {\n    -ms-flex: 0 0 58.333333%;\n    flex: 0 0 58.333333%;\n    max-width: 58.333333%;\n  }\n  .col-lg-8 {\n    -ms-flex: 0 0 66.666667%;\n    flex: 0 0 66.666667%;\n    max-width: 66.666667%;\n  }\n  .col-lg-9 {\n    -ms-flex: 0 0 75%;\n    flex: 0 0 75%;\n    max-width: 75%;\n  }\n  .col-lg-10 {\n    -ms-flex: 0 0 83.333333%;\n    flex: 0 0 83.333333%;\n    max-width: 83.333333%;\n  }\n  .col-lg-11 {\n    -ms-flex: 0 0 91.666667%;\n    flex: 0 0 91.666667%;\n    max-width: 91.666667%;\n  }\n  .col-lg-12 {\n    -ms-flex: 0 0 100%;\n    flex: 0 0 100%;\n    max-width: 100%;\n  }\n  .order-lg-first {\n    -ms-flex-order: -1;\n    order: -1;\n  }\n  .order-lg-last {\n    -ms-flex-order: 13;\n    order: 13;\n  }\n  .order-lg-0 {\n    -ms-flex-order: 0;\n    order: 0;\n  }\n  .order-lg-1 {\n    -ms-flex-order: 1;\n    order: 1;\n  }\n  .order-lg-2 {\n    -ms-flex-order: 2;\n    order: 2;\n  }\n  .order-lg-3 {\n    -ms-flex-order: 3;\n    order: 3;\n  }\n  .order-lg-4 {\n    -ms-flex-order: 4;\n    order: 4;\n  }\n  .order-lg-5 {\n    -ms-flex-order: 5;\n    order: 5;\n  }\n  .order-lg-6 {\n    -ms-flex-order: 6;\n    order: 6;\n  }\n  .order-lg-7 {\n    -ms-flex-order: 7;\n    order: 7;\n  }\n  .order-lg-8 {\n    -ms-flex-order: 8;\n    order: 8;\n  }\n  .order-lg-9 {\n    -ms-flex-order: 9;\n    order: 9;\n  }\n  .order-lg-10 {\n    -ms-flex-order: 10;\n    order: 10;\n  }\n  .order-lg-11 {\n    -ms-flex-order: 11;\n    order: 11;\n  }\n  .order-lg-12 {\n    -ms-flex-order: 12;\n    order: 12;\n  }\n  .offset-lg-0 {\n    margin-left: 0;\n  }\n  .offset-lg-1 {\n    margin-left: 8.333333%;\n  }\n  .offset-lg-2 {\n    margin-left: 16.666667%;\n  }\n  .offset-lg-3 {\n    margin-left: 25%;\n  }\n  .offset-lg-4 {\n    margin-left: 33.333333%;\n  }\n  .offset-lg-5 {\n    margin-left: 41.666667%;\n  }\n  .offset-lg-6 {\n    margin-left: 50%;\n  }\n  .offset-lg-7 {\n    margin-left: 58.333333%;\n  }\n  .offset-lg-8 {\n    margin-left: 66.666667%;\n  }\n  .offset-lg-9 {\n    margin-left: 75%;\n  }\n  .offset-lg-10 {\n    margin-left: 83.333333%;\n  }\n  .offset-lg-11 {\n    margin-left: 91.666667%;\n  }\n}\n\n@media (min-width: 1200px) {\n  .col-xl {\n    -ms-flex-preferred-size: 0;\n    flex-basis: 0;\n    -ms-flex-positive: 1;\n    flex-grow: 1;\n    max-width: 100%;\n  }\n  .row-cols-xl-1 > * {\n    -ms-flex: 0 0 100%;\n    flex: 0 0 100%;\n    max-width: 100%;\n  }\n  .row-cols-xl-2 > * {\n    -ms-flex: 0 0 50%;\n    flex: 0 0 50%;\n    max-width: 50%;\n  }\n  .row-cols-xl-3 > * {\n    -ms-flex: 0 0 33.333333%;\n    flex: 0 0 33.333333%;\n    max-width: 33.333333%;\n  }\n  .row-cols-xl-4 > * {\n    -ms-flex: 0 0 25%;\n    flex: 0 0 25%;\n    max-width: 25%;\n  }\n  .row-cols-xl-5 > * {\n    -ms-flex: 0 0 20%;\n    flex: 0 0 20%;\n    max-width: 20%;\n  }\n  .row-cols-xl-6 > * {\n    -ms-flex: 0 0 16.666667%;\n    flex: 0 0 16.666667%;\n    max-width: 16.666667%;\n  }\n  .col-xl-auto {\n    -ms-flex: 0 0 auto;\n    flex: 0 0 auto;\n    width: auto;\n    max-width: 100%;\n  }\n  .col-xl-1 {\n    -ms-flex: 0 0 8.333333%;\n    flex: 0 0 8.333333%;\n    max-width: 8.333333%;\n  }\n  .col-xl-2 {\n    -ms-flex: 0 0 16.666667%;\n    flex: 0 0 16.666667%;\n    max-width: 16.666667%;\n  }\n  .col-xl-3 {\n    -ms-flex: 0 0 25%;\n    flex: 0 0 25%;\n    max-width: 25%;\n  }\n  .col-xl-4 {\n    -ms-flex: 0 0 33.333333%;\n    flex: 0 0 33.333333%;\n    max-width: 33.333333%;\n  }\n  .col-xl-5 {\n    -ms-flex: 0 0 41.666667%;\n    flex: 0 0 41.666667%;\n    max-width: 41.666667%;\n  }\n  .col-xl-6 {\n    -ms-flex: 0 0 50%;\n    flex: 0 0 50%;\n    max-width: 50%;\n  }\n  .col-xl-7 {\n    -ms-flex: 0 0 58.333333%;\n    flex: 0 0 58.333333%;\n    max-width: 58.333333%;\n  }\n  .col-xl-8 {\n    -ms-flex: 0 0 66.666667%;\n    flex: 0 0 66.666667%;\n    max-width: 66.666667%;\n  }\n  .col-xl-9 {\n    -ms-flex: 0 0 75%;\n    flex: 0 0 75%;\n    max-width: 75%;\n  }\n  .col-xl-10 {\n    -ms-flex: 0 0 83.333333%;\n    flex: 0 0 83.333333%;\n    max-width: 83.333333%;\n  }\n  .col-xl-11 {\n    -ms-flex: 0 0 91.666667%;\n    flex: 0 0 91.666667%;\n    max-width: 91.666667%;\n  }\n  .col-xl-12 {\n    -ms-flex: 0 0 100%;\n    flex: 0 0 100%;\n    max-width: 100%;\n  }\n  .order-xl-first {\n    -ms-flex-order: -1;\n    order: -1;\n  }\n  .order-xl-last {\n    -ms-flex-order: 13;\n    order: 13;\n  }\n  .order-xl-0 {\n    -ms-flex-order: 0;\n    order: 0;\n  }\n  .order-xl-1 {\n    -ms-flex-order: 1;\n    order: 1;\n  }\n  .order-xl-2 {\n    -ms-flex-order: 2;\n    order: 2;\n  }\n  .order-xl-3 {\n    -ms-flex-order: 3;\n    order: 3;\n  }\n  .order-xl-4 {\n    -ms-flex-order: 4;\n    order: 4;\n  }\n  .order-xl-5 {\n    -ms-flex-order: 5;\n    order: 5;\n  }\n  .order-xl-6 {\n    -ms-flex-order: 6;\n    order: 6;\n  }\n  .order-xl-7 {\n    -ms-flex-order: 7;\n    order: 7;\n  }\n  .order-xl-8 {\n    -ms-flex-order: 8;\n    order: 8;\n  }\n  .order-xl-9 {\n    -ms-flex-order: 9;\n    order: 9;\n  }\n  .order-xl-10 {\n    -ms-flex-order: 10;\n    order: 10;\n  }\n  .order-xl-11 {\n    -ms-flex-order: 11;\n    order: 11;\n  }\n  .order-xl-12 {\n    -ms-flex-order: 12;\n    order: 12;\n  }\n  .offset-xl-0 {\n    margin-left: 0;\n  }\n  .offset-xl-1 {\n    margin-left: 8.333333%;\n  }\n  .offset-xl-2 {\n    margin-left: 16.666667%;\n  }\n  .offset-xl-3 {\n    margin-left: 25%;\n  }\n  .offset-xl-4 {\n    margin-left: 33.333333%;\n  }\n  .offset-xl-5 {\n    margin-left: 41.666667%;\n  }\n  .offset-xl-6 {\n    margin-left: 50%;\n  }\n  .offset-xl-7 {\n    margin-left: 58.333333%;\n  }\n  .offset-xl-8 {\n    margin-left: 66.666667%;\n  }\n  .offset-xl-9 {\n    margin-left: 75%;\n  }\n  .offset-xl-10 {\n    margin-left: 83.333333%;\n  }\n  .offset-xl-11 {\n    margin-left: 91.666667%;\n  }\n}\n\n.table {\n  width: 100%;\n  margin-bottom: 1rem;\n  color: #212529;\n}\n\n.table th,\n.table td {\n  padding: 0.75rem;\n  vertical-align: top;\n  border-top: 1px solid #dee2e6;\n}\n\n.table thead th {\n  vertical-align: bottom;\n  border-bottom: 2px solid #dee2e6;\n}\n\n.table tbody + tbody {\n  border-top: 2px solid #dee2e6;\n}\n\n.table-sm th,\n.table-sm td {\n  padding: 0.3rem;\n}\n\n.table-bordered {\n  border: 1px solid #dee2e6;\n}\n\n.table-bordered th,\n.table-bordered td {\n  border: 1px solid #dee2e6;\n}\n\n.table-bordered thead th,\n.table-bordered thead td {\n  border-bottom-width: 2px;\n}\n\n.table-borderless th,\n.table-borderless td,\n.table-borderless thead th,\n.table-borderless tbody + tbody {\n  border: 0;\n}\n\n.table-striped tbody tr:nth-of-type(odd) {\n  background-color: rgba(0, 0, 0, 0.05);\n}\n\n.table-hover tbody tr:hover {\n  color: #212529;\n  background-color: rgba(0, 0, 0, 0.075);\n}\n\n.table-primary,\n.table-primary > th,\n.table-primary > td {\n  background-color: #b8daff;\n}\n\n.table-primary th,\n.table-primary td,\n.table-primary thead th,\n.table-primary tbody + tbody {\n  border-color: #7abaff;\n}\n\n.table-hover .table-primary:hover {\n  background-color: #9fcdff;\n}\n\n.table-hover .table-primary:hover > td,\n.table-hover .table-primary:hover > th {\n  background-color: #9fcdff;\n}\n\n.table-secondary,\n.table-secondary > th,\n.table-secondary > td {\n  background-color: #d6d8db;\n}\n\n.table-secondary th,\n.table-secondary td,\n.table-secondary thead th,\n.table-secondary tbody + tbody {\n  border-color: #b3b7bb;\n}\n\n.table-hover .table-secondary:hover {\n  background-color: #c8cbcf;\n}\n\n.table-hover .table-secondary:hover > td,\n.table-hover .table-secondary:hover > th {\n  background-color: #c8cbcf;\n}\n\n.table-success,\n.table-success > th,\n.table-success > td {\n  background-color: #c3e6cb;\n}\n\n.table-success th,\n.table-success td,\n.table-success thead th,\n.table-success tbody + tbody {\n  border-color: #8fd19e;\n}\n\n.table-hover .table-success:hover {\n  background-color: #b1dfbb;\n}\n\n.table-hover .table-success:hover > td,\n.table-hover .table-success:hover > th {\n  background-color: #b1dfbb;\n}\n\n.table-info,\n.table-info > th,\n.table-info > td {\n  background-color: #bee5eb;\n}\n\n.table-info th,\n.table-info td,\n.table-info thead th,\n.table-info tbody + tbody {\n  border-color: #86cfda;\n}\n\n.table-hover .table-info:hover {\n  background-color: #abdde5;\n}\n\n.table-hover .table-info:hover > td,\n.table-hover .table-info:hover > th {\n  background-color: #abdde5;\n}\n\n.table-warning,\n.table-warning > th,\n.table-warning > td {\n  background-color: #ffeeba;\n}\n\n.table-warning th,\n.table-warning td,\n.table-warning thead th,\n.table-warning tbody + tbody {\n  border-color: #ffdf7e;\n}\n\n.table-hover .table-warning:hover {\n  background-color: #ffe8a1;\n}\n\n.table-hover .table-warning:hover > td,\n.table-hover .table-warning:hover > th {\n  background-color: #ffe8a1;\n}\n\n.table-danger,\n.table-danger > th,\n.table-danger > td {\n  background-color: #f5c6cb;\n}\n\n.table-danger th,\n.table-danger td,\n.table-danger thead th,\n.table-danger tbody + tbody {\n  border-color: #ed969e;\n}\n\n.table-hover .table-danger:hover {\n  background-color: #f1b0b7;\n}\n\n.table-hover .table-danger:hover > td,\n.table-hover .table-danger:hover > th {\n  background-color: #f1b0b7;\n}\n\n.table-light,\n.table-light > th,\n.table-light > td {\n  background-color: #fdfdfe;\n}\n\n.table-light th,\n.table-light td,\n.table-light thead th,\n.table-light tbody + tbody {\n  border-color: #fbfcfc;\n}\n\n.table-hover .table-light:hover {\n  background-color: #ececf6;\n}\n\n.table-hover .table-light:hover > td,\n.table-hover .table-light:hover > th {\n  background-color: #ececf6;\n}\n\n.table-dark,\n.table-dark > th,\n.table-dark > td {\n  background-color: #c6c8ca;\n}\n\n.table-dark th,\n.table-dark td,\n.table-dark thead th,\n.table-dark tbody + tbody {\n  border-color: #95999c;\n}\n\n.table-hover .table-dark:hover {\n  background-color: #b9bbbe;\n}\n\n.table-hover .table-dark:hover > td,\n.table-hover .table-dark:hover > th {\n  background-color: #b9bbbe;\n}\n\n.table-active,\n.table-active > th,\n.table-active > td {\n  background-color: rgba(0, 0, 0, 0.075);\n}\n\n.table-hover .table-active:hover {\n  background-color: rgba(0, 0, 0, 0.075);\n}\n\n.table-hover .table-active:hover > td,\n.table-hover .table-active:hover > th {\n  background-color: rgba(0, 0, 0, 0.075);\n}\n\n.table .thead-dark th {\n  color: #fff;\n  background-color: #343a40;\n  border-color: #454d55;\n}\n\n.table .thead-light th {\n  color: #495057;\n  background-color: #e9ecef;\n  border-color: #dee2e6;\n}\n\n.table-dark {\n  color: #fff;\n  background-color: #343a40;\n}\n\n.table-dark th,\n.table-dark td,\n.table-dark thead th {\n  border-color: #454d55;\n}\n\n.table-dark.table-bordered {\n  border: 0;\n}\n\n.table-dark.table-striped tbody tr:nth-of-type(odd) {\n  background-color: rgba(255, 255, 255, 0.05);\n}\n\n.table-dark.table-hover tbody tr:hover {\n  color: #fff;\n  background-color: rgba(255, 255, 255, 0.075);\n}\n\n@media (max-width: 575.98px) {\n  .table-responsive-sm {\n    display: block;\n    width: 100%;\n    overflow-x: auto;\n    -webkit-overflow-scrolling: touch;\n  }\n  .table-responsive-sm > .table-bordered {\n    border: 0;\n  }\n}\n\n@media (max-width: 767.98px) {\n  .table-responsive-md {\n    display: block;\n    width: 100%;\n    overflow-x: auto;\n    -webkit-overflow-scrolling: touch;\n  }\n  .table-responsive-md > .table-bordered {\n    border: 0;\n  }\n}\n\n@media (max-width: 991.98px) {\n  .table-responsive-lg {\n    display: block;\n    width: 100%;\n    overflow-x: auto;\n    -webkit-overflow-scrolling: touch;\n  }\n  .table-responsive-lg > .table-bordered {\n    border: 0;\n  }\n}\n\n@media (max-width: 1199.98px) {\n  .table-responsive-xl {\n    display: block;\n    width: 100%;\n    overflow-x: auto;\n    -webkit-overflow-scrolling: touch;\n  }\n  .table-responsive-xl > .table-bordered {\n    border: 0;\n  }\n}\n\n.table-responsive {\n  display: block;\n  width: 100%;\n  overflow-x: auto;\n  -webkit-overflow-scrolling: touch;\n}\n\n.table-responsive > .table-bordered {\n  border: 0;\n}\n\n.form-control {\n  display: block;\n  width: 100%;\n  height: calc(1.5em + 0.75rem + 2px);\n  padding: 0.375rem 0.75rem;\n  font-size: 1rem;\n  font-weight: 400;\n  line-height: 1.5;\n  color: #495057;\n  background-color: #fff;\n  background-clip: padding-box;\n  border: 1px solid #ced4da;\n  border-radius: 0.25rem;\n  transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .form-control {\n    transition: none;\n  }\n}\n\n.form-control::-ms-expand {\n  background-color: transparent;\n  border: 0;\n}\n\n.form-control:-moz-focusring {\n  color: transparent;\n  text-shadow: 0 0 0 #495057;\n}\n\n.form-control:focus {\n  color: #495057;\n  background-color: #fff;\n  border-color: #80bdff;\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);\n}\n\n.form-control::-webkit-input-placeholder {\n  color: #6c757d;\n  opacity: 1;\n}\n\n.form-control::-moz-placeholder {\n  color: #6c757d;\n  opacity: 1;\n}\n\n.form-control:-ms-input-placeholder {\n  color: #6c757d;\n  opacity: 1;\n}\n\n.form-control::-ms-input-placeholder {\n  color: #6c757d;\n  opacity: 1;\n}\n\n.form-control::placeholder {\n  color: #6c757d;\n  opacity: 1;\n}\n\n.form-control:disabled, .form-control[readonly] {\n  background-color: #e9ecef;\n  opacity: 1;\n}\n\nselect.form-control:focus::-ms-value {\n  color: #495057;\n  background-color: #fff;\n}\n\n.form-control-file,\n.form-control-range {\n  display: block;\n  width: 100%;\n}\n\n.col-form-label {\n  padding-top: calc(0.375rem + 1px);\n  padding-bottom: calc(0.375rem + 1px);\n  margin-bottom: 0;\n  font-size: inherit;\n  line-height: 1.5;\n}\n\n.col-form-label-lg {\n  padding-top: calc(0.5rem + 1px);\n  padding-bottom: calc(0.5rem + 1px);\n  font-size: 1.25rem;\n  line-height: 1.5;\n}\n\n.col-form-label-sm {\n  padding-top: calc(0.25rem + 1px);\n  padding-bottom: calc(0.25rem + 1px);\n  font-size: 0.875rem;\n  line-height: 1.5;\n}\n\n.form-control-plaintext {\n  display: block;\n  width: 100%;\n  padding: 0.375rem 0;\n  margin-bottom: 0;\n  font-size: 1rem;\n  line-height: 1.5;\n  color: #212529;\n  background-color: transparent;\n  border: solid transparent;\n  border-width: 1px 0;\n}\n\n.form-control-plaintext.form-control-sm, .form-control-plaintext.form-control-lg {\n  padding-right: 0;\n  padding-left: 0;\n}\n\n.form-control-sm {\n  height: calc(1.5em + 0.5rem + 2px);\n  padding: 0.25rem 0.5rem;\n  font-size: 0.875rem;\n  line-height: 1.5;\n  border-radius: 0.2rem;\n}\n\n.form-control-lg {\n  height: calc(1.5em + 1rem + 2px);\n  padding: 0.5rem 1rem;\n  font-size: 1.25rem;\n  line-height: 1.5;\n  border-radius: 0.3rem;\n}\n\nselect.form-control[size], select.form-control[multiple] {\n  height: auto;\n}\n\ntextarea.form-control {\n  height: auto;\n}\n\n.form-group {\n  margin-bottom: 1rem;\n}\n\n.form-text {\n  display: block;\n  margin-top: 0.25rem;\n}\n\n.form-row {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-wrap: wrap;\n  flex-wrap: wrap;\n  margin-right: -5px;\n  margin-left: -5px;\n}\n\n.form-row > .col,\n.form-row > [class*=\"col-\"] {\n  padding-right: 5px;\n  padding-left: 5px;\n}\n\n.form-check {\n  position: relative;\n  display: block;\n  padding-left: 1.25rem;\n}\n\n.form-check-input {\n  position: absolute;\n  margin-top: 0.3rem;\n  margin-left: -1.25rem;\n}\n\n.form-check-input[disabled] ~ .form-check-label,\n.form-check-input:disabled ~ .form-check-label {\n  color: #6c757d;\n}\n\n.form-check-label {\n  margin-bottom: 0;\n}\n\n.form-check-inline {\n  display: -ms-inline-flexbox;\n  display: inline-flex;\n  -ms-flex-align: center;\n  align-items: center;\n  padding-left: 0;\n  margin-right: 0.75rem;\n}\n\n.form-check-inline .form-check-input {\n  position: static;\n  margin-top: 0;\n  margin-right: 0.3125rem;\n  margin-left: 0;\n}\n\n.valid-feedback {\n  display: none;\n  width: 100%;\n  margin-top: 0.25rem;\n  font-size: 80%;\n  color: #28a745;\n}\n\n.valid-tooltip {\n  position: absolute;\n  top: 100%;\n  z-index: 5;\n  display: none;\n  max-width: 100%;\n  padding: 0.25rem 0.5rem;\n  margin-top: .1rem;\n  font-size: 0.875rem;\n  line-height: 1.5;\n  color: #fff;\n  background-color: rgba(40, 167, 69, 0.9);\n  border-radius: 0.25rem;\n}\n\n.was-validated :valid ~ .valid-feedback,\n.was-validated :valid ~ .valid-tooltip,\n.is-valid ~ .valid-feedback,\n.is-valid ~ .valid-tooltip {\n  display: block;\n}\n\n.was-validated .form-control:valid, .form-control.is-valid {\n  border-color: #28a745;\n  padding-right: calc(1.5em + 0.75rem);\n  background-image: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e\");\n  background-repeat: no-repeat;\n  background-position: right calc(0.375em + 0.1875rem) center;\n  background-size: calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);\n}\n\n.was-validated .form-control:valid:focus, .form-control.is-valid:focus {\n  border-color: #28a745;\n  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);\n}\n\n.was-validated textarea.form-control:valid, textarea.form-control.is-valid {\n  padding-right: calc(1.5em + 0.75rem);\n  background-position: top calc(0.375em + 0.1875rem) right calc(0.375em + 0.1875rem);\n}\n\n.was-validated .custom-select:valid, .custom-select.is-valid {\n  border-color: #28a745;\n  padding-right: calc(0.75em + 2.3125rem);\n  background: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e\") no-repeat right 0.75rem center/8px 10px, url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e\") #fff no-repeat center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);\n}\n\n.was-validated .custom-select:valid:focus, .custom-select.is-valid:focus {\n  border-color: #28a745;\n  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);\n}\n\n.was-validated .form-check-input:valid ~ .form-check-label, .form-check-input.is-valid ~ .form-check-label {\n  color: #28a745;\n}\n\n.was-validated .form-check-input:valid ~ .valid-feedback,\n.was-validated .form-check-input:valid ~ .valid-tooltip, .form-check-input.is-valid ~ .valid-feedback,\n.form-check-input.is-valid ~ .valid-tooltip {\n  display: block;\n}\n\n.was-validated .custom-control-input:valid ~ .custom-control-label, .custom-control-input.is-valid ~ .custom-control-label {\n  color: #28a745;\n}\n\n.was-validated .custom-control-input:valid ~ .custom-control-label::before, .custom-control-input.is-valid ~ .custom-control-label::before {\n  border-color: #28a745;\n}\n\n.was-validated .custom-control-input:valid:checked ~ .custom-control-label::before, .custom-control-input.is-valid:checked ~ .custom-control-label::before {\n  border-color: #34ce57;\n  background-color: #34ce57;\n}\n\n.was-validated .custom-control-input:valid:focus ~ .custom-control-label::before, .custom-control-input.is-valid:focus ~ .custom-control-label::before {\n  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);\n}\n\n.was-validated .custom-control-input:valid:focus:not(:checked) ~ .custom-control-label::before, .custom-control-input.is-valid:focus:not(:checked) ~ .custom-control-label::before {\n  border-color: #28a745;\n}\n\n.was-validated .custom-file-input:valid ~ .custom-file-label, .custom-file-input.is-valid ~ .custom-file-label {\n  border-color: #28a745;\n}\n\n.was-validated .custom-file-input:valid:focus ~ .custom-file-label, .custom-file-input.is-valid:focus ~ .custom-file-label {\n  border-color: #28a745;\n  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);\n}\n\n.invalid-feedback {\n  display: none;\n  width: 100%;\n  margin-top: 0.25rem;\n  font-size: 80%;\n  color: #dc3545;\n}\n\n.invalid-tooltip {\n  position: absolute;\n  top: 100%;\n  z-index: 5;\n  display: none;\n  max-width: 100%;\n  padding: 0.25rem 0.5rem;\n  margin-top: .1rem;\n  font-size: 0.875rem;\n  line-height: 1.5;\n  color: #fff;\n  background-color: rgba(220, 53, 69, 0.9);\n  border-radius: 0.25rem;\n}\n\n.was-validated :invalid ~ .invalid-feedback,\n.was-validated :invalid ~ .invalid-tooltip,\n.is-invalid ~ .invalid-feedback,\n.is-invalid ~ .invalid-tooltip {\n  display: block;\n}\n\n.was-validated .form-control:invalid, .form-control.is-invalid {\n  border-color: #dc3545;\n  padding-right: calc(1.5em + 0.75rem);\n  background-image: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e\");\n  background-repeat: no-repeat;\n  background-position: right calc(0.375em + 0.1875rem) center;\n  background-size: calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);\n}\n\n.was-validated .form-control:invalid:focus, .form-control.is-invalid:focus {\n  border-color: #dc3545;\n  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);\n}\n\n.was-validated textarea.form-control:invalid, textarea.form-control.is-invalid {\n  padding-right: calc(1.5em + 0.75rem);\n  background-position: top calc(0.375em + 0.1875rem) right calc(0.375em + 0.1875rem);\n}\n\n.was-validated .custom-select:invalid, .custom-select.is-invalid {\n  border-color: #dc3545;\n  padding-right: calc(0.75em + 2.3125rem);\n  background: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e\") no-repeat right 0.75rem center/8px 10px, url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e\") #fff no-repeat center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);\n}\n\n.was-validated .custom-select:invalid:focus, .custom-select.is-invalid:focus {\n  border-color: #dc3545;\n  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);\n}\n\n.was-validated .form-check-input:invalid ~ .form-check-label, .form-check-input.is-invalid ~ .form-check-label {\n  color: #dc3545;\n}\n\n.was-validated .form-check-input:invalid ~ .invalid-feedback,\n.was-validated .form-check-input:invalid ~ .invalid-tooltip, .form-check-input.is-invalid ~ .invalid-feedback,\n.form-check-input.is-invalid ~ .invalid-tooltip {\n  display: block;\n}\n\n.was-validated .custom-control-input:invalid ~ .custom-control-label, .custom-control-input.is-invalid ~ .custom-control-label {\n  color: #dc3545;\n}\n\n.was-validated .custom-control-input:invalid ~ .custom-control-label::before, .custom-control-input.is-invalid ~ .custom-control-label::before {\n  border-color: #dc3545;\n}\n\n.was-validated .custom-control-input:invalid:checked ~ .custom-control-label::before, .custom-control-input.is-invalid:checked ~ .custom-control-label::before {\n  border-color: #e4606d;\n  background-color: #e4606d;\n}\n\n.was-validated .custom-control-input:invalid:focus ~ .custom-control-label::before, .custom-control-input.is-invalid:focus ~ .custom-control-label::before {\n  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);\n}\n\n.was-validated .custom-control-input:invalid:focus:not(:checked) ~ .custom-control-label::before, .custom-control-input.is-invalid:focus:not(:checked) ~ .custom-control-label::before {\n  border-color: #dc3545;\n}\n\n.was-validated .custom-file-input:invalid ~ .custom-file-label, .custom-file-input.is-invalid ~ .custom-file-label {\n  border-color: #dc3545;\n}\n\n.was-validated .custom-file-input:invalid:focus ~ .custom-file-label, .custom-file-input.is-invalid:focus ~ .custom-file-label {\n  border-color: #dc3545;\n  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);\n}\n\n.form-inline {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-flow: row wrap;\n  flex-flow: row wrap;\n  -ms-flex-align: center;\n  align-items: center;\n}\n\n.form-inline .form-check {\n  width: 100%;\n}\n\n@media (min-width: 576px) {\n  .form-inline label {\n    display: -ms-flexbox;\n    display: flex;\n    -ms-flex-align: center;\n    align-items: center;\n    -ms-flex-pack: center;\n    justify-content: center;\n    margin-bottom: 0;\n  }\n  .form-inline .form-group {\n    display: -ms-flexbox;\n    display: flex;\n    -ms-flex: 0 0 auto;\n    flex: 0 0 auto;\n    -ms-flex-flow: row wrap;\n    flex-flow: row wrap;\n    -ms-flex-align: center;\n    align-items: center;\n    margin-bottom: 0;\n  }\n  .form-inline .form-control {\n    display: inline-block;\n    width: auto;\n    vertical-align: middle;\n  }\n  .form-inline .form-control-plaintext {\n    display: inline-block;\n  }\n  .form-inline .input-group,\n  .form-inline .custom-select {\n    width: auto;\n  }\n  .form-inline .form-check {\n    display: -ms-flexbox;\n    display: flex;\n    -ms-flex-align: center;\n    align-items: center;\n    -ms-flex-pack: center;\n    justify-content: center;\n    width: auto;\n    padding-left: 0;\n  }\n  .form-inline .form-check-input {\n    position: relative;\n    -ms-flex-negative: 0;\n    flex-shrink: 0;\n    margin-top: 0;\n    margin-right: 0.25rem;\n    margin-left: 0;\n  }\n  .form-inline .custom-control {\n    -ms-flex-align: center;\n    align-items: center;\n    -ms-flex-pack: center;\n    justify-content: center;\n  }\n  .form-inline .custom-control-label {\n    margin-bottom: 0;\n  }\n}\n\n.btn {\n  display: inline-block;\n  font-weight: 400;\n  color: #212529;\n  text-align: center;\n  vertical-align: middle;\n  cursor: pointer;\n  -webkit-user-select: none;\n  -moz-user-select: none;\n  -ms-user-select: none;\n  user-select: none;\n  background-color: transparent;\n  border: 1px solid transparent;\n  padding: 0.375rem 0.75rem;\n  font-size: 1rem;\n  line-height: 1.5;\n  border-radius: 0.25rem;\n  transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .btn {\n    transition: none;\n  }\n}\n\n.btn:hover {\n  color: #212529;\n  text-decoration: none;\n}\n\n.btn:focus, .btn.focus {\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);\n}\n\n.btn.disabled, .btn:disabled {\n  opacity: 0.65;\n}\n\na.btn.disabled,\nfieldset:disabled a.btn {\n  pointer-events: none;\n}\n\n.btn-primary {\n  color: #fff;\n  background-color: #007bff;\n  border-color: #007bff;\n}\n\n.btn-primary:hover {\n  color: #fff;\n  background-color: #0069d9;\n  border-color: #0062cc;\n}\n\n.btn-primary:focus, .btn-primary.focus {\n  color: #fff;\n  background-color: #0069d9;\n  border-color: #0062cc;\n  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);\n}\n\n.btn-primary.disabled, .btn-primary:disabled {\n  color: #fff;\n  background-color: #007bff;\n  border-color: #007bff;\n}\n\n.btn-primary:not(:disabled):not(.disabled):active, .btn-primary:not(:disabled):not(.disabled).active,\n.show > .btn-primary.dropdown-toggle {\n  color: #fff;\n  background-color: #0062cc;\n  border-color: #005cbf;\n}\n\n.btn-primary:not(:disabled):not(.disabled):active:focus, .btn-primary:not(:disabled):not(.disabled).active:focus,\n.show > .btn-primary.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);\n}\n\n.btn-secondary {\n  color: #fff;\n  background-color: #6c757d;\n  border-color: #6c757d;\n}\n\n.btn-secondary:hover {\n  color: #fff;\n  background-color: #5a6268;\n  border-color: #545b62;\n}\n\n.btn-secondary:focus, .btn-secondary.focus {\n  color: #fff;\n  background-color: #5a6268;\n  border-color: #545b62;\n  box-shadow: 0 0 0 0.2rem rgba(130, 138, 145, 0.5);\n}\n\n.btn-secondary.disabled, .btn-secondary:disabled {\n  color: #fff;\n  background-color: #6c757d;\n  border-color: #6c757d;\n}\n\n.btn-secondary:not(:disabled):not(.disabled):active, .btn-secondary:not(:disabled):not(.disabled).active,\n.show > .btn-secondary.dropdown-toggle {\n  color: #fff;\n  background-color: #545b62;\n  border-color: #4e555b;\n}\n\n.btn-secondary:not(:disabled):not(.disabled):active:focus, .btn-secondary:not(:disabled):not(.disabled).active:focus,\n.show > .btn-secondary.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(130, 138, 145, 0.5);\n}\n\n.btn-success {\n  color: #fff;\n  background-color: #28a745;\n  border-color: #28a745;\n}\n\n.btn-success:hover {\n  color: #fff;\n  background-color: #218838;\n  border-color: #1e7e34;\n}\n\n.btn-success:focus, .btn-success.focus {\n  color: #fff;\n  background-color: #218838;\n  border-color: #1e7e34;\n  box-shadow: 0 0 0 0.2rem rgba(72, 180, 97, 0.5);\n}\n\n.btn-success.disabled, .btn-success:disabled {\n  color: #fff;\n  background-color: #28a745;\n  border-color: #28a745;\n}\n\n.btn-success:not(:disabled):not(.disabled):active, .btn-success:not(:disabled):not(.disabled).active,\n.show > .btn-success.dropdown-toggle {\n  color: #fff;\n  background-color: #1e7e34;\n  border-color: #1c7430;\n}\n\n.btn-success:not(:disabled):not(.disabled):active:focus, .btn-success:not(:disabled):not(.disabled).active:focus,\n.show > .btn-success.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(72, 180, 97, 0.5);\n}\n\n.btn-info {\n  color: #fff;\n  background-color: #17a2b8;\n  border-color: #17a2b8;\n}\n\n.btn-info:hover {\n  color: #fff;\n  background-color: #138496;\n  border-color: #117a8b;\n}\n\n.btn-info:focus, .btn-info.focus {\n  color: #fff;\n  background-color: #138496;\n  border-color: #117a8b;\n  box-shadow: 0 0 0 0.2rem rgba(58, 176, 195, 0.5);\n}\n\n.btn-info.disabled, .btn-info:disabled {\n  color: #fff;\n  background-color: #17a2b8;\n  border-color: #17a2b8;\n}\n\n.btn-info:not(:disabled):not(.disabled):active, .btn-info:not(:disabled):not(.disabled).active,\n.show > .btn-info.dropdown-toggle {\n  color: #fff;\n  background-color: #117a8b;\n  border-color: #10707f;\n}\n\n.btn-info:not(:disabled):not(.disabled):active:focus, .btn-info:not(:disabled):not(.disabled).active:focus,\n.show > .btn-info.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(58, 176, 195, 0.5);\n}\n\n.btn-warning {\n  color: #212529;\n  background-color: #ffc107;\n  border-color: #ffc107;\n}\n\n.btn-warning:hover {\n  color: #212529;\n  background-color: #e0a800;\n  border-color: #d39e00;\n}\n\n.btn-warning:focus, .btn-warning.focus {\n  color: #212529;\n  background-color: #e0a800;\n  border-color: #d39e00;\n  box-shadow: 0 0 0 0.2rem rgba(222, 170, 12, 0.5);\n}\n\n.btn-warning.disabled, .btn-warning:disabled {\n  color: #212529;\n  background-color: #ffc107;\n  border-color: #ffc107;\n}\n\n.btn-warning:not(:disabled):not(.disabled):active, .btn-warning:not(:disabled):not(.disabled).active,\n.show > .btn-warning.dropdown-toggle {\n  color: #212529;\n  background-color: #d39e00;\n  border-color: #c69500;\n}\n\n.btn-warning:not(:disabled):not(.disabled):active:focus, .btn-warning:not(:disabled):not(.disabled).active:focus,\n.show > .btn-warning.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(222, 170, 12, 0.5);\n}\n\n.btn-danger {\n  color: #fff;\n  background-color: #dc3545;\n  border-color: #dc3545;\n}\n\n.btn-danger:hover {\n  color: #fff;\n  background-color: #c82333;\n  border-color: #bd2130;\n}\n\n.btn-danger:focus, .btn-danger.focus {\n  color: #fff;\n  background-color: #c82333;\n  border-color: #bd2130;\n  box-shadow: 0 0 0 0.2rem rgba(225, 83, 97, 0.5);\n}\n\n.btn-danger.disabled, .btn-danger:disabled {\n  color: #fff;\n  background-color: #dc3545;\n  border-color: #dc3545;\n}\n\n.btn-danger:not(:disabled):not(.disabled):active, .btn-danger:not(:disabled):not(.disabled).active,\n.show > .btn-danger.dropdown-toggle {\n  color: #fff;\n  background-color: #bd2130;\n  border-color: #b21f2d;\n}\n\n.btn-danger:not(:disabled):not(.disabled):active:focus, .btn-danger:not(:disabled):not(.disabled).active:focus,\n.show > .btn-danger.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(225, 83, 97, 0.5);\n}\n\n.btn-light {\n  color: #212529;\n  background-color: #f8f9fa;\n  border-color: #f8f9fa;\n}\n\n.btn-light:hover {\n  color: #212529;\n  background-color: #e2e6ea;\n  border-color: #dae0e5;\n}\n\n.btn-light:focus, .btn-light.focus {\n  color: #212529;\n  background-color: #e2e6ea;\n  border-color: #dae0e5;\n  box-shadow: 0 0 0 0.2rem rgba(216, 217, 219, 0.5);\n}\n\n.btn-light.disabled, .btn-light:disabled {\n  color: #212529;\n  background-color: #f8f9fa;\n  border-color: #f8f9fa;\n}\n\n.btn-light:not(:disabled):not(.disabled):active, .btn-light:not(:disabled):not(.disabled).active,\n.show > .btn-light.dropdown-toggle {\n  color: #212529;\n  background-color: #dae0e5;\n  border-color: #d3d9df;\n}\n\n.btn-light:not(:disabled):not(.disabled):active:focus, .btn-light:not(:disabled):not(.disabled).active:focus,\n.show > .btn-light.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(216, 217, 219, 0.5);\n}\n\n.btn-dark {\n  color: #fff;\n  background-color: #343a40;\n  border-color: #343a40;\n}\n\n.btn-dark:hover {\n  color: #fff;\n  background-color: #23272b;\n  border-color: #1d2124;\n}\n\n.btn-dark:focus, .btn-dark.focus {\n  color: #fff;\n  background-color: #23272b;\n  border-color: #1d2124;\n  box-shadow: 0 0 0 0.2rem rgba(82, 88, 93, 0.5);\n}\n\n.btn-dark.disabled, .btn-dark:disabled {\n  color: #fff;\n  background-color: #343a40;\n  border-color: #343a40;\n}\n\n.btn-dark:not(:disabled):not(.disabled):active, .btn-dark:not(:disabled):not(.disabled).active,\n.show > .btn-dark.dropdown-toggle {\n  color: #fff;\n  background-color: #1d2124;\n  border-color: #171a1d;\n}\n\n.btn-dark:not(:disabled):not(.disabled):active:focus, .btn-dark:not(:disabled):not(.disabled).active:focus,\n.show > .btn-dark.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(82, 88, 93, 0.5);\n}\n\n.btn-outline-primary {\n  color: #007bff;\n  border-color: #007bff;\n}\n\n.btn-outline-primary:hover {\n  color: #fff;\n  background-color: #007bff;\n  border-color: #007bff;\n}\n\n.btn-outline-primary:focus, .btn-outline-primary.focus {\n  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);\n}\n\n.btn-outline-primary.disabled, .btn-outline-primary:disabled {\n  color: #007bff;\n  background-color: transparent;\n}\n\n.btn-outline-primary:not(:disabled):not(.disabled):active, .btn-outline-primary:not(:disabled):not(.disabled).active,\n.show > .btn-outline-primary.dropdown-toggle {\n  color: #fff;\n  background-color: #007bff;\n  border-color: #007bff;\n}\n\n.btn-outline-primary:not(:disabled):not(.disabled):active:focus, .btn-outline-primary:not(:disabled):not(.disabled).active:focus,\n.show > .btn-outline-primary.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);\n}\n\n.btn-outline-secondary {\n  color: #6c757d;\n  border-color: #6c757d;\n}\n\n.btn-outline-secondary:hover {\n  color: #fff;\n  background-color: #6c757d;\n  border-color: #6c757d;\n}\n\n.btn-outline-secondary:focus, .btn-outline-secondary.focus {\n  box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5);\n}\n\n.btn-outline-secondary.disabled, .btn-outline-secondary:disabled {\n  color: #6c757d;\n  background-color: transparent;\n}\n\n.btn-outline-secondary:not(:disabled):not(.disabled):active, .btn-outline-secondary:not(:disabled):not(.disabled).active,\n.show > .btn-outline-secondary.dropdown-toggle {\n  color: #fff;\n  background-color: #6c757d;\n  border-color: #6c757d;\n}\n\n.btn-outline-secondary:not(:disabled):not(.disabled):active:focus, .btn-outline-secondary:not(:disabled):not(.disabled).active:focus,\n.show > .btn-outline-secondary.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5);\n}\n\n.btn-outline-success {\n  color: #28a745;\n  border-color: #28a745;\n}\n\n.btn-outline-success:hover {\n  color: #fff;\n  background-color: #28a745;\n  border-color: #28a745;\n}\n\n.btn-outline-success:focus, .btn-outline-success.focus {\n  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);\n}\n\n.btn-outline-success.disabled, .btn-outline-success:disabled {\n  color: #28a745;\n  background-color: transparent;\n}\n\n.btn-outline-success:not(:disabled):not(.disabled):active, .btn-outline-success:not(:disabled):not(.disabled).active,\n.show > .btn-outline-success.dropdown-toggle {\n  color: #fff;\n  background-color: #28a745;\n  border-color: #28a745;\n}\n\n.btn-outline-success:not(:disabled):not(.disabled):active:focus, .btn-outline-success:not(:disabled):not(.disabled).active:focus,\n.show > .btn-outline-success.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);\n}\n\n.btn-outline-info {\n  color: #17a2b8;\n  border-color: #17a2b8;\n}\n\n.btn-outline-info:hover {\n  color: #fff;\n  background-color: #17a2b8;\n  border-color: #17a2b8;\n}\n\n.btn-outline-info:focus, .btn-outline-info.focus {\n  box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);\n}\n\n.btn-outline-info.disabled, .btn-outline-info:disabled {\n  color: #17a2b8;\n  background-color: transparent;\n}\n\n.btn-outline-info:not(:disabled):not(.disabled):active, .btn-outline-info:not(:disabled):not(.disabled).active,\n.show > .btn-outline-info.dropdown-toggle {\n  color: #fff;\n  background-color: #17a2b8;\n  border-color: #17a2b8;\n}\n\n.btn-outline-info:not(:disabled):not(.disabled):active:focus, .btn-outline-info:not(:disabled):not(.disabled).active:focus,\n.show > .btn-outline-info.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);\n}\n\n.btn-outline-warning {\n  color: #ffc107;\n  border-color: #ffc107;\n}\n\n.btn-outline-warning:hover {\n  color: #212529;\n  background-color: #ffc107;\n  border-color: #ffc107;\n}\n\n.btn-outline-warning:focus, .btn-outline-warning.focus {\n  box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);\n}\n\n.btn-outline-warning.disabled, .btn-outline-warning:disabled {\n  color: #ffc107;\n  background-color: transparent;\n}\n\n.btn-outline-warning:not(:disabled):not(.disabled):active, .btn-outline-warning:not(:disabled):not(.disabled).active,\n.show > .btn-outline-warning.dropdown-toggle {\n  color: #212529;\n  background-color: #ffc107;\n  border-color: #ffc107;\n}\n\n.btn-outline-warning:not(:disabled):not(.disabled):active:focus, .btn-outline-warning:not(:disabled):not(.disabled).active:focus,\n.show > .btn-outline-warning.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);\n}\n\n.btn-outline-danger {\n  color: #dc3545;\n  border-color: #dc3545;\n}\n\n.btn-outline-danger:hover {\n  color: #fff;\n  background-color: #dc3545;\n  border-color: #dc3545;\n}\n\n.btn-outline-danger:focus, .btn-outline-danger.focus {\n  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);\n}\n\n.btn-outline-danger.disabled, .btn-outline-danger:disabled {\n  color: #dc3545;\n  background-color: transparent;\n}\n\n.btn-outline-danger:not(:disabled):not(.disabled):active, .btn-outline-danger:not(:disabled):not(.disabled).active,\n.show > .btn-outline-danger.dropdown-toggle {\n  color: #fff;\n  background-color: #dc3545;\n  border-color: #dc3545;\n}\n\n.btn-outline-danger:not(:disabled):not(.disabled):active:focus, .btn-outline-danger:not(:disabled):not(.disabled).active:focus,\n.show > .btn-outline-danger.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);\n}\n\n.btn-outline-light {\n  color: #f8f9fa;\n  border-color: #f8f9fa;\n}\n\n.btn-outline-light:hover {\n  color: #212529;\n  background-color: #f8f9fa;\n  border-color: #f8f9fa;\n}\n\n.btn-outline-light:focus, .btn-outline-light.focus {\n  box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);\n}\n\n.btn-outline-light.disabled, .btn-outline-light:disabled {\n  color: #f8f9fa;\n  background-color: transparent;\n}\n\n.btn-outline-light:not(:disabled):not(.disabled):active, .btn-outline-light:not(:disabled):not(.disabled).active,\n.show > .btn-outline-light.dropdown-toggle {\n  color: #212529;\n  background-color: #f8f9fa;\n  border-color: #f8f9fa;\n}\n\n.btn-outline-light:not(:disabled):not(.disabled):active:focus, .btn-outline-light:not(:disabled):not(.disabled).active:focus,\n.show > .btn-outline-light.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);\n}\n\n.btn-outline-dark {\n  color: #343a40;\n  border-color: #343a40;\n}\n\n.btn-outline-dark:hover {\n  color: #fff;\n  background-color: #343a40;\n  border-color: #343a40;\n}\n\n.btn-outline-dark:focus, .btn-outline-dark.focus {\n  box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);\n}\n\n.btn-outline-dark.disabled, .btn-outline-dark:disabled {\n  color: #343a40;\n  background-color: transparent;\n}\n\n.btn-outline-dark:not(:disabled):not(.disabled):active, .btn-outline-dark:not(:disabled):not(.disabled).active,\n.show > .btn-outline-dark.dropdown-toggle {\n  color: #fff;\n  background-color: #343a40;\n  border-color: #343a40;\n}\n\n.btn-outline-dark:not(:disabled):not(.disabled):active:focus, .btn-outline-dark:not(:disabled):not(.disabled).active:focus,\n.show > .btn-outline-dark.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);\n}\n\n.btn-link {\n  font-weight: 400;\n  color: #007bff;\n  text-decoration: none;\n}\n\n.btn-link:hover {\n  color: #0056b3;\n  text-decoration: underline;\n}\n\n.btn-link:focus, .btn-link.focus {\n  text-decoration: underline;\n  box-shadow: none;\n}\n\n.btn-link:disabled, .btn-link.disabled {\n  color: #6c757d;\n  pointer-events: none;\n}\n\n.btn-lg, .btn-group-lg > .btn {\n  padding: 0.5rem 1rem;\n  font-size: 1.25rem;\n  line-height: 1.5;\n  border-radius: 0.3rem;\n}\n\n.btn-sm, .btn-group-sm > .btn {\n  padding: 0.25rem 0.5rem;\n  font-size: 0.875rem;\n  line-height: 1.5;\n  border-radius: 0.2rem;\n}\n\n.btn-block {\n  display: block;\n  width: 100%;\n}\n\n.btn-block + .btn-block {\n  margin-top: 0.5rem;\n}\n\ninput[type=\"submit\"].btn-block,\ninput[type=\"reset\"].btn-block,\ninput[type=\"button\"].btn-block {\n  width: 100%;\n}\n\n.fade {\n  transition: opacity 0.15s linear;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .fade {\n    transition: none;\n  }\n}\n\n.fade:not(.show) {\n  opacity: 0;\n}\n\n.collapse:not(.show) {\n  display: none;\n}\n\n.collapsing {\n  position: relative;\n  height: 0;\n  overflow: hidden;\n  transition: height 0.35s ease;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .collapsing {\n    transition: none;\n  }\n}\n\n.dropup,\n.dropright,\n.dropdown,\n.dropleft {\n  position: relative;\n}\n\n.dropdown-toggle {\n  white-space: nowrap;\n}\n\n.dropdown-toggle::after {\n  display: inline-block;\n  margin-left: 0.255em;\n  vertical-align: 0.255em;\n  content: \"\";\n  border-top: 0.3em solid;\n  border-right: 0.3em solid transparent;\n  border-bottom: 0;\n  border-left: 0.3em solid transparent;\n}\n\n.dropdown-toggle:empty::after {\n  margin-left: 0;\n}\n\n.dropdown-menu {\n  position: absolute;\n  top: 100%;\n  left: 0;\n  z-index: 1000;\n  display: none;\n  float: left;\n  min-width: 10rem;\n  padding: 0.5rem 0;\n  margin: 0.125rem 0 0;\n  font-size: 1rem;\n  color: #212529;\n  text-align: left;\n  list-style: none;\n  background-color: #fff;\n  background-clip: padding-box;\n  border: 1px solid rgba(0, 0, 0, 0.15);\n  border-radius: 0.25rem;\n}\n\n.dropdown-menu-left {\n  right: auto;\n  left: 0;\n}\n\n.dropdown-menu-right {\n  right: 0;\n  left: auto;\n}\n\n@media (min-width: 576px) {\n  .dropdown-menu-sm-left {\n    right: auto;\n    left: 0;\n  }\n  .dropdown-menu-sm-right {\n    right: 0;\n    left: auto;\n  }\n}\n\n@media (min-width: 768px) {\n  .dropdown-menu-md-left {\n    right: auto;\n    left: 0;\n  }\n  .dropdown-menu-md-right {\n    right: 0;\n    left: auto;\n  }\n}\n\n@media (min-width: 992px) {\n  .dropdown-menu-lg-left {\n    right: auto;\n    left: 0;\n  }\n  .dropdown-menu-lg-right {\n    right: 0;\n    left: auto;\n  }\n}\n\n@media (min-width: 1200px) {\n  .dropdown-menu-xl-left {\n    right: auto;\n    left: 0;\n  }\n  .dropdown-menu-xl-right {\n    right: 0;\n    left: auto;\n  }\n}\n\n.dropup .dropdown-menu {\n  top: auto;\n  bottom: 100%;\n  margin-top: 0;\n  margin-bottom: 0.125rem;\n}\n\n.dropup .dropdown-toggle::after {\n  display: inline-block;\n  margin-left: 0.255em;\n  vertical-align: 0.255em;\n  content: \"\";\n  border-top: 0;\n  border-right: 0.3em solid transparent;\n  border-bottom: 0.3em solid;\n  border-left: 0.3em solid transparent;\n}\n\n.dropup .dropdown-toggle:empty::after {\n  margin-left: 0;\n}\n\n.dropright .dropdown-menu {\n  top: 0;\n  right: auto;\n  left: 100%;\n  margin-top: 0;\n  margin-left: 0.125rem;\n}\n\n.dropright .dropdown-toggle::after {\n  display: inline-block;\n  margin-left: 0.255em;\n  vertical-align: 0.255em;\n  content: \"\";\n  border-top: 0.3em solid transparent;\n  border-right: 0;\n  border-bottom: 0.3em solid transparent;\n  border-left: 0.3em solid;\n}\n\n.dropright .dropdown-toggle:empty::after {\n  margin-left: 0;\n}\n\n.dropright .dropdown-toggle::after {\n  vertical-align: 0;\n}\n\n.dropleft .dropdown-menu {\n  top: 0;\n  right: 100%;\n  left: auto;\n  margin-top: 0;\n  margin-right: 0.125rem;\n}\n\n.dropleft .dropdown-toggle::after {\n  display: inline-block;\n  margin-left: 0.255em;\n  vertical-align: 0.255em;\n  content: \"\";\n}\n\n.dropleft .dropdown-toggle::after {\n  display: none;\n}\n\n.dropleft .dropdown-toggle::before {\n  display: inline-block;\n  margin-right: 0.255em;\n  vertical-align: 0.255em;\n  content: \"\";\n  border-top: 0.3em solid transparent;\n  border-right: 0.3em solid;\n  border-bottom: 0.3em solid transparent;\n}\n\n.dropleft .dropdown-toggle:empty::after {\n  margin-left: 0;\n}\n\n.dropleft .dropdown-toggle::before {\n  vertical-align: 0;\n}\n\n.dropdown-menu[x-placement^=\"top\"], .dropdown-menu[x-placement^=\"right\"], .dropdown-menu[x-placement^=\"bottom\"], .dropdown-menu[x-placement^=\"left\"] {\n  right: auto;\n  bottom: auto;\n}\n\n.dropdown-divider {\n  height: 0;\n  margin: 0.5rem 0;\n  overflow: hidden;\n  border-top: 1px solid #e9ecef;\n}\n\n.dropdown-item {\n  display: block;\n  width: 100%;\n  padding: 0.25rem 1.5rem;\n  clear: both;\n  font-weight: 400;\n  color: #212529;\n  text-align: inherit;\n  white-space: nowrap;\n  background-color: transparent;\n  border: 0;\n}\n\n.dropdown-item:hover, .dropdown-item:focus {\n  color: #16181b;\n  text-decoration: none;\n  background-color: #f8f9fa;\n}\n\n.dropdown-item.active, .dropdown-item:active {\n  color: #fff;\n  text-decoration: none;\n  background-color: #007bff;\n}\n\n.dropdown-item.disabled, .dropdown-item:disabled {\n  color: #6c757d;\n  pointer-events: none;\n  background-color: transparent;\n}\n\n.dropdown-menu.show {\n  display: block;\n}\n\n.dropdown-header {\n  display: block;\n  padding: 0.5rem 1.5rem;\n  margin-bottom: 0;\n  font-size: 0.875rem;\n  color: #6c757d;\n  white-space: nowrap;\n}\n\n.dropdown-item-text {\n  display: block;\n  padding: 0.25rem 1.5rem;\n  color: #212529;\n}\n\n.btn-group,\n.btn-group-vertical {\n  position: relative;\n  display: -ms-inline-flexbox;\n  display: inline-flex;\n  vertical-align: middle;\n}\n\n.btn-group > .btn,\n.btn-group-vertical > .btn {\n  position: relative;\n  -ms-flex: 1 1 auto;\n  flex: 1 1 auto;\n}\n\n.btn-group > .btn:hover,\n.btn-group-vertical > .btn:hover {\n  z-index: 1;\n}\n\n.btn-group > .btn:focus, .btn-group > .btn:active, .btn-group > .btn.active,\n.btn-group-vertical > .btn:focus,\n.btn-group-vertical > .btn:active,\n.btn-group-vertical > .btn.active {\n  z-index: 1;\n}\n\n.btn-toolbar {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-wrap: wrap;\n  flex-wrap: wrap;\n  -ms-flex-pack: start;\n  justify-content: flex-start;\n}\n\n.btn-toolbar .input-group {\n  width: auto;\n}\n\n.btn-group > .btn:not(:first-child),\n.btn-group > .btn-group:not(:first-child) {\n  margin-left: -1px;\n}\n\n.btn-group > .btn:not(:last-child):not(.dropdown-toggle),\n.btn-group > .btn-group:not(:last-child) > .btn {\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n}\n\n.btn-group > .btn:not(:first-child),\n.btn-group > .btn-group:not(:first-child) > .btn {\n  border-top-left-radius: 0;\n  border-bottom-left-radius: 0;\n}\n\n.dropdown-toggle-split {\n  padding-right: 0.5625rem;\n  padding-left: 0.5625rem;\n}\n\n.dropdown-toggle-split::after,\n.dropup .dropdown-toggle-split::after,\n.dropright .dropdown-toggle-split::after {\n  margin-left: 0;\n}\n\n.dropleft .dropdown-toggle-split::before {\n  margin-right: 0;\n}\n\n.btn-sm + .dropdown-toggle-split, .btn-group-sm > .btn + .dropdown-toggle-split {\n  padding-right: 0.375rem;\n  padding-left: 0.375rem;\n}\n\n.btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split {\n  padding-right: 0.75rem;\n  padding-left: 0.75rem;\n}\n\n.btn-group-vertical {\n  -ms-flex-direction: column;\n  flex-direction: column;\n  -ms-flex-align: start;\n  align-items: flex-start;\n  -ms-flex-pack: center;\n  justify-content: center;\n}\n\n.btn-group-vertical > .btn,\n.btn-group-vertical > .btn-group {\n  width: 100%;\n}\n\n.btn-group-vertical > .btn:not(:first-child),\n.btn-group-vertical > .btn-group:not(:first-child) {\n  margin-top: -1px;\n}\n\n.btn-group-vertical > .btn:not(:last-child):not(.dropdown-toggle),\n.btn-group-vertical > .btn-group:not(:last-child) > .btn {\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 0;\n}\n\n.btn-group-vertical > .btn:not(:first-child),\n.btn-group-vertical > .btn-group:not(:first-child) > .btn {\n  border-top-left-radius: 0;\n  border-top-right-radius: 0;\n}\n\n.btn-group-toggle > .btn,\n.btn-group-toggle > .btn-group > .btn {\n  margin-bottom: 0;\n}\n\n.btn-group-toggle > .btn input[type=\"radio\"],\n.btn-group-toggle > .btn input[type=\"checkbox\"],\n.btn-group-toggle > .btn-group > .btn input[type=\"radio\"],\n.btn-group-toggle > .btn-group > .btn input[type=\"checkbox\"] {\n  position: absolute;\n  clip: rect(0, 0, 0, 0);\n  pointer-events: none;\n}\n\n.input-group {\n  position: relative;\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-wrap: wrap;\n  flex-wrap: wrap;\n  -ms-flex-align: stretch;\n  align-items: stretch;\n  width: 100%;\n}\n\n.input-group > .form-control,\n.input-group > .form-control-plaintext,\n.input-group > .custom-select,\n.input-group > .custom-file {\n  position: relative;\n  -ms-flex: 1 1 0%;\n  flex: 1 1 0%;\n  min-width: 0;\n  margin-bottom: 0;\n}\n\n.input-group > .form-control + .form-control,\n.input-group > .form-control + .custom-select,\n.input-group > .form-control + .custom-file,\n.input-group > .form-control-plaintext + .form-control,\n.input-group > .form-control-plaintext + .custom-select,\n.input-group > .form-control-plaintext + .custom-file,\n.input-group > .custom-select + .form-control,\n.input-group > .custom-select + .custom-select,\n.input-group > .custom-select + .custom-file,\n.input-group > .custom-file + .form-control,\n.input-group > .custom-file + .custom-select,\n.input-group > .custom-file + .custom-file {\n  margin-left: -1px;\n}\n\n.input-group > .form-control:focus,\n.input-group > .custom-select:focus,\n.input-group > .custom-file .custom-file-input:focus ~ .custom-file-label {\n  z-index: 3;\n}\n\n.input-group > .custom-file .custom-file-input:focus {\n  z-index: 4;\n}\n\n.input-group > .form-control:not(:last-child),\n.input-group > .custom-select:not(:last-child) {\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n}\n\n.input-group > .form-control:not(:first-child),\n.input-group > .custom-select:not(:first-child) {\n  border-top-left-radius: 0;\n  border-bottom-left-radius: 0;\n}\n\n.input-group > .custom-file {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-align: center;\n  align-items: center;\n}\n\n.input-group > .custom-file:not(:last-child) .custom-file-label,\n.input-group > .custom-file:not(:last-child) .custom-file-label::after {\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n}\n\n.input-group > .custom-file:not(:first-child) .custom-file-label {\n  border-top-left-radius: 0;\n  border-bottom-left-radius: 0;\n}\n\n.input-group-prepend,\n.input-group-append {\n  display: -ms-flexbox;\n  display: flex;\n}\n\n.input-group-prepend .btn,\n.input-group-append .btn {\n  position: relative;\n  z-index: 2;\n}\n\n.input-group-prepend .btn:focus,\n.input-group-append .btn:focus {\n  z-index: 3;\n}\n\n.input-group-prepend .btn + .btn,\n.input-group-prepend .btn + .input-group-text,\n.input-group-prepend .input-group-text + .input-group-text,\n.input-group-prepend .input-group-text + .btn,\n.input-group-append .btn + .btn,\n.input-group-append .btn + .input-group-text,\n.input-group-append .input-group-text + .input-group-text,\n.input-group-append .input-group-text + .btn {\n  margin-left: -1px;\n}\n\n.input-group-prepend {\n  margin-right: -1px;\n}\n\n.input-group-append {\n  margin-left: -1px;\n}\n\n.input-group-text {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-align: center;\n  align-items: center;\n  padding: 0.375rem 0.75rem;\n  margin-bottom: 0;\n  font-size: 1rem;\n  font-weight: 400;\n  line-height: 1.5;\n  color: #495057;\n  text-align: center;\n  white-space: nowrap;\n  background-color: #e9ecef;\n  border: 1px solid #ced4da;\n  border-radius: 0.25rem;\n}\n\n.input-group-text input[type=\"radio\"],\n.input-group-text input[type=\"checkbox\"] {\n  margin-top: 0;\n}\n\n.input-group-lg > .form-control:not(textarea),\n.input-group-lg > .custom-select {\n  height: calc(1.5em + 1rem + 2px);\n}\n\n.input-group-lg > .form-control,\n.input-group-lg > .custom-select,\n.input-group-lg > .input-group-prepend > .input-group-text,\n.input-group-lg > .input-group-append > .input-group-text,\n.input-group-lg > .input-group-prepend > .btn,\n.input-group-lg > .input-group-append > .btn {\n  padding: 0.5rem 1rem;\n  font-size: 1.25rem;\n  line-height: 1.5;\n  border-radius: 0.3rem;\n}\n\n.input-group-sm > .form-control:not(textarea),\n.input-group-sm > .custom-select {\n  height: calc(1.5em + 0.5rem + 2px);\n}\n\n.input-group-sm > .form-control,\n.input-group-sm > .custom-select,\n.input-group-sm > .input-group-prepend > .input-group-text,\n.input-group-sm > .input-group-append > .input-group-text,\n.input-group-sm > .input-group-prepend > .btn,\n.input-group-sm > .input-group-append > .btn {\n  padding: 0.25rem 0.5rem;\n  font-size: 0.875rem;\n  line-height: 1.5;\n  border-radius: 0.2rem;\n}\n\n.input-group-lg > .custom-select,\n.input-group-sm > .custom-select {\n  padding-right: 1.75rem;\n}\n\n.input-group > .input-group-prepend > .btn,\n.input-group > .input-group-prepend > .input-group-text,\n.input-group > .input-group-append:not(:last-child) > .btn,\n.input-group > .input-group-append:not(:last-child) > .input-group-text,\n.input-group > .input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle),\n.input-group > .input-group-append:last-child > .input-group-text:not(:last-child) {\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n}\n\n.input-group > .input-group-append > .btn,\n.input-group > .input-group-append > .input-group-text,\n.input-group > .input-group-prepend:not(:first-child) > .btn,\n.input-group > .input-group-prepend:not(:first-child) > .input-group-text,\n.input-group > .input-group-prepend:first-child > .btn:not(:first-child),\n.input-group > .input-group-prepend:first-child > .input-group-text:not(:first-child) {\n  border-top-left-radius: 0;\n  border-bottom-left-radius: 0;\n}\n\n.custom-control {\n  position: relative;\n  display: block;\n  min-height: 1.5rem;\n  padding-left: 1.5rem;\n}\n\n.custom-control-inline {\n  display: -ms-inline-flexbox;\n  display: inline-flex;\n  margin-right: 1rem;\n}\n\n.custom-control-input {\n  position: absolute;\n  left: 0;\n  z-index: -1;\n  width: 1rem;\n  height: 1.25rem;\n  opacity: 0;\n}\n\n.custom-control-input:checked ~ .custom-control-label::before {\n  color: #fff;\n  border-color: #007bff;\n  background-color: #007bff;\n}\n\n.custom-control-input:focus ~ .custom-control-label::before {\n  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);\n}\n\n.custom-control-input:focus:not(:checked) ~ .custom-control-label::before {\n  border-color: #80bdff;\n}\n\n.custom-control-input:not(:disabled):active ~ .custom-control-label::before {\n  color: #fff;\n  background-color: #b3d7ff;\n  border-color: #b3d7ff;\n}\n\n.custom-control-input[disabled] ~ .custom-control-label, .custom-control-input:disabled ~ .custom-control-label {\n  color: #6c757d;\n}\n\n.custom-control-input[disabled] ~ .custom-control-label::before, .custom-control-input:disabled ~ .custom-control-label::before {\n  background-color: #e9ecef;\n}\n\n.custom-control-label {\n  position: relative;\n  margin-bottom: 0;\n  vertical-align: top;\n}\n\n.custom-control-label::before {\n  position: absolute;\n  top: 0.25rem;\n  left: -1.5rem;\n  display: block;\n  width: 1rem;\n  height: 1rem;\n  pointer-events: none;\n  content: \"\";\n  background-color: #fff;\n  border: #adb5bd solid 1px;\n}\n\n.custom-control-label::after {\n  position: absolute;\n  top: 0.25rem;\n  left: -1.5rem;\n  display: block;\n  width: 1rem;\n  height: 1rem;\n  content: \"\";\n  background: no-repeat 50% / 50% 50%;\n}\n\n.custom-checkbox .custom-control-label::before {\n  border-radius: 0.25rem;\n}\n\n.custom-checkbox .custom-control-input:checked ~ .custom-control-label::after {\n  background-image: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26l2.974 2.99L8 2.193z'/%3e%3c/svg%3e\");\n}\n\n.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::before {\n  border-color: #007bff;\n  background-color: #007bff;\n}\n\n.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::after {\n  background-image: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='4' viewBox='0 0 4 4'%3e%3cpath stroke='%23fff' d='M0 2h4'/%3e%3c/svg%3e\");\n}\n\n.custom-checkbox .custom-control-input:disabled:checked ~ .custom-control-label::before {\n  background-color: rgba(0, 123, 255, 0.5);\n}\n\n.custom-checkbox .custom-control-input:disabled:indeterminate ~ .custom-control-label::before {\n  background-color: rgba(0, 123, 255, 0.5);\n}\n\n.custom-radio .custom-control-label::before {\n  border-radius: 50%;\n}\n\n.custom-radio .custom-control-input:checked ~ .custom-control-label::after {\n  background-image: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23fff'/%3e%3c/svg%3e\");\n}\n\n.custom-radio .custom-control-input:disabled:checked ~ .custom-control-label::before {\n  background-color: rgba(0, 123, 255, 0.5);\n}\n\n.custom-switch {\n  padding-left: 2.25rem;\n}\n\n.custom-switch .custom-control-label::before {\n  left: -2.25rem;\n  width: 1.75rem;\n  pointer-events: all;\n  border-radius: 0.5rem;\n}\n\n.custom-switch .custom-control-label::after {\n  top: calc(0.25rem + 2px);\n  left: calc(-2.25rem + 2px);\n  width: calc(1rem - 4px);\n  height: calc(1rem - 4px);\n  background-color: #adb5bd;\n  border-radius: 0.5rem;\n  transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-transform 0.15s ease-in-out;\n  transition: transform 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n  transition: transform 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-transform 0.15s ease-in-out;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .custom-switch .custom-control-label::after {\n    transition: none;\n  }\n}\n\n.custom-switch .custom-control-input:checked ~ .custom-control-label::after {\n  background-color: #fff;\n  -webkit-transform: translateX(0.75rem);\n  transform: translateX(0.75rem);\n}\n\n.custom-switch .custom-control-input:disabled:checked ~ .custom-control-label::before {\n  background-color: rgba(0, 123, 255, 0.5);\n}\n\n.custom-select {\n  display: inline-block;\n  width: 100%;\n  height: calc(1.5em + 0.75rem + 2px);\n  padding: 0.375rem 1.75rem 0.375rem 0.75rem;\n  font-size: 1rem;\n  font-weight: 400;\n  line-height: 1.5;\n  color: #495057;\n  vertical-align: middle;\n  background: #fff url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e\") no-repeat right 0.75rem center/8px 10px;\n  border: 1px solid #ced4da;\n  border-radius: 0.25rem;\n  -webkit-appearance: none;\n  -moz-appearance: none;\n  appearance: none;\n}\n\n.custom-select:focus {\n  border-color: #80bdff;\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);\n}\n\n.custom-select:focus::-ms-value {\n  color: #495057;\n  background-color: #fff;\n}\n\n.custom-select[multiple], .custom-select[size]:not([size=\"1\"]) {\n  height: auto;\n  padding-right: 0.75rem;\n  background-image: none;\n}\n\n.custom-select:disabled {\n  color: #6c757d;\n  background-color: #e9ecef;\n}\n\n.custom-select::-ms-expand {\n  display: none;\n}\n\n.custom-select:-moz-focusring {\n  color: transparent;\n  text-shadow: 0 0 0 #495057;\n}\n\n.custom-select-sm {\n  height: calc(1.5em + 0.5rem + 2px);\n  padding-top: 0.25rem;\n  padding-bottom: 0.25rem;\n  padding-left: 0.5rem;\n  font-size: 0.875rem;\n}\n\n.custom-select-lg {\n  height: calc(1.5em + 1rem + 2px);\n  padding-top: 0.5rem;\n  padding-bottom: 0.5rem;\n  padding-left: 1rem;\n  font-size: 1.25rem;\n}\n\n.custom-file {\n  position: relative;\n  display: inline-block;\n  width: 100%;\n  height: calc(1.5em + 0.75rem + 2px);\n  margin-bottom: 0;\n}\n\n.custom-file-input {\n  position: relative;\n  z-index: 2;\n  width: 100%;\n  height: calc(1.5em + 0.75rem + 2px);\n  margin: 0;\n  opacity: 0;\n}\n\n.custom-file-input:focus ~ .custom-file-label {\n  border-color: #80bdff;\n  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);\n}\n\n.custom-file-input[disabled] ~ .custom-file-label,\n.custom-file-input:disabled ~ .custom-file-label {\n  background-color: #e9ecef;\n}\n\n.custom-file-input:lang(en) ~ .custom-file-label::after {\n  content: \"Browse\";\n}\n\n.custom-file-input ~ .custom-file-label[data-browse]::after {\n  content: attr(data-browse);\n}\n\n.custom-file-label {\n  position: absolute;\n  top: 0;\n  right: 0;\n  left: 0;\n  z-index: 1;\n  height: calc(1.5em + 0.75rem + 2px);\n  padding: 0.375rem 0.75rem;\n  font-weight: 400;\n  line-height: 1.5;\n  color: #495057;\n  background-color: #fff;\n  border: 1px solid #ced4da;\n  border-radius: 0.25rem;\n}\n\n.custom-file-label::after {\n  position: absolute;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  z-index: 3;\n  display: block;\n  height: calc(1.5em + 0.75rem);\n  padding: 0.375rem 0.75rem;\n  line-height: 1.5;\n  color: #495057;\n  content: \"Browse\";\n  background-color: #e9ecef;\n  border-left: inherit;\n  border-radius: 0 0.25rem 0.25rem 0;\n}\n\n.custom-range {\n  width: 100%;\n  height: 1.4rem;\n  padding: 0;\n  background-color: transparent;\n  -webkit-appearance: none;\n  -moz-appearance: none;\n  appearance: none;\n}\n\n.custom-range:focus {\n  outline: none;\n}\n\n.custom-range:focus::-webkit-slider-thumb {\n  box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);\n}\n\n.custom-range:focus::-moz-range-thumb {\n  box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);\n}\n\n.custom-range:focus::-ms-thumb {\n  box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);\n}\n\n.custom-range::-moz-focus-outer {\n  border: 0;\n}\n\n.custom-range::-webkit-slider-thumb {\n  width: 1rem;\n  height: 1rem;\n  margin-top: -0.25rem;\n  background-color: #007bff;\n  border: 0;\n  border-radius: 1rem;\n  -webkit-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n  transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n  -webkit-appearance: none;\n  appearance: none;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .custom-range::-webkit-slider-thumb {\n    -webkit-transition: none;\n    transition: none;\n  }\n}\n\n.custom-range::-webkit-slider-thumb:active {\n  background-color: #b3d7ff;\n}\n\n.custom-range::-webkit-slider-runnable-track {\n  width: 100%;\n  height: 0.5rem;\n  color: transparent;\n  cursor: pointer;\n  background-color: #dee2e6;\n  border-color: transparent;\n  border-radius: 1rem;\n}\n\n.custom-range::-moz-range-thumb {\n  width: 1rem;\n  height: 1rem;\n  background-color: #007bff;\n  border: 0;\n  border-radius: 1rem;\n  -moz-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n  transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n  -moz-appearance: none;\n  appearance: none;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .custom-range::-moz-range-thumb {\n    -moz-transition: none;\n    transition: none;\n  }\n}\n\n.custom-range::-moz-range-thumb:active {\n  background-color: #b3d7ff;\n}\n\n.custom-range::-moz-range-track {\n  width: 100%;\n  height: 0.5rem;\n  color: transparent;\n  cursor: pointer;\n  background-color: #dee2e6;\n  border-color: transparent;\n  border-radius: 1rem;\n}\n\n.custom-range::-ms-thumb {\n  width: 1rem;\n  height: 1rem;\n  margin-top: 0;\n  margin-right: 0.2rem;\n  margin-left: 0.2rem;\n  background-color: #007bff;\n  border: 0;\n  border-radius: 1rem;\n  -ms-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n  transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n  appearance: none;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .custom-range::-ms-thumb {\n    -ms-transition: none;\n    transition: none;\n  }\n}\n\n.custom-range::-ms-thumb:active {\n  background-color: #b3d7ff;\n}\n\n.custom-range::-ms-track {\n  width: 100%;\n  height: 0.5rem;\n  color: transparent;\n  cursor: pointer;\n  background-color: transparent;\n  border-color: transparent;\n  border-width: 0.5rem;\n}\n\n.custom-range::-ms-fill-lower {\n  background-color: #dee2e6;\n  border-radius: 1rem;\n}\n\n.custom-range::-ms-fill-upper {\n  margin-right: 15px;\n  background-color: #dee2e6;\n  border-radius: 1rem;\n}\n\n.custom-range:disabled::-webkit-slider-thumb {\n  background-color: #adb5bd;\n}\n\n.custom-range:disabled::-webkit-slider-runnable-track {\n  cursor: default;\n}\n\n.custom-range:disabled::-moz-range-thumb {\n  background-color: #adb5bd;\n}\n\n.custom-range:disabled::-moz-range-track {\n  cursor: default;\n}\n\n.custom-range:disabled::-ms-thumb {\n  background-color: #adb5bd;\n}\n\n.custom-control-label::before,\n.custom-file-label,\n.custom-select {\n  transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .custom-control-label::before,\n  .custom-file-label,\n  .custom-select {\n    transition: none;\n  }\n}\n\n.nav {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-wrap: wrap;\n  flex-wrap: wrap;\n  padding-left: 0;\n  margin-bottom: 0;\n  list-style: none;\n}\n\n.nav-link {\n  display: block;\n  padding: 0.5rem 1rem;\n}\n\n.nav-link:hover, .nav-link:focus {\n  text-decoration: none;\n}\n\n.nav-link.disabled {\n  color: #6c757d;\n  pointer-events: none;\n  cursor: default;\n}\n\n.nav-tabs {\n  border-bottom: 1px solid #dee2e6;\n}\n\n.nav-tabs .nav-item {\n  margin-bottom: -1px;\n}\n\n.nav-tabs .nav-link {\n  border: 1px solid transparent;\n  border-top-left-radius: 0.25rem;\n  border-top-right-radius: 0.25rem;\n}\n\n.nav-tabs .nav-link:hover, .nav-tabs .nav-link:focus {\n  border-color: #e9ecef #e9ecef #dee2e6;\n}\n\n.nav-tabs .nav-link.disabled {\n  color: #6c757d;\n  background-color: transparent;\n  border-color: transparent;\n}\n\n.nav-tabs .nav-link.active,\n.nav-tabs .nav-item.show .nav-link {\n  color: #495057;\n  background-color: #fff;\n  border-color: #dee2e6 #dee2e6 #fff;\n}\n\n.nav-tabs .dropdown-menu {\n  margin-top: -1px;\n  border-top-left-radius: 0;\n  border-top-right-radius: 0;\n}\n\n.nav-pills .nav-link {\n  border-radius: 0.25rem;\n}\n\n.nav-pills .nav-link.active,\n.nav-pills .show > .nav-link {\n  color: #fff;\n  background-color: #007bff;\n}\n\n.nav-fill .nav-item {\n  -ms-flex: 1 1 auto;\n  flex: 1 1 auto;\n  text-align: center;\n}\n\n.nav-justified .nav-item {\n  -ms-flex-preferred-size: 0;\n  flex-basis: 0;\n  -ms-flex-positive: 1;\n  flex-grow: 1;\n  text-align: center;\n}\n\n.tab-content > .tab-pane {\n  display: none;\n}\n\n.tab-content > .active {\n  display: block;\n}\n\n.navbar {\n  position: relative;\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-wrap: wrap;\n  flex-wrap: wrap;\n  -ms-flex-align: center;\n  align-items: center;\n  -ms-flex-pack: justify;\n  justify-content: space-between;\n  padding: 0.5rem 1rem;\n}\n\n.navbar .container,\n.navbar .container-fluid, .navbar .container-sm, .navbar .container-md, .navbar .container-lg, .navbar .container-xl {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-wrap: wrap;\n  flex-wrap: wrap;\n  -ms-flex-align: center;\n  align-items: center;\n  -ms-flex-pack: justify;\n  justify-content: space-between;\n}\n\n.navbar-brand {\n  display: inline-block;\n  padding-top: 0.3125rem;\n  padding-bottom: 0.3125rem;\n  margin-right: 1rem;\n  font-size: 1.25rem;\n  line-height: inherit;\n  white-space: nowrap;\n}\n\n.navbar-brand:hover, .navbar-brand:focus {\n  text-decoration: none;\n}\n\n.navbar-nav {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-direction: column;\n  flex-direction: column;\n  padding-left: 0;\n  margin-bottom: 0;\n  list-style: none;\n}\n\n.navbar-nav .nav-link {\n  padding-right: 0;\n  padding-left: 0;\n}\n\n.navbar-nav .dropdown-menu {\n  position: static;\n  float: none;\n}\n\n.navbar-text {\n  display: inline-block;\n  padding-top: 0.5rem;\n  padding-bottom: 0.5rem;\n}\n\n.navbar-collapse {\n  -ms-flex-preferred-size: 100%;\n  flex-basis: 100%;\n  -ms-flex-positive: 1;\n  flex-grow: 1;\n  -ms-flex-align: center;\n  align-items: center;\n}\n\n.navbar-toggler {\n  padding: 0.25rem 0.75rem;\n  font-size: 1.25rem;\n  line-height: 1;\n  background-color: transparent;\n  border: 1px solid transparent;\n  border-radius: 0.25rem;\n}\n\n.navbar-toggler:hover, .navbar-toggler:focus {\n  text-decoration: none;\n}\n\n.navbar-toggler-icon {\n  display: inline-block;\n  width: 1.5em;\n  height: 1.5em;\n  vertical-align: middle;\n  content: \"\";\n  background: no-repeat center center;\n  background-size: 100% 100%;\n}\n\n@media (max-width: 575.98px) {\n  .navbar-expand-sm > .container,\n  .navbar-expand-sm > .container-fluid, .navbar-expand-sm > .container-sm, .navbar-expand-sm > .container-md, .navbar-expand-sm > .container-lg, .navbar-expand-sm > .container-xl {\n    padding-right: 0;\n    padding-left: 0;\n  }\n}\n\n@media (min-width: 576px) {\n  .navbar-expand-sm {\n    -ms-flex-flow: row nowrap;\n    flex-flow: row nowrap;\n    -ms-flex-pack: start;\n    justify-content: flex-start;\n  }\n  .navbar-expand-sm .navbar-nav {\n    -ms-flex-direction: row;\n    flex-direction: row;\n  }\n  .navbar-expand-sm .navbar-nav .dropdown-menu {\n    position: absolute;\n  }\n  .navbar-expand-sm .navbar-nav .nav-link {\n    padding-right: 0.5rem;\n    padding-left: 0.5rem;\n  }\n  .navbar-expand-sm > .container,\n  .navbar-expand-sm > .container-fluid, .navbar-expand-sm > .container-sm, .navbar-expand-sm > .container-md, .navbar-expand-sm > .container-lg, .navbar-expand-sm > .container-xl {\n    -ms-flex-wrap: nowrap;\n    flex-wrap: nowrap;\n  }\n  .navbar-expand-sm .navbar-collapse {\n    display: -ms-flexbox !important;\n    display: flex !important;\n    -ms-flex-preferred-size: auto;\n    flex-basis: auto;\n  }\n  .navbar-expand-sm .navbar-toggler {\n    display: none;\n  }\n}\n\n@media (max-width: 767.98px) {\n  .navbar-expand-md > .container,\n  .navbar-expand-md > .container-fluid, .navbar-expand-md > .container-sm, .navbar-expand-md > .container-md, .navbar-expand-md > .container-lg, .navbar-expand-md > .container-xl {\n    padding-right: 0;\n    padding-left: 0;\n  }\n}\n\n@media (min-width: 768px) {\n  .navbar-expand-md {\n    -ms-flex-flow: row nowrap;\n    flex-flow: row nowrap;\n    -ms-flex-pack: start;\n    justify-content: flex-start;\n  }\n  .navbar-expand-md .navbar-nav {\n    -ms-flex-direction: row;\n    flex-direction: row;\n  }\n  .navbar-expand-md .navbar-nav .dropdown-menu {\n    position: absolute;\n  }\n  .navbar-expand-md .navbar-nav .nav-link {\n    padding-right: 0.5rem;\n    padding-left: 0.5rem;\n  }\n  .navbar-expand-md > .container,\n  .navbar-expand-md > .container-fluid, .navbar-expand-md > .container-sm, .navbar-expand-md > .container-md, .navbar-expand-md > .container-lg, .navbar-expand-md > .container-xl {\n    -ms-flex-wrap: nowrap;\n    flex-wrap: nowrap;\n  }\n  .navbar-expand-md .navbar-collapse {\n    display: -ms-flexbox !important;\n    display: flex !important;\n    -ms-flex-preferred-size: auto;\n    flex-basis: auto;\n  }\n  .navbar-expand-md .navbar-toggler {\n    display: none;\n  }\n}\n\n@media (max-width: 991.98px) {\n  .navbar-expand-lg > .container,\n  .navbar-expand-lg > .container-fluid, .navbar-expand-lg > .container-sm, .navbar-expand-lg > .container-md, .navbar-expand-lg > .container-lg, .navbar-expand-lg > .container-xl {\n    padding-right: 0;\n    padding-left: 0;\n  }\n}\n\n@media (min-width: 992px) {\n  .navbar-expand-lg {\n    -ms-flex-flow: row nowrap;\n    flex-flow: row nowrap;\n    -ms-flex-pack: start;\n    justify-content: flex-start;\n  }\n  .navbar-expand-lg .navbar-nav {\n    -ms-flex-direction: row;\n    flex-direction: row;\n  }\n  .navbar-expand-lg .navbar-nav .dropdown-menu {\n    position: absolute;\n  }\n  .navbar-expand-lg .navbar-nav .nav-link {\n    padding-right: 0.5rem;\n    padding-left: 0.5rem;\n  }\n  .navbar-expand-lg > .container,\n  .navbar-expand-lg > .container-fluid, .navbar-expand-lg > .container-sm, .navbar-expand-lg > .container-md, .navbar-expand-lg > .container-lg, .navbar-expand-lg > .container-xl {\n    -ms-flex-wrap: nowrap;\n    flex-wrap: nowrap;\n  }\n  .navbar-expand-lg .navbar-collapse {\n    display: -ms-flexbox !important;\n    display: flex !important;\n    -ms-flex-preferred-size: auto;\n    flex-basis: auto;\n  }\n  .navbar-expand-lg .navbar-toggler {\n    display: none;\n  }\n}\n\n@media (max-width: 1199.98px) {\n  .navbar-expand-xl > .container,\n  .navbar-expand-xl > .container-fluid, .navbar-expand-xl > .container-sm, .navbar-expand-xl > .container-md, .navbar-expand-xl > .container-lg, .navbar-expand-xl > .container-xl {\n    padding-right: 0;\n    padding-left: 0;\n  }\n}\n\n@media (min-width: 1200px) {\n  .navbar-expand-xl {\n    -ms-flex-flow: row nowrap;\n    flex-flow: row nowrap;\n    -ms-flex-pack: start;\n    justify-content: flex-start;\n  }\n  .navbar-expand-xl .navbar-nav {\n    -ms-flex-direction: row;\n    flex-direction: row;\n  }\n  .navbar-expand-xl .navbar-nav .dropdown-menu {\n    position: absolute;\n  }\n  .navbar-expand-xl .navbar-nav .nav-link {\n    padding-right: 0.5rem;\n    padding-left: 0.5rem;\n  }\n  .navbar-expand-xl > .container,\n  .navbar-expand-xl > .container-fluid, .navbar-expand-xl > .container-sm, .navbar-expand-xl > .container-md, .navbar-expand-xl > .container-lg, .navbar-expand-xl > .container-xl {\n    -ms-flex-wrap: nowrap;\n    flex-wrap: nowrap;\n  }\n  .navbar-expand-xl .navbar-collapse {\n    display: -ms-flexbox !important;\n    display: flex !important;\n    -ms-flex-preferred-size: auto;\n    flex-basis: auto;\n  }\n  .navbar-expand-xl .navbar-toggler {\n    display: none;\n  }\n}\n\n.navbar-expand {\n  -ms-flex-flow: row nowrap;\n  flex-flow: row nowrap;\n  -ms-flex-pack: start;\n  justify-content: flex-start;\n}\n\n.navbar-expand > .container,\n.navbar-expand > .container-fluid, .navbar-expand > .container-sm, .navbar-expand > .container-md, .navbar-expand > .container-lg, .navbar-expand > .container-xl {\n  padding-right: 0;\n  padding-left: 0;\n}\n\n.navbar-expand .navbar-nav {\n  -ms-flex-direction: row;\n  flex-direction: row;\n}\n\n.navbar-expand .navbar-nav .dropdown-menu {\n  position: absolute;\n}\n\n.navbar-expand .navbar-nav .nav-link {\n  padding-right: 0.5rem;\n  padding-left: 0.5rem;\n}\n\n.navbar-expand > .container,\n.navbar-expand > .container-fluid, .navbar-expand > .container-sm, .navbar-expand > .container-md, .navbar-expand > .container-lg, .navbar-expand > .container-xl {\n  -ms-flex-wrap: nowrap;\n  flex-wrap: nowrap;\n}\n\n.navbar-expand .navbar-collapse {\n  display: -ms-flexbox !important;\n  display: flex !important;\n  -ms-flex-preferred-size: auto;\n  flex-basis: auto;\n}\n\n.navbar-expand .navbar-toggler {\n  display: none;\n}\n\n.navbar-light .navbar-brand {\n  color: rgba(0, 0, 0, 0.9);\n}\n\n.navbar-light .navbar-brand:hover, .navbar-light .navbar-brand:focus {\n  color: rgba(0, 0, 0, 0.9);\n}\n\n.navbar-light .navbar-nav .nav-link {\n  color: rgba(0, 0, 0, 0.5);\n}\n\n.navbar-light .navbar-nav .nav-link:hover, .navbar-light .navbar-nav .nav-link:focus {\n  color: rgba(0, 0, 0, 0.7);\n}\n\n.navbar-light .navbar-nav .nav-link.disabled {\n  color: rgba(0, 0, 0, 0.3);\n}\n\n.navbar-light .navbar-nav .show > .nav-link,\n.navbar-light .navbar-nav .active > .nav-link,\n.navbar-light .navbar-nav .nav-link.show,\n.navbar-light .navbar-nav .nav-link.active {\n  color: rgba(0, 0, 0, 0.9);\n}\n\n.navbar-light .navbar-toggler {\n  color: rgba(0, 0, 0, 0.5);\n  border-color: rgba(0, 0, 0, 0.1);\n}\n\n.navbar-light .navbar-toggler-icon {\n  background-image: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(0, 0, 0, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e\");\n}\n\n.navbar-light .navbar-text {\n  color: rgba(0, 0, 0, 0.5);\n}\n\n.navbar-light .navbar-text a {\n  color: rgba(0, 0, 0, 0.9);\n}\n\n.navbar-light .navbar-text a:hover, .navbar-light .navbar-text a:focus {\n  color: rgba(0, 0, 0, 0.9);\n}\n\n.navbar-dark .navbar-brand {\n  color: #fff;\n}\n\n.navbar-dark .navbar-brand:hover, .navbar-dark .navbar-brand:focus {\n  color: #fff;\n}\n\n.navbar-dark .navbar-nav .nav-link {\n  color: rgba(255, 255, 255, 0.5);\n}\n\n.navbar-dark .navbar-nav .nav-link:hover, .navbar-dark .navbar-nav .nav-link:focus {\n  color: rgba(255, 255, 255, 0.75);\n}\n\n.navbar-dark .navbar-nav .nav-link.disabled {\n  color: rgba(255, 255, 255, 0.25);\n}\n\n.navbar-dark .navbar-nav .show > .nav-link,\n.navbar-dark .navbar-nav .active > .nav-link,\n.navbar-dark .navbar-nav .nav-link.show,\n.navbar-dark .navbar-nav .nav-link.active {\n  color: #fff;\n}\n\n.navbar-dark .navbar-toggler {\n  color: rgba(255, 255, 255, 0.5);\n  border-color: rgba(255, 255, 255, 0.1);\n}\n\n.navbar-dark .navbar-toggler-icon {\n  background-image: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(255, 255, 255, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e\");\n}\n\n.navbar-dark .navbar-text {\n  color: rgba(255, 255, 255, 0.5);\n}\n\n.navbar-dark .navbar-text a {\n  color: #fff;\n}\n\n.navbar-dark .navbar-text a:hover, .navbar-dark .navbar-text a:focus {\n  color: #fff;\n}\n\n.card {\n  position: relative;\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-direction: column;\n  flex-direction: column;\n  min-width: 0;\n  word-wrap: break-word;\n  background-color: #fff;\n  background-clip: border-box;\n  border: 1px solid rgba(0, 0, 0, 0.125);\n  border-radius: 0.25rem;\n}\n\n.card > hr {\n  margin-right: 0;\n  margin-left: 0;\n}\n\n.card > .list-group:first-child .list-group-item:first-child {\n  border-top-left-radius: 0.25rem;\n  border-top-right-radius: 0.25rem;\n}\n\n.card > .list-group:last-child .list-group-item:last-child {\n  border-bottom-right-radius: 0.25rem;\n  border-bottom-left-radius: 0.25rem;\n}\n\n.card-body {\n  -ms-flex: 1 1 auto;\n  flex: 1 1 auto;\n  min-height: 1px;\n  padding: 1.25rem;\n}\n\n.card-title {\n  margin-bottom: 0.75rem;\n}\n\n.card-subtitle {\n  margin-top: -0.375rem;\n  margin-bottom: 0;\n}\n\n.card-text:last-child {\n  margin-bottom: 0;\n}\n\n.card-link:hover {\n  text-decoration: none;\n}\n\n.card-link + .card-link {\n  margin-left: 1.25rem;\n}\n\n.card-header {\n  padding: 0.75rem 1.25rem;\n  margin-bottom: 0;\n  background-color: rgba(0, 0, 0, 0.03);\n  border-bottom: 1px solid rgba(0, 0, 0, 0.125);\n}\n\n.card-header:first-child {\n  border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0;\n}\n\n.card-header + .list-group .list-group-item:first-child {\n  border-top: 0;\n}\n\n.card-footer {\n  padding: 0.75rem 1.25rem;\n  background-color: rgba(0, 0, 0, 0.03);\n  border-top: 1px solid rgba(0, 0, 0, 0.125);\n}\n\n.card-footer:last-child {\n  border-radius: 0 0 calc(0.25rem - 1px) calc(0.25rem - 1px);\n}\n\n.card-header-tabs {\n  margin-right: -0.625rem;\n  margin-bottom: -0.75rem;\n  margin-left: -0.625rem;\n  border-bottom: 0;\n}\n\n.card-header-pills {\n  margin-right: -0.625rem;\n  margin-left: -0.625rem;\n}\n\n.card-img-overlay {\n  position: absolute;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  padding: 1.25rem;\n}\n\n.card-img,\n.card-img-top,\n.card-img-bottom {\n  -ms-flex-negative: 0;\n  flex-shrink: 0;\n  width: 100%;\n}\n\n.card-img,\n.card-img-top {\n  border-top-left-radius: calc(0.25rem - 1px);\n  border-top-right-radius: calc(0.25rem - 1px);\n}\n\n.card-img,\n.card-img-bottom {\n  border-bottom-right-radius: calc(0.25rem - 1px);\n  border-bottom-left-radius: calc(0.25rem - 1px);\n}\n\n.card-deck .card {\n  margin-bottom: 15px;\n}\n\n@media (min-width: 576px) {\n  .card-deck {\n    display: -ms-flexbox;\n    display: flex;\n    -ms-flex-flow: row wrap;\n    flex-flow: row wrap;\n    margin-right: -15px;\n    margin-left: -15px;\n  }\n  .card-deck .card {\n    -ms-flex: 1 0 0%;\n    flex: 1 0 0%;\n    margin-right: 15px;\n    margin-bottom: 0;\n    margin-left: 15px;\n  }\n}\n\n.card-group > .card {\n  margin-bottom: 15px;\n}\n\n@media (min-width: 576px) {\n  .card-group {\n    display: -ms-flexbox;\n    display: flex;\n    -ms-flex-flow: row wrap;\n    flex-flow: row wrap;\n  }\n  .card-group > .card {\n    -ms-flex: 1 0 0%;\n    flex: 1 0 0%;\n    margin-bottom: 0;\n  }\n  .card-group > .card + .card {\n    margin-left: 0;\n    border-left: 0;\n  }\n  .card-group > .card:not(:last-child) {\n    border-top-right-radius: 0;\n    border-bottom-right-radius: 0;\n  }\n  .card-group > .card:not(:last-child) .card-img-top,\n  .card-group > .card:not(:last-child) .card-header {\n    border-top-right-radius: 0;\n  }\n  .card-group > .card:not(:last-child) .card-img-bottom,\n  .card-group > .card:not(:last-child) .card-footer {\n    border-bottom-right-radius: 0;\n  }\n  .card-group > .card:not(:first-child) {\n    border-top-left-radius: 0;\n    border-bottom-left-radius: 0;\n  }\n  .card-group > .card:not(:first-child) .card-img-top,\n  .card-group > .card:not(:first-child) .card-header {\n    border-top-left-radius: 0;\n  }\n  .card-group > .card:not(:first-child) .card-img-bottom,\n  .card-group > .card:not(:first-child) .card-footer {\n    border-bottom-left-radius: 0;\n  }\n}\n\n.card-columns .card {\n  margin-bottom: 0.75rem;\n}\n\n@media (min-width: 576px) {\n  .card-columns {\n    -webkit-column-count: 3;\n    -moz-column-count: 3;\n    column-count: 3;\n    -webkit-column-gap: 1.25rem;\n    -moz-column-gap: 1.25rem;\n    column-gap: 1.25rem;\n    orphans: 1;\n    widows: 1;\n  }\n  .card-columns .card {\n    display: inline-block;\n    width: 100%;\n  }\n}\n\n.accordion > .card {\n  overflow: hidden;\n}\n\n.accordion > .card:not(:last-of-type) {\n  border-bottom: 0;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 0;\n}\n\n.accordion > .card:not(:first-of-type) {\n  border-top-left-radius: 0;\n  border-top-right-radius: 0;\n}\n\n.accordion > .card > .card-header {\n  border-radius: 0;\n  margin-bottom: -1px;\n}\n\n.breadcrumb {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-wrap: wrap;\n  flex-wrap: wrap;\n  padding: 0.75rem 1rem;\n  margin-bottom: 1rem;\n  list-style: none;\n  background-color: #e9ecef;\n  border-radius: 0.25rem;\n}\n\n.breadcrumb-item + .breadcrumb-item {\n  padding-left: 0.5rem;\n}\n\n.breadcrumb-item + .breadcrumb-item::before {\n  display: inline-block;\n  padding-right: 0.5rem;\n  color: #6c757d;\n  content: \"/\";\n}\n\n.breadcrumb-item + .breadcrumb-item:hover::before {\n  text-decoration: underline;\n}\n\n.breadcrumb-item + .breadcrumb-item:hover::before {\n  text-decoration: none;\n}\n\n.breadcrumb-item.active {\n  color: #6c757d;\n}\n\n.pagination {\n  display: -ms-flexbox;\n  display: flex;\n  padding-left: 0;\n  list-style: none;\n  border-radius: 0.25rem;\n}\n\n.page-link {\n  position: relative;\n  display: block;\n  padding: 0.5rem 0.75rem;\n  margin-left: -1px;\n  line-height: 1.25;\n  color: #007bff;\n  background-color: #fff;\n  border: 1px solid #dee2e6;\n}\n\n.page-link:hover {\n  z-index: 2;\n  color: #0056b3;\n  text-decoration: none;\n  background-color: #e9ecef;\n  border-color: #dee2e6;\n}\n\n.page-link:focus {\n  z-index: 3;\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);\n}\n\n.page-item:first-child .page-link {\n  margin-left: 0;\n  border-top-left-radius: 0.25rem;\n  border-bottom-left-radius: 0.25rem;\n}\n\n.page-item:last-child .page-link {\n  border-top-right-radius: 0.25rem;\n  border-bottom-right-radius: 0.25rem;\n}\n\n.page-item.active .page-link {\n  z-index: 3;\n  color: #fff;\n  background-color: #007bff;\n  border-color: #007bff;\n}\n\n.page-item.disabled .page-link {\n  color: #6c757d;\n  pointer-events: none;\n  cursor: auto;\n  background-color: #fff;\n  border-color: #dee2e6;\n}\n\n.pagination-lg .page-link {\n  padding: 0.75rem 1.5rem;\n  font-size: 1.25rem;\n  line-height: 1.5;\n}\n\n.pagination-lg .page-item:first-child .page-link {\n  border-top-left-radius: 0.3rem;\n  border-bottom-left-radius: 0.3rem;\n}\n\n.pagination-lg .page-item:last-child .page-link {\n  border-top-right-radius: 0.3rem;\n  border-bottom-right-radius: 0.3rem;\n}\n\n.pagination-sm .page-link {\n  padding: 0.25rem 0.5rem;\n  font-size: 0.875rem;\n  line-height: 1.5;\n}\n\n.pagination-sm .page-item:first-child .page-link {\n  border-top-left-radius: 0.2rem;\n  border-bottom-left-radius: 0.2rem;\n}\n\n.pagination-sm .page-item:last-child .page-link {\n  border-top-right-radius: 0.2rem;\n  border-bottom-right-radius: 0.2rem;\n}\n\n.badge {\n  display: inline-block;\n  padding: 0.25em 0.4em;\n  font-size: 75%;\n  font-weight: 700;\n  line-height: 1;\n  text-align: center;\n  white-space: nowrap;\n  vertical-align: baseline;\n  border-radius: 0.25rem;\n  transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .badge {\n    transition: none;\n  }\n}\n\na.badge:hover, a.badge:focus {\n  text-decoration: none;\n}\n\n.badge:empty {\n  display: none;\n}\n\n.btn .badge {\n  position: relative;\n  top: -1px;\n}\n\n.badge-pill {\n  padding-right: 0.6em;\n  padding-left: 0.6em;\n  border-radius: 10rem;\n}\n\n.badge-primary {\n  color: #fff;\n  background-color: #007bff;\n}\n\na.badge-primary:hover, a.badge-primary:focus {\n  color: #fff;\n  background-color: #0062cc;\n}\n\na.badge-primary:focus, a.badge-primary.focus {\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);\n}\n\n.badge-secondary {\n  color: #fff;\n  background-color: #6c757d;\n}\n\na.badge-secondary:hover, a.badge-secondary:focus {\n  color: #fff;\n  background-color: #545b62;\n}\n\na.badge-secondary:focus, a.badge-secondary.focus {\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5);\n}\n\n.badge-success {\n  color: #fff;\n  background-color: #28a745;\n}\n\na.badge-success:hover, a.badge-success:focus {\n  color: #fff;\n  background-color: #1e7e34;\n}\n\na.badge-success:focus, a.badge-success.focus {\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);\n}\n\n.badge-info {\n  color: #fff;\n  background-color: #17a2b8;\n}\n\na.badge-info:hover, a.badge-info:focus {\n  color: #fff;\n  background-color: #117a8b;\n}\n\na.badge-info:focus, a.badge-info.focus {\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);\n}\n\n.badge-warning {\n  color: #212529;\n  background-color: #ffc107;\n}\n\na.badge-warning:hover, a.badge-warning:focus {\n  color: #212529;\n  background-color: #d39e00;\n}\n\na.badge-warning:focus, a.badge-warning.focus {\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);\n}\n\n.badge-danger {\n  color: #fff;\n  background-color: #dc3545;\n}\n\na.badge-danger:hover, a.badge-danger:focus {\n  color: #fff;\n  background-color: #bd2130;\n}\n\na.badge-danger:focus, a.badge-danger.focus {\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);\n}\n\n.badge-light {\n  color: #212529;\n  background-color: #f8f9fa;\n}\n\na.badge-light:hover, a.badge-light:focus {\n  color: #212529;\n  background-color: #dae0e5;\n}\n\na.badge-light:focus, a.badge-light.focus {\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);\n}\n\n.badge-dark {\n  color: #fff;\n  background-color: #343a40;\n}\n\na.badge-dark:hover, a.badge-dark:focus {\n  color: #fff;\n  background-color: #1d2124;\n}\n\na.badge-dark:focus, a.badge-dark.focus {\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);\n}\n\n.jumbotron {\n  padding: 2rem 1rem;\n  margin-bottom: 2rem;\n  background-color: #e9ecef;\n  border-radius: 0.3rem;\n}\n\n@media (min-width: 576px) {\n  .jumbotron {\n    padding: 4rem 2rem;\n  }\n}\n\n.jumbotron-fluid {\n  padding-right: 0;\n  padding-left: 0;\n  border-radius: 0;\n}\n\n.alert {\n  position: relative;\n  padding: 0.75rem 1.25rem;\n  margin-bottom: 1rem;\n  border: 1px solid transparent;\n  border-radius: 0.25rem;\n}\n\n.alert-heading {\n  color: inherit;\n}\n\n.alert-link {\n  font-weight: 700;\n}\n\n.alert-dismissible {\n  padding-right: 4rem;\n}\n\n.alert-dismissible .close {\n  position: absolute;\n  top: 0;\n  right: 0;\n  padding: 0.75rem 1.25rem;\n  color: inherit;\n}\n\n.alert-primary {\n  color: #004085;\n  background-color: #cce5ff;\n  border-color: #b8daff;\n}\n\n.alert-primary hr {\n  border-top-color: #9fcdff;\n}\n\n.alert-primary .alert-link {\n  color: #002752;\n}\n\n.alert-secondary {\n  color: #383d41;\n  background-color: #e2e3e5;\n  border-color: #d6d8db;\n}\n\n.alert-secondary hr {\n  border-top-color: #c8cbcf;\n}\n\n.alert-secondary .alert-link {\n  color: #202326;\n}\n\n.alert-success {\n  color: #155724;\n  background-color: #d4edda;\n  border-color: #c3e6cb;\n}\n\n.alert-success hr {\n  border-top-color: #b1dfbb;\n}\n\n.alert-success .alert-link {\n  color: #0b2e13;\n}\n\n.alert-info {\n  color: #0c5460;\n  background-color: #d1ecf1;\n  border-color: #bee5eb;\n}\n\n.alert-info hr {\n  border-top-color: #abdde5;\n}\n\n.alert-info .alert-link {\n  color: #062c33;\n}\n\n.alert-warning {\n  color: #856404;\n  background-color: #fff3cd;\n  border-color: #ffeeba;\n}\n\n.alert-warning hr {\n  border-top-color: #ffe8a1;\n}\n\n.alert-warning .alert-link {\n  color: #533f03;\n}\n\n.alert-danger {\n  color: #721c24;\n  background-color: #f8d7da;\n  border-color: #f5c6cb;\n}\n\n.alert-danger hr {\n  border-top-color: #f1b0b7;\n}\n\n.alert-danger .alert-link {\n  color: #491217;\n}\n\n.alert-light {\n  color: #818182;\n  background-color: #fefefe;\n  border-color: #fdfdfe;\n}\n\n.alert-light hr {\n  border-top-color: #ececf6;\n}\n\n.alert-light .alert-link {\n  color: #686868;\n}\n\n.alert-dark {\n  color: #1b1e21;\n  background-color: #d6d8d9;\n  border-color: #c6c8ca;\n}\n\n.alert-dark hr {\n  border-top-color: #b9bbbe;\n}\n\n.alert-dark .alert-link {\n  color: #040505;\n}\n\n@-webkit-keyframes progress-bar-stripes {\n  from {\n    background-position: 1rem 0;\n  }\n  to {\n    background-position: 0 0;\n  }\n}\n\n@keyframes progress-bar-stripes {\n  from {\n    background-position: 1rem 0;\n  }\n  to {\n    background-position: 0 0;\n  }\n}\n\n.progress {\n  display: -ms-flexbox;\n  display: flex;\n  height: 1rem;\n  overflow: hidden;\n  font-size: 0.75rem;\n  background-color: #e9ecef;\n  border-radius: 0.25rem;\n}\n\n.progress-bar {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-direction: column;\n  flex-direction: column;\n  -ms-flex-pack: center;\n  justify-content: center;\n  overflow: hidden;\n  color: #fff;\n  text-align: center;\n  white-space: nowrap;\n  background-color: #007bff;\n  transition: width 0.6s ease;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .progress-bar {\n    transition: none;\n  }\n}\n\n.progress-bar-striped {\n  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);\n  background-size: 1rem 1rem;\n}\n\n.progress-bar-animated {\n  -webkit-animation: progress-bar-stripes 1s linear infinite;\n  animation: progress-bar-stripes 1s linear infinite;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .progress-bar-animated {\n    -webkit-animation: none;\n    animation: none;\n  }\n}\n\n.media {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-align: start;\n  align-items: flex-start;\n}\n\n.media-body {\n  -ms-flex: 1;\n  flex: 1;\n}\n\n.list-group {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-direction: column;\n  flex-direction: column;\n  padding-left: 0;\n  margin-bottom: 0;\n}\n\n.list-group-item-action {\n  width: 100%;\n  color: #495057;\n  text-align: inherit;\n}\n\n.list-group-item-action:hover, .list-group-item-action:focus {\n  z-index: 1;\n  color: #495057;\n  text-decoration: none;\n  background-color: #f8f9fa;\n}\n\n.list-group-item-action:active {\n  color: #212529;\n  background-color: #e9ecef;\n}\n\n.list-group-item {\n  position: relative;\n  display: block;\n  padding: 0.75rem 1.25rem;\n  background-color: #fff;\n  border: 1px solid rgba(0, 0, 0, 0.125);\n}\n\n.list-group-item:first-child {\n  border-top-left-radius: 0.25rem;\n  border-top-right-radius: 0.25rem;\n}\n\n.list-group-item:last-child {\n  border-bottom-right-radius: 0.25rem;\n  border-bottom-left-radius: 0.25rem;\n}\n\n.list-group-item.disabled, .list-group-item:disabled {\n  color: #6c757d;\n  pointer-events: none;\n  background-color: #fff;\n}\n\n.list-group-item.active {\n  z-index: 2;\n  color: #fff;\n  background-color: #007bff;\n  border-color: #007bff;\n}\n\n.list-group-item + .list-group-item {\n  border-top-width: 0;\n}\n\n.list-group-item + .list-group-item.active {\n  margin-top: -1px;\n  border-top-width: 1px;\n}\n\n.list-group-horizontal {\n  -ms-flex-direction: row;\n  flex-direction: row;\n}\n\n.list-group-horizontal .list-group-item:first-child {\n  border-bottom-left-radius: 0.25rem;\n  border-top-right-radius: 0;\n}\n\n.list-group-horizontal .list-group-item:last-child {\n  border-top-right-radius: 0.25rem;\n  border-bottom-left-radius: 0;\n}\n\n.list-group-horizontal .list-group-item.active {\n  margin-top: 0;\n}\n\n.list-group-horizontal .list-group-item + .list-group-item {\n  border-top-width: 1px;\n  border-left-width: 0;\n}\n\n.list-group-horizontal .list-group-item + .list-group-item.active {\n  margin-left: -1px;\n  border-left-width: 1px;\n}\n\n@media (min-width: 576px) {\n  .list-group-horizontal-sm {\n    -ms-flex-direction: row;\n    flex-direction: row;\n  }\n  .list-group-horizontal-sm .list-group-item:first-child {\n    border-bottom-left-radius: 0.25rem;\n    border-top-right-radius: 0;\n  }\n  .list-group-horizontal-sm .list-group-item:last-child {\n    border-top-right-radius: 0.25rem;\n    border-bottom-left-radius: 0;\n  }\n  .list-group-horizontal-sm .list-group-item.active {\n    margin-top: 0;\n  }\n  .list-group-horizontal-sm .list-group-item + .list-group-item {\n    border-top-width: 1px;\n    border-left-width: 0;\n  }\n  .list-group-horizontal-sm .list-group-item + .list-group-item.active {\n    margin-left: -1px;\n    border-left-width: 1px;\n  }\n}\n\n@media (min-width: 768px) {\n  .list-group-horizontal-md {\n    -ms-flex-direction: row;\n    flex-direction: row;\n  }\n  .list-group-horizontal-md .list-group-item:first-child {\n    border-bottom-left-radius: 0.25rem;\n    border-top-right-radius: 0;\n  }\n  .list-group-horizontal-md .list-group-item:last-child {\n    border-top-right-radius: 0.25rem;\n    border-bottom-left-radius: 0;\n  }\n  .list-group-horizontal-md .list-group-item.active {\n    margin-top: 0;\n  }\n  .list-group-horizontal-md .list-group-item + .list-group-item {\n    border-top-width: 1px;\n    border-left-width: 0;\n  }\n  .list-group-horizontal-md .list-group-item + .list-group-item.active {\n    margin-left: -1px;\n    border-left-width: 1px;\n  }\n}\n\n@media (min-width: 992px) {\n  .list-group-horizontal-lg {\n    -ms-flex-direction: row;\n    flex-direction: row;\n  }\n  .list-group-horizontal-lg .list-group-item:first-child {\n    border-bottom-left-radius: 0.25rem;\n    border-top-right-radius: 0;\n  }\n  .list-group-horizontal-lg .list-group-item:last-child {\n    border-top-right-radius: 0.25rem;\n    border-bottom-left-radius: 0;\n  }\n  .list-group-horizontal-lg .list-group-item.active {\n    margin-top: 0;\n  }\n  .list-group-horizontal-lg .list-group-item + .list-group-item {\n    border-top-width: 1px;\n    border-left-width: 0;\n  }\n  .list-group-horizontal-lg .list-group-item + .list-group-item.active {\n    margin-left: -1px;\n    border-left-width: 1px;\n  }\n}\n\n@media (min-width: 1200px) {\n  .list-group-horizontal-xl {\n    -ms-flex-direction: row;\n    flex-direction: row;\n  }\n  .list-group-horizontal-xl .list-group-item:first-child {\n    border-bottom-left-radius: 0.25rem;\n    border-top-right-radius: 0;\n  }\n  .list-group-horizontal-xl .list-group-item:last-child {\n    border-top-right-radius: 0.25rem;\n    border-bottom-left-radius: 0;\n  }\n  .list-group-horizontal-xl .list-group-item.active {\n    margin-top: 0;\n  }\n  .list-group-horizontal-xl .list-group-item + .list-group-item {\n    border-top-width: 1px;\n    border-left-width: 0;\n  }\n  .list-group-horizontal-xl .list-group-item + .list-group-item.active {\n    margin-left: -1px;\n    border-left-width: 1px;\n  }\n}\n\n.list-group-flush .list-group-item {\n  border-right-width: 0;\n  border-left-width: 0;\n  border-radius: 0;\n}\n\n.list-group-flush .list-group-item:first-child {\n  border-top-width: 0;\n}\n\n.list-group-flush:last-child .list-group-item:last-child {\n  border-bottom-width: 0;\n}\n\n.list-group-item-primary {\n  color: #004085;\n  background-color: #b8daff;\n}\n\n.list-group-item-primary.list-group-item-action:hover, .list-group-item-primary.list-group-item-action:focus {\n  color: #004085;\n  background-color: #9fcdff;\n}\n\n.list-group-item-primary.list-group-item-action.active {\n  color: #fff;\n  background-color: #004085;\n  border-color: #004085;\n}\n\n.list-group-item-secondary {\n  color: #383d41;\n  background-color: #d6d8db;\n}\n\n.list-group-item-secondary.list-group-item-action:hover, .list-group-item-secondary.list-group-item-action:focus {\n  color: #383d41;\n  background-color: #c8cbcf;\n}\n\n.list-group-item-secondary.list-group-item-action.active {\n  color: #fff;\n  background-color: #383d41;\n  border-color: #383d41;\n}\n\n.list-group-item-success {\n  color: #155724;\n  background-color: #c3e6cb;\n}\n\n.list-group-item-success.list-group-item-action:hover, .list-group-item-success.list-group-item-action:focus {\n  color: #155724;\n  background-color: #b1dfbb;\n}\n\n.list-group-item-success.list-group-item-action.active {\n  color: #fff;\n  background-color: #155724;\n  border-color: #155724;\n}\n\n.list-group-item-info {\n  color: #0c5460;\n  background-color: #bee5eb;\n}\n\n.list-group-item-info.list-group-item-action:hover, .list-group-item-info.list-group-item-action:focus {\n  color: #0c5460;\n  background-color: #abdde5;\n}\n\n.list-group-item-info.list-group-item-action.active {\n  color: #fff;\n  background-color: #0c5460;\n  border-color: #0c5460;\n}\n\n.list-group-item-warning {\n  color: #856404;\n  background-color: #ffeeba;\n}\n\n.list-group-item-warning.list-group-item-action:hover, .list-group-item-warning.list-group-item-action:focus {\n  color: #856404;\n  background-color: #ffe8a1;\n}\n\n.list-group-item-warning.list-group-item-action.active {\n  color: #fff;\n  background-color: #856404;\n  border-color: #856404;\n}\n\n.list-group-item-danger {\n  color: #721c24;\n  background-color: #f5c6cb;\n}\n\n.list-group-item-danger.list-group-item-action:hover, .list-group-item-danger.list-group-item-action:focus {\n  color: #721c24;\n  background-color: #f1b0b7;\n}\n\n.list-group-item-danger.list-group-item-action.active {\n  color: #fff;\n  background-color: #721c24;\n  border-color: #721c24;\n}\n\n.list-group-item-light {\n  color: #818182;\n  background-color: #fdfdfe;\n}\n\n.list-group-item-light.list-group-item-action:hover, .list-group-item-light.list-group-item-action:focus {\n  color: #818182;\n  background-color: #ececf6;\n}\n\n.list-group-item-light.list-group-item-action.active {\n  color: #fff;\n  background-color: #818182;\n  border-color: #818182;\n}\n\n.list-group-item-dark {\n  color: #1b1e21;\n  background-color: #c6c8ca;\n}\n\n.list-group-item-dark.list-group-item-action:hover, .list-group-item-dark.list-group-item-action:focus {\n  color: #1b1e21;\n  background-color: #b9bbbe;\n}\n\n.list-group-item-dark.list-group-item-action.active {\n  color: #fff;\n  background-color: #1b1e21;\n  border-color: #1b1e21;\n}\n\n.close {\n  float: right;\n  font-size: 1.5rem;\n  font-weight: 700;\n  line-height: 1;\n  color: #000;\n  text-shadow: 0 1px 0 #fff;\n  opacity: .5;\n}\n\n.close:hover {\n  color: #000;\n  text-decoration: none;\n}\n\n.close:not(:disabled):not(.disabled):hover, .close:not(:disabled):not(.disabled):focus {\n  opacity: .75;\n}\n\nbutton.close {\n  padding: 0;\n  background-color: transparent;\n  border: 0;\n  -webkit-appearance: none;\n  -moz-appearance: none;\n  appearance: none;\n}\n\na.close.disabled {\n  pointer-events: none;\n}\n\n.toast {\n  max-width: 350px;\n  overflow: hidden;\n  font-size: 0.875rem;\n  background-color: rgba(255, 255, 255, 0.85);\n  background-clip: padding-box;\n  border: 1px solid rgba(0, 0, 0, 0.1);\n  box-shadow: 0 0.25rem 0.75rem rgba(0, 0, 0, 0.1);\n  -webkit-backdrop-filter: blur(10px);\n  backdrop-filter: blur(10px);\n  opacity: 0;\n  border-radius: 0.25rem;\n}\n\n.toast:not(:last-child) {\n  margin-bottom: 0.75rem;\n}\n\n.toast.showing {\n  opacity: 1;\n}\n\n.toast.show {\n  display: block;\n  opacity: 1;\n}\n\n.toast.hide {\n  display: none;\n}\n\n.toast-header {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-align: center;\n  align-items: center;\n  padding: 0.25rem 0.75rem;\n  color: #6c757d;\n  background-color: rgba(255, 255, 255, 0.85);\n  background-clip: padding-box;\n  border-bottom: 1px solid rgba(0, 0, 0, 0.05);\n}\n\n.toast-body {\n  padding: 0.75rem;\n}\n\n.modal-open {\n  overflow: hidden;\n}\n\n.modal-open .modal {\n  overflow-x: hidden;\n  overflow-y: auto;\n}\n\n.modal {\n  position: fixed;\n  top: 0;\n  left: 0;\n  z-index: 1050;\n  display: none;\n  width: 100%;\n  height: 100%;\n  overflow: hidden;\n  outline: 0;\n}\n\n.modal-dialog {\n  position: relative;\n  width: auto;\n  margin: 0.5rem;\n  pointer-events: none;\n}\n\n.modal.fade .modal-dialog {\n  transition: -webkit-transform 0.3s ease-out;\n  transition: transform 0.3s ease-out;\n  transition: transform 0.3s ease-out, -webkit-transform 0.3s ease-out;\n  -webkit-transform: translate(0, -50px);\n  transform: translate(0, -50px);\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .modal.fade .modal-dialog {\n    transition: none;\n  }\n}\n\n.modal.show .modal-dialog {\n  -webkit-transform: none;\n  transform: none;\n}\n\n.modal.modal-static .modal-dialog {\n  -webkit-transform: scale(1.02);\n  transform: scale(1.02);\n}\n\n.modal-dialog-scrollable {\n  display: -ms-flexbox;\n  display: flex;\n  max-height: calc(100% - 1rem);\n}\n\n.modal-dialog-scrollable .modal-content {\n  max-height: calc(100vh - 1rem);\n  overflow: hidden;\n}\n\n.modal-dialog-scrollable .modal-header,\n.modal-dialog-scrollable .modal-footer {\n  -ms-flex-negative: 0;\n  flex-shrink: 0;\n}\n\n.modal-dialog-scrollable .modal-body {\n  overflow-y: auto;\n}\n\n.modal-dialog-centered {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-align: center;\n  align-items: center;\n  min-height: calc(100% - 1rem);\n}\n\n.modal-dialog-centered::before {\n  display: block;\n  height: calc(100vh - 1rem);\n  content: \"\";\n}\n\n.modal-dialog-centered.modal-dialog-scrollable {\n  -ms-flex-direction: column;\n  flex-direction: column;\n  -ms-flex-pack: center;\n  justify-content: center;\n  height: 100%;\n}\n\n.modal-dialog-centered.modal-dialog-scrollable .modal-content {\n  max-height: none;\n}\n\n.modal-dialog-centered.modal-dialog-scrollable::before {\n  content: none;\n}\n\n.modal-content {\n  position: relative;\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-direction: column;\n  flex-direction: column;\n  width: 100%;\n  pointer-events: auto;\n  background-color: #fff;\n  background-clip: padding-box;\n  border: 1px solid rgba(0, 0, 0, 0.2);\n  border-radius: 0.3rem;\n  outline: 0;\n}\n\n.modal-backdrop {\n  position: fixed;\n  top: 0;\n  left: 0;\n  z-index: 1040;\n  width: 100vw;\n  height: 100vh;\n  background-color: #000;\n}\n\n.modal-backdrop.fade {\n  opacity: 0;\n}\n\n.modal-backdrop.show {\n  opacity: 0.5;\n}\n\n.modal-header {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-align: start;\n  align-items: flex-start;\n  -ms-flex-pack: justify;\n  justify-content: space-between;\n  padding: 1rem 1rem;\n  border-bottom: 1px solid #dee2e6;\n  border-top-left-radius: calc(0.3rem - 1px);\n  border-top-right-radius: calc(0.3rem - 1px);\n}\n\n.modal-header .close {\n  padding: 1rem 1rem;\n  margin: -1rem -1rem -1rem auto;\n}\n\n.modal-title {\n  margin-bottom: 0;\n  line-height: 1.5;\n}\n\n.modal-body {\n  position: relative;\n  -ms-flex: 1 1 auto;\n  flex: 1 1 auto;\n  padding: 1rem;\n}\n\n.modal-footer {\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-wrap: wrap;\n  flex-wrap: wrap;\n  -ms-flex-align: center;\n  align-items: center;\n  -ms-flex-pack: end;\n  justify-content: flex-end;\n  padding: 0.75rem;\n  border-top: 1px solid #dee2e6;\n  border-bottom-right-radius: calc(0.3rem - 1px);\n  border-bottom-left-radius: calc(0.3rem - 1px);\n}\n\n.modal-footer > * {\n  margin: 0.25rem;\n}\n\n.modal-scrollbar-measure {\n  position: absolute;\n  top: -9999px;\n  width: 50px;\n  height: 50px;\n  overflow: scroll;\n}\n\n@media (min-width: 576px) {\n  .modal-dialog {\n    max-width: 500px;\n    margin: 1.75rem auto;\n  }\n  .modal-dialog-scrollable {\n    max-height: calc(100% - 3.5rem);\n  }\n  .modal-dialog-scrollable .modal-content {\n    max-height: calc(100vh - 3.5rem);\n  }\n  .modal-dialog-centered {\n    min-height: calc(100% - 3.5rem);\n  }\n  .modal-dialog-centered::before {\n    height: calc(100vh - 3.5rem);\n  }\n  .modal-sm {\n    max-width: 300px;\n  }\n}\n\n@media (min-width: 992px) {\n  .modal-lg,\n  .modal-xl {\n    max-width: 800px;\n  }\n}\n\n@media (min-width: 1200px) {\n  .modal-xl {\n    max-width: 1140px;\n  }\n}\n\n.tooltip {\n  position: absolute;\n  z-index: 1070;\n  display: block;\n  margin: 0;\n  font-family: -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, \"Helvetica Neue\", Arial, \"Noto Sans\", sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\", \"Noto Color Emoji\";\n  font-style: normal;\n  font-weight: 400;\n  line-height: 1.5;\n  text-align: left;\n  text-align: start;\n  text-decoration: none;\n  text-shadow: none;\n  text-transform: none;\n  letter-spacing: normal;\n  word-break: normal;\n  word-spacing: normal;\n  white-space: normal;\n  line-break: auto;\n  font-size: 0.875rem;\n  word-wrap: break-word;\n  opacity: 0;\n}\n\n.tooltip.show {\n  opacity: 0.9;\n}\n\n.tooltip .arrow {\n  position: absolute;\n  display: block;\n  width: 0.8rem;\n  height: 0.4rem;\n}\n\n.tooltip .arrow::before {\n  position: absolute;\n  content: \"\";\n  border-color: transparent;\n  border-style: solid;\n}\n\n.bs-tooltip-top, .bs-tooltip-auto[x-placement^=\"top\"] {\n  padding: 0.4rem 0;\n}\n\n.bs-tooltip-top .arrow, .bs-tooltip-auto[x-placement^=\"top\"] .arrow {\n  bottom: 0;\n}\n\n.bs-tooltip-top .arrow::before, .bs-tooltip-auto[x-placement^=\"top\"] .arrow::before {\n  top: 0;\n  border-width: 0.4rem 0.4rem 0;\n  border-top-color: #000;\n}\n\n.bs-tooltip-right, .bs-tooltip-auto[x-placement^=\"right\"] {\n  padding: 0 0.4rem;\n}\n\n.bs-tooltip-right .arrow, .bs-tooltip-auto[x-placement^=\"right\"] .arrow {\n  left: 0;\n  width: 0.4rem;\n  height: 0.8rem;\n}\n\n.bs-tooltip-right .arrow::before, .bs-tooltip-auto[x-placement^=\"right\"] .arrow::before {\n  right: 0;\n  border-width: 0.4rem 0.4rem 0.4rem 0;\n  border-right-color: #000;\n}\n\n.bs-tooltip-bottom, .bs-tooltip-auto[x-placement^=\"bottom\"] {\n  padding: 0.4rem 0;\n}\n\n.bs-tooltip-bottom .arrow, .bs-tooltip-auto[x-placement^=\"bottom\"] .arrow {\n  top: 0;\n}\n\n.bs-tooltip-bottom .arrow::before, .bs-tooltip-auto[x-placement^=\"bottom\"] .arrow::before {\n  bottom: 0;\n  border-width: 0 0.4rem 0.4rem;\n  border-bottom-color: #000;\n}\n\n.bs-tooltip-left, .bs-tooltip-auto[x-placement^=\"left\"] {\n  padding: 0 0.4rem;\n}\n\n.bs-tooltip-left .arrow, .bs-tooltip-auto[x-placement^=\"left\"] .arrow {\n  right: 0;\n  width: 0.4rem;\n  height: 0.8rem;\n}\n\n.bs-tooltip-left .arrow::before, .bs-tooltip-auto[x-placement^=\"left\"] .arrow::before {\n  left: 0;\n  border-width: 0.4rem 0 0.4rem 0.4rem;\n  border-left-color: #000;\n}\n\n.tooltip-inner {\n  max-width: 200px;\n  padding: 0.25rem 0.5rem;\n  color: #fff;\n  text-align: center;\n  background-color: #000;\n  border-radius: 0.25rem;\n}\n\n.popover {\n  position: absolute;\n  top: 0;\n  left: 0;\n  z-index: 1060;\n  display: block;\n  max-width: 276px;\n  font-family: -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, \"Helvetica Neue\", Arial, \"Noto Sans\", sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\", \"Noto Color Emoji\";\n  font-style: normal;\n  font-weight: 400;\n  line-height: 1.5;\n  text-align: left;\n  text-align: start;\n  text-decoration: none;\n  text-shadow: none;\n  text-transform: none;\n  letter-spacing: normal;\n  word-break: normal;\n  word-spacing: normal;\n  white-space: normal;\n  line-break: auto;\n  font-size: 0.875rem;\n  word-wrap: break-word;\n  background-color: #fff;\n  background-clip: padding-box;\n  border: 1px solid rgba(0, 0, 0, 0.2);\n  border-radius: 0.3rem;\n}\n\n.popover .arrow {\n  position: absolute;\n  display: block;\n  width: 1rem;\n  height: 0.5rem;\n  margin: 0 0.3rem;\n}\n\n.popover .arrow::before, .popover .arrow::after {\n  position: absolute;\n  display: block;\n  content: \"\";\n  border-color: transparent;\n  border-style: solid;\n}\n\n.bs-popover-top, .bs-popover-auto[x-placement^=\"top\"] {\n  margin-bottom: 0.5rem;\n}\n\n.bs-popover-top > .arrow, .bs-popover-auto[x-placement^=\"top\"] > .arrow {\n  bottom: calc(-0.5rem - 1px);\n}\n\n.bs-popover-top > .arrow::before, .bs-popover-auto[x-placement^=\"top\"] > .arrow::before {\n  bottom: 0;\n  border-width: 0.5rem 0.5rem 0;\n  border-top-color: rgba(0, 0, 0, 0.25);\n}\n\n.bs-popover-top > .arrow::after, .bs-popover-auto[x-placement^=\"top\"] > .arrow::after {\n  bottom: 1px;\n  border-width: 0.5rem 0.5rem 0;\n  border-top-color: #fff;\n}\n\n.bs-popover-right, .bs-popover-auto[x-placement^=\"right\"] {\n  margin-left: 0.5rem;\n}\n\n.bs-popover-right > .arrow, .bs-popover-auto[x-placement^=\"right\"] > .arrow {\n  left: calc(-0.5rem - 1px);\n  width: 0.5rem;\n  height: 1rem;\n  margin: 0.3rem 0;\n}\n\n.bs-popover-right > .arrow::before, .bs-popover-auto[x-placement^=\"right\"] > .arrow::before {\n  left: 0;\n  border-width: 0.5rem 0.5rem 0.5rem 0;\n  border-right-color: rgba(0, 0, 0, 0.25);\n}\n\n.bs-popover-right > .arrow::after, .bs-popover-auto[x-placement^=\"right\"] > .arrow::after {\n  left: 1px;\n  border-width: 0.5rem 0.5rem 0.5rem 0;\n  border-right-color: #fff;\n}\n\n.bs-popover-bottom, .bs-popover-auto[x-placement^=\"bottom\"] {\n  margin-top: 0.5rem;\n}\n\n.bs-popover-bottom > .arrow, .bs-popover-auto[x-placement^=\"bottom\"] > .arrow {\n  top: calc(-0.5rem - 1px);\n}\n\n.bs-popover-bottom > .arrow::before, .bs-popover-auto[x-placement^=\"bottom\"] > .arrow::before {\n  top: 0;\n  border-width: 0 0.5rem 0.5rem 0.5rem;\n  border-bottom-color: rgba(0, 0, 0, 0.25);\n}\n\n.bs-popover-bottom > .arrow::after, .bs-popover-auto[x-placement^=\"bottom\"] > .arrow::after {\n  top: 1px;\n  border-width: 0 0.5rem 0.5rem 0.5rem;\n  border-bottom-color: #fff;\n}\n\n.bs-popover-bottom .popover-header::before, .bs-popover-auto[x-placement^=\"bottom\"] .popover-header::before {\n  position: absolute;\n  top: 0;\n  left: 50%;\n  display: block;\n  width: 1rem;\n  margin-left: -0.5rem;\n  content: \"\";\n  border-bottom: 1px solid #f7f7f7;\n}\n\n.bs-popover-left, .bs-popover-auto[x-placement^=\"left\"] {\n  margin-right: 0.5rem;\n}\n\n.bs-popover-left > .arrow, .bs-popover-auto[x-placement^=\"left\"] > .arrow {\n  right: calc(-0.5rem - 1px);\n  width: 0.5rem;\n  height: 1rem;\n  margin: 0.3rem 0;\n}\n\n.bs-popover-left > .arrow::before, .bs-popover-auto[x-placement^=\"left\"] > .arrow::before {\n  right: 0;\n  border-width: 0.5rem 0 0.5rem 0.5rem;\n  border-left-color: rgba(0, 0, 0, 0.25);\n}\n\n.bs-popover-left > .arrow::after, .bs-popover-auto[x-placement^=\"left\"] > .arrow::after {\n  right: 1px;\n  border-width: 0.5rem 0 0.5rem 0.5rem;\n  border-left-color: #fff;\n}\n\n.popover-header {\n  padding: 0.5rem 0.75rem;\n  margin-bottom: 0;\n  font-size: 1rem;\n  background-color: #f7f7f7;\n  border-bottom: 1px solid #ebebeb;\n  border-top-left-radius: calc(0.3rem - 1px);\n  border-top-right-radius: calc(0.3rem - 1px);\n}\n\n.popover-header:empty {\n  display: none;\n}\n\n.popover-body {\n  padding: 0.5rem 0.75rem;\n  color: #212529;\n}\n\n.carousel {\n  position: relative;\n}\n\n.carousel.pointer-event {\n  -ms-touch-action: pan-y;\n  touch-action: pan-y;\n}\n\n.carousel-inner {\n  position: relative;\n  width: 100%;\n  overflow: hidden;\n}\n\n.carousel-inner::after {\n  display: block;\n  clear: both;\n  content: \"\";\n}\n\n.carousel-item {\n  position: relative;\n  display: none;\n  float: left;\n  width: 100%;\n  margin-right: -100%;\n  -webkit-backface-visibility: hidden;\n  backface-visibility: hidden;\n  transition: -webkit-transform 0.6s ease-in-out;\n  transition: transform 0.6s ease-in-out;\n  transition: transform 0.6s ease-in-out, -webkit-transform 0.6s ease-in-out;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .carousel-item {\n    transition: none;\n  }\n}\n\n.carousel-item.active,\n.carousel-item-next,\n.carousel-item-prev {\n  display: block;\n}\n\n.carousel-item-next:not(.carousel-item-left),\n.active.carousel-item-right {\n  -webkit-transform: translateX(100%);\n  transform: translateX(100%);\n}\n\n.carousel-item-prev:not(.carousel-item-right),\n.active.carousel-item-left {\n  -webkit-transform: translateX(-100%);\n  transform: translateX(-100%);\n}\n\n.carousel-fade .carousel-item {\n  opacity: 0;\n  transition-property: opacity;\n  -webkit-transform: none;\n  transform: none;\n}\n\n.carousel-fade .carousel-item.active,\n.carousel-fade .carousel-item-next.carousel-item-left,\n.carousel-fade .carousel-item-prev.carousel-item-right {\n  z-index: 1;\n  opacity: 1;\n}\n\n.carousel-fade .active.carousel-item-left,\n.carousel-fade .active.carousel-item-right {\n  z-index: 0;\n  opacity: 0;\n  transition: opacity 0s 0.6s;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .carousel-fade .active.carousel-item-left,\n  .carousel-fade .active.carousel-item-right {\n    transition: none;\n  }\n}\n\n.carousel-control-prev,\n.carousel-control-next {\n  position: absolute;\n  top: 0;\n  bottom: 0;\n  z-index: 1;\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-align: center;\n  align-items: center;\n  -ms-flex-pack: center;\n  justify-content: center;\n  width: 15%;\n  color: #fff;\n  text-align: center;\n  opacity: 0.5;\n  transition: opacity 0.15s ease;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .carousel-control-prev,\n  .carousel-control-next {\n    transition: none;\n  }\n}\n\n.carousel-control-prev:hover, .carousel-control-prev:focus,\n.carousel-control-next:hover,\n.carousel-control-next:focus {\n  color: #fff;\n  text-decoration: none;\n  outline: 0;\n  opacity: 0.9;\n}\n\n.carousel-control-prev {\n  left: 0;\n}\n\n.carousel-control-next {\n  right: 0;\n}\n\n.carousel-control-prev-icon,\n.carousel-control-next-icon {\n  display: inline-block;\n  width: 20px;\n  height: 20px;\n  background: no-repeat 50% / 100% 100%;\n}\n\n.carousel-control-prev-icon {\n  background-image: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath d='M5.25 0l-4 4 4 4 1.5-1.5L4.25 4l2.5-2.5L5.25 0z'/%3e%3c/svg%3e\");\n}\n\n.carousel-control-next-icon {\n  background-image: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath d='M2.75 0l-1.5 1.5L3.75 4l-2.5 2.5L2.75 8l4-4-4-4z'/%3e%3c/svg%3e\");\n}\n\n.carousel-indicators {\n  position: absolute;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: 15;\n  display: -ms-flexbox;\n  display: flex;\n  -ms-flex-pack: center;\n  justify-content: center;\n  padding-left: 0;\n  margin-right: 15%;\n  margin-left: 15%;\n  list-style: none;\n}\n\n.carousel-indicators li {\n  box-sizing: content-box;\n  -ms-flex: 0 1 auto;\n  flex: 0 1 auto;\n  width: 30px;\n  height: 3px;\n  margin-right: 3px;\n  margin-left: 3px;\n  text-indent: -999px;\n  cursor: pointer;\n  background-color: #fff;\n  background-clip: padding-box;\n  border-top: 10px solid transparent;\n  border-bottom: 10px solid transparent;\n  opacity: .5;\n  transition: opacity 0.6s ease;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .carousel-indicators li {\n    transition: none;\n  }\n}\n\n.carousel-indicators .active {\n  opacity: 1;\n}\n\n.carousel-caption {\n  position: absolute;\n  right: 15%;\n  bottom: 20px;\n  left: 15%;\n  z-index: 10;\n  padding-top: 20px;\n  padding-bottom: 20px;\n  color: #fff;\n  text-align: center;\n}\n\n@-webkit-keyframes spinner-border {\n  to {\n    -webkit-transform: rotate(360deg);\n    transform: rotate(360deg);\n  }\n}\n\n@keyframes spinner-border {\n  to {\n    -webkit-transform: rotate(360deg);\n    transform: rotate(360deg);\n  }\n}\n\n.spinner-border {\n  display: inline-block;\n  width: 2rem;\n  height: 2rem;\n  vertical-align: text-bottom;\n  border: 0.25em solid currentColor;\n  border-right-color: transparent;\n  border-radius: 50%;\n  -webkit-animation: spinner-border .75s linear infinite;\n  animation: spinner-border .75s linear infinite;\n}\n\n.spinner-border-sm {\n  width: 1rem;\n  height: 1rem;\n  border-width: 0.2em;\n}\n\n@-webkit-keyframes spinner-grow {\n  0% {\n    -webkit-transform: scale(0);\n    transform: scale(0);\n  }\n  50% {\n    opacity: 1;\n  }\n}\n\n@keyframes spinner-grow {\n  0% {\n    -webkit-transform: scale(0);\n    transform: scale(0);\n  }\n  50% {\n    opacity: 1;\n  }\n}\n\n.spinner-grow {\n  display: inline-block;\n  width: 2rem;\n  height: 2rem;\n  vertical-align: text-bottom;\n  background-color: currentColor;\n  border-radius: 50%;\n  opacity: 0;\n  -webkit-animation: spinner-grow .75s linear infinite;\n  animation: spinner-grow .75s linear infinite;\n}\n\n.spinner-grow-sm {\n  width: 1rem;\n  height: 1rem;\n}\n\n.align-baseline {\n  vertical-align: baseline !important;\n}\n\n.align-top {\n  vertical-align: top !important;\n}\n\n.align-middle {\n  vertical-align: middle !important;\n}\n\n.align-bottom {\n  vertical-align: bottom !important;\n}\n\n.align-text-bottom {\n  vertical-align: text-bottom !important;\n}\n\n.align-text-top {\n  vertical-align: text-top !important;\n}\n\n.bg-primary {\n  background-color: #007bff !important;\n}\n\na.bg-primary:hover, a.bg-primary:focus,\nbutton.bg-primary:hover,\nbutton.bg-primary:focus {\n  background-color: #0062cc !important;\n}\n\n.bg-secondary {\n  background-color: #6c757d !important;\n}\n\na.bg-secondary:hover, a.bg-secondary:focus,\nbutton.bg-secondary:hover,\nbutton.bg-secondary:focus {\n  background-color: #545b62 !important;\n}\n\n.bg-success {\n  background-color: #28a745 !important;\n}\n\na.bg-success:hover, a.bg-success:focus,\nbutton.bg-success:hover,\nbutton.bg-success:focus {\n  background-color: #1e7e34 !important;\n}\n\n.bg-info {\n  background-color: #17a2b8 !important;\n}\n\na.bg-info:hover, a.bg-info:focus,\nbutton.bg-info:hover,\nbutton.bg-info:focus {\n  background-color: #117a8b !important;\n}\n\n.bg-warning {\n  background-color: #ffc107 !important;\n}\n\na.bg-warning:hover, a.bg-warning:focus,\nbutton.bg-warning:hover,\nbutton.bg-warning:focus {\n  background-color: #d39e00 !important;\n}\n\n.bg-danger {\n  background-color: #dc3545 !important;\n}\n\na.bg-danger:hover, a.bg-danger:focus,\nbutton.bg-danger:hover,\nbutton.bg-danger:focus {\n  background-color: #bd2130 !important;\n}\n\n.bg-light {\n  background-color: #f8f9fa !important;\n}\n\na.bg-light:hover, a.bg-light:focus,\nbutton.bg-light:hover,\nbutton.bg-light:focus {\n  background-color: #dae0e5 !important;\n}\n\n.bg-dark {\n  background-color: #343a40 !important;\n}\n\na.bg-dark:hover, a.bg-dark:focus,\nbutton.bg-dark:hover,\nbutton.bg-dark:focus {\n  background-color: #1d2124 !important;\n}\n\n.bg-white {\n  background-color: #fff !important;\n}\n\n.bg-transparent {\n  background-color: transparent !important;\n}\n\n.border {\n  border: 1px solid #dee2e6 !important;\n}\n\n.border-top {\n  border-top: 1px solid #dee2e6 !important;\n}\n\n.border-right {\n  border-right: 1px solid #dee2e6 !important;\n}\n\n.border-bottom {\n  border-bottom: 1px solid #dee2e6 !important;\n}\n\n.border-left {\n  border-left: 1px solid #dee2e6 !important;\n}\n\n.border-0 {\n  border: 0 !important;\n}\n\n.border-top-0 {\n  border-top: 0 !important;\n}\n\n.border-right-0 {\n  border-right: 0 !important;\n}\n\n.border-bottom-0 {\n  border-bottom: 0 !important;\n}\n\n.border-left-0 {\n  border-left: 0 !important;\n}\n\n.border-primary {\n  border-color: #007bff !important;\n}\n\n.border-secondary {\n  border-color: #6c757d !important;\n}\n\n.border-success {\n  border-color: #28a745 !important;\n}\n\n.border-info {\n  border-color: #17a2b8 !important;\n}\n\n.border-warning {\n  border-color: #ffc107 !important;\n}\n\n.border-danger {\n  border-color: #dc3545 !important;\n}\n\n.border-light {\n  border-color: #f8f9fa !important;\n}\n\n.border-dark {\n  border-color: #343a40 !important;\n}\n\n.border-white {\n  border-color: #fff !important;\n}\n\n.rounded-sm {\n  border-radius: 0.2rem !important;\n}\n\n.rounded {\n  border-radius: 0.25rem !important;\n}\n\n.rounded-top {\n  border-top-left-radius: 0.25rem !important;\n  border-top-right-radius: 0.25rem !important;\n}\n\n.rounded-right {\n  border-top-right-radius: 0.25rem !important;\n  border-bottom-right-radius: 0.25rem !important;\n}\n\n.rounded-bottom {\n  border-bottom-right-radius: 0.25rem !important;\n  border-bottom-left-radius: 0.25rem !important;\n}\n\n.rounded-left {\n  border-top-left-radius: 0.25rem !important;\n  border-bottom-left-radius: 0.25rem !important;\n}\n\n.rounded-lg {\n  border-radius: 0.3rem !important;\n}\n\n.rounded-circle {\n  border-radius: 50% !important;\n}\n\n.rounded-pill {\n  border-radius: 50rem !important;\n}\n\n.rounded-0 {\n  border-radius: 0 !important;\n}\n\n.clearfix::after {\n  display: block;\n  clear: both;\n  content: \"\";\n}\n\n.d-none {\n  display: none !important;\n}\n\n.d-inline {\n  display: inline !important;\n}\n\n.d-inline-block {\n  display: inline-block !important;\n}\n\n.d-block {\n  display: block !important;\n}\n\n.d-table {\n  display: table !important;\n}\n\n.d-table-row {\n  display: table-row !important;\n}\n\n.d-table-cell {\n  display: table-cell !important;\n}\n\n.d-flex {\n  display: -ms-flexbox !important;\n  display: flex !important;\n}\n\n.d-inline-flex {\n  display: -ms-inline-flexbox !important;\n  display: inline-flex !important;\n}\n\n@media (min-width: 576px) {\n  .d-sm-none {\n    display: none !important;\n  }\n  .d-sm-inline {\n    display: inline !important;\n  }\n  .d-sm-inline-block {\n    display: inline-block !important;\n  }\n  .d-sm-block {\n    display: block !important;\n  }\n  .d-sm-table {\n    display: table !important;\n  }\n  .d-sm-table-row {\n    display: table-row !important;\n  }\n  .d-sm-table-cell {\n    display: table-cell !important;\n  }\n  .d-sm-flex {\n    display: -ms-flexbox !important;\n    display: flex !important;\n  }\n  .d-sm-inline-flex {\n    display: -ms-inline-flexbox !important;\n    display: inline-flex !important;\n  }\n}\n\n@media (min-width: 768px) {\n  .d-md-none {\n    display: none !important;\n  }\n  .d-md-inline {\n    display: inline !important;\n  }\n  .d-md-inline-block {\n    display: inline-block !important;\n  }\n  .d-md-block {\n    display: block !important;\n  }\n  .d-md-table {\n    display: table !important;\n  }\n  .d-md-table-row {\n    display: table-row !important;\n  }\n  .d-md-table-cell {\n    display: table-cell !important;\n  }\n  .d-md-flex {\n    display: -ms-flexbox !important;\n    display: flex !important;\n  }\n  .d-md-inline-flex {\n    display: -ms-inline-flexbox !important;\n    display: inline-flex !important;\n  }\n}\n\n@media (min-width: 992px) {\n  .d-lg-none {\n    display: none !important;\n  }\n  .d-lg-inline {\n    display: inline !important;\n  }\n  .d-lg-inline-block {\n    display: inline-block !important;\n  }\n  .d-lg-block {\n    display: block !important;\n  }\n  .d-lg-table {\n    display: table !important;\n  }\n  .d-lg-table-row {\n    display: table-row !important;\n  }\n  .d-lg-table-cell {\n    display: table-cell !important;\n  }\n  .d-lg-flex {\n    display: -ms-flexbox !important;\n    display: flex !important;\n  }\n  .d-lg-inline-flex {\n    display: -ms-inline-flexbox !important;\n    display: inline-flex !important;\n  }\n}\n\n@media (min-width: 1200px) {\n  .d-xl-none {\n    display: none !important;\n  }\n  .d-xl-inline {\n    display: inline !important;\n  }\n  .d-xl-inline-block {\n    display: inline-block !important;\n  }\n  .d-xl-block {\n    display: block !important;\n  }\n  .d-xl-table {\n    display: table !important;\n  }\n  .d-xl-table-row {\n    display: table-row !important;\n  }\n  .d-xl-table-cell {\n    display: table-cell !important;\n  }\n  .d-xl-flex {\n    display: -ms-flexbox !important;\n    display: flex !important;\n  }\n  .d-xl-inline-flex {\n    display: -ms-inline-flexbox !important;\n    display: inline-flex !important;\n  }\n}\n\n@media print {\n  .d-print-none {\n    display: none !important;\n  }\n  .d-print-inline {\n    display: inline !important;\n  }\n  .d-print-inline-block {\n    display: inline-block !important;\n  }\n  .d-print-block {\n    display: block !important;\n  }\n  .d-print-table {\n    display: table !important;\n  }\n  .d-print-table-row {\n    display: table-row !important;\n  }\n  .d-print-table-cell {\n    display: table-cell !important;\n  }\n  .d-print-flex {\n    display: -ms-flexbox !important;\n    display: flex !important;\n  }\n  .d-print-inline-flex {\n    display: -ms-inline-flexbox !important;\n    display: inline-flex !important;\n  }\n}\n\n.embed-responsive {\n  position: relative;\n  display: block;\n  width: 100%;\n  padding: 0;\n  overflow: hidden;\n}\n\n.embed-responsive::before {\n  display: block;\n  content: \"\";\n}\n\n.embed-responsive .embed-responsive-item,\n.embed-responsive iframe,\n.embed-responsive embed,\n.embed-responsive object,\n.embed-responsive video {\n  position: absolute;\n  top: 0;\n  bottom: 0;\n  left: 0;\n  width: 100%;\n  height: 100%;\n  border: 0;\n}\n\n.embed-responsive-21by9::before {\n  padding-top: 42.857143%;\n}\n\n.embed-responsive-16by9::before {\n  padding-top: 56.25%;\n}\n\n.embed-responsive-4by3::before {\n  padding-top: 75%;\n}\n\n.embed-responsive-1by1::before {\n  padding-top: 100%;\n}\n\n.flex-row {\n  -ms-flex-direction: row !important;\n  flex-direction: row !important;\n}\n\n.flex-column {\n  -ms-flex-direction: column !important;\n  flex-direction: column !important;\n}\n\n.flex-row-reverse {\n  -ms-flex-direction: row-reverse !important;\n  flex-direction: row-reverse !important;\n}\n\n.flex-column-reverse {\n  -ms-flex-direction: column-reverse !important;\n  flex-direction: column-reverse !important;\n}\n\n.flex-wrap {\n  -ms-flex-wrap: wrap !important;\n  flex-wrap: wrap !important;\n}\n\n.flex-nowrap {\n  -ms-flex-wrap: nowrap !important;\n  flex-wrap: nowrap !important;\n}\n\n.flex-wrap-reverse {\n  -ms-flex-wrap: wrap-reverse !important;\n  flex-wrap: wrap-reverse !important;\n}\n\n.flex-fill {\n  -ms-flex: 1 1 auto !important;\n  flex: 1 1 auto !important;\n}\n\n.flex-grow-0 {\n  -ms-flex-positive: 0 !important;\n  flex-grow: 0 !important;\n}\n\n.flex-grow-1 {\n  -ms-flex-positive: 1 !important;\n  flex-grow: 1 !important;\n}\n\n.flex-shrink-0 {\n  -ms-flex-negative: 0 !important;\n  flex-shrink: 0 !important;\n}\n\n.flex-shrink-1 {\n  -ms-flex-negative: 1 !important;\n  flex-shrink: 1 !important;\n}\n\n.justify-content-start {\n  -ms-flex-pack: start !important;\n  justify-content: flex-start !important;\n}\n\n.justify-content-end {\n  -ms-flex-pack: end !important;\n  justify-content: flex-end !important;\n}\n\n.justify-content-center {\n  -ms-flex-pack: center !important;\n  justify-content: center !important;\n}\n\n.justify-content-between {\n  -ms-flex-pack: justify !important;\n  justify-content: space-between !important;\n}\n\n.justify-content-around {\n  -ms-flex-pack: distribute !important;\n  justify-content: space-around !important;\n}\n\n.align-items-start {\n  -ms-flex-align: start !important;\n  align-items: flex-start !important;\n}\n\n.align-items-end {\n  -ms-flex-align: end !important;\n  align-items: flex-end !important;\n}\n\n.align-items-center {\n  -ms-flex-align: center !important;\n  align-items: center !important;\n}\n\n.align-items-baseline {\n  -ms-flex-align: baseline !important;\n  align-items: baseline !important;\n}\n\n.align-items-stretch {\n  -ms-flex-align: stretch !important;\n  align-items: stretch !important;\n}\n\n.align-content-start {\n  -ms-flex-line-pack: start !important;\n  align-content: flex-start !important;\n}\n\n.align-content-end {\n  -ms-flex-line-pack: end !important;\n  align-content: flex-end !important;\n}\n\n.align-content-center {\n  -ms-flex-line-pack: center !important;\n  align-content: center !important;\n}\n\n.align-content-between {\n  -ms-flex-line-pack: justify !important;\n  align-content: space-between !important;\n}\n\n.align-content-around {\n  -ms-flex-line-pack: distribute !important;\n  align-content: space-around !important;\n}\n\n.align-content-stretch {\n  -ms-flex-line-pack: stretch !important;\n  align-content: stretch !important;\n}\n\n.align-self-auto {\n  -ms-flex-item-align: auto !important;\n  align-self: auto !important;\n}\n\n.align-self-start {\n  -ms-flex-item-align: start !important;\n  align-self: flex-start !important;\n}\n\n.align-self-end {\n  -ms-flex-item-align: end !important;\n  align-self: flex-end !important;\n}\n\n.align-self-center {\n  -ms-flex-item-align: center !important;\n  align-self: center !important;\n}\n\n.align-self-baseline {\n  -ms-flex-item-align: baseline !important;\n  align-self: baseline !important;\n}\n\n.align-self-stretch {\n  -ms-flex-item-align: stretch !important;\n  align-self: stretch !important;\n}\n\n@media (min-width: 576px) {\n  .flex-sm-row {\n    -ms-flex-direction: row !important;\n    flex-direction: row !important;\n  }\n  .flex-sm-column {\n    -ms-flex-direction: column !important;\n    flex-direction: column !important;\n  }\n  .flex-sm-row-reverse {\n    -ms-flex-direction: row-reverse !important;\n    flex-direction: row-reverse !important;\n  }\n  .flex-sm-column-reverse {\n    -ms-flex-direction: column-reverse !important;\n    flex-direction: column-reverse !important;\n  }\n  .flex-sm-wrap {\n    -ms-flex-wrap: wrap !important;\n    flex-wrap: wrap !important;\n  }\n  .flex-sm-nowrap {\n    -ms-flex-wrap: nowrap !important;\n    flex-wrap: nowrap !important;\n  }\n  .flex-sm-wrap-reverse {\n    -ms-flex-wrap: wrap-reverse !important;\n    flex-wrap: wrap-reverse !important;\n  }\n  .flex-sm-fill {\n    -ms-flex: 1 1 auto !important;\n    flex: 1 1 auto !important;\n  }\n  .flex-sm-grow-0 {\n    -ms-flex-positive: 0 !important;\n    flex-grow: 0 !important;\n  }\n  .flex-sm-grow-1 {\n    -ms-flex-positive: 1 !important;\n    flex-grow: 1 !important;\n  }\n  .flex-sm-shrink-0 {\n    -ms-flex-negative: 0 !important;\n    flex-shrink: 0 !important;\n  }\n  .flex-sm-shrink-1 {\n    -ms-flex-negative: 1 !important;\n    flex-shrink: 1 !important;\n  }\n  .justify-content-sm-start {\n    -ms-flex-pack: start !important;\n    justify-content: flex-start !important;\n  }\n  .justify-content-sm-end {\n    -ms-flex-pack: end !important;\n    justify-content: flex-end !important;\n  }\n  .justify-content-sm-center {\n    -ms-flex-pack: center !important;\n    justify-content: center !important;\n  }\n  .justify-content-sm-between {\n    -ms-flex-pack: justify !important;\n    justify-content: space-between !important;\n  }\n  .justify-content-sm-around {\n    -ms-flex-pack: distribute !important;\n    justify-content: space-around !important;\n  }\n  .align-items-sm-start {\n    -ms-flex-align: start !important;\n    align-items: flex-start !important;\n  }\n  .align-items-sm-end {\n    -ms-flex-align: end !important;\n    align-items: flex-end !important;\n  }\n  .align-items-sm-center {\n    -ms-flex-align: center !important;\n    align-items: center !important;\n  }\n  .align-items-sm-baseline {\n    -ms-flex-align: baseline !important;\n    align-items: baseline !important;\n  }\n  .align-items-sm-stretch {\n    -ms-flex-align: stretch !important;\n    align-items: stretch !important;\n  }\n  .align-content-sm-start {\n    -ms-flex-line-pack: start !important;\n    align-content: flex-start !important;\n  }\n  .align-content-sm-end {\n    -ms-flex-line-pack: end !important;\n    align-content: flex-end !important;\n  }\n  .align-content-sm-center {\n    -ms-flex-line-pack: center !important;\n    align-content: center !important;\n  }\n  .align-content-sm-between {\n    -ms-flex-line-pack: justify !important;\n    align-content: space-between !important;\n  }\n  .align-content-sm-around {\n    -ms-flex-line-pack: distribute !important;\n    align-content: space-around !important;\n  }\n  .align-content-sm-stretch {\n    -ms-flex-line-pack: stretch !important;\n    align-content: stretch !important;\n  }\n  .align-self-sm-auto {\n    -ms-flex-item-align: auto !important;\n    align-self: auto !important;\n  }\n  .align-self-sm-start {\n    -ms-flex-item-align: start !important;\n    align-self: flex-start !important;\n  }\n  .align-self-sm-end {\n    -ms-flex-item-align: end !important;\n    align-self: flex-end !important;\n  }\n  .align-self-sm-center {\n    -ms-flex-item-align: center !important;\n    align-self: center !important;\n  }\n  .align-self-sm-baseline {\n    -ms-flex-item-align: baseline !important;\n    align-self: baseline !important;\n  }\n  .align-self-sm-stretch {\n    -ms-flex-item-align: stretch !important;\n    align-self: stretch !important;\n  }\n}\n\n@media (min-width: 768px) {\n  .flex-md-row {\n    -ms-flex-direction: row !important;\n    flex-direction: row !important;\n  }\n  .flex-md-column {\n    -ms-flex-direction: column !important;\n    flex-direction: column !important;\n  }\n  .flex-md-row-reverse {\n    -ms-flex-direction: row-reverse !important;\n    flex-direction: row-reverse !important;\n  }\n  .flex-md-column-reverse {\n    -ms-flex-direction: column-reverse !important;\n    flex-direction: column-reverse !important;\n  }\n  .flex-md-wrap {\n    -ms-flex-wrap: wrap !important;\n    flex-wrap: wrap !important;\n  }\n  .flex-md-nowrap {\n    -ms-flex-wrap: nowrap !important;\n    flex-wrap: nowrap !important;\n  }\n  .flex-md-wrap-reverse {\n    -ms-flex-wrap: wrap-reverse !important;\n    flex-wrap: wrap-reverse !important;\n  }\n  .flex-md-fill {\n    -ms-flex: 1 1 auto !important;\n    flex: 1 1 auto !important;\n  }\n  .flex-md-grow-0 {\n    -ms-flex-positive: 0 !important;\n    flex-grow: 0 !important;\n  }\n  .flex-md-grow-1 {\n    -ms-flex-positive: 1 !important;\n    flex-grow: 1 !important;\n  }\n  .flex-md-shrink-0 {\n    -ms-flex-negative: 0 !important;\n    flex-shrink: 0 !important;\n  }\n  .flex-md-shrink-1 {\n    -ms-flex-negative: 1 !important;\n    flex-shrink: 1 !important;\n  }\n  .justify-content-md-start {\n    -ms-flex-pack: start !important;\n    justify-content: flex-start !important;\n  }\n  .justify-content-md-end {\n    -ms-flex-pack: end !important;\n    justify-content: flex-end !important;\n  }\n  .justify-content-md-center {\n    -ms-flex-pack: center !important;\n    justify-content: center !important;\n  }\n  .justify-content-md-between {\n    -ms-flex-pack: justify !important;\n    justify-content: space-between !important;\n  }\n  .justify-content-md-around {\n    -ms-flex-pack: distribute !important;\n    justify-content: space-around !important;\n  }\n  .align-items-md-start {\n    -ms-flex-align: start !important;\n    align-items: flex-start !important;\n  }\n  .align-items-md-end {\n    -ms-flex-align: end !important;\n    align-items: flex-end !important;\n  }\n  .align-items-md-center {\n    -ms-flex-align: center !important;\n    align-items: center !important;\n  }\n  .align-items-md-baseline {\n    -ms-flex-align: baseline !important;\n    align-items: baseline !important;\n  }\n  .align-items-md-stretch {\n    -ms-flex-align: stretch !important;\n    align-items: stretch !important;\n  }\n  .align-content-md-start {\n    -ms-flex-line-pack: start !important;\n    align-content: flex-start !important;\n  }\n  .align-content-md-end {\n    -ms-flex-line-pack: end !important;\n    align-content: flex-end !important;\n  }\n  .align-content-md-center {\n    -ms-flex-line-pack: center !important;\n    align-content: center !important;\n  }\n  .align-content-md-between {\n    -ms-flex-line-pack: justify !important;\n    align-content: space-between !important;\n  }\n  .align-content-md-around {\n    -ms-flex-line-pack: distribute !important;\n    align-content: space-around !important;\n  }\n  .align-content-md-stretch {\n    -ms-flex-line-pack: stretch !important;\n    align-content: stretch !important;\n  }\n  .align-self-md-auto {\n    -ms-flex-item-align: auto !important;\n    align-self: auto !important;\n  }\n  .align-self-md-start {\n    -ms-flex-item-align: start !important;\n    align-self: flex-start !important;\n  }\n  .align-self-md-end {\n    -ms-flex-item-align: end !important;\n    align-self: flex-end !important;\n  }\n  .align-self-md-center {\n    -ms-flex-item-align: center !important;\n    align-self: center !important;\n  }\n  .align-self-md-baseline {\n    -ms-flex-item-align: baseline !important;\n    align-self: baseline !important;\n  }\n  .align-self-md-stretch {\n    -ms-flex-item-align: stretch !important;\n    align-self: stretch !important;\n  }\n}\n\n@media (min-width: 992px) {\n  .flex-lg-row {\n    -ms-flex-direction: row !important;\n    flex-direction: row !important;\n  }\n  .flex-lg-column {\n    -ms-flex-direction: column !important;\n    flex-direction: column !important;\n  }\n  .flex-lg-row-reverse {\n    -ms-flex-direction: row-reverse !important;\n    flex-direction: row-reverse !important;\n  }\n  .flex-lg-column-reverse {\n    -ms-flex-direction: column-reverse !important;\n    flex-direction: column-reverse !important;\n  }\n  .flex-lg-wrap {\n    -ms-flex-wrap: wrap !important;\n    flex-wrap: wrap !important;\n  }\n  .flex-lg-nowrap {\n    -ms-flex-wrap: nowrap !important;\n    flex-wrap: nowrap !important;\n  }\n  .flex-lg-wrap-reverse {\n    -ms-flex-wrap: wrap-reverse !important;\n    flex-wrap: wrap-reverse !important;\n  }\n  .flex-lg-fill {\n    -ms-flex: 1 1 auto !important;\n    flex: 1 1 auto !important;\n  }\n  .flex-lg-grow-0 {\n    -ms-flex-positive: 0 !important;\n    flex-grow: 0 !important;\n  }\n  .flex-lg-grow-1 {\n    -ms-flex-positive: 1 !important;\n    flex-grow: 1 !important;\n  }\n  .flex-lg-shrink-0 {\n    -ms-flex-negative: 0 !important;\n    flex-shrink: 0 !important;\n  }\n  .flex-lg-shrink-1 {\n    -ms-flex-negative: 1 !important;\n    flex-shrink: 1 !important;\n  }\n  .justify-content-lg-start {\n    -ms-flex-pack: start !important;\n    justify-content: flex-start !important;\n  }\n  .justify-content-lg-end {\n    -ms-flex-pack: end !important;\n    justify-content: flex-end !important;\n  }\n  .justify-content-lg-center {\n    -ms-flex-pack: center !important;\n    justify-content: center !important;\n  }\n  .justify-content-lg-between {\n    -ms-flex-pack: justify !important;\n    justify-content: space-between !important;\n  }\n  .justify-content-lg-around {\n    -ms-flex-pack: distribute !important;\n    justify-content: space-around !important;\n  }\n  .align-items-lg-start {\n    -ms-flex-align: start !important;\n    align-items: flex-start !important;\n  }\n  .align-items-lg-end {\n    -ms-flex-align: end !important;\n    align-items: flex-end !important;\n  }\n  .align-items-lg-center {\n    -ms-flex-align: center !important;\n    align-items: center !important;\n  }\n  .align-items-lg-baseline {\n    -ms-flex-align: baseline !important;\n    align-items: baseline !important;\n  }\n  .align-items-lg-stretch {\n    -ms-flex-align: stretch !important;\n    align-items: stretch !important;\n  }\n  .align-content-lg-start {\n    -ms-flex-line-pack: start !important;\n    align-content: flex-start !important;\n  }\n  .align-content-lg-end {\n    -ms-flex-line-pack: end !important;\n    align-content: flex-end !important;\n  }\n  .align-content-lg-center {\n    -ms-flex-line-pack: center !important;\n    align-content: center !important;\n  }\n  .align-content-lg-between {\n    -ms-flex-line-pack: justify !important;\n    align-content: space-between !important;\n  }\n  .align-content-lg-around {\n    -ms-flex-line-pack: distribute !important;\n    align-content: space-around !important;\n  }\n  .align-content-lg-stretch {\n    -ms-flex-line-pack: stretch !important;\n    align-content: stretch !important;\n  }\n  .align-self-lg-auto {\n    -ms-flex-item-align: auto !important;\n    align-self: auto !important;\n  }\n  .align-self-lg-start {\n    -ms-flex-item-align: start !important;\n    align-self: flex-start !important;\n  }\n  .align-self-lg-end {\n    -ms-flex-item-align: end !important;\n    align-self: flex-end !important;\n  }\n  .align-self-lg-center {\n    -ms-flex-item-align: center !important;\n    align-self: center !important;\n  }\n  .align-self-lg-baseline {\n    -ms-flex-item-align: baseline !important;\n    align-self: baseline !important;\n  }\n  .align-self-lg-stretch {\n    -ms-flex-item-align: stretch !important;\n    align-self: stretch !important;\n  }\n}\n\n@media (min-width: 1200px) {\n  .flex-xl-row {\n    -ms-flex-direction: row !important;\n    flex-direction: row !important;\n  }\n  .flex-xl-column {\n    -ms-flex-direction: column !important;\n    flex-direction: column !important;\n  }\n  .flex-xl-row-reverse {\n    -ms-flex-direction: row-reverse !important;\n    flex-direction: row-reverse !important;\n  }\n  .flex-xl-column-reverse {\n    -ms-flex-direction: column-reverse !important;\n    flex-direction: column-reverse !important;\n  }\n  .flex-xl-wrap {\n    -ms-flex-wrap: wrap !important;\n    flex-wrap: wrap !important;\n  }\n  .flex-xl-nowrap {\n    -ms-flex-wrap: nowrap !important;\n    flex-wrap: nowrap !important;\n  }\n  .flex-xl-wrap-reverse {\n    -ms-flex-wrap: wrap-reverse !important;\n    flex-wrap: wrap-reverse !important;\n  }\n  .flex-xl-fill {\n    -ms-flex: 1 1 auto !important;\n    flex: 1 1 auto !important;\n  }\n  .flex-xl-grow-0 {\n    -ms-flex-positive: 0 !important;\n    flex-grow: 0 !important;\n  }\n  .flex-xl-grow-1 {\n    -ms-flex-positive: 1 !important;\n    flex-grow: 1 !important;\n  }\n  .flex-xl-shrink-0 {\n    -ms-flex-negative: 0 !important;\n    flex-shrink: 0 !important;\n  }\n  .flex-xl-shrink-1 {\n    -ms-flex-negative: 1 !important;\n    flex-shrink: 1 !important;\n  }\n  .justify-content-xl-start {\n    -ms-flex-pack: start !important;\n    justify-content: flex-start !important;\n  }\n  .justify-content-xl-end {\n    -ms-flex-pack: end !important;\n    justify-content: flex-end !important;\n  }\n  .justify-content-xl-center {\n    -ms-flex-pack: center !important;\n    justify-content: center !important;\n  }\n  .justify-content-xl-between {\n    -ms-flex-pack: justify !important;\n    justify-content: space-between !important;\n  }\n  .justify-content-xl-around {\n    -ms-flex-pack: distribute !important;\n    justify-content: space-around !important;\n  }\n  .align-items-xl-start {\n    -ms-flex-align: start !important;\n    align-items: flex-start !important;\n  }\n  .align-items-xl-end {\n    -ms-flex-align: end !important;\n    align-items: flex-end !important;\n  }\n  .align-items-xl-center {\n    -ms-flex-align: center !important;\n    align-items: center !important;\n  }\n  .align-items-xl-baseline {\n    -ms-flex-align: baseline !important;\n    align-items: baseline !important;\n  }\n  .align-items-xl-stretch {\n    -ms-flex-align: stretch !important;\n    align-items: stretch !important;\n  }\n  .align-content-xl-start {\n    -ms-flex-line-pack: start !important;\n    align-content: flex-start !important;\n  }\n  .align-content-xl-end {\n    -ms-flex-line-pack: end !important;\n    align-content: flex-end !important;\n  }\n  .align-content-xl-center {\n    -ms-flex-line-pack: center !important;\n    align-content: center !important;\n  }\n  .align-content-xl-between {\n    -ms-flex-line-pack: justify !important;\n    align-content: space-between !important;\n  }\n  .align-content-xl-around {\n    -ms-flex-line-pack: distribute !important;\n    align-content: space-around !important;\n  }\n  .align-content-xl-stretch {\n    -ms-flex-line-pack: stretch !important;\n    align-content: stretch !important;\n  }\n  .align-self-xl-auto {\n    -ms-flex-item-align: auto !important;\n    align-self: auto !important;\n  }\n  .align-self-xl-start {\n    -ms-flex-item-align: start !important;\n    align-self: flex-start !important;\n  }\n  .align-self-xl-end {\n    -ms-flex-item-align: end !important;\n    align-self: flex-end !important;\n  }\n  .align-self-xl-center {\n    -ms-flex-item-align: center !important;\n    align-self: center !important;\n  }\n  .align-self-xl-baseline {\n    -ms-flex-item-align: baseline !important;\n    align-self: baseline !important;\n  }\n  .align-self-xl-stretch {\n    -ms-flex-item-align: stretch !important;\n    align-self: stretch !important;\n  }\n}\n\n.float-left {\n  float: left !important;\n}\n\n.float-right {\n  float: right !important;\n}\n\n.float-none {\n  float: none !important;\n}\n\n@media (min-width: 576px) {\n  .float-sm-left {\n    float: left !important;\n  }\n  .float-sm-right {\n    float: right !important;\n  }\n  .float-sm-none {\n    float: none !important;\n  }\n}\n\n@media (min-width: 768px) {\n  .float-md-left {\n    float: left !important;\n  }\n  .float-md-right {\n    float: right !important;\n  }\n  .float-md-none {\n    float: none !important;\n  }\n}\n\n@media (min-width: 992px) {\n  .float-lg-left {\n    float: left !important;\n  }\n  .float-lg-right {\n    float: right !important;\n  }\n  .float-lg-none {\n    float: none !important;\n  }\n}\n\n@media (min-width: 1200px) {\n  .float-xl-left {\n    float: left !important;\n  }\n  .float-xl-right {\n    float: right !important;\n  }\n  .float-xl-none {\n    float: none !important;\n  }\n}\n\n.overflow-auto {\n  overflow: auto !important;\n}\n\n.overflow-hidden {\n  overflow: hidden !important;\n}\n\n.position-static {\n  position: static !important;\n}\n\n.position-relative {\n  position: relative !important;\n}\n\n.position-absolute {\n  position: absolute !important;\n}\n\n.position-fixed {\n  position: fixed !important;\n}\n\n.position-sticky {\n  position: -webkit-sticky !important;\n  position: sticky !important;\n}\n\n.fixed-top {\n  position: fixed;\n  top: 0;\n  right: 0;\n  left: 0;\n  z-index: 1030;\n}\n\n.fixed-bottom {\n  position: fixed;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: 1030;\n}\n\n@supports ((position: -webkit-sticky) or (position: sticky)) {\n  .sticky-top {\n    position: -webkit-sticky;\n    position: sticky;\n    top: 0;\n    z-index: 1020;\n  }\n}\n\n.sr-only {\n  position: absolute;\n  width: 1px;\n  height: 1px;\n  padding: 0;\n  margin: -1px;\n  overflow: hidden;\n  clip: rect(0, 0, 0, 0);\n  white-space: nowrap;\n  border: 0;\n}\n\n.sr-only-focusable:active, .sr-only-focusable:focus {\n  position: static;\n  width: auto;\n  height: auto;\n  overflow: visible;\n  clip: auto;\n  white-space: normal;\n}\n\n.shadow-sm {\n  box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075) !important;\n}\n\n.shadow {\n  box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15) !important;\n}\n\n.shadow-lg {\n  box-shadow: 0 1rem 3rem rgba(0, 0, 0, 0.175) !important;\n}\n\n.shadow-none {\n  box-shadow: none !important;\n}\n\n.w-25 {\n  width: 25% !important;\n}\n\n.w-50 {\n  width: 50% !important;\n}\n\n.w-75 {\n  width: 75% !important;\n}\n\n.w-100 {\n  width: 100% !important;\n}\n\n.w-auto {\n  width: auto !important;\n}\n\n.h-25 {\n  height: 25% !important;\n}\n\n.h-50 {\n  height: 50% !important;\n}\n\n.h-75 {\n  height: 75% !important;\n}\n\n.h-100 {\n  height: 100% !important;\n}\n\n.h-auto {\n  height: auto !important;\n}\n\n.mw-100 {\n  max-width: 100% !important;\n}\n\n.mh-100 {\n  max-height: 100% !important;\n}\n\n.min-vw-100 {\n  min-width: 100vw !important;\n}\n\n.min-vh-100 {\n  min-height: 100vh !important;\n}\n\n.vw-100 {\n  width: 100vw !important;\n}\n\n.vh-100 {\n  height: 100vh !important;\n}\n\n.stretched-link::after {\n  position: absolute;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: 1;\n  pointer-events: auto;\n  content: \"\";\n  background-color: rgba(0, 0, 0, 0);\n}\n\n.m-0 {\n  margin: 0 !important;\n}\n\n.mt-0,\n.my-0 {\n  margin-top: 0 !important;\n}\n\n.mr-0,\n.mx-0 {\n  margin-right: 0 !important;\n}\n\n.mb-0,\n.my-0 {\n  margin-bottom: 0 !important;\n}\n\n.ml-0,\n.mx-0 {\n  margin-left: 0 !important;\n}\n\n.m-1 {\n  margin: 0.25rem !important;\n}\n\n.mt-1,\n.my-1 {\n  margin-top: 0.25rem !important;\n}\n\n.mr-1,\n.mx-1 {\n  margin-right: 0.25rem !important;\n}\n\n.mb-1,\n.my-1 {\n  margin-bottom: 0.25rem !important;\n}\n\n.ml-1,\n.mx-1 {\n  margin-left: 0.25rem !important;\n}\n\n.m-2 {\n  margin: 0.5rem !important;\n}\n\n.mt-2,\n.my-2 {\n  margin-top: 0.5rem !important;\n}\n\n.mr-2,\n.mx-2 {\n  margin-right: 0.5rem !important;\n}\n\n.mb-2,\n.my-2 {\n  margin-bottom: 0.5rem !important;\n}\n\n.ml-2,\n.mx-2 {\n  margin-left: 0.5rem !important;\n}\n\n.m-3 {\n  margin: 1rem !important;\n}\n\n.mt-3,\n.my-3 {\n  margin-top: 1rem !important;\n}\n\n.mr-3,\n.mx-3 {\n  margin-right: 1rem !important;\n}\n\n.mb-3,\n.my-3 {\n  margin-bottom: 1rem !important;\n}\n\n.ml-3,\n.mx-3 {\n  margin-left: 1rem !important;\n}\n\n.m-4 {\n  margin: 1.5rem !important;\n}\n\n.mt-4,\n.my-4 {\n  margin-top: 1.5rem !important;\n}\n\n.mr-4,\n.mx-4 {\n  margin-right: 1.5rem !important;\n}\n\n.mb-4,\n.my-4 {\n  margin-bottom: 1.5rem !important;\n}\n\n.ml-4,\n.mx-4 {\n  margin-left: 1.5rem !important;\n}\n\n.m-5 {\n  margin: 3rem !important;\n}\n\n.mt-5,\n.my-5 {\n  margin-top: 3rem !important;\n}\n\n.mr-5,\n.mx-5 {\n  margin-right: 3rem !important;\n}\n\n.mb-5,\n.my-5 {\n  margin-bottom: 3rem !important;\n}\n\n.ml-5,\n.mx-5 {\n  margin-left: 3rem !important;\n}\n\n.p-0 {\n  padding: 0 !important;\n}\n\n.pt-0,\n.py-0 {\n  padding-top: 0 !important;\n}\n\n.pr-0,\n.px-0 {\n  padding-right: 0 !important;\n}\n\n.pb-0,\n.py-0 {\n  padding-bottom: 0 !important;\n}\n\n.pl-0,\n.px-0 {\n  padding-left: 0 !important;\n}\n\n.p-1 {\n  padding: 0.25rem !important;\n}\n\n.pt-1,\n.py-1 {\n  padding-top: 0.25rem !important;\n}\n\n.pr-1,\n.px-1 {\n  padding-right: 0.25rem !important;\n}\n\n.pb-1,\n.py-1 {\n  padding-bottom: 0.25rem !important;\n}\n\n.pl-1,\n.px-1 {\n  padding-left: 0.25rem !important;\n}\n\n.p-2 {\n  padding: 0.5rem !important;\n}\n\n.pt-2,\n.py-2 {\n  padding-top: 0.5rem !important;\n}\n\n.pr-2,\n.px-2 {\n  padding-right: 0.5rem !important;\n}\n\n.pb-2,\n.py-2 {\n  padding-bottom: 0.5rem !important;\n}\n\n.pl-2,\n.px-2 {\n  padding-left: 0.5rem !important;\n}\n\n.p-3 {\n  padding: 1rem !important;\n}\n\n.pt-3,\n.py-3 {\n  padding-top: 1rem !important;\n}\n\n.pr-3,\n.px-3 {\n  padding-right: 1rem !important;\n}\n\n.pb-3,\n.py-3 {\n  padding-bottom: 1rem !important;\n}\n\n.pl-3,\n.px-3 {\n  padding-left: 1rem !important;\n}\n\n.p-4 {\n  padding: 1.5rem !important;\n}\n\n.pt-4,\n.py-4 {\n  padding-top: 1.5rem !important;\n}\n\n.pr-4,\n.px-4 {\n  padding-right: 1.5rem !important;\n}\n\n.pb-4,\n.py-4 {\n  padding-bottom: 1.5rem !important;\n}\n\n.pl-4,\n.px-4 {\n  padding-left: 1.5rem !important;\n}\n\n.p-5 {\n  padding: 3rem !important;\n}\n\n.pt-5,\n.py-5 {\n  padding-top: 3rem !important;\n}\n\n.pr-5,\n.px-5 {\n  padding-right: 3rem !important;\n}\n\n.pb-5,\n.py-5 {\n  padding-bottom: 3rem !important;\n}\n\n.pl-5,\n.px-5 {\n  padding-left: 3rem !important;\n}\n\n.m-n1 {\n  margin: -0.25rem !important;\n}\n\n.mt-n1,\n.my-n1 {\n  margin-top: -0.25rem !important;\n}\n\n.mr-n1,\n.mx-n1 {\n  margin-right: -0.25rem !important;\n}\n\n.mb-n1,\n.my-n1 {\n  margin-bottom: -0.25rem !important;\n}\n\n.ml-n1,\n.mx-n1 {\n  margin-left: -0.25rem !important;\n}\n\n.m-n2 {\n  margin: -0.5rem !important;\n}\n\n.mt-n2,\n.my-n2 {\n  margin-top: -0.5rem !important;\n}\n\n.mr-n2,\n.mx-n2 {\n  margin-right: -0.5rem !important;\n}\n\n.mb-n2,\n.my-n2 {\n  margin-bottom: -0.5rem !important;\n}\n\n.ml-n2,\n.mx-n2 {\n  margin-left: -0.5rem !important;\n}\n\n.m-n3 {\n  margin: -1rem !important;\n}\n\n.mt-n3,\n.my-n3 {\n  margin-top: -1rem !important;\n}\n\n.mr-n3,\n.mx-n3 {\n  margin-right: -1rem !important;\n}\n\n.mb-n3,\n.my-n3 {\n  margin-bottom: -1rem !important;\n}\n\n.ml-n3,\n.mx-n3 {\n  margin-left: -1rem !important;\n}\n\n.m-n4 {\n  margin: -1.5rem !important;\n}\n\n.mt-n4,\n.my-n4 {\n  margin-top: -1.5rem !important;\n}\n\n.mr-n4,\n.mx-n4 {\n  margin-right: -1.5rem !important;\n}\n\n.mb-n4,\n.my-n4 {\n  margin-bottom: -1.5rem !important;\n}\n\n.ml-n4,\n.mx-n4 {\n  margin-left: -1.5rem !important;\n}\n\n.m-n5 {\n  margin: -3rem !important;\n}\n\n.mt-n5,\n.my-n5 {\n  margin-top: -3rem !important;\n}\n\n.mr-n5,\n.mx-n5 {\n  margin-right: -3rem !important;\n}\n\n.mb-n5,\n.my-n5 {\n  margin-bottom: -3rem !important;\n}\n\n.ml-n5,\n.mx-n5 {\n  margin-left: -3rem !important;\n}\n\n.m-auto {\n  margin: auto !important;\n}\n\n.mt-auto,\n.my-auto {\n  margin-top: auto !important;\n}\n\n.mr-auto,\n.mx-auto {\n  margin-right: auto !important;\n}\n\n.mb-auto,\n.my-auto {\n  margin-bottom: auto !important;\n}\n\n.ml-auto,\n.mx-auto {\n  margin-left: auto !important;\n}\n\n@media (min-width: 576px) {\n  .m-sm-0 {\n    margin: 0 !important;\n  }\n  .mt-sm-0,\n  .my-sm-0 {\n    margin-top: 0 !important;\n  }\n  .mr-sm-0,\n  .mx-sm-0 {\n    margin-right: 0 !important;\n  }\n  .mb-sm-0,\n  .my-sm-0 {\n    margin-bottom: 0 !important;\n  }\n  .ml-sm-0,\n  .mx-sm-0 {\n    margin-left: 0 !important;\n  }\n  .m-sm-1 {\n    margin: 0.25rem !important;\n  }\n  .mt-sm-1,\n  .my-sm-1 {\n    margin-top: 0.25rem !important;\n  }\n  .mr-sm-1,\n  .mx-sm-1 {\n    margin-right: 0.25rem !important;\n  }\n  .mb-sm-1,\n  .my-sm-1 {\n    margin-bottom: 0.25rem !important;\n  }\n  .ml-sm-1,\n  .mx-sm-1 {\n    margin-left: 0.25rem !important;\n  }\n  .m-sm-2 {\n    margin: 0.5rem !important;\n  }\n  .mt-sm-2,\n  .my-sm-2 {\n    margin-top: 0.5rem !important;\n  }\n  .mr-sm-2,\n  .mx-sm-2 {\n    margin-right: 0.5rem !important;\n  }\n  .mb-sm-2,\n  .my-sm-2 {\n    margin-bottom: 0.5rem !important;\n  }\n  .ml-sm-2,\n  .mx-sm-2 {\n    margin-left: 0.5rem !important;\n  }\n  .m-sm-3 {\n    margin: 1rem !important;\n  }\n  .mt-sm-3,\n  .my-sm-3 {\n    margin-top: 1rem !important;\n  }\n  .mr-sm-3,\n  .mx-sm-3 {\n    margin-right: 1rem !important;\n  }\n  .mb-sm-3,\n  .my-sm-3 {\n    margin-bottom: 1rem !important;\n  }\n  .ml-sm-3,\n  .mx-sm-3 {\n    margin-left: 1rem !important;\n  }\n  .m-sm-4 {\n    margin: 1.5rem !important;\n  }\n  .mt-sm-4,\n  .my-sm-4 {\n    margin-top: 1.5rem !important;\n  }\n  .mr-sm-4,\n  .mx-sm-4 {\n    margin-right: 1.5rem !important;\n  }\n  .mb-sm-4,\n  .my-sm-4 {\n    margin-bottom: 1.5rem !important;\n  }\n  .ml-sm-4,\n  .mx-sm-4 {\n    margin-left: 1.5rem !important;\n  }\n  .m-sm-5 {\n    margin: 3rem !important;\n  }\n  .mt-sm-5,\n  .my-sm-5 {\n    margin-top: 3rem !important;\n  }\n  .mr-sm-5,\n  .mx-sm-5 {\n    margin-right: 3rem !important;\n  }\n  .mb-sm-5,\n  .my-sm-5 {\n    margin-bottom: 3rem !important;\n  }\n  .ml-sm-5,\n  .mx-sm-5 {\n    margin-left: 3rem !important;\n  }\n  .p-sm-0 {\n    padding: 0 !important;\n  }\n  .pt-sm-0,\n  .py-sm-0 {\n    padding-top: 0 !important;\n  }\n  .pr-sm-0,\n  .px-sm-0 {\n    padding-right: 0 !important;\n  }\n  .pb-sm-0,\n  .py-sm-0 {\n    padding-bottom: 0 !important;\n  }\n  .pl-sm-0,\n  .px-sm-0 {\n    padding-left: 0 !important;\n  }\n  .p-sm-1 {\n    padding: 0.25rem !important;\n  }\n  .pt-sm-1,\n  .py-sm-1 {\n    padding-top: 0.25rem !important;\n  }\n  .pr-sm-1,\n  .px-sm-1 {\n    padding-right: 0.25rem !important;\n  }\n  .pb-sm-1,\n  .py-sm-1 {\n    padding-bottom: 0.25rem !important;\n  }\n  .pl-sm-1,\n  .px-sm-1 {\n    padding-left: 0.25rem !important;\n  }\n  .p-sm-2 {\n    padding: 0.5rem !important;\n  }\n  .pt-sm-2,\n  .py-sm-2 {\n    padding-top: 0.5rem !important;\n  }\n  .pr-sm-2,\n  .px-sm-2 {\n    padding-right: 0.5rem !important;\n  }\n  .pb-sm-2,\n  .py-sm-2 {\n    padding-bottom: 0.5rem !important;\n  }\n  .pl-sm-2,\n  .px-sm-2 {\n    padding-left: 0.5rem !important;\n  }\n  .p-sm-3 {\n    padding: 1rem !important;\n  }\n  .pt-sm-3,\n  .py-sm-3 {\n    padding-top: 1rem !important;\n  }\n  .pr-sm-3,\n  .px-sm-3 {\n    padding-right: 1rem !important;\n  }\n  .pb-sm-3,\n  .py-sm-3 {\n    padding-bottom: 1rem !important;\n  }\n  .pl-sm-3,\n  .px-sm-3 {\n    padding-left: 1rem !important;\n  }\n  .p-sm-4 {\n    padding: 1.5rem !important;\n  }\n  .pt-sm-4,\n  .py-sm-4 {\n    padding-top: 1.5rem !important;\n  }\n  .pr-sm-4,\n  .px-sm-4 {\n    padding-right: 1.5rem !important;\n  }\n  .pb-sm-4,\n  .py-sm-4 {\n    padding-bottom: 1.5rem !important;\n  }\n  .pl-sm-4,\n  .px-sm-4 {\n    padding-left: 1.5rem !important;\n  }\n  .p-sm-5 {\n    padding: 3rem !important;\n  }\n  .pt-sm-5,\n  .py-sm-5 {\n    padding-top: 3rem !important;\n  }\n  .pr-sm-5,\n  .px-sm-5 {\n    padding-right: 3rem !important;\n  }\n  .pb-sm-5,\n  .py-sm-5 {\n    padding-bottom: 3rem !important;\n  }\n  .pl-sm-5,\n  .px-sm-5 {\n    padding-left: 3rem !important;\n  }\n  .m-sm-n1 {\n    margin: -0.25rem !important;\n  }\n  .mt-sm-n1,\n  .my-sm-n1 {\n    margin-top: -0.25rem !important;\n  }\n  .mr-sm-n1,\n  .mx-sm-n1 {\n    margin-right: -0.25rem !important;\n  }\n  .mb-sm-n1,\n  .my-sm-n1 {\n    margin-bottom: -0.25rem !important;\n  }\n  .ml-sm-n1,\n  .mx-sm-n1 {\n    margin-left: -0.25rem !important;\n  }\n  .m-sm-n2 {\n    margin: -0.5rem !important;\n  }\n  .mt-sm-n2,\n  .my-sm-n2 {\n    margin-top: -0.5rem !important;\n  }\n  .mr-sm-n2,\n  .mx-sm-n2 {\n    margin-right: -0.5rem !important;\n  }\n  .mb-sm-n2,\n  .my-sm-n2 {\n    margin-bottom: -0.5rem !important;\n  }\n  .ml-sm-n2,\n  .mx-sm-n2 {\n    margin-left: -0.5rem !important;\n  }\n  .m-sm-n3 {\n    margin: -1rem !important;\n  }\n  .mt-sm-n3,\n  .my-sm-n3 {\n    margin-top: -1rem !important;\n  }\n  .mr-sm-n3,\n  .mx-sm-n3 {\n    margin-right: -1rem !important;\n  }\n  .mb-sm-n3,\n  .my-sm-n3 {\n    margin-bottom: -1rem !important;\n  }\n  .ml-sm-n3,\n  .mx-sm-n3 {\n    margin-left: -1rem !important;\n  }\n  .m-sm-n4 {\n    margin: -1.5rem !important;\n  }\n  .mt-sm-n4,\n  .my-sm-n4 {\n    margin-top: -1.5rem !important;\n  }\n  .mr-sm-n4,\n  .mx-sm-n4 {\n    margin-right: -1.5rem !important;\n  }\n  .mb-sm-n4,\n  .my-sm-n4 {\n    margin-bottom: -1.5rem !important;\n  }\n  .ml-sm-n4,\n  .mx-sm-n4 {\n    margin-left: -1.5rem !important;\n  }\n  .m-sm-n5 {\n    margin: -3rem !important;\n  }\n  .mt-sm-n5,\n  .my-sm-n5 {\n    margin-top: -3rem !important;\n  }\n  .mr-sm-n5,\n  .mx-sm-n5 {\n    margin-right: -3rem !important;\n  }\n  .mb-sm-n5,\n  .my-sm-n5 {\n    margin-bottom: -3rem !important;\n  }\n  .ml-sm-n5,\n  .mx-sm-n5 {\n    margin-left: -3rem !important;\n  }\n  .m-sm-auto {\n    margin: auto !important;\n  }\n  .mt-sm-auto,\n  .my-sm-auto {\n    margin-top: auto !important;\n  }\n  .mr-sm-auto,\n  .mx-sm-auto {\n    margin-right: auto !important;\n  }\n  .mb-sm-auto,\n  .my-sm-auto {\n    margin-bottom: auto !important;\n  }\n  .ml-sm-auto,\n  .mx-sm-auto {\n    margin-left: auto !important;\n  }\n}\n\n@media (min-width: 768px) {\n  .m-md-0 {\n    margin: 0 !important;\n  }\n  .mt-md-0,\n  .my-md-0 {\n    margin-top: 0 !important;\n  }\n  .mr-md-0,\n  .mx-md-0 {\n    margin-right: 0 !important;\n  }\n  .mb-md-0,\n  .my-md-0 {\n    margin-bottom: 0 !important;\n  }\n  .ml-md-0,\n  .mx-md-0 {\n    margin-left: 0 !important;\n  }\n  .m-md-1 {\n    margin: 0.25rem !important;\n  }\n  .mt-md-1,\n  .my-md-1 {\n    margin-top: 0.25rem !important;\n  }\n  .mr-md-1,\n  .mx-md-1 {\n    margin-right: 0.25rem !important;\n  }\n  .mb-md-1,\n  .my-md-1 {\n    margin-bottom: 0.25rem !important;\n  }\n  .ml-md-1,\n  .mx-md-1 {\n    margin-left: 0.25rem !important;\n  }\n  .m-md-2 {\n    margin: 0.5rem !important;\n  }\n  .mt-md-2,\n  .my-md-2 {\n    margin-top: 0.5rem !important;\n  }\n  .mr-md-2,\n  .mx-md-2 {\n    margin-right: 0.5rem !important;\n  }\n  .mb-md-2,\n  .my-md-2 {\n    margin-bottom: 0.5rem !important;\n  }\n  .ml-md-2,\n  .mx-md-2 {\n    margin-left: 0.5rem !important;\n  }\n  .m-md-3 {\n    margin: 1rem !important;\n  }\n  .mt-md-3,\n  .my-md-3 {\n    margin-top: 1rem !important;\n  }\n  .mr-md-3,\n  .mx-md-3 {\n    margin-right: 1rem !important;\n  }\n  .mb-md-3,\n  .my-md-3 {\n    margin-bottom: 1rem !important;\n  }\n  .ml-md-3,\n  .mx-md-3 {\n    margin-left: 1rem !important;\n  }\n  .m-md-4 {\n    margin: 1.5rem !important;\n  }\n  .mt-md-4,\n  .my-md-4 {\n    margin-top: 1.5rem !important;\n  }\n  .mr-md-4,\n  .mx-md-4 {\n    margin-right: 1.5rem !important;\n  }\n  .mb-md-4,\n  .my-md-4 {\n    margin-bottom: 1.5rem !important;\n  }\n  .ml-md-4,\n  .mx-md-4 {\n    margin-left: 1.5rem !important;\n  }\n  .m-md-5 {\n    margin: 3rem !important;\n  }\n  .mt-md-5,\n  .my-md-5 {\n    margin-top: 3rem !important;\n  }\n  .mr-md-5,\n  .mx-md-5 {\n    margin-right: 3rem !important;\n  }\n  .mb-md-5,\n  .my-md-5 {\n    margin-bottom: 3rem !important;\n  }\n  .ml-md-5,\n  .mx-md-5 {\n    margin-left: 3rem !important;\n  }\n  .p-md-0 {\n    padding: 0 !important;\n  }\n  .pt-md-0,\n  .py-md-0 {\n    padding-top: 0 !important;\n  }\n  .pr-md-0,\n  .px-md-0 {\n    padding-right: 0 !important;\n  }\n  .pb-md-0,\n  .py-md-0 {\n    padding-bottom: 0 !important;\n  }\n  .pl-md-0,\n  .px-md-0 {\n    padding-left: 0 !important;\n  }\n  .p-md-1 {\n    padding: 0.25rem !important;\n  }\n  .pt-md-1,\n  .py-md-1 {\n    padding-top: 0.25rem !important;\n  }\n  .pr-md-1,\n  .px-md-1 {\n    padding-right: 0.25rem !important;\n  }\n  .pb-md-1,\n  .py-md-1 {\n    padding-bottom: 0.25rem !important;\n  }\n  .pl-md-1,\n  .px-md-1 {\n    padding-left: 0.25rem !important;\n  }\n  .p-md-2 {\n    padding: 0.5rem !important;\n  }\n  .pt-md-2,\n  .py-md-2 {\n    padding-top: 0.5rem !important;\n  }\n  .pr-md-2,\n  .px-md-2 {\n    padding-right: 0.5rem !important;\n  }\n  .pb-md-2,\n  .py-md-2 {\n    padding-bottom: 0.5rem !important;\n  }\n  .pl-md-2,\n  .px-md-2 {\n    padding-left: 0.5rem !important;\n  }\n  .p-md-3 {\n    padding: 1rem !important;\n  }\n  .pt-md-3,\n  .py-md-3 {\n    padding-top: 1rem !important;\n  }\n  .pr-md-3,\n  .px-md-3 {\n    padding-right: 1rem !important;\n  }\n  .pb-md-3,\n  .py-md-3 {\n    padding-bottom: 1rem !important;\n  }\n  .pl-md-3,\n  .px-md-3 {\n    padding-left: 1rem !important;\n  }\n  .p-md-4 {\n    padding: 1.5rem !important;\n  }\n  .pt-md-4,\n  .py-md-4 {\n    padding-top: 1.5rem !important;\n  }\n  .pr-md-4,\n  .px-md-4 {\n    padding-right: 1.5rem !important;\n  }\n  .pb-md-4,\n  .py-md-4 {\n    padding-bottom: 1.5rem !important;\n  }\n  .pl-md-4,\n  .px-md-4 {\n    padding-left: 1.5rem !important;\n  }\n  .p-md-5 {\n    padding: 3rem !important;\n  }\n  .pt-md-5,\n  .py-md-5 {\n    padding-top: 3rem !important;\n  }\n  .pr-md-5,\n  .px-md-5 {\n    padding-right: 3rem !important;\n  }\n  .pb-md-5,\n  .py-md-5 {\n    padding-bottom: 3rem !important;\n  }\n  .pl-md-5,\n  .px-md-5 {\n    padding-left: 3rem !important;\n  }\n  .m-md-n1 {\n    margin: -0.25rem !important;\n  }\n  .mt-md-n1,\n  .my-md-n1 {\n    margin-top: -0.25rem !important;\n  }\n  .mr-md-n1,\n  .mx-md-n1 {\n    margin-right: -0.25rem !important;\n  }\n  .mb-md-n1,\n  .my-md-n1 {\n    margin-bottom: -0.25rem !important;\n  }\n  .ml-md-n1,\n  .mx-md-n1 {\n    margin-left: -0.25rem !important;\n  }\n  .m-md-n2 {\n    margin: -0.5rem !important;\n  }\n  .mt-md-n2,\n  .my-md-n2 {\n    margin-top: -0.5rem !important;\n  }\n  .mr-md-n2,\n  .mx-md-n2 {\n    margin-right: -0.5rem !important;\n  }\n  .mb-md-n2,\n  .my-md-n2 {\n    margin-bottom: -0.5rem !important;\n  }\n  .ml-md-n2,\n  .mx-md-n2 {\n    margin-left: -0.5rem !important;\n  }\n  .m-md-n3 {\n    margin: -1rem !important;\n  }\n  .mt-md-n3,\n  .my-md-n3 {\n    margin-top: -1rem !important;\n  }\n  .mr-md-n3,\n  .mx-md-n3 {\n    margin-right: -1rem !important;\n  }\n  .mb-md-n3,\n  .my-md-n3 {\n    margin-bottom: -1rem !important;\n  }\n  .ml-md-n3,\n  .mx-md-n3 {\n    margin-left: -1rem !important;\n  }\n  .m-md-n4 {\n    margin: -1.5rem !important;\n  }\n  .mt-md-n4,\n  .my-md-n4 {\n    margin-top: -1.5rem !important;\n  }\n  .mr-md-n4,\n  .mx-md-n4 {\n    margin-right: -1.5rem !important;\n  }\n  .mb-md-n4,\n  .my-md-n4 {\n    margin-bottom: -1.5rem !important;\n  }\n  .ml-md-n4,\n  .mx-md-n4 {\n    margin-left: -1.5rem !important;\n  }\n  .m-md-n5 {\n    margin: -3rem !important;\n  }\n  .mt-md-n5,\n  .my-md-n5 {\n    margin-top: -3rem !important;\n  }\n  .mr-md-n5,\n  .mx-md-n5 {\n    margin-right: -3rem !important;\n  }\n  .mb-md-n5,\n  .my-md-n5 {\n    margin-bottom: -3rem !important;\n  }\n  .ml-md-n5,\n  .mx-md-n5 {\n    margin-left: -3rem !important;\n  }\n  .m-md-auto {\n    margin: auto !important;\n  }\n  .mt-md-auto,\n  .my-md-auto {\n    margin-top: auto !important;\n  }\n  .mr-md-auto,\n  .mx-md-auto {\n    margin-right: auto !important;\n  }\n  .mb-md-auto,\n  .my-md-auto {\n    margin-bottom: auto !important;\n  }\n  .ml-md-auto,\n  .mx-md-auto {\n    margin-left: auto !important;\n  }\n}\n\n@media (min-width: 992px) {\n  .m-lg-0 {\n    margin: 0 !important;\n  }\n  .mt-lg-0,\n  .my-lg-0 {\n    margin-top: 0 !important;\n  }\n  .mr-lg-0,\n  .mx-lg-0 {\n    margin-right: 0 !important;\n  }\n  .mb-lg-0,\n  .my-lg-0 {\n    margin-bottom: 0 !important;\n  }\n  .ml-lg-0,\n  .mx-lg-0 {\n    margin-left: 0 !important;\n  }\n  .m-lg-1 {\n    margin: 0.25rem !important;\n  }\n  .mt-lg-1,\n  .my-lg-1 {\n    margin-top: 0.25rem !important;\n  }\n  .mr-lg-1,\n  .mx-lg-1 {\n    margin-right: 0.25rem !important;\n  }\n  .mb-lg-1,\n  .my-lg-1 {\n    margin-bottom: 0.25rem !important;\n  }\n  .ml-lg-1,\n  .mx-lg-1 {\n    margin-left: 0.25rem !important;\n  }\n  .m-lg-2 {\n    margin: 0.5rem !important;\n  }\n  .mt-lg-2,\n  .my-lg-2 {\n    margin-top: 0.5rem !important;\n  }\n  .mr-lg-2,\n  .mx-lg-2 {\n    margin-right: 0.5rem !important;\n  }\n  .mb-lg-2,\n  .my-lg-2 {\n    margin-bottom: 0.5rem !important;\n  }\n  .ml-lg-2,\n  .mx-lg-2 {\n    margin-left: 0.5rem !important;\n  }\n  .m-lg-3 {\n    margin: 1rem !important;\n  }\n  .mt-lg-3,\n  .my-lg-3 {\n    margin-top: 1rem !important;\n  }\n  .mr-lg-3,\n  .mx-lg-3 {\n    margin-right: 1rem !important;\n  }\n  .mb-lg-3,\n  .my-lg-3 {\n    margin-bottom: 1rem !important;\n  }\n  .ml-lg-3,\n  .mx-lg-3 {\n    margin-left: 1rem !important;\n  }\n  .m-lg-4 {\n    margin: 1.5rem !important;\n  }\n  .mt-lg-4,\n  .my-lg-4 {\n    margin-top: 1.5rem !important;\n  }\n  .mr-lg-4,\n  .mx-lg-4 {\n    margin-right: 1.5rem !important;\n  }\n  .mb-lg-4,\n  .my-lg-4 {\n    margin-bottom: 1.5rem !important;\n  }\n  .ml-lg-4,\n  .mx-lg-4 {\n    margin-left: 1.5rem !important;\n  }\n  .m-lg-5 {\n    margin: 3rem !important;\n  }\n  .mt-lg-5,\n  .my-lg-5 {\n    margin-top: 3rem !important;\n  }\n  .mr-lg-5,\n  .mx-lg-5 {\n    margin-right: 3rem !important;\n  }\n  .mb-lg-5,\n  .my-lg-5 {\n    margin-bottom: 3rem !important;\n  }\n  .ml-lg-5,\n  .mx-lg-5 {\n    margin-left: 3rem !important;\n  }\n  .p-lg-0 {\n    padding: 0 !important;\n  }\n  .pt-lg-0,\n  .py-lg-0 {\n    padding-top: 0 !important;\n  }\n  .pr-lg-0,\n  .px-lg-0 {\n    padding-right: 0 !important;\n  }\n  .pb-lg-0,\n  .py-lg-0 {\n    padding-bottom: 0 !important;\n  }\n  .pl-lg-0,\n  .px-lg-0 {\n    padding-left: 0 !important;\n  }\n  .p-lg-1 {\n    padding: 0.25rem !important;\n  }\n  .pt-lg-1,\n  .py-lg-1 {\n    padding-top: 0.25rem !important;\n  }\n  .pr-lg-1,\n  .px-lg-1 {\n    padding-right: 0.25rem !important;\n  }\n  .pb-lg-1,\n  .py-lg-1 {\n    padding-bottom: 0.25rem !important;\n  }\n  .pl-lg-1,\n  .px-lg-1 {\n    padding-left: 0.25rem !important;\n  }\n  .p-lg-2 {\n    padding: 0.5rem !important;\n  }\n  .pt-lg-2,\n  .py-lg-2 {\n    padding-top: 0.5rem !important;\n  }\n  .pr-lg-2,\n  .px-lg-2 {\n    padding-right: 0.5rem !important;\n  }\n  .pb-lg-2,\n  .py-lg-2 {\n    padding-bottom: 0.5rem !important;\n  }\n  .pl-lg-2,\n  .px-lg-2 {\n    padding-left: 0.5rem !important;\n  }\n  .p-lg-3 {\n    padding: 1rem !important;\n  }\n  .pt-lg-3,\n  .py-lg-3 {\n    padding-top: 1rem !important;\n  }\n  .pr-lg-3,\n  .px-lg-3 {\n    padding-right: 1rem !important;\n  }\n  .pb-lg-3,\n  .py-lg-3 {\n    padding-bottom: 1rem !important;\n  }\n  .pl-lg-3,\n  .px-lg-3 {\n    padding-left: 1rem !important;\n  }\n  .p-lg-4 {\n    padding: 1.5rem !important;\n  }\n  .pt-lg-4,\n  .py-lg-4 {\n    padding-top: 1.5rem !important;\n  }\n  .pr-lg-4,\n  .px-lg-4 {\n    padding-right: 1.5rem !important;\n  }\n  .pb-lg-4,\n  .py-lg-4 {\n    padding-bottom: 1.5rem !important;\n  }\n  .pl-lg-4,\n  .px-lg-4 {\n    padding-left: 1.5rem !important;\n  }\n  .p-lg-5 {\n    padding: 3rem !important;\n  }\n  .pt-lg-5,\n  .py-lg-5 {\n    padding-top: 3rem !important;\n  }\n  .pr-lg-5,\n  .px-lg-5 {\n    padding-right: 3rem !important;\n  }\n  .pb-lg-5,\n  .py-lg-5 {\n    padding-bottom: 3rem !important;\n  }\n  .pl-lg-5,\n  .px-lg-5 {\n    padding-left: 3rem !important;\n  }\n  .m-lg-n1 {\n    margin: -0.25rem !important;\n  }\n  .mt-lg-n1,\n  .my-lg-n1 {\n    margin-top: -0.25rem !important;\n  }\n  .mr-lg-n1,\n  .mx-lg-n1 {\n    margin-right: -0.25rem !important;\n  }\n  .mb-lg-n1,\n  .my-lg-n1 {\n    margin-bottom: -0.25rem !important;\n  }\n  .ml-lg-n1,\n  .mx-lg-n1 {\n    margin-left: -0.25rem !important;\n  }\n  .m-lg-n2 {\n    margin: -0.5rem !important;\n  }\n  .mt-lg-n2,\n  .my-lg-n2 {\n    margin-top: -0.5rem !important;\n  }\n  .mr-lg-n2,\n  .mx-lg-n2 {\n    margin-right: -0.5rem !important;\n  }\n  .mb-lg-n2,\n  .my-lg-n2 {\n    margin-bottom: -0.5rem !important;\n  }\n  .ml-lg-n2,\n  .mx-lg-n2 {\n    margin-left: -0.5rem !important;\n  }\n  .m-lg-n3 {\n    margin: -1rem !important;\n  }\n  .mt-lg-n3,\n  .my-lg-n3 {\n    margin-top: -1rem !important;\n  }\n  .mr-lg-n3,\n  .mx-lg-n3 {\n    margin-right: -1rem !important;\n  }\n  .mb-lg-n3,\n  .my-lg-n3 {\n    margin-bottom: -1rem !important;\n  }\n  .ml-lg-n3,\n  .mx-lg-n3 {\n    margin-left: -1rem !important;\n  }\n  .m-lg-n4 {\n    margin: -1.5rem !important;\n  }\n  .mt-lg-n4,\n  .my-lg-n4 {\n    margin-top: -1.5rem !important;\n  }\n  .mr-lg-n4,\n  .mx-lg-n4 {\n    margin-right: -1.5rem !important;\n  }\n  .mb-lg-n4,\n  .my-lg-n4 {\n    margin-bottom: -1.5rem !important;\n  }\n  .ml-lg-n4,\n  .mx-lg-n4 {\n    margin-left: -1.5rem !important;\n  }\n  .m-lg-n5 {\n    margin: -3rem !important;\n  }\n  .mt-lg-n5,\n  .my-lg-n5 {\n    margin-top: -3rem !important;\n  }\n  .mr-lg-n5,\n  .mx-lg-n5 {\n    margin-right: -3rem !important;\n  }\n  .mb-lg-n5,\n  .my-lg-n5 {\n    margin-bottom: -3rem !important;\n  }\n  .ml-lg-n5,\n  .mx-lg-n5 {\n    margin-left: -3rem !important;\n  }\n  .m-lg-auto {\n    margin: auto !important;\n  }\n  .mt-lg-auto,\n  .my-lg-auto {\n    margin-top: auto !important;\n  }\n  .mr-lg-auto,\n  .mx-lg-auto {\n    margin-right: auto !important;\n  }\n  .mb-lg-auto,\n  .my-lg-auto {\n    margin-bottom: auto !important;\n  }\n  .ml-lg-auto,\n  .mx-lg-auto {\n    margin-left: auto !important;\n  }\n}\n\n@media (min-width: 1200px) {\n  .m-xl-0 {\n    margin: 0 !important;\n  }\n  .mt-xl-0,\n  .my-xl-0 {\n    margin-top: 0 !important;\n  }\n  .mr-xl-0,\n  .mx-xl-0 {\n    margin-right: 0 !important;\n  }\n  .mb-xl-0,\n  .my-xl-0 {\n    margin-bottom: 0 !important;\n  }\n  .ml-xl-0,\n  .mx-xl-0 {\n    margin-left: 0 !important;\n  }\n  .m-xl-1 {\n    margin: 0.25rem !important;\n  }\n  .mt-xl-1,\n  .my-xl-1 {\n    margin-top: 0.25rem !important;\n  }\n  .mr-xl-1,\n  .mx-xl-1 {\n    margin-right: 0.25rem !important;\n  }\n  .mb-xl-1,\n  .my-xl-1 {\n    margin-bottom: 0.25rem !important;\n  }\n  .ml-xl-1,\n  .mx-xl-1 {\n    margin-left: 0.25rem !important;\n  }\n  .m-xl-2 {\n    margin: 0.5rem !important;\n  }\n  .mt-xl-2,\n  .my-xl-2 {\n    margin-top: 0.5rem !important;\n  }\n  .mr-xl-2,\n  .mx-xl-2 {\n    margin-right: 0.5rem !important;\n  }\n  .mb-xl-2,\n  .my-xl-2 {\n    margin-bottom: 0.5rem !important;\n  }\n  .ml-xl-2,\n  .mx-xl-2 {\n    margin-left: 0.5rem !important;\n  }\n  .m-xl-3 {\n    margin: 1rem !important;\n  }\n  .mt-xl-3,\n  .my-xl-3 {\n    margin-top: 1rem !important;\n  }\n  .mr-xl-3,\n  .mx-xl-3 {\n    margin-right: 1rem !important;\n  }\n  .mb-xl-3,\n  .my-xl-3 {\n    margin-bottom: 1rem !important;\n  }\n  .ml-xl-3,\n  .mx-xl-3 {\n    margin-left: 1rem !important;\n  }\n  .m-xl-4 {\n    margin: 1.5rem !important;\n  }\n  .mt-xl-4,\n  .my-xl-4 {\n    margin-top: 1.5rem !important;\n  }\n  .mr-xl-4,\n  .mx-xl-4 {\n    margin-right: 1.5rem !important;\n  }\n  .mb-xl-4,\n  .my-xl-4 {\n    margin-bottom: 1.5rem !important;\n  }\n  .ml-xl-4,\n  .mx-xl-4 {\n    margin-left: 1.5rem !important;\n  }\n  .m-xl-5 {\n    margin: 3rem !important;\n  }\n  .mt-xl-5,\n  .my-xl-5 {\n    margin-top: 3rem !important;\n  }\n  .mr-xl-5,\n  .mx-xl-5 {\n    margin-right: 3rem !important;\n  }\n  .mb-xl-5,\n  .my-xl-5 {\n    margin-bottom: 3rem !important;\n  }\n  .ml-xl-5,\n  .mx-xl-5 {\n    margin-left: 3rem !important;\n  }\n  .p-xl-0 {\n    padding: 0 !important;\n  }\n  .pt-xl-0,\n  .py-xl-0 {\n    padding-top: 0 !important;\n  }\n  .pr-xl-0,\n  .px-xl-0 {\n    padding-right: 0 !important;\n  }\n  .pb-xl-0,\n  .py-xl-0 {\n    padding-bottom: 0 !important;\n  }\n  .pl-xl-0,\n  .px-xl-0 {\n    padding-left: 0 !important;\n  }\n  .p-xl-1 {\n    padding: 0.25rem !important;\n  }\n  .pt-xl-1,\n  .py-xl-1 {\n    padding-top: 0.25rem !important;\n  }\n  .pr-xl-1,\n  .px-xl-1 {\n    padding-right: 0.25rem !important;\n  }\n  .pb-xl-1,\n  .py-xl-1 {\n    padding-bottom: 0.25rem !important;\n  }\n  .pl-xl-1,\n  .px-xl-1 {\n    padding-left: 0.25rem !important;\n  }\n  .p-xl-2 {\n    padding: 0.5rem !important;\n  }\n  .pt-xl-2,\n  .py-xl-2 {\n    padding-top: 0.5rem !important;\n  }\n  .pr-xl-2,\n  .px-xl-2 {\n    padding-right: 0.5rem !important;\n  }\n  .pb-xl-2,\n  .py-xl-2 {\n    padding-bottom: 0.5rem !important;\n  }\n  .pl-xl-2,\n  .px-xl-2 {\n    padding-left: 0.5rem !important;\n  }\n  .p-xl-3 {\n    padding: 1rem !important;\n  }\n  .pt-xl-3,\n  .py-xl-3 {\n    padding-top: 1rem !important;\n  }\n  .pr-xl-3,\n  .px-xl-3 {\n    padding-right: 1rem !important;\n  }\n  .pb-xl-3,\n  .py-xl-3 {\n    padding-bottom: 1rem !important;\n  }\n  .pl-xl-3,\n  .px-xl-3 {\n    padding-left: 1rem !important;\n  }\n  .p-xl-4 {\n    padding: 1.5rem !important;\n  }\n  .pt-xl-4,\n  .py-xl-4 {\n    padding-top: 1.5rem !important;\n  }\n  .pr-xl-4,\n  .px-xl-4 {\n    padding-right: 1.5rem !important;\n  }\n  .pb-xl-4,\n  .py-xl-4 {\n    padding-bottom: 1.5rem !important;\n  }\n  .pl-xl-4,\n  .px-xl-4 {\n    padding-left: 1.5rem !important;\n  }\n  .p-xl-5 {\n    padding: 3rem !important;\n  }\n  .pt-xl-5,\n  .py-xl-5 {\n    padding-top: 3rem !important;\n  }\n  .pr-xl-5,\n  .px-xl-5 {\n    padding-right: 3rem !important;\n  }\n  .pb-xl-5,\n  .py-xl-5 {\n    padding-bottom: 3rem !important;\n  }\n  .pl-xl-5,\n  .px-xl-5 {\n    padding-left: 3rem !important;\n  }\n  .m-xl-n1 {\n    margin: -0.25rem !important;\n  }\n  .mt-xl-n1,\n  .my-xl-n1 {\n    margin-top: -0.25rem !important;\n  }\n  .mr-xl-n1,\n  .mx-xl-n1 {\n    margin-right: -0.25rem !important;\n  }\n  .mb-xl-n1,\n  .my-xl-n1 {\n    margin-bottom: -0.25rem !important;\n  }\n  .ml-xl-n1,\n  .mx-xl-n1 {\n    margin-left: -0.25rem !important;\n  }\n  .m-xl-n2 {\n    margin: -0.5rem !important;\n  }\n  .mt-xl-n2,\n  .my-xl-n2 {\n    margin-top: -0.5rem !important;\n  }\n  .mr-xl-n2,\n  .mx-xl-n2 {\n    margin-right: -0.5rem !important;\n  }\n  .mb-xl-n2,\n  .my-xl-n2 {\n    margin-bottom: -0.5rem !important;\n  }\n  .ml-xl-n2,\n  .mx-xl-n2 {\n    margin-left: -0.5rem !important;\n  }\n  .m-xl-n3 {\n    margin: -1rem !important;\n  }\n  .mt-xl-n3,\n  .my-xl-n3 {\n    margin-top: -1rem !important;\n  }\n  .mr-xl-n3,\n  .mx-xl-n3 {\n    margin-right: -1rem !important;\n  }\n  .mb-xl-n3,\n  .my-xl-n3 {\n    margin-bottom: -1rem !important;\n  }\n  .ml-xl-n3,\n  .mx-xl-n3 {\n    margin-left: -1rem !important;\n  }\n  .m-xl-n4 {\n    margin: -1.5rem !important;\n  }\n  .mt-xl-n4,\n  .my-xl-n4 {\n    margin-top: -1.5rem !important;\n  }\n  .mr-xl-n4,\n  .mx-xl-n4 {\n    margin-right: -1.5rem !important;\n  }\n  .mb-xl-n4,\n  .my-xl-n4 {\n    margin-bottom: -1.5rem !important;\n  }\n  .ml-xl-n4,\n  .mx-xl-n4 {\n    margin-left: -1.5rem !important;\n  }\n  .m-xl-n5 {\n    margin: -3rem !important;\n  }\n  .mt-xl-n5,\n  .my-xl-n5 {\n    margin-top: -3rem !important;\n  }\n  .mr-xl-n5,\n  .mx-xl-n5 {\n    margin-right: -3rem !important;\n  }\n  .mb-xl-n5,\n  .my-xl-n5 {\n    margin-bottom: -3rem !important;\n  }\n  .ml-xl-n5,\n  .mx-xl-n5 {\n    margin-left: -3rem !important;\n  }\n  .m-xl-auto {\n    margin: auto !important;\n  }\n  .mt-xl-auto,\n  .my-xl-auto {\n    margin-top: auto !important;\n  }\n  .mr-xl-auto,\n  .mx-xl-auto {\n    margin-right: auto !important;\n  }\n  .mb-xl-auto,\n  .my-xl-auto {\n    margin-bottom: auto !important;\n  }\n  .ml-xl-auto,\n  .mx-xl-auto {\n    margin-left: auto !important;\n  }\n}\n\n.text-monospace {\n  font-family: SFMono-Regular, Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace !important;\n}\n\n.text-justify {\n  text-align: justify !important;\n}\n\n.text-wrap {\n  white-space: normal !important;\n}\n\n.text-nowrap {\n  white-space: nowrap !important;\n}\n\n.text-truncate {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n\n.text-left {\n  text-align: left !important;\n}\n\n.text-right {\n  text-align: right !important;\n}\n\n.text-center {\n  text-align: center !important;\n}\n\n@media (min-width: 576px) {\n  .text-sm-left {\n    text-align: left !important;\n  }\n  .text-sm-right {\n    text-align: right !important;\n  }\n  .text-sm-center {\n    text-align: center !important;\n  }\n}\n\n@media (min-width: 768px) {\n  .text-md-left {\n    text-align: left !important;\n  }\n  .text-md-right {\n    text-align: right !important;\n  }\n  .text-md-center {\n    text-align: center !important;\n  }\n}\n\n@media (min-width: 992px) {\n  .text-lg-left {\n    text-align: left !important;\n  }\n  .text-lg-right {\n    text-align: right !important;\n  }\n  .text-lg-center {\n    text-align: center !important;\n  }\n}\n\n@media (min-width: 1200px) {\n  .text-xl-left {\n    text-align: left !important;\n  }\n  .text-xl-right {\n    text-align: right !important;\n  }\n  .text-xl-center {\n    text-align: center !important;\n  }\n}\n\n.text-lowercase {\n  text-transform: lowercase !important;\n}\n\n.text-uppercase {\n  text-transform: uppercase !important;\n}\n\n.text-capitalize {\n  text-transform: capitalize !important;\n}\n\n.font-weight-light {\n  font-weight: 300 !important;\n}\n\n.font-weight-lighter {\n  font-weight: lighter !important;\n}\n\n.font-weight-normal {\n  font-weight: 400 !important;\n}\n\n.font-weight-bold {\n  font-weight: 700 !important;\n}\n\n.font-weight-bolder {\n  font-weight: bolder !important;\n}\n\n.font-italic {\n  font-style: italic !important;\n}\n\n.text-white {\n  color: #fff !important;\n}\n\n.text-primary {\n  color: #007bff !important;\n}\n\na.text-primary:hover, a.text-primary:focus {\n  color: #0056b3 !important;\n}\n\n.text-secondary {\n  color: #6c757d !important;\n}\n\na.text-secondary:hover, a.text-secondary:focus {\n  color: #494f54 !important;\n}\n\n.text-success {\n  color: #28a745 !important;\n}\n\na.text-success:hover, a.text-success:focus {\n  color: #19692c !important;\n}\n\n.text-info {\n  color: #17a2b8 !important;\n}\n\na.text-info:hover, a.text-info:focus {\n  color: #0f6674 !important;\n}\n\n.text-warning {\n  color: #ffc107 !important;\n}\n\na.text-warning:hover, a.text-warning:focus {\n  color: #ba8b00 !important;\n}\n\n.text-danger {\n  color: #dc3545 !important;\n}\n\na.text-danger:hover, a.text-danger:focus {\n  color: #a71d2a !important;\n}\n\n.text-light {\n  color: #f8f9fa !important;\n}\n\na.text-light:hover, a.text-light:focus {\n  color: #cbd3da !important;\n}\n\n.text-dark {\n  color: #343a40 !important;\n}\n\na.text-dark:hover, a.text-dark:focus {\n  color: #121416 !important;\n}\n\n.text-body {\n  color: #212529 !important;\n}\n\n.text-muted {\n  color: #6c757d !important;\n}\n\n.text-black-50 {\n  color: rgba(0, 0, 0, 0.5) !important;\n}\n\n.text-white-50 {\n  color: rgba(255, 255, 255, 0.5) !important;\n}\n\n.text-hide {\n  font: 0/0 a;\n  color: transparent;\n  text-shadow: none;\n  background-color: transparent;\n  border: 0;\n}\n\n.text-decoration-none {\n  text-decoration: none !important;\n}\n\n.text-break {\n  word-break: break-word !important;\n  overflow-wrap: break-word !important;\n}\n\n.text-reset {\n  color: inherit !important;\n}\n\n.visible {\n  visibility: visible !important;\n}\n\n.invisible {\n  visibility: hidden !important;\n}\n\n@media print {\n  *,\n  *::before,\n  *::after {\n    text-shadow: none !important;\n    box-shadow: none !important;\n  }\n  a:not(.btn) {\n    text-decoration: underline;\n  }\n  abbr[title]::after {\n    content: \" (\" attr(title) \")\";\n  }\n  pre {\n    white-space: pre-wrap !important;\n  }\n  pre,\n  blockquote {\n    border: 1px solid #adb5bd;\n    page-break-inside: avoid;\n  }\n  thead {\n    display: table-header-group;\n  }\n  tr,\n  img {\n    page-break-inside: avoid;\n  }\n  p,\n  h2,\n  h3 {\n    orphans: 3;\n    widows: 3;\n  }\n  h2,\n  h3 {\n    page-break-after: avoid;\n  }\n  @page {\n    size: a3;\n  }\n  body {\n    min-width: 992px !important;\n  }\n  .container {\n    min-width: 992px !important;\n  }\n  .navbar {\n    display: none;\n  }\n  .badge {\n    border: 1px solid #000;\n  }\n  .table {\n    border-collapse: collapse !important;\n  }\n  .table td,\n  .table th {\n    background-color: #fff !important;\n  }\n  .table-bordered th,\n  .table-bordered td {\n    border: 1px solid #dee2e6 !important;\n  }\n  .table-dark {\n    color: inherit;\n  }\n  .table-dark th,\n  .table-dark td,\n  .table-dark thead th,\n  .table-dark tbody + tbody {\n    border-color: #dee2e6;\n  }\n  .table .thead-dark th {\n    color: inherit;\n    border-color: #dee2e6;\n  }\n}\n/*# sourceMappingURL=bootstrap.css.map */","// stylelint-disable property-blacklist, scss/dollar-variable-default\n\n// SCSS RFS mixin\n//\n// Automated font-resizing\n//\n// See https://github.com/twbs/rfs\n\n// Configuration\n\n// Base font size\n$rfs-base-font-size: 1.25rem !default;\n$rfs-font-size-unit: rem !default;\n\n// Breakpoint at where font-size starts decreasing if screen width is smaller\n$rfs-breakpoint: 1200px !default;\n$rfs-breakpoint-unit: px !default;\n\n// Resize font-size based on screen height and width\n$rfs-two-dimensional: false !default;\n\n// Factor of decrease\n$rfs-factor: 10 !default;\n\n@if type-of($rfs-factor) != \"number\" or $rfs-factor <= 1 {\n  @error \"`#{$rfs-factor}` is not a valid  $rfs-factor, it must be greater than 1.\";\n}\n\n// Generate enable or disable classes. Possibilities: false, \"enable\" or \"disable\"\n$rfs-class: false !default;\n\n// 1 rem = $rfs-rem-value px\n$rfs-rem-value: 16 !default;\n\n// Safari iframe resize bug: https://github.com/twbs/rfs/issues/14\n$rfs-safari-iframe-resize-bug-fix: false !default;\n\n// Disable RFS by setting $enable-responsive-font-sizes to false\n$enable-responsive-font-sizes: true !default;\n\n// Cache $rfs-base-font-size unit\n$rfs-base-font-size-unit: unit($rfs-base-font-size);\n\n// Remove px-unit from $rfs-base-font-size for calculations\n@if $rfs-base-font-size-unit == \"px\" {\n  $rfs-base-font-size: $rfs-base-font-size / ($rfs-base-font-size * 0 + 1);\n}\n@else if $rfs-base-font-size-unit == \"rem\" {\n  $rfs-base-font-size: $rfs-base-font-size / ($rfs-base-font-size * 0 + 1 / $rfs-rem-value);\n}\n\n// Cache $rfs-breakpoint unit to prevent multiple calls\n$rfs-breakpoint-unit-cache: unit($rfs-breakpoint);\n\n// Remove unit from $rfs-breakpoint for calculations\n@if $rfs-breakpoint-unit-cache == \"px\" {\n  $rfs-breakpoint: $rfs-breakpoint / ($rfs-breakpoint * 0 + 1);\n}\n@else if $rfs-breakpoint-unit-cache == \"rem\" or $rfs-breakpoint-unit-cache == \"em\" {\n  $rfs-breakpoint: $rfs-breakpoint / ($rfs-breakpoint * 0 + 1 / $rfs-rem-value);\n}\n\n// Responsive font-size mixin\n@mixin rfs($fs, $important: false) {\n  // Cache $fs unit\n  $fs-unit: if(type-of($fs) == \"number\", unit($fs), false);\n\n  // Add !important suffix if needed\n  $rfs-suffix: if($important, \" !important\", \"\");\n\n  // If $fs isn't a number (like inherit) or $fs has a unit (not px or rem, like 1.5em) or $ is 0, just print the value\n  @if not $fs-unit or $fs-unit != \"\" and $fs-unit != \"px\" and $fs-unit != \"rem\" or $fs == 0 {\n    font-size: #{$fs}#{$rfs-suffix};\n  }\n  @else {\n    // Variables for storing static and fluid rescaling\n    $rfs-static: null;\n    $rfs-fluid: null;\n\n    // Remove px-unit from $fs for calculations\n    @if $fs-unit == \"px\" {\n      $fs: $fs / ($fs * 0 + 1);\n    }\n    @else if $fs-unit == \"rem\" {\n      $fs: $fs / ($fs * 0 + 1 / $rfs-rem-value);\n    }\n\n    // Set default font-size\n    @if $rfs-font-size-unit == rem {\n      $rfs-static: #{$fs / $rfs-rem-value}rem#{$rfs-suffix};\n    }\n    @else if $rfs-font-size-unit == px {\n      $rfs-static: #{$fs}px#{$rfs-suffix};\n    }\n    @else {\n      @error \"`#{$rfs-font-size-unit}` is not a valid unit for $rfs-font-size-unit. Use `px` or `rem`.\";\n    }\n\n    // Only add media query if font-size is bigger as the minimum font-size\n    // If $rfs-factor == 1, no rescaling will take place\n    @if $fs > $rfs-base-font-size and $enable-responsive-font-sizes {\n      $min-width: null;\n      $variable-unit: null;\n\n      // Calculate minimum font-size for given font-size\n      $fs-min: $rfs-base-font-size + ($fs - $rfs-base-font-size) / $rfs-factor;\n\n      // Calculate difference between given font-size and minimum font-size for given font-size\n      $fs-diff: $fs - $fs-min;\n\n      // Base font-size formatting\n      // No need to check if the unit is valid, because we did that before\n      $min-width: if($rfs-font-size-unit == rem, #{$fs-min / $rfs-rem-value}rem, #{$fs-min}px);\n\n      // If two-dimensional, use smallest of screen width and height\n      $variable-unit: if($rfs-two-dimensional, vmin, vw);\n\n      // Calculate the variable width between 0 and $rfs-breakpoint\n      $variable-width: #{$fs-diff * 100 / $rfs-breakpoint}#{$variable-unit};\n\n      // Set the calculated font-size.\n      $rfs-fluid: calc(#{$min-width} + #{$variable-width}) #{$rfs-suffix};\n    }\n\n    // Rendering\n    @if $rfs-fluid == null {\n      // Only render static font-size if no fluid font-size is available\n      font-size: $rfs-static;\n    }\n    @else {\n      $mq-value: null;\n\n      // RFS breakpoint formatting\n      @if $rfs-breakpoint-unit == em or $rfs-breakpoint-unit == rem {\n        $mq-value: #{$rfs-breakpoint / $rfs-rem-value}#{$rfs-breakpoint-unit};\n      }\n      @else if $rfs-breakpoint-unit == px {\n        $mq-value: #{$rfs-breakpoint}px;\n      }\n      @else {\n        @error \"`#{$rfs-breakpoint-unit}` is not a valid unit for $rfs-breakpoint-unit. Use `px`, `em` or `rem`.\";\n      }\n\n      @if $rfs-class == \"disable\" {\n        // Adding an extra class increases specificity,\n        // which prevents the media query to override the font size\n        &,\n        .disable-responsive-font-size &,\n        &.disable-responsive-font-size {\n          font-size: $rfs-static;\n        }\n      }\n      @else {\n        font-size: $rfs-static;\n      }\n\n      @if $rfs-two-dimensional {\n        @media (max-width: #{$mq-value}), (max-height: #{$mq-value}) {\n          @if $rfs-class == \"enable\" {\n            .enable-responsive-font-size &,\n            &.enable-responsive-font-size {\n              font-size: $rfs-fluid;\n            }\n          }\n          @else {\n            font-size: $rfs-fluid;\n          }\n\n          @if $rfs-safari-iframe-resize-bug-fix {\n            // stylelint-disable-next-line length-zero-no-unit\n            min-width: 0vw;\n          }\n        }\n      }\n      @else {\n        @media (max-width: #{$mq-value}) {\n          @if $rfs-class == \"enable\" {\n            .enable-responsive-font-size &,\n            &.enable-responsive-font-size {\n              font-size: $rfs-fluid;\n            }\n          }\n          @else {\n            font-size: $rfs-fluid;\n          }\n\n          @if $rfs-safari-iframe-resize-bug-fix {\n            // stylelint-disable-next-line length-zero-no-unit\n            min-width: 0vw;\n          }\n        }\n      }\n    }\n  }\n}\n\n// The font-size & responsive-font-size mixin uses RFS to rescale font sizes\n@mixin font-size($fs, $important: false) {\n  @include rfs($fs, $important);\n}\n\n@mixin responsive-font-size($fs, $important: false) {\n  @include rfs($fs, $important);\n}\n","/*!\n * Bootstrap v4.4.1 (https://getbootstrap.com/)\n * Copyright 2011-2019 The Bootstrap Authors\n * Copyright 2011-2019 Twitter, Inc.\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n */\n:root {\n  --blue: #007bff;\n  --indigo: #6610f2;\n  --purple: #6f42c1;\n  --pink: #e83e8c;\n  --red: #dc3545;\n  --orange: #fd7e14;\n  --yellow: #ffc107;\n  --green: #28a745;\n  --teal: #20c997;\n  --cyan: #17a2b8;\n  --white: #fff;\n  --gray: #6c757d;\n  --gray-dark: #343a40;\n  --primary: #007bff;\n  --secondary: #6c757d;\n  --success: #28a745;\n  --info: #17a2b8;\n  --warning: #ffc107;\n  --danger: #dc3545;\n  --light: #f8f9fa;\n  --dark: #343a40;\n  --breakpoint-xs: 0;\n  --breakpoint-sm: 576px;\n  --breakpoint-md: 768px;\n  --breakpoint-lg: 992px;\n  --breakpoint-xl: 1200px;\n  --font-family-sans-serif: -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, \"Helvetica Neue\", Arial, \"Noto Sans\", sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\", \"Noto Color Emoji\";\n  --font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace;\n}\n\n*,\n*::before,\n*::after {\n  box-sizing: border-box;\n}\n\nhtml {\n  font-family: sans-serif;\n  line-height: 1.15;\n  -webkit-text-size-adjust: 100%;\n  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);\n}\n\narticle, aside, figcaption, figure, footer, header, hgroup, main, nav, section {\n  display: block;\n}\n\nbody {\n  margin: 0;\n  font-family: -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, \"Helvetica Neue\", Arial, \"Noto Sans\", sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\", \"Noto Color Emoji\";\n  font-size: 1rem;\n  font-weight: 400;\n  line-height: 1.5;\n  color: #212529;\n  text-align: left;\n  background-color: #fff;\n}\n\n[tabindex=\"-1\"]:focus:not(:focus-visible) {\n  outline: 0 !important;\n}\n\nhr {\n  box-sizing: content-box;\n  height: 0;\n  overflow: visible;\n}\n\nh1, h2, h3, h4, h5, h6 {\n  margin-top: 0;\n  margin-bottom: 0.5rem;\n}\n\np {\n  margin-top: 0;\n  margin-bottom: 1rem;\n}\n\nabbr[title],\nabbr[data-original-title] {\n  text-decoration: underline;\n  text-decoration: underline dotted;\n  cursor: help;\n  border-bottom: 0;\n  text-decoration-skip-ink: none;\n}\n\naddress {\n  margin-bottom: 1rem;\n  font-style: normal;\n  line-height: inherit;\n}\n\nol,\nul,\ndl {\n  margin-top: 0;\n  margin-bottom: 1rem;\n}\n\nol ol,\nul ul,\nol ul,\nul ol {\n  margin-bottom: 0;\n}\n\ndt {\n  font-weight: 700;\n}\n\ndd {\n  margin-bottom: .5rem;\n  margin-left: 0;\n}\n\nblockquote {\n  margin: 0 0 1rem;\n}\n\nb,\nstrong {\n  font-weight: bolder;\n}\n\nsmall {\n  font-size: 80%;\n}\n\nsub,\nsup {\n  position: relative;\n  font-size: 75%;\n  line-height: 0;\n  vertical-align: baseline;\n}\n\nsub {\n  bottom: -.25em;\n}\n\nsup {\n  top: -.5em;\n}\n\na {\n  color: #007bff;\n  text-decoration: none;\n  background-color: transparent;\n}\n\na:hover {\n  color: #0056b3;\n  text-decoration: underline;\n}\n\na:not([href]) {\n  color: inherit;\n  text-decoration: none;\n}\n\na:not([href]):hover {\n  color: inherit;\n  text-decoration: none;\n}\n\npre,\ncode,\nkbd,\nsamp {\n  font-family: SFMono-Regular, Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace;\n  font-size: 1em;\n}\n\npre {\n  margin-top: 0;\n  margin-bottom: 1rem;\n  overflow: auto;\n}\n\nfigure {\n  margin: 0 0 1rem;\n}\n\nimg {\n  vertical-align: middle;\n  border-style: none;\n}\n\nsvg {\n  overflow: hidden;\n  vertical-align: middle;\n}\n\ntable {\n  border-collapse: collapse;\n}\n\ncaption {\n  padding-top: 0.75rem;\n  padding-bottom: 0.75rem;\n  color: #6c757d;\n  text-align: left;\n  caption-side: bottom;\n}\n\nth {\n  text-align: inherit;\n}\n\nlabel {\n  display: inline-block;\n  margin-bottom: 0.5rem;\n}\n\nbutton {\n  border-radius: 0;\n}\n\nbutton:focus {\n  outline: 1px dotted;\n  outline: 5px auto -webkit-focus-ring-color;\n}\n\ninput,\nbutton,\nselect,\noptgroup,\ntextarea {\n  margin: 0;\n  font-family: inherit;\n  font-size: inherit;\n  line-height: inherit;\n}\n\nbutton,\ninput {\n  overflow: visible;\n}\n\nbutton,\nselect {\n  text-transform: none;\n}\n\nselect {\n  word-wrap: normal;\n}\n\nbutton,\n[type=\"button\"],\n[type=\"reset\"],\n[type=\"submit\"] {\n  -webkit-appearance: button;\n}\n\nbutton:not(:disabled),\n[type=\"button\"]:not(:disabled),\n[type=\"reset\"]:not(:disabled),\n[type=\"submit\"]:not(:disabled) {\n  cursor: pointer;\n}\n\nbutton::-moz-focus-inner,\n[type=\"button\"]::-moz-focus-inner,\n[type=\"reset\"]::-moz-focus-inner,\n[type=\"submit\"]::-moz-focus-inner {\n  padding: 0;\n  border-style: none;\n}\n\ninput[type=\"radio\"],\ninput[type=\"checkbox\"] {\n  box-sizing: border-box;\n  padding: 0;\n}\n\ninput[type=\"date\"],\ninput[type=\"time\"],\ninput[type=\"datetime-local\"],\ninput[type=\"month\"] {\n  -webkit-appearance: listbox;\n}\n\ntextarea {\n  overflow: auto;\n  resize: vertical;\n}\n\nfieldset {\n  min-width: 0;\n  padding: 0;\n  margin: 0;\n  border: 0;\n}\n\nlegend {\n  display: block;\n  width: 100%;\n  max-width: 100%;\n  padding: 0;\n  margin-bottom: .5rem;\n  font-size: 1.5rem;\n  line-height: inherit;\n  color: inherit;\n  white-space: normal;\n}\n\nprogress {\n  vertical-align: baseline;\n}\n\n[type=\"number\"]::-webkit-inner-spin-button,\n[type=\"number\"]::-webkit-outer-spin-button {\n  height: auto;\n}\n\n[type=\"search\"] {\n  outline-offset: -2px;\n  -webkit-appearance: none;\n}\n\n[type=\"search\"]::-webkit-search-decoration {\n  -webkit-appearance: none;\n}\n\n::-webkit-file-upload-button {\n  font: inherit;\n  -webkit-appearance: button;\n}\n\noutput {\n  display: inline-block;\n}\n\nsummary {\n  display: list-item;\n  cursor: pointer;\n}\n\ntemplate {\n  display: none;\n}\n\n[hidden] {\n  display: none !important;\n}\n\nh1, h2, h3, h4, h5, h6,\n.h1, .h2, .h3, .h4, .h5, .h6 {\n  margin-bottom: 0.5rem;\n  font-weight: 500;\n  line-height: 1.2;\n}\n\nh1, .h1 {\n  font-size: 2.5rem;\n}\n\nh2, .h2 {\n  font-size: 2rem;\n}\n\nh3, .h3 {\n  font-size: 1.75rem;\n}\n\nh4, .h4 {\n  font-size: 1.5rem;\n}\n\nh5, .h5 {\n  font-size: 1.25rem;\n}\n\nh6, .h6 {\n  font-size: 1rem;\n}\n\n.lead {\n  font-size: 1.25rem;\n  font-weight: 300;\n}\n\n.display-1 {\n  font-size: 6rem;\n  font-weight: 300;\n  line-height: 1.2;\n}\n\n.display-2 {\n  font-size: 5.5rem;\n  font-weight: 300;\n  line-height: 1.2;\n}\n\n.display-3 {\n  font-size: 4.5rem;\n  font-weight: 300;\n  line-height: 1.2;\n}\n\n.display-4 {\n  font-size: 3.5rem;\n  font-weight: 300;\n  line-height: 1.2;\n}\n\nhr {\n  margin-top: 1rem;\n  margin-bottom: 1rem;\n  border: 0;\n  border-top: 1px solid rgba(0, 0, 0, 0.1);\n}\n\nsmall,\n.small {\n  font-size: 80%;\n  font-weight: 400;\n}\n\nmark,\n.mark {\n  padding: 0.2em;\n  background-color: #fcf8e3;\n}\n\n.list-unstyled {\n  padding-left: 0;\n  list-style: none;\n}\n\n.list-inline {\n  padding-left: 0;\n  list-style: none;\n}\n\n.list-inline-item {\n  display: inline-block;\n}\n\n.list-inline-item:not(:last-child) {\n  margin-right: 0.5rem;\n}\n\n.initialism {\n  font-size: 90%;\n  text-transform: uppercase;\n}\n\n.blockquote {\n  margin-bottom: 1rem;\n  font-size: 1.25rem;\n}\n\n.blockquote-footer {\n  display: block;\n  font-size: 80%;\n  color: #6c757d;\n}\n\n.blockquote-footer::before {\n  content: \"\\2014\\00A0\";\n}\n\n.img-fluid {\n  max-width: 100%;\n  height: auto;\n}\n\n.img-thumbnail {\n  padding: 0.25rem;\n  background-color: #fff;\n  border: 1px solid #dee2e6;\n  border-radius: 0.25rem;\n  max-width: 100%;\n  height: auto;\n}\n\n.figure {\n  display: inline-block;\n}\n\n.figure-img {\n  margin-bottom: 0.5rem;\n  line-height: 1;\n}\n\n.figure-caption {\n  font-size: 90%;\n  color: #6c757d;\n}\n\ncode {\n  font-size: 87.5%;\n  color: #e83e8c;\n  word-wrap: break-word;\n}\n\na > code {\n  color: inherit;\n}\n\nkbd {\n  padding: 0.2rem 0.4rem;\n  font-size: 87.5%;\n  color: #fff;\n  background-color: #212529;\n  border-radius: 0.2rem;\n}\n\nkbd kbd {\n  padding: 0;\n  font-size: 100%;\n  font-weight: 700;\n}\n\npre {\n  display: block;\n  font-size: 87.5%;\n  color: #212529;\n}\n\npre code {\n  font-size: inherit;\n  color: inherit;\n  word-break: normal;\n}\n\n.pre-scrollable {\n  max-height: 340px;\n  overflow-y: scroll;\n}\n\n.container {\n  width: 100%;\n  padding-right: 15px;\n  padding-left: 15px;\n  margin-right: auto;\n  margin-left: auto;\n}\n\n@media (min-width: 576px) {\n  .container {\n    max-width: 540px;\n  }\n}\n\n@media (min-width: 768px) {\n  .container {\n    max-width: 720px;\n  }\n}\n\n@media (min-width: 992px) {\n  .container {\n    max-width: 960px;\n  }\n}\n\n@media (min-width: 1200px) {\n  .container {\n    max-width: 1140px;\n  }\n}\n\n.container-fluid, .container-sm, .container-md, .container-lg, .container-xl {\n  width: 100%;\n  padding-right: 15px;\n  padding-left: 15px;\n  margin-right: auto;\n  margin-left: auto;\n}\n\n@media (min-width: 576px) {\n  .container, .container-sm {\n    max-width: 540px;\n  }\n}\n\n@media (min-width: 768px) {\n  .container, .container-sm, .container-md {\n    max-width: 720px;\n  }\n}\n\n@media (min-width: 992px) {\n  .container, .container-sm, .container-md, .container-lg {\n    max-width: 960px;\n  }\n}\n\n@media (min-width: 1200px) {\n  .container, .container-sm, .container-md, .container-lg, .container-xl {\n    max-width: 1140px;\n  }\n}\n\n.row {\n  display: flex;\n  flex-wrap: wrap;\n  margin-right: -15px;\n  margin-left: -15px;\n}\n\n.no-gutters {\n  margin-right: 0;\n  margin-left: 0;\n}\n\n.no-gutters > .col,\n.no-gutters > [class*=\"col-\"] {\n  padding-right: 0;\n  padding-left: 0;\n}\n\n.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col,\n.col-auto, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm,\n.col-sm-auto, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md,\n.col-md-auto, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg,\n.col-lg-auto, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl,\n.col-xl-auto {\n  position: relative;\n  width: 100%;\n  padding-right: 15px;\n  padding-left: 15px;\n}\n\n.col {\n  flex-basis: 0;\n  flex-grow: 1;\n  max-width: 100%;\n}\n\n.row-cols-1 > * {\n  flex: 0 0 100%;\n  max-width: 100%;\n}\n\n.row-cols-2 > * {\n  flex: 0 0 50%;\n  max-width: 50%;\n}\n\n.row-cols-3 > * {\n  flex: 0 0 33.333333%;\n  max-width: 33.333333%;\n}\n\n.row-cols-4 > * {\n  flex: 0 0 25%;\n  max-width: 25%;\n}\n\n.row-cols-5 > * {\n  flex: 0 0 20%;\n  max-width: 20%;\n}\n\n.row-cols-6 > * {\n  flex: 0 0 16.666667%;\n  max-width: 16.666667%;\n}\n\n.col-auto {\n  flex: 0 0 auto;\n  width: auto;\n  max-width: 100%;\n}\n\n.col-1 {\n  flex: 0 0 8.333333%;\n  max-width: 8.333333%;\n}\n\n.col-2 {\n  flex: 0 0 16.666667%;\n  max-width: 16.666667%;\n}\n\n.col-3 {\n  flex: 0 0 25%;\n  max-width: 25%;\n}\n\n.col-4 {\n  flex: 0 0 33.333333%;\n  max-width: 33.333333%;\n}\n\n.col-5 {\n  flex: 0 0 41.666667%;\n  max-width: 41.666667%;\n}\n\n.col-6 {\n  flex: 0 0 50%;\n  max-width: 50%;\n}\n\n.col-7 {\n  flex: 0 0 58.333333%;\n  max-width: 58.333333%;\n}\n\n.col-8 {\n  flex: 0 0 66.666667%;\n  max-width: 66.666667%;\n}\n\n.col-9 {\n  flex: 0 0 75%;\n  max-width: 75%;\n}\n\n.col-10 {\n  flex: 0 0 83.333333%;\n  max-width: 83.333333%;\n}\n\n.col-11 {\n  flex: 0 0 91.666667%;\n  max-width: 91.666667%;\n}\n\n.col-12 {\n  flex: 0 0 100%;\n  max-width: 100%;\n}\n\n.order-first {\n  order: -1;\n}\n\n.order-last {\n  order: 13;\n}\n\n.order-0 {\n  order: 0;\n}\n\n.order-1 {\n  order: 1;\n}\n\n.order-2 {\n  order: 2;\n}\n\n.order-3 {\n  order: 3;\n}\n\n.order-4 {\n  order: 4;\n}\n\n.order-5 {\n  order: 5;\n}\n\n.order-6 {\n  order: 6;\n}\n\n.order-7 {\n  order: 7;\n}\n\n.order-8 {\n  order: 8;\n}\n\n.order-9 {\n  order: 9;\n}\n\n.order-10 {\n  order: 10;\n}\n\n.order-11 {\n  order: 11;\n}\n\n.order-12 {\n  order: 12;\n}\n\n.offset-1 {\n  margin-left: 8.333333%;\n}\n\n.offset-2 {\n  margin-left: 16.666667%;\n}\n\n.offset-3 {\n  margin-left: 25%;\n}\n\n.offset-4 {\n  margin-left: 33.333333%;\n}\n\n.offset-5 {\n  margin-left: 41.666667%;\n}\n\n.offset-6 {\n  margin-left: 50%;\n}\n\n.offset-7 {\n  margin-left: 58.333333%;\n}\n\n.offset-8 {\n  margin-left: 66.666667%;\n}\n\n.offset-9 {\n  margin-left: 75%;\n}\n\n.offset-10 {\n  margin-left: 83.333333%;\n}\n\n.offset-11 {\n  margin-left: 91.666667%;\n}\n\n@media (min-width: 576px) {\n  .col-sm {\n    flex-basis: 0;\n    flex-grow: 1;\n    max-width: 100%;\n  }\n  .row-cols-sm-1 > * {\n    flex: 0 0 100%;\n    max-width: 100%;\n  }\n  .row-cols-sm-2 > * {\n    flex: 0 0 50%;\n    max-width: 50%;\n  }\n  .row-cols-sm-3 > * {\n    flex: 0 0 33.333333%;\n    max-width: 33.333333%;\n  }\n  .row-cols-sm-4 > * {\n    flex: 0 0 25%;\n    max-width: 25%;\n  }\n  .row-cols-sm-5 > * {\n    flex: 0 0 20%;\n    max-width: 20%;\n  }\n  .row-cols-sm-6 > * {\n    flex: 0 0 16.666667%;\n    max-width: 16.666667%;\n  }\n  .col-sm-auto {\n    flex: 0 0 auto;\n    width: auto;\n    max-width: 100%;\n  }\n  .col-sm-1 {\n    flex: 0 0 8.333333%;\n    max-width: 8.333333%;\n  }\n  .col-sm-2 {\n    flex: 0 0 16.666667%;\n    max-width: 16.666667%;\n  }\n  .col-sm-3 {\n    flex: 0 0 25%;\n    max-width: 25%;\n  }\n  .col-sm-4 {\n    flex: 0 0 33.333333%;\n    max-width: 33.333333%;\n  }\n  .col-sm-5 {\n    flex: 0 0 41.666667%;\n    max-width: 41.666667%;\n  }\n  .col-sm-6 {\n    flex: 0 0 50%;\n    max-width: 50%;\n  }\n  .col-sm-7 {\n    flex: 0 0 58.333333%;\n    max-width: 58.333333%;\n  }\n  .col-sm-8 {\n    flex: 0 0 66.666667%;\n    max-width: 66.666667%;\n  }\n  .col-sm-9 {\n    flex: 0 0 75%;\n    max-width: 75%;\n  }\n  .col-sm-10 {\n    flex: 0 0 83.333333%;\n    max-width: 83.333333%;\n  }\n  .col-sm-11 {\n    flex: 0 0 91.666667%;\n    max-width: 91.666667%;\n  }\n  .col-sm-12 {\n    flex: 0 0 100%;\n    max-width: 100%;\n  }\n  .order-sm-first {\n    order: -1;\n  }\n  .order-sm-last {\n    order: 13;\n  }\n  .order-sm-0 {\n    order: 0;\n  }\n  .order-sm-1 {\n    order: 1;\n  }\n  .order-sm-2 {\n    order: 2;\n  }\n  .order-sm-3 {\n    order: 3;\n  }\n  .order-sm-4 {\n    order: 4;\n  }\n  .order-sm-5 {\n    order: 5;\n  }\n  .order-sm-6 {\n    order: 6;\n  }\n  .order-sm-7 {\n    order: 7;\n  }\n  .order-sm-8 {\n    order: 8;\n  }\n  .order-sm-9 {\n    order: 9;\n  }\n  .order-sm-10 {\n    order: 10;\n  }\n  .order-sm-11 {\n    order: 11;\n  }\n  .order-sm-12 {\n    order: 12;\n  }\n  .offset-sm-0 {\n    margin-left: 0;\n  }\n  .offset-sm-1 {\n    margin-left: 8.333333%;\n  }\n  .offset-sm-2 {\n    margin-left: 16.666667%;\n  }\n  .offset-sm-3 {\n    margin-left: 25%;\n  }\n  .offset-sm-4 {\n    margin-left: 33.333333%;\n  }\n  .offset-sm-5 {\n    margin-left: 41.666667%;\n  }\n  .offset-sm-6 {\n    margin-left: 50%;\n  }\n  .offset-sm-7 {\n    margin-left: 58.333333%;\n  }\n  .offset-sm-8 {\n    margin-left: 66.666667%;\n  }\n  .offset-sm-9 {\n    margin-left: 75%;\n  }\n  .offset-sm-10 {\n    margin-left: 83.333333%;\n  }\n  .offset-sm-11 {\n    margin-left: 91.666667%;\n  }\n}\n\n@media (min-width: 768px) {\n  .col-md {\n    flex-basis: 0;\n    flex-grow: 1;\n    max-width: 100%;\n  }\n  .row-cols-md-1 > * {\n    flex: 0 0 100%;\n    max-width: 100%;\n  }\n  .row-cols-md-2 > * {\n    flex: 0 0 50%;\n    max-width: 50%;\n  }\n  .row-cols-md-3 > * {\n    flex: 0 0 33.333333%;\n    max-width: 33.333333%;\n  }\n  .row-cols-md-4 > * {\n    flex: 0 0 25%;\n    max-width: 25%;\n  }\n  .row-cols-md-5 > * {\n    flex: 0 0 20%;\n    max-width: 20%;\n  }\n  .row-cols-md-6 > * {\n    flex: 0 0 16.666667%;\n    max-width: 16.666667%;\n  }\n  .col-md-auto {\n    flex: 0 0 auto;\n    width: auto;\n    max-width: 100%;\n  }\n  .col-md-1 {\n    flex: 0 0 8.333333%;\n    max-width: 8.333333%;\n  }\n  .col-md-2 {\n    flex: 0 0 16.666667%;\n    max-width: 16.666667%;\n  }\n  .col-md-3 {\n    flex: 0 0 25%;\n    max-width: 25%;\n  }\n  .col-md-4 {\n    flex: 0 0 33.333333%;\n    max-width: 33.333333%;\n  }\n  .col-md-5 {\n    flex: 0 0 41.666667%;\n    max-width: 41.666667%;\n  }\n  .col-md-6 {\n    flex: 0 0 50%;\n    max-width: 50%;\n  }\n  .col-md-7 {\n    flex: 0 0 58.333333%;\n    max-width: 58.333333%;\n  }\n  .col-md-8 {\n    flex: 0 0 66.666667%;\n    max-width: 66.666667%;\n  }\n  .col-md-9 {\n    flex: 0 0 75%;\n    max-width: 75%;\n  }\n  .col-md-10 {\n    flex: 0 0 83.333333%;\n    max-width: 83.333333%;\n  }\n  .col-md-11 {\n    flex: 0 0 91.666667%;\n    max-width: 91.666667%;\n  }\n  .col-md-12 {\n    flex: 0 0 100%;\n    max-width: 100%;\n  }\n  .order-md-first {\n    order: -1;\n  }\n  .order-md-last {\n    order: 13;\n  }\n  .order-md-0 {\n    order: 0;\n  }\n  .order-md-1 {\n    order: 1;\n  }\n  .order-md-2 {\n    order: 2;\n  }\n  .order-md-3 {\n    order: 3;\n  }\n  .order-md-4 {\n    order: 4;\n  }\n  .order-md-5 {\n    order: 5;\n  }\n  .order-md-6 {\n    order: 6;\n  }\n  .order-md-7 {\n    order: 7;\n  }\n  .order-md-8 {\n    order: 8;\n  }\n  .order-md-9 {\n    order: 9;\n  }\n  .order-md-10 {\n    order: 10;\n  }\n  .order-md-11 {\n    order: 11;\n  }\n  .order-md-12 {\n    order: 12;\n  }\n  .offset-md-0 {\n    margin-left: 0;\n  }\n  .offset-md-1 {\n    margin-left: 8.333333%;\n  }\n  .offset-md-2 {\n    margin-left: 16.666667%;\n  }\n  .offset-md-3 {\n    margin-left: 25%;\n  }\n  .offset-md-4 {\n    margin-left: 33.333333%;\n  }\n  .offset-md-5 {\n    margin-left: 41.666667%;\n  }\n  .offset-md-6 {\n    margin-left: 50%;\n  }\n  .offset-md-7 {\n    margin-left: 58.333333%;\n  }\n  .offset-md-8 {\n    margin-left: 66.666667%;\n  }\n  .offset-md-9 {\n    margin-left: 75%;\n  }\n  .offset-md-10 {\n    margin-left: 83.333333%;\n  }\n  .offset-md-11 {\n    margin-left: 91.666667%;\n  }\n}\n\n@media (min-width: 992px) {\n  .col-lg {\n    flex-basis: 0;\n    flex-grow: 1;\n    max-width: 100%;\n  }\n  .row-cols-lg-1 > * {\n    flex: 0 0 100%;\n    max-width: 100%;\n  }\n  .row-cols-lg-2 > * {\n    flex: 0 0 50%;\n    max-width: 50%;\n  }\n  .row-cols-lg-3 > * {\n    flex: 0 0 33.333333%;\n    max-width: 33.333333%;\n  }\n  .row-cols-lg-4 > * {\n    flex: 0 0 25%;\n    max-width: 25%;\n  }\n  .row-cols-lg-5 > * {\n    flex: 0 0 20%;\n    max-width: 20%;\n  }\n  .row-cols-lg-6 > * {\n    flex: 0 0 16.666667%;\n    max-width: 16.666667%;\n  }\n  .col-lg-auto {\n    flex: 0 0 auto;\n    width: auto;\n    max-width: 100%;\n  }\n  .col-lg-1 {\n    flex: 0 0 8.333333%;\n    max-width: 8.333333%;\n  }\n  .col-lg-2 {\n    flex: 0 0 16.666667%;\n    max-width: 16.666667%;\n  }\n  .col-lg-3 {\n    flex: 0 0 25%;\n    max-width: 25%;\n  }\n  .col-lg-4 {\n    flex: 0 0 33.333333%;\n    max-width: 33.333333%;\n  }\n  .col-lg-5 {\n    flex: 0 0 41.666667%;\n    max-width: 41.666667%;\n  }\n  .col-lg-6 {\n    flex: 0 0 50%;\n    max-width: 50%;\n  }\n  .col-lg-7 {\n    flex: 0 0 58.333333%;\n    max-width: 58.333333%;\n  }\n  .col-lg-8 {\n    flex: 0 0 66.666667%;\n    max-width: 66.666667%;\n  }\n  .col-lg-9 {\n    flex: 0 0 75%;\n    max-width: 75%;\n  }\n  .col-lg-10 {\n    flex: 0 0 83.333333%;\n    max-width: 83.333333%;\n  }\n  .col-lg-11 {\n    flex: 0 0 91.666667%;\n    max-width: 91.666667%;\n  }\n  .col-lg-12 {\n    flex: 0 0 100%;\n    max-width: 100%;\n  }\n  .order-lg-first {\n    order: -1;\n  }\n  .order-lg-last {\n    order: 13;\n  }\n  .order-lg-0 {\n    order: 0;\n  }\n  .order-lg-1 {\n    order: 1;\n  }\n  .order-lg-2 {\n    order: 2;\n  }\n  .order-lg-3 {\n    order: 3;\n  }\n  .order-lg-4 {\n    order: 4;\n  }\n  .order-lg-5 {\n    order: 5;\n  }\n  .order-lg-6 {\n    order: 6;\n  }\n  .order-lg-7 {\n    order: 7;\n  }\n  .order-lg-8 {\n    order: 8;\n  }\n  .order-lg-9 {\n    order: 9;\n  }\n  .order-lg-10 {\n    order: 10;\n  }\n  .order-lg-11 {\n    order: 11;\n  }\n  .order-lg-12 {\n    order: 12;\n  }\n  .offset-lg-0 {\n    margin-left: 0;\n  }\n  .offset-lg-1 {\n    margin-left: 8.333333%;\n  }\n  .offset-lg-2 {\n    margin-left: 16.666667%;\n  }\n  .offset-lg-3 {\n    margin-left: 25%;\n  }\n  .offset-lg-4 {\n    margin-left: 33.333333%;\n  }\n  .offset-lg-5 {\n    margin-left: 41.666667%;\n  }\n  .offset-lg-6 {\n    margin-left: 50%;\n  }\n  .offset-lg-7 {\n    margin-left: 58.333333%;\n  }\n  .offset-lg-8 {\n    margin-left: 66.666667%;\n  }\n  .offset-lg-9 {\n    margin-left: 75%;\n  }\n  .offset-lg-10 {\n    margin-left: 83.333333%;\n  }\n  .offset-lg-11 {\n    margin-left: 91.666667%;\n  }\n}\n\n@media (min-width: 1200px) {\n  .col-xl {\n    flex-basis: 0;\n    flex-grow: 1;\n    max-width: 100%;\n  }\n  .row-cols-xl-1 > * {\n    flex: 0 0 100%;\n    max-width: 100%;\n  }\n  .row-cols-xl-2 > * {\n    flex: 0 0 50%;\n    max-width: 50%;\n  }\n  .row-cols-xl-3 > * {\n    flex: 0 0 33.333333%;\n    max-width: 33.333333%;\n  }\n  .row-cols-xl-4 > * {\n    flex: 0 0 25%;\n    max-width: 25%;\n  }\n  .row-cols-xl-5 > * {\n    flex: 0 0 20%;\n    max-width: 20%;\n  }\n  .row-cols-xl-6 > * {\n    flex: 0 0 16.666667%;\n    max-width: 16.666667%;\n  }\n  .col-xl-auto {\n    flex: 0 0 auto;\n    width: auto;\n    max-width: 100%;\n  }\n  .col-xl-1 {\n    flex: 0 0 8.333333%;\n    max-width: 8.333333%;\n  }\n  .col-xl-2 {\n    flex: 0 0 16.666667%;\n    max-width: 16.666667%;\n  }\n  .col-xl-3 {\n    flex: 0 0 25%;\n    max-width: 25%;\n  }\n  .col-xl-4 {\n    flex: 0 0 33.333333%;\n    max-width: 33.333333%;\n  }\n  .col-xl-5 {\n    flex: 0 0 41.666667%;\n    max-width: 41.666667%;\n  }\n  .col-xl-6 {\n    flex: 0 0 50%;\n    max-width: 50%;\n  }\n  .col-xl-7 {\n    flex: 0 0 58.333333%;\n    max-width: 58.333333%;\n  }\n  .col-xl-8 {\n    flex: 0 0 66.666667%;\n    max-width: 66.666667%;\n  }\n  .col-xl-9 {\n    flex: 0 0 75%;\n    max-width: 75%;\n  }\n  .col-xl-10 {\n    flex: 0 0 83.333333%;\n    max-width: 83.333333%;\n  }\n  .col-xl-11 {\n    flex: 0 0 91.666667%;\n    max-width: 91.666667%;\n  }\n  .col-xl-12 {\n    flex: 0 0 100%;\n    max-width: 100%;\n  }\n  .order-xl-first {\n    order: -1;\n  }\n  .order-xl-last {\n    order: 13;\n  }\n  .order-xl-0 {\n    order: 0;\n  }\n  .order-xl-1 {\n    order: 1;\n  }\n  .order-xl-2 {\n    order: 2;\n  }\n  .order-xl-3 {\n    order: 3;\n  }\n  .order-xl-4 {\n    order: 4;\n  }\n  .order-xl-5 {\n    order: 5;\n  }\n  .order-xl-6 {\n    order: 6;\n  }\n  .order-xl-7 {\n    order: 7;\n  }\n  .order-xl-8 {\n    order: 8;\n  }\n  .order-xl-9 {\n    order: 9;\n  }\n  .order-xl-10 {\n    order: 10;\n  }\n  .order-xl-11 {\n    order: 11;\n  }\n  .order-xl-12 {\n    order: 12;\n  }\n  .offset-xl-0 {\n    margin-left: 0;\n  }\n  .offset-xl-1 {\n    margin-left: 8.333333%;\n  }\n  .offset-xl-2 {\n    margin-left: 16.666667%;\n  }\n  .offset-xl-3 {\n    margin-left: 25%;\n  }\n  .offset-xl-4 {\n    margin-left: 33.333333%;\n  }\n  .offset-xl-5 {\n    margin-left: 41.666667%;\n  }\n  .offset-xl-6 {\n    margin-left: 50%;\n  }\n  .offset-xl-7 {\n    margin-left: 58.333333%;\n  }\n  .offset-xl-8 {\n    margin-left: 66.666667%;\n  }\n  .offset-xl-9 {\n    margin-left: 75%;\n  }\n  .offset-xl-10 {\n    margin-left: 83.333333%;\n  }\n  .offset-xl-11 {\n    margin-left: 91.666667%;\n  }\n}\n\n.table {\n  width: 100%;\n  margin-bottom: 1rem;\n  color: #212529;\n}\n\n.table th,\n.table td {\n  padding: 0.75rem;\n  vertical-align: top;\n  border-top: 1px solid #dee2e6;\n}\n\n.table thead th {\n  vertical-align: bottom;\n  border-bottom: 2px solid #dee2e6;\n}\n\n.table tbody + tbody {\n  border-top: 2px solid #dee2e6;\n}\n\n.table-sm th,\n.table-sm td {\n  padding: 0.3rem;\n}\n\n.table-bordered {\n  border: 1px solid #dee2e6;\n}\n\n.table-bordered th,\n.table-bordered td {\n  border: 1px solid #dee2e6;\n}\n\n.table-bordered thead th,\n.table-bordered thead td {\n  border-bottom-width: 2px;\n}\n\n.table-borderless th,\n.table-borderless td,\n.table-borderless thead th,\n.table-borderless tbody + tbody {\n  border: 0;\n}\n\n.table-striped tbody tr:nth-of-type(odd) {\n  background-color: rgba(0, 0, 0, 0.05);\n}\n\n.table-hover tbody tr:hover {\n  color: #212529;\n  background-color: rgba(0, 0, 0, 0.075);\n}\n\n.table-primary,\n.table-primary > th,\n.table-primary > td {\n  background-color: #b8daff;\n}\n\n.table-primary th,\n.table-primary td,\n.table-primary thead th,\n.table-primary tbody + tbody {\n  border-color: #7abaff;\n}\n\n.table-hover .table-primary:hover {\n  background-color: #9fcdff;\n}\n\n.table-hover .table-primary:hover > td,\n.table-hover .table-primary:hover > th {\n  background-color: #9fcdff;\n}\n\n.table-secondary,\n.table-secondary > th,\n.table-secondary > td {\n  background-color: #d6d8db;\n}\n\n.table-secondary th,\n.table-secondary td,\n.table-secondary thead th,\n.table-secondary tbody + tbody {\n  border-color: #b3b7bb;\n}\n\n.table-hover .table-secondary:hover {\n  background-color: #c8cbcf;\n}\n\n.table-hover .table-secondary:hover > td,\n.table-hover .table-secondary:hover > th {\n  background-color: #c8cbcf;\n}\n\n.table-success,\n.table-success > th,\n.table-success > td {\n  background-color: #c3e6cb;\n}\n\n.table-success th,\n.table-success td,\n.table-success thead th,\n.table-success tbody + tbody {\n  border-color: #8fd19e;\n}\n\n.table-hover .table-success:hover {\n  background-color: #b1dfbb;\n}\n\n.table-hover .table-success:hover > td,\n.table-hover .table-success:hover > th {\n  background-color: #b1dfbb;\n}\n\n.table-info,\n.table-info > th,\n.table-info > td {\n  background-color: #bee5eb;\n}\n\n.table-info th,\n.table-info td,\n.table-info thead th,\n.table-info tbody + tbody {\n  border-color: #86cfda;\n}\n\n.table-hover .table-info:hover {\n  background-color: #abdde5;\n}\n\n.table-hover .table-info:hover > td,\n.table-hover .table-info:hover > th {\n  background-color: #abdde5;\n}\n\n.table-warning,\n.table-warning > th,\n.table-warning > td {\n  background-color: #ffeeba;\n}\n\n.table-warning th,\n.table-warning td,\n.table-warning thead th,\n.table-warning tbody + tbody {\n  border-color: #ffdf7e;\n}\n\n.table-hover .table-warning:hover {\n  background-color: #ffe8a1;\n}\n\n.table-hover .table-warning:hover > td,\n.table-hover .table-warning:hover > th {\n  background-color: #ffe8a1;\n}\n\n.table-danger,\n.table-danger > th,\n.table-danger > td {\n  background-color: #f5c6cb;\n}\n\n.table-danger th,\n.table-danger td,\n.table-danger thead th,\n.table-danger tbody + tbody {\n  border-color: #ed969e;\n}\n\n.table-hover .table-danger:hover {\n  background-color: #f1b0b7;\n}\n\n.table-hover .table-danger:hover > td,\n.table-hover .table-danger:hover > th {\n  background-color: #f1b0b7;\n}\n\n.table-light,\n.table-light > th,\n.table-light > td {\n  background-color: #fdfdfe;\n}\n\n.table-light th,\n.table-light td,\n.table-light thead th,\n.table-light tbody + tbody {\n  border-color: #fbfcfc;\n}\n\n.table-hover .table-light:hover {\n  background-color: #ececf6;\n}\n\n.table-hover .table-light:hover > td,\n.table-hover .table-light:hover > th {\n  background-color: #ececf6;\n}\n\n.table-dark,\n.table-dark > th,\n.table-dark > td {\n  background-color: #c6c8ca;\n}\n\n.table-dark th,\n.table-dark td,\n.table-dark thead th,\n.table-dark tbody + tbody {\n  border-color: #95999c;\n}\n\n.table-hover .table-dark:hover {\n  background-color: #b9bbbe;\n}\n\n.table-hover .table-dark:hover > td,\n.table-hover .table-dark:hover > th {\n  background-color: #b9bbbe;\n}\n\n.table-active,\n.table-active > th,\n.table-active > td {\n  background-color: rgba(0, 0, 0, 0.075);\n}\n\n.table-hover .table-active:hover {\n  background-color: rgba(0, 0, 0, 0.075);\n}\n\n.table-hover .table-active:hover > td,\n.table-hover .table-active:hover > th {\n  background-color: rgba(0, 0, 0, 0.075);\n}\n\n.table .thead-dark th {\n  color: #fff;\n  background-color: #343a40;\n  border-color: #454d55;\n}\n\n.table .thead-light th {\n  color: #495057;\n  background-color: #e9ecef;\n  border-color: #dee2e6;\n}\n\n.table-dark {\n  color: #fff;\n  background-color: #343a40;\n}\n\n.table-dark th,\n.table-dark td,\n.table-dark thead th {\n  border-color: #454d55;\n}\n\n.table-dark.table-bordered {\n  border: 0;\n}\n\n.table-dark.table-striped tbody tr:nth-of-type(odd) {\n  background-color: rgba(255, 255, 255, 0.05);\n}\n\n.table-dark.table-hover tbody tr:hover {\n  color: #fff;\n  background-color: rgba(255, 255, 255, 0.075);\n}\n\n@media (max-width: 575.98px) {\n  .table-responsive-sm {\n    display: block;\n    width: 100%;\n    overflow-x: auto;\n    -webkit-overflow-scrolling: touch;\n  }\n  .table-responsive-sm > .table-bordered {\n    border: 0;\n  }\n}\n\n@media (max-width: 767.98px) {\n  .table-responsive-md {\n    display: block;\n    width: 100%;\n    overflow-x: auto;\n    -webkit-overflow-scrolling: touch;\n  }\n  .table-responsive-md > .table-bordered {\n    border: 0;\n  }\n}\n\n@media (max-width: 991.98px) {\n  .table-responsive-lg {\n    display: block;\n    width: 100%;\n    overflow-x: auto;\n    -webkit-overflow-scrolling: touch;\n  }\n  .table-responsive-lg > .table-bordered {\n    border: 0;\n  }\n}\n\n@media (max-width: 1199.98px) {\n  .table-responsive-xl {\n    display: block;\n    width: 100%;\n    overflow-x: auto;\n    -webkit-overflow-scrolling: touch;\n  }\n  .table-responsive-xl > .table-bordered {\n    border: 0;\n  }\n}\n\n.table-responsive {\n  display: block;\n  width: 100%;\n  overflow-x: auto;\n  -webkit-overflow-scrolling: touch;\n}\n\n.table-responsive > .table-bordered {\n  border: 0;\n}\n\n.form-control {\n  display: block;\n  width: 100%;\n  height: calc(1.5em + 0.75rem + 2px);\n  padding: 0.375rem 0.75rem;\n  font-size: 1rem;\n  font-weight: 400;\n  line-height: 1.5;\n  color: #495057;\n  background-color: #fff;\n  background-clip: padding-box;\n  border: 1px solid #ced4da;\n  border-radius: 0.25rem;\n  transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .form-control {\n    transition: none;\n  }\n}\n\n.form-control::-ms-expand {\n  background-color: transparent;\n  border: 0;\n}\n\n.form-control:-moz-focusring {\n  color: transparent;\n  text-shadow: 0 0 0 #495057;\n}\n\n.form-control:focus {\n  color: #495057;\n  background-color: #fff;\n  border-color: #80bdff;\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);\n}\n\n.form-control::placeholder {\n  color: #6c757d;\n  opacity: 1;\n}\n\n.form-control:disabled, .form-control[readonly] {\n  background-color: #e9ecef;\n  opacity: 1;\n}\n\nselect.form-control:focus::-ms-value {\n  color: #495057;\n  background-color: #fff;\n}\n\n.form-control-file,\n.form-control-range {\n  display: block;\n  width: 100%;\n}\n\n.col-form-label {\n  padding-top: calc(0.375rem + 1px);\n  padding-bottom: calc(0.375rem + 1px);\n  margin-bottom: 0;\n  font-size: inherit;\n  line-height: 1.5;\n}\n\n.col-form-label-lg {\n  padding-top: calc(0.5rem + 1px);\n  padding-bottom: calc(0.5rem + 1px);\n  font-size: 1.25rem;\n  line-height: 1.5;\n}\n\n.col-form-label-sm {\n  padding-top: calc(0.25rem + 1px);\n  padding-bottom: calc(0.25rem + 1px);\n  font-size: 0.875rem;\n  line-height: 1.5;\n}\n\n.form-control-plaintext {\n  display: block;\n  width: 100%;\n  padding: 0.375rem 0;\n  margin-bottom: 0;\n  font-size: 1rem;\n  line-height: 1.5;\n  color: #212529;\n  background-color: transparent;\n  border: solid transparent;\n  border-width: 1px 0;\n}\n\n.form-control-plaintext.form-control-sm, .form-control-plaintext.form-control-lg {\n  padding-right: 0;\n  padding-left: 0;\n}\n\n.form-control-sm {\n  height: calc(1.5em + 0.5rem + 2px);\n  padding: 0.25rem 0.5rem;\n  font-size: 0.875rem;\n  line-height: 1.5;\n  border-radius: 0.2rem;\n}\n\n.form-control-lg {\n  height: calc(1.5em + 1rem + 2px);\n  padding: 0.5rem 1rem;\n  font-size: 1.25rem;\n  line-height: 1.5;\n  border-radius: 0.3rem;\n}\n\nselect.form-control[size], select.form-control[multiple] {\n  height: auto;\n}\n\ntextarea.form-control {\n  height: auto;\n}\n\n.form-group {\n  margin-bottom: 1rem;\n}\n\n.form-text {\n  display: block;\n  margin-top: 0.25rem;\n}\n\n.form-row {\n  display: flex;\n  flex-wrap: wrap;\n  margin-right: -5px;\n  margin-left: -5px;\n}\n\n.form-row > .col,\n.form-row > [class*=\"col-\"] {\n  padding-right: 5px;\n  padding-left: 5px;\n}\n\n.form-check {\n  position: relative;\n  display: block;\n  padding-left: 1.25rem;\n}\n\n.form-check-input {\n  position: absolute;\n  margin-top: 0.3rem;\n  margin-left: -1.25rem;\n}\n\n.form-check-input[disabled] ~ .form-check-label,\n.form-check-input:disabled ~ .form-check-label {\n  color: #6c757d;\n}\n\n.form-check-label {\n  margin-bottom: 0;\n}\n\n.form-check-inline {\n  display: inline-flex;\n  align-items: center;\n  padding-left: 0;\n  margin-right: 0.75rem;\n}\n\n.form-check-inline .form-check-input {\n  position: static;\n  margin-top: 0;\n  margin-right: 0.3125rem;\n  margin-left: 0;\n}\n\n.valid-feedback {\n  display: none;\n  width: 100%;\n  margin-top: 0.25rem;\n  font-size: 80%;\n  color: #28a745;\n}\n\n.valid-tooltip {\n  position: absolute;\n  top: 100%;\n  z-index: 5;\n  display: none;\n  max-width: 100%;\n  padding: 0.25rem 0.5rem;\n  margin-top: .1rem;\n  font-size: 0.875rem;\n  line-height: 1.5;\n  color: #fff;\n  background-color: rgba(40, 167, 69, 0.9);\n  border-radius: 0.25rem;\n}\n\n.was-validated :valid ~ .valid-feedback,\n.was-validated :valid ~ .valid-tooltip,\n.is-valid ~ .valid-feedback,\n.is-valid ~ .valid-tooltip {\n  display: block;\n}\n\n.was-validated .form-control:valid, .form-control.is-valid {\n  border-color: #28a745;\n  padding-right: calc(1.5em + 0.75rem);\n  background-image: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e\");\n  background-repeat: no-repeat;\n  background-position: right calc(0.375em + 0.1875rem) center;\n  background-size: calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);\n}\n\n.was-validated .form-control:valid:focus, .form-control.is-valid:focus {\n  border-color: #28a745;\n  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);\n}\n\n.was-validated textarea.form-control:valid, textarea.form-control.is-valid {\n  padding-right: calc(1.5em + 0.75rem);\n  background-position: top calc(0.375em + 0.1875rem) right calc(0.375em + 0.1875rem);\n}\n\n.was-validated .custom-select:valid, .custom-select.is-valid {\n  border-color: #28a745;\n  padding-right: calc(0.75em + 2.3125rem);\n  background: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e\") no-repeat right 0.75rem center/8px 10px, url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e\") #fff no-repeat center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);\n}\n\n.was-validated .custom-select:valid:focus, .custom-select.is-valid:focus {\n  border-color: #28a745;\n  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);\n}\n\n.was-validated .form-check-input:valid ~ .form-check-label, .form-check-input.is-valid ~ .form-check-label {\n  color: #28a745;\n}\n\n.was-validated .form-check-input:valid ~ .valid-feedback,\n.was-validated .form-check-input:valid ~ .valid-tooltip, .form-check-input.is-valid ~ .valid-feedback,\n.form-check-input.is-valid ~ .valid-tooltip {\n  display: block;\n}\n\n.was-validated .custom-control-input:valid ~ .custom-control-label, .custom-control-input.is-valid ~ .custom-control-label {\n  color: #28a745;\n}\n\n.was-validated .custom-control-input:valid ~ .custom-control-label::before, .custom-control-input.is-valid ~ .custom-control-label::before {\n  border-color: #28a745;\n}\n\n.was-validated .custom-control-input:valid:checked ~ .custom-control-label::before, .custom-control-input.is-valid:checked ~ .custom-control-label::before {\n  border-color: #34ce57;\n  background-color: #34ce57;\n}\n\n.was-validated .custom-control-input:valid:focus ~ .custom-control-label::before, .custom-control-input.is-valid:focus ~ .custom-control-label::before {\n  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);\n}\n\n.was-validated .custom-control-input:valid:focus:not(:checked) ~ .custom-control-label::before, .custom-control-input.is-valid:focus:not(:checked) ~ .custom-control-label::before {\n  border-color: #28a745;\n}\n\n.was-validated .custom-file-input:valid ~ .custom-file-label, .custom-file-input.is-valid ~ .custom-file-label {\n  border-color: #28a745;\n}\n\n.was-validated .custom-file-input:valid:focus ~ .custom-file-label, .custom-file-input.is-valid:focus ~ .custom-file-label {\n  border-color: #28a745;\n  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);\n}\n\n.invalid-feedback {\n  display: none;\n  width: 100%;\n  margin-top: 0.25rem;\n  font-size: 80%;\n  color: #dc3545;\n}\n\n.invalid-tooltip {\n  position: absolute;\n  top: 100%;\n  z-index: 5;\n  display: none;\n  max-width: 100%;\n  padding: 0.25rem 0.5rem;\n  margin-top: .1rem;\n  font-size: 0.875rem;\n  line-height: 1.5;\n  color: #fff;\n  background-color: rgba(220, 53, 69, 0.9);\n  border-radius: 0.25rem;\n}\n\n.was-validated :invalid ~ .invalid-feedback,\n.was-validated :invalid ~ .invalid-tooltip,\n.is-invalid ~ .invalid-feedback,\n.is-invalid ~ .invalid-tooltip {\n  display: block;\n}\n\n.was-validated .form-control:invalid, .form-control.is-invalid {\n  border-color: #dc3545;\n  padding-right: calc(1.5em + 0.75rem);\n  background-image: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e\");\n  background-repeat: no-repeat;\n  background-position: right calc(0.375em + 0.1875rem) center;\n  background-size: calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);\n}\n\n.was-validated .form-control:invalid:focus, .form-control.is-invalid:focus {\n  border-color: #dc3545;\n  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);\n}\n\n.was-validated textarea.form-control:invalid, textarea.form-control.is-invalid {\n  padding-right: calc(1.5em + 0.75rem);\n  background-position: top calc(0.375em + 0.1875rem) right calc(0.375em + 0.1875rem);\n}\n\n.was-validated .custom-select:invalid, .custom-select.is-invalid {\n  border-color: #dc3545;\n  padding-right: calc(0.75em + 2.3125rem);\n  background: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e\") no-repeat right 0.75rem center/8px 10px, url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e\") #fff no-repeat center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);\n}\n\n.was-validated .custom-select:invalid:focus, .custom-select.is-invalid:focus {\n  border-color: #dc3545;\n  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);\n}\n\n.was-validated .form-check-input:invalid ~ .form-check-label, .form-check-input.is-invalid ~ .form-check-label {\n  color: #dc3545;\n}\n\n.was-validated .form-check-input:invalid ~ .invalid-feedback,\n.was-validated .form-check-input:invalid ~ .invalid-tooltip, .form-check-input.is-invalid ~ .invalid-feedback,\n.form-check-input.is-invalid ~ .invalid-tooltip {\n  display: block;\n}\n\n.was-validated .custom-control-input:invalid ~ .custom-control-label, .custom-control-input.is-invalid ~ .custom-control-label {\n  color: #dc3545;\n}\n\n.was-validated .custom-control-input:invalid ~ .custom-control-label::before, .custom-control-input.is-invalid ~ .custom-control-label::before {\n  border-color: #dc3545;\n}\n\n.was-validated .custom-control-input:invalid:checked ~ .custom-control-label::before, .custom-control-input.is-invalid:checked ~ .custom-control-label::before {\n  border-color: #e4606d;\n  background-color: #e4606d;\n}\n\n.was-validated .custom-control-input:invalid:focus ~ .custom-control-label::before, .custom-control-input.is-invalid:focus ~ .custom-control-label::before {\n  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);\n}\n\n.was-validated .custom-control-input:invalid:focus:not(:checked) ~ .custom-control-label::before, .custom-control-input.is-invalid:focus:not(:checked) ~ .custom-control-label::before {\n  border-color: #dc3545;\n}\n\n.was-validated .custom-file-input:invalid ~ .custom-file-label, .custom-file-input.is-invalid ~ .custom-file-label {\n  border-color: #dc3545;\n}\n\n.was-validated .custom-file-input:invalid:focus ~ .custom-file-label, .custom-file-input.is-invalid:focus ~ .custom-file-label {\n  border-color: #dc3545;\n  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);\n}\n\n.form-inline {\n  display: flex;\n  flex-flow: row wrap;\n  align-items: center;\n}\n\n.form-inline .form-check {\n  width: 100%;\n}\n\n@media (min-width: 576px) {\n  .form-inline label {\n    display: flex;\n    align-items: center;\n    justify-content: center;\n    margin-bottom: 0;\n  }\n  .form-inline .form-group {\n    display: flex;\n    flex: 0 0 auto;\n    flex-flow: row wrap;\n    align-items: center;\n    margin-bottom: 0;\n  }\n  .form-inline .form-control {\n    display: inline-block;\n    width: auto;\n    vertical-align: middle;\n  }\n  .form-inline .form-control-plaintext {\n    display: inline-block;\n  }\n  .form-inline .input-group,\n  .form-inline .custom-select {\n    width: auto;\n  }\n  .form-inline .form-check {\n    display: flex;\n    align-items: center;\n    justify-content: center;\n    width: auto;\n    padding-left: 0;\n  }\n  .form-inline .form-check-input {\n    position: relative;\n    flex-shrink: 0;\n    margin-top: 0;\n    margin-right: 0.25rem;\n    margin-left: 0;\n  }\n  .form-inline .custom-control {\n    align-items: center;\n    justify-content: center;\n  }\n  .form-inline .custom-control-label {\n    margin-bottom: 0;\n  }\n}\n\n.btn {\n  display: inline-block;\n  font-weight: 400;\n  color: #212529;\n  text-align: center;\n  vertical-align: middle;\n  cursor: pointer;\n  user-select: none;\n  background-color: transparent;\n  border: 1px solid transparent;\n  padding: 0.375rem 0.75rem;\n  font-size: 1rem;\n  line-height: 1.5;\n  border-radius: 0.25rem;\n  transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .btn {\n    transition: none;\n  }\n}\n\n.btn:hover {\n  color: #212529;\n  text-decoration: none;\n}\n\n.btn:focus, .btn.focus {\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);\n}\n\n.btn.disabled, .btn:disabled {\n  opacity: 0.65;\n}\n\na.btn.disabled,\nfieldset:disabled a.btn {\n  pointer-events: none;\n}\n\n.btn-primary {\n  color: #fff;\n  background-color: #007bff;\n  border-color: #007bff;\n}\n\n.btn-primary:hover {\n  color: #fff;\n  background-color: #0069d9;\n  border-color: #0062cc;\n}\n\n.btn-primary:focus, .btn-primary.focus {\n  color: #fff;\n  background-color: #0069d9;\n  border-color: #0062cc;\n  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);\n}\n\n.btn-primary.disabled, .btn-primary:disabled {\n  color: #fff;\n  background-color: #007bff;\n  border-color: #007bff;\n}\n\n.btn-primary:not(:disabled):not(.disabled):active, .btn-primary:not(:disabled):not(.disabled).active,\n.show > .btn-primary.dropdown-toggle {\n  color: #fff;\n  background-color: #0062cc;\n  border-color: #005cbf;\n}\n\n.btn-primary:not(:disabled):not(.disabled):active:focus, .btn-primary:not(:disabled):not(.disabled).active:focus,\n.show > .btn-primary.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);\n}\n\n.btn-secondary {\n  color: #fff;\n  background-color: #6c757d;\n  border-color: #6c757d;\n}\n\n.btn-secondary:hover {\n  color: #fff;\n  background-color: #5a6268;\n  border-color: #545b62;\n}\n\n.btn-secondary:focus, .btn-secondary.focus {\n  color: #fff;\n  background-color: #5a6268;\n  border-color: #545b62;\n  box-shadow: 0 0 0 0.2rem rgba(130, 138, 145, 0.5);\n}\n\n.btn-secondary.disabled, .btn-secondary:disabled {\n  color: #fff;\n  background-color: #6c757d;\n  border-color: #6c757d;\n}\n\n.btn-secondary:not(:disabled):not(.disabled):active, .btn-secondary:not(:disabled):not(.disabled).active,\n.show > .btn-secondary.dropdown-toggle {\n  color: #fff;\n  background-color: #545b62;\n  border-color: #4e555b;\n}\n\n.btn-secondary:not(:disabled):not(.disabled):active:focus, .btn-secondary:not(:disabled):not(.disabled).active:focus,\n.show > .btn-secondary.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(130, 138, 145, 0.5);\n}\n\n.btn-success {\n  color: #fff;\n  background-color: #28a745;\n  border-color: #28a745;\n}\n\n.btn-success:hover {\n  color: #fff;\n  background-color: #218838;\n  border-color: #1e7e34;\n}\n\n.btn-success:focus, .btn-success.focus {\n  color: #fff;\n  background-color: #218838;\n  border-color: #1e7e34;\n  box-shadow: 0 0 0 0.2rem rgba(72, 180, 97, 0.5);\n}\n\n.btn-success.disabled, .btn-success:disabled {\n  color: #fff;\n  background-color: #28a745;\n  border-color: #28a745;\n}\n\n.btn-success:not(:disabled):not(.disabled):active, .btn-success:not(:disabled):not(.disabled).active,\n.show > .btn-success.dropdown-toggle {\n  color: #fff;\n  background-color: #1e7e34;\n  border-color: #1c7430;\n}\n\n.btn-success:not(:disabled):not(.disabled):active:focus, .btn-success:not(:disabled):not(.disabled).active:focus,\n.show > .btn-success.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(72, 180, 97, 0.5);\n}\n\n.btn-info {\n  color: #fff;\n  background-color: #17a2b8;\n  border-color: #17a2b8;\n}\n\n.btn-info:hover {\n  color: #fff;\n  background-color: #138496;\n  border-color: #117a8b;\n}\n\n.btn-info:focus, .btn-info.focus {\n  color: #fff;\n  background-color: #138496;\n  border-color: #117a8b;\n  box-shadow: 0 0 0 0.2rem rgba(58, 176, 195, 0.5);\n}\n\n.btn-info.disabled, .btn-info:disabled {\n  color: #fff;\n  background-color: #17a2b8;\n  border-color: #17a2b8;\n}\n\n.btn-info:not(:disabled):not(.disabled):active, .btn-info:not(:disabled):not(.disabled).active,\n.show > .btn-info.dropdown-toggle {\n  color: #fff;\n  background-color: #117a8b;\n  border-color: #10707f;\n}\n\n.btn-info:not(:disabled):not(.disabled):active:focus, .btn-info:not(:disabled):not(.disabled).active:focus,\n.show > .btn-info.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(58, 176, 195, 0.5);\n}\n\n.btn-warning {\n  color: #212529;\n  background-color: #ffc107;\n  border-color: #ffc107;\n}\n\n.btn-warning:hover {\n  color: #212529;\n  background-color: #e0a800;\n  border-color: #d39e00;\n}\n\n.btn-warning:focus, .btn-warning.focus {\n  color: #212529;\n  background-color: #e0a800;\n  border-color: #d39e00;\n  box-shadow: 0 0 0 0.2rem rgba(222, 170, 12, 0.5);\n}\n\n.btn-warning.disabled, .btn-warning:disabled {\n  color: #212529;\n  background-color: #ffc107;\n  border-color: #ffc107;\n}\n\n.btn-warning:not(:disabled):not(.disabled):active, .btn-warning:not(:disabled):not(.disabled).active,\n.show > .btn-warning.dropdown-toggle {\n  color: #212529;\n  background-color: #d39e00;\n  border-color: #c69500;\n}\n\n.btn-warning:not(:disabled):not(.disabled):active:focus, .btn-warning:not(:disabled):not(.disabled).active:focus,\n.show > .btn-warning.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(222, 170, 12, 0.5);\n}\n\n.btn-danger {\n  color: #fff;\n  background-color: #dc3545;\n  border-color: #dc3545;\n}\n\n.btn-danger:hover {\n  color: #fff;\n  background-color: #c82333;\n  border-color: #bd2130;\n}\n\n.btn-danger:focus, .btn-danger.focus {\n  color: #fff;\n  background-color: #c82333;\n  border-color: #bd2130;\n  box-shadow: 0 0 0 0.2rem rgba(225, 83, 97, 0.5);\n}\n\n.btn-danger.disabled, .btn-danger:disabled {\n  color: #fff;\n  background-color: #dc3545;\n  border-color: #dc3545;\n}\n\n.btn-danger:not(:disabled):not(.disabled):active, .btn-danger:not(:disabled):not(.disabled).active,\n.show > .btn-danger.dropdown-toggle {\n  color: #fff;\n  background-color: #bd2130;\n  border-color: #b21f2d;\n}\n\n.btn-danger:not(:disabled):not(.disabled):active:focus, .btn-danger:not(:disabled):not(.disabled).active:focus,\n.show > .btn-danger.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(225, 83, 97, 0.5);\n}\n\n.btn-light {\n  color: #212529;\n  background-color: #f8f9fa;\n  border-color: #f8f9fa;\n}\n\n.btn-light:hover {\n  color: #212529;\n  background-color: #e2e6ea;\n  border-color: #dae0e5;\n}\n\n.btn-light:focus, .btn-light.focus {\n  color: #212529;\n  background-color: #e2e6ea;\n  border-color: #dae0e5;\n  box-shadow: 0 0 0 0.2rem rgba(216, 217, 219, 0.5);\n}\n\n.btn-light.disabled, .btn-light:disabled {\n  color: #212529;\n  background-color: #f8f9fa;\n  border-color: #f8f9fa;\n}\n\n.btn-light:not(:disabled):not(.disabled):active, .btn-light:not(:disabled):not(.disabled).active,\n.show > .btn-light.dropdown-toggle {\n  color: #212529;\n  background-color: #dae0e5;\n  border-color: #d3d9df;\n}\n\n.btn-light:not(:disabled):not(.disabled):active:focus, .btn-light:not(:disabled):not(.disabled).active:focus,\n.show > .btn-light.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(216, 217, 219, 0.5);\n}\n\n.btn-dark {\n  color: #fff;\n  background-color: #343a40;\n  border-color: #343a40;\n}\n\n.btn-dark:hover {\n  color: #fff;\n  background-color: #23272b;\n  border-color: #1d2124;\n}\n\n.btn-dark:focus, .btn-dark.focus {\n  color: #fff;\n  background-color: #23272b;\n  border-color: #1d2124;\n  box-shadow: 0 0 0 0.2rem rgba(82, 88, 93, 0.5);\n}\n\n.btn-dark.disabled, .btn-dark:disabled {\n  color: #fff;\n  background-color: #343a40;\n  border-color: #343a40;\n}\n\n.btn-dark:not(:disabled):not(.disabled):active, .btn-dark:not(:disabled):not(.disabled).active,\n.show > .btn-dark.dropdown-toggle {\n  color: #fff;\n  background-color: #1d2124;\n  border-color: #171a1d;\n}\n\n.btn-dark:not(:disabled):not(.disabled):active:focus, .btn-dark:not(:disabled):not(.disabled).active:focus,\n.show > .btn-dark.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(82, 88, 93, 0.5);\n}\n\n.btn-outline-primary {\n  color: #007bff;\n  border-color: #007bff;\n}\n\n.btn-outline-primary:hover {\n  color: #fff;\n  background-color: #007bff;\n  border-color: #007bff;\n}\n\n.btn-outline-primary:focus, .btn-outline-primary.focus {\n  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);\n}\n\n.btn-outline-primary.disabled, .btn-outline-primary:disabled {\n  color: #007bff;\n  background-color: transparent;\n}\n\n.btn-outline-primary:not(:disabled):not(.disabled):active, .btn-outline-primary:not(:disabled):not(.disabled).active,\n.show > .btn-outline-primary.dropdown-toggle {\n  color: #fff;\n  background-color: #007bff;\n  border-color: #007bff;\n}\n\n.btn-outline-primary:not(:disabled):not(.disabled):active:focus, .btn-outline-primary:not(:disabled):not(.disabled).active:focus,\n.show > .btn-outline-primary.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);\n}\n\n.btn-outline-secondary {\n  color: #6c757d;\n  border-color: #6c757d;\n}\n\n.btn-outline-secondary:hover {\n  color: #fff;\n  background-color: #6c757d;\n  border-color: #6c757d;\n}\n\n.btn-outline-secondary:focus, .btn-outline-secondary.focus {\n  box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5);\n}\n\n.btn-outline-secondary.disabled, .btn-outline-secondary:disabled {\n  color: #6c757d;\n  background-color: transparent;\n}\n\n.btn-outline-secondary:not(:disabled):not(.disabled):active, .btn-outline-secondary:not(:disabled):not(.disabled).active,\n.show > .btn-outline-secondary.dropdown-toggle {\n  color: #fff;\n  background-color: #6c757d;\n  border-color: #6c757d;\n}\n\n.btn-outline-secondary:not(:disabled):not(.disabled):active:focus, .btn-outline-secondary:not(:disabled):not(.disabled).active:focus,\n.show > .btn-outline-secondary.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5);\n}\n\n.btn-outline-success {\n  color: #28a745;\n  border-color: #28a745;\n}\n\n.btn-outline-success:hover {\n  color: #fff;\n  background-color: #28a745;\n  border-color: #28a745;\n}\n\n.btn-outline-success:focus, .btn-outline-success.focus {\n  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);\n}\n\n.btn-outline-success.disabled, .btn-outline-success:disabled {\n  color: #28a745;\n  background-color: transparent;\n}\n\n.btn-outline-success:not(:disabled):not(.disabled):active, .btn-outline-success:not(:disabled):not(.disabled).active,\n.show > .btn-outline-success.dropdown-toggle {\n  color: #fff;\n  background-color: #28a745;\n  border-color: #28a745;\n}\n\n.btn-outline-success:not(:disabled):not(.disabled):active:focus, .btn-outline-success:not(:disabled):not(.disabled).active:focus,\n.show > .btn-outline-success.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);\n}\n\n.btn-outline-info {\n  color: #17a2b8;\n  border-color: #17a2b8;\n}\n\n.btn-outline-info:hover {\n  color: #fff;\n  background-color: #17a2b8;\n  border-color: #17a2b8;\n}\n\n.btn-outline-info:focus, .btn-outline-info.focus {\n  box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);\n}\n\n.btn-outline-info.disabled, .btn-outline-info:disabled {\n  color: #17a2b8;\n  background-color: transparent;\n}\n\n.btn-outline-info:not(:disabled):not(.disabled):active, .btn-outline-info:not(:disabled):not(.disabled).active,\n.show > .btn-outline-info.dropdown-toggle {\n  color: #fff;\n  background-color: #17a2b8;\n  border-color: #17a2b8;\n}\n\n.btn-outline-info:not(:disabled):not(.disabled):active:focus, .btn-outline-info:not(:disabled):not(.disabled).active:focus,\n.show > .btn-outline-info.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);\n}\n\n.btn-outline-warning {\n  color: #ffc107;\n  border-color: #ffc107;\n}\n\n.btn-outline-warning:hover {\n  color: #212529;\n  background-color: #ffc107;\n  border-color: #ffc107;\n}\n\n.btn-outline-warning:focus, .btn-outline-warning.focus {\n  box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);\n}\n\n.btn-outline-warning.disabled, .btn-outline-warning:disabled {\n  color: #ffc107;\n  background-color: transparent;\n}\n\n.btn-outline-warning:not(:disabled):not(.disabled):active, .btn-outline-warning:not(:disabled):not(.disabled).active,\n.show > .btn-outline-warning.dropdown-toggle {\n  color: #212529;\n  background-color: #ffc107;\n  border-color: #ffc107;\n}\n\n.btn-outline-warning:not(:disabled):not(.disabled):active:focus, .btn-outline-warning:not(:disabled):not(.disabled).active:focus,\n.show > .btn-outline-warning.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);\n}\n\n.btn-outline-danger {\n  color: #dc3545;\n  border-color: #dc3545;\n}\n\n.btn-outline-danger:hover {\n  color: #fff;\n  background-color: #dc3545;\n  border-color: #dc3545;\n}\n\n.btn-outline-danger:focus, .btn-outline-danger.focus {\n  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);\n}\n\n.btn-outline-danger.disabled, .btn-outline-danger:disabled {\n  color: #dc3545;\n  background-color: transparent;\n}\n\n.btn-outline-danger:not(:disabled):not(.disabled):active, .btn-outline-danger:not(:disabled):not(.disabled).active,\n.show > .btn-outline-danger.dropdown-toggle {\n  color: #fff;\n  background-color: #dc3545;\n  border-color: #dc3545;\n}\n\n.btn-outline-danger:not(:disabled):not(.disabled):active:focus, .btn-outline-danger:not(:disabled):not(.disabled).active:focus,\n.show > .btn-outline-danger.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);\n}\n\n.btn-outline-light {\n  color: #f8f9fa;\n  border-color: #f8f9fa;\n}\n\n.btn-outline-light:hover {\n  color: #212529;\n  background-color: #f8f9fa;\n  border-color: #f8f9fa;\n}\n\n.btn-outline-light:focus, .btn-outline-light.focus {\n  box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);\n}\n\n.btn-outline-light.disabled, .btn-outline-light:disabled {\n  color: #f8f9fa;\n  background-color: transparent;\n}\n\n.btn-outline-light:not(:disabled):not(.disabled):active, .btn-outline-light:not(:disabled):not(.disabled).active,\n.show > .btn-outline-light.dropdown-toggle {\n  color: #212529;\n  background-color: #f8f9fa;\n  border-color: #f8f9fa;\n}\n\n.btn-outline-light:not(:disabled):not(.disabled):active:focus, .btn-outline-light:not(:disabled):not(.disabled).active:focus,\n.show > .btn-outline-light.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);\n}\n\n.btn-outline-dark {\n  color: #343a40;\n  border-color: #343a40;\n}\n\n.btn-outline-dark:hover {\n  color: #fff;\n  background-color: #343a40;\n  border-color: #343a40;\n}\n\n.btn-outline-dark:focus, .btn-outline-dark.focus {\n  box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);\n}\n\n.btn-outline-dark.disabled, .btn-outline-dark:disabled {\n  color: #343a40;\n  background-color: transparent;\n}\n\n.btn-outline-dark:not(:disabled):not(.disabled):active, .btn-outline-dark:not(:disabled):not(.disabled).active,\n.show > .btn-outline-dark.dropdown-toggle {\n  color: #fff;\n  background-color: #343a40;\n  border-color: #343a40;\n}\n\n.btn-outline-dark:not(:disabled):not(.disabled):active:focus, .btn-outline-dark:not(:disabled):not(.disabled).active:focus,\n.show > .btn-outline-dark.dropdown-toggle:focus {\n  box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);\n}\n\n.btn-link {\n  font-weight: 400;\n  color: #007bff;\n  text-decoration: none;\n}\n\n.btn-link:hover {\n  color: #0056b3;\n  text-decoration: underline;\n}\n\n.btn-link:focus, .btn-link.focus {\n  text-decoration: underline;\n  box-shadow: none;\n}\n\n.btn-link:disabled, .btn-link.disabled {\n  color: #6c757d;\n  pointer-events: none;\n}\n\n.btn-lg, .btn-group-lg > .btn {\n  padding: 0.5rem 1rem;\n  font-size: 1.25rem;\n  line-height: 1.5;\n  border-radius: 0.3rem;\n}\n\n.btn-sm, .btn-group-sm > .btn {\n  padding: 0.25rem 0.5rem;\n  font-size: 0.875rem;\n  line-height: 1.5;\n  border-radius: 0.2rem;\n}\n\n.btn-block {\n  display: block;\n  width: 100%;\n}\n\n.btn-block + .btn-block {\n  margin-top: 0.5rem;\n}\n\ninput[type=\"submit\"].btn-block,\ninput[type=\"reset\"].btn-block,\ninput[type=\"button\"].btn-block {\n  width: 100%;\n}\n\n.fade {\n  transition: opacity 0.15s linear;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .fade {\n    transition: none;\n  }\n}\n\n.fade:not(.show) {\n  opacity: 0;\n}\n\n.collapse:not(.show) {\n  display: none;\n}\n\n.collapsing {\n  position: relative;\n  height: 0;\n  overflow: hidden;\n  transition: height 0.35s ease;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .collapsing {\n    transition: none;\n  }\n}\n\n.dropup,\n.dropright,\n.dropdown,\n.dropleft {\n  position: relative;\n}\n\n.dropdown-toggle {\n  white-space: nowrap;\n}\n\n.dropdown-toggle::after {\n  display: inline-block;\n  margin-left: 0.255em;\n  vertical-align: 0.255em;\n  content: \"\";\n  border-top: 0.3em solid;\n  border-right: 0.3em solid transparent;\n  border-bottom: 0;\n  border-left: 0.3em solid transparent;\n}\n\n.dropdown-toggle:empty::after {\n  margin-left: 0;\n}\n\n.dropdown-menu {\n  position: absolute;\n  top: 100%;\n  left: 0;\n  z-index: 1000;\n  display: none;\n  float: left;\n  min-width: 10rem;\n  padding: 0.5rem 0;\n  margin: 0.125rem 0 0;\n  font-size: 1rem;\n  color: #212529;\n  text-align: left;\n  list-style: none;\n  background-color: #fff;\n  background-clip: padding-box;\n  border: 1px solid rgba(0, 0, 0, 0.15);\n  border-radius: 0.25rem;\n}\n\n.dropdown-menu-left {\n  right: auto;\n  left: 0;\n}\n\n.dropdown-menu-right {\n  right: 0;\n  left: auto;\n}\n\n@media (min-width: 576px) {\n  .dropdown-menu-sm-left {\n    right: auto;\n    left: 0;\n  }\n  .dropdown-menu-sm-right {\n    right: 0;\n    left: auto;\n  }\n}\n\n@media (min-width: 768px) {\n  .dropdown-menu-md-left {\n    right: auto;\n    left: 0;\n  }\n  .dropdown-menu-md-right {\n    right: 0;\n    left: auto;\n  }\n}\n\n@media (min-width: 992px) {\n  .dropdown-menu-lg-left {\n    right: auto;\n    left: 0;\n  }\n  .dropdown-menu-lg-right {\n    right: 0;\n    left: auto;\n  }\n}\n\n@media (min-width: 1200px) {\n  .dropdown-menu-xl-left {\n    right: auto;\n    left: 0;\n  }\n  .dropdown-menu-xl-right {\n    right: 0;\n    left: auto;\n  }\n}\n\n.dropup .dropdown-menu {\n  top: auto;\n  bottom: 100%;\n  margin-top: 0;\n  margin-bottom: 0.125rem;\n}\n\n.dropup .dropdown-toggle::after {\n  display: inline-block;\n  margin-left: 0.255em;\n  vertical-align: 0.255em;\n  content: \"\";\n  border-top: 0;\n  border-right: 0.3em solid transparent;\n  border-bottom: 0.3em solid;\n  border-left: 0.3em solid transparent;\n}\n\n.dropup .dropdown-toggle:empty::after {\n  margin-left: 0;\n}\n\n.dropright .dropdown-menu {\n  top: 0;\n  right: auto;\n  left: 100%;\n  margin-top: 0;\n  margin-left: 0.125rem;\n}\n\n.dropright .dropdown-toggle::after {\n  display: inline-block;\n  margin-left: 0.255em;\n  vertical-align: 0.255em;\n  content: \"\";\n  border-top: 0.3em solid transparent;\n  border-right: 0;\n  border-bottom: 0.3em solid transparent;\n  border-left: 0.3em solid;\n}\n\n.dropright .dropdown-toggle:empty::after {\n  margin-left: 0;\n}\n\n.dropright .dropdown-toggle::after {\n  vertical-align: 0;\n}\n\n.dropleft .dropdown-menu {\n  top: 0;\n  right: 100%;\n  left: auto;\n  margin-top: 0;\n  margin-right: 0.125rem;\n}\n\n.dropleft .dropdown-toggle::after {\n  display: inline-block;\n  margin-left: 0.255em;\n  vertical-align: 0.255em;\n  content: \"\";\n}\n\n.dropleft .dropdown-toggle::after {\n  display: none;\n}\n\n.dropleft .dropdown-toggle::before {\n  display: inline-block;\n  margin-right: 0.255em;\n  vertical-align: 0.255em;\n  content: \"\";\n  border-top: 0.3em solid transparent;\n  border-right: 0.3em solid;\n  border-bottom: 0.3em solid transparent;\n}\n\n.dropleft .dropdown-toggle:empty::after {\n  margin-left: 0;\n}\n\n.dropleft .dropdown-toggle::before {\n  vertical-align: 0;\n}\n\n.dropdown-menu[x-placement^=\"top\"], .dropdown-menu[x-placement^=\"right\"], .dropdown-menu[x-placement^=\"bottom\"], .dropdown-menu[x-placement^=\"left\"] {\n  right: auto;\n  bottom: auto;\n}\n\n.dropdown-divider {\n  height: 0;\n  margin: 0.5rem 0;\n  overflow: hidden;\n  border-top: 1px solid #e9ecef;\n}\n\n.dropdown-item {\n  display: block;\n  width: 100%;\n  padding: 0.25rem 1.5rem;\n  clear: both;\n  font-weight: 400;\n  color: #212529;\n  text-align: inherit;\n  white-space: nowrap;\n  background-color: transparent;\n  border: 0;\n}\n\n.dropdown-item:hover, .dropdown-item:focus {\n  color: #16181b;\n  text-decoration: none;\n  background-color: #f8f9fa;\n}\n\n.dropdown-item.active, .dropdown-item:active {\n  color: #fff;\n  text-decoration: none;\n  background-color: #007bff;\n}\n\n.dropdown-item.disabled, .dropdown-item:disabled {\n  color: #6c757d;\n  pointer-events: none;\n  background-color: transparent;\n}\n\n.dropdown-menu.show {\n  display: block;\n}\n\n.dropdown-header {\n  display: block;\n  padding: 0.5rem 1.5rem;\n  margin-bottom: 0;\n  font-size: 0.875rem;\n  color: #6c757d;\n  white-space: nowrap;\n}\n\n.dropdown-item-text {\n  display: block;\n  padding: 0.25rem 1.5rem;\n  color: #212529;\n}\n\n.btn-group,\n.btn-group-vertical {\n  position: relative;\n  display: inline-flex;\n  vertical-align: middle;\n}\n\n.btn-group > .btn,\n.btn-group-vertical > .btn {\n  position: relative;\n  flex: 1 1 auto;\n}\n\n.btn-group > .btn:hover,\n.btn-group-vertical > .btn:hover {\n  z-index: 1;\n}\n\n.btn-group > .btn:focus, .btn-group > .btn:active, .btn-group > .btn.active,\n.btn-group-vertical > .btn:focus,\n.btn-group-vertical > .btn:active,\n.btn-group-vertical > .btn.active {\n  z-index: 1;\n}\n\n.btn-toolbar {\n  display: flex;\n  flex-wrap: wrap;\n  justify-content: flex-start;\n}\n\n.btn-toolbar .input-group {\n  width: auto;\n}\n\n.btn-group > .btn:not(:first-child),\n.btn-group > .btn-group:not(:first-child) {\n  margin-left: -1px;\n}\n\n.btn-group > .btn:not(:last-child):not(.dropdown-toggle),\n.btn-group > .btn-group:not(:last-child) > .btn {\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n}\n\n.btn-group > .btn:not(:first-child),\n.btn-group > .btn-group:not(:first-child) > .btn {\n  border-top-left-radius: 0;\n  border-bottom-left-radius: 0;\n}\n\n.dropdown-toggle-split {\n  padding-right: 0.5625rem;\n  padding-left: 0.5625rem;\n}\n\n.dropdown-toggle-split::after,\n.dropup .dropdown-toggle-split::after,\n.dropright .dropdown-toggle-split::after {\n  margin-left: 0;\n}\n\n.dropleft .dropdown-toggle-split::before {\n  margin-right: 0;\n}\n\n.btn-sm + .dropdown-toggle-split, .btn-group-sm > .btn + .dropdown-toggle-split {\n  padding-right: 0.375rem;\n  padding-left: 0.375rem;\n}\n\n.btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split {\n  padding-right: 0.75rem;\n  padding-left: 0.75rem;\n}\n\n.btn-group-vertical {\n  flex-direction: column;\n  align-items: flex-start;\n  justify-content: center;\n}\n\n.btn-group-vertical > .btn,\n.btn-group-vertical > .btn-group {\n  width: 100%;\n}\n\n.btn-group-vertical > .btn:not(:first-child),\n.btn-group-vertical > .btn-group:not(:first-child) {\n  margin-top: -1px;\n}\n\n.btn-group-vertical > .btn:not(:last-child):not(.dropdown-toggle),\n.btn-group-vertical > .btn-group:not(:last-child) > .btn {\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 0;\n}\n\n.btn-group-vertical > .btn:not(:first-child),\n.btn-group-vertical > .btn-group:not(:first-child) > .btn {\n  border-top-left-radius: 0;\n  border-top-right-radius: 0;\n}\n\n.btn-group-toggle > .btn,\n.btn-group-toggle > .btn-group > .btn {\n  margin-bottom: 0;\n}\n\n.btn-group-toggle > .btn input[type=\"radio\"],\n.btn-group-toggle > .btn input[type=\"checkbox\"],\n.btn-group-toggle > .btn-group > .btn input[type=\"radio\"],\n.btn-group-toggle > .btn-group > .btn input[type=\"checkbox\"] {\n  position: absolute;\n  clip: rect(0, 0, 0, 0);\n  pointer-events: none;\n}\n\n.input-group {\n  position: relative;\n  display: flex;\n  flex-wrap: wrap;\n  align-items: stretch;\n  width: 100%;\n}\n\n.input-group > .form-control,\n.input-group > .form-control-plaintext,\n.input-group > .custom-select,\n.input-group > .custom-file {\n  position: relative;\n  flex: 1 1 0%;\n  min-width: 0;\n  margin-bottom: 0;\n}\n\n.input-group > .form-control + .form-control,\n.input-group > .form-control + .custom-select,\n.input-group > .form-control + .custom-file,\n.input-group > .form-control-plaintext + .form-control,\n.input-group > .form-control-plaintext + .custom-select,\n.input-group > .form-control-plaintext + .custom-file,\n.input-group > .custom-select + .form-control,\n.input-group > .custom-select + .custom-select,\n.input-group > .custom-select + .custom-file,\n.input-group > .custom-file + .form-control,\n.input-group > .custom-file + .custom-select,\n.input-group > .custom-file + .custom-file {\n  margin-left: -1px;\n}\n\n.input-group > .form-control:focus,\n.input-group > .custom-select:focus,\n.input-group > .custom-file .custom-file-input:focus ~ .custom-file-label {\n  z-index: 3;\n}\n\n.input-group > .custom-file .custom-file-input:focus {\n  z-index: 4;\n}\n\n.input-group > .form-control:not(:last-child),\n.input-group > .custom-select:not(:last-child) {\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n}\n\n.input-group > .form-control:not(:first-child),\n.input-group > .custom-select:not(:first-child) {\n  border-top-left-radius: 0;\n  border-bottom-left-radius: 0;\n}\n\n.input-group > .custom-file {\n  display: flex;\n  align-items: center;\n}\n\n.input-group > .custom-file:not(:last-child) .custom-file-label,\n.input-group > .custom-file:not(:last-child) .custom-file-label::after {\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n}\n\n.input-group > .custom-file:not(:first-child) .custom-file-label {\n  border-top-left-radius: 0;\n  border-bottom-left-radius: 0;\n}\n\n.input-group-prepend,\n.input-group-append {\n  display: flex;\n}\n\n.input-group-prepend .btn,\n.input-group-append .btn {\n  position: relative;\n  z-index: 2;\n}\n\n.input-group-prepend .btn:focus,\n.input-group-append .btn:focus {\n  z-index: 3;\n}\n\n.input-group-prepend .btn + .btn,\n.input-group-prepend .btn + .input-group-text,\n.input-group-prepend .input-group-text + .input-group-text,\n.input-group-prepend .input-group-text + .btn,\n.input-group-append .btn + .btn,\n.input-group-append .btn + .input-group-text,\n.input-group-append .input-group-text + .input-group-text,\n.input-group-append .input-group-text + .btn {\n  margin-left: -1px;\n}\n\n.input-group-prepend {\n  margin-right: -1px;\n}\n\n.input-group-append {\n  margin-left: -1px;\n}\n\n.input-group-text {\n  display: flex;\n  align-items: center;\n  padding: 0.375rem 0.75rem;\n  margin-bottom: 0;\n  font-size: 1rem;\n  font-weight: 400;\n  line-height: 1.5;\n  color: #495057;\n  text-align: center;\n  white-space: nowrap;\n  background-color: #e9ecef;\n  border: 1px solid #ced4da;\n  border-radius: 0.25rem;\n}\n\n.input-group-text input[type=\"radio\"],\n.input-group-text input[type=\"checkbox\"] {\n  margin-top: 0;\n}\n\n.input-group-lg > .form-control:not(textarea),\n.input-group-lg > .custom-select {\n  height: calc(1.5em + 1rem + 2px);\n}\n\n.input-group-lg > .form-control,\n.input-group-lg > .custom-select,\n.input-group-lg > .input-group-prepend > .input-group-text,\n.input-group-lg > .input-group-append > .input-group-text,\n.input-group-lg > .input-group-prepend > .btn,\n.input-group-lg > .input-group-append > .btn {\n  padding: 0.5rem 1rem;\n  font-size: 1.25rem;\n  line-height: 1.5;\n  border-radius: 0.3rem;\n}\n\n.input-group-sm > .form-control:not(textarea),\n.input-group-sm > .custom-select {\n  height: calc(1.5em + 0.5rem + 2px);\n}\n\n.input-group-sm > .form-control,\n.input-group-sm > .custom-select,\n.input-group-sm > .input-group-prepend > .input-group-text,\n.input-group-sm > .input-group-append > .input-group-text,\n.input-group-sm > .input-group-prepend > .btn,\n.input-group-sm > .input-group-append > .btn {\n  padding: 0.25rem 0.5rem;\n  font-size: 0.875rem;\n  line-height: 1.5;\n  border-radius: 0.2rem;\n}\n\n.input-group-lg > .custom-select,\n.input-group-sm > .custom-select {\n  padding-right: 1.75rem;\n}\n\n.input-group > .input-group-prepend > .btn,\n.input-group > .input-group-prepend > .input-group-text,\n.input-group > .input-group-append:not(:last-child) > .btn,\n.input-group > .input-group-append:not(:last-child) > .input-group-text,\n.input-group > .input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle),\n.input-group > .input-group-append:last-child > .input-group-text:not(:last-child) {\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n}\n\n.input-group > .input-group-append > .btn,\n.input-group > .input-group-append > .input-group-text,\n.input-group > .input-group-prepend:not(:first-child) > .btn,\n.input-group > .input-group-prepend:not(:first-child) > .input-group-text,\n.input-group > .input-group-prepend:first-child > .btn:not(:first-child),\n.input-group > .input-group-prepend:first-child > .input-group-text:not(:first-child) {\n  border-top-left-radius: 0;\n  border-bottom-left-radius: 0;\n}\n\n.custom-control {\n  position: relative;\n  display: block;\n  min-height: 1.5rem;\n  padding-left: 1.5rem;\n}\n\n.custom-control-inline {\n  display: inline-flex;\n  margin-right: 1rem;\n}\n\n.custom-control-input {\n  position: absolute;\n  left: 0;\n  z-index: -1;\n  width: 1rem;\n  height: 1.25rem;\n  opacity: 0;\n}\n\n.custom-control-input:checked ~ .custom-control-label::before {\n  color: #fff;\n  border-color: #007bff;\n  background-color: #007bff;\n}\n\n.custom-control-input:focus ~ .custom-control-label::before {\n  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);\n}\n\n.custom-control-input:focus:not(:checked) ~ .custom-control-label::before {\n  border-color: #80bdff;\n}\n\n.custom-control-input:not(:disabled):active ~ .custom-control-label::before {\n  color: #fff;\n  background-color: #b3d7ff;\n  border-color: #b3d7ff;\n}\n\n.custom-control-input[disabled] ~ .custom-control-label, .custom-control-input:disabled ~ .custom-control-label {\n  color: #6c757d;\n}\n\n.custom-control-input[disabled] ~ .custom-control-label::before, .custom-control-input:disabled ~ .custom-control-label::before {\n  background-color: #e9ecef;\n}\n\n.custom-control-label {\n  position: relative;\n  margin-bottom: 0;\n  vertical-align: top;\n}\n\n.custom-control-label::before {\n  position: absolute;\n  top: 0.25rem;\n  left: -1.5rem;\n  display: block;\n  width: 1rem;\n  height: 1rem;\n  pointer-events: none;\n  content: \"\";\n  background-color: #fff;\n  border: #adb5bd solid 1px;\n}\n\n.custom-control-label::after {\n  position: absolute;\n  top: 0.25rem;\n  left: -1.5rem;\n  display: block;\n  width: 1rem;\n  height: 1rem;\n  content: \"\";\n  background: no-repeat 50% / 50% 50%;\n}\n\n.custom-checkbox .custom-control-label::before {\n  border-radius: 0.25rem;\n}\n\n.custom-checkbox .custom-control-input:checked ~ .custom-control-label::after {\n  background-image: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26l2.974 2.99L8 2.193z'/%3e%3c/svg%3e\");\n}\n\n.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::before {\n  border-color: #007bff;\n  background-color: #007bff;\n}\n\n.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::after {\n  background-image: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='4' viewBox='0 0 4 4'%3e%3cpath stroke='%23fff' d='M0 2h4'/%3e%3c/svg%3e\");\n}\n\n.custom-checkbox .custom-control-input:disabled:checked ~ .custom-control-label::before {\n  background-color: rgba(0, 123, 255, 0.5);\n}\n\n.custom-checkbox .custom-control-input:disabled:indeterminate ~ .custom-control-label::before {\n  background-color: rgba(0, 123, 255, 0.5);\n}\n\n.custom-radio .custom-control-label::before {\n  border-radius: 50%;\n}\n\n.custom-radio .custom-control-input:checked ~ .custom-control-label::after {\n  background-image: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23fff'/%3e%3c/svg%3e\");\n}\n\n.custom-radio .custom-control-input:disabled:checked ~ .custom-control-label::before {\n  background-color: rgba(0, 123, 255, 0.5);\n}\n\n.custom-switch {\n  padding-left: 2.25rem;\n}\n\n.custom-switch .custom-control-label::before {\n  left: -2.25rem;\n  width: 1.75rem;\n  pointer-events: all;\n  border-radius: 0.5rem;\n}\n\n.custom-switch .custom-control-label::after {\n  top: calc(0.25rem + 2px);\n  left: calc(-2.25rem + 2px);\n  width: calc(1rem - 4px);\n  height: calc(1rem - 4px);\n  background-color: #adb5bd;\n  border-radius: 0.5rem;\n  transition: transform 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .custom-switch .custom-control-label::after {\n    transition: none;\n  }\n}\n\n.custom-switch .custom-control-input:checked ~ .custom-control-label::after {\n  background-color: #fff;\n  transform: translateX(0.75rem);\n}\n\n.custom-switch .custom-control-input:disabled:checked ~ .custom-control-label::before {\n  background-color: rgba(0, 123, 255, 0.5);\n}\n\n.custom-select {\n  display: inline-block;\n  width: 100%;\n  height: calc(1.5em + 0.75rem + 2px);\n  padding: 0.375rem 1.75rem 0.375rem 0.75rem;\n  font-size: 1rem;\n  font-weight: 400;\n  line-height: 1.5;\n  color: #495057;\n  vertical-align: middle;\n  background: #fff url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e\") no-repeat right 0.75rem center/8px 10px;\n  border: 1px solid #ced4da;\n  border-radius: 0.25rem;\n  appearance: none;\n}\n\n.custom-select:focus {\n  border-color: #80bdff;\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);\n}\n\n.custom-select:focus::-ms-value {\n  color: #495057;\n  background-color: #fff;\n}\n\n.custom-select[multiple], .custom-select[size]:not([size=\"1\"]) {\n  height: auto;\n  padding-right: 0.75rem;\n  background-image: none;\n}\n\n.custom-select:disabled {\n  color: #6c757d;\n  background-color: #e9ecef;\n}\n\n.custom-select::-ms-expand {\n  display: none;\n}\n\n.custom-select:-moz-focusring {\n  color: transparent;\n  text-shadow: 0 0 0 #495057;\n}\n\n.custom-select-sm {\n  height: calc(1.5em + 0.5rem + 2px);\n  padding-top: 0.25rem;\n  padding-bottom: 0.25rem;\n  padding-left: 0.5rem;\n  font-size: 0.875rem;\n}\n\n.custom-select-lg {\n  height: calc(1.5em + 1rem + 2px);\n  padding-top: 0.5rem;\n  padding-bottom: 0.5rem;\n  padding-left: 1rem;\n  font-size: 1.25rem;\n}\n\n.custom-file {\n  position: relative;\n  display: inline-block;\n  width: 100%;\n  height: calc(1.5em + 0.75rem + 2px);\n  margin-bottom: 0;\n}\n\n.custom-file-input {\n  position: relative;\n  z-index: 2;\n  width: 100%;\n  height: calc(1.5em + 0.75rem + 2px);\n  margin: 0;\n  opacity: 0;\n}\n\n.custom-file-input:focus ~ .custom-file-label {\n  border-color: #80bdff;\n  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);\n}\n\n.custom-file-input[disabled] ~ .custom-file-label,\n.custom-file-input:disabled ~ .custom-file-label {\n  background-color: #e9ecef;\n}\n\n.custom-file-input:lang(en) ~ .custom-file-label::after {\n  content: \"Browse\";\n}\n\n.custom-file-input ~ .custom-file-label[data-browse]::after {\n  content: attr(data-browse);\n}\n\n.custom-file-label {\n  position: absolute;\n  top: 0;\n  right: 0;\n  left: 0;\n  z-index: 1;\n  height: calc(1.5em + 0.75rem + 2px);\n  padding: 0.375rem 0.75rem;\n  font-weight: 400;\n  line-height: 1.5;\n  color: #495057;\n  background-color: #fff;\n  border: 1px solid #ced4da;\n  border-radius: 0.25rem;\n}\n\n.custom-file-label::after {\n  position: absolute;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  z-index: 3;\n  display: block;\n  height: calc(1.5em + 0.75rem);\n  padding: 0.375rem 0.75rem;\n  line-height: 1.5;\n  color: #495057;\n  content: \"Browse\";\n  background-color: #e9ecef;\n  border-left: inherit;\n  border-radius: 0 0.25rem 0.25rem 0;\n}\n\n.custom-range {\n  width: 100%;\n  height: 1.4rem;\n  padding: 0;\n  background-color: transparent;\n  appearance: none;\n}\n\n.custom-range:focus {\n  outline: none;\n}\n\n.custom-range:focus::-webkit-slider-thumb {\n  box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);\n}\n\n.custom-range:focus::-moz-range-thumb {\n  box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);\n}\n\n.custom-range:focus::-ms-thumb {\n  box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);\n}\n\n.custom-range::-moz-focus-outer {\n  border: 0;\n}\n\n.custom-range::-webkit-slider-thumb {\n  width: 1rem;\n  height: 1rem;\n  margin-top: -0.25rem;\n  background-color: #007bff;\n  border: 0;\n  border-radius: 1rem;\n  transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n  appearance: none;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .custom-range::-webkit-slider-thumb {\n    transition: none;\n  }\n}\n\n.custom-range::-webkit-slider-thumb:active {\n  background-color: #b3d7ff;\n}\n\n.custom-range::-webkit-slider-runnable-track {\n  width: 100%;\n  height: 0.5rem;\n  color: transparent;\n  cursor: pointer;\n  background-color: #dee2e6;\n  border-color: transparent;\n  border-radius: 1rem;\n}\n\n.custom-range::-moz-range-thumb {\n  width: 1rem;\n  height: 1rem;\n  background-color: #007bff;\n  border: 0;\n  border-radius: 1rem;\n  transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n  appearance: none;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .custom-range::-moz-range-thumb {\n    transition: none;\n  }\n}\n\n.custom-range::-moz-range-thumb:active {\n  background-color: #b3d7ff;\n}\n\n.custom-range::-moz-range-track {\n  width: 100%;\n  height: 0.5rem;\n  color: transparent;\n  cursor: pointer;\n  background-color: #dee2e6;\n  border-color: transparent;\n  border-radius: 1rem;\n}\n\n.custom-range::-ms-thumb {\n  width: 1rem;\n  height: 1rem;\n  margin-top: 0;\n  margin-right: 0.2rem;\n  margin-left: 0.2rem;\n  background-color: #007bff;\n  border: 0;\n  border-radius: 1rem;\n  transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n  appearance: none;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .custom-range::-ms-thumb {\n    transition: none;\n  }\n}\n\n.custom-range::-ms-thumb:active {\n  background-color: #b3d7ff;\n}\n\n.custom-range::-ms-track {\n  width: 100%;\n  height: 0.5rem;\n  color: transparent;\n  cursor: pointer;\n  background-color: transparent;\n  border-color: transparent;\n  border-width: 0.5rem;\n}\n\n.custom-range::-ms-fill-lower {\n  background-color: #dee2e6;\n  border-radius: 1rem;\n}\n\n.custom-range::-ms-fill-upper {\n  margin-right: 15px;\n  background-color: #dee2e6;\n  border-radius: 1rem;\n}\n\n.custom-range:disabled::-webkit-slider-thumb {\n  background-color: #adb5bd;\n}\n\n.custom-range:disabled::-webkit-slider-runnable-track {\n  cursor: default;\n}\n\n.custom-range:disabled::-moz-range-thumb {\n  background-color: #adb5bd;\n}\n\n.custom-range:disabled::-moz-range-track {\n  cursor: default;\n}\n\n.custom-range:disabled::-ms-thumb {\n  background-color: #adb5bd;\n}\n\n.custom-control-label::before,\n.custom-file-label,\n.custom-select {\n  transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .custom-control-label::before,\n  .custom-file-label,\n  .custom-select {\n    transition: none;\n  }\n}\n\n.nav {\n  display: flex;\n  flex-wrap: wrap;\n  padding-left: 0;\n  margin-bottom: 0;\n  list-style: none;\n}\n\n.nav-link {\n  display: block;\n  padding: 0.5rem 1rem;\n}\n\n.nav-link:hover, .nav-link:focus {\n  text-decoration: none;\n}\n\n.nav-link.disabled {\n  color: #6c757d;\n  pointer-events: none;\n  cursor: default;\n}\n\n.nav-tabs {\n  border-bottom: 1px solid #dee2e6;\n}\n\n.nav-tabs .nav-item {\n  margin-bottom: -1px;\n}\n\n.nav-tabs .nav-link {\n  border: 1px solid transparent;\n  border-top-left-radius: 0.25rem;\n  border-top-right-radius: 0.25rem;\n}\n\n.nav-tabs .nav-link:hover, .nav-tabs .nav-link:focus {\n  border-color: #e9ecef #e9ecef #dee2e6;\n}\n\n.nav-tabs .nav-link.disabled {\n  color: #6c757d;\n  background-color: transparent;\n  border-color: transparent;\n}\n\n.nav-tabs .nav-link.active,\n.nav-tabs .nav-item.show .nav-link {\n  color: #495057;\n  background-color: #fff;\n  border-color: #dee2e6 #dee2e6 #fff;\n}\n\n.nav-tabs .dropdown-menu {\n  margin-top: -1px;\n  border-top-left-radius: 0;\n  border-top-right-radius: 0;\n}\n\n.nav-pills .nav-link {\n  border-radius: 0.25rem;\n}\n\n.nav-pills .nav-link.active,\n.nav-pills .show > .nav-link {\n  color: #fff;\n  background-color: #007bff;\n}\n\n.nav-fill .nav-item {\n  flex: 1 1 auto;\n  text-align: center;\n}\n\n.nav-justified .nav-item {\n  flex-basis: 0;\n  flex-grow: 1;\n  text-align: center;\n}\n\n.tab-content > .tab-pane {\n  display: none;\n}\n\n.tab-content > .active {\n  display: block;\n}\n\n.navbar {\n  position: relative;\n  display: flex;\n  flex-wrap: wrap;\n  align-items: center;\n  justify-content: space-between;\n  padding: 0.5rem 1rem;\n}\n\n.navbar .container,\n.navbar .container-fluid, .navbar .container-sm, .navbar .container-md, .navbar .container-lg, .navbar .container-xl {\n  display: flex;\n  flex-wrap: wrap;\n  align-items: center;\n  justify-content: space-between;\n}\n\n.navbar-brand {\n  display: inline-block;\n  padding-top: 0.3125rem;\n  padding-bottom: 0.3125rem;\n  margin-right: 1rem;\n  font-size: 1.25rem;\n  line-height: inherit;\n  white-space: nowrap;\n}\n\n.navbar-brand:hover, .navbar-brand:focus {\n  text-decoration: none;\n}\n\n.navbar-nav {\n  display: flex;\n  flex-direction: column;\n  padding-left: 0;\n  margin-bottom: 0;\n  list-style: none;\n}\n\n.navbar-nav .nav-link {\n  padding-right: 0;\n  padding-left: 0;\n}\n\n.navbar-nav .dropdown-menu {\n  position: static;\n  float: none;\n}\n\n.navbar-text {\n  display: inline-block;\n  padding-top: 0.5rem;\n  padding-bottom: 0.5rem;\n}\n\n.navbar-collapse {\n  flex-basis: 100%;\n  flex-grow: 1;\n  align-items: center;\n}\n\n.navbar-toggler {\n  padding: 0.25rem 0.75rem;\n  font-size: 1.25rem;\n  line-height: 1;\n  background-color: transparent;\n  border: 1px solid transparent;\n  border-radius: 0.25rem;\n}\n\n.navbar-toggler:hover, .navbar-toggler:focus {\n  text-decoration: none;\n}\n\n.navbar-toggler-icon {\n  display: inline-block;\n  width: 1.5em;\n  height: 1.5em;\n  vertical-align: middle;\n  content: \"\";\n  background: no-repeat center center;\n  background-size: 100% 100%;\n}\n\n@media (max-width: 575.98px) {\n  .navbar-expand-sm > .container,\n  .navbar-expand-sm > .container-fluid, .navbar-expand-sm > .container-sm, .navbar-expand-sm > .container-md, .navbar-expand-sm > .container-lg, .navbar-expand-sm > .container-xl {\n    padding-right: 0;\n    padding-left: 0;\n  }\n}\n\n@media (min-width: 576px) {\n  .navbar-expand-sm {\n    flex-flow: row nowrap;\n    justify-content: flex-start;\n  }\n  .navbar-expand-sm .navbar-nav {\n    flex-direction: row;\n  }\n  .navbar-expand-sm .navbar-nav .dropdown-menu {\n    position: absolute;\n  }\n  .navbar-expand-sm .navbar-nav .nav-link {\n    padding-right: 0.5rem;\n    padding-left: 0.5rem;\n  }\n  .navbar-expand-sm > .container,\n  .navbar-expand-sm > .container-fluid, .navbar-expand-sm > .container-sm, .navbar-expand-sm > .container-md, .navbar-expand-sm > .container-lg, .navbar-expand-sm > .container-xl {\n    flex-wrap: nowrap;\n  }\n  .navbar-expand-sm .navbar-collapse {\n    display: flex !important;\n    flex-basis: auto;\n  }\n  .navbar-expand-sm .navbar-toggler {\n    display: none;\n  }\n}\n\n@media (max-width: 767.98px) {\n  .navbar-expand-md > .container,\n  .navbar-expand-md > .container-fluid, .navbar-expand-md > .container-sm, .navbar-expand-md > .container-md, .navbar-expand-md > .container-lg, .navbar-expand-md > .container-xl {\n    padding-right: 0;\n    padding-left: 0;\n  }\n}\n\n@media (min-width: 768px) {\n  .navbar-expand-md {\n    flex-flow: row nowrap;\n    justify-content: flex-start;\n  }\n  .navbar-expand-md .navbar-nav {\n    flex-direction: row;\n  }\n  .navbar-expand-md .navbar-nav .dropdown-menu {\n    position: absolute;\n  }\n  .navbar-expand-md .navbar-nav .nav-link {\n    padding-right: 0.5rem;\n    padding-left: 0.5rem;\n  }\n  .navbar-expand-md > .container,\n  .navbar-expand-md > .container-fluid, .navbar-expand-md > .container-sm, .navbar-expand-md > .container-md, .navbar-expand-md > .container-lg, .navbar-expand-md > .container-xl {\n    flex-wrap: nowrap;\n  }\n  .navbar-expand-md .navbar-collapse {\n    display: flex !important;\n    flex-basis: auto;\n  }\n  .navbar-expand-md .navbar-toggler {\n    display: none;\n  }\n}\n\n@media (max-width: 991.98px) {\n  .navbar-expand-lg > .container,\n  .navbar-expand-lg > .container-fluid, .navbar-expand-lg > .container-sm, .navbar-expand-lg > .container-md, .navbar-expand-lg > .container-lg, .navbar-expand-lg > .container-xl {\n    padding-right: 0;\n    padding-left: 0;\n  }\n}\n\n@media (min-width: 992px) {\n  .navbar-expand-lg {\n    flex-flow: row nowrap;\n    justify-content: flex-start;\n  }\n  .navbar-expand-lg .navbar-nav {\n    flex-direction: row;\n  }\n  .navbar-expand-lg .navbar-nav .dropdown-menu {\n    position: absolute;\n  }\n  .navbar-expand-lg .navbar-nav .nav-link {\n    padding-right: 0.5rem;\n    padding-left: 0.5rem;\n  }\n  .navbar-expand-lg > .container,\n  .navbar-expand-lg > .container-fluid, .navbar-expand-lg > .container-sm, .navbar-expand-lg > .container-md, .navbar-expand-lg > .container-lg, .navbar-expand-lg > .container-xl {\n    flex-wrap: nowrap;\n  }\n  .navbar-expand-lg .navbar-collapse {\n    display: flex !important;\n    flex-basis: auto;\n  }\n  .navbar-expand-lg .navbar-toggler {\n    display: none;\n  }\n}\n\n@media (max-width: 1199.98px) {\n  .navbar-expand-xl > .container,\n  .navbar-expand-xl > .container-fluid, .navbar-expand-xl > .container-sm, .navbar-expand-xl > .container-md, .navbar-expand-xl > .container-lg, .navbar-expand-xl > .container-xl {\n    padding-right: 0;\n    padding-left: 0;\n  }\n}\n\n@media (min-width: 1200px) {\n  .navbar-expand-xl {\n    flex-flow: row nowrap;\n    justify-content: flex-start;\n  }\n  .navbar-expand-xl .navbar-nav {\n    flex-direction: row;\n  }\n  .navbar-expand-xl .navbar-nav .dropdown-menu {\n    position: absolute;\n  }\n  .navbar-expand-xl .navbar-nav .nav-link {\n    padding-right: 0.5rem;\n    padding-left: 0.5rem;\n  }\n  .navbar-expand-xl > .container,\n  .navbar-expand-xl > .container-fluid, .navbar-expand-xl > .container-sm, .navbar-expand-xl > .container-md, .navbar-expand-xl > .container-lg, .navbar-expand-xl > .container-xl {\n    flex-wrap: nowrap;\n  }\n  .navbar-expand-xl .navbar-collapse {\n    display: flex !important;\n    flex-basis: auto;\n  }\n  .navbar-expand-xl .navbar-toggler {\n    display: none;\n  }\n}\n\n.navbar-expand {\n  flex-flow: row nowrap;\n  justify-content: flex-start;\n}\n\n.navbar-expand > .container,\n.navbar-expand > .container-fluid, .navbar-expand > .container-sm, .navbar-expand > .container-md, .navbar-expand > .container-lg, .navbar-expand > .container-xl {\n  padding-right: 0;\n  padding-left: 0;\n}\n\n.navbar-expand .navbar-nav {\n  flex-direction: row;\n}\n\n.navbar-expand .navbar-nav .dropdown-menu {\n  position: absolute;\n}\n\n.navbar-expand .navbar-nav .nav-link {\n  padding-right: 0.5rem;\n  padding-left: 0.5rem;\n}\n\n.navbar-expand > .container,\n.navbar-expand > .container-fluid, .navbar-expand > .container-sm, .navbar-expand > .container-md, .navbar-expand > .container-lg, .navbar-expand > .container-xl {\n  flex-wrap: nowrap;\n}\n\n.navbar-expand .navbar-collapse {\n  display: flex !important;\n  flex-basis: auto;\n}\n\n.navbar-expand .navbar-toggler {\n  display: none;\n}\n\n.navbar-light .navbar-brand {\n  color: rgba(0, 0, 0, 0.9);\n}\n\n.navbar-light .navbar-brand:hover, .navbar-light .navbar-brand:focus {\n  color: rgba(0, 0, 0, 0.9);\n}\n\n.navbar-light .navbar-nav .nav-link {\n  color: rgba(0, 0, 0, 0.5);\n}\n\n.navbar-light .navbar-nav .nav-link:hover, .navbar-light .navbar-nav .nav-link:focus {\n  color: rgba(0, 0, 0, 0.7);\n}\n\n.navbar-light .navbar-nav .nav-link.disabled {\n  color: rgba(0, 0, 0, 0.3);\n}\n\n.navbar-light .navbar-nav .show > .nav-link,\n.navbar-light .navbar-nav .active > .nav-link,\n.navbar-light .navbar-nav .nav-link.show,\n.navbar-light .navbar-nav .nav-link.active {\n  color: rgba(0, 0, 0, 0.9);\n}\n\n.navbar-light .navbar-toggler {\n  color: rgba(0, 0, 0, 0.5);\n  border-color: rgba(0, 0, 0, 0.1);\n}\n\n.navbar-light .navbar-toggler-icon {\n  background-image: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(0, 0, 0, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e\");\n}\n\n.navbar-light .navbar-text {\n  color: rgba(0, 0, 0, 0.5);\n}\n\n.navbar-light .navbar-text a {\n  color: rgba(0, 0, 0, 0.9);\n}\n\n.navbar-light .navbar-text a:hover, .navbar-light .navbar-text a:focus {\n  color: rgba(0, 0, 0, 0.9);\n}\n\n.navbar-dark .navbar-brand {\n  color: #fff;\n}\n\n.navbar-dark .navbar-brand:hover, .navbar-dark .navbar-brand:focus {\n  color: #fff;\n}\n\n.navbar-dark .navbar-nav .nav-link {\n  color: rgba(255, 255, 255, 0.5);\n}\n\n.navbar-dark .navbar-nav .nav-link:hover, .navbar-dark .navbar-nav .nav-link:focus {\n  color: rgba(255, 255, 255, 0.75);\n}\n\n.navbar-dark .navbar-nav .nav-link.disabled {\n  color: rgba(255, 255, 255, 0.25);\n}\n\n.navbar-dark .navbar-nav .show > .nav-link,\n.navbar-dark .navbar-nav .active > .nav-link,\n.navbar-dark .navbar-nav .nav-link.show,\n.navbar-dark .navbar-nav .nav-link.active {\n  color: #fff;\n}\n\n.navbar-dark .navbar-toggler {\n  color: rgba(255, 255, 255, 0.5);\n  border-color: rgba(255, 255, 255, 0.1);\n}\n\n.navbar-dark .navbar-toggler-icon {\n  background-image: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(255, 255, 255, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e\");\n}\n\n.navbar-dark .navbar-text {\n  color: rgba(255, 255, 255, 0.5);\n}\n\n.navbar-dark .navbar-text a {\n  color: #fff;\n}\n\n.navbar-dark .navbar-text a:hover, .navbar-dark .navbar-text a:focus {\n  color: #fff;\n}\n\n.card {\n  position: relative;\n  display: flex;\n  flex-direction: column;\n  min-width: 0;\n  word-wrap: break-word;\n  background-color: #fff;\n  background-clip: border-box;\n  border: 1px solid rgba(0, 0, 0, 0.125);\n  border-radius: 0.25rem;\n}\n\n.card > hr {\n  margin-right: 0;\n  margin-left: 0;\n}\n\n.card > .list-group:first-child .list-group-item:first-child {\n  border-top-left-radius: 0.25rem;\n  border-top-right-radius: 0.25rem;\n}\n\n.card > .list-group:last-child .list-group-item:last-child {\n  border-bottom-right-radius: 0.25rem;\n  border-bottom-left-radius: 0.25rem;\n}\n\n.card-body {\n  flex: 1 1 auto;\n  min-height: 1px;\n  padding: 1.25rem;\n}\n\n.card-title {\n  margin-bottom: 0.75rem;\n}\n\n.card-subtitle {\n  margin-top: -0.375rem;\n  margin-bottom: 0;\n}\n\n.card-text:last-child {\n  margin-bottom: 0;\n}\n\n.card-link:hover {\n  text-decoration: none;\n}\n\n.card-link + .card-link {\n  margin-left: 1.25rem;\n}\n\n.card-header {\n  padding: 0.75rem 1.25rem;\n  margin-bottom: 0;\n  background-color: rgba(0, 0, 0, 0.03);\n  border-bottom: 1px solid rgba(0, 0, 0, 0.125);\n}\n\n.card-header:first-child {\n  border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0;\n}\n\n.card-header + .list-group .list-group-item:first-child {\n  border-top: 0;\n}\n\n.card-footer {\n  padding: 0.75rem 1.25rem;\n  background-color: rgba(0, 0, 0, 0.03);\n  border-top: 1px solid rgba(0, 0, 0, 0.125);\n}\n\n.card-footer:last-child {\n  border-radius: 0 0 calc(0.25rem - 1px) calc(0.25rem - 1px);\n}\n\n.card-header-tabs {\n  margin-right: -0.625rem;\n  margin-bottom: -0.75rem;\n  margin-left: -0.625rem;\n  border-bottom: 0;\n}\n\n.card-header-pills {\n  margin-right: -0.625rem;\n  margin-left: -0.625rem;\n}\n\n.card-img-overlay {\n  position: absolute;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  padding: 1.25rem;\n}\n\n.card-img,\n.card-img-top,\n.card-img-bottom {\n  flex-shrink: 0;\n  width: 100%;\n}\n\n.card-img,\n.card-img-top {\n  border-top-left-radius: calc(0.25rem - 1px);\n  border-top-right-radius: calc(0.25rem - 1px);\n}\n\n.card-img,\n.card-img-bottom {\n  border-bottom-right-radius: calc(0.25rem - 1px);\n  border-bottom-left-radius: calc(0.25rem - 1px);\n}\n\n.card-deck .card {\n  margin-bottom: 15px;\n}\n\n@media (min-width: 576px) {\n  .card-deck {\n    display: flex;\n    flex-flow: row wrap;\n    margin-right: -15px;\n    margin-left: -15px;\n  }\n  .card-deck .card {\n    flex: 1 0 0%;\n    margin-right: 15px;\n    margin-bottom: 0;\n    margin-left: 15px;\n  }\n}\n\n.card-group > .card {\n  margin-bottom: 15px;\n}\n\n@media (min-width: 576px) {\n  .card-group {\n    display: flex;\n    flex-flow: row wrap;\n  }\n  .card-group > .card {\n    flex: 1 0 0%;\n    margin-bottom: 0;\n  }\n  .card-group > .card + .card {\n    margin-left: 0;\n    border-left: 0;\n  }\n  .card-group > .card:not(:last-child) {\n    border-top-right-radius: 0;\n    border-bottom-right-radius: 0;\n  }\n  .card-group > .card:not(:last-child) .card-img-top,\n  .card-group > .card:not(:last-child) .card-header {\n    border-top-right-radius: 0;\n  }\n  .card-group > .card:not(:last-child) .card-img-bottom,\n  .card-group > .card:not(:last-child) .card-footer {\n    border-bottom-right-radius: 0;\n  }\n  .card-group > .card:not(:first-child) {\n    border-top-left-radius: 0;\n    border-bottom-left-radius: 0;\n  }\n  .card-group > .card:not(:first-child) .card-img-top,\n  .card-group > .card:not(:first-child) .card-header {\n    border-top-left-radius: 0;\n  }\n  .card-group > .card:not(:first-child) .card-img-bottom,\n  .card-group > .card:not(:first-child) .card-footer {\n    border-bottom-left-radius: 0;\n  }\n}\n\n.card-columns .card {\n  margin-bottom: 0.75rem;\n}\n\n@media (min-width: 576px) {\n  .card-columns {\n    column-count: 3;\n    column-gap: 1.25rem;\n    orphans: 1;\n    widows: 1;\n  }\n  .card-columns .card {\n    display: inline-block;\n    width: 100%;\n  }\n}\n\n.accordion > .card {\n  overflow: hidden;\n}\n\n.accordion > .card:not(:last-of-type) {\n  border-bottom: 0;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 0;\n}\n\n.accordion > .card:not(:first-of-type) {\n  border-top-left-radius: 0;\n  border-top-right-radius: 0;\n}\n\n.accordion > .card > .card-header {\n  border-radius: 0;\n  margin-bottom: -1px;\n}\n\n.breadcrumb {\n  display: flex;\n  flex-wrap: wrap;\n  padding: 0.75rem 1rem;\n  margin-bottom: 1rem;\n  list-style: none;\n  background-color: #e9ecef;\n  border-radius: 0.25rem;\n}\n\n.breadcrumb-item + .breadcrumb-item {\n  padding-left: 0.5rem;\n}\n\n.breadcrumb-item + .breadcrumb-item::before {\n  display: inline-block;\n  padding-right: 0.5rem;\n  color: #6c757d;\n  content: \"/\";\n}\n\n.breadcrumb-item + .breadcrumb-item:hover::before {\n  text-decoration: underline;\n}\n\n.breadcrumb-item + .breadcrumb-item:hover::before {\n  text-decoration: none;\n}\n\n.breadcrumb-item.active {\n  color: #6c757d;\n}\n\n.pagination {\n  display: flex;\n  padding-left: 0;\n  list-style: none;\n  border-radius: 0.25rem;\n}\n\n.page-link {\n  position: relative;\n  display: block;\n  padding: 0.5rem 0.75rem;\n  margin-left: -1px;\n  line-height: 1.25;\n  color: #007bff;\n  background-color: #fff;\n  border: 1px solid #dee2e6;\n}\n\n.page-link:hover {\n  z-index: 2;\n  color: #0056b3;\n  text-decoration: none;\n  background-color: #e9ecef;\n  border-color: #dee2e6;\n}\n\n.page-link:focus {\n  z-index: 3;\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);\n}\n\n.page-item:first-child .page-link {\n  margin-left: 0;\n  border-top-left-radius: 0.25rem;\n  border-bottom-left-radius: 0.25rem;\n}\n\n.page-item:last-child .page-link {\n  border-top-right-radius: 0.25rem;\n  border-bottom-right-radius: 0.25rem;\n}\n\n.page-item.active .page-link {\n  z-index: 3;\n  color: #fff;\n  background-color: #007bff;\n  border-color: #007bff;\n}\n\n.page-item.disabled .page-link {\n  color: #6c757d;\n  pointer-events: none;\n  cursor: auto;\n  background-color: #fff;\n  border-color: #dee2e6;\n}\n\n.pagination-lg .page-link {\n  padding: 0.75rem 1.5rem;\n  font-size: 1.25rem;\n  line-height: 1.5;\n}\n\n.pagination-lg .page-item:first-child .page-link {\n  border-top-left-radius: 0.3rem;\n  border-bottom-left-radius: 0.3rem;\n}\n\n.pagination-lg .page-item:last-child .page-link {\n  border-top-right-radius: 0.3rem;\n  border-bottom-right-radius: 0.3rem;\n}\n\n.pagination-sm .page-link {\n  padding: 0.25rem 0.5rem;\n  font-size: 0.875rem;\n  line-height: 1.5;\n}\n\n.pagination-sm .page-item:first-child .page-link {\n  border-top-left-radius: 0.2rem;\n  border-bottom-left-radius: 0.2rem;\n}\n\n.pagination-sm .page-item:last-child .page-link {\n  border-top-right-radius: 0.2rem;\n  border-bottom-right-radius: 0.2rem;\n}\n\n.badge {\n  display: inline-block;\n  padding: 0.25em 0.4em;\n  font-size: 75%;\n  font-weight: 700;\n  line-height: 1;\n  text-align: center;\n  white-space: nowrap;\n  vertical-align: baseline;\n  border-radius: 0.25rem;\n  transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .badge {\n    transition: none;\n  }\n}\n\na.badge:hover, a.badge:focus {\n  text-decoration: none;\n}\n\n.badge:empty {\n  display: none;\n}\n\n.btn .badge {\n  position: relative;\n  top: -1px;\n}\n\n.badge-pill {\n  padding-right: 0.6em;\n  padding-left: 0.6em;\n  border-radius: 10rem;\n}\n\n.badge-primary {\n  color: #fff;\n  background-color: #007bff;\n}\n\na.badge-primary:hover, a.badge-primary:focus {\n  color: #fff;\n  background-color: #0062cc;\n}\n\na.badge-primary:focus, a.badge-primary.focus {\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);\n}\n\n.badge-secondary {\n  color: #fff;\n  background-color: #6c757d;\n}\n\na.badge-secondary:hover, a.badge-secondary:focus {\n  color: #fff;\n  background-color: #545b62;\n}\n\na.badge-secondary:focus, a.badge-secondary.focus {\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5);\n}\n\n.badge-success {\n  color: #fff;\n  background-color: #28a745;\n}\n\na.badge-success:hover, a.badge-success:focus {\n  color: #fff;\n  background-color: #1e7e34;\n}\n\na.badge-success:focus, a.badge-success.focus {\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);\n}\n\n.badge-info {\n  color: #fff;\n  background-color: #17a2b8;\n}\n\na.badge-info:hover, a.badge-info:focus {\n  color: #fff;\n  background-color: #117a8b;\n}\n\na.badge-info:focus, a.badge-info.focus {\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);\n}\n\n.badge-warning {\n  color: #212529;\n  background-color: #ffc107;\n}\n\na.badge-warning:hover, a.badge-warning:focus {\n  color: #212529;\n  background-color: #d39e00;\n}\n\na.badge-warning:focus, a.badge-warning.focus {\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);\n}\n\n.badge-danger {\n  color: #fff;\n  background-color: #dc3545;\n}\n\na.badge-danger:hover, a.badge-danger:focus {\n  color: #fff;\n  background-color: #bd2130;\n}\n\na.badge-danger:focus, a.badge-danger.focus {\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);\n}\n\n.badge-light {\n  color: #212529;\n  background-color: #f8f9fa;\n}\n\na.badge-light:hover, a.badge-light:focus {\n  color: #212529;\n  background-color: #dae0e5;\n}\n\na.badge-light:focus, a.badge-light.focus {\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);\n}\n\n.badge-dark {\n  color: #fff;\n  background-color: #343a40;\n}\n\na.badge-dark:hover, a.badge-dark:focus {\n  color: #fff;\n  background-color: #1d2124;\n}\n\na.badge-dark:focus, a.badge-dark.focus {\n  outline: 0;\n  box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);\n}\n\n.jumbotron {\n  padding: 2rem 1rem;\n  margin-bottom: 2rem;\n  background-color: #e9ecef;\n  border-radius: 0.3rem;\n}\n\n@media (min-width: 576px) {\n  .jumbotron {\n    padding: 4rem 2rem;\n  }\n}\n\n.jumbotron-fluid {\n  padding-right: 0;\n  padding-left: 0;\n  border-radius: 0;\n}\n\n.alert {\n  position: relative;\n  padding: 0.75rem 1.25rem;\n  margin-bottom: 1rem;\n  border: 1px solid transparent;\n  border-radius: 0.25rem;\n}\n\n.alert-heading {\n  color: inherit;\n}\n\n.alert-link {\n  font-weight: 700;\n}\n\n.alert-dismissible {\n  padding-right: 4rem;\n}\n\n.alert-dismissible .close {\n  position: absolute;\n  top: 0;\n  right: 0;\n  padding: 0.75rem 1.25rem;\n  color: inherit;\n}\n\n.alert-primary {\n  color: #004085;\n  background-color: #cce5ff;\n  border-color: #b8daff;\n}\n\n.alert-primary hr {\n  border-top-color: #9fcdff;\n}\n\n.alert-primary .alert-link {\n  color: #002752;\n}\n\n.alert-secondary {\n  color: #383d41;\n  background-color: #e2e3e5;\n  border-color: #d6d8db;\n}\n\n.alert-secondary hr {\n  border-top-color: #c8cbcf;\n}\n\n.alert-secondary .alert-link {\n  color: #202326;\n}\n\n.alert-success {\n  color: #155724;\n  background-color: #d4edda;\n  border-color: #c3e6cb;\n}\n\n.alert-success hr {\n  border-top-color: #b1dfbb;\n}\n\n.alert-success .alert-link {\n  color: #0b2e13;\n}\n\n.alert-info {\n  color: #0c5460;\n  background-color: #d1ecf1;\n  border-color: #bee5eb;\n}\n\n.alert-info hr {\n  border-top-color: #abdde5;\n}\n\n.alert-info .alert-link {\n  color: #062c33;\n}\n\n.alert-warning {\n  color: #856404;\n  background-color: #fff3cd;\n  border-color: #ffeeba;\n}\n\n.alert-warning hr {\n  border-top-color: #ffe8a1;\n}\n\n.alert-warning .alert-link {\n  color: #533f03;\n}\n\n.alert-danger {\n  color: #721c24;\n  background-color: #f8d7da;\n  border-color: #f5c6cb;\n}\n\n.alert-danger hr {\n  border-top-color: #f1b0b7;\n}\n\n.alert-danger .alert-link {\n  color: #491217;\n}\n\n.alert-light {\n  color: #818182;\n  background-color: #fefefe;\n  border-color: #fdfdfe;\n}\n\n.alert-light hr {\n  border-top-color: #ececf6;\n}\n\n.alert-light .alert-link {\n  color: #686868;\n}\n\n.alert-dark {\n  color: #1b1e21;\n  background-color: #d6d8d9;\n  border-color: #c6c8ca;\n}\n\n.alert-dark hr {\n  border-top-color: #b9bbbe;\n}\n\n.alert-dark .alert-link {\n  color: #040505;\n}\n\n@keyframes progress-bar-stripes {\n  from {\n    background-position: 1rem 0;\n  }\n  to {\n    background-position: 0 0;\n  }\n}\n\n.progress {\n  display: flex;\n  height: 1rem;\n  overflow: hidden;\n  font-size: 0.75rem;\n  background-color: #e9ecef;\n  border-radius: 0.25rem;\n}\n\n.progress-bar {\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  overflow: hidden;\n  color: #fff;\n  text-align: center;\n  white-space: nowrap;\n  background-color: #007bff;\n  transition: width 0.6s ease;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .progress-bar {\n    transition: none;\n  }\n}\n\n.progress-bar-striped {\n  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);\n  background-size: 1rem 1rem;\n}\n\n.progress-bar-animated {\n  animation: progress-bar-stripes 1s linear infinite;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .progress-bar-animated {\n    animation: none;\n  }\n}\n\n.media {\n  display: flex;\n  align-items: flex-start;\n}\n\n.media-body {\n  flex: 1;\n}\n\n.list-group {\n  display: flex;\n  flex-direction: column;\n  padding-left: 0;\n  margin-bottom: 0;\n}\n\n.list-group-item-action {\n  width: 100%;\n  color: #495057;\n  text-align: inherit;\n}\n\n.list-group-item-action:hover, .list-group-item-action:focus {\n  z-index: 1;\n  color: #495057;\n  text-decoration: none;\n  background-color: #f8f9fa;\n}\n\n.list-group-item-action:active {\n  color: #212529;\n  background-color: #e9ecef;\n}\n\n.list-group-item {\n  position: relative;\n  display: block;\n  padding: 0.75rem 1.25rem;\n  background-color: #fff;\n  border: 1px solid rgba(0, 0, 0, 0.125);\n}\n\n.list-group-item:first-child {\n  border-top-left-radius: 0.25rem;\n  border-top-right-radius: 0.25rem;\n}\n\n.list-group-item:last-child {\n  border-bottom-right-radius: 0.25rem;\n  border-bottom-left-radius: 0.25rem;\n}\n\n.list-group-item.disabled, .list-group-item:disabled {\n  color: #6c757d;\n  pointer-events: none;\n  background-color: #fff;\n}\n\n.list-group-item.active {\n  z-index: 2;\n  color: #fff;\n  background-color: #007bff;\n  border-color: #007bff;\n}\n\n.list-group-item + .list-group-item {\n  border-top-width: 0;\n}\n\n.list-group-item + .list-group-item.active {\n  margin-top: -1px;\n  border-top-width: 1px;\n}\n\n.list-group-horizontal {\n  flex-direction: row;\n}\n\n.list-group-horizontal .list-group-item:first-child {\n  border-bottom-left-radius: 0.25rem;\n  border-top-right-radius: 0;\n}\n\n.list-group-horizontal .list-group-item:last-child {\n  border-top-right-radius: 0.25rem;\n  border-bottom-left-radius: 0;\n}\n\n.list-group-horizontal .list-group-item.active {\n  margin-top: 0;\n}\n\n.list-group-horizontal .list-group-item + .list-group-item {\n  border-top-width: 1px;\n  border-left-width: 0;\n}\n\n.list-group-horizontal .list-group-item + .list-group-item.active {\n  margin-left: -1px;\n  border-left-width: 1px;\n}\n\n@media (min-width: 576px) {\n  .list-group-horizontal-sm {\n    flex-direction: row;\n  }\n  .list-group-horizontal-sm .list-group-item:first-child {\n    border-bottom-left-radius: 0.25rem;\n    border-top-right-radius: 0;\n  }\n  .list-group-horizontal-sm .list-group-item:last-child {\n    border-top-right-radius: 0.25rem;\n    border-bottom-left-radius: 0;\n  }\n  .list-group-horizontal-sm .list-group-item.active {\n    margin-top: 0;\n  }\n  .list-group-horizontal-sm .list-group-item + .list-group-item {\n    border-top-width: 1px;\n    border-left-width: 0;\n  }\n  .list-group-horizontal-sm .list-group-item + .list-group-item.active {\n    margin-left: -1px;\n    border-left-width: 1px;\n  }\n}\n\n@media (min-width: 768px) {\n  .list-group-horizontal-md {\n    flex-direction: row;\n  }\n  .list-group-horizontal-md .list-group-item:first-child {\n    border-bottom-left-radius: 0.25rem;\n    border-top-right-radius: 0;\n  }\n  .list-group-horizontal-md .list-group-item:last-child {\n    border-top-right-radius: 0.25rem;\n    border-bottom-left-radius: 0;\n  }\n  .list-group-horizontal-md .list-group-item.active {\n    margin-top: 0;\n  }\n  .list-group-horizontal-md .list-group-item + .list-group-item {\n    border-top-width: 1px;\n    border-left-width: 0;\n  }\n  .list-group-horizontal-md .list-group-item + .list-group-item.active {\n    margin-left: -1px;\n    border-left-width: 1px;\n  }\n}\n\n@media (min-width: 992px) {\n  .list-group-horizontal-lg {\n    flex-direction: row;\n  }\n  .list-group-horizontal-lg .list-group-item:first-child {\n    border-bottom-left-radius: 0.25rem;\n    border-top-right-radius: 0;\n  }\n  .list-group-horizontal-lg .list-group-item:last-child {\n    border-top-right-radius: 0.25rem;\n    border-bottom-left-radius: 0;\n  }\n  .list-group-horizontal-lg .list-group-item.active {\n    margin-top: 0;\n  }\n  .list-group-horizontal-lg .list-group-item + .list-group-item {\n    border-top-width: 1px;\n    border-left-width: 0;\n  }\n  .list-group-horizontal-lg .list-group-item + .list-group-item.active {\n    margin-left: -1px;\n    border-left-width: 1px;\n  }\n}\n\n@media (min-width: 1200px) {\n  .list-group-horizontal-xl {\n    flex-direction: row;\n  }\n  .list-group-horizontal-xl .list-group-item:first-child {\n    border-bottom-left-radius: 0.25rem;\n    border-top-right-radius: 0;\n  }\n  .list-group-horizontal-xl .list-group-item:last-child {\n    border-top-right-radius: 0.25rem;\n    border-bottom-left-radius: 0;\n  }\n  .list-group-horizontal-xl .list-group-item.active {\n    margin-top: 0;\n  }\n  .list-group-horizontal-xl .list-group-item + .list-group-item {\n    border-top-width: 1px;\n    border-left-width: 0;\n  }\n  .list-group-horizontal-xl .list-group-item + .list-group-item.active {\n    margin-left: -1px;\n    border-left-width: 1px;\n  }\n}\n\n.list-group-flush .list-group-item {\n  border-right-width: 0;\n  border-left-width: 0;\n  border-radius: 0;\n}\n\n.list-group-flush .list-group-item:first-child {\n  border-top-width: 0;\n}\n\n.list-group-flush:last-child .list-group-item:last-child {\n  border-bottom-width: 0;\n}\n\n.list-group-item-primary {\n  color: #004085;\n  background-color: #b8daff;\n}\n\n.list-group-item-primary.list-group-item-action:hover, .list-group-item-primary.list-group-item-action:focus {\n  color: #004085;\n  background-color: #9fcdff;\n}\n\n.list-group-item-primary.list-group-item-action.active {\n  color: #fff;\n  background-color: #004085;\n  border-color: #004085;\n}\n\n.list-group-item-secondary {\n  color: #383d41;\n  background-color: #d6d8db;\n}\n\n.list-group-item-secondary.list-group-item-action:hover, .list-group-item-secondary.list-group-item-action:focus {\n  color: #383d41;\n  background-color: #c8cbcf;\n}\n\n.list-group-item-secondary.list-group-item-action.active {\n  color: #fff;\n  background-color: #383d41;\n  border-color: #383d41;\n}\n\n.list-group-item-success {\n  color: #155724;\n  background-color: #c3e6cb;\n}\n\n.list-group-item-success.list-group-item-action:hover, .list-group-item-success.list-group-item-action:focus {\n  color: #155724;\n  background-color: #b1dfbb;\n}\n\n.list-group-item-success.list-group-item-action.active {\n  color: #fff;\n  background-color: #155724;\n  border-color: #155724;\n}\n\n.list-group-item-info {\n  color: #0c5460;\n  background-color: #bee5eb;\n}\n\n.list-group-item-info.list-group-item-action:hover, .list-group-item-info.list-group-item-action:focus {\n  color: #0c5460;\n  background-color: #abdde5;\n}\n\n.list-group-item-info.list-group-item-action.active {\n  color: #fff;\n  background-color: #0c5460;\n  border-color: #0c5460;\n}\n\n.list-group-item-warning {\n  color: #856404;\n  background-color: #ffeeba;\n}\n\n.list-group-item-warning.list-group-item-action:hover, .list-group-item-warning.list-group-item-action:focus {\n  color: #856404;\n  background-color: #ffe8a1;\n}\n\n.list-group-item-warning.list-group-item-action.active {\n  color: #fff;\n  background-color: #856404;\n  border-color: #856404;\n}\n\n.list-group-item-danger {\n  color: #721c24;\n  background-color: #f5c6cb;\n}\n\n.list-group-item-danger.list-group-item-action:hover, .list-group-item-danger.list-group-item-action:focus {\n  color: #721c24;\n  background-color: #f1b0b7;\n}\n\n.list-group-item-danger.list-group-item-action.active {\n  color: #fff;\n  background-color: #721c24;\n  border-color: #721c24;\n}\n\n.list-group-item-light {\n  color: #818182;\n  background-color: #fdfdfe;\n}\n\n.list-group-item-light.list-group-item-action:hover, .list-group-item-light.list-group-item-action:focus {\n  color: #818182;\n  background-color: #ececf6;\n}\n\n.list-group-item-light.list-group-item-action.active {\n  color: #fff;\n  background-color: #818182;\n  border-color: #818182;\n}\n\n.list-group-item-dark {\n  color: #1b1e21;\n  background-color: #c6c8ca;\n}\n\n.list-group-item-dark.list-group-item-action:hover, .list-group-item-dark.list-group-item-action:focus {\n  color: #1b1e21;\n  background-color: #b9bbbe;\n}\n\n.list-group-item-dark.list-group-item-action.active {\n  color: #fff;\n  background-color: #1b1e21;\n  border-color: #1b1e21;\n}\n\n.close {\n  float: right;\n  font-size: 1.5rem;\n  font-weight: 700;\n  line-height: 1;\n  color: #000;\n  text-shadow: 0 1px 0 #fff;\n  opacity: .5;\n}\n\n.close:hover {\n  color: #000;\n  text-decoration: none;\n}\n\n.close:not(:disabled):not(.disabled):hover, .close:not(:disabled):not(.disabled):focus {\n  opacity: .75;\n}\n\nbutton.close {\n  padding: 0;\n  background-color: transparent;\n  border: 0;\n  appearance: none;\n}\n\na.close.disabled {\n  pointer-events: none;\n}\n\n.toast {\n  max-width: 350px;\n  overflow: hidden;\n  font-size: 0.875rem;\n  background-color: rgba(255, 255, 255, 0.85);\n  background-clip: padding-box;\n  border: 1px solid rgba(0, 0, 0, 0.1);\n  box-shadow: 0 0.25rem 0.75rem rgba(0, 0, 0, 0.1);\n  backdrop-filter: blur(10px);\n  opacity: 0;\n  border-radius: 0.25rem;\n}\n\n.toast:not(:last-child) {\n  margin-bottom: 0.75rem;\n}\n\n.toast.showing {\n  opacity: 1;\n}\n\n.toast.show {\n  display: block;\n  opacity: 1;\n}\n\n.toast.hide {\n  display: none;\n}\n\n.toast-header {\n  display: flex;\n  align-items: center;\n  padding: 0.25rem 0.75rem;\n  color: #6c757d;\n  background-color: rgba(255, 255, 255, 0.85);\n  background-clip: padding-box;\n  border-bottom: 1px solid rgba(0, 0, 0, 0.05);\n}\n\n.toast-body {\n  padding: 0.75rem;\n}\n\n.modal-open {\n  overflow: hidden;\n}\n\n.modal-open .modal {\n  overflow-x: hidden;\n  overflow-y: auto;\n}\n\n.modal {\n  position: fixed;\n  top: 0;\n  left: 0;\n  z-index: 1050;\n  display: none;\n  width: 100%;\n  height: 100%;\n  overflow: hidden;\n  outline: 0;\n}\n\n.modal-dialog {\n  position: relative;\n  width: auto;\n  margin: 0.5rem;\n  pointer-events: none;\n}\n\n.modal.fade .modal-dialog {\n  transition: transform 0.3s ease-out;\n  transform: translate(0, -50px);\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .modal.fade .modal-dialog {\n    transition: none;\n  }\n}\n\n.modal.show .modal-dialog {\n  transform: none;\n}\n\n.modal.modal-static .modal-dialog {\n  transform: scale(1.02);\n}\n\n.modal-dialog-scrollable {\n  display: flex;\n  max-height: calc(100% - 1rem);\n}\n\n.modal-dialog-scrollable .modal-content {\n  max-height: calc(100vh - 1rem);\n  overflow: hidden;\n}\n\n.modal-dialog-scrollable .modal-header,\n.modal-dialog-scrollable .modal-footer {\n  flex-shrink: 0;\n}\n\n.modal-dialog-scrollable .modal-body {\n  overflow-y: auto;\n}\n\n.modal-dialog-centered {\n  display: flex;\n  align-items: center;\n  min-height: calc(100% - 1rem);\n}\n\n.modal-dialog-centered::before {\n  display: block;\n  height: calc(100vh - 1rem);\n  content: \"\";\n}\n\n.modal-dialog-centered.modal-dialog-scrollable {\n  flex-direction: column;\n  justify-content: center;\n  height: 100%;\n}\n\n.modal-dialog-centered.modal-dialog-scrollable .modal-content {\n  max-height: none;\n}\n\n.modal-dialog-centered.modal-dialog-scrollable::before {\n  content: none;\n}\n\n.modal-content {\n  position: relative;\n  display: flex;\n  flex-direction: column;\n  width: 100%;\n  pointer-events: auto;\n  background-color: #fff;\n  background-clip: padding-box;\n  border: 1px solid rgba(0, 0, 0, 0.2);\n  border-radius: 0.3rem;\n  outline: 0;\n}\n\n.modal-backdrop {\n  position: fixed;\n  top: 0;\n  left: 0;\n  z-index: 1040;\n  width: 100vw;\n  height: 100vh;\n  background-color: #000;\n}\n\n.modal-backdrop.fade {\n  opacity: 0;\n}\n\n.modal-backdrop.show {\n  opacity: 0.5;\n}\n\n.modal-header {\n  display: flex;\n  align-items: flex-start;\n  justify-content: space-between;\n  padding: 1rem 1rem;\n  border-bottom: 1px solid #dee2e6;\n  border-top-left-radius: calc(0.3rem - 1px);\n  border-top-right-radius: calc(0.3rem - 1px);\n}\n\n.modal-header .close {\n  padding: 1rem 1rem;\n  margin: -1rem -1rem -1rem auto;\n}\n\n.modal-title {\n  margin-bottom: 0;\n  line-height: 1.5;\n}\n\n.modal-body {\n  position: relative;\n  flex: 1 1 auto;\n  padding: 1rem;\n}\n\n.modal-footer {\n  display: flex;\n  flex-wrap: wrap;\n  align-items: center;\n  justify-content: flex-end;\n  padding: 0.75rem;\n  border-top: 1px solid #dee2e6;\n  border-bottom-right-radius: calc(0.3rem - 1px);\n  border-bottom-left-radius: calc(0.3rem - 1px);\n}\n\n.modal-footer > * {\n  margin: 0.25rem;\n}\n\n.modal-scrollbar-measure {\n  position: absolute;\n  top: -9999px;\n  width: 50px;\n  height: 50px;\n  overflow: scroll;\n}\n\n@media (min-width: 576px) {\n  .modal-dialog {\n    max-width: 500px;\n    margin: 1.75rem auto;\n  }\n  .modal-dialog-scrollable {\n    max-height: calc(100% - 3.5rem);\n  }\n  .modal-dialog-scrollable .modal-content {\n    max-height: calc(100vh - 3.5rem);\n  }\n  .modal-dialog-centered {\n    min-height: calc(100% - 3.5rem);\n  }\n  .modal-dialog-centered::before {\n    height: calc(100vh - 3.5rem);\n  }\n  .modal-sm {\n    max-width: 300px;\n  }\n}\n\n@media (min-width: 992px) {\n  .modal-lg,\n  .modal-xl {\n    max-width: 800px;\n  }\n}\n\n@media (min-width: 1200px) {\n  .modal-xl {\n    max-width: 1140px;\n  }\n}\n\n.tooltip {\n  position: absolute;\n  z-index: 1070;\n  display: block;\n  margin: 0;\n  font-family: -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, \"Helvetica Neue\", Arial, \"Noto Sans\", sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\", \"Noto Color Emoji\";\n  font-style: normal;\n  font-weight: 400;\n  line-height: 1.5;\n  text-align: left;\n  text-align: start;\n  text-decoration: none;\n  text-shadow: none;\n  text-transform: none;\n  letter-spacing: normal;\n  word-break: normal;\n  word-spacing: normal;\n  white-space: normal;\n  line-break: auto;\n  font-size: 0.875rem;\n  word-wrap: break-word;\n  opacity: 0;\n}\n\n.tooltip.show {\n  opacity: 0.9;\n}\n\n.tooltip .arrow {\n  position: absolute;\n  display: block;\n  width: 0.8rem;\n  height: 0.4rem;\n}\n\n.tooltip .arrow::before {\n  position: absolute;\n  content: \"\";\n  border-color: transparent;\n  border-style: solid;\n}\n\n.bs-tooltip-top, .bs-tooltip-auto[x-placement^=\"top\"] {\n  padding: 0.4rem 0;\n}\n\n.bs-tooltip-top .arrow, .bs-tooltip-auto[x-placement^=\"top\"] .arrow {\n  bottom: 0;\n}\n\n.bs-tooltip-top .arrow::before, .bs-tooltip-auto[x-placement^=\"top\"] .arrow::before {\n  top: 0;\n  border-width: 0.4rem 0.4rem 0;\n  border-top-color: #000;\n}\n\n.bs-tooltip-right, .bs-tooltip-auto[x-placement^=\"right\"] {\n  padding: 0 0.4rem;\n}\n\n.bs-tooltip-right .arrow, .bs-tooltip-auto[x-placement^=\"right\"] .arrow {\n  left: 0;\n  width: 0.4rem;\n  height: 0.8rem;\n}\n\n.bs-tooltip-right .arrow::before, .bs-tooltip-auto[x-placement^=\"right\"] .arrow::before {\n  right: 0;\n  border-width: 0.4rem 0.4rem 0.4rem 0;\n  border-right-color: #000;\n}\n\n.bs-tooltip-bottom, .bs-tooltip-auto[x-placement^=\"bottom\"] {\n  padding: 0.4rem 0;\n}\n\n.bs-tooltip-bottom .arrow, .bs-tooltip-auto[x-placement^=\"bottom\"] .arrow {\n  top: 0;\n}\n\n.bs-tooltip-bottom .arrow::before, .bs-tooltip-auto[x-placement^=\"bottom\"] .arrow::before {\n  bottom: 0;\n  border-width: 0 0.4rem 0.4rem;\n  border-bottom-color: #000;\n}\n\n.bs-tooltip-left, .bs-tooltip-auto[x-placement^=\"left\"] {\n  padding: 0 0.4rem;\n}\n\n.bs-tooltip-left .arrow, .bs-tooltip-auto[x-placement^=\"left\"] .arrow {\n  right: 0;\n  width: 0.4rem;\n  height: 0.8rem;\n}\n\n.bs-tooltip-left .arrow::before, .bs-tooltip-auto[x-placement^=\"left\"] .arrow::before {\n  left: 0;\n  border-width: 0.4rem 0 0.4rem 0.4rem;\n  border-left-color: #000;\n}\n\n.tooltip-inner {\n  max-width: 200px;\n  padding: 0.25rem 0.5rem;\n  color: #fff;\n  text-align: center;\n  background-color: #000;\n  border-radius: 0.25rem;\n}\n\n.popover {\n  position: absolute;\n  top: 0;\n  left: 0;\n  z-index: 1060;\n  display: block;\n  max-width: 276px;\n  font-family: -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, \"Helvetica Neue\", Arial, \"Noto Sans\", sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\", \"Noto Color Emoji\";\n  font-style: normal;\n  font-weight: 400;\n  line-height: 1.5;\n  text-align: left;\n  text-align: start;\n  text-decoration: none;\n  text-shadow: none;\n  text-transform: none;\n  letter-spacing: normal;\n  word-break: normal;\n  word-spacing: normal;\n  white-space: normal;\n  line-break: auto;\n  font-size: 0.875rem;\n  word-wrap: break-word;\n  background-color: #fff;\n  background-clip: padding-box;\n  border: 1px solid rgba(0, 0, 0, 0.2);\n  border-radius: 0.3rem;\n}\n\n.popover .arrow {\n  position: absolute;\n  display: block;\n  width: 1rem;\n  height: 0.5rem;\n  margin: 0 0.3rem;\n}\n\n.popover .arrow::before, .popover .arrow::after {\n  position: absolute;\n  display: block;\n  content: \"\";\n  border-color: transparent;\n  border-style: solid;\n}\n\n.bs-popover-top, .bs-popover-auto[x-placement^=\"top\"] {\n  margin-bottom: 0.5rem;\n}\n\n.bs-popover-top > .arrow, .bs-popover-auto[x-placement^=\"top\"] > .arrow {\n  bottom: calc(-0.5rem - 1px);\n}\n\n.bs-popover-top > .arrow::before, .bs-popover-auto[x-placement^=\"top\"] > .arrow::before {\n  bottom: 0;\n  border-width: 0.5rem 0.5rem 0;\n  border-top-color: rgba(0, 0, 0, 0.25);\n}\n\n.bs-popover-top > .arrow::after, .bs-popover-auto[x-placement^=\"top\"] > .arrow::after {\n  bottom: 1px;\n  border-width: 0.5rem 0.5rem 0;\n  border-top-color: #fff;\n}\n\n.bs-popover-right, .bs-popover-auto[x-placement^=\"right\"] {\n  margin-left: 0.5rem;\n}\n\n.bs-popover-right > .arrow, .bs-popover-auto[x-placement^=\"right\"] > .arrow {\n  left: calc(-0.5rem - 1px);\n  width: 0.5rem;\n  height: 1rem;\n  margin: 0.3rem 0;\n}\n\n.bs-popover-right > .arrow::before, .bs-popover-auto[x-placement^=\"right\"] > .arrow::before {\n  left: 0;\n  border-width: 0.5rem 0.5rem 0.5rem 0;\n  border-right-color: rgba(0, 0, 0, 0.25);\n}\n\n.bs-popover-right > .arrow::after, .bs-popover-auto[x-placement^=\"right\"] > .arrow::after {\n  left: 1px;\n  border-width: 0.5rem 0.5rem 0.5rem 0;\n  border-right-color: #fff;\n}\n\n.bs-popover-bottom, .bs-popover-auto[x-placement^=\"bottom\"] {\n  margin-top: 0.5rem;\n}\n\n.bs-popover-bottom > .arrow, .bs-popover-auto[x-placement^=\"bottom\"] > .arrow {\n  top: calc(-0.5rem - 1px);\n}\n\n.bs-popover-bottom > .arrow::before, .bs-popover-auto[x-placement^=\"bottom\"] > .arrow::before {\n  top: 0;\n  border-width: 0 0.5rem 0.5rem 0.5rem;\n  border-bottom-color: rgba(0, 0, 0, 0.25);\n}\n\n.bs-popover-bottom > .arrow::after, .bs-popover-auto[x-placement^=\"bottom\"] > .arrow::after {\n  top: 1px;\n  border-width: 0 0.5rem 0.5rem 0.5rem;\n  border-bottom-color: #fff;\n}\n\n.bs-popover-bottom .popover-header::before, .bs-popover-auto[x-placement^=\"bottom\"] .popover-header::before {\n  position: absolute;\n  top: 0;\n  left: 50%;\n  display: block;\n  width: 1rem;\n  margin-left: -0.5rem;\n  content: \"\";\n  border-bottom: 1px solid #f7f7f7;\n}\n\n.bs-popover-left, .bs-popover-auto[x-placement^=\"left\"] {\n  margin-right: 0.5rem;\n}\n\n.bs-popover-left > .arrow, .bs-popover-auto[x-placement^=\"left\"] > .arrow {\n  right: calc(-0.5rem - 1px);\n  width: 0.5rem;\n  height: 1rem;\n  margin: 0.3rem 0;\n}\n\n.bs-popover-left > .arrow::before, .bs-popover-auto[x-placement^=\"left\"] > .arrow::before {\n  right: 0;\n  border-width: 0.5rem 0 0.5rem 0.5rem;\n  border-left-color: rgba(0, 0, 0, 0.25);\n}\n\n.bs-popover-left > .arrow::after, .bs-popover-auto[x-placement^=\"left\"] > .arrow::after {\n  right: 1px;\n  border-width: 0.5rem 0 0.5rem 0.5rem;\n  border-left-color: #fff;\n}\n\n.popover-header {\n  padding: 0.5rem 0.75rem;\n  margin-bottom: 0;\n  font-size: 1rem;\n  background-color: #f7f7f7;\n  border-bottom: 1px solid #ebebeb;\n  border-top-left-radius: calc(0.3rem - 1px);\n  border-top-right-radius: calc(0.3rem - 1px);\n}\n\n.popover-header:empty {\n  display: none;\n}\n\n.popover-body {\n  padding: 0.5rem 0.75rem;\n  color: #212529;\n}\n\n.carousel {\n  position: relative;\n}\n\n.carousel.pointer-event {\n  touch-action: pan-y;\n}\n\n.carousel-inner {\n  position: relative;\n  width: 100%;\n  overflow: hidden;\n}\n\n.carousel-inner::after {\n  display: block;\n  clear: both;\n  content: \"\";\n}\n\n.carousel-item {\n  position: relative;\n  display: none;\n  float: left;\n  width: 100%;\n  margin-right: -100%;\n  backface-visibility: hidden;\n  transition: transform 0.6s ease-in-out;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .carousel-item {\n    transition: none;\n  }\n}\n\n.carousel-item.active,\n.carousel-item-next,\n.carousel-item-prev {\n  display: block;\n}\n\n.carousel-item-next:not(.carousel-item-left),\n.active.carousel-item-right {\n  transform: translateX(100%);\n}\n\n.carousel-item-prev:not(.carousel-item-right),\n.active.carousel-item-left {\n  transform: translateX(-100%);\n}\n\n.carousel-fade .carousel-item {\n  opacity: 0;\n  transition-property: opacity;\n  transform: none;\n}\n\n.carousel-fade .carousel-item.active,\n.carousel-fade .carousel-item-next.carousel-item-left,\n.carousel-fade .carousel-item-prev.carousel-item-right {\n  z-index: 1;\n  opacity: 1;\n}\n\n.carousel-fade .active.carousel-item-left,\n.carousel-fade .active.carousel-item-right {\n  z-index: 0;\n  opacity: 0;\n  transition: opacity 0s 0.6s;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .carousel-fade .active.carousel-item-left,\n  .carousel-fade .active.carousel-item-right {\n    transition: none;\n  }\n}\n\n.carousel-control-prev,\n.carousel-control-next {\n  position: absolute;\n  top: 0;\n  bottom: 0;\n  z-index: 1;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  width: 15%;\n  color: #fff;\n  text-align: center;\n  opacity: 0.5;\n  transition: opacity 0.15s ease;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .carousel-control-prev,\n  .carousel-control-next {\n    transition: none;\n  }\n}\n\n.carousel-control-prev:hover, .carousel-control-prev:focus,\n.carousel-control-next:hover,\n.carousel-control-next:focus {\n  color: #fff;\n  text-decoration: none;\n  outline: 0;\n  opacity: 0.9;\n}\n\n.carousel-control-prev {\n  left: 0;\n}\n\n.carousel-control-next {\n  right: 0;\n}\n\n.carousel-control-prev-icon,\n.carousel-control-next-icon {\n  display: inline-block;\n  width: 20px;\n  height: 20px;\n  background: no-repeat 50% / 100% 100%;\n}\n\n.carousel-control-prev-icon {\n  background-image: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath d='M5.25 0l-4 4 4 4 1.5-1.5L4.25 4l2.5-2.5L5.25 0z'/%3e%3c/svg%3e\");\n}\n\n.carousel-control-next-icon {\n  background-image: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath d='M2.75 0l-1.5 1.5L3.75 4l-2.5 2.5L2.75 8l4-4-4-4z'/%3e%3c/svg%3e\");\n}\n\n.carousel-indicators {\n  position: absolute;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: 15;\n  display: flex;\n  justify-content: center;\n  padding-left: 0;\n  margin-right: 15%;\n  margin-left: 15%;\n  list-style: none;\n}\n\n.carousel-indicators li {\n  box-sizing: content-box;\n  flex: 0 1 auto;\n  width: 30px;\n  height: 3px;\n  margin-right: 3px;\n  margin-left: 3px;\n  text-indent: -999px;\n  cursor: pointer;\n  background-color: #fff;\n  background-clip: padding-box;\n  border-top: 10px solid transparent;\n  border-bottom: 10px solid transparent;\n  opacity: .5;\n  transition: opacity 0.6s ease;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .carousel-indicators li {\n    transition: none;\n  }\n}\n\n.carousel-indicators .active {\n  opacity: 1;\n}\n\n.carousel-caption {\n  position: absolute;\n  right: 15%;\n  bottom: 20px;\n  left: 15%;\n  z-index: 10;\n  padding-top: 20px;\n  padding-bottom: 20px;\n  color: #fff;\n  text-align: center;\n}\n\n@keyframes spinner-border {\n  to {\n    transform: rotate(360deg);\n  }\n}\n\n.spinner-border {\n  display: inline-block;\n  width: 2rem;\n  height: 2rem;\n  vertical-align: text-bottom;\n  border: 0.25em solid currentColor;\n  border-right-color: transparent;\n  border-radius: 50%;\n  animation: spinner-border .75s linear infinite;\n}\n\n.spinner-border-sm {\n  width: 1rem;\n  height: 1rem;\n  border-width: 0.2em;\n}\n\n@keyframes spinner-grow {\n  0% {\n    transform: scale(0);\n  }\n  50% {\n    opacity: 1;\n  }\n}\n\n.spinner-grow {\n  display: inline-block;\n  width: 2rem;\n  height: 2rem;\n  vertical-align: text-bottom;\n  background-color: currentColor;\n  border-radius: 50%;\n  opacity: 0;\n  animation: spinner-grow .75s linear infinite;\n}\n\n.spinner-grow-sm {\n  width: 1rem;\n  height: 1rem;\n}\n\n.align-baseline {\n  vertical-align: baseline !important;\n}\n\n.align-top {\n  vertical-align: top !important;\n}\n\n.align-middle {\n  vertical-align: middle !important;\n}\n\n.align-bottom {\n  vertical-align: bottom !important;\n}\n\n.align-text-bottom {\n  vertical-align: text-bottom !important;\n}\n\n.align-text-top {\n  vertical-align: text-top !important;\n}\n\n.bg-primary {\n  background-color: #007bff !important;\n}\n\na.bg-primary:hover, a.bg-primary:focus,\nbutton.bg-primary:hover,\nbutton.bg-primary:focus {\n  background-color: #0062cc !important;\n}\n\n.bg-secondary {\n  background-color: #6c757d !important;\n}\n\na.bg-secondary:hover, a.bg-secondary:focus,\nbutton.bg-secondary:hover,\nbutton.bg-secondary:focus {\n  background-color: #545b62 !important;\n}\n\n.bg-success {\n  background-color: #28a745 !important;\n}\n\na.bg-success:hover, a.bg-success:focus,\nbutton.bg-success:hover,\nbutton.bg-success:focus {\n  background-color: #1e7e34 !important;\n}\n\n.bg-info {\n  background-color: #17a2b8 !important;\n}\n\na.bg-info:hover, a.bg-info:focus,\nbutton.bg-info:hover,\nbutton.bg-info:focus {\n  background-color: #117a8b !important;\n}\n\n.bg-warning {\n  background-color: #ffc107 !important;\n}\n\na.bg-warning:hover, a.bg-warning:focus,\nbutton.bg-warning:hover,\nbutton.bg-warning:focus {\n  background-color: #d39e00 !important;\n}\n\n.bg-danger {\n  background-color: #dc3545 !important;\n}\n\na.bg-danger:hover, a.bg-danger:focus,\nbutton.bg-danger:hover,\nbutton.bg-danger:focus {\n  background-color: #bd2130 !important;\n}\n\n.bg-light {\n  background-color: #f8f9fa !important;\n}\n\na.bg-light:hover, a.bg-light:focus,\nbutton.bg-light:hover,\nbutton.bg-light:focus {\n  background-color: #dae0e5 !important;\n}\n\n.bg-dark {\n  background-color: #343a40 !important;\n}\n\na.bg-dark:hover, a.bg-dark:focus,\nbutton.bg-dark:hover,\nbutton.bg-dark:focus {\n  background-color: #1d2124 !important;\n}\n\n.bg-white {\n  background-color: #fff !important;\n}\n\n.bg-transparent {\n  background-color: transparent !important;\n}\n\n.border {\n  border: 1px solid #dee2e6 !important;\n}\n\n.border-top {\n  border-top: 1px solid #dee2e6 !important;\n}\n\n.border-right {\n  border-right: 1px solid #dee2e6 !important;\n}\n\n.border-bottom {\n  border-bottom: 1px solid #dee2e6 !important;\n}\n\n.border-left {\n  border-left: 1px solid #dee2e6 !important;\n}\n\n.border-0 {\n  border: 0 !important;\n}\n\n.border-top-0 {\n  border-top: 0 !important;\n}\n\n.border-right-0 {\n  border-right: 0 !important;\n}\n\n.border-bottom-0 {\n  border-bottom: 0 !important;\n}\n\n.border-left-0 {\n  border-left: 0 !important;\n}\n\n.border-primary {\n  border-color: #007bff !important;\n}\n\n.border-secondary {\n  border-color: #6c757d !important;\n}\n\n.border-success {\n  border-color: #28a745 !important;\n}\n\n.border-info {\n  border-color: #17a2b8 !important;\n}\n\n.border-warning {\n  border-color: #ffc107 !important;\n}\n\n.border-danger {\n  border-color: #dc3545 !important;\n}\n\n.border-light {\n  border-color: #f8f9fa !important;\n}\n\n.border-dark {\n  border-color: #343a40 !important;\n}\n\n.border-white {\n  border-color: #fff !important;\n}\n\n.rounded-sm {\n  border-radius: 0.2rem !important;\n}\n\n.rounded {\n  border-radius: 0.25rem !important;\n}\n\n.rounded-top {\n  border-top-left-radius: 0.25rem !important;\n  border-top-right-radius: 0.25rem !important;\n}\n\n.rounded-right {\n  border-top-right-radius: 0.25rem !important;\n  border-bottom-right-radius: 0.25rem !important;\n}\n\n.rounded-bottom {\n  border-bottom-right-radius: 0.25rem !important;\n  border-bottom-left-radius: 0.25rem !important;\n}\n\n.rounded-left {\n  border-top-left-radius: 0.25rem !important;\n  border-bottom-left-radius: 0.25rem !important;\n}\n\n.rounded-lg {\n  border-radius: 0.3rem !important;\n}\n\n.rounded-circle {\n  border-radius: 50% !important;\n}\n\n.rounded-pill {\n  border-radius: 50rem !important;\n}\n\n.rounded-0 {\n  border-radius: 0 !important;\n}\n\n.clearfix::after {\n  display: block;\n  clear: both;\n  content: \"\";\n}\n\n.d-none {\n  display: none !important;\n}\n\n.d-inline {\n  display: inline !important;\n}\n\n.d-inline-block {\n  display: inline-block !important;\n}\n\n.d-block {\n  display: block !important;\n}\n\n.d-table {\n  display: table !important;\n}\n\n.d-table-row {\n  display: table-row !important;\n}\n\n.d-table-cell {\n  display: table-cell !important;\n}\n\n.d-flex {\n  display: flex !important;\n}\n\n.d-inline-flex {\n  display: inline-flex !important;\n}\n\n@media (min-width: 576px) {\n  .d-sm-none {\n    display: none !important;\n  }\n  .d-sm-inline {\n    display: inline !important;\n  }\n  .d-sm-inline-block {\n    display: inline-block !important;\n  }\n  .d-sm-block {\n    display: block !important;\n  }\n  .d-sm-table {\n    display: table !important;\n  }\n  .d-sm-table-row {\n    display: table-row !important;\n  }\n  .d-sm-table-cell {\n    display: table-cell !important;\n  }\n  .d-sm-flex {\n    display: flex !important;\n  }\n  .d-sm-inline-flex {\n    display: inline-flex !important;\n  }\n}\n\n@media (min-width: 768px) {\n  .d-md-none {\n    display: none !important;\n  }\n  .d-md-inline {\n    display: inline !important;\n  }\n  .d-md-inline-block {\n    display: inline-block !important;\n  }\n  .d-md-block {\n    display: block !important;\n  }\n  .d-md-table {\n    display: table !important;\n  }\n  .d-md-table-row {\n    display: table-row !important;\n  }\n  .d-md-table-cell {\n    display: table-cell !important;\n  }\n  .d-md-flex {\n    display: flex !important;\n  }\n  .d-md-inline-flex {\n    display: inline-flex !important;\n  }\n}\n\n@media (min-width: 992px) {\n  .d-lg-none {\n    display: none !important;\n  }\n  .d-lg-inline {\n    display: inline !important;\n  }\n  .d-lg-inline-block {\n    display: inline-block !important;\n  }\n  .d-lg-block {\n    display: block !important;\n  }\n  .d-lg-table {\n    display: table !important;\n  }\n  .d-lg-table-row {\n    display: table-row !important;\n  }\n  .d-lg-table-cell {\n    display: table-cell !important;\n  }\n  .d-lg-flex {\n    display: flex !important;\n  }\n  .d-lg-inline-flex {\n    display: inline-flex !important;\n  }\n}\n\n@media (min-width: 1200px) {\n  .d-xl-none {\n    display: none !important;\n  }\n  .d-xl-inline {\n    display: inline !important;\n  }\n  .d-xl-inline-block {\n    display: inline-block !important;\n  }\n  .d-xl-block {\n    display: block !important;\n  }\n  .d-xl-table {\n    display: table !important;\n  }\n  .d-xl-table-row {\n    display: table-row !important;\n  }\n  .d-xl-table-cell {\n    display: table-cell !important;\n  }\n  .d-xl-flex {\n    display: flex !important;\n  }\n  .d-xl-inline-flex {\n    display: inline-flex !important;\n  }\n}\n\n@media print {\n  .d-print-none {\n    display: none !important;\n  }\n  .d-print-inline {\n    display: inline !important;\n  }\n  .d-print-inline-block {\n    display: inline-block !important;\n  }\n  .d-print-block {\n    display: block !important;\n  }\n  .d-print-table {\n    display: table !important;\n  }\n  .d-print-table-row {\n    display: table-row !important;\n  }\n  .d-print-table-cell {\n    display: table-cell !important;\n  }\n  .d-print-flex {\n    display: flex !important;\n  }\n  .d-print-inline-flex {\n    display: inline-flex !important;\n  }\n}\n\n.embed-responsive {\n  position: relative;\n  display: block;\n  width: 100%;\n  padding: 0;\n  overflow: hidden;\n}\n\n.embed-responsive::before {\n  display: block;\n  content: \"\";\n}\n\n.embed-responsive .embed-responsive-item,\n.embed-responsive iframe,\n.embed-responsive embed,\n.embed-responsive object,\n.embed-responsive video {\n  position: absolute;\n  top: 0;\n  bottom: 0;\n  left: 0;\n  width: 100%;\n  height: 100%;\n  border: 0;\n}\n\n.embed-responsive-21by9::before {\n  padding-top: 42.857143%;\n}\n\n.embed-responsive-16by9::before {\n  padding-top: 56.25%;\n}\n\n.embed-responsive-4by3::before {\n  padding-top: 75%;\n}\n\n.embed-responsive-1by1::before {\n  padding-top: 100%;\n}\n\n.flex-row {\n  flex-direction: row !important;\n}\n\n.flex-column {\n  flex-direction: column !important;\n}\n\n.flex-row-reverse {\n  flex-direction: row-reverse !important;\n}\n\n.flex-column-reverse {\n  flex-direction: column-reverse !important;\n}\n\n.flex-wrap {\n  flex-wrap: wrap !important;\n}\n\n.flex-nowrap {\n  flex-wrap: nowrap !important;\n}\n\n.flex-wrap-reverse {\n  flex-wrap: wrap-reverse !important;\n}\n\n.flex-fill {\n  flex: 1 1 auto !important;\n}\n\n.flex-grow-0 {\n  flex-grow: 0 !important;\n}\n\n.flex-grow-1 {\n  flex-grow: 1 !important;\n}\n\n.flex-shrink-0 {\n  flex-shrink: 0 !important;\n}\n\n.flex-shrink-1 {\n  flex-shrink: 1 !important;\n}\n\n.justify-content-start {\n  justify-content: flex-start !important;\n}\n\n.justify-content-end {\n  justify-content: flex-end !important;\n}\n\n.justify-content-center {\n  justify-content: center !important;\n}\n\n.justify-content-between {\n  justify-content: space-between !important;\n}\n\n.justify-content-around {\n  justify-content: space-around !important;\n}\n\n.align-items-start {\n  align-items: flex-start !important;\n}\n\n.align-items-end {\n  align-items: flex-end !important;\n}\n\n.align-items-center {\n  align-items: center !important;\n}\n\n.align-items-baseline {\n  align-items: baseline !important;\n}\n\n.align-items-stretch {\n  align-items: stretch !important;\n}\n\n.align-content-start {\n  align-content: flex-start !important;\n}\n\n.align-content-end {\n  align-content: flex-end !important;\n}\n\n.align-content-center {\n  align-content: center !important;\n}\n\n.align-content-between {\n  align-content: space-between !important;\n}\n\n.align-content-around {\n  align-content: space-around !important;\n}\n\n.align-content-stretch {\n  align-content: stretch !important;\n}\n\n.align-self-auto {\n  align-self: auto !important;\n}\n\n.align-self-start {\n  align-self: flex-start !important;\n}\n\n.align-self-end {\n  align-self: flex-end !important;\n}\n\n.align-self-center {\n  align-self: center !important;\n}\n\n.align-self-baseline {\n  align-self: baseline !important;\n}\n\n.align-self-stretch {\n  align-self: stretch !important;\n}\n\n@media (min-width: 576px) {\n  .flex-sm-row {\n    flex-direction: row !important;\n  }\n  .flex-sm-column {\n    flex-direction: column !important;\n  }\n  .flex-sm-row-reverse {\n    flex-direction: row-reverse !important;\n  }\n  .flex-sm-column-reverse {\n    flex-direction: column-reverse !important;\n  }\n  .flex-sm-wrap {\n    flex-wrap: wrap !important;\n  }\n  .flex-sm-nowrap {\n    flex-wrap: nowrap !important;\n  }\n  .flex-sm-wrap-reverse {\n    flex-wrap: wrap-reverse !important;\n  }\n  .flex-sm-fill {\n    flex: 1 1 auto !important;\n  }\n  .flex-sm-grow-0 {\n    flex-grow: 0 !important;\n  }\n  .flex-sm-grow-1 {\n    flex-grow: 1 !important;\n  }\n  .flex-sm-shrink-0 {\n    flex-shrink: 0 !important;\n  }\n  .flex-sm-shrink-1 {\n    flex-shrink: 1 !important;\n  }\n  .justify-content-sm-start {\n    justify-content: flex-start !important;\n  }\n  .justify-content-sm-end {\n    justify-content: flex-end !important;\n  }\n  .justify-content-sm-center {\n    justify-content: center !important;\n  }\n  .justify-content-sm-between {\n    justify-content: space-between !important;\n  }\n  .justify-content-sm-around {\n    justify-content: space-around !important;\n  }\n  .align-items-sm-start {\n    align-items: flex-start !important;\n  }\n  .align-items-sm-end {\n    align-items: flex-end !important;\n  }\n  .align-items-sm-center {\n    align-items: center !important;\n  }\n  .align-items-sm-baseline {\n    align-items: baseline !important;\n  }\n  .align-items-sm-stretch {\n    align-items: stretch !important;\n  }\n  .align-content-sm-start {\n    align-content: flex-start !important;\n  }\n  .align-content-sm-end {\n    align-content: flex-end !important;\n  }\n  .align-content-sm-center {\n    align-content: center !important;\n  }\n  .align-content-sm-between {\n    align-content: space-between !important;\n  }\n  .align-content-sm-around {\n    align-content: space-around !important;\n  }\n  .align-content-sm-stretch {\n    align-content: stretch !important;\n  }\n  .align-self-sm-auto {\n    align-self: auto !important;\n  }\n  .align-self-sm-start {\n    align-self: flex-start !important;\n  }\n  .align-self-sm-end {\n    align-self: flex-end !important;\n  }\n  .align-self-sm-center {\n    align-self: center !important;\n  }\n  .align-self-sm-baseline {\n    align-self: baseline !important;\n  }\n  .align-self-sm-stretch {\n    align-self: stretch !important;\n  }\n}\n\n@media (min-width: 768px) {\n  .flex-md-row {\n    flex-direction: row !important;\n  }\n  .flex-md-column {\n    flex-direction: column !important;\n  }\n  .flex-md-row-reverse {\n    flex-direction: row-reverse !important;\n  }\n  .flex-md-column-reverse {\n    flex-direction: column-reverse !important;\n  }\n  .flex-md-wrap {\n    flex-wrap: wrap !important;\n  }\n  .flex-md-nowrap {\n    flex-wrap: nowrap !important;\n  }\n  .flex-md-wrap-reverse {\n    flex-wrap: wrap-reverse !important;\n  }\n  .flex-md-fill {\n    flex: 1 1 auto !important;\n  }\n  .flex-md-grow-0 {\n    flex-grow: 0 !important;\n  }\n  .flex-md-grow-1 {\n    flex-grow: 1 !important;\n  }\n  .flex-md-shrink-0 {\n    flex-shrink: 0 !important;\n  }\n  .flex-md-shrink-1 {\n    flex-shrink: 1 !important;\n  }\n  .justify-content-md-start {\n    justify-content: flex-start !important;\n  }\n  .justify-content-md-end {\n    justify-content: flex-end !important;\n  }\n  .justify-content-md-center {\n    justify-content: center !important;\n  }\n  .justify-content-md-between {\n    justify-content: space-between !important;\n  }\n  .justify-content-md-around {\n    justify-content: space-around !important;\n  }\n  .align-items-md-start {\n    align-items: flex-start !important;\n  }\n  .align-items-md-end {\n    align-items: flex-end !important;\n  }\n  .align-items-md-center {\n    align-items: center !important;\n  }\n  .align-items-md-baseline {\n    align-items: baseline !important;\n  }\n  .align-items-md-stretch {\n    align-items: stretch !important;\n  }\n  .align-content-md-start {\n    align-content: flex-start !important;\n  }\n  .align-content-md-end {\n    align-content: flex-end !important;\n  }\n  .align-content-md-center {\n    align-content: center !important;\n  }\n  .align-content-md-between {\n    align-content: space-between !important;\n  }\n  .align-content-md-around {\n    align-content: space-around !important;\n  }\n  .align-content-md-stretch {\n    align-content: stretch !important;\n  }\n  .align-self-md-auto {\n    align-self: auto !important;\n  }\n  .align-self-md-start {\n    align-self: flex-start !important;\n  }\n  .align-self-md-end {\n    align-self: flex-end !important;\n  }\n  .align-self-md-center {\n    align-self: center !important;\n  }\n  .align-self-md-baseline {\n    align-self: baseline !important;\n  }\n  .align-self-md-stretch {\n    align-self: stretch !important;\n  }\n}\n\n@media (min-width: 992px) {\n  .flex-lg-row {\n    flex-direction: row !important;\n  }\n  .flex-lg-column {\n    flex-direction: column !important;\n  }\n  .flex-lg-row-reverse {\n    flex-direction: row-reverse !important;\n  }\n  .flex-lg-column-reverse {\n    flex-direction: column-reverse !important;\n  }\n  .flex-lg-wrap {\n    flex-wrap: wrap !important;\n  }\n  .flex-lg-nowrap {\n    flex-wrap: nowrap !important;\n  }\n  .flex-lg-wrap-reverse {\n    flex-wrap: wrap-reverse !important;\n  }\n  .flex-lg-fill {\n    flex: 1 1 auto !important;\n  }\n  .flex-lg-grow-0 {\n    flex-grow: 0 !important;\n  }\n  .flex-lg-grow-1 {\n    flex-grow: 1 !important;\n  }\n  .flex-lg-shrink-0 {\n    flex-shrink: 0 !important;\n  }\n  .flex-lg-shrink-1 {\n    flex-shrink: 1 !important;\n  }\n  .justify-content-lg-start {\n    justify-content: flex-start !important;\n  }\n  .justify-content-lg-end {\n    justify-content: flex-end !important;\n  }\n  .justify-content-lg-center {\n    justify-content: center !important;\n  }\n  .justify-content-lg-between {\n    justify-content: space-between !important;\n  }\n  .justify-content-lg-around {\n    justify-content: space-around !important;\n  }\n  .align-items-lg-start {\n    align-items: flex-start !important;\n  }\n  .align-items-lg-end {\n    align-items: flex-end !important;\n  }\n  .align-items-lg-center {\n    align-items: center !important;\n  }\n  .align-items-lg-baseline {\n    align-items: baseline !important;\n  }\n  .align-items-lg-stretch {\n    align-items: stretch !important;\n  }\n  .align-content-lg-start {\n    align-content: flex-start !important;\n  }\n  .align-content-lg-end {\n    align-content: flex-end !important;\n  }\n  .align-content-lg-center {\n    align-content: center !important;\n  }\n  .align-content-lg-between {\n    align-content: space-between !important;\n  }\n  .align-content-lg-around {\n    align-content: space-around !important;\n  }\n  .align-content-lg-stretch {\n    align-content: stretch !important;\n  }\n  .align-self-lg-auto {\n    align-self: auto !important;\n  }\n  .align-self-lg-start {\n    align-self: flex-start !important;\n  }\n  .align-self-lg-end {\n    align-self: flex-end !important;\n  }\n  .align-self-lg-center {\n    align-self: center !important;\n  }\n  .align-self-lg-baseline {\n    align-self: baseline !important;\n  }\n  .align-self-lg-stretch {\n    align-self: stretch !important;\n  }\n}\n\n@media (min-width: 1200px) {\n  .flex-xl-row {\n    flex-direction: row !important;\n  }\n  .flex-xl-column {\n    flex-direction: column !important;\n  }\n  .flex-xl-row-reverse {\n    flex-direction: row-reverse !important;\n  }\n  .flex-xl-column-reverse {\n    flex-direction: column-reverse !important;\n  }\n  .flex-xl-wrap {\n    flex-wrap: wrap !important;\n  }\n  .flex-xl-nowrap {\n    flex-wrap: nowrap !important;\n  }\n  .flex-xl-wrap-reverse {\n    flex-wrap: wrap-reverse !important;\n  }\n  .flex-xl-fill {\n    flex: 1 1 auto !important;\n  }\n  .flex-xl-grow-0 {\n    flex-grow: 0 !important;\n  }\n  .flex-xl-grow-1 {\n    flex-grow: 1 !important;\n  }\n  .flex-xl-shrink-0 {\n    flex-shrink: 0 !important;\n  }\n  .flex-xl-shrink-1 {\n    flex-shrink: 1 !important;\n  }\n  .justify-content-xl-start {\n    justify-content: flex-start !important;\n  }\n  .justify-content-xl-end {\n    justify-content: flex-end !important;\n  }\n  .justify-content-xl-center {\n    justify-content: center !important;\n  }\n  .justify-content-xl-between {\n    justify-content: space-between !important;\n  }\n  .justify-content-xl-around {\n    justify-content: space-around !important;\n  }\n  .align-items-xl-start {\n    align-items: flex-start !important;\n  }\n  .align-items-xl-end {\n    align-items: flex-end !important;\n  }\n  .align-items-xl-center {\n    align-items: center !important;\n  }\n  .align-items-xl-baseline {\n    align-items: baseline !important;\n  }\n  .align-items-xl-stretch {\n    align-items: stretch !important;\n  }\n  .align-content-xl-start {\n    align-content: flex-start !important;\n  }\n  .align-content-xl-end {\n    align-content: flex-end !important;\n  }\n  .align-content-xl-center {\n    align-content: center !important;\n  }\n  .align-content-xl-between {\n    align-content: space-between !important;\n  }\n  .align-content-xl-around {\n    align-content: space-around !important;\n  }\n  .align-content-xl-stretch {\n    align-content: stretch !important;\n  }\n  .align-self-xl-auto {\n    align-self: auto !important;\n  }\n  .align-self-xl-start {\n    align-self: flex-start !important;\n  }\n  .align-self-xl-end {\n    align-self: flex-end !important;\n  }\n  .align-self-xl-center {\n    align-self: center !important;\n  }\n  .align-self-xl-baseline {\n    align-self: baseline !important;\n  }\n  .align-self-xl-stretch {\n    align-self: stretch !important;\n  }\n}\n\n.float-left {\n  float: left !important;\n}\n\n.float-right {\n  float: right !important;\n}\n\n.float-none {\n  float: none !important;\n}\n\n@media (min-width: 576px) {\n  .float-sm-left {\n    float: left !important;\n  }\n  .float-sm-right {\n    float: right !important;\n  }\n  .float-sm-none {\n    float: none !important;\n  }\n}\n\n@media (min-width: 768px) {\n  .float-md-left {\n    float: left !important;\n  }\n  .float-md-right {\n    float: right !important;\n  }\n  .float-md-none {\n    float: none !important;\n  }\n}\n\n@media (min-width: 992px) {\n  .float-lg-left {\n    float: left !important;\n  }\n  .float-lg-right {\n    float: right !important;\n  }\n  .float-lg-none {\n    float: none !important;\n  }\n}\n\n@media (min-width: 1200px) {\n  .float-xl-left {\n    float: left !important;\n  }\n  .float-xl-right {\n    float: right !important;\n  }\n  .float-xl-none {\n    float: none !important;\n  }\n}\n\n.overflow-auto {\n  overflow: auto !important;\n}\n\n.overflow-hidden {\n  overflow: hidden !important;\n}\n\n.position-static {\n  position: static !important;\n}\n\n.position-relative {\n  position: relative !important;\n}\n\n.position-absolute {\n  position: absolute !important;\n}\n\n.position-fixed {\n  position: fixed !important;\n}\n\n.position-sticky {\n  position: sticky !important;\n}\n\n.fixed-top {\n  position: fixed;\n  top: 0;\n  right: 0;\n  left: 0;\n  z-index: 1030;\n}\n\n.fixed-bottom {\n  position: fixed;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: 1030;\n}\n\n@supports (position: sticky) {\n  .sticky-top {\n    position: sticky;\n    top: 0;\n    z-index: 1020;\n  }\n}\n\n.sr-only {\n  position: absolute;\n  width: 1px;\n  height: 1px;\n  padding: 0;\n  margin: -1px;\n  overflow: hidden;\n  clip: rect(0, 0, 0, 0);\n  white-space: nowrap;\n  border: 0;\n}\n\n.sr-only-focusable:active, .sr-only-focusable:focus {\n  position: static;\n  width: auto;\n  height: auto;\n  overflow: visible;\n  clip: auto;\n  white-space: normal;\n}\n\n.shadow-sm {\n  box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075) !important;\n}\n\n.shadow {\n  box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15) !important;\n}\n\n.shadow-lg {\n  box-shadow: 0 1rem 3rem rgba(0, 0, 0, 0.175) !important;\n}\n\n.shadow-none {\n  box-shadow: none !important;\n}\n\n.w-25 {\n  width: 25% !important;\n}\n\n.w-50 {\n  width: 50% !important;\n}\n\n.w-75 {\n  width: 75% !important;\n}\n\n.w-100 {\n  width: 100% !important;\n}\n\n.w-auto {\n  width: auto !important;\n}\n\n.h-25 {\n  height: 25% !important;\n}\n\n.h-50 {\n  height: 50% !important;\n}\n\n.h-75 {\n  height: 75% !important;\n}\n\n.h-100 {\n  height: 100% !important;\n}\n\n.h-auto {\n  height: auto !important;\n}\n\n.mw-100 {\n  max-width: 100% !important;\n}\n\n.mh-100 {\n  max-height: 100% !important;\n}\n\n.min-vw-100 {\n  min-width: 100vw !important;\n}\n\n.min-vh-100 {\n  min-height: 100vh !important;\n}\n\n.vw-100 {\n  width: 100vw !important;\n}\n\n.vh-100 {\n  height: 100vh !important;\n}\n\n.stretched-link::after {\n  position: absolute;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: 1;\n  pointer-events: auto;\n  content: \"\";\n  background-color: rgba(0, 0, 0, 0);\n}\n\n.m-0 {\n  margin: 0 !important;\n}\n\n.mt-0,\n.my-0 {\n  margin-top: 0 !important;\n}\n\n.mr-0,\n.mx-0 {\n  margin-right: 0 !important;\n}\n\n.mb-0,\n.my-0 {\n  margin-bottom: 0 !important;\n}\n\n.ml-0,\n.mx-0 {\n  margin-left: 0 !important;\n}\n\n.m-1 {\n  margin: 0.25rem !important;\n}\n\n.mt-1,\n.my-1 {\n  margin-top: 0.25rem !important;\n}\n\n.mr-1,\n.mx-1 {\n  margin-right: 0.25rem !important;\n}\n\n.mb-1,\n.my-1 {\n  margin-bottom: 0.25rem !important;\n}\n\n.ml-1,\n.mx-1 {\n  margin-left: 0.25rem !important;\n}\n\n.m-2 {\n  margin: 0.5rem !important;\n}\n\n.mt-2,\n.my-2 {\n  margin-top: 0.5rem !important;\n}\n\n.mr-2,\n.mx-2 {\n  margin-right: 0.5rem !important;\n}\n\n.mb-2,\n.my-2 {\n  margin-bottom: 0.5rem !important;\n}\n\n.ml-2,\n.mx-2 {\n  margin-left: 0.5rem !important;\n}\n\n.m-3 {\n  margin: 1rem !important;\n}\n\n.mt-3,\n.my-3 {\n  margin-top: 1rem !important;\n}\n\n.mr-3,\n.mx-3 {\n  margin-right: 1rem !important;\n}\n\n.mb-3,\n.my-3 {\n  margin-bottom: 1rem !important;\n}\n\n.ml-3,\n.mx-3 {\n  margin-left: 1rem !important;\n}\n\n.m-4 {\n  margin: 1.5rem !important;\n}\n\n.mt-4,\n.my-4 {\n  margin-top: 1.5rem !important;\n}\n\n.mr-4,\n.mx-4 {\n  margin-right: 1.5rem !important;\n}\n\n.mb-4,\n.my-4 {\n  margin-bottom: 1.5rem !important;\n}\n\n.ml-4,\n.mx-4 {\n  margin-left: 1.5rem !important;\n}\n\n.m-5 {\n  margin: 3rem !important;\n}\n\n.mt-5,\n.my-5 {\n  margin-top: 3rem !important;\n}\n\n.mr-5,\n.mx-5 {\n  margin-right: 3rem !important;\n}\n\n.mb-5,\n.my-5 {\n  margin-bottom: 3rem !important;\n}\n\n.ml-5,\n.mx-5 {\n  margin-left: 3rem !important;\n}\n\n.p-0 {\n  padding: 0 !important;\n}\n\n.pt-0,\n.py-0 {\n  padding-top: 0 !important;\n}\n\n.pr-0,\n.px-0 {\n  padding-right: 0 !important;\n}\n\n.pb-0,\n.py-0 {\n  padding-bottom: 0 !important;\n}\n\n.pl-0,\n.px-0 {\n  padding-left: 0 !important;\n}\n\n.p-1 {\n  padding: 0.25rem !important;\n}\n\n.pt-1,\n.py-1 {\n  padding-top: 0.25rem !important;\n}\n\n.pr-1,\n.px-1 {\n  padding-right: 0.25rem !important;\n}\n\n.pb-1,\n.py-1 {\n  padding-bottom: 0.25rem !important;\n}\n\n.pl-1,\n.px-1 {\n  padding-left: 0.25rem !important;\n}\n\n.p-2 {\n  padding: 0.5rem !important;\n}\n\n.pt-2,\n.py-2 {\n  padding-top: 0.5rem !important;\n}\n\n.pr-2,\n.px-2 {\n  padding-right: 0.5rem !important;\n}\n\n.pb-2,\n.py-2 {\n  padding-bottom: 0.5rem !important;\n}\n\n.pl-2,\n.px-2 {\n  padding-left: 0.5rem !important;\n}\n\n.p-3 {\n  padding: 1rem !important;\n}\n\n.pt-3,\n.py-3 {\n  padding-top: 1rem !important;\n}\n\n.pr-3,\n.px-3 {\n  padding-right: 1rem !important;\n}\n\n.pb-3,\n.py-3 {\n  padding-bottom: 1rem !important;\n}\n\n.pl-3,\n.px-3 {\n  padding-left: 1rem !important;\n}\n\n.p-4 {\n  padding: 1.5rem !important;\n}\n\n.pt-4,\n.py-4 {\n  padding-top: 1.5rem !important;\n}\n\n.pr-4,\n.px-4 {\n  padding-right: 1.5rem !important;\n}\n\n.pb-4,\n.py-4 {\n  padding-bottom: 1.5rem !important;\n}\n\n.pl-4,\n.px-4 {\n  padding-left: 1.5rem !important;\n}\n\n.p-5 {\n  padding: 3rem !important;\n}\n\n.pt-5,\n.py-5 {\n  padding-top: 3rem !important;\n}\n\n.pr-5,\n.px-5 {\n  padding-right: 3rem !important;\n}\n\n.pb-5,\n.py-5 {\n  padding-bottom: 3rem !important;\n}\n\n.pl-5,\n.px-5 {\n  padding-left: 3rem !important;\n}\n\n.m-n1 {\n  margin: -0.25rem !important;\n}\n\n.mt-n1,\n.my-n1 {\n  margin-top: -0.25rem !important;\n}\n\n.mr-n1,\n.mx-n1 {\n  margin-right: -0.25rem !important;\n}\n\n.mb-n1,\n.my-n1 {\n  margin-bottom: -0.25rem !important;\n}\n\n.ml-n1,\n.mx-n1 {\n  margin-left: -0.25rem !important;\n}\n\n.m-n2 {\n  margin: -0.5rem !important;\n}\n\n.mt-n2,\n.my-n2 {\n  margin-top: -0.5rem !important;\n}\n\n.mr-n2,\n.mx-n2 {\n  margin-right: -0.5rem !important;\n}\n\n.mb-n2,\n.my-n2 {\n  margin-bottom: -0.5rem !important;\n}\n\n.ml-n2,\n.mx-n2 {\n  margin-left: -0.5rem !important;\n}\n\n.m-n3 {\n  margin: -1rem !important;\n}\n\n.mt-n3,\n.my-n3 {\n  margin-top: -1rem !important;\n}\n\n.mr-n3,\n.mx-n3 {\n  margin-right: -1rem !important;\n}\n\n.mb-n3,\n.my-n3 {\n  margin-bottom: -1rem !important;\n}\n\n.ml-n3,\n.mx-n3 {\n  margin-left: -1rem !important;\n}\n\n.m-n4 {\n  margin: -1.5rem !important;\n}\n\n.mt-n4,\n.my-n4 {\n  margin-top: -1.5rem !important;\n}\n\n.mr-n4,\n.mx-n4 {\n  margin-right: -1.5rem !important;\n}\n\n.mb-n4,\n.my-n4 {\n  margin-bottom: -1.5rem !important;\n}\n\n.ml-n4,\n.mx-n4 {\n  margin-left: -1.5rem !important;\n}\n\n.m-n5 {\n  margin: -3rem !important;\n}\n\n.mt-n5,\n.my-n5 {\n  margin-top: -3rem !important;\n}\n\n.mr-n5,\n.mx-n5 {\n  margin-right: -3rem !important;\n}\n\n.mb-n5,\n.my-n5 {\n  margin-bottom: -3rem !important;\n}\n\n.ml-n5,\n.mx-n5 {\n  margin-left: -3rem !important;\n}\n\n.m-auto {\n  margin: auto !important;\n}\n\n.mt-auto,\n.my-auto {\n  margin-top: auto !important;\n}\n\n.mr-auto,\n.mx-auto {\n  margin-right: auto !important;\n}\n\n.mb-auto,\n.my-auto {\n  margin-bottom: auto !important;\n}\n\n.ml-auto,\n.mx-auto {\n  margin-left: auto !important;\n}\n\n@media (min-width: 576px) {\n  .m-sm-0 {\n    margin: 0 !important;\n  }\n  .mt-sm-0,\n  .my-sm-0 {\n    margin-top: 0 !important;\n  }\n  .mr-sm-0,\n  .mx-sm-0 {\n    margin-right: 0 !important;\n  }\n  .mb-sm-0,\n  .my-sm-0 {\n    margin-bottom: 0 !important;\n  }\n  .ml-sm-0,\n  .mx-sm-0 {\n    margin-left: 0 !important;\n  }\n  .m-sm-1 {\n    margin: 0.25rem !important;\n  }\n  .mt-sm-1,\n  .my-sm-1 {\n    margin-top: 0.25rem !important;\n  }\n  .mr-sm-1,\n  .mx-sm-1 {\n    margin-right: 0.25rem !important;\n  }\n  .mb-sm-1,\n  .my-sm-1 {\n    margin-bottom: 0.25rem !important;\n  }\n  .ml-sm-1,\n  .mx-sm-1 {\n    margin-left: 0.25rem !important;\n  }\n  .m-sm-2 {\n    margin: 0.5rem !important;\n  }\n  .mt-sm-2,\n  .my-sm-2 {\n    margin-top: 0.5rem !important;\n  }\n  .mr-sm-2,\n  .mx-sm-2 {\n    margin-right: 0.5rem !important;\n  }\n  .mb-sm-2,\n  .my-sm-2 {\n    margin-bottom: 0.5rem !important;\n  }\n  .ml-sm-2,\n  .mx-sm-2 {\n    margin-left: 0.5rem !important;\n  }\n  .m-sm-3 {\n    margin: 1rem !important;\n  }\n  .mt-sm-3,\n  .my-sm-3 {\n    margin-top: 1rem !important;\n  }\n  .mr-sm-3,\n  .mx-sm-3 {\n    margin-right: 1rem !important;\n  }\n  .mb-sm-3,\n  .my-sm-3 {\n    margin-bottom: 1rem !important;\n  }\n  .ml-sm-3,\n  .mx-sm-3 {\n    margin-left: 1rem !important;\n  }\n  .m-sm-4 {\n    margin: 1.5rem !important;\n  }\n  .mt-sm-4,\n  .my-sm-4 {\n    margin-top: 1.5rem !important;\n  }\n  .mr-sm-4,\n  .mx-sm-4 {\n    margin-right: 1.5rem !important;\n  }\n  .mb-sm-4,\n  .my-sm-4 {\n    margin-bottom: 1.5rem !important;\n  }\n  .ml-sm-4,\n  .mx-sm-4 {\n    margin-left: 1.5rem !important;\n  }\n  .m-sm-5 {\n    margin: 3rem !important;\n  }\n  .mt-sm-5,\n  .my-sm-5 {\n    margin-top: 3rem !important;\n  }\n  .mr-sm-5,\n  .mx-sm-5 {\n    margin-right: 3rem !important;\n  }\n  .mb-sm-5,\n  .my-sm-5 {\n    margin-bottom: 3rem !important;\n  }\n  .ml-sm-5,\n  .mx-sm-5 {\n    margin-left: 3rem !important;\n  }\n  .p-sm-0 {\n    padding: 0 !important;\n  }\n  .pt-sm-0,\n  .py-sm-0 {\n    padding-top: 0 !important;\n  }\n  .pr-sm-0,\n  .px-sm-0 {\n    padding-right: 0 !important;\n  }\n  .pb-sm-0,\n  .py-sm-0 {\n    padding-bottom: 0 !important;\n  }\n  .pl-sm-0,\n  .px-sm-0 {\n    padding-left: 0 !important;\n  }\n  .p-sm-1 {\n    padding: 0.25rem !important;\n  }\n  .pt-sm-1,\n  .py-sm-1 {\n    padding-top: 0.25rem !important;\n  }\n  .pr-sm-1,\n  .px-sm-1 {\n    padding-right: 0.25rem !important;\n  }\n  .pb-sm-1,\n  .py-sm-1 {\n    padding-bottom: 0.25rem !important;\n  }\n  .pl-sm-1,\n  .px-sm-1 {\n    padding-left: 0.25rem !important;\n  }\n  .p-sm-2 {\n    padding: 0.5rem !important;\n  }\n  .pt-sm-2,\n  .py-sm-2 {\n    padding-top: 0.5rem !important;\n  }\n  .pr-sm-2,\n  .px-sm-2 {\n    padding-right: 0.5rem !important;\n  }\n  .pb-sm-2,\n  .py-sm-2 {\n    padding-bottom: 0.5rem !important;\n  }\n  .pl-sm-2,\n  .px-sm-2 {\n    padding-left: 0.5rem !important;\n  }\n  .p-sm-3 {\n    padding: 1rem !important;\n  }\n  .pt-sm-3,\n  .py-sm-3 {\n    padding-top: 1rem !important;\n  }\n  .pr-sm-3,\n  .px-sm-3 {\n    padding-right: 1rem !important;\n  }\n  .pb-sm-3,\n  .py-sm-3 {\n    padding-bottom: 1rem !important;\n  }\n  .pl-sm-3,\n  .px-sm-3 {\n    padding-left: 1rem !important;\n  }\n  .p-sm-4 {\n    padding: 1.5rem !important;\n  }\n  .pt-sm-4,\n  .py-sm-4 {\n    padding-top: 1.5rem !important;\n  }\n  .pr-sm-4,\n  .px-sm-4 {\n    padding-right: 1.5rem !important;\n  }\n  .pb-sm-4,\n  .py-sm-4 {\n    padding-bottom: 1.5rem !important;\n  }\n  .pl-sm-4,\n  .px-sm-4 {\n    padding-left: 1.5rem !important;\n  }\n  .p-sm-5 {\n    padding: 3rem !important;\n  }\n  .pt-sm-5,\n  .py-sm-5 {\n    padding-top: 3rem !important;\n  }\n  .pr-sm-5,\n  .px-sm-5 {\n    padding-right: 3rem !important;\n  }\n  .pb-sm-5,\n  .py-sm-5 {\n    padding-bottom: 3rem !important;\n  }\n  .pl-sm-5,\n  .px-sm-5 {\n    padding-left: 3rem !important;\n  }\n  .m-sm-n1 {\n    margin: -0.25rem !important;\n  }\n  .mt-sm-n1,\n  .my-sm-n1 {\n    margin-top: -0.25rem !important;\n  }\n  .mr-sm-n1,\n  .mx-sm-n1 {\n    margin-right: -0.25rem !important;\n  }\n  .mb-sm-n1,\n  .my-sm-n1 {\n    margin-bottom: -0.25rem !important;\n  }\n  .ml-sm-n1,\n  .mx-sm-n1 {\n    margin-left: -0.25rem !important;\n  }\n  .m-sm-n2 {\n    margin: -0.5rem !important;\n  }\n  .mt-sm-n2,\n  .my-sm-n2 {\n    margin-top: -0.5rem !important;\n  }\n  .mr-sm-n2,\n  .mx-sm-n2 {\n    margin-right: -0.5rem !important;\n  }\n  .mb-sm-n2,\n  .my-sm-n2 {\n    margin-bottom: -0.5rem !important;\n  }\n  .ml-sm-n2,\n  .mx-sm-n2 {\n    margin-left: -0.5rem !important;\n  }\n  .m-sm-n3 {\n    margin: -1rem !important;\n  }\n  .mt-sm-n3,\n  .my-sm-n3 {\n    margin-top: -1rem !important;\n  }\n  .mr-sm-n3,\n  .mx-sm-n3 {\n    margin-right: -1rem !important;\n  }\n  .mb-sm-n3,\n  .my-sm-n3 {\n    margin-bottom: -1rem !important;\n  }\n  .ml-sm-n3,\n  .mx-sm-n3 {\n    margin-left: -1rem !important;\n  }\n  .m-sm-n4 {\n    margin: -1.5rem !important;\n  }\n  .mt-sm-n4,\n  .my-sm-n4 {\n    margin-top: -1.5rem !important;\n  }\n  .mr-sm-n4,\n  .mx-sm-n4 {\n    margin-right: -1.5rem !important;\n  }\n  .mb-sm-n4,\n  .my-sm-n4 {\n    margin-bottom: -1.5rem !important;\n  }\n  .ml-sm-n4,\n  .mx-sm-n4 {\n    margin-left: -1.5rem !important;\n  }\n  .m-sm-n5 {\n    margin: -3rem !important;\n  }\n  .mt-sm-n5,\n  .my-sm-n5 {\n    margin-top: -3rem !important;\n  }\n  .mr-sm-n5,\n  .mx-sm-n5 {\n    margin-right: -3rem !important;\n  }\n  .mb-sm-n5,\n  .my-sm-n5 {\n    margin-bottom: -3rem !important;\n  }\n  .ml-sm-n5,\n  .mx-sm-n5 {\n    margin-left: -3rem !important;\n  }\n  .m-sm-auto {\n    margin: auto !important;\n  }\n  .mt-sm-auto,\n  .my-sm-auto {\n    margin-top: auto !important;\n  }\n  .mr-sm-auto,\n  .mx-sm-auto {\n    margin-right: auto !important;\n  }\n  .mb-sm-auto,\n  .my-sm-auto {\n    margin-bottom: auto !important;\n  }\n  .ml-sm-auto,\n  .mx-sm-auto {\n    margin-left: auto !important;\n  }\n}\n\n@media (min-width: 768px) {\n  .m-md-0 {\n    margin: 0 !important;\n  }\n  .mt-md-0,\n  .my-md-0 {\n    margin-top: 0 !important;\n  }\n  .mr-md-0,\n  .mx-md-0 {\n    margin-right: 0 !important;\n  }\n  .mb-md-0,\n  .my-md-0 {\n    margin-bottom: 0 !important;\n  }\n  .ml-md-0,\n  .mx-md-0 {\n    margin-left: 0 !important;\n  }\n  .m-md-1 {\n    margin: 0.25rem !important;\n  }\n  .mt-md-1,\n  .my-md-1 {\n    margin-top: 0.25rem !important;\n  }\n  .mr-md-1,\n  .mx-md-1 {\n    margin-right: 0.25rem !important;\n  }\n  .mb-md-1,\n  .my-md-1 {\n    margin-bottom: 0.25rem !important;\n  }\n  .ml-md-1,\n  .mx-md-1 {\n    margin-left: 0.25rem !important;\n  }\n  .m-md-2 {\n    margin: 0.5rem !important;\n  }\n  .mt-md-2,\n  .my-md-2 {\n    margin-top: 0.5rem !important;\n  }\n  .mr-md-2,\n  .mx-md-2 {\n    margin-right: 0.5rem !important;\n  }\n  .mb-md-2,\n  .my-md-2 {\n    margin-bottom: 0.5rem !important;\n  }\n  .ml-md-2,\n  .mx-md-2 {\n    margin-left: 0.5rem !important;\n  }\n  .m-md-3 {\n    margin: 1rem !important;\n  }\n  .mt-md-3,\n  .my-md-3 {\n    margin-top: 1rem !important;\n  }\n  .mr-md-3,\n  .mx-md-3 {\n    margin-right: 1rem !important;\n  }\n  .mb-md-3,\n  .my-md-3 {\n    margin-bottom: 1rem !important;\n  }\n  .ml-md-3,\n  .mx-md-3 {\n    margin-left: 1rem !important;\n  }\n  .m-md-4 {\n    margin: 1.5rem !important;\n  }\n  .mt-md-4,\n  .my-md-4 {\n    margin-top: 1.5rem !important;\n  }\n  .mr-md-4,\n  .mx-md-4 {\n    margin-right: 1.5rem !important;\n  }\n  .mb-md-4,\n  .my-md-4 {\n    margin-bottom: 1.5rem !important;\n  }\n  .ml-md-4,\n  .mx-md-4 {\n    margin-left: 1.5rem !important;\n  }\n  .m-md-5 {\n    margin: 3rem !important;\n  }\n  .mt-md-5,\n  .my-md-5 {\n    margin-top: 3rem !important;\n  }\n  .mr-md-5,\n  .mx-md-5 {\n    margin-right: 3rem !important;\n  }\n  .mb-md-5,\n  .my-md-5 {\n    margin-bottom: 3rem !important;\n  }\n  .ml-md-5,\n  .mx-md-5 {\n    margin-left: 3rem !important;\n  }\n  .p-md-0 {\n    padding: 0 !important;\n  }\n  .pt-md-0,\n  .py-md-0 {\n    padding-top: 0 !important;\n  }\n  .pr-md-0,\n  .px-md-0 {\n    padding-right: 0 !important;\n  }\n  .pb-md-0,\n  .py-md-0 {\n    padding-bottom: 0 !important;\n  }\n  .pl-md-0,\n  .px-md-0 {\n    padding-left: 0 !important;\n  }\n  .p-md-1 {\n    padding: 0.25rem !important;\n  }\n  .pt-md-1,\n  .py-md-1 {\n    padding-top: 0.25rem !important;\n  }\n  .pr-md-1,\n  .px-md-1 {\n    padding-right: 0.25rem !important;\n  }\n  .pb-md-1,\n  .py-md-1 {\n    padding-bottom: 0.25rem !important;\n  }\n  .pl-md-1,\n  .px-md-1 {\n    padding-left: 0.25rem !important;\n  }\n  .p-md-2 {\n    padding: 0.5rem !important;\n  }\n  .pt-md-2,\n  .py-md-2 {\n    padding-top: 0.5rem !important;\n  }\n  .pr-md-2,\n  .px-md-2 {\n    padding-right: 0.5rem !important;\n  }\n  .pb-md-2,\n  .py-md-2 {\n    padding-bottom: 0.5rem !important;\n  }\n  .pl-md-2,\n  .px-md-2 {\n    padding-left: 0.5rem !important;\n  }\n  .p-md-3 {\n    padding: 1rem !important;\n  }\n  .pt-md-3,\n  .py-md-3 {\n    padding-top: 1rem !important;\n  }\n  .pr-md-3,\n  .px-md-3 {\n    padding-right: 1rem !important;\n  }\n  .pb-md-3,\n  .py-md-3 {\n    padding-bottom: 1rem !important;\n  }\n  .pl-md-3,\n  .px-md-3 {\n    padding-left: 1rem !important;\n  }\n  .p-md-4 {\n    padding: 1.5rem !important;\n  }\n  .pt-md-4,\n  .py-md-4 {\n    padding-top: 1.5rem !important;\n  }\n  .pr-md-4,\n  .px-md-4 {\n    padding-right: 1.5rem !important;\n  }\n  .pb-md-4,\n  .py-md-4 {\n    padding-bottom: 1.5rem !important;\n  }\n  .pl-md-4,\n  .px-md-4 {\n    padding-left: 1.5rem !important;\n  }\n  .p-md-5 {\n    padding: 3rem !important;\n  }\n  .pt-md-5,\n  .py-md-5 {\n    padding-top: 3rem !important;\n  }\n  .pr-md-5,\n  .px-md-5 {\n    padding-right: 3rem !important;\n  }\n  .pb-md-5,\n  .py-md-5 {\n    padding-bottom: 3rem !important;\n  }\n  .pl-md-5,\n  .px-md-5 {\n    padding-left: 3rem !important;\n  }\n  .m-md-n1 {\n    margin: -0.25rem !important;\n  }\n  .mt-md-n1,\n  .my-md-n1 {\n    margin-top: -0.25rem !important;\n  }\n  .mr-md-n1,\n  .mx-md-n1 {\n    margin-right: -0.25rem !important;\n  }\n  .mb-md-n1,\n  .my-md-n1 {\n    margin-bottom: -0.25rem !important;\n  }\n  .ml-md-n1,\n  .mx-md-n1 {\n    margin-left: -0.25rem !important;\n  }\n  .m-md-n2 {\n    margin: -0.5rem !important;\n  }\n  .mt-md-n2,\n  .my-md-n2 {\n    margin-top: -0.5rem !important;\n  }\n  .mr-md-n2,\n  .mx-md-n2 {\n    margin-right: -0.5rem !important;\n  }\n  .mb-md-n2,\n  .my-md-n2 {\n    margin-bottom: -0.5rem !important;\n  }\n  .ml-md-n2,\n  .mx-md-n2 {\n    margin-left: -0.5rem !important;\n  }\n  .m-md-n3 {\n    margin: -1rem !important;\n  }\n  .mt-md-n3,\n  .my-md-n3 {\n    margin-top: -1rem !important;\n  }\n  .mr-md-n3,\n  .mx-md-n3 {\n    margin-right: -1rem !important;\n  }\n  .mb-md-n3,\n  .my-md-n3 {\n    margin-bottom: -1rem !important;\n  }\n  .ml-md-n3,\n  .mx-md-n3 {\n    margin-left: -1rem !important;\n  }\n  .m-md-n4 {\n    margin: -1.5rem !important;\n  }\n  .mt-md-n4,\n  .my-md-n4 {\n    margin-top: -1.5rem !important;\n  }\n  .mr-md-n4,\n  .mx-md-n4 {\n    margin-right: -1.5rem !important;\n  }\n  .mb-md-n4,\n  .my-md-n4 {\n    margin-bottom: -1.5rem !important;\n  }\n  .ml-md-n4,\n  .mx-md-n4 {\n    margin-left: -1.5rem !important;\n  }\n  .m-md-n5 {\n    margin: -3rem !important;\n  }\n  .mt-md-n5,\n  .my-md-n5 {\n    margin-top: -3rem !important;\n  }\n  .mr-md-n5,\n  .mx-md-n5 {\n    margin-right: -3rem !important;\n  }\n  .mb-md-n5,\n  .my-md-n5 {\n    margin-bottom: -3rem !important;\n  }\n  .ml-md-n5,\n  .mx-md-n5 {\n    margin-left: -3rem !important;\n  }\n  .m-md-auto {\n    margin: auto !important;\n  }\n  .mt-md-auto,\n  .my-md-auto {\n    margin-top: auto !important;\n  }\n  .mr-md-auto,\n  .mx-md-auto {\n    margin-right: auto !important;\n  }\n  .mb-md-auto,\n  .my-md-auto {\n    margin-bottom: auto !important;\n  }\n  .ml-md-auto,\n  .mx-md-auto {\n    margin-left: auto !important;\n  }\n}\n\n@media (min-width: 992px) {\n  .m-lg-0 {\n    margin: 0 !important;\n  }\n  .mt-lg-0,\n  .my-lg-0 {\n    margin-top: 0 !important;\n  }\n  .mr-lg-0,\n  .mx-lg-0 {\n    margin-right: 0 !important;\n  }\n  .mb-lg-0,\n  .my-lg-0 {\n    margin-bottom: 0 !important;\n  }\n  .ml-lg-0,\n  .mx-lg-0 {\n    margin-left: 0 !important;\n  }\n  .m-lg-1 {\n    margin: 0.25rem !important;\n  }\n  .mt-lg-1,\n  .my-lg-1 {\n    margin-top: 0.25rem !important;\n  }\n  .mr-lg-1,\n  .mx-lg-1 {\n    margin-right: 0.25rem !important;\n  }\n  .mb-lg-1,\n  .my-lg-1 {\n    margin-bottom: 0.25rem !important;\n  }\n  .ml-lg-1,\n  .mx-lg-1 {\n    margin-left: 0.25rem !important;\n  }\n  .m-lg-2 {\n    margin: 0.5rem !important;\n  }\n  .mt-lg-2,\n  .my-lg-2 {\n    margin-top: 0.5rem !important;\n  }\n  .mr-lg-2,\n  .mx-lg-2 {\n    margin-right: 0.5rem !important;\n  }\n  .mb-lg-2,\n  .my-lg-2 {\n    margin-bottom: 0.5rem !important;\n  }\n  .ml-lg-2,\n  .mx-lg-2 {\n    margin-left: 0.5rem !important;\n  }\n  .m-lg-3 {\n    margin: 1rem !important;\n  }\n  .mt-lg-3,\n  .my-lg-3 {\n    margin-top: 1rem !important;\n  }\n  .mr-lg-3,\n  .mx-lg-3 {\n    margin-right: 1rem !important;\n  }\n  .mb-lg-3,\n  .my-lg-3 {\n    margin-bottom: 1rem !important;\n  }\n  .ml-lg-3,\n  .mx-lg-3 {\n    margin-left: 1rem !important;\n  }\n  .m-lg-4 {\n    margin: 1.5rem !important;\n  }\n  .mt-lg-4,\n  .my-lg-4 {\n    margin-top: 1.5rem !important;\n  }\n  .mr-lg-4,\n  .mx-lg-4 {\n    margin-right: 1.5rem !important;\n  }\n  .mb-lg-4,\n  .my-lg-4 {\n    margin-bottom: 1.5rem !important;\n  }\n  .ml-lg-4,\n  .mx-lg-4 {\n    margin-left: 1.5rem !important;\n  }\n  .m-lg-5 {\n    margin: 3rem !important;\n  }\n  .mt-lg-5,\n  .my-lg-5 {\n    margin-top: 3rem !important;\n  }\n  .mr-lg-5,\n  .mx-lg-5 {\n    margin-right: 3rem !important;\n  }\n  .mb-lg-5,\n  .my-lg-5 {\n    margin-bottom: 3rem !important;\n  }\n  .ml-lg-5,\n  .mx-lg-5 {\n    margin-left: 3rem !important;\n  }\n  .p-lg-0 {\n    padding: 0 !important;\n  }\n  .pt-lg-0,\n  .py-lg-0 {\n    padding-top: 0 !important;\n  }\n  .pr-lg-0,\n  .px-lg-0 {\n    padding-right: 0 !important;\n  }\n  .pb-lg-0,\n  .py-lg-0 {\n    padding-bottom: 0 !important;\n  }\n  .pl-lg-0,\n  .px-lg-0 {\n    padding-left: 0 !important;\n  }\n  .p-lg-1 {\n    padding: 0.25rem !important;\n  }\n  .pt-lg-1,\n  .py-lg-1 {\n    padding-top: 0.25rem !important;\n  }\n  .pr-lg-1,\n  .px-lg-1 {\n    padding-right: 0.25rem !important;\n  }\n  .pb-lg-1,\n  .py-lg-1 {\n    padding-bottom: 0.25rem !important;\n  }\n  .pl-lg-1,\n  .px-lg-1 {\n    padding-left: 0.25rem !important;\n  }\n  .p-lg-2 {\n    padding: 0.5rem !important;\n  }\n  .pt-lg-2,\n  .py-lg-2 {\n    padding-top: 0.5rem !important;\n  }\n  .pr-lg-2,\n  .px-lg-2 {\n    padding-right: 0.5rem !important;\n  }\n  .pb-lg-2,\n  .py-lg-2 {\n    padding-bottom: 0.5rem !important;\n  }\n  .pl-lg-2,\n  .px-lg-2 {\n    padding-left: 0.5rem !important;\n  }\n  .p-lg-3 {\n    padding: 1rem !important;\n  }\n  .pt-lg-3,\n  .py-lg-3 {\n    padding-top: 1rem !important;\n  }\n  .pr-lg-3,\n  .px-lg-3 {\n    padding-right: 1rem !important;\n  }\n  .pb-lg-3,\n  .py-lg-3 {\n    padding-bottom: 1rem !important;\n  }\n  .pl-lg-3,\n  .px-lg-3 {\n    padding-left: 1rem !important;\n  }\n  .p-lg-4 {\n    padding: 1.5rem !important;\n  }\n  .pt-lg-4,\n  .py-lg-4 {\n    padding-top: 1.5rem !important;\n  }\n  .pr-lg-4,\n  .px-lg-4 {\n    padding-right: 1.5rem !important;\n  }\n  .pb-lg-4,\n  .py-lg-4 {\n    padding-bottom: 1.5rem !important;\n  }\n  .pl-lg-4,\n  .px-lg-4 {\n    padding-left: 1.5rem !important;\n  }\n  .p-lg-5 {\n    padding: 3rem !important;\n  }\n  .pt-lg-5,\n  .py-lg-5 {\n    padding-top: 3rem !important;\n  }\n  .pr-lg-5,\n  .px-lg-5 {\n    padding-right: 3rem !important;\n  }\n  .pb-lg-5,\n  .py-lg-5 {\n    padding-bottom: 3rem !important;\n  }\n  .pl-lg-5,\n  .px-lg-5 {\n    padding-left: 3rem !important;\n  }\n  .m-lg-n1 {\n    margin: -0.25rem !important;\n  }\n  .mt-lg-n1,\n  .my-lg-n1 {\n    margin-top: -0.25rem !important;\n  }\n  .mr-lg-n1,\n  .mx-lg-n1 {\n    margin-right: -0.25rem !important;\n  }\n  .mb-lg-n1,\n  .my-lg-n1 {\n    margin-bottom: -0.25rem !important;\n  }\n  .ml-lg-n1,\n  .mx-lg-n1 {\n    margin-left: -0.25rem !important;\n  }\n  .m-lg-n2 {\n    margin: -0.5rem !important;\n  }\n  .mt-lg-n2,\n  .my-lg-n2 {\n    margin-top: -0.5rem !important;\n  }\n  .mr-lg-n2,\n  .mx-lg-n2 {\n    margin-right: -0.5rem !important;\n  }\n  .mb-lg-n2,\n  .my-lg-n2 {\n    margin-bottom: -0.5rem !important;\n  }\n  .ml-lg-n2,\n  .mx-lg-n2 {\n    margin-left: -0.5rem !important;\n  }\n  .m-lg-n3 {\n    margin: -1rem !important;\n  }\n  .mt-lg-n3,\n  .my-lg-n3 {\n    margin-top: -1rem !important;\n  }\n  .mr-lg-n3,\n  .mx-lg-n3 {\n    margin-right: -1rem !important;\n  }\n  .mb-lg-n3,\n  .my-lg-n3 {\n    margin-bottom: -1rem !important;\n  }\n  .ml-lg-n3,\n  .mx-lg-n3 {\n    margin-left: -1rem !important;\n  }\n  .m-lg-n4 {\n    margin: -1.5rem !important;\n  }\n  .mt-lg-n4,\n  .my-lg-n4 {\n    margin-top: -1.5rem !important;\n  }\n  .mr-lg-n4,\n  .mx-lg-n4 {\n    margin-right: -1.5rem !important;\n  }\n  .mb-lg-n4,\n  .my-lg-n4 {\n    margin-bottom: -1.5rem !important;\n  }\n  .ml-lg-n4,\n  .mx-lg-n4 {\n    margin-left: -1.5rem !important;\n  }\n  .m-lg-n5 {\n    margin: -3rem !important;\n  }\n  .mt-lg-n5,\n  .my-lg-n5 {\n    margin-top: -3rem !important;\n  }\n  .mr-lg-n5,\n  .mx-lg-n5 {\n    margin-right: -3rem !important;\n  }\n  .mb-lg-n5,\n  .my-lg-n5 {\n    margin-bottom: -3rem !important;\n  }\n  .ml-lg-n5,\n  .mx-lg-n5 {\n    margin-left: -3rem !important;\n  }\n  .m-lg-auto {\n    margin: auto !important;\n  }\n  .mt-lg-auto,\n  .my-lg-auto {\n    margin-top: auto !important;\n  }\n  .mr-lg-auto,\n  .mx-lg-auto {\n    margin-right: auto !important;\n  }\n  .mb-lg-auto,\n  .my-lg-auto {\n    margin-bottom: auto !important;\n  }\n  .ml-lg-auto,\n  .mx-lg-auto {\n    margin-left: auto !important;\n  }\n}\n\n@media (min-width: 1200px) {\n  .m-xl-0 {\n    margin: 0 !important;\n  }\n  .mt-xl-0,\n  .my-xl-0 {\n    margin-top: 0 !important;\n  }\n  .mr-xl-0,\n  .mx-xl-0 {\n    margin-right: 0 !important;\n  }\n  .mb-xl-0,\n  .my-xl-0 {\n    margin-bottom: 0 !important;\n  }\n  .ml-xl-0,\n  .mx-xl-0 {\n    margin-left: 0 !important;\n  }\n  .m-xl-1 {\n    margin: 0.25rem !important;\n  }\n  .mt-xl-1,\n  .my-xl-1 {\n    margin-top: 0.25rem !important;\n  }\n  .mr-xl-1,\n  .mx-xl-1 {\n    margin-right: 0.25rem !important;\n  }\n  .mb-xl-1,\n  .my-xl-1 {\n    margin-bottom: 0.25rem !important;\n  }\n  .ml-xl-1,\n  .mx-xl-1 {\n    margin-left: 0.25rem !important;\n  }\n  .m-xl-2 {\n    margin: 0.5rem !important;\n  }\n  .mt-xl-2,\n  .my-xl-2 {\n    margin-top: 0.5rem !important;\n  }\n  .mr-xl-2,\n  .mx-xl-2 {\n    margin-right: 0.5rem !important;\n  }\n  .mb-xl-2,\n  .my-xl-2 {\n    margin-bottom: 0.5rem !important;\n  }\n  .ml-xl-2,\n  .mx-xl-2 {\n    margin-left: 0.5rem !important;\n  }\n  .m-xl-3 {\n    margin: 1rem !important;\n  }\n  .mt-xl-3,\n  .my-xl-3 {\n    margin-top: 1rem !important;\n  }\n  .mr-xl-3,\n  .mx-xl-3 {\n    margin-right: 1rem !important;\n  }\n  .mb-xl-3,\n  .my-xl-3 {\n    margin-bottom: 1rem !important;\n  }\n  .ml-xl-3,\n  .mx-xl-3 {\n    margin-left: 1rem !important;\n  }\n  .m-xl-4 {\n    margin: 1.5rem !important;\n  }\n  .mt-xl-4,\n  .my-xl-4 {\n    margin-top: 1.5rem !important;\n  }\n  .mr-xl-4,\n  .mx-xl-4 {\n    margin-right: 1.5rem !important;\n  }\n  .mb-xl-4,\n  .my-xl-4 {\n    margin-bottom: 1.5rem !important;\n  }\n  .ml-xl-4,\n  .mx-xl-4 {\n    margin-left: 1.5rem !important;\n  }\n  .m-xl-5 {\n    margin: 3rem !important;\n  }\n  .mt-xl-5,\n  .my-xl-5 {\n    margin-top: 3rem !important;\n  }\n  .mr-xl-5,\n  .mx-xl-5 {\n    margin-right: 3rem !important;\n  }\n  .mb-xl-5,\n  .my-xl-5 {\n    margin-bottom: 3rem !important;\n  }\n  .ml-xl-5,\n  .mx-xl-5 {\n    margin-left: 3rem !important;\n  }\n  .p-xl-0 {\n    padding: 0 !important;\n  }\n  .pt-xl-0,\n  .py-xl-0 {\n    padding-top: 0 !important;\n  }\n  .pr-xl-0,\n  .px-xl-0 {\n    padding-right: 0 !important;\n  }\n  .pb-xl-0,\n  .py-xl-0 {\n    padding-bottom: 0 !important;\n  }\n  .pl-xl-0,\n  .px-xl-0 {\n    padding-left: 0 !important;\n  }\n  .p-xl-1 {\n    padding: 0.25rem !important;\n  }\n  .pt-xl-1,\n  .py-xl-1 {\n    padding-top: 0.25rem !important;\n  }\n  .pr-xl-1,\n  .px-xl-1 {\n    padding-right: 0.25rem !important;\n  }\n  .pb-xl-1,\n  .py-xl-1 {\n    padding-bottom: 0.25rem !important;\n  }\n  .pl-xl-1,\n  .px-xl-1 {\n    padding-left: 0.25rem !important;\n  }\n  .p-xl-2 {\n    padding: 0.5rem !important;\n  }\n  .pt-xl-2,\n  .py-xl-2 {\n    padding-top: 0.5rem !important;\n  }\n  .pr-xl-2,\n  .px-xl-2 {\n    padding-right: 0.5rem !important;\n  }\n  .pb-xl-2,\n  .py-xl-2 {\n    padding-bottom: 0.5rem !important;\n  }\n  .pl-xl-2,\n  .px-xl-2 {\n    padding-left: 0.5rem !important;\n  }\n  .p-xl-3 {\n    padding: 1rem !important;\n  }\n  .pt-xl-3,\n  .py-xl-3 {\n    padding-top: 1rem !important;\n  }\n  .pr-xl-3,\n  .px-xl-3 {\n    padding-right: 1rem !important;\n  }\n  .pb-xl-3,\n  .py-xl-3 {\n    padding-bottom: 1rem !important;\n  }\n  .pl-xl-3,\n  .px-xl-3 {\n    padding-left: 1rem !important;\n  }\n  .p-xl-4 {\n    padding: 1.5rem !important;\n  }\n  .pt-xl-4,\n  .py-xl-4 {\n    padding-top: 1.5rem !important;\n  }\n  .pr-xl-4,\n  .px-xl-4 {\n    padding-right: 1.5rem !important;\n  }\n  .pb-xl-4,\n  .py-xl-4 {\n    padding-bottom: 1.5rem !important;\n  }\n  .pl-xl-4,\n  .px-xl-4 {\n    padding-left: 1.5rem !important;\n  }\n  .p-xl-5 {\n    padding: 3rem !important;\n  }\n  .pt-xl-5,\n  .py-xl-5 {\n    padding-top: 3rem !important;\n  }\n  .pr-xl-5,\n  .px-xl-5 {\n    padding-right: 3rem !important;\n  }\n  .pb-xl-5,\n  .py-xl-5 {\n    padding-bottom: 3rem !important;\n  }\n  .pl-xl-5,\n  .px-xl-5 {\n    padding-left: 3rem !important;\n  }\n  .m-xl-n1 {\n    margin: -0.25rem !important;\n  }\n  .mt-xl-n1,\n  .my-xl-n1 {\n    margin-top: -0.25rem !important;\n  }\n  .mr-xl-n1,\n  .mx-xl-n1 {\n    margin-right: -0.25rem !important;\n  }\n  .mb-xl-n1,\n  .my-xl-n1 {\n    margin-bottom: -0.25rem !important;\n  }\n  .ml-xl-n1,\n  .mx-xl-n1 {\n    margin-left: -0.25rem !important;\n  }\n  .m-xl-n2 {\n    margin: -0.5rem !important;\n  }\n  .mt-xl-n2,\n  .my-xl-n2 {\n    margin-top: -0.5rem !important;\n  }\n  .mr-xl-n2,\n  .mx-xl-n2 {\n    margin-right: -0.5rem !important;\n  }\n  .mb-xl-n2,\n  .my-xl-n2 {\n    margin-bottom: -0.5rem !important;\n  }\n  .ml-xl-n2,\n  .mx-xl-n2 {\n    margin-left: -0.5rem !important;\n  }\n  .m-xl-n3 {\n    margin: -1rem !important;\n  }\n  .mt-xl-n3,\n  .my-xl-n3 {\n    margin-top: -1rem !important;\n  }\n  .mr-xl-n3,\n  .mx-xl-n3 {\n    margin-right: -1rem !important;\n  }\n  .mb-xl-n3,\n  .my-xl-n3 {\n    margin-bottom: -1rem !important;\n  }\n  .ml-xl-n3,\n  .mx-xl-n3 {\n    margin-left: -1rem !important;\n  }\n  .m-xl-n4 {\n    margin: -1.5rem !important;\n  }\n  .mt-xl-n4,\n  .my-xl-n4 {\n    margin-top: -1.5rem !important;\n  }\n  .mr-xl-n4,\n  .mx-xl-n4 {\n    margin-right: -1.5rem !important;\n  }\n  .mb-xl-n4,\n  .my-xl-n4 {\n    margin-bottom: -1.5rem !important;\n  }\n  .ml-xl-n4,\n  .mx-xl-n4 {\n    margin-left: -1.5rem !important;\n  }\n  .m-xl-n5 {\n    margin: -3rem !important;\n  }\n  .mt-xl-n5,\n  .my-xl-n5 {\n    margin-top: -3rem !important;\n  }\n  .mr-xl-n5,\n  .mx-xl-n5 {\n    margin-right: -3rem !important;\n  }\n  .mb-xl-n5,\n  .my-xl-n5 {\n    margin-bottom: -3rem !important;\n  }\n  .ml-xl-n5,\n  .mx-xl-n5 {\n    margin-left: -3rem !important;\n  }\n  .m-xl-auto {\n    margin: auto !important;\n  }\n  .mt-xl-auto,\n  .my-xl-auto {\n    margin-top: auto !important;\n  }\n  .mr-xl-auto,\n  .mx-xl-auto {\n    margin-right: auto !important;\n  }\n  .mb-xl-auto,\n  .my-xl-auto {\n    margin-bottom: auto !important;\n  }\n  .ml-xl-auto,\n  .mx-xl-auto {\n    margin-left: auto !important;\n  }\n}\n\n.text-monospace {\n  font-family: SFMono-Regular, Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace !important;\n}\n\n.text-justify {\n  text-align: justify !important;\n}\n\n.text-wrap {\n  white-space: normal !important;\n}\n\n.text-nowrap {\n  white-space: nowrap !important;\n}\n\n.text-truncate {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n\n.text-left {\n  text-align: left !important;\n}\n\n.text-right {\n  text-align: right !important;\n}\n\n.text-center {\n  text-align: center !important;\n}\n\n@media (min-width: 576px) {\n  .text-sm-left {\n    text-align: left !important;\n  }\n  .text-sm-right {\n    text-align: right !important;\n  }\n  .text-sm-center {\n    text-align: center !important;\n  }\n}\n\n@media (min-width: 768px) {\n  .text-md-left {\n    text-align: left !important;\n  }\n  .text-md-right {\n    text-align: right !important;\n  }\n  .text-md-center {\n    text-align: center !important;\n  }\n}\n\n@media (min-width: 992px) {\n  .text-lg-left {\n    text-align: left !important;\n  }\n  .text-lg-right {\n    text-align: right !important;\n  }\n  .text-lg-center {\n    text-align: center !important;\n  }\n}\n\n@media (min-width: 1200px) {\n  .text-xl-left {\n    text-align: left !important;\n  }\n  .text-xl-right {\n    text-align: right !important;\n  }\n  .text-xl-center {\n    text-align: center !important;\n  }\n}\n\n.text-lowercase {\n  text-transform: lowercase !important;\n}\n\n.text-uppercase {\n  text-transform: uppercase !important;\n}\n\n.text-capitalize {\n  text-transform: capitalize !important;\n}\n\n.font-weight-light {\n  font-weight: 300 !important;\n}\n\n.font-weight-lighter {\n  font-weight: lighter !important;\n}\n\n.font-weight-normal {\n  font-weight: 400 !important;\n}\n\n.font-weight-bold {\n  font-weight: 700 !important;\n}\n\n.font-weight-bolder {\n  font-weight: bolder !important;\n}\n\n.font-italic {\n  font-style: italic !important;\n}\n\n.text-white {\n  color: #fff !important;\n}\n\n.text-primary {\n  color: #007bff !important;\n}\n\na.text-primary:hover, a.text-primary:focus {\n  color: #0056b3 !important;\n}\n\n.text-secondary {\n  color: #6c757d !important;\n}\n\na.text-secondary:hover, a.text-secondary:focus {\n  color: #494f54 !important;\n}\n\n.text-success {\n  color: #28a745 !important;\n}\n\na.text-success:hover, a.text-success:focus {\n  color: #19692c !important;\n}\n\n.text-info {\n  color: #17a2b8 !important;\n}\n\na.text-info:hover, a.text-info:focus {\n  color: #0f6674 !important;\n}\n\n.text-warning {\n  color: #ffc107 !important;\n}\n\na.text-warning:hover, a.text-warning:focus {\n  color: #ba8b00 !important;\n}\n\n.text-danger {\n  color: #dc3545 !important;\n}\n\na.text-danger:hover, a.text-danger:focus {\n  color: #a71d2a !important;\n}\n\n.text-light {\n  color: #f8f9fa !important;\n}\n\na.text-light:hover, a.text-light:focus {\n  color: #cbd3da !important;\n}\n\n.text-dark {\n  color: #343a40 !important;\n}\n\na.text-dark:hover, a.text-dark:focus {\n  color: #121416 !important;\n}\n\n.text-body {\n  color: #212529 !important;\n}\n\n.text-muted {\n  color: #6c757d !important;\n}\n\n.text-black-50 {\n  color: rgba(0, 0, 0, 0.5) !important;\n}\n\n.text-white-50 {\n  color: rgba(255, 255, 255, 0.5) !important;\n}\n\n.text-hide {\n  font: 0/0 a;\n  color: transparent;\n  text-shadow: none;\n  background-color: transparent;\n  border: 0;\n}\n\n.text-decoration-none {\n  text-decoration: none !important;\n}\n\n.text-break {\n  word-break: break-word !important;\n  overflow-wrap: break-word !important;\n}\n\n.text-reset {\n  color: inherit !important;\n}\n\n.visible {\n  visibility: visible !important;\n}\n\n.invisible {\n  visibility: hidden !important;\n}\n\n@media print {\n  *,\n  *::before,\n  *::after {\n    text-shadow: none !important;\n    box-shadow: none !important;\n  }\n  a:not(.btn) {\n    text-decoration: underline;\n  }\n  abbr[title]::after {\n    content: \" (\" attr(title) \")\";\n  }\n  pre {\n    white-space: pre-wrap !important;\n  }\n  pre,\n  blockquote {\n    border: 1px solid #adb5bd;\n    page-break-inside: avoid;\n  }\n  thead {\n    display: table-header-group;\n  }\n  tr,\n  img {\n    page-break-inside: avoid;\n  }\n  p,\n  h2,\n  h3 {\n    orphans: 3;\n    widows: 3;\n  }\n  h2,\n  h3 {\n    page-break-after: avoid;\n  }\n  @page {\n    size: a3;\n  }\n  body {\n    min-width: 992px !important;\n  }\n  .container {\n    min-width: 992px !important;\n  }\n  .navbar {\n    display: none;\n  }\n  .badge {\n    border: 1px solid #000;\n  }\n  .table {\n    border-collapse: collapse !important;\n  }\n  .table td,\n  .table th {\n    background-color: #fff !important;\n  }\n  .table-bordered th,\n  .table-bordered td {\n    border: 1px solid #dee2e6 !important;\n  }\n  .table-dark {\n    color: inherit;\n  }\n  .table-dark th,\n  .table-dark td,\n  .table-dark thead th,\n  .table-dark tbody + tbody {\n    border-color: #dee2e6;\n  }\n  .table .thead-dark th {\n    color: inherit;\n    border-color: #dee2e6;\n  }\n}\n\n/*# sourceMappingURL=bootstrap.css.map */","// Hover mixin and `$enable-hover-media-query` are deprecated.\n//\n// Originally added during our alphas and maintained during betas, this mixin was\n// designed to prevent `:hover` stickiness on iOS-an issue where hover styles\n// would persist after initial touch.\n//\n// For backward compatibility, we've kept these mixins and updated them to\n// always return their regular pseudo-classes instead of a shimmed media query.\n//\n// Issue: https://github.com/twbs/bootstrap/issues/25195\n\n@mixin hover() {\n  &:hover { @content; }\n}\n\n@mixin hover-focus() {\n  &:hover,\n  &:focus {\n    @content;\n  }\n}\n\n@mixin plain-hover-focus() {\n  &,\n  &:hover,\n  &:focus {\n    @content;\n  }\n}\n\n@mixin hover-focus-active() {\n  &:hover,\n  &:focus,\n  &:active {\n    @content;\n  }\n}\n","// stylelint-disable declaration-no-important, selector-list-comma-newline-after\n\n//\n// Headings\n//\n\nh1, h2, h3, h4, h5, h6,\n.h1, .h2, .h3, .h4, .h5, .h6 {\n  margin-bottom: $headings-margin-bottom;\n  font-family: $headings-font-family;\n  font-weight: $headings-font-weight;\n  line-height: $headings-line-height;\n  color: $headings-color;\n}\n\nh1, .h1 { @include font-size($h1-font-size); }\nh2, .h2 { @include font-size($h2-font-size); }\nh3, .h3 { @include font-size($h3-font-size); }\nh4, .h4 { @include font-size($h4-font-size); }\nh5, .h5 { @include font-size($h5-font-size); }\nh6, .h6 { @include font-size($h6-font-size); }\n\n.lead {\n  @include font-size($lead-font-size);\n  font-weight: $lead-font-weight;\n}\n\n// Type display classes\n.display-1 {\n  @include font-size($display1-size);\n  font-weight: $display1-weight;\n  line-height: $display-line-height;\n}\n.display-2 {\n  @include font-size($display2-size);\n  font-weight: $display2-weight;\n  line-height: $display-line-height;\n}\n.display-3 {\n  @include font-size($display3-size);\n  font-weight: $display3-weight;\n  line-height: $display-line-height;\n}\n.display-4 {\n  @include font-size($display4-size);\n  font-weight: $display4-weight;\n  line-height: $display-line-height;\n}\n\n\n//\n// Horizontal rules\n//\n\nhr {\n  margin-top: $hr-margin-y;\n  margin-bottom: $hr-margin-y;\n  border: 0;\n  border-top: $hr-border-width solid $hr-border-color;\n}\n\n\n//\n// Emphasis\n//\n\nsmall,\n.small {\n  @include font-size($small-font-size);\n  font-weight: $font-weight-normal;\n}\n\nmark,\n.mark {\n  padding: $mark-padding;\n  background-color: $mark-bg;\n}\n\n\n//\n// Lists\n//\n\n.list-unstyled {\n  @include list-unstyled();\n}\n\n// Inline turns list items into inline-block\n.list-inline {\n  @include list-unstyled();\n}\n.list-inline-item {\n  display: inline-block;\n\n  &:not(:last-child) {\n    margin-right: $list-inline-padding;\n  }\n}\n\n\n//\n// Misc\n//\n\n// Builds on `abbr`\n.initialism {\n  @include font-size(90%);\n  text-transform: uppercase;\n}\n\n// Blockquotes\n.blockquote {\n  margin-bottom: $spacer;\n  @include font-size($blockquote-font-size);\n}\n\n.blockquote-footer {\n  display: block;\n  @include font-size($blockquote-small-font-size);\n  color: $blockquote-small-color;\n\n  &::before {\n    content: \"\\2014\\00A0\"; // em dash, nbsp\n  }\n}\n","// Lists\n\n// Unstyled keeps list items block level, just removes default browser padding and list-style\n@mixin list-unstyled() {\n  padding-left: 0;\n  list-style: none;\n}\n","// Responsive images (ensure images don't scale beyond their parents)\n//\n// This is purposefully opt-in via an explicit class rather than being the default for all `<img>`s.\n// We previously tried the \"images are responsive by default\" approach in Bootstrap v2,\n// and abandoned it in Bootstrap v3 because it breaks lots of third-party widgets (including Google Maps)\n// which weren't expecting the images within themselves to be involuntarily resized.\n// See also https://github.com/twbs/bootstrap/issues/18178\n.img-fluid {\n  @include img-fluid();\n}\n\n\n// Image thumbnails\n.img-thumbnail {\n  padding: $thumbnail-padding;\n  background-color: $thumbnail-bg;\n  border: $thumbnail-border-width solid $thumbnail-border-color;\n  @include border-radius($thumbnail-border-radius);\n  @include box-shadow($thumbnail-box-shadow);\n\n  // Keep them at most 100% wide\n  @include img-fluid();\n}\n\n//\n// Figures\n//\n\n.figure {\n  // Ensures the caption's text aligns with the image.\n  display: inline-block;\n}\n\n.figure-img {\n  margin-bottom: $spacer / 2;\n  line-height: 1;\n}\n\n.figure-caption {\n  @include font-size($figure-caption-font-size);\n  color: $figure-caption-color;\n}\n","// Image Mixins\n// - Responsive image\n// - Retina image\n\n\n// Responsive image\n//\n// Keep images from scaling beyond the width of their parents.\n\n@mixin img-fluid() {\n  // Part 1: Set a maximum relative to the parent\n  max-width: 100%;\n  // Part 2: Override the height to auto, otherwise images will be stretched\n  // when setting a width and height attribute on the img element.\n  height: auto;\n}\n\n\n// Retina image\n//\n// Short retina mixin for setting background-image and -size.\n\n@mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) {\n  background-image: url($file-1x);\n\n  // Autoprefixer takes care of adding -webkit-min-device-pixel-ratio and -o-min-device-pixel-ratio,\n  // but doesn't convert dppx=>dpi.\n  // There's no such thing as unprefixed min-device-pixel-ratio since it's nonstandard.\n  // Compatibility info: https://caniuse.com/#feat=css-media-resolution\n  @media only screen and (min-resolution: 192dpi), // IE9-11 don't support dppx\n    only screen and (min-resolution: 2dppx) { // Standardized\n    background-image: url($file-2x);\n    background-size: $width-1x $height-1x;\n  }\n  @include deprecate(\"`img-retina()`\", \"v4.3.0\", \"v5\");\n}\n","// stylelint-disable property-blacklist\n// Single side border-radius\n\n@mixin border-radius($radius: $border-radius, $fallback-border-radius: false) {\n  @if $enable-rounded {\n    border-radius: $radius;\n  }\n  @else if $fallback-border-radius != false {\n    border-radius: $fallback-border-radius;\n  }\n}\n\n@mixin border-top-radius($radius) {\n  @if $enable-rounded {\n    border-top-left-radius: $radius;\n    border-top-right-radius: $radius;\n  }\n}\n\n@mixin border-right-radius($radius) {\n  @if $enable-rounded {\n    border-top-right-radius: $radius;\n    border-bottom-right-radius: $radius;\n  }\n}\n\n@mixin border-bottom-radius($radius) {\n  @if $enable-rounded {\n    border-bottom-right-radius: $radius;\n    border-bottom-left-radius: $radius;\n  }\n}\n\n@mixin border-left-radius($radius) {\n  @if $enable-rounded {\n    border-top-left-radius: $radius;\n    border-bottom-left-radius: $radius;\n  }\n}\n\n@mixin border-top-left-radius($radius) {\n  @if $enable-rounded {\n    border-top-left-radius: $radius;\n  }\n}\n\n@mixin border-top-right-radius($radius) {\n  @if $enable-rounded {\n    border-top-right-radius: $radius;\n  }\n}\n\n@mixin border-bottom-right-radius($radius) {\n  @if $enable-rounded {\n    border-bottom-right-radius: $radius;\n  }\n}\n\n@mixin border-bottom-left-radius($radius) {\n  @if $enable-rounded {\n    border-bottom-left-radius: $radius;\n  }\n}\n","// Inline code\ncode {\n  @include font-size($code-font-size);\n  color: $code-color;\n  word-wrap: break-word;\n\n  // Streamline the style when inside anchors to avoid broken underline and more\n  a > & {\n    color: inherit;\n  }\n}\n\n// User input typically entered via keyboard\nkbd {\n  padding: $kbd-padding-y $kbd-padding-x;\n  @include font-size($kbd-font-size);\n  color: $kbd-color;\n  background-color: $kbd-bg;\n  @include border-radius($border-radius-sm);\n  @include box-shadow($kbd-box-shadow);\n\n  kbd {\n    padding: 0;\n    @include font-size(100%);\n    font-weight: $nested-kbd-font-weight;\n    @include box-shadow(none);\n  }\n}\n\n// Blocks of code\npre {\n  display: block;\n  @include font-size($code-font-size);\n  color: $pre-color;\n\n  // Account for some code outputs that place code tags in pre tags\n  code {\n    @include font-size(inherit);\n    color: inherit;\n    word-break: normal;\n  }\n}\n\n// Enable scrollable blocks of code\n.pre-scrollable {\n  max-height: $pre-scrollable-max-height;\n  overflow-y: scroll;\n}\n","// Container widths\n//\n// Set the container width, and override it for fixed navbars in media queries.\n\n@if $enable-grid-classes {\n  // Single container class with breakpoint max-widths\n  .container {\n    @include make-container();\n    @include make-container-max-widths();\n  }\n\n  // 100% wide container at all breakpoints\n  .container-fluid {\n    @include make-container();\n  }\n\n  // Responsive containers that are 100% wide until a breakpoint\n  @each $breakpoint, $container-max-width in $container-max-widths {\n    .container-#{$breakpoint} {\n      @extend .container-fluid;\n    }\n\n    @include media-breakpoint-up($breakpoint, $grid-breakpoints) {\n      %responsive-container-#{$breakpoint} {\n        max-width: $container-max-width;\n      }\n\n      @each $name, $width in $grid-breakpoints {\n        @if ($container-max-width > $width or $breakpoint == $name) {\n          .container#{breakpoint-infix($name, $grid-breakpoints)} {\n            @extend %responsive-container-#{$breakpoint};\n          }\n        }\n      }\n    }\n  }\n}\n\n\n// Row\n//\n// Rows contain your columns.\n\n@if $enable-grid-classes {\n  .row {\n    @include make-row();\n  }\n\n  // Remove the negative margin from default .row, then the horizontal padding\n  // from all immediate children columns (to prevent runaway style inheritance).\n  .no-gutters {\n    margin-right: 0;\n    margin-left: 0;\n\n    > .col,\n    > [class*=\"col-\"] {\n      padding-right: 0;\n      padding-left: 0;\n    }\n  }\n}\n\n// Columns\n//\n// Common styles for small and large grid columns\n\n@if $enable-grid-classes {\n  @include make-grid-columns();\n}\n","/// Grid system\n//\n// Generate semantic grid columns with these mixins.\n\n@mixin make-container($gutter: $grid-gutter-width) {\n  width: 100%;\n  padding-right: $gutter / 2;\n  padding-left: $gutter / 2;\n  margin-right: auto;\n  margin-left: auto;\n}\n\n\n// For each breakpoint, define the maximum width of the container in a media query\n@mixin make-container-max-widths($max-widths: $container-max-widths, $breakpoints: $grid-breakpoints) {\n  @each $breakpoint, $container-max-width in $max-widths {\n    @include media-breakpoint-up($breakpoint, $breakpoints) {\n      max-width: $container-max-width;\n    }\n  }\n}\n\n@mixin make-row($gutter: $grid-gutter-width) {\n  display: flex;\n  flex-wrap: wrap;\n  margin-right: -$gutter / 2;\n  margin-left: -$gutter / 2;\n}\n\n@mixin make-col-ready($gutter: $grid-gutter-width) {\n  position: relative;\n  // Prevent columns from becoming too narrow when at smaller grid tiers by\n  // always setting `width: 100%;`. This works because we use `flex` values\n  // later on to override this initial width.\n  width: 100%;\n  padding-right: $gutter / 2;\n  padding-left: $gutter / 2;\n}\n\n@mixin make-col($size, $columns: $grid-columns) {\n  flex: 0 0 percentage($size / $columns);\n  // Add a `max-width` to ensure content within each column does not blow out\n  // the width of the column. Applies to IE10+ and Firefox. Chrome and Safari\n  // do not appear to require this.\n  max-width: percentage($size / $columns);\n}\n\n@mixin make-col-auto() {\n  flex: 0 0 auto;\n  width: auto;\n  max-width: 100%; // Reset earlier grid tiers\n}\n\n@mixin make-col-offset($size, $columns: $grid-columns) {\n  $num: $size / $columns;\n  margin-left: if($num == 0, 0, percentage($num));\n}\n\n// Row columns\n//\n// Specify on a parent element(e.g., .row) to force immediate children into NN\n// numberof columns. Supports wrapping to new lines, but does not do a Masonry\n// style grid.\n@mixin row-cols($count) {\n  & > * {\n    flex: 0 0 100% / $count;\n    max-width: 100% / $count;\n  }\n}\n","// Breakpoint viewport sizes and media queries.\n//\n// Breakpoints are defined as a map of (name: minimum width), order from small to large:\n//\n//    (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)\n//\n// The map defined in the `$grid-breakpoints` global variable is used as the `$breakpoints` argument by default.\n\n// Name of the next breakpoint, or null for the last breakpoint.\n//\n//    >> breakpoint-next(sm)\n//    md\n//    >> breakpoint-next(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))\n//    md\n//    >> breakpoint-next(sm, $breakpoint-names: (xs sm md lg xl))\n//    md\n@function breakpoint-next($name, $breakpoints: $grid-breakpoints, $breakpoint-names: map-keys($breakpoints)) {\n  $n: index($breakpoint-names, $name);\n  @return if($n != null and $n < length($breakpoint-names), nth($breakpoint-names, $n + 1), null);\n}\n\n// Minimum breakpoint width. Null for the smallest (first) breakpoint.\n//\n//    >> breakpoint-min(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))\n//    576px\n@function breakpoint-min($name, $breakpoints: $grid-breakpoints) {\n  $min: map-get($breakpoints, $name);\n  @return if($min != 0, $min, null);\n}\n\n// Maximum breakpoint width. Null for the largest (last) breakpoint.\n// The maximum value is calculated as the minimum of the next one less 0.02px\n// to work around the limitations of `min-` and `max-` prefixes and viewports with fractional widths.\n// See https://www.w3.org/TR/mediaqueries-4/#mq-min-max\n// Uses 0.02px rather than 0.01px to work around a current rounding bug in Safari.\n// See https://bugs.webkit.org/show_bug.cgi?id=178261\n//\n//    >> breakpoint-max(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))\n//    767.98px\n@function breakpoint-max($name, $breakpoints: $grid-breakpoints) {\n  $next: breakpoint-next($name, $breakpoints);\n  @return if($next, breakpoint-min($next, $breakpoints) - .02, null);\n}\n\n// Returns a blank string if smallest breakpoint, otherwise returns the name with a dash in front.\n// Useful for making responsive utilities.\n//\n//    >> breakpoint-infix(xs, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))\n//    \"\"  (Returns a blank string)\n//    >> breakpoint-infix(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))\n//    \"-sm\"\n@function breakpoint-infix($name, $breakpoints: $grid-breakpoints) {\n  @return if(breakpoint-min($name, $breakpoints) == null, \"\", \"-#{$name}\");\n}\n\n// Media of at least the minimum breakpoint width. No query for the smallest breakpoint.\n// Makes the @content apply to the given breakpoint and wider.\n@mixin media-breakpoint-up($name, $breakpoints: $grid-breakpoints) {\n  $min: breakpoint-min($name, $breakpoints);\n  @if $min {\n    @media (min-width: $min) {\n      @content;\n    }\n  } @else {\n    @content;\n  }\n}\n\n// Media of at most the maximum breakpoint width. No query for the largest breakpoint.\n// Makes the @content apply to the given breakpoint and narrower.\n@mixin media-breakpoint-down($name, $breakpoints: $grid-breakpoints) {\n  $max: breakpoint-max($name, $breakpoints);\n  @if $max {\n    @media (max-width: $max) {\n      @content;\n    }\n  } @else {\n    @content;\n  }\n}\n\n// Media that spans multiple breakpoint widths.\n// Makes the @content apply between the min and max breakpoints\n@mixin media-breakpoint-between($lower, $upper, $breakpoints: $grid-breakpoints) {\n  $min: breakpoint-min($lower, $breakpoints);\n  $max: breakpoint-max($upper, $breakpoints);\n\n  @if $min != null and $max != null {\n    @media (min-width: $min) and (max-width: $max) {\n      @content;\n    }\n  } @else if $max == null {\n    @include media-breakpoint-up($lower, $breakpoints) {\n      @content;\n    }\n  } @else if $min == null {\n    @include media-breakpoint-down($upper, $breakpoints) {\n      @content;\n    }\n  }\n}\n\n// Media between the breakpoint's minimum and maximum widths.\n// No minimum for the smallest breakpoint, and no maximum for the largest one.\n// Makes the @content apply only to the given breakpoint, not viewports any wider or narrower.\n@mixin media-breakpoint-only($name, $breakpoints: $grid-breakpoints) {\n  $min: breakpoint-min($name, $breakpoints);\n  $max: breakpoint-max($name, $breakpoints);\n\n  @if $min != null and $max != null {\n    @media (min-width: $min) and (max-width: $max) {\n      @content;\n    }\n  } @else if $max == null {\n    @include media-breakpoint-up($name, $breakpoints) {\n      @content;\n    }\n  } @else if $min == null {\n    @include media-breakpoint-down($name, $breakpoints) {\n      @content;\n    }\n  }\n}\n","// Framework grid generation\n//\n// Used only by Bootstrap to generate the correct number of grid classes given\n// any value of `$grid-columns`.\n\n@mixin make-grid-columns($columns: $grid-columns, $gutter: $grid-gutter-width, $breakpoints: $grid-breakpoints) {\n  // Common properties for all breakpoints\n  %grid-column {\n    position: relative;\n    width: 100%;\n    padding-right: $gutter / 2;\n    padding-left: $gutter / 2;\n  }\n\n  @each $breakpoint in map-keys($breakpoints) {\n    $infix: breakpoint-infix($breakpoint, $breakpoints);\n\n    // Allow columns to stretch full width below their breakpoints\n    @for $i from 1 through $columns {\n      .col#{$infix}-#{$i} {\n        @extend %grid-column;\n      }\n    }\n    .col#{$infix},\n    .col#{$infix}-auto {\n      @extend %grid-column;\n    }\n\n    @include media-breakpoint-up($breakpoint, $breakpoints) {\n      // Provide basic `.col-{bp}` classes for equal-width flexbox columns\n      .col#{$infix} {\n        flex-basis: 0;\n        flex-grow: 1;\n        max-width: 100%;\n      }\n\n      @for $i from 1 through $grid-row-columns {\n        .row-cols#{$infix}-#{$i} {\n          @include row-cols($i);\n        }\n      }\n\n      .col#{$infix}-auto {\n        @include make-col-auto();\n      }\n\n      @for $i from 1 through $columns {\n        .col#{$infix}-#{$i} {\n          @include make-col($i, $columns);\n        }\n      }\n\n      .order#{$infix}-first { order: -1; }\n\n      .order#{$infix}-last { order: $columns + 1; }\n\n      @for $i from 0 through $columns {\n        .order#{$infix}-#{$i} { order: $i; }\n      }\n\n      // `$columns - 1` because offsetting by the width of an entire row isn't possible\n      @for $i from 0 through ($columns - 1) {\n        @if not ($infix == \"\" and $i == 0) { // Avoid emitting useless .offset-0\n          .offset#{$infix}-#{$i} {\n            @include make-col-offset($i, $columns);\n          }\n        }\n      }\n    }\n  }\n}\n","//\n// Basic Bootstrap table\n//\n\n.table {\n  width: 100%;\n  margin-bottom: $spacer;\n  color: $table-color;\n  background-color: $table-bg; // Reset for nesting within parents with `background-color`.\n\n  th,\n  td {\n    padding: $table-cell-padding;\n    vertical-align: top;\n    border-top: $table-border-width solid $table-border-color;\n  }\n\n  thead th {\n    vertical-align: bottom;\n    border-bottom: (2 * $table-border-width) solid $table-border-color;\n  }\n\n  tbody + tbody {\n    border-top: (2 * $table-border-width) solid $table-border-color;\n  }\n}\n\n\n//\n// Condensed table w/ half padding\n//\n\n.table-sm {\n  th,\n  td {\n    padding: $table-cell-padding-sm;\n  }\n}\n\n\n// Border versions\n//\n// Add or remove borders all around the table and between all the columns.\n\n.table-bordered {\n  border: $table-border-width solid $table-border-color;\n\n  th,\n  td {\n    border: $table-border-width solid $table-border-color;\n  }\n\n  thead {\n    th,\n    td {\n      border-bottom-width: 2 * $table-border-width;\n    }\n  }\n}\n\n.table-borderless {\n  th,\n  td,\n  thead th,\n  tbody + tbody {\n    border: 0;\n  }\n}\n\n// Zebra-striping\n//\n// Default zebra-stripe styles (alternating gray and transparent backgrounds)\n\n.table-striped {\n  tbody tr:nth-of-type(#{$table-striped-order}) {\n    background-color: $table-accent-bg;\n  }\n}\n\n\n// Hover effect\n//\n// Placed here since it has to come after the potential zebra striping\n\n.table-hover {\n  tbody tr {\n    @include hover() {\n      color: $table-hover-color;\n      background-color: $table-hover-bg;\n    }\n  }\n}\n\n\n// Table backgrounds\n//\n// Exact selectors below required to override `.table-striped` and prevent\n// inheritance to nested tables.\n\n@each $color, $value in $theme-colors {\n  @include table-row-variant($color, theme-color-level($color, $table-bg-level), theme-color-level($color, $table-border-level));\n}\n\n@include table-row-variant(active, $table-active-bg);\n\n\n// Dark styles\n//\n// Same table markup, but inverted color scheme: dark background and light text.\n\n// stylelint-disable-next-line no-duplicate-selectors\n.table {\n  .thead-dark {\n    th {\n      color: $table-dark-color;\n      background-color: $table-dark-bg;\n      border-color: $table-dark-border-color;\n    }\n  }\n\n  .thead-light {\n    th {\n      color: $table-head-color;\n      background-color: $table-head-bg;\n      border-color: $table-border-color;\n    }\n  }\n}\n\n.table-dark {\n  color: $table-dark-color;\n  background-color: $table-dark-bg;\n\n  th,\n  td,\n  thead th {\n    border-color: $table-dark-border-color;\n  }\n\n  &.table-bordered {\n    border: 0;\n  }\n\n  &.table-striped {\n    tbody tr:nth-of-type(#{$table-striped-order}) {\n      background-color: $table-dark-accent-bg;\n    }\n  }\n\n  &.table-hover {\n    tbody tr {\n      @include hover() {\n        color: $table-dark-hover-color;\n        background-color: $table-dark-hover-bg;\n      }\n    }\n  }\n}\n\n\n// Responsive tables\n//\n// Generate series of `.table-responsive-*` classes for configuring the screen\n// size of where your table will overflow.\n\n.table-responsive {\n  @each $breakpoint in map-keys($grid-breakpoints) {\n    $next: breakpoint-next($breakpoint, $grid-breakpoints);\n    $infix: breakpoint-infix($next, $grid-breakpoints);\n\n    &#{$infix} {\n      @include media-breakpoint-down($breakpoint) {\n        display: block;\n        width: 100%;\n        overflow-x: auto;\n        -webkit-overflow-scrolling: touch;\n\n        // Prevent double border on horizontal scroll due to use of `display: block;`\n        > .table-bordered {\n          border: 0;\n        }\n      }\n    }\n  }\n}\n","// Tables\n\n@mixin table-row-variant($state, $background, $border: null) {\n  // Exact selectors below required to override `.table-striped` and prevent\n  // inheritance to nested tables.\n  .table-#{$state} {\n    &,\n    > th,\n    > td {\n      background-color: $background;\n    }\n\n    @if $border != null {\n      th,\n      td,\n      thead th,\n      tbody + tbody {\n        border-color: $border;\n      }\n    }\n  }\n\n  // Hover states for `.table-hover`\n  // Note: this is not available for cells or rows within `thead` or `tfoot`.\n  .table-hover {\n    $hover-background: darken($background, 5%);\n\n    .table-#{$state} {\n      @include hover() {\n        background-color: $hover-background;\n\n        > td,\n        > th {\n          background-color: $hover-background;\n        }\n      }\n    }\n  }\n}\n","// stylelint-disable selector-no-qualifying-type\n\n//\n// Textual form controls\n//\n\n.form-control {\n  display: block;\n  width: 100%;\n  height: $input-height;\n  padding: $input-padding-y $input-padding-x;\n  font-family: $input-font-family;\n  @include font-size($input-font-size);\n  font-weight: $input-font-weight;\n  line-height: $input-line-height;\n  color: $input-color;\n  background-color: $input-bg;\n  background-clip: padding-box;\n  border: $input-border-width solid $input-border-color;\n\n  // Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS.\n  @include border-radius($input-border-radius, 0);\n\n  @include box-shadow($input-box-shadow);\n  @include transition($input-transition);\n\n  // Unstyle the caret on `<select>`s in IE10+.\n  &::-ms-expand {\n    background-color: transparent;\n    border: 0;\n  }\n\n  // Remove select outline from select box in FF\n  &:-moz-focusring {\n    color: transparent;\n    text-shadow: 0 0 0 $input-color;\n  }\n\n  // Customize the `:focus` state to imitate native WebKit styles.\n  @include form-control-focus($ignore-warning: true);\n\n  // Placeholder\n  &::placeholder {\n    color: $input-placeholder-color;\n    // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526.\n    opacity: 1;\n  }\n\n  // Disabled and read-only inputs\n  //\n  // HTML5 says that controls under a fieldset > legend:first-child won't be\n  // disabled if the fieldset is disabled. Due to implementation difficulty, we\n  // don't honor that edge case; we style them as disabled anyway.\n  &:disabled,\n  &[readonly] {\n    background-color: $input-disabled-bg;\n    // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655.\n    opacity: 1;\n  }\n}\n\nselect.form-control {\n  &:focus::-ms-value {\n    // Suppress the nested default white text on blue background highlight given to\n    // the selected option text when the (still closed) <select> receives focus\n    // in IE and (under certain conditions) Edge, as it looks bad and cannot be made to\n    // match the appearance of the native widget.\n    // See https://github.com/twbs/bootstrap/issues/19398.\n    color: $input-color;\n    background-color: $input-bg;\n  }\n}\n\n// Make file inputs better match text inputs by forcing them to new lines.\n.form-control-file,\n.form-control-range {\n  display: block;\n  width: 100%;\n}\n\n\n//\n// Labels\n//\n\n// For use with horizontal and inline forms, when you need the label (or legend)\n// text to align with the form controls.\n.col-form-label {\n  padding-top: add($input-padding-y, $input-border-width);\n  padding-bottom: add($input-padding-y, $input-border-width);\n  margin-bottom: 0; // Override the `<label>/<legend>` default\n  @include font-size(inherit); // Override the `<legend>` default\n  line-height: $input-line-height;\n}\n\n.col-form-label-lg {\n  padding-top: add($input-padding-y-lg, $input-border-width);\n  padding-bottom: add($input-padding-y-lg, $input-border-width);\n  @include font-size($input-font-size-lg);\n  line-height: $input-line-height-lg;\n}\n\n.col-form-label-sm {\n  padding-top: add($input-padding-y-sm, $input-border-width);\n  padding-bottom: add($input-padding-y-sm, $input-border-width);\n  @include font-size($input-font-size-sm);\n  line-height: $input-line-height-sm;\n}\n\n\n// Readonly controls as plain text\n//\n// Apply class to a readonly input to make it appear like regular plain\n// text (without any border, background color, focus indicator)\n\n.form-control-plaintext {\n  display: block;\n  width: 100%;\n  padding: $input-padding-y 0;\n  margin-bottom: 0; // match inputs if this class comes on inputs with default margins\n  @include font-size($input-font-size);\n  line-height: $input-line-height;\n  color: $input-plaintext-color;\n  background-color: transparent;\n  border: solid transparent;\n  border-width: $input-border-width 0;\n\n  &.form-control-sm,\n  &.form-control-lg {\n    padding-right: 0;\n    padding-left: 0;\n  }\n}\n\n\n// Form control sizing\n//\n// Build on `.form-control` with modifier classes to decrease or increase the\n// height and font-size of form controls.\n//\n// Repeated in `_input_group.scss` to avoid Sass extend issues.\n\n.form-control-sm {\n  height: $input-height-sm;\n  padding: $input-padding-y-sm $input-padding-x-sm;\n  @include font-size($input-font-size-sm);\n  line-height: $input-line-height-sm;\n  @include border-radius($input-border-radius-sm);\n}\n\n.form-control-lg {\n  height: $input-height-lg;\n  padding: $input-padding-y-lg $input-padding-x-lg;\n  @include font-size($input-font-size-lg);\n  line-height: $input-line-height-lg;\n  @include border-radius($input-border-radius-lg);\n}\n\n// stylelint-disable-next-line no-duplicate-selectors\nselect.form-control {\n  &[size],\n  &[multiple] {\n    height: auto;\n  }\n}\n\ntextarea.form-control {\n  height: auto;\n}\n\n// Form groups\n//\n// Designed to help with the organization and spacing of vertical forms. For\n// horizontal forms, use the predefined grid classes.\n\n.form-group {\n  margin-bottom: $form-group-margin-bottom;\n}\n\n.form-text {\n  display: block;\n  margin-top: $form-text-margin-top;\n}\n\n\n// Form grid\n//\n// Special replacement for our grid system's `.row` for tighter form layouts.\n\n.form-row {\n  display: flex;\n  flex-wrap: wrap;\n  margin-right: -$form-grid-gutter-width / 2;\n  margin-left: -$form-grid-gutter-width / 2;\n\n  > .col,\n  > [class*=\"col-\"] {\n    padding-right: $form-grid-gutter-width / 2;\n    padding-left: $form-grid-gutter-width / 2;\n  }\n}\n\n\n// Checkboxes and radios\n//\n// Indent the labels to position radios/checkboxes as hanging controls.\n\n.form-check {\n  position: relative;\n  display: block;\n  padding-left: $form-check-input-gutter;\n}\n\n.form-check-input {\n  position: absolute;\n  margin-top: $form-check-input-margin-y;\n  margin-left: -$form-check-input-gutter;\n\n  // Use [disabled] and :disabled for workaround https://github.com/twbs/bootstrap/issues/28247\n  &[disabled] ~ .form-check-label,\n  &:disabled ~ .form-check-label {\n    color: $text-muted;\n  }\n}\n\n.form-check-label {\n  margin-bottom: 0; // Override default `<label>` bottom margin\n}\n\n.form-check-inline {\n  display: inline-flex;\n  align-items: center;\n  padding-left: 0; // Override base .form-check\n  margin-right: $form-check-inline-margin-x;\n\n  // Undo .form-check-input defaults and add some `margin-right`.\n  .form-check-input {\n    position: static;\n    margin-top: 0;\n    margin-right: $form-check-inline-input-margin-x;\n    margin-left: 0;\n  }\n}\n\n\n// Form validation\n//\n// Provide feedback to users when form field values are valid or invalid. Works\n// primarily for client-side validation via scoped `:invalid` and `:valid`\n// pseudo-classes but also includes `.is-invalid` and `.is-valid` classes for\n// server side validation.\n\n@each $state, $data in $form-validation-states {\n  @include form-validation-state($state, map-get($data, color), map-get($data, icon));\n}\n\n// Inline forms\n//\n// Make forms appear inline(-block) by adding the `.form-inline` class. Inline\n// forms begin stacked on extra small (mobile) devices and then go inline when\n// viewports reach <768px.\n//\n// Requires wrapping inputs and labels with `.form-group` for proper display of\n// default HTML form controls and our custom form controls (e.g., input groups).\n\n.form-inline {\n  display: flex;\n  flex-flow: row wrap;\n  align-items: center; // Prevent shorter elements from growing to same height as others (e.g., small buttons growing to normal sized button height)\n\n  // Because we use flex, the initial sizing of checkboxes is collapsed and\n  // doesn't occupy the full-width (which is what we want for xs grid tier),\n  // so we force that here.\n  .form-check {\n    width: 100%;\n  }\n\n  // Kick in the inline\n  @include media-breakpoint-up(sm) {\n    label {\n      display: flex;\n      align-items: center;\n      justify-content: center;\n      margin-bottom: 0;\n    }\n\n    // Inline-block all the things for \"inline\"\n    .form-group {\n      display: flex;\n      flex: 0 0 auto;\n      flex-flow: row wrap;\n      align-items: center;\n      margin-bottom: 0;\n    }\n\n    // Allow folks to *not* use `.form-group`\n    .form-control {\n      display: inline-block;\n      width: auto; // Prevent labels from stacking above inputs in `.form-group`\n      vertical-align: middle;\n    }\n\n    // Make static controls behave like regular ones\n    .form-control-plaintext {\n      display: inline-block;\n    }\n\n    .input-group,\n    .custom-select {\n      width: auto;\n    }\n\n    // Remove default margin on radios/checkboxes that were used for stacking, and\n    // then undo the floating of radios and checkboxes to match.\n    .form-check {\n      display: flex;\n      align-items: center;\n      justify-content: center;\n      width: auto;\n      padding-left: 0;\n    }\n    .form-check-input {\n      position: relative;\n      flex-shrink: 0;\n      margin-top: 0;\n      margin-right: $form-check-input-margin-x;\n      margin-left: 0;\n    }\n\n    .custom-control {\n      align-items: center;\n      justify-content: center;\n    }\n    .custom-control-label {\n      margin-bottom: 0;\n    }\n  }\n}\n","// stylelint-disable property-blacklist\n@mixin transition($transition...) {\n  @if $enable-transitions {\n    @if length($transition) == 0 {\n      transition: $transition-base;\n    } @else {\n      transition: $transition;\n    }\n  }\n\n  @if $enable-prefers-reduced-motion-media-query {\n    @media (prefers-reduced-motion: reduce) {\n      transition: none;\n    }\n  }\n}\n","// Form control focus state\n//\n// Generate a customized focus state and for any input with the specified color,\n// which defaults to the `$input-focus-border-color` variable.\n//\n// We highly encourage you to not customize the default value, but instead use\n// this to tweak colors on an as-needed basis. This aesthetic change is based on\n// WebKit's default styles, but applicable to a wider range of browsers. Its\n// usability and accessibility should be taken into account with any change.\n//\n// Example usage: change the default blue border and shadow to white for better\n// contrast against a dark gray background.\n@mixin form-control-focus($ignore-warning: false) {\n  &:focus {\n    color: $input-focus-color;\n    background-color: $input-focus-bg;\n    border-color: $input-focus-border-color;\n    outline: 0;\n    // Avoid using mixin so we can pass custom focus shadow properly\n    @if $enable-shadows {\n      box-shadow: $input-box-shadow, $input-focus-box-shadow;\n    } @else {\n      box-shadow: $input-focus-box-shadow;\n    }\n  }\n  @include deprecate(\"The `form-control-focus()` mixin\", \"v4.4.0\", \"v5\", $ignore-warning);\n}\n\n// This mixin uses an `if()` technique to be compatible with Dart Sass\n// See https://github.com/sass/sass/issues/1873#issuecomment-152293725 for more details\n@mixin form-validation-state-selector($state) {\n  @if ($state == \"valid\" or $state == \"invalid\") {\n    .was-validated #{if(&, \"&\", \"\")}:#{$state},\n    #{if(&, \"&\", \"\")}.is-#{$state} {\n      @content;\n    }\n  } @else {\n    #{if(&, \"&\", \"\")}.is-#{$state} {\n      @content;\n    }\n  }\n}\n\n@mixin form-validation-state($state, $color, $icon) {\n  .#{$state}-feedback {\n    display: none;\n    width: 100%;\n    margin-top: $form-feedback-margin-top;\n    @include font-size($form-feedback-font-size);\n    color: $color;\n  }\n\n  .#{$state}-tooltip {\n    position: absolute;\n    top: 100%;\n    z-index: 5;\n    display: none;\n    max-width: 100%; // Contain to parent when possible\n    padding: $form-feedback-tooltip-padding-y $form-feedback-tooltip-padding-x;\n    margin-top: .1rem;\n    @include font-size($form-feedback-tooltip-font-size);\n    line-height: $form-feedback-tooltip-line-height;\n    color: color-yiq($color);\n    background-color: rgba($color, $form-feedback-tooltip-opacity);\n    @include border-radius($form-feedback-tooltip-border-radius);\n  }\n\n  @include form-validation-state-selector($state) {\n    ~ .#{$state}-feedback,\n    ~ .#{$state}-tooltip {\n      display: block;\n    }\n  }\n\n  .form-control {\n    @include form-validation-state-selector($state) {\n      border-color: $color;\n\n      @if $enable-validation-icons {\n        padding-right: $input-height-inner;\n        background-image: escape-svg($icon);\n        background-repeat: no-repeat;\n        background-position: right $input-height-inner-quarter center;\n        background-size: $input-height-inner-half $input-height-inner-half;\n      }\n\n      &:focus {\n        border-color: $color;\n        box-shadow: 0 0 0 $input-focus-width rgba($color, .25);\n      }\n    }\n  }\n\n  // stylelint-disable-next-line selector-no-qualifying-type\n  textarea.form-control {\n    @include form-validation-state-selector($state) {\n      @if $enable-validation-icons {\n        padding-right: $input-height-inner;\n        background-position: top $input-height-inner-quarter right $input-height-inner-quarter;\n      }\n    }\n  }\n\n  .custom-select {\n    @include form-validation-state-selector($state) {\n      border-color: $color;\n\n      @if $enable-validation-icons {\n        padding-right: $custom-select-feedback-icon-padding-right;\n        background: $custom-select-background, escape-svg($icon) $custom-select-bg no-repeat $custom-select-feedback-icon-position / $custom-select-feedback-icon-size;\n      }\n\n      &:focus {\n        border-color: $color;\n        box-shadow: 0 0 0 $input-focus-width rgba($color, .25);\n      }\n    }\n  }\n\n  .form-check-input {\n    @include form-validation-state-selector($state) {\n      ~ .form-check-label {\n        color: $color;\n      }\n\n      ~ .#{$state}-feedback,\n      ~ .#{$state}-tooltip {\n        display: block;\n      }\n    }\n  }\n\n  .custom-control-input {\n    @include form-validation-state-selector($state) {\n      ~ .custom-control-label {\n        color: $color;\n\n        &::before {\n          border-color: $color;\n        }\n      }\n\n      &:checked {\n        ~ .custom-control-label::before {\n          border-color: lighten($color, 10%);\n          @include gradient-bg(lighten($color, 10%));\n        }\n      }\n\n      &:focus {\n        ~ .custom-control-label::before {\n          box-shadow: 0 0 0 $input-focus-width rgba($color, .25);\n        }\n\n        &:not(:checked) ~ .custom-control-label::before {\n          border-color: $color;\n        }\n      }\n    }\n  }\n\n  // custom file\n  .custom-file-input {\n    @include form-validation-state-selector($state) {\n      ~ .custom-file-label {\n        border-color: $color;\n      }\n\n      &:focus {\n        ~ .custom-file-label {\n          border-color: $color;\n          box-shadow: 0 0 0 $input-focus-width rgba($color, .25);\n        }\n      }\n    }\n  }\n}\n","// Gradients\n\n@mixin gradient-bg($color) {\n  @if $enable-gradients {\n    background: $color linear-gradient(180deg, mix($body-bg, $color, 15%), $color) repeat-x;\n  } @else {\n    background-color: $color;\n  }\n}\n\n// Horizontal gradient, from left to right\n//\n// Creates two color stops, start and end, by specifying a color and position for each color stop.\n@mixin gradient-x($start-color: $gray-700, $end-color: $gray-800, $start-percent: 0%, $end-percent: 100%) {\n  background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent);\n  background-repeat: repeat-x;\n}\n\n// Vertical gradient, from top to bottom\n//\n// Creates two color stops, start and end, by specifying a color and position for each color stop.\n@mixin gradient-y($start-color: $gray-700, $end-color: $gray-800, $start-percent: 0%, $end-percent: 100%) {\n  background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent);\n  background-repeat: repeat-x;\n}\n\n@mixin gradient-directional($start-color: $gray-700, $end-color: $gray-800, $deg: 45deg) {\n  background-image: linear-gradient($deg, $start-color, $end-color);\n  background-repeat: repeat-x;\n}\n@mixin gradient-x-three-colors($start-color: $blue, $mid-color: $purple, $color-stop: 50%, $end-color: $red) {\n  background-image: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color);\n  background-repeat: no-repeat;\n}\n@mixin gradient-y-three-colors($start-color: $blue, $mid-color: $purple, $color-stop: 50%, $end-color: $red) {\n  background-image: linear-gradient($start-color, $mid-color $color-stop, $end-color);\n  background-repeat: no-repeat;\n}\n@mixin gradient-radial($inner-color: $gray-700, $outer-color: $gray-800) {\n  background-image: radial-gradient(circle, $inner-color, $outer-color);\n  background-repeat: no-repeat;\n}\n@mixin gradient-striped($color: rgba($white, .15), $angle: 45deg) {\n  background-image: linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);\n}\n","// stylelint-disable selector-no-qualifying-type\n\n//\n// Base styles\n//\n\n.btn {\n  display: inline-block;\n  font-family: $btn-font-family;\n  font-weight: $btn-font-weight;\n  color: $body-color;\n  text-align: center;\n  white-space: $btn-white-space;\n  vertical-align: middle;\n  cursor: if($enable-pointer-cursor-for-buttons, pointer, null);\n  user-select: none;\n  background-color: transparent;\n  border: $btn-border-width solid transparent;\n  @include button-size($btn-padding-y, $btn-padding-x, $btn-font-size, $btn-line-height, $btn-border-radius);\n  @include transition($btn-transition);\n\n  @include hover() {\n    color: $body-color;\n    text-decoration: none;\n  }\n\n  &:focus,\n  &.focus {\n    outline: 0;\n    box-shadow: $btn-focus-box-shadow;\n  }\n\n  // Disabled comes first so active can properly restyle\n  &.disabled,\n  &:disabled {\n    opacity: $btn-disabled-opacity;\n    @include box-shadow(none);\n  }\n\n  &:not(:disabled):not(.disabled):active,\n  &:not(:disabled):not(.disabled).active {\n    @include box-shadow($btn-active-box-shadow);\n\n    &:focus {\n      @include box-shadow($btn-focus-box-shadow, $btn-active-box-shadow);\n    }\n  }\n}\n\n// Future-proof disabling of clicks on `<a>` elements\na.btn.disabled,\nfieldset:disabled a.btn {\n  pointer-events: none;\n}\n\n\n//\n// Alternate buttons\n//\n\n@each $color, $value in $theme-colors {\n  .btn-#{$color} {\n    @include button-variant($value, $value);\n  }\n}\n\n@each $color, $value in $theme-colors {\n  .btn-outline-#{$color} {\n    @include button-outline-variant($value);\n  }\n}\n\n\n//\n// Link buttons\n//\n\n// Make a button look and behave like a link\n.btn-link {\n  font-weight: $font-weight-normal;\n  color: $link-color;\n  text-decoration: $link-decoration;\n\n  @include hover() {\n    color: $link-hover-color;\n    text-decoration: $link-hover-decoration;\n  }\n\n  &:focus,\n  &.focus {\n    text-decoration: $link-hover-decoration;\n    box-shadow: none;\n  }\n\n  &:disabled,\n  &.disabled {\n    color: $btn-link-disabled-color;\n    pointer-events: none;\n  }\n\n  // No need for an active state here\n}\n\n\n//\n// Button Sizes\n//\n\n.btn-lg {\n  @include button-size($btn-padding-y-lg, $btn-padding-x-lg, $btn-font-size-lg, $btn-line-height-lg, $btn-border-radius-lg);\n}\n\n.btn-sm {\n  @include button-size($btn-padding-y-sm, $btn-padding-x-sm, $btn-font-size-sm, $btn-line-height-sm, $btn-border-radius-sm);\n}\n\n\n//\n// Block button\n//\n\n.btn-block {\n  display: block;\n  width: 100%;\n\n  // Vertically space out multiple block buttons\n  + .btn-block {\n    margin-top: $btn-block-spacing-y;\n  }\n}\n\n// Specificity overrides\ninput[type=\"submit\"],\ninput[type=\"reset\"],\ninput[type=\"button\"] {\n  &.btn-block {\n    width: 100%;\n  }\n}\n","// Button variants\n//\n// Easily pump out default styles, as well as :hover, :focus, :active,\n// and disabled options for all buttons\n\n@mixin button-variant($background, $border, $hover-background: darken($background, 7.5%), $hover-border: darken($border, 10%), $active-background: darken($background, 10%), $active-border: darken($border, 12.5%)) {\n  color: color-yiq($background);\n  @include gradient-bg($background);\n  border-color: $border;\n  @include box-shadow($btn-box-shadow);\n\n  @include hover() {\n    color: color-yiq($hover-background);\n    @include gradient-bg($hover-background);\n    border-color: $hover-border;\n  }\n\n  &:focus,\n  &.focus {\n    color: color-yiq($hover-background);\n    @include gradient-bg($hover-background);\n    border-color: $hover-border;\n    // Avoid using mixin so we can pass custom focus shadow properly\n    @if $enable-shadows {\n      box-shadow: $btn-box-shadow, 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5);\n    } @else {\n      box-shadow: 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5);\n    }\n  }\n\n  // Disabled comes first so active can properly restyle\n  &.disabled,\n  &:disabled {\n    color: color-yiq($background);\n    background-color: $background;\n    border-color: $border;\n    // Remove CSS gradients if they're enabled\n    @if $enable-gradients {\n      background-image: none;\n    }\n  }\n\n  &:not(:disabled):not(.disabled):active,\n  &:not(:disabled):not(.disabled).active,\n  .show > &.dropdown-toggle {\n    color: color-yiq($active-background);\n    background-color: $active-background;\n    @if $enable-gradients {\n      background-image: none; // Remove the gradient for the pressed/active state\n    }\n    border-color: $active-border;\n\n    &:focus {\n      // Avoid using mixin so we can pass custom focus shadow properly\n      @if $enable-shadows and $btn-active-box-shadow != none {\n        box-shadow: $btn-active-box-shadow, 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5);\n      } @else {\n        box-shadow: 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5);\n      }\n    }\n  }\n}\n\n@mixin button-outline-variant($color, $color-hover: color-yiq($color), $active-background: $color, $active-border: $color) {\n  color: $color;\n  border-color: $color;\n\n  @include hover() {\n    color: $color-hover;\n    background-color: $active-background;\n    border-color: $active-border;\n  }\n\n  &:focus,\n  &.focus {\n    box-shadow: 0 0 0 $btn-focus-width rgba($color, .5);\n  }\n\n  &.disabled,\n  &:disabled {\n    color: $color;\n    background-color: transparent;\n  }\n\n  &:not(:disabled):not(.disabled):active,\n  &:not(:disabled):not(.disabled).active,\n  .show > &.dropdown-toggle {\n    color: color-yiq($active-background);\n    background-color: $active-background;\n    border-color: $active-border;\n\n    &:focus {\n      // Avoid using mixin so we can pass custom focus shadow properly\n      @if $enable-shadows and $btn-active-box-shadow != none {\n        box-shadow: $btn-active-box-shadow, 0 0 0 $btn-focus-width rgba($color, .5);\n      } @else {\n        box-shadow: 0 0 0 $btn-focus-width rgba($color, .5);\n      }\n    }\n  }\n}\n\n// Button sizes\n@mixin button-size($padding-y, $padding-x, $font-size, $line-height, $border-radius) {\n  padding: $padding-y $padding-x;\n  @include font-size($font-size);\n  line-height: $line-height;\n  // Manually declare to provide an override to the browser default\n  @include border-radius($border-radius, 0);\n}\n",".fade {\n  @include transition($transition-fade);\n\n  &:not(.show) {\n    opacity: 0;\n  }\n}\n\n.collapse {\n  &:not(.show) {\n    display: none;\n  }\n}\n\n.collapsing {\n  position: relative;\n  height: 0;\n  overflow: hidden;\n  @include transition($transition-collapse);\n}\n","// The dropdown wrapper (`<div>`)\n.dropup,\n.dropright,\n.dropdown,\n.dropleft {\n  position: relative;\n}\n\n.dropdown-toggle {\n  white-space: nowrap;\n\n  // Generate the caret automatically\n  @include caret();\n}\n\n// The dropdown menu\n.dropdown-menu {\n  position: absolute;\n  top: 100%;\n  left: 0;\n  z-index: $zindex-dropdown;\n  display: none; // none by default, but block on \"open\" of the menu\n  float: left;\n  min-width: $dropdown-min-width;\n  padding: $dropdown-padding-y 0;\n  margin: $dropdown-spacer 0 0; // override default ul\n  @include font-size($dropdown-font-size);\n  color: $dropdown-color;\n  text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)\n  list-style: none;\n  background-color: $dropdown-bg;\n  background-clip: padding-box;\n  border: $dropdown-border-width solid $dropdown-border-color;\n  @include border-radius($dropdown-border-radius);\n  @include box-shadow($dropdown-box-shadow);\n}\n\n@each $breakpoint in map-keys($grid-breakpoints) {\n  @include media-breakpoint-up($breakpoint) {\n    $infix: breakpoint-infix($breakpoint, $grid-breakpoints);\n\n    .dropdown-menu#{$infix}-left {\n      right: auto;\n      left: 0;\n    }\n\n    .dropdown-menu#{$infix}-right {\n      right: 0;\n      left: auto;\n    }\n  }\n}\n\n// Allow for dropdowns to go bottom up (aka, dropup-menu)\n// Just add .dropup after the standard .dropdown class and you're set.\n.dropup {\n  .dropdown-menu {\n    top: auto;\n    bottom: 100%;\n    margin-top: 0;\n    margin-bottom: $dropdown-spacer;\n  }\n\n  .dropdown-toggle {\n    @include caret(up);\n  }\n}\n\n.dropright {\n  .dropdown-menu {\n    top: 0;\n    right: auto;\n    left: 100%;\n    margin-top: 0;\n    margin-left: $dropdown-spacer;\n  }\n\n  .dropdown-toggle {\n    @include caret(right);\n    &::after {\n      vertical-align: 0;\n    }\n  }\n}\n\n.dropleft {\n  .dropdown-menu {\n    top: 0;\n    right: 100%;\n    left: auto;\n    margin-top: 0;\n    margin-right: $dropdown-spacer;\n  }\n\n  .dropdown-toggle {\n    @include caret(left);\n    &::before {\n      vertical-align: 0;\n    }\n  }\n}\n\n// When enabled Popper.js, reset basic dropdown position\n// stylelint-disable-next-line no-duplicate-selectors\n.dropdown-menu {\n  &[x-placement^=\"top\"],\n  &[x-placement^=\"right\"],\n  &[x-placement^=\"bottom\"],\n  &[x-placement^=\"left\"] {\n    right: auto;\n    bottom: auto;\n  }\n}\n\n// Dividers (basically an `<hr>`) within the dropdown\n.dropdown-divider {\n  @include nav-divider($dropdown-divider-bg, $dropdown-divider-margin-y, true);\n}\n\n// Links, buttons, and more within the dropdown menu\n//\n// `<button>`-specific styles are denoted with `// For <button>s`\n.dropdown-item {\n  display: block;\n  width: 100%; // For `<button>`s\n  padding: $dropdown-item-padding-y $dropdown-item-padding-x;\n  clear: both;\n  font-weight: $font-weight-normal;\n  color: $dropdown-link-color;\n  text-align: inherit; // For `<button>`s\n  white-space: nowrap; // prevent links from randomly breaking onto new lines\n  background-color: transparent; // For `<button>`s\n  border: 0; // For `<button>`s\n\n  // Prevent dropdown overflow if there's no padding\n  // See https://github.com/twbs/bootstrap/pull/27703\n  @if $dropdown-padding-y == 0 {\n    &:first-child {\n      @include border-top-radius($dropdown-inner-border-radius);\n    }\n\n    &:last-child {\n      @include border-bottom-radius($dropdown-inner-border-radius);\n    }\n  }\n\n  @include hover-focus() {\n    color: $dropdown-link-hover-color;\n    text-decoration: none;\n    @include gradient-bg($dropdown-link-hover-bg);\n  }\n\n  &.active,\n  &:active {\n    color: $dropdown-link-active-color;\n    text-decoration: none;\n    @include gradient-bg($dropdown-link-active-bg);\n  }\n\n  &.disabled,\n  &:disabled {\n    color: $dropdown-link-disabled-color;\n    pointer-events: none;\n    background-color: transparent;\n    // Remove CSS gradients if they're enabled\n    @if $enable-gradients {\n      background-image: none;\n    }\n  }\n}\n\n.dropdown-menu.show {\n  display: block;\n}\n\n// Dropdown section headers\n.dropdown-header {\n  display: block;\n  padding: $dropdown-padding-y $dropdown-item-padding-x;\n  margin-bottom: 0; // for use with heading elements\n  @include font-size($font-size-sm);\n  color: $dropdown-header-color;\n  white-space: nowrap; // as with > li > a\n}\n\n// Dropdown text\n.dropdown-item-text {\n  display: block;\n  padding: $dropdown-item-padding-y $dropdown-item-padding-x;\n  color: $dropdown-link-color;\n}\n","@mixin caret-down() {\n  border-top: $caret-width solid;\n  border-right: $caret-width solid transparent;\n  border-bottom: 0;\n  border-left: $caret-width solid transparent;\n}\n\n@mixin caret-up() {\n  border-top: 0;\n  border-right: $caret-width solid transparent;\n  border-bottom: $caret-width solid;\n  border-left: $caret-width solid transparent;\n}\n\n@mixin caret-right() {\n  border-top: $caret-width solid transparent;\n  border-right: 0;\n  border-bottom: $caret-width solid transparent;\n  border-left: $caret-width solid;\n}\n\n@mixin caret-left() {\n  border-top: $caret-width solid transparent;\n  border-right: $caret-width solid;\n  border-bottom: $caret-width solid transparent;\n}\n\n@mixin caret($direction: down) {\n  @if $enable-caret {\n    &::after {\n      display: inline-block;\n      margin-left: $caret-spacing;\n      vertical-align: $caret-vertical-align;\n      content: \"\";\n      @if $direction == down {\n        @include caret-down();\n      } @else if $direction == up {\n        @include caret-up();\n      } @else if $direction == right {\n        @include caret-right();\n      }\n    }\n\n    @if $direction == left {\n      &::after {\n        display: none;\n      }\n\n      &::before {\n        display: inline-block;\n        margin-right: $caret-spacing;\n        vertical-align: $caret-vertical-align;\n        content: \"\";\n        @include caret-left();\n      }\n    }\n\n    &:empty::after {\n      margin-left: 0;\n    }\n  }\n}\n","// Horizontal dividers\n//\n// Dividers (basically an hr) within dropdowns and nav lists\n\n@mixin nav-divider($color: $nav-divider-color, $margin-y: $nav-divider-margin-y, $ignore-warning: false) {\n  height: 0;\n  margin: $margin-y 0;\n  overflow: hidden;\n  border-top: 1px solid $color;\n  @include deprecate(\"The `nav-divider()` mixin\", \"v4.4.0\", \"v5\", $ignore-warning);\n}\n","// stylelint-disable selector-no-qualifying-type\n\n// Make the div behave like a button\n.btn-group,\n.btn-group-vertical {\n  position: relative;\n  display: inline-flex;\n  vertical-align: middle; // match .btn alignment given font-size hack above\n\n  > .btn {\n    position: relative;\n    flex: 1 1 auto;\n\n    // Bring the hover, focused, and \"active\" buttons to the front to overlay\n    // the borders properly\n    @include hover() {\n      z-index: 1;\n    }\n    &:focus,\n    &:active,\n    &.active {\n      z-index: 1;\n    }\n  }\n}\n\n// Optional: Group multiple button groups together for a toolbar\n.btn-toolbar {\n  display: flex;\n  flex-wrap: wrap;\n  justify-content: flex-start;\n\n  .input-group {\n    width: auto;\n  }\n}\n\n.btn-group {\n  // Prevent double borders when buttons are next to each other\n  > .btn:not(:first-child),\n  > .btn-group:not(:first-child) {\n    margin-left: -$btn-border-width;\n  }\n\n  // Reset rounded corners\n  > .btn:not(:last-child):not(.dropdown-toggle),\n  > .btn-group:not(:last-child) > .btn {\n    @include border-right-radius(0);\n  }\n\n  > .btn:not(:first-child),\n  > .btn-group:not(:first-child) > .btn {\n    @include border-left-radius(0);\n  }\n}\n\n// Sizing\n//\n// Remix the default button sizing classes into new ones for easier manipulation.\n\n.btn-group-sm > .btn { @extend .btn-sm; }\n.btn-group-lg > .btn { @extend .btn-lg; }\n\n\n//\n// Split button dropdowns\n//\n\n.dropdown-toggle-split {\n  padding-right: $btn-padding-x * .75;\n  padding-left: $btn-padding-x * .75;\n\n  &::after,\n  .dropup &::after,\n  .dropright &::after {\n    margin-left: 0;\n  }\n\n  .dropleft &::before {\n    margin-right: 0;\n  }\n}\n\n.btn-sm + .dropdown-toggle-split {\n  padding-right: $btn-padding-x-sm * .75;\n  padding-left: $btn-padding-x-sm * .75;\n}\n\n.btn-lg + .dropdown-toggle-split {\n  padding-right: $btn-padding-x-lg * .75;\n  padding-left: $btn-padding-x-lg * .75;\n}\n\n\n// The clickable button for toggling the menu\n// Set the same inset shadow as the :active state\n.btn-group.show .dropdown-toggle {\n  @include box-shadow($btn-active-box-shadow);\n\n  // Show no shadow for `.btn-link` since it has no other button styles.\n  &.btn-link {\n    @include box-shadow(none);\n  }\n}\n\n\n//\n// Vertical button groups\n//\n\n.btn-group-vertical {\n  flex-direction: column;\n  align-items: flex-start;\n  justify-content: center;\n\n  > .btn,\n  > .btn-group {\n    width: 100%;\n  }\n\n  > .btn:not(:first-child),\n  > .btn-group:not(:first-child) {\n    margin-top: -$btn-border-width;\n  }\n\n  // Reset rounded corners\n  > .btn:not(:last-child):not(.dropdown-toggle),\n  > .btn-group:not(:last-child) > .btn {\n    @include border-bottom-radius(0);\n  }\n\n  > .btn:not(:first-child),\n  > .btn-group:not(:first-child) > .btn {\n    @include border-top-radius(0);\n  }\n}\n\n\n// Checkbox and radio options\n//\n// In order to support the browser's form validation feedback, powered by the\n// `required` attribute, we have to \"hide\" the inputs via `clip`. We cannot use\n// `display: none;` or `visibility: hidden;` as that also hides the popover.\n// Simply visually hiding the inputs via `opacity` would leave them clickable in\n// certain cases which is prevented by using `clip` and `pointer-events`.\n// This way, we ensure a DOM element is visible to position the popover from.\n//\n// See https://github.com/twbs/bootstrap/pull/12794 and\n// https://github.com/twbs/bootstrap/pull/14559 for more information.\n\n.btn-group-toggle {\n  > .btn,\n  > .btn-group > .btn {\n    margin-bottom: 0; // Override default `<label>` value\n\n    input[type=\"radio\"],\n    input[type=\"checkbox\"] {\n      position: absolute;\n      clip: rect(0, 0, 0, 0);\n      pointer-events: none;\n    }\n  }\n}\n","// stylelint-disable selector-no-qualifying-type\n\n//\n// Base styles\n//\n\n.input-group {\n  position: relative;\n  display: flex;\n  flex-wrap: wrap; // For form validation feedback\n  align-items: stretch;\n  width: 100%;\n\n  > .form-control,\n  > .form-control-plaintext,\n  > .custom-select,\n  > .custom-file {\n    position: relative; // For focus state's z-index\n    flex: 1 1 0%;\n    min-width: 0; // https://stackoverflow.com/questions/36247140/why-dont-flex-items-shrink-past-content-size\n    margin-bottom: 0;\n\n    + .form-control,\n    + .custom-select,\n    + .custom-file {\n      margin-left: -$input-border-width;\n    }\n  }\n\n  // Bring the \"active\" form control to the top of surrounding elements\n  > .form-control:focus,\n  > .custom-select:focus,\n  > .custom-file .custom-file-input:focus ~ .custom-file-label {\n    z-index: 3;\n  }\n\n  // Bring the custom file input above the label\n  > .custom-file .custom-file-input:focus {\n    z-index: 4;\n  }\n\n  > .form-control,\n  > .custom-select {\n    &:not(:last-child) { @include border-right-radius(0); }\n    &:not(:first-child) { @include border-left-radius(0); }\n  }\n\n  // Custom file inputs have more complex markup, thus requiring different\n  // border-radius overrides.\n  > .custom-file {\n    display: flex;\n    align-items: center;\n\n    &:not(:last-child) .custom-file-label,\n    &:not(:last-child) .custom-file-label::after { @include border-right-radius(0); }\n    &:not(:first-child) .custom-file-label { @include border-left-radius(0); }\n  }\n}\n\n\n// Prepend and append\n//\n// While it requires one extra layer of HTML for each, dedicated prepend and\n// append elements allow us to 1) be less clever, 2) simplify our selectors, and\n// 3) support HTML5 form validation.\n\n.input-group-prepend,\n.input-group-append {\n  display: flex;\n\n  // Ensure buttons are always above inputs for more visually pleasing borders.\n  // This isn't needed for `.input-group-text` since it shares the same border-color\n  // as our inputs.\n  .btn {\n    position: relative;\n    z-index: 2;\n\n    &:focus {\n      z-index: 3;\n    }\n  }\n\n  .btn + .btn,\n  .btn + .input-group-text,\n  .input-group-text + .input-group-text,\n  .input-group-text + .btn {\n    margin-left: -$input-border-width;\n  }\n}\n\n.input-group-prepend { margin-right: -$input-border-width; }\n.input-group-append { margin-left: -$input-border-width; }\n\n\n// Textual addons\n//\n// Serves as a catch-all element for any text or radio/checkbox input you wish\n// to prepend or append to an input.\n\n.input-group-text {\n  display: flex;\n  align-items: center;\n  padding: $input-padding-y $input-padding-x;\n  margin-bottom: 0; // Allow use of <label> elements by overriding our default margin-bottom\n  @include font-size($input-font-size); // Match inputs\n  font-weight: $font-weight-normal;\n  line-height: $input-line-height;\n  color: $input-group-addon-color;\n  text-align: center;\n  white-space: nowrap;\n  background-color: $input-group-addon-bg;\n  border: $input-border-width solid $input-group-addon-border-color;\n  @include border-radius($input-border-radius);\n\n  // Nuke default margins from checkboxes and radios to vertically center within.\n  input[type=\"radio\"],\n  input[type=\"checkbox\"] {\n    margin-top: 0;\n  }\n}\n\n\n// Sizing\n//\n// Remix the default form control sizing classes into new ones for easier\n// manipulation.\n\n.input-group-lg > .form-control:not(textarea),\n.input-group-lg > .custom-select {\n  height: $input-height-lg;\n}\n\n.input-group-lg > .form-control,\n.input-group-lg > .custom-select,\n.input-group-lg > .input-group-prepend > .input-group-text,\n.input-group-lg > .input-group-append > .input-group-text,\n.input-group-lg > .input-group-prepend > .btn,\n.input-group-lg > .input-group-append > .btn {\n  padding: $input-padding-y-lg $input-padding-x-lg;\n  @include font-size($input-font-size-lg);\n  line-height: $input-line-height-lg;\n  @include border-radius($input-border-radius-lg);\n}\n\n.input-group-sm > .form-control:not(textarea),\n.input-group-sm > .custom-select {\n  height: $input-height-sm;\n}\n\n.input-group-sm > .form-control,\n.input-group-sm > .custom-select,\n.input-group-sm > .input-group-prepend > .input-group-text,\n.input-group-sm > .input-group-append > .input-group-text,\n.input-group-sm > .input-group-prepend > .btn,\n.input-group-sm > .input-group-append > .btn {\n  padding: $input-padding-y-sm $input-padding-x-sm;\n  @include font-size($input-font-size-sm);\n  line-height: $input-line-height-sm;\n  @include border-radius($input-border-radius-sm);\n}\n\n.input-group-lg > .custom-select,\n.input-group-sm > .custom-select {\n  padding-right: $custom-select-padding-x + $custom-select-indicator-padding;\n}\n\n\n// Prepend and append rounded corners\n//\n// These rulesets must come after the sizing ones to properly override sm and lg\n// border-radius values when extending. They're more specific than we'd like\n// with the `.input-group >` part, but without it, we cannot override the sizing.\n\n\n.input-group > .input-group-prepend > .btn,\n.input-group > .input-group-prepend > .input-group-text,\n.input-group > .input-group-append:not(:last-child) > .btn,\n.input-group > .input-group-append:not(:last-child) > .input-group-text,\n.input-group > .input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle),\n.input-group > .input-group-append:last-child > .input-group-text:not(:last-child) {\n  @include border-right-radius(0);\n}\n\n.input-group > .input-group-append > .btn,\n.input-group > .input-group-append > .input-group-text,\n.input-group > .input-group-prepend:not(:first-child) > .btn,\n.input-group > .input-group-prepend:not(:first-child) > .input-group-text,\n.input-group > .input-group-prepend:first-child > .btn:not(:first-child),\n.input-group > .input-group-prepend:first-child > .input-group-text:not(:first-child) {\n  @include border-left-radius(0);\n}\n","// Embedded icons from Open Iconic.\n// Released under MIT and copyright 2014 Waybury.\n// https://useiconic.com/open\n\n\n// Checkboxes and radios\n//\n// Base class takes care of all the key behavioral aspects.\n\n.custom-control {\n  position: relative;\n  display: block;\n  min-height: $font-size-base * $line-height-base;\n  padding-left: $custom-control-gutter + $custom-control-indicator-size;\n}\n\n.custom-control-inline {\n  display: inline-flex;\n  margin-right: $custom-control-spacer-x;\n}\n\n.custom-control-input {\n  position: absolute;\n  left: 0;\n  z-index: -1; // Put the input behind the label so it doesn't overlay text\n  width: $custom-control-indicator-size;\n  height: ($font-size-base * $line-height-base + $custom-control-indicator-size) / 2;\n  opacity: 0;\n\n  &:checked ~ .custom-control-label::before {\n    color: $custom-control-indicator-checked-color;\n    border-color: $custom-control-indicator-checked-border-color;\n    @include gradient-bg($custom-control-indicator-checked-bg);\n    @include box-shadow($custom-control-indicator-checked-box-shadow);\n  }\n\n  &:focus ~ .custom-control-label::before {\n    // the mixin is not used here to make sure there is feedback\n    @if $enable-shadows {\n      box-shadow: $input-box-shadow, $input-focus-box-shadow;\n    } @else {\n      box-shadow: $custom-control-indicator-focus-box-shadow;\n    }\n  }\n\n  &:focus:not(:checked) ~ .custom-control-label::before {\n    border-color: $custom-control-indicator-focus-border-color;\n  }\n\n  &:not(:disabled):active ~ .custom-control-label::before {\n    color: $custom-control-indicator-active-color;\n    background-color: $custom-control-indicator-active-bg;\n    border-color: $custom-control-indicator-active-border-color;\n    @include box-shadow($custom-control-indicator-active-box-shadow);\n  }\n\n  // Use [disabled] and :disabled to work around https://github.com/twbs/bootstrap/issues/28247\n  &[disabled],\n  &:disabled {\n    ~ .custom-control-label {\n      color: $custom-control-label-disabled-color;\n\n      &::before {\n        background-color: $custom-control-indicator-disabled-bg;\n      }\n    }\n  }\n}\n\n// Custom control indicators\n//\n// Build the custom controls out of pseudo-elements.\n\n.custom-control-label {\n  position: relative;\n  margin-bottom: 0;\n  color: $custom-control-label-color;\n  vertical-align: top;\n  cursor: $custom-control-cursor;\n\n  // Background-color and (when enabled) gradient\n  &::before {\n    position: absolute;\n    top: ($font-size-base * $line-height-base - $custom-control-indicator-size) / 2;\n    left: -($custom-control-gutter + $custom-control-indicator-size);\n    display: block;\n    width: $custom-control-indicator-size;\n    height: $custom-control-indicator-size;\n    pointer-events: none;\n    content: \"\";\n    background-color: $custom-control-indicator-bg;\n    border: $custom-control-indicator-border-color solid $custom-control-indicator-border-width;\n    @include box-shadow($custom-control-indicator-box-shadow);\n  }\n\n  // Foreground (icon)\n  &::after {\n    position: absolute;\n    top: ($font-size-base * $line-height-base - $custom-control-indicator-size) / 2;\n    left: -($custom-control-gutter + $custom-control-indicator-size);\n    display: block;\n    width: $custom-control-indicator-size;\n    height: $custom-control-indicator-size;\n    content: \"\";\n    background: no-repeat 50% / #{$custom-control-indicator-bg-size};\n  }\n}\n\n\n// Checkboxes\n//\n// Tweak just a few things for checkboxes.\n\n.custom-checkbox {\n  .custom-control-label::before {\n    @include border-radius($custom-checkbox-indicator-border-radius);\n  }\n\n  .custom-control-input:checked ~ .custom-control-label {\n    &::after {\n      background-image: escape-svg($custom-checkbox-indicator-icon-checked);\n    }\n  }\n\n  .custom-control-input:indeterminate ~ .custom-control-label {\n    &::before {\n      border-color: $custom-checkbox-indicator-indeterminate-border-color;\n      @include gradient-bg($custom-checkbox-indicator-indeterminate-bg);\n      @include box-shadow($custom-checkbox-indicator-indeterminate-box-shadow);\n    }\n    &::after {\n      background-image: escape-svg($custom-checkbox-indicator-icon-indeterminate);\n    }\n  }\n\n  .custom-control-input:disabled {\n    &:checked ~ .custom-control-label::before {\n      background-color: $custom-control-indicator-checked-disabled-bg;\n    }\n    &:indeterminate ~ .custom-control-label::before {\n      background-color: $custom-control-indicator-checked-disabled-bg;\n    }\n  }\n}\n\n// Radios\n//\n// Tweak just a few things for radios.\n\n.custom-radio {\n  .custom-control-label::before {\n    // stylelint-disable-next-line property-blacklist\n    border-radius: $custom-radio-indicator-border-radius;\n  }\n\n  .custom-control-input:checked ~ .custom-control-label {\n    &::after {\n      background-image: escape-svg($custom-radio-indicator-icon-checked);\n    }\n  }\n\n  .custom-control-input:disabled {\n    &:checked ~ .custom-control-label::before {\n      background-color: $custom-control-indicator-checked-disabled-bg;\n    }\n  }\n}\n\n\n// switches\n//\n// Tweak a few things for switches\n\n.custom-switch {\n  padding-left: $custom-switch-width + $custom-control-gutter;\n\n  .custom-control-label {\n    &::before {\n      left: -($custom-switch-width + $custom-control-gutter);\n      width: $custom-switch-width;\n      pointer-events: all;\n      // stylelint-disable-next-line property-blacklist\n      border-radius: $custom-switch-indicator-border-radius;\n    }\n\n    &::after {\n      top: add(($font-size-base * $line-height-base - $custom-control-indicator-size) / 2, $custom-control-indicator-border-width * 2);\n      left: add(-($custom-switch-width + $custom-control-gutter), $custom-control-indicator-border-width * 2);\n      width: $custom-switch-indicator-size;\n      height: $custom-switch-indicator-size;\n      background-color: $custom-control-indicator-border-color;\n      // stylelint-disable-next-line property-blacklist\n      border-radius: $custom-switch-indicator-border-radius;\n      @include transition(transform .15s ease-in-out, $custom-forms-transition);\n    }\n  }\n\n  .custom-control-input:checked ~ .custom-control-label {\n    &::after {\n      background-color: $custom-control-indicator-bg;\n      transform: translateX($custom-switch-width - $custom-control-indicator-size);\n    }\n  }\n\n  .custom-control-input:disabled {\n    &:checked ~ .custom-control-label::before {\n      background-color: $custom-control-indicator-checked-disabled-bg;\n    }\n  }\n}\n\n\n// Select\n//\n// Replaces the browser default select with a custom one, mostly pulled from\n// https://primer.github.io/.\n//\n\n.custom-select {\n  display: inline-block;\n  width: 100%;\n  height: $custom-select-height;\n  padding: $custom-select-padding-y ($custom-select-padding-x + $custom-select-indicator-padding) $custom-select-padding-y $custom-select-padding-x;\n  font-family: $custom-select-font-family;\n  @include font-size($custom-select-font-size);\n  font-weight: $custom-select-font-weight;\n  line-height: $custom-select-line-height;\n  color: $custom-select-color;\n  vertical-align: middle;\n  background: $custom-select-bg $custom-select-background;\n  border: $custom-select-border-width solid $custom-select-border-color;\n  @include border-radius($custom-select-border-radius, 0);\n  @include box-shadow($custom-select-box-shadow);\n  appearance: none;\n\n  &:focus {\n    border-color: $custom-select-focus-border-color;\n    outline: 0;\n    @if $enable-shadows {\n      box-shadow: $custom-select-box-shadow, $custom-select-focus-box-shadow;\n    } @else {\n      box-shadow: $custom-select-focus-box-shadow;\n    }\n\n    &::-ms-value {\n      // For visual consistency with other platforms/browsers,\n      // suppress the default white text on blue background highlight given to\n      // the selected option text when the (still closed) <select> receives focus\n      // in IE and (under certain conditions) Edge.\n      // See https://github.com/twbs/bootstrap/issues/19398.\n      color: $input-color;\n      background-color: $input-bg;\n    }\n  }\n\n  &[multiple],\n  &[size]:not([size=\"1\"]) {\n    height: auto;\n    padding-right: $custom-select-padding-x;\n    background-image: none;\n  }\n\n  &:disabled {\n    color: $custom-select-disabled-color;\n    background-color: $custom-select-disabled-bg;\n  }\n\n  // Hides the default caret in IE11\n  &::-ms-expand {\n    display: none;\n  }\n\n  // Remove outline from select box in FF\n  &:-moz-focusring {\n    color: transparent;\n    text-shadow: 0 0 0 $custom-select-color;\n  }\n}\n\n.custom-select-sm {\n  height: $custom-select-height-sm;\n  padding-top: $custom-select-padding-y-sm;\n  padding-bottom: $custom-select-padding-y-sm;\n  padding-left: $custom-select-padding-x-sm;\n  @include font-size($custom-select-font-size-sm);\n}\n\n.custom-select-lg {\n  height: $custom-select-height-lg;\n  padding-top: $custom-select-padding-y-lg;\n  padding-bottom: $custom-select-padding-y-lg;\n  padding-left: $custom-select-padding-x-lg;\n  @include font-size($custom-select-font-size-lg);\n}\n\n\n// File\n//\n// Custom file input.\n\n.custom-file {\n  position: relative;\n  display: inline-block;\n  width: 100%;\n  height: $custom-file-height;\n  margin-bottom: 0;\n}\n\n.custom-file-input {\n  position: relative;\n  z-index: 2;\n  width: 100%;\n  height: $custom-file-height;\n  margin: 0;\n  opacity: 0;\n\n  &:focus ~ .custom-file-label {\n    border-color: $custom-file-focus-border-color;\n    box-shadow: $custom-file-focus-box-shadow;\n  }\n\n  // Use [disabled] and :disabled to work around https://github.com/twbs/bootstrap/issues/28247\n  &[disabled] ~ .custom-file-label,\n  &:disabled ~ .custom-file-label {\n    background-color: $custom-file-disabled-bg;\n  }\n\n  @each $lang, $value in $custom-file-text {\n    &:lang(#{$lang}) ~ .custom-file-label::after {\n      content: $value;\n    }\n  }\n\n  ~ .custom-file-label[data-browse]::after {\n    content: attr(data-browse);\n  }\n}\n\n.custom-file-label {\n  position: absolute;\n  top: 0;\n  right: 0;\n  left: 0;\n  z-index: 1;\n  height: $custom-file-height;\n  padding: $custom-file-padding-y $custom-file-padding-x;\n  font-family: $custom-file-font-family;\n  font-weight: $custom-file-font-weight;\n  line-height: $custom-file-line-height;\n  color: $custom-file-color;\n  background-color: $custom-file-bg;\n  border: $custom-file-border-width solid $custom-file-border-color;\n  @include border-radius($custom-file-border-radius);\n  @include box-shadow($custom-file-box-shadow);\n\n  &::after {\n    position: absolute;\n    top: 0;\n    right: 0;\n    bottom: 0;\n    z-index: 3;\n    display: block;\n    height: $custom-file-height-inner;\n    padding: $custom-file-padding-y $custom-file-padding-x;\n    line-height: $custom-file-line-height;\n    color: $custom-file-button-color;\n    content: \"Browse\";\n    @include gradient-bg($custom-file-button-bg);\n    border-left: inherit;\n    @include border-radius(0 $custom-file-border-radius $custom-file-border-radius 0);\n  }\n}\n\n// Range\n//\n// Style range inputs the same across browsers. Vendor-specific rules for pseudo\n// elements cannot be mixed. As such, there are no shared styles for focus or\n// active states on prefixed selectors.\n\n.custom-range {\n  width: 100%;\n  height: add($custom-range-thumb-height, $custom-range-thumb-focus-box-shadow-width * 2);\n  padding: 0; // Need to reset padding\n  background-color: transparent;\n  appearance: none;\n\n  &:focus {\n    outline: none;\n\n    // Pseudo-elements must be split across multiple rulesets to have an effect.\n    // No box-shadow() mixin for focus accessibility.\n    &::-webkit-slider-thumb { box-shadow: $custom-range-thumb-focus-box-shadow; }\n    &::-moz-range-thumb     { box-shadow: $custom-range-thumb-focus-box-shadow; }\n    &::-ms-thumb            { box-shadow: $custom-range-thumb-focus-box-shadow; }\n  }\n\n  &::-moz-focus-outer {\n    border: 0;\n  }\n\n  &::-webkit-slider-thumb {\n    width: $custom-range-thumb-width;\n    height: $custom-range-thumb-height;\n    margin-top: ($custom-range-track-height - $custom-range-thumb-height) / 2; // Webkit specific\n    @include gradient-bg($custom-range-thumb-bg);\n    border: $custom-range-thumb-border;\n    @include border-radius($custom-range-thumb-border-radius);\n    @include box-shadow($custom-range-thumb-box-shadow);\n    @include transition($custom-forms-transition);\n    appearance: none;\n\n    &:active {\n      @include gradient-bg($custom-range-thumb-active-bg);\n    }\n  }\n\n  &::-webkit-slider-runnable-track {\n    width: $custom-range-track-width;\n    height: $custom-range-track-height;\n    color: transparent; // Why?\n    cursor: $custom-range-track-cursor;\n    background-color: $custom-range-track-bg;\n    border-color: transparent;\n    @include border-radius($custom-range-track-border-radius);\n    @include box-shadow($custom-range-track-box-shadow);\n  }\n\n  &::-moz-range-thumb {\n    width: $custom-range-thumb-width;\n    height: $custom-range-thumb-height;\n    @include gradient-bg($custom-range-thumb-bg);\n    border: $custom-range-thumb-border;\n    @include border-radius($custom-range-thumb-border-radius);\n    @include box-shadow($custom-range-thumb-box-shadow);\n    @include transition($custom-forms-transition);\n    appearance: none;\n\n    &:active {\n      @include gradient-bg($custom-range-thumb-active-bg);\n    }\n  }\n\n  &::-moz-range-track {\n    width: $custom-range-track-width;\n    height: $custom-range-track-height;\n    color: transparent;\n    cursor: $custom-range-track-cursor;\n    background-color: $custom-range-track-bg;\n    border-color: transparent; // Firefox specific?\n    @include border-radius($custom-range-track-border-radius);\n    @include box-shadow($custom-range-track-box-shadow);\n  }\n\n  &::-ms-thumb {\n    width: $custom-range-thumb-width;\n    height: $custom-range-thumb-height;\n    margin-top: 0; // Edge specific\n    margin-right: $custom-range-thumb-focus-box-shadow-width; // Workaround that overflowed box-shadow is hidden.\n    margin-left: $custom-range-thumb-focus-box-shadow-width;  // Workaround that overflowed box-shadow is hidden.\n    @include gradient-bg($custom-range-thumb-bg);\n    border: $custom-range-thumb-border;\n    @include border-radius($custom-range-thumb-border-radius);\n    @include box-shadow($custom-range-thumb-box-shadow);\n    @include transition($custom-forms-transition);\n    appearance: none;\n\n    &:active {\n      @include gradient-bg($custom-range-thumb-active-bg);\n    }\n  }\n\n  &::-ms-track {\n    width: $custom-range-track-width;\n    height: $custom-range-track-height;\n    color: transparent;\n    cursor: $custom-range-track-cursor;\n    background-color: transparent;\n    border-color: transparent;\n    border-width: $custom-range-thumb-height / 2;\n    @include box-shadow($custom-range-track-box-shadow);\n  }\n\n  &::-ms-fill-lower {\n    background-color: $custom-range-track-bg;\n    @include border-radius($custom-range-track-border-radius);\n  }\n\n  &::-ms-fill-upper {\n    margin-right: 15px; // arbitrary?\n    background-color: $custom-range-track-bg;\n    @include border-radius($custom-range-track-border-radius);\n  }\n\n  &:disabled {\n    &::-webkit-slider-thumb {\n      background-color: $custom-range-thumb-disabled-bg;\n    }\n\n    &::-webkit-slider-runnable-track {\n      cursor: default;\n    }\n\n    &::-moz-range-thumb {\n      background-color: $custom-range-thumb-disabled-bg;\n    }\n\n    &::-moz-range-track {\n      cursor: default;\n    }\n\n    &::-ms-thumb {\n      background-color: $custom-range-thumb-disabled-bg;\n    }\n  }\n}\n\n.custom-control-label::before,\n.custom-file-label,\n.custom-select {\n  @include transition($custom-forms-transition);\n}\n","// Base class\n//\n// Kickstart any navigation component with a set of style resets. Works with\n// `<nav>`s, `<ul>`s or `<ol>`s.\n\n.nav {\n  display: flex;\n  flex-wrap: wrap;\n  padding-left: 0;\n  margin-bottom: 0;\n  list-style: none;\n}\n\n.nav-link {\n  display: block;\n  padding: $nav-link-padding-y $nav-link-padding-x;\n\n  @include hover-focus() {\n    text-decoration: none;\n  }\n\n  // Disabled state lightens text\n  &.disabled {\n    color: $nav-link-disabled-color;\n    pointer-events: none;\n    cursor: default;\n  }\n}\n\n//\n// Tabs\n//\n\n.nav-tabs {\n  border-bottom: $nav-tabs-border-width solid $nav-tabs-border-color;\n\n  .nav-item {\n    margin-bottom: -$nav-tabs-border-width;\n  }\n\n  .nav-link {\n    border: $nav-tabs-border-width solid transparent;\n    @include border-top-radius($nav-tabs-border-radius);\n\n    @include hover-focus() {\n      border-color: $nav-tabs-link-hover-border-color;\n    }\n\n    &.disabled {\n      color: $nav-link-disabled-color;\n      background-color: transparent;\n      border-color: transparent;\n    }\n  }\n\n  .nav-link.active,\n  .nav-item.show .nav-link {\n    color: $nav-tabs-link-active-color;\n    background-color: $nav-tabs-link-active-bg;\n    border-color: $nav-tabs-link-active-border-color;\n  }\n\n  .dropdown-menu {\n    // Make dropdown border overlap tab border\n    margin-top: -$nav-tabs-border-width;\n    // Remove the top rounded corners here since there is a hard edge above the menu\n    @include border-top-radius(0);\n  }\n}\n\n\n//\n// Pills\n//\n\n.nav-pills {\n  .nav-link {\n    @include border-radius($nav-pills-border-radius);\n  }\n\n  .nav-link.active,\n  .show > .nav-link {\n    color: $nav-pills-link-active-color;\n    background-color: $nav-pills-link-active-bg;\n  }\n}\n\n\n//\n// Justified variants\n//\n\n.nav-fill {\n  .nav-item {\n    flex: 1 1 auto;\n    text-align: center;\n  }\n}\n\n.nav-justified {\n  .nav-item {\n    flex-basis: 0;\n    flex-grow: 1;\n    text-align: center;\n  }\n}\n\n\n// Tabbable tabs\n//\n// Hide tabbable panes to start, show them when `.active`\n\n.tab-content {\n  > .tab-pane {\n    display: none;\n  }\n  > .active {\n    display: block;\n  }\n}\n","// Contents\n//\n// Navbar\n// Navbar brand\n// Navbar nav\n// Navbar text\n// Navbar divider\n// Responsive navbar\n// Navbar position\n// Navbar themes\n\n\n// Navbar\n//\n// Provide a static navbar from which we expand to create full-width, fixed, and\n// other navbar variations.\n\n.navbar {\n  position: relative;\n  display: flex;\n  flex-wrap: wrap; // allow us to do the line break for collapsing content\n  align-items: center;\n  justify-content: space-between; // space out brand from logo\n  padding: $navbar-padding-y $navbar-padding-x;\n\n  // Because flex properties aren't inherited, we need to redeclare these first\n  // few properties so that content nested within behave properly.\n  %container-flex-properties {\n    display: flex;\n    flex-wrap: wrap;\n    align-items: center;\n    justify-content: space-between;\n  }\n\n  .container,\n  .container-fluid {\n    @extend %container-flex-properties;\n  }\n\n  @each $breakpoint, $container-max-width in $container-max-widths {\n    > .container#{breakpoint-infix($breakpoint, $container-max-widths)} {\n      @extend %container-flex-properties;\n    }\n  }\n}\n\n\n// Navbar brand\n//\n// Used for brand, project, or site names.\n\n.navbar-brand {\n  display: inline-block;\n  padding-top: $navbar-brand-padding-y;\n  padding-bottom: $navbar-brand-padding-y;\n  margin-right: $navbar-padding-x;\n  @include font-size($navbar-brand-font-size);\n  line-height: inherit;\n  white-space: nowrap;\n\n  @include hover-focus() {\n    text-decoration: none;\n  }\n}\n\n\n// Navbar nav\n//\n// Custom navbar navigation (doesn't require `.nav`, but does make use of `.nav-link`).\n\n.navbar-nav {\n  display: flex;\n  flex-direction: column; // cannot use `inherit` to get the `.navbar`s value\n  padding-left: 0;\n  margin-bottom: 0;\n  list-style: none;\n\n  .nav-link {\n    padding-right: 0;\n    padding-left: 0;\n  }\n\n  .dropdown-menu {\n    position: static;\n    float: none;\n  }\n}\n\n\n// Navbar text\n//\n//\n\n.navbar-text {\n  display: inline-block;\n  padding-top: $nav-link-padding-y;\n  padding-bottom: $nav-link-padding-y;\n}\n\n\n// Responsive navbar\n//\n// Custom styles for responsive collapsing and toggling of navbar contents.\n// Powered by the collapse Bootstrap JavaScript plugin.\n\n// When collapsed, prevent the toggleable navbar contents from appearing in\n// the default flexbox row orientation. Requires the use of `flex-wrap: wrap`\n// on the `.navbar` parent.\n.navbar-collapse {\n  flex-basis: 100%;\n  flex-grow: 1;\n  // For always expanded or extra full navbars, ensure content aligns itself\n  // properly vertically. Can be easily overridden with flex utilities.\n  align-items: center;\n}\n\n// Button for toggling the navbar when in its collapsed state\n.navbar-toggler {\n  padding: $navbar-toggler-padding-y $navbar-toggler-padding-x;\n  @include font-size($navbar-toggler-font-size);\n  line-height: 1;\n  background-color: transparent; // remove default button style\n  border: $border-width solid transparent; // remove default button style\n  @include border-radius($navbar-toggler-border-radius);\n\n  @include hover-focus() {\n    text-decoration: none;\n  }\n}\n\n// Keep as a separate element so folks can easily override it with another icon\n// or image file as needed.\n.navbar-toggler-icon {\n  display: inline-block;\n  width: 1.5em;\n  height: 1.5em;\n  vertical-align: middle;\n  content: \"\";\n  background: no-repeat center center;\n  background-size: 100% 100%;\n}\n\n// Generate series of `.navbar-expand-*` responsive classes for configuring\n// where your navbar collapses.\n.navbar-expand {\n  @each $breakpoint in map-keys($grid-breakpoints) {\n    $next: breakpoint-next($breakpoint, $grid-breakpoints);\n    $infix: breakpoint-infix($next, $grid-breakpoints);\n\n    &#{$infix} {\n      @include media-breakpoint-down($breakpoint) {\n        %container-navbar-expand-#{$breakpoint} {\n          padding-right: 0;\n          padding-left: 0;\n        }\n\n        > .container,\n        > .container-fluid {\n          @extend %container-navbar-expand-#{$breakpoint};\n        }\n\n        @each $size, $container-max-width in $container-max-widths {\n          > .container#{breakpoint-infix($size, $container-max-widths)} {\n            @extend %container-navbar-expand-#{$breakpoint};\n          }\n        }\n      }\n\n      @include media-breakpoint-up($next) {\n        flex-flow: row nowrap;\n        justify-content: flex-start;\n\n        .navbar-nav {\n          flex-direction: row;\n\n          .dropdown-menu {\n            position: absolute;\n          }\n\n          .nav-link {\n            padding-right: $navbar-nav-link-padding-x;\n            padding-left: $navbar-nav-link-padding-x;\n          }\n        }\n\n        // For nesting containers, have to redeclare for alignment purposes\n        %container-nesting-#{$breakpoint} {\n          flex-wrap: nowrap;\n        }\n\n        > .container,\n        > .container-fluid {\n          @extend %container-nesting-#{$breakpoint};\n        }\n\n        @each $size, $container-max-width in $container-max-widths {\n          > .container#{breakpoint-infix($size, $container-max-widths)} {\n            @extend %container-nesting-#{$breakpoint};\n          }\n        }\n\n        .navbar-collapse {\n          display: flex !important; // stylelint-disable-line declaration-no-important\n\n          // Changes flex-bases to auto because of an IE10 bug\n          flex-basis: auto;\n        }\n\n        .navbar-toggler {\n          display: none;\n        }\n      }\n    }\n  }\n}\n\n\n// Navbar themes\n//\n// Styles for switching between navbars with light or dark background.\n\n// Dark links against a light background\n.navbar-light {\n  .navbar-brand {\n    color: $navbar-light-brand-color;\n\n    @include hover-focus() {\n      color: $navbar-light-brand-hover-color;\n    }\n  }\n\n  .navbar-nav {\n    .nav-link {\n      color: $navbar-light-color;\n\n      @include hover-focus() {\n        color: $navbar-light-hover-color;\n      }\n\n      &.disabled {\n        color: $navbar-light-disabled-color;\n      }\n    }\n\n    .show > .nav-link,\n    .active > .nav-link,\n    .nav-link.show,\n    .nav-link.active {\n      color: $navbar-light-active-color;\n    }\n  }\n\n  .navbar-toggler {\n    color: $navbar-light-color;\n    border-color: $navbar-light-toggler-border-color;\n  }\n\n  .navbar-toggler-icon {\n    background-image: escape-svg($navbar-light-toggler-icon-bg);\n  }\n\n  .navbar-text {\n    color: $navbar-light-color;\n    a {\n      color: $navbar-light-active-color;\n\n      @include hover-focus() {\n        color: $navbar-light-active-color;\n      }\n    }\n  }\n}\n\n// White links against a dark background\n.navbar-dark {\n  .navbar-brand {\n    color: $navbar-dark-brand-color;\n\n    @include hover-focus() {\n      color: $navbar-dark-brand-hover-color;\n    }\n  }\n\n  .navbar-nav {\n    .nav-link {\n      color: $navbar-dark-color;\n\n      @include hover-focus() {\n        color: $navbar-dark-hover-color;\n      }\n\n      &.disabled {\n        color: $navbar-dark-disabled-color;\n      }\n    }\n\n    .show > .nav-link,\n    .active > .nav-link,\n    .nav-link.show,\n    .nav-link.active {\n      color: $navbar-dark-active-color;\n    }\n  }\n\n  .navbar-toggler {\n    color: $navbar-dark-color;\n    border-color: $navbar-dark-toggler-border-color;\n  }\n\n  .navbar-toggler-icon {\n    background-image: escape-svg($navbar-dark-toggler-icon-bg);\n  }\n\n  .navbar-text {\n    color: $navbar-dark-color;\n    a {\n      color: $navbar-dark-active-color;\n\n      @include hover-focus() {\n        color: $navbar-dark-active-color;\n      }\n    }\n  }\n}\n","//\n// Base styles\n//\n\n.card {\n  position: relative;\n  display: flex;\n  flex-direction: column;\n  min-width: 0; // See https://github.com/twbs/bootstrap/pull/22740#issuecomment-305868106\n  height: $card-height;\n  word-wrap: break-word;\n  background-color: $card-bg;\n  background-clip: border-box;\n  border: $card-border-width solid $card-border-color;\n  @include border-radius($card-border-radius);\n\n  > hr {\n    margin-right: 0;\n    margin-left: 0;\n  }\n\n  > .list-group:first-child {\n    .list-group-item:first-child {\n      @include border-top-radius($card-border-radius);\n    }\n  }\n\n  > .list-group:last-child {\n    .list-group-item:last-child {\n      @include border-bottom-radius($card-border-radius);\n    }\n  }\n}\n\n.card-body {\n  // Enable `flex-grow: 1` for decks and groups so that card blocks take up\n  // as much space as possible, ensuring footers are aligned to the bottom.\n  flex: 1 1 auto;\n  // Workaround for the image size bug in IE\n  // See: https://github.com/twbs/bootstrap/pull/28855\n  min-height: 1px;\n  padding: $card-spacer-x;\n  color: $card-color;\n}\n\n.card-title {\n  margin-bottom: $card-spacer-y;\n}\n\n.card-subtitle {\n  margin-top: -$card-spacer-y / 2;\n  margin-bottom: 0;\n}\n\n.card-text:last-child {\n  margin-bottom: 0;\n}\n\n.card-link {\n  @include hover() {\n    text-decoration: none;\n  }\n\n  + .card-link {\n    margin-left: $card-spacer-x;\n  }\n}\n\n//\n// Optional textual caps\n//\n\n.card-header {\n  padding: $card-spacer-y $card-spacer-x;\n  margin-bottom: 0; // Removes the default margin-bottom of <hN>\n  color: $card-cap-color;\n  background-color: $card-cap-bg;\n  border-bottom: $card-border-width solid $card-border-color;\n\n  &:first-child {\n    @include border-radius($card-inner-border-radius $card-inner-border-radius 0 0);\n  }\n\n  + .list-group {\n    .list-group-item:first-child {\n      border-top: 0;\n    }\n  }\n}\n\n.card-footer {\n  padding: $card-spacer-y $card-spacer-x;\n  background-color: $card-cap-bg;\n  border-top: $card-border-width solid $card-border-color;\n\n  &:last-child {\n    @include border-radius(0 0 $card-inner-border-radius $card-inner-border-radius);\n  }\n}\n\n\n//\n// Header navs\n//\n\n.card-header-tabs {\n  margin-right: -$card-spacer-x / 2;\n  margin-bottom: -$card-spacer-y;\n  margin-left: -$card-spacer-x / 2;\n  border-bottom: 0;\n}\n\n.card-header-pills {\n  margin-right: -$card-spacer-x / 2;\n  margin-left: -$card-spacer-x / 2;\n}\n\n// Card image\n.card-img-overlay {\n  position: absolute;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  padding: $card-img-overlay-padding;\n}\n\n.card-img,\n.card-img-top,\n.card-img-bottom {\n  flex-shrink: 0; // For IE: https://github.com/twbs/bootstrap/issues/29396\n  width: 100%; // Required because we use flexbox and this inherently applies align-self: stretch\n}\n\n.card-img,\n.card-img-top {\n  @include border-top-radius($card-inner-border-radius);\n}\n\n.card-img,\n.card-img-bottom {\n  @include border-bottom-radius($card-inner-border-radius);\n}\n\n\n// Card deck\n\n.card-deck {\n  .card {\n    margin-bottom: $card-deck-margin;\n  }\n\n  @include media-breakpoint-up(sm) {\n    display: flex;\n    flex-flow: row wrap;\n    margin-right: -$card-deck-margin;\n    margin-left: -$card-deck-margin;\n\n    .card {\n      // Flexbugs #4: https://github.com/philipwalton/flexbugs#flexbug-4\n      flex: 1 0 0%;\n      margin-right: $card-deck-margin;\n      margin-bottom: 0; // Override the default\n      margin-left: $card-deck-margin;\n    }\n  }\n}\n\n\n//\n// Card groups\n//\n\n.card-group {\n  // The child selector allows nested `.card` within `.card-group`\n  // to display properly.\n  > .card {\n    margin-bottom: $card-group-margin;\n  }\n\n  @include media-breakpoint-up(sm) {\n    display: flex;\n    flex-flow: row wrap;\n    // The child selector allows nested `.card` within `.card-group`\n    // to display properly.\n    > .card {\n      // Flexbugs #4: https://github.com/philipwalton/flexbugs#flexbug-4\n      flex: 1 0 0%;\n      margin-bottom: 0;\n\n      + .card {\n        margin-left: 0;\n        border-left: 0;\n      }\n\n      // Handle rounded corners\n      @if $enable-rounded {\n        &:not(:last-child) {\n          @include border-right-radius(0);\n\n          .card-img-top,\n          .card-header {\n            // stylelint-disable-next-line property-blacklist\n            border-top-right-radius: 0;\n          }\n          .card-img-bottom,\n          .card-footer {\n            // stylelint-disable-next-line property-blacklist\n            border-bottom-right-radius: 0;\n          }\n        }\n\n        &:not(:first-child) {\n          @include border-left-radius(0);\n\n          .card-img-top,\n          .card-header {\n            // stylelint-disable-next-line property-blacklist\n            border-top-left-radius: 0;\n          }\n          .card-img-bottom,\n          .card-footer {\n            // stylelint-disable-next-line property-blacklist\n            border-bottom-left-radius: 0;\n          }\n        }\n      }\n    }\n  }\n}\n\n\n//\n// Columns\n//\n\n.card-columns {\n  .card {\n    margin-bottom: $card-columns-margin;\n  }\n\n  @include media-breakpoint-up(sm) {\n    column-count: $card-columns-count;\n    column-gap: $card-columns-gap;\n    orphans: 1;\n    widows: 1;\n\n    .card {\n      display: inline-block; // Don't let them vertically span multiple columns\n      width: 100%; // Don't let their width change\n    }\n  }\n}\n\n\n//\n// Accordion\n//\n\n.accordion {\n  > .card {\n    overflow: hidden;\n\n    &:not(:last-of-type) {\n      border-bottom: 0;\n      @include border-bottom-radius(0);\n    }\n\n    &:not(:first-of-type) {\n      @include border-top-radius(0);\n    }\n\n    > .card-header {\n      @include border-radius(0);\n      margin-bottom: -$card-border-width;\n    }\n  }\n}\n",".breadcrumb {\n  display: flex;\n  flex-wrap: wrap;\n  padding: $breadcrumb-padding-y $breadcrumb-padding-x;\n  margin-bottom: $breadcrumb-margin-bottom;\n  @include font-size($breadcrumb-font-size);\n  list-style: none;\n  background-color: $breadcrumb-bg;\n  @include border-radius($breadcrumb-border-radius);\n}\n\n.breadcrumb-item {\n  // The separator between breadcrumbs (by default, a forward-slash: \"/\")\n  + .breadcrumb-item {\n    padding-left: $breadcrumb-item-padding;\n\n    &::before {\n      display: inline-block; // Suppress underlining of the separator in modern browsers\n      padding-right: $breadcrumb-item-padding;\n      color: $breadcrumb-divider-color;\n      content: escape-svg($breadcrumb-divider);\n    }\n  }\n\n  // IE9-11 hack to properly handle hyperlink underlines for breadcrumbs built\n  // without `<ul>`s. The `::before` pseudo-element generates an element\n  // *within* the .breadcrumb-item and thereby inherits the `text-decoration`.\n  //\n  // To trick IE into suppressing the underline, we give the pseudo-element an\n  // underline and then immediately remove it.\n  + .breadcrumb-item:hover::before {\n    text-decoration: underline;\n  }\n  // stylelint-disable-next-line no-duplicate-selectors\n  + .breadcrumb-item:hover::before {\n    text-decoration: none;\n  }\n\n  &.active {\n    color: $breadcrumb-active-color;\n  }\n}\n",".pagination {\n  display: flex;\n  @include list-unstyled();\n  @include border-radius();\n}\n\n.page-link {\n  position: relative;\n  display: block;\n  padding: $pagination-padding-y $pagination-padding-x;\n  margin-left: -$pagination-border-width;\n  line-height: $pagination-line-height;\n  color: $pagination-color;\n  background-color: $pagination-bg;\n  border: $pagination-border-width solid $pagination-border-color;\n\n  &:hover {\n    z-index: 2;\n    color: $pagination-hover-color;\n    text-decoration: none;\n    background-color: $pagination-hover-bg;\n    border-color: $pagination-hover-border-color;\n  }\n\n  &:focus {\n    z-index: 3;\n    outline: $pagination-focus-outline;\n    box-shadow: $pagination-focus-box-shadow;\n  }\n}\n\n.page-item {\n  &:first-child {\n    .page-link {\n      margin-left: 0;\n      @include border-left-radius($border-radius);\n    }\n  }\n  &:last-child {\n    .page-link {\n      @include border-right-radius($border-radius);\n    }\n  }\n\n  &.active .page-link {\n    z-index: 3;\n    color: $pagination-active-color;\n    background-color: $pagination-active-bg;\n    border-color: $pagination-active-border-color;\n  }\n\n  &.disabled .page-link {\n    color: $pagination-disabled-color;\n    pointer-events: none;\n    // Opinionated: remove the \"hand\" cursor set previously for .page-link\n    cursor: auto;\n    background-color: $pagination-disabled-bg;\n    border-color: $pagination-disabled-border-color;\n  }\n}\n\n\n//\n// Sizing\n//\n\n.pagination-lg {\n  @include pagination-size($pagination-padding-y-lg, $pagination-padding-x-lg, $font-size-lg, $line-height-lg, $border-radius-lg);\n}\n\n.pagination-sm {\n  @include pagination-size($pagination-padding-y-sm, $pagination-padding-x-sm, $font-size-sm, $line-height-sm, $border-radius-sm);\n}\n","// Pagination\n\n@mixin pagination-size($padding-y, $padding-x, $font-size, $line-height, $border-radius) {\n  .page-link {\n    padding: $padding-y $padding-x;\n    @include font-size($font-size);\n    line-height: $line-height;\n  }\n\n  .page-item {\n    &:first-child {\n      .page-link {\n        @include border-left-radius($border-radius);\n      }\n    }\n    &:last-child {\n      .page-link {\n        @include border-right-radius($border-radius);\n      }\n    }\n  }\n}\n","// Base class\n//\n// Requires one of the contextual, color modifier classes for `color` and\n// `background-color`.\n\n.badge {\n  display: inline-block;\n  padding: $badge-padding-y $badge-padding-x;\n  @include font-size($badge-font-size);\n  font-weight: $badge-font-weight;\n  line-height: 1;\n  text-align: center;\n  white-space: nowrap;\n  vertical-align: baseline;\n  @include border-radius($badge-border-radius);\n  @include transition($badge-transition);\n\n  @at-root a#{&} {\n    @include hover-focus() {\n      text-decoration: none;\n    }\n  }\n\n  // Empty badges collapse automatically\n  &:empty {\n    display: none;\n  }\n}\n\n// Quick fix for badges in buttons\n.btn .badge {\n  position: relative;\n  top: -1px;\n}\n\n// Pill badges\n//\n// Make them extra rounded with a modifier to replace v3's badges.\n\n.badge-pill {\n  padding-right: $badge-pill-padding-x;\n  padding-left: $badge-pill-padding-x;\n  @include border-radius($badge-pill-border-radius);\n}\n\n// Colors\n//\n// Contextual variations (linked badges get darker on :hover).\n\n@each $color, $value in $theme-colors {\n  .badge-#{$color} {\n    @include badge-variant($value);\n  }\n}\n","@mixin badge-variant($bg) {\n  color: color-yiq($bg);\n  background-color: $bg;\n\n  @at-root a#{&} {\n    @include hover-focus() {\n      color: color-yiq($bg);\n      background-color: darken($bg, 10%);\n    }\n\n    &:focus,\n    &.focus {\n      outline: 0;\n      box-shadow: 0 0 0 $badge-focus-width rgba($bg, .5);\n    }\n  }\n}\n",".jumbotron {\n  padding: $jumbotron-padding ($jumbotron-padding / 2);\n  margin-bottom: $jumbotron-padding;\n  color: $jumbotron-color;\n  background-color: $jumbotron-bg;\n  @include border-radius($border-radius-lg);\n\n  @include media-breakpoint-up(sm) {\n    padding: ($jumbotron-padding * 2) $jumbotron-padding;\n  }\n}\n\n.jumbotron-fluid {\n  padding-right: 0;\n  padding-left: 0;\n  @include border-radius(0);\n}\n","//\n// Base styles\n//\n\n.alert {\n  position: relative;\n  padding: $alert-padding-y $alert-padding-x;\n  margin-bottom: $alert-margin-bottom;\n  border: $alert-border-width solid transparent;\n  @include border-radius($alert-border-radius);\n}\n\n// Headings for larger alerts\n.alert-heading {\n  // Specified to prevent conflicts of changing $headings-color\n  color: inherit;\n}\n\n// Provide class for links that match alerts\n.alert-link {\n  font-weight: $alert-link-font-weight;\n}\n\n\n// Dismissible alerts\n//\n// Expand the right padding and account for the close button's positioning.\n\n.alert-dismissible {\n  padding-right: $close-font-size + $alert-padding-x * 2;\n\n  // Adjust close link position\n  .close {\n    position: absolute;\n    top: 0;\n    right: 0;\n    padding: $alert-padding-y $alert-padding-x;\n    color: inherit;\n  }\n}\n\n\n// Alternate styles\n//\n// Generate contextual modifier classes for colorizing the alert.\n\n@each $color, $value in $theme-colors {\n  .alert-#{$color} {\n    @include alert-variant(theme-color-level($color, $alert-bg-level), theme-color-level($color, $alert-border-level), theme-color-level($color, $alert-color-level));\n  }\n}\n","@mixin alert-variant($background, $border, $color) {\n  color: $color;\n  @include gradient-bg($background);\n  border-color: $border;\n\n  hr {\n    border-top-color: darken($border, 5%);\n  }\n\n  .alert-link {\n    color: darken($color, 10%);\n  }\n}\n","// Disable animation if transitions are disabled\n@if $enable-transitions {\n  @keyframes progress-bar-stripes {\n    from { background-position: $progress-height 0; }\n    to { background-position: 0 0; }\n  }\n}\n\n.progress {\n  display: flex;\n  height: $progress-height;\n  overflow: hidden; // force rounded corners by cropping it\n  @include font-size($progress-font-size);\n  background-color: $progress-bg;\n  @include border-radius($progress-border-radius);\n  @include box-shadow($progress-box-shadow);\n}\n\n.progress-bar {\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  overflow: hidden;\n  color: $progress-bar-color;\n  text-align: center;\n  white-space: nowrap;\n  background-color: $progress-bar-bg;\n  @include transition($progress-bar-transition);\n}\n\n.progress-bar-striped {\n  @include gradient-striped();\n  background-size: $progress-height $progress-height;\n}\n\n@if $enable-transitions {\n  .progress-bar-animated {\n    animation: progress-bar-stripes $progress-bar-animation-timing;\n\n    @if $enable-prefers-reduced-motion-media-query {\n      @media (prefers-reduced-motion: reduce) {\n        animation: none;\n      }\n    }\n  }\n}\n",".media {\n  display: flex;\n  align-items: flex-start;\n}\n\n.media-body {\n  flex: 1;\n}\n","// Base class\n//\n// Easily usable on <ul>, <ol>, or <div>.\n\n.list-group {\n  display: flex;\n  flex-direction: column;\n\n  // No need to set list-style: none; since .list-group-item is block level\n  padding-left: 0; // reset padding because ul and ol\n  margin-bottom: 0;\n}\n\n\n// Interactive list items\n//\n// Use anchor or button elements instead of `li`s or `div`s to create interactive\n// list items. Includes an extra `.active` modifier class for selected items.\n\n.list-group-item-action {\n  width: 100%; // For `<button>`s (anchors become 100% by default though)\n  color: $list-group-action-color;\n  text-align: inherit; // For `<button>`s (anchors inherit)\n\n  // Hover state\n  @include hover-focus() {\n    z-index: 1; // Place hover/focus items above their siblings for proper border styling\n    color: $list-group-action-hover-color;\n    text-decoration: none;\n    background-color: $list-group-hover-bg;\n  }\n\n  &:active {\n    color: $list-group-action-active-color;\n    background-color: $list-group-action-active-bg;\n  }\n}\n\n\n// Individual list items\n//\n// Use on `li`s or `div`s within the `.list-group` parent.\n\n.list-group-item {\n  position: relative;\n  display: block;\n  padding: $list-group-item-padding-y $list-group-item-padding-x;\n  color: $list-group-color;\n  background-color: $list-group-bg;\n  border: $list-group-border-width solid $list-group-border-color;\n\n  &:first-child {\n    @include border-top-radius($list-group-border-radius);\n  }\n\n  &:last-child {\n    @include border-bottom-radius($list-group-border-radius);\n  }\n\n  &.disabled,\n  &:disabled {\n    color: $list-group-disabled-color;\n    pointer-events: none;\n    background-color: $list-group-disabled-bg;\n  }\n\n  // Include both here for `<a>`s and `<button>`s\n  &.active {\n    z-index: 2; // Place active items above their siblings for proper border styling\n    color: $list-group-active-color;\n    background-color: $list-group-active-bg;\n    border-color: $list-group-active-border-color;\n  }\n\n  & + & {\n    border-top-width: 0;\n\n    &.active {\n      margin-top: -$list-group-border-width;\n      border-top-width: $list-group-border-width;\n    }\n  }\n}\n\n\n// Horizontal\n//\n// Change the layout of list group items from vertical (default) to horizontal.\n\n@each $breakpoint in map-keys($grid-breakpoints) {\n  @include media-breakpoint-up($breakpoint) {\n    $infix: breakpoint-infix($breakpoint, $grid-breakpoints);\n\n    .list-group-horizontal#{$infix} {\n      flex-direction: row;\n\n      .list-group-item {\n        &:first-child {\n          @include border-bottom-left-radius($list-group-border-radius);\n          @include border-top-right-radius(0);\n        }\n\n        &:last-child {\n          @include border-top-right-radius($list-group-border-radius);\n          @include border-bottom-left-radius(0);\n        }\n\n        &.active {\n          margin-top: 0;\n        }\n\n        & + .list-group-item {\n          border-top-width: $list-group-border-width;\n          border-left-width: 0;\n\n          &.active {\n            margin-left: -$list-group-border-width;\n            border-left-width: $list-group-border-width;\n          }\n        }\n      }\n    }\n  }\n}\n\n\n// Flush list items\n//\n// Remove borders and border-radius to keep list group items edge-to-edge. Most\n// useful within other components (e.g., cards).\n\n.list-group-flush {\n  .list-group-item {\n    border-right-width: 0;\n    border-left-width: 0;\n    @include border-radius(0);\n\n    &:first-child {\n      border-top-width: 0;\n    }\n  }\n\n  &:last-child {\n    .list-group-item:last-child {\n      border-bottom-width: 0;\n    }\n  }\n}\n\n\n// Contextual variants\n//\n// Add modifier classes to change text and background color on individual items.\n// Organizationally, this must come after the `:hover` states.\n\n@each $color, $value in $theme-colors {\n  @include list-group-item-variant($color, theme-color-level($color, -9), theme-color-level($color, 6));\n}\n","// List Groups\n\n@mixin list-group-item-variant($state, $background, $color) {\n  .list-group-item-#{$state} {\n    color: $color;\n    background-color: $background;\n\n    &.list-group-item-action {\n      @include hover-focus() {\n        color: $color;\n        background-color: darken($background, 5%);\n      }\n\n      &.active {\n        color: $white;\n        background-color: $color;\n        border-color: $color;\n      }\n    }\n  }\n}\n",".close {\n  float: right;\n  @include font-size($close-font-size);\n  font-weight: $close-font-weight;\n  line-height: 1;\n  color: $close-color;\n  text-shadow: $close-text-shadow;\n  opacity: .5;\n\n  // Override <a>'s hover style\n  @include hover() {\n    color: $close-color;\n    text-decoration: none;\n  }\n\n  &:not(:disabled):not(.disabled) {\n    @include hover-focus() {\n      opacity: .75;\n    }\n  }\n}\n\n// Additional properties for button version\n// iOS requires the button element instead of an anchor tag.\n// If you want the anchor version, it requires `href=\"#\"`.\n// See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile\n\n// stylelint-disable-next-line selector-no-qualifying-type\nbutton.close {\n  padding: 0;\n  background-color: transparent;\n  border: 0;\n  appearance: none;\n}\n\n// Future-proof disabling of clicks on `<a>` elements\n\n// stylelint-disable-next-line selector-no-qualifying-type\na.close.disabled {\n  pointer-events: none;\n}\n",".toast {\n  max-width: $toast-max-width;\n  overflow: hidden; // cheap rounded corners on nested items\n  @include font-size($toast-font-size);\n  color: $toast-color;\n  background-color: $toast-background-color;\n  background-clip: padding-box;\n  border: $toast-border-width solid $toast-border-color;\n  box-shadow: $toast-box-shadow;\n  backdrop-filter: blur(10px);\n  opacity: 0;\n  @include border-radius($toast-border-radius);\n\n  &:not(:last-child) {\n    margin-bottom: $toast-padding-x;\n  }\n\n  &.showing {\n    opacity: 1;\n  }\n\n  &.show {\n    display: block;\n    opacity: 1;\n  }\n\n  &.hide {\n    display: none;\n  }\n}\n\n.toast-header {\n  display: flex;\n  align-items: center;\n  padding: $toast-padding-y $toast-padding-x;\n  color: $toast-header-color;\n  background-color: $toast-header-background-color;\n  background-clip: padding-box;\n  border-bottom: $toast-border-width solid $toast-header-border-color;\n}\n\n.toast-body {\n  padding: $toast-padding-x; // apply to both vertical and horizontal\n}\n","// .modal-open      - body class for killing the scroll\n// .modal           - container to scroll within\n// .modal-dialog    - positioning shell for the actual modal\n// .modal-content   - actual modal w/ bg and corners and stuff\n\n\n.modal-open {\n  // Kill the scroll on the body\n  overflow: hidden;\n\n  .modal {\n    overflow-x: hidden;\n    overflow-y: auto;\n  }\n}\n\n// Container that the modal scrolls within\n.modal {\n  position: fixed;\n  top: 0;\n  left: 0;\n  z-index: $zindex-modal;\n  display: none;\n  width: 100%;\n  height: 100%;\n  overflow: hidden;\n  // Prevent Chrome on Windows from adding a focus outline. For details, see\n  // https://github.com/twbs/bootstrap/pull/10951.\n  outline: 0;\n  // We deliberately don't use `-webkit-overflow-scrolling: touch;` due to a\n  // gnarly iOS Safari bug: https://bugs.webkit.org/show_bug.cgi?id=158342\n  // See also https://github.com/twbs/bootstrap/issues/17695\n}\n\n// Shell div to position the modal with bottom padding\n.modal-dialog {\n  position: relative;\n  width: auto;\n  margin: $modal-dialog-margin;\n  // allow clicks to pass through for custom click handling to close modal\n  pointer-events: none;\n\n  // When fading in the modal, animate it to slide down\n  .modal.fade & {\n    @include transition($modal-transition);\n    transform: $modal-fade-transform;\n  }\n  .modal.show & {\n    transform: $modal-show-transform;\n  }\n\n  // When trying to close, animate focus to scale\n  .modal.modal-static & {\n    transform: $modal-scale-transform;\n  }\n}\n\n.modal-dialog-scrollable {\n  display: flex; // IE10/11\n  max-height: subtract(100%, $modal-dialog-margin * 2);\n\n  .modal-content {\n    max-height: subtract(100vh, $modal-dialog-margin * 2); // IE10/11\n    overflow: hidden;\n  }\n\n  .modal-header,\n  .modal-footer {\n    flex-shrink: 0;\n  }\n\n  .modal-body {\n    overflow-y: auto;\n  }\n}\n\n.modal-dialog-centered {\n  display: flex;\n  align-items: center;\n  min-height: subtract(100%, $modal-dialog-margin * 2);\n\n  // Ensure `modal-dialog-centered` extends the full height of the view (IE10/11)\n  &::before {\n    display: block; // IE10\n    height: subtract(100vh, $modal-dialog-margin * 2);\n    content: \"\";\n  }\n\n  // Ensure `.modal-body` shows scrollbar (IE10/11)\n  &.modal-dialog-scrollable {\n    flex-direction: column;\n    justify-content: center;\n    height: 100%;\n\n    .modal-content {\n      max-height: none;\n    }\n\n    &::before {\n      content: none;\n    }\n  }\n}\n\n// Actual modal\n.modal-content {\n  position: relative;\n  display: flex;\n  flex-direction: column;\n  width: 100%; // Ensure `.modal-content` extends the full width of the parent `.modal-dialog`\n  // counteract the pointer-events: none; in the .modal-dialog\n  color: $modal-content-color;\n  pointer-events: auto;\n  background-color: $modal-content-bg;\n  background-clip: padding-box;\n  border: $modal-content-border-width solid $modal-content-border-color;\n  @include border-radius($modal-content-border-radius);\n  @include box-shadow($modal-content-box-shadow-xs);\n  // Remove focus outline from opened modal\n  outline: 0;\n}\n\n// Modal background\n.modal-backdrop {\n  position: fixed;\n  top: 0;\n  left: 0;\n  z-index: $zindex-modal-backdrop;\n  width: 100vw;\n  height: 100vh;\n  background-color: $modal-backdrop-bg;\n\n  // Fade for backdrop\n  &.fade { opacity: 0; }\n  &.show { opacity: $modal-backdrop-opacity; }\n}\n\n// Modal header\n// Top section of the modal w/ title and dismiss\n.modal-header {\n  display: flex;\n  align-items: flex-start; // so the close btn always stays on the upper right corner\n  justify-content: space-between; // Put modal header elements (title and dismiss) on opposite ends\n  padding: $modal-header-padding;\n  border-bottom: $modal-header-border-width solid $modal-header-border-color;\n  @include border-top-radius($modal-content-inner-border-radius);\n\n  .close {\n    padding: $modal-header-padding;\n    // auto on the left force icon to the right even when there is no .modal-title\n    margin: (-$modal-header-padding-y) (-$modal-header-padding-x) (-$modal-header-padding-y) auto;\n  }\n}\n\n// Title text within header\n.modal-title {\n  margin-bottom: 0;\n  line-height: $modal-title-line-height;\n}\n\n// Modal body\n// Where all modal content resides (sibling of .modal-header and .modal-footer)\n.modal-body {\n  position: relative;\n  // Enable `flex-grow: 1` so that the body take up as much space as possible\n  // when there should be a fixed height on `.modal-dialog`.\n  flex: 1 1 auto;\n  padding: $modal-inner-padding;\n}\n\n// Footer (for actions)\n.modal-footer {\n  display: flex;\n  flex-wrap: wrap;\n  align-items: center; // vertically center\n  justify-content: flex-end; // Right align buttons with flex property because text-align doesn't work on flex items\n  padding: $modal-inner-padding - $modal-footer-margin-between / 2;\n  border-top: $modal-footer-border-width solid $modal-footer-border-color;\n  @include border-bottom-radius($modal-content-inner-border-radius);\n\n  // Place margin between footer elements\n  // This solution is far from ideal because of the universal selector usage,\n  // but is needed to fix https://github.com/twbs/bootstrap/issues/24800\n  // stylelint-disable-next-line selector-max-universal\n  > * {\n    margin: $modal-footer-margin-between / 2;\n  }\n}\n\n// Measure scrollbar width for padding body during modal show/hide\n.modal-scrollbar-measure {\n  position: absolute;\n  top: -9999px;\n  width: 50px;\n  height: 50px;\n  overflow: scroll;\n}\n\n// Scale up the modal\n@include media-breakpoint-up(sm) {\n  // Automatically set modal's width for larger viewports\n  .modal-dialog {\n    max-width: $modal-md;\n    margin: $modal-dialog-margin-y-sm-up auto;\n  }\n\n  .modal-dialog-scrollable {\n    max-height: subtract(100%, $modal-dialog-margin-y-sm-up * 2);\n\n    .modal-content {\n      max-height: subtract(100vh, $modal-dialog-margin-y-sm-up * 2);\n    }\n  }\n\n  .modal-dialog-centered {\n    min-height: subtract(100%, $modal-dialog-margin-y-sm-up * 2);\n\n    &::before {\n      height: subtract(100vh, $modal-dialog-margin-y-sm-up * 2);\n    }\n  }\n\n  .modal-content {\n    @include box-shadow($modal-content-box-shadow-sm-up);\n  }\n\n  .modal-sm { max-width: $modal-sm; }\n}\n\n@include media-breakpoint-up(lg) {\n  .modal-lg,\n  .modal-xl {\n    max-width: $modal-lg;\n  }\n}\n\n@include media-breakpoint-up(xl) {\n  .modal-xl { max-width: $modal-xl; }\n}\n","// Base class\n.tooltip {\n  position: absolute;\n  z-index: $zindex-tooltip;\n  display: block;\n  margin: $tooltip-margin;\n  // Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.\n  // So reset our font and text properties to avoid inheriting weird values.\n  @include reset-text();\n  @include font-size($tooltip-font-size);\n  // Allow breaking very long words so they don't overflow the tooltip's bounds\n  word-wrap: break-word;\n  opacity: 0;\n\n  &.show { opacity: $tooltip-opacity; }\n\n  .arrow {\n    position: absolute;\n    display: block;\n    width: $tooltip-arrow-width;\n    height: $tooltip-arrow-height;\n\n    &::before {\n      position: absolute;\n      content: \"\";\n      border-color: transparent;\n      border-style: solid;\n    }\n  }\n}\n\n.bs-tooltip-top {\n  padding: $tooltip-arrow-height 0;\n\n  .arrow {\n    bottom: 0;\n\n    &::before {\n      top: 0;\n      border-width: $tooltip-arrow-height ($tooltip-arrow-width / 2) 0;\n      border-top-color: $tooltip-arrow-color;\n    }\n  }\n}\n\n.bs-tooltip-right {\n  padding: 0 $tooltip-arrow-height;\n\n  .arrow {\n    left: 0;\n    width: $tooltip-arrow-height;\n    height: $tooltip-arrow-width;\n\n    &::before {\n      right: 0;\n      border-width: ($tooltip-arrow-width / 2) $tooltip-arrow-height ($tooltip-arrow-width / 2) 0;\n      border-right-color: $tooltip-arrow-color;\n    }\n  }\n}\n\n.bs-tooltip-bottom {\n  padding: $tooltip-arrow-height 0;\n\n  .arrow {\n    top: 0;\n\n    &::before {\n      bottom: 0;\n      border-width: 0 ($tooltip-arrow-width / 2) $tooltip-arrow-height;\n      border-bottom-color: $tooltip-arrow-color;\n    }\n  }\n}\n\n.bs-tooltip-left {\n  padding: 0 $tooltip-arrow-height;\n\n  .arrow {\n    right: 0;\n    width: $tooltip-arrow-height;\n    height: $tooltip-arrow-width;\n\n    &::before {\n      left: 0;\n      border-width: ($tooltip-arrow-width / 2) 0 ($tooltip-arrow-width / 2) $tooltip-arrow-height;\n      border-left-color: $tooltip-arrow-color;\n    }\n  }\n}\n\n.bs-tooltip-auto {\n  &[x-placement^=\"top\"] {\n    @extend .bs-tooltip-top;\n  }\n  &[x-placement^=\"right\"] {\n    @extend .bs-tooltip-right;\n  }\n  &[x-placement^=\"bottom\"] {\n    @extend .bs-tooltip-bottom;\n  }\n  &[x-placement^=\"left\"] {\n    @extend .bs-tooltip-left;\n  }\n}\n\n// Wrapper for the tooltip content\n.tooltip-inner {\n  max-width: $tooltip-max-width;\n  padding: $tooltip-padding-y $tooltip-padding-x;\n  color: $tooltip-color;\n  text-align: center;\n  background-color: $tooltip-bg;\n  @include border-radius($tooltip-border-radius);\n}\n","@mixin reset-text() {\n  font-family: $font-family-base;\n  // We deliberately do NOT reset font-size or word-wrap.\n  font-style: normal;\n  font-weight: $font-weight-normal;\n  line-height: $line-height-base;\n  text-align: left; // Fallback for where `start` is not supported\n  text-align: start;\n  text-decoration: none;\n  text-shadow: none;\n  text-transform: none;\n  letter-spacing: normal;\n  word-break: normal;\n  word-spacing: normal;\n  white-space: normal;\n  line-break: auto;\n}\n",".popover {\n  position: absolute;\n  top: 0;\n  left: 0;\n  z-index: $zindex-popover;\n  display: block;\n  max-width: $popover-max-width;\n  // Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.\n  // So reset our font and text properties to avoid inheriting weird values.\n  @include reset-text();\n  @include font-size($popover-font-size);\n  // Allow breaking very long words so they don't overflow the popover's bounds\n  word-wrap: break-word;\n  background-color: $popover-bg;\n  background-clip: padding-box;\n  border: $popover-border-width solid $popover-border-color;\n  @include border-radius($popover-border-radius);\n  @include box-shadow($popover-box-shadow);\n\n  .arrow {\n    position: absolute;\n    display: block;\n    width: $popover-arrow-width;\n    height: $popover-arrow-height;\n    margin: 0 $popover-border-radius;\n\n    &::before,\n    &::after {\n      position: absolute;\n      display: block;\n      content: \"\";\n      border-color: transparent;\n      border-style: solid;\n    }\n  }\n}\n\n.bs-popover-top {\n  margin-bottom: $popover-arrow-height;\n\n  > .arrow {\n    bottom: subtract(-$popover-arrow-height, $popover-border-width);\n\n    &::before {\n      bottom: 0;\n      border-width: $popover-arrow-height ($popover-arrow-width / 2) 0;\n      border-top-color: $popover-arrow-outer-color;\n    }\n\n    &::after {\n      bottom: $popover-border-width;\n      border-width: $popover-arrow-height ($popover-arrow-width / 2) 0;\n      border-top-color: $popover-arrow-color;\n    }\n  }\n}\n\n.bs-popover-right {\n  margin-left: $popover-arrow-height;\n\n  > .arrow {\n    left: subtract(-$popover-arrow-height, $popover-border-width);\n    width: $popover-arrow-height;\n    height: $popover-arrow-width;\n    margin: $popover-border-radius 0; // make sure the arrow does not touch the popover's rounded corners\n\n    &::before {\n      left: 0;\n      border-width: ($popover-arrow-width / 2) $popover-arrow-height ($popover-arrow-width / 2) 0;\n      border-right-color: $popover-arrow-outer-color;\n    }\n\n    &::after {\n      left: $popover-border-width;\n      border-width: ($popover-arrow-width / 2) $popover-arrow-height ($popover-arrow-width / 2) 0;\n      border-right-color: $popover-arrow-color;\n    }\n  }\n}\n\n.bs-popover-bottom {\n  margin-top: $popover-arrow-height;\n\n  > .arrow {\n    top: subtract(-$popover-arrow-height, $popover-border-width);\n\n    &::before {\n      top: 0;\n      border-width: 0 ($popover-arrow-width / 2) $popover-arrow-height ($popover-arrow-width / 2);\n      border-bottom-color: $popover-arrow-outer-color;\n    }\n\n    &::after {\n      top: $popover-border-width;\n      border-width: 0 ($popover-arrow-width / 2) $popover-arrow-height ($popover-arrow-width / 2);\n      border-bottom-color: $popover-arrow-color;\n    }\n  }\n\n  // This will remove the popover-header's border just below the arrow\n  .popover-header::before {\n    position: absolute;\n    top: 0;\n    left: 50%;\n    display: block;\n    width: $popover-arrow-width;\n    margin-left: -$popover-arrow-width / 2;\n    content: \"\";\n    border-bottom: $popover-border-width solid $popover-header-bg;\n  }\n}\n\n.bs-popover-left {\n  margin-right: $popover-arrow-height;\n\n  > .arrow {\n    right: subtract(-$popover-arrow-height, $popover-border-width);\n    width: $popover-arrow-height;\n    height: $popover-arrow-width;\n    margin: $popover-border-radius 0; // make sure the arrow does not touch the popover's rounded corners\n\n    &::before {\n      right: 0;\n      border-width: ($popover-arrow-width / 2) 0 ($popover-arrow-width / 2) $popover-arrow-height;\n      border-left-color: $popover-arrow-outer-color;\n    }\n\n    &::after {\n      right: $popover-border-width;\n      border-width: ($popover-arrow-width / 2) 0 ($popover-arrow-width / 2) $popover-arrow-height;\n      border-left-color: $popover-arrow-color;\n    }\n  }\n}\n\n.bs-popover-auto {\n  &[x-placement^=\"top\"] {\n    @extend .bs-popover-top;\n  }\n  &[x-placement^=\"right\"] {\n    @extend .bs-popover-right;\n  }\n  &[x-placement^=\"bottom\"] {\n    @extend .bs-popover-bottom;\n  }\n  &[x-placement^=\"left\"] {\n    @extend .bs-popover-left;\n  }\n}\n\n\n// Offset the popover to account for the popover arrow\n.popover-header {\n  padding: $popover-header-padding-y $popover-header-padding-x;\n  margin-bottom: 0; // Reset the default from Reboot\n  @include font-size($font-size-base);\n  color: $popover-header-color;\n  background-color: $popover-header-bg;\n  border-bottom: $popover-border-width solid darken($popover-header-bg, 5%);\n  @include border-top-radius($popover-inner-border-radius);\n\n  &:empty {\n    display: none;\n  }\n}\n\n.popover-body {\n  padding: $popover-body-padding-y $popover-body-padding-x;\n  color: $popover-body-color;\n}\n","// Notes on the classes:\n//\n// 1. .carousel.pointer-event should ideally be pan-y (to allow for users to scroll vertically)\n//    even when their scroll action started on a carousel, but for compatibility (with Firefox)\n//    we're preventing all actions instead\n// 2. The .carousel-item-left and .carousel-item-right is used to indicate where\n//    the active slide is heading.\n// 3. .active.carousel-item is the current slide.\n// 4. .active.carousel-item-left and .active.carousel-item-right is the current\n//    slide in its in-transition state. Only one of these occurs at a time.\n// 5. .carousel-item-next.carousel-item-left and .carousel-item-prev.carousel-item-right\n//    is the upcoming slide in transition.\n\n.carousel {\n  position: relative;\n}\n\n.carousel.pointer-event {\n  touch-action: pan-y;\n}\n\n.carousel-inner {\n  position: relative;\n  width: 100%;\n  overflow: hidden;\n  @include clearfix();\n}\n\n.carousel-item {\n  position: relative;\n  display: none;\n  float: left;\n  width: 100%;\n  margin-right: -100%;\n  backface-visibility: hidden;\n  @include transition($carousel-transition);\n}\n\n.carousel-item.active,\n.carousel-item-next,\n.carousel-item-prev {\n  display: block;\n}\n\n.carousel-item-next:not(.carousel-item-left),\n.active.carousel-item-right {\n  transform: translateX(100%);\n}\n\n.carousel-item-prev:not(.carousel-item-right),\n.active.carousel-item-left {\n  transform: translateX(-100%);\n}\n\n\n//\n// Alternate transitions\n//\n\n.carousel-fade {\n  .carousel-item {\n    opacity: 0;\n    transition-property: opacity;\n    transform: none;\n  }\n\n  .carousel-item.active,\n  .carousel-item-next.carousel-item-left,\n  .carousel-item-prev.carousel-item-right {\n    z-index: 1;\n    opacity: 1;\n  }\n\n  .active.carousel-item-left,\n  .active.carousel-item-right {\n    z-index: 0;\n    opacity: 0;\n    @include transition(opacity 0s $carousel-transition-duration);\n  }\n}\n\n\n//\n// Left/right controls for nav\n//\n\n.carousel-control-prev,\n.carousel-control-next {\n  position: absolute;\n  top: 0;\n  bottom: 0;\n  z-index: 1;\n  // Use flex for alignment (1-3)\n  display: flex; // 1. allow flex styles\n  align-items: center; // 2. vertically center contents\n  justify-content: center; // 3. horizontally center contents\n  width: $carousel-control-width;\n  color: $carousel-control-color;\n  text-align: center;\n  opacity: $carousel-control-opacity;\n  @include transition($carousel-control-transition);\n\n  // Hover/focus state\n  @include hover-focus() {\n    color: $carousel-control-color;\n    text-decoration: none;\n    outline: 0;\n    opacity: $carousel-control-hover-opacity;\n  }\n}\n.carousel-control-prev {\n  left: 0;\n  @if $enable-gradients {\n    background-image: linear-gradient(90deg, rgba($black, .25), rgba($black, .001));\n  }\n}\n.carousel-control-next {\n  right: 0;\n  @if $enable-gradients {\n    background-image: linear-gradient(270deg, rgba($black, .25), rgba($black, .001));\n  }\n}\n\n// Icons for within\n.carousel-control-prev-icon,\n.carousel-control-next-icon {\n  display: inline-block;\n  width: $carousel-control-icon-width;\n  height: $carousel-control-icon-width;\n  background: no-repeat 50% / 100% 100%;\n}\n.carousel-control-prev-icon {\n  background-image: escape-svg($carousel-control-prev-icon-bg);\n}\n.carousel-control-next-icon {\n  background-image: escape-svg($carousel-control-next-icon-bg);\n}\n\n\n// Optional indicator pips\n//\n// Add an ordered list with the following class and add a list item for each\n// slide your carousel holds.\n\n.carousel-indicators {\n  position: absolute;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: 15;\n  display: flex;\n  justify-content: center;\n  padding-left: 0; // override <ol> default\n  // Use the .carousel-control's width as margin so we don't overlay those\n  margin-right: $carousel-control-width;\n  margin-left: $carousel-control-width;\n  list-style: none;\n\n  li {\n    box-sizing: content-box;\n    flex: 0 1 auto;\n    width: $carousel-indicator-width;\n    height: $carousel-indicator-height;\n    margin-right: $carousel-indicator-spacer;\n    margin-left: $carousel-indicator-spacer;\n    text-indent: -999px;\n    cursor: pointer;\n    background-color: $carousel-indicator-active-bg;\n    background-clip: padding-box;\n    // Use transparent borders to increase the hit area by 10px on top and bottom.\n    border-top: $carousel-indicator-hit-area-height solid transparent;\n    border-bottom: $carousel-indicator-hit-area-height solid transparent;\n    opacity: .5;\n    @include transition($carousel-indicator-transition);\n  }\n\n  .active {\n    opacity: 1;\n  }\n}\n\n\n// Optional captions\n//\n//\n\n.carousel-caption {\n  position: absolute;\n  right: (100% - $carousel-caption-width) / 2;\n  bottom: 20px;\n  left: (100% - $carousel-caption-width) / 2;\n  z-index: 10;\n  padding-top: 20px;\n  padding-bottom: 20px;\n  color: $carousel-caption-color;\n  text-align: center;\n}\n","@mixin clearfix() {\n  &::after {\n    display: block;\n    clear: both;\n    content: \"\";\n  }\n}\n","//\n// Rotating border\n//\n\n@keyframes spinner-border {\n  to { transform: rotate(360deg); }\n}\n\n.spinner-border {\n  display: inline-block;\n  width: $spinner-width;\n  height: $spinner-height;\n  vertical-align: text-bottom;\n  border: $spinner-border-width solid currentColor;\n  border-right-color: transparent;\n  // stylelint-disable-next-line property-blacklist\n  border-radius: 50%;\n  animation: spinner-border .75s linear infinite;\n}\n\n.spinner-border-sm {\n  width: $spinner-width-sm;\n  height: $spinner-height-sm;\n  border-width: $spinner-border-width-sm;\n}\n\n//\n// Growing circle\n//\n\n@keyframes spinner-grow {\n  0% {\n    transform: scale(0);\n  }\n  50% {\n    opacity: 1;\n  }\n}\n\n.spinner-grow {\n  display: inline-block;\n  width: $spinner-width;\n  height: $spinner-height;\n  vertical-align: text-bottom;\n  background-color: currentColor;\n  // stylelint-disable-next-line property-blacklist\n  border-radius: 50%;\n  opacity: 0;\n  animation: spinner-grow .75s linear infinite;\n}\n\n.spinner-grow-sm {\n  width: $spinner-width-sm;\n  height: $spinner-height-sm;\n}\n","// stylelint-disable declaration-no-important\n\n.align-baseline    { vertical-align: baseline !important; } // Browser default\n.align-top         { vertical-align: top !important; }\n.align-middle      { vertical-align: middle !important; }\n.align-bottom      { vertical-align: bottom !important; }\n.align-text-bottom { vertical-align: text-bottom !important; }\n.align-text-top    { vertical-align: text-top !important; }\n","// stylelint-disable declaration-no-important\n\n// Contextual backgrounds\n\n@mixin bg-variant($parent, $color, $ignore-warning: false) {\n  #{$parent} {\n    background-color: $color !important;\n  }\n  a#{$parent},\n  button#{$parent} {\n    @include hover-focus() {\n      background-color: darken($color, 10%) !important;\n    }\n  }\n  @include deprecate(\"The `bg-variant` mixin\", \"v4.4.0\", \"v5\", $ignore-warning);\n}\n\n@mixin bg-gradient-variant($parent, $color) {\n  #{$parent} {\n    background: $color linear-gradient(180deg, mix($body-bg, $color, 15%), $color) repeat-x !important;\n  }\n}\n","// stylelint-disable declaration-no-important\n\n@each $color, $value in $theme-colors {\n  @include bg-variant(\".bg-#{$color}\", $value, true);\n}\n\n@if $enable-gradients {\n  @each $color, $value in $theme-colors {\n    @include bg-gradient-variant(\".bg-gradient-#{$color}\", $value);\n  }\n}\n\n.bg-white {\n  background-color: $white !important;\n}\n\n.bg-transparent {\n  background-color: transparent !important;\n}\n","// stylelint-disable property-blacklist, declaration-no-important\n\n//\n// Border\n//\n\n.border         { border: $border-width solid $border-color !important; }\n.border-top     { border-top: $border-width solid $border-color !important; }\n.border-right   { border-right: $border-width solid $border-color !important; }\n.border-bottom  { border-bottom: $border-width solid $border-color !important; }\n.border-left    { border-left: $border-width solid $border-color !important; }\n\n.border-0        { border: 0 !important; }\n.border-top-0    { border-top: 0 !important; }\n.border-right-0  { border-right: 0 !important; }\n.border-bottom-0 { border-bottom: 0 !important; }\n.border-left-0   { border-left: 0 !important; }\n\n@each $color, $value in $theme-colors {\n  .border-#{$color} {\n    border-color: $value !important;\n  }\n}\n\n.border-white {\n  border-color: $white !important;\n}\n\n//\n// Border-radius\n//\n\n.rounded-sm {\n  border-radius: $border-radius-sm !important;\n}\n\n.rounded {\n  border-radius: $border-radius !important;\n}\n\n.rounded-top {\n  border-top-left-radius: $border-radius !important;\n  border-top-right-radius: $border-radius !important;\n}\n\n.rounded-right {\n  border-top-right-radius: $border-radius !important;\n  border-bottom-right-radius: $border-radius !important;\n}\n\n.rounded-bottom {\n  border-bottom-right-radius: $border-radius !important;\n  border-bottom-left-radius: $border-radius !important;\n}\n\n.rounded-left {\n  border-top-left-radius: $border-radius !important;\n  border-bottom-left-radius: $border-radius !important;\n}\n\n.rounded-lg {\n  border-radius: $border-radius-lg !important;\n}\n\n.rounded-circle {\n  border-radius: 50% !important;\n}\n\n.rounded-pill {\n  border-radius: $rounded-pill !important;\n}\n\n.rounded-0 {\n  border-radius: 0 !important;\n}\n","// stylelint-disable declaration-no-important\n\n//\n// Utilities for common `display` values\n//\n\n@each $breakpoint in map-keys($grid-breakpoints) {\n  @include media-breakpoint-up($breakpoint) {\n    $infix: breakpoint-infix($breakpoint, $grid-breakpoints);\n\n    @each $value in $displays {\n      .d#{$infix}-#{$value} { display: $value !important; }\n    }\n  }\n}\n\n\n//\n// Utilities for toggling `display` in print\n//\n\n@media print {\n  @each $value in $displays {\n    .d-print-#{$value} { display: $value !important; }\n  }\n}\n","// Credit: Nicolas Gallagher and SUIT CSS.\n\n.embed-responsive {\n  position: relative;\n  display: block;\n  width: 100%;\n  padding: 0;\n  overflow: hidden;\n\n  &::before {\n    display: block;\n    content: \"\";\n  }\n\n  .embed-responsive-item,\n  iframe,\n  embed,\n  object,\n  video {\n    position: absolute;\n    top: 0;\n    bottom: 0;\n    left: 0;\n    width: 100%;\n    height: 100%;\n    border: 0;\n  }\n}\n\n@each $embed-responsive-aspect-ratio in $embed-responsive-aspect-ratios {\n  $embed-responsive-aspect-ratio-x: nth($embed-responsive-aspect-ratio, 1);\n  $embed-responsive-aspect-ratio-y: nth($embed-responsive-aspect-ratio, 2);\n\n  .embed-responsive-#{$embed-responsive-aspect-ratio-x}by#{$embed-responsive-aspect-ratio-y} {\n    &::before {\n      padding-top: percentage($embed-responsive-aspect-ratio-y / $embed-responsive-aspect-ratio-x);\n    }\n  }\n}\n","// stylelint-disable declaration-no-important\n\n// Flex variation\n//\n// Custom styles for additional flex alignment options.\n\n@each $breakpoint in map-keys($grid-breakpoints) {\n  @include media-breakpoint-up($breakpoint) {\n    $infix: breakpoint-infix($breakpoint, $grid-breakpoints);\n\n    .flex#{$infix}-row            { flex-direction: row !important; }\n    .flex#{$infix}-column         { flex-direction: column !important; }\n    .flex#{$infix}-row-reverse    { flex-direction: row-reverse !important; }\n    .flex#{$infix}-column-reverse { flex-direction: column-reverse !important; }\n\n    .flex#{$infix}-wrap         { flex-wrap: wrap !important; }\n    .flex#{$infix}-nowrap       { flex-wrap: nowrap !important; }\n    .flex#{$infix}-wrap-reverse { flex-wrap: wrap-reverse !important; }\n    .flex#{$infix}-fill         { flex: 1 1 auto !important; }\n    .flex#{$infix}-grow-0       { flex-grow: 0 !important; }\n    .flex#{$infix}-grow-1       { flex-grow: 1 !important; }\n    .flex#{$infix}-shrink-0     { flex-shrink: 0 !important; }\n    .flex#{$infix}-shrink-1     { flex-shrink: 1 !important; }\n\n    .justify-content#{$infix}-start   { justify-content: flex-start !important; }\n    .justify-content#{$infix}-end     { justify-content: flex-end !important; }\n    .justify-content#{$infix}-center  { justify-content: center !important; }\n    .justify-content#{$infix}-between { justify-content: space-between !important; }\n    .justify-content#{$infix}-around  { justify-content: space-around !important; }\n\n    .align-items#{$infix}-start    { align-items: flex-start !important; }\n    .align-items#{$infix}-end      { align-items: flex-end !important; }\n    .align-items#{$infix}-center   { align-items: center !important; }\n    .align-items#{$infix}-baseline { align-items: baseline !important; }\n    .align-items#{$infix}-stretch  { align-items: stretch !important; }\n\n    .align-content#{$infix}-start   { align-content: flex-start !important; }\n    .align-content#{$infix}-end     { align-content: flex-end !important; }\n    .align-content#{$infix}-center  { align-content: center !important; }\n    .align-content#{$infix}-between { align-content: space-between !important; }\n    .align-content#{$infix}-around  { align-content: space-around !important; }\n    .align-content#{$infix}-stretch { align-content: stretch !important; }\n\n    .align-self#{$infix}-auto     { align-self: auto !important; }\n    .align-self#{$infix}-start    { align-self: flex-start !important; }\n    .align-self#{$infix}-end      { align-self: flex-end !important; }\n    .align-self#{$infix}-center   { align-self: center !important; }\n    .align-self#{$infix}-baseline { align-self: baseline !important; }\n    .align-self#{$infix}-stretch  { align-self: stretch !important; }\n  }\n}\n","// stylelint-disable declaration-no-important\n\n@each $breakpoint in map-keys($grid-breakpoints) {\n  @include media-breakpoint-up($breakpoint) {\n    $infix: breakpoint-infix($breakpoint, $grid-breakpoints);\n\n    .float#{$infix}-left  { float: left !important; }\n    .float#{$infix}-right { float: right !important; }\n    .float#{$infix}-none  { float: none !important; }\n  }\n}\n","// stylelint-disable declaration-no-important\n\n@each $value in $overflows {\n  .overflow-#{$value} { overflow: $value !important; }\n}\n","// stylelint-disable declaration-no-important\n\n// Common values\n@each $position in $positions {\n  .position-#{$position} { position: $position !important; }\n}\n\n// Shorthand\n\n.fixed-top {\n  position: fixed;\n  top: 0;\n  right: 0;\n  left: 0;\n  z-index: $zindex-fixed;\n}\n\n.fixed-bottom {\n  position: fixed;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: $zindex-fixed;\n}\n\n.sticky-top {\n  @supports (position: sticky) {\n    position: sticky;\n    top: 0;\n    z-index: $zindex-sticky;\n  }\n}\n","//\n// Screenreaders\n//\n\n.sr-only {\n  @include sr-only();\n}\n\n.sr-only-focusable {\n  @include sr-only-focusable();\n}\n","// Only display content to screen readers\n//\n// See: https://a11yproject.com/posts/how-to-hide-content/\n// See: https://hugogiraudel.com/2016/10/13/css-hide-and-seek/\n\n@mixin sr-only() {\n  position: absolute;\n  width: 1px;\n  height: 1px;\n  padding: 0;\n  margin: -1px; // Fix for https://github.com/twbs/bootstrap/issues/25686\n  overflow: hidden;\n  clip: rect(0, 0, 0, 0);\n  white-space: nowrap;\n  border: 0;\n}\n\n// Use in conjunction with .sr-only to only display content when it's focused.\n//\n// Useful for \"Skip to main content\" links; see https://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1\n//\n// Credit: HTML5 Boilerplate\n\n@mixin sr-only-focusable() {\n  &:active,\n  &:focus {\n    position: static;\n    width: auto;\n    height: auto;\n    overflow: visible;\n    clip: auto;\n    white-space: normal;\n  }\n}\n","// stylelint-disable declaration-no-important\n\n.shadow-sm { box-shadow: $box-shadow-sm !important; }\n.shadow { box-shadow: $box-shadow !important; }\n.shadow-lg { box-shadow: $box-shadow-lg !important; }\n.shadow-none { box-shadow: none !important; }\n","// stylelint-disable declaration-no-important\n\n// Width and height\n\n@each $prop, $abbrev in (width: w, height: h) {\n  @each $size, $length in $sizes {\n    .#{$abbrev}-#{$size} { #{$prop}: $length !important; }\n  }\n}\n\n.mw-100 { max-width: 100% !important; }\n.mh-100 { max-height: 100% !important; }\n\n// Viewport additional helpers\n\n.min-vw-100 { min-width: 100vw !important; }\n.min-vh-100 { min-height: 100vh !important; }\n\n.vw-100 { width: 100vw !important; }\n.vh-100 { height: 100vh !important; }\n","//\n// Stretched link\n//\n\n.stretched-link {\n  &::after {\n    position: absolute;\n    top: 0;\n    right: 0;\n    bottom: 0;\n    left: 0;\n    z-index: 1;\n    // Just in case `pointer-events: none` is set on a parent\n    pointer-events: auto;\n    content: \"\";\n    // IE10 bugfix, see https://stackoverflow.com/questions/16947967/ie10-hover-pseudo-class-doesnt-work-without-background-color\n    background-color: rgba(0, 0, 0, 0);\n  }\n}\n","// stylelint-disable declaration-no-important\n\n// Margin and Padding\n\n@each $breakpoint in map-keys($grid-breakpoints) {\n  @include media-breakpoint-up($breakpoint) {\n    $infix: breakpoint-infix($breakpoint, $grid-breakpoints);\n\n    @each $prop, $abbrev in (margin: m, padding: p) {\n      @each $size, $length in $spacers {\n        .#{$abbrev}#{$infix}-#{$size} { #{$prop}: $length !important; }\n        .#{$abbrev}t#{$infix}-#{$size},\n        .#{$abbrev}y#{$infix}-#{$size} {\n          #{$prop}-top: $length !important;\n        }\n        .#{$abbrev}r#{$infix}-#{$size},\n        .#{$abbrev}x#{$infix}-#{$size} {\n          #{$prop}-right: $length !important;\n        }\n        .#{$abbrev}b#{$infix}-#{$size},\n        .#{$abbrev}y#{$infix}-#{$size} {\n          #{$prop}-bottom: $length !important;\n        }\n        .#{$abbrev}l#{$infix}-#{$size},\n        .#{$abbrev}x#{$infix}-#{$size} {\n          #{$prop}-left: $length !important;\n        }\n      }\n    }\n\n    // Negative margins (e.g., where `.mb-n1` is negative version of `.mb-1`)\n    @each $size, $length in $spacers {\n      @if $size != 0 {\n        .m#{$infix}-n#{$size} { margin: -$length !important; }\n        .mt#{$infix}-n#{$size},\n        .my#{$infix}-n#{$size} {\n          margin-top: -$length !important;\n        }\n        .mr#{$infix}-n#{$size},\n        .mx#{$infix}-n#{$size} {\n          margin-right: -$length !important;\n        }\n        .mb#{$infix}-n#{$size},\n        .my#{$infix}-n#{$size} {\n          margin-bottom: -$length !important;\n        }\n        .ml#{$infix}-n#{$size},\n        .mx#{$infix}-n#{$size} {\n          margin-left: -$length !important;\n        }\n      }\n    }\n\n    // Some special margin utils\n    .m#{$infix}-auto { margin: auto !important; }\n    .mt#{$infix}-auto,\n    .my#{$infix}-auto {\n      margin-top: auto !important;\n    }\n    .mr#{$infix}-auto,\n    .mx#{$infix}-auto {\n      margin-right: auto !important;\n    }\n    .mb#{$infix}-auto,\n    .my#{$infix}-auto {\n      margin-bottom: auto !important;\n    }\n    .ml#{$infix}-auto,\n    .mx#{$infix}-auto {\n      margin-left: auto !important;\n    }\n  }\n}\n","// stylelint-disable declaration-no-important\n\n//\n// Text\n//\n\n.text-monospace { font-family: $font-family-monospace !important; }\n\n// Alignment\n\n.text-justify  { text-align: justify !important; }\n.text-wrap     { white-space: normal !important; }\n.text-nowrap   { white-space: nowrap !important; }\n.text-truncate { @include text-truncate(); }\n\n// Responsive alignment\n\n@each $breakpoint in map-keys($grid-breakpoints) {\n  @include media-breakpoint-up($breakpoint) {\n    $infix: breakpoint-infix($breakpoint, $grid-breakpoints);\n\n    .text#{$infix}-left   { text-align: left !important; }\n    .text#{$infix}-right  { text-align: right !important; }\n    .text#{$infix}-center { text-align: center !important; }\n  }\n}\n\n// Transformation\n\n.text-lowercase  { text-transform: lowercase !important; }\n.text-uppercase  { text-transform: uppercase !important; }\n.text-capitalize { text-transform: capitalize !important; }\n\n// Weight and italics\n\n.font-weight-light   { font-weight: $font-weight-light !important; }\n.font-weight-lighter { font-weight: $font-weight-lighter !important; }\n.font-weight-normal  { font-weight: $font-weight-normal !important; }\n.font-weight-bold    { font-weight: $font-weight-bold !important; }\n.font-weight-bolder  { font-weight: $font-weight-bolder !important; }\n.font-italic         { font-style: italic !important; }\n\n// Contextual colors\n\n.text-white { color: $white !important; }\n\n@each $color, $value in $theme-colors {\n  @include text-emphasis-variant(\".text-#{$color}\", $value, true);\n}\n\n.text-body { color: $body-color !important; }\n.text-muted { color: $text-muted !important; }\n\n.text-black-50 { color: rgba($black, .5) !important; }\n.text-white-50 { color: rgba($white, .5) !important; }\n\n// Misc\n\n.text-hide {\n  @include text-hide($ignore-warning: true);\n}\n\n.text-decoration-none { text-decoration: none !important; }\n\n.text-break {\n  word-break: break-word !important; // IE & < Edge 18\n  overflow-wrap: break-word !important;\n}\n\n// Reset\n\n.text-reset { color: inherit !important; }\n","// Text truncate\n// Requires inline-block or block for proper styling\n\n@mixin text-truncate() {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n","// stylelint-disable declaration-no-important\n\n// Typography\n\n@mixin text-emphasis-variant($parent, $color, $ignore-warning: false) {\n  #{$parent} {\n    color: $color !important;\n  }\n  @if $emphasized-link-hover-darken-percentage != 0 {\n    a#{$parent} {\n      @include hover-focus() {\n        color: darken($color, $emphasized-link-hover-darken-percentage) !important;\n      }\n    }\n  }\n  @include deprecate(\"`text-emphasis-variant()`\", \"v4.4.0\", \"v5\", $ignore-warning);\n}\n","// CSS image replacement\n@mixin text-hide($ignore-warning: false) {\n  // stylelint-disable-next-line font-family-no-missing-generic-family-keyword\n  font: 0/0 a;\n  color: transparent;\n  text-shadow: none;\n  background-color: transparent;\n  border: 0;\n\n  @include deprecate(\"`text-hide()`\", \"v4.1.0\", \"v5\", $ignore-warning);\n}\n","// stylelint-disable declaration-no-important\n\n//\n// Visibility utilities\n//\n\n.visible {\n  visibility: visible !important;\n}\n\n.invisible {\n  visibility: hidden !important;\n}\n","// stylelint-disable declaration-no-important, selector-no-qualifying-type\n\n// Source: https://github.com/h5bp/main.css/blob/master/src/_print.css\n\n// ==========================================================================\n// Print styles.\n// Inlined to avoid the additional HTTP request:\n// https://www.phpied.com/delay-loading-your-print-css/\n// ==========================================================================\n\n@if $enable-print-styles {\n  @media print {\n    *,\n    *::before,\n    *::after {\n      // Bootstrap specific; comment out `color` and `background`\n      //color: $black !important; // Black prints faster\n      text-shadow: none !important;\n      //background: transparent !important;\n      box-shadow: none !important;\n    }\n\n    a {\n      &:not(.btn) {\n        text-decoration: underline;\n      }\n    }\n\n    // Bootstrap specific; comment the following selector out\n    //a[href]::after {\n    //  content: \" (\" attr(href) \")\";\n    //}\n\n    abbr[title]::after {\n      content: \" (\" attr(title) \")\";\n    }\n\n    // Bootstrap specific; comment the following selector out\n    //\n    // Don't show links that are fragment identifiers,\n    // or use the `javascript:` pseudo protocol\n    //\n\n    //a[href^=\"#\"]::after,\n    //a[href^=\"javascript:\"]::after {\n    // content: \"\";\n    //}\n\n    pre {\n      white-space: pre-wrap !important;\n    }\n    pre,\n    blockquote {\n      border: $border-width solid $gray-500; // Bootstrap custom code; using `$border-width` instead of 1px\n      page-break-inside: avoid;\n    }\n\n    //\n    // Printing Tables:\n    // https://web.archive.org/web/20180815150934/http://css-discuss.incutio.com/wiki/Printing_Tables\n    //\n\n    thead {\n      display: table-header-group;\n    }\n\n    tr,\n    img {\n      page-break-inside: avoid;\n    }\n\n    p,\n    h2,\n    h3 {\n      orphans: 3;\n      widows: 3;\n    }\n\n    h2,\n    h3 {\n      page-break-after: avoid;\n    }\n\n    // Bootstrap specific changes start\n\n    // Specify a size and min-width to make printing closer across browsers.\n    // We don't set margin here because it breaks `size` in Chrome. We also\n    // don't use `!important` on `size` as it breaks in Chrome.\n    @page {\n      size: $print-page-size;\n    }\n    body {\n      min-width: $print-body-min-width !important;\n    }\n    .container {\n      min-width: $print-body-min-width !important;\n    }\n\n    // Bootstrap components\n    .navbar {\n      display: none;\n    }\n    .badge {\n      border: $border-width solid $black;\n    }\n\n    .table {\n      border-collapse: collapse !important;\n\n      td,\n      th {\n        background-color: $white !important;\n      }\n    }\n\n    .table-bordered {\n      th,\n      td {\n        border: 1px solid $gray-300 !important;\n      }\n    }\n\n    .table-dark {\n      color: inherit;\n\n      th,\n      td,\n      thead th,\n      tbody + tbody {\n        border-color: $table-border-color;\n      }\n    }\n\n    .table .thead-dark th {\n      color: inherit;\n      border-color: $table-border-color;\n    }\n\n    // Bootstrap specific changes end\n  }\n}\n"]}
\ No newline at end of file
diff --git a/ui/bootstrap/src/main/resources/css/main.css b/ui/bootstrap/src/main/resources/css/custom-bootstrap.css
similarity index 100%
rename from ui/bootstrap/src/main/resources/css/main.css
rename to ui/bootstrap/src/main/resources/css/custom-bootstrap.css
diff --git a/ui/bootstrap/src/main/resources/js/bootstrap.bundle.min.js b/ui/bootstrap/src/main/resources/js/bootstrap.bundle.min.js
deleted file mode 100644
index 78c533b4..00000000
--- a/ui/bootstrap/src/main/resources/js/bootstrap.bundle.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
-  * Bootstrap v4.4.1 (https://getbootstrap.com/)
-  * Copyright 2011-2019 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
-  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
-  */
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("jquery")):"function"==typeof define&&define.amd?define(["exports","jquery"],t):t((e=e||self).bootstrap={},e.jQuery)}(this,function(e,p){"use strict";function i(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}function s(e,t,n){return t&&i(e.prototype,t),n&&i(e,n),e}function t(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(t);e&&(i=i.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),n.push.apply(n,i)}return n}function l(o){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?t(Object(r),!0).forEach(function(e){var t,n,i;t=o,i=r[n=e],n in t?Object.defineProperty(t,n,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[n]=i}):Object.getOwnPropertyDescriptors?Object.defineProperties(o,Object.getOwnPropertyDescriptors(r)):t(Object(r)).forEach(function(e){Object.defineProperty(o,e,Object.getOwnPropertyDescriptor(r,e))})}return o}p=p&&p.hasOwnProperty("default")?p.default:p;var n="transitionend";function o(e){var t=this,n=!1;return p(this).one(m.TRANSITION_END,function(){n=!0}),setTimeout(function(){n||m.triggerTransitionEnd(t)},e),this}var m={TRANSITION_END:"bsTransitionEnd",getUID:function(e){for(;e+=~~(1e6*Math.random()),document.getElementById(e););return e},getSelectorFromElement:function(e){var t=e.getAttribute("data-target");if(!t||"#"===t){var n=e.getAttribute("href");t=n&&"#"!==n?n.trim():""}try{return document.querySelector(t)?t:null}catch(e){return null}},getTransitionDurationFromElement:function(e){if(!e)return 0;var t=p(e).css("transition-duration"),n=p(e).css("transition-delay"),i=parseFloat(t),o=parseFloat(n);return i||o?(t=t.split(",")[0],n=n.split(",")[0],1e3*(parseFloat(t)+parseFloat(n))):0},reflow:function(e){return e.offsetHeight},triggerTransitionEnd:function(e){p(e).trigger(n)},supportsTransitionEnd:function(){return Boolean(n)},isElement:function(e){return(e[0]||e).nodeType},typeCheckConfig:function(e,t,n){for(var i in n)if(Object.prototype.hasOwnProperty.call(n,i)){var o=n[i],r=t[i],s=r&&m.isElement(r)?"element":(a=r,{}.toString.call(a).match(/\s([a-z]+)/i)[1].toLowerCase());if(!new RegExp(o).test(s))throw new Error(e.toUpperCase()+': Option "'+i+'" provided type "'+s+'" but expected type "'+o+'".')}var a},findShadowRoot:function(e){if(!document.documentElement.attachShadow)return null;if("function"!=typeof e.getRootNode)return e instanceof ShadowRoot?e:e.parentNode?m.findShadowRoot(e.parentNode):null;var t=e.getRootNode();return t instanceof ShadowRoot?t:null},jQueryDetection:function(){if("undefined"==typeof p)throw new TypeError("Bootstrap's JavaScript requires jQuery. jQuery must be included before Bootstrap's JavaScript.");var e=p.fn.jquery.split(" ")[0].split(".");if(e[0]<2&&e[1]<9||1===e[0]&&9===e[1]&&e[2]<1||4<=e[0])throw new Error("Bootstrap's JavaScript requires at least jQuery v1.9.1 but less than v4.0.0")}};m.jQueryDetection(),p.fn.emulateTransitionEnd=o,p.event.special[m.TRANSITION_END]={bindType:n,delegateType:n,handle:function(e){if(p(e.target).is(this))return e.handleObj.handler.apply(this,arguments)}};var r="alert",a="bs.alert",c="."+a,h=p.fn[r],u={CLOSE:"close"+c,CLOSED:"closed"+c,CLICK_DATA_API:"click"+c+".data-api"},f="alert",d="fade",g="show",_=function(){function i(e){this._element=e}var e=i.prototype;return e.close=function(e){var t=this._element;e&&(t=this._getRootElement(e)),this._triggerCloseEvent(t).isDefaultPrevented()||this._removeElement(t)},e.dispose=function(){p.removeData(this._element,a),this._element=null},e._getRootElement=function(e){var t=m.getSelectorFromElement(e),n=!1;return t&&(n=document.querySelector(t)),n=n||p(e).closest("."+f)[0]},e._triggerCloseEvent=function(e){var t=p.Event(u.CLOSE);return p(e).trigger(t),t},e._removeElement=function(t){var n=this;if(p(t).removeClass(g),p(t).hasClass(d)){var e=m.getTransitionDurationFromElement(t);p(t).one(m.TRANSITION_END,function(e){return n._destroyElement(t,e)}).emulateTransitionEnd(e)}else this._destroyElement(t)},e._destroyElement=function(e){p(e).detach().trigger(u.CLOSED).remove()},i._jQueryInterface=function(n){return this.each(function(){var e=p(this),t=e.data(a);t||(t=new i(this),e.data(a,t)),"close"===n&&t[n](this)})},i._handleDismiss=function(t){return function(e){e&&e.preventDefault(),t.close(this)}},s(i,null,[{key:"VERSION",get:function(){return"4.4.1"}}]),i}();p(document).on(u.CLICK_DATA_API,'[data-dismiss="alert"]',_._handleDismiss(new _)),p.fn[r]=_._jQueryInterface,p.fn[r].Constructor=_,p.fn[r].noConflict=function(){return p.fn[r]=h,_._jQueryInterface};var v="button",y="bs.button",E="."+y,b=".data-api",w=p.fn[v],T="active",C="btn",S="focus",D='[data-toggle^="button"]',I='[data-toggle="buttons"]',A='[data-toggle="button"]',O='[data-toggle="buttons"] .btn',N='input:not([type="hidden"])',k=".active",L=".btn",P={CLICK_DATA_API:"click"+E+b,FOCUS_BLUR_DATA_API:"focus"+E+b+" blur"+E+b,LOAD_DATA_API:"load"+E+b},x=function(){function n(e){this._element=e}var e=n.prototype;return e.toggle=function(){var e=!0,t=!0,n=p(this._element).closest(I)[0];if(n){var i=this._element.querySelector(N);if(i){if("radio"===i.type)if(i.checked&&this._element.classList.contains(T))e=!1;else{var o=n.querySelector(k);o&&p(o).removeClass(T)}else"checkbox"===i.type?"LABEL"===this._element.tagName&&i.checked===this._element.classList.contains(T)&&(e=!1):e=!1;e&&(i.checked=!this._element.classList.contains(T),p(i).trigger("change")),i.focus(),t=!1}}this._element.hasAttribute("disabled")||this._element.classList.contains("disabled")||(t&&this._element.setAttribute("aria-pressed",!this._element.classList.contains(T)),e&&p(this._element).toggleClass(T))},e.dispose=function(){p.removeData(this._element,y),this._element=null},n._jQueryInterface=function(t){return this.each(function(){var e=p(this).data(y);e||(e=new n(this),p(this).data(y,e)),"toggle"===t&&e[t]()})},s(n,null,[{key:"VERSION",get:function(){return"4.4.1"}}]),n}();p(document).on(P.CLICK_DATA_API,D,function(e){var t=e.target;if(p(t).hasClass(C)||(t=p(t).closest(L)[0]),!t||t.hasAttribute("disabled")||t.classList.contains("disabled"))e.preventDefault();else{var n=t.querySelector(N);if(n&&(n.hasAttribute("disabled")||n.classList.contains("disabled")))return void e.preventDefault();x._jQueryInterface.call(p(t),"toggle")}}).on(P.FOCUS_BLUR_DATA_API,D,function(e){var t=p(e.target).closest(L)[0];p(t).toggleClass(S,/^focus(in)?$/.test(e.type))}),p(window).on(P.LOAD_DATA_API,function(){for(var e=[].slice.call(document.querySelectorAll(O)),t=0,n=e.length;t<n;t++){var i=e[t],o=i.querySelector(N);o.checked||o.hasAttribute("checked")?i.classList.add(T):i.classList.remove(T)}for(var r=0,s=(e=[].slice.call(document.querySelectorAll(A))).length;r<s;r++){var a=e[r];"true"===a.getAttribute("aria-pressed")?a.classList.add(T):a.classList.remove(T)}}),p.fn[v]=x._jQueryInterface,p.fn[v].Constructor=x,p.fn[v].noConflict=function(){return p.fn[v]=w,x._jQueryInterface};var j="carousel",H="bs.carousel",R="."+H,F=".data-api",M=p.fn[j],W={interval:5e3,keyboard:!0,slide:!1,pause:"hover",wrap:!0,touch:!0},U={interval:"(number|boolean)",keyboard:"boolean",slide:"(boolean|string)",pause:"(string|boolean)",wrap:"boolean",touch:"boolean"},B="next",q="prev",K="left",Q="right",V={SLIDE:"slide"+R,SLID:"slid"+R,KEYDOWN:"keydown"+R,MOUSEENTER:"mouseenter"+R,MOUSELEAVE:"mouseleave"+R,TOUCHSTART:"touchstart"+R,TOUCHMOVE:"touchmove"+R,TOUCHEND:"touchend"+R,POINTERDOWN:"pointerdown"+R,POINTERUP:"pointerup"+R,DRAG_START:"dragstart"+R,LOAD_DATA_API:"load"+R+F,CLICK_DATA_API:"click"+R+F},Y="carousel",z="active",X="slide",G="carousel-item-right",$="carousel-item-left",J="carousel-item-next",Z="carousel-item-prev",ee="pointer-event",te=".active",ne=".active.carousel-item",ie=".carousel-item",oe=".carousel-item img",re=".carousel-item-next, .carousel-item-prev",se=".carousel-indicators",ae="[data-slide], [data-slide-to]",le='[data-ride="carousel"]',ce={TOUCH:"touch",PEN:"pen"},he=function(){function r(e,t){this._items=null,this._interval=null,this._activeElement=null,this._isPaused=!1,this._isSliding=!1,this.touchTimeout=null,this.touchStartX=0,this.touchDeltaX=0,this._config=this._getConfig(t),this._element=e,this._indicatorsElement=this._element.querySelector(se),this._touchSupported="ontouchstart"in document.documentElement||0<navigator.maxTouchPoints,this._pointerEvent=Boolean(window.PointerEvent||window.MSPointerEvent),this._addEventListeners()}var e=r.prototype;return e.next=function(){this._isSliding||this._slide(B)},e.nextWhenVisible=function(){!document.hidden&&p(this._element).is(":visible")&&"hidden"!==p(this._element).css("visibility")&&this.next()},e.prev=function(){this._isSliding||this._slide(q)},e.pause=function(e){e||(this._isPaused=!0),this._element.querySelector(re)&&(m.triggerTransitionEnd(this._element),this.cycle(!0)),clearInterval(this._interval),this._interval=null},e.cycle=function(e){e||(this._isPaused=!1),this._interval&&(clearInterval(this._interval),this._interval=null),this._config.interval&&!this._isPaused&&(this._interval=setInterval((document.visibilityState?this.nextWhenVisible:this.next).bind(this),this._config.interval))},e.to=function(e){var t=this;this._activeElement=this._element.querySelector(ne);var n=this._getItemIndex(this._activeElement);if(!(e>this._items.length-1||e<0))if(this._isSliding)p(this._element).one(V.SLID,function(){return t.to(e)});else{if(n===e)return this.pause(),void this.cycle();var i=n<e?B:q;this._slide(i,this._items[e])}},e.dispose=function(){p(this._element).off(R),p.removeData(this._element,H),this._items=null,this._config=null,this._element=null,this._interval=null,this._isPaused=null,this._isSliding=null,this._activeElement=null,this._indicatorsElement=null},e._getConfig=function(e){return e=l({},W,{},e),m.typeCheckConfig(j,e,U),e},e._handleSwipe=function(){var e=Math.abs(this.touchDeltaX);if(!(e<=40)){var t=e/this.touchDeltaX;(this.touchDeltaX=0)<t&&this.prev(),t<0&&this.next()}},e._addEventListeners=function(){var t=this;this._config.keyboard&&p(this._element).on(V.KEYDOWN,function(e){return t._keydown(e)}),"hover"===this._config.pause&&p(this._element).on(V.MOUSEENTER,function(e){return t.pause(e)}).on(V.MOUSELEAVE,function(e){return t.cycle(e)}),this._config.touch&&this._addTouchEventListeners()},e._addTouchEventListeners=function(){var t=this;if(this._touchSupported){var n=function(e){t._pointerEvent&&ce[e.originalEvent.pointerType.toUpperCase()]?t.touchStartX=e.originalEvent.clientX:t._pointerEvent||(t.touchStartX=e.originalEvent.touches[0].clientX)},i=function(e){t._pointerEvent&&ce[e.originalEvent.pointerType.toUpperCase()]&&(t.touchDeltaX=e.originalEvent.clientX-t.touchStartX),t._handleSwipe(),"hover"===t._config.pause&&(t.pause(),t.touchTimeout&&clearTimeout(t.touchTimeout),t.touchTimeout=setTimeout(function(e){return t.cycle(e)},500+t._config.interval))};p(this._element.querySelectorAll(oe)).on(V.DRAG_START,function(e){return e.preventDefault()}),this._pointerEvent?(p(this._element).on(V.POINTERDOWN,function(e){return n(e)}),p(this._element).on(V.POINTERUP,function(e){return i(e)}),this._element.classList.add(ee)):(p(this._element).on(V.TOUCHSTART,function(e){return n(e)}),p(this._element).on(V.TOUCHMOVE,function(e){return function(e){e.originalEvent.touches&&1<e.originalEvent.touches.length?t.touchDeltaX=0:t.touchDeltaX=e.originalEvent.touches[0].clientX-t.touchStartX}(e)}),p(this._element).on(V.TOUCHEND,function(e){return i(e)}))}},e._keydown=function(e){if(!/input|textarea/i.test(e.target.tagName))switch(e.which){case 37:e.preventDefault(),this.prev();break;case 39:e.preventDefault(),this.next()}},e._getItemIndex=function(e){return this._items=e&&e.parentNode?[].slice.call(e.parentNode.querySelectorAll(ie)):[],this._items.indexOf(e)},e._getItemByDirection=function(e,t){var n=e===B,i=e===q,o=this._getItemIndex(t),r=this._items.length-1;if((i&&0===o||n&&o===r)&&!this._config.wrap)return t;var s=(o+(e===q?-1:1))%this._items.length;return-1==s?this._items[this._items.length-1]:this._items[s]},e._triggerSlideEvent=function(e,t){var n=this._getItemIndex(e),i=this._getItemIndex(this._element.querySelector(ne)),o=p.Event(V.SLIDE,{relatedTarget:e,direction:t,from:i,to:n});return p(this._element).trigger(o),o},e._setActiveIndicatorElement=function(e){if(this._indicatorsElement){var t=[].slice.call(this._indicatorsElement.querySelectorAll(te));p(t).removeClass(z);var n=this._indicatorsElement.children[this._getItemIndex(e)];n&&p(n).addClass(z)}},e._slide=function(e,t){var n,i,o,r=this,s=this._element.querySelector(ne),a=this._getItemIndex(s),l=t||s&&this._getItemByDirection(e,s),c=this._getItemIndex(l),h=Boolean(this._interval);if(o=e===B?(n=$,i=J,K):(n=G,i=Z,Q),l&&p(l).hasClass(z))this._isSliding=!1;else if(!this._triggerSlideEvent(l,o).isDefaultPrevented()&&s&&l){this._isSliding=!0,h&&this.pause(),this._setActiveIndicatorElement(l);var u=p.Event(V.SLID,{relatedTarget:l,direction:o,from:a,to:c});if(p(this._element).hasClass(X)){p(l).addClass(i),m.reflow(l),p(s).addClass(n),p(l).addClass(n);var f=parseInt(l.getAttribute("data-interval"),10);f?(this._config.defaultInterval=this._config.defaultInterval||this._config.interval,this._config.interval=f):this._config.interval=this._config.defaultInterval||this._config.interval;var d=m.getTransitionDurationFromElement(s);p(s).one(m.TRANSITION_END,function(){p(l).removeClass(n+" "+i).addClass(z),p(s).removeClass(z+" "+i+" "+n),r._isSliding=!1,setTimeout(function(){return p(r._element).trigger(u)},0)}).emulateTransitionEnd(d)}else p(s).removeClass(z),p(l).addClass(z),this._isSliding=!1,p(this._element).trigger(u);h&&this.cycle()}},r._jQueryInterface=function(i){return this.each(function(){var e=p(this).data(H),t=l({},W,{},p(this).data());"object"==typeof i&&(t=l({},t,{},i));var n="string"==typeof i?i:t.slide;if(e||(e=new r(this,t),p(this).data(H,e)),"number"==typeof i)e.to(i);else if("string"==typeof n){if("undefined"==typeof e[n])throw new TypeError('No method named "'+n+'"');e[n]()}else t.interval&&t.ride&&(e.pause(),e.cycle())})},r._dataApiClickHandler=function(e){var t=m.getSelectorFromElement(this);if(t){var n=p(t)[0];if(n&&p(n).hasClass(Y)){var i=l({},p(n).data(),{},p(this).data()),o=this.getAttribute("data-slide-to");o&&(i.interval=!1),r._jQueryInterface.call(p(n),i),o&&p(n).data(H).to(o),e.preventDefault()}}},s(r,null,[{key:"VERSION",get:function(){return"4.4.1"}},{key:"Default",get:function(){return W}}]),r}();p(document).on(V.CLICK_DATA_API,ae,he._dataApiClickHandler),p(window).on(V.LOAD_DATA_API,function(){for(var e=[].slice.call(document.querySelectorAll(le)),t=0,n=e.length;t<n;t++){var i=p(e[t]);he._jQueryInterface.call(i,i.data())}}),p.fn[j]=he._jQueryInterface,p.fn[j].Constructor=he,p.fn[j].noConflict=function(){return p.fn[j]=M,he._jQueryInterface};var ue="collapse",fe="bs.collapse",de="."+fe,pe=p.fn[ue],me={toggle:!0,parent:""},ge={toggle:"boolean",parent:"(string|element)"},_e={SHOW:"show"+de,SHOWN:"shown"+de,HIDE:"hide"+de,HIDDEN:"hidden"+de,CLICK_DATA_API:"click"+de+".data-api"},ve="show",ye="collapse",Ee="collapsing",be="collapsed",we="width",Te="height",Ce=".show, .collapsing",Se='[data-toggle="collapse"]',De=function(){function a(t,e){this._isTransitioning=!1,this._element=t,this._config=this._getConfig(e),this._triggerArray=[].slice.call(document.querySelectorAll('[data-toggle="collapse"][href="#'+t.id+'"],[data-toggle="collapse"][data-target="#'+t.id+'"]'));for(var n=[].slice.call(document.querySelectorAll(Se)),i=0,o=n.length;i<o;i++){var r=n[i],s=m.getSelectorFromElement(r),a=[].slice.call(document.querySelectorAll(s)).filter(function(e){return e===t});null!==s&&0<a.length&&(this._selector=s,this._triggerArray.push(r))}this._parent=this._config.parent?this._getParent():null,this._config.parent||this._addAriaAndCollapsedClass(this._element,this._triggerArray),this._config.toggle&&this.toggle()}var e=a.prototype;return e.toggle=function(){p(this._element).hasClass(ve)?this.hide():this.show()},e.show=function(){var e,t,n=this;if(!this._isTransitioning&&!p(this._element).hasClass(ve)&&(this._parent&&0===(e=[].slice.call(this._parent.querySelectorAll(Ce)).filter(function(e){return"string"==typeof n._config.parent?e.getAttribute("data-parent")===n._config.parent:e.classList.contains(ye)})).length&&(e=null),!(e&&(t=p(e).not(this._selector).data(fe))&&t._isTransitioning))){var i=p.Event(_e.SHOW);if(p(this._element).trigger(i),!i.isDefaultPrevented()){e&&(a._jQueryInterface.call(p(e).not(this._selector),"hide"),t||p(e).data(fe,null));var o=this._getDimension();p(this._element).removeClass(ye).addClass(Ee),this._element.style[o]=0,this._triggerArray.length&&p(this._triggerArray).removeClass(be).attr("aria-expanded",!0),this.setTransitioning(!0);var r="scroll"+(o[0].toUpperCase()+o.slice(1)),s=m.getTransitionDurationFromElement(this._element);p(this._element).one(m.TRANSITION_END,function(){p(n._element).removeClass(Ee).addClass(ye).addClass(ve),n._element.style[o]="",n.setTransitioning(!1),p(n._element).trigger(_e.SHOWN)}).emulateTransitionEnd(s),this._element.style[o]=this._element[r]+"px"}}},e.hide=function(){var e=this;if(!this._isTransitioning&&p(this._element).hasClass(ve)){var t=p.Event(_e.HIDE);if(p(this._element).trigger(t),!t.isDefaultPrevented()){var n=this._getDimension();this._element.style[n]=this._element.getBoundingClientRect()[n]+"px",m.reflow(this._element),p(this._element).addClass(Ee).removeClass(ye).removeClass(ve);var i=this._triggerArray.length;if(0<i)for(var o=0;o<i;o++){var r=this._triggerArray[o],s=m.getSelectorFromElement(r);if(null!==s)p([].slice.call(document.querySelectorAll(s))).hasClass(ve)||p(r).addClass(be).attr("aria-expanded",!1)}this.setTransitioning(!0);this._element.style[n]="";var a=m.getTransitionDurationFromElement(this._element);p(this._element).one(m.TRANSITION_END,function(){e.setTransitioning(!1),p(e._element).removeClass(Ee).addClass(ye).trigger(_e.HIDDEN)}).emulateTransitionEnd(a)}}},e.setTransitioning=function(e){this._isTransitioning=e},e.dispose=function(){p.removeData(this._element,fe),this._config=null,this._parent=null,this._element=null,this._triggerArray=null,this._isTransitioning=null},e._getConfig=function(e){return(e=l({},me,{},e)).toggle=Boolean(e.toggle),m.typeCheckConfig(ue,e,ge),e},e._getDimension=function(){return p(this._element).hasClass(we)?we:Te},e._getParent=function(){var e,n=this;m.isElement(this._config.parent)?(e=this._config.parent,"undefined"!=typeof this._config.parent.jquery&&(e=this._config.parent[0])):e=document.querySelector(this._config.parent);var t='[data-toggle="collapse"][data-parent="'+this._config.parent+'"]',i=[].slice.call(e.querySelectorAll(t));return p(i).each(function(e,t){n._addAriaAndCollapsedClass(a._getTargetFromElement(t),[t])}),e},e._addAriaAndCollapsedClass=function(e,t){var n=p(e).hasClass(ve);t.length&&p(t).toggleClass(be,!n).attr("aria-expanded",n)},a._getTargetFromElement=function(e){var t=m.getSelectorFromElement(e);return t?document.querySelector(t):null},a._jQueryInterface=function(i){return this.each(function(){var e=p(this),t=e.data(fe),n=l({},me,{},e.data(),{},"object"==typeof i&&i?i:{});if(!t&&n.toggle&&/show|hide/.test(i)&&(n.toggle=!1),t||(t=new a(this,n),e.data(fe,t)),"string"==typeof i){if("undefined"==typeof t[i])throw new TypeError('No method named "'+i+'"');t[i]()}})},s(a,null,[{key:"VERSION",get:function(){return"4.4.1"}},{key:"Default",get:function(){return me}}]),a}();p(document).on(_e.CLICK_DATA_API,Se,function(e){"A"===e.currentTarget.tagName&&e.preventDefault();var n=p(this),t=m.getSelectorFromElement(this),i=[].slice.call(document.querySelectorAll(t));p(i).each(function(){var e=p(this),t=e.data(fe)?"toggle":n.data();De._jQueryInterface.call(e,t)})}),p.fn[ue]=De._jQueryInterface,p.fn[ue].Constructor=De,p.fn[ue].noConflict=function(){return p.fn[ue]=pe,De._jQueryInterface};var Ie="undefined"!=typeof window&&"undefined"!=typeof document&&"undefined"!=typeof navigator,Ae=function(){for(var e=["Edge","Trident","Firefox"],t=0;t<e.length;t+=1)if(Ie&&0<=navigator.userAgent.indexOf(e[t]))return 1;return 0}();var Oe=Ie&&window.Promise?function(e){var t=!1;return function(){t||(t=!0,window.Promise.resolve().then(function(){t=!1,e()}))}}:function(e){var t=!1;return function(){t||(t=!0,setTimeout(function(){t=!1,e()},Ae))}};function Ne(e){return e&&"[object Function]"==={}.toString.call(e)}function ke(e,t){if(1!==e.nodeType)return[];var n=e.ownerDocument.defaultView.getComputedStyle(e,null);return t?n[t]:n}function Le(e){return"HTML"===e.nodeName?e:e.parentNode||e.host}function Pe(e){if(!e)return document.body;switch(e.nodeName){case"HTML":case"BODY":return e.ownerDocument.body;case"#document":return e.body}var t=ke(e),n=t.overflow,i=t.overflowX,o=t.overflowY;return/(auto|scroll|overlay)/.test(n+o+i)?e:Pe(Le(e))}function xe(e){return e&&e.referenceNode?e.referenceNode:e}var je=Ie&&!(!window.MSInputMethodContext||!document.documentMode),He=Ie&&/MSIE 10/.test(navigator.userAgent);function Re(e){return 11===e?je:10===e?He:je||He}function Fe(e){if(!e)return document.documentElement;for(var t=Re(10)?document.body:null,n=e.offsetParent||null;n===t&&e.nextElementSibling;)n=(e=e.nextElementSibling).offsetParent;var i=n&&n.nodeName;return i&&"BODY"!==i&&"HTML"!==i?-1!==["TH","TD","TABLE"].indexOf(n.nodeName)&&"static"===ke(n,"position")?Fe(n):n:e?e.ownerDocument.documentElement:document.documentElement}function Me(e){return null!==e.parentNode?Me(e.parentNode):e}function We(e,t){if(!(e&&e.nodeType&&t&&t.nodeType))return document.documentElement;var n=e.compareDocumentPosition(t)&Node.DOCUMENT_POSITION_FOLLOWING,i=n?e:t,o=n?t:e,r=document.createRange();r.setStart(i,0),r.setEnd(o,0);var s=r.commonAncestorContainer;if(e!==s&&t!==s||i.contains(o))return function(e){var t=e.nodeName;return"BODY"!==t&&("HTML"===t||Fe(e.firstElementChild)===e)}(s)?s:Fe(s);var a=Me(e);return a.host?We(a.host,t):We(e,Me(t).host)}function Ue(e,t){var n="top"===(1<arguments.length&&void 0!==t?t:"top")?"scrollTop":"scrollLeft",i=e.nodeName;if("BODY"!==i&&"HTML"!==i)return e[n];var o=e.ownerDocument.documentElement;return(e.ownerDocument.scrollingElement||o)[n]}function Be(e,t){var n="x"===t?"Left":"Top",i="Left"==n?"Right":"Bottom";return parseFloat(e["border"+n+"Width"],10)+parseFloat(e["border"+i+"Width"],10)}function qe(e,t,n,i){return Math.max(t["offset"+e],t["scroll"+e],n["client"+e],n["offset"+e],n["scroll"+e],Re(10)?parseInt(n["offset"+e])+parseInt(i["margin"+("Height"===e?"Top":"Left")])+parseInt(i["margin"+("Height"===e?"Bottom":"Right")]):0)}function Ke(e){var t=e.body,n=e.documentElement,i=Re(10)&&getComputedStyle(n);return{height:qe("Height",t,n,i),width:qe("Width",t,n,i)}}var Qe=function(e,t,n){return t&&Ve(e.prototype,t),n&&Ve(e,n),e};function Ve(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}function Ye(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var ze=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var i in n)Object.prototype.hasOwnProperty.call(n,i)&&(e[i]=n[i])}return e};function Xe(e){return ze({},e,{right:e.left+e.width,bottom:e.top+e.height})}function Ge(e){var t={};try{if(Re(10)){t=e.getBoundingClientRect();var n=Ue(e,"top"),i=Ue(e,"left");t.top+=n,t.left+=i,t.bottom+=n,t.right+=i}else t=e.getBoundingClientRect()}catch(e){}var o={left:t.left,top:t.top,width:t.right-t.left,height:t.bottom-t.top},r="HTML"===e.nodeName?Ke(e.ownerDocument):{},s=r.width||e.clientWidth||o.width,a=r.height||e.clientHeight||o.height,l=e.offsetWidth-s,c=e.offsetHeight-a;if(l||c){var h=ke(e);l-=Be(h,"x"),c-=Be(h,"y"),o.width-=l,o.height-=c}return Xe(o)}function $e(e,t,n){var i=2<arguments.length&&void 0!==n&&n,o=Re(10),r="HTML"===t.nodeName,s=Ge(e),a=Ge(t),l=Pe(e),c=ke(t),h=parseFloat(c.borderTopWidth,10),u=parseFloat(c.borderLeftWidth,10);i&&r&&(a.top=Math.max(a.top,0),a.left=Math.max(a.left,0));var f=Xe({top:s.top-a.top-h,left:s.left-a.left-u,width:s.width,height:s.height});if(f.marginTop=0,f.marginLeft=0,!o&&r){var d=parseFloat(c.marginTop,10),p=parseFloat(c.marginLeft,10);f.top-=h-d,f.bottom-=h-d,f.left-=u-p,f.right-=u-p,f.marginTop=d,f.marginLeft=p}return(o&&!i?t.contains(l):t===l&&"BODY"!==l.nodeName)&&(f=function(e,t,n){var i=2<arguments.length&&void 0!==n&&n,o=Ue(t,"top"),r=Ue(t,"left"),s=i?-1:1;return e.top+=o*s,e.bottom+=o*s,e.left+=r*s,e.right+=r*s,e}(f,t)),f}function Je(e){if(!e||!e.parentElement||Re())return document.documentElement;for(var t=e.parentElement;t&&"none"===ke(t,"transform");)t=t.parentElement;return t||document.documentElement}function Ze(e,t,n,i,o){var r=4<arguments.length&&void 0!==o&&o,s={top:0,left:0},a=r?Je(e):We(e,xe(t));if("viewport"===i)s=function(e,t){var n=1<arguments.length&&void 0!==t&&t,i=e.ownerDocument.documentElement,o=$e(e,i),r=Math.max(i.clientWidth,window.innerWidth||0),s=Math.max(i.clientHeight,window.innerHeight||0),a=n?0:Ue(i),l=n?0:Ue(i,"left");return Xe({top:a-o.top+o.marginTop,left:l-o.left+o.marginLeft,width:r,height:s})}(a,r);else{var l=void 0;"scrollParent"===i?"BODY"===(l=Pe(Le(t))).nodeName&&(l=e.ownerDocument.documentElement):l="window"===i?e.ownerDocument.documentElement:i;var c=$e(l,a,r);if("HTML"!==l.nodeName||function e(t){var n=t.nodeName;if("BODY"===n||"HTML"===n)return!1;if("fixed"===ke(t,"position"))return!0;var i=Le(t);return!!i&&e(i)}(a))s=c;else{var h=Ke(e.ownerDocument),u=h.height,f=h.width;s.top+=c.top-c.marginTop,s.bottom=u+c.top,s.left+=c.left-c.marginLeft,s.right=f+c.left}}var d="number"==typeof(n=n||0);return s.left+=d?n:n.left||0,s.top+=d?n:n.top||0,s.right-=d?n:n.right||0,s.bottom-=d?n:n.bottom||0,s}function et(e,t,i,n,o,r){var s=5<arguments.length&&void 0!==r?r:0;if(-1===e.indexOf("auto"))return e;var a=Ze(i,n,s,o),l={top:{width:a.width,height:t.top-a.top},right:{width:a.right-t.right,height:a.height},bottom:{width:a.width,height:a.bottom-t.bottom},left:{width:t.left-a.left,height:a.height}},c=Object.keys(l).map(function(e){return ze({key:e},l[e],{area:function(e){return e.width*e.height}(l[e])})}).sort(function(e,t){return t.area-e.area}),h=c.filter(function(e){var t=e.width,n=e.height;return t>=i.clientWidth&&n>=i.clientHeight}),u=0<h.length?h[0].key:c[0].key,f=e.split("-")[1];return u+(f?"-"+f:"")}function tt(e,t,n,i){var o=3<arguments.length&&void 0!==i?i:null;return $e(n,o?Je(t):We(t,xe(n)),o)}function nt(e){var t=e.ownerDocument.defaultView.getComputedStyle(e),n=parseFloat(t.marginTop||0)+parseFloat(t.marginBottom||0),i=parseFloat(t.marginLeft||0)+parseFloat(t.marginRight||0);return{width:e.offsetWidth+i,height:e.offsetHeight+n}}function it(e){var t={left:"right",right:"left",bottom:"top",top:"bottom"};return e.replace(/left|right|bottom|top/g,function(e){return t[e]})}function ot(e,t,n){n=n.split("-")[0];var i=nt(e),o={width:i.width,height:i.height},r=-1!==["right","left"].indexOf(n),s=r?"top":"left",a=r?"left":"top",l=r?"height":"width",c=r?"width":"height";return o[s]=t[s]+t[l]/2-i[l]/2,o[a]=n===a?t[a]-i[c]:t[it(a)],o}function rt(e,t){return Array.prototype.find?e.find(t):e.filter(t)[0]}function st(e,n,t){return(void 0===t?e:e.slice(0,function(e,t,n){if(Array.prototype.findIndex)return e.findIndex(function(e){return e[t]===n});var i=rt(e,function(e){return e[t]===n});return e.indexOf(i)}(e,"name",t))).forEach(function(e){e.function&&console.warn("`modifier.function` is deprecated, use `modifier.fn`!");var t=e.function||e.fn;e.enabled&&Ne(t)&&(n.offsets.popper=Xe(n.offsets.popper),n.offsets.reference=Xe(n.offsets.reference),n=t(n,e))}),n}function at(e,n){return e.some(function(e){var t=e.name;return e.enabled&&t===n})}function lt(e){for(var t=[!1,"ms","Webkit","Moz","O"],n=e.charAt(0).toUpperCase()+e.slice(1),i=0;i<t.length;i++){var o=t[i],r=o?""+o+n:e;if("undefined"!=typeof document.body.style[r])return r}return null}function ct(e){var t=e.ownerDocument;return t?t.defaultView:window}function ht(e,t,n,i){n.updateBound=i,ct(e).addEventListener("resize",n.updateBound,{passive:!0});var o=Pe(e);return function e(t,n,i,o){var r="BODY"===t.nodeName,s=r?t.ownerDocument.defaultView:t;s.addEventListener(n,i,{passive:!0}),r||e(Pe(s.parentNode),n,i,o),o.push(s)}(o,"scroll",n.updateBound,n.scrollParents),n.scrollElement=o,n.eventsEnabled=!0,n}function ut(){this.state.eventsEnabled&&(cancelAnimationFrame(this.scheduleUpdate),this.state=function(e,t){return ct(e).removeEventListener("resize",t.updateBound),t.scrollParents.forEach(function(e){e.removeEventListener("scroll",t.updateBound)}),t.updateBound=null,t.scrollParents=[],t.scrollElement=null,t.eventsEnabled=!1,t}(this.reference,this.state))}function ft(e){return""!==e&&!isNaN(parseFloat(e))&&isFinite(e)}function dt(n,i){Object.keys(i).forEach(function(e){var t="";-1!==["width","height","top","right","bottom","left"].indexOf(e)&&ft(i[e])&&(t="px"),n.style[e]=i[e]+t})}function pt(e,t){function n(e){return e}var i=e.offsets,o=i.popper,r=i.reference,s=Math.round,a=Math.floor,l=s(r.width),c=s(o.width),h=-1!==["left","right"].indexOf(e.placement),u=-1!==e.placement.indexOf("-"),f=t?h||u||l%2==c%2?s:a:n,d=t?s:n;return{left:f(l%2==1&&c%2==1&&!u&&t?o.left-1:o.left),top:d(o.top),bottom:d(o.bottom),right:f(o.right)}}var mt=Ie&&/Firefox/i.test(navigator.userAgent);function gt(e,t,n){var i=rt(e,function(e){return e.name===t}),o=!!i&&e.some(function(e){return e.name===n&&e.enabled&&e.order<i.order});if(!o){var r="`"+t+"`",s="`"+n+"`";console.warn(s+" modifier is required by "+r+" modifier in order to work, be sure to include it before "+r+"!")}return o}var _t=["auto-start","auto","auto-end","top-start","top","top-end","right-start","right","right-end","bottom-end","bottom","bottom-start","left-end","left","left-start"],vt=_t.slice(3);function yt(e,t){var n=1<arguments.length&&void 0!==t&&t,i=vt.indexOf(e),o=vt.slice(i+1).concat(vt.slice(0,i));return n?o.reverse():o}var Et="flip",bt="clockwise",wt="counterclockwise";function Tt(e,o,r,t){var s=[0,0],a=-1!==["right","left"].indexOf(t),n=e.split(/(\+|\-)/).map(function(e){return e.trim()}),i=n.indexOf(rt(n,function(e){return-1!==e.search(/,|\s/)}));n[i]&&-1===n[i].indexOf(",")&&console.warn("Offsets separated by white space(s) are deprecated, use a comma (,) instead.");var l=/\s*,\s*|\s+/,c=-1!==i?[n.slice(0,i).concat([n[i].split(l)[0]]),[n[i].split(l)[1]].concat(n.slice(i+1))]:[n];return(c=c.map(function(e,t){var n=(1===t?!a:a)?"height":"width",i=!1;return e.reduce(function(e,t){return""===e[e.length-1]&&-1!==["+","-"].indexOf(t)?(e[e.length-1]=t,i=!0,e):i?(e[e.length-1]+=t,i=!1,e):e.concat(t)},[]).map(function(e){return function(e,t,n,i){var o=e.match(/((?:\-|\+)?\d*\.?\d*)(.*)/),r=+o[1],s=o[2];if(!r)return e;if(0!==s.indexOf("%"))return"vh"!==s&&"vw"!==s?r:("vh"===s?Math.max(document.documentElement.clientHeight,window.innerHeight||0):Math.max(document.documentElement.clientWidth,window.innerWidth||0))/100*r;var a=void 0;switch(s){case"%p":a=n;break;case"%":case"%r":default:a=i}return Xe(a)[t]/100*r}(e,n,o,r)})})).forEach(function(n,i){n.forEach(function(e,t){ft(e)&&(s[i]+=e*("-"===n[t-1]?-1:1))})}),s}var Ct={placement:"bottom",positionFixed:!1,eventsEnabled:!0,removeOnDestroy:!1,onCreate:function(){},onUpdate:function(){},modifiers:{shift:{order:100,enabled:!0,fn:function(e){var t=e.placement,n=t.split("-")[0],i=t.split("-")[1];if(i){var o=e.offsets,r=o.reference,s=o.popper,a=-1!==["bottom","top"].indexOf(n),l=a?"left":"top",c=a?"width":"height",h={start:Ye({},l,r[l]),end:Ye({},l,r[l]+r[c]-s[c])};e.offsets.popper=ze({},s,h[i])}return e}},offset:{order:200,enabled:!0,fn:function(e,t){var n=t.offset,i=e.placement,o=e.offsets,r=o.popper,s=o.reference,a=i.split("-")[0],l=void 0;return l=ft(+n)?[+n,0]:Tt(n,r,s,a),"left"===a?(r.top+=l[0],r.left-=l[1]):"right"===a?(r.top+=l[0],r.left+=l[1]):"top"===a?(r.left+=l[0],r.top-=l[1]):"bottom"===a&&(r.left+=l[0],r.top+=l[1]),e.popper=r,e},offset:0},preventOverflow:{order:300,enabled:!0,fn:function(e,i){var t=i.boundariesElement||Fe(e.instance.popper);e.instance.reference===t&&(t=Fe(t));var n=lt("transform"),o=e.instance.popper.style,r=o.top,s=o.left,a=o[n];o.top="",o.left="",o[n]="";var l=Ze(e.instance.popper,e.instance.reference,i.padding,t,e.positionFixed);o.top=r,o.left=s,o[n]=a,i.boundaries=l;var c=i.priority,h=e.offsets.popper,u={primary:function(e){var t=h[e];return h[e]<l[e]&&!i.escapeWithReference&&(t=Math.max(h[e],l[e])),Ye({},e,t)},secondary:function(e){var t="right"===e?"left":"top",n=h[t];return h[e]>l[e]&&!i.escapeWithReference&&(n=Math.min(h[t],l[e]-("right"===e?h.width:h.height))),Ye({},t,n)}};return c.forEach(function(e){var t=-1!==["left","top"].indexOf(e)?"primary":"secondary";h=ze({},h,u[t](e))}),e.offsets.popper=h,e},priority:["left","right","top","bottom"],padding:5,boundariesElement:"scrollParent"},keepTogether:{order:400,enabled:!0,fn:function(e){var t=e.offsets,n=t.popper,i=t.reference,o=e.placement.split("-")[0],r=Math.floor,s=-1!==["top","bottom"].indexOf(o),a=s?"right":"bottom",l=s?"left":"top",c=s?"width":"height";return n[a]<r(i[l])&&(e.offsets.popper[l]=r(i[l])-n[c]),n[l]>r(i[a])&&(e.offsets.popper[l]=r(i[a])),e}},arrow:{order:500,enabled:!0,fn:function(e,t){var n;if(!gt(e.instance.modifiers,"arrow","keepTogether"))return e;var i=t.element;if("string"==typeof i){if(!(i=e.instance.popper.querySelector(i)))return e}else if(!e.instance.popper.contains(i))return console.warn("WARNING: `arrow.element` must be child of its popper element!"),e;var o=e.placement.split("-")[0],r=e.offsets,s=r.popper,a=r.reference,l=-1!==["left","right"].indexOf(o),c=l?"height":"width",h=l?"Top":"Left",u=h.toLowerCase(),f=l?"left":"top",d=l?"bottom":"right",p=nt(i)[c];a[d]-p<s[u]&&(e.offsets.popper[u]-=s[u]-(a[d]-p)),a[u]+p>s[d]&&(e.offsets.popper[u]+=a[u]+p-s[d]),e.offsets.popper=Xe(e.offsets.popper);var m=a[u]+a[c]/2-p/2,g=ke(e.instance.popper),_=parseFloat(g["margin"+h],10),v=parseFloat(g["border"+h+"Width"],10),y=m-e.offsets.popper[u]-_-v;return y=Math.max(Math.min(s[c]-p,y),0),e.arrowElement=i,e.offsets.arrow=(Ye(n={},u,Math.round(y)),Ye(n,f,""),n),e},element:"[x-arrow]"},flip:{order:600,enabled:!0,fn:function(m,g){if(at(m.instance.modifiers,"inner"))return m;if(m.flipped&&m.placement===m.originalPlacement)return m;var _=Ze(m.instance.popper,m.instance.reference,g.padding,g.boundariesElement,m.positionFixed),v=m.placement.split("-")[0],y=it(v),E=m.placement.split("-")[1]||"",b=[];switch(g.behavior){case Et:b=[v,y];break;case bt:b=yt(v);break;case wt:b=yt(v,!0);break;default:b=g.behavior}return b.forEach(function(e,t){if(v!==e||b.length===t+1)return m;v=m.placement.split("-")[0],y=it(v);var n=m.offsets.popper,i=m.offsets.reference,o=Math.floor,r="left"===v&&o(n.right)>o(i.left)||"right"===v&&o(n.left)<o(i.right)||"top"===v&&o(n.bottom)>o(i.top)||"bottom"===v&&o(n.top)<o(i.bottom),s=o(n.left)<o(_.left),a=o(n.right)>o(_.right),l=o(n.top)<o(_.top),c=o(n.bottom)>o(_.bottom),h="left"===v&&s||"right"===v&&a||"top"===v&&l||"bottom"===v&&c,u=-1!==["top","bottom"].indexOf(v),f=!!g.flipVariations&&(u&&"start"===E&&s||u&&"end"===E&&a||!u&&"start"===E&&l||!u&&"end"===E&&c),d=!!g.flipVariationsByContent&&(u&&"start"===E&&a||u&&"end"===E&&s||!u&&"start"===E&&c||!u&&"end"===E&&l),p=f||d;(r||h||p)&&(m.flipped=!0,(r||h)&&(v=b[t+1]),p&&(E=function(e){return"end"===e?"start":"start"===e?"end":e}(E)),m.placement=v+(E?"-"+E:""),m.offsets.popper=ze({},m.offsets.popper,ot(m.instance.popper,m.offsets.reference,m.placement)),m=st(m.instance.modifiers,m,"flip"))}),m},behavior:"flip",padding:5,boundariesElement:"viewport",flipVariations:!1,flipVariationsByContent:!1},inner:{order:700,enabled:!1,fn:function(e){var t=e.placement,n=t.split("-")[0],i=e.offsets,o=i.popper,r=i.reference,s=-1!==["left","right"].indexOf(n),a=-1===["top","left"].indexOf(n);return o[s?"left":"top"]=r[n]-(a?o[s?"width":"height"]:0),e.placement=it(t),e.offsets.popper=Xe(o),e}},hide:{order:800,enabled:!0,fn:function(e){if(!gt(e.instance.modifiers,"hide","preventOverflow"))return e;var t=e.offsets.reference,n=rt(e.instance.modifiers,function(e){return"preventOverflow"===e.name}).boundaries;if(t.bottom<n.top||t.left>n.right||t.top>n.bottom||t.right<n.left){if(!0===e.hide)return e;e.hide=!0,e.attributes["x-out-of-boundaries"]=""}else{if(!1===e.hide)return e;e.hide=!1,e.attributes["x-out-of-boundaries"]=!1}return e}},computeStyle:{order:850,enabled:!0,fn:function(e,t){var n=t.x,i=t.y,o=e.offsets.popper,r=rt(e.instance.modifiers,function(e){return"applyStyle"===e.name}).gpuAcceleration;void 0!==r&&console.warn("WARNING: `gpuAcceleration` option moved to `computeStyle` modifier and will not be supported in future versions of Popper.js!");var s=void 0!==r?r:t.gpuAcceleration,a=Fe(e.instance.popper),l=Ge(a),c={position:o.position},h=pt(e,window.devicePixelRatio<2||!mt),u="bottom"===n?"top":"bottom",f="right"===i?"left":"right",d=lt("transform"),p=void 0,m=void 0;if(m="bottom"==u?"HTML"===a.nodeName?-a.clientHeight+h.bottom:-l.height+h.bottom:h.top,p="right"==f?"HTML"===a.nodeName?-a.clientWidth+h.right:-l.width+h.right:h.left,s&&d)c[d]="translate3d("+p+"px, "+m+"px, 0)",c[u]=0,c[f]=0,c.willChange="transform";else{var g="bottom"==u?-1:1,_="right"==f?-1:1;c[u]=m*g,c[f]=p*_,c.willChange=u+", "+f}var v={"x-placement":e.placement};return e.attributes=ze({},v,e.attributes),e.styles=ze({},c,e.styles),e.arrowStyles=ze({},e.offsets.arrow,e.arrowStyles),e},gpuAcceleration:!0,x:"bottom",y:"right"},applyStyle:{order:900,enabled:!0,fn:function(e){return dt(e.instance.popper,e.styles),function(t,n){Object.keys(n).forEach(function(e){!1!==n[e]?t.setAttribute(e,n[e]):t.removeAttribute(e)})}(e.instance.popper,e.attributes),e.arrowElement&&Object.keys(e.arrowStyles).length&&dt(e.arrowElement,e.arrowStyles),e},onLoad:function(e,t,n,i,o){var r=tt(o,t,e,n.positionFixed),s=et(n.placement,r,t,e,n.modifiers.flip.boundariesElement,n.modifiers.flip.padding);return t.setAttribute("x-placement",s),dt(t,{position:n.positionFixed?"fixed":"absolute"}),n},gpuAcceleration:void 0}}},St=(Qe(Dt,[{key:"update",value:function(){return function(){if(!this.state.isDestroyed){var e={instance:this,styles:{},arrowStyles:{},attributes:{},flipped:!1,offsets:{}};e.offsets.reference=tt(this.state,this.popper,this.reference,this.options.positionFixed),e.placement=et(this.options.placement,e.offsets.reference,this.popper,this.reference,this.options.modifiers.flip.boundariesElement,this.options.modifiers.flip.padding),e.originalPlacement=e.placement,e.positionFixed=this.options.positionFixed,e.offsets.popper=ot(this.popper,e.offsets.reference,e.placement),e.offsets.popper.position=this.options.positionFixed?"fixed":"absolute",e=st(this.modifiers,e),this.state.isCreated?this.options.onUpdate(e):(this.state.isCreated=!0,this.options.onCreate(e))}}.call(this)}},{key:"destroy",value:function(){return function(){return this.state.isDestroyed=!0,at(this.modifiers,"applyStyle")&&(this.popper.removeAttribute("x-placement"),this.popper.style.position="",this.popper.style.top="",this.popper.style.left="",this.popper.style.right="",this.popper.style.bottom="",this.popper.style.willChange="",this.popper.style[lt("transform")]=""),this.disableEventListeners(),this.options.removeOnDestroy&&this.popper.parentNode.removeChild(this.popper),this}.call(this)}},{key:"enableEventListeners",value:function(){return function(){this.state.eventsEnabled||(this.state=ht(this.reference,this.options,this.state,this.scheduleUpdate))}.call(this)}},{key:"disableEventListeners",value:function(){return ut.call(this)}}]),Dt);function Dt(e,t){var n=this,i=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{};!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,Dt),this.scheduleUpdate=function(){return requestAnimationFrame(n.update)},this.update=Oe(this.update.bind(this)),this.options=ze({},Dt.Defaults,i),this.state={isDestroyed:!1,isCreated:!1,scrollParents:[]},this.reference=e&&e.jquery?e[0]:e,this.popper=t&&t.jquery?t[0]:t,this.options.modifiers={},Object.keys(ze({},Dt.Defaults.modifiers,i.modifiers)).forEach(function(e){n.options.modifiers[e]=ze({},Dt.Defaults.modifiers[e]||{},i.modifiers?i.modifiers[e]:{})}),this.modifiers=Object.keys(this.options.modifiers).map(function(e){return ze({name:e},n.options.modifiers[e])}).sort(function(e,t){return e.order-t.order}),this.modifiers.forEach(function(e){e.enabled&&Ne(e.onLoad)&&e.onLoad(n.reference,n.popper,n.options,e,n.state)}),this.update();var o=this.options.eventsEnabled;o&&this.enableEventListeners(),this.state.eventsEnabled=o}St.Utils=("undefined"!=typeof window?window:global).PopperUtils,St.placements=_t,St.Defaults=Ct;var It="dropdown",At="bs.dropdown",Ot="."+At,Nt=".data-api",kt=p.fn[It],Lt=new RegExp("38|40|27"),Pt={HIDE:"hide"+Ot,HIDDEN:"hidden"+Ot,SHOW:"show"+Ot,SHOWN:"shown"+Ot,CLICK:"click"+Ot,CLICK_DATA_API:"click"+Ot+Nt,KEYDOWN_DATA_API:"keydown"+Ot+Nt,KEYUP_DATA_API:"keyup"+Ot+Nt},xt="disabled",jt="show",Ht="dropup",Rt="dropright",Ft="dropleft",Mt="dropdown-menu-right",Wt="position-static",Ut='[data-toggle="dropdown"]',Bt=".dropdown form",qt=".dropdown-menu",Kt=".navbar-nav",Qt=".dropdown-menu .dropdown-item:not(.disabled):not(:disabled)",Vt="top-start",Yt="top-end",zt="bottom-start",Xt="bottom-end",Gt="right-start",$t="left-start",Jt={offset:0,flip:!0,boundary:"scrollParent",reference:"toggle",display:"dynamic",popperConfig:null},Zt={offset:"(number|string|function)",flip:"boolean",boundary:"(string|element)",reference:"(string|element)",display:"string",popperConfig:"(null|object)"},en=function(){function c(e,t){this._element=e,this._popper=null,this._config=this._getConfig(t),this._menu=this._getMenuElement(),this._inNavbar=this._detectNavbar(),this._addEventListeners()}var e=c.prototype;return e.toggle=function(){if(!this._element.disabled&&!p(this._element).hasClass(xt)){var e=p(this._menu).hasClass(jt);c._clearMenus(),e||this.show(!0)}},e.show=function(e){if(void 0===e&&(e=!1),!(this._element.disabled||p(this._element).hasClass(xt)||p(this._menu).hasClass(jt))){var t={relatedTarget:this._element},n=p.Event(Pt.SHOW,t),i=c._getParentFromElement(this._element);if(p(i).trigger(n),!n.isDefaultPrevented()){if(!this._inNavbar&&e){if("undefined"==typeof St)throw new TypeError("Bootstrap's dropdowns require Popper.js (https://popper.js.org/)");var o=this._element;"parent"===this._config.reference?o=i:m.isElement(this._config.reference)&&(o=this._config.reference,"undefined"!=typeof this._config.reference.jquery&&(o=this._config.reference[0])),"scrollParent"!==this._config.boundary&&p(i).addClass(Wt),this._popper=new St(o,this._menu,this._getPopperConfig())}"ontouchstart"in document.documentElement&&0===p(i).closest(Kt).length&&p(document.body).children().on("mouseover",null,p.noop),this._element.focus(),this._element.setAttribute("aria-expanded",!0),p(this._menu).toggleClass(jt),p(i).toggleClass(jt).trigger(p.Event(Pt.SHOWN,t))}}},e.hide=function(){if(!this._element.disabled&&!p(this._element).hasClass(xt)&&p(this._menu).hasClass(jt)){var e={relatedTarget:this._element},t=p.Event(Pt.HIDE,e),n=c._getParentFromElement(this._element);p(n).trigger(t),t.isDefaultPrevented()||(this._popper&&this._popper.destroy(),p(this._menu).toggleClass(jt),p(n).toggleClass(jt).trigger(p.Event(Pt.HIDDEN,e)))}},e.dispose=function(){p.removeData(this._element,At),p(this._element).off(Ot),this._element=null,(this._menu=null)!==this._popper&&(this._popper.destroy(),this._popper=null)},e.update=function(){this._inNavbar=this._detectNavbar(),null!==this._popper&&this._popper.scheduleUpdate()},e._addEventListeners=function(){var t=this;p(this._element).on(Pt.CLICK,function(e){e.preventDefault(),e.stopPropagation(),t.toggle()})},e._getConfig=function(e){return e=l({},this.constructor.Default,{},p(this._element).data(),{},e),m.typeCheckConfig(It,e,this.constructor.DefaultType),e},e._getMenuElement=function(){if(!this._menu){var e=c._getParentFromElement(this._element);e&&(this._menu=e.querySelector(qt))}return this._menu},e._getPlacement=function(){var e=p(this._element.parentNode),t=zt;return e.hasClass(Ht)?(t=Vt,p(this._menu).hasClass(Mt)&&(t=Yt)):e.hasClass(Rt)?t=Gt:e.hasClass(Ft)?t=$t:p(this._menu).hasClass(Mt)&&(t=Xt),t},e._detectNavbar=function(){return 0<p(this._element).closest(".navbar").length},e._getOffset=function(){var t=this,e={};return"function"==typeof this._config.offset?e.fn=function(e){return e.offsets=l({},e.offsets,{},t._config.offset(e.offsets,t._element)||{}),e}:e.offset=this._config.offset,e},e._getPopperConfig=function(){var e={placement:this._getPlacement(),modifiers:{offset:this._getOffset(),flip:{enabled:this._config.flip},preventOverflow:{boundariesElement:this._config.boundary}}};return"static"===this._config.display&&(e.modifiers.applyStyle={enabled:!1}),l({},e,{},this._config.popperConfig)},c._jQueryInterface=function(t){return this.each(function(){var e=p(this).data(At);if(e||(e=new c(this,"object"==typeof t?t:null),p(this).data(At,e)),"string"==typeof t){if("undefined"==typeof e[t])throw new TypeError('No method named "'+t+'"');e[t]()}})},c._clearMenus=function(e){if(!e||3!==e.which&&("keyup"!==e.type||9===e.which))for(var t=[].slice.call(document.querySelectorAll(Ut)),n=0,i=t.length;n<i;n++){var o=c._getParentFromElement(t[n]),r=p(t[n]).data(At),s={relatedTarget:t[n]};if(e&&"click"===e.type&&(s.clickEvent=e),r){var a=r._menu;if(p(o).hasClass(jt)&&!(e&&("click"===e.type&&/input|textarea/i.test(e.target.tagName)||"keyup"===e.type&&9===e.which)&&p.contains(o,e.target))){var l=p.Event(Pt.HIDE,s);p(o).trigger(l),l.isDefaultPrevented()||("ontouchstart"in document.documentElement&&p(document.body).children().off("mouseover",null,p.noop),t[n].setAttribute("aria-expanded","false"),r._popper&&r._popper.destroy(),p(a).removeClass(jt),p(o).removeClass(jt).trigger(p.Event(Pt.HIDDEN,s)))}}}},c._getParentFromElement=function(e){var t,n=m.getSelectorFromElement(e);return n&&(t=document.querySelector(n)),t||e.parentNode},c._dataApiKeydownHandler=function(e){if((/input|textarea/i.test(e.target.tagName)?!(32===e.which||27!==e.which&&(40!==e.which&&38!==e.which||p(e.target).closest(qt).length)):Lt.test(e.which))&&(e.preventDefault(),e.stopPropagation(),!this.disabled&&!p(this).hasClass(xt))){var t=c._getParentFromElement(this),n=p(t).hasClass(jt);if(n||27!==e.which)if(n&&(!n||27!==e.which&&32!==e.which)){var i=[].slice.call(t.querySelectorAll(Qt)).filter(function(e){return p(e).is(":visible")});if(0!==i.length){var o=i.indexOf(e.target);38===e.which&&0<o&&o--,40===e.which&&o<i.length-1&&o++,o<0&&(o=0),i[o].focus()}}else{if(27===e.which){var r=t.querySelector(Ut);p(r).trigger("focus")}p(this).trigger("click")}}},s(c,null,[{key:"VERSION",get:function(){return"4.4.1"}},{key:"Default",get:function(){return Jt}},{key:"DefaultType",get:function(){return Zt}}]),c}();p(document).on(Pt.KEYDOWN_DATA_API,Ut,en._dataApiKeydownHandler).on(Pt.KEYDOWN_DATA_API,qt,en._dataApiKeydownHandler).on(Pt.CLICK_DATA_API+" "+Pt.KEYUP_DATA_API,en._clearMenus).on(Pt.CLICK_DATA_API,Ut,function(e){e.preventDefault(),e.stopPropagation(),en._jQueryInterface.call(p(this),"toggle")}).on(Pt.CLICK_DATA_API,Bt,function(e){e.stopPropagation()}),p.fn[It]=en._jQueryInterface,p.fn[It].Constructor=en,p.fn[It].noConflict=function(){return p.fn[It]=kt,en._jQueryInterface};var tn="modal",nn="bs.modal",on="."+nn,rn=p.fn[tn],sn={backdrop:!0,keyboard:!0,focus:!0,show:!0},an={backdrop:"(boolean|string)",keyboard:"boolean",focus:"boolean",show:"boolean"},ln={HIDE:"hide"+on,HIDE_PREVENTED:"hidePrevented"+on,HIDDEN:"hidden"+on,SHOW:"show"+on,SHOWN:"shown"+on,FOCUSIN:"focusin"+on,RESIZE:"resize"+on,CLICK_DISMISS:"click.dismiss"+on,KEYDOWN_DISMISS:"keydown.dismiss"+on,MOUSEUP_DISMISS:"mouseup.dismiss"+on,MOUSEDOWN_DISMISS:"mousedown.dismiss"+on,CLICK_DATA_API:"click"+on+".data-api"},cn="modal-dialog-scrollable",hn="modal-scrollbar-measure",un="modal-backdrop",fn="modal-open",dn="fade",pn="show",mn="modal-static",gn=".modal-dialog",_n=".modal-body",vn='[data-toggle="modal"]',yn='[data-dismiss="modal"]',En=".fixed-top, .fixed-bottom, .is-fixed, .sticky-top",bn=".sticky-top",wn=function(){function o(e,t){this._config=this._getConfig(t),this._element=e,this._dialog=e.querySelector(gn),this._backdrop=null,this._isShown=!1,this._isBodyOverflowing=!1,this._ignoreBackdropClick=!1,this._isTransitioning=!1,this._scrollbarWidth=0}var e=o.prototype;return e.toggle=function(e){return this._isShown?this.hide():this.show(e)},e.show=function(e){var t=this;if(!this._isShown&&!this._isTransitioning){p(this._element).hasClass(dn)&&(this._isTransitioning=!0);var n=p.Event(ln.SHOW,{relatedTarget:e});p(this._element).trigger(n),this._isShown||n.isDefaultPrevented()||(this._isShown=!0,this._checkScrollbar(),this._setScrollbar(),this._adjustDialog(),this._setEscapeEvent(),this._setResizeEvent(),p(this._element).on(ln.CLICK_DISMISS,yn,function(e){return t.hide(e)}),p(this._dialog).on(ln.MOUSEDOWN_DISMISS,function(){p(t._element).one(ln.MOUSEUP_DISMISS,function(e){p(e.target).is(t._element)&&(t._ignoreBackdropClick=!0)})}),this._showBackdrop(function(){return t._showElement(e)}))}},e.hide=function(e){var t=this;if(e&&e.preventDefault(),this._isShown&&!this._isTransitioning){var n=p.Event(ln.HIDE);if(p(this._element).trigger(n),this._isShown&&!n.isDefaultPrevented()){this._isShown=!1;var i=p(this._element).hasClass(dn);if(i&&(this._isTransitioning=!0),this._setEscapeEvent(),this._setResizeEvent(),p(document).off(ln.FOCUSIN),p(this._element).removeClass(pn),p(this._element).off(ln.CLICK_DISMISS),p(this._dialog).off(ln.MOUSEDOWN_DISMISS),i){var o=m.getTransitionDurationFromElement(this._element);p(this._element).one(m.TRANSITION_END,function(e){return t._hideModal(e)}).emulateTransitionEnd(o)}else this._hideModal()}}},e.dispose=function(){[window,this._element,this._dialog].forEach(function(e){return p(e).off(on)}),p(document).off(ln.FOCUSIN),p.removeData(this._element,nn),this._config=null,this._element=null,this._dialog=null,this._backdrop=null,this._isShown=null,this._isBodyOverflowing=null,this._ignoreBackdropClick=null,this._isTransitioning=null,this._scrollbarWidth=null},e.handleUpdate=function(){this._adjustDialog()},e._getConfig=function(e){return e=l({},sn,{},e),m.typeCheckConfig(tn,e,an),e},e._triggerBackdropTransition=function(){var e=this;if("static"===this._config.backdrop){var t=p.Event(ln.HIDE_PREVENTED);if(p(this._element).trigger(t),t.defaultPrevented)return;this._element.classList.add(mn);var n=m.getTransitionDurationFromElement(this._element);p(this._element).one(m.TRANSITION_END,function(){e._element.classList.remove(mn)}).emulateTransitionEnd(n),this._element.focus()}else this.hide()},e._showElement=function(e){var t=this,n=p(this._element).hasClass(dn),i=this._dialog?this._dialog.querySelector(_n):null;this._element.parentNode&&this._element.parentNode.nodeType===Node.ELEMENT_NODE||document.body.appendChild(this._element),this._element.style.display="block",this._element.removeAttribute("aria-hidden"),this._element.setAttribute("aria-modal",!0),p(this._dialog).hasClass(cn)&&i?i.scrollTop=0:this._element.scrollTop=0,n&&m.reflow(this._element),p(this._element).addClass(pn),this._config.focus&&this._enforceFocus();function o(){t._config.focus&&t._element.focus(),t._isTransitioning=!1,p(t._element).trigger(r)}var r=p.Event(ln.SHOWN,{relatedTarget:e});if(n){var s=m.getTransitionDurationFromElement(this._dialog);p(this._dialog).one(m.TRANSITION_END,o).emulateTransitionEnd(s)}else o()},e._enforceFocus=function(){var t=this;p(document).off(ln.FOCUSIN).on(ln.FOCUSIN,function(e){document!==e.target&&t._element!==e.target&&0===p(t._element).has(e.target).length&&t._element.focus()})},e._setEscapeEvent=function(){var t=this;this._isShown&&this._config.keyboard?p(this._element).on(ln.KEYDOWN_DISMISS,function(e){27===e.which&&t._triggerBackdropTransition()}):this._isShown||p(this._element).off(ln.KEYDOWN_DISMISS)},e._setResizeEvent=function(){var t=this;this._isShown?p(window).on(ln.RESIZE,function(e){return t.handleUpdate(e)}):p(window).off(ln.RESIZE)},e._hideModal=function(){var e=this;this._element.style.display="none",this._element.setAttribute("aria-hidden",!0),this._element.removeAttribute("aria-modal"),this._isTransitioning=!1,this._showBackdrop(function(){p(document.body).removeClass(fn),e._resetAdjustments(),e._resetScrollbar(),p(e._element).trigger(ln.HIDDEN)})},e._removeBackdrop=function(){this._backdrop&&(p(this._backdrop).remove(),this._backdrop=null)},e._showBackdrop=function(e){var t=this,n=p(this._element).hasClass(dn)?dn:"";if(this._isShown&&this._config.backdrop){if(this._backdrop=document.createElement("div"),this._backdrop.className=un,n&&this._backdrop.classList.add(n),p(this._backdrop).appendTo(document.body),p(this._element).on(ln.CLICK_DISMISS,function(e){t._ignoreBackdropClick?t._ignoreBackdropClick=!1:e.target===e.currentTarget&&t._triggerBackdropTransition()}),n&&m.reflow(this._backdrop),p(this._backdrop).addClass(pn),!e)return;if(!n)return void e();var i=m.getTransitionDurationFromElement(this._backdrop);p(this._backdrop).one(m.TRANSITION_END,e).emulateTransitionEnd(i)}else if(!this._isShown&&this._backdrop){p(this._backdrop).removeClass(pn);var o=function(){t._removeBackdrop(),e&&e()};if(p(this._element).hasClass(dn)){var r=m.getTransitionDurationFromElement(this._backdrop);p(this._backdrop).one(m.TRANSITION_END,o).emulateTransitionEnd(r)}else o()}else e&&e()},e._adjustDialog=function(){var e=this._element.scrollHeight>document.documentElement.clientHeight;!this._isBodyOverflowing&&e&&(this._element.style.paddingLeft=this._scrollbarWidth+"px"),this._isBodyOverflowing&&!e&&(this._element.style.paddingRight=this._scrollbarWidth+"px")},e._resetAdjustments=function(){this._element.style.paddingLeft="",this._element.style.paddingRight=""},e._checkScrollbar=function(){var e=document.body.getBoundingClientRect();this._isBodyOverflowing=e.left+e.right<window.innerWidth,this._scrollbarWidth=this._getScrollbarWidth()},e._setScrollbar=function(){var o=this;if(this._isBodyOverflowing){var e=[].slice.call(document.querySelectorAll(En)),t=[].slice.call(document.querySelectorAll(bn));p(e).each(function(e,t){var n=t.style.paddingRight,i=p(t).css("padding-right");p(t).data("padding-right",n).css("padding-right",parseFloat(i)+o._scrollbarWidth+"px")}),p(t).each(function(e,t){var n=t.style.marginRight,i=p(t).css("margin-right");p(t).data("margin-right",n).css("margin-right",parseFloat(i)-o._scrollbarWidth+"px")});var n=document.body.style.paddingRight,i=p(document.body).css("padding-right");p(document.body).data("padding-right",n).css("padding-right",parseFloat(i)+this._scrollbarWidth+"px")}p(document.body).addClass(fn)},e._resetScrollbar=function(){var e=[].slice.call(document.querySelectorAll(En));p(e).each(function(e,t){var n=p(t).data("padding-right");p(t).removeData("padding-right"),t.style.paddingRight=n||""});var t=[].slice.call(document.querySelectorAll(""+bn));p(t).each(function(e,t){var n=p(t).data("margin-right");"undefined"!=typeof n&&p(t).css("margin-right",n).removeData("margin-right")});var n=p(document.body).data("padding-right");p(document.body).removeData("padding-right"),document.body.style.paddingRight=n||""},e._getScrollbarWidth=function(){var e=document.createElement("div");e.className=hn,document.body.appendChild(e);var t=e.getBoundingClientRect().width-e.clientWidth;return document.body.removeChild(e),t},o._jQueryInterface=function(n,i){return this.each(function(){var e=p(this).data(nn),t=l({},sn,{},p(this).data(),{},"object"==typeof n&&n?n:{});if(e||(e=new o(this,t),p(this).data(nn,e)),"string"==typeof n){if("undefined"==typeof e[n])throw new TypeError('No method named "'+n+'"');e[n](i)}else t.show&&e.show(i)})},s(o,null,[{key:"VERSION",get:function(){return"4.4.1"}},{key:"Default",get:function(){return sn}}]),o}();p(document).on(ln.CLICK_DATA_API,vn,function(e){var t,n=this,i=m.getSelectorFromElement(this);i&&(t=document.querySelector(i));var o=p(t).data(nn)?"toggle":l({},p(t).data(),{},p(this).data());"A"!==this.tagName&&"AREA"!==this.tagName||e.preventDefault();var r=p(t).one(ln.SHOW,function(e){e.isDefaultPrevented()||r.one(ln.HIDDEN,function(){p(n).is(":visible")&&n.focus()})});wn._jQueryInterface.call(p(t),o,this)}),p.fn[tn]=wn._jQueryInterface,p.fn[tn].Constructor=wn,p.fn[tn].noConflict=function(){return p.fn[tn]=rn,wn._jQueryInterface};var Tn=["background","cite","href","itemtype","longdesc","poster","src","xlink:href"],Cn={"*":["class","dir","id","lang","role",/^aria-[\w-]*$/i],a:["target","href","title","rel"],area:[],b:[],br:[],col:[],code:[],div:[],em:[],hr:[],h1:[],h2:[],h3:[],h4:[],h5:[],h6:[],i:[],img:["src","alt","title","width","height"],li:[],ol:[],p:[],pre:[],s:[],small:[],span:[],sub:[],sup:[],strong:[],u:[],ul:[]},Sn=/^(?:(?:https?|mailto|ftp|tel|file):|[^&:/?#]*(?:[/?#]|$))/gi,Dn=/^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[a-z0-9+/]+=*$/i;function In(e,r,t){if(0===e.length)return e;if(t&&"function"==typeof t)return t(e);for(var n=(new window.DOMParser).parseFromString(e,"text/html"),s=Object.keys(r),a=[].slice.call(n.body.querySelectorAll("*")),i=function(e){var t=a[e],n=t.nodeName.toLowerCase();if(-1===s.indexOf(t.nodeName.toLowerCase()))return t.parentNode.removeChild(t),"continue";var i=[].slice.call(t.attributes),o=[].concat(r["*"]||[],r[n]||[]);i.forEach(function(e){!function(e,t){var n=e.nodeName.toLowerCase();if(-1!==t.indexOf(n))return-1===Tn.indexOf(n)||Boolean(e.nodeValue.match(Sn)||e.nodeValue.match(Dn));for(var i=t.filter(function(e){return e instanceof RegExp}),o=0,r=i.length;o<r;o++)if(n.match(i[o]))return!0;return!1}(e,o)&&t.removeAttribute(e.nodeName)})},o=0,l=a.length;o<l;o++)i(o);return n.body.innerHTML}var An="tooltip",On="bs.tooltip",Nn="."+On,kn=p.fn[An],Ln="bs-tooltip",Pn=new RegExp("(^|\\s)"+Ln+"\\S+","g"),xn=["sanitize","whiteList","sanitizeFn"],jn={animation:"boolean",template:"string",title:"(string|element|function)",trigger:"string",delay:"(number|object)",html:"boolean",selector:"(string|boolean)",placement:"(string|function)",offset:"(number|string|function)",container:"(string|element|boolean)",fallbackPlacement:"(string|array)",boundary:"(string|element)",sanitize:"boolean",sanitizeFn:"(null|function)",whiteList:"object",popperConfig:"(null|object)"},Hn={AUTO:"auto",TOP:"top",RIGHT:"right",BOTTOM:"bottom",LEFT:"left"},Rn={animation:!0,template:'<div class="tooltip" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,selector:!1,placement:"top",offset:0,container:!1,fallbackPlacement:"flip",boundary:"scrollParent",sanitize:!0,sanitizeFn:null,whiteList:Cn,popperConfig:null},Fn="show",Mn="out",Wn={HIDE:"hide"+Nn,HIDDEN:"hidden"+Nn,SHOW:"show"+Nn,SHOWN:"shown"+Nn,INSERTED:"inserted"+Nn,CLICK:"click"+Nn,FOCUSIN:"focusin"+Nn,FOCUSOUT:"focusout"+Nn,MOUSEENTER:"mouseenter"+Nn,MOUSELEAVE:"mouseleave"+Nn},Un="fade",Bn="show",qn=".tooltip-inner",Kn=".arrow",Qn="hover",Vn="focus",Yn="click",zn="manual",Xn=function(){function i(e,t){if("undefined"==typeof St)throw new TypeError("Bootstrap's tooltips require Popper.js (https://popper.js.org/)");this._isEnabled=!0,this._timeout=0,this._hoverState="",this._activeTrigger={},this._popper=null,this.element=e,this.config=this._getConfig(t),this.tip=null,this._setListeners()}var e=i.prototype;return e.enable=function(){this._isEnabled=!0},e.disable=function(){this._isEnabled=!1},e.toggleEnabled=function(){this._isEnabled=!this._isEnabled},e.toggle=function(e){if(this._isEnabled)if(e){var t=this.constructor.DATA_KEY,n=p(e.currentTarget).data(t);n||(n=new this.constructor(e.currentTarget,this._getDelegateConfig()),p(e.currentTarget).data(t,n)),n._activeTrigger.click=!n._activeTrigger.click,n._isWithActiveTrigger()?n._enter(null,n):n._leave(null,n)}else{if(p(this.getTipElement()).hasClass(Bn))return void this._leave(null,this);this._enter(null,this)}},e.dispose=function(){clearTimeout(this._timeout),p.removeData(this.element,this.constructor.DATA_KEY),p(this.element).off(this.constructor.EVENT_KEY),p(this.element).closest(".modal").off("hide.bs.modal",this._hideModalHandler),this.tip&&p(this.tip).remove(),this._isEnabled=null,this._timeout=null,this._hoverState=null,this._activeTrigger=null,this._popper&&this._popper.destroy(),this._popper=null,this.element=null,this.config=null,this.tip=null},e.show=function(){var t=this;if("none"===p(this.element).css("display"))throw new Error("Please use show on visible elements");var e=p.Event(this.constructor.Event.SHOW);if(this.isWithContent()&&this._isEnabled){p(this.element).trigger(e);var n=m.findShadowRoot(this.element),i=p.contains(null!==n?n:this.element.ownerDocument.documentElement,this.element);if(e.isDefaultPrevented()||!i)return;var o=this.getTipElement(),r=m.getUID(this.constructor.NAME);o.setAttribute("id",r),this.element.setAttribute("aria-describedby",r),this.setContent(),this.config.animation&&p(o).addClass(Un);var s="function"==typeof this.config.placement?this.config.placement.call(this,o,this.element):this.config.placement,a=this._getAttachment(s);this.addAttachmentClass(a);var l=this._getContainer();p(o).data(this.constructor.DATA_KEY,this),p.contains(this.element.ownerDocument.documentElement,this.tip)||p(o).appendTo(l),p(this.element).trigger(this.constructor.Event.INSERTED),this._popper=new St(this.element,o,this._getPopperConfig(a)),p(o).addClass(Bn),"ontouchstart"in document.documentElement&&p(document.body).children().on("mouseover",null,p.noop);var c=function(){t.config.animation&&t._fixTransition();var e=t._hoverState;t._hoverState=null,p(t.element).trigger(t.constructor.Event.SHOWN),e===Mn&&t._leave(null,t)};if(p(this.tip).hasClass(Un)){var h=m.getTransitionDurationFromElement(this.tip);p(this.tip).one(m.TRANSITION_END,c).emulateTransitionEnd(h)}else c()}},e.hide=function(e){function t(){n._hoverState!==Fn&&i.parentNode&&i.parentNode.removeChild(i),n._cleanTipClass(),n.element.removeAttribute("aria-describedby"),p(n.element).trigger(n.constructor.Event.HIDDEN),null!==n._popper&&n._popper.destroy(),e&&e()}var n=this,i=this.getTipElement(),o=p.Event(this.constructor.Event.HIDE);if(p(this.element).trigger(o),!o.isDefaultPrevented()){if(p(i).removeClass(Bn),"ontouchstart"in document.documentElement&&p(document.body).children().off("mouseover",null,p.noop),this._activeTrigger[Yn]=!1,this._activeTrigger[Vn]=!1,this._activeTrigger[Qn]=!1,p(this.tip).hasClass(Un)){var r=m.getTransitionDurationFromElement(i);p(i).one(m.TRANSITION_END,t).emulateTransitionEnd(r)}else t();this._hoverState=""}},e.update=function(){null!==this._popper&&this._popper.scheduleUpdate()},e.isWithContent=function(){return Boolean(this.getTitle())},e.addAttachmentClass=function(e){p(this.getTipElement()).addClass(Ln+"-"+e)},e.getTipElement=function(){return this.tip=this.tip||p(this.config.template)[0],this.tip},e.setContent=function(){var e=this.getTipElement();this.setElementContent(p(e.querySelectorAll(qn)),this.getTitle()),p(e).removeClass(Un+" "+Bn)},e.setElementContent=function(e,t){"object"!=typeof t||!t.nodeType&&!t.jquery?this.config.html?(this.config.sanitize&&(t=In(t,this.config.whiteList,this.config.sanitizeFn)),e.html(t)):e.text(t):this.config.html?p(t).parent().is(e)||e.empty().append(t):e.text(p(t).text())},e.getTitle=function(){var e=this.element.getAttribute("data-original-title");return e=e||("function"==typeof this.config.title?this.config.title.call(this.element):this.config.title)},e._getPopperConfig=function(e){var t=this;return l({},{placement:e,modifiers:{offset:this._getOffset(),flip:{behavior:this.config.fallbackPlacement},arrow:{element:Kn},preventOverflow:{boundariesElement:this.config.boundary}},onCreate:function(e){e.originalPlacement!==e.placement&&t._handlePopperPlacementChange(e)},onUpdate:function(e){return t._handlePopperPlacementChange(e)}},{},this.config.popperConfig)},e._getOffset=function(){var t=this,e={};return"function"==typeof this.config.offset?e.fn=function(e){return e.offsets=l({},e.offsets,{},t.config.offset(e.offsets,t.element)||{}),e}:e.offset=this.config.offset,e},e._getContainer=function(){return!1===this.config.container?document.body:m.isElement(this.config.container)?p(this.config.container):p(document).find(this.config.container)},e._getAttachment=function(e){return Hn[e.toUpperCase()]},e._setListeners=function(){var i=this;this.config.trigger.split(" ").forEach(function(e){if("click"===e)p(i.element).on(i.constructor.Event.CLICK,i.config.selector,function(e){return i.toggle(e)});else if(e!==zn){var t=e===Qn?i.constructor.Event.MOUSEENTER:i.constructor.Event.FOCUSIN,n=e===Qn?i.constructor.Event.MOUSELEAVE:i.constructor.Event.FOCUSOUT;p(i.element).on(t,i.config.selector,function(e){return i._enter(e)}).on(n,i.config.selector,function(e){return i._leave(e)})}}),this._hideModalHandler=function(){i.element&&i.hide()},p(this.element).closest(".modal").on("hide.bs.modal",this._hideModalHandler),this.config.selector?this.config=l({},this.config,{trigger:"manual",selector:""}):this._fixTitle()},e._fixTitle=function(){var e=typeof this.element.getAttribute("data-original-title");!this.element.getAttribute("title")&&"string"==e||(this.element.setAttribute("data-original-title",this.element.getAttribute("title")||""),this.element.setAttribute("title",""))},e._enter=function(e,t){var n=this.constructor.DATA_KEY;(t=t||p(e.currentTarget).data(n))||(t=new this.constructor(e.currentTarget,this._getDelegateConfig()),p(e.currentTarget).data(n,t)),e&&(t._activeTrigger["focusin"===e.type?Vn:Qn]=!0),p(t.getTipElement()).hasClass(Bn)||t._hoverState===Fn?t._hoverState=Fn:(clearTimeout(t._timeout),t._hoverState=Fn,t.config.delay&&t.config.delay.show?t._timeout=setTimeout(function(){t._hoverState===Fn&&t.show()},t.config.delay.show):t.show())},e._leave=function(e,t){var n=this.constructor.DATA_KEY;(t=t||p(e.currentTarget).data(n))||(t=new this.constructor(e.currentTarget,this._getDelegateConfig()),p(e.currentTarget).data(n,t)),e&&(t._activeTrigger["focusout"===e.type?Vn:Qn]=!1),t._isWithActiveTrigger()||(clearTimeout(t._timeout),t._hoverState=Mn,t.config.delay&&t.config.delay.hide?t._timeout=setTimeout(function(){t._hoverState===Mn&&t.hide()},t.config.delay.hide):t.hide())},e._isWithActiveTrigger=function(){for(var e in this._activeTrigger)if(this._activeTrigger[e])return!0;return!1},e._getConfig=function(e){var t=p(this.element).data();return Object.keys(t).forEach(function(e){-1!==xn.indexOf(e)&&delete t[e]}),"number"==typeof(e=l({},this.constructor.Default,{},t,{},"object"==typeof e&&e?e:{})).delay&&(e.delay={show:e.delay,hide:e.delay}),"number"==typeof e.title&&(e.title=e.title.toString()),"number"==typeof e.content&&(e.content=e.content.toString()),m.typeCheckConfig(An,e,this.constructor.DefaultType),e.sanitize&&(e.template=In(e.template,e.whiteList,e.sanitizeFn)),e},e._getDelegateConfig=function(){var e={};if(this.config)for(var t in this.config)this.constructor.Default[t]!==this.config[t]&&(e[t]=this.config[t]);return e},e._cleanTipClass=function(){var e=p(this.getTipElement()),t=e.attr("class").match(Pn);null!==t&&t.length&&e.removeClass(t.join(""))},e._handlePopperPlacementChange=function(e){var t=e.instance;this.tip=t.popper,this._cleanTipClass(),this.addAttachmentClass(this._getAttachment(e.placement))},e._fixTransition=function(){var e=this.getTipElement(),t=this.config.animation;null===e.getAttribute("x-placement")&&(p(e).removeClass(Un),this.config.animation=!1,this.hide(),this.show(),this.config.animation=t)},i._jQueryInterface=function(n){return this.each(function(){var e=p(this).data(On),t="object"==typeof n&&n;if((e||!/dispose|hide/.test(n))&&(e||(e=new i(this,t),p(this).data(On,e)),"string"==typeof n)){if("undefined"==typeof e[n])throw new TypeError('No method named "'+n+'"');e[n]()}})},s(i,null,[{key:"VERSION",get:function(){return"4.4.1"}},{key:"Default",get:function(){return Rn}},{key:"NAME",get:function(){return An}},{key:"DATA_KEY",get:function(){return On}},{key:"Event",get:function(){return Wn}},{key:"EVENT_KEY",get:function(){return Nn}},{key:"DefaultType",get:function(){return jn}}]),i}();p.fn[An]=Xn._jQueryInterface,p.fn[An].Constructor=Xn,p.fn[An].noConflict=function(){return p.fn[An]=kn,Xn._jQueryInterface};var Gn="popover",$n="bs.popover",Jn="."+$n,Zn=p.fn[Gn],ei="bs-popover",ti=new RegExp("(^|\\s)"+ei+"\\S+","g"),ni=l({},Xn.Default,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>'}),ii=l({},Xn.DefaultType,{content:"(string|element|function)"}),oi="fade",ri="show",si=".popover-header",ai=".popover-body",li={HIDE:"hide"+Jn,HIDDEN:"hidden"+Jn,SHOW:"show"+Jn,SHOWN:"shown"+Jn,INSERTED:"inserted"+Jn,CLICK:"click"+Jn,FOCUSIN:"focusin"+Jn,FOCUSOUT:"focusout"+Jn,MOUSEENTER:"mouseenter"+Jn,MOUSELEAVE:"mouseleave"+Jn},ci=function(e){function i(){return e.apply(this,arguments)||this}!function(e,t){e.prototype=Object.create(t.prototype),(e.prototype.constructor=e).__proto__=t}(i,e);var t=i.prototype;return t.isWithContent=function(){return this.getTitle()||this._getContent()},t.addAttachmentClass=function(e){p(this.getTipElement()).addClass(ei+"-"+e)},t.getTipElement=function(){return this.tip=this.tip||p(this.config.template)[0],this.tip},t.setContent=function(){var e=p(this.getTipElement());this.setElementContent(e.find(si),this.getTitle());var t=this._getContent();"function"==typeof t&&(t=t.call(this.element)),this.setElementContent(e.find(ai),t),e.removeClass(oi+" "+ri)},t._getContent=function(){return this.element.getAttribute("data-content")||this.config.content},t._cleanTipClass=function(){var e=p(this.getTipElement()),t=e.attr("class").match(ti);null!==t&&0<t.length&&e.removeClass(t.join(""))},i._jQueryInterface=function(n){return this.each(function(){var e=p(this).data($n),t="object"==typeof n?n:null;if((e||!/dispose|hide/.test(n))&&(e||(e=new i(this,t),p(this).data($n,e)),"string"==typeof n)){if("undefined"==typeof e[n])throw new TypeError('No method named "'+n+'"');e[n]()}})},s(i,null,[{key:"VERSION",get:function(){return"4.4.1"}},{key:"Default",get:function(){return ni}},{key:"NAME",get:function(){return Gn}},{key:"DATA_KEY",get:function(){return $n}},{key:"Event",get:function(){return li}},{key:"EVENT_KEY",get:function(){return Jn}},{key:"DefaultType",get:function(){return ii}}]),i}(Xn);p.fn[Gn]=ci._jQueryInterface,p.fn[Gn].Constructor=ci,p.fn[Gn].noConflict=function(){return p.fn[Gn]=Zn,ci._jQueryInterface};var hi="scrollspy",ui="bs.scrollspy",fi="."+ui,di=p.fn[hi],pi={offset:10,method:"auto",target:""},mi={offset:"number",method:"string",target:"(string|element)"},gi={ACTIVATE:"activate"+fi,SCROLL:"scroll"+fi,LOAD_DATA_API:"load"+fi+".data-api"},_i="dropdown-item",vi="active",yi='[data-spy="scroll"]',Ei=".nav, .list-group",bi=".nav-link",wi=".nav-item",Ti=".list-group-item",Ci=".dropdown",Si=".dropdown-item",Di=".dropdown-toggle",Ii="offset",Ai="position",Oi=function(){function n(e,t){var n=this;this._element=e,this._scrollElement="BODY"===e.tagName?window:e,this._config=this._getConfig(t),this._selector=this._config.target+" "+bi+","+this._config.target+" "+Ti+","+this._config.target+" "+Si,this._offsets=[],this._targets=[],this._activeTarget=null,this._scrollHeight=0,p(this._scrollElement).on(gi.SCROLL,function(e){return n._process(e)}),this.refresh(),this._process()}var e=n.prototype;return e.refresh=function(){var t=this,e=this._scrollElement===this._scrollElement.window?Ii:Ai,o="auto"===this._config.method?e:this._config.method,r=o===Ai?this._getScrollTop():0;this._offsets=[],this._targets=[],this._scrollHeight=this._getScrollHeight(),[].slice.call(document.querySelectorAll(this._selector)).map(function(e){var t,n=m.getSelectorFromElement(e);if(n&&(t=document.querySelector(n)),t){var i=t.getBoundingClientRect();if(i.width||i.height)return[p(t)[o]().top+r,n]}return null}).filter(function(e){return e}).sort(function(e,t){return e[0]-t[0]}).forEach(function(e){t._offsets.push(e[0]),t._targets.push(e[1])})},e.dispose=function(){p.removeData(this._element,ui),p(this._scrollElement).off(fi),this._element=null,this._scrollElement=null,this._config=null,this._selector=null,this._offsets=null,this._targets=null,this._activeTarget=null,this._scrollHeight=null},e._getConfig=function(e){if("string"!=typeof(e=l({},pi,{},"object"==typeof e&&e?e:{})).target){var t=p(e.target).attr("id");t||(t=m.getUID(hi),p(e.target).attr("id",t)),e.target="#"+t}return m.typeCheckConfig(hi,e,mi),e},e._getScrollTop=function(){return this._scrollElement===window?this._scrollElement.pageYOffset:this._scrollElement.scrollTop},e._getScrollHeight=function(){return this._scrollElement.scrollHeight||Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)},e._getOffsetHeight=function(){return this._scrollElement===window?window.innerHeight:this._scrollElement.getBoundingClientRect().height},e._process=function(){var e=this._getScrollTop()+this._config.offset,t=this._getScrollHeight(),n=this._config.offset+t-this._getOffsetHeight();if(this._scrollHeight!==t&&this.refresh(),n<=e){var i=this._targets[this._targets.length-1];this._activeTarget!==i&&this._activate(i)}else{if(this._activeTarget&&e<this._offsets[0]&&0<this._offsets[0])return this._activeTarget=null,void this._clear();for(var o=this._offsets.length;o--;){this._activeTarget!==this._targets[o]&&e>=this._offsets[o]&&("undefined"==typeof this._offsets[o+1]||e<this._offsets[o+1])&&this._activate(this._targets[o])}}},e._activate=function(t){this._activeTarget=t,this._clear();var e=this._selector.split(",").map(function(e){return e+'[data-target="'+t+'"],'+e+'[href="'+t+'"]'}),n=p([].slice.call(document.querySelectorAll(e.join(","))));n.hasClass(_i)?(n.closest(Ci).find(Di).addClass(vi),n.addClass(vi)):(n.addClass(vi),n.parents(Ei).prev(bi+", "+Ti).addClass(vi),n.parents(Ei).prev(wi).children(bi).addClass(vi)),p(this._scrollElement).trigger(gi.ACTIVATE,{relatedTarget:t})},e._clear=function(){[].slice.call(document.querySelectorAll(this._selector)).filter(function(e){return e.classList.contains(vi)}).forEach(function(e){return e.classList.remove(vi)})},n._jQueryInterface=function(t){return this.each(function(){var e=p(this).data(ui);if(e||(e=new n(this,"object"==typeof t&&t),p(this).data(ui,e)),"string"==typeof t){if("undefined"==typeof e[t])throw new TypeError('No method named "'+t+'"');e[t]()}})},s(n,null,[{key:"VERSION",get:function(){return"4.4.1"}},{key:"Default",get:function(){return pi}}]),n}();p(window).on(gi.LOAD_DATA_API,function(){for(var e=[].slice.call(document.querySelectorAll(yi)),t=e.length;t--;){var n=p(e[t]);Oi._jQueryInterface.call(n,n.data())}}),p.fn[hi]=Oi._jQueryInterface,p.fn[hi].Constructor=Oi,p.fn[hi].noConflict=function(){return p.fn[hi]=di,Oi._jQueryInterface};var Ni="bs.tab",ki="."+Ni,Li=p.fn.tab,Pi={HIDE:"hide"+ki,HIDDEN:"hidden"+ki,SHOW:"show"+ki,SHOWN:"shown"+ki,CLICK_DATA_API:"click"+ki+".data-api"},xi="dropdown-menu",ji="active",Hi="disabled",Ri="fade",Fi="show",Mi=".dropdown",Wi=".nav, .list-group",Ui=".active",Bi="> li > .active",qi='[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]',Ki=".dropdown-toggle",Qi="> .dropdown-menu .active",Vi=function(){function i(e){this._element=e}var e=i.prototype;return e.show=function(){var n=this;if(!(this._element.parentNode&&this._element.parentNode.nodeType===Node.ELEMENT_NODE&&p(this._element).hasClass(ji)||p(this._element).hasClass(Hi))){var e,i,t=p(this._element).closest(Wi)[0],o=m.getSelectorFromElement(this._element);if(t){var r="UL"===t.nodeName||"OL"===t.nodeName?Bi:Ui;i=(i=p.makeArray(p(t).find(r)))[i.length-1]}var s=p.Event(Pi.HIDE,{relatedTarget:this._element}),a=p.Event(Pi.SHOW,{relatedTarget:i});if(i&&p(i).trigger(s),p(this._element).trigger(a),!a.isDefaultPrevented()&&!s.isDefaultPrevented()){o&&(e=document.querySelector(o)),this._activate(this._element,t);var l=function(){var e=p.Event(Pi.HIDDEN,{relatedTarget:n._element}),t=p.Event(Pi.SHOWN,{relatedTarget:i});p(i).trigger(e),p(n._element).trigger(t)};e?this._activate(e,e.parentNode,l):l()}}},e.dispose=function(){p.removeData(this._element,Ni),this._element=null},e._activate=function(e,t,n){function i(){return o._transitionComplete(e,r,n)}var o=this,r=(!t||"UL"!==t.nodeName&&"OL"!==t.nodeName?p(t).children(Ui):p(t).find(Bi))[0],s=n&&r&&p(r).hasClass(Ri);if(r&&s){var a=m.getTransitionDurationFromElement(r);p(r).removeClass(Fi).one(m.TRANSITION_END,i).emulateTransitionEnd(a)}else i()},e._transitionComplete=function(e,t,n){if(t){p(t).removeClass(ji);var i=p(t.parentNode).find(Qi)[0];i&&p(i).removeClass(ji),"tab"===t.getAttribute("role")&&t.setAttribute("aria-selected",!1)}if(p(e).addClass(ji),"tab"===e.getAttribute("role")&&e.setAttribute("aria-selected",!0),m.reflow(e),e.classList.contains(Ri)&&e.classList.add(Fi),e.parentNode&&p(e.parentNode).hasClass(xi)){var o=p(e).closest(Mi)[0];if(o){var r=[].slice.call(o.querySelectorAll(Ki));p(r).addClass(ji)}e.setAttribute("aria-expanded",!0)}n&&n()},i._jQueryInterface=function(n){return this.each(function(){var e=p(this),t=e.data(Ni);if(t||(t=new i(this),e.data(Ni,t)),"string"==typeof n){if("undefined"==typeof t[n])throw new TypeError('No method named "'+n+'"');t[n]()}})},s(i,null,[{key:"VERSION",get:function(){return"4.4.1"}}]),i}();p(document).on(Pi.CLICK_DATA_API,qi,function(e){e.preventDefault(),Vi._jQueryInterface.call(p(this),"show")}),p.fn.tab=Vi._jQueryInterface,p.fn.tab.Constructor=Vi,p.fn.tab.noConflict=function(){return p.fn.tab=Li,Vi._jQueryInterface};var Yi="toast",zi="bs.toast",Xi="."+zi,Gi=p.fn[Yi],$i={CLICK_DISMISS:"click.dismiss"+Xi,HIDE:"hide"+Xi,HIDDEN:"hidden"+Xi,SHOW:"show"+Xi,SHOWN:"shown"+Xi},Ji="fade",Zi="hide",eo="show",to="showing",no={animation:"boolean",autohide:"boolean",delay:"number"},io={animation:!0,autohide:!0,delay:500},oo='[data-dismiss="toast"]',ro=function(){function i(e,t){this._element=e,this._config=this._getConfig(t),this._timeout=null,this._setListeners()}var e=i.prototype;return e.show=function(){var e=this,t=p.Event($i.SHOW);if(p(this._element).trigger(t),!t.isDefaultPrevented()){this._config.animation&&this._element.classList.add(Ji);var n=function(){e._element.classList.remove(to),e._element.classList.add(eo),p(e._element).trigger($i.SHOWN),e._config.autohide&&(e._timeout=setTimeout(function(){e.hide()},e._config.delay))};if(this._element.classList.remove(Zi),m.reflow(this._element),this._element.classList.add(to),this._config.animation){var i=m.getTransitionDurationFromElement(this._element);p(this._element).one(m.TRANSITION_END,n).emulateTransitionEnd(i)}else n()}},e.hide=function(){if(this._element.classList.contains(eo)){var e=p.Event($i.HIDE);p(this._element).trigger(e),e.isDefaultPrevented()||this._close()}},e.dispose=function(){clearTimeout(this._timeout),this._timeout=null,this._element.classList.contains(eo)&&this._element.classList.remove(eo),p(this._element).off($i.CLICK_DISMISS),p.removeData(this._element,zi),this._element=null,this._config=null},e._getConfig=function(e){return e=l({},io,{},p(this._element).data(),{},"object"==typeof e&&e?e:{}),m.typeCheckConfig(Yi,e,this.constructor.DefaultType),e},e._setListeners=function(){var e=this;p(this._element).on($i.CLICK_DISMISS,oo,function(){return e.hide()})},e._close=function(){function e(){t._element.classList.add(Zi),p(t._element).trigger($i.HIDDEN)}var t=this;if(this._element.classList.remove(eo),this._config.animation){var n=m.getTransitionDurationFromElement(this._element);p(this._element).one(m.TRANSITION_END,e).emulateTransitionEnd(n)}else e()},i._jQueryInterface=function(n){return this.each(function(){var e=p(this),t=e.data(zi);if(t||(t=new i(this,"object"==typeof n&&n),e.data(zi,t)),"string"==typeof n){if("undefined"==typeof t[n])throw new TypeError('No method named "'+n+'"');t[n](this)}})},s(i,null,[{key:"VERSION",get:function(){return"4.4.1"}},{key:"DefaultType",get:function(){return no}},{key:"Default",get:function(){return io}}]),i}();p.fn[Yi]=ro._jQueryInterface,p.fn[Yi].Constructor=ro,p.fn[Yi].noConflict=function(){return p.fn[Yi]=Gi,ro._jQueryInterface},e.Alert=_,e.Button=x,e.Carousel=he,e.Collapse=De,e.Dropdown=en,e.Modal=wn,e.Popover=ci,e.Scrollspy=Oi,e.Tab=Vi,e.Toast=ro,e.Tooltip=Xn,e.Util=m,Object.defineProperty(e,"__esModule",{value:!0})});
-//# sourceMappingURL=bootstrap.bundle.min.js.map
\ No newline at end of file
diff --git a/ui/bootstrap/src/main/resources/js/bootstrap.bundle.min.js.map b/ui/bootstrap/src/main/resources/js/bootstrap.bundle.min.js.map
deleted file mode 100644
index 54d24950..00000000
--- a/ui/bootstrap/src/main/resources/js/bootstrap.bundle.min.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["../../js/src/util.js","../../js/src/alert.js","../../js/src/button.js","../../js/src/carousel.js","../../js/src/collapse.js","../../node_modules/popper.js/dist/esm/popper.js","../../js/src/dropdown.js","../../js/src/modal.js","../../js/src/tools/sanitizer.js","../../js/src/tooltip.js","../../js/src/popover.js","../../js/src/scrollspy.js","../../js/src/tab.js","../../js/src/toast.js"],"names":["TRANSITION_END","transitionEndEmulator","duration","_this","this","called","$","one","Util","setTimeout","triggerTransitionEnd","getUID","prefix","Math","random","document","getElementById","getSelectorFromElement","element","selector","getAttribute","hrefAttr","trim","querySelector","err","getTransitionDurationFromElement","transitionDuration","css","transitionDelay","floatTransitionDuration","parseFloat","floatTransitionDelay","split","reflow","offsetHeight","trigger","supportsTransitionEnd","Boolean","isElement","obj","nodeType","typeCheckConfig","componentName","config","configTypes","property","Object","prototype","hasOwnProperty","call","expectedTypes","value","valueType","toString","match","toLowerCase","RegExp","test","Error","toUpperCase","findShadowRoot","documentElement","attachShadow","getRootNode","ShadowRoot","parentNode","root","jQueryDetection","TypeError","version","fn","jquery","emulateTransitionEnd","event","special","bindType","delegateType","handle","target","is","handleObj","handler","apply","arguments","NAME","DATA_KEY","EVENT_KEY","JQUERY_NO_CONFLICT","Event","CLOSE","CLOSED","CLICK_DATA_API","ClassName","Alert","_element","close","rootElement","_getRootElement","_triggerCloseEvent","isDefaultPrevented","_removeElement","dispose","removeData","parent","closest","closeEvent","removeClass","hasClass","_destroyElement","detach","remove","_jQueryInterface","each","$element","data","_handleDismiss","alertInstance","preventDefault","on","Constructor","noConflict","DATA_API_KEY","Selector","FOCUS_BLUR_DATA_API","LOAD_DATA_API","Button","toggle","triggerChangeEvent","addAriaPressed","input","type","checked","classList","contains","activeElement","tagName","focus","hasAttribute","setAttribute","toggleClass","button","inputBtn","window","buttons","slice","querySelectorAll","i","len","length","add","Default","interval","keyboard","slide","pause","wrap","touch","DefaultType","Direction","SLIDE","SLID","KEYDOWN","MOUSEENTER","MOUSELEAVE","TOUCHSTART","TOUCHMOVE","TOUCHEND","POINTERDOWN","POINTERUP","DRAG_START","PointerType","TOUCH","PEN","Carousel","_items","_interval","_activeElement","_isPaused","_isSliding","touchTimeout","touchStartX","touchDeltaX","_config","_getConfig","_indicatorsElement","_touchSupported","navigator","maxTouchPoints","_pointerEvent","PointerEvent","MSPointerEvent","_addEventListeners","next","_slide","nextWhenVisible","hidden","prev","cycle","clearInterval","setInterval","visibilityState","bind","to","index","activeIndex","_getItemIndex","direction","off","_objectSpread2","_handleSwipe","absDeltax","abs","_this2","_keydown","_addTouchEventListeners","_this3","start","originalEvent","pointerType","clientX","touches","end","clearTimeout","e","move","which","indexOf","_getItemByDirection","isNextDirection","isPrevDirection","lastItemIndex","itemIndex","_triggerSlideEvent","relatedTarget","eventDirectionName","targetIndex","fromIndex","slideEvent","from","_setActiveIndicatorElement","indicators","nextIndicator","children","addClass","directionalClassName","orderClassName","_this4","activeElementIndex","nextElement","nextElementIndex","isCycling","slidEvent","nextElementInterval","parseInt","defaultInterval","action","ride","_dataApiClickHandler","slideIndex","carousels","$carousel","SHOW","SHOWN","HIDE","HIDDEN","Dimension","Collapse","_isTransitioning","_triggerArray","id","toggleList","elem","filterElement","filter","foundElem","_selector","push","_parent","_getParent","_addAriaAndCollapsedClass","hide","show","actives","activesData","not","startEvent","dimension","_getDimension","style","attr","setTransitioning","scrollSize","getBoundingClientRect","triggerArrayLength","isTransitioning","_getTargetFromElement","triggerArray","isOpen","$this","currentTarget","$trigger","selectors","$target","isBrowser","timeoutDuration","longerTimeoutBrowsers","userAgent","debounce","Promise","resolve","then","scheduled","isFunction","functionToCheck","getStyleComputedProperty","ownerDocument","defaultView","getComputedStyle","getParentNode","nodeName","host","getScrollParent","body","_getStyleComputedProp","overflow","overflowX","overflowY","getReferenceNode","reference","referenceNode","isIE11","MSInputMethodContext","documentMode","isIE10","isIE","getOffsetParent","noOffsetParent","offsetParent","nextElementSibling","getRoot","node","findCommonOffsetParent","element1","element2","order","compareDocumentPosition","Node","DOCUMENT_POSITION_FOLLOWING","range","createRange","setStart","setEnd","commonAncestorContainer","firstElementChild","isOffsetContainer","element1root","getScroll","upperSide","undefined","html","scrollingElement","getBordersSize","styles","axis","sideA","sideB","getSize","computedStyle","max","getWindowSizes","height","width","createClass","protoProps","staticProps","defineProperties","props","descriptor","enumerable","configurable","writable","defineProperty","key","_extends","assign","source","getClientRect","offsets","right","left","bottom","top","rect","scrollTop","scrollLeft","result","sizes","clientWidth","clientHeight","horizScrollbar","offsetWidth","vertScrollbar","getOffsetRectRelativeToArbitraryNode","fixedPosition","isHTML","childrenRect","parentRect","scrollParent","borderTopWidth","borderLeftWidth","marginTop","marginLeft","subtract","modifier","includeScroll","getFixedPositionOffsetParent","parentElement","el","getBoundaries","popper","padding","boundariesElement","boundaries","excludeScroll","relativeOffset","innerWidth","innerHeight","getViewportOffsetRectRelativeToArtbitraryNode","boundariesNode","isFixed","_getWindowSizes","isPaddingNumber","computeAutoPlacement","placement","refRect","rects","sortedAreas","keys","map","area","_ref","getArea","sort","a","b","filteredAreas","_ref2","computedPlacement","variation","getReferenceOffsets","state","getOuterSizes","x","marginBottom","y","marginRight","getOppositePlacement","hash","replace","matched","getPopperOffsets","referenceOffsets","popperRect","popperOffsets","isHoriz","mainSide","secondarySide","measurement","secondaryMeasurement","find","arr","check","Array","runModifiers","modifiers","ends","prop","findIndex","cur","forEach","console","warn","enabled","isModifierEnabled","modifierName","some","name","getSupportedPropertyName","prefixes","upperProp","charAt","toCheck","getWindow","setupEventListeners","options","updateBound","addEventListener","passive","scrollElement","attachToScrollParents","callback","scrollParents","isBody","eventsEnabled","disableEventListeners","cancelAnimationFrame","scheduleUpdate","removeEventListener","removeEventListeners","isNumeric","n","isNaN","isFinite","setStyles","unit","getRoundedOffsets","shouldRound","noRound","v","_data$offsets","round","floor","referenceWidth","popperWidth","isVertical","isVariation","horizontalToInteger","verticalToInteger","isFirefox","isModifierRequired","requestingName","requestedName","requesting","isRequired","_requesting","requested","placements","validPlacements","clockwise","counter","concat","reverse","BEHAVIORS","parseOffset","offset","basePlacement","useHeight","fragments","frag","divider","search","splitRegex","ops","op","mergeWithPrevious","reduce","str","toValue","index2","Defaults","positionFixed","removeOnDestroy","onCreate","onUpdate","shift","shiftvariation","side","shiftOffsets","preventOverflow","instance","transformProp","popperStyles","transform","priority","primary","escapeWithReference","secondary","min","keepTogether","opSide","arrow","_data$offsets$arrow","arrowElement","sideCapitalized","altSide","arrowElementSize","center","popperMarginSide","popperBorderSide","sideValue","flip","flipped","originalPlacement","placementOpposite","flipOrder","behavior","step","refOffsets","overlapsRef","overflowsLeft","overflowsRight","overflowsTop","overflowsBottom","overflowsBoundaries","flippedVariationByRef","flipVariations","flippedVariationByContent","flipVariationsByContent","flippedVariation","getOppositeVariation","inner","subtractLength","bound","attributes","computeStyle","legacyGpuAccelerationOption","gpuAcceleration","offsetParentRect","position","devicePixelRatio","prefixedProperty","willChange","invertTop","invertLeft","x-placement","arrowStyles","applyStyle","removeAttribute","setAttributes","onLoad","modifierOptions","Popper","isDestroyed","isCreated","removeChild","classCallCheck","requestAnimationFrame","update","enableEventListeners","Utils","global","PopperUtils","REGEXP_KEYDOWN","ARROW_UP_KEYCODE","CLICK","KEYDOWN_DATA_API","KEYUP_DATA_API","AttachmentMap","boundary","display","popperConfig","Dropdown","_popper","_menu","_getMenuElement","_inNavbar","_detectNavbar","disabled","isActive","_clearMenus","usePopper","showEvent","_getParentFromElement","referenceElement","_getPopperConfig","noop","hideEvent","destroy","stopPropagation","constructor","_getPlacement","$parentDropdown","_getOffset","toggles","context","clickEvent","dropdownMenu","_dataApiKeydownHandler","items","item","backdrop","HIDE_PREVENTED","FOCUSIN","RESIZE","CLICK_DISMISS","KEYDOWN_DISMISS","MOUSEUP_DISMISS","MOUSEDOWN_DISMISS","Modal","_dialog","_backdrop","_isShown","_isBodyOverflowing","_ignoreBackdropClick","_scrollbarWidth","_checkScrollbar","_setScrollbar","_adjustDialog","_setEscapeEvent","_setResizeEvent","_showBackdrop","_showElement","transition","_hideModal","htmlElement","handleUpdate","_triggerBackdropTransition","hideEventPrevented","defaultPrevented","modalTransitionDuration","modalBody","ELEMENT_NODE","appendChild","_enforceFocus","transitionComplete","shownEvent","_this5","has","_this6","_this7","_this8","_resetAdjustments","_resetScrollbar","_removeBackdrop","_this9","animate","createElement","className","appendTo","backdropTransitionDuration","callbackRemove","isModalOverflowing","scrollHeight","paddingLeft","paddingRight","_getScrollbarWidth","_this10","fixedContent","stickyContent","actualPadding","calculatedPadding","actualMargin","calculatedMargin","elements","margin","scrollDiv","scrollbarWidth","_this11","uriAttrs","DefaultWhitelist","*","br","col","code","div","em","hr","h1","h2","h3","h4","h5","h6","img","li","ol","p","pre","s","small","span","sub","sup","strong","u","ul","SAFE_URL_PATTERN","DATA_URL_PATTERN","sanitizeHtml","unsafeHtml","whiteList","sanitizeFn","createdDocument","DOMParser","parseFromString","whitelistKeys","_loop","elName","attributeList","whitelistedAttributes","allowedAttributeList","attrName","nodeValue","regExp","attrRegex","l","allowedAttribute","innerHTML","CLASS_PREFIX","BSCLS_PREFIX_REGEX","DISALLOWED_ATTRIBUTES","animation","template","title","delay","container","fallbackPlacement","sanitize","AUTO","TOP","RIGHT","BOTTOM","LEFT","HoverState","INSERTED","FOCUSOUT","Trigger","Tooltip","_isEnabled","_timeout","_hoverState","_activeTrigger","tip","_setListeners","enable","disable","toggleEnabled","dataKey","_getDelegateConfig","click","_isWithActiveTrigger","_enter","_leave","getTipElement","_hideModalHandler","isWithContent","shadowRoot","isInTheDom","tipId","setContent","attachment","_getAttachment","addAttachmentClass","_getContainer","complete","_fixTransition","prevHoverState","_cleanTipClass","getTitle","setElementContent","content","text","empty","append","_handlePopperPlacementChange","eventIn","eventOut","_fixTitle","titleType","dataAttributes","dataAttr","$tip","tabClass","join","popperData","popperInstance","initConfigAnimation","Popover","_getContent","method","ACTIVATE","SCROLL","OffsetMethod","ScrollSpy","_scrollElement","_offsets","_targets","_activeTarget","_scrollHeight","_process","refresh","autoMethod","offsetMethod","offsetBase","_getScrollTop","_getScrollHeight","targetSelector","targetBCR","pageYOffset","_getOffsetHeight","maxScroll","_activate","_clear","queries","$link","parents","scrollSpys","$spy","Tab","previous","listElement","itemSelector","makeArray","hiddenEvent","_transitionComplete","active","dropdownChild","dropdownElement","dropdownToggleList","autohide","Toast","_close"],"mappings":"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","sourcesContent":["/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.4.1): util.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\n\n/**\n * ------------------------------------------------------------------------\n * Private TransitionEnd Helpers\n * ------------------------------------------------------------------------\n */\n\nconst TRANSITION_END = 'transitionend'\nconst MAX_UID = 1000000\nconst MILLISECONDS_MULTIPLIER = 1000\n\n// Shoutout AngusCroll (https://goo.gl/pxwQGp)\nfunction toType(obj) {\n  return {}.toString.call(obj).match(/\\s([a-z]+)/i)[1].toLowerCase()\n}\n\nfunction getSpecialTransitionEndEvent() {\n  return {\n    bindType: TRANSITION_END,\n    delegateType: TRANSITION_END,\n    handle(event) {\n      if ($(event.target).is(this)) {\n        return event.handleObj.handler.apply(this, arguments) // eslint-disable-line prefer-rest-params\n      }\n      return undefined // eslint-disable-line no-undefined\n    }\n  }\n}\n\nfunction transitionEndEmulator(duration) {\n  let called = false\n\n  $(this).one(Util.TRANSITION_END, () => {\n    called = true\n  })\n\n  setTimeout(() => {\n    if (!called) {\n      Util.triggerTransitionEnd(this)\n    }\n  }, duration)\n\n  return this\n}\n\nfunction setTransitionEndSupport() {\n  $.fn.emulateTransitionEnd = transitionEndEmulator\n  $.event.special[Util.TRANSITION_END] = getSpecialTransitionEndEvent()\n}\n\n/**\n * --------------------------------------------------------------------------\n * Public Util Api\n * --------------------------------------------------------------------------\n */\n\nconst Util = {\n\n  TRANSITION_END: 'bsTransitionEnd',\n\n  getUID(prefix) {\n    do {\n      // eslint-disable-next-line no-bitwise\n      prefix += ~~(Math.random() * MAX_UID) // \"~~\" acts like a faster Math.floor() here\n    } while (document.getElementById(prefix))\n    return prefix\n  },\n\n  getSelectorFromElement(element) {\n    let selector = element.getAttribute('data-target')\n\n    if (!selector || selector === '#') {\n      const hrefAttr = element.getAttribute('href')\n      selector = hrefAttr && hrefAttr !== '#' ? hrefAttr.trim() : ''\n    }\n\n    try {\n      return document.querySelector(selector) ? selector : null\n    } catch (err) {\n      return null\n    }\n  },\n\n  getTransitionDurationFromElement(element) {\n    if (!element) {\n      return 0\n    }\n\n    // Get transition-duration of the element\n    let transitionDuration = $(element).css('transition-duration')\n    let transitionDelay = $(element).css('transition-delay')\n\n    const floatTransitionDuration = parseFloat(transitionDuration)\n    const floatTransitionDelay = parseFloat(transitionDelay)\n\n    // Return 0 if element or transition duration is not found\n    if (!floatTransitionDuration && !floatTransitionDelay) {\n      return 0\n    }\n\n    // If multiple durations are defined, take the first\n    transitionDuration = transitionDuration.split(',')[0]\n    transitionDelay = transitionDelay.split(',')[0]\n\n    return (parseFloat(transitionDuration) + parseFloat(transitionDelay)) * MILLISECONDS_MULTIPLIER\n  },\n\n  reflow(element) {\n    return element.offsetHeight\n  },\n\n  triggerTransitionEnd(element) {\n    $(element).trigger(TRANSITION_END)\n  },\n\n  // TODO: Remove in v5\n  supportsTransitionEnd() {\n    return Boolean(TRANSITION_END)\n  },\n\n  isElement(obj) {\n    return (obj[0] || obj).nodeType\n  },\n\n  typeCheckConfig(componentName, config, configTypes) {\n    for (const property in configTypes) {\n      if (Object.prototype.hasOwnProperty.call(configTypes, property)) {\n        const expectedTypes = configTypes[property]\n        const value         = config[property]\n        const valueType     = value && Util.isElement(value)\n          ? 'element' : toType(value)\n\n        if (!new RegExp(expectedTypes).test(valueType)) {\n          throw new Error(\n            `${componentName.toUpperCase()}: ` +\n            `Option \"${property}\" provided type \"${valueType}\" ` +\n            `but expected type \"${expectedTypes}\".`)\n        }\n      }\n    }\n  },\n\n  findShadowRoot(element) {\n    if (!document.documentElement.attachShadow) {\n      return null\n    }\n\n    // Can find the shadow root otherwise it'll return the document\n    if (typeof element.getRootNode === 'function') {\n      const root = element.getRootNode()\n      return root instanceof ShadowRoot ? root : null\n    }\n\n    if (element instanceof ShadowRoot) {\n      return element\n    }\n\n    // when we don't find a shadow root\n    if (!element.parentNode) {\n      return null\n    }\n\n    return Util.findShadowRoot(element.parentNode)\n  },\n\n  jQueryDetection() {\n    if (typeof $ === 'undefined') {\n      throw new TypeError('Bootstrap\\'s JavaScript requires jQuery. jQuery must be included before Bootstrap\\'s JavaScript.')\n    }\n\n    const version = $.fn.jquery.split(' ')[0].split('.')\n    const minMajor = 1\n    const ltMajor = 2\n    const minMinor = 9\n    const minPatch = 1\n    const maxMajor = 4\n\n    if (version[0] < ltMajor && version[1] < minMinor || version[0] === minMajor && version[1] === minMinor && version[2] < minPatch || version[0] >= maxMajor) {\n      throw new Error('Bootstrap\\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0')\n    }\n  }\n}\n\nUtil.jQueryDetection()\nsetTransitionEndSupport()\n\nexport default Util\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.4.1): alert.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\nimport Util from './util'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME                = 'alert'\nconst VERSION             = '4.4.1'\nconst DATA_KEY            = 'bs.alert'\nconst EVENT_KEY           = `.${DATA_KEY}`\nconst DATA_API_KEY        = '.data-api'\nconst JQUERY_NO_CONFLICT  = $.fn[NAME]\n\nconst Selector = {\n  DISMISS : '[data-dismiss=\"alert\"]'\n}\n\nconst Event = {\n  CLOSE          : `close${EVENT_KEY}`,\n  CLOSED         : `closed${EVENT_KEY}`,\n  CLICK_DATA_API : `click${EVENT_KEY}${DATA_API_KEY}`\n}\n\nconst ClassName = {\n  ALERT : 'alert',\n  FADE  : 'fade',\n  SHOW  : 'show'\n}\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass Alert {\n  constructor(element) {\n    this._element = element\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  // Public\n\n  close(element) {\n    let rootElement = this._element\n    if (element) {\n      rootElement = this._getRootElement(element)\n    }\n\n    const customEvent = this._triggerCloseEvent(rootElement)\n\n    if (customEvent.isDefaultPrevented()) {\n      return\n    }\n\n    this._removeElement(rootElement)\n  }\n\n  dispose() {\n    $.removeData(this._element, DATA_KEY)\n    this._element = null\n  }\n\n  // Private\n\n  _getRootElement(element) {\n    const selector = Util.getSelectorFromElement(element)\n    let parent     = false\n\n    if (selector) {\n      parent = document.querySelector(selector)\n    }\n\n    if (!parent) {\n      parent = $(element).closest(`.${ClassName.ALERT}`)[0]\n    }\n\n    return parent\n  }\n\n  _triggerCloseEvent(element) {\n    const closeEvent = $.Event(Event.CLOSE)\n\n    $(element).trigger(closeEvent)\n    return closeEvent\n  }\n\n  _removeElement(element) {\n    $(element).removeClass(ClassName.SHOW)\n\n    if (!$(element).hasClass(ClassName.FADE)) {\n      this._destroyElement(element)\n      return\n    }\n\n    const transitionDuration = Util.getTransitionDurationFromElement(element)\n\n    $(element)\n      .one(Util.TRANSITION_END, (event) => this._destroyElement(element, event))\n      .emulateTransitionEnd(transitionDuration)\n  }\n\n  _destroyElement(element) {\n    $(element)\n      .detach()\n      .trigger(Event.CLOSED)\n      .remove()\n  }\n\n  // Static\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      const $element = $(this)\n      let data       = $element.data(DATA_KEY)\n\n      if (!data) {\n        data = new Alert(this)\n        $element.data(DATA_KEY, data)\n      }\n\n      if (config === 'close') {\n        data[config](this)\n      }\n    })\n  }\n\n  static _handleDismiss(alertInstance) {\n    return function (event) {\n      if (event) {\n        event.preventDefault()\n      }\n\n      alertInstance.close(this)\n    }\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * Data Api implementation\n * ------------------------------------------------------------------------\n */\n\n$(document).on(\n  Event.CLICK_DATA_API,\n  Selector.DISMISS,\n  Alert._handleDismiss(new Alert())\n)\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME]             = Alert._jQueryInterface\n$.fn[NAME].Constructor = Alert\n$.fn[NAME].noConflict  = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Alert._jQueryInterface\n}\n\nexport default Alert\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.4.1): button.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME                = 'button'\nconst VERSION             = '4.4.1'\nconst DATA_KEY            = 'bs.button'\nconst EVENT_KEY           = `.${DATA_KEY}`\nconst DATA_API_KEY        = '.data-api'\nconst JQUERY_NO_CONFLICT  = $.fn[NAME]\n\nconst ClassName = {\n  ACTIVE : 'active',\n  BUTTON : 'btn',\n  FOCUS  : 'focus'\n}\n\nconst Selector = {\n  DATA_TOGGLE_CARROT   : '[data-toggle^=\"button\"]',\n  DATA_TOGGLES         : '[data-toggle=\"buttons\"]',\n  DATA_TOGGLE          : '[data-toggle=\"button\"]',\n  DATA_TOGGLES_BUTTONS : '[data-toggle=\"buttons\"] .btn',\n  INPUT                : 'input:not([type=\"hidden\"])',\n  ACTIVE               : '.active',\n  BUTTON               : '.btn'\n}\n\nconst Event = {\n  CLICK_DATA_API      : `click${EVENT_KEY}${DATA_API_KEY}`,\n  FOCUS_BLUR_DATA_API : `focus${EVENT_KEY}${DATA_API_KEY} ` +\n                          `blur${EVENT_KEY}${DATA_API_KEY}`,\n  LOAD_DATA_API       : `load${EVENT_KEY}${DATA_API_KEY}`\n}\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass Button {\n  constructor(element) {\n    this._element = element\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  // Public\n\n  toggle() {\n    let triggerChangeEvent = true\n    let addAriaPressed = true\n    const rootElement = $(this._element).closest(\n      Selector.DATA_TOGGLES\n    )[0]\n\n    if (rootElement) {\n      const input = this._element.querySelector(Selector.INPUT)\n\n      if (input) {\n        if (input.type === 'radio') {\n          if (input.checked &&\n            this._element.classList.contains(ClassName.ACTIVE)) {\n            triggerChangeEvent = false\n          } else {\n            const activeElement = rootElement.querySelector(Selector.ACTIVE)\n\n            if (activeElement) {\n              $(activeElement).removeClass(ClassName.ACTIVE)\n            }\n          }\n        } else if (input.type === 'checkbox') {\n          if (this._element.tagName === 'LABEL' && input.checked === this._element.classList.contains(ClassName.ACTIVE)) {\n            triggerChangeEvent = false\n          }\n        } else {\n          // if it's not a radio button or checkbox don't add a pointless/invalid checked property to the input\n          triggerChangeEvent = false\n        }\n\n        if (triggerChangeEvent) {\n          input.checked = !this._element.classList.contains(ClassName.ACTIVE)\n          $(input).trigger('change')\n        }\n\n        input.focus()\n        addAriaPressed = false\n      }\n    }\n\n    if (!(this._element.hasAttribute('disabled') || this._element.classList.contains('disabled'))) {\n      if (addAriaPressed) {\n        this._element.setAttribute('aria-pressed',\n          !this._element.classList.contains(ClassName.ACTIVE))\n      }\n\n      if (triggerChangeEvent) {\n        $(this._element).toggleClass(ClassName.ACTIVE)\n      }\n    }\n  }\n\n  dispose() {\n    $.removeData(this._element, DATA_KEY)\n    this._element = null\n  }\n\n  // Static\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      let data = $(this).data(DATA_KEY)\n\n      if (!data) {\n        data = new Button(this)\n        $(this).data(DATA_KEY, data)\n      }\n\n      if (config === 'toggle') {\n        data[config]()\n      }\n    })\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * Data Api implementation\n * ------------------------------------------------------------------------\n */\n\n$(document)\n  .on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE_CARROT, (event) => {\n    let button = event.target\n\n    if (!$(button).hasClass(ClassName.BUTTON)) {\n      button = $(button).closest(Selector.BUTTON)[0]\n    }\n\n    if (!button || button.hasAttribute('disabled') || button.classList.contains('disabled')) {\n      event.preventDefault() // work around Firefox bug #1540995\n    } else {\n      const inputBtn = button.querySelector(Selector.INPUT)\n\n      if (inputBtn && (inputBtn.hasAttribute('disabled') || inputBtn.classList.contains('disabled'))) {\n        event.preventDefault() // work around Firefox bug #1540995\n        return\n      }\n\n      Button._jQueryInterface.call($(button), 'toggle')\n    }\n  })\n  .on(Event.FOCUS_BLUR_DATA_API, Selector.DATA_TOGGLE_CARROT, (event) => {\n    const button = $(event.target).closest(Selector.BUTTON)[0]\n    $(button).toggleClass(ClassName.FOCUS, /^focus(in)?$/.test(event.type))\n  })\n\n$(window).on(Event.LOAD_DATA_API, () => {\n  // ensure correct active class is set to match the controls' actual values/states\n\n  // find all checkboxes/readio buttons inside data-toggle groups\n  let buttons = [].slice.call(document.querySelectorAll(Selector.DATA_TOGGLES_BUTTONS))\n  for (let i = 0, len = buttons.length; i < len; i++) {\n    const button = buttons[i]\n    const input = button.querySelector(Selector.INPUT)\n    if (input.checked || input.hasAttribute('checked')) {\n      button.classList.add(ClassName.ACTIVE)\n    } else {\n      button.classList.remove(ClassName.ACTIVE)\n    }\n  }\n\n  // find all button toggles\n  buttons = [].slice.call(document.querySelectorAll(Selector.DATA_TOGGLE))\n  for (let i = 0, len = buttons.length; i < len; i++) {\n    const button = buttons[i]\n    if (button.getAttribute('aria-pressed') === 'true') {\n      button.classList.add(ClassName.ACTIVE)\n    } else {\n      button.classList.remove(ClassName.ACTIVE)\n    }\n  }\n})\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME] = Button._jQueryInterface\n$.fn[NAME].Constructor = Button\n$.fn[NAME].noConflict = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Button._jQueryInterface\n}\n\nexport default Button\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.4.1): carousel.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\nimport Util from './util'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME                   = 'carousel'\nconst VERSION                = '4.4.1'\nconst DATA_KEY               = 'bs.carousel'\nconst EVENT_KEY              = `.${DATA_KEY}`\nconst DATA_API_KEY           = '.data-api'\nconst JQUERY_NO_CONFLICT     = $.fn[NAME]\nconst ARROW_LEFT_KEYCODE     = 37 // KeyboardEvent.which value for left arrow key\nconst ARROW_RIGHT_KEYCODE    = 39 // KeyboardEvent.which value for right arrow key\nconst TOUCHEVENT_COMPAT_WAIT = 500 // Time for mouse compat events to fire after touch\nconst SWIPE_THRESHOLD        = 40\n\nconst Default = {\n  interval : 5000,\n  keyboard : true,\n  slide    : false,\n  pause    : 'hover',\n  wrap     : true,\n  touch    : true\n}\n\nconst DefaultType = {\n  interval : '(number|boolean)',\n  keyboard : 'boolean',\n  slide    : '(boolean|string)',\n  pause    : '(string|boolean)',\n  wrap     : 'boolean',\n  touch    : 'boolean'\n}\n\nconst Direction = {\n  NEXT     : 'next',\n  PREV     : 'prev',\n  LEFT     : 'left',\n  RIGHT    : 'right'\n}\n\nconst Event = {\n  SLIDE          : `slide${EVENT_KEY}`,\n  SLID           : `slid${EVENT_KEY}`,\n  KEYDOWN        : `keydown${EVENT_KEY}`,\n  MOUSEENTER     : `mouseenter${EVENT_KEY}`,\n  MOUSELEAVE     : `mouseleave${EVENT_KEY}`,\n  TOUCHSTART     : `touchstart${EVENT_KEY}`,\n  TOUCHMOVE      : `touchmove${EVENT_KEY}`,\n  TOUCHEND       : `touchend${EVENT_KEY}`,\n  POINTERDOWN    : `pointerdown${EVENT_KEY}`,\n  POINTERUP      : `pointerup${EVENT_KEY}`,\n  DRAG_START     : `dragstart${EVENT_KEY}`,\n  LOAD_DATA_API  : `load${EVENT_KEY}${DATA_API_KEY}`,\n  CLICK_DATA_API : `click${EVENT_KEY}${DATA_API_KEY}`\n}\n\nconst ClassName = {\n  CAROUSEL      : 'carousel',\n  ACTIVE        : 'active',\n  SLIDE         : 'slide',\n  RIGHT         : 'carousel-item-right',\n  LEFT          : 'carousel-item-left',\n  NEXT          : 'carousel-item-next',\n  PREV          : 'carousel-item-prev',\n  ITEM          : 'carousel-item',\n  POINTER_EVENT : 'pointer-event'\n}\n\nconst Selector = {\n  ACTIVE      : '.active',\n  ACTIVE_ITEM : '.active.carousel-item',\n  ITEM        : '.carousel-item',\n  ITEM_IMG    : '.carousel-item img',\n  NEXT_PREV   : '.carousel-item-next, .carousel-item-prev',\n  INDICATORS  : '.carousel-indicators',\n  DATA_SLIDE  : '[data-slide], [data-slide-to]',\n  DATA_RIDE   : '[data-ride=\"carousel\"]'\n}\n\nconst PointerType = {\n  TOUCH : 'touch',\n  PEN   : 'pen'\n}\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\nclass Carousel {\n  constructor(element, config) {\n    this._items         = null\n    this._interval      = null\n    this._activeElement = null\n    this._isPaused      = false\n    this._isSliding     = false\n    this.touchTimeout   = null\n    this.touchStartX    = 0\n    this.touchDeltaX    = 0\n\n    this._config            = this._getConfig(config)\n    this._element           = element\n    this._indicatorsElement = this._element.querySelector(Selector.INDICATORS)\n    this._touchSupported    = 'ontouchstart' in document.documentElement || navigator.maxTouchPoints > 0\n    this._pointerEvent      = Boolean(window.PointerEvent || window.MSPointerEvent)\n\n    this._addEventListeners()\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  static get Default() {\n    return Default\n  }\n\n  // Public\n\n  next() {\n    if (!this._isSliding) {\n      this._slide(Direction.NEXT)\n    }\n  }\n\n  nextWhenVisible() {\n    // Don't call next when the page isn't visible\n    // or the carousel or its parent isn't visible\n    if (!document.hidden &&\n      ($(this._element).is(':visible') && $(this._element).css('visibility') !== 'hidden')) {\n      this.next()\n    }\n  }\n\n  prev() {\n    if (!this._isSliding) {\n      this._slide(Direction.PREV)\n    }\n  }\n\n  pause(event) {\n    if (!event) {\n      this._isPaused = true\n    }\n\n    if (this._element.querySelector(Selector.NEXT_PREV)) {\n      Util.triggerTransitionEnd(this._element)\n      this.cycle(true)\n    }\n\n    clearInterval(this._interval)\n    this._interval = null\n  }\n\n  cycle(event) {\n    if (!event) {\n      this._isPaused = false\n    }\n\n    if (this._interval) {\n      clearInterval(this._interval)\n      this._interval = null\n    }\n\n    if (this._config.interval && !this._isPaused) {\n      this._interval = setInterval(\n        (document.visibilityState ? this.nextWhenVisible : this.next).bind(this),\n        this._config.interval\n      )\n    }\n  }\n\n  to(index) {\n    this._activeElement = this._element.querySelector(Selector.ACTIVE_ITEM)\n\n    const activeIndex = this._getItemIndex(this._activeElement)\n\n    if (index > this._items.length - 1 || index < 0) {\n      return\n    }\n\n    if (this._isSliding) {\n      $(this._element).one(Event.SLID, () => this.to(index))\n      return\n    }\n\n    if (activeIndex === index) {\n      this.pause()\n      this.cycle()\n      return\n    }\n\n    const direction = index > activeIndex\n      ? Direction.NEXT\n      : Direction.PREV\n\n    this._slide(direction, this._items[index])\n  }\n\n  dispose() {\n    $(this._element).off(EVENT_KEY)\n    $.removeData(this._element, DATA_KEY)\n\n    this._items             = null\n    this._config            = null\n    this._element           = null\n    this._interval          = null\n    this._isPaused          = null\n    this._isSliding         = null\n    this._activeElement     = null\n    this._indicatorsElement = null\n  }\n\n  // Private\n\n  _getConfig(config) {\n    config = {\n      ...Default,\n      ...config\n    }\n    Util.typeCheckConfig(NAME, config, DefaultType)\n    return config\n  }\n\n  _handleSwipe() {\n    const absDeltax = Math.abs(this.touchDeltaX)\n\n    if (absDeltax <= SWIPE_THRESHOLD) {\n      return\n    }\n\n    const direction = absDeltax / this.touchDeltaX\n\n    this.touchDeltaX = 0\n\n    // swipe left\n    if (direction > 0) {\n      this.prev()\n    }\n\n    // swipe right\n    if (direction < 0) {\n      this.next()\n    }\n  }\n\n  _addEventListeners() {\n    if (this._config.keyboard) {\n      $(this._element)\n        .on(Event.KEYDOWN, (event) => this._keydown(event))\n    }\n\n    if (this._config.pause === 'hover') {\n      $(this._element)\n        .on(Event.MOUSEENTER, (event) => this.pause(event))\n        .on(Event.MOUSELEAVE, (event) => this.cycle(event))\n    }\n\n    if (this._config.touch) {\n      this._addTouchEventListeners()\n    }\n  }\n\n  _addTouchEventListeners() {\n    if (!this._touchSupported) {\n      return\n    }\n\n    const start = (event) => {\n      if (this._pointerEvent && PointerType[event.originalEvent.pointerType.toUpperCase()]) {\n        this.touchStartX = event.originalEvent.clientX\n      } else if (!this._pointerEvent) {\n        this.touchStartX = event.originalEvent.touches[0].clientX\n      }\n    }\n\n    const move = (event) => {\n      // ensure swiping with one touch and not pinching\n      if (event.originalEvent.touches && event.originalEvent.touches.length > 1) {\n        this.touchDeltaX = 0\n      } else {\n        this.touchDeltaX = event.originalEvent.touches[0].clientX - this.touchStartX\n      }\n    }\n\n    const end = (event) => {\n      if (this._pointerEvent && PointerType[event.originalEvent.pointerType.toUpperCase()]) {\n        this.touchDeltaX = event.originalEvent.clientX - this.touchStartX\n      }\n\n      this._handleSwipe()\n      if (this._config.pause === 'hover') {\n        // If it's a touch-enabled device, mouseenter/leave are fired as\n        // part of the mouse compatibility events on first tap - the carousel\n        // would stop cycling until user tapped out of it;\n        // here, we listen for touchend, explicitly pause the carousel\n        // (as if it's the second time we tap on it, mouseenter compat event\n        // is NOT fired) and after a timeout (to allow for mouse compatibility\n        // events to fire) we explicitly restart cycling\n\n        this.pause()\n        if (this.touchTimeout) {\n          clearTimeout(this.touchTimeout)\n        }\n        this.touchTimeout = setTimeout((event) => this.cycle(event), TOUCHEVENT_COMPAT_WAIT + this._config.interval)\n      }\n    }\n\n    $(this._element.querySelectorAll(Selector.ITEM_IMG)).on(Event.DRAG_START, (e) => e.preventDefault())\n    if (this._pointerEvent) {\n      $(this._element).on(Event.POINTERDOWN, (event) => start(event))\n      $(this._element).on(Event.POINTERUP, (event) => end(event))\n\n      this._element.classList.add(ClassName.POINTER_EVENT)\n    } else {\n      $(this._element).on(Event.TOUCHSTART, (event) => start(event))\n      $(this._element).on(Event.TOUCHMOVE, (event) => move(event))\n      $(this._element).on(Event.TOUCHEND, (event) => end(event))\n    }\n  }\n\n  _keydown(event) {\n    if (/input|textarea/i.test(event.target.tagName)) {\n      return\n    }\n\n    switch (event.which) {\n      case ARROW_LEFT_KEYCODE:\n        event.preventDefault()\n        this.prev()\n        break\n      case ARROW_RIGHT_KEYCODE:\n        event.preventDefault()\n        this.next()\n        break\n      default:\n    }\n  }\n\n  _getItemIndex(element) {\n    this._items = element && element.parentNode\n      ? [].slice.call(element.parentNode.querySelectorAll(Selector.ITEM))\n      : []\n    return this._items.indexOf(element)\n  }\n\n  _getItemByDirection(direction, activeElement) {\n    const isNextDirection = direction === Direction.NEXT\n    const isPrevDirection = direction === Direction.PREV\n    const activeIndex     = this._getItemIndex(activeElement)\n    const lastItemIndex   = this._items.length - 1\n    const isGoingToWrap   = isPrevDirection && activeIndex === 0 ||\n                            isNextDirection && activeIndex === lastItemIndex\n\n    if (isGoingToWrap && !this._config.wrap) {\n      return activeElement\n    }\n\n    const delta     = direction === Direction.PREV ? -1 : 1\n    const itemIndex = (activeIndex + delta) % this._items.length\n\n    return itemIndex === -1\n      ? this._items[this._items.length - 1] : this._items[itemIndex]\n  }\n\n  _triggerSlideEvent(relatedTarget, eventDirectionName) {\n    const targetIndex = this._getItemIndex(relatedTarget)\n    const fromIndex = this._getItemIndex(this._element.querySelector(Selector.ACTIVE_ITEM))\n    const slideEvent = $.Event(Event.SLIDE, {\n      relatedTarget,\n      direction: eventDirectionName,\n      from: fromIndex,\n      to: targetIndex\n    })\n\n    $(this._element).trigger(slideEvent)\n\n    return slideEvent\n  }\n\n  _setActiveIndicatorElement(element) {\n    if (this._indicatorsElement) {\n      const indicators = [].slice.call(this._indicatorsElement.querySelectorAll(Selector.ACTIVE))\n      $(indicators)\n        .removeClass(ClassName.ACTIVE)\n\n      const nextIndicator = this._indicatorsElement.children[\n        this._getItemIndex(element)\n      ]\n\n      if (nextIndicator) {\n        $(nextIndicator).addClass(ClassName.ACTIVE)\n      }\n    }\n  }\n\n  _slide(direction, element) {\n    const activeElement = this._element.querySelector(Selector.ACTIVE_ITEM)\n    const activeElementIndex = this._getItemIndex(activeElement)\n    const nextElement   = element || activeElement &&\n      this._getItemByDirection(direction, activeElement)\n    const nextElementIndex = this._getItemIndex(nextElement)\n    const isCycling = Boolean(this._interval)\n\n    let directionalClassName\n    let orderClassName\n    let eventDirectionName\n\n    if (direction === Direction.NEXT) {\n      directionalClassName = ClassName.LEFT\n      orderClassName = ClassName.NEXT\n      eventDirectionName = Direction.LEFT\n    } else {\n      directionalClassName = ClassName.RIGHT\n      orderClassName = ClassName.PREV\n      eventDirectionName = Direction.RIGHT\n    }\n\n    if (nextElement && $(nextElement).hasClass(ClassName.ACTIVE)) {\n      this._isSliding = false\n      return\n    }\n\n    const slideEvent = this._triggerSlideEvent(nextElement, eventDirectionName)\n    if (slideEvent.isDefaultPrevented()) {\n      return\n    }\n\n    if (!activeElement || !nextElement) {\n      // Some weirdness is happening, so we bail\n      return\n    }\n\n    this._isSliding = true\n\n    if (isCycling) {\n      this.pause()\n    }\n\n    this._setActiveIndicatorElement(nextElement)\n\n    const slidEvent = $.Event(Event.SLID, {\n      relatedTarget: nextElement,\n      direction: eventDirectionName,\n      from: activeElementIndex,\n      to: nextElementIndex\n    })\n\n    if ($(this._element).hasClass(ClassName.SLIDE)) {\n      $(nextElement).addClass(orderClassName)\n\n      Util.reflow(nextElement)\n\n      $(activeElement).addClass(directionalClassName)\n      $(nextElement).addClass(directionalClassName)\n\n      const nextElementInterval = parseInt(nextElement.getAttribute('data-interval'), 10)\n      if (nextElementInterval) {\n        this._config.defaultInterval = this._config.defaultInterval || this._config.interval\n        this._config.interval = nextElementInterval\n      } else {\n        this._config.interval = this._config.defaultInterval || this._config.interval\n      }\n\n      const transitionDuration = Util.getTransitionDurationFromElement(activeElement)\n\n      $(activeElement)\n        .one(Util.TRANSITION_END, () => {\n          $(nextElement)\n            .removeClass(`${directionalClassName} ${orderClassName}`)\n            .addClass(ClassName.ACTIVE)\n\n          $(activeElement).removeClass(`${ClassName.ACTIVE} ${orderClassName} ${directionalClassName}`)\n\n          this._isSliding = false\n\n          setTimeout(() => $(this._element).trigger(slidEvent), 0)\n        })\n        .emulateTransitionEnd(transitionDuration)\n    } else {\n      $(activeElement).removeClass(ClassName.ACTIVE)\n      $(nextElement).addClass(ClassName.ACTIVE)\n\n      this._isSliding = false\n      $(this._element).trigger(slidEvent)\n    }\n\n    if (isCycling) {\n      this.cycle()\n    }\n  }\n\n  // Static\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      let data = $(this).data(DATA_KEY)\n      let _config = {\n        ...Default,\n        ...$(this).data()\n      }\n\n      if (typeof config === 'object') {\n        _config = {\n          ..._config,\n          ...config\n        }\n      }\n\n      const action = typeof config === 'string' ? config : _config.slide\n\n      if (!data) {\n        data = new Carousel(this, _config)\n        $(this).data(DATA_KEY, data)\n      }\n\n      if (typeof config === 'number') {\n        data.to(config)\n      } else if (typeof action === 'string') {\n        if (typeof data[action] === 'undefined') {\n          throw new TypeError(`No method named \"${action}\"`)\n        }\n        data[action]()\n      } else if (_config.interval && _config.ride) {\n        data.pause()\n        data.cycle()\n      }\n    })\n  }\n\n  static _dataApiClickHandler(event) {\n    const selector = Util.getSelectorFromElement(this)\n\n    if (!selector) {\n      return\n    }\n\n    const target = $(selector)[0]\n\n    if (!target || !$(target).hasClass(ClassName.CAROUSEL)) {\n      return\n    }\n\n    const config = {\n      ...$(target).data(),\n      ...$(this).data()\n    }\n    const slideIndex = this.getAttribute('data-slide-to')\n\n    if (slideIndex) {\n      config.interval = false\n    }\n\n    Carousel._jQueryInterface.call($(target), config)\n\n    if (slideIndex) {\n      $(target).data(DATA_KEY).to(slideIndex)\n    }\n\n    event.preventDefault()\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * Data Api implementation\n * ------------------------------------------------------------------------\n */\n\n$(document)\n  .on(Event.CLICK_DATA_API, Selector.DATA_SLIDE, Carousel._dataApiClickHandler)\n\n$(window).on(Event.LOAD_DATA_API, () => {\n  const carousels = [].slice.call(document.querySelectorAll(Selector.DATA_RIDE))\n  for (let i = 0, len = carousels.length; i < len; i++) {\n    const $carousel = $(carousels[i])\n    Carousel._jQueryInterface.call($carousel, $carousel.data())\n  }\n})\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME] = Carousel._jQueryInterface\n$.fn[NAME].Constructor = Carousel\n$.fn[NAME].noConflict = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Carousel._jQueryInterface\n}\n\nexport default Carousel\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.4.1): collapse.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\nimport Util from './util'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME                = 'collapse'\nconst VERSION             = '4.4.1'\nconst DATA_KEY            = 'bs.collapse'\nconst EVENT_KEY           = `.${DATA_KEY}`\nconst DATA_API_KEY        = '.data-api'\nconst JQUERY_NO_CONFLICT  = $.fn[NAME]\n\nconst Default = {\n  toggle : true,\n  parent : ''\n}\n\nconst DefaultType = {\n  toggle : 'boolean',\n  parent : '(string|element)'\n}\n\nconst Event = {\n  SHOW           : `show${EVENT_KEY}`,\n  SHOWN          : `shown${EVENT_KEY}`,\n  HIDE           : `hide${EVENT_KEY}`,\n  HIDDEN         : `hidden${EVENT_KEY}`,\n  CLICK_DATA_API : `click${EVENT_KEY}${DATA_API_KEY}`\n}\n\nconst ClassName = {\n  SHOW       : 'show',\n  COLLAPSE   : 'collapse',\n  COLLAPSING : 'collapsing',\n  COLLAPSED  : 'collapsed'\n}\n\nconst Dimension = {\n  WIDTH  : 'width',\n  HEIGHT : 'height'\n}\n\nconst Selector = {\n  ACTIVES     : '.show, .collapsing',\n  DATA_TOGGLE : '[data-toggle=\"collapse\"]'\n}\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass Collapse {\n  constructor(element, config) {\n    this._isTransitioning = false\n    this._element         = element\n    this._config          = this._getConfig(config)\n    this._triggerArray    = [].slice.call(document.querySelectorAll(\n      `[data-toggle=\"collapse\"][href=\"#${element.id}\"],` +\n      `[data-toggle=\"collapse\"][data-target=\"#${element.id}\"]`\n    ))\n\n    const toggleList = [].slice.call(document.querySelectorAll(Selector.DATA_TOGGLE))\n    for (let i = 0, len = toggleList.length; i < len; i++) {\n      const elem = toggleList[i]\n      const selector = Util.getSelectorFromElement(elem)\n      const filterElement = [].slice.call(document.querySelectorAll(selector))\n        .filter((foundElem) => foundElem === element)\n\n      if (selector !== null && filterElement.length > 0) {\n        this._selector = selector\n        this._triggerArray.push(elem)\n      }\n    }\n\n    this._parent = this._config.parent ? this._getParent() : null\n\n    if (!this._config.parent) {\n      this._addAriaAndCollapsedClass(this._element, this._triggerArray)\n    }\n\n    if (this._config.toggle) {\n      this.toggle()\n    }\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  static get Default() {\n    return Default\n  }\n\n  // Public\n\n  toggle() {\n    if ($(this._element).hasClass(ClassName.SHOW)) {\n      this.hide()\n    } else {\n      this.show()\n    }\n  }\n\n  show() {\n    if (this._isTransitioning ||\n      $(this._element).hasClass(ClassName.SHOW)) {\n      return\n    }\n\n    let actives\n    let activesData\n\n    if (this._parent) {\n      actives = [].slice.call(this._parent.querySelectorAll(Selector.ACTIVES))\n        .filter((elem) => {\n          if (typeof this._config.parent === 'string') {\n            return elem.getAttribute('data-parent') === this._config.parent\n          }\n\n          return elem.classList.contains(ClassName.COLLAPSE)\n        })\n\n      if (actives.length === 0) {\n        actives = null\n      }\n    }\n\n    if (actives) {\n      activesData = $(actives).not(this._selector).data(DATA_KEY)\n      if (activesData && activesData._isTransitioning) {\n        return\n      }\n    }\n\n    const startEvent = $.Event(Event.SHOW)\n    $(this._element).trigger(startEvent)\n    if (startEvent.isDefaultPrevented()) {\n      return\n    }\n\n    if (actives) {\n      Collapse._jQueryInterface.call($(actives).not(this._selector), 'hide')\n      if (!activesData) {\n        $(actives).data(DATA_KEY, null)\n      }\n    }\n\n    const dimension = this._getDimension()\n\n    $(this._element)\n      .removeClass(ClassName.COLLAPSE)\n      .addClass(ClassName.COLLAPSING)\n\n    this._element.style[dimension] = 0\n\n    if (this._triggerArray.length) {\n      $(this._triggerArray)\n        .removeClass(ClassName.COLLAPSED)\n        .attr('aria-expanded', true)\n    }\n\n    this.setTransitioning(true)\n\n    const complete = () => {\n      $(this._element)\n        .removeClass(ClassName.COLLAPSING)\n        .addClass(ClassName.COLLAPSE)\n        .addClass(ClassName.SHOW)\n\n      this._element.style[dimension] = ''\n\n      this.setTransitioning(false)\n\n      $(this._element).trigger(Event.SHOWN)\n    }\n\n    const capitalizedDimension = dimension[0].toUpperCase() + dimension.slice(1)\n    const scrollSize = `scroll${capitalizedDimension}`\n    const transitionDuration = Util.getTransitionDurationFromElement(this._element)\n\n    $(this._element)\n      .one(Util.TRANSITION_END, complete)\n      .emulateTransitionEnd(transitionDuration)\n\n    this._element.style[dimension] = `${this._element[scrollSize]}px`\n  }\n\n  hide() {\n    if (this._isTransitioning ||\n      !$(this._element).hasClass(ClassName.SHOW)) {\n      return\n    }\n\n    const startEvent = $.Event(Event.HIDE)\n    $(this._element).trigger(startEvent)\n    if (startEvent.isDefaultPrevented()) {\n      return\n    }\n\n    const dimension = this._getDimension()\n\n    this._element.style[dimension] = `${this._element.getBoundingClientRect()[dimension]}px`\n\n    Util.reflow(this._element)\n\n    $(this._element)\n      .addClass(ClassName.COLLAPSING)\n      .removeClass(ClassName.COLLAPSE)\n      .removeClass(ClassName.SHOW)\n\n    const triggerArrayLength = this._triggerArray.length\n    if (triggerArrayLength > 0) {\n      for (let i = 0; i < triggerArrayLength; i++) {\n        const trigger = this._triggerArray[i]\n        const selector = Util.getSelectorFromElement(trigger)\n\n        if (selector !== null) {\n          const $elem = $([].slice.call(document.querySelectorAll(selector)))\n          if (!$elem.hasClass(ClassName.SHOW)) {\n            $(trigger).addClass(ClassName.COLLAPSED)\n              .attr('aria-expanded', false)\n          }\n        }\n      }\n    }\n\n    this.setTransitioning(true)\n\n    const complete = () => {\n      this.setTransitioning(false)\n      $(this._element)\n        .removeClass(ClassName.COLLAPSING)\n        .addClass(ClassName.COLLAPSE)\n        .trigger(Event.HIDDEN)\n    }\n\n    this._element.style[dimension] = ''\n    const transitionDuration = Util.getTransitionDurationFromElement(this._element)\n\n    $(this._element)\n      .one(Util.TRANSITION_END, complete)\n      .emulateTransitionEnd(transitionDuration)\n  }\n\n  setTransitioning(isTransitioning) {\n    this._isTransitioning = isTransitioning\n  }\n\n  dispose() {\n    $.removeData(this._element, DATA_KEY)\n\n    this._config          = null\n    this._parent          = null\n    this._element         = null\n    this._triggerArray    = null\n    this._isTransitioning = null\n  }\n\n  // Private\n\n  _getConfig(config) {\n    config = {\n      ...Default,\n      ...config\n    }\n    config.toggle = Boolean(config.toggle) // Coerce string values\n    Util.typeCheckConfig(NAME, config, DefaultType)\n    return config\n  }\n\n  _getDimension() {\n    const hasWidth = $(this._element).hasClass(Dimension.WIDTH)\n    return hasWidth ? Dimension.WIDTH : Dimension.HEIGHT\n  }\n\n  _getParent() {\n    let parent\n\n    if (Util.isElement(this._config.parent)) {\n      parent = this._config.parent\n\n      // It's a jQuery object\n      if (typeof this._config.parent.jquery !== 'undefined') {\n        parent = this._config.parent[0]\n      }\n    } else {\n      parent = document.querySelector(this._config.parent)\n    }\n\n    const selector =\n      `[data-toggle=\"collapse\"][data-parent=\"${this._config.parent}\"]`\n\n    const children = [].slice.call(parent.querySelectorAll(selector))\n    $(children).each((i, element) => {\n      this._addAriaAndCollapsedClass(\n        Collapse._getTargetFromElement(element),\n        [element]\n      )\n    })\n\n    return parent\n  }\n\n  _addAriaAndCollapsedClass(element, triggerArray) {\n    const isOpen = $(element).hasClass(ClassName.SHOW)\n\n    if (triggerArray.length) {\n      $(triggerArray)\n        .toggleClass(ClassName.COLLAPSED, !isOpen)\n        .attr('aria-expanded', isOpen)\n    }\n  }\n\n  // Static\n\n  static _getTargetFromElement(element) {\n    const selector = Util.getSelectorFromElement(element)\n    return selector ? document.querySelector(selector) : null\n  }\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      const $this   = $(this)\n      let data      = $this.data(DATA_KEY)\n      const _config = {\n        ...Default,\n        ...$this.data(),\n        ...typeof config === 'object' && config ? config : {}\n      }\n\n      if (!data && _config.toggle && /show|hide/.test(config)) {\n        _config.toggle = false\n      }\n\n      if (!data) {\n        data = new Collapse(this, _config)\n        $this.data(DATA_KEY, data)\n      }\n\n      if (typeof config === 'string') {\n        if (typeof data[config] === 'undefined') {\n          throw new TypeError(`No method named \"${config}\"`)\n        }\n        data[config]()\n      }\n    })\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * Data Api implementation\n * ------------------------------------------------------------------------\n */\n\n$(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {\n  // preventDefault only for <a> elements (which change the URL) not inside the collapsible element\n  if (event.currentTarget.tagName === 'A') {\n    event.preventDefault()\n  }\n\n  const $trigger = $(this)\n  const selector = Util.getSelectorFromElement(this)\n  const selectors = [].slice.call(document.querySelectorAll(selector))\n\n  $(selectors).each(function () {\n    const $target = $(this)\n    const data    = $target.data(DATA_KEY)\n    const config  = data ? 'toggle' : $trigger.data()\n    Collapse._jQueryInterface.call($target, config)\n  })\n})\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME] = Collapse._jQueryInterface\n$.fn[NAME].Constructor = Collapse\n$.fn[NAME].noConflict = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Collapse._jQueryInterface\n}\n\nexport default Collapse\n","/**!\n * @fileOverview Kickass library to create and place poppers near their reference elements.\n * @version 1.16.0\n * @license\n * Copyright (c) 2016 Federico Zivolo and contributors\n *\n * Permission is hereby granted, free of charge, to any person obtaining a copy\n * of this software and associated documentation files (the \"Software\"), to deal\n * in the Software without restriction, including without limitation the rights\n * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n * copies of the Software, and to permit persons to whom the Software is\n * furnished to do so, subject to the following conditions:\n *\n * The above copyright notice and this permission notice shall be included in all\n * copies or substantial portions of the Software.\n *\n * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n * SOFTWARE.\n */\nvar isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined' && typeof navigator !== 'undefined';\n\nvar timeoutDuration = function () {\n  var longerTimeoutBrowsers = ['Edge', 'Trident', 'Firefox'];\n  for (var i = 0; i < longerTimeoutBrowsers.length; i += 1) {\n    if (isBrowser && navigator.userAgent.indexOf(longerTimeoutBrowsers[i]) >= 0) {\n      return 1;\n    }\n  }\n  return 0;\n}();\n\nfunction microtaskDebounce(fn) {\n  var called = false;\n  return function () {\n    if (called) {\n      return;\n    }\n    called = true;\n    window.Promise.resolve().then(function () {\n      called = false;\n      fn();\n    });\n  };\n}\n\nfunction taskDebounce(fn) {\n  var scheduled = false;\n  return function () {\n    if (!scheduled) {\n      scheduled = true;\n      setTimeout(function () {\n        scheduled = false;\n        fn();\n      }, timeoutDuration);\n    }\n  };\n}\n\nvar supportsMicroTasks = isBrowser && window.Promise;\n\n/**\n* Create a debounced version of a method, that's asynchronously deferred\n* but called in the minimum time possible.\n*\n* @method\n* @memberof Popper.Utils\n* @argument {Function} fn\n* @returns {Function}\n*/\nvar debounce = supportsMicroTasks ? microtaskDebounce : taskDebounce;\n\n/**\n * Check if the given variable is a function\n * @method\n * @memberof Popper.Utils\n * @argument {Any} functionToCheck - variable to check\n * @returns {Boolean} answer to: is a function?\n */\nfunction isFunction(functionToCheck) {\n  var getType = {};\n  return functionToCheck && getType.toString.call(functionToCheck) === '[object Function]';\n}\n\n/**\n * Get CSS computed property of the given element\n * @method\n * @memberof Popper.Utils\n * @argument {Eement} element\n * @argument {String} property\n */\nfunction getStyleComputedProperty(element, property) {\n  if (element.nodeType !== 1) {\n    return [];\n  }\n  // NOTE: 1 DOM access here\n  var window = element.ownerDocument.defaultView;\n  var css = window.getComputedStyle(element, null);\n  return property ? css[property] : css;\n}\n\n/**\n * Returns the parentNode or the host of the element\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Element} parent\n */\nfunction getParentNode(element) {\n  if (element.nodeName === 'HTML') {\n    return element;\n  }\n  return element.parentNode || element.host;\n}\n\n/**\n * Returns the scrolling parent of the given element\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Element} scroll parent\n */\nfunction getScrollParent(element) {\n  // Return body, `getScroll` will take care to get the correct `scrollTop` from it\n  if (!element) {\n    return document.body;\n  }\n\n  switch (element.nodeName) {\n    case 'HTML':\n    case 'BODY':\n      return element.ownerDocument.body;\n    case '#document':\n      return element.body;\n  }\n\n  // Firefox want us to check `-x` and `-y` variations as well\n\n  var _getStyleComputedProp = getStyleComputedProperty(element),\n      overflow = _getStyleComputedProp.overflow,\n      overflowX = _getStyleComputedProp.overflowX,\n      overflowY = _getStyleComputedProp.overflowY;\n\n  if (/(auto|scroll|overlay)/.test(overflow + overflowY + overflowX)) {\n    return element;\n  }\n\n  return getScrollParent(getParentNode(element));\n}\n\n/**\n * Returns the reference node of the reference object, or the reference object itself.\n * @method\n * @memberof Popper.Utils\n * @param {Element|Object} reference - the reference element (the popper will be relative to this)\n * @returns {Element} parent\n */\nfunction getReferenceNode(reference) {\n  return reference && reference.referenceNode ? reference.referenceNode : reference;\n}\n\nvar isIE11 = isBrowser && !!(window.MSInputMethodContext && document.documentMode);\nvar isIE10 = isBrowser && /MSIE 10/.test(navigator.userAgent);\n\n/**\n * Determines if the browser is Internet Explorer\n * @method\n * @memberof Popper.Utils\n * @param {Number} version to check\n * @returns {Boolean} isIE\n */\nfunction isIE(version) {\n  if (version === 11) {\n    return isIE11;\n  }\n  if (version === 10) {\n    return isIE10;\n  }\n  return isIE11 || isIE10;\n}\n\n/**\n * Returns the offset parent of the given element\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Element} offset parent\n */\nfunction getOffsetParent(element) {\n  if (!element) {\n    return document.documentElement;\n  }\n\n  var noOffsetParent = isIE(10) ? document.body : null;\n\n  // NOTE: 1 DOM access here\n  var offsetParent = element.offsetParent || null;\n  // Skip hidden elements which don't have an offsetParent\n  while (offsetParent === noOffsetParent && element.nextElementSibling) {\n    offsetParent = (element = element.nextElementSibling).offsetParent;\n  }\n\n  var nodeName = offsetParent && offsetParent.nodeName;\n\n  if (!nodeName || nodeName === 'BODY' || nodeName === 'HTML') {\n    return element ? element.ownerDocument.documentElement : document.documentElement;\n  }\n\n  // .offsetParent will return the closest TH, TD or TABLE in case\n  // no offsetParent is present, I hate this job...\n  if (['TH', 'TD', 'TABLE'].indexOf(offsetParent.nodeName) !== -1 && getStyleComputedProperty(offsetParent, 'position') === 'static') {\n    return getOffsetParent(offsetParent);\n  }\n\n  return offsetParent;\n}\n\nfunction isOffsetContainer(element) {\n  var nodeName = element.nodeName;\n\n  if (nodeName === 'BODY') {\n    return false;\n  }\n  return nodeName === 'HTML' || getOffsetParent(element.firstElementChild) === element;\n}\n\n/**\n * Finds the root node (document, shadowDOM root) of the given element\n * @method\n * @memberof Popper.Utils\n * @argument {Element} node\n * @returns {Element} root node\n */\nfunction getRoot(node) {\n  if (node.parentNode !== null) {\n    return getRoot(node.parentNode);\n  }\n\n  return node;\n}\n\n/**\n * Finds the offset parent common to the two provided nodes\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element1\n * @argument {Element} element2\n * @returns {Element} common offset parent\n */\nfunction findCommonOffsetParent(element1, element2) {\n  // This check is needed to avoid errors in case one of the elements isn't defined for any reason\n  if (!element1 || !element1.nodeType || !element2 || !element2.nodeType) {\n    return document.documentElement;\n  }\n\n  // Here we make sure to give as \"start\" the element that comes first in the DOM\n  var order = element1.compareDocumentPosition(element2) & Node.DOCUMENT_POSITION_FOLLOWING;\n  var start = order ? element1 : element2;\n  var end = order ? element2 : element1;\n\n  // Get common ancestor container\n  var range = document.createRange();\n  range.setStart(start, 0);\n  range.setEnd(end, 0);\n  var commonAncestorContainer = range.commonAncestorContainer;\n\n  // Both nodes are inside #document\n\n  if (element1 !== commonAncestorContainer && element2 !== commonAncestorContainer || start.contains(end)) {\n    if (isOffsetContainer(commonAncestorContainer)) {\n      return commonAncestorContainer;\n    }\n\n    return getOffsetParent(commonAncestorContainer);\n  }\n\n  // one of the nodes is inside shadowDOM, find which one\n  var element1root = getRoot(element1);\n  if (element1root.host) {\n    return findCommonOffsetParent(element1root.host, element2);\n  } else {\n    return findCommonOffsetParent(element1, getRoot(element2).host);\n  }\n}\n\n/**\n * Gets the scroll value of the given element in the given side (top and left)\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @argument {String} side `top` or `left`\n * @returns {number} amount of scrolled pixels\n */\nfunction getScroll(element) {\n  var side = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'top';\n\n  var upperSide = side === 'top' ? 'scrollTop' : 'scrollLeft';\n  var nodeName = element.nodeName;\n\n  if (nodeName === 'BODY' || nodeName === 'HTML') {\n    var html = element.ownerDocument.documentElement;\n    var scrollingElement = element.ownerDocument.scrollingElement || html;\n    return scrollingElement[upperSide];\n  }\n\n  return element[upperSide];\n}\n\n/*\n * Sum or subtract the element scroll values (left and top) from a given rect object\n * @method\n * @memberof Popper.Utils\n * @param {Object} rect - Rect object you want to change\n * @param {HTMLElement} element - The element from the function reads the scroll values\n * @param {Boolean} subtract - set to true if you want to subtract the scroll values\n * @return {Object} rect - The modifier rect object\n */\nfunction includeScroll(rect, element) {\n  var subtract = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;\n\n  var scrollTop = getScroll(element, 'top');\n  var scrollLeft = getScroll(element, 'left');\n  var modifier = subtract ? -1 : 1;\n  rect.top += scrollTop * modifier;\n  rect.bottom += scrollTop * modifier;\n  rect.left += scrollLeft * modifier;\n  rect.right += scrollLeft * modifier;\n  return rect;\n}\n\n/*\n * Helper to detect borders of a given element\n * @method\n * @memberof Popper.Utils\n * @param {CSSStyleDeclaration} styles\n * Result of `getStyleComputedProperty` on the given element\n * @param {String} axis - `x` or `y`\n * @return {number} borders - The borders size of the given axis\n */\n\nfunction getBordersSize(styles, axis) {\n  var sideA = axis === 'x' ? 'Left' : 'Top';\n  var sideB = sideA === 'Left' ? 'Right' : 'Bottom';\n\n  return parseFloat(styles['border' + sideA + 'Width'], 10) + parseFloat(styles['border' + sideB + 'Width'], 10);\n}\n\nfunction getSize(axis, body, html, computedStyle) {\n  return Math.max(body['offset' + axis], body['scroll' + axis], html['client' + axis], html['offset' + axis], html['scroll' + axis], isIE(10) ? parseInt(html['offset' + axis]) + parseInt(computedStyle['margin' + (axis === 'Height' ? 'Top' : 'Left')]) + parseInt(computedStyle['margin' + (axis === 'Height' ? 'Bottom' : 'Right')]) : 0);\n}\n\nfunction getWindowSizes(document) {\n  var body = document.body;\n  var html = document.documentElement;\n  var computedStyle = isIE(10) && getComputedStyle(html);\n\n  return {\n    height: getSize('Height', body, html, computedStyle),\n    width: getSize('Width', body, html, computedStyle)\n  };\n}\n\nvar classCallCheck = function (instance, Constructor) {\n  if (!(instance instanceof Constructor)) {\n    throw new TypeError(\"Cannot call a class as a function\");\n  }\n};\n\nvar createClass = function () {\n  function defineProperties(target, props) {\n    for (var i = 0; i < props.length; i++) {\n      var descriptor = props[i];\n      descriptor.enumerable = descriptor.enumerable || false;\n      descriptor.configurable = true;\n      if (\"value\" in descriptor) descriptor.writable = true;\n      Object.defineProperty(target, descriptor.key, descriptor);\n    }\n  }\n\n  return function (Constructor, protoProps, staticProps) {\n    if (protoProps) defineProperties(Constructor.prototype, protoProps);\n    if (staticProps) defineProperties(Constructor, staticProps);\n    return Constructor;\n  };\n}();\n\n\n\n\n\nvar defineProperty = function (obj, key, value) {\n  if (key in obj) {\n    Object.defineProperty(obj, key, {\n      value: value,\n      enumerable: true,\n      configurable: true,\n      writable: true\n    });\n  } else {\n    obj[key] = value;\n  }\n\n  return obj;\n};\n\nvar _extends = Object.assign || function (target) {\n  for (var i = 1; i < arguments.length; i++) {\n    var source = arguments[i];\n\n    for (var key in source) {\n      if (Object.prototype.hasOwnProperty.call(source, key)) {\n        target[key] = source[key];\n      }\n    }\n  }\n\n  return target;\n};\n\n/**\n * Given element offsets, generate an output similar to getBoundingClientRect\n * @method\n * @memberof Popper.Utils\n * @argument {Object} offsets\n * @returns {Object} ClientRect like output\n */\nfunction getClientRect(offsets) {\n  return _extends({}, offsets, {\n    right: offsets.left + offsets.width,\n    bottom: offsets.top + offsets.height\n  });\n}\n\n/**\n * Get bounding client rect of given element\n * @method\n * @memberof Popper.Utils\n * @param {HTMLElement} element\n * @return {Object} client rect\n */\nfunction getBoundingClientRect(element) {\n  var rect = {};\n\n  // IE10 10 FIX: Please, don't ask, the element isn't\n  // considered in DOM in some circumstances...\n  // This isn't reproducible in IE10 compatibility mode of IE11\n  try {\n    if (isIE(10)) {\n      rect = element.getBoundingClientRect();\n      var scrollTop = getScroll(element, 'top');\n      var scrollLeft = getScroll(element, 'left');\n      rect.top += scrollTop;\n      rect.left += scrollLeft;\n      rect.bottom += scrollTop;\n      rect.right += scrollLeft;\n    } else {\n      rect = element.getBoundingClientRect();\n    }\n  } catch (e) {}\n\n  var result = {\n    left: rect.left,\n    top: rect.top,\n    width: rect.right - rect.left,\n    height: rect.bottom - rect.top\n  };\n\n  // subtract scrollbar size from sizes\n  var sizes = element.nodeName === 'HTML' ? getWindowSizes(element.ownerDocument) : {};\n  var width = sizes.width || element.clientWidth || result.width;\n  var height = sizes.height || element.clientHeight || result.height;\n\n  var horizScrollbar = element.offsetWidth - width;\n  var vertScrollbar = element.offsetHeight - height;\n\n  // if an hypothetical scrollbar is detected, we must be sure it's not a `border`\n  // we make this check conditional for performance reasons\n  if (horizScrollbar || vertScrollbar) {\n    var styles = getStyleComputedProperty(element);\n    horizScrollbar -= getBordersSize(styles, 'x');\n    vertScrollbar -= getBordersSize(styles, 'y');\n\n    result.width -= horizScrollbar;\n    result.height -= vertScrollbar;\n  }\n\n  return getClientRect(result);\n}\n\nfunction getOffsetRectRelativeToArbitraryNode(children, parent) {\n  var fixedPosition = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;\n\n  var isIE10 = isIE(10);\n  var isHTML = parent.nodeName === 'HTML';\n  var childrenRect = getBoundingClientRect(children);\n  var parentRect = getBoundingClientRect(parent);\n  var scrollParent = getScrollParent(children);\n\n  var styles = getStyleComputedProperty(parent);\n  var borderTopWidth = parseFloat(styles.borderTopWidth, 10);\n  var borderLeftWidth = parseFloat(styles.borderLeftWidth, 10);\n\n  // In cases where the parent is fixed, we must ignore negative scroll in offset calc\n  if (fixedPosition && isHTML) {\n    parentRect.top = Math.max(parentRect.top, 0);\n    parentRect.left = Math.max(parentRect.left, 0);\n  }\n  var offsets = getClientRect({\n    top: childrenRect.top - parentRect.top - borderTopWidth,\n    left: childrenRect.left - parentRect.left - borderLeftWidth,\n    width: childrenRect.width,\n    height: childrenRect.height\n  });\n  offsets.marginTop = 0;\n  offsets.marginLeft = 0;\n\n  // Subtract margins of documentElement in case it's being used as parent\n  // we do this only on HTML because it's the only element that behaves\n  // differently when margins are applied to it. The margins are included in\n  // the box of the documentElement, in the other cases not.\n  if (!isIE10 && isHTML) {\n    var marginTop = parseFloat(styles.marginTop, 10);\n    var marginLeft = parseFloat(styles.marginLeft, 10);\n\n    offsets.top -= borderTopWidth - marginTop;\n    offsets.bottom -= borderTopWidth - marginTop;\n    offsets.left -= borderLeftWidth - marginLeft;\n    offsets.right -= borderLeftWidth - marginLeft;\n\n    // Attach marginTop and marginLeft because in some circumstances we may need them\n    offsets.marginTop = marginTop;\n    offsets.marginLeft = marginLeft;\n  }\n\n  if (isIE10 && !fixedPosition ? parent.contains(scrollParent) : parent === scrollParent && scrollParent.nodeName !== 'BODY') {\n    offsets = includeScroll(offsets, parent);\n  }\n\n  return offsets;\n}\n\nfunction getViewportOffsetRectRelativeToArtbitraryNode(element) {\n  var excludeScroll = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;\n\n  var html = element.ownerDocument.documentElement;\n  var relativeOffset = getOffsetRectRelativeToArbitraryNode(element, html);\n  var width = Math.max(html.clientWidth, window.innerWidth || 0);\n  var height = Math.max(html.clientHeight, window.innerHeight || 0);\n\n  var scrollTop = !excludeScroll ? getScroll(html) : 0;\n  var scrollLeft = !excludeScroll ? getScroll(html, 'left') : 0;\n\n  var offset = {\n    top: scrollTop - relativeOffset.top + relativeOffset.marginTop,\n    left: scrollLeft - relativeOffset.left + relativeOffset.marginLeft,\n    width: width,\n    height: height\n  };\n\n  return getClientRect(offset);\n}\n\n/**\n * Check if the given element is fixed or is inside a fixed parent\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @argument {Element} customContainer\n * @returns {Boolean} answer to \"isFixed?\"\n */\nfunction isFixed(element) {\n  var nodeName = element.nodeName;\n  if (nodeName === 'BODY' || nodeName === 'HTML') {\n    return false;\n  }\n  if (getStyleComputedProperty(element, 'position') === 'fixed') {\n    return true;\n  }\n  var parentNode = getParentNode(element);\n  if (!parentNode) {\n    return false;\n  }\n  return isFixed(parentNode);\n}\n\n/**\n * Finds the first parent of an element that has a transformed property defined\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Element} first transformed parent or documentElement\n */\n\nfunction getFixedPositionOffsetParent(element) {\n  // This check is needed to avoid errors in case one of the elements isn't defined for any reason\n  if (!element || !element.parentElement || isIE()) {\n    return document.documentElement;\n  }\n  var el = element.parentElement;\n  while (el && getStyleComputedProperty(el, 'transform') === 'none') {\n    el = el.parentElement;\n  }\n  return el || document.documentElement;\n}\n\n/**\n * Computed the boundaries limits and return them\n * @method\n * @memberof Popper.Utils\n * @param {HTMLElement} popper\n * @param {HTMLElement} reference\n * @param {number} padding\n * @param {HTMLElement} boundariesElement - Element used to define the boundaries\n * @param {Boolean} fixedPosition - Is in fixed position mode\n * @returns {Object} Coordinates of the boundaries\n */\nfunction getBoundaries(popper, reference, padding, boundariesElement) {\n  var fixedPosition = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;\n\n  // NOTE: 1 DOM access here\n\n  var boundaries = { top: 0, left: 0 };\n  var offsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, getReferenceNode(reference));\n\n  // Handle viewport case\n  if (boundariesElement === 'viewport') {\n    boundaries = getViewportOffsetRectRelativeToArtbitraryNode(offsetParent, fixedPosition);\n  } else {\n    // Handle other cases based on DOM element used as boundaries\n    var boundariesNode = void 0;\n    if (boundariesElement === 'scrollParent') {\n      boundariesNode = getScrollParent(getParentNode(reference));\n      if (boundariesNode.nodeName === 'BODY') {\n        boundariesNode = popper.ownerDocument.documentElement;\n      }\n    } else if (boundariesElement === 'window') {\n      boundariesNode = popper.ownerDocument.documentElement;\n    } else {\n      boundariesNode = boundariesElement;\n    }\n\n    var offsets = getOffsetRectRelativeToArbitraryNode(boundariesNode, offsetParent, fixedPosition);\n\n    // In case of HTML, we need a different computation\n    if (boundariesNode.nodeName === 'HTML' && !isFixed(offsetParent)) {\n      var _getWindowSizes = getWindowSizes(popper.ownerDocument),\n          height = _getWindowSizes.height,\n          width = _getWindowSizes.width;\n\n      boundaries.top += offsets.top - offsets.marginTop;\n      boundaries.bottom = height + offsets.top;\n      boundaries.left += offsets.left - offsets.marginLeft;\n      boundaries.right = width + offsets.left;\n    } else {\n      // for all the other DOM elements, this one is good\n      boundaries = offsets;\n    }\n  }\n\n  // Add paddings\n  padding = padding || 0;\n  var isPaddingNumber = typeof padding === 'number';\n  boundaries.left += isPaddingNumber ? padding : padding.left || 0;\n  boundaries.top += isPaddingNumber ? padding : padding.top || 0;\n  boundaries.right -= isPaddingNumber ? padding : padding.right || 0;\n  boundaries.bottom -= isPaddingNumber ? padding : padding.bottom || 0;\n\n  return boundaries;\n}\n\nfunction getArea(_ref) {\n  var width = _ref.width,\n      height = _ref.height;\n\n  return width * height;\n}\n\n/**\n * Utility used to transform the `auto` placement to the placement with more\n * available space.\n * @method\n * @memberof Popper.Utils\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nfunction computeAutoPlacement(placement, refRect, popper, reference, boundariesElement) {\n  var padding = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0;\n\n  if (placement.indexOf('auto') === -1) {\n    return placement;\n  }\n\n  var boundaries = getBoundaries(popper, reference, padding, boundariesElement);\n\n  var rects = {\n    top: {\n      width: boundaries.width,\n      height: refRect.top - boundaries.top\n    },\n    right: {\n      width: boundaries.right - refRect.right,\n      height: boundaries.height\n    },\n    bottom: {\n      width: boundaries.width,\n      height: boundaries.bottom - refRect.bottom\n    },\n    left: {\n      width: refRect.left - boundaries.left,\n      height: boundaries.height\n    }\n  };\n\n  var sortedAreas = Object.keys(rects).map(function (key) {\n    return _extends({\n      key: key\n    }, rects[key], {\n      area: getArea(rects[key])\n    });\n  }).sort(function (a, b) {\n    return b.area - a.area;\n  });\n\n  var filteredAreas = sortedAreas.filter(function (_ref2) {\n    var width = _ref2.width,\n        height = _ref2.height;\n    return width >= popper.clientWidth && height >= popper.clientHeight;\n  });\n\n  var computedPlacement = filteredAreas.length > 0 ? filteredAreas[0].key : sortedAreas[0].key;\n\n  var variation = placement.split('-')[1];\n\n  return computedPlacement + (variation ? '-' + variation : '');\n}\n\n/**\n * Get offsets to the reference element\n * @method\n * @memberof Popper.Utils\n * @param {Object} state\n * @param {Element} popper - the popper element\n * @param {Element} reference - the reference element (the popper will be relative to this)\n * @param {Element} fixedPosition - is in fixed position mode\n * @returns {Object} An object containing the offsets which will be applied to the popper\n */\nfunction getReferenceOffsets(state, popper, reference) {\n  var fixedPosition = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;\n\n  var commonOffsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, getReferenceNode(reference));\n  return getOffsetRectRelativeToArbitraryNode(reference, commonOffsetParent, fixedPosition);\n}\n\n/**\n * Get the outer sizes of the given element (offset size + margins)\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Object} object containing width and height properties\n */\nfunction getOuterSizes(element) {\n  var window = element.ownerDocument.defaultView;\n  var styles = window.getComputedStyle(element);\n  var x = parseFloat(styles.marginTop || 0) + parseFloat(styles.marginBottom || 0);\n  var y = parseFloat(styles.marginLeft || 0) + parseFloat(styles.marginRight || 0);\n  var result = {\n    width: element.offsetWidth + y,\n    height: element.offsetHeight + x\n  };\n  return result;\n}\n\n/**\n * Get the opposite placement of the given one\n * @method\n * @memberof Popper.Utils\n * @argument {String} placement\n * @returns {String} flipped placement\n */\nfunction getOppositePlacement(placement) {\n  var hash = { left: 'right', right: 'left', bottom: 'top', top: 'bottom' };\n  return placement.replace(/left|right|bottom|top/g, function (matched) {\n    return hash[matched];\n  });\n}\n\n/**\n * Get offsets to the popper\n * @method\n * @memberof Popper.Utils\n * @param {Object} position - CSS position the Popper will get applied\n * @param {HTMLElement} popper - the popper element\n * @param {Object} referenceOffsets - the reference offsets (the popper will be relative to this)\n * @param {String} placement - one of the valid placement options\n * @returns {Object} popperOffsets - An object containing the offsets which will be applied to the popper\n */\nfunction getPopperOffsets(popper, referenceOffsets, placement) {\n  placement = placement.split('-')[0];\n\n  // Get popper node sizes\n  var popperRect = getOuterSizes(popper);\n\n  // Add position, width and height to our offsets object\n  var popperOffsets = {\n    width: popperRect.width,\n    height: popperRect.height\n  };\n\n  // depending by the popper placement we have to compute its offsets slightly differently\n  var isHoriz = ['right', 'left'].indexOf(placement) !== -1;\n  var mainSide = isHoriz ? 'top' : 'left';\n  var secondarySide = isHoriz ? 'left' : 'top';\n  var measurement = isHoriz ? 'height' : 'width';\n  var secondaryMeasurement = !isHoriz ? 'height' : 'width';\n\n  popperOffsets[mainSide] = referenceOffsets[mainSide] + referenceOffsets[measurement] / 2 - popperRect[measurement] / 2;\n  if (placement === secondarySide) {\n    popperOffsets[secondarySide] = referenceOffsets[secondarySide] - popperRect[secondaryMeasurement];\n  } else {\n    popperOffsets[secondarySide] = referenceOffsets[getOppositePlacement(secondarySide)];\n  }\n\n  return popperOffsets;\n}\n\n/**\n * Mimics the `find` method of Array\n * @method\n * @memberof Popper.Utils\n * @argument {Array} arr\n * @argument prop\n * @argument value\n * @returns index or -1\n */\nfunction find(arr, check) {\n  // use native find if supported\n  if (Array.prototype.find) {\n    return arr.find(check);\n  }\n\n  // use `filter` to obtain the same behavior of `find`\n  return arr.filter(check)[0];\n}\n\n/**\n * Return the index of the matching object\n * @method\n * @memberof Popper.Utils\n * @argument {Array} arr\n * @argument prop\n * @argument value\n * @returns index or -1\n */\nfunction findIndex(arr, prop, value) {\n  // use native findIndex if supported\n  if (Array.prototype.findIndex) {\n    return arr.findIndex(function (cur) {\n      return cur[prop] === value;\n    });\n  }\n\n  // use `find` + `indexOf` if `findIndex` isn't supported\n  var match = find(arr, function (obj) {\n    return obj[prop] === value;\n  });\n  return arr.indexOf(match);\n}\n\n/**\n * Loop trough the list of modifiers and run them in order,\n * each of them will then edit the data object.\n * @method\n * @memberof Popper.Utils\n * @param {dataObject} data\n * @param {Array} modifiers\n * @param {String} ends - Optional modifier name used as stopper\n * @returns {dataObject}\n */\nfunction runModifiers(modifiers, data, ends) {\n  var modifiersToRun = ends === undefined ? modifiers : modifiers.slice(0, findIndex(modifiers, 'name', ends));\n\n  modifiersToRun.forEach(function (modifier) {\n    if (modifier['function']) {\n      // eslint-disable-line dot-notation\n      console.warn('`modifier.function` is deprecated, use `modifier.fn`!');\n    }\n    var fn = modifier['function'] || modifier.fn; // eslint-disable-line dot-notation\n    if (modifier.enabled && isFunction(fn)) {\n      // Add properties to offsets to make them a complete clientRect object\n      // we do this before each modifier to make sure the previous one doesn't\n      // mess with these values\n      data.offsets.popper = getClientRect(data.offsets.popper);\n      data.offsets.reference = getClientRect(data.offsets.reference);\n\n      data = fn(data, modifier);\n    }\n  });\n\n  return data;\n}\n\n/**\n * Updates the position of the popper, computing the new offsets and applying\n * the new style.<br />\n * Prefer `scheduleUpdate` over `update` because of performance reasons.\n * @method\n * @memberof Popper\n */\nfunction update() {\n  // if popper is destroyed, don't perform any further update\n  if (this.state.isDestroyed) {\n    return;\n  }\n\n  var data = {\n    instance: this,\n    styles: {},\n    arrowStyles: {},\n    attributes: {},\n    flipped: false,\n    offsets: {}\n  };\n\n  // compute reference element offsets\n  data.offsets.reference = getReferenceOffsets(this.state, this.popper, this.reference, this.options.positionFixed);\n\n  // compute auto placement, store placement inside the data object,\n  // modifiers will be able to edit `placement` if needed\n  // and refer to originalPlacement to know the original value\n  data.placement = computeAutoPlacement(this.options.placement, data.offsets.reference, this.popper, this.reference, this.options.modifiers.flip.boundariesElement, this.options.modifiers.flip.padding);\n\n  // store the computed placement inside `originalPlacement`\n  data.originalPlacement = data.placement;\n\n  data.positionFixed = this.options.positionFixed;\n\n  // compute the popper offsets\n  data.offsets.popper = getPopperOffsets(this.popper, data.offsets.reference, data.placement);\n\n  data.offsets.popper.position = this.options.positionFixed ? 'fixed' : 'absolute';\n\n  // run the modifiers\n  data = runModifiers(this.modifiers, data);\n\n  // the first `update` will call `onCreate` callback\n  // the other ones will call `onUpdate` callback\n  if (!this.state.isCreated) {\n    this.state.isCreated = true;\n    this.options.onCreate(data);\n  } else {\n    this.options.onUpdate(data);\n  }\n}\n\n/**\n * Helper used to know if the given modifier is enabled.\n * @method\n * @memberof Popper.Utils\n * @returns {Boolean}\n */\nfunction isModifierEnabled(modifiers, modifierName) {\n  return modifiers.some(function (_ref) {\n    var name = _ref.name,\n        enabled = _ref.enabled;\n    return enabled && name === modifierName;\n  });\n}\n\n/**\n * Get the prefixed supported property name\n * @method\n * @memberof Popper.Utils\n * @argument {String} property (camelCase)\n * @returns {String} prefixed property (camelCase or PascalCase, depending on the vendor prefix)\n */\nfunction getSupportedPropertyName(property) {\n  var prefixes = [false, 'ms', 'Webkit', 'Moz', 'O'];\n  var upperProp = property.charAt(0).toUpperCase() + property.slice(1);\n\n  for (var i = 0; i < prefixes.length; i++) {\n    var prefix = prefixes[i];\n    var toCheck = prefix ? '' + prefix + upperProp : property;\n    if (typeof document.body.style[toCheck] !== 'undefined') {\n      return toCheck;\n    }\n  }\n  return null;\n}\n\n/**\n * Destroys the popper.\n * @method\n * @memberof Popper\n */\nfunction destroy() {\n  this.state.isDestroyed = true;\n\n  // touch DOM only if `applyStyle` modifier is enabled\n  if (isModifierEnabled(this.modifiers, 'applyStyle')) {\n    this.popper.removeAttribute('x-placement');\n    this.popper.style.position = '';\n    this.popper.style.top = '';\n    this.popper.style.left = '';\n    this.popper.style.right = '';\n    this.popper.style.bottom = '';\n    this.popper.style.willChange = '';\n    this.popper.style[getSupportedPropertyName('transform')] = '';\n  }\n\n  this.disableEventListeners();\n\n  // remove the popper if user explicitly asked for the deletion on destroy\n  // do not use `remove` because IE11 doesn't support it\n  if (this.options.removeOnDestroy) {\n    this.popper.parentNode.removeChild(this.popper);\n  }\n  return this;\n}\n\n/**\n * Get the window associated with the element\n * @argument {Element} element\n * @returns {Window}\n */\nfunction getWindow(element) {\n  var ownerDocument = element.ownerDocument;\n  return ownerDocument ? ownerDocument.defaultView : window;\n}\n\nfunction attachToScrollParents(scrollParent, event, callback, scrollParents) {\n  var isBody = scrollParent.nodeName === 'BODY';\n  var target = isBody ? scrollParent.ownerDocument.defaultView : scrollParent;\n  target.addEventListener(event, callback, { passive: true });\n\n  if (!isBody) {\n    attachToScrollParents(getScrollParent(target.parentNode), event, callback, scrollParents);\n  }\n  scrollParents.push(target);\n}\n\n/**\n * Setup needed event listeners used to update the popper position\n * @method\n * @memberof Popper.Utils\n * @private\n */\nfunction setupEventListeners(reference, options, state, updateBound) {\n  // Resize event listener on window\n  state.updateBound = updateBound;\n  getWindow(reference).addEventListener('resize', state.updateBound, { passive: true });\n\n  // Scroll event listener on scroll parents\n  var scrollElement = getScrollParent(reference);\n  attachToScrollParents(scrollElement, 'scroll', state.updateBound, state.scrollParents);\n  state.scrollElement = scrollElement;\n  state.eventsEnabled = true;\n\n  return state;\n}\n\n/**\n * It will add resize/scroll events and start recalculating\n * position of the popper element when they are triggered.\n * @method\n * @memberof Popper\n */\nfunction enableEventListeners() {\n  if (!this.state.eventsEnabled) {\n    this.state = setupEventListeners(this.reference, this.options, this.state, this.scheduleUpdate);\n  }\n}\n\n/**\n * Remove event listeners used to update the popper position\n * @method\n * @memberof Popper.Utils\n * @private\n */\nfunction removeEventListeners(reference, state) {\n  // Remove resize event listener on window\n  getWindow(reference).removeEventListener('resize', state.updateBound);\n\n  // Remove scroll event listener on scroll parents\n  state.scrollParents.forEach(function (target) {\n    target.removeEventListener('scroll', state.updateBound);\n  });\n\n  // Reset state\n  state.updateBound = null;\n  state.scrollParents = [];\n  state.scrollElement = null;\n  state.eventsEnabled = false;\n  return state;\n}\n\n/**\n * It will remove resize/scroll events and won't recalculate popper position\n * when they are triggered. It also won't trigger `onUpdate` callback anymore,\n * unless you call `update` method manually.\n * @method\n * @memberof Popper\n */\nfunction disableEventListeners() {\n  if (this.state.eventsEnabled) {\n    cancelAnimationFrame(this.scheduleUpdate);\n    this.state = removeEventListeners(this.reference, this.state);\n  }\n}\n\n/**\n * Tells if a given input is a number\n * @method\n * @memberof Popper.Utils\n * @param {*} input to check\n * @return {Boolean}\n */\nfunction isNumeric(n) {\n  return n !== '' && !isNaN(parseFloat(n)) && isFinite(n);\n}\n\n/**\n * Set the style to the given popper\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element - Element to apply the style to\n * @argument {Object} styles\n * Object with a list of properties and values which will be applied to the element\n */\nfunction setStyles(element, styles) {\n  Object.keys(styles).forEach(function (prop) {\n    var unit = '';\n    // add unit if the value is numeric and is one of the following\n    if (['width', 'height', 'top', 'right', 'bottom', 'left'].indexOf(prop) !== -1 && isNumeric(styles[prop])) {\n      unit = 'px';\n    }\n    element.style[prop] = styles[prop] + unit;\n  });\n}\n\n/**\n * Set the attributes to the given popper\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element - Element to apply the attributes to\n * @argument {Object} styles\n * Object with a list of properties and values which will be applied to the element\n */\nfunction setAttributes(element, attributes) {\n  Object.keys(attributes).forEach(function (prop) {\n    var value = attributes[prop];\n    if (value !== false) {\n      element.setAttribute(prop, attributes[prop]);\n    } else {\n      element.removeAttribute(prop);\n    }\n  });\n}\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} data.styles - List of style properties - values to apply to popper element\n * @argument {Object} data.attributes - List of attribute properties - values to apply to popper element\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The same data object\n */\nfunction applyStyle(data) {\n  // any property present in `data.styles` will be applied to the popper,\n  // in this way we can make the 3rd party modifiers add custom styles to it\n  // Be aware, modifiers could override the properties defined in the previous\n  // lines of this modifier!\n  setStyles(data.instance.popper, data.styles);\n\n  // any property present in `data.attributes` will be applied to the popper,\n  // they will be set as HTML attributes of the element\n  setAttributes(data.instance.popper, data.attributes);\n\n  // if arrowElement is defined and arrowStyles has some properties\n  if (data.arrowElement && Object.keys(data.arrowStyles).length) {\n    setStyles(data.arrowElement, data.arrowStyles);\n  }\n\n  return data;\n}\n\n/**\n * Set the x-placement attribute before everything else because it could be used\n * to add margins to the popper margins needs to be calculated to get the\n * correct popper offsets.\n * @method\n * @memberof Popper.modifiers\n * @param {HTMLElement} reference - The reference element used to position the popper\n * @param {HTMLElement} popper - The HTML element used as popper\n * @param {Object} options - Popper.js options\n */\nfunction applyStyleOnLoad(reference, popper, options, modifierOptions, state) {\n  // compute reference element offsets\n  var referenceOffsets = getReferenceOffsets(state, popper, reference, options.positionFixed);\n\n  // compute auto placement, store placement inside the data object,\n  // modifiers will be able to edit `placement` if needed\n  // and refer to originalPlacement to know the original value\n  var placement = computeAutoPlacement(options.placement, referenceOffsets, popper, reference, options.modifiers.flip.boundariesElement, options.modifiers.flip.padding);\n\n  popper.setAttribute('x-placement', placement);\n\n  // Apply `position` to popper before anything else because\n  // without the position applied we can't guarantee correct computations\n  setStyles(popper, { position: options.positionFixed ? 'fixed' : 'absolute' });\n\n  return options;\n}\n\n/**\n * @function\n * @memberof Popper.Utils\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Boolean} shouldRound - If the offsets should be rounded at all\n * @returns {Object} The popper's position offsets rounded\n *\n * The tale of pixel-perfect positioning. It's still not 100% perfect, but as\n * good as it can be within reason.\n * Discussion here: https://github.com/FezVrasta/popper.js/pull/715\n *\n * Low DPI screens cause a popper to be blurry if not using full pixels (Safari\n * as well on High DPI screens).\n *\n * Firefox prefers no rounding for positioning and does not have blurriness on\n * high DPI screens.\n *\n * Only horizontal placement and left/right values need to be considered.\n */\nfunction getRoundedOffsets(data, shouldRound) {\n  var _data$offsets = data.offsets,\n      popper = _data$offsets.popper,\n      reference = _data$offsets.reference;\n  var round = Math.round,\n      floor = Math.floor;\n\n  var noRound = function noRound(v) {\n    return v;\n  };\n\n  var referenceWidth = round(reference.width);\n  var popperWidth = round(popper.width);\n\n  var isVertical = ['left', 'right'].indexOf(data.placement) !== -1;\n  var isVariation = data.placement.indexOf('-') !== -1;\n  var sameWidthParity = referenceWidth % 2 === popperWidth % 2;\n  var bothOddWidth = referenceWidth % 2 === 1 && popperWidth % 2 === 1;\n\n  var horizontalToInteger = !shouldRound ? noRound : isVertical || isVariation || sameWidthParity ? round : floor;\n  var verticalToInteger = !shouldRound ? noRound : round;\n\n  return {\n    left: horizontalToInteger(bothOddWidth && !isVariation && shouldRound ? popper.left - 1 : popper.left),\n    top: verticalToInteger(popper.top),\n    bottom: verticalToInteger(popper.bottom),\n    right: horizontalToInteger(popper.right)\n  };\n}\n\nvar isFirefox = isBrowser && /Firefox/i.test(navigator.userAgent);\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nfunction computeStyle(data, options) {\n  var x = options.x,\n      y = options.y;\n  var popper = data.offsets.popper;\n\n  // Remove this legacy support in Popper.js v2\n\n  var legacyGpuAccelerationOption = find(data.instance.modifiers, function (modifier) {\n    return modifier.name === 'applyStyle';\n  }).gpuAcceleration;\n  if (legacyGpuAccelerationOption !== undefined) {\n    console.warn('WARNING: `gpuAcceleration` option moved to `computeStyle` modifier and will not be supported in future versions of Popper.js!');\n  }\n  var gpuAcceleration = legacyGpuAccelerationOption !== undefined ? legacyGpuAccelerationOption : options.gpuAcceleration;\n\n  var offsetParent = getOffsetParent(data.instance.popper);\n  var offsetParentRect = getBoundingClientRect(offsetParent);\n\n  // Styles\n  var styles = {\n    position: popper.position\n  };\n\n  var offsets = getRoundedOffsets(data, window.devicePixelRatio < 2 || !isFirefox);\n\n  var sideA = x === 'bottom' ? 'top' : 'bottom';\n  var sideB = y === 'right' ? 'left' : 'right';\n\n  // if gpuAcceleration is set to `true` and transform is supported,\n  //  we use `translate3d` to apply the position to the popper we\n  // automatically use the supported prefixed version if needed\n  var prefixedProperty = getSupportedPropertyName('transform');\n\n  // now, let's make a step back and look at this code closely (wtf?)\n  // If the content of the popper grows once it's been positioned, it\n  // may happen that the popper gets misplaced because of the new content\n  // overflowing its reference element\n  // To avoid this problem, we provide two options (x and y), which allow\n  // the consumer to define the offset origin.\n  // If we position a popper on top of a reference element, we can set\n  // `x` to `top` to make the popper grow towards its top instead of\n  // its bottom.\n  var left = void 0,\n      top = void 0;\n  if (sideA === 'bottom') {\n    // when offsetParent is <html> the positioning is relative to the bottom of the screen (excluding the scrollbar)\n    // and not the bottom of the html element\n    if (offsetParent.nodeName === 'HTML') {\n      top = -offsetParent.clientHeight + offsets.bottom;\n    } else {\n      top = -offsetParentRect.height + offsets.bottom;\n    }\n  } else {\n    top = offsets.top;\n  }\n  if (sideB === 'right') {\n    if (offsetParent.nodeName === 'HTML') {\n      left = -offsetParent.clientWidth + offsets.right;\n    } else {\n      left = -offsetParentRect.width + offsets.right;\n    }\n  } else {\n    left = offsets.left;\n  }\n  if (gpuAcceleration && prefixedProperty) {\n    styles[prefixedProperty] = 'translate3d(' + left + 'px, ' + top + 'px, 0)';\n    styles[sideA] = 0;\n    styles[sideB] = 0;\n    styles.willChange = 'transform';\n  } else {\n    // othwerise, we use the standard `top`, `left`, `bottom` and `right` properties\n    var invertTop = sideA === 'bottom' ? -1 : 1;\n    var invertLeft = sideB === 'right' ? -1 : 1;\n    styles[sideA] = top * invertTop;\n    styles[sideB] = left * invertLeft;\n    styles.willChange = sideA + ', ' + sideB;\n  }\n\n  // Attributes\n  var attributes = {\n    'x-placement': data.placement\n  };\n\n  // Update `data` attributes, styles and arrowStyles\n  data.attributes = _extends({}, attributes, data.attributes);\n  data.styles = _extends({}, styles, data.styles);\n  data.arrowStyles = _extends({}, data.offsets.arrow, data.arrowStyles);\n\n  return data;\n}\n\n/**\n * Helper used to know if the given modifier depends from another one.<br />\n * It checks if the needed modifier is listed and enabled.\n * @method\n * @memberof Popper.Utils\n * @param {Array} modifiers - list of modifiers\n * @param {String} requestingName - name of requesting modifier\n * @param {String} requestedName - name of requested modifier\n * @returns {Boolean}\n */\nfunction isModifierRequired(modifiers, requestingName, requestedName) {\n  var requesting = find(modifiers, function (_ref) {\n    var name = _ref.name;\n    return name === requestingName;\n  });\n\n  var isRequired = !!requesting && modifiers.some(function (modifier) {\n    return modifier.name === requestedName && modifier.enabled && modifier.order < requesting.order;\n  });\n\n  if (!isRequired) {\n    var _requesting = '`' + requestingName + '`';\n    var requested = '`' + requestedName + '`';\n    console.warn(requested + ' modifier is required by ' + _requesting + ' modifier in order to work, be sure to include it before ' + _requesting + '!');\n  }\n  return isRequired;\n}\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nfunction arrow(data, options) {\n  var _data$offsets$arrow;\n\n  // arrow depends on keepTogether in order to work\n  if (!isModifierRequired(data.instance.modifiers, 'arrow', 'keepTogether')) {\n    return data;\n  }\n\n  var arrowElement = options.element;\n\n  // if arrowElement is a string, suppose it's a CSS selector\n  if (typeof arrowElement === 'string') {\n    arrowElement = data.instance.popper.querySelector(arrowElement);\n\n    // if arrowElement is not found, don't run the modifier\n    if (!arrowElement) {\n      return data;\n    }\n  } else {\n    // if the arrowElement isn't a query selector we must check that the\n    // provided DOM node is child of its popper node\n    if (!data.instance.popper.contains(arrowElement)) {\n      console.warn('WARNING: `arrow.element` must be child of its popper element!');\n      return data;\n    }\n  }\n\n  var placement = data.placement.split('-')[0];\n  var _data$offsets = data.offsets,\n      popper = _data$offsets.popper,\n      reference = _data$offsets.reference;\n\n  var isVertical = ['left', 'right'].indexOf(placement) !== -1;\n\n  var len = isVertical ? 'height' : 'width';\n  var sideCapitalized = isVertical ? 'Top' : 'Left';\n  var side = sideCapitalized.toLowerCase();\n  var altSide = isVertical ? 'left' : 'top';\n  var opSide = isVertical ? 'bottom' : 'right';\n  var arrowElementSize = getOuterSizes(arrowElement)[len];\n\n  //\n  // extends keepTogether behavior making sure the popper and its\n  // reference have enough pixels in conjunction\n  //\n\n  // top/left side\n  if (reference[opSide] - arrowElementSize < popper[side]) {\n    data.offsets.popper[side] -= popper[side] - (reference[opSide] - arrowElementSize);\n  }\n  // bottom/right side\n  if (reference[side] + arrowElementSize > popper[opSide]) {\n    data.offsets.popper[side] += reference[side] + arrowElementSize - popper[opSide];\n  }\n  data.offsets.popper = getClientRect(data.offsets.popper);\n\n  // compute center of the popper\n  var center = reference[side] + reference[len] / 2 - arrowElementSize / 2;\n\n  // Compute the sideValue using the updated popper offsets\n  // take popper margin in account because we don't have this info available\n  var css = getStyleComputedProperty(data.instance.popper);\n  var popperMarginSide = parseFloat(css['margin' + sideCapitalized], 10);\n  var popperBorderSide = parseFloat(css['border' + sideCapitalized + 'Width'], 10);\n  var sideValue = center - data.offsets.popper[side] - popperMarginSide - popperBorderSide;\n\n  // prevent arrowElement from being placed not contiguously to its popper\n  sideValue = Math.max(Math.min(popper[len] - arrowElementSize, sideValue), 0);\n\n  data.arrowElement = arrowElement;\n  data.offsets.arrow = (_data$offsets$arrow = {}, defineProperty(_data$offsets$arrow, side, Math.round(sideValue)), defineProperty(_data$offsets$arrow, altSide, ''), _data$offsets$arrow);\n\n  return data;\n}\n\n/**\n * Get the opposite placement variation of the given one\n * @method\n * @memberof Popper.Utils\n * @argument {String} placement variation\n * @returns {String} flipped placement variation\n */\nfunction getOppositeVariation(variation) {\n  if (variation === 'end') {\n    return 'start';\n  } else if (variation === 'start') {\n    return 'end';\n  }\n  return variation;\n}\n\n/**\n * List of accepted placements to use as values of the `placement` option.<br />\n * Valid placements are:\n * - `auto`\n * - `top`\n * - `right`\n * - `bottom`\n * - `left`\n *\n * Each placement can have a variation from this list:\n * - `-start`\n * - `-end`\n *\n * Variations are interpreted easily if you think of them as the left to right\n * written languages. Horizontally (`top` and `bottom`), `start` is left and `end`\n * is right.<br />\n * Vertically (`left` and `right`), `start` is top and `end` is bottom.\n *\n * Some valid examples are:\n * - `top-end` (on top of reference, right aligned)\n * - `right-start` (on right of reference, top aligned)\n * - `bottom` (on bottom, centered)\n * - `auto-end` (on the side with more space available, alignment depends by placement)\n *\n * @static\n * @type {Array}\n * @enum {String}\n * @readonly\n * @method placements\n * @memberof Popper\n */\nvar placements = ['auto-start', 'auto', 'auto-end', 'top-start', 'top', 'top-end', 'right-start', 'right', 'right-end', 'bottom-end', 'bottom', 'bottom-start', 'left-end', 'left', 'left-start'];\n\n// Get rid of `auto` `auto-start` and `auto-end`\nvar validPlacements = placements.slice(3);\n\n/**\n * Given an initial placement, returns all the subsequent placements\n * clockwise (or counter-clockwise).\n *\n * @method\n * @memberof Popper.Utils\n * @argument {String} placement - A valid placement (it accepts variations)\n * @argument {Boolean} counter - Set to true to walk the placements counterclockwise\n * @returns {Array} placements including their variations\n */\nfunction clockwise(placement) {\n  var counter = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;\n\n  var index = validPlacements.indexOf(placement);\n  var arr = validPlacements.slice(index + 1).concat(validPlacements.slice(0, index));\n  return counter ? arr.reverse() : arr;\n}\n\nvar BEHAVIORS = {\n  FLIP: 'flip',\n  CLOCKWISE: 'clockwise',\n  COUNTERCLOCKWISE: 'counterclockwise'\n};\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nfunction flip(data, options) {\n  // if `inner` modifier is enabled, we can't use the `flip` modifier\n  if (isModifierEnabled(data.instance.modifiers, 'inner')) {\n    return data;\n  }\n\n  if (data.flipped && data.placement === data.originalPlacement) {\n    // seems like flip is trying to loop, probably there's not enough space on any of the flippable sides\n    return data;\n  }\n\n  var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, options.boundariesElement, data.positionFixed);\n\n  var placement = data.placement.split('-')[0];\n  var placementOpposite = getOppositePlacement(placement);\n  var variation = data.placement.split('-')[1] || '';\n\n  var flipOrder = [];\n\n  switch (options.behavior) {\n    case BEHAVIORS.FLIP:\n      flipOrder = [placement, placementOpposite];\n      break;\n    case BEHAVIORS.CLOCKWISE:\n      flipOrder = clockwise(placement);\n      break;\n    case BEHAVIORS.COUNTERCLOCKWISE:\n      flipOrder = clockwise(placement, true);\n      break;\n    default:\n      flipOrder = options.behavior;\n  }\n\n  flipOrder.forEach(function (step, index) {\n    if (placement !== step || flipOrder.length === index + 1) {\n      return data;\n    }\n\n    placement = data.placement.split('-')[0];\n    placementOpposite = getOppositePlacement(placement);\n\n    var popperOffsets = data.offsets.popper;\n    var refOffsets = data.offsets.reference;\n\n    // using floor because the reference offsets may contain decimals we are not going to consider here\n    var floor = Math.floor;\n    var overlapsRef = placement === 'left' && floor(popperOffsets.right) > floor(refOffsets.left) || placement === 'right' && floor(popperOffsets.left) < floor(refOffsets.right) || placement === 'top' && floor(popperOffsets.bottom) > floor(refOffsets.top) || placement === 'bottom' && floor(popperOffsets.top) < floor(refOffsets.bottom);\n\n    var overflowsLeft = floor(popperOffsets.left) < floor(boundaries.left);\n    var overflowsRight = floor(popperOffsets.right) > floor(boundaries.right);\n    var overflowsTop = floor(popperOffsets.top) < floor(boundaries.top);\n    var overflowsBottom = floor(popperOffsets.bottom) > floor(boundaries.bottom);\n\n    var overflowsBoundaries = placement === 'left' && overflowsLeft || placement === 'right' && overflowsRight || placement === 'top' && overflowsTop || placement === 'bottom' && overflowsBottom;\n\n    // flip the variation if required\n    var isVertical = ['top', 'bottom'].indexOf(placement) !== -1;\n\n    // flips variation if reference element overflows boundaries\n    var flippedVariationByRef = !!options.flipVariations && (isVertical && variation === 'start' && overflowsLeft || isVertical && variation === 'end' && overflowsRight || !isVertical && variation === 'start' && overflowsTop || !isVertical && variation === 'end' && overflowsBottom);\n\n    // flips variation if popper content overflows boundaries\n    var flippedVariationByContent = !!options.flipVariationsByContent && (isVertical && variation === 'start' && overflowsRight || isVertical && variation === 'end' && overflowsLeft || !isVertical && variation === 'start' && overflowsBottom || !isVertical && variation === 'end' && overflowsTop);\n\n    var flippedVariation = flippedVariationByRef || flippedVariationByContent;\n\n    if (overlapsRef || overflowsBoundaries || flippedVariation) {\n      // this boolean to detect any flip loop\n      data.flipped = true;\n\n      if (overlapsRef || overflowsBoundaries) {\n        placement = flipOrder[index + 1];\n      }\n\n      if (flippedVariation) {\n        variation = getOppositeVariation(variation);\n      }\n\n      data.placement = placement + (variation ? '-' + variation : '');\n\n      // this object contains `position`, we want to preserve it along with\n      // any additional property we may add in the future\n      data.offsets.popper = _extends({}, data.offsets.popper, getPopperOffsets(data.instance.popper, data.offsets.reference, data.placement));\n\n      data = runModifiers(data.instance.modifiers, data, 'flip');\n    }\n  });\n  return data;\n}\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nfunction keepTogether(data) {\n  var _data$offsets = data.offsets,\n      popper = _data$offsets.popper,\n      reference = _data$offsets.reference;\n\n  var placement = data.placement.split('-')[0];\n  var floor = Math.floor;\n  var isVertical = ['top', 'bottom'].indexOf(placement) !== -1;\n  var side = isVertical ? 'right' : 'bottom';\n  var opSide = isVertical ? 'left' : 'top';\n  var measurement = isVertical ? 'width' : 'height';\n\n  if (popper[side] < floor(reference[opSide])) {\n    data.offsets.popper[opSide] = floor(reference[opSide]) - popper[measurement];\n  }\n  if (popper[opSide] > floor(reference[side])) {\n    data.offsets.popper[opSide] = floor(reference[side]);\n  }\n\n  return data;\n}\n\n/**\n * Converts a string containing value + unit into a px value number\n * @function\n * @memberof {modifiers~offset}\n * @private\n * @argument {String} str - Value + unit string\n * @argument {String} measurement - `height` or `width`\n * @argument {Object} popperOffsets\n * @argument {Object} referenceOffsets\n * @returns {Number|String}\n * Value in pixels, or original string if no values were extracted\n */\nfunction toValue(str, measurement, popperOffsets, referenceOffsets) {\n  // separate value from unit\n  var split = str.match(/((?:\\-|\\+)?\\d*\\.?\\d*)(.*)/);\n  var value = +split[1];\n  var unit = split[2];\n\n  // If it's not a number it's an operator, I guess\n  if (!value) {\n    return str;\n  }\n\n  if (unit.indexOf('%') === 0) {\n    var element = void 0;\n    switch (unit) {\n      case '%p':\n        element = popperOffsets;\n        break;\n      case '%':\n      case '%r':\n      default:\n        element = referenceOffsets;\n    }\n\n    var rect = getClientRect(element);\n    return rect[measurement] / 100 * value;\n  } else if (unit === 'vh' || unit === 'vw') {\n    // if is a vh or vw, we calculate the size based on the viewport\n    var size = void 0;\n    if (unit === 'vh') {\n      size = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);\n    } else {\n      size = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);\n    }\n    return size / 100 * value;\n  } else {\n    // if is an explicit pixel unit, we get rid of the unit and keep the value\n    // if is an implicit unit, it's px, and we return just the value\n    return value;\n  }\n}\n\n/**\n * Parse an `offset` string to extrapolate `x` and `y` numeric offsets.\n * @function\n * @memberof {modifiers~offset}\n * @private\n * @argument {String} offset\n * @argument {Object} popperOffsets\n * @argument {Object} referenceOffsets\n * @argument {String} basePlacement\n * @returns {Array} a two cells array with x and y offsets in numbers\n */\nfunction parseOffset(offset, popperOffsets, referenceOffsets, basePlacement) {\n  var offsets = [0, 0];\n\n  // Use height if placement is left or right and index is 0 otherwise use width\n  // in this way the first offset will use an axis and the second one\n  // will use the other one\n  var useHeight = ['right', 'left'].indexOf(basePlacement) !== -1;\n\n  // Split the offset string to obtain a list of values and operands\n  // The regex addresses values with the plus or minus sign in front (+10, -20, etc)\n  var fragments = offset.split(/(\\+|\\-)/).map(function (frag) {\n    return frag.trim();\n  });\n\n  // Detect if the offset string contains a pair of values or a single one\n  // they could be separated by comma or space\n  var divider = fragments.indexOf(find(fragments, function (frag) {\n    return frag.search(/,|\\s/) !== -1;\n  }));\n\n  if (fragments[divider] && fragments[divider].indexOf(',') === -1) {\n    console.warn('Offsets separated by white space(s) are deprecated, use a comma (,) instead.');\n  }\n\n  // If divider is found, we divide the list of values and operands to divide\n  // them by ofset X and Y.\n  var splitRegex = /\\s*,\\s*|\\s+/;\n  var ops = divider !== -1 ? [fragments.slice(0, divider).concat([fragments[divider].split(splitRegex)[0]]), [fragments[divider].split(splitRegex)[1]].concat(fragments.slice(divider + 1))] : [fragments];\n\n  // Convert the values with units to absolute pixels to allow our computations\n  ops = ops.map(function (op, index) {\n    // Most of the units rely on the orientation of the popper\n    var measurement = (index === 1 ? !useHeight : useHeight) ? 'height' : 'width';\n    var mergeWithPrevious = false;\n    return op\n    // This aggregates any `+` or `-` sign that aren't considered operators\n    // e.g.: 10 + +5 => [10, +, +5]\n    .reduce(function (a, b) {\n      if (a[a.length - 1] === '' && ['+', '-'].indexOf(b) !== -1) {\n        a[a.length - 1] = b;\n        mergeWithPrevious = true;\n        return a;\n      } else if (mergeWithPrevious) {\n        a[a.length - 1] += b;\n        mergeWithPrevious = false;\n        return a;\n      } else {\n        return a.concat(b);\n      }\n    }, [])\n    // Here we convert the string values into number values (in px)\n    .map(function (str) {\n      return toValue(str, measurement, popperOffsets, referenceOffsets);\n    });\n  });\n\n  // Loop trough the offsets arrays and execute the operations\n  ops.forEach(function (op, index) {\n    op.forEach(function (frag, index2) {\n      if (isNumeric(frag)) {\n        offsets[index] += frag * (op[index2 - 1] === '-' ? -1 : 1);\n      }\n    });\n  });\n  return offsets;\n}\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @argument {Number|String} options.offset=0\n * The offset value as described in the modifier description\n * @returns {Object} The data object, properly modified\n */\nfunction offset(data, _ref) {\n  var offset = _ref.offset;\n  var placement = data.placement,\n      _data$offsets = data.offsets,\n      popper = _data$offsets.popper,\n      reference = _data$offsets.reference;\n\n  var basePlacement = placement.split('-')[0];\n\n  var offsets = void 0;\n  if (isNumeric(+offset)) {\n    offsets = [+offset, 0];\n  } else {\n    offsets = parseOffset(offset, popper, reference, basePlacement);\n  }\n\n  if (basePlacement === 'left') {\n    popper.top += offsets[0];\n    popper.left -= offsets[1];\n  } else if (basePlacement === 'right') {\n    popper.top += offsets[0];\n    popper.left += offsets[1];\n  } else if (basePlacement === 'top') {\n    popper.left += offsets[0];\n    popper.top -= offsets[1];\n  } else if (basePlacement === 'bottom') {\n    popper.left += offsets[0];\n    popper.top += offsets[1];\n  }\n\n  data.popper = popper;\n  return data;\n}\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nfunction preventOverflow(data, options) {\n  var boundariesElement = options.boundariesElement || getOffsetParent(data.instance.popper);\n\n  // If offsetParent is the reference element, we really want to\n  // go one step up and use the next offsetParent as reference to\n  // avoid to make this modifier completely useless and look like broken\n  if (data.instance.reference === boundariesElement) {\n    boundariesElement = getOffsetParent(boundariesElement);\n  }\n\n  // NOTE: DOM access here\n  // resets the popper's position so that the document size can be calculated excluding\n  // the size of the popper element itself\n  var transformProp = getSupportedPropertyName('transform');\n  var popperStyles = data.instance.popper.style; // assignment to help minification\n  var top = popperStyles.top,\n      left = popperStyles.left,\n      transform = popperStyles[transformProp];\n\n  popperStyles.top = '';\n  popperStyles.left = '';\n  popperStyles[transformProp] = '';\n\n  var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, boundariesElement, data.positionFixed);\n\n  // NOTE: DOM access here\n  // restores the original style properties after the offsets have been computed\n  popperStyles.top = top;\n  popperStyles.left = left;\n  popperStyles[transformProp] = transform;\n\n  options.boundaries = boundaries;\n\n  var order = options.priority;\n  var popper = data.offsets.popper;\n\n  var check = {\n    primary: function primary(placement) {\n      var value = popper[placement];\n      if (popper[placement] < boundaries[placement] && !options.escapeWithReference) {\n        value = Math.max(popper[placement], boundaries[placement]);\n      }\n      return defineProperty({}, placement, value);\n    },\n    secondary: function secondary(placement) {\n      var mainSide = placement === 'right' ? 'left' : 'top';\n      var value = popper[mainSide];\n      if (popper[placement] > boundaries[placement] && !options.escapeWithReference) {\n        value = Math.min(popper[mainSide], boundaries[placement] - (placement === 'right' ? popper.width : popper.height));\n      }\n      return defineProperty({}, mainSide, value);\n    }\n  };\n\n  order.forEach(function (placement) {\n    var side = ['left', 'top'].indexOf(placement) !== -1 ? 'primary' : 'secondary';\n    popper = _extends({}, popper, check[side](placement));\n  });\n\n  data.offsets.popper = popper;\n\n  return data;\n}\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nfunction shift(data) {\n  var placement = data.placement;\n  var basePlacement = placement.split('-')[0];\n  var shiftvariation = placement.split('-')[1];\n\n  // if shift shiftvariation is specified, run the modifier\n  if (shiftvariation) {\n    var _data$offsets = data.offsets,\n        reference = _data$offsets.reference,\n        popper = _data$offsets.popper;\n\n    var isVertical = ['bottom', 'top'].indexOf(basePlacement) !== -1;\n    var side = isVertical ? 'left' : 'top';\n    var measurement = isVertical ? 'width' : 'height';\n\n    var shiftOffsets = {\n      start: defineProperty({}, side, reference[side]),\n      end: defineProperty({}, side, reference[side] + reference[measurement] - popper[measurement])\n    };\n\n    data.offsets.popper = _extends({}, popper, shiftOffsets[shiftvariation]);\n  }\n\n  return data;\n}\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nfunction hide(data) {\n  if (!isModifierRequired(data.instance.modifiers, 'hide', 'preventOverflow')) {\n    return data;\n  }\n\n  var refRect = data.offsets.reference;\n  var bound = find(data.instance.modifiers, function (modifier) {\n    return modifier.name === 'preventOverflow';\n  }).boundaries;\n\n  if (refRect.bottom < bound.top || refRect.left > bound.right || refRect.top > bound.bottom || refRect.right < bound.left) {\n    // Avoid unnecessary DOM access if visibility hasn't changed\n    if (data.hide === true) {\n      return data;\n    }\n\n    data.hide = true;\n    data.attributes['x-out-of-boundaries'] = '';\n  } else {\n    // Avoid unnecessary DOM access if visibility hasn't changed\n    if (data.hide === false) {\n      return data;\n    }\n\n    data.hide = false;\n    data.attributes['x-out-of-boundaries'] = false;\n  }\n\n  return data;\n}\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nfunction inner(data) {\n  var placement = data.placement;\n  var basePlacement = placement.split('-')[0];\n  var _data$offsets = data.offsets,\n      popper = _data$offsets.popper,\n      reference = _data$offsets.reference;\n\n  var isHoriz = ['left', 'right'].indexOf(basePlacement) !== -1;\n\n  var subtractLength = ['top', 'left'].indexOf(basePlacement) === -1;\n\n  popper[isHoriz ? 'left' : 'top'] = reference[basePlacement] - (subtractLength ? popper[isHoriz ? 'width' : 'height'] : 0);\n\n  data.placement = getOppositePlacement(placement);\n  data.offsets.popper = getClientRect(popper);\n\n  return data;\n}\n\n/**\n * Modifier function, each modifier can have a function of this type assigned\n * to its `fn` property.<br />\n * These functions will be called on each update, this means that you must\n * make sure they are performant enough to avoid performance bottlenecks.\n *\n * @function ModifierFn\n * @argument {dataObject} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {dataObject} The data object, properly modified\n */\n\n/**\n * Modifiers are plugins used to alter the behavior of your poppers.<br />\n * Popper.js uses a set of 9 modifiers to provide all the basic functionalities\n * needed by the library.\n *\n * Usually you don't want to override the `order`, `fn` and `onLoad` props.\n * All the other properties are configurations that could be tweaked.\n * @namespace modifiers\n */\nvar modifiers = {\n  /**\n   * Modifier used to shift the popper on the start or end of its reference\n   * element.<br />\n   * It will read the variation of the `placement` property.<br />\n   * It can be one either `-end` or `-start`.\n   * @memberof modifiers\n   * @inner\n   */\n  shift: {\n    /** @prop {number} order=100 - Index used to define the order of execution */\n    order: 100,\n    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n    enabled: true,\n    /** @prop {ModifierFn} */\n    fn: shift\n  },\n\n  /**\n   * The `offset` modifier can shift your popper on both its axis.\n   *\n   * It accepts the following units:\n   * - `px` or unit-less, interpreted as pixels\n   * - `%` or `%r`, percentage relative to the length of the reference element\n   * - `%p`, percentage relative to the length of the popper element\n   * - `vw`, CSS viewport width unit\n   * - `vh`, CSS viewport height unit\n   *\n   * For length is intended the main axis relative to the placement of the popper.<br />\n   * This means that if the placement is `top` or `bottom`, the length will be the\n   * `width`. In case of `left` or `right`, it will be the `height`.\n   *\n   * You can provide a single value (as `Number` or `String`), or a pair of values\n   * as `String` divided by a comma or one (or more) white spaces.<br />\n   * The latter is a deprecated method because it leads to confusion and will be\n   * removed in v2.<br />\n   * Additionally, it accepts additions and subtractions between different units.\n   * Note that multiplications and divisions aren't supported.\n   *\n   * Valid examples are:\n   * ```\n   * 10\n   * '10%'\n   * '10, 10'\n   * '10%, 10'\n   * '10 + 10%'\n   * '10 - 5vh + 3%'\n   * '-10px + 5vh, 5px - 6%'\n   * ```\n   * > **NB**: If you desire to apply offsets to your poppers in a way that may make them overlap\n   * > with their reference element, unfortunately, you will have to disable the `flip` modifier.\n   * > You can read more on this at this [issue](https://github.com/FezVrasta/popper.js/issues/373).\n   *\n   * @memberof modifiers\n   * @inner\n   */\n  offset: {\n    /** @prop {number} order=200 - Index used to define the order of execution */\n    order: 200,\n    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n    enabled: true,\n    /** @prop {ModifierFn} */\n    fn: offset,\n    /** @prop {Number|String} offset=0\n     * The offset value as described in the modifier description\n     */\n    offset: 0\n  },\n\n  /**\n   * Modifier used to prevent the popper from being positioned outside the boundary.\n   *\n   * A scenario exists where the reference itself is not within the boundaries.<br />\n   * We can say it has \"escaped the boundaries\" — or just \"escaped\".<br />\n   * In this case we need to decide whether the popper should either:\n   *\n   * - detach from the reference and remain \"trapped\" in the boundaries, or\n   * - if it should ignore the boundary and \"escape with its reference\"\n   *\n   * When `escapeWithReference` is set to`true` and reference is completely\n   * outside its boundaries, the popper will overflow (or completely leave)\n   * the boundaries in order to remain attached to the edge of the reference.\n   *\n   * @memberof modifiers\n   * @inner\n   */\n  preventOverflow: {\n    /** @prop {number} order=300 - Index used to define the order of execution */\n    order: 300,\n    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n    enabled: true,\n    /** @prop {ModifierFn} */\n    fn: preventOverflow,\n    /**\n     * @prop {Array} [priority=['left','right','top','bottom']]\n     * Popper will try to prevent overflow following these priorities by default,\n     * then, it could overflow on the left and on top of the `boundariesElement`\n     */\n    priority: ['left', 'right', 'top', 'bottom'],\n    /**\n     * @prop {number} padding=5\n     * Amount of pixel used to define a minimum distance between the boundaries\n     * and the popper. This makes sure the popper always has a little padding\n     * between the edges of its container\n     */\n    padding: 5,\n    /**\n     * @prop {String|HTMLElement} boundariesElement='scrollParent'\n     * Boundaries used by the modifier. Can be `scrollParent`, `window`,\n     * `viewport` or any DOM element.\n     */\n    boundariesElement: 'scrollParent'\n  },\n\n  /**\n   * Modifier used to make sure the reference and its popper stay near each other\n   * without leaving any gap between the two. Especially useful when the arrow is\n   * enabled and you want to ensure that it points to its reference element.\n   * It cares only about the first axis. You can still have poppers with margin\n   * between the popper and its reference element.\n   * @memberof modifiers\n   * @inner\n   */\n  keepTogether: {\n    /** @prop {number} order=400 - Index used to define the order of execution */\n    order: 400,\n    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n    enabled: true,\n    /** @prop {ModifierFn} */\n    fn: keepTogether\n  },\n\n  /**\n   * This modifier is used to move the `arrowElement` of the popper to make\n   * sure it is positioned between the reference element and its popper element.\n   * It will read the outer size of the `arrowElement` node to detect how many\n   * pixels of conjunction are needed.\n   *\n   * It has no effect if no `arrowElement` is provided.\n   * @memberof modifiers\n   * @inner\n   */\n  arrow: {\n    /** @prop {number} order=500 - Index used to define the order of execution */\n    order: 500,\n    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n    enabled: true,\n    /** @prop {ModifierFn} */\n    fn: arrow,\n    /** @prop {String|HTMLElement} element='[x-arrow]' - Selector or node used as arrow */\n    element: '[x-arrow]'\n  },\n\n  /**\n   * Modifier used to flip the popper's placement when it starts to overlap its\n   * reference element.\n   *\n   * Requires the `preventOverflow` modifier before it in order to work.\n   *\n   * **NOTE:** this modifier will interrupt the current update cycle and will\n   * restart it if it detects the need to flip the placement.\n   * @memberof modifiers\n   * @inner\n   */\n  flip: {\n    /** @prop {number} order=600 - Index used to define the order of execution */\n    order: 600,\n    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n    enabled: true,\n    /** @prop {ModifierFn} */\n    fn: flip,\n    /**\n     * @prop {String|Array} behavior='flip'\n     * The behavior used to change the popper's placement. It can be one of\n     * `flip`, `clockwise`, `counterclockwise` or an array with a list of valid\n     * placements (with optional variations)\n     */\n    behavior: 'flip',\n    /**\n     * @prop {number} padding=5\n     * The popper will flip if it hits the edges of the `boundariesElement`\n     */\n    padding: 5,\n    /**\n     * @prop {String|HTMLElement} boundariesElement='viewport'\n     * The element which will define the boundaries of the popper position.\n     * The popper will never be placed outside of the defined boundaries\n     * (except if `keepTogether` is enabled)\n     */\n    boundariesElement: 'viewport',\n    /**\n     * @prop {Boolean} flipVariations=false\n     * The popper will switch placement variation between `-start` and `-end` when\n     * the reference element overlaps its boundaries.\n     *\n     * The original placement should have a set variation.\n     */\n    flipVariations: false,\n    /**\n     * @prop {Boolean} flipVariationsByContent=false\n     * The popper will switch placement variation between `-start` and `-end` when\n     * the popper element overlaps its reference boundaries.\n     *\n     * The original placement should have a set variation.\n     */\n    flipVariationsByContent: false\n  },\n\n  /**\n   * Modifier used to make the popper flow toward the inner of the reference element.\n   * By default, when this modifier is disabled, the popper will be placed outside\n   * the reference element.\n   * @memberof modifiers\n   * @inner\n   */\n  inner: {\n    /** @prop {number} order=700 - Index used to define the order of execution */\n    order: 700,\n    /** @prop {Boolean} enabled=false - Whether the modifier is enabled or not */\n    enabled: false,\n    /** @prop {ModifierFn} */\n    fn: inner\n  },\n\n  /**\n   * Modifier used to hide the popper when its reference element is outside of the\n   * popper boundaries. It will set a `x-out-of-boundaries` attribute which can\n   * be used to hide with a CSS selector the popper when its reference is\n   * out of boundaries.\n   *\n   * Requires the `preventOverflow` modifier before it in order to work.\n   * @memberof modifiers\n   * @inner\n   */\n  hide: {\n    /** @prop {number} order=800 - Index used to define the order of execution */\n    order: 800,\n    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n    enabled: true,\n    /** @prop {ModifierFn} */\n    fn: hide\n  },\n\n  /**\n   * Computes the style that will be applied to the popper element to gets\n   * properly positioned.\n   *\n   * Note that this modifier will not touch the DOM, it just prepares the styles\n   * so that `applyStyle` modifier can apply it. This separation is useful\n   * in case you need to replace `applyStyle` with a custom implementation.\n   *\n   * This modifier has `850` as `order` value to maintain backward compatibility\n   * with previous versions of Popper.js. Expect the modifiers ordering method\n   * to change in future major versions of the library.\n   *\n   * @memberof modifiers\n   * @inner\n   */\n  computeStyle: {\n    /** @prop {number} order=850 - Index used to define the order of execution */\n    order: 850,\n    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n    enabled: true,\n    /** @prop {ModifierFn} */\n    fn: computeStyle,\n    /**\n     * @prop {Boolean} gpuAcceleration=true\n     * If true, it uses the CSS 3D transformation to position the popper.\n     * Otherwise, it will use the `top` and `left` properties\n     */\n    gpuAcceleration: true,\n    /**\n     * @prop {string} [x='bottom']\n     * Where to anchor the X axis (`bottom` or `top`). AKA X offset origin.\n     * Change this if your popper should grow in a direction different from `bottom`\n     */\n    x: 'bottom',\n    /**\n     * @prop {string} [x='left']\n     * Where to anchor the Y axis (`left` or `right`). AKA Y offset origin.\n     * Change this if your popper should grow in a direction different from `right`\n     */\n    y: 'right'\n  },\n\n  /**\n   * Applies the computed styles to the popper element.\n   *\n   * All the DOM manipulations are limited to this modifier. This is useful in case\n   * you want to integrate Popper.js inside a framework or view library and you\n   * want to delegate all the DOM manipulations to it.\n   *\n   * Note that if you disable this modifier, you must make sure the popper element\n   * has its position set to `absolute` before Popper.js can do its work!\n   *\n   * Just disable this modifier and define your own to achieve the desired effect.\n   *\n   * @memberof modifiers\n   * @inner\n   */\n  applyStyle: {\n    /** @prop {number} order=900 - Index used to define the order of execution */\n    order: 900,\n    /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n    enabled: true,\n    /** @prop {ModifierFn} */\n    fn: applyStyle,\n    /** @prop {Function} */\n    onLoad: applyStyleOnLoad,\n    /**\n     * @deprecated since version 1.10.0, the property moved to `computeStyle` modifier\n     * @prop {Boolean} gpuAcceleration=true\n     * If true, it uses the CSS 3D transformation to position the popper.\n     * Otherwise, it will use the `top` and `left` properties\n     */\n    gpuAcceleration: undefined\n  }\n};\n\n/**\n * The `dataObject` is an object containing all the information used by Popper.js.\n * This object is passed to modifiers and to the `onCreate` and `onUpdate` callbacks.\n * @name dataObject\n * @property {Object} data.instance The Popper.js instance\n * @property {String} data.placement Placement applied to popper\n * @property {String} data.originalPlacement Placement originally defined on init\n * @property {Boolean} data.flipped True if popper has been flipped by flip modifier\n * @property {Boolean} data.hide True if the reference element is out of boundaries, useful to know when to hide the popper\n * @property {HTMLElement} data.arrowElement Node used as arrow by arrow modifier\n * @property {Object} data.styles Any CSS property defined here will be applied to the popper. It expects the JavaScript nomenclature (eg. `marginBottom`)\n * @property {Object} data.arrowStyles Any CSS property defined here will be applied to the popper arrow. It expects the JavaScript nomenclature (eg. `marginBottom`)\n * @property {Object} data.boundaries Offsets of the popper boundaries\n * @property {Object} data.offsets The measurements of popper, reference and arrow elements\n * @property {Object} data.offsets.popper `top`, `left`, `width`, `height` values\n * @property {Object} data.offsets.reference `top`, `left`, `width`, `height` values\n * @property {Object} data.offsets.arrow] `top` and `left` offsets, only one of them will be different from 0\n */\n\n/**\n * Default options provided to Popper.js constructor.<br />\n * These can be overridden using the `options` argument of Popper.js.<br />\n * To override an option, simply pass an object with the same\n * structure of the `options` object, as the 3rd argument. For example:\n * ```\n * new Popper(ref, pop, {\n *   modifiers: {\n *     preventOverflow: { enabled: false }\n *   }\n * })\n * ```\n * @type {Object}\n * @static\n * @memberof Popper\n */\nvar Defaults = {\n  /**\n   * Popper's placement.\n   * @prop {Popper.placements} placement='bottom'\n   */\n  placement: 'bottom',\n\n  /**\n   * Set this to true if you want popper to position it self in 'fixed' mode\n   * @prop {Boolean} positionFixed=false\n   */\n  positionFixed: false,\n\n  /**\n   * Whether events (resize, scroll) are initially enabled.\n   * @prop {Boolean} eventsEnabled=true\n   */\n  eventsEnabled: true,\n\n  /**\n   * Set to true if you want to automatically remove the popper when\n   * you call the `destroy` method.\n   * @prop {Boolean} removeOnDestroy=false\n   */\n  removeOnDestroy: false,\n\n  /**\n   * Callback called when the popper is created.<br />\n   * By default, it is set to no-op.<br />\n   * Access Popper.js instance with `data.instance`.\n   * @prop {onCreate}\n   */\n  onCreate: function onCreate() {},\n\n  /**\n   * Callback called when the popper is updated. This callback is not called\n   * on the initialization/creation of the popper, but only on subsequent\n   * updates.<br />\n   * By default, it is set to no-op.<br />\n   * Access Popper.js instance with `data.instance`.\n   * @prop {onUpdate}\n   */\n  onUpdate: function onUpdate() {},\n\n  /**\n   * List of modifiers used to modify the offsets before they are applied to the popper.\n   * They provide most of the functionalities of Popper.js.\n   * @prop {modifiers}\n   */\n  modifiers: modifiers\n};\n\n/**\n * @callback onCreate\n * @param {dataObject} data\n */\n\n/**\n * @callback onUpdate\n * @param {dataObject} data\n */\n\n// Utils\n// Methods\nvar Popper = function () {\n  /**\n   * Creates a new Popper.js instance.\n   * @class Popper\n   * @param {Element|referenceObject} reference - The reference element used to position the popper\n   * @param {Element} popper - The HTML / XML element used as the popper\n   * @param {Object} options - Your custom options to override the ones defined in [Defaults](#defaults)\n   * @return {Object} instance - The generated Popper.js instance\n   */\n  function Popper(reference, popper) {\n    var _this = this;\n\n    var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};\n    classCallCheck(this, Popper);\n\n    this.scheduleUpdate = function () {\n      return requestAnimationFrame(_this.update);\n    };\n\n    // make update() debounced, so that it only runs at most once-per-tick\n    this.update = debounce(this.update.bind(this));\n\n    // with {} we create a new object with the options inside it\n    this.options = _extends({}, Popper.Defaults, options);\n\n    // init state\n    this.state = {\n      isDestroyed: false,\n      isCreated: false,\n      scrollParents: []\n    };\n\n    // get reference and popper elements (allow jQuery wrappers)\n    this.reference = reference && reference.jquery ? reference[0] : reference;\n    this.popper = popper && popper.jquery ? popper[0] : popper;\n\n    // Deep merge modifiers options\n    this.options.modifiers = {};\n    Object.keys(_extends({}, Popper.Defaults.modifiers, options.modifiers)).forEach(function (name) {\n      _this.options.modifiers[name] = _extends({}, Popper.Defaults.modifiers[name] || {}, options.modifiers ? options.modifiers[name] : {});\n    });\n\n    // Refactoring modifiers' list (Object => Array)\n    this.modifiers = Object.keys(this.options.modifiers).map(function (name) {\n      return _extends({\n        name: name\n      }, _this.options.modifiers[name]);\n    })\n    // sort the modifiers by order\n    .sort(function (a, b) {\n      return a.order - b.order;\n    });\n\n    // modifiers have the ability to execute arbitrary code when Popper.js get inited\n    // such code is executed in the same order of its modifier\n    // they could add new properties to their options configuration\n    // BE AWARE: don't add options to `options.modifiers.name` but to `modifierOptions`!\n    this.modifiers.forEach(function (modifierOptions) {\n      if (modifierOptions.enabled && isFunction(modifierOptions.onLoad)) {\n        modifierOptions.onLoad(_this.reference, _this.popper, _this.options, modifierOptions, _this.state);\n      }\n    });\n\n    // fire the first update to position the popper in the right place\n    this.update();\n\n    var eventsEnabled = this.options.eventsEnabled;\n    if (eventsEnabled) {\n      // setup event listeners, they will take care of update the position in specific situations\n      this.enableEventListeners();\n    }\n\n    this.state.eventsEnabled = eventsEnabled;\n  }\n\n  // We can't use class properties because they don't get listed in the\n  // class prototype and break stuff like Sinon stubs\n\n\n  createClass(Popper, [{\n    key: 'update',\n    value: function update$$1() {\n      return update.call(this);\n    }\n  }, {\n    key: 'destroy',\n    value: function destroy$$1() {\n      return destroy.call(this);\n    }\n  }, {\n    key: 'enableEventListeners',\n    value: function enableEventListeners$$1() {\n      return enableEventListeners.call(this);\n    }\n  }, {\n    key: 'disableEventListeners',\n    value: function disableEventListeners$$1() {\n      return disableEventListeners.call(this);\n    }\n\n    /**\n     * Schedules an update. It will run on the next UI update available.\n     * @method scheduleUpdate\n     * @memberof Popper\n     */\n\n\n    /**\n     * Collection of utilities useful when writing custom modifiers.\n     * Starting from version 1.7, this method is available only if you\n     * include `popper-utils.js` before `popper.js`.\n     *\n     * **DEPRECATION**: This way to access PopperUtils is deprecated\n     * and will be removed in v2! Use the PopperUtils module directly instead.\n     * Due to the high instability of the methods contained in Utils, we can't\n     * guarantee them to follow semver. Use them at your own risk!\n     * @static\n     * @private\n     * @type {Object}\n     * @deprecated since version 1.8\n     * @member Utils\n     * @memberof Popper\n     */\n\n  }]);\n  return Popper;\n}();\n\n/**\n * The `referenceObject` is an object that provides an interface compatible with Popper.js\n * and lets you use it as replacement of a real DOM node.<br />\n * You can use this method to position a popper relatively to a set of coordinates\n * in case you don't have a DOM node to use as reference.\n *\n * ```\n * new Popper(referenceObject, popperNode);\n * ```\n *\n * NB: This feature isn't supported in Internet Explorer 10.\n * @name referenceObject\n * @property {Function} data.getBoundingClientRect\n * A function that returns a set of coordinates compatible with the native `getBoundingClientRect` method.\n * @property {number} data.clientWidth\n * An ES6 getter that will return the width of the virtual reference element.\n * @property {number} data.clientHeight\n * An ES6 getter that will return the height of the virtual reference element.\n */\n\n\nPopper.Utils = (typeof window !== 'undefined' ? window : global).PopperUtils;\nPopper.placements = placements;\nPopper.Defaults = Defaults;\n\nexport default Popper;\n//# sourceMappingURL=popper.js.map\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.4.1): dropdown.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\nimport Popper from 'popper.js'\nimport Util from './util'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME                     = 'dropdown'\nconst VERSION                  = '4.4.1'\nconst DATA_KEY                 = 'bs.dropdown'\nconst EVENT_KEY                = `.${DATA_KEY}`\nconst DATA_API_KEY             = '.data-api'\nconst JQUERY_NO_CONFLICT       = $.fn[NAME]\nconst ESCAPE_KEYCODE           = 27 // KeyboardEvent.which value for Escape (Esc) key\nconst SPACE_KEYCODE            = 32 // KeyboardEvent.which value for space key\nconst TAB_KEYCODE              = 9 // KeyboardEvent.which value for tab key\nconst ARROW_UP_KEYCODE         = 38 // KeyboardEvent.which value for up arrow key\nconst ARROW_DOWN_KEYCODE       = 40 // KeyboardEvent.which value for down arrow key\nconst RIGHT_MOUSE_BUTTON_WHICH = 3 // MouseEvent.which value for the right button (assuming a right-handed mouse)\nconst REGEXP_KEYDOWN           = new RegExp(`${ARROW_UP_KEYCODE}|${ARROW_DOWN_KEYCODE}|${ESCAPE_KEYCODE}`)\n\nconst Event = {\n  HIDE             : `hide${EVENT_KEY}`,\n  HIDDEN           : `hidden${EVENT_KEY}`,\n  SHOW             : `show${EVENT_KEY}`,\n  SHOWN            : `shown${EVENT_KEY}`,\n  CLICK            : `click${EVENT_KEY}`,\n  CLICK_DATA_API   : `click${EVENT_KEY}${DATA_API_KEY}`,\n  KEYDOWN_DATA_API : `keydown${EVENT_KEY}${DATA_API_KEY}`,\n  KEYUP_DATA_API   : `keyup${EVENT_KEY}${DATA_API_KEY}`\n}\n\nconst ClassName = {\n  DISABLED        : 'disabled',\n  SHOW            : 'show',\n  DROPUP          : 'dropup',\n  DROPRIGHT       : 'dropright',\n  DROPLEFT        : 'dropleft',\n  MENURIGHT       : 'dropdown-menu-right',\n  MENULEFT        : 'dropdown-menu-left',\n  POSITION_STATIC : 'position-static'\n}\n\nconst Selector = {\n  DATA_TOGGLE   : '[data-toggle=\"dropdown\"]',\n  FORM_CHILD    : '.dropdown form',\n  MENU          : '.dropdown-menu',\n  NAVBAR_NAV    : '.navbar-nav',\n  VISIBLE_ITEMS : '.dropdown-menu .dropdown-item:not(.disabled):not(:disabled)'\n}\n\nconst AttachmentMap = {\n  TOP       : 'top-start',\n  TOPEND    : 'top-end',\n  BOTTOM    : 'bottom-start',\n  BOTTOMEND : 'bottom-end',\n  RIGHT     : 'right-start',\n  RIGHTEND  : 'right-end',\n  LEFT      : 'left-start',\n  LEFTEND   : 'left-end'\n}\n\nconst Default = {\n  offset       : 0,\n  flip         : true,\n  boundary     : 'scrollParent',\n  reference    : 'toggle',\n  display      : 'dynamic',\n  popperConfig : null\n}\n\nconst DefaultType = {\n  offset       : '(number|string|function)',\n  flip         : 'boolean',\n  boundary     : '(string|element)',\n  reference    : '(string|element)',\n  display      : 'string',\n  popperConfig : '(null|object)'\n}\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass Dropdown {\n  constructor(element, config) {\n    this._element  = element\n    this._popper   = null\n    this._config   = this._getConfig(config)\n    this._menu     = this._getMenuElement()\n    this._inNavbar = this._detectNavbar()\n\n    this._addEventListeners()\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  static get Default() {\n    return Default\n  }\n\n  static get DefaultType() {\n    return DefaultType\n  }\n\n  // Public\n\n  toggle() {\n    if (this._element.disabled || $(this._element).hasClass(ClassName.DISABLED)) {\n      return\n    }\n\n    const isActive = $(this._menu).hasClass(ClassName.SHOW)\n\n    Dropdown._clearMenus()\n\n    if (isActive) {\n      return\n    }\n\n    this.show(true)\n  }\n\n  show(usePopper = false) {\n    if (this._element.disabled || $(this._element).hasClass(ClassName.DISABLED) || $(this._menu).hasClass(ClassName.SHOW)) {\n      return\n    }\n\n    const relatedTarget = {\n      relatedTarget: this._element\n    }\n    const showEvent = $.Event(Event.SHOW, relatedTarget)\n    const parent = Dropdown._getParentFromElement(this._element)\n\n    $(parent).trigger(showEvent)\n\n    if (showEvent.isDefaultPrevented()) {\n      return\n    }\n\n    // Disable totally Popper.js for Dropdown in Navbar\n    if (!this._inNavbar && usePopper) {\n      /**\n       * Check for Popper dependency\n       * Popper - https://popper.js.org\n       */\n      if (typeof Popper === 'undefined') {\n        throw new TypeError('Bootstrap\\'s dropdowns require Popper.js (https://popper.js.org/)')\n      }\n\n      let referenceElement = this._element\n\n      if (this._config.reference === 'parent') {\n        referenceElement = parent\n      } else if (Util.isElement(this._config.reference)) {\n        referenceElement = this._config.reference\n\n        // Check if it's jQuery element\n        if (typeof this._config.reference.jquery !== 'undefined') {\n          referenceElement = this._config.reference[0]\n        }\n      }\n\n      // If boundary is not `scrollParent`, then set position to `static`\n      // to allow the menu to \"escape\" the scroll parent's boundaries\n      // https://github.com/twbs/bootstrap/issues/24251\n      if (this._config.boundary !== 'scrollParent') {\n        $(parent).addClass(ClassName.POSITION_STATIC)\n      }\n      this._popper = new Popper(referenceElement, this._menu, this._getPopperConfig())\n    }\n\n    // If this is a touch-enabled device we add extra\n    // empty mouseover listeners to the body's immediate children;\n    // only needed because of broken event delegation on iOS\n    // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html\n    if ('ontouchstart' in document.documentElement &&\n        $(parent).closest(Selector.NAVBAR_NAV).length === 0) {\n      $(document.body).children().on('mouseover', null, $.noop)\n    }\n\n    this._element.focus()\n    this._element.setAttribute('aria-expanded', true)\n\n    $(this._menu).toggleClass(ClassName.SHOW)\n    $(parent)\n      .toggleClass(ClassName.SHOW)\n      .trigger($.Event(Event.SHOWN, relatedTarget))\n  }\n\n  hide() {\n    if (this._element.disabled || $(this._element).hasClass(ClassName.DISABLED) || !$(this._menu).hasClass(ClassName.SHOW)) {\n      return\n    }\n\n    const relatedTarget = {\n      relatedTarget: this._element\n    }\n    const hideEvent = $.Event(Event.HIDE, relatedTarget)\n    const parent = Dropdown._getParentFromElement(this._element)\n\n    $(parent).trigger(hideEvent)\n\n    if (hideEvent.isDefaultPrevented()) {\n      return\n    }\n\n    if (this._popper) {\n      this._popper.destroy()\n    }\n\n    $(this._menu).toggleClass(ClassName.SHOW)\n    $(parent)\n      .toggleClass(ClassName.SHOW)\n      .trigger($.Event(Event.HIDDEN, relatedTarget))\n  }\n\n  dispose() {\n    $.removeData(this._element, DATA_KEY)\n    $(this._element).off(EVENT_KEY)\n    this._element = null\n    this._menu = null\n    if (this._popper !== null) {\n      this._popper.destroy()\n      this._popper = null\n    }\n  }\n\n  update() {\n    this._inNavbar = this._detectNavbar()\n    if (this._popper !== null) {\n      this._popper.scheduleUpdate()\n    }\n  }\n\n  // Private\n\n  _addEventListeners() {\n    $(this._element).on(Event.CLICK, (event) => {\n      event.preventDefault()\n      event.stopPropagation()\n      this.toggle()\n    })\n  }\n\n  _getConfig(config) {\n    config = {\n      ...this.constructor.Default,\n      ...$(this._element).data(),\n      ...config\n    }\n\n    Util.typeCheckConfig(\n      NAME,\n      config,\n      this.constructor.DefaultType\n    )\n\n    return config\n  }\n\n  _getMenuElement() {\n    if (!this._menu) {\n      const parent = Dropdown._getParentFromElement(this._element)\n\n      if (parent) {\n        this._menu = parent.querySelector(Selector.MENU)\n      }\n    }\n    return this._menu\n  }\n\n  _getPlacement() {\n    const $parentDropdown = $(this._element.parentNode)\n    let placement = AttachmentMap.BOTTOM\n\n    // Handle dropup\n    if ($parentDropdown.hasClass(ClassName.DROPUP)) {\n      placement = AttachmentMap.TOP\n      if ($(this._menu).hasClass(ClassName.MENURIGHT)) {\n        placement = AttachmentMap.TOPEND\n      }\n    } else if ($parentDropdown.hasClass(ClassName.DROPRIGHT)) {\n      placement = AttachmentMap.RIGHT\n    } else if ($parentDropdown.hasClass(ClassName.DROPLEFT)) {\n      placement = AttachmentMap.LEFT\n    } else if ($(this._menu).hasClass(ClassName.MENURIGHT)) {\n      placement = AttachmentMap.BOTTOMEND\n    }\n    return placement\n  }\n\n  _detectNavbar() {\n    return $(this._element).closest('.navbar').length > 0\n  }\n\n  _getOffset() {\n    const offset = {}\n\n    if (typeof this._config.offset === 'function') {\n      offset.fn = (data) => {\n        data.offsets = {\n          ...data.offsets,\n          ...this._config.offset(data.offsets, this._element) || {}\n        }\n\n        return data\n      }\n    } else {\n      offset.offset = this._config.offset\n    }\n\n    return offset\n  }\n\n  _getPopperConfig() {\n    const popperConfig = {\n      placement: this._getPlacement(),\n      modifiers: {\n        offset: this._getOffset(),\n        flip: {\n          enabled: this._config.flip\n        },\n        preventOverflow: {\n          boundariesElement: this._config.boundary\n        }\n      }\n    }\n\n    // Disable Popper.js if we have a static display\n    if (this._config.display === 'static') {\n      popperConfig.modifiers.applyStyle = {\n        enabled: false\n      }\n    }\n\n    return {\n      ...popperConfig,\n      ...this._config.popperConfig\n    }\n  }\n\n  // Static\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      let data = $(this).data(DATA_KEY)\n      const _config = typeof config === 'object' ? config : null\n\n      if (!data) {\n        data = new Dropdown(this, _config)\n        $(this).data(DATA_KEY, data)\n      }\n\n      if (typeof config === 'string') {\n        if (typeof data[config] === 'undefined') {\n          throw new TypeError(`No method named \"${config}\"`)\n        }\n        data[config]()\n      }\n    })\n  }\n\n  static _clearMenus(event) {\n    if (event && (event.which === RIGHT_MOUSE_BUTTON_WHICH ||\n      event.type === 'keyup' && event.which !== TAB_KEYCODE)) {\n      return\n    }\n\n    const toggles = [].slice.call(document.querySelectorAll(Selector.DATA_TOGGLE))\n\n    for (let i = 0, len = toggles.length; i < len; i++) {\n      const parent = Dropdown._getParentFromElement(toggles[i])\n      const context = $(toggles[i]).data(DATA_KEY)\n      const relatedTarget = {\n        relatedTarget: toggles[i]\n      }\n\n      if (event && event.type === 'click') {\n        relatedTarget.clickEvent = event\n      }\n\n      if (!context) {\n        continue\n      }\n\n      const dropdownMenu = context._menu\n      if (!$(parent).hasClass(ClassName.SHOW)) {\n        continue\n      }\n\n      if (event && (event.type === 'click' &&\n          /input|textarea/i.test(event.target.tagName) || event.type === 'keyup' && event.which === TAB_KEYCODE) &&\n          $.contains(parent, event.target)) {\n        continue\n      }\n\n      const hideEvent = $.Event(Event.HIDE, relatedTarget)\n      $(parent).trigger(hideEvent)\n      if (hideEvent.isDefaultPrevented()) {\n        continue\n      }\n\n      // If this is a touch-enabled device we remove the extra\n      // empty mouseover listeners we added for iOS support\n      if ('ontouchstart' in document.documentElement) {\n        $(document.body).children().off('mouseover', null, $.noop)\n      }\n\n      toggles[i].setAttribute('aria-expanded', 'false')\n\n      if (context._popper) {\n        context._popper.destroy()\n      }\n\n      $(dropdownMenu).removeClass(ClassName.SHOW)\n      $(parent)\n        .removeClass(ClassName.SHOW)\n        .trigger($.Event(Event.HIDDEN, relatedTarget))\n    }\n  }\n\n  static _getParentFromElement(element) {\n    let parent\n    const selector = Util.getSelectorFromElement(element)\n\n    if (selector) {\n      parent = document.querySelector(selector)\n    }\n\n    return parent || element.parentNode\n  }\n\n  // eslint-disable-next-line complexity\n  static _dataApiKeydownHandler(event) {\n    // If not input/textarea:\n    //  - And not a key in REGEXP_KEYDOWN => not a dropdown command\n    // If input/textarea:\n    //  - If space key => not a dropdown command\n    //  - If key is other than escape\n    //    - If key is not up or down => not a dropdown command\n    //    - If trigger inside the menu => not a dropdown command\n    if (/input|textarea/i.test(event.target.tagName)\n      ? event.which === SPACE_KEYCODE || event.which !== ESCAPE_KEYCODE &&\n      (event.which !== ARROW_DOWN_KEYCODE && event.which !== ARROW_UP_KEYCODE ||\n        $(event.target).closest(Selector.MENU).length) : !REGEXP_KEYDOWN.test(event.which)) {\n      return\n    }\n\n    event.preventDefault()\n    event.stopPropagation()\n\n    if (this.disabled || $(this).hasClass(ClassName.DISABLED)) {\n      return\n    }\n\n    const parent   = Dropdown._getParentFromElement(this)\n    const isActive = $(parent).hasClass(ClassName.SHOW)\n\n    if (!isActive && event.which === ESCAPE_KEYCODE) {\n      return\n    }\n\n    if (!isActive || isActive && (event.which === ESCAPE_KEYCODE || event.which === SPACE_KEYCODE)) {\n      if (event.which === ESCAPE_KEYCODE) {\n        const toggle = parent.querySelector(Selector.DATA_TOGGLE)\n        $(toggle).trigger('focus')\n      }\n\n      $(this).trigger('click')\n      return\n    }\n\n    const items = [].slice.call(parent.querySelectorAll(Selector.VISIBLE_ITEMS))\n      .filter((item) => $(item).is(':visible'))\n\n    if (items.length === 0) {\n      return\n    }\n\n    let index = items.indexOf(event.target)\n\n    if (event.which === ARROW_UP_KEYCODE && index > 0) { // Up\n      index--\n    }\n\n    if (event.which === ARROW_DOWN_KEYCODE && index < items.length - 1) { // Down\n      index++\n    }\n\n    if (index < 0) {\n      index = 0\n    }\n\n    items[index].focus()\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * Data Api implementation\n * ------------------------------------------------------------------------\n */\n\n$(document)\n  .on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler)\n  .on(Event.KEYDOWN_DATA_API, Selector.MENU, Dropdown._dataApiKeydownHandler)\n  .on(`${Event.CLICK_DATA_API} ${Event.KEYUP_DATA_API}`, Dropdown._clearMenus)\n  .on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {\n    event.preventDefault()\n    event.stopPropagation()\n    Dropdown._jQueryInterface.call($(this), 'toggle')\n  })\n  .on(Event.CLICK_DATA_API, Selector.FORM_CHILD, (e) => {\n    e.stopPropagation()\n  })\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME] = Dropdown._jQueryInterface\n$.fn[NAME].Constructor = Dropdown\n$.fn[NAME].noConflict = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Dropdown._jQueryInterface\n}\n\n\nexport default Dropdown\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.4.1): modal.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\nimport Util from './util'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME               = 'modal'\nconst VERSION            = '4.4.1'\nconst DATA_KEY           = 'bs.modal'\nconst EVENT_KEY          = `.${DATA_KEY}`\nconst DATA_API_KEY       = '.data-api'\nconst JQUERY_NO_CONFLICT = $.fn[NAME]\nconst ESCAPE_KEYCODE     = 27 // KeyboardEvent.which value for Escape (Esc) key\n\nconst Default = {\n  backdrop : true,\n  keyboard : true,\n  focus    : true,\n  show     : true\n}\n\nconst DefaultType = {\n  backdrop : '(boolean|string)',\n  keyboard : 'boolean',\n  focus    : 'boolean',\n  show     : 'boolean'\n}\n\nconst Event = {\n  HIDE              : `hide${EVENT_KEY}`,\n  HIDE_PREVENTED    : `hidePrevented${EVENT_KEY}`,\n  HIDDEN            : `hidden${EVENT_KEY}`,\n  SHOW              : `show${EVENT_KEY}`,\n  SHOWN             : `shown${EVENT_KEY}`,\n  FOCUSIN           : `focusin${EVENT_KEY}`,\n  RESIZE            : `resize${EVENT_KEY}`,\n  CLICK_DISMISS     : `click.dismiss${EVENT_KEY}`,\n  KEYDOWN_DISMISS   : `keydown.dismiss${EVENT_KEY}`,\n  MOUSEUP_DISMISS   : `mouseup.dismiss${EVENT_KEY}`,\n  MOUSEDOWN_DISMISS : `mousedown.dismiss${EVENT_KEY}`,\n  CLICK_DATA_API    : `click${EVENT_KEY}${DATA_API_KEY}`\n}\n\nconst ClassName = {\n  SCROLLABLE         : 'modal-dialog-scrollable',\n  SCROLLBAR_MEASURER : 'modal-scrollbar-measure',\n  BACKDROP           : 'modal-backdrop',\n  OPEN               : 'modal-open',\n  FADE               : 'fade',\n  SHOW               : 'show',\n  STATIC             : 'modal-static'\n}\n\nconst Selector = {\n  DIALOG         : '.modal-dialog',\n  MODAL_BODY     : '.modal-body',\n  DATA_TOGGLE    : '[data-toggle=\"modal\"]',\n  DATA_DISMISS   : '[data-dismiss=\"modal\"]',\n  FIXED_CONTENT  : '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top',\n  STICKY_CONTENT : '.sticky-top'\n}\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass Modal {\n  constructor(element, config) {\n    this._config              = this._getConfig(config)\n    this._element             = element\n    this._dialog              = element.querySelector(Selector.DIALOG)\n    this._backdrop            = null\n    this._isShown             = false\n    this._isBodyOverflowing   = false\n    this._ignoreBackdropClick = false\n    this._isTransitioning     = false\n    this._scrollbarWidth      = 0\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  static get Default() {\n    return Default\n  }\n\n  // Public\n\n  toggle(relatedTarget) {\n    return this._isShown ? this.hide() : this.show(relatedTarget)\n  }\n\n  show(relatedTarget) {\n    if (this._isShown || this._isTransitioning) {\n      return\n    }\n\n    if ($(this._element).hasClass(ClassName.FADE)) {\n      this._isTransitioning = true\n    }\n\n    const showEvent = $.Event(Event.SHOW, {\n      relatedTarget\n    })\n\n    $(this._element).trigger(showEvent)\n\n    if (this._isShown || showEvent.isDefaultPrevented()) {\n      return\n    }\n\n    this._isShown = true\n\n    this._checkScrollbar()\n    this._setScrollbar()\n\n    this._adjustDialog()\n\n    this._setEscapeEvent()\n    this._setResizeEvent()\n\n    $(this._element).on(\n      Event.CLICK_DISMISS,\n      Selector.DATA_DISMISS,\n      (event) => this.hide(event)\n    )\n\n    $(this._dialog).on(Event.MOUSEDOWN_DISMISS, () => {\n      $(this._element).one(Event.MOUSEUP_DISMISS, (event) => {\n        if ($(event.target).is(this._element)) {\n          this._ignoreBackdropClick = true\n        }\n      })\n    })\n\n    this._showBackdrop(() => this._showElement(relatedTarget))\n  }\n\n  hide(event) {\n    if (event) {\n      event.preventDefault()\n    }\n\n    if (!this._isShown || this._isTransitioning) {\n      return\n    }\n\n    const hideEvent = $.Event(Event.HIDE)\n\n    $(this._element).trigger(hideEvent)\n\n    if (!this._isShown || hideEvent.isDefaultPrevented()) {\n      return\n    }\n\n    this._isShown = false\n    const transition = $(this._element).hasClass(ClassName.FADE)\n\n    if (transition) {\n      this._isTransitioning = true\n    }\n\n    this._setEscapeEvent()\n    this._setResizeEvent()\n\n    $(document).off(Event.FOCUSIN)\n\n    $(this._element).removeClass(ClassName.SHOW)\n\n    $(this._element).off(Event.CLICK_DISMISS)\n    $(this._dialog).off(Event.MOUSEDOWN_DISMISS)\n\n\n    if (transition) {\n      const transitionDuration  = Util.getTransitionDurationFromElement(this._element)\n\n      $(this._element)\n        .one(Util.TRANSITION_END, (event) => this._hideModal(event))\n        .emulateTransitionEnd(transitionDuration)\n    } else {\n      this._hideModal()\n    }\n  }\n\n  dispose() {\n    [window, this._element, this._dialog]\n      .forEach((htmlElement) => $(htmlElement).off(EVENT_KEY))\n\n    /**\n     * `document` has 2 events `Event.FOCUSIN` and `Event.CLICK_DATA_API`\n     * Do not move `document` in `htmlElements` array\n     * It will remove `Event.CLICK_DATA_API` event that should remain\n     */\n    $(document).off(Event.FOCUSIN)\n\n    $.removeData(this._element, DATA_KEY)\n\n    this._config              = null\n    this._element             = null\n    this._dialog              = null\n    this._backdrop            = null\n    this._isShown             = null\n    this._isBodyOverflowing   = null\n    this._ignoreBackdropClick = null\n    this._isTransitioning     = null\n    this._scrollbarWidth      = null\n  }\n\n  handleUpdate() {\n    this._adjustDialog()\n  }\n\n  // Private\n\n  _getConfig(config) {\n    config = {\n      ...Default,\n      ...config\n    }\n    Util.typeCheckConfig(NAME, config, DefaultType)\n    return config\n  }\n\n  _triggerBackdropTransition() {\n    if (this._config.backdrop === 'static') {\n      const hideEventPrevented = $.Event(Event.HIDE_PREVENTED)\n\n      $(this._element).trigger(hideEventPrevented)\n      if (hideEventPrevented.defaultPrevented) {\n        return\n      }\n\n      this._element.classList.add(ClassName.STATIC)\n\n      const modalTransitionDuration = Util.getTransitionDurationFromElement(this._element)\n\n      $(this._element).one(Util.TRANSITION_END, () => {\n        this._element.classList.remove(ClassName.STATIC)\n      })\n        .emulateTransitionEnd(modalTransitionDuration)\n      this._element.focus()\n    } else {\n      this.hide()\n    }\n  }\n\n  _showElement(relatedTarget) {\n    const transition = $(this._element).hasClass(ClassName.FADE)\n    const modalBody = this._dialog ? this._dialog.querySelector(Selector.MODAL_BODY) : null\n\n    if (!this._element.parentNode ||\n        this._element.parentNode.nodeType !== Node.ELEMENT_NODE) {\n      // Don't move modal's DOM position\n      document.body.appendChild(this._element)\n    }\n\n    this._element.style.display = 'block'\n    this._element.removeAttribute('aria-hidden')\n    this._element.setAttribute('aria-modal', true)\n\n    if ($(this._dialog).hasClass(ClassName.SCROLLABLE) && modalBody) {\n      modalBody.scrollTop = 0\n    } else {\n      this._element.scrollTop = 0\n    }\n\n    if (transition) {\n      Util.reflow(this._element)\n    }\n\n    $(this._element).addClass(ClassName.SHOW)\n\n    if (this._config.focus) {\n      this._enforceFocus()\n    }\n\n    const shownEvent = $.Event(Event.SHOWN, {\n      relatedTarget\n    })\n\n    const transitionComplete = () => {\n      if (this._config.focus) {\n        this._element.focus()\n      }\n      this._isTransitioning = false\n      $(this._element).trigger(shownEvent)\n    }\n\n    if (transition) {\n      const transitionDuration  = Util.getTransitionDurationFromElement(this._dialog)\n\n      $(this._dialog)\n        .one(Util.TRANSITION_END, transitionComplete)\n        .emulateTransitionEnd(transitionDuration)\n    } else {\n      transitionComplete()\n    }\n  }\n\n  _enforceFocus() {\n    $(document)\n      .off(Event.FOCUSIN) // Guard against infinite focus loop\n      .on(Event.FOCUSIN, (event) => {\n        if (document !== event.target &&\n            this._element !== event.target &&\n            $(this._element).has(event.target).length === 0) {\n          this._element.focus()\n        }\n      })\n  }\n\n  _setEscapeEvent() {\n    if (this._isShown && this._config.keyboard) {\n      $(this._element).on(Event.KEYDOWN_DISMISS, (event) => {\n        if (event.which === ESCAPE_KEYCODE) {\n          this._triggerBackdropTransition()\n        }\n      })\n    } else if (!this._isShown) {\n      $(this._element).off(Event.KEYDOWN_DISMISS)\n    }\n  }\n\n  _setResizeEvent() {\n    if (this._isShown) {\n      $(window).on(Event.RESIZE, (event) => this.handleUpdate(event))\n    } else {\n      $(window).off(Event.RESIZE)\n    }\n  }\n\n  _hideModal() {\n    this._element.style.display = 'none'\n    this._element.setAttribute('aria-hidden', true)\n    this._element.removeAttribute('aria-modal')\n    this._isTransitioning = false\n    this._showBackdrop(() => {\n      $(document.body).removeClass(ClassName.OPEN)\n      this._resetAdjustments()\n      this._resetScrollbar()\n      $(this._element).trigger(Event.HIDDEN)\n    })\n  }\n\n  _removeBackdrop() {\n    if (this._backdrop) {\n      $(this._backdrop).remove()\n      this._backdrop = null\n    }\n  }\n\n  _showBackdrop(callback) {\n    const animate = $(this._element).hasClass(ClassName.FADE)\n      ? ClassName.FADE : ''\n\n    if (this._isShown && this._config.backdrop) {\n      this._backdrop = document.createElement('div')\n      this._backdrop.className = ClassName.BACKDROP\n\n      if (animate) {\n        this._backdrop.classList.add(animate)\n      }\n\n      $(this._backdrop).appendTo(document.body)\n\n      $(this._element).on(Event.CLICK_DISMISS, (event) => {\n        if (this._ignoreBackdropClick) {\n          this._ignoreBackdropClick = false\n          return\n        }\n        if (event.target !== event.currentTarget) {\n          return\n        }\n\n        this._triggerBackdropTransition()\n      })\n\n      if (animate) {\n        Util.reflow(this._backdrop)\n      }\n\n      $(this._backdrop).addClass(ClassName.SHOW)\n\n      if (!callback) {\n        return\n      }\n\n      if (!animate) {\n        callback()\n        return\n      }\n\n      const backdropTransitionDuration = Util.getTransitionDurationFromElement(this._backdrop)\n\n      $(this._backdrop)\n        .one(Util.TRANSITION_END, callback)\n        .emulateTransitionEnd(backdropTransitionDuration)\n    } else if (!this._isShown && this._backdrop) {\n      $(this._backdrop).removeClass(ClassName.SHOW)\n\n      const callbackRemove = () => {\n        this._removeBackdrop()\n        if (callback) {\n          callback()\n        }\n      }\n\n      if ($(this._element).hasClass(ClassName.FADE)) {\n        const backdropTransitionDuration = Util.getTransitionDurationFromElement(this._backdrop)\n\n        $(this._backdrop)\n          .one(Util.TRANSITION_END, callbackRemove)\n          .emulateTransitionEnd(backdropTransitionDuration)\n      } else {\n        callbackRemove()\n      }\n    } else if (callback) {\n      callback()\n    }\n  }\n\n  // ----------------------------------------------------------------------\n  // the following methods are used to handle overflowing modals\n  // todo (fat): these should probably be refactored out of modal.js\n  // ----------------------------------------------------------------------\n\n  _adjustDialog() {\n    const isModalOverflowing =\n      this._element.scrollHeight > document.documentElement.clientHeight\n\n    if (!this._isBodyOverflowing && isModalOverflowing) {\n      this._element.style.paddingLeft = `${this._scrollbarWidth}px`\n    }\n\n    if (this._isBodyOverflowing && !isModalOverflowing) {\n      this._element.style.paddingRight = `${this._scrollbarWidth}px`\n    }\n  }\n\n  _resetAdjustments() {\n    this._element.style.paddingLeft = ''\n    this._element.style.paddingRight = ''\n  }\n\n  _checkScrollbar() {\n    const rect = document.body.getBoundingClientRect()\n    this._isBodyOverflowing = rect.left + rect.right < window.innerWidth\n    this._scrollbarWidth = this._getScrollbarWidth()\n  }\n\n  _setScrollbar() {\n    if (this._isBodyOverflowing) {\n      // Note: DOMNode.style.paddingRight returns the actual value or '' if not set\n      //   while $(DOMNode).css('padding-right') returns the calculated value or 0 if not set\n      const fixedContent = [].slice.call(document.querySelectorAll(Selector.FIXED_CONTENT))\n      const stickyContent = [].slice.call(document.querySelectorAll(Selector.STICKY_CONTENT))\n\n      // Adjust fixed content padding\n      $(fixedContent).each((index, element) => {\n        const actualPadding = element.style.paddingRight\n        const calculatedPadding = $(element).css('padding-right')\n        $(element)\n          .data('padding-right', actualPadding)\n          .css('padding-right', `${parseFloat(calculatedPadding) + this._scrollbarWidth}px`)\n      })\n\n      // Adjust sticky content margin\n      $(stickyContent).each((index, element) => {\n        const actualMargin = element.style.marginRight\n        const calculatedMargin = $(element).css('margin-right')\n        $(element)\n          .data('margin-right', actualMargin)\n          .css('margin-right', `${parseFloat(calculatedMargin) - this._scrollbarWidth}px`)\n      })\n\n      // Adjust body padding\n      const actualPadding = document.body.style.paddingRight\n      const calculatedPadding = $(document.body).css('padding-right')\n      $(document.body)\n        .data('padding-right', actualPadding)\n        .css('padding-right', `${parseFloat(calculatedPadding) + this._scrollbarWidth}px`)\n    }\n\n    $(document.body).addClass(ClassName.OPEN)\n  }\n\n  _resetScrollbar() {\n    // Restore fixed content padding\n    const fixedContent = [].slice.call(document.querySelectorAll(Selector.FIXED_CONTENT))\n    $(fixedContent).each((index, element) => {\n      const padding = $(element).data('padding-right')\n      $(element).removeData('padding-right')\n      element.style.paddingRight = padding ? padding : ''\n    })\n\n    // Restore sticky content\n    const elements = [].slice.call(document.querySelectorAll(`${Selector.STICKY_CONTENT}`))\n    $(elements).each((index, element) => {\n      const margin = $(element).data('margin-right')\n      if (typeof margin !== 'undefined') {\n        $(element).css('margin-right', margin).removeData('margin-right')\n      }\n    })\n\n    // Restore body padding\n    const padding = $(document.body).data('padding-right')\n    $(document.body).removeData('padding-right')\n    document.body.style.paddingRight = padding ? padding : ''\n  }\n\n  _getScrollbarWidth() { // thx d.walsh\n    const scrollDiv = document.createElement('div')\n    scrollDiv.className = ClassName.SCROLLBAR_MEASURER\n    document.body.appendChild(scrollDiv)\n    const scrollbarWidth = scrollDiv.getBoundingClientRect().width - scrollDiv.clientWidth\n    document.body.removeChild(scrollDiv)\n    return scrollbarWidth\n  }\n\n  // Static\n\n  static _jQueryInterface(config, relatedTarget) {\n    return this.each(function () {\n      let data = $(this).data(DATA_KEY)\n      const _config = {\n        ...Default,\n        ...$(this).data(),\n        ...typeof config === 'object' && config ? config : {}\n      }\n\n      if (!data) {\n        data = new Modal(this, _config)\n        $(this).data(DATA_KEY, data)\n      }\n\n      if (typeof config === 'string') {\n        if (typeof data[config] === 'undefined') {\n          throw new TypeError(`No method named \"${config}\"`)\n        }\n        data[config](relatedTarget)\n      } else if (_config.show) {\n        data.show(relatedTarget)\n      }\n    })\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * Data Api implementation\n * ------------------------------------------------------------------------\n */\n\n$(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {\n  let target\n  const selector = Util.getSelectorFromElement(this)\n\n  if (selector) {\n    target = document.querySelector(selector)\n  }\n\n  const config = $(target).data(DATA_KEY)\n    ? 'toggle' : {\n      ...$(target).data(),\n      ...$(this).data()\n    }\n\n  if (this.tagName === 'A' || this.tagName === 'AREA') {\n    event.preventDefault()\n  }\n\n  const $target = $(target).one(Event.SHOW, (showEvent) => {\n    if (showEvent.isDefaultPrevented()) {\n      // Only register focus restorer if modal will actually get shown\n      return\n    }\n\n    $target.one(Event.HIDDEN, () => {\n      if ($(this).is(':visible')) {\n        this.focus()\n      }\n    })\n  })\n\n  Modal._jQueryInterface.call($(target), config, this)\n})\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME] = Modal._jQueryInterface\n$.fn[NAME].Constructor = Modal\n$.fn[NAME].noConflict = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Modal._jQueryInterface\n}\n\nexport default Modal\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.4.1): tools/sanitizer.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nconst uriAttrs = [\n  'background',\n  'cite',\n  'href',\n  'itemtype',\n  'longdesc',\n  'poster',\n  'src',\n  'xlink:href'\n]\n\nconst ARIA_ATTRIBUTE_PATTERN = /^aria-[\\w-]*$/i\n\nexport const DefaultWhitelist = {\n  // Global attributes allowed on any supplied element below.\n  '*': ['class', 'dir', 'id', 'lang', 'role', ARIA_ATTRIBUTE_PATTERN],\n  a: ['target', 'href', 'title', 'rel'],\n  area: [],\n  b: [],\n  br: [],\n  col: [],\n  code: [],\n  div: [],\n  em: [],\n  hr: [],\n  h1: [],\n  h2: [],\n  h3: [],\n  h4: [],\n  h5: [],\n  h6: [],\n  i: [],\n  img: ['src', 'alt', 'title', 'width', 'height'],\n  li: [],\n  ol: [],\n  p: [],\n  pre: [],\n  s: [],\n  small: [],\n  span: [],\n  sub: [],\n  sup: [],\n  strong: [],\n  u: [],\n  ul: []\n}\n\n/**\n * A pattern that recognizes a commonly useful subset of URLs that are safe.\n *\n * Shoutout to Angular 7 https://github.com/angular/angular/blob/7.2.4/packages/core/src/sanitization/url_sanitizer.ts\n */\nconst SAFE_URL_PATTERN = /^(?:(?:https?|mailto|ftp|tel|file):|[^&:/?#]*(?:[/?#]|$))/gi\n\n/**\n * A pattern that matches safe data URLs. Only matches image, video and audio types.\n *\n * Shoutout to Angular 7 https://github.com/angular/angular/blob/7.2.4/packages/core/src/sanitization/url_sanitizer.ts\n */\nconst DATA_URL_PATTERN = /^data:(?:image\\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\\/(?:mpeg|mp4|ogg|webm)|audio\\/(?:mp3|oga|ogg|opus));base64,[a-z0-9+/]+=*$/i\n\nfunction allowedAttribute(attr, allowedAttributeList) {\n  const attrName = attr.nodeName.toLowerCase()\n\n  if (allowedAttributeList.indexOf(attrName) !== -1) {\n    if (uriAttrs.indexOf(attrName) !== -1) {\n      return Boolean(attr.nodeValue.match(SAFE_URL_PATTERN) || attr.nodeValue.match(DATA_URL_PATTERN))\n    }\n\n    return true\n  }\n\n  const regExp = allowedAttributeList.filter((attrRegex) => attrRegex instanceof RegExp)\n\n  // Check if a regular expression validates the attribute.\n  for (let i = 0, l = regExp.length; i < l; i++) {\n    if (attrName.match(regExp[i])) {\n      return true\n    }\n  }\n\n  return false\n}\n\nexport function sanitizeHtml(unsafeHtml, whiteList, sanitizeFn) {\n  if (unsafeHtml.length === 0) {\n    return unsafeHtml\n  }\n\n  if (sanitizeFn && typeof sanitizeFn === 'function') {\n    return sanitizeFn(unsafeHtml)\n  }\n\n  const domParser = new window.DOMParser()\n  const createdDocument = domParser.parseFromString(unsafeHtml, 'text/html')\n  const whitelistKeys = Object.keys(whiteList)\n  const elements = [].slice.call(createdDocument.body.querySelectorAll('*'))\n\n  for (let i = 0, len = elements.length; i < len; i++) {\n    const el = elements[i]\n    const elName = el.nodeName.toLowerCase()\n\n    if (whitelistKeys.indexOf(el.nodeName.toLowerCase()) === -1) {\n      el.parentNode.removeChild(el)\n\n      continue\n    }\n\n    const attributeList = [].slice.call(el.attributes)\n    const whitelistedAttributes = [].concat(whiteList['*'] || [], whiteList[elName] || [])\n\n    attributeList.forEach((attr) => {\n      if (!allowedAttribute(attr, whitelistedAttributes)) {\n        el.removeAttribute(attr.nodeName)\n      }\n    })\n  }\n\n  return createdDocument.body.innerHTML\n}\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.4.1): tooltip.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport {\n  DefaultWhitelist,\n  sanitizeHtml\n} from './tools/sanitizer'\nimport $ from 'jquery'\nimport Popper from 'popper.js'\nimport Util from './util'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME                  = 'tooltip'\nconst VERSION               = '4.4.1'\nconst DATA_KEY              = 'bs.tooltip'\nconst EVENT_KEY             = `.${DATA_KEY}`\nconst JQUERY_NO_CONFLICT    = $.fn[NAME]\nconst CLASS_PREFIX          = 'bs-tooltip'\nconst BSCLS_PREFIX_REGEX    = new RegExp(`(^|\\\\s)${CLASS_PREFIX}\\\\S+`, 'g')\nconst DISALLOWED_ATTRIBUTES = ['sanitize', 'whiteList', 'sanitizeFn']\n\nconst DefaultType = {\n  animation         : 'boolean',\n  template          : 'string',\n  title             : '(string|element|function)',\n  trigger           : 'string',\n  delay             : '(number|object)',\n  html              : 'boolean',\n  selector          : '(string|boolean)',\n  placement         : '(string|function)',\n  offset            : '(number|string|function)',\n  container         : '(string|element|boolean)',\n  fallbackPlacement : '(string|array)',\n  boundary          : '(string|element)',\n  sanitize          : 'boolean',\n  sanitizeFn        : '(null|function)',\n  whiteList         : 'object',\n  popperConfig      : '(null|object)'\n}\n\nconst AttachmentMap = {\n  AUTO   : 'auto',\n  TOP    : 'top',\n  RIGHT  : 'right',\n  BOTTOM : 'bottom',\n  LEFT   : 'left'\n}\n\nconst Default = {\n  animation         : true,\n  template          : '<div class=\"tooltip\" role=\"tooltip\">' +\n                    '<div class=\"arrow\"></div>' +\n                    '<div class=\"tooltip-inner\"></div></div>',\n  trigger           : 'hover focus',\n  title             : '',\n  delay             : 0,\n  html              : false,\n  selector          : false,\n  placement         : 'top',\n  offset            : 0,\n  container         : false,\n  fallbackPlacement : 'flip',\n  boundary          : 'scrollParent',\n  sanitize          : true,\n  sanitizeFn        : null,\n  whiteList         : DefaultWhitelist,\n  popperConfig      : null\n}\n\nconst HoverState = {\n  SHOW : 'show',\n  OUT  : 'out'\n}\n\nconst Event = {\n  HIDE       : `hide${EVENT_KEY}`,\n  HIDDEN     : `hidden${EVENT_KEY}`,\n  SHOW       : `show${EVENT_KEY}`,\n  SHOWN      : `shown${EVENT_KEY}`,\n  INSERTED   : `inserted${EVENT_KEY}`,\n  CLICK      : `click${EVENT_KEY}`,\n  FOCUSIN    : `focusin${EVENT_KEY}`,\n  FOCUSOUT   : `focusout${EVENT_KEY}`,\n  MOUSEENTER : `mouseenter${EVENT_KEY}`,\n  MOUSELEAVE : `mouseleave${EVENT_KEY}`\n}\n\nconst ClassName = {\n  FADE : 'fade',\n  SHOW : 'show'\n}\n\nconst Selector = {\n  TOOLTIP       : '.tooltip',\n  TOOLTIP_INNER : '.tooltip-inner',\n  ARROW         : '.arrow'\n}\n\nconst Trigger = {\n  HOVER  : 'hover',\n  FOCUS  : 'focus',\n  CLICK  : 'click',\n  MANUAL : 'manual'\n}\n\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass Tooltip {\n  constructor(element, config) {\n    if (typeof Popper === 'undefined') {\n      throw new TypeError('Bootstrap\\'s tooltips require Popper.js (https://popper.js.org/)')\n    }\n\n    // private\n    this._isEnabled     = true\n    this._timeout       = 0\n    this._hoverState    = ''\n    this._activeTrigger = {}\n    this._popper        = null\n\n    // Protected\n    this.element = element\n    this.config  = this._getConfig(config)\n    this.tip     = null\n\n    this._setListeners()\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  static get Default() {\n    return Default\n  }\n\n  static get NAME() {\n    return NAME\n  }\n\n  static get DATA_KEY() {\n    return DATA_KEY\n  }\n\n  static get Event() {\n    return Event\n  }\n\n  static get EVENT_KEY() {\n    return EVENT_KEY\n  }\n\n  static get DefaultType() {\n    return DefaultType\n  }\n\n  // Public\n\n  enable() {\n    this._isEnabled = true\n  }\n\n  disable() {\n    this._isEnabled = false\n  }\n\n  toggleEnabled() {\n    this._isEnabled = !this._isEnabled\n  }\n\n  toggle(event) {\n    if (!this._isEnabled) {\n      return\n    }\n\n    if (event) {\n      const dataKey = this.constructor.DATA_KEY\n      let context = $(event.currentTarget).data(dataKey)\n\n      if (!context) {\n        context = new this.constructor(\n          event.currentTarget,\n          this._getDelegateConfig()\n        )\n        $(event.currentTarget).data(dataKey, context)\n      }\n\n      context._activeTrigger.click = !context._activeTrigger.click\n\n      if (context._isWithActiveTrigger()) {\n        context._enter(null, context)\n      } else {\n        context._leave(null, context)\n      }\n    } else {\n      if ($(this.getTipElement()).hasClass(ClassName.SHOW)) {\n        this._leave(null, this)\n        return\n      }\n\n      this._enter(null, this)\n    }\n  }\n\n  dispose() {\n    clearTimeout(this._timeout)\n\n    $.removeData(this.element, this.constructor.DATA_KEY)\n\n    $(this.element).off(this.constructor.EVENT_KEY)\n    $(this.element).closest('.modal').off('hide.bs.modal', this._hideModalHandler)\n\n    if (this.tip) {\n      $(this.tip).remove()\n    }\n\n    this._isEnabled     = null\n    this._timeout       = null\n    this._hoverState    = null\n    this._activeTrigger = null\n    if (this._popper) {\n      this._popper.destroy()\n    }\n\n    this._popper = null\n    this.element = null\n    this.config  = null\n    this.tip     = null\n  }\n\n  show() {\n    if ($(this.element).css('display') === 'none') {\n      throw new Error('Please use show on visible elements')\n    }\n\n    const showEvent = $.Event(this.constructor.Event.SHOW)\n    if (this.isWithContent() && this._isEnabled) {\n      $(this.element).trigger(showEvent)\n\n      const shadowRoot = Util.findShadowRoot(this.element)\n      const isInTheDom = $.contains(\n        shadowRoot !== null ? shadowRoot : this.element.ownerDocument.documentElement,\n        this.element\n      )\n\n      if (showEvent.isDefaultPrevented() || !isInTheDom) {\n        return\n      }\n\n      const tip   = this.getTipElement()\n      const tipId = Util.getUID(this.constructor.NAME)\n\n      tip.setAttribute('id', tipId)\n      this.element.setAttribute('aria-describedby', tipId)\n\n      this.setContent()\n\n      if (this.config.animation) {\n        $(tip).addClass(ClassName.FADE)\n      }\n\n      const placement  = typeof this.config.placement === 'function'\n        ? this.config.placement.call(this, tip, this.element)\n        : this.config.placement\n\n      const attachment = this._getAttachment(placement)\n      this.addAttachmentClass(attachment)\n\n      const container = this._getContainer()\n      $(tip).data(this.constructor.DATA_KEY, this)\n\n      if (!$.contains(this.element.ownerDocument.documentElement, this.tip)) {\n        $(tip).appendTo(container)\n      }\n\n      $(this.element).trigger(this.constructor.Event.INSERTED)\n\n      this._popper = new Popper(this.element, tip, this._getPopperConfig(attachment))\n\n      $(tip).addClass(ClassName.SHOW)\n\n      // If this is a touch-enabled device we add extra\n      // empty mouseover listeners to the body's immediate children;\n      // only needed because of broken event delegation on iOS\n      // https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html\n      if ('ontouchstart' in document.documentElement) {\n        $(document.body).children().on('mouseover', null, $.noop)\n      }\n\n      const complete = () => {\n        if (this.config.animation) {\n          this._fixTransition()\n        }\n        const prevHoverState = this._hoverState\n        this._hoverState     = null\n\n        $(this.element).trigger(this.constructor.Event.SHOWN)\n\n        if (prevHoverState === HoverState.OUT) {\n          this._leave(null, this)\n        }\n      }\n\n      if ($(this.tip).hasClass(ClassName.FADE)) {\n        const transitionDuration = Util.getTransitionDurationFromElement(this.tip)\n\n        $(this.tip)\n          .one(Util.TRANSITION_END, complete)\n          .emulateTransitionEnd(transitionDuration)\n      } else {\n        complete()\n      }\n    }\n  }\n\n  hide(callback) {\n    const tip       = this.getTipElement()\n    const hideEvent = $.Event(this.constructor.Event.HIDE)\n    const complete = () => {\n      if (this._hoverState !== HoverState.SHOW && tip.parentNode) {\n        tip.parentNode.removeChild(tip)\n      }\n\n      this._cleanTipClass()\n      this.element.removeAttribute('aria-describedby')\n      $(this.element).trigger(this.constructor.Event.HIDDEN)\n      if (this._popper !== null) {\n        this._popper.destroy()\n      }\n\n      if (callback) {\n        callback()\n      }\n    }\n\n    $(this.element).trigger(hideEvent)\n\n    if (hideEvent.isDefaultPrevented()) {\n      return\n    }\n\n    $(tip).removeClass(ClassName.SHOW)\n\n    // If this is a touch-enabled device we remove the extra\n    // empty mouseover listeners we added for iOS support\n    if ('ontouchstart' in document.documentElement) {\n      $(document.body).children().off('mouseover', null, $.noop)\n    }\n\n    this._activeTrigger[Trigger.CLICK] = false\n    this._activeTrigger[Trigger.FOCUS] = false\n    this._activeTrigger[Trigger.HOVER] = false\n\n    if ($(this.tip).hasClass(ClassName.FADE)) {\n      const transitionDuration = Util.getTransitionDurationFromElement(tip)\n\n      $(tip)\n        .one(Util.TRANSITION_END, complete)\n        .emulateTransitionEnd(transitionDuration)\n    } else {\n      complete()\n    }\n\n    this._hoverState = ''\n  }\n\n  update() {\n    if (this._popper !== null) {\n      this._popper.scheduleUpdate()\n    }\n  }\n\n  // Protected\n\n  isWithContent() {\n    return Boolean(this.getTitle())\n  }\n\n  addAttachmentClass(attachment) {\n    $(this.getTipElement()).addClass(`${CLASS_PREFIX}-${attachment}`)\n  }\n\n  getTipElement() {\n    this.tip = this.tip || $(this.config.template)[0]\n    return this.tip\n  }\n\n  setContent() {\n    const tip = this.getTipElement()\n    this.setElementContent($(tip.querySelectorAll(Selector.TOOLTIP_INNER)), this.getTitle())\n    $(tip).removeClass(`${ClassName.FADE} ${ClassName.SHOW}`)\n  }\n\n  setElementContent($element, content) {\n    if (typeof content === 'object' && (content.nodeType || content.jquery)) {\n      // Content is a DOM node or a jQuery\n      if (this.config.html) {\n        if (!$(content).parent().is($element)) {\n          $element.empty().append(content)\n        }\n      } else {\n        $element.text($(content).text())\n      }\n\n      return\n    }\n\n    if (this.config.html) {\n      if (this.config.sanitize) {\n        content = sanitizeHtml(content, this.config.whiteList, this.config.sanitizeFn)\n      }\n\n      $element.html(content)\n    } else {\n      $element.text(content)\n    }\n  }\n\n  getTitle() {\n    let title = this.element.getAttribute('data-original-title')\n\n    if (!title) {\n      title = typeof this.config.title === 'function'\n        ? this.config.title.call(this.element)\n        : this.config.title\n    }\n\n    return title\n  }\n\n  // Private\n\n  _getPopperConfig(attachment) {\n    const defaultBsConfig = {\n      placement: attachment,\n      modifiers: {\n        offset: this._getOffset(),\n        flip: {\n          behavior: this.config.fallbackPlacement\n        },\n        arrow: {\n          element: Selector.ARROW\n        },\n        preventOverflow: {\n          boundariesElement: this.config.boundary\n        }\n      },\n      onCreate: (data) => {\n        if (data.originalPlacement !== data.placement) {\n          this._handlePopperPlacementChange(data)\n        }\n      },\n      onUpdate: (data) => this._handlePopperPlacementChange(data)\n    }\n\n    return {\n      ...defaultBsConfig,\n      ...this.config.popperConfig\n    }\n  }\n\n  _getOffset() {\n    const offset = {}\n\n    if (typeof this.config.offset === 'function') {\n      offset.fn = (data) => {\n        data.offsets = {\n          ...data.offsets,\n          ...this.config.offset(data.offsets, this.element) || {}\n        }\n\n        return data\n      }\n    } else {\n      offset.offset = this.config.offset\n    }\n\n    return offset\n  }\n\n  _getContainer() {\n    if (this.config.container === false) {\n      return document.body\n    }\n\n    if (Util.isElement(this.config.container)) {\n      return $(this.config.container)\n    }\n\n    return $(document).find(this.config.container)\n  }\n\n  _getAttachment(placement) {\n    return AttachmentMap[placement.toUpperCase()]\n  }\n\n  _setListeners() {\n    const triggers = this.config.trigger.split(' ')\n\n    triggers.forEach((trigger) => {\n      if (trigger === 'click') {\n        $(this.element).on(\n          this.constructor.Event.CLICK,\n          this.config.selector,\n          (event) => this.toggle(event)\n        )\n      } else if (trigger !== Trigger.MANUAL) {\n        const eventIn = trigger === Trigger.HOVER\n          ? this.constructor.Event.MOUSEENTER\n          : this.constructor.Event.FOCUSIN\n        const eventOut = trigger === Trigger.HOVER\n          ? this.constructor.Event.MOUSELEAVE\n          : this.constructor.Event.FOCUSOUT\n\n        $(this.element)\n          .on(\n            eventIn,\n            this.config.selector,\n            (event) => this._enter(event)\n          )\n          .on(\n            eventOut,\n            this.config.selector,\n            (event) => this._leave(event)\n          )\n      }\n    })\n\n    this._hideModalHandler = () => {\n      if (this.element) {\n        this.hide()\n      }\n    }\n\n    $(this.element).closest('.modal').on(\n      'hide.bs.modal',\n      this._hideModalHandler\n    )\n\n    if (this.config.selector) {\n      this.config = {\n        ...this.config,\n        trigger: 'manual',\n        selector: ''\n      }\n    } else {\n      this._fixTitle()\n    }\n  }\n\n  _fixTitle() {\n    const titleType = typeof this.element.getAttribute('data-original-title')\n\n    if (this.element.getAttribute('title') || titleType !== 'string') {\n      this.element.setAttribute(\n        'data-original-title',\n        this.element.getAttribute('title') || ''\n      )\n\n      this.element.setAttribute('title', '')\n    }\n  }\n\n  _enter(event, context) {\n    const dataKey = this.constructor.DATA_KEY\n    context = context || $(event.currentTarget).data(dataKey)\n\n    if (!context) {\n      context = new this.constructor(\n        event.currentTarget,\n        this._getDelegateConfig()\n      )\n      $(event.currentTarget).data(dataKey, context)\n    }\n\n    if (event) {\n      context._activeTrigger[\n        event.type === 'focusin' ? Trigger.FOCUS : Trigger.HOVER\n      ] = true\n    }\n\n    if ($(context.getTipElement()).hasClass(ClassName.SHOW) || context._hoverState === HoverState.SHOW) {\n      context._hoverState = HoverState.SHOW\n      return\n    }\n\n    clearTimeout(context._timeout)\n\n    context._hoverState = HoverState.SHOW\n\n    if (!context.config.delay || !context.config.delay.show) {\n      context.show()\n      return\n    }\n\n    context._timeout = setTimeout(() => {\n      if (context._hoverState === HoverState.SHOW) {\n        context.show()\n      }\n    }, context.config.delay.show)\n  }\n\n  _leave(event, context) {\n    const dataKey = this.constructor.DATA_KEY\n    context = context || $(event.currentTarget).data(dataKey)\n\n    if (!context) {\n      context = new this.constructor(\n        event.currentTarget,\n        this._getDelegateConfig()\n      )\n      $(event.currentTarget).data(dataKey, context)\n    }\n\n    if (event) {\n      context._activeTrigger[\n        event.type === 'focusout' ? Trigger.FOCUS : Trigger.HOVER\n      ] = false\n    }\n\n    if (context._isWithActiveTrigger()) {\n      return\n    }\n\n    clearTimeout(context._timeout)\n\n    context._hoverState = HoverState.OUT\n\n    if (!context.config.delay || !context.config.delay.hide) {\n      context.hide()\n      return\n    }\n\n    context._timeout = setTimeout(() => {\n      if (context._hoverState === HoverState.OUT) {\n        context.hide()\n      }\n    }, context.config.delay.hide)\n  }\n\n  _isWithActiveTrigger() {\n    for (const trigger in this._activeTrigger) {\n      if (this._activeTrigger[trigger]) {\n        return true\n      }\n    }\n\n    return false\n  }\n\n  _getConfig(config) {\n    const dataAttributes = $(this.element).data()\n\n    Object.keys(dataAttributes)\n      .forEach((dataAttr) => {\n        if (DISALLOWED_ATTRIBUTES.indexOf(dataAttr) !== -1) {\n          delete dataAttributes[dataAttr]\n        }\n      })\n\n    config = {\n      ...this.constructor.Default,\n      ...dataAttributes,\n      ...typeof config === 'object' && config ? config : {}\n    }\n\n    if (typeof config.delay === 'number') {\n      config.delay = {\n        show: config.delay,\n        hide: config.delay\n      }\n    }\n\n    if (typeof config.title === 'number') {\n      config.title = config.title.toString()\n    }\n\n    if (typeof config.content === 'number') {\n      config.content = config.content.toString()\n    }\n\n    Util.typeCheckConfig(\n      NAME,\n      config,\n      this.constructor.DefaultType\n    )\n\n    if (config.sanitize) {\n      config.template = sanitizeHtml(config.template, config.whiteList, config.sanitizeFn)\n    }\n\n    return config\n  }\n\n  _getDelegateConfig() {\n    const config = {}\n\n    if (this.config) {\n      for (const key in this.config) {\n        if (this.constructor.Default[key] !== this.config[key]) {\n          config[key] = this.config[key]\n        }\n      }\n    }\n\n    return config\n  }\n\n  _cleanTipClass() {\n    const $tip = $(this.getTipElement())\n    const tabClass = $tip.attr('class').match(BSCLS_PREFIX_REGEX)\n    if (tabClass !== null && tabClass.length) {\n      $tip.removeClass(tabClass.join(''))\n    }\n  }\n\n  _handlePopperPlacementChange(popperData) {\n    const popperInstance = popperData.instance\n    this.tip = popperInstance.popper\n    this._cleanTipClass()\n    this.addAttachmentClass(this._getAttachment(popperData.placement))\n  }\n\n  _fixTransition() {\n    const tip = this.getTipElement()\n    const initConfigAnimation = this.config.animation\n\n    if (tip.getAttribute('x-placement') !== null) {\n      return\n    }\n\n    $(tip).removeClass(ClassName.FADE)\n    this.config.animation = false\n    this.hide()\n    this.show()\n    this.config.animation = initConfigAnimation\n  }\n\n  // Static\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      let data = $(this).data(DATA_KEY)\n      const _config = typeof config === 'object' && config\n\n      if (!data && /dispose|hide/.test(config)) {\n        return\n      }\n\n      if (!data) {\n        data = new Tooltip(this, _config)\n        $(this).data(DATA_KEY, data)\n      }\n\n      if (typeof config === 'string') {\n        if (typeof data[config] === 'undefined') {\n          throw new TypeError(`No method named \"${config}\"`)\n        }\n        data[config]()\n      }\n    })\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME] = Tooltip._jQueryInterface\n$.fn[NAME].Constructor = Tooltip\n$.fn[NAME].noConflict = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Tooltip._jQueryInterface\n}\n\nexport default Tooltip\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.4.1): popover.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\nimport Tooltip from './tooltip'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME                = 'popover'\nconst VERSION             = '4.4.1'\nconst DATA_KEY            = 'bs.popover'\nconst EVENT_KEY           = `.${DATA_KEY}`\nconst JQUERY_NO_CONFLICT  = $.fn[NAME]\nconst CLASS_PREFIX        = 'bs-popover'\nconst BSCLS_PREFIX_REGEX  = new RegExp(`(^|\\\\s)${CLASS_PREFIX}\\\\S+`, 'g')\n\nconst Default = {\n  ...Tooltip.Default,\n  placement : 'right',\n  trigger   : 'click',\n  content   : '',\n  template  : '<div class=\"popover\" role=\"tooltip\">' +\n              '<div class=\"arrow\"></div>' +\n              '<h3 class=\"popover-header\"></h3>' +\n              '<div class=\"popover-body\"></div></div>'\n}\n\nconst DefaultType = {\n  ...Tooltip.DefaultType,\n  content : '(string|element|function)'\n}\n\nconst ClassName = {\n  FADE : 'fade',\n  SHOW : 'show'\n}\n\nconst Selector = {\n  TITLE   : '.popover-header',\n  CONTENT : '.popover-body'\n}\n\nconst Event = {\n  HIDE       : `hide${EVENT_KEY}`,\n  HIDDEN     : `hidden${EVENT_KEY}`,\n  SHOW       : `show${EVENT_KEY}`,\n  SHOWN      : `shown${EVENT_KEY}`,\n  INSERTED   : `inserted${EVENT_KEY}`,\n  CLICK      : `click${EVENT_KEY}`,\n  FOCUSIN    : `focusin${EVENT_KEY}`,\n  FOCUSOUT   : `focusout${EVENT_KEY}`,\n  MOUSEENTER : `mouseenter${EVENT_KEY}`,\n  MOUSELEAVE : `mouseleave${EVENT_KEY}`\n}\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass Popover extends Tooltip {\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  static get Default() {\n    return Default\n  }\n\n  static get NAME() {\n    return NAME\n  }\n\n  static get DATA_KEY() {\n    return DATA_KEY\n  }\n\n  static get Event() {\n    return Event\n  }\n\n  static get EVENT_KEY() {\n    return EVENT_KEY\n  }\n\n  static get DefaultType() {\n    return DefaultType\n  }\n\n  // Overrides\n\n  isWithContent() {\n    return this.getTitle() || this._getContent()\n  }\n\n  addAttachmentClass(attachment) {\n    $(this.getTipElement()).addClass(`${CLASS_PREFIX}-${attachment}`)\n  }\n\n  getTipElement() {\n    this.tip = this.tip || $(this.config.template)[0]\n    return this.tip\n  }\n\n  setContent() {\n    const $tip = $(this.getTipElement())\n\n    // We use append for html objects to maintain js events\n    this.setElementContent($tip.find(Selector.TITLE), this.getTitle())\n    let content = this._getContent()\n    if (typeof content === 'function') {\n      content = content.call(this.element)\n    }\n    this.setElementContent($tip.find(Selector.CONTENT), content)\n\n    $tip.removeClass(`${ClassName.FADE} ${ClassName.SHOW}`)\n  }\n\n  // Private\n\n  _getContent() {\n    return this.element.getAttribute('data-content') ||\n      this.config.content\n  }\n\n  _cleanTipClass() {\n    const $tip = $(this.getTipElement())\n    const tabClass = $tip.attr('class').match(BSCLS_PREFIX_REGEX)\n    if (tabClass !== null && tabClass.length > 0) {\n      $tip.removeClass(tabClass.join(''))\n    }\n  }\n\n  // Static\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      let data = $(this).data(DATA_KEY)\n      const _config = typeof config === 'object' ? config : null\n\n      if (!data && /dispose|hide/.test(config)) {\n        return\n      }\n\n      if (!data) {\n        data = new Popover(this, _config)\n        $(this).data(DATA_KEY, data)\n      }\n\n      if (typeof config === 'string') {\n        if (typeof data[config] === 'undefined') {\n          throw new TypeError(`No method named \"${config}\"`)\n        }\n        data[config]()\n      }\n    })\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME] = Popover._jQueryInterface\n$.fn[NAME].Constructor = Popover\n$.fn[NAME].noConflict = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Popover._jQueryInterface\n}\n\nexport default Popover\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.4.1): scrollspy.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\nimport Util from './util'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME               = 'scrollspy'\nconst VERSION            = '4.4.1'\nconst DATA_KEY           = 'bs.scrollspy'\nconst EVENT_KEY          = `.${DATA_KEY}`\nconst DATA_API_KEY       = '.data-api'\nconst JQUERY_NO_CONFLICT = $.fn[NAME]\n\nconst Default = {\n  offset : 10,\n  method : 'auto',\n  target : ''\n}\n\nconst DefaultType = {\n  offset : 'number',\n  method : 'string',\n  target : '(string|element)'\n}\n\nconst Event = {\n  ACTIVATE      : `activate${EVENT_KEY}`,\n  SCROLL        : `scroll${EVENT_KEY}`,\n  LOAD_DATA_API : `load${EVENT_KEY}${DATA_API_KEY}`\n}\n\nconst ClassName = {\n  DROPDOWN_ITEM : 'dropdown-item',\n  DROPDOWN_MENU : 'dropdown-menu',\n  ACTIVE        : 'active'\n}\n\nconst Selector = {\n  DATA_SPY        : '[data-spy=\"scroll\"]',\n  ACTIVE          : '.active',\n  NAV_LIST_GROUP  : '.nav, .list-group',\n  NAV_LINKS       : '.nav-link',\n  NAV_ITEMS       : '.nav-item',\n  LIST_ITEMS      : '.list-group-item',\n  DROPDOWN        : '.dropdown',\n  DROPDOWN_ITEMS  : '.dropdown-item',\n  DROPDOWN_TOGGLE : '.dropdown-toggle'\n}\n\nconst OffsetMethod = {\n  OFFSET   : 'offset',\n  POSITION : 'position'\n}\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass ScrollSpy {\n  constructor(element, config) {\n    this._element       = element\n    this._scrollElement = element.tagName === 'BODY' ? window : element\n    this._config        = this._getConfig(config)\n    this._selector      = `${this._config.target} ${Selector.NAV_LINKS},` +\n                          `${this._config.target} ${Selector.LIST_ITEMS},` +\n                          `${this._config.target} ${Selector.DROPDOWN_ITEMS}`\n    this._offsets       = []\n    this._targets       = []\n    this._activeTarget  = null\n    this._scrollHeight  = 0\n\n    $(this._scrollElement).on(Event.SCROLL, (event) => this._process(event))\n\n    this.refresh()\n    this._process()\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  static get Default() {\n    return Default\n  }\n\n  // Public\n\n  refresh() {\n    const autoMethod = this._scrollElement === this._scrollElement.window\n      ? OffsetMethod.OFFSET : OffsetMethod.POSITION\n\n    const offsetMethod = this._config.method === 'auto'\n      ? autoMethod : this._config.method\n\n    const offsetBase = offsetMethod === OffsetMethod.POSITION\n      ? this._getScrollTop() : 0\n\n    this._offsets = []\n    this._targets = []\n\n    this._scrollHeight = this._getScrollHeight()\n\n    const targets = [].slice.call(document.querySelectorAll(this._selector))\n\n    targets\n      .map((element) => {\n        let target\n        const targetSelector = Util.getSelectorFromElement(element)\n\n        if (targetSelector) {\n          target = document.querySelector(targetSelector)\n        }\n\n        if (target) {\n          const targetBCR = target.getBoundingClientRect()\n          if (targetBCR.width || targetBCR.height) {\n            // TODO (fat): remove sketch reliance on jQuery position/offset\n            return [\n              $(target)[offsetMethod]().top + offsetBase,\n              targetSelector\n            ]\n          }\n        }\n        return null\n      })\n      .filter((item) => item)\n      .sort((a, b) => a[0] - b[0])\n      .forEach((item) => {\n        this._offsets.push(item[0])\n        this._targets.push(item[1])\n      })\n  }\n\n  dispose() {\n    $.removeData(this._element, DATA_KEY)\n    $(this._scrollElement).off(EVENT_KEY)\n\n    this._element       = null\n    this._scrollElement = null\n    this._config        = null\n    this._selector      = null\n    this._offsets       = null\n    this._targets       = null\n    this._activeTarget  = null\n    this._scrollHeight  = null\n  }\n\n  // Private\n\n  _getConfig(config) {\n    config = {\n      ...Default,\n      ...typeof config === 'object' && config ? config : {}\n    }\n\n    if (typeof config.target !== 'string') {\n      let id = $(config.target).attr('id')\n      if (!id) {\n        id = Util.getUID(NAME)\n        $(config.target).attr('id', id)\n      }\n      config.target = `#${id}`\n    }\n\n    Util.typeCheckConfig(NAME, config, DefaultType)\n\n    return config\n  }\n\n  _getScrollTop() {\n    return this._scrollElement === window\n      ? this._scrollElement.pageYOffset : this._scrollElement.scrollTop\n  }\n\n  _getScrollHeight() {\n    return this._scrollElement.scrollHeight || Math.max(\n      document.body.scrollHeight,\n      document.documentElement.scrollHeight\n    )\n  }\n\n  _getOffsetHeight() {\n    return this._scrollElement === window\n      ? window.innerHeight : this._scrollElement.getBoundingClientRect().height\n  }\n\n  _process() {\n    const scrollTop    = this._getScrollTop() + this._config.offset\n    const scrollHeight = this._getScrollHeight()\n    const maxScroll    = this._config.offset +\n      scrollHeight -\n      this._getOffsetHeight()\n\n    if (this._scrollHeight !== scrollHeight) {\n      this.refresh()\n    }\n\n    if (scrollTop >= maxScroll) {\n      const target = this._targets[this._targets.length - 1]\n\n      if (this._activeTarget !== target) {\n        this._activate(target)\n      }\n      return\n    }\n\n    if (this._activeTarget && scrollTop < this._offsets[0] && this._offsets[0] > 0) {\n      this._activeTarget = null\n      this._clear()\n      return\n    }\n\n    const offsetLength = this._offsets.length\n    for (let i = offsetLength; i--;) {\n      const isActiveTarget = this._activeTarget !== this._targets[i] &&\n          scrollTop >= this._offsets[i] &&\n          (typeof this._offsets[i + 1] === 'undefined' ||\n              scrollTop < this._offsets[i + 1])\n\n      if (isActiveTarget) {\n        this._activate(this._targets[i])\n      }\n    }\n  }\n\n  _activate(target) {\n    this._activeTarget = target\n\n    this._clear()\n\n    const queries = this._selector\n      .split(',')\n      .map((selector) => `${selector}[data-target=\"${target}\"],${selector}[href=\"${target}\"]`)\n\n    const $link = $([].slice.call(document.querySelectorAll(queries.join(','))))\n\n    if ($link.hasClass(ClassName.DROPDOWN_ITEM)) {\n      $link.closest(Selector.DROPDOWN).find(Selector.DROPDOWN_TOGGLE).addClass(ClassName.ACTIVE)\n      $link.addClass(ClassName.ACTIVE)\n    } else {\n      // Set triggered link as active\n      $link.addClass(ClassName.ACTIVE)\n      // Set triggered links parents as active\n      // With both <ul> and <nav> markup a parent is the previous sibling of any nav ancestor\n      $link.parents(Selector.NAV_LIST_GROUP).prev(`${Selector.NAV_LINKS}, ${Selector.LIST_ITEMS}`).addClass(ClassName.ACTIVE)\n      // Handle special case when .nav-link is inside .nav-item\n      $link.parents(Selector.NAV_LIST_GROUP).prev(Selector.NAV_ITEMS).children(Selector.NAV_LINKS).addClass(ClassName.ACTIVE)\n    }\n\n    $(this._scrollElement).trigger(Event.ACTIVATE, {\n      relatedTarget: target\n    })\n  }\n\n  _clear() {\n    [].slice.call(document.querySelectorAll(this._selector))\n      .filter((node) => node.classList.contains(ClassName.ACTIVE))\n      .forEach((node) => node.classList.remove(ClassName.ACTIVE))\n  }\n\n  // Static\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      let data = $(this).data(DATA_KEY)\n      const _config = typeof config === 'object' && config\n\n      if (!data) {\n        data = new ScrollSpy(this, _config)\n        $(this).data(DATA_KEY, data)\n      }\n\n      if (typeof config === 'string') {\n        if (typeof data[config] === 'undefined') {\n          throw new TypeError(`No method named \"${config}\"`)\n        }\n        data[config]()\n      }\n    })\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * Data Api implementation\n * ------------------------------------------------------------------------\n */\n\n$(window).on(Event.LOAD_DATA_API, () => {\n  const scrollSpys = [].slice.call(document.querySelectorAll(Selector.DATA_SPY))\n  const scrollSpysLength = scrollSpys.length\n\n  for (let i = scrollSpysLength; i--;) {\n    const $spy = $(scrollSpys[i])\n    ScrollSpy._jQueryInterface.call($spy, $spy.data())\n  }\n})\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME] = ScrollSpy._jQueryInterface\n$.fn[NAME].Constructor = ScrollSpy\n$.fn[NAME].noConflict = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return ScrollSpy._jQueryInterface\n}\n\nexport default ScrollSpy\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.4.1): tab.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\nimport Util from './util'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME               = 'tab'\nconst VERSION            = '4.4.1'\nconst DATA_KEY           = 'bs.tab'\nconst EVENT_KEY          = `.${DATA_KEY}`\nconst DATA_API_KEY       = '.data-api'\nconst JQUERY_NO_CONFLICT = $.fn[NAME]\n\nconst Event = {\n  HIDE           : `hide${EVENT_KEY}`,\n  HIDDEN         : `hidden${EVENT_KEY}`,\n  SHOW           : `show${EVENT_KEY}`,\n  SHOWN          : `shown${EVENT_KEY}`,\n  CLICK_DATA_API : `click${EVENT_KEY}${DATA_API_KEY}`\n}\n\nconst ClassName = {\n  DROPDOWN_MENU : 'dropdown-menu',\n  ACTIVE        : 'active',\n  DISABLED      : 'disabled',\n  FADE          : 'fade',\n  SHOW          : 'show'\n}\n\nconst Selector = {\n  DROPDOWN              : '.dropdown',\n  NAV_LIST_GROUP        : '.nav, .list-group',\n  ACTIVE                : '.active',\n  ACTIVE_UL             : '> li > .active',\n  DATA_TOGGLE           : '[data-toggle=\"tab\"], [data-toggle=\"pill\"], [data-toggle=\"list\"]',\n  DROPDOWN_TOGGLE       : '.dropdown-toggle',\n  DROPDOWN_ACTIVE_CHILD : '> .dropdown-menu .active'\n}\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass Tab {\n  constructor(element) {\n    this._element = element\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  // Public\n\n  show() {\n    if (this._element.parentNode &&\n        this._element.parentNode.nodeType === Node.ELEMENT_NODE &&\n        $(this._element).hasClass(ClassName.ACTIVE) ||\n        $(this._element).hasClass(ClassName.DISABLED)) {\n      return\n    }\n\n    let target\n    let previous\n    const listElement = $(this._element).closest(Selector.NAV_LIST_GROUP)[0]\n    const selector = Util.getSelectorFromElement(this._element)\n\n    if (listElement) {\n      const itemSelector = listElement.nodeName === 'UL' || listElement.nodeName === 'OL' ? Selector.ACTIVE_UL : Selector.ACTIVE\n      previous = $.makeArray($(listElement).find(itemSelector))\n      previous = previous[previous.length - 1]\n    }\n\n    const hideEvent = $.Event(Event.HIDE, {\n      relatedTarget: this._element\n    })\n\n    const showEvent = $.Event(Event.SHOW, {\n      relatedTarget: previous\n    })\n\n    if (previous) {\n      $(previous).trigger(hideEvent)\n    }\n\n    $(this._element).trigger(showEvent)\n\n    if (showEvent.isDefaultPrevented() ||\n        hideEvent.isDefaultPrevented()) {\n      return\n    }\n\n    if (selector) {\n      target = document.querySelector(selector)\n    }\n\n    this._activate(\n      this._element,\n      listElement\n    )\n\n    const complete = () => {\n      const hiddenEvent = $.Event(Event.HIDDEN, {\n        relatedTarget: this._element\n      })\n\n      const shownEvent = $.Event(Event.SHOWN, {\n        relatedTarget: previous\n      })\n\n      $(previous).trigger(hiddenEvent)\n      $(this._element).trigger(shownEvent)\n    }\n\n    if (target) {\n      this._activate(target, target.parentNode, complete)\n    } else {\n      complete()\n    }\n  }\n\n  dispose() {\n    $.removeData(this._element, DATA_KEY)\n    this._element = null\n  }\n\n  // Private\n\n  _activate(element, container, callback) {\n    const activeElements = container && (container.nodeName === 'UL' || container.nodeName === 'OL')\n      ? $(container).find(Selector.ACTIVE_UL)\n      : $(container).children(Selector.ACTIVE)\n\n    const active = activeElements[0]\n    const isTransitioning = callback && (active && $(active).hasClass(ClassName.FADE))\n    const complete = () => this._transitionComplete(\n      element,\n      active,\n      callback\n    )\n\n    if (active && isTransitioning) {\n      const transitionDuration = Util.getTransitionDurationFromElement(active)\n\n      $(active)\n        .removeClass(ClassName.SHOW)\n        .one(Util.TRANSITION_END, complete)\n        .emulateTransitionEnd(transitionDuration)\n    } else {\n      complete()\n    }\n  }\n\n  _transitionComplete(element, active, callback) {\n    if (active) {\n      $(active).removeClass(ClassName.ACTIVE)\n\n      const dropdownChild = $(active.parentNode).find(\n        Selector.DROPDOWN_ACTIVE_CHILD\n      )[0]\n\n      if (dropdownChild) {\n        $(dropdownChild).removeClass(ClassName.ACTIVE)\n      }\n\n      if (active.getAttribute('role') === 'tab') {\n        active.setAttribute('aria-selected', false)\n      }\n    }\n\n    $(element).addClass(ClassName.ACTIVE)\n    if (element.getAttribute('role') === 'tab') {\n      element.setAttribute('aria-selected', true)\n    }\n\n    Util.reflow(element)\n\n    if (element.classList.contains(ClassName.FADE)) {\n      element.classList.add(ClassName.SHOW)\n    }\n\n    if (element.parentNode && $(element.parentNode).hasClass(ClassName.DROPDOWN_MENU)) {\n      const dropdownElement = $(element).closest(Selector.DROPDOWN)[0]\n\n      if (dropdownElement) {\n        const dropdownToggleList = [].slice.call(dropdownElement.querySelectorAll(Selector.DROPDOWN_TOGGLE))\n\n        $(dropdownToggleList).addClass(ClassName.ACTIVE)\n      }\n\n      element.setAttribute('aria-expanded', true)\n    }\n\n    if (callback) {\n      callback()\n    }\n  }\n\n  // Static\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      const $this = $(this)\n      let data = $this.data(DATA_KEY)\n\n      if (!data) {\n        data = new Tab(this)\n        $this.data(DATA_KEY, data)\n      }\n\n      if (typeof config === 'string') {\n        if (typeof data[config] === 'undefined') {\n          throw new TypeError(`No method named \"${config}\"`)\n        }\n        data[config]()\n      }\n    })\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * Data Api implementation\n * ------------------------------------------------------------------------\n */\n\n$(document)\n  .on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {\n    event.preventDefault()\n    Tab._jQueryInterface.call($(this), 'show')\n  })\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME] = Tab._jQueryInterface\n$.fn[NAME].Constructor = Tab\n$.fn[NAME].noConflict = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Tab._jQueryInterface\n}\n\nexport default Tab\n","/**\n * --------------------------------------------------------------------------\n * Bootstrap (v4.4.1): toast.js\n * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n * --------------------------------------------------------------------------\n */\n\nimport $ from 'jquery'\nimport Util from './util'\n\n/**\n * ------------------------------------------------------------------------\n * Constants\n * ------------------------------------------------------------------------\n */\n\nconst NAME               = 'toast'\nconst VERSION            = '4.4.1'\nconst DATA_KEY           = 'bs.toast'\nconst EVENT_KEY          = `.${DATA_KEY}`\nconst JQUERY_NO_CONFLICT = $.fn[NAME]\n\nconst Event = {\n  CLICK_DISMISS : `click.dismiss${EVENT_KEY}`,\n  HIDE          : `hide${EVENT_KEY}`,\n  HIDDEN        : `hidden${EVENT_KEY}`,\n  SHOW          : `show${EVENT_KEY}`,\n  SHOWN         : `shown${EVENT_KEY}`\n}\n\nconst ClassName = {\n  FADE    : 'fade',\n  HIDE    : 'hide',\n  SHOW    : 'show',\n  SHOWING : 'showing'\n}\n\nconst DefaultType = {\n  animation : 'boolean',\n  autohide  : 'boolean',\n  delay     : 'number'\n}\n\nconst Default = {\n  animation : true,\n  autohide  : true,\n  delay     : 500\n}\n\nconst Selector = {\n  DATA_DISMISS : '[data-dismiss=\"toast\"]'\n}\n\n/**\n * ------------------------------------------------------------------------\n * Class Definition\n * ------------------------------------------------------------------------\n */\n\nclass Toast {\n  constructor(element, config) {\n    this._element = element\n    this._config  = this._getConfig(config)\n    this._timeout = null\n    this._setListeners()\n  }\n\n  // Getters\n\n  static get VERSION() {\n    return VERSION\n  }\n\n  static get DefaultType() {\n    return DefaultType\n  }\n\n  static get Default() {\n    return Default\n  }\n\n  // Public\n\n  show() {\n    const showEvent = $.Event(Event.SHOW)\n\n    $(this._element).trigger(showEvent)\n    if (showEvent.isDefaultPrevented()) {\n      return\n    }\n\n    if (this._config.animation) {\n      this._element.classList.add(ClassName.FADE)\n    }\n\n    const complete = () => {\n      this._element.classList.remove(ClassName.SHOWING)\n      this._element.classList.add(ClassName.SHOW)\n\n      $(this._element).trigger(Event.SHOWN)\n\n      if (this._config.autohide) {\n        this._timeout = setTimeout(() => {\n          this.hide()\n        }, this._config.delay)\n      }\n    }\n\n    this._element.classList.remove(ClassName.HIDE)\n    Util.reflow(this._element)\n    this._element.classList.add(ClassName.SHOWING)\n    if (this._config.animation) {\n      const transitionDuration = Util.getTransitionDurationFromElement(this._element)\n\n      $(this._element)\n        .one(Util.TRANSITION_END, complete)\n        .emulateTransitionEnd(transitionDuration)\n    } else {\n      complete()\n    }\n  }\n\n  hide() {\n    if (!this._element.classList.contains(ClassName.SHOW)) {\n      return\n    }\n\n    const hideEvent = $.Event(Event.HIDE)\n\n    $(this._element).trigger(hideEvent)\n    if (hideEvent.isDefaultPrevented()) {\n      return\n    }\n\n    this._close()\n  }\n\n  dispose() {\n    clearTimeout(this._timeout)\n    this._timeout = null\n\n    if (this._element.classList.contains(ClassName.SHOW)) {\n      this._element.classList.remove(ClassName.SHOW)\n    }\n\n    $(this._element).off(Event.CLICK_DISMISS)\n\n    $.removeData(this._element, DATA_KEY)\n    this._element = null\n    this._config  = null\n  }\n\n  // Private\n\n  _getConfig(config) {\n    config = {\n      ...Default,\n      ...$(this._element).data(),\n      ...typeof config === 'object' && config ? config : {}\n    }\n\n    Util.typeCheckConfig(\n      NAME,\n      config,\n      this.constructor.DefaultType\n    )\n\n    return config\n  }\n\n  _setListeners() {\n    $(this._element).on(\n      Event.CLICK_DISMISS,\n      Selector.DATA_DISMISS,\n      () => this.hide()\n    )\n  }\n\n  _close() {\n    const complete = () => {\n      this._element.classList.add(ClassName.HIDE)\n      $(this._element).trigger(Event.HIDDEN)\n    }\n\n    this._element.classList.remove(ClassName.SHOW)\n    if (this._config.animation) {\n      const transitionDuration = Util.getTransitionDurationFromElement(this._element)\n\n      $(this._element)\n        .one(Util.TRANSITION_END, complete)\n        .emulateTransitionEnd(transitionDuration)\n    } else {\n      complete()\n    }\n  }\n\n  // Static\n\n  static _jQueryInterface(config) {\n    return this.each(function () {\n      const $element = $(this)\n      let data       = $element.data(DATA_KEY)\n      const _config  = typeof config === 'object' && config\n\n      if (!data) {\n        data = new Toast(this, _config)\n        $element.data(DATA_KEY, data)\n      }\n\n      if (typeof config === 'string') {\n        if (typeof data[config] === 'undefined') {\n          throw new TypeError(`No method named \"${config}\"`)\n        }\n\n        data[config](this)\n      }\n    })\n  }\n}\n\n/**\n * ------------------------------------------------------------------------\n * jQuery\n * ------------------------------------------------------------------------\n */\n\n$.fn[NAME]             = Toast._jQueryInterface\n$.fn[NAME].Constructor = Toast\n$.fn[NAME].noConflict  = () => {\n  $.fn[NAME] = JQUERY_NO_CONFLICT\n  return Toast._jQueryInterface\n}\n\nexport default Toast\n"]}
\ No newline at end of file
diff --git a/ui/bootstrap/src/main/resources/js/jquery-3.4.1.min.js b/ui/bootstrap/src/main/resources/js/jquery-3.4.1.min.js
deleted file mode 100644
index a1c07fd8..00000000
--- a/ui/bootstrap/src/main/resources/js/jquery-3.4.1.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}k.fn=k.prototype={jquery:f,constructor:k,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=k.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return k.each(this,e)},map:function(n){return this.pushStack(k.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},k.extend=k.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(k.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||k.isPlainObject(n)?n:{},i=!1,a[t]=k.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},k.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t){b(e,{nonce:t&&t.nonce})},each:function(e,t){var n,r=0;if(d(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},trim:function(e){return null==e?"":(e+"").replace(p,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(d(Object(e))?k.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(d(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g.apply([],a)},guid:1,support:y}),"function"==typeof Symbol&&(k.fn[Symbol.iterator]=t[Symbol.iterator]),k.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var h=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,k="sizzle"+1*new Date,m=n.document,S=0,r=0,p=ue(),x=ue(),N=ue(),A=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",$=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",F=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="<a id='"+k+"'></a><select id='"+k+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!==C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!==C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(F," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[S,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[S,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[k]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace(B,"$1"));return s[k]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[S,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[k]||(e[k]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===S&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[k]&&(v=Ce(v)),y&&!y[k]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[k]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(B,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(B," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=N[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[k]?i.push(a):o.push(a);(a=N(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=S+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t===C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument===C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(S=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(S=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=k.split("").sort(D).join("")===k,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);k.find=h,k.expr=h.selectors,k.expr[":"]=k.expr.pseudos,k.uniqueSort=k.unique=h.uniqueSort,k.text=h.getText,k.isXMLDoc=h.isXML,k.contains=h.contains,k.escapeSelector=h.escape;var T=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&k(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},N=k.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var D=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1<i.call(n,e)!==r}):k.filter(n,e,r)}k.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?k.find.matchesSelector(r,e)?[r]:[]:k.find.matches(e,k.grep(t,function(e){return 1===e.nodeType}))},k.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(k(e).filter(function(){for(t=0;t<r;t++)if(k.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)k.find(e,i[t],n);return 1<r?k.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&N.test(e)?k(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(k.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&k(e);if(!N.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&k.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?k.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(k(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(k.uniqueSort(k.merge(this.get(),k(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),k.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return T(e,"parentNode")},parentsUntil:function(e,t,n){return T(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return T(e,"nextSibling")},prevAll:function(e){return T(e,"previousSibling")},nextUntil:function(e,t,n){return T(e,"nextSibling",n)},prevUntil:function(e,t,n){return T(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return"undefined"!=typeof e.contentDocument?e.contentDocument:(A(e,"template")&&(e=e.content||e),k.merge([],e.childNodes))}},function(r,i){k.fn[r]=function(e,t){var n=k.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=k.filter(t,n)),1<this.length&&(O[r]||k.uniqueSort(n),H.test(r)&&n.reverse()),this.pushStack(n)}});var R=/[^\x20\t\r\n\f]+/g;function M(e){return e}function I(e){throw e}function W(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}k.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},k.each(e.match(R)||[],function(e,t){n[t]=!0}),n):k.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){k.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return k.each(arguments,function(e,t){var n;while(-1<(n=k.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<k.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},k.extend({Deferred:function(e){var o=[["notify","progress",k.Callbacks("memory"),k.Callbacks("memory"),2],["resolve","done",k.Callbacks("once memory"),k.Callbacks("once memory"),0,"resolved"],["reject","fail",k.Callbacks("once memory"),k.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return k.Deferred(function(r){k.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,M,s),l(u,o,I,s)):(u++,t.call(e,l(u,o,M,s),l(u,o,I,s),l(u,o,M,o.notifyWith))):(a!==M&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){k.Deferred.exceptionHook&&k.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==I&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(k.Deferred.getStackHook&&(t.stackTrace=k.Deferred.getStackHook()),C.setTimeout(t))}}return k.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:M,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:M)),o[2][3].add(l(0,e,m(n)?n:I))}).promise()},promise:function(e){return null!=e?k.extend(e,a):a}},s={};return k.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=k.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(W(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)W(i[t],a(t),o.reject);return o.promise()}});var $=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;k.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&$.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},k.readyException=function(e){C.setTimeout(function(){throw e})};var F=k.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),k.ready()}k.fn.ready=function(e){return F.then(e)["catch"](function(e){k.readyException(e)}),this},k.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--k.readyWait:k.isReady)||(k.isReady=!0)!==e&&0<--k.readyWait||F.resolveWith(E,[k])}}),k.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(k.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var _=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)_(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(k(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},z=/^-ms-/,U=/-([a-z])/g;function X(e,t){return t.toUpperCase()}function V(e){return e.replace(z,"ms-").replace(U,X)}var G=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function Y(){this.expando=k.expando+Y.uid++}Y.uid=1,Y.prototype={cache:function(e){var t=e[this.expando];return t||(t={},G(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[V(t)]=n;else for(r in t)i[V(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][V(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(V):(t=V(t))in r?[t]:t.match(R)||[]).length;while(n--)delete r[t[n]]}(void 0===t||k.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!k.isEmptyObject(t)}};var Q=new Y,J=new Y,K=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Z=/[A-Z]/g;function ee(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(Z,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:K.test(i)?JSON.parse(i):i)}catch(e){}J.set(e,t,n)}else n=void 0;return n}k.extend({hasData:function(e){return J.hasData(e)||Q.hasData(e)},data:function(e,t,n){return J.access(e,t,n)},removeData:function(e,t){J.remove(e,t)},_data:function(e,t,n){return Q.access(e,t,n)},_removeData:function(e,t){Q.remove(e,t)}}),k.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=J.get(o),1===o.nodeType&&!Q.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=V(r.slice(5)),ee(o,r,i[r]));Q.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){J.set(this,n)}):_(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=J.get(o,n))?t:void 0!==(t=ee(o,n))?t:void 0;this.each(function(){J.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){J.remove(this,e)})}}),k.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Q.get(e,t),n&&(!r||Array.isArray(n)?r=Q.access(e,t,k.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=k.queue(e,t),r=n.length,i=n.shift(),o=k._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){k.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Q.get(e,n)||Q.access(e,n,{empty:k.Callbacks("once memory").add(function(){Q.remove(e,[t+"queue",n])})})}}),k.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?k.queue(this[0],t):void 0===n?this:this.each(function(){var e=k.queue(this,t,n);k._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&k.dequeue(this,t)})},dequeue:function(e){return this.each(function(){k.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=k.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Q.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var te=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ne=new RegExp("^(?:([+-])=|)("+te+")([a-z%]*)$","i"),re=["Top","Right","Bottom","Left"],ie=E.documentElement,oe=function(e){return k.contains(e.ownerDocument,e)},ae={composed:!0};ie.getRootNode&&(oe=function(e){return k.contains(e.ownerDocument,e)||e.getRootNode(ae)===e.ownerDocument});var se=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&oe(e)&&"none"===k.css(e,"display")},ue=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];for(o in i=n.apply(e,r||[]),t)e.style[o]=a[o];return i};function le(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return k.css(e,t,"")},u=s(),l=n&&n[3]||(k.cssNumber[t]?"":"px"),c=e.nodeType&&(k.cssNumber[t]||"px"!==l&&+u)&&ne.exec(k.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)k.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,k.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ce={};function fe(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Q.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&se(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ce[s])||(o=a.body.appendChild(a.createElement(s)),u=k.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ce[s]=u)))):"none"!==n&&(l[c]="none",Q.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}k.fn.extend({show:function(){return fe(this,!0)},hide:function(){return fe(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){se(this)?k(this).show():k(this).hide()})}});var pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Q.set(e[n],"globalEval",!t||Q.get(t[n],"globalEval"))}ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;var me,xe,be=/<|&#?\w+;/;function we(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))k.merge(p,o.nodeType?[o]:o);else if(be.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+k.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;k.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<k.inArray(o,r))i&&i.push(o);else if(l=oe(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}me=E.createDocumentFragment().appendChild(E.createElement("div")),(xe=E.createElement("input")).setAttribute("type","radio"),xe.setAttribute("checked","checked"),xe.setAttribute("name","t"),me.appendChild(xe),y.checkClone=me.cloneNode(!0).cloneNode(!0).lastChild.checked,me.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t<arguments.length;t++)u[t]=arguments[t];if(s.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,s)){a=k.event.handlers.call(this,s,l),t=0;while((i=a[t++])&&!s.isPropagationStopped()){s.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!s.isImmediatePropagationStopped())s.rnamespace&&!1!==o.namespace&&!s.rnamespace.test(o.namespace)||(s.handleObj=o,s.data=o.data,void 0!==(r=((k.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,u))&&!1===(s.result=r)&&(s.preventDefault(),s.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,s),s.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<k(i,this).index(l):k.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(k.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[k.expando]?e:new k.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click",ke),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Q.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},k.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},k.Event=function(e,t){if(!(this instanceof k.Event))return new k.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?ke:Se,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&k.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[k.expando]=!0},k.Event.prototype={constructor:k.Event,isDefaultPrevented:Se,isPropagationStopped:Se,isImmediatePropagationStopped:Se,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=ke,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=ke,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=ke,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},k.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&Te.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&Ce.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},k.event.addProp),k.each({focus:"focusin",blur:"focusout"},function(e,t){k.event.special[e]={setup:function(){return De(this,e,Ne),!1},trigger:function(){return De(this,e),!0},delegateType:t}}),k.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){k.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||k.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),k.fn.extend({on:function(e,t,n,r){return Ae(this,e,t,n,r)},one:function(e,t,n,r){return Ae(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,k(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Se),this.each(function(){k.event.remove(this,e,n,t)})}});var je=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/<script|<style|<link/i,Le=/checked\s*(?:[^=]|=\s*.checked.)/i,He=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n<r;n++)k.event.add(t,i,l[i][n]);J.hasData(e)&&(s=J.access(e),u=k.extend({},s),J.set(t,u))}}function Ie(n,r,i,o){r=g.apply([],r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Le.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Ie(t,r,i,o)});if(f&&(t=(e=we(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=k.map(ve(e,"script"),Pe)).length;c<f;c++)u=e,c!==p&&(u=k.clone(u,!0,!0),s&&k.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,k.map(a,Re),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Q.access(u,"globalEval")&&k.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?k._evalUrl&&!u.noModule&&k._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")}):b(u.textContent.replace(He,""),u,l))}return n}function We(e,t,n){for(var r,i=t?k.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||k.cleanData(ve(r)),r.parentNode&&(n&&oe(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}k.extend({htmlPrefilter:function(e){return e.replace(je,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Me(o[r],a[r]);else Me(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=k.event.special,o=0;void 0!==(n=e[o]);o++)if(G(n)){if(t=n[Q.expando]){if(t.events)for(r in t.events)i[r]?k.event.remove(n,r):k.removeEvent(n,r,t.handle);n[Q.expando]=void 0}n[J.expando]&&(n[J.expando]=void 0)}}}),k.fn.extend({detach:function(e){return We(this,e,!0)},remove:function(e){return We(this,e)},text:function(e){return _(this,function(e){return void 0===e?k.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Ie(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Oe(this,e).appendChild(e)})},prepend:function(){return Ie(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Oe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(k.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return k.clone(this,e,t)})},html:function(e){return _(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!qe.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=k.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(k.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Ie(this,arguments,function(e){var t=this.parentNode;k.inArray(this,n)<0&&(k.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),k.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){k.fn[e]=function(e){for(var t,n=[],r=k(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),k(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var $e=new RegExp("^("+te+")(?!px)[a-z%]+$","i"),Fe=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Be=new RegExp(re.join("|"),"i");function _e(e,t,n){var r,i,o,a,s=e.style;return(n=n||Fe(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||oe(e)||(a=k.style(e,t)),!y.pixelBoxStyles()&&$e.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function ze(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(u){s.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",u.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",ie.appendChild(s).appendChild(u);var e=C.getComputedStyle(u);n="1%"!==e.top,a=12===t(e.marginLeft),u.style.right="60%",o=36===t(e.right),r=36===t(e.width),u.style.position="absolute",i=12===t(u.offsetWidth/3),ie.removeChild(s),u=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s=E.createElement("div"),u=E.createElement("div");u.style&&(u.style.backgroundClip="content-box",u.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===u.style.backgroundClip,k.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),a},scrollboxSize:function(){return e(),i}}))}();var Ue=["Webkit","Moz","ms"],Xe=E.createElement("div").style,Ve={};function Ge(e){var t=k.cssProps[e]||Ve[e];return t||(e in Xe?e:Ve[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Ue.length;while(n--)if((e=Ue[n]+t)in Xe)return e}(e)||e)}var Ye=/^(none|table(?!-c[ea]).+)/,Qe=/^--/,Je={position:"absolute",visibility:"hidden",display:"block"},Ke={letterSpacing:"0",fontWeight:"400"};function Ze(e,t,n){var r=ne.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function et(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=k.css(e,n+re[a],!0,i)),r?("content"===n&&(u-=k.css(e,"padding"+re[a],!0,i)),"margin"!==n&&(u-=k.css(e,"border"+re[a]+"Width",!0,i))):(u+=k.css(e,"padding"+re[a],!0,i),"padding"!==n?u+=k.css(e,"border"+re[a]+"Width",!0,i):s+=k.css(e,"border"+re[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function tt(e,t,n){var r=Fe(e),i=(!y.boxSizingReliable()||n)&&"border-box"===k.css(e,"boxSizing",!1,r),o=i,a=_e(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if($e.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||"auto"===a||!parseFloat(a)&&"inline"===k.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===k.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+et(e,t,n||(i?"border":"content"),o,r,a)+"px"}function nt(e,t,n,r,i){return new nt.prototype.init(e,t,n,r,i)}k.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=_e(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=V(t),u=Qe.test(t),l=e.style;if(u||(t=Ge(s)),a=k.cssHooks[t]||k.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=ne.exec(n))&&i[1]&&(n=le(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(k.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=V(t);return Qe.test(t)||(t=Ge(s)),(a=k.cssHooks[t]||k.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=_e(e,t,r)),"normal"===i&&t in Ke&&(i=Ke[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),k.each(["height","width"],function(e,u){k.cssHooks[u]={get:function(e,t,n){if(t)return!Ye.test(k.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?tt(e,u,n):ue(e,Je,function(){return tt(e,u,n)})},set:function(e,t,n){var r,i=Fe(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===k.css(e,"boxSizing",!1,i),s=n?et(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-et(e,u,"border",!1,i)-.5)),s&&(r=ne.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=k.css(e,u)),Ze(0,t,s)}}}),k.cssHooks.marginLeft=ze(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(_e(e,"marginLeft"))||e.getBoundingClientRect().left-ue(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),k.each({margin:"",padding:"",border:"Width"},function(i,o){k.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+re[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(k.cssHooks[i+o].set=Ze)}),k.fn.extend({css:function(e,t){return _(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Fe(e),i=t.length;a<i;a++)o[t[a]]=k.css(e,t[a],!1,r);return o}return void 0!==n?k.style(e,t,n):k.css(e,t)},e,t,1<arguments.length)}}),((k.Tween=nt).prototype={constructor:nt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||k.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(k.cssNumber[n]?"":"px")},cur:function(){var e=nt.propHooks[this.prop];return e&&e.get?e.get(this):nt.propHooks._default.get(this)},run:function(e){var t,n=nt.propHooks[this.prop];return this.options.duration?this.pos=t=k.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):nt.propHooks._default.set(this),this}}).init.prototype=nt.prototype,(nt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=k.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){k.fx.step[e.prop]?k.fx.step[e.prop](e):1!==e.elem.nodeType||!k.cssHooks[e.prop]&&null==e.elem.style[Ge(e.prop)]?e.elem[e.prop]=e.now:k.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=nt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},k.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},k.fx=nt.prototype.init,k.fx.step={};var rt,it,ot,at,st=/^(?:toggle|show|hide)$/,ut=/queueHooks$/;function lt(){it&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(lt):C.setTimeout(lt,k.fx.interval),k.fx.tick())}function ct(){return C.setTimeout(function(){rt=void 0}),rt=Date.now()}function ft(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=re[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function pt(e,t,n){for(var r,i=(dt.tweeners[t]||[]).concat(dt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function dt(o,e,t){var n,a,r=0,i=dt.prefilters.length,s=k.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=rt||ct(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:k.extend({},e),opts:k.extend(!0,{specialEasing:{},easing:k.easing._default},t),originalProperties:e,originalOptions:t,startTime:rt||ct(),duration:t.duration,tweens:[],createTween:function(e,t){var n=k.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=V(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=k.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=dt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(k._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return k.map(c,pt,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),k.fx.timer(k.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}k.Animation=k.extend(dt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return le(n.elem,e,ne.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(R);for(var n,r=0,i=e.length;r<i;r++)n=e[r],dt.tweeners[n]=dt.tweeners[n]||[],dt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&se(e),v=Q.get(e,"fxshow");for(r in n.queue||(null==(a=k._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,k.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],st.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||k.style(e,r)}if((u=!k.isEmptyObject(t))||!k.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Q.get(e,"display")),"none"===(c=k.css(e,"display"))&&(l?c=l:(fe([e],!0),l=e.style.display||l,c=k.css(e,"display"),fe([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===k.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Q.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&fe([e],!0),p.done(function(){for(r in g||fe([e]),Q.remove(e,"fxshow"),d)k.style(e,r,d[r])})),u=pt(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?dt.prefilters.unshift(e):dt.prefilters.push(e)}}),k.speed=function(e,t,n){var r=e&&"object"==typeof e?k.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return k.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in k.fx.speeds?r.duration=k.fx.speeds[r.duration]:r.duration=k.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&k.dequeue(this,r.queue)},r},k.fn.extend({fadeTo:function(e,t,n,r){return this.filter(se).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=k.isEmptyObject(t),o=k.speed(e,n,r),a=function(){var e=dt(this,k.extend({},t),o);(i||Q.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&!1!==i&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=k.timers,r=Q.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&ut.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||k.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Q.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=k.timers,o=n?n.length:0;for(t.finish=!0,k.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),k.each(["toggle","show","hide"],function(e,r){var i=k.fn[r];k.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(ft(r,!0),e,t,n)}}),k.each({slideDown:ft("show"),slideUp:ft("hide"),slideToggle:ft("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){k.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),k.timers=[],k.fx.tick=function(){var e,t=0,n=k.timers;for(rt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||k.fx.stop(),rt=void 0},k.fx.timer=function(e){k.timers.push(e),k.fx.start()},k.fx.interval=13,k.fx.start=function(){it||(it=!0,lt())},k.fx.stop=function(){it=null},k.fx.speeds={slow:600,fast:200,_default:400},k.fn.delay=function(r,e){return r=k.fx&&k.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},ot=E.createElement("input"),at=E.createElement("select").appendChild(E.createElement("option")),ot.type="checkbox",y.checkOn=""!==ot.value,y.optSelected=at.selected,(ot=E.createElement("input")).value="t",ot.type="radio",y.radioValue="t"===ot.value;var ht,gt=k.expr.attrHandle;k.fn.extend({attr:function(e,t){return _(this,k.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){k.removeAttr(this,e)})}}),k.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?k.prop(e,t,n):(1===o&&k.isXMLDoc(e)||(i=k.attrHooks[t.toLowerCase()]||(k.expr.match.bool.test(t)?ht:void 0)),void 0!==n?null===n?void k.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=k.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(R);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ht={set:function(e,t,n){return!1===t?k.removeAttr(e,n):e.setAttribute(n,n),n}},k.each(k.expr.match.bool.source.match(/\w+/g),function(e,t){var a=gt[t]||k.find.attr;gt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=gt[o],gt[o]=r,r=null!=a(e,t,n)?o:null,gt[o]=i),r}});var vt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;function mt(e){return(e.match(R)||[]).join(" ")}function xt(e){return e.getAttribute&&e.getAttribute("class")||""}function bt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(R)||[]}k.fn.extend({prop:function(e,t){return _(this,k.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[k.propFix[e]||e]})}}),k.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&k.isXMLDoc(e)||(t=k.propFix[t]||t,i=k.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=k.find.attr(e,"tabindex");return t?parseInt(t,10):vt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(k.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),k.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){k.propFix[this.toLowerCase()]=this}),k.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).addClass(t.call(this,e,xt(this)))});if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).removeClass(t.call(this,e,xt(this)))});if(!arguments.length)return this.attr("class","");if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){k(this).toggleClass(i.call(this,e,xt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=k(this),r=bt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=xt(this))&&Q.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Q.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+mt(xt(n))+" ").indexOf(t))return!0;return!1}});var wt=/\r/g;k.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,k(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=k.map(t,function(e){return null==e?"":e+""})),(r=k.valHooks[this.type]||k.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=k.valHooks[t.type]||k.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(wt,""):null==e?"":e:void 0}}),k.extend({valHooks:{option:{get:function(e){var t=k.find.attr(e,"value");return null!=t?t:mt(k.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=k(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=k.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<k.inArray(k.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),k.each(["radio","checkbox"],function(){k.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<k.inArray(k(e).val(),t)}},y.checkOn||(k.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var Tt=/^(?:focusinfocus|focusoutblur)$/,Ct=function(e){e.stopPropagation()};k.extend(k.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!Tt.test(d+k.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[k.expando]?e:new k.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:k.makeArray(t,[e]),c=k.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,Tt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Q.get(o,"events")||{})[e.type]&&Q.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&G(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!G(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),k.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,Ct),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,Ct),k.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=k.extend(new k.Event,n,{type:e,isSimulated:!0});k.event.trigger(r,null,t)}}),k.fn.extend({trigger:function(e,t){return this.each(function(){k.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return k.event.trigger(e,t,n,!0)}}),y.focusin||k.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){k.event.simulate(r,e.target,k.event.fix(e))};k.event.special[r]={setup:function(){var e=this.ownerDocument||this,t=Q.access(e,r);t||e.addEventListener(n,i,!0),Q.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this,t=Q.access(e,r)-1;t?Q.access(e,r,t):(e.removeEventListener(n,i,!0),Q.remove(e,r))}}});var Et=C.location,kt=Date.now(),St=/\?/;k.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||k.error("Invalid XML: "+e),t};var Nt=/\[\]$/,At=/\r?\n/g,Dt=/^(?:submit|button|image|reset|file)$/i,jt=/^(?:input|select|textarea|keygen)/i;function qt(n,e,r,i){var t;if(Array.isArray(e))k.each(e,function(e,t){r||Nt.test(n)?i(n,t):qt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)qt(n+"["+t+"]",e[t],r,i)}k.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!k.isPlainObject(e))k.each(e,function(){i(this.name,this.value)});else for(n in e)qt(n,e[n],t,i);return r.join("&")},k.fn.extend({serialize:function(){return k.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=k.prop(this,"elements");return e?k.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!k(this).is(":disabled")&&jt.test(this.nodeName)&&!Dt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=k(this).val();return null==n?null:Array.isArray(n)?k.map(n,function(e){return{name:t.name,value:e.replace(At,"\r\n")}}):{name:t.name,value:n.replace(At,"\r\n")}}).get()}});var Lt=/%20/g,Ht=/#.*$/,Ot=/([?&])_=[^&]*/,Pt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Rt=/^(?:GET|HEAD)$/,Mt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Ft=E.createElement("a");function Bt(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(R)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function _t(t,i,o,a){var s={},u=t===Wt;function l(e){var r;return s[e]=!0,k.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function zt(e,t){var n,r,i=k.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&k.extend(!0,e,r),e}Ft.href=Et.href,k.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Et.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Et.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":k.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,k.ajaxSettings),t):zt(k.ajaxSettings,e)},ajaxPrefilter:Bt(It),ajaxTransport:Bt(Wt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=k.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?k(y):k.event,x=k.Deferred(),b=k.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Pt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Et.href)+"").replace(Mt,Et.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(R)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Ft.protocol+"//"+Ft.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=k.param(v.data,v.traditional)),_t(It,v,t,T),h)return T;for(i in(g=k.event&&v.global)&&0==k.active++&&k.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Rt.test(v.type),f=v.url.replace(Ht,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Lt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(St.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Ot,"$1"),o=(St.test(f)?"&":"?")+"_="+kt+++o),v.url=f+o),v.ifModified&&(k.lastModified[f]&&T.setRequestHeader("If-Modified-Since",k.lastModified[f]),k.etag[f]&&T.setRequestHeader("If-None-Match",k.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+$t+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=_t(Wt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(k.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(k.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--k.active||k.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return k.get(e,t,n,"json")},getScript:function(e,t){return k.get(e,void 0,t,"script")}}),k.each(["get","post"],function(e,i){k[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),k.ajax(k.extend({url:e,type:i,dataType:r,data:t,success:n},k.isPlainObject(e)&&e))}}),k._evalUrl=function(e,t){return k.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){k.globalEval(e,t)}})},k.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=k(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){k(this).wrapInner(n.call(this,e))}):this.each(function(){var e=k(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){k(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){k(this).replaceWith(this.childNodes)}),this}}),k.expr.pseudos.hidden=function(e){return!k.expr.pseudos.visible(e)},k.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},k.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Ut={0:200,1223:204},Xt=k.ajaxSettings.xhr();y.cors=!!Xt&&"withCredentials"in Xt,y.ajax=Xt=!!Xt,k.ajaxTransport(function(i){var o,a;if(y.cors||Xt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Ut[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),k.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),k.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return k.globalEval(e),e}}}),k.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),k.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=k("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=mt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&k.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?k("<div>").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}}),k.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),k.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),k.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||k.guid++,i},k.holdReady=function(e){e?k.readyWait++:k.ready(!0)},k.isArray=Array.isArray,k.parseJSON=JSON.parse,k.nodeName=A,k.isFunction=m,k.isWindow=x,k.camelCase=V,k.type=w,k.now=Date.now,k.isNumeric=function(e){var t=k.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},"function"==typeof define&&define.amd&&define("jquery",[],function(){return k});var Qt=C.jQuery,Jt=C.$;return k.noConflict=function(e){return C.$===k&&(C.$=Jt),e&&C.jQuery===k&&(C.jQuery=Qt),k},e||(C.jQuery=C.$=k),k});
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt
index 8f2898d2..435ea98d 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt
@@ -9,7 +9,7 @@ import hep.dataforge.names.toName
 import hep.dataforge.vision.set
 import hep.dataforge.vision.setProperty
 import hep.dataforge.vision.solid.*
-import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
+import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY
 import hep.dataforge.vision.styleSheet
 import hep.dataforge.vision.useStyle
 import space.kscience.gdml.*
@@ -27,6 +27,8 @@ private inline operator fun Number.times(d: Double) = toDouble() * d
 private inline operator fun Number.times(f: Float) = toFloat() * f
 
 public class GdmlTransformerSettings {
+    public val random: Random = Random(222)
+
     public enum class Action {
         ADD,
         REJECT,
@@ -38,11 +40,14 @@ public class GdmlTransformerSettings {
 
     public var solidAction: (GdmlSolid) -> Action = { Action.PROTOTYPE }
     public var volumeAction: (GdmlGroup) -> Action = { Action.PROTOTYPE }
+
+    public var paint: SolidMaterial.(material: GdmlMaterial) -> Unit = { _->
+        color(random.nextInt(16777216))
+    }
 }
 
 private class GdmlTransformer(val settings: GdmlTransformerSettings) {
     //private val materialCache = HashMap<GdmlMaterial, Meta>()
-    private val random = Random(222)
 
     /**
      * A special group for local templates
@@ -105,7 +110,8 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
         val styleName = "materials.${material.name}"
 
         obj.useStyle(styleName) {
-            MATERIAL_COLOR_KEY put random.nextInt(16777216)
+            val vfMaterial = settings.run { SolidMaterial().apply { paint(material)}}
+            MATERIAL_KEY put vfMaterial.toMeta()
             "Gdml.material" put material.name
         }
 
@@ -195,7 +201,9 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
                     scaleZ = solid.scale.z.toFloat()
                 }
             }
-            is GdmlSphere -> sphere(solid.rmax * lScale, solid.deltaphi * aScale, solid.deltatheta * aScale, name) {
+            is GdmlSphere -> sphereLayer(solid.rmax * lScale,  solid.rmin * lScale, name) {
+                phi = solid.deltaphi * aScale
+                theta = solid.deltatheta * aScale
                 phiStart = solid.startphi * aScale
                 thetaStart = solid.starttheta * aScale
             }
@@ -255,7 +263,7 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
         solid: GdmlSolid,
         name: String?,
     ): Solid? {
-        require(name != ""){"Can't use empty solid name. Use null instead."}
+        require(name != "") { "Can't use empty solid name. Use null instead." }
         return when (settings.solidAction(solid)) {
             GdmlTransformerSettings.Action.ADD -> {
                 addSolid(root, solid, name)
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
index f5d42074..e08cb09c 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
@@ -5,8 +5,8 @@ import hep.dataforge.vision.visitor.countDistinct
 import hep.dataforge.vision.visitor.flowStatistics
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import space.kscience.gdml.Gdml
 import nl.adaptivity.xmlutil.StAXReader
+import space.kscience.gdml.Gdml
 import java.io.File
 import kotlin.reflect.KClass
 
@@ -17,7 +17,7 @@ suspend fun main() {
             File("D:\\Work\\Projects\\dataforge-vis\\visionforge-gdml\\src\\jvmTest\\resources\\gdml\\BM@N.gdml").inputStream()
 
         val xmlReader = StAXReader(stream, "UTF-8")
-        val xml = Gdml.format.parse(Gdml.serializer(), xmlReader)
+        val xml = Gdml.format.decodeFromReader(Gdml.serializer(), xmlReader)
         val vision = xml.toVision()
 
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
index 5fc30a60..d3da6ed1 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
@@ -54,12 +54,8 @@ public class Sphere(
 @VisionBuilder
 public inline fun VisionContainerBuilder<Solid>.sphere(
     radius: Number,
-    phi: Number = 2 * PI,
-    theta: Number = PI,
     name: String? = null,
     action: Sphere.() -> Unit = {},
 ): Sphere = Sphere(
     radius.toFloat(),
-    phi = phi.toFloat(),
-    theta = theta.toFloat()
 ).apply(action).also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SphereLayer.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SphereLayer.kt
new file mode 100644
index 00000000..69bd3afa
--- /dev/null
+++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SphereLayer.kt
@@ -0,0 +1,77 @@
+package hep.dataforge.vision.solid
+
+import hep.dataforge.vision.VisionBuilder
+import hep.dataforge.vision.VisionContainerBuilder
+import hep.dataforge.vision.set
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlin.math.PI
+import kotlin.math.cos
+import kotlin.math.sin
+
+@Serializable
+@SerialName("solid.sphereLayer")
+public class SphereLayer(
+    public var outerRadius: Float,
+    public var innerRadius: Float,
+    public var phiStart: Float = 0f,
+    public var phi: Float = PI2,
+    public var thetaStart: Float = 0f,
+    public var theta: Float = PI.toFloat(),
+) : SolidBase(), GeometrySolid {
+
+    override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>): Unit = geometryBuilder.run {
+        require(outerRadius > 0) { "Outer radius must be positive" }
+        require(innerRadius >= 0) { "inner radius must be non-negative" }
+
+        fun point3DfromSphCoord(r: Float, theta: Float, phi: Float): Point3D {
+            // This transformation matches three.js sphere implementation
+            val y = r * cos(theta)
+            val z = r * sin(theta) * sin(phi)
+            val x = -r * sin(theta) * cos(phi)
+            return Point3D(x, y, z)
+        }
+
+        val segments = detail ?: 8
+        require(segments >= 4) { "The detail for sphere must be >= 4" }
+        val phiStep = phi / segments
+        val thetaStep = theta / segments
+        for (i in 0 until segments) {  // theta iteration
+            val theta1 = thetaStart + i * thetaStep
+            val theta2 = theta1 + thetaStep
+            for (j in 0 until segments) {   // phi iteration
+                val phi1 = phiStart + j * phiStep
+                val phi2 = phi1 + phiStep
+                //outer points
+                val outerPoint1 = point3DfromSphCoord(outerRadius, theta1, phi1)
+                val outerPoint2 = point3DfromSphCoord(outerRadius, theta1, phi2)
+                val outerPoint3 = point3DfromSphCoord(outerRadius, theta2, phi2)
+                val outerPoint4 = point3DfromSphCoord(outerRadius, theta2, phi1)
+                // 1-2-3-4 gives the same face but with opposite orientation
+                face4(outerPoint1, outerPoint4, outerPoint3, outerPoint2)
+                if (innerRadius > 0) {
+                    val innerPoint1 = point3DfromSphCoord(innerRadius, theta1, phi1)
+                    val innerPoint2 = point3DfromSphCoord(innerRadius, theta1, phi2)
+                    val innerPoint3 = point3DfromSphCoord(innerRadius, theta2, phi2)
+                    val innerPoint4 = point3DfromSphCoord(innerRadius, theta2, phi1)
+                    face4(innerPoint1, innerPoint2, innerPoint3, innerPoint4)
+                    //the cup
+                    if (i == segments - 1 && theta != PI.toFloat() && innerRadius != outerRadius) {
+                        face4(outerPoint4, innerPoint4, innerPoint3, outerPoint3)
+                    }
+                }
+            }
+        }
+    }
+}
+
+@VisionBuilder
+public inline fun VisionContainerBuilder<Solid>.sphereLayer(
+    outerRadius: Number,
+    innerRadius: Number,
+    name: String? = null,
+    action: SphereLayer.() -> Unit = {},
+): SphereLayer = SphereLayer(
+    outerRadius.toFloat(),
+    innerRadius.toFloat(),
+).apply(action).also { set(name, it) }
\ No newline at end of file

From 7febb4452a4b010567e31494ac71d076e692f457 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 7 Mar 2021 16:19:43 +0300
Subject: [PATCH 098/151] Grand package change

---
 build.gradle.kts                              | 12 ++++--
 demo/gdml/build.gradle.kts                    |  4 +-
 .../visionforge}/gdml/GDMLVisualTest.kt       | 14 +++----
 .../gdml/demo/GDMLAppComponent.kt             | 28 ++++++-------
 .../visionforge}/gdml/demo/GdmlJsDemoApp.kt   | 16 +++----
 .../visionforge}/gdml/demo/fileDrop.kt        |  2 +-
 .../visionforge}/gdml/demo/GdmlFxDemoApp.kt   | 24 +++++------
 .../visionforge}/gdml/demo/readFile.kt        | 10 ++---
 .../visionforge}/gdml/demo/saveToJson.kt      |  6 +--
 .../solid/FileSerializationTest.kt            |  4 +-
 demo/jupyter-playground/build.gradle.kts      |  2 +-
 .../VisionForgePlayGroundForJupyter.kt        | 42 +++++++++----------
 .../kotlin/ru/mipt/npm/muon/monitor/Event.kt  |  2 +-
 .../kotlin/ru/mipt/npm/muon/monitor/Model.kt  |  4 +-
 .../ru/mipt/npm/muon/monitor/Monitor.kt       |  4 +-
 .../mipt/npm/muon/monitor/MMAppComponent.kt   | 34 +++++++--------
 .../ru/mipt/npm/muon/monitor/MMDemoApp.kt     |  8 ++--
 .../mipt/npm/muon/monitor/server/MMServer.kt  |  8 ++--
 .../ru/mipt/npm/muon/monitor/sim/line.kt      |  2 +-
 .../src/jsMain/kotlin/playgroundMain.kt       |  8 ++--
 .../src/jvmMain/kotlin/gdmlCubes.kt           | 18 ++++----
 .../playground/src/jvmMain/kotlin/gdmlIaxo.kt | 16 +++----
 .../src/jvmMain/kotlin/generateSchema.kt      |  6 +--
 .../src/jvmMain/kotlin/plotlyVision.kt        | 18 ++++----
 .../src/jvmMain/kotlin/randomSpheres.kt       | 14 +++----
 .../src/jvmMain/kotlin/serverExtensions.kt    | 22 +++++-----
 .../src/jvmMain/kotlin/simpleCube.kt          | 18 ++++----
 .../main/kotlin/ru/mipt/npm/sat/geometry.kt   | 10 ++---
 .../main/kotlin/ru/mipt/npm/sat/satServer.kt  | 10 ++---
 demo/solid-showcase/build.gradle.kts          |  2 +-
 .../kscience/visionforge}/solid/demo/demo.kt  | 18 ++++----
 .../visionforge}/solid/demo/ThreeDemoApp.kt   | 10 ++---
 .../visionforge}/solid/demo/ThreeDemoGrid.kt  | 20 ++++-----
 .../visionforge}/solid/demo/VariableBox.kt    | 25 +++++------
 .../visionforge}/solid/demo/FXDemoApp.kt      |  2 +-
 .../visionforge}/solid/demo/FXDemoGrid.kt     | 16 +++----
 .../visionforge}/solid/demo/MetaEditorDemo.kt | 16 +++----
 settings.gradle.kts                           |  4 +-
 .../visionforge}/bootstrap/bootstrap.kt       |  2 +-
 .../visionforge}/bootstrap/outputConfig.kt    | 10 ++---
 .../visionforge}/bootstrap/reactBootstrap.kt  |  8 ++--
 .../visionforge}/bootstrap/tabComponent.kt    |  4 +-
 .../visionforge}/bootstrap/threeControls.kt   | 14 +++----
 .../bootstrap/visionPropertyEditor.kt         | 12 +++---
 .../hep/dataforge/vision/material/icons.kt    |  2 +-
 .../hep/dataforge/vision/material/misc.kt     |  6 +--
 .../dataforge/vision/material/objectTree.kt   | 18 ++++----
 .../kscience/visionforge}/react/MetaViewer.kt | 26 ++++++------
 .../kscience/visionforge}/react/ObjectTree.kt | 16 +++----
 .../visionforge}/react/PropertyEditor.kt      | 21 ++++++----
 .../react/ThreeCanvasComponent.kt             | 14 +++----
 .../kscience/visionforge}/react/TreeStyles.kt |  2 +-
 .../kscience/visionforge}/react/layout.kt     |  2 +-
 .../visionforge}/react/valueChooser.kt        | 14 +++----
 visionforge-core/build.gradle.kts             |  2 +-
 .../hep/dataforge/vision/VisionLayout.kt      |  8 ----
 .../kscience/visionforge}/Colors.kt           | 10 ++---
 .../kscience/visionforge}/StyleReference.kt   |  8 ++--
 .../kscience/visionforge}/StyleSheet.kt       | 12 +++---
 .../kscience/visionforge}/Vision.kt           | 20 ++++-----
 .../kscience/visionforge}/VisionBase.kt       | 24 +++++------
 .../kscience/visionforge}/VisionChange.kt     | 12 +++---
 .../kscience/visionforge}/VisionForge.kt      |  8 ++--
 .../kscience/visionforge}/VisionGroup.kt      |  6 +--
 .../kscience/visionforge}/VisionGroupBase.kt  |  4 +-
 .../kscience/visionforge/VisionLayout.kt      |  8 ++++
 .../kscience/visionforge}/VisionManager.kt    | 15 ++++---
 .../visionforge}/VisionPropertyContainer.kt   |  6 +--
 .../visionforge}/html/HtmlVisionFragment.kt   |  6 +--
 .../kscience/visionforge}/html/Page.kt        | 12 +++---
 .../visionforge}/html/VisionTagConsumer.kt    | 20 ++++-----
 .../visionforge}/html/staticHtmlRender.kt     | 10 ++---
 .../kscience/visionforge}/misc.kt             |  6 +--
 .../kscience/visionforge}/visionDescriptor.kt | 18 ++++----
 .../visionforge}/visitor/StatisticsVisitor.kt |  8 ++--
 .../visionforge}/visitor/VisionVisitor.kt     | 10 ++---
 .../kscience/visionforge}/html/HtmlTagTest.kt | 12 +++---
 .../kscience/visionforge}/Application.kt      |  2 +-
 .../kscience/visionforge}/VisionClient.kt     | 18 ++++----
 .../kscience/visionforge}/elementOutput.kt    |  6 +--
 .../kscience/visionforge}/visionForgeJs.kt    |  6 +--
 .../kscience/visionforge}/html/headers.kt     |  6 +--
 .../kscience/visionforge}/html/htmlExport.kt  | 10 ++---
 .../kscience/visionforge}/visionForgeJvm.kt   |  8 ++--
 .../visionforge}/visitor/countDistinct.kt     |  2 +-
 .../kscience/visionforge}/FXPlugin.kt         | 10 ++---
 .../visionforge}/editor/ColorValueChooser.kt  | 16 +++----
 .../editor/ComboBoxValueChooser.kt            | 18 ++++----
 .../visionforge}/editor/ConfigEditor.kt       | 12 +++---
 .../kscience/visionforge}/editor/FXMeta.kt    | 16 +++----
 .../visionforge}/editor/MetaViewer.kt         |  8 ++--
 .../visionforge}/editor/TextValueChooser.kt   | 10 ++---
 .../visionforge}/editor/ValueCallback.kt      |  4 +-
 .../visionforge}/editor/ValueChooser.kt       | 26 ++++++------
 .../visionforge}/editor/ValueChooserBase.kt   |  8 ++--
 .../editor/VisualObjectEditorFragment.kt      | 11 +++--
 .../editor/VisualObjectTreeFragment.kt        |  6 +--
 .../kscience/visionforge}/solid/FX3DPlugin.kt | 16 +++----
 .../kscience/visionforge}/solid/FXCanvas3D.kt |  8 ++--
 .../visionforge}/solid/FXCompositeFactory.kt  |  4 +-
 .../visionforge}/solid/FXConvexFactory.kt     |  2 +-
 .../visionforge}/solid/FXMaterials.kt         | 12 +++---
 .../visionforge}/solid/FXReferenceFactory.kt  |  8 ++--
 .../visionforge}/solid/FXShapeFactory.kt      |  4 +-
 .../visionforge}/solid/OrbitControls.kt       |  4 +-
 .../solid/VisualObjectFXBinding.kt            | 16 +++----
 .../visionforge}/gdml/GdmlOptimizer.kt        | 12 +++---
 .../visionforge}/gdml/GdmlShowcase.kt         |  2 +-
 .../visionforge}/gdml/GdmlTransformer.kt      | 26 ++++++------
 .../src/commonTest/kotlin/TestCubes.kt        | 16 +++----
 .../kscience/visionforge}/gdml/gdmlJs.kt      |  2 +-
 .../kscience/visionforge}/gdml/gdmlJVM.kt     |  4 +-
 .../visionforge}/gdml/TestConvertor.kt        |  6 +--
 .../visionforge}/gdml/bmanStatistics.kt       |  8 ++--
 visionforge-plotly/build.gradle.kts           |  4 +-
 .../dataforge/vision/plotly/VisionOfPlotly.kt | 19 ---------
 .../visionforge}/plotly/PlotlyPlugin.kt       | 14 +++----
 .../visionforge/plotly/VisionOfPlotly.kt      | 19 +++++++++
 .../kscience/visionforge}/plotly/plotlyJs.kt  | 26 ++++++------
 .../visionforge}/plotly/plotlyHeaders.kt      | 12 +++---
 .../kscience/visionforge}/plotly/plotlyJvm.kt | 14 +++----
 .../visionforge}/three/server/VisionServer.kt | 39 ++++++++++-------
 .../vision/solid/specifications/Controls.kt   |  9 ----
 .../vision/solid/specifications/Light.kt      |  8 ----
 .../kscience/visionforge}/solid/Box.kt        |  8 ++--
 .../visionforge}/solid/ColorAccessor.kt       | 20 ++++-----
 .../kscience/visionforge}/solid/Composite.kt  |  8 ++--
 .../visionforge}/solid/ConeSegment.kt         |  6 +--
 .../kscience/visionforge}/solid/Convex.kt     |  6 +--
 .../kscience/visionforge}/solid/Extruded.kt   |  8 ++--
 .../visionforge}/solid/GeometryBuilder.kt     |  4 +-
 .../kscience/visionforge}/solid/PolyLine.kt   | 18 ++++----
 .../kscience/visionforge}/solid/Solid.kt      | 30 ++++++-------
 .../kscience/visionforge}/solid/SolidBase.kt  | 16 +++----
 .../kscience/visionforge}/solid/SolidGroup.kt | 12 +++---
 .../kscience/visionforge}/solid/SolidLabel.kt |  8 ++--
 .../visionforge}/solid/SolidMaterial.kt       | 26 ++++++------
 .../visionforge}/solid/SolidReference.kt      | 14 +++----
 .../kscience/visionforge}/solid/Solids.kt     | 16 +++----
 .../kscience/visionforge}/solid/Sphere.kt     |  8 ++--
 .../visionforge}/solid/SphereLayer.kt         |  8 ++--
 .../kscience/visionforge}/solid/Tube.kt       |  8 ++--
 .../kscience/visionforge}/solid/geometry.kt   | 10 ++---
 .../visionforge}/solid/specifications/Axes.kt | 10 ++---
 .../solid/specifications/Camera.kt            | 10 ++---
 .../solid/specifications/Canvas3DOptions.kt   |  6 +--
 .../solid/specifications/Controls.kt          |  9 ++++
 .../visionforge/solid/specifications/Light.kt |  8 ++++
 .../solid/transform/RemoveSingleChild.kt      | 10 ++---
 .../visionforge}/solid/transform/UnRef.kt     | 16 +++----
 .../solid/transform/VisualTreeTransform.kt    |  4 +-
 .../visionforge}/solid/CompositeTest.kt       |  3 +-
 .../kscience/visionforge}/solid/ConvexTest.kt | 12 +++---
 .../kscience/visionforge}/solid/GroupTest.kt  |  6 +--
 .../visionforge}/solid/PropertyTest.kt        |  8 ++--
 .../visionforge}/solid/SerializationTest.kt   | 12 +++---
 .../visionforge}/solid/SolidPluginTest.kt     |  8 ++--
 .../visionforge}/solid/SolidReferenceTest.kt  | 10 ++---
 .../visionforge}/solid/VisionUpdateTest.kt    | 12 +++---
 .../solid/three/MeshThreeFactory.kt           | 22 +++++-----
 .../solid/three/ThreeBoxFactory.kt            |  6 +--
 .../visionforge}/solid/three/ThreeCanvas.kt   | 27 ++++++------
 .../solid/three/ThreeCanvasLabelFactory.kt    |  8 ++--
 .../solid/three/ThreeCompositeFactory.kt      |  7 ++--
 .../solid/three/ThreeConvexFactory.kt         |  4 +-
 .../solid/three/ThreeCylinderFactory.kt       |  6 +--
 .../visionforge}/solid/three/ThreeFactory.kt  | 18 ++++----
 .../solid/three/ThreeGeometryBuilder.kt       | 12 +++---
 .../solid/three/ThreeLabelFactory.kt          |  9 ++--
 .../solid/three/ThreeLineFactory.kt           | 14 +++----
 .../solid/three/ThreeMaterials.kt             | 20 ++++-----
 .../visionforge}/solid/three/ThreePlugin.kt   | 16 +++----
 .../solid/three/ThreeReferenceFactory.kt      | 16 +++----
 .../solid/three/ThreeSphereFactory.kt         |  6 +--
 .../visionforge}/solid/three/ThreeVision.kt   |  4 +-
 .../kscience/visionforge}/solid/three/csg.kt  |  0
 .../visionforge}/solid/three/three.kt         | 12 +++---
 .../dataforge/vision/three/server/jsMain.kt   | 11 -----
 .../visionforge/three/server/jsMain.kt        | 11 +++++
 .../three/server/serverExtensions.kt          | 16 +++----
 180 files changed, 1029 insertions(+), 1006 deletions(-)
 rename demo/gdml/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/GDMLVisualTest.kt (67%)
 rename demo/gdml/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/demo/GDMLAppComponent.kt (81%)
 rename demo/gdml/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/demo/GdmlJsDemoApp.kt (66%)
 rename demo/gdml/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/demo/fileDrop.kt (93%)
 rename demo/gdml/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/demo/GdmlFxDemoApp.kt (76%)
 rename demo/gdml/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/demo/readFile.kt (81%)
 rename demo/gdml/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/demo/saveToJson.kt (86%)
 rename demo/gdml/src/jvmTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/FileSerializationTest.kt (80%)
 rename demo/solid-showcase/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/demo/demo.kt (91%)
 rename demo/solid-showcase/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/demo/ThreeDemoApp.kt (84%)
 rename demo/solid-showcase/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/demo/ThreeDemoGrid.kt (81%)
 rename demo/solid-showcase/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/demo/VariableBox.kt (84%)
 rename demo/solid-showcase/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/demo/FXDemoApp.kt (87%)
 rename demo/solid-showcase/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/demo/FXDemoGrid.kt (65%)
 rename demo/solid-showcase/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/demo/MetaEditorDemo.kt (74%)
 rename ui/bootstrap/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/bootstrap/bootstrap.kt (99%)
 rename ui/bootstrap/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/bootstrap/outputConfig.kt (93%)
 rename ui/bootstrap/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/bootstrap/reactBootstrap.kt (96%)
 rename ui/bootstrap/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/bootstrap/tabComponent.kt (95%)
 rename ui/bootstrap/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/bootstrap/threeControls.kt (85%)
 rename ui/bootstrap/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/bootstrap/visionPropertyEditor.kt (80%)
 rename ui/react/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/react/MetaViewer.kt (87%)
 rename ui/react/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/react/ObjectTree.kt (90%)
 rename ui/react/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/react/PropertyEditor.kt (92%)
 rename ui/react/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/react/ThreeCanvasComponent.kt (81%)
 rename ui/react/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/react/TreeStyles.kt (98%)
 rename ui/react/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/react/layout.kt (94%)
 rename ui/react/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/react/valueChooser.kt (94%)
 delete mode 100644 visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionLayout.kt
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/Colors.kt (97%)
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/StyleReference.kt (84%)
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/StyleSheet.kt (92%)
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/Vision.kt (89%)
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/VisionBase.kt (87%)
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/VisionChange.kt (94%)
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/VisionForge.kt (55%)
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/VisionGroup.kt (93%)
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/VisionGroupBase.kt (98%)
 create mode 100644 visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionLayout.kt
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/VisionManager.kt (89%)
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/VisionPropertyContainer.kt (77%)
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/html/HtmlVisionFragment.kt (71%)
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/html/Page.kt (70%)
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/html/VisionTagConsumer.kt (88%)
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/html/staticHtmlRender.kt (88%)
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/misc.kt (84%)
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/visionDescriptor.kt (79%)
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/visitor/StatisticsVisitor.kt (85%)
 rename visionforge-core/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/visitor/VisionVisitor.kt (87%)
 rename visionforge-core/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/html/HtmlTagTest.kt (83%)
 rename visionforge-core/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/Application.kt (98%)
 rename visionforge-core/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/VisionClient.kt (92%)
 rename visionforge-core/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/elementOutput.kt (87%)
 rename visionforge-core/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/visionForgeJs.kt (91%)
 rename visionforge-core/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/html/headers.kt (97%)
 rename visionforge-core/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/html/htmlExport.kt (89%)
 rename visionforge-core/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/visionForgeJvm.kt (68%)
 rename visionforge-core/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/visitor/countDistinct.kt (88%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/FXPlugin.kt (93%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/ColorValueChooser.kt (77%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/ComboBoxValueChooser.kt (81%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/ConfigEditor.kt (96%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/FXMeta.kt (94%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/MetaViewer.kt (92%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/TextValueChooser.kt (93%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/ValueCallback.kt (86%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/ValueChooser.kt (85%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/ValueChooserBase.kt (89%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/VisualObjectEditorFragment.kt (87%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/editor/VisualObjectTreeFragment.kt (93%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/FX3DPlugin.kt (92%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/FXCanvas3D.kt (91%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/FXCompositeFactory.kt (95%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/FXConvexFactory.kt (92%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/FXMaterials.kt (88%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/FXReferenceFactory.kt (90%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/FXShapeFactory.kt (95%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/OrbitControls.kt (97%)
 rename visionforge-fx/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/VisualObjectFXBinding.kt (86%)
 rename visionforge-gdml/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/GdmlOptimizer.kt (90%)
 rename visionforge-gdml/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/GdmlShowcase.kt (98%)
 rename visionforge-gdml/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/GdmlTransformer.kt (95%)
 rename visionforge-gdml/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/gdmlJs.kt (79%)
 rename visionforge-gdml/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/gdmlJVM.kt (83%)
 rename visionforge-gdml/src/jvmTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/TestConvertor.kt (90%)
 rename visionforge-gdml/src/jvmTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/gdml/bmanStatistics.kt (84%)
 delete mode 100644 visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt
 rename visionforge-plotly/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/plotly/PlotlyPlugin.kt (63%)
 create mode 100644 visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/VisionOfPlotly.kt
 rename visionforge-plotly/src/jsMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/plotly/plotlyJs.kt (70%)
 rename visionforge-plotly/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/plotly/plotlyHeaders.kt (65%)
 rename visionforge-plotly/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/plotly/plotlyJvm.kt (65%)
 rename visionforge-server/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/three/server/VisionServer.kt (88%)
 delete mode 100644 visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Controls.kt
 delete mode 100644 visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Light.kt
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/Box.kt (86%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/ColorAccessor.kt (67%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/Composite.kt (89%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/ConeSegment.kt (94%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/Convex.kt (82%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/Extruded.kt (93%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/GeometryBuilder.kt (94%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/PolyLine.kt (62%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/Solid.kt (88%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/SolidBase.kt (71%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/SolidGroup.kt (93%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/SolidLabel.kt (70%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/SolidMaterial.kt (82%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/SolidReference.kt (95%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/Solids.kt (86%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/Sphere.kt (90%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/SphereLayer.kt (93%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/Tube.kt (95%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/geometry.kt (84%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/specifications/Axes.kt (59%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/specifications/Camera.kt (78%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/specifications/Canvas3DOptions.kt (86%)
 create mode 100644 visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Controls.kt
 create mode 100644 visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Light.kt
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/transform/RemoveSingleChild.kt (88%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/transform/UnRef.kt (78%)
 rename visionforge-solid/src/commonMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/transform/VisualTreeTransform.kt (89%)
 rename visionforge-solid/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/CompositeTest.kt (89%)
 rename visionforge-solid/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/ConvexTest.kt (76%)
 rename visionforge-solid/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/GroupTest.kt (91%)
 rename visionforge-solid/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/PropertyTest.kt (92%)
 rename visionforge-solid/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/SerializationTest.kt (83%)
 rename visionforge-solid/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/SolidPluginTest.kt (78%)
 rename visionforge-solid/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/SolidReferenceTest.kt (80%)
 rename visionforge-solid/src/commonTest/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/VisionUpdateTest.kt (89%)
 rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/MeshThreeFactory.kt (89%)
 rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeBoxFactory.kt (72%)
 rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeCanvas.kt (91%)
 rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeCanvasLabelFactory.kt (88%)
 rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeCompositeFactory.kt (86%)
 rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeConvexFactory.kt (77%)
 rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeCylinderFactory.kt (88%)
 rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeFactory.kt (79%)
 rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeGeometryBuilder.kt (84%)
 rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeLabelFactory.kt (78%)
 rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeLineFactory.kt (75%)
 rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeMaterials.kt (93%)
 rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreePlugin.kt (95%)
 rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeReferenceFactory.kt (82%)
 rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeSphereFactory.kt (85%)
 rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/ThreeVision.kt (69%)
 rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/csg.kt (100%)
 rename visionforge-threejs/src/main/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/solid/three/three.kt (88%)
 delete mode 100644 visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
 create mode 100644 visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt
 rename visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/{hep/dataforge/vision => space/kscience/visionforge}/three/server/serverExtensions.kt (62%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 47055ee3..12a8077e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     kotlin("jupyter.api") apply false
 }
 
-val dataforgeVersion by extra("0.3.0")
+val dataforgeVersion by extra("0.4.0-dev-2")
 val ktorVersion by extra(ru.mipt.npm.gradle.KScienceVersions.ktorVersion)
 val htmlVersion by extra(ru.mipt.npm.gradle.KScienceVersions.htmlVersion)
 val kotlinWrappersVersion by extra("pre.148-kotlin-1.4.30")
@@ -22,7 +22,7 @@ allprojects {
     }
 
     group = "hep.dataforge"
-    version = "0.2.0-dev-6"
+    version = "0.2.0-dev-7"
 }
 
 val githubProject by extra("visionforge")
@@ -30,10 +30,16 @@ val bintrayRepo by extra("dataforge")
 
 subprojects {
     if (name.startsWith("visionforge")) {
-        plugins.apply("ru.mipt.npm.gradle.publish")
+        plugins.apply("maven-publish")
     }
 }
 
+ksciencePublish{
+    github("visionforge")
+    space()
+    sonatype()
+}
+
 apiValidation {
     validationDisabled = true
     ignoredPackages.add("info.laht.threekt")
diff --git a/demo/gdml/build.gradle.kts b/demo/gdml/build.gradle.kts
index 1246edad..e4fef51e 100644
--- a/demo/gdml/build.gradle.kts
+++ b/demo/gdml/build.gradle.kts
@@ -39,11 +39,11 @@ kotlin {
 }
 
 application {
-    mainClass.set("hep.dataforge.vision.gdml.demo.GdmlFxDemoAppKt")
+    mainClass.set("space.kscience.visionforge.gdml.demo.GdmlFxDemoAppKt")
 }
 
 val convertGdmlToJson by tasks.creating(JavaExec::class) {
     group = "application"
     classpath = sourceSets["main"].runtimeClasspath
-    main = "hep.dataforge.vis.spatial.gdml.demo.SaveToJsonKt"
+    main = "space.kscience.dataforge.vis.spatial.gdml.demo.SaveToJsonKt"
 }
\ No newline at end of file
diff --git a/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt b/demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/GDMLVisualTest.kt
similarity index 67%
rename from demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt
rename to demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/GDMLVisualTest.kt
index 728c592c..c0587c2e 100644
--- a/demo/gdml/src/commonTest/kotlin/hep/dataforge/vision/gdml/GDMLVisualTest.kt
+++ b/demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/GDMLVisualTest.kt
@@ -1,11 +1,11 @@
-package hep.dataforge.vision.gdml
+package space.kscience.visionforge.gdml
 
-import hep.dataforge.meta.string
-import hep.dataforge.names.toName
-import hep.dataforge.values.asValue
-import hep.dataforge.vision.gdml.GdmlShowcase.cubes
-import hep.dataforge.vision.setProperty
-import hep.dataforge.vision.solid.SolidMaterial
+import space.kscience.dataforge.meta.string
+import space.kscience.dataforge.names.toName
+import space.kscience.dataforge.values.asValue
+import space.kscience.visionforge.gdml.GdmlShowcase.cubes
+import space.kscience.visionforge.setProperty
+import space.kscience.visionforge.solid.SolidMaterial
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
similarity index 81%
rename from demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
rename to demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
index 13d68ab2..9d60eaf4 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
@@ -1,18 +1,5 @@
-package hep.dataforge.vision.gdml.demo
+package space.kscience.visionforge.gdml.demo
 
-import hep.dataforge.context.Context
-import hep.dataforge.names.Name
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.bootstrap.gridRow
-import hep.dataforge.vision.bootstrap.nameCrumbs
-import hep.dataforge.vision.bootstrap.threeControls
-import hep.dataforge.vision.gdml.toVision
-import hep.dataforge.vision.react.ThreeCanvasComponent
-import hep.dataforge.vision.react.flexColumn
-import hep.dataforge.vision.solid.Solid
-import hep.dataforge.vision.solid.Solids
-import hep.dataforge.vision.solid.specifications.Canvas3DOptions
-import hep.dataforge.vision.solid.three.ThreeCanvas
 import kotlinx.browser.window
 import kotlinx.css.*
 import org.w3c.files.FileReader
@@ -22,8 +9,21 @@ import react.child
 import react.dom.h1
 import react.functionalComponent
 import react.useState
+import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.names.Name
 import space.kscience.gdml.Gdml
 import space.kscience.gdml.decodeFromString
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.bootstrap.gridRow
+import space.kscience.visionforge.bootstrap.nameCrumbs
+import space.kscience.visionforge.bootstrap.threeControls
+import space.kscience.visionforge.gdml.toVision
+import space.kscience.visionforge.react.ThreeCanvasComponent
+import space.kscience.visionforge.react.flexColumn
+import space.kscience.visionforge.solid.Solid
+import space.kscience.visionforge.solid.Solids
+import space.kscience.visionforge.solid.specifications.Canvas3DOptions
+import space.kscience.visionforge.solid.three.ThreeCanvas
 import styled.css
 import styled.styledDiv
 
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt
similarity index 66%
rename from demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
rename to demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt
index 93c5e0bf..31f4645b 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlJsDemoApp.kt
+++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt
@@ -1,15 +1,15 @@
-package hep.dataforge.vision.gdml.demo
+package space.kscience.visionforge.gdml.demo
 
-import hep.dataforge.context.Global
-import hep.dataforge.vision.Application
-import hep.dataforge.vision.bootstrap.useBootstrap
-import hep.dataforge.vision.gdml.GdmlShowcase
-import hep.dataforge.vision.gdml.toVision
-import hep.dataforge.vision.solid.three.ThreePlugin
-import hep.dataforge.vision.startApplication
 import kotlinx.browser.document
 import react.child
 import react.dom.render
+import space.kscience.dataforge.context.Global
+import space.kscience.visionforge.Application
+import space.kscience.visionforge.bootstrap.useBootstrap
+import space.kscience.visionforge.gdml.GdmlShowcase
+import space.kscience.visionforge.gdml.toVision
+import space.kscience.visionforge.solid.three.ThreePlugin
+import space.kscience.visionforge.startApplication
 
 
 private class GDMLDemoApp : Application {
diff --git a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/fileDrop.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/fileDrop.kt
similarity index 93%
rename from demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/fileDrop.kt
rename to demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/fileDrop.kt
index 4bf47c85..dcd7b4eb 100644
--- a/demo/gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/demo/fileDrop.kt
+++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/fileDrop.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.vision.gdml.demo
+package space.kscience.visionforge.gdml.demo
 
 import drop.FileDrop
 import kotlinx.css.*
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt b/demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlFxDemoApp.kt
similarity index 76%
rename from demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
rename to demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlFxDemoApp.kt
index a4a75780..544d8a7f 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/GdmlFxDemoApp.kt
+++ b/demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlFxDemoApp.kt
@@ -1,19 +1,19 @@
-package hep.dataforge.vision.gdml.demo
+package space.kscience.visionforge.gdml.demo
 
-import hep.dataforge.context.Global
-import hep.dataforge.vision.VisionManager
-import hep.dataforge.vision.describedProperties
-import hep.dataforge.vision.editor.VisualObjectEditorFragment
-import hep.dataforge.vision.editor.VisualObjectTreeFragment
-import hep.dataforge.vision.gdml.GdmlShowcase.cubes
-import hep.dataforge.vision.gdml.toVision
-import hep.dataforge.vision.solid.FX3DPlugin
-import hep.dataforge.vision.solid.FXCanvas3D
-import hep.dataforge.vision.solid.Solid
-import hep.dataforge.vision.solid.SolidMaterial
 import javafx.geometry.Orientation
 import javafx.scene.Parent
 import javafx.stage.FileChooser
+import space.kscience.dataforge.context.Global
+import space.kscience.visionforge.VisionManager
+import space.kscience.visionforge.describedProperties
+import space.kscience.visionforge.editor.VisualObjectEditorFragment
+import space.kscience.visionforge.editor.VisualObjectTreeFragment
+import space.kscience.visionforge.gdml.GdmlShowcase.cubes
+import space.kscience.visionforge.gdml.toVision
+import space.kscience.visionforge.solid.FX3DPlugin
+import space.kscience.visionforge.solid.FXCanvas3D
+import space.kscience.visionforge.solid.Solid
+import space.kscience.visionforge.solid.SolidMaterial
 import tornadofx.*
 
 class GDMLDemoApp : App(GDMLView::class)
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt b/demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/readFile.kt
similarity index 81%
rename from demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
rename to demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/readFile.kt
index 2f8ec999..933fac3c 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/readFile.kt
+++ b/demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/readFile.kt
@@ -1,11 +1,11 @@
-package hep.dataforge.vision.gdml.demo
+package space.kscience.visionforge.gdml.demo
 
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionManager
-import hep.dataforge.vision.gdml.toVision
+import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.gdml.Gdml
 import space.kscience.gdml.decodeFromFile
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.VisionManager
+import space.kscience.visionforge.gdml.toVision
 import java.io.File
 import java.util.zip.GZIPInputStream
 import java.util.zip.ZipInputStream
diff --git a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt b/demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/saveToJson.kt
similarity index 86%
rename from demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt
rename to demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/saveToJson.kt
index 09568da2..9e4c04b1 100644
--- a/demo/gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/demo/saveToJson.kt
+++ b/demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/saveToJson.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.gdml.demo
+package space.kscience.visionforge.gdml.demo
 
-import hep.dataforge.vision.gdml.toVision
-import hep.dataforge.vision.solid.Solids
 import space.kscience.gdml.Gdml
 import space.kscience.gdml.LUnit
 import space.kscience.gdml.decodeFromFile
+import space.kscience.visionforge.gdml.toVision
+import space.kscience.visionforge.solid.Solids
 import java.io.File
 import java.nio.file.Paths
 
diff --git a/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt b/demo/gdml/src/jvmTest/kotlin/space/kscience/visionforge/solid/FileSerializationTest.kt
similarity index 80%
rename from demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt
rename to demo/gdml/src/jvmTest/kotlin/space/kscience/visionforge/solid/FileSerializationTest.kt
index 1d3c686e..cd45a97b 100644
--- a/demo/gdml/src/jvmTest/kotlin/hep/dataforge/vision/solid/FileSerializationTest.kt
+++ b/demo/gdml/src/jvmTest/kotlin/space/kscience/visionforge/solid/FileSerializationTest.kt
@@ -1,7 +1,7 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.names.asName
 import org.junit.jupiter.api.Test
+import space.kscience.dataforge.names.asName
 import kotlin.test.Ignore
 
 class FileSerializationTest {
diff --git a/demo/jupyter-playground/build.gradle.kts b/demo/jupyter-playground/build.gradle.kts
index 3f4206af..e467f49b 100644
--- a/demo/jupyter-playground/build.gradle.kts
+++ b/demo/jupyter-playground/build.gradle.kts
@@ -32,7 +32,7 @@ tasks.withType<Test> {
 }
 
 tasks.processJupyterApiResources {
-    libraryProducers = listOf("hep.dataforge.playground.VisionForgePlayGroundForJupyter")
+    libraryProducers = listOf("space.kscience.dataforge.playground.VisionForgePlayGroundForJupyter")
 }
 
 tasks.findByName("shadowJar")?.dependsOn("processJupyterApiResources")
\ No newline at end of file
diff --git a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
index f9ddea35..58304bd2 100644
--- a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
+++ b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
@@ -1,28 +1,28 @@
-package hep.dataforge.playground
+package space.kscience.dataforge.playground
 
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionForge
-import hep.dataforge.vision.gdml.toVision
-import hep.dataforge.vision.html.HtmlVisionFragment
-import hep.dataforge.vision.html.Page
-import hep.dataforge.vision.html.embedVisionFragment
-import hep.dataforge.vision.html.fragment
-import hep.dataforge.vision.plotly.toVision
-import hep.dataforge.vision.plotly.usePlotly
-import hep.dataforge.vision.plugins
-import hep.dataforge.vision.solid.Solids
-import hep.dataforge.vision.visionManager
 import kotlinx.html.div
 import kotlinx.html.id
 import kotlinx.html.script
 import kotlinx.html.stream.createHTML
 import kotlinx.html.unsafe
-import kscience.plotly.Plot
 import org.jetbrains.kotlinx.jupyter.api.HTML
 import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
 import org.jetbrains.kotlinx.jupyter.api.libraries.*
+import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.gdml.Gdml
+import space.kscience.plotly.Plot
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.VisionForge
+import space.kscience.visionforge.gdml.toVision
+import space.kscience.visionforge.html.HtmlVisionFragment
+import space.kscience.visionforge.html.Page
+import space.kscience.visionforge.html.embedVisionFragment
+import space.kscience.visionforge.html.fragment
+import space.kscience.visionforge.plotly.toVision
+import space.kscience.visionforge.plotly.usePlotly
+import space.kscience.visionforge.plugins
+import space.kscience.visionforge.solid.Solids
+import space.kscience.visionforge.visionManager
 
 @JupyterLibrary
 @DFExperimental
@@ -57,12 +57,12 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
 
         import(
             "space.kscience.gdml.*",
-            "kscience.plotly.*",
-            "kscience.plotly.models.*",
+            "space.kscience.plotly.*",
+            "space.kscience.plotly.models.*",
             "kotlinx.html.*",
-            "hep.dataforge.vision.solid.*",
-            "hep.dataforge.vision.html.Page",
-            "hep.dataforge.vision.html.page"
+            "space.kscience.visionforge.solid.*",
+            "space.kscience.visionforge.html.Page",
+            "space.kscience.visionforge.html.page"
         )
 
         import<VisionForge>()
@@ -90,7 +90,7 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
             HTML(produceHtmlVisionString(fragment))
         }
 
-        render<kscience.plotly.HtmlFragment> { fragment ->
+        render<space.kscience.plotly.PlotlyHtmlFragment> { fragment ->
             HTML(createHTML().apply(fragment.visit).finalize())
         }
 
diff --git a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Event.kt b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Event.kt
index 3d64e67a..b47c2b66 100644
--- a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Event.kt
+++ b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Event.kt
@@ -1,7 +1,7 @@
 package ru.mipt.npm.muon.monitor
 
-import hep.dataforge.vision.solid.Point3D
 import kotlinx.serialization.Serializable
+import space.kscience.visionforge.solid.Point3D
 
 typealias Track = List<Point3D>
 
diff --git a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt
index b4b883fc..43f13028 100644
--- a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt
+++ b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt
@@ -1,10 +1,10 @@
 package ru.mipt.npm.muon.monitor
 
-import hep.dataforge.vision.removeAll
-import hep.dataforge.vision.solid.*
 import ru.mipt.npm.muon.monitor.Monitor.CENTRAL_LAYER_Z
 import ru.mipt.npm.muon.monitor.Monitor.LOWER_LAYER_Z
 import ru.mipt.npm.muon.monitor.Monitor.UPPER_LAYER_Z
+import space.kscience.visionforge.removeAll
+import space.kscience.visionforge.solid.*
 import kotlin.math.PI
 
 class Model {
diff --git a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Monitor.kt b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Monitor.kt
index e526c131..e87a2abc 100644
--- a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Monitor.kt
+++ b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Monitor.kt
@@ -1,9 +1,9 @@
 package ru.mipt.npm.muon.monitor
 
-import hep.dataforge.vision.solid.Point3D
-import hep.dataforge.vision.solid.plus
 import ru.mipt.npm.muon.monitor.Monitor.PIXEL_XY_SIZE
 import ru.mipt.npm.muon.monitor.Monitor.PIXEL_Z_SIZE
+import space.kscience.visionforge.solid.Point3D
+import space.kscience.visionforge.solid.plus
 
 /**
  * A single pixel
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
index 7e146287..8eb251ad 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
@@ -1,21 +1,5 @@
 package ru.mipt.npm.muon.monitor
 
-import hep.dataforge.context.Context
-import hep.dataforge.names.Name
-import hep.dataforge.names.NameToken
-import hep.dataforge.names.isEmpty
-import hep.dataforge.names.length
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.bootstrap.canvasControls
-import hep.dataforge.vision.bootstrap.card
-import hep.dataforge.vision.bootstrap.gridRow
-import hep.dataforge.vision.bootstrap.visionPropertyEditor
-import hep.dataforge.vision.react.ThreeCanvasComponent
-import hep.dataforge.vision.react.flexColumn
-import hep.dataforge.vision.react.objectTree
-import hep.dataforge.vision.solid.specifications.Camera
-import hep.dataforge.vision.solid.specifications.Canvas3DOptions
-import hep.dataforge.vision.solid.three.ThreeCanvas
 import io.ktor.client.HttpClient
 import io.ktor.client.request.get
 import kotlinx.coroutines.GlobalScope
@@ -27,6 +11,22 @@ import react.child
 import react.dom.*
 import react.functionalComponent
 import react.useState
+import space.kscience.dataforge.context.Context
+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.Vision
+import space.kscience.visionforge.bootstrap.canvasControls
+import space.kscience.visionforge.bootstrap.card
+import space.kscience.visionforge.bootstrap.gridRow
+import space.kscience.visionforge.bootstrap.visionPropertyEditor
+import space.kscience.visionforge.react.ThreeCanvasComponent
+import space.kscience.visionforge.react.flexColumn
+import space.kscience.visionforge.react.objectTree
+import space.kscience.visionforge.solid.specifications.Camera
+import space.kscience.visionforge.solid.specifications.Canvas3DOptions
+import space.kscience.visionforge.solid.three.ThreeCanvas
 import styled.css
 import styled.styledDiv
 import kotlin.math.PI
@@ -154,7 +154,7 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                                 +"World"
                                 attrs {
                                     onClickFunction = {
-                                        selected = hep.dataforge.names.Name.EMPTY
+                                        selected = space.kscience.dataforge.names.Name.EMPTY
                                     }
                                 }
                             }
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
index 0ec1c8a3..1047047d 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
@@ -1,15 +1,15 @@
 package ru.mipt.npm.muon.monitor
 
-import hep.dataforge.context.Global
-import hep.dataforge.vision.Application
-import hep.dataforge.vision.bootstrap.useBootstrap
-import hep.dataforge.vision.startApplication
 import io.ktor.client.HttpClient
 import io.ktor.client.features.json.JsonFeature
 import io.ktor.client.features.json.serializer.KotlinxSerializer
 import kotlinx.browser.document
 import react.child
 import react.dom.render
+import space.kscience.dataforge.context.Global
+import space.kscience.visionforge.Application
+import space.kscience.visionforge.bootstrap.useBootstrap
+import space.kscience.visionforge.startApplication
 
 private class MMDemoApp : Application {
 
diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
index 0b66e091..aa9dbbb2 100644
--- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
+++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
@@ -1,10 +1,10 @@
 package ru.mipt.npm.muon.monitor.server
 
 
-import hep.dataforge.context.Context
-import hep.dataforge.context.Global
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.solid.Solids
+import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.context.Global
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.solid.Solids
 import io.ktor.application.Application
 import io.ktor.application.call
 import io.ktor.application.install
diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt
index afa017d1..ca82dc87 100644
--- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt
+++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt
@@ -1,6 +1,6 @@
 package ru.mipt.npm.muon.monitor.sim
 
-import hep.dataforge.vision.solid.Point3D
+import space.kscience.visionforge.solid.Point3D
 import org.apache.commons.math3.geometry.euclidean.threed.Line
 import org.apache.commons.math3.geometry.euclidean.threed.Plane
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D
diff --git a/demo/playground/src/jsMain/kotlin/playgroundMain.kt b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
index 6f397312..a49fb3b2 100644
--- a/demo/playground/src/jsMain/kotlin/playgroundMain.kt
+++ b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
@@ -1,8 +1,8 @@
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.VisionForge
-import hep.dataforge.vision.plotly.usePlotly
-import hep.dataforge.vision.solid.three.useThreeJs
 import kotlinx.browser.window
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.VisionForge
+import space.kscience.visionforge.plotly.usePlotly
+import space.kscience.visionforge.solid.three.useThreeJs
 
 @DFExperimental
 fun main(): Unit = VisionForge.run{
diff --git a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
index a486511b..823a8f19 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
@@ -1,13 +1,13 @@
-package hep.dataforge.vision.examples
+package space.kscience.visionforge.examples
 
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.VisionForge
-import hep.dataforge.vision.gdml.GdmlShowcase.cubes
-import hep.dataforge.vision.gdml.toVision
-import hep.dataforge.vision.html.ResourceLocation
-import hep.dataforge.vision.html.fragment
-import hep.dataforge.vision.invoke
-import hep.dataforge.vision.solid.Solids
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.VisionForge
+import space.kscience.visionforge.gdml.GdmlShowcase.cubes
+import space.kscience.visionforge.gdml.toVision
+import space.kscience.visionforge.html.ResourceLocation
+import space.kscience.visionforge.html.fragment
+import space.kscience.visionforge.invoke
+import space.kscience.visionforge.solid.Solids
 
 @DFExperimental
 fun main() = VisionForge(Solids) {
diff --git a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
index 416e83d1..9ab231e6 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
@@ -1,15 +1,15 @@
-package hep.dataforge.vision.examples
+package space.kscience.visionforge.examples
 
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.VisionForge
-import hep.dataforge.vision.gdml.toVision
-import hep.dataforge.vision.html.ResourceLocation
-import hep.dataforge.vision.html.fragment
-import hep.dataforge.vision.invoke
-import hep.dataforge.vision.solid.Solids
+import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.gdml.Gdml
 import space.kscience.gdml.LUnit
 import space.kscience.gdml.decodeFromStream
+import space.kscience.visionforge.VisionForge
+import space.kscience.visionforge.gdml.toVision
+import space.kscience.visionforge.html.ResourceLocation
+import space.kscience.visionforge.html.fragment
+import space.kscience.visionforge.invoke
+import space.kscience.visionforge.solid.Solids
 
 @DFExperimental
 fun main() = VisionForge(Solids) {
diff --git a/demo/playground/src/jvmMain/kotlin/generateSchema.kt b/demo/playground/src/jvmMain/kotlin/generateSchema.kt
index 1b48dbc8..75c6f9cd 100644
--- a/demo/playground/src/jvmMain/kotlin/generateSchema.kt
+++ b/demo/playground/src/jvmMain/kotlin/generateSchema.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.examples
+package space.kscience.visionforge.examples
 
 import com.github.ricky12awesome.jss.encodeToSchema
-import hep.dataforge.vision.solid.SolidGroup
-import hep.dataforge.vision.solid.Solids
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
+import space.kscience.visionforge.solid.SolidGroup
+import space.kscience.visionforge.solid.Solids
 
 @ExperimentalSerializationApi
 fun main() {
diff --git a/demo/playground/src/jvmMain/kotlin/plotlyVision.kt b/demo/playground/src/jvmMain/kotlin/plotlyVision.kt
index 0341e73f..7da3d09b 100644
--- a/demo/playground/src/jvmMain/kotlin/plotlyVision.kt
+++ b/demo/playground/src/jvmMain/kotlin/plotlyVision.kt
@@ -1,13 +1,13 @@
-package hep.dataforge.vision.examples
+package space.kscience.visionforge.examples
 
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.VisionForge
-import hep.dataforge.vision.html.ResourceLocation
-import hep.dataforge.vision.html.fragment
-import hep.dataforge.vision.invoke
-import hep.dataforge.vision.plotly.PlotlyPlugin
-import hep.dataforge.vision.plotly.plotly
-import kscience.plotly.scatter
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.plotly.scatter
+import space.kscience.visionforge.VisionForge
+import space.kscience.visionforge.html.ResourceLocation
+import space.kscience.visionforge.html.fragment
+import space.kscience.visionforge.invoke
+import space.kscience.visionforge.plotly.PlotlyPlugin
+import space.kscience.visionforge.plotly.plotly
 
 @DFExperimental
 fun main() = VisionForge(PlotlyPlugin) {
diff --git a/demo/playground/src/jvmMain/kotlin/randomSpheres.kt b/demo/playground/src/jvmMain/kotlin/randomSpheres.kt
index 9526d318..04027052 100644
--- a/demo/playground/src/jvmMain/kotlin/randomSpheres.kt
+++ b/demo/playground/src/jvmMain/kotlin/randomSpheres.kt
@@ -1,12 +1,12 @@
-package hep.dataforge.vision.examples
+package space.kscience.visionforge.examples
 
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.VisionForge
-import hep.dataforge.vision.html.ResourceLocation
-import hep.dataforge.vision.html.fragment
-import hep.dataforge.vision.invoke
-import hep.dataforge.vision.solid.*
 import kotlinx.html.h1
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.VisionForge
+import space.kscience.visionforge.html.ResourceLocation
+import space.kscience.visionforge.html.fragment
+import space.kscience.visionforge.invoke
+import space.kscience.visionforge.solid.*
 import java.nio.file.Paths
 import kotlin.random.Random
 
diff --git a/demo/playground/src/jvmMain/kotlin/serverExtensions.kt b/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
index d5bfc0b4..285a14a2 100644
--- a/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
+++ b/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
@@ -1,15 +1,15 @@
-package hep.dataforge.vision.examples
+package space.kscience.visionforge.examples
 
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionForge
-import hep.dataforge.vision.html.HtmlVisionFragment
-import hep.dataforge.vision.html.ResourceLocation
-import hep.dataforge.vision.html.page
-import hep.dataforge.vision.html.scriptHeader
-import hep.dataforge.vision.makeFile
-import hep.dataforge.vision.three.server.VisionServer
-import hep.dataforge.vision.three.server.useScript
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.VisionForge
+import space.kscience.visionforge.html.HtmlVisionFragment
+import space.kscience.visionforge.html.ResourceLocation
+import space.kscience.visionforge.html.page
+import space.kscience.visionforge.html.scriptHeader
+import space.kscience.visionforge.makeFile
+import space.kscience.visionforge.three.server.VisionServer
+import space.kscience.visionforge.three.server.useScript
 import java.awt.Desktop
 import java.nio.file.Path
 
diff --git a/demo/playground/src/jvmMain/kotlin/simpleCube.kt b/demo/playground/src/jvmMain/kotlin/simpleCube.kt
index 519738d7..3a90cfb8 100644
--- a/demo/playground/src/jvmMain/kotlin/simpleCube.kt
+++ b/demo/playground/src/jvmMain/kotlin/simpleCube.kt
@@ -1,13 +1,13 @@
-package hep.dataforge.vision.examples
+package space.kscience.visionforge.examples
 
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.VisionForge
-import hep.dataforge.vision.html.ResourceLocation
-import hep.dataforge.vision.html.fragment
-import hep.dataforge.vision.invoke
-import hep.dataforge.vision.solid.Solids
-import hep.dataforge.vision.solid.box
-import hep.dataforge.vision.solid.solid
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.VisionForge
+import space.kscience.visionforge.html.ResourceLocation
+import space.kscience.visionforge.html.fragment
+import space.kscience.visionforge.invoke
+import space.kscience.visionforge.solid.Solids
+import space.kscience.visionforge.solid.box
+import space.kscience.visionforge.solid.solid
 
 @DFExperimental
 fun main() = VisionForge(Solids) {
diff --git a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt
index 76ac5391..c747f89b 100644
--- a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt
+++ b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/geometry.kt
@@ -1,10 +1,10 @@
 package ru.mipt.npm.sat
 
-import hep.dataforge.meta.set
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.solid.*
-import hep.dataforge.vision.style
-import hep.dataforge.vision.useStyle
+import space.kscience.dataforge.meta.set
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.solid.*
+import space.kscience.visionforge.style
+import space.kscience.visionforge.useStyle
 import kotlin.math.PI
 
 @DFExperimental
diff --git a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
index 242d29d5..6651cc13 100644
--- a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
+++ b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
@@ -1,17 +1,17 @@
 package ru.mipt.npm.sat
 
 
-import hep.dataforge.context.Global
-import hep.dataforge.names.toName
-import hep.dataforge.vision.solid.*
-import hep.dataforge.vision.three.server.*
-import hep.dataforge.vision.visionManager
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.html.div
 import kotlinx.html.h1
+import space.kscience.dataforge.context.Global
+import space.kscience.dataforge.names.toName
+import space.kscience.visionforge.solid.*
+import space.kscience.visionforge.three.server.*
+import space.kscience.visionforge.visionManager
 import kotlin.random.Random
 
 fun main() {
diff --git a/demo/solid-showcase/build.gradle.kts b/demo/solid-showcase/build.gradle.kts
index 6cdec7f0..a4b38e82 100644
--- a/demo/solid-showcase/build.gradle.kts
+++ b/demo/solid-showcase/build.gradle.kts
@@ -44,5 +44,5 @@ kotlin {
 }
 
 application {
-    mainClassName = "hep.dataforge.vision.solid.demo.FXDemoAppKt"
+    mainClassName = "space.kscience.visionforge.solid.demo.FXDemoAppKt"
 }
\ No newline at end of file
diff --git a/demo/solid-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt b/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt
similarity index 91%
rename from demo/solid-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
rename to demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt
index 6ede2c08..c5cf2a56 100644
--- a/demo/solid-showcase/src/commonMain/kotlin/hep/dataforge/vision/solid/demo/demo.kt
+++ b/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt
@@ -1,14 +1,14 @@
-package hep.dataforge.vision.solid.demo
+package space.kscience.visionforge.solid.demo
 
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.invoke
-import hep.dataforge.names.toName
-import hep.dataforge.vision.Colors
-import hep.dataforge.vision.VisionLayout
-import hep.dataforge.vision.solid.*
-import hep.dataforge.vision.solid.specifications.Canvas3DOptions
-import hep.dataforge.vision.visible
 import kotlinx.coroutines.*
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.invoke
+import space.kscience.dataforge.names.toName
+import space.kscience.visionforge.Colors
+import space.kscience.visionforge.VisionLayout
+import space.kscience.visionforge.solid.*
+import space.kscience.visionforge.solid.specifications.Canvas3DOptions
+import space.kscience.visionforge.visible
 import kotlin.math.PI
 import kotlin.math.cos
 import kotlin.math.sin
diff --git a/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoApp.kt
similarity index 84%
rename from demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
rename to demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoApp.kt
index 8a2bcdd0..c5d2c2cf 100644
--- a/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoApp.kt
+++ b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoApp.kt
@@ -1,14 +1,14 @@
-package hep.dataforge.vision.solid.demo
+package space.kscience.visionforge.solid.demo
 
-import hep.dataforge.vision.Application
-import hep.dataforge.vision.solid.x
-import hep.dataforge.vision.solid.y
-import hep.dataforge.vision.startApplication
 import kotlinx.browser.document
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import space.kscience.visionforge.Application
+import space.kscience.visionforge.solid.x
+import space.kscience.visionforge.solid.y
+import space.kscience.visionforge.startApplication
 import kotlin.random.Random
 
 private class ThreeDemoApp : Application {
diff --git a/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt
similarity index 81%
rename from demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
rename to demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt
index 92d63d16..65dd35db 100644
--- a/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/ThreeDemoGrid.kt
+++ b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt
@@ -1,14 +1,5 @@
-package hep.dataforge.vision.solid.demo
+package space.kscience.visionforge.solid.demo
 
-import hep.dataforge.context.Global
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.get
-import hep.dataforge.meta.string
-import hep.dataforge.names.Name
-import hep.dataforge.vision.VisionLayout
-import hep.dataforge.vision.solid.Solid
-import hep.dataforge.vision.solid.three.ThreeCanvas
-import hep.dataforge.vision.solid.three.ThreePlugin
 import kotlinx.browser.document
 import kotlinx.dom.clear
 import kotlinx.html.dom.append
@@ -18,6 +9,15 @@ import kotlinx.html.style
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLDivElement
 import org.w3c.dom.HTMLElement
+import space.kscience.dataforge.context.Global
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.get
+import space.kscience.dataforge.meta.string
+import space.kscience.dataforge.names.Name
+import space.kscience.visionforge.VisionLayout
+import space.kscience.visionforge.solid.Solid
+import space.kscience.visionforge.solid.three.ThreeCanvas
+import space.kscience.visionforge.solid.three.ThreePlugin
 
 class ThreeDemoGrid(element: Element) : VisionLayout<Solid> {
     private lateinit var navigationElement: HTMLElement
diff --git a/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt
similarity index 84%
rename from demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
rename to demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt
index e90cc845..b6f0fd5c 100644
--- a/demo/solid-showcase/src/jsMain/kotlin/hep/dataforge/vision/solid/demo/VariableBox.kt
+++ b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt
@@ -1,20 +1,21 @@
-package hep.dataforge.vision.solid.demo
+package space.kscience.visionforge.solid.demo
 
-import hep.dataforge.meta.*
-import hep.dataforge.names.plus
-import hep.dataforge.names.startsWith
-import hep.dataforge.values.asValue
-import hep.dataforge.vision.getProperty
-import hep.dataforge.vision.onPropertyChange
-import hep.dataforge.vision.set
-import hep.dataforge.vision.setProperty
-import hep.dataforge.vision.solid.*
-import hep.dataforge.vision.solid.Solid.Companion.GEOMETRY_KEY
-import hep.dataforge.vision.solid.three.*
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.geometries.BoxBufferGeometry
 import info.laht.threekt.objects.Mesh
+import space.kscience.dataforge.meta.int
+import space.kscience.dataforge.meta.number
+import space.kscience.dataforge.names.plus
+import space.kscience.dataforge.names.startsWith
+import space.kscience.dataforge.values.asValue
+import space.kscience.visionforge.getProperty
+import space.kscience.visionforge.onPropertyChange
+import space.kscience.visionforge.set
+import space.kscience.visionforge.setProperty
+import space.kscience.visionforge.solid.*
+import space.kscience.visionforge.solid.Solid.Companion.GEOMETRY_KEY
+import space.kscience.visionforge.solid.three.*
 import kotlin.math.max
 
 internal fun SolidGroup.varBox(
diff --git a/demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoApp.kt b/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoApp.kt
similarity index 87%
rename from demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoApp.kt
rename to demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoApp.kt
index 0491941c..1ed557ea 100644
--- a/demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoApp.kt
+++ b/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoApp.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.vision.solid.demo
+package space.kscience.visionforge.solid.demo
 
 import javafx.stage.Stage
 import tornadofx.*
diff --git a/demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt b/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoGrid.kt
similarity index 65%
rename from demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt
rename to demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoGrid.kt
index 62b9cc20..fdcaca2e 100644
--- a/demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/FXDemoGrid.kt
+++ b/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoGrid.kt
@@ -1,15 +1,15 @@
-package hep.dataforge.vision.solid.demo
+package space.kscience.visionforge.solid.demo
 
-import hep.dataforge.context.Global
-import hep.dataforge.meta.Meta
-import hep.dataforge.names.Name
-import hep.dataforge.vision.VisionLayout
-import hep.dataforge.vision.solid.FX3DPlugin
-import hep.dataforge.vision.solid.FXCanvas3D
-import hep.dataforge.vision.solid.Solid
 import javafx.collections.FXCollections
 import javafx.scene.Parent
 import javafx.scene.control.Tab
+import space.kscience.dataforge.context.Global
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.names.Name
+import space.kscience.visionforge.VisionLayout
+import space.kscience.visionforge.solid.FX3DPlugin
+import space.kscience.visionforge.solid.FXCanvas3D
+import space.kscience.visionforge.solid.Solid
 import tornadofx.*
 
 class FXDemoGrid : View(title = "DataForge-vis FX demo"), VisionLayout<Solid> {
diff --git a/demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/MetaEditorDemo.kt b/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/MetaEditorDemo.kt
similarity index 74%
rename from demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/MetaEditorDemo.kt
rename to demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/MetaEditorDemo.kt
index 888812a4..fc231c38 100644
--- a/demo/solid-showcase/src/jvmMain/kotlin/hep/dataforge/vision/solid/demo/MetaEditorDemo.kt
+++ b/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/MetaEditorDemo.kt
@@ -1,13 +1,13 @@
-package hep.dataforge.vision.demo
+package space.kscience.visionforge.demo
 
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.asConfig
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.values.ValueType
-import hep.dataforge.vision.editor.ConfigEditor
-import hep.dataforge.vision.editor.FXMeta
-import hep.dataforge.vision.editor.MetaViewer
 import javafx.geometry.Orientation
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.asConfig
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.dataforge.values.ValueType
+import space.kscience.visionforge.editor.ConfigEditor
+import space.kscience.visionforge.editor.FXMeta
+import space.kscience.visionforge.editor.MetaViewer
 import tornadofx.*
 
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 817e2525..b85d49a3 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
-    val kotlinVersion = "1.4.30"
-    val toolsVersion = "0.8.3"
+    val kotlinVersion = "1.4.31"
+    val toolsVersion = "0.9.0"
 
     repositories {
         maven("https://repo.kotlin.link")
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/bootstrap.kt
similarity index 99%
rename from ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt
rename to ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/bootstrap.kt
index aa9ac5e1..2f924ecc 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/bootstrap.kt
+++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/bootstrap.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.vision.bootstrap
+package space.kscience.visionforge.bootstrap
 
 public fun useBootstrap(){
     kotlinext.js.require("bootstrap/dist/css/bootstrap.min.css")
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt
similarity index 93%
rename from ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
rename to ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt
index 69585627..604eaec1 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/outputConfig.kt
+++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt
@@ -1,9 +1,5 @@
-package hep.dataforge.vision.bootstrap
+package space.kscience.visionforge.bootstrap
 
-import hep.dataforge.vision.react.flexColumn
-import hep.dataforge.vision.react.flexRow
-import hep.dataforge.vision.solid.SolidGroup
-import hep.dataforge.vision.solid.three.ThreeCanvas
 import kotlinx.css.*
 import kotlinx.css.properties.border
 import kotlinx.html.InputType
@@ -18,6 +14,10 @@ import react.dom.button
 import react.dom.h3
 import react.dom.input
 import react.dom.label
+import space.kscience.visionforge.react.flexColumn
+import space.kscience.visionforge.react.flexRow
+import space.kscience.visionforge.solid.SolidGroup
+import space.kscience.visionforge.solid.three.ThreeCanvas
 import styled.css
 import styled.styledDiv
 
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/reactBootstrap.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/reactBootstrap.kt
similarity index 96%
rename from ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/reactBootstrap.kt
rename to ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/reactBootstrap.kt
index d17dcac3..dca591fe 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/reactBootstrap.kt
+++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/reactBootstrap.kt
@@ -1,8 +1,5 @@
-package hep.dataforge.vision.bootstrap
+package space.kscience.visionforge.bootstrap
 
-import hep.dataforge.names.Name
-import hep.dataforge.names.NameToken
-import hep.dataforge.names.length
 import kotlinx.html.ButtonType
 import kotlinx.html.DIV
 import kotlinx.html.id
@@ -10,6 +7,9 @@ import kotlinx.html.js.onClickFunction
 import react.RBuilder
 import react.ReactElement
 import react.dom.*
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.NameToken
+import space.kscience.dataforge.names.length
 import styled.StyledDOMBuilder
 import styled.css
 import styled.styledDiv
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/tabComponent.kt
similarity index 95%
rename from ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt
rename to ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/tabComponent.kt
index fa61d3d4..1f29be59 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/tabComponent.kt
+++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/tabComponent.kt
@@ -1,6 +1,5 @@
-package hep.dataforge.vision.bootstrap
+package space.kscience.visionforge.bootstrap
 
-import hep.dataforge.vision.react.flexColumn
 import kotlinx.html.DIV
 import kotlinx.html.classes
 import kotlinx.html.js.onClickFunction
@@ -8,6 +7,7 @@ import react.*
 import react.dom.button
 import react.dom.li
 import react.dom.ul
+import space.kscience.visionforge.react.flexColumn
 import styled.StyledDOMBuilder
 import styled.styledDiv
 
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt
similarity index 85%
rename from ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
rename to ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt
index 33b94244..a0af57aa 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/threeControls.kt
+++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt
@@ -1,15 +1,15 @@
-package hep.dataforge.vision.bootstrap
+package space.kscience.visionforge.bootstrap
 
-import hep.dataforge.names.Name
-import hep.dataforge.names.isEmpty
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionGroup
-import hep.dataforge.vision.react.objectTree
-import hep.dataforge.vision.solid.three.ThreeCanvas
 import kotlinx.css.*
 import kotlinx.css.properties.border
 import react.*
 import react.dom.h2
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.isEmpty
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.VisionGroup
+import space.kscience.visionforge.react.objectTree
+import space.kscience.visionforge.solid.three.ThreeCanvas
 import styled.css
 import styled.styledDiv
 
diff --git a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/visionPropertyEditor.kt
similarity index 80%
rename from ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
rename to ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/visionPropertyEditor.kt
index 8156c412..7f28473e 100644
--- a/ui/bootstrap/src/main/kotlin/hep/dataforge/vision/bootstrap/visionPropertyEditor.kt
+++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/visionPropertyEditor.kt
@@ -1,13 +1,13 @@
-package hep.dataforge.vision.bootstrap
+package space.kscience.visionforge.bootstrap
 
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.vision.*
-import hep.dataforge.vision.react.metaViewer
-import hep.dataforge.vision.react.propertyEditor
-        import hep.dataforge.vision.solid.SolidReference
 import org.w3c.dom.Element
 import react.RBuilder
 import react.dom.render
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.visionforge.*
+import space.kscience.visionforge.react.metaViewer
+import space.kscience.visionforge.react.propertyEditor
+import space.kscience.visionforge.solid.SolidReference
 
 public fun RBuilder.visionPropertyEditor(
     vision: Vision,
diff --git a/ui/material/src/main/kotlin/hep/dataforge/vision/material/icons.kt b/ui/material/src/main/kotlin/hep/dataforge/vision/material/icons.kt
index eae580ab..1ad3f280 100644
--- a/ui/material/src/main/kotlin/hep/dataforge/vision/material/icons.kt
+++ b/ui/material/src/main/kotlin/hep/dataforge/vision/material/icons.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.vision.material
+package space.kscience.visionforge.material
 
 //@JsModule("@material-ui/icons/ExpandMore")
 //external class ExpandMoreIcon : Component<RProps, RState>{
diff --git a/ui/material/src/main/kotlin/hep/dataforge/vision/material/misc.kt b/ui/material/src/main/kotlin/hep/dataforge/vision/material/misc.kt
index 72dcaf4a..a093c043 100644
--- a/ui/material/src/main/kotlin/hep/dataforge/vision/material/misc.kt
+++ b/ui/material/src/main/kotlin/hep/dataforge/vision/material/misc.kt
@@ -1,7 +1,7 @@
-package hep.dataforge.vision.material
+package space.kscience.visionforge.material
 
-import hep.dataforge.vision.react.component
-import hep.dataforge.vision.react.state
+import space.kscience.visionforge.react.component
+import space.kscience.visionforge.react.state
 import kotlinx.html.DIV
 import materialui.components.card.card
 import materialui.components.cardcontent.cardContent
diff --git a/ui/material/src/main/kotlin/hep/dataforge/vision/material/objectTree.kt b/ui/material/src/main/kotlin/hep/dataforge/vision/material/objectTree.kt
index 22d56684..d90d2904 100644
--- a/ui/material/src/main/kotlin/hep/dataforge/vision/material/objectTree.kt
+++ b/ui/material/src/main/kotlin/hep/dataforge/vision/material/objectTree.kt
@@ -1,13 +1,13 @@
-package hep.dataforge.vision.material
+package space.kscience.visionforge.material
 
-import hep.dataforge.names.Name
-import hep.dataforge.names.plus
-import hep.dataforge.names.toName
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionGroup
-import hep.dataforge.vision.isEmpty
-import hep.dataforge.vision.react.component
-import hep.dataforge.vision.react.state
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.plus
+import space.kscience.dataforge.names.toName
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.VisionGroup
+import space.kscience.visionforge.isEmpty
+import space.kscience.visionforge.react.component
+import space.kscience.visionforge.react.state
 import kotlinx.html.UL
 import materialui.lab.components.treeItem.treeItem
 import materialui.lab.components.treeView.SingleSelectTreeViewElementBuilder
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
similarity index 87%
rename from ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
rename to ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
index 14cb4bc1..106ebd8b 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/MetaViewer.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
@@ -1,21 +1,21 @@
-package hep.dataforge.vision.react
+package space.kscience.visionforge.react
 
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.MetaItemNode
-import hep.dataforge.meta.MetaItemValue
-import hep.dataforge.meta.descriptors.ItemDescriptor
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.meta.descriptors.defaultItem
-import hep.dataforge.meta.descriptors.get
-import hep.dataforge.meta.get
-import hep.dataforge.names.Name
-import hep.dataforge.names.NameToken
-import hep.dataforge.names.lastOrNull
-import hep.dataforge.names.plus
 import kotlinx.html.js.onClickFunction
 import org.w3c.dom.events.Event
 import react.*
 import react.dom.a
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.MetaItemNode
+import space.kscience.dataforge.meta.MetaItemValue
+import space.kscience.dataforge.meta.descriptors.ItemDescriptor
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.dataforge.meta.descriptors.defaultItem
+import space.kscience.dataforge.meta.descriptors.get
+import space.kscience.dataforge.meta.get
+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.*
 
 public external interface MetaViewerProps : RProps {
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ObjectTree.kt
similarity index 90%
rename from ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt
rename to ui/react/src/main/kotlin/space/kscience/visionforge/react/ObjectTree.kt
index 5faab7ba..d4d295c1 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ObjectTree.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ObjectTree.kt
@@ -1,15 +1,15 @@
-package hep.dataforge.vision.react
+package space.kscience.visionforge.react
 
-import hep.dataforge.names.Name
-import hep.dataforge.names.lastOrNull
-import hep.dataforge.names.plus
-import hep.dataforge.names.startsWith
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionGroup
-import hep.dataforge.vision.isEmpty
 import kotlinx.html.js.onClickFunction
 import org.w3c.dom.events.Event
 import react.*
+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.isEmpty
 import styled.*
 
 public external interface ObjectTreeProps : RProps {
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
similarity index 92%
rename from ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
rename to ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
index dbee8a29..050378a3 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/PropertyEditor.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
@@ -1,13 +1,5 @@
-package hep.dataforge.vision.react
+package space.kscience.visionforge.react
 
-import hep.dataforge.meta.*
-import hep.dataforge.meta.descriptors.*
-import hep.dataforge.names.Name
-import hep.dataforge.names.NameToken
-import hep.dataforge.names.lastOrNull
-import hep.dataforge.names.plus
-import hep.dataforge.values.Value
-import hep.dataforge.vision.hidden
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.GlobalScope
@@ -22,6 +14,17 @@ import org.w3c.dom.Element
 import org.w3c.dom.events.Event
 import react.*
 import react.dom.render
+import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.meta.descriptors.ItemDescriptor
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.dataforge.meta.descriptors.ValueDescriptor
+import space.kscience.dataforge.meta.descriptors.get
+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 space.kscience.dataforge.values.Value
+import space.kscience.visionforge.hidden
 import styled.*
 
 public external interface PropertyEditorProps : RProps {
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
similarity index 81%
rename from ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
rename to ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
index 877ce5bc..8a3758c8 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
@@ -1,16 +1,16 @@
-package hep.dataforge.vision.react
+package space.kscience.visionforge.react
 
-import hep.dataforge.context.Context
-import hep.dataforge.names.Name
-import hep.dataforge.vision.solid.Solid
-import hep.dataforge.vision.solid.specifications.Canvas3DOptions
-import hep.dataforge.vision.solid.three.ThreeCanvas
-import hep.dataforge.vision.solid.three.ThreePlugin
 import kotlinx.css.Display
 import kotlinx.css.display
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
 import react.*
+import space.kscience.dataforge.context.Context
+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
 
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/TreeStyles.kt
similarity index 98%
rename from ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt
rename to ui/react/src/main/kotlin/space/kscience/visionforge/react/TreeStyles.kt
index 16602699..654c31eb 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/TreeStyles.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/TreeStyles.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.vision.react
+package space.kscience.visionforge.react
 
 import kotlinx.css.*
 import kotlinx.css.properties.*
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/layout.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/layout.kt
similarity index 94%
rename from ui/react/src/main/kotlin/hep/dataforge/vision/react/layout.kt
rename to ui/react/src/main/kotlin/space/kscience/visionforge/react/layout.kt
index cdafb527..2f35bb24 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/layout.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/layout.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.vision.react
+package space.kscience.visionforge.react
 
 import kotlinx.css.Display
 import kotlinx.css.FlexDirection
diff --git a/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
similarity index 94%
rename from ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
rename to ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
index 6c043e19..feab99d8 100644
--- a/ui/react/src/main/kotlin/hep/dataforge/vision/react/valueChooser.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
@@ -1,11 +1,5 @@
-package hep.dataforge.vision.react
+package space.kscience.visionforge.react
 
-import hep.dataforge.meta.*
-import hep.dataforge.meta.descriptors.ValueDescriptor
-import hep.dataforge.names.Name
-import hep.dataforge.values.*
-import hep.dataforge.vision.Colors
-import hep.dataforge.vision.widgetType
 import kotlinx.html.InputType
 import kotlinx.html.js.onChangeFunction
 import kotlinx.html.js.onKeyDownFunction
@@ -14,6 +8,12 @@ import org.w3c.dom.HTMLSelectElement
 import org.w3c.dom.events.Event
 import react.*
 import react.dom.option
+import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.meta.descriptors.ValueDescriptor
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.values.*
+import space.kscience.visionforge.Colors
+import space.kscience.visionforge.widgetType
 import styled.styledInput
 import styled.styledSelect
 
diff --git a/visionforge-core/build.gradle.kts b/visionforge-core/build.gradle.kts
index 05e9d619..d33d733d 100644
--- a/visionforge-core/build.gradle.kts
+++ b/visionforge-core/build.gradle.kts
@@ -14,7 +14,7 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api("hep.dataforge:dataforge-context:$dataforgeVersion")
+                api("space.kscience:dataforge-context:$dataforgeVersion")
                 api("org.jetbrains.kotlinx:kotlinx-html:$htmlVersion")
                 api("org.jetbrains:kotlin-css:1.0.0-$kotlinWrappersVersion")
             }
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionLayout.kt b/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionLayout.kt
deleted file mode 100644
index ae86a0c8..00000000
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionLayout.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package hep.dataforge.vision
-
-import hep.dataforge.meta.Meta
-import hep.dataforge.names.Name
-
-public interface VisionLayout<in V: Vision> {
-    public fun render(name: Name, vision: V, meta: Meta = Meta.EMPTY)
-}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Colors.kt
similarity index 97%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Colors.kt
index c69e69fa..3f228272 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Colors.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Colors.kt
@@ -1,9 +1,9 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.meta.*
-import hep.dataforge.values.ValueType
-import hep.dataforge.values.int
-import hep.dataforge.values.string
+import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.values.ValueType
+import space.kscience.dataforge.values.int
+import space.kscience.dataforge.values.string
 import kotlin.math.max
 
 /**
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleReference.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleReference.kt
similarity index 84%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleReference.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleReference.kt
index 045f7879..e25315aa 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleReference.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleReference.kt
@@ -1,8 +1,8 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.MetaBuilder
-import hep.dataforge.misc.DFExperimental
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.MetaBuilder
+import space.kscience.dataforge.misc.DFExperimental
 import kotlin.properties.ReadOnlyProperty
 
 /**
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleSheet.kt
similarity index 92%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleSheet.kt
index e5f30854..cdfe2a07 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/StyleSheet.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleSheet.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.meta.*
-import hep.dataforge.names.Name
-import hep.dataforge.names.NameToken
-import hep.dataforge.names.asName
-import hep.dataforge.names.plus
+import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.NameToken
+import space.kscience.dataforge.names.asName
+import space.kscience.dataforge.names.plus
 
 /**
  * A container for styles
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt
similarity index 89%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt
index 7314b6c2..9ca20f6b 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt
@@ -1,18 +1,18 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.meta.*
-import hep.dataforge.meta.descriptors.Described
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.meta.descriptors.get
-import hep.dataforge.misc.Type
-import hep.dataforge.names.Name
-import hep.dataforge.names.asName
-import hep.dataforge.names.toName
-import hep.dataforge.vision.Vision.Companion.TYPE
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.meta.descriptors.Described
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.dataforge.meta.descriptors.get
+import space.kscience.dataforge.misc.Type
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.asName
+import space.kscience.dataforge.names.toName
+import space.kscience.visionforge.Vision.Companion.TYPE
 
 /**
  * A root type for display hierarchy
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
similarity index 87%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
index f083e2c1..8b15493f 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
@@ -1,16 +1,5 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.meta.*
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.meta.descriptors.defaultItem
-import hep.dataforge.meta.descriptors.get
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.names.Name
-import hep.dataforge.names.asName
-import hep.dataforge.names.plus
-import hep.dataforge.values.Null
-import hep.dataforge.values.ValueType
-import hep.dataforge.vision.Vision.Companion.STYLE_KEY
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.Flow
@@ -19,6 +8,17 @@ import kotlinx.coroutines.launch
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
+import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.dataforge.meta.descriptors.defaultItem
+import space.kscience.dataforge.meta.descriptors.get
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.asName
+import space.kscience.dataforge.names.plus
+import space.kscience.dataforge.values.Null
+import space.kscience.dataforge.values.ValueType
+import space.kscience.visionforge.Vision.Companion.STYLE_KEY
 import kotlin.jvm.Synchronized
 
 internal data class PropertyListener(
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionChange.kt
similarity index 94%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionChange.kt
index 9943b6aa..25e0dc8e 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionChange.kt
@@ -1,16 +1,16 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.meta.*
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.names.Name
-import hep.dataforge.names.plus
-import hep.dataforge.values.Null
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.serialization.Serializable
+import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.plus
+import space.kscience.dataforge.values.Null
 import kotlin.jvm.Synchronized
 import kotlin.time.Duration
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionForge.kt
similarity index 55%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionForge.kt
index 54332115..90158f9e 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionForge.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionForge.kt
@@ -1,8 +1,8 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.context.Context
-import hep.dataforge.context.PluginManager
-import hep.dataforge.misc.DFExperimental
+import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.context.PluginManager
+import space.kscience.dataforge.misc.DFExperimental
 
 public expect object VisionForge
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroup.kt
similarity index 93%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroup.kt
index de33a779..fa22d072 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroup.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroup.kt
@@ -1,8 +1,8 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.names.*
-import hep.dataforge.provider.Provider
 import kotlinx.coroutines.flow.Flow
+import space.kscience.dataforge.names.*
+import space.kscience.dataforge.provider.Provider
 
 public interface VisionContainer<out V : Vision> {
     public operator fun get(name: Name): V?
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt
similarity index 98%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt
index 3525ac88..f7f703ab 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt
@@ -1,12 +1,12 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.names.*
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.launch
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
+import space.kscience.dataforge.names.*
 
 
 /**
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionLayout.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionLayout.kt
new file mode 100644
index 00000000..1a0fddfc
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionLayout.kt
@@ -0,0 +1,8 @@
+package space.kscience.visionforge
+
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.names.Name
+
+public interface VisionLayout<in V: Vision> {
+    public fun render(name: Name, vision: V, meta: Meta = Meta.EMPTY)
+}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt
similarity index 89%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt
index 210906f1..65f16961 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt
@@ -1,16 +1,19 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.context.*
-import hep.dataforge.meta.*
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.names.Name
-import hep.dataforge.names.toName
 import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.modules.SerializersModule
 import kotlinx.serialization.modules.polymorphic
 import kotlinx.serialization.modules.subclass
+import space.kscience.dataforge.context.*
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.dataforge.meta.node
+import space.kscience.dataforge.meta.toJson
+import space.kscience.dataforge.meta.toMetaItem
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.toName
 import kotlin.reflect.KClass
 
 public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionPropertyContainer.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionPropertyContainer.kt
similarity index 77%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionPropertyContainer.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionPropertyContainer.kt
index a8b3ecad..68567ee3 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/VisionPropertyContainer.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionPropertyContainer.kt
@@ -1,7 +1,7 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.meta.MetaItem
-import hep.dataforge.names.Name
+import space.kscience.dataforge.meta.MetaItem
+import space.kscience.dataforge.names.Name
 
 /**
  * Property containers are used to create a symmetric behaviors for vision properties and style builders
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionFragment.kt
similarity index 71%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionFragment.kt
index 4de488c8..b57db4a5 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/HtmlVisionFragment.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionFragment.kt
@@ -1,9 +1,9 @@
-package hep.dataforge.vision.html
+package space.kscience.visionforge.html
 
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.VisionForge
 import kotlinx.html.FlowContent
 import kotlinx.html.TagConsumer
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.VisionForge
 
 public typealias HtmlFragment = TagConsumer<*>.() -> Unit
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/Page.kt
similarity index 70%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/Page.kt
index f66d38be..ac1642b8 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/Page.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/Page.kt
@@ -1,11 +1,11 @@
-package hep.dataforge.vision.html
+package space.kscience.visionforge.html
 
-import hep.dataforge.context.Context
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.VisionForge
-import hep.dataforge.vision.context
-import hep.dataforge.vision.visionManager
 import kotlinx.html.*
+import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.VisionForge
+import space.kscience.visionforge.context
+import space.kscience.visionforge.visionManager
 
 public data class Page(
     public val context: Context,
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt
similarity index 88%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt
index c1c26818..1ceaee36 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/VisionTagConsumer.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt
@@ -1,15 +1,15 @@
-package hep.dataforge.vision.html
+package space.kscience.visionforge.html
 
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.MetaBuilder
-import hep.dataforge.meta.MetaSerializer
-import hep.dataforge.meta.isEmpty
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.names.Name
-import hep.dataforge.names.toName
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionManager
 import kotlinx.html.*
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.MetaBuilder
+import space.kscience.dataforge.meta.MetaSerializer
+import space.kscience.dataforge.meta.isEmpty
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.toName
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.VisionManager
 import kotlin.collections.set
 
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/staticHtmlRender.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/staticHtmlRender.kt
similarity index 88%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/staticHtmlRender.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/staticHtmlRender.kt
index ebe63603..e246572e 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/html/staticHtmlRender.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/staticHtmlRender.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.html
+package space.kscience.visionforge.html
 
-import hep.dataforge.meta.Meta
-import hep.dataforge.names.Name
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionManager
 import kotlinx.html.*
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.names.Name
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.VisionManager
 
 
 public fun TagConsumer<*>.embedVisionFragment(
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/misc.kt
similarity index 84%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/misc.kt
index b4c3c326..8e51e537 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/misc.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/misc.kt
@@ -1,7 +1,7 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.meta.*
-import hep.dataforge.values.asValue
+import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.values.asValue
 
 @DslMarker
 public annotation class VisionBuilder
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionDescriptor.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visionDescriptor.kt
similarity index 79%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionDescriptor.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visionDescriptor.kt
index 59001d15..e058c3c6 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visionDescriptor.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visionDescriptor.kt
@@ -1,13 +1,13 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.meta.*
-import hep.dataforge.meta.descriptors.ItemDescriptor
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.meta.descriptors.ValueDescriptor
-import hep.dataforge.meta.descriptors.attributes
-import hep.dataforge.names.Name
-import hep.dataforge.values.ValueType
-import hep.dataforge.values.asValue
+import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.meta.descriptors.ItemDescriptor
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.dataforge.meta.descriptors.ValueDescriptor
+import space.kscience.dataforge.meta.descriptors.attributes
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.values.ValueType
+import space.kscience.dataforge.values.asValue
 
 private const val INHERITED_DESCRIPTOR_ATTRIBUTE = "inherited"
 private const val STYLE_DESCRIPTOR_ATTRIBUTE = "useStyles"
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/StatisticsVisitor.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visitor/StatisticsVisitor.kt
similarity index 85%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/StatisticsVisitor.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visitor/StatisticsVisitor.kt
index e4a027c9..0a60c3c0 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/StatisticsVisitor.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visitor/StatisticsVisitor.kt
@@ -1,13 +1,13 @@
-package hep.dataforge.vision.visitor
+package space.kscience.visionforge.visitor
 
-import hep.dataforge.names.Name
-import hep.dataforge.names.length
-import hep.dataforge.vision.Vision
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.length
+import space.kscience.visionforge.Vision
 import kotlin.reflect.KClass
 
 
diff --git a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/VisionVisitor.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visitor/VisionVisitor.kt
similarity index 87%
rename from visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/VisionVisitor.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visitor/VisionVisitor.kt
index 4b6e480e..0533dc4e 100644
--- a/visionforge-core/src/commonMain/kotlin/hep/dataforge/vision/visitor/VisionVisitor.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visitor/VisionVisitor.kt
@@ -1,12 +1,12 @@
-package hep.dataforge.vision.visitor
+package space.kscience.visionforge.visitor
 
-import hep.dataforge.names.Name
-import hep.dataforge.names.plus
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionGroup
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.plus
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.VisionGroup
 
 public interface VisionVisitor {
     /**
diff --git a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt b/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt
similarity index 83%
rename from visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
rename to visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt
index ae19ab16..bbbd6c8b 100644
--- a/visionforge-core/src/commonTest/kotlin/hep/dataforge/vision/html/HtmlTagTest.kt
+++ b/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt
@@ -1,12 +1,12 @@
-package hep.dataforge.vision.html
+package space.kscience.visionforge.html
 
-import hep.dataforge.meta.set
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.VisionBase
-import hep.dataforge.vision.configure
-import hep.dataforge.vision.meta
 import kotlinx.html.*
 import kotlinx.html.stream.createHTML
+import space.kscience.dataforge.meta.set
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.VisionBase
+import space.kscience.visionforge.configure
+import space.kscience.visionforge.meta
 import kotlin.test.Test
 
 @DFExperimental
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/Application.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/Application.kt
similarity index 98%
rename from visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/Application.kt
rename to visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/Application.kt
index 78f6acc8..f9ba8e46 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/Application.kt
+++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/Application.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
 import kotlinx.browser.document
 import kotlinx.dom.hasClass
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
similarity index 92%
rename from visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionClient.kt
rename to visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
index 2933f01d..85c3c9de 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
@@ -1,13 +1,5 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.context.*
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.MetaSerializer
-import hep.dataforge.vision.html.VisionTagConsumer
-import hep.dataforge.vision.html.VisionTagConsumer.Companion.OUTPUT_CONNECT_ATTRIBUTE
-import hep.dataforge.vision.html.VisionTagConsumer.Companion.OUTPUT_ENDPOINT_ATTRIBUTE
-import hep.dataforge.vision.html.VisionTagConsumer.Companion.OUTPUT_FETCH_ATTRIBUTE
-import hep.dataforge.vision.html.VisionTagConsumer.Companion.OUTPUT_NAME_ATTRIBUTE
 import kotlinx.browser.document
 import kotlinx.browser.window
 import org.w3c.dom.Element
@@ -15,6 +7,14 @@ import org.w3c.dom.WebSocket
 import org.w3c.dom.asList
 import org.w3c.dom.get
 import org.w3c.dom.url.URL
+import space.kscience.dataforge.context.*
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.MetaSerializer
+import space.kscience.visionforge.html.VisionTagConsumer
+import space.kscience.visionforge.html.VisionTagConsumer.Companion.OUTPUT_CONNECT_ATTRIBUTE
+import space.kscience.visionforge.html.VisionTagConsumer.Companion.OUTPUT_ENDPOINT_ATTRIBUTE
+import space.kscience.visionforge.html.VisionTagConsumer.Companion.OUTPUT_FETCH_ATTRIBUTE
+import space.kscience.visionforge.html.VisionTagConsumer.Companion.OUTPUT_NAME_ATTRIBUTE
 import kotlin.collections.set
 import kotlin.reflect.KClass
 
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/elementOutput.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/elementOutput.kt
similarity index 87%
rename from visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/elementOutput.kt
rename to visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/elementOutput.kt
index 809f60ef..555e4627 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/elementOutput.kt
+++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/elementOutput.kt
@@ -1,8 +1,8 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.meta.Meta
-import hep.dataforge.misc.Type
 import org.w3c.dom.Element
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.misc.Type
 
 @Type(ElementVisionRenderer.TYPE)
 public interface ElementVisionRenderer {
diff --git a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/visionForgeJs.kt
similarity index 91%
rename from visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt
rename to visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/visionForgeJs.kt
index a1f40a4d..fbcca4ec 100644
--- a/visionforge-core/src/jsMain/kotlin/hep/dataforge/vision/visionForgeJs.kt
+++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/visionForgeJs.kt
@@ -1,9 +1,9 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.context.Context
-import hep.dataforge.misc.DFExperimental
 import kotlinx.browser.document
 import kotlinx.browser.window
+import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.misc.DFExperimental
 
 @JsExport
 @DFExperimental
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/headers.kt b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/headers.kt
similarity index 97%
rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/headers.kt
rename to visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/headers.kt
index ac9f7127..6bf8be49 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/headers.kt
+++ b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/headers.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.html
+package space.kscience.visionforge.html
 
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.VisionManager
 import kotlinx.html.link
 import kotlinx.html.script
 import kotlinx.html.unsafe
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.VisionManager
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.StandardOpenOption
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/htmlExport.kt b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/htmlExport.kt
similarity index 89%
rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/htmlExport.kt
rename to visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/htmlExport.kt
index 70fe0bab..63f405c3 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/html/htmlExport.kt
+++ b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/htmlExport.kt
@@ -1,11 +1,9 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.context.Context
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.html.HtmlFragment
-import hep.dataforge.vision.html.HtmlVisionFragment
-import hep.dataforge.vision.html.Page
 import kotlinx.html.stream.createHTML
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.html.HtmlFragment
+import space.kscience.visionforge.html.Page
 import java.awt.Desktop
 import java.nio.file.Files
 import java.nio.file.Path
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visionForgeJvm.kt b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/visionForgeJvm.kt
similarity index 68%
rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visionForgeJvm.kt
rename to visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/visionForgeJvm.kt
index be2533cc..6d2802b7 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visionForgeJvm.kt
+++ b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/visionForgeJvm.kt
@@ -1,8 +1,8 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.context.Context
-import hep.dataforge.context.PluginFactory
-import hep.dataforge.misc.DFExperimental
+import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.context.PluginFactory
+import space.kscience.dataforge.misc.DFExperimental
 
 public actual object VisionForge
 
diff --git a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visitor/countDistinct.kt b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/visitor/countDistinct.kt
similarity index 88%
rename from visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visitor/countDistinct.kt
rename to visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/visitor/countDistinct.kt
index 716f888e..9c3286fe 100644
--- a/visionforge-core/src/jvmMain/kotlin/hep/dataforge/vision/visitor/countDistinct.kt
+++ b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/visitor/countDistinct.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.vision.visitor
+package space.kscience.visionforge.visitor
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/FXPlugin.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/FXPlugin.kt
similarity index 93%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/FXPlugin.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/FXPlugin.kt
index 11176bf6..5e7994ef 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/FXPlugin.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/FXPlugin.kt
@@ -1,8 +1,5 @@
-package hep.dataforge.vision
+package space.kscience.visionforge
 
-import hep.dataforge.context.*
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.boolean
 import javafx.application.Application
 import javafx.application.Platform
 import javafx.collections.FXCollections
@@ -12,6 +9,9 @@ import javafx.scene.Scene
 import javafx.scene.image.Image
 import javafx.scene.image.ImageView
 import javafx.stage.Stage
+import space.kscience.dataforge.context.*
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.boolean
 import tornadofx.*
 import kotlin.concurrent.thread
 import kotlin.reflect.KClass
@@ -46,7 +46,7 @@ public class FXPlugin(meta: Meta = Meta.EMPTY) : AbstractPlugin(meta) {
         if (FX.getApplication(FX.defaultScope) == null) {
             if (consoleMode) {
                 thread(name = "${context.name} FX application thread") {
-                    context.logger.debug("Starting FX application surrogate")
+                    context.logger.debug{"Starting FX application surrogate"}
                     launch<ApplicationSurrogate>()
                 }
 
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ColorValueChooser.kt
similarity index 77%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ColorValueChooser.kt
index 3fb053e5..442c299f 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ColorValueChooser.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ColorValueChooser.kt
@@ -1,15 +1,15 @@
-package hep.dataforge.vision.editor
+package space.kscience.visionforge.editor
 
-import hep.dataforge.meta.Meta
-import hep.dataforge.names.Name
-import hep.dataforge.names.asName
-import hep.dataforge.values.Null
-import hep.dataforge.values.Value
-import hep.dataforge.values.asValue
-import hep.dataforge.values.string
 import javafx.scene.control.ColorPicker
 import javafx.scene.paint.Color
 import org.slf4j.LoggerFactory
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.asName
+import space.kscience.dataforge.values.Null
+import space.kscience.dataforge.values.Value
+import space.kscience.dataforge.values.asValue
+import space.kscience.dataforge.values.string
 import tornadofx.*
 
 /**
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ComboBoxValueChooser.kt
similarity index 81%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ComboBoxValueChooser.kt
index dc1e80ac..a3d5c942 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ComboBoxValueChooser.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ComboBoxValueChooser.kt
@@ -3,19 +3,19 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package hep.dataforge.vision.editor
+package space.kscience.visionforge.editor
 
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.get
-import hep.dataforge.meta.value
-import hep.dataforge.names.Name
-import hep.dataforge.names.asName
-import hep.dataforge.values.Value
-import hep.dataforge.values.parseValue
-import hep.dataforge.values.string
 import javafx.collections.FXCollections
 import javafx.scene.control.ComboBox
 import javafx.util.StringConverter
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.get
+import space.kscience.dataforge.meta.value
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.asName
+import space.kscience.dataforge.values.Value
+import space.kscience.dataforge.values.parseValue
+import space.kscience.dataforge.values.string
 import java.util.*
 
 public class ComboBoxValueChooser(public val values: Collection<Value>? = null) : ValueChooserBase<ComboBox<Value>>() {
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ConfigEditor.kt
similarity index 96%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ConfigEditor.kt
index 2d48b5d1..76d32f57 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ConfigEditor.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ConfigEditor.kt
@@ -3,15 +3,10 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package hep.dataforge.vision.editor
+package space.kscience.visionforge.editor
 
 import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon
 import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView
-import hep.dataforge.context.Global
-import hep.dataforge.meta.Config
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.names.NameToken
-import hep.dataforge.vision.dfIconView
 import javafx.scene.Node
 import javafx.scene.control.*
 import javafx.scene.control.cell.TextFieldTreeTableCell
@@ -20,6 +15,11 @@ import javafx.scene.layout.HBox
 import javafx.scene.layout.Priority
 import javafx.scene.paint.Color
 import javafx.scene.text.Text
+import space.kscience.dataforge.context.Global
+import space.kscience.dataforge.meta.Config
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.dataforge.names.NameToken
+import space.kscience.visionforge.dfIconView
 import tornadofx.*
 
 /**
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/FXMeta.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/FXMeta.kt
similarity index 94%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/FXMeta.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/FXMeta.kt
index 150b5bb8..3e2cfc8d 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/FXMeta.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/FXMeta.kt
@@ -1,18 +1,18 @@
-package hep.dataforge.vision.editor
+package space.kscience.visionforge.editor
 
-import hep.dataforge.meta.*
-import hep.dataforge.meta.descriptors.ItemDescriptor
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.meta.descriptors.ValueDescriptor
-import hep.dataforge.names.*
-import hep.dataforge.values.Null
-import hep.dataforge.values.Value
 import javafx.beans.binding.ListBinding
 import javafx.beans.binding.ObjectBinding
 import javafx.beans.property.SimpleObjectProperty
 import javafx.beans.value.ObservableBooleanValue
 import javafx.beans.value.ObservableStringValue
 import javafx.collections.ObservableList
+import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.meta.descriptors.ItemDescriptor
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.dataforge.meta.descriptors.ValueDescriptor
+import space.kscience.dataforge.names.*
+import space.kscience.dataforge.values.Null
+import space.kscience.dataforge.values.Value
 import tornadofx.*
 
 /**
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/MetaViewer.kt
similarity index 92%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/MetaViewer.kt
index 88079731..1a822793 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/MetaViewer.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/MetaViewer.kt
@@ -14,15 +14,15 @@
  *  limitations under the License.
  */
 
-package hep.dataforge.vision.editor
+package space.kscience.visionforge.editor
 
-import hep.dataforge.meta.Meta
-import hep.dataforge.values.string
-import hep.dataforge.vision.dfIconView
 import javafx.beans.property.SimpleStringProperty
 import javafx.scene.control.TreeItem
 import javafx.scene.control.TreeSortMode
 import javafx.scene.control.TreeTableView
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.values.string
+import space.kscience.visionforge.dfIconView
 import tornadofx.*
 
 class MetaViewer(val rootNode: FXMetaNode<*>, title: String = "Meta viewer") : Fragment(title,
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/TextValueChooser.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/TextValueChooser.kt
similarity index 93%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/TextValueChooser.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/TextValueChooser.kt
index e6cff8fe..ea55fc83 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/TextValueChooser.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/TextValueChooser.kt
@@ -3,16 +3,16 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package hep.dataforge.vision.editor
+package space.kscience.visionforge.editor
 
-import hep.dataforge.meta.Meta
-import hep.dataforge.names.Name
-import hep.dataforge.names.asName
-import hep.dataforge.values.*
 import javafx.beans.value.ObservableValue
 import javafx.scene.control.TextField
 import javafx.scene.input.KeyCode
 import javafx.scene.input.KeyEvent
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.asName
+import space.kscience.dataforge.values.*
 import tornadofx.*
 
 class TextValueChooser : ValueChooserBase<TextField>() {
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueCallback.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueCallback.kt
similarity index 86%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueCallback.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueCallback.kt
index c7c7dd8d..32a0d741 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueCallback.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueCallback.kt
@@ -3,9 +3,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package hep.dataforge.vision.editor
+package space.kscience.visionforge.editor
 
-import hep.dataforge.values.Value
+import space.kscience.dataforge.values.Value
 
 
 /**
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooser.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooser.kt
similarity index 85%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooser.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooser.kt
index 1530484a..c3796fa0 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooser.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooser.kt
@@ -3,22 +3,22 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package hep.dataforge.vision.editor
+package space.kscience.visionforge.editor
 
-import hep.dataforge.context.Context
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.descriptors.ValueDescriptor
-import hep.dataforge.misc.Named
-import hep.dataforge.misc.Type
-import hep.dataforge.names.toName
-import hep.dataforge.provider.provideByType
-import hep.dataforge.values.Null
-import hep.dataforge.values.Value
-import hep.dataforge.vision.widget
-import hep.dataforge.vision.widgetType
 import javafx.beans.property.ObjectProperty
 import javafx.beans.value.ObservableValue
 import javafx.scene.Node
+import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.descriptors.ValueDescriptor
+import space.kscience.dataforge.misc.Named
+import space.kscience.dataforge.misc.Type
+import space.kscience.dataforge.names.toName
+import space.kscience.dataforge.provider.provideByType
+import space.kscience.dataforge.values.Null
+import space.kscience.dataforge.values.Value
+import space.kscience.visionforge.widget
+import space.kscience.visionforge.widgetType
 import tornadofx.*
 
 /**
@@ -63,7 +63,7 @@ public interface ValueChooser {
 
     public fun setCallback(callback: ValueCallback)
 
-    @Type("hep.dataforge.vis.fx.valueChooserFactory")
+    @Type("space.kscience.dataforge.vis.fx.valueChooserFactory")
     public interface Factory : Named {
         public operator fun invoke(meta: Meta = Meta.EMPTY): ValueChooser
     }
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooserBase.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooserBase.kt
similarity index 89%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooserBase.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooserBase.kt
index b05fb4fb..81dc42ac 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/ValueChooserBase.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooserBase.kt
@@ -3,14 +3,14 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package hep.dataforge.vision.editor
+package space.kscience.visionforge.editor
 
-import hep.dataforge.meta.descriptors.ValueDescriptor
-import hep.dataforge.values.Null
-import hep.dataforge.values.Value
 import javafx.beans.property.SimpleObjectProperty
 import javafx.scene.Node
 import org.slf4j.LoggerFactory
+import space.kscience.dataforge.meta.descriptors.ValueDescriptor
+import space.kscience.dataforge.values.Null
+import space.kscience.dataforge.values.Value
 import tornadofx.*
 
 /**
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisualObjectEditorFragment.kt
similarity index 87%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisualObjectEditorFragment.kt
index 762c8090..929c7e85 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectEditorFragment.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisualObjectEditorFragment.kt
@@ -1,13 +1,16 @@
-package hep.dataforge.vision.editor
+package space.kscience.visionforge.editor
 
-import hep.dataforge.meta.*
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.vision.*
 import javafx.beans.binding.Binding
 import javafx.beans.property.SimpleObjectProperty
 import javafx.scene.Node
 import javafx.scene.Parent
 import javafx.scene.layout.VBox
+import space.kscience.dataforge.meta.Config
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.MutableItemProvider
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.dataforge.meta.update
+import space.kscience.visionforge.*
 import tornadofx.*
 
 class VisualObjectEditorFragment(val selector: (Vision) -> Meta) : Fragment() {
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectTreeFragment.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisualObjectTreeFragment.kt
similarity index 93%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectTreeFragment.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisualObjectTreeFragment.kt
index 409fa1ff..f1faaf1a 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/editor/VisualObjectTreeFragment.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisualObjectTreeFragment.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.editor
+package space.kscience.visionforge.editor
 
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionGroup
 import javafx.beans.property.SimpleObjectProperty
 import javafx.scene.control.SelectionMode
 import javafx.scene.control.TreeItem
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.VisionGroup
 import tornadofx.*
 
 private fun toTreeItem(vision: Vision, title: String): TreeItem<Pair<String, Vision>> {
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt
similarity index 92%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt
index 3cf8dec4..6bd56fcf 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FX3DPlugin.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt
@@ -1,12 +1,5 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.context.*
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.boolean
-import hep.dataforge.misc.Type
-import hep.dataforge.vision.solid.FX3DFactory.Companion.TYPE
-import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY
-import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_WIREFRAME_KEY
 import javafx.scene.Group
 import javafx.scene.Node
 import javafx.scene.shape.CullFace
@@ -19,6 +12,13 @@ import org.fxyz3d.geometry.Point3D
 import org.fxyz3d.shapes.composites.PolyLine3D
 import org.fxyz3d.shapes.primitives.CuboidMesh
 import org.fxyz3d.shapes.primitives.SpheroidMesh
+import space.kscience.dataforge.context.*
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.boolean
+import space.kscience.dataforge.misc.Type
+import space.kscience.visionforge.solid.FX3DFactory.Companion.TYPE
+import space.kscience.visionforge.solid.SolidMaterial.Companion.MATERIAL_KEY
+import space.kscience.visionforge.solid.SolidMaterial.Companion.MATERIAL_WIREFRAME_KEY
 import kotlin.collections.set
 import kotlin.math.PI
 import kotlin.reflect.KClass
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCanvas3D.kt
similarity index 91%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCanvas3D.kt
index 8cef5208..171bc5a3 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCanvas3D.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCanvas3D.kt
@@ -1,14 +1,14 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.context.Context
-import hep.dataforge.context.ContextAware
-import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import javafx.application.Platform
 import javafx.beans.property.ObjectProperty
 import javafx.beans.property.SimpleObjectProperty
 import javafx.scene.*
 import javafx.scene.paint.Color
 import org.fxyz3d.scene.Axes
+import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.context.ContextAware
+import space.kscience.visionforge.solid.specifications.Canvas3DOptions
 import tornadofx.*
 
 class FXCanvas3D(
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCompositeFactory.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCompositeFactory.kt
similarity index 95%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCompositeFactory.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCompositeFactory.kt
index 4a485529..5aa7619e 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXCompositeFactory.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCompositeFactory.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
 import eu.mihosoft.jcsg.CSG
 import eu.mihosoft.jcsg.Polygon
@@ -8,8 +8,6 @@ import javafx.scene.Node
 import javafx.scene.shape.MeshView
 import javafx.scene.shape.TriangleMesh
 import javafx.scene.shape.VertexFormat
-import java.util.*
-import kotlin.collections.HashMap
 import kotlin.reflect.KClass
 
 private fun MeshView.toCSG(): CSG {
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXConvexFactory.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXConvexFactory.kt
similarity index 92%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXConvexFactory.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXConvexFactory.kt
index f8f6fc32..f2bbba54 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXConvexFactory.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXConvexFactory.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
 import eu.mihosoft.jcsg.PropertyStorage
 import eu.mihosoft.jcsg.ext.quickhull3d.HullUtil
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXMaterials.kt
similarity index 88%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXMaterials.kt
index 3f384f63..aa02d1ca 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXMaterials.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXMaterials.kt
@@ -1,13 +1,13 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.meta.*
-import hep.dataforge.values.ValueType
-import hep.dataforge.values.int
-import hep.dataforge.values.string
-import hep.dataforge.vision.Colors
 import javafx.scene.paint.Color
 import javafx.scene.paint.Material
 import javafx.scene.paint.PhongMaterial
+import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.values.ValueType
+import space.kscience.dataforge.values.int
+import space.kscience.dataforge.values.string
+import space.kscience.visionforge.Colors
 
 public object FXMaterials {
     public val RED: PhongMaterial = PhongMaterial().apply {
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXReferenceFactory.kt
similarity index 90%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXReferenceFactory.kt
index 9b785323..dc72f7f1 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXReferenceFactory.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXReferenceFactory.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.names.*
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.onPropertyChange
 import javafx.scene.Group
 import javafx.scene.Node
+import space.kscience.dataforge.names.*
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.onPropertyChange
 import kotlin.reflect.KClass
 
 class FXReferenceFactory(val plugin: FX3DPlugin) : FX3DFactory<SolidReferenceGroup> {
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXShapeFactory.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXShapeFactory.kt
similarity index 95%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXShapeFactory.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXShapeFactory.kt
index fa8ce279..ad88aac0 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/FXShapeFactory.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXShapeFactory.kt
@@ -1,11 +1,11 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.meta.Meta
 import javafx.scene.shape.Mesh
 import javafx.scene.shape.MeshView
 import javafx.scene.shape.TriangleMesh
 import javafx.scene.shape.VertexFormat
 import org.fxyz3d.geometry.Face3
+import space.kscience.dataforge.meta.Meta
 import kotlin.reflect.KClass
 
 object FXShapeFactory : FX3DFactory<GeometrySolid> {
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/OrbitControls.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt
similarity index 97%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/OrbitControls.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt
index 498c756f..47c3c8e8 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/OrbitControls.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
 import javafx.beans.InvalidationListener
 import javafx.beans.property.SimpleDoubleProperty
@@ -14,7 +14,7 @@ import javafx.scene.transform.Rotate
 import javafx.scene.transform.Translate
 import tornadofx.*
 import kotlin.math.*
-import hep.dataforge.vision.solid.specifications.Camera as CameraSpec
+import space.kscience.visionforge.solid.specifications.Camera as CameraSpec
 
 
 class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec: CameraSpec) {
diff --git a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/VisualObjectFXBinding.kt
similarity index 86%
rename from visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
rename to visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/VisualObjectFXBinding.kt
index 2a47b447..5ab8fa70 100644
--- a/visionforge-fx/src/main/kotlin/hep/dataforge/vision/solid/VisualObjectFXBinding.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/VisualObjectFXBinding.kt
@@ -1,15 +1,15 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.meta.*
-import hep.dataforge.names.Name
-import hep.dataforge.names.startsWith
-import hep.dataforge.names.toName
-import hep.dataforge.values.Value
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.onPropertyChange
 import javafx.application.Platform
 import javafx.beans.binding.Binding
 import javafx.beans.binding.ObjectBinding
+import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.startsWith
+import space.kscience.dataforge.names.toName
+import space.kscience.dataforge.values.Value
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.onPropertyChange
 import tornadofx.*
 
 /**
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlOptimizer.kt
similarity index 90%
rename from visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
rename to visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlOptimizer.kt
index 02915331..a35e845c 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlOptimizer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlOptimizer.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.gdml
+package space.kscience.visionforge.gdml
 
-import hep.dataforge.meta.itemSequence
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.meta
-import hep.dataforge.vision.solid.*
+import space.kscience.dataforge.meta.itemSequence
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.meta
+import space.kscience.visionforge.solid.*
 
 public expect class Counter() {
     public fun get(): Int
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlShowcase.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlShowcase.kt
similarity index 98%
rename from visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlShowcase.kt
rename to visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlShowcase.kt
index ae253996..b677e124 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlShowcase.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlShowcase.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.vision.gdml
+package space.kscience.visionforge.gdml
 
 import space.kscience.gdml.*
 
diff --git a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
similarity index 95%
rename from visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt
rename to visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
index 435ea98d..f9bba939 100644
--- a/visionforge-gdml/src/commonMain/kotlin/hep/dataforge/vision/gdml/GdmlTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
@@ -1,18 +1,18 @@
-package hep.dataforge.vision.gdml
+package space.kscience.visionforge.gdml
 
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.MetaBuilder
-import hep.dataforge.names.Name
-import hep.dataforge.names.asName
-import hep.dataforge.names.plus
-import hep.dataforge.names.toName
-import hep.dataforge.vision.set
-import hep.dataforge.vision.setProperty
-import hep.dataforge.vision.solid.*
-import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY
-import hep.dataforge.vision.styleSheet
-import hep.dataforge.vision.useStyle
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.MetaBuilder
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.asName
+import space.kscience.dataforge.names.plus
+import space.kscience.dataforge.names.toName
 import space.kscience.gdml.*
+import space.kscience.visionforge.set
+import space.kscience.visionforge.setProperty
+import space.kscience.visionforge.solid.*
+import space.kscience.visionforge.solid.SolidMaterial.Companion.MATERIAL_KEY
+import space.kscience.visionforge.styleSheet
+import space.kscience.visionforge.useStyle
 import kotlin.math.cos
 import kotlin.math.sin
 import kotlin.random.Random
diff --git a/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt b/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt
index ca6f71ab..22f12553 100644
--- a/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt
+++ b/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt
@@ -1,16 +1,16 @@
-package hep.dataforge.vision.gdml
+package space.kscience.visionforge.gdml
 
-import hep.dataforge.context.Context
-import hep.dataforge.names.toName
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.gdml.GdmlShowcase.cubes
-import hep.dataforge.vision.get
-import hep.dataforge.vision.solid.*
-import hep.dataforge.vision.visionManager
+import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.names.toName
 import space.kscience.gdml.Gdml
 import space.kscience.gdml.GdmlBox
 import space.kscience.gdml.decodeFromString
 import space.kscience.gdml.encodeToString
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.gdml.GdmlShowcase.cubes
+import space.kscience.visionforge.get
+import space.kscience.visionforge.solid.*
+import space.kscience.visionforge.visionManager
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
diff --git a/visionforge-gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/gdmlJs.kt b/visionforge-gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/gdmlJs.kt
similarity index 79%
rename from visionforge-gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/gdmlJs.kt
rename to visionforge-gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/gdmlJs.kt
index 87b0f63c..f90eec29 100644
--- a/visionforge-gdml/src/jsMain/kotlin/hep/dataforge/vision/gdml/gdmlJs.kt
+++ b/visionforge-gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/gdmlJs.kt
@@ -1,4 +1,4 @@
-package hep.dataforge.vision.gdml
+package space.kscience.visionforge.gdml
 
 public actual class Counter {
     private var count: Int = 0
diff --git a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt b/visionforge-gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/gdmlJVM.kt
similarity index 83%
rename from visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
rename to visionforge-gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/gdmlJVM.kt
index e9fd2a58..310631ce 100644
--- a/visionforge-gdml/src/jvmMain/kotlin/hep/dataforge/vision/gdml/gdmlJVM.kt
+++ b/visionforge-gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/gdmlJVM.kt
@@ -1,8 +1,8 @@
-package hep.dataforge.vision.gdml
+package space.kscience.visionforge.gdml
 
-import hep.dataforge.vision.solid.SolidGroup
 import space.kscience.gdml.Gdml
 import space.kscience.gdml.decodeFromFile
+import space.kscience.visionforge.solid.SolidGroup
 import java.nio.file.Path
 import java.util.concurrent.atomic.AtomicInteger
 
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt b/visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/TestConvertor.kt
similarity index 90%
rename from visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
rename to visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/TestConvertor.kt
index 1d199c0d..730adfa9 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/TestConvertor.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/TestConvertor.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.gdml
+package space.kscience.visionforge.gdml
 
-import hep.dataforge.names.toName
-import hep.dataforge.vision.solid.Solids
 import org.junit.jupiter.api.Test
+import space.kscience.dataforge.names.toName
 import space.kscience.gdml.Gdml
 import space.kscience.gdml.decodeFromStream
+import space.kscience.visionforge.solid.Solids
 import kotlin.test.assertNotNull
 
 @Suppress("UNUSED_VARIABLE")
diff --git a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt b/visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/bmanStatistics.kt
similarity index 84%
rename from visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
rename to visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/bmanStatistics.kt
index e08cb09c..b61a7813 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/hep/dataforge/vision/gdml/bmanStatistics.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/bmanStatistics.kt
@@ -1,12 +1,12 @@
-package hep.dataforge.vision.gdml
+package space.kscience.visionforge.gdml
 
-import hep.dataforge.vision.solid.prototype
-import hep.dataforge.vision.visitor.countDistinct
-import hep.dataforge.vision.visitor.flowStatistics
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import nl.adaptivity.xmlutil.StAXReader
 import space.kscience.gdml.Gdml
+import space.kscience.visionforge.solid.prototype
+import space.kscience.visionforge.visitor.countDistinct
+import space.kscience.visionforge.visitor.flowStatistics
 import java.io.File
 import kotlin.reflect.KClass
 
diff --git a/visionforge-plotly/build.gradle.kts b/visionforge-plotly/build.gradle.kts
index 3e197394..4f8b04db 100644
--- a/visionforge-plotly/build.gradle.kts
+++ b/visionforge-plotly/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     id("ru.mipt.npm.gradle.mpp")
 }
 
-val plotlyVersion = "0.3.1"
+val plotlyVersion = "0.4.0-dev-1"
 
 kscience{
     useSerialization()
@@ -34,7 +34,7 @@ kotlin {
         commonMain {
             dependencies {
                 api(project(":visionforge-core"))
-                api("kscience.plotlykt:plotlykt-core:${plotlyVersion}")
+                api("space.kscience:plotlykt-core:${plotlyVersion}")
             }
         }
     }
diff --git a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt
deleted file mode 100644
index 7c6f527b..00000000
--- a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/VisionOfPlotly.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package hep.dataforge.vision.plotly
-
-import hep.dataforge.meta.Config
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.VisionBase
-import hep.dataforge.vision.html.VisionOutput
-import kotlinx.serialization.Serializable
-import kscience.plotly.Plot
-import kscience.plotly.Plotly
-
-@Serializable
-public class VisionOfPlotly(private val plotConfig: Config) : VisionBase(plotConfig){
-    public val plot: Plot get() = Plot(plotConfig)
-}
-
-public fun Plot.toVision(): VisionOfPlotly = VisionOfPlotly(config)
-
-@DFExperimental
-public inline fun VisionOutput.plotly(block: Plot.() -> Unit): VisionOfPlotly = VisionOfPlotly(Plotly.plot(block).config)
\ No newline at end of file
diff --git a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt b/visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/PlotlyPlugin.kt
similarity index 63%
rename from visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt
rename to visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/PlotlyPlugin.kt
index 58f39f52..84e3b5d1 100644
--- a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt
+++ b/visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/PlotlyPlugin.kt
@@ -1,14 +1,14 @@
-package hep.dataforge.vision.plotly
+package space.kscience.visionforge.plotly
 
-import hep.dataforge.context.PluginFactory
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionForge
-import hep.dataforge.vision.VisionPlugin
-import hep.dataforge.vision.plugins
 import kotlinx.serialization.modules.SerializersModule
 import kotlinx.serialization.modules.polymorphic
 import kotlinx.serialization.modules.subclass
+import space.kscience.dataforge.context.PluginFactory
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.VisionForge
+import space.kscience.visionforge.VisionPlugin
+import space.kscience.visionforge.plugins
 
 public expect class PlotlyPlugin : VisionPlugin{
     public companion object: PluginFactory<PlotlyPlugin>
diff --git a/visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/VisionOfPlotly.kt b/visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/VisionOfPlotly.kt
new file mode 100644
index 00000000..c9d6db78
--- /dev/null
+++ b/visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/VisionOfPlotly.kt
@@ -0,0 +1,19 @@
+package space.kscience.visionforge.plotly
+
+import kotlinx.serialization.Serializable
+import space.kscience.dataforge.meta.Config
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.plotly.Plot
+import space.kscience.plotly.Plotly
+import space.kscience.visionforge.VisionBase
+import space.kscience.visionforge.html.VisionOutput
+
+@Serializable
+public class VisionOfPlotly(private val plotConfig: Config) : VisionBase(plotConfig){
+    public val plot: Plot get() = Plot(plotConfig)
+}
+
+public fun Plot.toVision(): VisionOfPlotly = VisionOfPlotly(config)
+
+@DFExperimental
+public inline fun VisionOutput.plotly(block: Plot.() -> Unit): VisionOfPlotly = VisionOfPlotly(Plotly.plot(block).config)
\ No newline at end of file
diff --git a/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt b/visionforge-plotly/src/jsMain/kotlin/space/kscience/visionforge/plotly/plotlyJs.kt
similarity index 70%
rename from visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt
rename to visionforge-plotly/src/jsMain/kotlin/space/kscience/visionforge/plotly/plotlyJs.kt
index 790844b6..317a6930 100644
--- a/visionforge-plotly/src/jsMain/kotlin/hep/dataforge/vision/plotly/plotlyJs.kt
+++ b/visionforge-plotly/src/jsMain/kotlin/space/kscience/visionforge/plotly/plotlyJs.kt
@@ -1,19 +1,19 @@
-package hep.dataforge.vision.plotly
+package space.kscience.visionforge.plotly
 
-import hep.dataforge.context.Context
-import hep.dataforge.context.PluginFactory
-import hep.dataforge.context.PluginTag
-import hep.dataforge.meta.Meta
-import hep.dataforge.names.Name
-import hep.dataforge.names.asName
-import hep.dataforge.vision.ElementVisionRenderer
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionClient
-import hep.dataforge.vision.VisionPlugin
 import kotlinx.serialization.modules.SerializersModule
-import kscience.plotly.PlotlyConfig
-import kscience.plotly.plot
 import org.w3c.dom.Element
+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.names.Name
+import space.kscience.dataforge.names.asName
+import space.kscience.plotly.PlotlyConfig
+import space.kscience.plotly.plot
+import space.kscience.visionforge.ElementVisionRenderer
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.VisionClient
+import space.kscience.visionforge.VisionPlugin
 import kotlin.reflect.KClass
 
 public actual class PlotlyPlugin : VisionPlugin(), ElementVisionRenderer {
diff --git a/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyHeaders.kt b/visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyHeaders.kt
similarity index 65%
rename from visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyHeaders.kt
rename to visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyHeaders.kt
index 65ad8a91..fe966172 100644
--- a/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyHeaders.kt
+++ b/visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyHeaders.kt
@@ -1,11 +1,11 @@
-package hep.dataforge.vision.plotly
+package space.kscience.visionforge.plotly
 
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.html.HtmlFragment
-import hep.dataforge.vision.html.ResourceLocation
-import hep.dataforge.vision.html.scriptHeader
 import kotlinx.html.script
 import kotlinx.html.unsafe
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.html.HtmlFragment
+import space.kscience.visionforge.html.ResourceLocation
+import space.kscience.visionforge.html.scriptHeader
 import java.nio.file.Path
 
 internal val plotlyScriptLocation = "js/visionforge-three.js"
@@ -24,7 +24,7 @@ public fun plotlyHeader(location: ResourceLocation, filePath: Path? = null): Htm
         type = "text/javascript"
         unsafe {
             //language=JavaScript
-            +"hep.dataforge.vision.plotly.loadPlotly()"
+            +"space.kscience.visionforge.plotly.loadPlotly()"
         }
     }
 }
diff --git a/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyJvm.kt b/visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyJvm.kt
similarity index 65%
rename from visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyJvm.kt
rename to visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyJvm.kt
index 29687288..21522664 100644
--- a/visionforge-plotly/src/jvmMain/kotlin/hep/dataforge/vision/plotly/plotlyJvm.kt
+++ b/visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyJvm.kt
@@ -1,12 +1,12 @@
-package hep.dataforge.vision.plotly
+package space.kscience.visionforge.plotly
 
-import hep.dataforge.context.Context
-import hep.dataforge.context.Plugin
-import hep.dataforge.context.PluginFactory
-import hep.dataforge.context.PluginTag
-import hep.dataforge.meta.Meta
-import hep.dataforge.vision.VisionPlugin
 import kotlinx.serialization.modules.SerializersModule
+import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.context.Plugin
+import space.kscience.dataforge.context.PluginFactory
+import space.kscience.dataforge.context.PluginTag
+import space.kscience.dataforge.meta.Meta
+import space.kscience.visionforge.VisionPlugin
 import kotlin.reflect.KClass
 
 public actual class PlotlyPlugin : VisionPlugin(), Plugin {
diff --git a/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt b/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
similarity index 88%
rename from visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt
rename to visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
index 5672bd00..52e37fc1 100644
--- a/visionforge-server/src/main/kotlin/hep/dataforge/vision/three/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
@@ -1,19 +1,5 @@
-package hep.dataforge.vision.three.server
+package space.kscience.visionforge.three.server
 
-import hep.dataforge.context.Context
-import hep.dataforge.meta.*
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.names.Name
-import hep.dataforge.names.toName
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.VisionChange
-import hep.dataforge.vision.VisionManager
-import hep.dataforge.vision.flowChanges
-import hep.dataforge.vision.html.HtmlFragment
-import hep.dataforge.vision.html.HtmlVisionFragment
-import hep.dataforge.vision.html.VisionTagConsumer
-import hep.dataforge.vision.html.fragment
-import hep.dataforge.vision.three.server.VisionServer.Companion.DEFAULT_PAGE
 import io.ktor.application.*
 import io.ktor.features.CORS
 import io.ktor.features.CallLogging
@@ -38,8 +24,31 @@ import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.withContext
 import kotlinx.html.*
 import kotlinx.html.stream.createHTML
+import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.toName
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.VisionChange
+import space.kscience.visionforge.VisionManager
+import space.kscience.visionforge.flowChanges
+import space.kscience.visionforge.html.HtmlFragment
+import space.kscience.visionforge.html.HtmlVisionFragment
+import space.kscience.visionforge.html.VisionTagConsumer
+import space.kscience.visionforge.html.fragment
+import space.kscience.visionforge.three.server.VisionServer.Companion.DEFAULT_PAGE
 import java.awt.Desktop
 import java.net.URI
+import kotlin.collections.ArrayList
+import kotlin.collections.HashMap
+import kotlin.collections.List
+import kotlin.collections.Map
+import kotlin.collections.emptyList
+import kotlin.collections.first
+import kotlin.collections.forEach
+import kotlin.collections.plus
+import kotlin.collections.set
 import kotlin.time.milliseconds
 
 public enum class VisionServerDataMode {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Controls.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Controls.kt
deleted file mode 100644
index 90d024c3..00000000
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Controls.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package hep.dataforge.vision.solid.specifications
-
-import hep.dataforge.meta.Scheme
-import hep.dataforge.meta.SchemeSpec
-
-
-public class Controls : Scheme() {
-    public companion object : SchemeSpec<Controls>(::Controls)
-}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Light.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Light.kt
deleted file mode 100644
index 46ba8939..00000000
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Light.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package hep.dataforge.vision.solid.specifications
-
-import hep.dataforge.meta.Scheme
-import hep.dataforge.meta.SchemeSpec
-
-public class Light : Scheme() {
-    public companion object : SchemeSpec<Light>(::Light)
-}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Box.kt
similarity index 86%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Box.kt
index 1a0eab5d..c84d5c9b 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Box.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Box.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.vision.VisionBuilder
-import hep.dataforge.vision.VisionContainerBuilder
-import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import space.kscience.visionforge.VisionBuilder
+import space.kscience.visionforge.VisionContainerBuilder
+import space.kscience.visionforge.set
 
 @Serializable
 @SerialName("solid.box")
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ColorAccessor.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ColorAccessor.kt
similarity index 67%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ColorAccessor.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ColorAccessor.kt
index 05e8cad9..9232874c 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ColorAccessor.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ColorAccessor.kt
@@ -1,14 +1,14 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.meta.MutableItemProvider
-import hep.dataforge.meta.set
-import hep.dataforge.meta.value
-import hep.dataforge.names.Name
-import hep.dataforge.values.Value
-import hep.dataforge.values.asValue
-import hep.dataforge.values.string
-import hep.dataforge.vision.Colors
-import hep.dataforge.vision.VisionBuilder
+import space.kscience.dataforge.meta.MutableItemProvider
+import space.kscience.dataforge.meta.set
+import space.kscience.dataforge.meta.value
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.values.Value
+import space.kscience.dataforge.values.asValue
+import space.kscience.dataforge.values.string
+import space.kscience.visionforge.Colors
+import space.kscience.visionforge.VisionBuilder
 
 @VisionBuilder
 public class ColorAccessor(private val parent: MutableItemProvider, private val colorKey: Name) {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt
similarity index 89%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt
index cee7928d..f7325d2b 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Composite.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.meta.update
-import hep.dataforge.names.NameToken
-import hep.dataforge.vision.*
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import space.kscience.dataforge.meta.update
+import space.kscience.dataforge.names.NameToken
+import space.kscience.visionforge.*
 
 public enum class CompositeType {
     UNION,
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt
similarity index 94%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt
index a04594b6..e07cdee3 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/ConeSegment.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt
@@ -1,9 +1,9 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.vision.VisionContainerBuilder
-import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import space.kscience.visionforge.VisionContainerBuilder
+import space.kscience.visionforge.set
 import kotlin.math.cos
 import kotlin.math.sin
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Convex.kt
similarity index 82%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Convex.kt
index af26fa6f..2d242391 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Convex.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Convex.kt
@@ -1,9 +1,9 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.vision.VisionContainerBuilder
-import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import space.kscience.visionforge.VisionContainerBuilder
+import space.kscience.visionforge.set
 
 @Serializable
 @SerialName("solid.convex")
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Extruded.kt
similarity index 93%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Extruded.kt
index 96c6802a..d5943e3a 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Extruded.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Extruded.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.vision.VisionBuilder
-import hep.dataforge.vision.VisionContainerBuilder
-import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import space.kscience.visionforge.VisionBuilder
+import space.kscience.visionforge.VisionContainerBuilder
+import space.kscience.visionforge.set
 import kotlin.math.PI
 import kotlin.math.cos
 import kotlin.math.sin
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/GeometryBuilder.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/GeometryBuilder.kt
similarity index 94%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/GeometryBuilder.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/GeometryBuilder.kt
index 5d06ea2a..3cfc5da9 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/GeometryBuilder.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/GeometryBuilder.kt
@@ -1,6 +1,6 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.meta.Meta
+import space.kscience.dataforge.meta.Meta
 
 /**
  * @param T the type of resulting geometry
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/PolyLine.kt
similarity index 62%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/PolyLine.kt
index 9c46fb05..41fe9903 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/PolyLine.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/PolyLine.kt
@@ -1,15 +1,15 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.meta.number
-import hep.dataforge.names.Name
-import hep.dataforge.names.asName
-import hep.dataforge.names.plus
-import hep.dataforge.vision.VisionBuilder
-import hep.dataforge.vision.VisionContainerBuilder
-import hep.dataforge.vision.allProperties
-import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import space.kscience.dataforge.meta.number
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.asName
+import space.kscience.dataforge.names.plus
+import space.kscience.visionforge.VisionBuilder
+import space.kscience.visionforge.VisionContainerBuilder
+import space.kscience.visionforge.allProperties
+import space.kscience.visionforge.set
 
 @Serializable
 @SerialName("solid.line")
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
similarity index 88%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
index bb9a8867..d7d03c90 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
@@ -1,19 +1,19 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.meta.boolean
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.meta.enum
-import hep.dataforge.meta.int
-import hep.dataforge.names.Name
-import hep.dataforge.names.asName
-import hep.dataforge.names.plus
-import hep.dataforge.values.ValueType
-import hep.dataforge.values.asValue
-import hep.dataforge.vision.*
-import hep.dataforge.vision.Vision.Companion.VISIBLE_KEY
-import hep.dataforge.vision.solid.Solid.Companion.DETAIL_KEY
-import hep.dataforge.vision.solid.Solid.Companion.IGNORE_KEY
-import hep.dataforge.vision.solid.Solid.Companion.LAYER_KEY
+import space.kscience.dataforge.meta.boolean
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.dataforge.meta.enum
+import space.kscience.dataforge.meta.int
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.asName
+import space.kscience.dataforge.names.plus
+import space.kscience.dataforge.values.ValueType
+import space.kscience.dataforge.values.asValue
+import space.kscience.visionforge.*
+import space.kscience.visionforge.Vision.Companion.VISIBLE_KEY
+import space.kscience.visionforge.solid.Solid.Companion.DETAIL_KEY
+import space.kscience.visionforge.solid.Solid.Companion.IGNORE_KEY
+import space.kscience.visionforge.solid.Solid.Companion.LAYER_KEY
 
 /**
  * Interface for 3-dimensional [Vision]
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidBase.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt
similarity index 71%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidBase.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt
index 21c8e5bf..77e66a53 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidBase.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt
@@ -1,14 +1,14 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.meta.float
-import hep.dataforge.meta.get
-import hep.dataforge.meta.node
-import hep.dataforge.vision.VisionBase
-import hep.dataforge.vision.VisionChange
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.dataforge.meta.float
+import space.kscience.dataforge.meta.get
+import space.kscience.dataforge.meta.node
+import space.kscience.visionforge.VisionBase
+import space.kscience.visionforge.VisionChange
 
 @Serializable
 @SerialName("solid")
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
similarity index 93%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
index 8f51a612..c9c987a2 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
@@ -1,10 +1,5 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.meta.MetaItem
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.names.Name
-import hep.dataforge.names.NameToken
-import hep.dataforge.vision.*
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.SerialName
@@ -13,6 +8,11 @@ import kotlinx.serialization.builtins.MapSerializer
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
+import space.kscience.dataforge.meta.MetaItem
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.NameToken
+import space.kscience.visionforge.*
 
 public interface PrototypeHolder {
     @VisionBuilder
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidLabel.kt
similarity index 70%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidLabel.kt
index c628a4f0..ac45e22e 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidLabel.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidLabel.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.vision.VisionBuilder
-import hep.dataforge.vision.VisionContainerBuilder
-import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import space.kscience.visionforge.VisionBuilder
+import space.kscience.visionforge.VisionContainerBuilder
+import space.kscience.visionforge.set
 
 @Serializable
 @SerialName("solid.label")
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidMaterial.kt
similarity index 82%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidMaterial.kt
index 3062b0ad..aa6c9301 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidMaterial.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidMaterial.kt
@@ -1,17 +1,17 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.meta.*
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.meta.descriptors.attributes
-import hep.dataforge.names.Name
-import hep.dataforge.names.asName
-import hep.dataforge.names.plus
-import hep.dataforge.values.ValueType
-import hep.dataforge.values.asValue
-import hep.dataforge.vision.*
-import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
-import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY
-import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_OPACITY_KEY
+import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.dataforge.meta.descriptors.attributes
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.asName
+import space.kscience.dataforge.names.plus
+import space.kscience.dataforge.values.ValueType
+import space.kscience.dataforge.values.asValue
+import space.kscience.visionforge.*
+import space.kscience.visionforge.solid.SolidMaterial.Companion.MATERIAL_COLOR_KEY
+import space.kscience.visionforge.solid.SolidMaterial.Companion.MATERIAL_KEY
+import space.kscience.visionforge.solid.SolidMaterial.Companion.MATERIAL_OPACITY_KEY
 
 @VisionBuilder
 public class SolidMaterial : Scheme() {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
similarity index 95%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
index 5008abc2..6379e51f 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
@@ -1,15 +1,15 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.meta.MetaItem
-import hep.dataforge.meta.asMetaItem
-import hep.dataforge.meta.descriptors.NodeDescriptor
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.names.*
-import hep.dataforge.vision.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import space.kscience.dataforge.meta.MetaItem
+import space.kscience.dataforge.meta.asMetaItem
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.dataforge.names.*
+import space.kscience.visionforge.*
 
 public interface SolidReference : Vision {
     public val prototype: Solid
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solids.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt
similarity index 86%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solids.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt
index 02c88bcc..b6d9bb16 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Solids.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt
@@ -1,18 +1,18 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.context.Context
-import hep.dataforge.context.PluginFactory
-import hep.dataforge.context.PluginTag
-import hep.dataforge.meta.Meta
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.*
-import hep.dataforge.vision.html.VisionOutput
 import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.modules.PolymorphicModuleBuilder
 import kotlinx.serialization.modules.SerializersModule
 import kotlinx.serialization.modules.polymorphic
 import kotlinx.serialization.modules.subclass
+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.misc.DFExperimental
+import space.kscience.visionforge.*
+import space.kscience.visionforge.html.VisionOutput
 import kotlin.reflect.KClass
 
 
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Sphere.kt
similarity index 90%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Sphere.kt
index d3da6ed1..f3ace5b3 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Sphere.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Sphere.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.vision.VisionBuilder
-import hep.dataforge.vision.VisionContainerBuilder
-import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import space.kscience.visionforge.VisionBuilder
+import space.kscience.visionforge.VisionContainerBuilder
+import space.kscience.visionforge.set
 import kotlin.math.PI
 import kotlin.math.cos
 import kotlin.math.sin
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SphereLayer.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SphereLayer.kt
similarity index 93%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SphereLayer.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SphereLayer.kt
index 69bd3afa..de82d02a 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SphereLayer.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SphereLayer.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.vision.VisionBuilder
-import hep.dataforge.vision.VisionContainerBuilder
-import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import space.kscience.visionforge.VisionBuilder
+import space.kscience.visionforge.VisionContainerBuilder
+import space.kscience.visionforge.set
 import kotlin.math.PI
 import kotlin.math.cos
 import kotlin.math.sin
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Tube.kt
similarity index 95%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Tube.kt
index 165c2b8c..00c060ca 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/Tube.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Tube.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.vision.VisionBuilder
-import hep.dataforge.vision.VisionContainerBuilder
-import hep.dataforge.vision.set
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import space.kscience.visionforge.VisionBuilder
+import space.kscience.visionforge.VisionContainerBuilder
+import space.kscience.visionforge.set
 import kotlin.math.PI
 import kotlin.math.cos
 import kotlin.math.sin
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/geometry.kt
similarity index 84%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/geometry.kt
index 8d4fb85a..35fc731f 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/geometry.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/geometry.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.MetaBuilder
-import hep.dataforge.meta.double
-import hep.dataforge.meta.get
 import kotlinx.serialization.Serializable
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.MetaBuilder
+import space.kscience.dataforge.meta.double
+import space.kscience.dataforge.meta.get
 import kotlin.math.PI
 
 public const val PI2: Float = 2 * PI.toFloat()
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Axes.kt
similarity index 59%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Axes.kt
index 802bebd6..2f907091 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Axes.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Axes.kt
@@ -1,9 +1,9 @@
-package hep.dataforge.vision.solid.specifications
+package space.kscience.visionforge.solid.specifications
 
-import hep.dataforge.meta.Scheme
-import hep.dataforge.meta.SchemeSpec
-import hep.dataforge.meta.boolean
-import hep.dataforge.meta.double
+import space.kscience.dataforge.meta.Scheme
+import space.kscience.dataforge.meta.SchemeSpec
+import space.kscience.dataforge.meta.boolean
+import space.kscience.dataforge.meta.double
 
 public class Axes : Scheme() {
     public var visible: Boolean by boolean(false)
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Camera.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Camera.kt
similarity index 78%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Camera.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Camera.kt
index 396df8a4..b035e9fe 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Camera.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Camera.kt
@@ -1,9 +1,9 @@
-package hep.dataforge.vision.solid.specifications
+package space.kscience.visionforge.solid.specifications
 
-import hep.dataforge.meta.Scheme
-import hep.dataforge.meta.SchemeSpec
-import hep.dataforge.meta.double
-import hep.dataforge.meta.int
+import space.kscience.dataforge.meta.Scheme
+import space.kscience.dataforge.meta.SchemeSpec
+import space.kscience.dataforge.meta.double
+import space.kscience.dataforge.meta.int
 import kotlin.math.PI
 
 public class Camera : Scheme() {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt
similarity index 86%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt
index 2a147100..ffb43756 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/specifications/Canvas3DOptions.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt
@@ -1,7 +1,7 @@
-package hep.dataforge.vision.solid.specifications
+package space.kscience.visionforge.solid.specifications
 
-import hep.dataforge.meta.*
-import hep.dataforge.names.Name
+import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.names.Name
 
 public class Canvas3DOptions : Scheme() {
     public var axes: Axes by spec(Axes)
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Controls.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Controls.kt
new file mode 100644
index 00000000..ee8ebb9d
--- /dev/null
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Controls.kt
@@ -0,0 +1,9 @@
+package space.kscience.visionforge.solid.specifications
+
+import space.kscience.dataforge.meta.Scheme
+import space.kscience.dataforge.meta.SchemeSpec
+
+
+public class Controls : Scheme() {
+    public companion object : SchemeSpec<Controls>(::Controls)
+}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Light.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Light.kt
new file mode 100644
index 00000000..39b79466
--- /dev/null
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Light.kt
@@ -0,0 +1,8 @@
+package space.kscience.visionforge.solid.specifications
+
+import space.kscience.dataforge.meta.Scheme
+import space.kscience.dataforge.meta.SchemeSpec
+
+public class Light : Scheme() {
+    public companion object : SchemeSpec<Light>(::Light)
+}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/RemoveSingleChild.kt
similarity index 88%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/RemoveSingleChild.kt
index 72db9f97..5d07303e 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/RemoveSingleChild.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/RemoveSingleChild.kt
@@ -1,9 +1,9 @@
-package hep.dataforge.vision.solid.transform
+package space.kscience.visionforge.solid.transform
 
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.names.asName
-import hep.dataforge.vision.*
-import hep.dataforge.vision.solid.*
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.dataforge.names.asName
+import space.kscience.visionforge.*
+import space.kscience.visionforge.solid.*
 
 @DFExperimental
 internal fun mergeChild(parent: VisionGroup, child: Vision): Vision {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/UnRef.kt
similarity index 78%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/UnRef.kt
index a9f22c1c..b6d7c2e6 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/UnRef.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/UnRef.kt
@@ -1,12 +1,12 @@
-package hep.dataforge.vision.solid.transform
+package space.kscience.visionforge.solid.transform
 
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.names.Name
-import hep.dataforge.names.asName
-import hep.dataforge.vision.MutableVisionGroup
-import hep.dataforge.vision.VisionGroup
-import hep.dataforge.vision.solid.SolidGroup
-import hep.dataforge.vision.solid.SolidReferenceGroup
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.asName
+import space.kscience.visionforge.MutableVisionGroup
+import space.kscience.visionforge.VisionGroup
+import space.kscience.visionforge.solid.SolidGroup
+import space.kscience.visionforge.solid.SolidReferenceGroup
 
 @DFExperimental
 internal object UnRef : VisualTreeTransform<SolidGroup>() {
diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/VisualTreeTransform.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/VisualTreeTransform.kt
similarity index 89%
rename from visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/VisualTreeTransform.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/VisualTreeTransform.kt
index 22825f6c..d1f78e96 100644
--- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/transform/VisualTreeTransform.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/VisualTreeTransform.kt
@@ -1,6 +1,6 @@
-package hep.dataforge.vision.solid.transform
+package space.kscience.visionforge.solid.transform
 
-import hep.dataforge.vision.Vision
+import space.kscience.visionforge.Vision
 
 /**
  * A root class for [Vision] tree optimization
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/CompositeTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/CompositeTest.kt
similarity index 89%
rename from visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/CompositeTest.kt
rename to visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/CompositeTest.kt
index 45cc6d49..411aa75b 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/CompositeTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/CompositeTest.kt
@@ -1,6 +1,5 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.vision.Colors
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/ConvexTest.kt
similarity index 76%
rename from visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
rename to visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/ConvexTest.kt
index 16b4c6d6..58cde48e 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/ConvexTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/ConvexTest.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.meta.MetaItemNode
-import hep.dataforge.meta.getIndexed
-import hep.dataforge.meta.node
-import hep.dataforge.meta.toMetaItem
-import hep.dataforge.misc.DFExperimental
+import space.kscience.dataforge.meta.MetaItemNode
+import space.kscience.dataforge.meta.getIndexed
+import space.kscience.dataforge.meta.node
+import space.kscience.dataforge.meta.toMetaItem
+import space.kscience.dataforge.misc.DFExperimental
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/GroupTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/GroupTest.kt
similarity index 91%
rename from visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/GroupTest.kt
rename to visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/GroupTest.kt
index 5bfc8382..4e78e340 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/GroupTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/GroupTest.kt
@@ -1,7 +1,7 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.vision.Colors
-import hep.dataforge.vision.get
+import space.kscience.visionforge.Colors
+import space.kscience.visionforge.get
 import kotlin.math.PI
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/PropertyTest.kt
similarity index 92%
rename from visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
rename to visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/PropertyTest.kt
index 5f6fad96..1a9aa45b 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/PropertyTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/PropertyTest.kt
@@ -1,8 +1,8 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.meta.int
-import hep.dataforge.names.asName
-import hep.dataforge.vision.*
+import space.kscience.dataforge.meta.int
+import space.kscience.dataforge.names.asName
+import space.kscience.visionforge.*
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SerializationTest.kt
similarity index 83%
rename from visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
rename to visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SerializationTest.kt
index 90a158de..6df7b285 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SerializationTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SerializationTest.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.names.Name
-import hep.dataforge.names.toName
-import hep.dataforge.vision.MutableVisionGroup
-import hep.dataforge.vision.get
-import hep.dataforge.vision.meta
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.toName
+import space.kscience.visionforge.MutableVisionGroup
+import space.kscience.visionforge.get
+import space.kscience.visionforge.meta
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidPluginTest.kt
similarity index 78%
rename from visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt
rename to visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidPluginTest.kt
index 9613fb9b..fe8c4ad8 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidPluginTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidPluginTest.kt
@@ -1,8 +1,8 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.context.Global
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.get
+import space.kscience.dataforge.context.Global
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.get
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidReferenceTest.kt
similarity index 80%
rename from visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt
rename to visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidReferenceTest.kt
index bb84eb31..2f8b7781 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/SolidReferenceTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidReferenceTest.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.get
-import hep.dataforge.vision.style
-import hep.dataforge.vision.useStyle
 import kotlinx.serialization.json.encodeToJsonElement
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.get
+import space.kscience.visionforge.style
+import space.kscience.visionforge.useStyle
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/VisionUpdateTest.kt
similarity index 89%
rename from visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt
rename to visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/VisionUpdateTest.kt
index 2b8502e5..a96c7d49 100644
--- a/visionforge-solid/src/commonTest/kotlin/hep/dataforge/vision/solid/VisionUpdateTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/VisionUpdateTest.kt
@@ -1,10 +1,10 @@
-package hep.dataforge.vision.solid
+package space.kscience.visionforge.solid
 
-import hep.dataforge.context.Global
-import hep.dataforge.meta.MetaItem
-import hep.dataforge.names.toName
-import hep.dataforge.vision.VisionChange
-import hep.dataforge.vision.get
+import space.kscience.dataforge.context.Global
+import space.kscience.dataforge.meta.MetaItem
+import space.kscience.dataforge.names.toName
+import space.kscience.visionforge.VisionChange
+import space.kscience.visionforge.get
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/MeshThreeFactory.kt
similarity index 89%
rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/MeshThreeFactory.kt
index 605c658f..b01dbd1a 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/MeshThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/MeshThreeFactory.kt
@@ -1,19 +1,19 @@
-package hep.dataforge.vision.solid.three
+package space.kscience.visionforge.solid.three
 
-import hep.dataforge.meta.boolean
-import hep.dataforge.meta.node
-import hep.dataforge.names.Name
-import hep.dataforge.names.asName
-import hep.dataforge.names.plus
-import hep.dataforge.names.startsWith
-import hep.dataforge.vision.onPropertyChange
-import hep.dataforge.vision.solid.Solid
-import hep.dataforge.vision.solid.SolidMaterial
-import hep.dataforge.vision.solid.layer
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.geometries.EdgesGeometry
 import info.laht.threekt.objects.LineSegments
 import info.laht.threekt.objects.Mesh
+import space.kscience.dataforge.meta.boolean
+import space.kscience.dataforge.meta.node
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.asName
+import space.kscience.dataforge.names.plus
+import space.kscience.dataforge.names.startsWith
+import space.kscience.visionforge.onPropertyChange
+import space.kscience.visionforge.solid.Solid
+import space.kscience.visionforge.solid.SolidMaterial
+import space.kscience.visionforge.solid.layer
 import kotlin.reflect.KClass
 
 /**
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeBoxFactory.kt
similarity index 72%
rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeBoxFactory.kt
index b1a3d07b..dad57066 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeBoxFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeBoxFactory.kt
@@ -1,8 +1,8 @@
-package hep.dataforge.vision.solid.three
+package space.kscience.visionforge.solid.three
 
-import hep.dataforge.vision.solid.Box
-import hep.dataforge.vision.solid.detail
 import info.laht.threekt.geometries.BoxBufferGeometry
+import space.kscience.visionforge.solid.Box
+import space.kscience.visionforge.solid.detail
 
 public object ThreeBoxFactory : MeshThreeFactory<Box>(Box::class) {
     override fun buildGeometry(obj: Box): BoxBufferGeometry =
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
similarity index 91%
rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
index f6bec606..b68133b2 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
@@ -1,17 +1,5 @@
-package hep.dataforge.vision.solid.three
+package space.kscience.visionforge.solid.three
 
-import hep.dataforge.context.logger
-import hep.dataforge.meta.get
-import hep.dataforge.meta.string
-import hep.dataforge.names.Name
-import hep.dataforge.names.asName
-import hep.dataforge.names.plus
-import hep.dataforge.names.toName
-import hep.dataforge.vision.Colors
-import hep.dataforge.vision.solid.Solid
-import hep.dataforge.vision.solid.specifications.*
-import hep.dataforge.vision.solid.three.ThreeMaterials.HIGHLIGHT_MATERIAL
-import hep.dataforge.vision.solid.three.ThreeMaterials.SELECTED_MATERIAL
 import info.laht.threekt.WebGLRenderer
 import info.laht.threekt.cameras.PerspectiveCamera
 import info.laht.threekt.core.BufferGeometry
@@ -31,6 +19,19 @@ import org.w3c.dom.Element
 import org.w3c.dom.HTMLCanvasElement
 import org.w3c.dom.Node
 import org.w3c.dom.events.MouseEvent
+import space.kscience.dataforge.context.info
+import space.kscience.dataforge.context.logger
+import space.kscience.dataforge.meta.get
+import space.kscience.dataforge.meta.string
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.asName
+import space.kscience.dataforge.names.plus
+import space.kscience.dataforge.names.toName
+import space.kscience.visionforge.Colors
+import space.kscience.visionforge.solid.Solid
+import space.kscience.visionforge.solid.specifications.*
+import space.kscience.visionforge.solid.three.ThreeMaterials.HIGHLIGHT_MATERIAL
+import space.kscience.visionforge.solid.three.ThreeMaterials.SELECTED_MATERIAL
 import kotlin.math.cos
 import kotlin.math.sin
 
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvasLabelFactory.kt
similarity index 88%
rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvasLabelFactory.kt
index f8d26cec..cae984d9 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCanvasLabelFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvasLabelFactory.kt
@@ -1,8 +1,5 @@
-package hep.dataforge.vision.solid.three
+package space.kscience.visionforge.solid.three
 
-import hep.dataforge.vision.solid.SolidLabel
-import hep.dataforge.vision.solid.color
-import hep.dataforge.vision.solid.three.ThreeCanvas.Companion.DO_NOT_HIGHLIGHT_TAG
 import info.laht.threekt.DoubleSide
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.geometries.PlaneBufferGeometry
@@ -14,6 +11,9 @@ import org.w3c.dom.CanvasRenderingContext2D
 import org.w3c.dom.CanvasTextBaseline
 import org.w3c.dom.HTMLCanvasElement
 import org.w3c.dom.MIDDLE
+import space.kscience.visionforge.solid.SolidLabel
+import space.kscience.visionforge.solid.color
+import space.kscience.visionforge.solid.three.ThreeCanvas.Companion.DO_NOT_HIGHLIGHT_TAG
 import kotlin.reflect.KClass
 
 /**
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCompositeFactory.kt
similarity index 86%
rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCompositeFactory.kt
index ffe249d2..1f8c9328 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCompositeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCompositeFactory.kt
@@ -1,9 +1,10 @@
-package hep.dataforge.vision.solid.three
+package space.kscience.visionforge.solid.three
 
-import hep.dataforge.vision.solid.Composite
-import hep.dataforge.vision.solid.CompositeType
+import CSG
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.objects.Mesh
+import space.kscience.visionforge.solid.Composite
+import space.kscience.visionforge.solid.CompositeType
 
 /**
  * This should be inner, because it uses object builder
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeConvexFactory.kt
similarity index 77%
rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeConvexFactory.kt
index e41035c9..fe08b1cf 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeConvexFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeConvexFactory.kt
@@ -1,7 +1,7 @@
-package hep.dataforge.vision.solid.three
+package space.kscience.visionforge.solid.three
 
-import hep.dataforge.vision.solid.Convex
 import info.laht.threekt.external.geometries.ConvexBufferGeometry
+import space.kscience.visionforge.solid.Convex
 
 public object ThreeConvexFactory : MeshThreeFactory<Convex>(Convex::class) {
     override fun buildGeometry(obj: Convex): ConvexBufferGeometry {
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCylinderFactory.kt
similarity index 88%
rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCylinderFactory.kt
index 00154c88..57206c3e 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeCylinderFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCylinderFactory.kt
@@ -1,9 +1,9 @@
-package hep.dataforge.vision.solid.three
+package space.kscience.visionforge.solid.three
 
-import hep.dataforge.vision.solid.ConeSegment
-import hep.dataforge.vision.solid.detail
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.geometries.CylinderBufferGeometry
+import space.kscience.visionforge.solid.ConeSegment
+import space.kscience.visionforge.solid.detail
 import kotlin.math.PI
 import kotlin.math.pow
 
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeFactory.kt
similarity index 79%
rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeFactory.kt
index 41cccd43..e231c4ce 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeFactory.kt
@@ -1,16 +1,16 @@
-package hep.dataforge.vision.solid.three
+package space.kscience.visionforge.solid.three
 
-import hep.dataforge.misc.Type
-import hep.dataforge.names.Name
-import hep.dataforge.names.startsWith
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.solid.*
-import hep.dataforge.vision.solid.SolidMaterial.Companion.MATERIAL_KEY
-import hep.dataforge.vision.solid.three.ThreeFactory.Companion.TYPE
-import hep.dataforge.vision.visible
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.objects.Mesh
+import space.kscience.dataforge.misc.Type
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.startsWith
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.solid.*
+import space.kscience.visionforge.solid.SolidMaterial.Companion.MATERIAL_KEY
+import space.kscience.visionforge.solid.three.ThreeFactory.Companion.TYPE
+import space.kscience.visionforge.visible
 import kotlin.reflect.KClass
 
 /**
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt
similarity index 84%
rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt
index e0861f98..c1568ffd 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeGeometryBuilder.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt
@@ -1,14 +1,14 @@
-package hep.dataforge.vision.solid.three
+package space.kscience.visionforge.solid.three
 
-import hep.dataforge.meta.Meta
-import hep.dataforge.meta.get
-import hep.dataforge.meta.int
-import hep.dataforge.vision.solid.GeometryBuilder
-import hep.dataforge.vision.solid.Point3D
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Face3
 import info.laht.threekt.core.Geometry
 import info.laht.threekt.math.Vector3
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.get
+import space.kscience.dataforge.meta.int
+import space.kscience.visionforge.solid.GeometryBuilder
+import space.kscience.visionforge.solid.Point3D
 
 internal fun Point3D.toVector() = Vector3(x, y, z)
 
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeLabelFactory.kt
similarity index 78%
rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeLabelFactory.kt
index ebb6e76c..d0c10605 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLabelFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeLabelFactory.kt
@@ -1,13 +1,14 @@
-package hep.dataforge.vision.solid.three
+package space.kscience.visionforge.solid.three
 
 
-import hep.dataforge.context.logger
-import hep.dataforge.vision.onPropertyChange
-import hep.dataforge.vision.solid.SolidLabel
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.geometries.TextBufferGeometry
 import info.laht.threekt.objects.Mesh
 import kotlinext.js.jsObject
+import space.kscience.dataforge.context.logger
+import space.kscience.dataforge.context.warn
+import space.kscience.visionforge.onPropertyChange
+import space.kscience.visionforge.solid.SolidLabel
 import kotlin.reflect.KClass
 
 /**
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeLineFactory.kt
similarity index 75%
rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeLineFactory.kt
index 655b3c38..cc9c58ce 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeLineFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeLineFactory.kt
@@ -1,15 +1,15 @@
-package hep.dataforge.vision.solid.three
+package space.kscience.visionforge.solid.three
 
-import hep.dataforge.meta.node
-import hep.dataforge.vision.onPropertyChange
-import hep.dataforge.vision.solid.PolyLine
-import hep.dataforge.vision.solid.color
-import hep.dataforge.vision.solid.string
-import hep.dataforge.vision.solid.three.ThreeMaterials.DEFAULT_LINE_COLOR
 import info.laht.threekt.core.Geometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.math.Color
 import info.laht.threekt.objects.LineSegments
+import space.kscience.dataforge.meta.node
+import space.kscience.visionforge.onPropertyChange
+import space.kscience.visionforge.solid.PolyLine
+import space.kscience.visionforge.solid.color
+import space.kscience.visionforge.solid.string
+import space.kscience.visionforge.solid.three.ThreeMaterials.DEFAULT_LINE_COLOR
 import kotlin.reflect.KClass
 
 public object ThreeLineFactory : ThreeFactory<PolyLine> {
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeMaterials.kt
similarity index 93%
rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeMaterials.kt
index f41e9112..7f79ce37 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeMaterials.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeMaterials.kt
@@ -1,20 +1,20 @@
-package hep.dataforge.vision.solid.three
+package space.kscience.visionforge.solid.three
 
-import hep.dataforge.meta.*
-import hep.dataforge.names.Name
-import hep.dataforge.values.ValueType
-import hep.dataforge.values.int
-import hep.dataforge.values.string
-import hep.dataforge.vision.Colors
-import hep.dataforge.vision.Vision
-import hep.dataforge.vision.ownProperties
-import hep.dataforge.vision.solid.SolidMaterial
 import info.laht.threekt.materials.LineBasicMaterial
 import info.laht.threekt.materials.Material
 import info.laht.threekt.materials.MeshBasicMaterial
 import info.laht.threekt.materials.MeshPhongMaterial
 import info.laht.threekt.math.Color
 import info.laht.threekt.objects.Mesh
+import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.values.ValueType
+import space.kscience.dataforge.values.int
+import space.kscience.dataforge.values.string
+import space.kscience.visionforge.Colors
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.ownProperties
+import space.kscience.visionforge.solid.SolidMaterial
 
 
 public object ThreeMaterials {
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
similarity index 95%
rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
index 63eb4e28..c91698f1 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
@@ -1,18 +1,18 @@
-package hep.dataforge.vision.solid.three
+package space.kscience.visionforge.solid.three
 
-import hep.dataforge.context.*
-import hep.dataforge.meta.Meta
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.names.*
-import hep.dataforge.vision.*
-import hep.dataforge.vision.solid.*
-import hep.dataforge.vision.solid.specifications.Canvas3DOptions
 import info.laht.threekt.core.Object3D
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
+import space.kscience.dataforge.context.*
+import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.dataforge.names.*
+import space.kscience.visionforge.*
+import space.kscience.visionforge.solid.*
+import space.kscience.visionforge.solid.specifications.Canvas3DOptions
 import kotlin.collections.set
 import kotlin.reflect.KClass
 import info.laht.threekt.objects.Group as ThreeGroup
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeReferenceFactory.kt
similarity index 82%
rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeReferenceFactory.kt
index d245f846..33fd3ccb 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeReferenceFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeReferenceFactory.kt
@@ -1,15 +1,15 @@
-package hep.dataforge.vision.solid.three
+package space.kscience.visionforge.solid.three
 
-import hep.dataforge.names.cutFirst
-import hep.dataforge.names.firstOrNull
-import hep.dataforge.names.toName
-import hep.dataforge.vision.onPropertyChange
-import hep.dataforge.vision.solid.Solid
-import hep.dataforge.vision.solid.SolidReferenceGroup
-import hep.dataforge.vision.solid.SolidReferenceGroup.Companion.REFERENCE_CHILD_PROPERTY_PREFIX
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.objects.Mesh
+import space.kscience.dataforge.names.cutFirst
+import space.kscience.dataforge.names.firstOrNull
+import space.kscience.dataforge.names.toName
+import space.kscience.visionforge.onPropertyChange
+import space.kscience.visionforge.solid.Solid
+import space.kscience.visionforge.solid.SolidReferenceGroup
+import space.kscience.visionforge.solid.SolidReferenceGroup.Companion.REFERENCE_CHILD_PROPERTY_PREFIX
 import kotlin.reflect.KClass
 
 public object ThreeReferenceFactory : ThreeFactory<SolidReferenceGroup> {
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeSphereFactory.kt
similarity index 85%
rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeSphereFactory.kt
index 37910fc9..8f117516 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeSphereFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeSphereFactory.kt
@@ -1,9 +1,9 @@
-package hep.dataforge.vision.solid.three
+package space.kscience.visionforge.solid.three
 
-import hep.dataforge.vision.solid.Sphere
-import hep.dataforge.vision.solid.detail
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.geometries.SphereBufferGeometry
+import space.kscience.visionforge.solid.Sphere
+import space.kscience.visionforge.solid.detail
 
 public object ThreeSphereFactory : MeshThreeFactory<Sphere>(Sphere::class) {
     override fun buildGeometry(obj: Sphere): BufferGeometry {
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeVision.kt
similarity index 69%
rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeVision.kt
index 8a6d2a52..16d1bd4f 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/ThreeVision.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeVision.kt
@@ -1,7 +1,7 @@
-package hep.dataforge.vision.solid.three
+package space.kscience.visionforge.solid.three
 
-import hep.dataforge.vision.solid.SolidBase
 import info.laht.threekt.core.Object3D
+import space.kscience.visionforge.solid.SolidBase
 
 /**
  * A custom visual object that has its own Three.js renderer
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/csg.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/csg.kt
similarity index 100%
rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/csg.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/csg.kt
diff --git a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/three.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/three.kt
similarity index 88%
rename from visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/three.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/three.kt
index 9a11c550..fa13e91d 100644
--- a/visionforge-threejs/src/main/kotlin/hep/dataforge/vision/solid/three/three.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/three.kt
@@ -1,11 +1,6 @@
-package hep.dataforge.vision.solid.three
+package space.kscience.visionforge.solid.three
 
 import CSG
-import hep.dataforge.meta.MetaItem
-import hep.dataforge.meta.float
-import hep.dataforge.meta.get
-import hep.dataforge.meta.node
-import hep.dataforge.vision.solid.*
 import info.laht.threekt.core.*
 import info.laht.threekt.external.controls.OrbitControls
 import info.laht.threekt.materials.Material
@@ -13,6 +8,11 @@ import info.laht.threekt.math.Euler
 import info.laht.threekt.math.Vector3
 import info.laht.threekt.objects.Mesh
 import info.laht.threekt.textures.Texture
+import space.kscience.dataforge.meta.MetaItem
+import space.kscience.dataforge.meta.float
+import space.kscience.dataforge.meta.get
+import space.kscience.dataforge.meta.node
+import space.kscience.visionforge.solid.*
 import kotlin.math.PI
 
 public val Solid.euler: Euler get() = Euler(rotationX, rotationY, rotationZ, rotationOrder.name)
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
deleted file mode 100644
index 9fd1ebf4..00000000
--- a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/hep/dataforge/vision/three/server/jsMain.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package hep.dataforge.vision.three.server
-
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.VisionForge
-import hep.dataforge.vision.solid.three.useThreeJs
-
-@DFExperimental
-public fun main(): Unit = VisionForge.run {
-    useThreeJs()
-    renderVisionsInWindow()
-}
\ No newline at end of file
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt
new file mode 100644
index 00000000..e65b2503
--- /dev/null
+++ b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt
@@ -0,0 +1,11 @@
+package space.kscience.visionforge.three.server
+
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.VisionForge
+import space.kscience.visionforge.solid.three.useThreeJs
+
+@DFExperimental
+public fun main(): Unit = VisionForge.run {
+    useThreeJs()
+    renderVisionsInWindow()
+}
\ No newline at end of file
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/space/kscience/visionforge/three/server/serverExtensions.kt
similarity index 62%
rename from visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
rename to visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/space/kscience/visionforge/three/server/serverExtensions.kt
index 1a7639d9..fd9b1636 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/hep/dataforge/vision/three/server/serverExtensions.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/space/kscience/visionforge/three/server/serverExtensions.kt
@@ -1,12 +1,12 @@
-package hep.dataforge.vision.three.server
+package space.kscience.visionforge.three.server
 
-import hep.dataforge.misc.DFExperimental
-import hep.dataforge.vision.VisionForge
-import hep.dataforge.vision.html.HtmlVisionFragment
-import hep.dataforge.vision.html.ResourceLocation
-import hep.dataforge.vision.html.page
-import hep.dataforge.vision.html.scriptHeader
-import hep.dataforge.vision.makeFile
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.VisionForge
+import space.kscience.visionforge.html.HtmlVisionFragment
+import space.kscience.visionforge.html.ResourceLocation
+import space.kscience.visionforge.html.page
+import space.kscience.visionforge.html.scriptHeader
+import space.kscience.visionforge.makeFile
 import java.awt.Desktop
 import java.nio.file.Path
 

From 806093385949f95f1134b4fcb17e78920a177f4e Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 7 Mar 2021 19:22:30 +0300
Subject: [PATCH 099/151] Gdml fixes

---
 build.gradle.kts                              |  9 +-
 demo/muon-monitor/build.gradle.kts            |  2 +-
 .../visionforge-gdml-jupyter/build.gradle.kts | 16 ++++
 .../src/main/kotlin/GdmlForJupyter.kt         | 84 +++++++++++++++++++
 settings.gradle.kts                           |  7 +-
 visionforge-core/build.gradle.kts             |  3 +-
 visionforge-gdml/build.gradle.kts             |  2 +-
 .../kscience/visionforge/gdml/GdmlShowcase.kt |  4 +-
 visionforge-server/build.gradle.kts           |  2 +-
 .../visionforge/three/server/jsMain.kt        |  3 +
 10 files changed, 115 insertions(+), 17 deletions(-)
 create mode 100644 jupyter/visionforge-gdml-jupyter/build.gradle.kts
 create mode 100644 jupyter/visionforge-gdml-jupyter/src/main/kotlin/GdmlForJupyter.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 12a8077e..c3f88591 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,8 +5,6 @@ plugins {
 }
 
 val dataforgeVersion by extra("0.4.0-dev-2")
-val ktorVersion by extra(ru.mipt.npm.gradle.KScienceVersions.ktorVersion)
-val htmlVersion by extra(ru.mipt.npm.gradle.KScienceVersions.htmlVersion)
 val kotlinWrappersVersion by extra("pre.148-kotlin-1.4.30")
 val fxVersion by extra("14")
 
@@ -21,13 +19,10 @@ allprojects {
         maven("http://maven.jzy3d.org/releases")
     }
 
-    group = "hep.dataforge"
-    version = "0.2.0-dev-7"
+    group = "space.kscience"
+    version = "0.2.0-dev-8"
 }
 
-val githubProject by extra("visionforge")
-val bintrayRepo by extra("dataforge")
-
 subprojects {
     if (name.startsWith("visionforge")) {
         plugins.apply("maven-publish")
diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts
index 0e0d1dab..72e086b0 100644
--- a/demo/muon-monitor/build.gradle.kts
+++ b/demo/muon-monitor/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 group = "ru.mipt.npm"
 
-val ktorVersion: String by rootProject.extra
+val ktorVersion: String  = ru.mipt.npm.gradle.KScienceVersions.ktorVersion
 
 kscience {
     useSerialization()
diff --git a/jupyter/visionforge-gdml-jupyter/build.gradle.kts b/jupyter/visionforge-gdml-jupyter/build.gradle.kts
new file mode 100644
index 00000000..cc1988dc
--- /dev/null
+++ b/jupyter/visionforge-gdml-jupyter/build.gradle.kts
@@ -0,0 +1,16 @@
+plugins {
+    id("ru.mipt.npm.gradle.jvm")
+    kotlin("jupyter.api")
+}
+
+description = "Jupyter api artifact for GDML rendering"
+
+dependencies {
+    implementation(project(":visionforge-gdml"))
+    implementation(project(":visionforge-threejs:visionforge-threejs-server"))
+}
+
+readme{
+    maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
+}
+
diff --git a/jupyter/visionforge-gdml-jupyter/src/main/kotlin/GdmlForJupyter.kt b/jupyter/visionforge-gdml-jupyter/src/main/kotlin/GdmlForJupyter.kt
new file mode 100644
index 00000000..5c8c32d0
--- /dev/null
+++ b/jupyter/visionforge-gdml-jupyter/src/main/kotlin/GdmlForJupyter.kt
@@ -0,0 +1,84 @@
+package space.kscience.visionforge.gdml.jupyter
+
+import kotlinx.html.div
+import kotlinx.html.id
+import kotlinx.html.script
+import kotlinx.html.stream.createHTML
+import kotlinx.html.unsafe
+import org.jetbrains.kotlinx.jupyter.api.HTML
+import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
+import org.jetbrains.kotlinx.jupyter.api.libraries.*
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.gdml.Gdml
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.VisionForge
+import space.kscience.visionforge.gdml.toVision
+import space.kscience.visionforge.html.HtmlVisionFragment
+import space.kscience.visionforge.html.Page
+import space.kscience.visionforge.html.embedVisionFragment
+import space.kscience.visionforge.html.fragment
+import space.kscience.visionforge.plugins
+import space.kscience.visionforge.solid.Solids
+import space.kscience.visionforge.visionManager
+
+@JupyterLibrary
+@DFExperimental
+internal class GdmlForJupyter : JupyterIntegration() {
+
+    private val jsBundle = ResourceFallbacksBundle(listOf(
+        ResourceLocation("js/visionforge-three.js", ResourcePathType.CLASSPATH_PATH))
+    )
+    private val jsResource = LibraryResource(name = "visionforge-three", type = ResourceType.JS, bundles = listOf(jsBundle))
+
+    private var counter = 0
+
+    private fun produceHtmlVisionString(fragment: HtmlVisionFragment) = createHTML().div {
+        val id = "visionforge.vision[${counter++}]"
+        div {
+            this.id = id
+            embedVisionFragment(VisionForge.visionManager, fragment = fragment)
+        }
+        script {
+            type = "text/javascript"
+            unsafe { +"window.renderVisionsAt(\"$id\");" }
+        }
+    }
+
+    override fun Builder.onLoaded() {
+        resource(jsResource)
+
+        onLoaded {
+            VisionForge.plugins.fetch(Solids)
+        }
+
+        import(
+            "space.kscience.gdml.*",
+            "kotlinx.html.*",
+            "space.kscience.visionforge.solid.*",
+            "space.kscience.visionforge.html.Page",
+            "space.kscience.visionforge.html.page",
+            "space.kscience.visionforge.gdml.jupyter.*"
+        )
+
+        import<VisionForge>()
+
+        render<Gdml> { gdmlModel ->
+            val fragment = VisionForge.fragment {
+                vision(gdmlModel.toVision())
+            }
+            HTML(produceHtmlVisionString(fragment))
+        }
+
+        render<Vision> { vision ->
+            val fragment = VisionForge.fragment {
+                vision(vision)
+            }
+
+            HTML(produceHtmlVisionString(fragment))
+        }
+
+        render<Page> { page ->
+            HTML(page.render(createHTML()), true)
+        }
+    }
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b85d49a3..d8a039bc 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
     val kotlinVersion = "1.4.31"
-    val toolsVersion = "0.9.0"
+    val toolsVersion = "0.9.1"
 
     repositories {
         maven("https://repo.kotlin.link")
@@ -45,5 +45,6 @@ include(
     ":demo:muon-monitor",
     ":demo:sat-demo",
     ":demo:playground",
-    ":demo:jupyter-playground"
-)
+    ":demo:jupyter-playground",
+    ":jupyter:visionforge-gdml-jupyter"
+)
\ No newline at end of file
diff --git a/visionforge-core/build.gradle.kts b/visionforge-core/build.gradle.kts
index d33d733d..89a3b693 100644
--- a/visionforge-core/build.gradle.kts
+++ b/visionforge-core/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
 
 val dataforgeVersion: String by rootProject.extra
 val kotlinWrappersVersion: String by rootProject.extra
-val htmlVersion: String by rootProject.extra
 
 kscience{
     useSerialization()
@@ -15,7 +14,7 @@ kotlin {
         commonMain {
             dependencies {
                 api("space.kscience:dataforge-context:$dataforgeVersion")
-                api("org.jetbrains.kotlinx:kotlinx-html:$htmlVersion")
+                api("org.jetbrains.kotlinx:kotlinx-html:${ru.mipt.npm.gradle.KScienceVersions.htmlVersion}")
                 api("org.jetbrains:kotlin-css:1.0.0-$kotlinWrappersVersion")
             }
         }
diff --git a/visionforge-gdml/build.gradle.kts b/visionforge-gdml/build.gradle.kts
index b99fef45..738b0724 100644
--- a/visionforge-gdml/build.gradle.kts
+++ b/visionforge-gdml/build.gradle.kts
@@ -7,7 +7,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 api(project(":visionforge-solid"))
-                api("space.kscience:gdml:0.3.0")
+                api("space.kscience:gdml:0.3.2")
             }
         }
     }
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlShowcase.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlShowcase.kt
index b677e124..03c403aa 100644
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlShowcase.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlShowcase.kt
@@ -13,7 +13,7 @@ public object GdmlShowcase {
             val segment = solids.tube("segment", 20, 5.0) {
                 rmin = 17
                 deltaphi = 60
-                aunit = AUnit.DEG.title
+                aunit = AUnit.DEG
             }
             val worldBox = solids.box("largeBox", 200, 200, 200)
             val smallBox = solids.box("smallBox", 30, 30, 30)
@@ -25,7 +25,7 @@ public object GdmlShowcase {
                         positionref = center
                         rotation {
                             z = 60 * i
-                            unit = AUnit.DEG.title
+                            unit = AUnit.DEG
                         }
                     }
                 }
diff --git a/visionforge-server/build.gradle.kts b/visionforge-server/build.gradle.kts
index 8c98f498..18fda1cf 100644
--- a/visionforge-server/build.gradle.kts
+++ b/visionforge-server/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     id("ru.mipt.npm.gradle.jvm")
 }
 
-val ktorVersion: String by rootProject.extra
+val ktorVersion = ru.mipt.npm.gradle.KScienceVersions.ktorVersion
 
 dependencies {
     api(project(":visionforge-core"))
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt
index e65b2503..9ed1536e 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt
@@ -1,5 +1,6 @@
 package space.kscience.visionforge.three.server
 
+import kotlinx.browser.window
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.visionforge.VisionForge
 import space.kscience.visionforge.solid.three.useThreeJs
@@ -8,4 +9,6 @@ import space.kscience.visionforge.solid.three.useThreeJs
 public fun main(): Unit = VisionForge.run {
     useThreeJs()
     renderVisionsInWindow()
+    window.asDynamic()["renderVisionsAt"] = ::renderVisionsAt
+    window.asDynamic()["renderVisionsInWindow"] = ::renderVisionsInWindow
 }
\ No newline at end of file

From 1a5a207fb71da199e5eb30dddb443b194400733a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 7 Mar 2021 23:00:19 +0300
Subject: [PATCH 100/151] VisionForge window binding

---
 build.gradle.kts                              |  2 +-
 .../VisionForgePlayGroundForJupyter.kt        |  2 +-
 demo/playground/build.gradle.kts              |  1 +
 .../src/jsMain/kotlin/playgroundMain.kt       |  4 ++--
 .../src/main/kotlin/GdmlForJupyter.kt         |  2 +-
 .../kscience/visionforge/visionForgeJs.kt     | 22 ++++++++++++++-----
 .../visionforge/three/server/jsMain.kt        |  4 ++--
 7 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c3f88591..3e30285f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,7 +20,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.2.0-dev-8"
+    version = "0.2.0-dev-9"
 }
 
 subprojects {
diff --git a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
index 58304bd2..7b277b71 100644
--- a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
+++ b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
@@ -43,7 +43,7 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
         }
         script {
             type = "text/javascript"
-            unsafe { +"window.renderVisionsAt(\"$id\");" }
+            unsafe { +"VisionForge.renderVisionsAt(\"$id\");" }
         }
     }
 
diff --git a/demo/playground/build.gradle.kts b/demo/playground/build.gradle.kts
index 3159194c..733bc7c2 100644
--- a/demo/playground/build.gradle.kts
+++ b/demo/playground/build.gradle.kts
@@ -62,6 +62,7 @@ kotlin {
         val jvmMain by getting{
             dependencies {
                 api(project(":visionforge-server"))
+                api("ch.qos.logback:logback-classic:1.2.3")
                 implementation("com.github.Ricky12Awesome:json-schema-serialization:0.6.6")
             }
         }
diff --git a/demo/playground/src/jsMain/kotlin/playgroundMain.kt b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
index a49fb3b2..4ecf33f3 100644
--- a/demo/playground/src/jsMain/kotlin/playgroundMain.kt
+++ b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
@@ -6,9 +6,9 @@ import space.kscience.visionforge.solid.three.useThreeJs
 
 @DFExperimental
 fun main(): Unit = VisionForge.run{
+    console.info("Starting VisionForge context")
     usePlotly()
     useThreeJs()
+    window.asDynamic()["VisionForge"] = VisionForge
     renderVisionsInWindow()
-    window.asDynamic()["renderVisionsAt"] = ::renderVisionsAt
-    window.asDynamic()["renderVisionsInWindow"] = ::renderVisionsInWindow
 }
\ No newline at end of file
diff --git a/jupyter/visionforge-gdml-jupyter/src/main/kotlin/GdmlForJupyter.kt b/jupyter/visionforge-gdml-jupyter/src/main/kotlin/GdmlForJupyter.kt
index 5c8c32d0..16b7c9f9 100644
--- a/jupyter/visionforge-gdml-jupyter/src/main/kotlin/GdmlForJupyter.kt
+++ b/jupyter/visionforge-gdml-jupyter/src/main/kotlin/GdmlForJupyter.kt
@@ -40,7 +40,7 @@ internal class GdmlForJupyter : JupyterIntegration() {
         }
         script {
             type = "text/javascript"
-            unsafe { +"window.renderVisionsAt(\"$id\");" }
+            unsafe { +"VisionForge.renderVisionsAt(\"$id\");" }
         }
     }
 
diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/visionForgeJs.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/visionForgeJs.kt
index fbcca4ec..28e2ef66 100644
--- a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/visionForgeJs.kt
+++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/visionForgeJs.kt
@@ -2,26 +2,36 @@ package space.kscience.visionforge
 
 import kotlinx.browser.document
 import kotlinx.browser.window
+import org.w3c.dom.COMPLETE
+import org.w3c.dom.Document
+import org.w3c.dom.DocumentReadyState
 import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.misc.DFExperimental
 
+
+private fun whenDocumentLoaded(block: Document.() -> Unit): Unit {
+    if(document.readyState == DocumentReadyState.COMPLETE){
+        block(document)
+    } else {
+        document.addEventListener("DOMContentLoaded", { block(document) })
+    }
+}
+
 @JsExport
 @DFExperimental
 public actual object VisionForge {
     /**
      * Render all visions in this [window] using current global state of [VisionForge]
      */
-    public fun renderVisionsInWindow() {
-        window.onload = {
-            visionClient.renderAllVisions()
-        }
+    public fun renderVisionsInWindow(): Unit = whenDocumentLoaded {
+        visionClient.renderAllVisions()
     }
 
     /**
      * Render all visions in an element with a given [id]
      */
-    public fun renderVisionsAt(id: String) {
-        val element = document.getElementById(id)
+    public fun renderVisionsAt(id: String): Unit = whenDocumentLoaded {
+        val element = getElementById(id)
         if (element != null) {
             visionClient.renderAllVisionsAt(element)
         } else {
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt
index 9ed1536e..48460a92 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt
@@ -7,8 +7,8 @@ import space.kscience.visionforge.solid.three.useThreeJs
 
 @DFExperimental
 public fun main(): Unit = VisionForge.run {
+    console.info("Starting VisionForge context")
     useThreeJs()
+    window.asDynamic()["VisionForge"] = VisionForge
     renderVisionsInWindow()
-    window.asDynamic()["renderVisionsAt"] = ::renderVisionsAt
-    window.asDynamic()["renderVisionsInWindow"] = ::renderVisionsInWindow
 }
\ No newline at end of file

From 97b988d41970aab441c9abff7b8357a61ccdb867 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 10 Mar 2021 21:58:28 +0300
Subject: [PATCH 101/151] Update headers and Jupyter integration

---
 build.gradle.kts                              |  3 +-
 demo/gdml/build.gradle.kts                    |  3 +-
 demo/gdml/src/jsMain/kotlin/drop/FileDrop.kt  |  4 +-
 .../visionforge/gdml/demo/GdmlJsDemoApp.kt    |  2 +-
 demo/muon-monitor/build.gradle.kts            | 42 +++++-----
 .../mipt/npm/muon/monitor/server/MMServer.kt  |  8 +-
 .../ru/mipt/npm/muon/monitor/sim/line.kt      |  2 +-
 .../ru/mipt/npm/muon/monitor/sim/monitor.kt   |  1 -
 .../ru/mipt/npm/muon/monitor/GeometryTest.kt  |  3 +-
 .../src/jvmMain/kotlin/serverExtensions.kt    |  2 +-
 .../visionforge-gdml-jupyter/build.gradle.kts | 50 +++++++++--
 .../src/jsMain/kotlin/ThreeWithControls.kt    | 49 +++++++++++
 .../src/jsMain/kotlin/gdmlJupyter.kt          | 32 +++++++
 .../src/jsMain/kotlin/threeViewer.kt          | 83 +++++++++++++++++++
 .../kotlin/GdmlForJupyter.kt                  | 18 ++--
 settings.gradle.kts                           |  5 +-
 .../visionforge/html/HtmlVisionFragment.kt    |  3 +
 .../kscience/visionforge/visionForgeJs.kt     |  1 +
 .../kscience/visionforge/html/headers.kt      |  4 +-
 .../visionforge/plotly/plotlyHeaders.kt       |  4 +-
 .../three/server/serverExtensions.kt          |  2 +-
 21 files changed, 266 insertions(+), 55 deletions(-)
 create mode 100644 jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/ThreeWithControls.kt
 create mode 100644 jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/gdmlJupyter.kt
 create mode 100644 jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/threeViewer.kt
 rename jupyter/visionforge-gdml-jupyter/src/{main => jvmMain}/kotlin/GdmlForJupyter.kt (86%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3e30285f..dcf9eb7d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("ru.mipt.npm.gradle.project")
     kotlin("jvm") apply false
+    kotlin("js") apply false
     kotlin("jupyter.api") apply false
 }
 
@@ -20,7 +21,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.2.0-dev-9"
+    version = "0.2.0-dev-13"
 }
 
 subprojects {
diff --git a/demo/gdml/build.gradle.kts b/demo/gdml/build.gradle.kts
index e4fef51e..ae64890e 100644
--- a/demo/gdml/build.gradle.kts
+++ b/demo/gdml/build.gradle.kts
@@ -2,7 +2,8 @@ import ru.mipt.npm.gradle.DependencyConfiguration
 import ru.mipt.npm.gradle.FXModule
 
 plugins {
-    id("ru.mipt.npm.gradle.mpp")
+    kotlin("multiplatform")
+    id("ru.mipt.npm.gradle.common")
     application
 }
 
diff --git a/demo/gdml/src/jsMain/kotlin/drop/FileDrop.kt b/demo/gdml/src/jsMain/kotlin/drop/FileDrop.kt
index 2799eead..a52343b0 100644
--- a/demo/gdml/src/jsMain/kotlin/drop/FileDrop.kt
+++ b/demo/gdml/src/jsMain/kotlin/drop/FileDrop.kt
@@ -5,7 +5,9 @@ package drop
 
 import org.w3c.dom.DragEvent
 import org.w3c.files.FileList
-import react.*
+import react.Component
+import react.RProps
+import react.RState
 
 external enum class DropEffects {
     copy,
diff --git a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt
index 31f4645b..f1cbec0d 100644
--- a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt
+++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt
@@ -22,6 +22,7 @@ private class GDMLDemoApp : Application {
         val context = Global.context("demo") .apply{
             plugins.fetch(ThreePlugin)
         }
+
         render(element) {
             child(GDMLApp) {
                 val vision = GdmlShowcase.cubes.toVision()
@@ -32,7 +33,6 @@ private class GDMLDemoApp : Application {
                 }
             }
         }
-
     }
 }
 
diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts
index 72e086b0..209685b9 100644
--- a/demo/muon-monitor/build.gradle.kts
+++ b/demo/muon-monitor/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME
-
 plugins {
     id("ru.mipt.npm.gradle.mpp")
     application
@@ -7,7 +5,7 @@ plugins {
 
 group = "ru.mipt.npm"
 
-val ktorVersion: String  = ru.mipt.npm.gradle.KScienceVersions.ktorVersion
+val ktorVersion: String = ru.mipt.npm.gradle.KScienceVersions.ktorVersion
 
 kscience {
     useSerialization()
@@ -15,20 +13,18 @@ kscience {
 }
 
 kotlin {
+    jvm {
+        withJava()
+    }
+
     afterEvaluate {
         val jsBrowserDistribution by tasks.getting
 
-        jvm {
-            withJava()
-            compilations[MAIN_COMPILATION_NAME]?.apply {
-                tasks.getByName<ProcessResources>(processResourcesTaskName) {
-                    dependsOn(jsBrowserDistribution)
-                    afterEvaluate {
-                        from(jsBrowserDistribution)
-                    }
-                }
+        tasks.getByName<ProcessResources>("jvmProcessResources") {
+            dependsOn(jsBrowserDistribution)
+            afterEvaluate {
+                from(jsBrowserDistribution)
             }
-
         }
     }
 
@@ -61,13 +57,13 @@ application {
     mainClass.set("ru.mipt.npm.muon.monitor.server.MMServerKt")
 }
 
-distributions {
-    main {
-        contents {
-            from("$buildDir/libs") {
-                rename("${rootProject.name}-jvm", rootProject.name)
-                into("lib")
-            }
-        }
-    }
-}
\ No newline at end of file
+//distributions {
+//    main {
+//        contents {
+//            from("$buildDir/libs") {
+//                rename("${rootProject.name}-jvm", rootProject.name)
+//                into("lib")
+//            }
+//        }
+//    }
+//}
\ No newline at end of file
diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
index aa9dbbb2..9e4ff43c 100644
--- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
+++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
@@ -1,10 +1,6 @@
 package ru.mipt.npm.muon.monitor.server
 
 
-import space.kscience.dataforge.context.Context
-import space.kscience.dataforge.context.Global
-import space.kscience.dataforge.misc.DFExperimental
-import space.kscience.visionforge.solid.Solids
 import io.ktor.application.Application
 import io.ktor.application.call
 import io.ktor.application.install
@@ -28,6 +24,10 @@ import org.apache.commons.math3.random.JDKRandomGenerator
 import ru.mipt.npm.muon.monitor.Model
 import ru.mipt.npm.muon.monitor.sim.Cos2TrackGenerator
 import ru.mipt.npm.muon.monitor.sim.simulateOne
+import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.context.Global
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.solid.Solids
 import java.awt.Desktop
 import java.io.File
 import java.net.URI
diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt
index ca82dc87..de704441 100644
--- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt
+++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt
@@ -1,11 +1,11 @@
 package ru.mipt.npm.muon.monitor.sim
 
-import space.kscience.visionforge.solid.Point3D
 import org.apache.commons.math3.geometry.euclidean.threed.Line
 import org.apache.commons.math3.geometry.euclidean.threed.Plane
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D
 import ru.mipt.npm.muon.monitor.Monitor.CENTRAL_LAYER_Z
 import ru.mipt.npm.muon.monitor.Monitor.GEOMETRY_TOLERANCE
+import space.kscience.visionforge.solid.Point3D
 
 /**
  * Created by darksnake on 11-May-16.
diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/monitor.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/monitor.kt
index 01ff5d3b..a4e83c8b 100644
--- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/monitor.kt
+++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/monitor.kt
@@ -7,7 +7,6 @@ import ru.mipt.npm.muon.monitor.Event
 import ru.mipt.npm.muon.monitor.Monitor
 import ru.mipt.npm.muon.monitor.SC1
 import ru.mipt.npm.muon.monitor.readResource
-import java.util.*
 
 
 // minimal track length in detector
diff --git a/demo/muon-monitor/src/jvmTest/kotlin/ru/mipt/npm/muon/monitor/GeometryTest.kt b/demo/muon-monitor/src/jvmTest/kotlin/ru/mipt/npm/muon/monitor/GeometryTest.kt
index 6e1ec106..6221c529 100644
--- a/demo/muon-monitor/src/jvmTest/kotlin/ru/mipt/npm/muon/monitor/GeometryTest.kt
+++ b/demo/muon-monitor/src/jvmTest/kotlin/ru/mipt/npm/muon/monitor/GeometryTest.kt
@@ -1,6 +1,7 @@
 package ru.mipt.npm.muon.monitor
 
-import kotlin.test.*
+import kotlin.test.Test
+import kotlin.test.assertTrue
 
 class GeometryTest {
 
diff --git a/demo/playground/src/jvmMain/kotlin/serverExtensions.kt b/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
index 285a14a2..da4d6cde 100644
--- a/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
+++ b/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
@@ -27,7 +27,7 @@ public fun VisionForge.makeVisionFile(
     show: Boolean = true,
 ): Unit {
     val actualPath = page(title, content = content).makeFile(path) { actualPath ->
-        mapOf("threeJs" to scriptHeader("js/visionforge-playground.js", actualPath, resourceLocation))
+        mapOf("threeJs" to scriptHeader("js/visionforge-playground.js", resourceLocation, actualPath))
     }
     if (show) Desktop.getDesktop().browse(actualPath.toFile().toURI())
 }
diff --git a/jupyter/visionforge-gdml-jupyter/build.gradle.kts b/jupyter/visionforge-gdml-jupyter/build.gradle.kts
index cc1988dc..86847c2c 100644
--- a/jupyter/visionforge-gdml-jupyter/build.gradle.kts
+++ b/jupyter/visionforge-gdml-jupyter/build.gradle.kts
@@ -1,16 +1,54 @@
 plugins {
-    id("ru.mipt.npm.gradle.jvm")
+    id("ru.mipt.npm.gradle.mpp")
     kotlin("jupyter.api")
 }
 
 description = "Jupyter api artifact for GDML rendering"
 
-dependencies {
-    implementation(project(":visionforge-gdml"))
-    implementation(project(":visionforge-threejs:visionforge-threejs-server"))
+kotlin{
+    explicitApi = null
+    js{
+        browser {
+            webpackTask {
+                this.outputFileName = "js/gdml-jupyter.js"
+            }
+        }
+        binaries.executable()
+    }
+
+    afterEvaluate {
+        val jsBrowserDistribution by tasks.getting
+
+        tasks.getByName<ProcessResources>("jvmProcessResources") {
+            dependsOn(jsBrowserDistribution)
+            afterEvaluate {
+                from(jsBrowserDistribution)
+            }
+        }
+    }
+
+    sourceSets{
+        commonMain {
+            dependencies {
+                api(project(":visionforge-solid"))
+            }
+        }
+        jvmMain{
+            dependencies {
+                implementation(project(":visionforge-gdml"))
+                implementation(kotlin("script-runtime"))
+            }
+        }
+        jsMain {
+            dependencies {
+                api(project(":visionforge-threejs"))
+                implementation(project(":ui:bootstrap"))
+            }
+        }
+
+    }
 }
 
 readme{
     maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
-}
-
+}
\ No newline at end of file
diff --git a/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/ThreeWithControls.kt b/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/ThreeWithControls.kt
new file mode 100644
index 00000000..bad07723
--- /dev/null
+++ b/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/ThreeWithControls.kt
@@ -0,0 +1,49 @@
+package space.kscience.visionforge.gdml.jupyter
+
+import org.w3c.dom.Element
+import react.child
+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.names.Name
+import space.kscience.dataforge.names.asName
+import space.kscience.visionforge.ElementVisionRenderer
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.solid.Solid
+import space.kscience.visionforge.solid.three.ThreePlugin
+import kotlin.reflect.KClass
+
+class ThreeWithControls : AbstractPlugin(), ElementVisionRenderer {
+    val three 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, vision: Vision, meta: Meta) {
+        react.dom.render(element) {
+            child(GdmlView) {
+                attrs {
+                    this.context = this@ThreeWithControls.context
+                    this.rootVision = vision
+                }
+            }
+        }
+    }
+
+    override fun content(target: String): Map<Name, Any> {
+        return when (target) {
+            ElementVisionRenderer.TYPE -> mapOf("three.withControls".asName() to this)
+            else -> super.content(target)
+        }
+    }
+
+    companion object : PluginFactory<ThreeWithControls> {
+        override val tag: PluginTag = PluginTag("vision.threejs.withControls", PluginTag.DATAFORGE_GROUP)
+        override val type: KClass<ThreeWithControls> = ThreeWithControls::class
+        override fun invoke(meta: Meta, context: Context): ThreeWithControls = ThreeWithControls()
+    }
+}
\ No newline at end of file
diff --git a/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/gdmlJupyter.kt b/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/gdmlJupyter.kt
new file mode 100644
index 00000000..57bdb872
--- /dev/null
+++ b/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/gdmlJupyter.kt
@@ -0,0 +1,32 @@
+package space.kscience.visionforge.gdml.jupyter
+
+import kotlinx.browser.window
+import kotlinx.css.ListStyleType
+import kotlinx.css.listStyleType
+import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.visionforge.VisionForge
+import space.kscience.visionforge.bootstrap.useBootstrap
+import space.kscience.visionforge.plugins
+import styled.injectGlobal
+
+@DFExperimental
+fun main(): Unit = VisionForge.run {
+    useBootstrap()
+    injectGlobal {
+        rule("ul.nav") {
+            listStyleType = ListStyleType.none
+        }
+
+        rule(".treeStyles-tree") {
+            listStyleType = ListStyleType.none
+        }
+
+        rule("ol.breadcrumb") {
+            listStyleType = ListStyleType.none
+        }
+    }
+    console.info("Starting VisionForge context")
+    plugins.fetch(ThreeWithControls)
+    window.asDynamic()["VisionForge"] = VisionForge
+    renderVisionsInWindow()
+}
\ No newline at end of file
diff --git a/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/threeViewer.kt b/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/threeViewer.kt
new file mode 100644
index 00000000..d7818254
--- /dev/null
+++ b/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/threeViewer.kt
@@ -0,0 +1,83 @@
+package space.kscience.visionforge.gdml.jupyter
+
+import kotlinx.css.*
+import react.RProps
+import react.child
+import react.dom.h1
+import react.functionalComponent
+import react.useState
+import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.names.Name
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.bootstrap.gridRow
+import space.kscience.visionforge.bootstrap.nameCrumbs
+import space.kscience.visionforge.bootstrap.threeControls
+import space.kscience.visionforge.react.ThreeCanvasComponent
+import space.kscience.visionforge.react.flexColumn
+import space.kscience.visionforge.solid.Solid
+import space.kscience.visionforge.solid.specifications.Canvas3DOptions
+import space.kscience.visionforge.solid.three.ThreeCanvas
+import styled.css
+import styled.styledDiv
+
+external interface GdmlViewProps : RProps {
+    var context: Context
+    var rootVision: Vision?
+    var selected: Name?
+}
+
+@JsExport
+val GdmlView = functionalComponent<GdmlViewProps>("GdmlView") { props ->
+    var selected by useState { props.selected }
+    var canvas: ThreeCanvas? by useState { null }
+    var vision: Vision? by useState { props.rootVision }
+
+    val onSelect: (Name?) -> Unit = {
+        selected = it
+    }
+
+    gridRow {
+        flexColumn {
+            css {
+                +"col-lg-9"
+                height = 100.vh
+            }
+            styledDiv {
+                css {
+                    +"mx-auto"
+                    +"page-header"
+                }
+                h1 { +"GDML/JSON loader demo" }
+            }
+            nameCrumbs(selected, "World", onSelect)
+            //canvas
+
+            child(ThreeCanvasComponent) {
+                attrs {
+                    this.context = props.context
+                    this.obj = vision as? Solid
+                    this.selected = selected
+                    this.options = Canvas3DOptions.invoke {
+                        this.onSelect = onSelect
+                    }
+                    this.canvasCallback = {
+                        canvas = it
+                    }
+                }
+            }
+
+        }
+        flexColumn {
+            css {
+                +"col-lg-3"
+                padding(top = 4.px)
+                //border(1.px, BorderStyle.solid, Color.lightGray)
+                height = 100.vh
+                overflowY = Overflow.auto
+            }
+            canvas?.let {
+                threeControls(it, selected, onSelect)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/jupyter/visionforge-gdml-jupyter/src/main/kotlin/GdmlForJupyter.kt b/jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt
similarity index 86%
rename from jupyter/visionforge-gdml-jupyter/src/main/kotlin/GdmlForJupyter.kt
rename to jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt
index 16b7c9f9..0161d621 100644
--- a/jupyter/visionforge-gdml-jupyter/src/main/kotlin/GdmlForJupyter.kt
+++ b/jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt
@@ -7,7 +7,8 @@ import kotlinx.html.stream.createHTML
 import kotlinx.html.unsafe
 import org.jetbrains.kotlinx.jupyter.api.HTML
 import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
-import org.jetbrains.kotlinx.jupyter.api.libraries.*
+import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
+import org.jetbrains.kotlinx.jupyter.api.libraries.resources
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.gdml.Gdml
 import space.kscience.visionforge.Vision
@@ -25,11 +26,6 @@ import space.kscience.visionforge.visionManager
 @DFExperimental
 internal class GdmlForJupyter : JupyterIntegration() {
 
-    private val jsBundle = ResourceFallbacksBundle(listOf(
-        ResourceLocation("js/visionforge-three.js", ResourcePathType.CLASSPATH_PATH))
-    )
-    private val jsResource = LibraryResource(name = "visionforge-three", type = ResourceType.JS, bundles = listOf(jsBundle))
-
     private var counter = 0
 
     private fun produceHtmlVisionString(fragment: HtmlVisionFragment) = createHTML().div {
@@ -45,7 +41,15 @@ internal class GdmlForJupyter : JupyterIntegration() {
     }
 
     override fun Builder.onLoaded() {
-        resource(jsResource)
+
+        resources {
+            js("three"){
+                classPath("js/gdml-jupyter.js")
+            }
+//            css("override") {
+//                classPath("css/jupyter-override.css")
+//            }
+        }
 
         onLoaded {
             VisionForge.plugins.fetch(Solids)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d8a039bc..9654d977 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,8 +1,9 @@
 pluginManagement {
     val kotlinVersion = "1.4.31"
-    val toolsVersion = "0.9.1"
+    val toolsVersion = "0.9.2"
 
     repositories {
+        mavenLocal()
         maven("https://repo.kotlin.link")
         mavenCentral()
         gradlePluginPortal()
@@ -15,7 +16,7 @@ pluginManagement {
         id("ru.mipt.npm.gradle.js") version toolsVersion
         id("ru.mipt.npm.gradle.publish") version toolsVersion
         kotlin("jvm") version kotlinVersion
-        kotlin("jupyter.api") version "0.8.3.236"
+        kotlin("jupyter.api") version "0.8.3.279"
         kotlin("js") version kotlinVersion
         kotlin("multiplatform") version kotlinVersion
     }
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionFragment.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionFragment.kt
index b57db4a5..4597a955 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionFragment.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionFragment.kt
@@ -2,11 +2,14 @@ package space.kscience.visionforge.html
 
 import kotlinx.html.FlowContent
 import kotlinx.html.TagConsumer
+import kotlinx.html.stream.createHTML
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.visionforge.VisionForge
 
 public typealias HtmlFragment = TagConsumer<*>.() -> Unit
 
+public fun HtmlFragment.render(): String = createHTML().apply(this).finalize()
+
 public fun TagConsumer<*>.fragment(fragment: HtmlFragment) {
     fragment()
 }
diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/visionForgeJs.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/visionForgeJs.kt
index 28e2ef66..e605b4d1 100644
--- a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/visionForgeJs.kt
+++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/visionForgeJs.kt
@@ -19,6 +19,7 @@ private fun whenDocumentLoaded(block: Document.() -> Unit): Unit {
 
 @JsExport
 @DFExperimental
+@JsName("VisionForge")
 public actual object VisionForge {
     /**
      * Render all visions in this [window] using current global state of [VisionForge]
diff --git a/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/headers.kt b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/headers.kt
index 6bf8be49..56b2e17b 100644
--- a/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/headers.kt
+++ b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/headers.kt
@@ -89,7 +89,7 @@ internal fun embedScriptHeader(resource: String): HtmlFragment = {
     script {
         type = "text/javascript"
         unsafe {
-            val bytes = VisionManager::class.java.getResourceAsStream("/$resource").readAllBytes()
+            val bytes = VisionManager::class.java.getResourceAsStream("/$resource")!!.readAllBytes()
             +bytes.toString(Charsets.UTF_8)
         }
     }
@@ -113,8 +113,8 @@ internal fun fileCssHeader(
 @DFExperimental
 public fun scriptHeader(
     scriptResource: String,
-    htmlPath: Path?,
     resourceLocation: ResourceLocation,
+    htmlPath: Path? = null,
 ): HtmlFragment {
     val targetPath = when (resourceLocation) {
         ResourceLocation.LOCAL -> checkOrStoreFile(
diff --git a/visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyHeaders.kt b/visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyHeaders.kt
index fe966172..a09909c7 100644
--- a/visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyHeaders.kt
+++ b/visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyHeaders.kt
@@ -17,8 +17,8 @@ internal val plotlyScriptLocation = "js/visionforge-three.js"
 public fun plotlyHeader(location: ResourceLocation, filePath: Path? = null): HtmlFragment = {
     scriptHeader(
         plotlyScriptLocation,
-        filePath,
-        resourceLocation = location
+        resourceLocation = location,
+        htmlPath = filePath
     ).invoke(this)
     script {
         type = "text/javascript"
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/space/kscience/visionforge/three/server/serverExtensions.kt b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/space/kscience/visionforge/three/server/serverExtensions.kt
index fd9b1636..9bd6e6b9 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/space/kscience/visionforge/three/server/serverExtensions.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/space/kscience/visionforge/three/server/serverExtensions.kt
@@ -24,7 +24,7 @@ public fun VisionForge.makeThreeJsFile(
     show: Boolean = true,
 ): Unit {
     val actualPath = page(title, content = content).makeFile(path) { actualPath ->
-        mapOf("threeJs" to scriptHeader("js/visionforge-three.js", actualPath, resourceLocation))
+        mapOf("threeJs" to scriptHeader("js/visionforge-three.js", resourceLocation, actualPath))
     }
     if (show) Desktop.getDesktop().browse(actualPath.toFile().toURI())
 }

From 0961ae90b76ec79e34e353bc8d1a0ec6a8652992 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 5 May 2021 15:28:06 +0300
Subject: [PATCH 102/151] Remove global VisionForge object

---
 build.gradle.kts                              | 16 ++--
 demo/gdml/build.gradle.kts                    |  3 +-
 .../visionforge/gdml/GDMLVisualTest.kt        | 14 ++--
 .../visionforge/gdml/demo/GdmlJsDemoApp.kt    |  8 +-
 .../visionforge/gdml/demo/GdmlFxDemoApp.kt    | 16 ++--
 demo/jupyter-playground/build.gradle.kts      |  3 -
 .../VisionForgePlayGroundForJupyter.kt        | 28 +++----
 demo/muon-monitor/build.gradle.kts            |  7 ++
 .../ru/mipt/npm/muon/monitor/MMDemoApp.kt     |  2 +-
 .../mipt/npm/muon/monitor/server/MMServer.kt  |  3 +-
 .../src/jsMain/kotlin/playgroundMain.kt       | 16 ++--
 .../src/jvmMain/kotlin/gdmlCubes.kt           | 19 +++--
 .../playground/src/jvmMain/kotlin/gdmlIaxo.kt | 16 ++--
 .../src/jvmMain/kotlin/plotlyVision.kt        | 14 ++--
 .../src/jvmMain/kotlin/randomSpheres.kt       | 22 +++---
 .../src/jvmMain/kotlin/serverExtensions.kt    | 28 +++----
 .../src/jvmMain/kotlin/simpleCube.kt          | 15 ++--
 demo/plotly-fx/build.gradle.kts               | 57 +++++++++++++++
 .../main/kotlin/ru/mipt/npm/sat/satServer.kt  |  2 +-
 gradle.properties                             | 11 +--
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 .../src/jsMain/kotlin/gdmlJupyter.kt          | 11 +--
 .../src/jvmMain/kotlin/GdmlForJupyter.kt      | 22 +++---
 settings.gradle.kts                           | 13 ++--
 ui/bootstrap/build.gradle.kts                 |  1 +
 .../visionforge/bootstrap/outputConfig.kt     | 51 ++++++++++---
 ui/react/build.gradle.kts                     |  5 +-
 .../visionforge/react/PropertyEditor.kt       | 13 +++-
 .../space/kscience/visionforge/StyleSheet.kt  |  4 +-
 .../space/kscience/visionforge/VisionForge.kt | 16 ----
 .../kscience/visionforge/VisionManager.kt     |  4 +-
 .../visionforge/html/HtmlVisionFragment.kt    |  3 +-
 .../space/kscience/visionforge/html/Page.kt   |  8 +-
 .../visionforge/html/VisionTagConsumer.kt     |  3 +
 .../kscience/visionforge/schemeDesctiptors.kt | 62 ++++++++++++++++
 .../kscience/visionforge/visionDescriptor.kt  | 31 +++++---
 .../kscience/visionforge/html/HtmlTagTest.kt  |  2 +-
 .../kscience/visionforge/VisionClient.kt      | 66 +++++++++++++----
 .../kscience/visionforge/visionForgeJs.kt     | 73 -------------------
 .../kscience/visionforge/visionForgeJvm.kt    | 21 ------
 visionforge-gdml/build.gradle.kts             |  3 +-
 .../kscience/visionforge/gdml/GdmlShowcase.kt | 57 ---------------
 .../visionforge/gdml/GdmlTransformer.kt       | 32 ++++++--
 .../src/commonTest/kotlin/TestCubes.kt        | 11 ++-
 .../visionforge/gdml/bmanStatistics.kt        |  3 +-
 visionforge-plotly/build.gradle.kts           | 16 ++--
 .../visionforge/plotly/PlotlyPlugin.kt        | 15 +---
 .../visionforge/plotly/plotlyHeaders.kt       | 48 +++++-------
 .../kscience/visionforge/solid/Solids.kt      |  2 -
 .../kscience/visionforge/solid/SphereLayer.kt |  3 +
 .../visionforge/solid/specifications/Axes.kt  | 10 +++
 .../solid/specifications/Camera.kt            | 13 ++++
 .../solid/specifications/Canvas3DOptions.kt   | 24 +++++-
 .../visionforge/solid/DescriptorTest.kt       | 22 ++++++
 visionforge-threejs/build.gradle.kts          |  2 +-
 .../laht/threekt/renderers/WebGLRenderer.kt   | 14 ++++
 .../visionforge/solid/three/ThreeCanvas.kt    | 32 +++++---
 .../visionforge/solid/three/ThreePlugin.kt    | 14 +---
 .../visionforge/three/server/jsMain.kt        | 13 ++--
 .../three/server/serverExtensions.kt          |  4 +-
 60 files changed, 573 insertions(+), 476 deletions(-)
 create mode 100644 demo/plotly-fx/build.gradle.kts
 delete mode 100644 visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionForge.kt
 create mode 100644 visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/schemeDesctiptors.kt
 delete mode 100644 visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/visionForgeJs.kt
 delete mode 100644 visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/visionForgeJvm.kt
 delete mode 100644 visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlShowcase.kt
 create mode 100644 visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/DescriptorTest.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index dcf9eb7d..cc4ff994 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,27 +1,29 @@
 plugins {
     id("ru.mipt.npm.gradle.project")
+    kotlin("multiplatform") apply false
     kotlin("jvm") apply false
     kotlin("js") apply false
     kotlin("jupyter.api") apply false
+    id("ru.mipt.npm.gradle.js") apply false
 }
 
-val dataforgeVersion by extra("0.4.0-dev-2")
-val kotlinWrappersVersion by extra("pre.148-kotlin-1.4.30")
-val fxVersion by extra("14")
+val dataforgeVersion by extra("0.4.0")
+val kotlinWrappersVersion by extra("pre.152-kotlin-1.4.32")
+val fxVersion by extra("11")
 
 allprojects {
     repositories {
-        mavenLocal()
         mavenCentral()
         jcenter()
         maven("https://repo.kotlin.link")
-        maven("https://kotlin.bintray.com/kotlin-js-wrappers")
         maven("https://dl.bintray.com/pdvrieze/maven")
-        maven("http://maven.jzy3d.org/releases")
+        maven("https://maven.jzy3d.org/releases")
+        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers")
+        maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
     }
 
     group = "space.kscience"
-    version = "0.2.0-dev-13"
+    version = "0.2.0-dev-15"
 }
 
 subprojects {
diff --git a/demo/gdml/build.gradle.kts b/demo/gdml/build.gradle.kts
index ae64890e..e4fef51e 100644
--- a/demo/gdml/build.gradle.kts
+++ b/demo/gdml/build.gradle.kts
@@ -2,8 +2,7 @@ import ru.mipt.npm.gradle.DependencyConfiguration
 import ru.mipt.npm.gradle.FXModule
 
 plugins {
-    kotlin("multiplatform")
-    id("ru.mipt.npm.gradle.common")
+    id("ru.mipt.npm.gradle.mpp")
     application
 }
 
diff --git a/demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/GDMLVisualTest.kt b/demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/GDMLVisualTest.kt
index c0587c2e..c12c7215 100644
--- a/demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/GDMLVisualTest.kt
+++ b/demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/GDMLVisualTest.kt
@@ -3,12 +3,12 @@ package space.kscience.visionforge.gdml
 import space.kscience.dataforge.meta.string
 import space.kscience.dataforge.names.toName
 import space.kscience.dataforge.values.asValue
-import space.kscience.visionforge.gdml.GdmlShowcase.cubes
+import space.kscience.gdml.GdmlShowCase
 import space.kscience.visionforge.setProperty
 import space.kscience.visionforge.solid.SolidMaterial
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import kotlin.test.assertTrue
+import kotlin.test.assertNotNull
 
 class GDMLVisualTest {
 
@@ -23,10 +23,10 @@ class GDMLVisualTest {
 
     @Test
     fun testPrototypeProperty() {
-        val visual = cubes.toVision()
-        val child = visual["composite[0,0,0].segment[0]".toName()]
-        assertTrue { child!= null }
-        child?.setProperty(SolidMaterial.MATERIAL_COLOR_KEY, "red".asValue())
-        assertEquals("red", child?.getProperty(SolidMaterial.MATERIAL_COLOR_KEY).string)
+        val vision = GdmlShowCase.cubes().toVision()
+        val child = vision["composite-000.segment-0".toName()]
+        assertNotNull(child)
+        child.setProperty(SolidMaterial.MATERIAL_COLOR_KEY, "red".asValue())
+        assertEquals("red", child.getProperty(SolidMaterial.MATERIAL_COLOR_KEY).string)
     }
 }
\ No newline at end of file
diff --git a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt
index f1cbec0d..1b40155e 100644
--- a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt
+++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt
@@ -4,9 +4,9 @@ import kotlinx.browser.document
 import react.child
 import react.dom.render
 import space.kscience.dataforge.context.Global
+import space.kscience.gdml.GdmlShowCase
 import space.kscience.visionforge.Application
 import space.kscience.visionforge.bootstrap.useBootstrap
-import space.kscience.visionforge.gdml.GdmlShowcase
 import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.solid.three.ThreePlugin
 import space.kscience.visionforge.startApplication
@@ -19,13 +19,13 @@ private class GDMLDemoApp : Application {
 
         val element = document.getElementById("app") ?: error("Element with id 'app' not found on page")
 
-        val context = Global.context("demo") .apply{
-            plugins.fetch(ThreePlugin)
+        val context = Global.buildContext("demo"){
+            plugin(ThreePlugin)
         }
 
         render(element) {
             child(GDMLApp) {
-                val vision = GdmlShowcase.cubes.toVision()
+                val vision = GdmlShowCase.cubes().toVision()
                 //println(context.plugins.fetch(VisionManager).encodeToString(vision))
                 attrs {
                     this.context = context
diff --git a/demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlFxDemoApp.kt b/demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlFxDemoApp.kt
index 544d8a7f..4fd1e2e7 100644
--- a/demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlFxDemoApp.kt
+++ b/demo/gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlFxDemoApp.kt
@@ -3,12 +3,13 @@ package space.kscience.visionforge.gdml.demo
 import javafx.geometry.Orientation
 import javafx.scene.Parent
 import javafx.stage.FileChooser
-import space.kscience.dataforge.context.Global
+import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.context.fetch
+import space.kscience.gdml.GdmlShowCase
 import space.kscience.visionforge.VisionManager
 import space.kscience.visionforge.describedProperties
 import space.kscience.visionforge.editor.VisualObjectEditorFragment
 import space.kscience.visionforge.editor.VisualObjectTreeFragment
-import space.kscience.visionforge.gdml.GdmlShowcase.cubes
 import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.solid.FX3DPlugin
 import space.kscience.visionforge.solid.FXCanvas3D
@@ -19,8 +20,13 @@ import tornadofx.*
 class GDMLDemoApp : App(GDMLView::class)
 
 class GDMLView : View() {
-    private val fx3d = Global.plugins.fetch(FX3DPlugin)
-    private val visionManager = Global.plugins.fetch(VisionManager)
+    private val context = Context {
+        plugin(FX3DPlugin)
+        plugin(VisionManager)
+    }
+
+    private val fx3d = context.fetch(FX3DPlugin)
+    private val visionManager = context.fetch(VisionManager)
     private val canvas = FXCanvas3D(fx3d)
 
     private val treeFragment = VisualObjectTreeFragment().apply {
@@ -61,7 +67,7 @@ class GDMLView : View() {
 
     init {
         runAsync {
-            cubes.toVision()
+            GdmlShowCase.cubes().toVision()
         } ui {
             canvas.render(it)
         }
diff --git a/demo/jupyter-playground/build.gradle.kts b/demo/jupyter-playground/build.gradle.kts
index e467f49b..903b991b 100644
--- a/demo/jupyter-playground/build.gradle.kts
+++ b/demo/jupyter-playground/build.gradle.kts
@@ -7,9 +7,6 @@ plugins {
 repositories {
     mavenCentral()
     maven("https://repo.kotlin.link")
-    maven("https://dl.bintray.com/mipt-npm/dataforge")
-    maven("https://dl.bintray.com/mipt-npm/kscience")
-    maven("https://dl.bintray.com/mipt-npm/dev")
 }
 
 dependencies {
diff --git a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
index 7b277b71..e1e2a97f 100644
--- a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
+++ b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
@@ -8,19 +8,17 @@ import kotlinx.html.unsafe
 import org.jetbrains.kotlinx.jupyter.api.HTML
 import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
 import org.jetbrains.kotlinx.jupyter.api.libraries.*
+import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.gdml.Gdml
 import space.kscience.plotly.Plot
 import space.kscience.visionforge.Vision
-import space.kscience.visionforge.VisionForge
 import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.html.HtmlVisionFragment
 import space.kscience.visionforge.html.Page
 import space.kscience.visionforge.html.embedVisionFragment
-import space.kscience.visionforge.html.fragment
+import space.kscience.visionforge.plotly.PlotlyPlugin
 import space.kscience.visionforge.plotly.toVision
-import space.kscience.visionforge.plotly.usePlotly
-import space.kscience.visionforge.plugins
 import space.kscience.visionforge.solid.Solids
 import space.kscience.visionforge.visionManager
 
@@ -28,6 +26,11 @@ import space.kscience.visionforge.visionManager
 @DFExperimental
 internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
 
+    private val context = Context("VisionForge") {
+        plugin(Solids)
+        plugin(PlotlyPlugin)
+    }
+
     private val jsBundle = ResourceFallbacksBundle(listOf(
         ResourceLocation("js/visionforge-playground.js", ResourcePathType.CLASSPATH_PATH))
     )
@@ -39,22 +42,17 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
         val id = "visionforge.vision[${counter++}]"
         div {
             this.id = id
-            embedVisionFragment(VisionForge.visionManager, fragment = fragment)
+            embedVisionFragment(context.visionManager, fragment = fragment)
         }
         script {
             type = "text/javascript"
-            unsafe { +"VisionForge.renderVisionsAt(\"$id\");" }
+            unsafe { +"window.renderAllVisionsById(\"$id\");" }
         }
     }
 
     override fun Builder.onLoaded() {
         resource(jsResource)
 
-        onLoaded {
-            VisionForge.plugins.fetch(Solids)
-            VisionForge.usePlotly()
-        }
-
         import(
             "space.kscience.gdml.*",
             "space.kscience.plotly.*",
@@ -65,17 +63,15 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
             "space.kscience.visionforge.html.page"
         )
 
-        import<VisionForge>()
-
         render<Gdml> { gdmlModel ->
-            val fragment = VisionForge.fragment {
+            val fragment = HtmlVisionFragment {
                 vision(gdmlModel.toVision())
             }
             HTML(produceHtmlVisionString(fragment))
         }
 
         render<Vision> { vision ->
-            val fragment = VisionForge.fragment {
+            val fragment = HtmlVisionFragment {
                 vision(vision)
             }
 
@@ -83,7 +79,7 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
         }
 
         render<Plot> { plot ->
-            val fragment = VisionForge.fragment {
+            val fragment = HtmlVisionFragment {
                 vision(plot.toVision())
             }
 
diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts
index 209685b9..3fe03042 100644
--- a/demo/muon-monitor/build.gradle.kts
+++ b/demo/muon-monitor/build.gradle.kts
@@ -22,6 +22,7 @@ kotlin {
 
         tasks.getByName<ProcessResources>("jvmProcessResources") {
             dependsOn(jsBrowserDistribution)
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
             afterEvaluate {
                 from(jsBrowserDistribution)
             }
@@ -57,6 +58,12 @@ application {
     mainClass.set("ru.mipt.npm.muon.monitor.server.MMServerKt")
 }
 
+tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile>(){
+    kotlinOptions{
+        freeCompilerArgs = freeCompilerArgs + "-Xir-property-lazy-initialization"
+    }
+}
+
 //distributions {
 //    main {
 //        contents {
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
index 1047047d..45a34e06 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
@@ -26,7 +26,7 @@ private class MMDemoApp : Application {
 
         val element = document.getElementById("app") ?: error("Element with id 'app' not found on page")
 
-        val context = Global.context("demo") {}
+        val context = Global.buildContext("demo") {}
         render(element) {
             child(MMApp) {
                 attrs {
diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
index 9e4ff43c..336264e2 100644
--- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
+++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
@@ -26,6 +26,7 @@ import ru.mipt.npm.muon.monitor.sim.Cos2TrackGenerator
 import ru.mipt.npm.muon.monitor.sim.simulateOne
 import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.context.Global
+import space.kscience.dataforge.context.fetch
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.visionforge.solid.Solids
 import java.awt.Desktop
@@ -38,7 +39,7 @@ private val generator = Cos2TrackGenerator(JDKRandomGenerator(223))
 fun Application.module(context: Context = Global) {
     val currentDir = File(".").absoluteFile
     environment.log.info("Current directory: $currentDir")
-    val solidManager = context.plugins.load(Solids)
+    val solidManager = context.fetch(Solids)
 
     install(DefaultHeaders)
     install(CallLogging)
diff --git a/demo/playground/src/jsMain/kotlin/playgroundMain.kt b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
index 4ecf33f3..9ee2dc93 100644
--- a/demo/playground/src/jsMain/kotlin/playgroundMain.kt
+++ b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
@@ -1,14 +1,10 @@
-import kotlinx.browser.window
 import space.kscience.dataforge.misc.DFExperimental
-import space.kscience.visionforge.VisionForge
-import space.kscience.visionforge.plotly.usePlotly
-import space.kscience.visionforge.solid.three.useThreeJs
+import space.kscience.visionforge.plotly.PlotlyPlugin
+import space.kscience.visionforge.runVisionClient
+import space.kscience.visionforge.solid.three.ThreePlugin
 
 @DFExperimental
-fun main(): Unit = VisionForge.run{
-    console.info("Starting VisionForge context")
-    usePlotly()
-    useThreeJs()
-    window.asDynamic()["VisionForge"] = VisionForge
-    renderVisionsInWindow()
+fun main() = runVisionClient {
+    plugin(PlotlyPlugin)
+    plugin(ThreePlugin)
 }
\ No newline at end of file
diff --git a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
index 823a8f19..9de22003 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmlCubes.kt
@@ -1,20 +1,19 @@
 package space.kscience.visionforge.examples
 
-import space.kscience.dataforge.misc.DFExperimental
-import space.kscience.visionforge.VisionForge
-import space.kscience.visionforge.gdml.GdmlShowcase.cubes
+import space.kscience.dataforge.context.Context
+import space.kscience.gdml.GdmlShowCase
 import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.html.ResourceLocation
-import space.kscience.visionforge.html.fragment
-import space.kscience.visionforge.invoke
 import space.kscience.visionforge.solid.Solids
 
-@DFExperimental
-fun main() = VisionForge(Solids) {
-    val content = VisionForge.fragment {
+fun main() {
+    val context = Context {
+        plugin(Solids)
+    }
+
+    context.makeVisionFile(resourceLocation = ResourceLocation.SYSTEM){
         vision("canvas") {
-            cubes.toVision()
+            GdmlShowCase.cubes().toVision()
         }
     }
-    makeVisionFile(content, resourceLocation = ResourceLocation.SYSTEM)
 }
\ No newline at end of file
diff --git a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
index 9ab231e6..a292396f 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
@@ -1,24 +1,22 @@
 package space.kscience.visionforge.examples
 
-import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.dataforge.context.Context
 import space.kscience.gdml.Gdml
 import space.kscience.gdml.LUnit
 import space.kscience.gdml.decodeFromStream
-import space.kscience.visionforge.VisionForge
 import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.html.ResourceLocation
-import space.kscience.visionforge.html.fragment
-import space.kscience.visionforge.invoke
 import space.kscience.visionforge.solid.Solids
 
-@DFExperimental
-fun main() = VisionForge(Solids) {
-    val content = VisionForge.fragment {
+fun main() {
+    val context = Context {
+        plugin(Solids)
+    }
+    context.makeVisionFile(resourceLocation = ResourceLocation.EMBED) {
         vision("canvas") {
-            Gdml.decodeFromStream(Gdml.javaClass.getResourceAsStream("/gdml/babyIAXO.gdml")!!, true).toVision {
+            Gdml.decodeFromStream(javaClass.getResourceAsStream("/gdml/babyIAXO.gdml")!!, true).toVision {
                 lUnit = LUnit.MM
             }
         }
     }
-    makeVisionFile(content, resourceLocation = ResourceLocation.EMBED)
 }
\ No newline at end of file
diff --git a/demo/playground/src/jvmMain/kotlin/plotlyVision.kt b/demo/playground/src/jvmMain/kotlin/plotlyVision.kt
index 7da3d09b..4575b952 100644
--- a/demo/playground/src/jvmMain/kotlin/plotlyVision.kt
+++ b/demo/playground/src/jvmMain/kotlin/plotlyVision.kt
@@ -1,17 +1,16 @@
 package space.kscience.visionforge.examples
 
-import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.dataforge.context.Context
 import space.kscience.plotly.scatter
-import space.kscience.visionforge.VisionForge
 import space.kscience.visionforge.html.ResourceLocation
-import space.kscience.visionforge.html.fragment
-import space.kscience.visionforge.invoke
 import space.kscience.visionforge.plotly.PlotlyPlugin
 import space.kscience.visionforge.plotly.plotly
 
-@DFExperimental
-fun main() = VisionForge(PlotlyPlugin) {
-    val fragment = fragment {
+fun main() {
+    val context = Context {
+        plugin(PlotlyPlugin)
+    }
+    context.makeVisionFile(resourceLocation = ResourceLocation.SYSTEM){
         vision {
             plotly {
                 scatter {
@@ -21,5 +20,4 @@ fun main() = VisionForge(PlotlyPlugin) {
             }
         }
     }
-    makeVisionFile(fragment, resourceLocation = ResourceLocation.SYSTEM)
 }
\ No newline at end of file
diff --git a/demo/playground/src/jvmMain/kotlin/randomSpheres.kt b/demo/playground/src/jvmMain/kotlin/randomSpheres.kt
index 04027052..855c99c1 100644
--- a/demo/playground/src/jvmMain/kotlin/randomSpheres.kt
+++ b/demo/playground/src/jvmMain/kotlin/randomSpheres.kt
@@ -1,20 +1,23 @@
 package space.kscience.visionforge.examples
 
 import kotlinx.html.h1
-import space.kscience.dataforge.misc.DFExperimental
-import space.kscience.visionforge.VisionForge
+import space.kscience.dataforge.context.Context
 import space.kscience.visionforge.html.ResourceLocation
-import space.kscience.visionforge.html.fragment
-import space.kscience.visionforge.invoke
 import space.kscience.visionforge.solid.*
 import java.nio.file.Paths
 import kotlin.random.Random
 
-@OptIn(DFExperimental::class)
-fun main() = VisionForge(Solids) {
+fun main() {
+    val context = Context {
+        plugin(Solids)
+    }
 
     val random = Random(112233)
-    val fragment = fragment {
+
+    context.makeVisionFile(
+        Paths.get("randomSpheres.html"),
+        resourceLocation = ResourceLocation.EMBED
+    ) {
         h1 { +"Happy new year!" }
         vision {
             solid {
@@ -33,9 +36,4 @@ fun main() = VisionForge(Solids) {
             }
         }
     }
-    makeVisionFile(
-        fragment,
-        Paths.get("randomSpheres.html"),
-        resourceLocation = ResourceLocation.EMBED
-    )
 }
\ No newline at end of file
diff --git a/demo/playground/src/jvmMain/kotlin/serverExtensions.kt b/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
index da4d6cde..4dfd35f1 100644
--- a/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
+++ b/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
@@ -1,10 +1,9 @@
 package space.kscience.visionforge.examples
 
+import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.misc.DFExperimental
-import space.kscience.visionforge.Vision
-import space.kscience.visionforge.VisionForge
-import space.kscience.visionforge.html.HtmlVisionFragment
 import space.kscience.visionforge.html.ResourceLocation
+import space.kscience.visionforge.html.VisionTagConsumer
 import space.kscience.visionforge.html.page
 import space.kscience.visionforge.html.scriptHeader
 import space.kscience.visionforge.makeFile
@@ -18,25 +17,26 @@ public fun VisionServer.usePlayground(): Unit {
     useScript("js/visionforge-playground.js")
 }
 
-@DFExperimental
-public fun VisionForge.makeVisionFile(
-    content: HtmlVisionFragment,
+@OptIn(DFExperimental::class)
+public fun Context.makeVisionFile(
     path: Path? = null,
     title: String = "VisionForge page",
     resourceLocation: ResourceLocation = ResourceLocation.SYSTEM,
     show: Boolean = true,
+    content: VisionTagConsumer<*>.() -> Unit
 ): Unit {
+
     val actualPath = page(title, content = content).makeFile(path) { actualPath ->
         mapOf("threeJs" to scriptHeader("js/visionforge-playground.js", resourceLocation, actualPath))
     }
     if (show) Desktop.getDesktop().browse(actualPath.toFile().toURI())
 }
 
-@DFExperimental
-public fun VisionForge.makeVisionFile(
-    vision: Vision,
-    path: Path? = null,
-    title: String = "VisionForge page",
-    resourceLocation: ResourceLocation = ResourceLocation.SYSTEM,
-    show: Boolean = true,
-): Unit = makeVisionFile({ vision(vision) }, path, title, resourceLocation, show)
+//@DFExperimental
+//public fun Context.makeVisionFile(
+//    vision: Vision,
+//    path: Path? = null,
+//    title: String = "VisionForge page",
+//    resourceLocation: ResourceLocation = ResourceLocation.SYSTEM,
+//    show: Boolean = true,
+//): Unit = makeVisionFile({ vision(vision) }, path, title, resourceLocation, show)
diff --git a/demo/playground/src/jvmMain/kotlin/simpleCube.kt b/demo/playground/src/jvmMain/kotlin/simpleCube.kt
index 3a90cfb8..e98d1ff1 100644
--- a/demo/playground/src/jvmMain/kotlin/simpleCube.kt
+++ b/demo/playground/src/jvmMain/kotlin/simpleCube.kt
@@ -1,22 +1,21 @@
 package space.kscience.visionforge.examples
 
-import space.kscience.dataforge.misc.DFExperimental
-import space.kscience.visionforge.VisionForge
+import space.kscience.dataforge.context.Context
 import space.kscience.visionforge.html.ResourceLocation
-import space.kscience.visionforge.html.fragment
-import space.kscience.visionforge.invoke
 import space.kscience.visionforge.solid.Solids
 import space.kscience.visionforge.solid.box
 import space.kscience.visionforge.solid.solid
 
-@DFExperimental
-fun main() = VisionForge(Solids) {
-    val content = fragment {
+fun main() {
+    val context = Context {
+        plugin(Solids)
+    }
+
+    context.makeVisionFile(resourceLocation = ResourceLocation.SYSTEM){
         vision("canvas") {
             solid {
                 box(100, 100, 100)
             }
         }
     }
-    makeVisionFile(content, resourceLocation = ResourceLocation.SYSTEM)
 }
\ No newline at end of file
diff --git a/demo/plotly-fx/build.gradle.kts b/demo/plotly-fx/build.gradle.kts
new file mode 100644
index 00000000..fa7a6976
--- /dev/null
+++ b/demo/plotly-fx/build.gradle.kts
@@ -0,0 +1,57 @@
+plugins {
+    kotlin("multiplatform")
+    application
+    id("org.openjfx.javafxplugin") version "0.0.9"
+}
+
+repositories {
+    maven("https://repo.kotlin.link")
+    mavenLocal()
+    jcenter()
+}
+
+kotlin {
+    jvm {
+        withJava()
+    }
+
+    js(IR) {
+        browser()
+    }
+
+    sourceSets{
+        commonMain{
+            dependencies {
+
+            }
+        }
+        val jvmMain by getting {
+            dependencies {
+                implementation("no.tornado:tornadofx:1.7.19")
+                implementation(project(":visionforge-server"))
+                implementation("ch.qos.logback:logback-classic:1.2.3")
+            }
+        }
+    }
+
+}
+
+javafx {
+    modules("javafx.web")
+    version = "16"
+}
+
+application {
+    mainClassName = "space.kscience.plotly.fx.PlotlyFXAppKt"
+}
+
+
+//
+//val compileKotlin: KotlinCompile by tasks
+//compileKotlin.kotlinOptions {
+//    jvmTarget = "11"
+//}
+//val compileTestKotlin: KotlinCompile by tasks
+//compileTestKotlin.kotlinOptions {
+//    jvmTarget = "11"
+//}
\ No newline at end of file
diff --git a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
index 6651cc13..6d80c691 100644
--- a/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
+++ b/demo/sat-demo/src/main/kotlin/ru/mipt/npm/sat/satServer.kt
@@ -15,7 +15,7 @@ import space.kscience.visionforge.visionManager
 import kotlin.random.Random
 
 fun main() {
-    val satContext = Global.context("sat") {
+    val satContext = Global.buildContext ("sat") {
         plugin(Solids)
     }
 
diff --git a/gradle.properties b/gradle.properties
index 930bba55..d9bddc47 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,10 @@
 kotlin.code.style=official
-kotlin.parallel.tasks.in.project=true
+
 kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.native.enableDependencyPropagation=false
 kotlin.mpp.stability.nowarn=true
 
-org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
-org.gradle.parallel=true
-systemProp.org.gradle.internal.publish.checksums.insecure=true
\ No newline at end of file
+kotlin.native.enableDependencyPropagation=false
+kotlin.parallel.tasks.in.project=true
+
+org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
+org.gradle.parallel=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d9132..f371643e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/gdmlJupyter.kt b/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/gdmlJupyter.kt
index 57bdb872..9c4d8140 100644
--- a/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/gdmlJupyter.kt
+++ b/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/gdmlJupyter.kt
@@ -1,16 +1,14 @@
 package space.kscience.visionforge.gdml.jupyter
 
-import kotlinx.browser.window
 import kotlinx.css.ListStyleType
 import kotlinx.css.listStyleType
 import space.kscience.dataforge.misc.DFExperimental
-import space.kscience.visionforge.VisionForge
 import space.kscience.visionforge.bootstrap.useBootstrap
-import space.kscience.visionforge.plugins
+import space.kscience.visionforge.runVisionClient
 import styled.injectGlobal
 
 @DFExperimental
-fun main(): Unit = VisionForge.run {
+fun main(): Unit = runVisionClient {
     useBootstrap()
     injectGlobal {
         rule("ul.nav") {
@@ -25,8 +23,5 @@ fun main(): Unit = VisionForge.run {
             listStyleType = ListStyleType.none
         }
     }
-    console.info("Starting VisionForge context")
-    plugins.fetch(ThreeWithControls)
-    window.asDynamic()["VisionForge"] = VisionForge
-    renderVisionsInWindow()
+    plugin(ThreeWithControls)
 }
\ No newline at end of file
diff --git a/jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt b/jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt
index 0161d621..86041d32 100644
--- a/jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt
+++ b/jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt
@@ -9,16 +9,14 @@ import org.jetbrains.kotlinx.jupyter.api.HTML
 import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
 import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
 import org.jetbrains.kotlinx.jupyter.api.libraries.resources
+import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.gdml.Gdml
 import space.kscience.visionforge.Vision
-import space.kscience.visionforge.VisionForge
 import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.html.HtmlVisionFragment
 import space.kscience.visionforge.html.Page
 import space.kscience.visionforge.html.embedVisionFragment
-import space.kscience.visionforge.html.fragment
-import space.kscience.visionforge.plugins
 import space.kscience.visionforge.solid.Solids
 import space.kscience.visionforge.visionManager
 
@@ -26,13 +24,17 @@ import space.kscience.visionforge.visionManager
 @DFExperimental
 internal class GdmlForJupyter : JupyterIntegration() {
 
+    private val context = Context("GDML") {
+        plugin(Solids)
+    }
+
     private var counter = 0
 
     private fun produceHtmlVisionString(fragment: HtmlVisionFragment) = createHTML().div {
         val id = "visionforge.vision[${counter++}]"
         div {
             this.id = id
-            embedVisionFragment(VisionForge.visionManager, fragment = fragment)
+            embedVisionFragment(context.visionManager, fragment = fragment)
         }
         script {
             type = "text/javascript"
@@ -43,7 +45,7 @@ internal class GdmlForJupyter : JupyterIntegration() {
     override fun Builder.onLoaded() {
 
         resources {
-            js("three"){
+            js("three") {
                 classPath("js/gdml-jupyter.js")
             }
 //            css("override") {
@@ -51,10 +53,6 @@ internal class GdmlForJupyter : JupyterIntegration() {
 //            }
         }
 
-        onLoaded {
-            VisionForge.plugins.fetch(Solids)
-        }
-
         import(
             "space.kscience.gdml.*",
             "kotlinx.html.*",
@@ -64,17 +62,15 @@ internal class GdmlForJupyter : JupyterIntegration() {
             "space.kscience.visionforge.gdml.jupyter.*"
         )
 
-        import<VisionForge>()
-
         render<Gdml> { gdmlModel ->
-            val fragment = VisionForge.fragment {
+            val fragment = HtmlVisionFragment {
                 vision(gdmlModel.toVision())
             }
             HTML(produceHtmlVisionString(fragment))
         }
 
         render<Vision> { vision ->
-            val fragment = VisionForge.fragment {
+            val fragment = HtmlVisionFragment {
                 vision(vision)
             }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9654d977..1c923b9a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,9 +1,8 @@
 pluginManagement {
-    val kotlinVersion = "1.4.31"
-    val toolsVersion = "0.9.2"
+    val kotlinVersion = "1.5.0"
+    val toolsVersion = "0.9.5"
 
     repositories {
-        mavenLocal()
         maven("https://repo.kotlin.link")
         mavenCentral()
         gradlePluginPortal()
@@ -14,11 +13,10 @@ pluginManagement {
         id("ru.mipt.npm.gradle.mpp") version toolsVersion
         id("ru.mipt.npm.gradle.jvm") version toolsVersion
         id("ru.mipt.npm.gradle.js") version toolsVersion
-        id("ru.mipt.npm.gradle.publish") version toolsVersion
-        kotlin("jvm") version kotlinVersion
-        kotlin("jupyter.api") version "0.8.3.279"
-        kotlin("js") version kotlinVersion
         kotlin("multiplatform") version kotlinVersion
+        kotlin("jvm") version kotlinVersion
+        kotlin("js") version kotlinVersion
+        kotlin("jupyter.api") version "0.9.1-20"
     }
 }
 
@@ -47,5 +45,6 @@ include(
     ":demo:sat-demo",
     ":demo:playground",
     ":demo:jupyter-playground",
+    ":demo:plotly-fx",
     ":jupyter:visionforge-gdml-jupyter"
 )
\ No newline at end of file
diff --git a/ui/bootstrap/build.gradle.kts b/ui/bootstrap/build.gradle.kts
index 50873978..b1b0588e 100644
--- a/ui/bootstrap/build.gradle.kts
+++ b/ui/bootstrap/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+    kotlin("js")
     id("ru.mipt.npm.gradle.js")
 }
 
diff --git a/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt
index 604eaec1..b65b9666 100644
--- a/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt
+++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt
@@ -1,25 +1,25 @@
 package space.kscience.visionforge.bootstrap
 
-import kotlinx.css.*
+import kotlinx.css.BorderStyle
+import kotlinx.css.Color
+import kotlinx.css.padding
 import kotlinx.css.properties.border
-import kotlinx.html.InputType
-import kotlinx.html.js.onChangeFunction
+import kotlinx.css.px
 import kotlinx.html.js.onClickFunction
-import org.w3c.dom.HTMLInputElement
 import org.w3c.dom.events.Event
 import org.w3c.files.Blob
 import org.w3c.files.BlobPropertyBag
 import react.*
 import react.dom.button
-import react.dom.h3
-import react.dom.input
-import react.dom.label
+import space.kscience.dataforge.meta.descriptors.defaultMeta
+import space.kscience.dataforge.meta.withDefault
 import space.kscience.visionforge.react.flexColumn
 import space.kscience.visionforge.react.flexRow
+import space.kscience.visionforge.react.propertyEditor
 import space.kscience.visionforge.solid.SolidGroup
+import space.kscience.visionforge.solid.specifications.Canvas3DOptions
 import space.kscience.visionforge.solid.three.ThreeCanvas
 import styled.css
-import styled.styledDiv
 
 private fun saveData(event: Event, fileName: String, mimeType: String = "text/plain", dataBuilder: () -> String) {
     event.stopPropagation();
@@ -48,7 +48,35 @@ public val CanvasControls: FunctionalComponent<CanvasControlsProps> = functional
         arrayOf(props.canvas)
     )
     flexColumn {
-        h3 { +"Axes" }
+        flexRow {
+            css{
+                border(1.px, BorderStyle.solid, Color.blue)
+                padding(4.px)
+            }
+            button {
+                +"Export"
+                attrs {
+                    onClickFunction = {
+                        val json = (props.canvas.content as? SolidGroup)?.let { group ->
+                            visionManager.encodeToString(group)
+                        }
+                        if (json != null) {
+                            saveData(it, "object.json", "text/json") {
+                                json
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        propertyEditor(
+            ownProperties = props.canvas.options,
+            allProperties = props.canvas.options.withDefault(Canvas3DOptions.descriptor.defaultMeta()),
+            descriptor = Canvas3DOptions.descriptor,
+            expanded = false
+        )
+
+/*        h3 { +"Axes" }
         flexRow {
             css{
                 border(1.px,BorderStyle.solid, Color.blue)
@@ -57,9 +85,9 @@ public val CanvasControls: FunctionalComponent<CanvasControlsProps> = functional
             label("checkbox-inline") {
                 input(type = InputType.checkBox) {
                     attrs {
-                        defaultChecked = props.canvas.axes.visible
+                        defaultChecked = props.canvas.options.axes.visible
                         onChangeFunction = {
-                            props.canvas.axes.visible = (it.target as HTMLInputElement).checked
+                            props.canvas.options.axes.visible = (it.target as HTMLInputElement).checked
                         }
                     }
                 }
@@ -118,5 +146,6 @@ public val CanvasControls: FunctionalComponent<CanvasControlsProps> = functional
                 }
             }
         }
+ */
     }
 }
\ No newline at end of file
diff --git a/ui/react/build.gradle.kts b/ui/react/build.gradle.kts
index b430a3d2..86c5068f 100644
--- a/ui/react/build.gradle.kts
+++ b/ui/react/build.gradle.kts
@@ -2,12 +2,11 @@ plugins {
     id("ru.mipt.npm.gradle.js")
 }
 
-val reactVersion by extra("17.0.1")
 val kotlinWrappersVersion: String by rootProject.extra
 
 dependencies{
     api(project(":visionforge-solid"))
-    api("org.jetbrains:kotlin-styled:5.2.1-$kotlinWrappersVersion")
-    api("org.jetbrains:kotlin-react-dom:$reactVersion-$kotlinWrappersVersion")
+    api("org.jetbrains:kotlin-styled:5.2.3-$kotlinWrappersVersion")
+    api("org.jetbrains:kotlin-react-dom:17.0.2-$kotlinWrappersVersion")
     implementation(project(":visionforge-threejs"))
 }
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
index 050378a3..34fcf78b 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
@@ -59,6 +59,11 @@ public external interface PropertyEditorProps : RProps {
      * Flow names of updated properties
      */
     public var updateFlow: Flow<Name>?
+
+    /**
+     * Initial expanded state
+     */
+    public var expanded: Boolean?
 }
 
 private val PropertyEditorItem: FunctionalComponent<PropertyEditorProps> =
@@ -67,7 +72,7 @@ private val PropertyEditorItem: FunctionalComponent<PropertyEditorProps> =
     }
 
 private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
-    var expanded: Boolean by useState { true }
+    var expanded: Boolean by useState { props.expanded ?: true }
     val descriptorItem: ItemDescriptor? = props.descriptor?.get(props.name)
     var ownProperty: MetaItem? by useState { props.ownProperties.getItem(props.name) }
     val actualItem: MetaItem? = props.allProperties?.getItem(props.name)
@@ -110,7 +115,7 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
     if (actualItem is MetaItemNode) {
         val keys = buildSet {
             (descriptorItem as? NodeDescriptor)?.items?.filterNot {
-                it.key.startsWith("@")  || it.value.hidden
+                it.key.startsWith("@") || it.value.hidden
             }?.forEach {
                 add(NameToken(it.key))
             }
@@ -232,11 +237,12 @@ public val PropertyEditor: FunctionalComponent<PropertyEditorProps> = functional
 
 public fun RBuilder.propertyEditor(
     ownProperties: MutableItemProvider,
-    allProperties: ItemProvider?,
+    allProperties: ItemProvider? = ownProperties,
     updateFlow: Flow<Name>? = null,
     descriptor: NodeDescriptor? = null,
     scope: CoroutineScope? = null,
     key: Any? = null,
+    expanded: Boolean? = null
 ) {
     child(PropertyEditor) {
         attrs {
@@ -246,6 +252,7 @@ public fun RBuilder.propertyEditor(
             this.descriptor = descriptor
             this.key = key?.toString() ?: ""
             this.scope = scope
+            this.expanded = expanded
         }
     }
 }
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleSheet.kt
index cdfe2a07..2e688667 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleSheet.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleSheet.kt
@@ -5,11 +5,13 @@ import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.NameToken
 import space.kscience.dataforge.names.asName
 import space.kscience.dataforge.names.plus
+import kotlin.jvm.JvmInline
 
 /**
  * A container for styles
  */
-public inline class StyleSheet(private val owner: VisionGroup) {
+@JvmInline
+public value class StyleSheet(private val owner: VisionGroup) {
 
     private val styleNode get() = owner.ownProperties[STYLESHEET_KEY].node
 
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionForge.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionForge.kt
deleted file mode 100644
index 90158f9e..00000000
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionForge.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package space.kscience.visionforge
-
-import space.kscience.dataforge.context.Context
-import space.kscience.dataforge.context.PluginManager
-import space.kscience.dataforge.misc.DFExperimental
-
-public expect object VisionForge
-
-@DFExperimental
-public expect val VisionForge.context: Context
-
-@DFExperimental
-public val VisionForge.plugins: PluginManager get() = context.plugins
-
-@DFExperimental
-public val VisionForge.visionManager: VisionManager get() = plugins.fetch(VisionManager)
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt
index 65f16961..d45cc906 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt
@@ -93,6 +93,6 @@ public abstract class VisionPlugin(meta: Meta = Meta.EMPTY) : AbstractPlugin(met
 }
 
 /**
- * Fetch a [VisionManager] from this plugin
+ * Fetch a [VisionManager] from this plugin or create a child plugin with a [VisionManager]
  */
-public val Context.visionManager: VisionManager get() = plugins.fetch(VisionManager)
\ No newline at end of file
+public val Context.visionManager: VisionManager get() = fetch(VisionManager)
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionFragment.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionFragment.kt
index 4597a955..9be18263 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionFragment.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionFragment.kt
@@ -4,7 +4,6 @@ import kotlinx.html.FlowContent
 import kotlinx.html.TagConsumer
 import kotlinx.html.stream.createHTML
 import space.kscience.dataforge.misc.DFExperimental
-import space.kscience.visionforge.VisionForge
 
 public typealias HtmlFragment = TagConsumer<*>.() -> Unit
 
@@ -21,4 +20,4 @@ public fun FlowContent.fragment(fragment: HtmlFragment) {
 public typealias HtmlVisionFragment = VisionTagConsumer<*>.() -> Unit
 
 @DFExperimental
-public fun VisionForge.fragment(content: HtmlVisionFragment): VisionTagConsumer<*>.() -> Unit = content
\ No newline at end of file
+public fun HtmlVisionFragment(content: VisionTagConsumer<*>.() -> Unit): HtmlVisionFragment = content
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/Page.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/Page.kt
index ac1642b8..6e807e92 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/Page.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/Page.kt
@@ -3,15 +3,13 @@ package space.kscience.visionforge.html
 import kotlinx.html.*
 import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.misc.DFExperimental
-import space.kscience.visionforge.VisionForge
-import space.kscience.visionforge.context
 import space.kscience.visionforge.visionManager
 
 public data class Page(
     public val context: Context,
     public val title: String,
     public val headers: Map<String, HtmlFragment>,
-    public val content: HtmlVisionFragment
+    public val content: HtmlVisionFragment,
 ) {
     public fun <R> render(root: TagConsumer<R>): R = root.apply {
         head {
@@ -31,8 +29,8 @@ public data class Page(
 
 
 @DFExperimental
-public fun VisionForge.page(
+public fun Context.page(
     title: String = "VisionForge page",
     vararg headers: Pair<String, HtmlFragment>,
     content: HtmlVisionFragment,
-): Page = Page(context, title, mapOf(*headers), content)
\ No newline at end of file
+): Page = Page(this, title, mapOf(*headers), content)
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt
index 1ceaee36..aa8e6fcb 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt
@@ -79,6 +79,9 @@ public abstract class VisionTagConsumer<R>(
         return vision(name, vision, output.meta)
     }
 
+    /**
+     * TODO to be replaced by multi-receiver
+     */
     @OptIn(DFExperimental::class)
     public inline fun <T> TagConsumer<T>.vision(
         name: String = DEFAULT_VISION_NAME,
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/schemeDesctiptors.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/schemeDesctiptors.kt
new file mode 100644
index 00000000..f1a5fb1c
--- /dev/null
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/schemeDesctiptors.kt
@@ -0,0 +1,62 @@
+package space.kscience.visionforge
+
+import space.kscience.dataforge.meta.Scheme
+import space.kscience.dataforge.meta.SchemeSpec
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.dataforge.meta.descriptors.NodeDescriptorBuilder
+import space.kscience.dataforge.meta.descriptors.ValueDescriptor
+import space.kscience.dataforge.meta.toConfig
+import space.kscience.dataforge.values.ValueType
+import kotlin.reflect.KProperty1
+import kotlin.reflect.typeOf
+
+/**
+ * TODO to be moved into the core
+ */
+public inline fun <S : Scheme, reified T> NodeDescriptorBuilder.value(
+    property: KProperty1<S, T>,
+    noinline block: ValueDescriptor.() -> Unit = {},
+) {
+    when (typeOf<T>()) {
+        typeOf<Number>(), typeOf<Int>(), typeOf<Double>(), typeOf<Short>(), typeOf<Long>(), typeOf<Float>() ->
+            value(property.name) {
+                type(ValueType.NUMBER)
+                block()
+            }
+        typeOf<Boolean>() -> value(property.name) {
+            type(ValueType.BOOLEAN)
+            block()
+        }
+        typeOf<List<Number>>(), typeOf<List<Int>>(), typeOf<List<Double>>(), typeOf<List<Short>>(), typeOf<List<Long>>(), typeOf<List<Float>>(),
+        typeOf<IntArray>(), typeOf<DoubleArray>(), typeOf<ShortArray>(), typeOf<LongArray>(), typeOf<FloatArray>(),
+        -> value(property.name) {
+            type(ValueType.NUMBER)
+            multiple = true
+            block()
+        }
+        typeOf<String>() -> value(property.name) {
+            type(ValueType.STRING)
+            block()
+        }
+        typeOf<List<String>>(), typeOf<Array<String>>() -> value(property.name) {
+            type(ValueType.STRING)
+            multiple = true
+            block()
+        }
+        else -> value(property.name, block)
+    }
+}
+
+public fun NodeDescriptor.copy(block: NodeDescriptorBuilder.() -> Unit = {}): NodeDescriptor {
+    return NodeDescriptorBuilder(toMeta().toConfig()).apply(block)
+}
+
+public inline fun <S : Scheme, reified T : Scheme> NodeDescriptorBuilder.scheme(
+    property: KProperty1<S, T>,
+    spec: SchemeSpec<T>,
+    noinline block: NodeDescriptor.() -> Unit = {},
+) {
+    spec.descriptor?.let { descriptor ->
+        item(property.name, descriptor.copy(block))
+    }
+}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visionDescriptor.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visionDescriptor.kt
index e058c3c6..c56b495e 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visionDescriptor.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/visionDescriptor.kt
@@ -1,10 +1,7 @@
 package space.kscience.visionforge
 
 import space.kscience.dataforge.meta.*
-import space.kscience.dataforge.meta.descriptors.ItemDescriptor
-import space.kscience.dataforge.meta.descriptors.NodeDescriptor
-import space.kscience.dataforge.meta.descriptors.ValueDescriptor
-import space.kscience.dataforge.meta.descriptors.attributes
+import space.kscience.dataforge.meta.descriptors.*
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.values.ValueType
 import space.kscience.dataforge.values.asValue
@@ -12,13 +9,19 @@ import space.kscience.dataforge.values.asValue
 private const val INHERITED_DESCRIPTOR_ATTRIBUTE = "inherited"
 private const val STYLE_DESCRIPTOR_ATTRIBUTE = "useStyles"
 
-public var ItemDescriptor.inherited: Boolean
+public val ItemDescriptor.inherited: Boolean
+    get() = attributes[INHERITED_DESCRIPTOR_ATTRIBUTE].boolean ?: false
+
+public var ItemDescriptorBuilder.inherited: Boolean
     get() = attributes[INHERITED_DESCRIPTOR_ATTRIBUTE].boolean ?: false
     set(value) = attributes {
         set(INHERITED_DESCRIPTOR_ATTRIBUTE, value)
     }
 
-public var ItemDescriptor.usesStyles: Boolean
+public val ItemDescriptor.usesStyles: Boolean
+    get() = attributes[STYLE_DESCRIPTOR_ATTRIBUTE].boolean ?: true
+
+public var ItemDescriptorBuilder.usesStyles: Boolean
     get() = attributes[STYLE_DESCRIPTOR_ATTRIBUTE].boolean ?: true
     set(value) = attributes {
         set(STYLE_DESCRIPTOR_ATTRIBUTE, value)
@@ -32,10 +35,13 @@ public val Vision.describedProperties: Meta
         }
     }
 
+public val ValueDescriptor.widget: Meta
+    get() = attributes["widget"].node ?: Meta.EMPTY
+
 /**
  * Extension property to access the "widget" key of [ValueDescriptor]
  */
-public var ValueDescriptor.widget: Meta
+public var ValueDescriptorBuilder.widget: Meta
     get() = attributes["widget"].node ?: Meta.EMPTY
     set(value) {
         attributes {
@@ -43,10 +49,13 @@ public var ValueDescriptor.widget: Meta
         }
     }
 
+public val ValueDescriptor.widgetType: String?
+    get() = attributes["widget.type"].string
+
 /**
  * Extension property to access the "widget.type" key of [ValueDescriptor]
  */
-public var ValueDescriptor.widgetType: String?
+public var ValueDescriptorBuilder.widgetType: String?
     get() = attributes["widget.type"].string
     set(value) {
         attributes {
@@ -60,15 +69,15 @@ public var ValueDescriptor.widgetType: String?
 public val ItemDescriptor.hidden: Boolean
     get() = attributes["widget.hide"].boolean ?: false
 
-public fun ItemDescriptor.hide(): Unit = attributes {
+public fun ItemDescriptorBuilder.hide(): Unit = attributes {
     set("widget.hide", true)
 }
 
 
-public inline fun <reified E : Enum<E>> NodeDescriptor.enum(
+public inline fun <reified E : Enum<E>> NodeDescriptorBuilder.enum(
     key: Name,
     default: E?,
-    crossinline modifier: ValueDescriptor.() -> Unit = {},
+    crossinline modifier: ValueDescriptorBuilder.() -> Unit = {},
 ): Unit = value(key) {
     type(ValueType.STRING)
     default?.let {
diff --git a/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt b/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt
index bbbd6c8b..5f35bd74 100644
--- a/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt
+++ b/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt
@@ -46,7 +46,7 @@ class HtmlTagTest {
         }
     }
 
-    val groupRenderer: HtmlVisionRenderer = { _, group, _ ->
+    val groupRenderer: HtmlVisionRenderer = { _, _, _ ->
         p { +"This is group" }
     }
 
diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
index 85c3c9de..9ca71059 100644
--- a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
@@ -2,10 +2,7 @@ package space.kscience.visionforge
 
 import kotlinx.browser.document
 import kotlinx.browser.window
-import org.w3c.dom.Element
-import org.w3c.dom.WebSocket
-import org.w3c.dom.asList
-import org.w3c.dom.get
+import org.w3c.dom.*
 import org.w3c.dom.url.URL
 import space.kscience.dataforge.context.*
 import space.kscience.dataforge.meta.Meta
@@ -66,7 +63,7 @@ public class VisionClient : AbstractPlugin() {
     /**
      * Fetch from server and render a vision, described in a given with [VisionTagConsumer.OUTPUT_CLASS] class.
      */
-    public fun renderVisionAt(element: Element) {
+    public fun renderVisionIn(element: Element) {
         val name = resolveName(element) ?: error("The element is not a vision output")
         logger.info { "Found DF output with name $name" }
         if (!element.classList.contains(VisionTagConsumer.OUTPUT_CLASS)) error("The element $element is not an output element")
@@ -173,21 +170,58 @@ public class VisionClient : AbstractPlugin() {
     }
 }
 
-/**
- * Fetch and render visions for all elements with [VisionTagConsumer.OUTPUT_CLASS] class inside given [element].
- */
-public fun VisionClient.renderAllVisionsAt(element: Element) {
-    val elements = element.getElementsByClassName(VisionTagConsumer.OUTPUT_CLASS)
-    console.info("Finished search for outputs. Found ${elements.length} items")
-    elements.asList().forEach { child ->
-        renderVisionAt(child)
+
+private fun whenDocumentLoaded(block: Document.() -> Unit): Unit {
+    if (document.readyState == DocumentReadyState.COMPLETE) {
+        block(document)
+    } else {
+        document.addEventListener("DOMContentLoaded", { block(document) })
     }
 }
 
+/**
+ * Fetch and render visions for all elements with [VisionTagConsumer.OUTPUT_CLASS] class inside given [element].
+ */
+public fun VisionClient.renderAllVisionsIn(element: Element) {
+    val elements = element.getElementsByClassName(VisionTagConsumer.OUTPUT_CLASS)
+    console.info("Finished search for outputs. Found ${elements.length} items")
+    elements.asList().forEach { child ->
+        renderVisionIn(child)
+    }
+}
+
+/**
+ * Render all visions in an element with a given [id]
+ */
+public fun VisionClient.renderAllVisionsById(id: String): Unit = whenDocumentLoaded {
+    val element = getElementById(id)
+    if (element != null) {
+        renderAllVisionsIn(element)
+    } else {
+        console.warn("Element with id $id not found")
+    }
+}
+
+
 /**
  * Fetch visions from the server for all elements with [VisionTagConsumer.OUTPUT_CLASS] class in the document body
  */
-public fun VisionClient.renderAllVisions() {
-    val element = document.body ?: error("Document does not have a body")
-    renderAllVisionsAt(element)
+public fun VisionClient.renderAllVisions(): Unit = whenDocumentLoaded {
+    val element = body ?: error("Document does not have a body")
+    renderAllVisionsIn(element)
+}
+
+/**
+ * Create a vision client context and render all visions on the page.
+ */
+public fun runVisionClient(contextBuilder: ContextBuilder.() -> Unit) {
+    console.info("Starting VisionForge context")
+    val context = Context("VisionForge"){
+        contextBuilder()
+        plugin(VisionClient)
+    }
+    val visionClient = context.fetch(VisionClient)
+    window.asDynamic()["renderAllVisionsById"] = visionClient::renderAllVisionsById
+
+    visionClient.renderAllVisions()
 }
\ No newline at end of file
diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/visionForgeJs.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/visionForgeJs.kt
deleted file mode 100644
index e605b4d1..00000000
--- a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/visionForgeJs.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-package space.kscience.visionforge
-
-import kotlinx.browser.document
-import kotlinx.browser.window
-import org.w3c.dom.COMPLETE
-import org.w3c.dom.Document
-import org.w3c.dom.DocumentReadyState
-import space.kscience.dataforge.context.Context
-import space.kscience.dataforge.misc.DFExperimental
-
-
-private fun whenDocumentLoaded(block: Document.() -> Unit): Unit {
-    if(document.readyState == DocumentReadyState.COMPLETE){
-        block(document)
-    } else {
-        document.addEventListener("DOMContentLoaded", { block(document) })
-    }
-}
-
-@JsExport
-@DFExperimental
-@JsName("VisionForge")
-public actual object VisionForge {
-    /**
-     * Render all visions in this [window] using current global state of [VisionForge]
-     */
-    public fun renderVisionsInWindow(): Unit = whenDocumentLoaded {
-        visionClient.renderAllVisions()
-    }
-
-    /**
-     * Render all visions in an element with a given [id]
-     */
-    public fun renderVisionsAt(id: String): Unit = whenDocumentLoaded {
-        val element = getElementById(id)
-        if (element != null) {
-            visionClient.renderAllVisionsAt(element)
-        } else {
-            console.warn("Element with id $id not found")
-        }
-    }
-}
-
-private val visionForgeContext = Context("VisionForge") {
-    plugin(VisionClient)
-}
-
-@DFExperimental
-public actual val VisionForge.context: Context
-    get() = visionForgeContext
-
-@DFExperimental
-public val VisionForge.visionClient: VisionClient
-    get() = plugins.fetch(VisionClient)
-
-
-///**
-// * Render all visions in this [window] using current global state of [VisionForge]
-// */
-//@DFExperimental
-//@JsExport
-//public fun renderVisionsInWindow(): Unit {
-//    VisionForge.renderVisionsInWindow()
-//}
-//
-///**
-// * Render all visions in an element with a given [id]
-// */
-//@DFExperimental
-//@JsExport
-//public fun renderVisionsAt(id: String): Unit {
-//    VisionForge.renderVisionsAt(id)
-//}
\ No newline at end of file
diff --git a/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/visionForgeJvm.kt b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/visionForgeJvm.kt
deleted file mode 100644
index 6d2802b7..00000000
--- a/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/visionForgeJvm.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package space.kscience.visionforge
-
-import space.kscience.dataforge.context.Context
-import space.kscience.dataforge.context.PluginFactory
-import space.kscience.dataforge.misc.DFExperimental
-
-public actual object VisionForge
-
-@DFExperimental
-private val visionForgeContext = Context("VisionForge")
-
-@DFExperimental
-public actual val VisionForge.context: Context get() = visionForgeContext
-
-@DFExperimental
-public operator fun VisionForge.invoke(vararg modules: PluginFactory<out VisionPlugin>, block: VisionForge.() -> Unit): Unit {
-    modules.forEach {
-        plugins.fetch(it)
-    }
-    run(block)
-}
\ No newline at end of file
diff --git a/visionforge-gdml/build.gradle.kts b/visionforge-gdml/build.gradle.kts
index 738b0724..aa40405a 100644
--- a/visionforge-gdml/build.gradle.kts
+++ b/visionforge-gdml/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+    kotlin("multiplatform")
     id("ru.mipt.npm.gradle.mpp")
 }
 
@@ -7,7 +8,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 api(project(":visionforge-solid"))
-                api("space.kscience:gdml:0.3.2")
+                api("space.kscience:gdml:0.4.0")
             }
         }
     }
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlShowcase.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlShowcase.kt
deleted file mode 100644
index 03c403aa..00000000
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlShowcase.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package space.kscience.visionforge.gdml
-
-import space.kscience.gdml.*
-
-public object GdmlShowcase {
-    public val cubes: Gdml = Gdml {
-        val center = define.position("center")
-        structure {
-            val air = materials.composite("G4_AIR") {}
-            val tubeMaterial = materials.composite("tube") {}
-            val boxMaterial = materials.composite("box") {}
-
-            val segment = solids.tube("segment", 20, 5.0) {
-                rmin = 17
-                deltaphi = 60
-                aunit = AUnit.DEG
-            }
-            val worldBox = solids.box("largeBox", 200, 200, 200)
-            val smallBox = solids.box("smallBox", 30, 30, 30)
-            val segmentVolume = volume("segment", tubeMaterial, segment) {}
-            val circle = volume("composite", boxMaterial, smallBox) {
-                for (i in 0 until 6) {
-                    physVolume(segmentVolume) {
-                        name = "segment[$i]"
-                        positionref = center
-                        rotation {
-                            z = 60 * i
-                            unit = AUnit.DEG
-                        }
-                    }
-                }
-            }
-
-            world = volume("world", air, worldBox) {
-                for (i in 0 until 3) {
-                    for (j in 0 until 3) {
-                        for (k in 0 until 3) {
-                            physVolume(circle) {
-                                name = "composite[$i,$j,$k]"
-                                position {
-                                    x = (-50 + i * 50)
-                                    y = (-50 + j * 50)
-                                    z = (-50 + k * 50)
-                                }
-                                rotation {
-                                    x = i * 120
-                                    y = j * 120
-                                    z = 120 * k
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
index f9bba939..449bd09d 100644
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
@@ -35,13 +35,13 @@ public class GdmlTransformerSettings {
         PROTOTYPE
     }
 
-    public var lUnit: LUnit = LUnit.CM
+    public var lUnit: LUnit = LUnit.MM
     public var aUnit: AUnit = AUnit.RADIAN
 
     public var solidAction: (GdmlSolid) -> Action = { Action.PROTOTYPE }
     public var volumeAction: (GdmlGroup) -> Action = { Action.PROTOTYPE }
 
-    public var paint: SolidMaterial.(material: GdmlMaterial) -> Unit = { _->
+    public var paint: SolidMaterial.(material: GdmlMaterial) -> Unit = { _ ->
         color(random.nextInt(16777216))
     }
 }
@@ -110,7 +110,7 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
         val styleName = "materials.${material.name}"
 
         obj.useStyle(styleName) {
-            val vfMaterial = settings.run { SolidMaterial().apply { paint(material)}}
+            val vfMaterial = settings.run { SolidMaterial().apply { paint(material) } }
             MATERIAL_KEY put vfMaterial.toMeta()
             "Gdml.material" put material.name
         }
@@ -151,6 +151,24 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
         physVolume.resolveScale(root)
     )
 
+    private fun GdmlSolid.lscale(targetUnit: LUnit): Float {
+        val solidUnit = lunit ?: return 1f
+        return if (solidUnit == targetUnit) {
+            1f
+        } else {
+            solidUnit.value / targetUnit.value
+        }
+    }
+
+    private fun GdmlSolid.ascale(targetUnit: AUnit = AUnit.RAD): Float {
+        val solidUnit = aunit ?: return 1f
+        return if (solidUnit == targetUnit) {
+            1f
+        } else {
+            solidUnit.value / targetUnit.value
+        }
+    }
+
     fun SolidGroup.addSolid(
         root: Gdml,
         solid: GdmlSolid,
@@ -158,7 +176,7 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
     ): Solid {
         //context.solidAdded(solid)
         val lScale = solid.lscale(settings.lUnit)
-        val aScale = solid.ascale()
+        val aScale = solid.ascale(settings.aUnit)
         return when (solid) {
             is GdmlBox -> box(solid.x * lScale, solid.y * lScale, solid.z * lScale, name)
             is GdmlTube -> tube(
@@ -201,7 +219,7 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
                     scaleZ = solid.scale.z.toFloat()
                 }
             }
-            is GdmlSphere -> sphereLayer(solid.rmax * lScale,  solid.rmin * lScale, name) {
+            is GdmlSphere -> sphereLayer(solid.rmax * lScale, solid.rmin * lScale, name) {
                 phi = solid.deltaphi * aScale
                 theta = solid.deltatheta * aScale
                 phiStart = solid.startphi * aScale
@@ -299,7 +317,7 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
         when (settings.volumeAction(volume)) {
             GdmlTransformerSettings.Action.ADD -> {
                 val group: SolidGroup = volume(root, volume)
-                this[physVolume.name ?: ""] = group.withPosition(root, physVolume)
+                this[physVolume.name] = group.withPosition(root, physVolume)
             }
             GdmlTransformerSettings.Action.PROTOTYPE -> {
                 proxyVolume(root, this, physVolume, volume)
@@ -378,7 +396,7 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
         return final
     }
 
-    fun transform(root: Gdml): SolidGroup = finalize(volume(root, root.world))
+    fun transform(root: Gdml): SolidGroup = finalize(volume(root, root.world.resolve(root) ?: error("GDML root is not resolved")))
 }
 
 
diff --git a/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt b/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt
index 22f12553..a364996c 100644
--- a/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt
+++ b/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt
@@ -2,12 +2,8 @@ package space.kscience.visionforge.gdml
 
 import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.names.toName
-import space.kscience.gdml.Gdml
-import space.kscience.gdml.GdmlBox
-import space.kscience.gdml.decodeFromString
-import space.kscience.gdml.encodeToString
+import space.kscience.gdml.*
 import space.kscience.visionforge.Vision
-import space.kscience.visionforge.gdml.GdmlShowcase.cubes
 import space.kscience.visionforge.get
 import space.kscience.visionforge.solid.*
 import space.kscience.visionforge.visionManager
@@ -21,13 +17,16 @@ internal val testContext = Context("TEST") {
 
 class TestCubes {
 
+    val cubes = GdmlShowCase.cubes()
+
     @Test
     fun testCubesDirect() {
         val vision = cubes.toVision()
+//        println(Solids.encodeToString(vision))
         val smallBoxPrototype = vision.getPrototype("solids.smallBox".toName()) as? Box
         assertNotNull(smallBoxPrototype)
         assertEquals(30.0, smallBoxPrototype.xSize.toDouble())
-        val smallBoxVision = vision["composite[1,1,1].smallBox"]?.prototype as? Box
+        val smallBoxVision = vision["composite-111.smallBox"]?.prototype as? Box
         assertNotNull(smallBoxVision)
         assertEquals(30.0, smallBoxVision.xSize.toDouble())
     }
diff --git a/visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/bmanStatistics.kt b/visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/bmanStatistics.kt
index b61a7813..eccac343 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/bmanStatistics.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/bmanStatistics.kt
@@ -4,6 +4,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import nl.adaptivity.xmlutil.StAXReader
 import space.kscience.gdml.Gdml
+import space.kscience.gdml.decodeFromReader
 import space.kscience.visionforge.solid.prototype
 import space.kscience.visionforge.visitor.countDistinct
 import space.kscience.visionforge.visitor.flowStatistics
@@ -17,7 +18,7 @@ suspend fun main() {
             File("D:\\Work\\Projects\\dataforge-vis\\visionforge-gdml\\src\\jvmTest\\resources\\gdml\\BM@N.gdml").inputStream()
 
         val xmlReader = StAXReader(stream, "UTF-8")
-        val xml = Gdml.format.decodeFromReader(Gdml.serializer(), xmlReader)
+        val xml = Gdml.decodeFromReader( xmlReader)
         val vision = xml.toVision()
 
 
diff --git a/visionforge-plotly/build.gradle.kts b/visionforge-plotly/build.gradle.kts
index 4f8b04db..9844b470 100644
--- a/visionforge-plotly/build.gradle.kts
+++ b/visionforge-plotly/build.gradle.kts
@@ -4,12 +4,12 @@ plugins {
 
 val plotlyVersion = "0.4.0-dev-1"
 
-kscience{
+kscience {
     useSerialization()
 }
 
 kotlin {
-    js{
+    js {
         //binaries.library()
         binaries.executable()
         browser {
@@ -19,15 +19,11 @@ kotlin {
         }
     }
 
-    afterEvaluate {
-        val jsBrowserDistribution by tasks.getting
+    val jsBrowserDistribution by tasks.getting
 
-        tasks.getByName<ProcessResources>("jvmProcessResources") {
-            dependsOn(jsBrowserDistribution)
-            afterEvaluate {
-                from(jsBrowserDistribution)
-            }
-        }
+    tasks.getByName<ProcessResources>("jvmProcessResources") {
+        dependsOn(jsBrowserDistribution)
+        from(jsBrowserDistribution)
     }
 
     sourceSets {
diff --git a/visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/PlotlyPlugin.kt b/visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/PlotlyPlugin.kt
index 84e3b5d1..da6185c6 100644
--- a/visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/PlotlyPlugin.kt
+++ b/visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/PlotlyPlugin.kt
@@ -4,26 +4,15 @@ import kotlinx.serialization.modules.SerializersModule
 import kotlinx.serialization.modules.polymorphic
 import kotlinx.serialization.modules.subclass
 import space.kscience.dataforge.context.PluginFactory
-import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.visionforge.Vision
-import space.kscience.visionforge.VisionForge
 import space.kscience.visionforge.VisionPlugin
-import space.kscience.visionforge.plugins
 
-public expect class PlotlyPlugin : VisionPlugin{
-    public companion object: PluginFactory<PlotlyPlugin>
+public expect class PlotlyPlugin : VisionPlugin {
+    public companion object : PluginFactory<PlotlyPlugin>
 }
 
 internal val plotlySerializersModule = SerializersModule {
     polymorphic(Vision::class) {
         subclass(VisionOfPlotly.serializer())
     }
-}
-
-/**
- * Ensure that [PlotlyPlugin] is loaded in the global [VisionForge] context
- */
-@DFExperimental
-public fun VisionForge.usePlotly() {
-    plugins.fetch(PlotlyPlugin)
 }
\ No newline at end of file
diff --git a/visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyHeaders.kt b/visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyHeaders.kt
index a09909c7..8c986125 100644
--- a/visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyHeaders.kt
+++ b/visionforge-plotly/src/jvmMain/kotlin/space/kscience/visionforge/plotly/plotlyHeaders.kt
@@ -1,30 +1,22 @@
 package space.kscience.visionforge.plotly
 
-import kotlinx.html.script
-import kotlinx.html.unsafe
-import space.kscience.dataforge.misc.DFExperimental
-import space.kscience.visionforge.html.HtmlFragment
-import space.kscience.visionforge.html.ResourceLocation
-import space.kscience.visionforge.html.scriptHeader
-import java.nio.file.Path
-
-internal val plotlyScriptLocation = "js/visionforge-three.js"
-
-/**
- * A header that stores/embeds plotly bundle and registers plotly renderer in the frontend
- */
-@OptIn(DFExperimental::class)
-public fun plotlyHeader(location: ResourceLocation, filePath: Path? = null): HtmlFragment = {
-    scriptHeader(
-        plotlyScriptLocation,
-        resourceLocation = location,
-        htmlPath = filePath
-    ).invoke(this)
-    script {
-        type = "text/javascript"
-        unsafe {
-            //language=JavaScript
-            +"space.kscience.visionforge.plotly.loadPlotly()"
-        }
-    }
-}
+//internal val plotlyScriptLocation = "js/visionforge-three.js"
+//
+///**
+// * A header that stores/embeds plotly bundle and registers plotly renderer in the frontend
+// */
+//@OptIn(DFExperimental::class)
+//public fun plotlyHeader(location: ResourceLocation, filePath: Path? = null): HtmlFragment = {
+//    scriptHeader(
+//        plotlyScriptLocation,
+//        resourceLocation = location,
+//        htmlPath = filePath
+//    ).invoke(this)
+//    script {
+//        type = "text/javascript"
+//        unsafe {
+//            //language=JavaScript
+//            +"space.kscience.visionforge.plotly.loadPlotly()"
+//        }
+//    }
+//}
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt
index b6d9bb16..fc296244 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt
@@ -17,9 +17,7 @@ import kotlin.reflect.KClass
 
 
 public class Solids(meta: Meta) : VisionPlugin(meta) {
-
     override val tag: PluginTag get() = Companion.tag
-
     override val visionSerializersModule: SerializersModule get() = serializersModuleForSolids
 
     public companion object : PluginFactory<Solids> {
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SphereLayer.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SphereLayer.kt
index de82d02a..6443bdd0 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SphereLayer.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SphereLayer.kt
@@ -9,6 +9,9 @@ import kotlin.math.PI
 import kotlin.math.cos
 import kotlin.math.sin
 
+/**
+ * A spherical layer
+ */
 @Serializable
 @SerialName("solid.sphereLayer")
 public class SphereLayer(
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Axes.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Axes.kt
index 2f907091..8b59a8b4 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Axes.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Axes.kt
@@ -3,7 +3,9 @@ package space.kscience.visionforge.solid.specifications
 import space.kscience.dataforge.meta.Scheme
 import space.kscience.dataforge.meta.SchemeSpec
 import space.kscience.dataforge.meta.boolean
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
 import space.kscience.dataforge.meta.double
+import space.kscience.visionforge.value
 
 public class Axes : Scheme() {
     public var visible: Boolean by boolean(false)
@@ -13,5 +15,13 @@ public class Axes : Scheme() {
     public companion object : SchemeSpec<Axes>(::Axes) {
         public const val AXIS_SIZE: Double = 1000.0
         public const val AXIS_WIDTH: Double = 3.0
+
+        override val descriptor: NodeDescriptor by lazy {
+            NodeDescriptor {
+                value(Axes::visible)
+                value(Axes::size)
+                value(Axes::width)
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Camera.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Camera.kt
index b035e9fe..00c36d50 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Camera.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Camera.kt
@@ -2,8 +2,10 @@ package space.kscience.visionforge.solid.specifications
 
 import space.kscience.dataforge.meta.Scheme
 import space.kscience.dataforge.meta.SchemeSpec
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
 import space.kscience.dataforge.meta.double
 import space.kscience.dataforge.meta.int
+import space.kscience.visionforge.value
 import kotlin.math.PI
 
 public class Camera : Scheme() {
@@ -25,5 +27,16 @@ public class Camera : Scheme() {
         public const val NEAR_CLIP: Double = 0.1
         public const val FAR_CLIP: Double = 10000.0
         public const val FIELD_OF_VIEW: Int = 75
+
+        override val descriptor: NodeDescriptor  by lazy {
+            NodeDescriptor {
+                value(Camera::fov)
+                value(Camera::nearClip)
+                value(Camera::farClip)
+                value(Camera::distance)
+                value(Camera::azimuth)
+                value(Camera::zenith)
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt
index ffb43756..bd3eebc3 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt
@@ -1,7 +1,10 @@
 package space.kscience.visionforge.solid.specifications
 
 import space.kscience.dataforge.meta.*
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
 import space.kscience.dataforge.names.Name
+import space.kscience.visionforge.scheme
+import space.kscience.visionforge.value
 
 public class Canvas3DOptions : Scheme() {
     public var axes: Axes by spec(Axes)
@@ -17,14 +20,29 @@ public class Canvas3DOptions : Scheme() {
     public var maxWith: Number by number { maxSize }
     public var maxHeight: Number by number { maxSize }
 
-    public var onSelect: ((Name?)->Unit)? = null
+    public var onSelect: ((Name?) -> Unit)? = null
 
 
-    public companion object : SchemeSpec<Canvas3DOptions>(::Canvas3DOptions)
+    public companion object : SchemeSpec<Canvas3DOptions>(::Canvas3DOptions) {
+        override val descriptor: NodeDescriptor by lazy {
+            NodeDescriptor {
+                scheme(Canvas3DOptions::axes, Axes)
+                scheme(Canvas3DOptions::light, Light)
+                scheme(Canvas3DOptions::camera, Camera)
+                scheme(Canvas3DOptions::controls, Controls)
+                value(Canvas3DOptions::minSize)
+                value(Canvas3DOptions::minWith)
+                value(Canvas3DOptions::minHeight)
+                value(Canvas3DOptions::maxSize)
+                value(Canvas3DOptions::maxWith)
+                value(Canvas3DOptions::maxHeight)
+            }
+        }
+    }
 }
 
 public fun Canvas3DOptions.computeWidth(external: Number): Int =
     (external.toInt()).coerceIn(minWith.toInt()..maxWith.toInt())
 
 public fun Canvas3DOptions.computeHeight(external: Number): Int =
-    (external.toInt()).coerceIn(minHeight.toInt()..maxHeight.toInt())
\ No newline at end of file
+    (external.toInt()).coerceIn(minHeight.toInt()..maxHeight.toInt())
diff --git a/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/DescriptorTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/DescriptorTest.kt
new file mode 100644
index 00000000..95f6b23e
--- /dev/null
+++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/DescriptorTest.kt
@@ -0,0 +1,22 @@
+package space.kscience.visionforge.solid
+
+import space.kscience.dataforge.meta.descriptors.ValueDescriptor
+import space.kscience.dataforge.meta.descriptors.get
+import space.kscience.dataforge.values.ValueType
+import space.kscience.visionforge.solid.specifications.Canvas3DOptions
+import kotlin.test.Test
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+class DescriptorTest {
+    @Test
+    fun canvasDescriptor() {
+        val descriptor = Canvas3DOptions.descriptor
+        //println(descriptor.config)
+        val axesSize = descriptor["axes.size"]
+        assertNotNull(axesSize)
+        assertTrue {
+            ValueType.NUMBER in (axesSize as ValueDescriptor).type!!
+        }
+    }
+}
\ No newline at end of file
diff --git a/visionforge-threejs/build.gradle.kts b/visionforge-threejs/build.gradle.kts
index c9f20e92..498c63f8 100644
--- a/visionforge-threejs/build.gradle.kts
+++ b/visionforge-threejs/build.gradle.kts
@@ -11,5 +11,5 @@ kotlin{
 dependencies {
     api(project(":visionforge-solid"))
     implementation(npm("three", "0.124.0"))
-    implementation(npm("three-csg-ts", "2.2.0"))
+    implementation(npm("three-csg-ts", "2.2.2"))
 }
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt
index 80edbbca..aa95f1ba 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/renderers/WebGLRenderer.kt
@@ -28,6 +28,7 @@
 package info.laht.threekt.renderers
 
 import info.laht.threekt.cameras.Camera
+import info.laht.threekt.math.Plane
 import info.laht.threekt.scenes.Scene
 import org.w3c.dom.Node
 
@@ -103,4 +104,17 @@ external class WebGLRenderer(params: WebGLRendererParams = definedExternally) {
     )
 
     fun setPixelRatio(value: Number)
+
+    //clipping
+
+    /**
+     * User-defined clipping planes specified as THREE.Plane objects in world space. These planes apply globally.
+     * Points in space whose dot product with the plane is negative are cut away. Default is [].
+     */
+    var clippingPlanes: Array<Plane>
+
+    /**
+     * Defines whether the renderer respects object-level clipping planes. Default is false.
+     */
+    var localClippingEnabled: Boolean
 }
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
index b68133b2..c79ee93a 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
@@ -23,6 +23,7 @@ import space.kscience.dataforge.context.info
 import space.kscience.dataforge.context.logger
 import space.kscience.dataforge.meta.get
 import space.kscience.dataforge.meta.string
+import space.kscience.dataforge.meta.useProperty
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.asName
 import space.kscience.dataforge.names.plus
@@ -41,7 +42,7 @@ import kotlin.math.sin
 public class ThreeCanvas(
     public val three: ThreePlugin,
     public val options: Canvas3DOptions,
-)  {
+) {
     private var root: Object3D? = null
 
     private val raycaster = Raycaster()
@@ -50,14 +51,23 @@ public class ThreeCanvas(
     public var content: Solid? = null
         private set
 
-    public var axes: AxesHelper = AxesHelper(options.axes.size.toInt()).apply { visible = options.axes.visible }
-        private set
-
-    private var light = buildLight(options.light)
-
     private val scene: Scene = Scene().apply {
-        add(axes)
-        add(light)
+        options.useProperty(Canvas3DOptions::axes){axesConfig->
+            getObjectByName(AXES_NAME)?.let { remove(it) }
+            val axesObject = AxesHelper(axes.size.toInt()).apply { visible = axes.visible }
+            axesObject.name = AXES_NAME
+            add(axesObject)
+        }
+
+        //Set up light
+        options.useProperty(Canvas3DOptions::light){lightConfig->
+            //remove old light if present
+            getObjectByName(LIGHT_NAME)?.let { remove(it) }
+            //add new light
+            val lightObject = buildLight(lightConfig)
+            lightObject.name = LIGHT_NAME
+            add(lightObject)
+        }
     }
 
     public var camera: PerspectiveCamera = buildCamera(options.camera)
@@ -138,7 +148,7 @@ public class ThreeCanvas(
     }
 
     internal fun attach(element: Element) {
-        check(element.getElementsByClassName("three-canvas").length == 0){"Three canvas already created in this element"}
+        check(element.getElementsByClassName("three-canvas").length == 0) { "Three canvas already created in this element" }
         element.appendChild(canvas)
         updateSize()
     }
@@ -171,7 +181,7 @@ public class ThreeCanvas(
         }
     }
 
-    private fun buildLight(spec: Light): info.laht.threekt.lights.Light = AmbientLight(0x404040)
+    private fun buildLight(spec: Light?): info.laht.threekt.lights.Light = AmbientLight(0x404040)
 
     private fun buildCamera(spec: Camera) = PerspectiveCamera(
         spec.fov,
@@ -262,5 +272,7 @@ public class ThreeCanvas(
         public const val DO_NOT_HIGHLIGHT_TAG: String = "doNotHighlight"
         private const val HIGHLIGHT_NAME = "@highlight"
         private const val SELECT_NAME = "@select"
+        private const val LIGHT_NAME = "@light"
+        private const val AXES_NAME = "@axes"
     }
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
index c91698f1..7aa84885 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
@@ -8,11 +8,13 @@ import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
 import space.kscience.dataforge.context.*
 import space.kscience.dataforge.meta.Meta
-import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.dataforge.names.*
-import space.kscience.visionforge.*
+import space.kscience.visionforge.ElementVisionRenderer
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.onPropertyChange
 import space.kscience.visionforge.solid.*
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
+import space.kscience.visionforge.visible
 import kotlin.collections.set
 import kotlin.reflect.KClass
 import info.laht.threekt.objects.Group as ThreeGroup
@@ -149,14 +151,6 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
     }
 }
 
-/**
- * Ensure that [ThreePlugin] is loaded in the global [VisionForge] context
- */
-@DFExperimental
-public fun VisionForge.useThreeJs() {
-    plugins.fetch(ThreePlugin)
-}
-
 public fun ThreePlugin.render(
     element: HTMLElement,
     obj: Solid,
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt
index 48460a92..d6d191f0 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jsMain/kotlin/space/kscience/visionforge/three/server/jsMain.kt
@@ -1,14 +1,11 @@
 package space.kscience.visionforge.three.server
 
-import kotlinx.browser.window
 import space.kscience.dataforge.misc.DFExperimental
-import space.kscience.visionforge.VisionForge
-import space.kscience.visionforge.solid.three.useThreeJs
+import space.kscience.visionforge.runVisionClient
+import space.kscience.visionforge.solid.three.ThreePlugin
+
 
 @DFExperimental
-public fun main(): Unit = VisionForge.run {
-    console.info("Starting VisionForge context")
-    useThreeJs()
-    window.asDynamic()["VisionForge"] = VisionForge
-    renderVisionsInWindow()
+public fun main(): Unit = runVisionClient {
+    plugin(ThreePlugin)
 }
\ No newline at end of file
diff --git a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/space/kscience/visionforge/three/server/serverExtensions.kt b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/space/kscience/visionforge/three/server/serverExtensions.kt
index 9bd6e6b9..94034547 100644
--- a/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/space/kscience/visionforge/three/server/serverExtensions.kt
+++ b/visionforge-threejs/visionforge-threejs-server/src/jvmMain/kotlin/space/kscience/visionforge/three/server/serverExtensions.kt
@@ -1,7 +1,7 @@
 package space.kscience.visionforge.three.server
 
+import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.misc.DFExperimental
-import space.kscience.visionforge.VisionForge
 import space.kscience.visionforge.html.HtmlVisionFragment
 import space.kscience.visionforge.html.ResourceLocation
 import space.kscience.visionforge.html.page
@@ -16,7 +16,7 @@ public fun VisionServer.useThreeJs(): Unit {
 }
 
 @DFExperimental
-public fun VisionForge.makeThreeJsFile(
+public fun Context.makeThreeJsFile(
     content: HtmlVisionFragment,
     path: Path? = null,
     title: String = "VisionForge page",

From 8a41f185debf07a2cf193e6ef721049cd55e8a5a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 5 May 2021 22:24:47 +0300
Subject: [PATCH 103/151] Remove global VisionForge object

---
 .../visionforge/gdml/demo/GDMLAppComponent.kt     | 11 +++++------
 .../visionforge/solid/demo/ThreeDemoGrid.kt       |  3 ++-
 .../visionforge/react/ThreeCanvasComponent.kt     |  6 ++++--
 .../visionforge/three/server/VisionServer.kt      | 15 ++++-----------
 .../kscience/visionforge/solid/SolidReference.kt  |  2 +-
 .../kscience/visionforge/solid/SolidPluginTest.kt |  3 ++-
 .../visionforge/solid/VisionUpdateTest.kt         |  3 ++-
 7 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
index 9d60eaf4..60e676a0 100644
--- a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
@@ -4,12 +4,10 @@ import kotlinx.browser.window
 import kotlinx.css.*
 import org.w3c.files.FileReader
 import org.w3c.files.get
-import react.RProps
-import react.child
+import react.*
 import react.dom.h1
-import react.functionalComponent
-import react.useState
 import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.context.fetch
 import space.kscience.dataforge.names.Name
 import space.kscience.gdml.Gdml
 import space.kscience.gdml.decodeFromString
@@ -51,8 +49,9 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
         selected = it
     }
 
+    val visionManager = useMemo({ props.context.fetch(Solids).visionManager }, arrayOf(props.context))
+
     fun loadData(name: String, data: String) {
-        val visionManager = props.context.plugins.fetch(Solids).visionManager
         val parsedVision = when {
             name.endsWith(".gdml") || name.endsWith(".xml") -> {
                 val gdml = Gdml.decodeFromString(data)
@@ -70,7 +69,7 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
 
     gridRow {
         flexColumn {
-            css{
+            css {
                 +"col-lg-9"
                 height = 100.vh
             }
diff --git a/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt
index 65dd35db..b26e30aa 100644
--- a/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt
+++ b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt
@@ -10,6 +10,7 @@ import org.w3c.dom.Element
 import org.w3c.dom.HTMLDivElement
 import org.w3c.dom.HTMLElement
 import space.kscience.dataforge.context.Global
+import space.kscience.dataforge.context.fetch
 import space.kscience.dataforge.meta.Meta
 import space.kscience.dataforge.meta.get
 import space.kscience.dataforge.meta.string
@@ -25,7 +26,7 @@ class ThreeDemoGrid(element: Element) : VisionLayout<Solid> {
 
     private val outputs: MutableMap<Name, ThreeCanvas> = HashMap()
 
-    private val three = Global.plugins.fetch(ThreePlugin)
+    private val three = Global.fetch(ThreePlugin)
 
     init {
         element.clear()
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
index 8a3758c8..74a1a61d 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
@@ -6,6 +6,7 @@ import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
 import react.*
 import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.context.fetch
 import space.kscience.dataforge.names.Name
 import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
@@ -33,10 +34,11 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
     val elementRef = useRef<Element?>(null)
     var canvas by useState<ThreeCanvas?>(null)
 
-    useEffect(listOf(props.context, props.obj, props.options, elementRef)) {
+    val three: ThreePlugin = useMemo({props.context.fetch(ThreePlugin)}, arrayOf(props.context))
+
+    useEffect(listOf(props.obj, props.options, elementRef)) {
         if (canvas == null) {
             val element = elementRef.current as? HTMLElement ?: error("Canvas element not found")
-            val three: ThreePlugin = props.context.plugins.fetch(ThreePlugin)
             val newCanvas: ThreeCanvas = three.createCanvas(element, props.options ?: Canvas3DOptions.empty())
             props.canvasCallback?.invoke(newCanvas)
             canvas = newCanvas
diff --git a/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt b/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
index 52e37fc1..c52a84a1 100644
--- a/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
@@ -25,6 +25,7 @@ import kotlinx.coroutines.withContext
 import kotlinx.html.*
 import kotlinx.html.stream.createHTML
 import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.context.fetch
 import space.kscience.dataforge.meta.*
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.dataforge.names.Name
@@ -40,16 +41,8 @@ import space.kscience.visionforge.html.fragment
 import space.kscience.visionforge.three.server.VisionServer.Companion.DEFAULT_PAGE
 import java.awt.Desktop
 import java.net.URI
-import kotlin.collections.ArrayList
-import kotlin.collections.HashMap
-import kotlin.collections.List
-import kotlin.collections.Map
-import kotlin.collections.emptyList
-import kotlin.collections.first
-import kotlin.collections.forEach
-import kotlin.collections.plus
 import kotlin.collections.set
-import kotlin.time.milliseconds
+import kotlin.time.Duration
 
 public enum class VisionServerDataMode {
     EMBED,
@@ -144,7 +137,7 @@ public class VisionServer internal constructor(
 
             try {
                 withContext(visionManager.context.coroutineContext) {
-                    vision.flowChanges(visionManager, updateInterval.milliseconds).collect { update ->
+                    vision.flowChanges(visionManager, Duration.milliseconds(updateInterval)).collect { update ->
                         val json = visionManager.jsonFormat.encodeToString(
                             VisionChange.serializer(),
                             update
@@ -277,7 +270,7 @@ public fun Application.visionServer(context: Context, route: String = DEFAULT_PA
         install(CallLogging)
     }
 
-    val visionManager = context.plugins.fetch(VisionManager)
+    val visionManager = context.fetch(VisionManager)
 
     routing {
         route(route) {
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
index 6379e51f..acb0ce88 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
@@ -126,7 +126,7 @@ public class SolidReferenceGroup(
                 val parentName = childName.cutLast()
                 return if (parentName.isEmpty()) this@SolidReferenceGroup else ReferenceChild(parentName)
             }
-            set(value) {
+            set(_) {
                 error("Setting a parent for a reference child is not possible")
             }
 
diff --git a/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidPluginTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidPluginTest.kt
index fe8c4ad8..23a48a63 100644
--- a/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidPluginTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/SolidPluginTest.kt
@@ -1,6 +1,7 @@
 package space.kscience.visionforge.solid
 
 import space.kscience.dataforge.context.Global
+import space.kscience.dataforge.context.fetch
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.visionforge.get
 import kotlin.test.Test
@@ -18,7 +19,7 @@ class SolidPluginTest {
     @DFExperimental
     @Test
     fun testPluginConverter() {
-        val visionManager = Global.plugins.fetch(Solids).visionManager
+        val visionManager = Global.fetch(Solids).visionManager
         val meta = visionManager.encodeToMeta(vision)
 
         val reconstructed = visionManager.decodeFromMeta(meta) as SolidGroup
diff --git a/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/VisionUpdateTest.kt b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/VisionUpdateTest.kt
index a96c7d49..2e87adf8 100644
--- a/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/VisionUpdateTest.kt
+++ b/visionforge-solid/src/commonTest/kotlin/space/kscience/visionforge/solid/VisionUpdateTest.kt
@@ -1,6 +1,7 @@
 package space.kscience.visionforge.solid
 
 import space.kscience.dataforge.context.Global
+import space.kscience.dataforge.context.fetch
 import space.kscience.dataforge.meta.MetaItem
 import space.kscience.dataforge.names.toName
 import space.kscience.visionforge.VisionChange
@@ -10,7 +11,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
 class VisionUpdateTest {
-    val solidManager = Global.plugins.fetch(Solids)
+    val solidManager = Global.fetch(Solids)
     val visionManager = solidManager.visionManager
 
     @Test

From 3a87e434838eacb86affe7bf33c3f634f30a965b Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 5 May 2021 22:53:11 +0300
Subject: [PATCH 104/151] Remove global VisionForge object

---
 build.gradle.kts                                               | 3 +--
 .../kotlin/space/kscience/visionforge/solid/demo/FXDemoGrid.kt | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index cc4ff994..12596ced 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,14 +16,13 @@ allprojects {
         mavenCentral()
         jcenter()
         maven("https://repo.kotlin.link")
-        maven("https://dl.bintray.com/pdvrieze/maven")
         maven("https://maven.jzy3d.org/releases")
         maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers")
         maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
     }
 
     group = "space.kscience"
-    version = "0.2.0-dev-15"
+    version = "0.2.0-dev-16"
 }
 
 subprojects {
diff --git a/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoGrid.kt b/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoGrid.kt
index fdcaca2e..4e727bb6 100644
--- a/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoGrid.kt
+++ b/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoGrid.kt
@@ -4,6 +4,7 @@ import javafx.collections.FXCollections
 import javafx.scene.Parent
 import javafx.scene.control.Tab
 import space.kscience.dataforge.context.Global
+import space.kscience.dataforge.context.fetch
 import space.kscience.dataforge.meta.Meta
 import space.kscience.dataforge.names.Name
 import space.kscience.visionforge.VisionLayout
@@ -23,7 +24,7 @@ class FXDemoGrid : View(title = "DataForge-vis FX demo"), VisionLayout<Solid> {
         }
     }
 
-    private val fx3d = Global.plugins.fetch(FX3DPlugin)
+    private val fx3d = Global.fetch(FX3DPlugin)
 
     override fun render(name: Name, vision: Solid, meta: Meta) {
         outputs.getOrPut(name) { FXCanvas3D(fx3d, canvasOptions) }.render(vision)

From ff80629f24888800ab7b481e6fe1a764ccef74b1 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 7 May 2021 16:41:07 +0300
Subject: [PATCH 105/151] Implement cone surface as a partial fix for #39

---
 .../playground/src/jvmMain/kotlin/gdmlIaxo.kt |  8 +--
 .../visionforge/gdml/GdmlTransformer.kt       | 30 ++++++--
 .../kscience/visionforge/solid/ConeSegment.kt |  2 +-
 .../solid/{Tube.kt => ConeSurface.kt}         | 69 ++++++++++++-------
 .../kscience/visionforge/solid/Solids.kt      |  2 +-
 .../visionforge/solid/three/ThreeCanvas.kt    |  2 +
 .../solid/three/ThreeCylinderFactory.kt       | 14 ++--
 .../visionforge/solid/three/ThreePlugin.kt    |  2 +-
 8 files changed, 82 insertions(+), 47 deletions(-)
 rename visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/{Tube.kt => ConeSurface.kt} (71%)

diff --git a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
index a292396f..a45345cc 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
@@ -1,9 +1,7 @@
 package space.kscience.visionforge.examples
 
 import space.kscience.dataforge.context.Context
-import space.kscience.gdml.Gdml
-import space.kscience.gdml.LUnit
-import space.kscience.gdml.decodeFromStream
+import space.kscience.gdml.GdmlShowCase
 import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.html.ResourceLocation
 import space.kscience.visionforge.solid.Solids
@@ -14,9 +12,7 @@ fun main() {
     }
     context.makeVisionFile(resourceLocation = ResourceLocation.EMBED) {
         vision("canvas") {
-            Gdml.decodeFromStream(javaClass.getResourceAsStream("/gdml/babyIAXO.gdml")!!, true).toVision {
-                lUnit = LUnit.MM
-            }
+            GdmlShowCase.babyIaxo().toVision()
         }
     }
 }
\ No newline at end of file
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
index 449bd09d..ec53b430 100644
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
@@ -187,11 +187,28 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
                 solid.deltaphi * aScale,
                 name
             )
-            is GdmlCone -> cone(solid.rmax1, solid.z, solid.rmax2, name = name) {
-                require(solid.rmin1 == 0.0) { "Empty cones are not supported" }
-                require(solid.rmin2 == 0.0) { "Empty cones are not supported" }
-                startAngle = solid.startphi.toFloat()
-                angle = solid.deltaphi.toFloat()
+            is GdmlCone -> if (solid.rmin1.toDouble() == 0.0 && solid.rmin2.toDouble() == 0.0) {
+                cone(
+                    bottomRadius = solid.rmax1,
+                    height = solid.z,
+                    upperRadius = solid.rmax2,
+                    name = name
+                ) {
+                    startAngle = solid.startphi.toFloat()
+                    angle = solid.deltaphi.toFloat()
+                }
+            } else {
+                coneSurface(
+                    bottomOuterRadius = solid.rmax1,
+                    bottomInnerRadius = solid.rmin1,
+                    height = solid.z,
+                    topOuterRadius = solid.rmax2,
+                    topInnerRadius = solid.rmin2,
+                    name = name
+                ) {
+                    startAngle = solid.startphi.toFloat()
+                    angle = solid.deltaphi.toFloat()
+                }
             }
             is GdmlXtru -> extrude(name) {
                 shape {
@@ -396,7 +413,8 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
         return final
     }
 
-    fun transform(root: Gdml): SolidGroup = finalize(volume(root, root.world.resolve(root) ?: error("GDML root is not resolved")))
+    fun transform(root: Gdml): SolidGroup =
+        finalize(volume(root, root.world.resolve(root) ?: error("GDML root is not resolved")))
 }
 
 
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt
index e07cdee3..a0cc0342 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt
@@ -8,7 +8,7 @@ import kotlin.math.cos
 import kotlin.math.sin
 
 /**
- * A cylinder or cut cone segment
+ * A solid cylinder or cut cone segment
  */
 @Serializable
 @SerialName("solid.cone")
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Tube.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSurface.kt
similarity index 71%
rename from visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Tube.kt
rename to visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSurface.kt
index 00c060ca..ecc3e227 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Tube.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSurface.kt
@@ -10,22 +10,24 @@ import kotlin.math.cos
 import kotlin.math.sin
 
 /**
- * Straight tube segment
+ * A conical or cylindrical surface
  */
 @Serializable
-@SerialName("solid.tube")
-public class Tube(
-    public var radius: Float,
+@SerialName("solid.coneSurface")
+public class ConeSurface(
+    public var bottomRadius: Float,
+    public var bottomInnerRadius: Float,
     public var height: Float,
-    public var innerRadius: Float = 0f,
+    public var topRadius: Float,
+    public var topInnerRadius: Float,
     public var startAngle: Float = 0f,
     public var angle: Float = PI2,
 ) : SolidBase(), GeometrySolid {
 
     init {
-        require(radius > 0)
-        require(height > 0)
-        require(innerRadius >= 0)
+        require(bottomRadius > 0) { "Cone surface bottom radius must be positive" }
+        require(height > 0) { "Cone surface height must be positive" }
+        require(bottomInnerRadius >= 0) { "Cone surface bottom inner radius must be non-negative" }
         //require(startAngle >= 0)
         require(angle in (0f..(PI2)))
     }
@@ -44,8 +46,8 @@ public class Tube(
         geometryBuilder.apply {
 
             //creating shape in x-y plane with z = 0
-            val bottomOuterPoints = shape(radius, -height / 2)
-            val upperOuterPoints = shape(radius, height / 2)
+            val bottomOuterPoints = shape(bottomRadius, -height / 2)
+            val upperOuterPoints = shape(topRadius, height / 2)
             //outer face
             (1 until segments).forEach {
                 face4(bottomOuterPoints[it - 1], bottomOuterPoints[it], upperOuterPoints[it], upperOuterPoints[it - 1])
@@ -54,7 +56,7 @@ public class Tube(
             if (angle == PI2) {
                 face4(bottomOuterPoints.last(), bottomOuterPoints[0], upperOuterPoints[0], upperOuterPoints.last())
             }
-            if (innerRadius == 0f) {
+            if (bottomInnerRadius == 0f) {
                 val zeroBottom = Point3D(0f, 0f, 0f)
                 val zeroTop = Point3D(0f, 0f, height)
                 (1 until segments).forEach {
@@ -69,8 +71,8 @@ public class Tube(
                     face4(zeroTop, zeroBottom, bottomOuterPoints.last(), upperOuterPoints.last())
                 }
             } else {
-                val bottomInnerPoints = shape(innerRadius, -height / 2)
-                val upperInnerPoints = shape(innerRadius, height / 2)
+                val bottomInnerPoints = shape(bottomInnerRadius, -height / 2)
+                val upperInnerPoints = shape(topInnerRadius, height / 2)
                 //outer face
                 (1 until segments).forEach {
                     // inner surface
@@ -116,24 +118,41 @@ public class Tube(
             }
         }
     }
-
 }
 
+
 @VisionBuilder
 public inline fun VisionContainerBuilder<Solid>.tube(
     r: Number,
     height: Number,
-    innerRadius: Number = 0f,
+    innerRadius: Number,
     startAngle: Number = 0f,
     angle: Number = 2 * PI,
     name: String? = null,
-    block: Tube.() -> Unit = {},
-): Tube = Tube(
-    r.toFloat(),
-    height.toFloat(),
-    innerRadius.toFloat(),
-    startAngle.toFloat(),
-    angle.toFloat()
-).apply(
-    block
-).also { set(name, it) }
\ No newline at end of file
+    block: ConeSurface.() -> Unit = {},
+): ConeSurface = ConeSurface(
+    bottomRadius = r.toFloat(),
+    bottomInnerRadius = innerRadius.toFloat(),
+    height = height.toFloat(),
+    topRadius = r.toFloat(),
+    topInnerRadius = innerRadius.toFloat(),
+    startAngle = startAngle.toFloat(),
+    angle = angle.toFloat()
+).apply(block).also { set(name, it) }
+
+@VisionBuilder
+public inline fun VisionContainerBuilder<Solid>.coneSurface(
+    bottomOuterRadius: Number,
+    bottomInnerRadius: Number,
+    height: Number,
+    topOuterRadius: Number,
+    topInnerRadius: Number,
+    name: String? = null,
+    block: ConeSurface.() -> Unit = {},
+): ConeSurface = ConeSurface(
+    bottomRadius = bottomOuterRadius.toFloat(),
+    bottomInnerRadius = bottomInnerRadius.toFloat(),
+    height = height.toFloat(),
+    topRadius = topOuterRadius.toFloat(),
+    topInnerRadius = topInnerRadius.toFloat(),
+).apply(block).also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt
index fc296244..536770ec 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt
@@ -29,9 +29,9 @@ public class Solids(meta: Meta) : VisionPlugin(meta) {
             subclass(SolidGroup.serializer())
             subclass(SolidReferenceGroup.serializer())
             subclass(Composite.serializer())
-            subclass(Tube.serializer())
             subclass(Box.serializer())
             subclass(ConeSegment.serializer())
+            subclass(ConeSurface.serializer())
             subclass(Convex.serializer())
             subclass(Extruded.serializer())
             subclass(PolyLine.serializer())
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
index c79ee93a..034cf430 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
@@ -89,6 +89,7 @@ public class ThreeCanvas(
             width = "100%"
             height = "100%"
             display = "block"
+            zIndex = "1000"
         }
     }
 
@@ -126,6 +127,7 @@ public class ThreeCanvas(
                 mousePosition.x = ((event.clientX - rect.left) / canvas.clientWidth) * 2 - 1
                 mousePosition.y = -((event.clientY - rect.top) / canvas.clientHeight) * 2 + 1
             }
+            event.preventDefault()
         }, false)
 
         canvas.onresize = {
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCylinderFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCylinderFactory.kt
index 57206c3e..6ee0cd18 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCylinderFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCylinderFactory.kt
@@ -2,18 +2,18 @@ package space.kscience.visionforge.solid.three
 
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.geometries.CylinderBufferGeometry
-import space.kscience.visionforge.solid.ConeSegment
+import space.kscience.visionforge.solid.ConeSurface
 import space.kscience.visionforge.solid.detail
 import kotlin.math.PI
 import kotlin.math.pow
 
-public object ThreeCylinderFactory : MeshThreeFactory<ConeSegment>(ConeSegment::class) {
-    override fun buildGeometry(obj: ConeSegment): BufferGeometry {
+public object ThreeCylinderFactory : MeshThreeFactory<ConeSurface>(ConeSurface::class) {
+    override fun buildGeometry(obj: ConeSurface): BufferGeometry {
         val cylinder =  obj.detail?.let {
             val segments = it.toDouble().pow(0.5).toInt()
             CylinderBufferGeometry(
-                radiusTop = obj.upperRadius,
-                radiusBottom = obj.radius,
+                radiusTop = obj.topRadius,
+                radiusBottom = obj.bottomRadius,
                 height = obj.height,
                 radialSegments = segments,
                 heightSegments = segments,
@@ -22,8 +22,8 @@ public object ThreeCylinderFactory : MeshThreeFactory<ConeSegment>(ConeSegment::
                 thetaLength = obj.angle
             )
         } ?: CylinderBufferGeometry(
-            radiusTop = obj.upperRadius,
-            radiusBottom = obj.radius,
+            radiusTop = obj.topRadius,
+            radiusBottom = obj.bottomRadius,
             height = obj.height,
             openEnded = false,
             thetaStart = obj.startAngle,
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
index 7aa84885..b4eb66fd 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
@@ -35,7 +35,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
         objectFactories[Box::class] = ThreeBoxFactory
         objectFactories[Convex::class] = ThreeConvexFactory
         objectFactories[Sphere::class] = ThreeSphereFactory
-        objectFactories[ConeSegment::class] = ThreeCylinderFactory
+        objectFactories[ConeSurface::class] = ThreeCylinderFactory
         objectFactories[PolyLine::class] = ThreeLineFactory
         objectFactories[SolidLabel::class] = ThreeCanvasLabelFactory
     }

From e644b1b20a066f243c4f7f003a914d04e8d4ef7e Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 7 May 2021 18:24:36 +0300
Subject: [PATCH 106/151] Add Hexagon. Second part of #39 fix

---
 CHANGELOG.md                                  |  2 +
 .../playground/src/jvmMain/kotlin/gdmlIaxo.kt |  1 +
 .../src/jvmMain/kotlin/serverExtensions.kt    |  1 -
 .../kscience/visionforge/solid/demo/demo.kt   |  2 +-
 .../visionforge/gdml/GdmlTransformer.kt       | 17 +++-
 .../space/kscience/visionforge/solid/Box.kt   | 50 -----------
 .../kscience/visionforge/solid/ConeSegment.kt |  4 +-
 .../kscience/visionforge/solid/Hexagon.kt     | 88 +++++++++++++++++++
 .../kscience/visionforge/solid/Solids.kt      |  1 +
 9 files changed, 112 insertions(+), 54 deletions(-)
 delete mode 100644 visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Box.kt
 create mode 100644 visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Hexagon.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5dc2ab31..1685272b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Change collector
 - Customizable accessors for colors
 - SphereLayer solid
+- Hexagon interface and GenericHexagon implementation (Box inherits Hexagon)
 
 ### Changed
 - Vision does not implement ItemProvider anymore. Property changes are done via `getProperty`/`setProperty` and `property` delegate.
@@ -15,6 +16,7 @@
 - \[Format breaking change!\] Stylesheets are moved into properties under `@stylesheet` key
 - VisionGroup builder accepts `null` as name for statics instead of `""`
 - gdml sphere is rendered as a SphereLayer instead of Sphere (#35)
+- Tube is replaced by more general ConeSurface
 
 ### Deprecated
 
diff --git a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
index a45345cc..cd496761 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
@@ -10,6 +10,7 @@ fun main() {
     val context = Context {
         plugin(Solids)
     }
+
     context.makeVisionFile(resourceLocation = ResourceLocation.EMBED) {
         vision("canvas") {
             GdmlShowCase.babyIaxo().toVision()
diff --git a/demo/playground/src/jvmMain/kotlin/serverExtensions.kt b/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
index 4dfd35f1..b71b1873 100644
--- a/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
+++ b/demo/playground/src/jvmMain/kotlin/serverExtensions.kt
@@ -25,7 +25,6 @@ public fun Context.makeVisionFile(
     show: Boolean = true,
     content: VisionTagConsumer<*>.() -> Unit
 ): Unit {
-
     val actualPath = page(title, content = content).makeFile(path) { actualPath ->
         mapOf("threeJs" to scriptHeader("js/visionforge-playground.js", resourceLocation, actualPath))
     }
diff --git a/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt b/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt
index c5cf2a56..18c56704 100644
--- a/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt
+++ b/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt
@@ -181,7 +181,7 @@ fun VisionLayout<Solid>.showcaseCSG() {
 
     demo("CSG.custom", "CSG with manually created object") {
         intersect {
-            tube(60, 10) {
+            cylinder(60, 10) {
                 detail = 32
             }
             box(100, 100, 100)
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
index ec53b430..08aa7351 100644
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
@@ -282,13 +282,28 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
 
                 }
             }
+            is GdmlTrapezoid -> {
+                val dxBottom = solid.x1.toDouble()
+                val dxTop = solid.x2.toDouble()
+                val dyBottom = solid.y1.toDouble()
+                val dyTop = solid.y2.toDouble()
+                val dz = solid.z.toDouble()
+                val node1 = Point3D(-dxBottom, -dyBottom, -dz)
+                val node2 = Point3D(dxBottom, -dyBottom, -dz)
+                val node3 = Point3D(dxBottom, dyBottom, -dz)
+                val node4 = Point3D(-dxBottom, dyBottom, -dz)
+                val node5 = Point3D(-dxTop, -dyTop, dz)
+                val node6 = Point3D(dxTop, -dyTop, dz)
+                val node7 = Point3D(dxTop, dyTop, dz)
+                val node8 = Point3D(-dxTop, dyTop, dz)
+                hexagon(node1, node2, node3, node4, node5, node6, node7, node8, name)
+            }
             is GdmlEllipsoid -> TODO("Renderer for $solid not supported yet")
             is GdmlElTube -> TODO("Renderer for $solid not supported yet")
             is GdmlElCone -> TODO("Renderer for $solid not supported yet")
             is GdmlParaboloid -> TODO("Renderer for $solid not supported yet")
             is GdmlParallelepiped -> TODO("Renderer for $solid not supported yet")
             is GdmlTorus -> TODO("Renderer for $solid not supported yet")
-            is GdmlTrapezoid -> TODO("Renderer for $solid not supported yet")
             is GdmlPolycone -> TODO("Renderer for $solid not supported yet")
         }
     }
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Box.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Box.kt
deleted file mode 100644
index c84d5c9b..00000000
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Box.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package space.kscience.visionforge.solid
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import space.kscience.visionforge.VisionBuilder
-import space.kscience.visionforge.VisionContainerBuilder
-import space.kscience.visionforge.set
-
-@Serializable
-@SerialName("solid.box")
-public class Box(
-    public val xSize: Float,
-    public val ySize: Float,
-    public val zSize: Float
-) : SolidBase(), GeometrySolid {
-
-    //TODO add helper for color configuration
-    override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>) {
-        val dx = xSize / 2
-        val dy = ySize / 2
-        val dz = zSize / 2
-        val node1 = Point3D(-dx, -dy, -dz)
-        val node2 = Point3D(dx, -dy, -dz)
-        val node3 = Point3D(dx, dy, -dz)
-        val node4 = Point3D(-dx, dy, -dz)
-        val node5 = Point3D(-dx, -dy, dz)
-        val node6 = Point3D(dx, -dy, dz)
-        val node7 = Point3D(dx, dy, dz)
-        val node8 = Point3D(-dx, dy, dz)
-        geometryBuilder.face4(node1, node4, node3, node2)
-        geometryBuilder.face4(node1, node2, node6, node5)
-        geometryBuilder.face4(node2, node3, node7, node6)
-        geometryBuilder.face4(node4, node8, node7, node3)
-        geometryBuilder.face4(node1, node5, node8, node4)
-        geometryBuilder.face4(node8, node5, node6, node7)
-    }
-
-    public companion object {
-
-    }
-}
-
-@VisionBuilder
-public inline fun VisionContainerBuilder<Solid>.box(
-    xSize: Number,
-    ySize: Number,
-    zSize: Number,
-    name: String? = null,
-    action: Box.() -> Unit = {}
-): Box = Box(xSize.toFloat(), ySize.toFloat(), zSize.toFloat()).apply(action).also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt
index a0cc0342..94d99cc3 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt
@@ -2,6 +2,7 @@ package space.kscience.visionforge.solid
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import space.kscience.visionforge.VisionBuilder
 import space.kscience.visionforge.VisionContainerBuilder
 import space.kscience.visionforge.set
 import kotlin.math.cos
@@ -64,6 +65,7 @@ public class ConeSegment(
 
 }
 
+@VisionBuilder
 public inline fun VisionContainerBuilder<Solid>.cylinder(
     r: Number,
     height: Number,
@@ -75,7 +77,7 @@ public inline fun VisionContainerBuilder<Solid>.cylinder(
     r.toFloat()
 ).apply(block).also { set(name, it) }
 
-
+@VisionBuilder
 public inline fun VisionContainerBuilder<Solid>.cone(
     bottomRadius: Number,
     height: Number,
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Hexagon.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Hexagon.kt
new file mode 100644
index 00000000..baced452
--- /dev/null
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Hexagon.kt
@@ -0,0 +1,88 @@
+package space.kscience.visionforge.solid
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import space.kscience.visionforge.VisionBuilder
+import space.kscience.visionforge.VisionContainerBuilder
+import space.kscience.visionforge.set
+
+public interface Hexagon : GeometrySolid {
+    public val node1: Point3D
+    public val node2: Point3D
+    public val node3: Point3D
+    public val node4: Point3D
+    public val node5: Point3D
+    public val node6: Point3D
+    public val node7: Point3D
+    public val node8: Point3D
+
+    override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>) {
+        geometryBuilder.face4(node1, node4, node3, node2)
+        geometryBuilder.face4(node1, node2, node6, node5)
+        geometryBuilder.face4(node2, node3, node7, node6)
+        geometryBuilder.face4(node4, node8, node7, node3)
+        geometryBuilder.face4(node1, node5, node8, node4)
+        geometryBuilder.face4(node8, node5, node6, node7)
+    }
+}
+
+/**
+ * A separate class is created to optimize native rendering
+ */
+@Serializable
+@SerialName("solid.box")
+public class Box(
+    public val xSize: Float,
+    public val ySize: Float,
+    public val zSize: Float,
+) : SolidBase(), Hexagon {
+
+    private inline val dx get() = xSize / 2
+    private inline val dy get() = ySize / 2
+    private inline val dz get() = zSize / 2
+
+    override val node1: Point3D get() = Point3D(-dx, -dy, -dz)
+    override val node2: Point3D get() = Point3D(dx, -dy, -dz)
+    override val node3: Point3D get() = Point3D(dx, dy, -dz)
+    override val node4: Point3D get() = Point3D(-dx, dy, -dz)
+    override val node5: Point3D get() = Point3D(-dx, -dy, dz)
+    override val node6: Point3D get() = Point3D(dx, -dy, dz)
+    override val node7: Point3D get() = Point3D(dx, dy, dz)
+    override val node8: Point3D get() = Point3D(-dx, dy, dz)
+}
+
+@VisionBuilder
+public inline fun VisionContainerBuilder<Solid>.box(
+    xSize: Number,
+    ySize: Number,
+    zSize: Number,
+    name: String? = null,
+    action: Box.() -> Unit = {},
+): Box = Box(xSize.toFloat(), ySize.toFloat(), zSize.toFloat()).apply(action).also { set(name, it) }
+
+@Serializable
+@SerialName("solid.hexagon")
+public class GenericHexagon(
+    override val node1: Point3D,
+    override val node2: Point3D,
+    override val node3: Point3D,
+    override val node4: Point3D,
+    override val node5: Point3D,
+    override val node6: Point3D,
+    override val node7: Point3D,
+    override val node8: Point3D,
+) : SolidBase(), Hexagon
+
+@VisionBuilder
+public inline fun VisionContainerBuilder<Solid>.hexagon(
+    node1: Point3D,
+    node2: Point3D,
+    node3: Point3D,
+    node4: Point3D,
+    node5: Point3D,
+    node6: Point3D,
+    node7: Point3D,
+    node8: Point3D,
+    name: String? = null,
+    action: Hexagon.() -> Unit = {},
+): Hexagon = GenericHexagon(node1, node2, node3, node4, node5, node6, node7, node8).apply(action).also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt
index 536770ec..f65bd7d2 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt
@@ -30,6 +30,7 @@ public class Solids(meta: Meta) : VisionPlugin(meta) {
             subclass(SolidReferenceGroup.serializer())
             subclass(Composite.serializer())
             subclass(Box.serializer())
+            subclass(GenericHexagon.serializer())
             subclass(ConeSegment.serializer())
             subclass(ConeSurface.serializer())
             subclass(Convex.serializer())

From 03b666017b54c253a6c7d05ba857f0eba4d719b0 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 7 May 2021 18:54:52 +0300
Subject: [PATCH 107/151] Fix tube rendering

---
 .../playground/src/jvmMain/kotlin/gdmlIaxo.kt |  3 +-
 .../kscience/visionforge/VisionClient.kt      |  2 +-
 .../visionforge/gdml/GdmlTransformer.kt       | 46 +++++++++----------
 .../kscience/visionforge/solid/ConeSegment.kt | 10 ++--
 .../kscience/visionforge/solid/ConeSurface.kt | 44 +++++++++---------
 ...CylinderFactory.kt => ThreeConeFactory.kt} |  6 +--
 .../visionforge/solid/three/ThreePlugin.kt    |  2 +-
 7 files changed, 56 insertions(+), 57 deletions(-)
 rename visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/{ThreeCylinderFactory.kt => ThreeConeFactory.kt} (83%)

diff --git a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
index cd496761..10e81070 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
@@ -3,7 +3,6 @@ package space.kscience.visionforge.examples
 import space.kscience.dataforge.context.Context
 import space.kscience.gdml.GdmlShowCase
 import space.kscience.visionforge.gdml.toVision
-import space.kscience.visionforge.html.ResourceLocation
 import space.kscience.visionforge.solid.Solids
 
 fun main() {
@@ -11,7 +10,7 @@ fun main() {
         plugin(Solids)
     }
 
-    context.makeVisionFile(resourceLocation = ResourceLocation.EMBED) {
+    context.makeVisionFile{
         vision("canvas") {
             GdmlShowCase.babyIaxo().toVision()
         }
diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
index 9ca71059..47fed77b 100644
--- a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
@@ -218,7 +218,7 @@ public fun runVisionClient(contextBuilder: ContextBuilder.() -> Unit) {
     console.info("Starting VisionForge context")
     val context = Context("VisionForge"){
         contextBuilder()
-        plugin(VisionClient)
+        //plugin(VisionClient)
     }
     val visionClient = context.fetch(VisionClient)
     window.asDynamic()["renderAllVisionsById"] = visionClient::renderAllVisionsById
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
index 08aa7351..e8fb8815 100644
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
@@ -180,34 +180,34 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
         return when (solid) {
             is GdmlBox -> box(solid.x * lScale, solid.y * lScale, solid.z * lScale, name)
             is GdmlTube -> tube(
-                solid.rmax * lScale,
-                solid.z * lScale,
-                solid.rmin * lScale,
-                solid.startphi * aScale,
-                solid.deltaphi * aScale,
-                name
+                radius = solid.rmax * lScale,
+                height = solid.z * lScale,
+                innerRadius = solid.rmin * lScale,
+                startAngle = solid.startphi * aScale,
+                angle = solid.deltaphi * aScale,
+                name = name
             )
             is GdmlCone -> if (solid.rmin1.toDouble() == 0.0 && solid.rmin2.toDouble() == 0.0) {
                 cone(
-                    bottomRadius = solid.rmax1,
-                    height = solid.z,
-                    upperRadius = solid.rmax2,
+                    bottomRadius = solid.rmax1 * lScale,
+                    height = solid.z * lScale,
+                    upperRadius = solid.rmax2 * lScale,
                     name = name
                 ) {
-                    startAngle = solid.startphi.toFloat()
-                    angle = solid.deltaphi.toFloat()
+                    startAngle = solid.startphi * aScale
+                    angle = solid.deltaphi * aScale
                 }
             } else {
                 coneSurface(
-                    bottomOuterRadius = solid.rmax1,
-                    bottomInnerRadius = solid.rmin1,
-                    height = solid.z,
-                    topOuterRadius = solid.rmax2,
-                    topInnerRadius = solid.rmin2,
+                    bottomOuterRadius = solid.rmax1 * lScale,
+                    bottomInnerRadius = solid.rmin1 * lScale,
+                    height = solid.z * lScale,
+                    topOuterRadius = solid.rmax2 * lScale,
+                    topInnerRadius = solid.rmin2 * lScale,
                     name = name
                 ) {
-                    startAngle = solid.startphi.toFloat()
-                    angle = solid.deltaphi.toFloat()
+                    startAngle = solid.startphi * aScale
+                    angle = solid.deltaphi * aScale
                 }
             }
             is GdmlXtru -> extrude(name) {
@@ -283,11 +283,11 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
                 }
             }
             is GdmlTrapezoid -> {
-                val dxBottom = solid.x1.toDouble()
-                val dxTop = solid.x2.toDouble()
-                val dyBottom = solid.y1.toDouble()
-                val dyTop = solid.y2.toDouble()
-                val dz = solid.z.toDouble()
+                val dxBottom = solid.x1.toDouble() / 2
+                val dxTop = solid.x2.toDouble() / 2
+                val dyBottom = solid.y1.toDouble() / 2
+                val dyTop = solid.y2.toDouble() / 2
+                val dz = solid.z.toDouble() / 2
                 val node1 = Point3D(-dxBottom, -dyBottom, -dz)
                 val node2 = Point3D(dxBottom, -dyBottom, -dz)
                 val node3 = Point3D(dxBottom, dyBottom, -dz)
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt
index 94d99cc3..ef529207 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt
@@ -14,9 +14,9 @@ import kotlin.math.sin
 @Serializable
 @SerialName("solid.cone")
 public class ConeSegment(
-    public var radius: Float,
+    public var bottomRadius: Float,
     public var height: Float,
-    public var upperRadius: Float,
+    public var topRadius: Float,
     public var startAngle: Float = 0f,
     public var angle: Float = PI2
 ) : SolidBase(), GeometrySolid {
@@ -35,8 +35,8 @@ public class ConeSegment(
         geometryBuilder.apply {
 
             //creating shape in x-y plane with z = 0
-            val bottomOuterPoints = shape(upperRadius, -height / 2)
-            val upperOuterPoints = shape(radius, height / 2)
+            val bottomOuterPoints = shape(topRadius, -height / 2)
+            val upperOuterPoints = shape(bottomRadius, height / 2)
             //outer face
             (1 until segments).forEach {
                 face4(bottomOuterPoints[it - 1], bottomOuterPoints[it], upperOuterPoints[it], upperOuterPoints[it - 1])
@@ -87,5 +87,5 @@ public inline fun VisionContainerBuilder<Solid>.cone(
 ): ConeSegment = ConeSegment(
     bottomRadius.toFloat(),
     height.toFloat(),
-    upperRadius = upperRadius.toFloat()
+    topRadius = upperRadius.toFloat()
 ).apply(block).also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSurface.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSurface.kt
index ecc3e227..b654ee90 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSurface.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSurface.kt
@@ -47,40 +47,40 @@ public class ConeSurface(
 
             //creating shape in x-y plane with z = 0
             val bottomOuterPoints = shape(bottomRadius, -height / 2)
-            val upperOuterPoints = shape(topRadius, height / 2)
+            val topOuterPoints = shape(topRadius, height / 2)
             //outer face
             (1 until segments).forEach {
-                face4(bottomOuterPoints[it - 1], bottomOuterPoints[it], upperOuterPoints[it], upperOuterPoints[it - 1])
+                face4(bottomOuterPoints[it - 1], bottomOuterPoints[it], topOuterPoints[it], topOuterPoints[it - 1])
             }
 
             if (angle == PI2) {
-                face4(bottomOuterPoints.last(), bottomOuterPoints[0], upperOuterPoints[0], upperOuterPoints.last())
+                face4(bottomOuterPoints.last(), bottomOuterPoints[0], topOuterPoints[0], topOuterPoints.last())
             }
             if (bottomInnerRadius == 0f) {
                 val zeroBottom = Point3D(0f, 0f, 0f)
                 val zeroTop = Point3D(0f, 0f, height)
                 (1 until segments).forEach {
                     face(bottomOuterPoints[it - 1], zeroBottom, bottomOuterPoints[it])
-                    face(upperOuterPoints[it - 1], upperOuterPoints[it], zeroTop)
+                    face(topOuterPoints[it - 1], topOuterPoints[it], zeroTop)
                 }
                 if (angle == PI2) {
                     face(bottomOuterPoints.last(), zeroBottom, bottomOuterPoints[0])
-                    face(upperOuterPoints.last(), upperOuterPoints[0], zeroTop)
+                    face(topOuterPoints.last(), topOuterPoints[0], zeroTop)
                 } else {
-                    face4(zeroTop, zeroBottom, bottomOuterPoints[0], upperOuterPoints[0])
-                    face4(zeroTop, zeroBottom, bottomOuterPoints.last(), upperOuterPoints.last())
+                    face4(zeroTop, zeroBottom, bottomOuterPoints[0], topOuterPoints[0])
+                    face4(zeroTop, zeroBottom, bottomOuterPoints.last(), topOuterPoints.last())
                 }
             } else {
                 val bottomInnerPoints = shape(bottomInnerRadius, -height / 2)
-                val upperInnerPoints = shape(topInnerRadius, height / 2)
+                val topInnerPoints = shape(topInnerRadius, height / 2)
                 //outer face
                 (1 until segments).forEach {
                     // inner surface
                     face4(
                         bottomInnerPoints[it],
                         bottomInnerPoints[it - 1],
-                        upperInnerPoints[it - 1],
-                        upperInnerPoints[it]
+                        topInnerPoints[it - 1],
+                        topInnerPoints[it]
                     )
                     //bottom cup
                     face4(
@@ -91,28 +91,28 @@ public class ConeSurface(
                     )
                     //upper cup
                     face4(
-                        upperInnerPoints[it],
-                        upperInnerPoints[it - 1],
-                        upperOuterPoints[it - 1],
-                        upperOuterPoints[it]
+                        topInnerPoints[it],
+                        topInnerPoints[it - 1],
+                        topOuterPoints[it - 1],
+                        topOuterPoints[it]
                     )
                 }
                 if (angle == PI2) {
-                    face4(bottomInnerPoints[0], bottomInnerPoints.last(), upperInnerPoints.last(), upperInnerPoints[0])
+                    face4(bottomInnerPoints[0], bottomInnerPoints.last(), topInnerPoints.last(), topInnerPoints[0])
                     face4(
                         bottomInnerPoints.last(),
                         bottomInnerPoints[0],
                         bottomOuterPoints[0],
                         bottomOuterPoints.last()
                     )
-                    face4(upperInnerPoints[0], upperInnerPoints.last(), upperOuterPoints.last(), upperOuterPoints[0])
+                    face4(topInnerPoints[0], topInnerPoints.last(), topOuterPoints.last(), topOuterPoints[0])
                 } else {
-                    face4(bottomInnerPoints[0], bottomOuterPoints[0], upperOuterPoints[0], upperInnerPoints[0])
+                    face4(bottomInnerPoints[0], bottomOuterPoints[0], topOuterPoints[0], topInnerPoints[0])
                     face4(
                         bottomOuterPoints.last(),
                         bottomInnerPoints.last(),
-                        upperInnerPoints.last(),
-                        upperOuterPoints.last()
+                        topInnerPoints.last(),
+                        topOuterPoints.last()
                     )
                 }
             }
@@ -123,7 +123,7 @@ public class ConeSurface(
 
 @VisionBuilder
 public inline fun VisionContainerBuilder<Solid>.tube(
-    r: Number,
+    radius: Number,
     height: Number,
     innerRadius: Number,
     startAngle: Number = 0f,
@@ -131,10 +131,10 @@ public inline fun VisionContainerBuilder<Solid>.tube(
     name: String? = null,
     block: ConeSurface.() -> Unit = {},
 ): ConeSurface = ConeSurface(
-    bottomRadius = r.toFloat(),
+    bottomRadius = radius.toFloat(),
     bottomInnerRadius = innerRadius.toFloat(),
     height = height.toFloat(),
-    topRadius = r.toFloat(),
+    topRadius = radius.toFloat(),
     topInnerRadius = innerRadius.toFloat(),
     startAngle = startAngle.toFloat(),
     angle = angle.toFloat()
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCylinderFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeConeFactory.kt
similarity index 83%
rename from visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCylinderFactory.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeConeFactory.kt
index 6ee0cd18..c8eece9a 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCylinderFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeConeFactory.kt
@@ -2,13 +2,13 @@ package space.kscience.visionforge.solid.three
 
 import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.geometries.CylinderBufferGeometry
-import space.kscience.visionforge.solid.ConeSurface
+import space.kscience.visionforge.solid.ConeSegment
 import space.kscience.visionforge.solid.detail
 import kotlin.math.PI
 import kotlin.math.pow
 
-public object ThreeCylinderFactory : MeshThreeFactory<ConeSurface>(ConeSurface::class) {
-    override fun buildGeometry(obj: ConeSurface): BufferGeometry {
+public object ThreeConeFactory : MeshThreeFactory<ConeSegment>(ConeSegment::class) {
+    override fun buildGeometry(obj: ConeSegment): BufferGeometry {
         val cylinder =  obj.detail?.let {
             val segments = it.toDouble().pow(0.5).toInt()
             CylinderBufferGeometry(
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
index b4eb66fd..da3a94b6 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
@@ -35,7 +35,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
         objectFactories[Box::class] = ThreeBoxFactory
         objectFactories[Convex::class] = ThreeConvexFactory
         objectFactories[Sphere::class] = ThreeSphereFactory
-        objectFactories[ConeSurface::class] = ThreeCylinderFactory
+        objectFactories[ConeSegment::class] = ThreeConeFactory
         objectFactories[PolyLine::class] = ThreeLineFactory
         objectFactories[SolidLabel::class] = ThreeCanvasLabelFactory
     }

From 2798439582bbb21fc7ce82c4648841c90de65e61 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 7 May 2021 19:14:46 +0300
Subject: [PATCH 108/151] Increased the default detail level for spheres and
 cones to 32. Fix for #38

---
 CHANGELOG.md                                  |   1 +
 .../playground/src/jvmMain/kotlin/gdmCurve.kt | 226 ++++++++++++++++++
 .../visionforge/gdml/GdmlTransformer.kt       |  13 +-
 .../kscience/visionforge/solid/ConeSegment.kt |   3 +-
 .../kscience/visionforge/solid/ConeSurface.kt |   3 +-
 .../kscience/visionforge/solid/Sphere.kt      |   2 +-
 .../kscience/visionforge/solid/SphereLayer.kt |   2 +-
 7 files changed, 241 insertions(+), 9 deletions(-)
 create mode 100644 demo/playground/src/jvmMain/kotlin/gdmCurve.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1685272b..91d20f96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Customizable accessors for colors
 - SphereLayer solid
 - Hexagon interface and GenericHexagon implementation (Box inherits Hexagon)
+- Increased the default detail level for spheres and cones to 32
 
 ### Changed
 - Vision does not implement ItemProvider anymore. Property changes are done via `getProperty`/`setProperty` and `property` delegate.
diff --git a/demo/playground/src/jvmMain/kotlin/gdmCurve.kt b/demo/playground/src/jvmMain/kotlin/gdmCurve.kt
new file mode 100644
index 00000000..12981241
--- /dev/null
+++ b/demo/playground/src/jvmMain/kotlin/gdmCurve.kt
@@ -0,0 +1,226 @@
+package space.kscience.visionforge.examples
+
+import space.kscience.dataforge.context.Context
+import space.kscience.gdml.*
+import space.kscience.visionforge.gdml.gdml
+import space.kscience.visionforge.solid.Solids
+
+fun main() {
+    val context = Context {
+        plugin(Solids)
+    }
+
+    context.makeVisionFile {
+        vision("canvas") {
+            gdml {
+                // geometry variables
+                val worldSize = 500
+                // chamber
+                val chamberHeight = 30 // length of the chamber
+                val chamberDiameter = 102 // inner diameter of the copper chamber
+                val chamberOuterSquareSide = 134 // chamber has a square footprint
+                val chamberBackplateThickness = 15 // thickness of the backplate of the chamber
+                // teflon disk
+                val cathodeTeflonDiskHoleRadius = 15
+                val cathodeTeflonDiskThickness = 5
+                val cathodeCopperSupportOuterRadius = 45
+                val cathodeCopperSupportInnerRadius = 8.5
+                val cathodeCopperSupportThickness = 1
+                // mylar cathode
+                val mylarCathodeThickness = 0.004
+                // patern
+                val cathodePatternLineWidth = 0.3
+                val cathodePatternDiskRadius = 4.25
+                // readout
+                val chamberTeflonWallThickness = 1
+                val readoutKaptonThickness = 0.5
+                val readoutCopperThickness = 0.2
+                val readoutPlaneSide = 60
+
+                structure {
+                    val worldMaterial = materials.composite("G4_AIR")
+                    val worldBox = solids.box(worldSize, worldSize, worldSize)
+
+                    val shieldingMaterial = materials.composite("G4_Pb")
+                    val scintillatorMaterial = materials.composite("BC408")
+                    val captureMaterial = materials.composite("G4_Cd")
+
+                    // chamber
+                    val copperMaterial = materials.composite("G4_Cu")
+                    val chamberSolidBase = solids.box(chamberOuterSquareSide, chamberOuterSquareSide, chamberHeight)
+                    val chamberSolidHole = solids.tube(chamberDiameter / 2, chamberHeight)
+                    val chamberSolid = solids.subtraction(chamberSolidBase, chamberSolidHole)
+                    val chamberBodyVolume = volume(copperMaterial, chamberSolid)
+                    val chamberBackplateSolid =
+                        solids.box(chamberOuterSquareSide, chamberOuterSquareSide, chamberBackplateThickness)
+                    val chamberBackplateVolume = volume(copperMaterial, chamberBackplateSolid)
+                    // chamber teflon walls
+                    val teflonMaterial = materials.composite("G4_TEFLON")
+                    val chamberTeflonWallSolid = solids.tube(chamberDiameter / 2, chamberHeight) {
+                        rmin = chamberDiameter / 2.0 - chamberTeflonWallThickness
+                    }
+                    val chamberTeflonWallVolume = volume(teflonMaterial, chamberTeflonWallSolid)
+                    // cathode
+                    val cathodeCopperDiskMaterial = materials.composite("G4_Cu")
+                    val cathodeWindowMaterial = materials.composite("G4_MYLAR")
+
+                    val cathodeTeflonDiskSolidBase =
+                        solids.tube(chamberOuterSquareSide / 2, cathodeTeflonDiskThickness) {
+                            rmin = cathodeTeflonDiskHoleRadius
+                        }
+                    val cathodeCopperDiskSolid =
+                        solids.tube(cathodeCopperSupportOuterRadius, cathodeCopperSupportThickness) {
+                            rmin = cathodeCopperSupportInnerRadius
+                        }
+
+                    val cathodeTeflonDiskSolid = solids.subtraction(cathodeTeflonDiskSolidBase, cathodeCopperDiskSolid)
+                    val cathodeTeflonDiskVolume = volume(teflonMaterial, cathodeTeflonDiskSolid)
+
+                    val cathodeWindowSolid = solids.tube(cathodeTeflonDiskHoleRadius, mylarCathodeThickness)
+                    val cathodeWindowVolume = volume(cathodeWindowMaterial, cathodeWindowSolid)
+
+                    val cathodeFillingMaterial = materials.composite("G4_Galactic")
+                    val cathodeFillingSolidBase = solids.tube(cathodeTeflonDiskHoleRadius, cathodeTeflonDiskThickness)
+
+                    val cathodeFillingSolid = solids.subtraction(cathodeFillingSolidBase, cathodeCopperDiskSolid) {
+                        position(z = chamberHeight / 2 - mylarCathodeThickness / 2)
+                    }
+                    val cathodeFillingVolume = volume(cathodeFillingMaterial, cathodeFillingSolid)
+
+                    // pattern
+                    val cathodePatternLineAux = solids.box(
+                        cathodePatternLineWidth,
+                        cathodeCopperSupportInnerRadius * 2,
+                        cathodeCopperSupportThickness
+                    )
+                    val cathodePatternCentralHole = solids.tube(
+                        cathodePatternDiskRadius - 0 * cathodePatternLineWidth,
+                        cathodeCopperSupportThickness * 1.1
+                    )
+                    val cathodePatternLine = solids.subtraction(cathodePatternLineAux, cathodePatternCentralHole)
+
+                    val cathodePatternDisk = solids.tube(
+                        cathodePatternDiskRadius,
+                        cathodeCopperSupportThickness
+                    ) { rmin = cathodePatternDiskRadius - cathodePatternLineWidth }
+
+
+                    val cathodeCopperDiskSolidAux0 =
+                        solids.union(cathodeCopperDiskSolid, cathodePatternLine) {
+                            rotation(x = 0, y = 0, z = 0)
+                        }
+                    val cathodeCopperDiskSolidAux1 =
+                        solids.union(cathodeCopperDiskSolidAux0, cathodePatternLine) {
+                            rotation = GdmlRotation(
+                                "cathodePatternRotation1", x = 0, y = 0, z = 45
+                            )
+                        }
+                    val cathodeCopperDiskSolidAux2 =
+                        solids.union(cathodeCopperDiskSolidAux1, cathodePatternLine) {
+                            rotation = GdmlRotation(
+                                "cathodePatternRotation2", x = 0, y = 0, z = 90
+                            )
+                        }
+                    val cathodeCopperDiskSolidAux3 =
+                        solids.union(cathodeCopperDiskSolidAux2, cathodePatternLine) {
+                            rotation = GdmlRotation(
+                                "cathodePatternRotation3", x = 0, y = 0, z = 135
+                            )
+                        }
+
+                    val cathodeCopperDiskFinal =
+                        solids.union(cathodeCopperDiskSolidAux3, cathodePatternDisk)
+
+
+                    val cathodeCopperDiskVolume =
+                        volume(cathodeCopperDiskMaterial, cathodeCopperDiskFinal)
+
+                    val gasSolidOriginal = solids.tube(
+                        chamberDiameter / 2 - chamberTeflonWallThickness,
+                        chamberHeight
+                    )
+
+                    val kaptonReadoutMaterial = materials.composite("G4_KAPTON")
+                    val kaptonReadoutSolid = solids.box(
+                        chamberOuterSquareSide,
+                        chamberOuterSquareSide,
+                        readoutKaptonThickness)
+                    val kaptonReadoutVolume = volume( kaptonReadoutMaterial, kaptonReadoutSolid)
+
+                    val copperReadoutSolid =
+                        solids.box(readoutPlaneSide, readoutPlaneSide, readoutCopperThickness)
+                    val copperReadoutVolume = volume(copperMaterial, copperReadoutSolid)
+
+                    val gasSolidAux =
+                        solids.subtraction(gasSolidOriginal, copperReadoutSolid) {
+                            position(z = -chamberHeight / 2 + readoutCopperThickness / 2)
+                        }
+
+                    val gasMaterial = materials.composite("G4_Ar")
+                    val gasSolid =
+                        solids.subtraction( gasSolidAux, cathodeWindowSolid) {
+                            position(z = chamberHeight / 2 - mylarCathodeThickness / 2)
+                            rotation(z = 45)
+                        }
+                    val gasVolume = volume(gasMaterial, gasSolid)
+
+                    // world setup
+                    world = volume(worldMaterial, worldBox) {
+                        physVolume(gasVolume) {
+                            name = "gas"
+                        }
+                        physVolume(kaptonReadoutVolume) {
+                            name = "kaptonReadout"
+                            position {
+                                z = -chamberHeight / 2 - readoutKaptonThickness / 2
+                            }
+                        }
+                        physVolume(copperReadoutVolume) {
+                            name = "copperReadout"
+                            position {
+                                z = -chamberHeight / 2 + readoutCopperThickness / 2
+                            }
+                            rotation { z = 45 }
+                        }
+                        physVolume(chamberBodyVolume) {
+                            name = "chamberBody"
+                        }
+                        physVolume(chamberBackplateVolume) {
+                            name = "chamberBackplate"
+                            position {
+                                z = -chamberHeight / 2 - readoutKaptonThickness - chamberBackplateThickness / 2
+                            }
+                        }
+                        physVolume(chamberTeflonWallVolume) {
+                            name = "chamberTeflonWall"
+                        }
+                        physVolume(cathodeTeflonDiskVolume) {
+                            name = "cathodeTeflonDisk"
+                            position {
+                                z = chamberHeight / 2 + cathodeTeflonDiskThickness / 2
+                            }
+                        }
+                        physVolume(cathodeCopperDiskVolume) {
+                            name = "cathodeCopperDisk"
+                            position {
+                                z = chamberHeight / 2 + cathodeCopperSupportThickness / 2
+                            }
+                        }
+                        physVolume(cathodeWindowVolume) {
+                            name = "cathodeWindow"
+                            position {
+                                z = chamberHeight / 2 - mylarCathodeThickness / 2
+                            }
+                        }
+                        physVolume(cathodeFillingVolume) {
+                            name = "cathodeFilling"
+                            position {
+                                z = chamberHeight / 2 + cathodeTeflonDiskThickness / 2
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
index e8fb8815..ac0e9e4b 100644
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
@@ -2,17 +2,16 @@ package space.kscience.visionforge.gdml
 
 import space.kscience.dataforge.meta.Meta
 import space.kscience.dataforge.meta.MetaBuilder
+import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.asName
 import space.kscience.dataforge.names.plus
 import space.kscience.dataforge.names.toName
 import space.kscience.gdml.*
-import space.kscience.visionforge.set
-import space.kscience.visionforge.setProperty
+import space.kscience.visionforge.*
+import space.kscience.visionforge.html.VisionOutput
 import space.kscience.visionforge.solid.*
 import space.kscience.visionforge.solid.SolidMaterial.Companion.MATERIAL_KEY
-import space.kscience.visionforge.styleSheet
-import space.kscience.visionforge.useStyle
 import kotlin.math.cos
 import kotlin.math.sin
 import kotlin.random.Random
@@ -445,4 +444,8 @@ public fun SolidGroup.gdml(gdml: Gdml, key: String? = null, transformer: GdmlTra
     val visual = gdml.toVision(transformer)
     //println(Visual3DPlugin.json.stringify(VisualGroup3D.serializer(), visual))
     set(key, visual)
-}
\ No newline at end of file
+}
+
+@VisionBuilder
+@DFExperimental
+public inline fun VisionOutput.gdml(block: Gdml.() -> Unit): SolidGroup = Gdml(block).toVision()
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt
index ef529207..211e3af2 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt
@@ -10,6 +10,7 @@ import kotlin.math.sin
 
 /**
  * A solid cylinder or cut cone segment
+ * The default segment number is 32
  */
 @Serializable
 @SerialName("solid.cone")
@@ -22,7 +23,7 @@ public class ConeSegment(
 ) : SolidBase(), GeometrySolid {
 
     override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>) {
-        val segments = detail ?: 8
+        val segments = detail ?: 32
         require(segments >= 4) { "The number of segments in cone segment is too small" }
         val angleStep = angle / (segments - 1)
 
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSurface.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSurface.kt
index b654ee90..caa8c746 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSurface.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSurface.kt
@@ -11,6 +11,7 @@ import kotlin.math.sin
 
 /**
  * A conical or cylindrical surface
+ * The default segment number is 32
  */
 @Serializable
 @SerialName("solid.coneSurface")
@@ -33,7 +34,7 @@ public class ConeSurface(
     }
 
     override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>) {
-        val segments = detail ?: 8
+        val segments = detail ?: 32
         require(segments >= 4) { "The number of segments in tube is too small" }
         val angleStep = angle / (segments - 1)
 
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Sphere.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Sphere.kt
index f3ace5b3..c4d67f97 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Sphere.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Sphere.kt
@@ -28,7 +28,7 @@ public class Sphere(
             return Point3D(x, y, z)
         }
 
-        val segments = this.detail ?: 8
+        val segments = this.detail ?: 32
         require(segments >= 4) { "The detail for sphere must be >= 4" }
         val phiStep = phi / segments
         val thetaStep = theta / segments
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SphereLayer.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SphereLayer.kt
index 6443bdd0..83e358e2 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SphereLayer.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SphereLayer.kt
@@ -35,7 +35,7 @@ public class SphereLayer(
             return Point3D(x, y, z)
         }
 
-        val segments = detail ?: 8
+        val segments = detail ?: 32
         require(segments >= 4) { "The detail for sphere must be >= 4" }
         val phiStep = phi / segments
         val thetaStep = theta / segments

From faf3fa85124ddba153363539cda4f8dc4aef3986 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 8 May 2021 23:14:15 +0300
Subject: [PATCH 109/151] Add multi-select value chooser for layers

---
 demo/gdml/src/jsMain/resources/index.html     |   1 -
 .../playground/src/jvmMain/kotlin/gdmCurve.kt |   6 +-
 .../playground/src/jvmMain/kotlin/gdmlIaxo.kt |   6 +-
 .../src/jvmMain/kotlin/GdmlForJupyter.kt      |  35 ++---
 ui/react/build.gradle.kts                     |   1 +
 .../visionforge/react/MultiSelectChooser.kt   |  42 ++++++
 .../visionforge/react/valueChooser.kt         |   1 +
 .../kscience/visionforge/StyleReference.kt    |  29 ++--
 ...ticHtmlRender.kt => HtmlVisionRenderer.kt} |  26 ++--
 .../visionforge/html/VisionTagConsumer.kt     |   4 +-
 .../kscience/visionforge/schemeDesctiptors.kt |   6 +-
 .../kscience/visionforge/html/HtmlTagTest.kt  |  28 +++-
 .../kscience/visionforge/VisionClient.kt      |   3 +-
 ...mlTransformer.kt => GdmlTransformerEnv.kt} | 134 +++++++++++-------
 .../kscience/visionforge/gdml/gdmlJVM.kt      |   2 +-
 .../visionforge/three/server/VisionServer.kt  |   2 +-
 .../visionforge/solid/specifications/Axes.kt  |  12 +-
 .../solid/specifications/Camera.kt            |  24 +++-
 .../solid/specifications/Canvas3DOptions.kt   |  44 ++++--
 .../visionforge/solid/three/ThreeCanvas.kt    |  41 +++---
 20 files changed, 295 insertions(+), 152 deletions(-)
 create mode 100644 ui/react/src/main/kotlin/space/kscience/visionforge/react/MultiSelectChooser.kt
 rename visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/{staticHtmlRender.kt => HtmlVisionRenderer.kt} (65%)
 rename visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/{GdmlTransformer.kt => GdmlTransformerEnv.kt} (84%)

diff --git a/demo/gdml/src/jsMain/resources/index.html b/demo/gdml/src/jsMain/resources/index.html
index ba6c6868..8f5ca1ef 100644
--- a/demo/gdml/src/jsMain/resources/index.html
+++ b/demo/gdml/src/jsMain/resources/index.html
@@ -5,7 +5,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Three js demo for particle physics</title>
     <script type="text/javascript" src="gdml.js"></script>
-    <link rel="stylesheet" href="css/custom-bootstrap.css">
     <link rel="stylesheet" href="css/fileDrop.css">
 </head>
 <body class="application">
diff --git a/demo/playground/src/jvmMain/kotlin/gdmCurve.kt b/demo/playground/src/jvmMain/kotlin/gdmCurve.kt
index 12981241..2b9aef01 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmCurve.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmCurve.kt
@@ -2,7 +2,7 @@ package space.kscience.visionforge.examples
 
 import space.kscience.dataforge.context.Context
 import space.kscience.gdml.*
-import space.kscience.visionforge.gdml.gdml
+import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.solid.Solids
 
 fun main() {
@@ -12,7 +12,7 @@ fun main() {
 
     context.makeVisionFile {
         vision("canvas") {
-            gdml {
+            Gdml {
                 // geometry variables
                 val worldSize = 500
                 // chamber
@@ -220,6 +220,8 @@ fun main() {
                         }
                     }
                 }
+            }.toVision {
+                this.solidAction
             }
         }
     }
diff --git a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
index 10e81070..a9070af7 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
@@ -10,9 +10,7 @@ fun main() {
         plugin(Solids)
     }
 
-    context.makeVisionFile{
-        vision("canvas") {
-            GdmlShowCase.babyIaxo().toVision()
-        }
+    context.makeVisionFile {
+        vision("canvas") { GdmlShowCase.babyIaxo().toVision() }
     }
 }
\ No newline at end of file
diff --git a/jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt b/jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt
index 86041d32..31d1d9aa 100644
--- a/jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt
+++ b/jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt
@@ -1,10 +1,6 @@
 package space.kscience.visionforge.gdml.jupyter
 
-import kotlinx.html.div
-import kotlinx.html.id
-import kotlinx.html.script
 import kotlinx.html.stream.createHTML
-import kotlinx.html.unsafe
 import org.jetbrains.kotlinx.jupyter.api.HTML
 import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
 import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
@@ -16,7 +12,7 @@ import space.kscience.visionforge.Vision
 import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.html.HtmlVisionFragment
 import space.kscience.visionforge.html.Page
-import space.kscience.visionforge.html.embedVisionFragment
+import space.kscience.visionforge.html.embedAndRenderVisionFragment
 import space.kscience.visionforge.solid.Solids
 import space.kscience.visionforge.visionManager
 
@@ -30,17 +26,9 @@ internal class GdmlForJupyter : JupyterIntegration() {
 
     private var counter = 0
 
-    private fun produceHtmlVisionString(fragment: HtmlVisionFragment) = createHTML().div {
-        val id = "visionforge.vision[${counter++}]"
-        div {
-            this.id = id
-            embedVisionFragment(context.visionManager, fragment = fragment)
-        }
-        script {
-            type = "text/javascript"
-            unsafe { +"VisionForge.renderVisionsAt(\"$id\");" }
-        }
-    }
+    private fun produceHtmlVisionString(fragment: HtmlVisionFragment) = createHTML().apply {
+        embedAndRenderVisionFragment(context.visionManager, counter++, fragment)
+    }.finalize()
 
     override fun Builder.onLoaded() {
 
@@ -62,19 +50,12 @@ internal class GdmlForJupyter : JupyterIntegration() {
             "space.kscience.visionforge.gdml.jupyter.*"
         )
 
-        render<Gdml> { gdmlModel ->
-            val fragment = HtmlVisionFragment {
-                vision(gdmlModel.toVision())
-            }
-            HTML(produceHtmlVisionString(fragment))
+        render<Vision> { vision ->
+            HTML(produceHtmlVisionString { vision(vision) })
         }
 
-        render<Vision> { vision ->
-            val fragment = HtmlVisionFragment {
-                vision(vision)
-            }
-
-            HTML(produceHtmlVisionString(fragment))
+        render<Gdml> { gdmlModel ->
+            HTML(produceHtmlVisionString { vision(gdmlModel.toVision()) })
         }
 
         render<Page> { page ->
diff --git a/ui/react/build.gradle.kts b/ui/react/build.gradle.kts
index 86c5068f..f20a63b8 100644
--- a/ui/react/build.gradle.kts
+++ b/ui/react/build.gradle.kts
@@ -8,5 +8,6 @@ dependencies{
     api(project(":visionforge-solid"))
     api("org.jetbrains:kotlin-styled:5.2.3-$kotlinWrappersVersion")
     api("org.jetbrains:kotlin-react-dom:17.0.2-$kotlinWrappersVersion")
+//    implementation(npm("react-select","4.3.0"))
     implementation(project(":visionforge-threejs"))
 }
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/MultiSelectChooser.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MultiSelectChooser.kt
new file mode 100644
index 00000000..497256c8
--- /dev/null
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MultiSelectChooser.kt
@@ -0,0 +1,42 @@
+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.FunctionalComponent
+import react.dom.option
+import react.dom.select
+import react.functionalComponent
+import react.useState
+import space.kscience.dataforge.meta.value
+import space.kscience.dataforge.values.asValue
+import space.kscience.dataforge.values.string
+
+@JsExport
+public val MultiSelectChooser: FunctionalComponent<ValueChooserProps> =
+    functionalComponent("MultiSelectChooser") { props ->
+        var selectedItems by useState { props.item.value?.list ?: emptyList() }
+
+        val onChange: (Event) -> Unit = { event: Event ->
+            val newSelected= (event.target as HTMLSelectElement).selectedOptions.asList()
+                .map { (it as HTMLOptionElement).value.asValue() }
+            props.valueChanged?.invoke(newSelected.asValue())
+            selectedItems = newSelected
+        }
+
+        select {
+            attrs {
+                multiple = true
+                values = selectedItems.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/main/kotlin/space/kscience/visionforge/react/valueChooser.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
index feab99d8..b0b448bb 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
@@ -152,6 +152,7 @@ public val ValueChooser: FunctionalComponent<ValueChooserProps> = functionalComp
     when {
         rawInput -> child(StringValueChooser, props)
         descriptor?.widgetType == "color" -> child(ColorValueChooser, props)
+        descriptor?.widgetType == "multiSelect" -> child(MultiSelectChooser, props)
         type == ValueType.BOOLEAN -> child(BooleanValueChooser, props)
         type == ValueType.NUMBER -> child(NumberValueChooser, props)
         descriptor?.allowedValues?.isNotEmpty() ?: false -> child(ComboValueChooser, props)
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleReference.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleReference.kt
index e25315aa..961e937a 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleReference.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleReference.kt
@@ -2,7 +2,8 @@ package space.kscience.visionforge
 
 import space.kscience.dataforge.meta.Meta
 import space.kscience.dataforge.meta.MetaBuilder
-import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.dataforge.meta.Scheme
+import space.kscience.dataforge.meta.Specification
 import kotlin.properties.ReadOnlyProperty
 
 /**
@@ -23,11 +24,23 @@ public fun Vision.useStyle(reference: StyleReference) {
     useStyle(reference.name)
 }
 
-@DFExperimental
 @VisionBuilder
-public fun VisionGroup.style(builder: MetaBuilder.() -> Unit): ReadOnlyProperty<Any?, StyleReference> =
-    ReadOnlyProperty { _, property ->
-        val styleName = property.name
-        styleSheet.define(styleName, Meta(builder))
-        StyleReference(this, styleName)
-    }
\ No newline at end of file
+public fun VisionGroup.style(
+    styleKey: String? = null,
+    builder: MetaBuilder.() -> Unit,
+): ReadOnlyProperty<Any?, StyleReference> = ReadOnlyProperty { _, property ->
+    val styleName = styleKey ?: property.name
+    styleSheet.define(styleName, Meta(builder))
+    StyleReference(this, styleName)
+}
+
+@VisionBuilder
+public fun <T : Scheme> VisionGroup.style(
+    spec: Specification<T>,
+    styleKey: String? = null,
+    builder: T.() -> Unit,
+): ReadOnlyProperty<Any?, StyleReference> = ReadOnlyProperty { _, property ->
+    val styleName = styleKey ?: property.name
+    styleSheet.define(styleName, spec(builder).toMeta())
+    StyleReference(this, styleName)
+}
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/staticHtmlRender.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionRenderer.kt
similarity index 65%
rename from visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/staticHtmlRender.kt
rename to visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionRenderer.kt
index e246572e..2e902d4d 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/staticHtmlRender.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionRenderer.kt
@@ -2,6 +2,7 @@ package space.kscience.visionforge.html
 
 import kotlinx.html.*
 import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.dataforge.names.Name
 import space.kscience.visionforge.Vision
 import space.kscience.visionforge.VisionManager
@@ -35,20 +36,19 @@ public fun FlowContent.embedVisionFragment(
     fragment: HtmlVisionFragment,
 ): Map<Name, Vision>  = consumer.embedVisionFragment(manager, idPrefix, fragment)
 
-public typealias HtmlVisionRenderer = FlowContent.(name: Name, vision: Vision, meta: Meta) -> Unit
 
-public fun FlowContent.renderVisionFragment(
-    renderer: DIV.(name: Name, vision: Vision, meta: Meta) -> Unit,
-    idPrefix: String? = null,
-    fragment: HtmlVisionFragment,
-): Map<Name, Vision> {
-    val visionMap = HashMap<Name, Vision>()
-    val consumer = object : VisionTagConsumer<Any?>(consumer, idPrefix) {
-        override fun DIV.renderVision(name: Name, vision: Vision, outputMeta: Meta) {
-            visionMap[name] = vision
-            renderer(name, vision, outputMeta)
+internal const val RENDER_FUNCTION_NAME = "renderAllVisionsById"
+
+@DFExperimental
+public fun TagConsumer<*>.embedAndRenderVisionFragment(manager: VisionManager, id: Any, fragment: HtmlVisionFragment){
+    div {
+        div {
+            this.id = id.toString()
+            embedVisionFragment(manager, fragment = fragment)
+        }
+        script {
+            type = "text/javascript"
+            unsafe { +"window.${RENDER_FUNCTION_NAME}(\"$id\");" }
         }
     }
-    fragment(consumer)
-    return visionMap
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt
index aa8e6fcb..967e1851 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt
@@ -66,7 +66,9 @@ public abstract class VisionTagConsumer<R>(
                 }
             }
         }
-        vision?.let { renderVision(name, it, outputMeta) }
+        vision?.let {
+            renderVision(name, it, outputMeta)
+        }
     }
 
     @OptIn(DFExperimental::class)
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/schemeDesctiptors.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/schemeDesctiptors.kt
index f1a5fb1c..8c43d0e0 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/schemeDesctiptors.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/schemeDesctiptors.kt
@@ -4,7 +4,7 @@ import space.kscience.dataforge.meta.Scheme
 import space.kscience.dataforge.meta.SchemeSpec
 import space.kscience.dataforge.meta.descriptors.NodeDescriptor
 import space.kscience.dataforge.meta.descriptors.NodeDescriptorBuilder
-import space.kscience.dataforge.meta.descriptors.ValueDescriptor
+import space.kscience.dataforge.meta.descriptors.ValueDescriptorBuilder
 import space.kscience.dataforge.meta.toConfig
 import space.kscience.dataforge.values.ValueType
 import kotlin.reflect.KProperty1
@@ -15,7 +15,7 @@ import kotlin.reflect.typeOf
  */
 public inline fun <S : Scheme, reified T> NodeDescriptorBuilder.value(
     property: KProperty1<S, T>,
-    noinline block: ValueDescriptor.() -> Unit = {},
+    noinline block: ValueDescriptorBuilder.() -> Unit = {},
 ) {
     when (typeOf<T>()) {
         typeOf<Number>(), typeOf<Int>(), typeOf<Double>(), typeOf<Short>(), typeOf<Long>(), typeOf<Float>() ->
@@ -54,7 +54,7 @@ public fun NodeDescriptor.copy(block: NodeDescriptorBuilder.() -> Unit = {}): No
 public inline fun <S : Scheme, reified T : Scheme> NodeDescriptorBuilder.scheme(
     property: KProperty1<S, T>,
     spec: SchemeSpec<T>,
-    noinline block: NodeDescriptor.() -> Unit = {},
+    noinline block: NodeDescriptorBuilder.() -> Unit = {},
 ) {
     spec.descriptor?.let { descriptor ->
         item(property.name, descriptor.copy(block))
diff --git a/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt b/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt
index 5f35bd74..e50c13b3 100644
--- a/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt
+++ b/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt
@@ -2,13 +2,35 @@ package space.kscience.visionforge.html
 
 import kotlinx.html.*
 import kotlinx.html.stream.createHTML
+import space.kscience.dataforge.meta.Meta
 import space.kscience.dataforge.meta.set
 import space.kscience.dataforge.misc.DFExperimental
+import space.kscience.dataforge.names.Name
+import space.kscience.visionforge.Vision
 import space.kscience.visionforge.VisionBase
 import space.kscience.visionforge.configure
 import space.kscience.visionforge.meta
 import kotlin.test.Test
 
+typealias HtmlVisionRenderer = FlowContent.(name: Name, vision: Vision, meta: Meta) -> Unit
+
+fun FlowContent.renderVisionFragment(
+    renderer: DIV.(name: Name, vision: Vision, meta: Meta) -> Unit,
+    idPrefix: String? = null,
+    fragment: HtmlVisionFragment,
+): Map<Name, Vision> {
+    val visionMap = HashMap<Name, Vision>()
+    val consumer = object : VisionTagConsumer<Any?>(consumer, idPrefix) {
+        override fun DIV.renderVision(name: Name, vision: Vision, outputMeta: Meta) {
+            visionMap[name] = vision
+            renderer(name, vision, outputMeta)
+        }
+    }
+    fragment(consumer)
+    return visionMap
+}
+
+
 @DFExperimental
 class HtmlTagTest {
 
@@ -46,15 +68,11 @@ class HtmlTagTest {
         }
     }
 
-    val groupRenderer: HtmlVisionRenderer = { _, _, _ ->
-        p { +"This is group" }
-    }
-
 
     @Test
     fun testStringRender() {
         println(
-            createHTML().div {
+            createHTML().div{
                 renderVisionFragment(simpleVisionRenderer, fragment = fragment)
             }
         )
diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
index 47fed77b..8cd5dd09 100644
--- a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
@@ -7,6 +7,7 @@ import org.w3c.dom.url.URL
 import space.kscience.dataforge.context.*
 import space.kscience.dataforge.meta.Meta
 import space.kscience.dataforge.meta.MetaSerializer
+import space.kscience.visionforge.html.RENDER_FUNCTION_NAME
 import space.kscience.visionforge.html.VisionTagConsumer
 import space.kscience.visionforge.html.VisionTagConsumer.Companion.OUTPUT_CONNECT_ATTRIBUTE
 import space.kscience.visionforge.html.VisionTagConsumer.Companion.OUTPUT_ENDPOINT_ATTRIBUTE
@@ -221,7 +222,7 @@ public fun runVisionClient(contextBuilder: ContextBuilder.() -> Unit) {
         //plugin(VisionClient)
     }
     val visionClient = context.fetch(VisionClient)
-    window.asDynamic()["renderAllVisionsById"] = visionClient::renderAllVisionsById
+    window.asDynamic()[RENDER_FUNCTION_NAME] = visionClient::renderAllVisionsById
 
     visionClient.renderAllVisions()
 }
\ No newline at end of file
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformerEnv.kt
similarity index 84%
rename from visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
rename to visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformerEnv.kt
index ac0e9e4b..c4a2364a 100644
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformerEnv.kt
@@ -25,8 +25,7 @@ private inline operator fun Number.times(d: Double) = toDouble() * d
 @Suppress("NOTHING_TO_INLINE")
 private inline operator fun Number.times(f: Float) = toFloat() * f
 
-public class GdmlTransformerSettings {
-    public val random: Random = Random(222)
+public class GdmlTransformer {
 
     public enum class Action {
         ADD,
@@ -40,12 +39,70 @@ public class GdmlTransformerSettings {
     public var solidAction: (GdmlSolid) -> Action = { Action.PROTOTYPE }
     public var volumeAction: (GdmlGroup) -> Action = { Action.PROTOTYPE }
 
-    public var paint: SolidMaterial.(material: GdmlMaterial) -> Unit = { _ ->
-        color(random.nextInt(16777216))
+    internal val styleCache = HashMap<Name, Meta>()
+
+    public fun Solid.useStyle(name: String, builder: MetaBuilder.() -> Unit) {
+        styleCache.getOrPut(name.toName()) {
+            Meta(builder)
+        }
+        useStyle(name)
+    }
+
+    public fun Solid.opaque() {
+        useStyle("opaque") {
+            SolidMaterial.MATERIAL_OPACITY_KEY put 0.3
+            "edges.enabled" put true
+        }
+    }
+
+    /**
+     * Configure paint for given solid with given [GdmlMaterial]
+     */
+    public var configurePaint: SolidMaterial.(material: GdmlMaterial, solid: GdmlSolid) -> Unit =
+        { material, _ -> color(randomColor(material)) }
+        private set
+
+    public fun paint(block: SolidMaterial.(material: GdmlMaterial, solid: GdmlSolid) -> Unit) {
+        configurePaint = block
+    }
+
+    /**
+     * Configure given solid
+     */
+    public var configureSolid: Solid.(parent: GdmlVolume, solid: GdmlSolid, material: GdmlMaterial) -> Unit =
+        { parent, solid, material ->
+            val styleName = "materials.${material.name}"
+
+            if (parent.physVolumes.isNotEmpty()) opaque()
+
+            useStyle(styleName) {
+                val vfMaterial = SolidMaterial().apply {
+                    configurePaint(material, solid)
+                }
+                MATERIAL_KEY put vfMaterial.toMeta()
+                "Gdml.material" put material.name
+            }
+        }
+        private set
+
+
+
+    public companion object {
+        private val random: Random = Random(222)
+
+        private val colorCache = HashMap<GdmlMaterial, Int>()
+
+        /**
+         * Use random color and cache it based on the material. Meaning that colors are random, but always the same for the
+         * same material.
+         */
+        public fun randomColor(material: GdmlMaterial): Int {
+            return colorCache.getOrPut(material) { random.nextInt(16777216) }
+        }
     }
 }
 
-private class GdmlTransformer(val settings: GdmlTransformerSettings) {
+private class GdmlTransformerEnv(val settings: GdmlTransformer) {
     //private val materialCache = HashMap<GdmlMaterial, Meta>()
 
     /**
@@ -57,9 +114,13 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
         setProperty("edges.enabled", false)
     }
 
-
     private val referenceStore = HashMap<Name, MutableList<SolidReferenceGroup>>()
 
+    fun Solid.configureSolid(root: Gdml, parent: GdmlVolume, solid: GdmlSolid) {
+        val material = parent.materialref.resolve(root) ?: GdmlElement(parent.materialref.ref)
+        settings.run { configureSolid(parent, solid, material) }
+    }
+
     private fun proxySolid(root: Gdml, group: SolidGroup, solid: GdmlSolid, name: String): SolidReferenceGroup {
         val templateName = solidsName + name
         if (proto[templateName] == null) {
@@ -85,38 +146,6 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
         return ref
     }
 
-    private val styleCache = HashMap<Name, Meta>()
-
-    var solidConfiguration: Solid.(parent: GdmlVolume, solid: GdmlSolid) -> Unit = { parent, _ ->
-        if (parent.physVolumes.isNotEmpty()) {
-            useStyle("opaque") {
-                SolidMaterial.MATERIAL_OPACITY_KEY put 0.3
-                "edges.enabled" put true
-            }
-        }
-    }
-
-    fun Solid.useStyle(name: String, builder: MetaBuilder.() -> Unit) {
-        styleCache.getOrPut(name.toName()) {
-            Meta(builder)
-        }
-        useStyle(name)
-    }
-
-    fun configureSolid(root: Gdml, obj: Solid, parent: GdmlVolume, solid: GdmlSolid) {
-        val material = parent.materialref.resolve(root) ?: GdmlElement(parent.materialref.ref)
-
-        val styleName = "materials.${material.name}"
-
-        obj.useStyle(styleName) {
-            val vfMaterial = settings.run { SolidMaterial().apply { paint(material) } }
-            MATERIAL_KEY put vfMaterial.toMeta()
-            "Gdml.material" put material.name
-        }
-
-        obj.solidConfiguration(parent, solid)
-    }
-
     fun <T : Solid> T.withPosition(
         newPos: GdmlPosition? = null,
         newRotation: GdmlRotation? = null,
@@ -314,13 +343,13 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
     ): Solid? {
         require(name != "") { "Can't use empty solid name. Use null instead." }
         return when (settings.solidAction(solid)) {
-            GdmlTransformerSettings.Action.ADD -> {
+            GdmlTransformer.Action.ADD -> {
                 addSolid(root, solid, name)
             }
-            GdmlTransformerSettings.Action.PROTOTYPE -> {
+            GdmlTransformer.Action.PROTOTYPE -> {
                 proxySolid(root, this, solid, name ?: solid.name)
             }
-            GdmlTransformerSettings.Action.REJECT -> {
+            GdmlTransformer.Action.REJECT -> {
                 //ignore
                 null
             }
@@ -339,21 +368,21 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
             val solid = volume.solidref.resolve(root)
                 ?: error("Solid with tag ${volume.solidref.ref} for volume ${volume.name} not defined")
             addSolidWithCaching(root, solid, physVolume.name)?.apply {
-                configureSolid(root, this, volume, solid)
+                configureSolid(root, volume, solid)
                 withPosition(root, physVolume)
             }
             return
         }
 
         when (settings.volumeAction(volume)) {
-            GdmlTransformerSettings.Action.ADD -> {
+            GdmlTransformer.Action.ADD -> {
                 val group: SolidGroup = volume(root, volume)
                 this[physVolume.name] = group.withPosition(root, physVolume)
             }
-            GdmlTransformerSettings.Action.PROTOTYPE -> {
+            GdmlTransformer.Action.PROTOTYPE -> {
                 proxyVolume(root, this, physVolume, volume)
             }
-            GdmlTransformerSettings.Action.REJECT -> {
+            GdmlTransformer.Action.REJECT -> {
                 //ignore
             }
         }
@@ -379,7 +408,7 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
                 ?: error("Solid with tag ${group.solidref.ref} for volume ${group.name} not defined")
 
             addSolidWithCaching(root, solid, null)?.apply {
-                configureSolid(root, this, group, solid)
+                this.configureSolid(root, group, solid)
             }
 
             when (val vol: GdmlPlacement? = group.placement) {
@@ -394,10 +423,10 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
     }
 
     private fun finalize(final: SolidGroup): SolidGroup {
-        //final.prototypes = proto
-        final.useStyle("gdml") {
+        val rootStyle by final.style("gdml") {
             Solid.ROTATION_ORDER_KEY put RotationOrder.ZXY
         }
+        final.useStyle(rootStyle)
 
         //inline prototypes
 //        referenceStore.forEach { (protoName, list) ->
@@ -419,7 +448,7 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
                 set(token.asName(), item as? Solid)
             }
         }
-        styleCache.forEach {
+        settings.styleCache.forEach {
             final.styleSheet {
                 define(it.key.toString(), it.value)
             }
@@ -432,15 +461,16 @@ private class GdmlTransformer(val settings: GdmlTransformerSettings) {
 }
 
 
-public fun Gdml.toVision(block: GdmlTransformerSettings.() -> Unit = {}): SolidGroup {
-    val context = GdmlTransformer(GdmlTransformerSettings().apply(block))
+public fun Gdml.toVision(block: GdmlTransformer.() -> Unit = {}): SolidGroup {
+    val settings = GdmlTransformer().apply(block)
+    val context = GdmlTransformerEnv(settings)
     return context.transform(this)
 }
 
 /**
  * Append Gdml node to the group
  */
-public fun SolidGroup.gdml(gdml: Gdml, key: String? = null, transformer: GdmlTransformerSettings.() -> Unit = {}) {
+public fun SolidGroup.gdml(gdml: Gdml, key: String? = null, transformer: GdmlTransformer.() -> Unit = {}) {
     val visual = gdml.toVision(transformer)
     //println(Visual3DPlugin.json.stringify(VisualGroup3D.serializer(), visual))
     set(key, visual)
diff --git a/visionforge-gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/gdmlJVM.kt b/visionforge-gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/gdmlJVM.kt
index 310631ce..7bd17a5c 100644
--- a/visionforge-gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/gdmlJVM.kt
+++ b/visionforge-gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/gdmlJVM.kt
@@ -12,7 +12,7 @@ public fun SolidGroup.gdml(
     file: Path,
     key: String = "",
     usePreprocessor: Boolean = false,
-    transformer: GdmlTransformerSettings.() -> Unit = {},
+    transformer: GdmlTransformer.() -> Unit = {},
 ) {
     val gdml = Gdml.decodeFromFile(file, usePreprocessor)
     gdml(gdml, key, transformer)
diff --git a/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt b/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
index c52a84a1..06c13bfe 100644
--- a/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
@@ -89,7 +89,7 @@ public class VisionServer internal constructor(
                         script {
                             attributes["class"] = OUTPUT_DATA_CLASS
                             unsafe {
-                                +visionManager.encodeToString(vision)
+                                +"\n${visionManager.encodeToString(vision)}\n"
                             }
                         }
                     }
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Axes.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Axes.kt
index 8b59a8b4..2f3e1645 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Axes.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Axes.kt
@@ -18,9 +18,15 @@ public class Axes : Scheme() {
 
         override val descriptor: NodeDescriptor by lazy {
             NodeDescriptor {
-                value(Axes::visible)
-                value(Axes::size)
-                value(Axes::width)
+                value(Axes::visible){
+                    default(false)
+                }
+                value(Axes::size){
+                    default(AXIS_SIZE)
+                }
+                value(Axes::width){
+                    default(AXIS_WIDTH)
+                }
             }
         }
     }
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Camera.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Camera.kt
index 00c36d50..b6209b54 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Camera.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Camera.kt
@@ -30,12 +30,24 @@ public class Camera : Scheme() {
 
         override val descriptor: NodeDescriptor  by lazy {
             NodeDescriptor {
-                value(Camera::fov)
-                value(Camera::nearClip)
-                value(Camera::farClip)
-                value(Camera::distance)
-                value(Camera::azimuth)
-                value(Camera::zenith)
+                value(Camera::fov){
+                    default(FIELD_OF_VIEW)
+                }
+                value(Camera::nearClip){
+                    default(NEAR_CLIP)
+                }
+                value(Camera::farClip){
+                    default(FAR_CLIP)
+                }
+                value(Camera::distance){
+                    default(INITIAL_DISTANCE)
+                }
+                value(Camera::azimuth){
+                    default(INITIAL_AZIMUTH)
+                }
+                value(Camera::latitude){
+                    default(INITIAL_LATITUDE)
+                }
             }
         }
     }
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt
index bd3eebc3..aa7cb258 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt
@@ -3,8 +3,11 @@ package space.kscience.visionforge.solid.specifications
 import space.kscience.dataforge.meta.*
 import space.kscience.dataforge.meta.descriptors.NodeDescriptor
 import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.values.ValueType
+import space.kscience.visionforge.hide
 import space.kscience.visionforge.scheme
 import space.kscience.visionforge.value
+import space.kscience.visionforge.widgetType
 
 public class Canvas3DOptions : Scheme() {
     public var axes: Axes by spec(Axes)
@@ -20,6 +23,8 @@ public class Canvas3DOptions : Scheme() {
     public var maxWith: Number by number { maxSize }
     public var maxHeight: Number by number { maxSize }
 
+    public var layers: List<Number> by numberList(0)
+
     public var onSelect: ((Name?) -> Unit)? = null
 
 
@@ -28,14 +33,37 @@ public class Canvas3DOptions : Scheme() {
             NodeDescriptor {
                 scheme(Canvas3DOptions::axes, Axes)
                 scheme(Canvas3DOptions::light, Light)
-                scheme(Canvas3DOptions::camera, Camera)
-                scheme(Canvas3DOptions::controls, Controls)
-                value(Canvas3DOptions::minSize)
-                value(Canvas3DOptions::minWith)
-                value(Canvas3DOptions::minHeight)
-                value(Canvas3DOptions::maxSize)
-                value(Canvas3DOptions::maxWith)
-                value(Canvas3DOptions::maxHeight)
+                scheme(Canvas3DOptions::camera, Camera) {
+                    hide()
+                }
+                scheme(Canvas3DOptions::controls, Controls) {
+                    hide()
+                }
+                value(Canvas3DOptions::minSize) {
+                    hide()
+                }
+                value(Canvas3DOptions::minWith) {
+                    hide()
+                }
+                value(Canvas3DOptions::minHeight) {
+                    hide()
+                }
+                value(Canvas3DOptions::maxSize) {
+                    hide()
+                }
+                value(Canvas3DOptions::maxWith) {
+                    hide()
+                }
+                value(Canvas3DOptions::maxHeight) {
+                    hide()
+                }
+                value(Canvas3DOptions::layers) {
+                    type(ValueType.NUMBER)
+                    multiple = true
+                    default(listOf(0))
+                    widgetType = "multiSelect"
+                    allow(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
+                }
             }
         }
     }
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
index 034cf430..8d0e0d0d 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
@@ -52,7 +52,7 @@ public class ThreeCanvas(
         private set
 
     private val scene: Scene = Scene().apply {
-        options.useProperty(Canvas3DOptions::axes){axesConfig->
+        options.useProperty(Canvas3DOptions::axes) { axesConfig ->
             getObjectByName(AXES_NAME)?.let { remove(it) }
             val axesObject = AxesHelper(axes.size.toInt()).apply { visible = axes.visible }
             axesObject.name = AXES_NAME
@@ -60,7 +60,7 @@ public class ThreeCanvas(
         }
 
         //Set up light
-        options.useProperty(Canvas3DOptions::light){lightConfig->
+        options.useProperty(Canvas3DOptions::light) { lightConfig ->
             //remove old light if present
             getObjectByName(LIGHT_NAME)?.let { remove(it) }
             //add new light
@@ -70,8 +70,29 @@ public class ThreeCanvas(
         }
     }
 
-    public var camera: PerspectiveCamera = buildCamera(options.camera)
-        private set
+
+    private fun buildCamera(spec: Camera) = PerspectiveCamera(
+        spec.fov,
+        1.0,
+        spec.nearClip,
+        spec.farClip
+    ).apply {
+        translateX(spec.distance * sin(spec.zenith) * sin(spec.azimuth))
+        translateY(spec.distance * cos(spec.zenith))
+        translateZ(spec.distance * sin(spec.zenith) * cos(spec.azimuth))
+        options.useProperty(Canvas3DOptions::layers) { selectedLayers ->
+            (0..31).forEach {
+                if (it in selectedLayers) {
+                    this@apply.layers.enable(it)
+                } else{
+                    this@apply.layers.disable(it)
+                }
+            }
+        }
+    }
+
+
+    public val camera: PerspectiveCamera = buildCamera(options.camera)
 
     private var picked: Object3D? = null
 
@@ -127,7 +148,6 @@ public class ThreeCanvas(
                 mousePosition.x = ((event.clientX - rect.left) / canvas.clientWidth) * 2 - 1
                 mousePosition.y = -((event.clientY - rect.top) / canvas.clientHeight) * 2 + 1
             }
-            event.preventDefault()
         }, false)
 
         canvas.onresize = {
@@ -185,17 +205,6 @@ public class ThreeCanvas(
 
     private fun buildLight(spec: Light?): info.laht.threekt.lights.Light = AmbientLight(0x404040)
 
-    private fun buildCamera(spec: Camera) = PerspectiveCamera(
-        spec.fov,
-        1.0,
-        spec.nearClip,
-        spec.farClip
-    ).apply {
-        translateX(spec.distance * sin(spec.zenith) * sin(spec.azimuth))
-        translateY(spec.distance * cos(spec.zenith))
-        translateZ(spec.distance * sin(spec.zenith) * cos(spec.azimuth))
-    }
-
     private fun addControls(element: Node, controls: Controls) {
         when (controls["type"].string) {
             "trackball" -> TrackballControls(camera, element)

From 65c0183ba756b3bc4be94b3a5834bbb9d8f222e4 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 9 May 2021 11:11:21 +0300
Subject: [PATCH 110/151] Update ring-ui

---
 settings.gradle.kts                           |  2 +-
 ui/ring/build.gradle.kts                      |  5 ++-
 ui/ring/src/main/kotlin/ringui/Alert.kt       | 36 +++++++++----------
 ui/ring/src/main/kotlin/ringui/Button.kt      | 34 +++++++++---------
 ui/ring/src/main/kotlin/ringui/Dialog.kt      | 22 ++++++------
 ui/ring/src/main/kotlin/ringui/Icon.kt        | 16 ++++-----
 ui/ring/src/main/kotlin/ringui/Link.kt        |  6 ++--
 ui/ring/src/main/kotlin/ringui/RingUI.kt      | 14 ++++----
 ui/ring/src/main/kotlin/ringui/UserCard.kt    | 12 +++----
 .../src/main/kotlin/ringui/header/Header.kt   |  8 ++---
 ui/ring/src/main/kotlin/ringui/header/Logo.kt |  6 ++--
 ui/ring/src/main/kotlin/ringui/header/Tray.kt | 10 +++---
 .../src/main/kotlin/ringui/island/Content.kt  | 14 ++++----
 .../src/main/kotlin/ringui/island/Header.kt   | 10 +++---
 .../src/main/kotlin/ringui/island/Island.kt   | 10 +++---
 ui/ring/webpack.config.d/01.ring.js           |  3 +-
 ui/ring/webpack.config.d/02.svg.js            | 15 --------
 17 files changed, 103 insertions(+), 120 deletions(-)
 delete mode 100644 ui/ring/webpack.config.d/02.svg.js

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1c923b9a..11152323 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -28,7 +28,7 @@ rootProject.name = "visionforge"
 include(
 //    ":ui",
     ":ui:react",
-//    ":ui:ring",
+    ":ui:ring",
 //    ":ui:material",
     ":ui:bootstrap",
     ":visionforge-core",
diff --git a/ui/ring/build.gradle.kts b/ui/ring/build.gradle.kts
index 16aa8c92..bb80da8f 100644
--- a/ui/ring/build.gradle.kts
+++ b/ui/ring/build.gradle.kts
@@ -13,7 +13,6 @@ kotlin{
 dependencies{
     api(project(":ui:react"))
 
-    implementation(npm("@jetbrains/logos", "1.1.6"))
-    implementation(npm("@jetbrains/ring-ui", "3.0.13"))
-    implementation(npm("svg-inline-loader", "0.8.0"))
+    implementation(npm("@jetbrains/icons", "3.14.1"))
+    implementation(npm("@jetbrains/ring-ui", "4.0.7"))
 }
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/Alert.kt b/ui/ring/src/main/kotlin/ringui/Alert.kt
index 10d9b5a7..2f5c4b8b 100644
--- a/ui/ring/src/main/kotlin/ringui/Alert.kt
+++ b/ui/ring/src/main/kotlin/ringui/Alert.kt
@@ -5,29 +5,29 @@ import react.RHandler
 import react.dom.WithClassName
 
 // https://github.com/JetBrains/ring-ui/blob/master/components/alert/alert.js
-external interface AlertProps : WithClassName {
-    var timeout: Number
-    var onCloseRequest: () -> Unit
-    var onClose: () -> Unit
-    var isShaking: Boolean
-    var isClosing: Boolean
-    var inline: Boolean
-    var showWithAnimation: Boolean
-    var closeable: Boolean
-    var type: AlertType
+public external interface AlertProps : WithClassName {
+    public var timeout: Number
+    public var onCloseRequest: () -> Unit
+    public var onClose: () -> Unit
+    public var isShaking: Boolean
+    public var isClosing: Boolean
+    public var inline: Boolean
+    public var showWithAnimation: Boolean
+    public var closeable: Boolean
+    public var type: AlertType
 }
 
-typealias AlertType = String
+public typealias AlertType = String
 
-object AlertTypes {
-    var ERROR = "error"
-    var MESSAGE = "message"
-    var SUCCESS = "success"
-    var WARNING = "warning"
-    var LOADING = "loading"
+public object AlertTypes {
+    public var ERROR = "error"
+    public var MESSAGE = "message"
+    public var SUCCESS = "success"
+    public var WARNING = "warning"
+    public var LOADING = "loading"
 }
 
-fun RBuilder.ringAlert(handler: RHandler<AlertProps>) {
+public fun RBuilder.ringAlert(handler: RHandler<AlertProps>) {
     RingUI.Alert {
         handler()
     }
diff --git a/ui/ring/src/main/kotlin/ringui/Button.kt b/ui/ring/src/main/kotlin/ringui/Button.kt
index cacbcad2..040bb5da 100644
--- a/ui/ring/src/main/kotlin/ringui/Button.kt
+++ b/ui/ring/src/main/kotlin/ringui/Button.kt
@@ -6,29 +6,29 @@ import react.RHandler
 import react.dom.WithClassName
 
 // https://github.com/JetBrains/ring-ui/blob/master/components/button/button.js
-external interface ButtonProps : WithClassName {
-    var theme: String
-    var active: Boolean
-    var danger: Boolean
-    var delayed: Boolean
-    var loader: Boolean
-    var primary: Boolean
+public external interface ButtonProps : WithClassName {
+    public var theme: String
+    public var active: Boolean
+    public var danger: Boolean
+    public var delayed: Boolean
+    public var loader: Boolean
+    public var primary: Boolean
 
-    var short: Boolean
-    var text: Boolean
-    var inline: Boolean
-    var dropdown: Boolean
+    public var short: Boolean
+    public var text: Boolean
+    public var inline: Boolean
+    public var dropdown: Boolean
 
-    var href: String
+    public var href: String
 
-    var icon: dynamic /* string | func */
-    var iconSize: Number
-    var iconClassName: String
+    public var icon: dynamic /* string | func */
+    public var iconSize: Number
+    public var iconClassName: String
 
-    var onMouseDown: (MouseEvent) -> Unit
+    public var onMouseDown: (MouseEvent) -> Unit
 }
 
-fun RBuilder.ringButton(handler: RHandler<ButtonProps>) {
+public fun RBuilder.ringButton(handler: RHandler<ButtonProps>) {
     RingUI.Button {
         handler()
     }
diff --git a/ui/ring/src/main/kotlin/ringui/Dialog.kt b/ui/ring/src/main/kotlin/ringui/Dialog.kt
index 6ef54bf5..90ac16b9 100644
--- a/ui/ring/src/main/kotlin/ringui/Dialog.kt
+++ b/ui/ring/src/main/kotlin/ringui/Dialog.kt
@@ -5,22 +5,22 @@ import react.RHandler
 import react.dom.WithClassName
 
 // https://github.com/JetBrains/ring-ui/blob/master/components/dialog/dialog.js
-external interface DialogProps : WithClassName {
-    var contentClassName: String
-    var show: Boolean
-    var showCloseButton: Boolean
-    var onOverlayClick: () -> Unit
-    var onEscPress: () -> Unit
-    var onCloseClick: () -> Unit
+public external interface DialogProps : WithClassName {
+    public var contentClassName: String
+    public var show: Boolean
+    public var showCloseButton: Boolean
+    public var onOverlayClick: () -> Unit
+    public var onEscPress: () -> Unit
+    public var onCloseClick: () -> Unit
     // onCloseAttempt is a common callback for ESC pressing and overlay clicking.
     // Use it if you don't need different behaviors for this cases.
-    var onCloseAttempt: () -> Unit
+    public var onCloseAttempt: () -> Unit
     // focusTrap may break popups inside dialog, so use it carefully
-    var trapFocus: Boolean
-    var autoFocusFirst: Boolean
+    public var trapFocus: Boolean
+    public var autoFocusFirst: Boolean
 }
 
-fun RBuilder.ringDialog(show: Boolean, handler: RHandler<DialogProps>) {
+public fun RBuilder.ringDialog(show: Boolean, handler: RHandler<DialogProps>) {
     RingUI.Dialog {
         attrs.show = show
         handler()
diff --git a/ui/ring/src/main/kotlin/ringui/Icon.kt b/ui/ring/src/main/kotlin/ringui/Icon.kt
index 3bb9c640..a8ea7d66 100644
--- a/ui/ring/src/main/kotlin/ringui/Icon.kt
+++ b/ui/ring/src/main/kotlin/ringui/Icon.kt
@@ -5,16 +5,16 @@ import react.RHandler
 import react.dom.WithClassName
 
 // https://github.com/JetBrains/ring-ui/blob/master/components/icon/icon.js
-external interface IconProps : WithClassName {
-    var color: String
-    var glyph: dynamic /* string | func */
-    var height: Number
-    var size: Number
-    var width: Number
-    var loading: Boolean
+public external interface IconProps : WithClassName {
+    public var color: String
+    public var glyph: dynamic /* string | func */
+    public var height: Number
+    public var size: Number
+    public var width: Number
+    public var loading: Boolean
 }
 
-fun RBuilder.ringIcon(handler: RHandler<IconProps>) {
+public fun RBuilder.ringIcon(handler: RHandler<IconProps>) {
     RingUI.Icon {
         handler()
     }
diff --git a/ui/ring/src/main/kotlin/ringui/Link.kt b/ui/ring/src/main/kotlin/ringui/Link.kt
index bd3d7835..c38239d9 100644
--- a/ui/ring/src/main/kotlin/ringui/Link.kt
+++ b/ui/ring/src/main/kotlin/ringui/Link.kt
@@ -6,9 +6,9 @@ import react.RHandler
 import react.dom.WithClassName
 
 // https://github.com/JetBrains/ring-ui/blob/master/components/link/link.js
-external interface LinkProps : WithClassName {
-    var innerClassName: String
-    var active: Boolean
+public external interface LinkProps : WithClassName {
+    public var innerClassName: String
+    public var active: Boolean
     var inherit: Boolean
     var pseudo: Boolean
     var hover: Boolean
diff --git a/ui/ring/src/main/kotlin/ringui/RingUI.kt b/ui/ring/src/main/kotlin/ringui/RingUI.kt
index 7d9a475c..816627de 100644
--- a/ui/ring/src/main/kotlin/ringui/RingUI.kt
+++ b/ui/ring/src/main/kotlin/ringui/RingUI.kt
@@ -4,11 +4,11 @@ import react.RClass
 import ringui.header.HeaderProps
 
 @JsModule("@jetbrains/ring-ui")
-external object RingUI {
-    val Alert: RClass<AlertProps>
-    val Button: RClass<ButtonProps>
-    val Dialog: RClass<DialogProps>
-    val Header: RClass<HeaderProps>
-    val Link: RClass<LinkProps>
-    val Icon: RClass<IconProps>
+public external object RingUI {
+    public val Alert: RClass<AlertProps>
+    public val Button: RClass<ButtonProps>
+    public val Dialog: RClass<DialogProps>
+    public val Header: RClass<HeaderProps>
+    public val Link: RClass<LinkProps>
+    public val Icon: RClass<IconProps>
 }
diff --git a/ui/ring/src/main/kotlin/ringui/UserCard.kt b/ui/ring/src/main/kotlin/ringui/UserCard.kt
index 97f5192f..89ab105a 100644
--- a/ui/ring/src/main/kotlin/ringui/UserCard.kt
+++ b/ui/ring/src/main/kotlin/ringui/UserCard.kt
@@ -11,12 +11,12 @@ private external object UserCardModule {
 }
 
 // https://github.com/JetBrains/ring-ui/blob/master/components/user-card/card.js
-external interface UserCardProps : RProps {
-    var user: UserCardModel
-    var wording: UserCardWording
+public external interface UserCardProps : RProps {
+    public var user: UserCardModel
+    public var wording: UserCardWording
 }
 
-data class UserCardModel(
+public data class UserCardModel(
     val name: String,
     val login: String,
     val avatarUrl: String,
@@ -24,13 +24,13 @@ data class UserCardModel(
     val href: String? = null
 )
 
-data class UserCardWording(
+public data class UserCardWording(
     val banned: String,
     val online: String,
     val offline: String
 )
 
-fun RBuilder.ringUserCard(user: UserCardModel, handler: RHandler<UserCardProps> = {}) {
+public fun RBuilder.ringUserCard(user: UserCardModel, handler: RHandler<UserCardProps> = {}) {
     UserCardModule.UserCard {
         attrs.user = user
         handler()
diff --git a/ui/ring/src/main/kotlin/ringui/header/Header.kt b/ui/ring/src/main/kotlin/ringui/header/Header.kt
index a9c9b1d6..379e2539 100644
--- a/ui/ring/src/main/kotlin/ringui/header/Header.kt
+++ b/ui/ring/src/main/kotlin/ringui/header/Header.kt
@@ -19,12 +19,12 @@ internal external object HeaderModule {
 }
 
 // https://github.com/JetBrains/ring-ui/blob/master/components/header/header.js
-external interface HeaderProps : WithClassName {
-    var spaced: Boolean
-    var theme: String
+public external interface HeaderProps : WithClassName {
+    public var spaced: Boolean
+    public var theme: String
 }
 
-fun RBuilder.ringHeader(handler: RHandler<HeaderProps>) {
+public fun RBuilder.ringHeader(handler: RHandler<HeaderProps>) {
     RingUI.Header {
         handler()
     }
diff --git a/ui/ring/src/main/kotlin/ringui/header/Logo.kt b/ui/ring/src/main/kotlin/ringui/header/Logo.kt
index f6fd40de..5773517d 100644
--- a/ui/ring/src/main/kotlin/ringui/header/Logo.kt
+++ b/ui/ring/src/main/kotlin/ringui/header/Logo.kt
@@ -6,15 +6,15 @@ import react.RHandler
 import ringui.IconProps
 import styled.StyledDOMBuilder
 
-external interface HeaderLogoProps : IconProps
+public external interface HeaderLogoProps : IconProps
 
-fun StyledDOMBuilder<A>.ringLogo(handler: RHandler<HeaderLogoProps>) {
+public fun StyledDOMBuilder<A>.ringLogo(handler: RHandler<HeaderLogoProps>) {
     HeaderModule.Logo {
         handler()
     }
 }
 
-fun RElementBuilder<HeaderProps>.ringLogo(handler: RHandler<HeaderLogoProps>) {
+public fun RElementBuilder<HeaderProps>.ringLogo(handler: RHandler<HeaderLogoProps>) {
     HeaderModule.Logo {
         handler()
     }
diff --git a/ui/ring/src/main/kotlin/ringui/header/Tray.kt b/ui/ring/src/main/kotlin/ringui/header/Tray.kt
index cadac0ee..b04e96a7 100644
--- a/ui/ring/src/main/kotlin/ringui/header/Tray.kt
+++ b/ui/ring/src/main/kotlin/ringui/header/Tray.kt
@@ -6,20 +6,20 @@ import react.dom.WithClassName
 import ringui.ButtonProps
 
 // https://github.com/JetBrains/ring-ui/blob/master/components/header/tray.js
-external interface HeaderTrayProps : WithClassName
+public external interface HeaderTrayProps : WithClassName
 
 // https://github.com/JetBrains/ring-ui/blob/master/components/header/tray-icon.js
-external interface HeaderTrayIconProps : ButtonProps {
-    var rotatable: Boolean
+public external interface HeaderTrayIconProps : ButtonProps {
+    public var rotatable: Boolean
 }
 
-fun RElementBuilder<HeaderProps>.ringTray(handler: RHandler<HeaderTrayProps>) {
+public fun RElementBuilder<HeaderProps>.ringTray(handler: RHandler<HeaderTrayProps>) {
     HeaderModule.Tray {
         handler()
     }
 }
 
-fun RElementBuilder<HeaderTrayProps>.ringTrayIcon(handler: RHandler<WithClassName>) {
+public fun RElementBuilder<HeaderTrayProps>.ringTrayIcon(handler: RHandler<WithClassName>) {
     HeaderModule.TrayIcon {
         handler()
     }
diff --git a/ui/ring/src/main/kotlin/ringui/island/Content.kt b/ui/ring/src/main/kotlin/ringui/island/Content.kt
index d183f702..63124dc2 100644
--- a/ui/ring/src/main/kotlin/ringui/island/Content.kt
+++ b/ui/ring/src/main/kotlin/ringui/island/Content.kt
@@ -5,15 +5,15 @@ import react.RHandler
 import react.dom.WithClassName
 
 // https://github.com/JetBrains/ring-ui/blob/master/components/island/content.js
-external interface IslandContentProps : WithClassName {
-    var scrollableWrapperClassName: String
-    var fade: Boolean
-    var bottomBorder: Boolean
-    var onScroll: () -> Unit
-    var onScrollToBottom: () -> Unit
+public external interface IslandContentProps : WithClassName {
+    public var scrollableWrapperClassName: String
+    public var fade: Boolean
+    public var bottomBorder: Boolean
+    public var onScroll: () -> Unit
+    public var onScrollToBottom: () -> Unit
 }
 
-fun RElementBuilder<IslandProps>.ringIslandContent(handler: RHandler<IslandContentProps>) {
+public fun RElementBuilder<IslandProps>.ringIslandContent(handler: RHandler<IslandContentProps>) {
     IslandModule.Content {
         handler()
     }
diff --git a/ui/ring/src/main/kotlin/ringui/island/Header.kt b/ui/ring/src/main/kotlin/ringui/island/Header.kt
index 952a3cfc..1a970d89 100644
--- a/ui/ring/src/main/kotlin/ringui/island/Header.kt
+++ b/ui/ring/src/main/kotlin/ringui/island/Header.kt
@@ -5,13 +5,13 @@ import react.RHandler
 import react.dom.WithClassName
 
 // https://github.com/JetBrains/ring-ui/blob/master/components/island/header.js
-external interface IslandHeaderProps : WithClassName {
-    var border: Boolean
-    var wrapWithTitle: Boolean
-    var phase: Number
+public external interface IslandHeaderProps : WithClassName {
+    public var border: Boolean
+    public var wrapWithTitle: Boolean
+    public var phase: Number
 }
 
-fun RElementBuilder<IslandProps>.ringIslandHeader(handler: RHandler<IslandHeaderProps>) {
+public fun RElementBuilder<IslandProps>.ringIslandHeader(handler: RHandler<IslandHeaderProps>) {
     IslandModule.Header {
         handler()
     }
diff --git a/ui/ring/src/main/kotlin/ringui/island/Island.kt b/ui/ring/src/main/kotlin/ringui/island/Island.kt
index 1e02e892..7699f66b 100644
--- a/ui/ring/src/main/kotlin/ringui/island/Island.kt
+++ b/ui/ring/src/main/kotlin/ringui/island/Island.kt
@@ -14,18 +14,18 @@ internal external object IslandModule {
 }
 
 // https://github.com/JetBrains/ring-ui/blob/master/components/island/island.js
-external interface IslandProps : WithClassName {
-    val narrow: Boolean
-    val withoutPaddings: Boolean
+public external interface IslandProps : WithClassName {
+    public val narrow: Boolean
+    public val withoutPaddings: Boolean
 }
 
-fun RBuilder.ringIsland(handler: RHandler<IslandProps>) {
+public fun RBuilder.ringIsland(handler: RHandler<IslandProps>) {
     IslandModule.default {
         handler()
     }
 }
 
-fun RBuilder.ringAdaptiveIsland(handler: RHandler<IslandProps>) {
+public fun RBuilder.ringAdaptiveIsland(handler: RHandler<IslandProps>) {
     IslandModule.AdaptiveIsland {
         handler()
     }
diff --git a/ui/ring/webpack.config.d/01.ring.js b/ui/ring/webpack.config.d/01.ring.js
index 549b6c50..868fde03 100644
--- a/ui/ring/webpack.config.d/01.ring.js
+++ b/ui/ring/webpack.config.d/01.ring.js
@@ -1,7 +1,6 @@
 // wrap is useful, because declaring variables in module can be already declared
 // module creates own lexical environment
-;(function (config) {
+(function (config) {
     const ringConfig = require('@jetbrains/ring-ui/webpack.config').config;
-
     config.module.rules.push(...ringConfig.module.rules);
 })(config);
\ No newline at end of file
diff --git a/ui/ring/webpack.config.d/02.svg.js b/ui/ring/webpack.config.d/02.svg.js
deleted file mode 100644
index df178fd3..00000000
--- a/ui/ring/webpack.config.d/02.svg.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// wrap is useful, because declaring variables in module can be already declared
-// module creates own lexical environment
-;(function (config) {
-    const path = require("path");
-    config.module.rules.push(
-        {
-            test: /\.svg$/,
-            loader: "svg-inline-loader",
-            options: {removeSVGTagAttrs: false},
-            include: [
-                path.resolve(require.resolve("@jetbrains/logos"), "..", "..")
-            ]
-        }
-    );
-})(config);
\ No newline at end of file

From e615fcc2bcdb82931790f43862f01577c261dafe Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 9 May 2021 15:49:18 +0300
Subject: [PATCH 111/151] Fix build for ring-UI

---
 demo/gdml/build.gradle.kts                    |  10 ++
 .../visionforge/gdml/demo/GDMLAppComponent.kt |  12 +-
 demo/gdml/webpack.config.d/01.ring.js         |   3 +
 demo/gdml/webpack.config.d/02.boostrap.js     |   7 +
 .../visionforge/react/PropertyEditor.kt       |   1 -
 ui/ring/build.gradle.kts                      |   9 ++
 ui/ring/src/main/kotlin/ringui/Alert.kt       |  10 +-
 ui/ring/src/main/kotlin/ringui/Link.kt        |  14 +-
 .../src/main/kotlin/ringui/island/Island.kt   |  10 ++
 .../src/main/kotlin/ringui/tabs/SmartTabs.kt  |  21 +++
 ui/ring/src/main/kotlin/ringui/tabs/Tabs.kt   |  50 ++++++
 .../ringPropertyEditor.kt                     |  75 +++++++++
 .../ringThreeControls.kt                      | 150 ++++++++++++++++++
 ui/ring/webpack.config.d/01.ring.js           |   9 +-
 .../solid/VisualObjectFXBinding.kt            |  29 ++--
 15 files changed, 366 insertions(+), 44 deletions(-)
 create mode 100644 demo/gdml/webpack.config.d/01.ring.js
 create mode 100644 demo/gdml/webpack.config.d/02.boostrap.js
 create mode 100644 ui/ring/src/main/kotlin/ringui/tabs/SmartTabs.kt
 create mode 100644 ui/ring/src/main/kotlin/ringui/tabs/Tabs.kt
 create mode 100644 ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt
 create mode 100644 ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt

diff --git a/demo/gdml/build.gradle.kts b/demo/gdml/build.gradle.kts
index e4fef51e..cf9d8eb3 100644
--- a/demo/gdml/build.gradle.kts
+++ b/demo/gdml/build.gradle.kts
@@ -16,6 +16,15 @@ kotlin {
     jvm {
         withJava()
     }
+    js{
+        useCommonJs()
+        browser {
+            commonWebpackConfig {
+                sourceMaps = false
+                cssSupport.enabled = false
+            }
+        }
+    }
     sourceSets {
         commonMain {
             dependencies {
@@ -31,6 +40,7 @@ kotlin {
         jsMain {
             dependencies {
                 implementation(project(":ui:bootstrap"))
+                implementation(project(":ui:ring"))
                 implementation(project(":visionforge-threejs"))
                 implementation(npm("react-file-drop", "3.0.6"))
             }
diff --git a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
index 60e676a0..2122e8bd 100644
--- a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
@@ -14,10 +14,10 @@ import space.kscience.gdml.decodeFromString
 import space.kscience.visionforge.Vision
 import space.kscience.visionforge.bootstrap.gridRow
 import space.kscience.visionforge.bootstrap.nameCrumbs
-import space.kscience.visionforge.bootstrap.threeControls
 import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.react.ThreeCanvasComponent
 import space.kscience.visionforge.react.flexColumn
+import space.kscience.visionforge.ring.ringThreeControls
 import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.Solids
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
@@ -31,14 +31,6 @@ external interface GDMLAppProps : RProps {
     var selected: Name?
 }
 
-//private val canvasConfig = Canvas3DOptions {
-//    camera = Camera {
-//        distance = 2100.0
-//        latitude = PI / 6
-//        azimuth = PI + PI / 6
-//    }
-//}
-
 @JsExport
 val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
     var selected by useState { props.selected }
@@ -120,7 +112,7 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
                 }
             }
             canvas?.let {
-                threeControls(it, selected, onSelect)
+                ringThreeControls(it, selected, onSelect)
             }
         }
     }
diff --git a/demo/gdml/webpack.config.d/01.ring.js b/demo/gdml/webpack.config.d/01.ring.js
new file mode 100644
index 00000000..41da041c
--- /dev/null
+++ b/demo/gdml/webpack.config.d/01.ring.js
@@ -0,0 +1,3 @@
+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/demo/gdml/webpack.config.d/02.boostrap.js b/demo/gdml/webpack.config.d/02.boostrap.js
new file mode 100644
index 00000000..e1d53b36
--- /dev/null
+++ b/demo/gdml/webpack.config.d/02.boostrap.js
@@ -0,0 +1,7 @@
+config.module.rules.push({
+    test: /\.css$/,
+    include: [
+        require.resolve('bootstrap/dist/css/bootstrap.min.css')
+    ],
+    use: ['style-loader', 'css-loader']
+});
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
index 34fcf78b..8052d576 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
@@ -49,7 +49,6 @@ public external interface PropertyEditorProps : RProps {
      */
     public var descriptor: NodeDescriptor?
 
-
     /**
      * A coroutine scope for updates
      */
diff --git a/ui/ring/build.gradle.kts b/ui/ring/build.gradle.kts
index bb80da8f..5bd5817c 100644
--- a/ui/ring/build.gradle.kts
+++ b/ui/ring/build.gradle.kts
@@ -7,6 +7,11 @@ val dataforgeVersion: String by rootProject.extra
 kotlin{
     js{
         useCommonJs()
+        browser {
+            commonWebpackConfig {
+                cssSupport.enabled = false
+            }
+        }
     }
 }
 
@@ -15,4 +20,8 @@ dependencies{
 
     implementation(npm("@jetbrains/icons", "3.14.1"))
     implementation(npm("@jetbrains/ring-ui", "4.0.7"))
+    implementation(npm("core-js","3.12.1"))
+    compileOnly(npm("url-loader","4.1.1"))
+    compileOnly(npm("postcss-loader","5.2.0"))
+    compileOnly(npm("source-map-loader","2.0.1"))
 }
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/Alert.kt b/ui/ring/src/main/kotlin/ringui/Alert.kt
index 2f5c4b8b..05cebfe0 100644
--- a/ui/ring/src/main/kotlin/ringui/Alert.kt
+++ b/ui/ring/src/main/kotlin/ringui/Alert.kt
@@ -20,11 +20,11 @@ public external interface AlertProps : WithClassName {
 public typealias AlertType = String
 
 public object AlertTypes {
-    public var ERROR = "error"
-    public var MESSAGE = "message"
-    public var SUCCESS = "success"
-    public var WARNING = "warning"
-    public var LOADING = "loading"
+    public var ERROR: String = "error"
+    public var MESSAGE: String = "message"
+    public var SUCCESS: String = "success"
+    public var WARNING: String = "warning"
+    public var LOADING: String = "loading"
 }
 
 public fun RBuilder.ringAlert(handler: RHandler<AlertProps>) {
diff --git a/ui/ring/src/main/kotlin/ringui/Link.kt b/ui/ring/src/main/kotlin/ringui/Link.kt
index c38239d9..7688c5ce 100644
--- a/ui/ring/src/main/kotlin/ringui/Link.kt
+++ b/ui/ring/src/main/kotlin/ringui/Link.kt
@@ -9,15 +9,15 @@ import react.dom.WithClassName
 public external interface LinkProps : WithClassName {
     public var innerClassName: String
     public var active: Boolean
-    var inherit: Boolean
-    var pseudo: Boolean
-    var hover: Boolean
-    var href: String
-    var onPlainLeftClick: (MouseEvent) -> Unit
-    var onClick: (MouseEvent) -> Unit
+    public var inherit: Boolean
+    public var pseudo: Boolean
+    public var hover: Boolean
+    public var href: String
+    public var onPlainLeftClick: (MouseEvent) -> Unit
+    public var onClick: (MouseEvent) -> Unit
 }
 
-fun RBuilder.ringLink(handler: RHandler<LinkProps>) {
+public fun RBuilder.ringLink(handler: RHandler<LinkProps>) {
     RingUI.Link {
         handler()
     }
diff --git a/ui/ring/src/main/kotlin/ringui/island/Island.kt b/ui/ring/src/main/kotlin/ringui/island/Island.kt
index 7699f66b..300faefa 100644
--- a/ui/ring/src/main/kotlin/ringui/island/Island.kt
+++ b/ui/ring/src/main/kotlin/ringui/island/Island.kt
@@ -25,6 +25,16 @@ public fun RBuilder.ringIsland(handler: RHandler<IslandProps>) {
     }
 }
 
+public fun RBuilder.ringIsland(header: String, handler: RHandler<IslandContentProps>) {
+    ringIsland {
+        ringIslandHeader {
+            +header
+        }
+        ringIslandContent(handler)
+    }
+}
+
+
 public fun RBuilder.ringAdaptiveIsland(handler: RHandler<IslandProps>) {
     IslandModule.AdaptiveIsland {
         handler()
diff --git a/ui/ring/src/main/kotlin/ringui/tabs/SmartTabs.kt b/ui/ring/src/main/kotlin/ringui/tabs/SmartTabs.kt
new file mode 100644
index 00000000..574224ef
--- /dev/null
+++ b/ui/ring/src/main/kotlin/ringui/tabs/SmartTabs.kt
@@ -0,0 +1,21 @@
+package ringui.tabs
+
+import react.RBuilder
+import react.RHandler
+import react.dom.WithClassName
+
+public external interface SmartTabsProps: WithClassName {
+    public var initSelected: String
+}
+
+
+public fun RBuilder.ringSmartTabs(active: String? = null, handler: RHandler<SmartTabsProps>){
+    TabsModule.SmartTabs{
+        active?.let{
+            attrs {
+                initSelected = active
+            }
+        }
+        handler()
+    }
+}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/tabs/Tabs.kt b/ui/ring/src/main/kotlin/ringui/tabs/Tabs.kt
new file mode 100644
index 00000000..ec30223b
--- /dev/null
+++ b/ui/ring/src/main/kotlin/ringui/tabs/Tabs.kt
@@ -0,0 +1,50 @@
+package ringui.tabs
+
+import react.RBuilder
+import react.RClass
+import react.RHandler
+import react.dom.WithClassName
+
+@JsModule("@jetbrains/ring-ui/components/tabs/tabs")
+internal external object TabsModule {
+    val Tabs: RClass<TabsProps>
+    val Tab: RClass<TabProps>
+    val SmartTabs: RClass<SmartTabsProps>
+    //val CustomItem: RClass<CustomItemProps>
+}
+
+//https://github.com/JetBrains/ring-ui/blob/master/components/tabs/tabs.js
+public external interface TabsProps : WithClassName {
+    public var theme: String
+    public var selected: String
+    public var onSelect: (String) -> Unit
+    public var href: String
+    public var autoCollapse: Boolean
+}
+
+public external interface CustomItemProps : WithClassName
+
+public external interface TabProps : WithClassName {
+    public var title: dynamic // PropTypes.oneOfType([PropTypes.node, PropTypes.func]).isRequired,
+    public var id: String
+}
+
+public fun RBuilder.ringTabs(active: String? = null, handler: RHandler<TabsProps>) {
+    TabsModule.Tabs {
+        active?.let{
+            attrs {
+                selected = active
+            }
+        }
+        handler()
+    }
+}
+
+public fun RBuilder.ringTab(title: dynamic, handler: RHandler<TabProps>) {
+    TabsModule.Tab {
+        attrs {
+            this.title = title
+        }
+        handler()
+    }
+}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt
new file mode 100644
index 00000000..40101c5e
--- /dev/null
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt
@@ -0,0 +1,75 @@
+package space.kscience.visionforge.ring
+
+import org.w3c.dom.Element
+import react.RBuilder
+import react.dom.render
+import ringui.island.ringIsland
+import ringui.island.ringIslandContent
+import ringui.island.ringIslandHeader
+import ringui.tabs.ringSmartTabs
+import ringui.tabs.ringTab
+import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.visionforge.*
+import space.kscience.visionforge.react.metaViewer
+import space.kscience.visionforge.react.propertyEditor
+import space.kscience.visionforge.solid.SolidReference
+
+public fun RBuilder.ringPropertyEditor(
+    vision: Vision,
+    descriptor: NodeDescriptor? = vision.descriptor,
+    key: Any? = null,
+) {
+
+    ringIsland {
+        ringIslandHeader {
+            attrs {
+                border = true
+            }
+            +"Properties"
+        }
+        ringIslandContent {
+            propertyEditor(
+                ownProperties = vision.ownProperties,
+                allProperties = vision.allProperties(),
+                updateFlow = vision.propertyChanges,
+                descriptor = descriptor,
+                key = key
+            )
+        }
+    }
+    val styles = if (vision is SolidReference) {
+        (vision.styles + vision.prototype.styles).distinct()
+    } else {
+        vision.styles
+    }
+    if (styles.isNotEmpty()) {
+        ringIsland {
+            ringIslandHeader {
+                attrs {
+                    border = true
+                }
+                +"Styles"
+            }
+            ringIslandContent {
+                ringSmartTabs {
+
+                }
+                styles.forEach { styleName ->
+                    val style = vision.getStyle(styleName)
+                    if (style != null) {
+                        ringTab(styleName) {
+                            metaViewer(style)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+public fun Element.ringPropertyEditor(
+    item: Vision,
+    descriptor: NodeDescriptor? = item.descriptor,
+): Unit = render(this) {
+    ringPropertyEditor(item, descriptor = descriptor)
+}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
new file mode 100644
index 00000000..63722265
--- /dev/null
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
@@ -0,0 +1,150 @@
+package space.kscience.visionforge.ring
+
+import kotlinx.css.*
+import kotlinx.css.properties.border
+import kotlinx.html.js.onClickFunction
+import org.w3c.dom.events.Event
+import org.w3c.files.Blob
+import org.w3c.files.BlobPropertyBag
+import react.*
+import react.dom.button
+import react.dom.h2
+import ringui.island.ringIsland
+import ringui.tabs.ringSmartTabs
+import ringui.tabs.ringTab
+import space.kscience.dataforge.meta.descriptors.defaultMeta
+import space.kscience.dataforge.meta.withDefault
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.isEmpty
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.VisionGroup
+import space.kscience.visionforge.react.flexColumn
+import space.kscience.visionforge.react.flexRow
+import space.kscience.visionforge.react.objectTree
+import space.kscience.visionforge.react.propertyEditor
+import space.kscience.visionforge.solid.SolidGroup
+import space.kscience.visionforge.solid.specifications.Canvas3DOptions
+import space.kscience.visionforge.solid.three.ThreeCanvas
+import styled.css
+import styled.styledDiv
+
+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(canvas: ThreeCanvas): ReactElement {
+    return child(CanvasControls) {
+        attrs {
+            this.canvas = canvas
+        }
+    }
+}
+
+internal external interface CanvasControlsProps : RProps {
+    public var canvas: ThreeCanvas
+}
+
+internal val CanvasControls: FunctionalComponent<CanvasControlsProps> = functionalComponent("CanvasControls") { props ->
+    val visionManager = useMemo(
+        { props.canvas.three.solids.visionManager },
+        arrayOf(props.canvas)
+    )
+    flexColumn {
+        flexRow {
+            css {
+                border(1.px, BorderStyle.solid, Color.blue)
+                padding(4.px)
+            }
+            button {
+                +"Export"
+                attrs {
+                    onClickFunction = {
+                        val json = (props.canvas.content as? SolidGroup)?.let { group ->
+                            visionManager.encodeToString(group)
+                        }
+                        if (json != null) {
+                            saveData(it, "object.json", "text/json") {
+                                json
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        propertyEditor(
+            ownProperties = props.canvas.options,
+            allProperties = props.canvas.options.withDefault(Canvas3DOptions.descriptor.defaultMeta()),
+            descriptor = Canvas3DOptions.descriptor,
+            expanded = false
+        )
+
+    }
+}
+
+
+public external interface ThreeControlsProps : RProps {
+    public var canvas: ThreeCanvas
+    public var selected: Name?
+    public var onSelect: (Name) -> Unit
+}
+
+@JsExport
+public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalComponent { props ->
+    val vision = props.canvas.content
+    ringSmartTabs(if (props.selected != null) "Properties" else null) {
+        ringTab("Canvas") {
+            ringIsland("Canvas configuration") {
+                canvasControls(props.canvas)
+            }
+        }
+        ringTab("Tree") {
+            styledDiv {
+                css {
+                    border(1.px, BorderStyle.solid, Color.lightGray)
+                    padding(10.px)
+                }
+                h2 { +"Object tree" }
+                styledDiv {
+                    css {
+                        flex(1.0, 1.0, FlexBasis.inherit)
+                    }
+                    props.canvas.content?.let {
+                        objectTree(it, props.selected, props.onSelect)
+                    }
+                }
+            }
+        }
+        ringTab("Properties") {
+            props.selected.let { selected ->
+                val selectedObject: Vision? = when {
+                    selected == null -> null
+                    selected.isEmpty() -> vision
+                    else -> (vision as? VisionGroup)?.get(selected)
+                }
+                if (selectedObject != null) {
+                    ringPropertyEditor(selectedObject, key = selected)
+                }
+            }
+        }
+        props.children()
+    }
+}
+
+public fun RBuilder.ringThreeControls(
+    canvas: ThreeCanvas,
+    selected: Name?,
+    onSelect: (Name) -> Unit = {},
+    builder: RBuilder.() -> Unit = {},
+): ReactElement = child(ThreeControls) {
+    attrs {
+        this.canvas = canvas
+        this.selected = selected
+        this.onSelect = onSelect
+    }
+    builder()
+}
\ 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
index 868fde03..41da041c 100644
--- a/ui/ring/webpack.config.d/01.ring.js
+++ b/ui/ring/webpack.config.d/01.ring.js
@@ -1,6 +1,3 @@
-// wrap is useful, because declaring variables in module can be already declared
-// module creates own lexical environment
-(function (config) {
-    const ringConfig = require('@jetbrains/ring-ui/webpack.config').config;
-    config.module.rules.push(...ringConfig.module.rules);
-})(config);
\ No newline at end of file
+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/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/VisualObjectFXBinding.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/VisualObjectFXBinding.kt
index 5ab8fa70..5045a375 100644
--- a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/VisualObjectFXBinding.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/VisualObjectFXBinding.kt
@@ -1,8 +1,7 @@
 package space.kscience.visionforge.solid
 
 import javafx.application.Platform
-import javafx.beans.binding.Binding
-import javafx.beans.binding.ObjectBinding
+import javafx.beans.binding.*
 import space.kscience.dataforge.meta.*
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.startsWith
@@ -46,18 +45,18 @@ public class VisualObjectFXBinding(public val fx: FX3DPlugin, public val obj: Vi
 }
 
 public fun ObjectBinding<MetaItem?>.value(): Binding<Value?> = objectBinding { it.value }
-fun ObjectBinding<MetaItem?>.string() = stringBinding { it.string }
-fun ObjectBinding<MetaItem?>.number() = objectBinding { it.number }
-fun ObjectBinding<MetaItem?>.double() = objectBinding { it.double }
-fun ObjectBinding<MetaItem?>.float() = objectBinding { it.float }
-fun ObjectBinding<MetaItem?>.int() = objectBinding { it.int }
-fun ObjectBinding<MetaItem?>.long() = objectBinding { it.long }
-fun ObjectBinding<MetaItem?>.node() = objectBinding { it.node }
+public fun ObjectBinding<MetaItem?>.string(): StringBinding = stringBinding { it.string }
+public fun ObjectBinding<MetaItem?>.number(): Binding<Number?> = objectBinding { it.number }
+public fun ObjectBinding<MetaItem?>.double(): Binding<Double?> = objectBinding { it.double }
+public fun ObjectBinding<MetaItem?>.float(): Binding<Float?> = objectBinding { it.float }
+public fun ObjectBinding<MetaItem?>.int(): Binding<Int?> = objectBinding { it.int }
+public fun ObjectBinding<MetaItem?>.long(): Binding<Long?> = objectBinding { it.long }
+public fun ObjectBinding<MetaItem?>.node(): Binding<Meta?> = objectBinding { it.node }
 
-fun ObjectBinding<MetaItem?>.string(default: String) = stringBinding { it.string ?: default }
-fun ObjectBinding<MetaItem?>.double(default: Double) = doubleBinding { it.double ?: default }
-fun ObjectBinding<MetaItem?>.float(default: Float) = floatBinding { it.float ?: default }
-fun ObjectBinding<MetaItem?>.int(default: Int) = integerBinding { it.int ?: default }
-fun ObjectBinding<MetaItem?>.long(default: Long) = longBinding { it.long ?: default }
+public fun ObjectBinding<MetaItem?>.string(default: String): StringBinding = stringBinding { it.string ?: default }
+public fun ObjectBinding<MetaItem?>.double(default: Double): DoubleBinding = doubleBinding { it.double ?: default }
+public fun ObjectBinding<MetaItem?>.float(default: Float): FloatBinding = floatBinding { it.float ?: default }
+public fun ObjectBinding<MetaItem?>.int(default: Int): IntegerBinding = integerBinding { it.int ?: default }
+public fun ObjectBinding<MetaItem?>.long(default: Long): LongBinding = longBinding { it.long ?: default }
 
-fun <T> ObjectBinding<MetaItem?>.transform(transform: (MetaItem) -> T) = objectBinding { it?.let(transform) }
+public fun <T> ObjectBinding<MetaItem?>.transform(transform: (MetaItem) -> T): Binding<T?> = objectBinding { it?.let(transform) }

From b8fadb06b56c73f0a50029839b77d9812ea6da56 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 9 May 2021 15:56:15 +0300
Subject: [PATCH 112/151] Fix style display

---
 .../src/main/kotlin/ringui/island/Island.kt   |  3 ++
 .../ringPropertyEditor.kt                     | 37 +++++++------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/ui/ring/src/main/kotlin/ringui/island/Island.kt b/ui/ring/src/main/kotlin/ringui/island/Island.kt
index 300faefa..03530902 100644
--- a/ui/ring/src/main/kotlin/ringui/island/Island.kt
+++ b/ui/ring/src/main/kotlin/ringui/island/Island.kt
@@ -28,6 +28,9 @@ public fun RBuilder.ringIsland(handler: RHandler<IslandProps>) {
 public fun RBuilder.ringIsland(header: String, handler: RHandler<IslandContentProps>) {
     ringIsland {
         ringIslandHeader {
+            attrs{
+                border = true
+            }
             +header
         }
         ringIslandContent(handler)
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt
index 40101c5e..680bc6bf 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt
@@ -20,22 +20,14 @@ public fun RBuilder.ringPropertyEditor(
     key: Any? = null,
 ) {
 
-    ringIsland {
-        ringIslandHeader {
-            attrs {
-                border = true
-            }
-            +"Properties"
-        }
-        ringIslandContent {
-            propertyEditor(
-                ownProperties = vision.ownProperties,
-                allProperties = vision.allProperties(),
-                updateFlow = vision.propertyChanges,
-                descriptor = descriptor,
-                key = key
-            )
-        }
+    ringIsland("Properties") {
+        propertyEditor(
+            ownProperties = vision.ownProperties,
+            allProperties = vision.allProperties(),
+            updateFlow = vision.propertyChanges,
+            descriptor = descriptor,
+            key = key
+        )
     }
     val styles = if (vision is SolidReference) {
         (vision.styles + vision.prototype.styles).distinct()
@@ -52,13 +44,12 @@ public fun RBuilder.ringPropertyEditor(
             }
             ringIslandContent {
                 ringSmartTabs {
-
-                }
-                styles.forEach { styleName ->
-                    val style = vision.getStyle(styleName)
-                    if (style != null) {
-                        ringTab(styleName) {
-                            metaViewer(style)
+                    styles.forEach { styleName ->
+                        val style = vision.getStyle(styleName)
+                        if (style != null) {
+                            ringTab(styleName) {
+                                metaViewer(style)
+                            }
                         }
                     }
                 }

From 5afa9117c46a6ee9395a45178fa0292956cf7c3a Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 9 May 2021 22:40:30 +0300
Subject: [PATCH 113/151] Improve dancing boxes performance. A lot.

---
 build.gradle.kts                              |  2 +-
 .../visionforge/solid/demo/ThreeDemoApp.kt    |  2 +-
 .../visionforge/solid/demo/VariableBox.kt     | 75 +++++++------------
 .../visionforge/bootstrap/outputConfig.kt     | 75 +------------------
 .../kscience/visionforge/react/MetaViewer.kt  |  3 +-
 .../ringThreeControls.kt                      |  3 +-
 .../space/kscience/visionforge/StyleSheet.kt  |  4 +-
 .../space/kscience/visionforge/VisionBase.kt  | 12 ++-
 .../kotlin/space/kscience/visionforge/misc.kt |  4 +-
 .../visionforge/solid/SolidReference.kt       | 14 ++--
 10 files changed, 48 insertions(+), 146 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 12596ced..9bdf18a6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     id("ru.mipt.npm.gradle.js") apply false
 }
 
-val dataforgeVersion by extra("0.4.0")
+val dataforgeVersion by extra("0.4.1")
 val kotlinWrappersVersion by extra("pre.152-kotlin-1.4.32")
 val fxVersion by extra("11")
 
diff --git a/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoApp.kt b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoApp.kt
index c5d2c2cf..db6ebbff 100644
--- a/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoApp.kt
+++ b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoApp.kt
@@ -23,7 +23,7 @@ private class ThreeDemoApp : Application {
             demo("dynamicBox", "Dancing boxes") {
                 val boxes = (-10..10).flatMap { i ->
                     (-10..10).map { j ->
-                        varBox(10, 10, 0, name = "cell_${i}_${j}") {
+                        varBox(10, 10, name = "cell_${i}_${j}") {
                             x = i * 10
                             y = j * 10
                             value = 128
diff --git a/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt
index b6f0fd5c..e3961775 100644
--- a/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt
+++ b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt
@@ -1,49 +1,37 @@
 package space.kscience.visionforge.solid.demo
 
-import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.geometries.BoxBufferGeometry
 import info.laht.threekt.objects.Mesh
 import space.kscience.dataforge.meta.int
 import space.kscience.dataforge.meta.number
-import space.kscience.dataforge.names.plus
+import space.kscience.dataforge.names.asName
 import space.kscience.dataforge.names.startsWith
 import space.kscience.dataforge.values.asValue
-import space.kscience.visionforge.getProperty
 import space.kscience.visionforge.onPropertyChange
 import space.kscience.visionforge.set
 import space.kscience.visionforge.setProperty
-import space.kscience.visionforge.solid.*
-import space.kscience.visionforge.solid.Solid.Companion.GEOMETRY_KEY
+import space.kscience.visionforge.solid.SolidGroup
+import space.kscience.visionforge.solid.layer
 import space.kscience.visionforge.solid.three.*
 import kotlin.math.max
 
 internal fun SolidGroup.varBox(
     xSize: Number,
     ySize: Number,
-    zSize: Number,
     name: String = "",
     action: VariableBox.() -> Unit = {},
-): VariableBox = VariableBox(xSize, ySize, zSize).apply(action).also { set(name, it) }
+): VariableBox = VariableBox(xSize, ySize).apply(action).also { set(name, it) }
 
-internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeVision() {
-    init {
-        scaleX = xSize
-        scaleY = ySize
-        scaleZ = zSize
-    }
+internal class VariableBox(val xSize: Number, val ySize: Number) : ThreeVision() {
 
     override fun render(three: ThreePlugin): Object3D {
-        val xSize = getProperty(X_SIZE_KEY, false).number?.toDouble() ?: 1.0
-        val ySize = getProperty(Y_SIZE_KEY, false).number?.toDouble() ?: 1.0
-        val zSize = getProperty(Z_SIZE_KEY, false).number?.toDouble() ?: 1.0
-        val geometry = BoxBufferGeometry(1, 1, 1)
+        val geometry = BoxBufferGeometry(xSize, ySize, 1)
 
-        //JS sometimes tries to pass Geometry as BufferGeometry
-        @Suppress("USELESS_IS_CHECK") if (geometry !is BufferGeometry) error("BufferGeometry expected")
+        val material = ThreeMaterials.DEFAULT.clone()
 
-        val mesh = Mesh(geometry, ThreeMaterials.DEFAULT).apply {
-            updateMaterial(this@VariableBox)
+        val mesh = Mesh(geometry, material).apply {
+            //updateMaterial(this@VariableBox)
             applyEdges(this@VariableBox)
             //applyWireFrame(this@VariableBox)
 
@@ -55,21 +43,24 @@ internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeV
                 it.layers.enable(this@VariableBox.layer)
             }
         }
-
-        mesh.scale.set(xSize, ySize, zSize)
+        mesh.scale.z = getOwnProperty(VALUE).number?.toDouble() ?: 1.0
 
         //add listener to object properties
         onPropertyChange(three.context) { name ->
             when {
-                name.startsWith(GEOMETRY_KEY) -> {
-                    val newXSize = getProperty(X_SIZE_KEY, false).number?.toDouble() ?: 1.0
-                    val newYSize = getProperty(Y_SIZE_KEY, false).number?.toDouble() ?: 1.0
-                    val newZSize = getProperty(Z_SIZE_KEY, false).number?.toDouble() ?: 1.0
-                    mesh.scale.set(newXSize, newYSize, newZSize)
+                name == VALUE -> {
+                    val value = getOwnProperty(VALUE).int ?: 0
+                    val size = value.toFloat() / 255f * 20f
+                    mesh.scale.z = size.toDouble()
+                    mesh.position.z = size.toDouble() / 2
+
+                    val b = max(0, 128 - value)
+                    val r = max(0, value - 128)
+                    val g = 255 - b - r
+                    material.color.setRGB(r.toFloat() / 256, g.toFloat() / 256, b.toFloat() / 256)
                     mesh.updateMatrix()
                 }
                 name.startsWith(MeshThreeFactory.EDGES_KEY) -> mesh.applyEdges(this@VariableBox)
-                //name.startsWith(MATERIAL_COLOR_KEY) -> mesh.updateMaterialProperty(this, name)
                 else -> mesh.updateProperty(this@VariableBox, name)
             }
         }
@@ -77,29 +68,17 @@ internal class VariableBox(xSize: Number, ySize: Number, zSize: Number) : ThreeV
         return mesh
     }
 
-    var variableZSize: Number
-        get() = getProperty(Z_SIZE_KEY, false).number ?: 0f
-        set(value) {
-            setProperty(Z_SIZE_KEY, value.asValue())
-        }
-
     var value: Int
-        get() = getProperty("value", false).int ?: 0
+        get() = getOwnProperty(VALUE).int ?: 0
         set(value) {
-            setProperty("value", value.asValue())
-            val size = value.toFloat() / 255f * 20f
-            scaleZ = size
-            z = size / 2
-
-            val b = max(0, 128 - value)
-            val r = max(0, value - 128)
-            val g = 255 - b - r
-            color(r.toUByte(), g.toUByte(), b.toUByte())
+            setProperty(VALUE, value.asValue())
         }
 
     companion object {
-        private val X_SIZE_KEY = GEOMETRY_KEY + "xSize"
-        private val Y_SIZE_KEY = GEOMETRY_KEY + "ySize"
-        private val Z_SIZE_KEY = GEOMETRY_KEY + "zSize"
+        private val VALUE = "value".asName()
+//
+//        private val X_SIZE_KEY = GEOMETRY_KEY + "xSize"
+//        private val Y_SIZE_KEY = GEOMETRY_KEY + "ySize"
+//        private val Z_SIZE_KEY = GEOMETRY_KEY + "zSize"
     }
 }
\ No newline at end of file
diff --git a/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt
index b65b9666..accc68e2 100644
--- a/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt
+++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt
@@ -11,7 +11,6 @@ import org.w3c.files.Blob
 import org.w3c.files.BlobPropertyBag
 import react.*
 import react.dom.button
-import space.kscience.dataforge.meta.descriptors.defaultMeta
 import space.kscience.dataforge.meta.withDefault
 import space.kscience.visionforge.react.flexColumn
 import space.kscience.visionforge.react.flexRow
@@ -71,81 +70,9 @@ public val CanvasControls: FunctionalComponent<CanvasControlsProps> = functional
         }
         propertyEditor(
             ownProperties = props.canvas.options,
-            allProperties = props.canvas.options.withDefault(Canvas3DOptions.descriptor.defaultMeta()),
+            allProperties = props.canvas.options.withDefault(Canvas3DOptions.descriptor.defaultMeta),
             descriptor = Canvas3DOptions.descriptor,
             expanded = false
         )
-
-/*        h3 { +"Axes" }
-        flexRow {
-            css{
-                border(1.px,BorderStyle.solid, Color.blue)
-                padding(4.px)
-            }
-            label("checkbox-inline") {
-                input(type = InputType.checkBox) {
-                    attrs {
-                        defaultChecked = props.canvas.options.axes.visible
-                        onChangeFunction = {
-                            props.canvas.options.axes.visible = (it.target as HTMLInputElement).checked
-                        }
-                    }
-                }
-                +"Axes"
-            }
-        }
-        h3 { +"Export" }
-        flexRow {
-            css{
-                border(1.px,BorderStyle.solid, Color.blue)
-                padding(4.px)
-            }
-            button {
-                +"Export"
-                attrs {
-                    onClickFunction = {
-                        val json = (props.canvas.content as? SolidGroup)?.let { group ->
-                            visionManager.encodeToString(group)
-                        }
-                        if (json != null) {
-                            saveData(it, "object.json", "text/json") {
-                                json
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        h3 { +"Layers" }
-        flexRow {
-            css {
-                flexWrap = FlexWrap.wrap
-                border(1.px,BorderStyle.solid, Color.blue)
-                padding(4.px)
-            }
-            (0..31).forEach { layer ->
-                styledDiv {
-                    css{
-                        padding(4.px)
-                    }
-                    label { +layer.toString() }
-                    input(type = InputType.checkBox) {
-                        attrs {
-                            if (layer == 0) {
-                                defaultChecked = true
-                            }
-                            onChangeFunction = {
-                                if ((it.target as HTMLInputElement).checked) {
-                                    props.canvas.camera.layers.enable(layer)
-                                } else {
-                                    props.canvas.camera.layers.disable(layer)
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
- */
     }
 }
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
index 106ebd8b..58e651d8 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
@@ -9,7 +9,6 @@ import space.kscience.dataforge.meta.MetaItemNode
 import space.kscience.dataforge.meta.MetaItemValue
 import space.kscience.dataforge.meta.descriptors.ItemDescriptor
 import space.kscience.dataforge.meta.descriptors.NodeDescriptor
-import space.kscience.dataforge.meta.descriptors.defaultItem
 import space.kscience.dataforge.meta.descriptors.get
 import space.kscience.dataforge.meta.get
 import space.kscience.dataforge.names.Name
@@ -43,7 +42,7 @@ private fun RBuilder.metaViewerItem(props: MetaViewerProps) {
     var expanded: Boolean by useState { true }
     val item = props.root[props.name]
     val descriptorItem: ItemDescriptor? = props.descriptor?.get(props.name)
-    val actualItem = item ?: descriptorItem?.defaultItem()
+    val actualItem = item ?: descriptorItem?.defaultValue
 
     val token = props.name.lastOrNull()?.toString() ?: "Meta"
 
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
index 63722265..431fc2d6 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
@@ -12,7 +12,6 @@ import react.dom.h2
 import ringui.island.ringIsland
 import ringui.tabs.ringSmartTabs
 import ringui.tabs.ringTab
-import space.kscience.dataforge.meta.descriptors.defaultMeta
 import space.kscience.dataforge.meta.withDefault
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.isEmpty
@@ -78,7 +77,7 @@ internal val CanvasControls: FunctionalComponent<CanvasControlsProps> = function
         }
         propertyEditor(
             ownProperties = props.canvas.options,
-            allProperties = props.canvas.options.withDefault(Canvas3DOptions.descriptor.defaultMeta()),
+            allProperties = props.canvas.options.withDefault(Canvas3DOptions.descriptor.defaultMeta),
             descriptor = Canvas3DOptions.descriptor,
             expanded = false
         )
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleSheet.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleSheet.kt
index 2e688667..655cb0f3 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleSheet.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/StyleSheet.kt
@@ -98,8 +98,8 @@ public tailrec fun Vision.getStyle(name: String): Meta? =
 /**
  * Resolve an item in all style layers
  */
-public fun Vision.getStyleItems(name: Name): Sequence<MetaItem> = styles.asSequence().map {
+public fun Vision.getStyleItems(name: Name): List<MetaItem> = styles.mapNotNull {
     getStyle(it)[name]
-}.filterNotNull()
+}
 
 
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
index 8b15493f..651de863 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
@@ -10,8 +10,6 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import space.kscience.dataforge.meta.*
 import space.kscience.dataforge.meta.descriptors.NodeDescriptor
-import space.kscience.dataforge.meta.descriptors.defaultItem
-import space.kscience.dataforge.meta.descriptors.get
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.asName
@@ -66,16 +64,16 @@ public open class VisionBase(
     ): MetaItem? = if (!inherit && !includeStyles && !includeDefaults) {
         getOwnProperty(name)
     } else {
-        sequence {
-            yield(getOwnProperty(name))
+        buildList {
+            add(getOwnProperty(name))
             if (includeStyles) {
-                yieldAll(getStyleItems(name))
+                addAll(getStyleItems(name))
             }
             if (inherit) {
-                yield(parent?.getProperty(name, inherit, includeStyles, includeDefaults))
+                add(parent?.getProperty(name, inherit, includeStyles, includeDefaults))
             }
             if (includeDefaults) {
-                yield(descriptor?.get(name)?.defaultItem())
+                add(descriptor?.defaultMeta?.get(name))
             }
         }.merge()
     }
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/misc.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/misc.kt
index 8e51e537..f471b234 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/misc.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/misc.kt
@@ -6,12 +6,12 @@ import space.kscience.dataforge.values.asValue
 @DslMarker
 public annotation class VisionBuilder
 
-public fun Sequence<MetaItem?>.merge(): MetaItem? = when (val first = firstOrNull { it != null }) {
+public fun List<MetaItem?>.merge(): MetaItem? = when (val first = firstOrNull { it != null }) {
     null -> null
     is MetaItemValue -> first //fast search for first entry if it is value
     is MetaItemNode -> {
         //merge nodes if first encountered node is meta
-        val laminate: Laminate = Laminate(mapNotNull { it.node }.toList())
+        val laminate: Laminate = Laminate(mapNotNull { it.node })
         MetaItemNode(laminate)
     }
 }
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
index acb0ce88..d5d43100 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
@@ -20,14 +20,14 @@ private fun SolidReference.getRefProperty(
     inherit: Boolean,
     includeStyles: Boolean,
     includeDefaults: Boolean,
-): MetaItem? = sequence {
-    yield(getOwnProperty(name))
+): MetaItem? = buildList {
+    add(getOwnProperty(name))
     if (includeStyles) {
-        yieldAll(getStyleItems(name))
+        addAll(getStyleItems(name))
     }
-    yield(prototype.getProperty(name, inherit, includeStyles, includeDefaults))
+    add(prototype.getProperty(name, inherit, includeStyles, includeDefaults))
     if (inherit) {
-        yield(parent?.getProperty(name, inherit))
+        add(parent?.getProperty(name, inherit))
     }
 }.merge()
 
@@ -45,8 +45,8 @@ public class SolidReferenceGroup(
      */
     override val prototype: Solid
         get() {
-            if(parent == null) error("No parent is present for SolidReferenceGroup")
-            if(parent !is SolidGroup) error("Reference parent is not a group")
+            if (parent == null) error("No parent is present for SolidReferenceGroup")
+            if (parent !is SolidGroup) error("Reference parent is not a group")
             return (parent as? SolidGroup)?.getPrototype(refName)
                 ?: error("Prototype with name $refName not found")
         }

From 1f8700efde6f6cc37eaa819f4db66b48edc352ec Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 10 May 2021 22:07:16 +0300
Subject: [PATCH 114/151] Generalize three with controls

---
 build.gradle.kts                              |  2 +-
 demo/playground/build.gradle.kts              |  7 +-
 .../src/jsMain/kotlin/playgroundMain.kt       |  4 +-
 .../playground/src/jvmMain/kotlin/gdmCurve.kt | 16 +++-
 demo/playground/webpack.config.d/01.ring.js   |  3 +
 .../visionforge-gdml-jupyter/build.gradle.kts |  7 +-
 .../src/jsMain/kotlin/gdmlJupyter.kt          | 23 +----
 .../src/jsMain/kotlin/threeViewer.kt          | 83 ------------------
 .../src/jvmMain/kotlin/GdmlForJupyter.kt      |  3 -
 .../webpack.config.d/01.ring.js               |  3 +
 .../visionforge/react/ThreeCanvasComponent.kt |  3 +
 ui/ring/build.gradle.kts                      |  1 +
 ui/ring/src/main/kotlin/ringui/grid/Col.kt    | 23 +++++
 ui/ring/src/main/kotlin/ringui/grid/Grid.kt   | 20 +++++
 ui/ring/src/main/kotlin/ringui/grid/Row.kt    | 33 +++++++
 .../ThreeViewWithControls.kt                  | 87 +++++++++++++++++++
 .../ThreeWithControls.kt                      | 10 +--
 .../kscience/visionforge/VisionClient.kt      |  5 +-
 .../kscience/visionforge/html/headers.kt      | 13 ++-
 .../visionforge/gdml/GdmlTransformerEnv.kt    | 13 ++-
 visionforge-threejs/build.gradle.kts          |  1 +
 .../visionforge/solid/three/ThreeCanvas.kt    |  1 -
 22 files changed, 231 insertions(+), 130 deletions(-)
 create mode 100644 demo/playground/webpack.config.d/01.ring.js
 delete mode 100644 jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/threeViewer.kt
 create mode 100644 jupyter/visionforge-gdml-jupyter/webpack.config.d/01.ring.js
 create mode 100644 ui/ring/src/main/kotlin/ringui/grid/Col.kt
 create mode 100644 ui/ring/src/main/kotlin/ringui/grid/Grid.kt
 create mode 100644 ui/ring/src/main/kotlin/ringui/grid/Row.kt
 create mode 100644 ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
 rename {jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin => ui/ring/src/main/kotlin/space.kscience.visionforge.ring}/ThreeWithControls.kt (85%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9bdf18a6..65e355ac 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,7 +22,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.2.0-dev-16"
+    version = "0.2.0-dev-17"
 }
 
 subprojects {
diff --git a/demo/playground/build.gradle.kts b/demo/playground/build.gradle.kts
index 733bc7c2..7c99d6fa 100644
--- a/demo/playground/build.gradle.kts
+++ b/demo/playground/build.gradle.kts
@@ -14,10 +14,15 @@ repositories{
 kotlin {
 
     js(IR) {
+        useCommonJs()
         browser {
             webpackTask {
                 this.outputFileName = "js/visionforge-playground.js"
             }
+            commonWebpackConfig {
+                sourceMaps = false
+                cssSupport.enabled = false
+            }
         }
         binaries.executable()
     }
@@ -54,7 +59,7 @@ kotlin {
 
         val jsMain by getting{
             dependencies {
-                api(project(":ui:bootstrap"))
+                implementation(project(":ui:ring"))
                 api(project(":visionforge-threejs"))
             }
         }
diff --git a/demo/playground/src/jsMain/kotlin/playgroundMain.kt b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
index 9ee2dc93..42cb97e2 100644
--- a/demo/playground/src/jsMain/kotlin/playgroundMain.kt
+++ b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
@@ -1,10 +1,10 @@
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.visionforge.plotly.PlotlyPlugin
+import space.kscience.visionforge.ring.ThreeWithControls
 import space.kscience.visionforge.runVisionClient
-import space.kscience.visionforge.solid.three.ThreePlugin
 
 @DFExperimental
 fun main() = runVisionClient {
     plugin(PlotlyPlugin)
-    plugin(ThreePlugin)
+    plugin(ThreeWithControls)
 }
\ No newline at end of file
diff --git a/demo/playground/src/jvmMain/kotlin/gdmCurve.kt b/demo/playground/src/jvmMain/kotlin/gdmCurve.kt
index 2b9aef01..3f7ff281 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmCurve.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmCurve.kt
@@ -3,14 +3,17 @@ package space.kscience.visionforge.examples
 import space.kscience.dataforge.context.Context
 import space.kscience.gdml.*
 import space.kscience.visionforge.gdml.toVision
+import space.kscience.visionforge.html.ResourceLocation
 import space.kscience.visionforge.solid.Solids
+import space.kscience.visionforge.visible
+import java.nio.file.Path
 
 fun main() {
     val context = Context {
         plugin(Solids)
     }
 
-    context.makeVisionFile {
+    context.makeVisionFile(Path.of("curves.html"), resourceLocation = ResourceLocation.EMBED) {
         vision("canvas") {
             Gdml {
                 // geometry variables
@@ -39,7 +42,7 @@ fun main() {
 
                 structure {
                     val worldMaterial = materials.composite("G4_AIR")
-                    val worldBox = solids.box(worldSize, worldSize, worldSize)
+                    val worldBox = solids.box(worldSize, worldSize, worldSize, name = "world")
 
                     val shieldingMaterial = materials.composite("G4_Pb")
                     val scintillatorMaterial = materials.composite("BC408")
@@ -221,7 +224,14 @@ fun main() {
                     }
                 }
             }.toVision {
-                this.solidAction
+                configure { parent, solid, material ->
+                    //disable visibility for the world box
+                    if(solid.name == "world"){
+                        visible = false
+                    }
+                    //make all solids semi-transparent
+                    transparent()
+                }
             }
         }
     }
diff --git a/demo/playground/webpack.config.d/01.ring.js b/demo/playground/webpack.config.d/01.ring.js
new file mode 100644
index 00000000..41da041c
--- /dev/null
+++ b/demo/playground/webpack.config.d/01.ring.js
@@ -0,0 +1,3 @@
+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/jupyter/visionforge-gdml-jupyter/build.gradle.kts b/jupyter/visionforge-gdml-jupyter/build.gradle.kts
index 86847c2c..48391b5d 100644
--- a/jupyter/visionforge-gdml-jupyter/build.gradle.kts
+++ b/jupyter/visionforge-gdml-jupyter/build.gradle.kts
@@ -8,10 +8,15 @@ description = "Jupyter api artifact for GDML rendering"
 kotlin{
     explicitApi = null
     js{
+        useCommonJs()
         browser {
             webpackTask {
                 this.outputFileName = "js/gdml-jupyter.js"
             }
+            commonWebpackConfig {
+                sourceMaps = false
+                cssSupport.enabled = false
+            }
         }
         binaries.executable()
     }
@@ -42,7 +47,7 @@ kotlin{
         jsMain {
             dependencies {
                 api(project(":visionforge-threejs"))
-                implementation(project(":ui:bootstrap"))
+                implementation(project(":ui:ring"))
             }
         }
 
diff --git a/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/gdmlJupyter.kt b/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/gdmlJupyter.kt
index 9c4d8140..3356c20d 100644
--- a/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/gdmlJupyter.kt
+++ b/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/gdmlJupyter.kt
@@ -1,27 +1,12 @@
 package space.kscience.visionforge.gdml.jupyter
 
-import kotlinx.css.ListStyleType
-import kotlinx.css.listStyleType
 import space.kscience.dataforge.misc.DFExperimental
-import space.kscience.visionforge.bootstrap.useBootstrap
+import space.kscience.visionforge.ring.ThreeWithControls
 import space.kscience.visionforge.runVisionClient
-import styled.injectGlobal
 
 @DFExperimental
+@JsExport
 fun main(): Unit = runVisionClient {
-    useBootstrap()
-    injectGlobal {
-        rule("ul.nav") {
-            listStyleType = ListStyleType.none
-        }
-
-        rule(".treeStyles-tree") {
-            listStyleType = ListStyleType.none
-        }
-
-        rule("ol.breadcrumb") {
-            listStyleType = ListStyleType.none
-        }
-    }
     plugin(ThreeWithControls)
-}
\ No newline at end of file
+}
+
diff --git a/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/threeViewer.kt b/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/threeViewer.kt
deleted file mode 100644
index d7818254..00000000
--- a/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/threeViewer.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package space.kscience.visionforge.gdml.jupyter
-
-import kotlinx.css.*
-import react.RProps
-import react.child
-import react.dom.h1
-import react.functionalComponent
-import react.useState
-import space.kscience.dataforge.context.Context
-import space.kscience.dataforge.names.Name
-import space.kscience.visionforge.Vision
-import space.kscience.visionforge.bootstrap.gridRow
-import space.kscience.visionforge.bootstrap.nameCrumbs
-import space.kscience.visionforge.bootstrap.threeControls
-import space.kscience.visionforge.react.ThreeCanvasComponent
-import space.kscience.visionforge.react.flexColumn
-import space.kscience.visionforge.solid.Solid
-import space.kscience.visionforge.solid.specifications.Canvas3DOptions
-import space.kscience.visionforge.solid.three.ThreeCanvas
-import styled.css
-import styled.styledDiv
-
-external interface GdmlViewProps : RProps {
-    var context: Context
-    var rootVision: Vision?
-    var selected: Name?
-}
-
-@JsExport
-val GdmlView = functionalComponent<GdmlViewProps>("GdmlView") { props ->
-    var selected by useState { props.selected }
-    var canvas: ThreeCanvas? by useState { null }
-    var vision: Vision? by useState { props.rootVision }
-
-    val onSelect: (Name?) -> Unit = {
-        selected = it
-    }
-
-    gridRow {
-        flexColumn {
-            css {
-                +"col-lg-9"
-                height = 100.vh
-            }
-            styledDiv {
-                css {
-                    +"mx-auto"
-                    +"page-header"
-                }
-                h1 { +"GDML/JSON loader demo" }
-            }
-            nameCrumbs(selected, "World", onSelect)
-            //canvas
-
-            child(ThreeCanvasComponent) {
-                attrs {
-                    this.context = props.context
-                    this.obj = vision as? Solid
-                    this.selected = selected
-                    this.options = Canvas3DOptions.invoke {
-                        this.onSelect = onSelect
-                    }
-                    this.canvasCallback = {
-                        canvas = it
-                    }
-                }
-            }
-
-        }
-        flexColumn {
-            css {
-                +"col-lg-3"
-                padding(top = 4.px)
-                //border(1.px, BorderStyle.solid, Color.lightGray)
-                height = 100.vh
-                overflowY = Overflow.auto
-            }
-            canvas?.let {
-                threeControls(it, selected, onSelect)
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt b/jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt
index 31d1d9aa..0b12d3fb 100644
--- a/jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt
+++ b/jupyter/visionforge-gdml-jupyter/src/jvmMain/kotlin/GdmlForJupyter.kt
@@ -36,9 +36,6 @@ internal class GdmlForJupyter : JupyterIntegration() {
             js("three") {
                 classPath("js/gdml-jupyter.js")
             }
-//            css("override") {
-//                classPath("css/jupyter-override.css")
-//            }
         }
 
         import(
diff --git a/jupyter/visionforge-gdml-jupyter/webpack.config.d/01.ring.js b/jupyter/visionforge-gdml-jupyter/webpack.config.d/01.ring.js
new file mode 100644
index 00000000..41da041c
--- /dev/null
+++ b/jupyter/visionforge-gdml-jupyter/webpack.config.d/01.ring.js
@@ -0,0 +1,3 @@
+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/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
index 74a1a61d..7446acce 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
@@ -2,6 +2,8 @@ package space.kscience.visionforge.react
 
 import kotlinx.css.Display
 import kotlinx.css.display
+import kotlinx.css.height
+import kotlinx.css.pct
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
 import react.*
@@ -60,6 +62,7 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
     styledDiv {
         css {
             display = Display.contents
+            height = 100.pct
         }
         ref = elementRef
     }
diff --git a/ui/ring/build.gradle.kts b/ui/ring/build.gradle.kts
index 5bd5817c..54d6b737 100644
--- a/ui/ring/build.gradle.kts
+++ b/ui/ring/build.gradle.kts
@@ -21,6 +21,7 @@ dependencies{
     implementation(npm("@jetbrains/icons", "3.14.1"))
     implementation(npm("@jetbrains/ring-ui", "4.0.7"))
     implementation(npm("core-js","3.12.1"))
+    implementation(npm("file-saver", "2.0.2"))
     compileOnly(npm("url-loader","4.1.1"))
     compileOnly(npm("postcss-loader","5.2.0"))
     compileOnly(npm("source-map-loader","2.0.1"))
diff --git a/ui/ring/src/main/kotlin/ringui/grid/Col.kt b/ui/ring/src/main/kotlin/ringui/grid/Col.kt
new file mode 100644
index 00000000..057415db
--- /dev/null
+++ b/ui/ring/src/main/kotlin/ringui/grid/Col.kt
@@ -0,0 +1,23 @@
+package ringui.grid
+
+import react.RBuilder
+import react.RHandler
+import react.dom.WithClassName
+
+public external interface ColProps : WithClassName {
+    public var xs: dynamic // number or boolean
+    public var sm: dynamic // number or boolean
+    public var md: dynamic // number or boolean
+    public var lg: dynamic // number or boolean
+    public var xsOffset: Number
+    public var smOffset: Number
+    public var mdOffset: Number
+    public var lgOffset: Number
+    public var reverse: Boolean
+}
+
+public fun RBuilder.ringCol(handler: RHandler<ColProps>){
+    GridModule.Col {
+        handler()
+    }
+}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/grid/Grid.kt b/ui/ring/src/main/kotlin/ringui/grid/Grid.kt
new file mode 100644
index 00000000..7613a6c4
--- /dev/null
+++ b/ui/ring/src/main/kotlin/ringui/grid/Grid.kt
@@ -0,0 +1,20 @@
+package ringui.grid
+
+import react.RBuilder
+import react.RClass
+import react.RHandler
+import react.RProps
+
+@JsModule("@jetbrains/ring-ui/components/grid/grid")
+internal external object GridModule {
+    val Grid: RClass<RProps>
+    val Row: RClass<RowProps>
+    val Col: RClass<dynamic>
+}
+
+
+public fun RBuilder.ringGrid(handler: RHandler<RProps>) {
+    GridModule.Grid {
+        handler()
+    }
+}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/grid/Row.kt b/ui/ring/src/main/kotlin/ringui/grid/Row.kt
new file mode 100644
index 00000000..78131971
--- /dev/null
+++ b/ui/ring/src/main/kotlin/ringui/grid/Row.kt
@@ -0,0 +1,33 @@
+package ringui.grid
+
+import react.RBuilder
+import react.RHandler
+import react.dom.WithClassName
+
+public enum class RowPosition {
+    xs,
+    sm,
+    md,
+    lg
+}
+
+public external interface RowProps : WithClassName {
+    public var reverse: Boolean
+    public var start: RowPosition
+    public var center: RowPosition
+    public var end: RowPosition
+    public var top: RowPosition
+    public var middle: RowPosition
+    public var baseline: RowPosition
+    public var bottom: RowPosition
+    public var around: RowPosition
+    public var between: RowPosition
+    public var first: RowPosition
+    public var last: RowPosition
+}
+
+public fun RBuilder.ringRow(handler: RHandler<RowProps>){
+    GridModule.Row {
+        handler()
+    }
+}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
new file mode 100644
index 00000000..2b1dca09
--- /dev/null
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
@@ -0,0 +1,87 @@
+package space.kscience.visionforge.ring
+
+import kotlinx.css.*
+import react.RProps
+import react.child
+import react.functionalComponent
+import react.useState
+import ringui.grid.ringCol
+import ringui.grid.ringGrid
+import ringui.grid.ringRow
+import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.names.Name
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.react.ThreeCanvasComponent
+import space.kscience.visionforge.solid.Solid
+import space.kscience.visionforge.solid.specifications.Canvas3DOptions
+import space.kscience.visionforge.solid.three.ThreeCanvas
+import styled.css
+import styled.styledDiv
+
+public external interface GdmlViewProps : RProps {
+    public var context: Context
+    public var rootVision: Vision?
+    public var selected: Name?
+}
+
+@JsExport
+public val ThreeViewWithControls: (props: GdmlViewProps) -> dynamic =
+    functionalComponent<GdmlViewProps>("ThreeViewWithControls") { props ->
+        var selected by useState { props.selected }
+        var canvas: ThreeCanvas? by useState { null }
+
+        val onSelect: (Name?) -> Unit = {
+            selected = it
+        }
+
+        styledDiv {
+            css {
+                height = 100.pct
+            }
+            ringGrid {
+                ringRow {
+                    ringCol {
+                        attrs {
+                            xs = 12
+                            sm = 12
+                            md = 8
+                            lg = 9
+                        }
+                        child(ThreeCanvasComponent) {
+                            attrs {
+                                this.context = props.context
+                                this.obj = props.rootVision as? Solid
+                                this.selected = selected
+                                this.options = Canvas3DOptions.invoke {
+                                    this.onSelect = onSelect
+                                }
+                                this.canvasCallback = {
+                                    canvas = it
+                                }
+                            }
+                        }
+
+                    }
+                    ringCol {
+                        attrs {
+                            xs = 12
+                            sm = 12
+                            md = 4
+                            lg = 3
+                        }
+                        styledDiv {
+                            css {
+                                padding(top = 4.px)
+                                //border(1.px, BorderStyle.solid, Color.lightGray)
+                                height = 100.pct
+                                overflowY = Overflow.auto
+                            }
+                            canvas?.let {
+                                ringThreeControls(it, selected, onSelect)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
\ No newline at end of file
diff --git a/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/ThreeWithControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControls.kt
similarity index 85%
rename from jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/ThreeWithControls.kt
rename to ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControls.kt
index bad07723..9b415e84 100644
--- a/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/ThreeWithControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControls.kt
@@ -1,4 +1,4 @@
-package space.kscience.visionforge.gdml.jupyter
+package space.kscience.visionforge.ring
 
 import org.w3c.dom.Element
 import react.child
@@ -15,8 +15,8 @@ import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.three.ThreePlugin
 import kotlin.reflect.KClass
 
-class ThreeWithControls : AbstractPlugin(), ElementVisionRenderer {
-    val three by require(ThreePlugin)
+public class ThreeWithControls : AbstractPlugin(), ElementVisionRenderer {
+    public val three by require(ThreePlugin)
 
     override val tag: PluginTag get() = Companion.tag
 
@@ -25,7 +25,7 @@ class ThreeWithControls : AbstractPlugin(), ElementVisionRenderer {
 
     override fun render(element: Element, vision: Vision, meta: Meta) {
         react.dom.render(element) {
-            child(GdmlView) {
+            child(ThreeViewWithControls) {
                 attrs {
                     this.context = this@ThreeWithControls.context
                     this.rootVision = vision
@@ -41,7 +41,7 @@ class ThreeWithControls : AbstractPlugin(), ElementVisionRenderer {
         }
     }
 
-    companion object : PluginFactory<ThreeWithControls> {
+    public companion object : PluginFactory<ThreeWithControls> {
         override val tag: PluginTag = PluginTag("vision.threejs.withControls", PluginTag.DATAFORGE_GROUP)
         override val type: KClass<ThreeWithControls> = ThreeWithControls::class
         override fun invoke(meta: Meta, context: Context): ThreeWithControls = ThreeWithControls()
diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
index 8cd5dd09..22d670dd 100644
--- a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
@@ -217,10 +217,7 @@ public fun VisionClient.renderAllVisions(): Unit = whenDocumentLoaded {
  */
 public fun runVisionClient(contextBuilder: ContextBuilder.() -> Unit) {
     console.info("Starting VisionForge context")
-    val context = Context("VisionForge"){
-        contextBuilder()
-        //plugin(VisionClient)
-    }
+    val context = Context("VisionForge", contextBuilder)
     val visionClient = context.fetch(VisionClient)
     window.asDynamic()[RENDER_FUNCTION_NAME] = visionClient::renderAllVisionsById
 
diff --git a/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/headers.kt b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/headers.kt
index 56b2e17b..ffe35cc7 100644
--- a/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/headers.kt
+++ b/visionforge-core/src/jvmMain/kotlin/space/kscience/visionforge/html/headers.kt
@@ -3,6 +3,7 @@ package space.kscience.visionforge.html
 import kotlinx.html.link
 import kotlinx.html.script
 import kotlinx.html.unsafe
+import org.slf4j.LoggerFactory
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.visionforge.VisionManager
 import java.nio.file.Files
@@ -49,18 +50,22 @@ private fun ByteArray.toHexString() = asUByteArray().joinToString("") { it.toStr
  */
 @OptIn(ExperimentalPathApi::class)
 internal fun checkOrStoreFile(htmlPath: Path, filePath: Path, resource: String): Path {
-    //TODO add logging
-    val fullPath = htmlPath.resolveSibling(filePath).toAbsolutePath().resolve(resource)
+    val logger = LoggerFactory.getLogger("")
 
-    val bytes = VisionManager::class.java.getResourceAsStream("/$resource").readAllBytes()
+    logger.info("Resolving or storing resource file $resource")
+    val fullPath = htmlPath.resolveSibling(filePath).toAbsolutePath().resolve(resource)
+    logger.debug("Full path to resource file $resource: $fullPath")
+
+    val bytes = VisionManager.Companion::class.java.getResourceAsStream("/$resource")?.readAllBytes()
+        ?: error("Resource $resource not found on classpath")
     val md = MessageDigest.getInstance("MD5")
 
     val checksum = md.digest(bytes).toHexString()
-
     val md5File = fullPath.resolveSibling(fullPath.fileName.toString() + ".md5")
     val skip: Boolean = Files.exists(fullPath) && Files.exists(md5File) && md5File.readText() == checksum
 
     if (!skip) {
+        logger.debug("File $fullPath does not exist or wrong checksum. Writing file")
         Files.createDirectories(fullPath.parent)
         Files.write(fullPath, bytes, StandardOpenOption.CREATE, StandardOpenOption.WRITE)
         Files.write(md5File, checksum.encodeToByteArray(), StandardOpenOption.CREATE, StandardOpenOption.WRITE)
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformerEnv.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformerEnv.kt
index c4a2364a..0d4b6d29 100644
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformerEnv.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformerEnv.kt
@@ -48,8 +48,8 @@ public class GdmlTransformer {
         useStyle(name)
     }
 
-    public fun Solid.opaque() {
-        useStyle("opaque") {
+    public fun Solid.transparent() {
+        useStyle("transparent") {
             SolidMaterial.MATERIAL_OPACITY_KEY put 0.3
             "edges.enabled" put true
         }
@@ -73,7 +73,7 @@ public class GdmlTransformer {
         { parent, solid, material ->
             val styleName = "materials.${material.name}"
 
-            if (parent.physVolumes.isNotEmpty()) opaque()
+            if (parent.physVolumes.isNotEmpty()) transparent()
 
             useStyle(styleName) {
                 val vfMaterial = SolidMaterial().apply {
@@ -85,6 +85,13 @@ public class GdmlTransformer {
         }
         private set
 
+    public fun configure(block: Solid.(parent: GdmlVolume, solid: GdmlSolid, material: GdmlMaterial) -> Unit) {
+        val oldConfigure = configureSolid
+        configureSolid = { parent: GdmlVolume, solid: GdmlSolid, material: GdmlMaterial ->
+            oldConfigure(parent, solid, material)
+            block(parent, solid, material)
+        }
+    }
 
 
     public companion object {
diff --git a/visionforge-threejs/build.gradle.kts b/visionforge-threejs/build.gradle.kts
index 498c63f8..68ab9204 100644
--- a/visionforge-threejs/build.gradle.kts
+++ b/visionforge-threejs/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
 }
 
 kotlin{
+    explicitApi = null
     js{
         binaries.library()
     }
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
index 8d0e0d0d..e9c7a61a 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
@@ -110,7 +110,6 @@ public class ThreeCanvas(
             width = "100%"
             height = "100%"
             display = "block"
-            zIndex = "1000"
         }
     }
 

From 8652b03fa5bdf102e99a524f2beaccd22fa86382 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 11 May 2021 11:33:12 +0300
Subject: [PATCH 115/151] Fix a bug with composite children. Composite is no
 longer a group.

---
 .../playground/src/jvmMain/kotlin/gdmCurve.kt | 10 ++++++++--
 .../ThreeWithControls.kt                      |  2 +-
 .../space/kscience/visionforge/VisionBase.kt  |  4 +---
 .../visionforge/gdml/GdmlTransformerEnv.kt    |  6 +++---
 .../kscience/visionforge/solid/Composite.kt   | 19 +++++++++----------
 .../kscience/visionforge/solid/SolidBase.kt   | 12 +++++-------
 .../kscience/visionforge/solid/SolidGroup.kt  |  9 +++------
 .../kscience/visionforge/solid/Solids.kt      |  1 +
 .../solid/specifications/Canvas3DOptions.kt   | 11 +++++++++++
 .../visionforge/solid/three/ThreeCanvas.kt    |  9 ++++++++-
 10 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/demo/playground/src/jvmMain/kotlin/gdmCurve.kt b/demo/playground/src/jvmMain/kotlin/gdmCurve.kt
index 3f7ff281..cbdac68a 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmCurve.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmCurve.kt
@@ -5,6 +5,8 @@ import space.kscience.gdml.*
 import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.html.ResourceLocation
 import space.kscience.visionforge.solid.Solids
+import space.kscience.visionforge.solid.color
+import space.kscience.visionforge.solid.invoke
 import space.kscience.visionforge.visible
 import java.nio.file.Path
 
@@ -229,8 +231,12 @@ fun main() {
                     if(solid.name == "world"){
                         visible = false
                     }
-                    //make all solids semi-transparent
-                    transparent()
+                    if(solid.name.startsWith("gas")){
+                        color("green")
+                    } else {
+                        //make all solids semi-transparent
+                        transparent()
+                    }
                 }
             }
         }
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControls.kt
index 9b415e84..6d7aaa0b 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControls.kt
@@ -16,7 +16,7 @@ import space.kscience.visionforge.solid.three.ThreePlugin
 import kotlin.reflect.KClass
 
 public class ThreeWithControls : AbstractPlugin(), ElementVisionRenderer {
-    public val three by require(ThreePlugin)
+    public val three: ThreePlugin by require(ThreePlugin)
 
     override val tag: PluginTag get() = Companion.tag
 
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
index 651de863..26ec2523 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
@@ -32,12 +32,10 @@ internal data class PropertyListener(
 @SerialName("vision")
 public open class VisionBase(
     internal var properties: Config? = null,
+    @Transient override var parent: VisionGroup? = null,
     @Transient public val coroutineScope: CoroutineScope = GlobalScope,
 ) : Vision {
 
-    @Transient
-    override var parent: VisionGroup? = null
-
     @Synchronized
     protected fun getOrCreateConfig(): Config {
         if (properties == null) {
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformerEnv.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformerEnv.kt
index 0d4b6d29..ef41a214 100644
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformerEnv.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformerEnv.kt
@@ -160,20 +160,20 @@ private class GdmlTransformerEnv(val settings: GdmlTransformer) {
     ): T = apply {
         newPos?.let {
             val point = Point3D(it.x(settings.lUnit), it.y(settings.lUnit), it.z(settings.lUnit))
-            if (position != null || point != Point3D.ZERO) {
+            if (point != Point3D.ZERO) {
                 position = point
             }
         }
         newRotation?.let {
             val point = Point3D(it.x(settings.aUnit), it.y(settings.aUnit), it.z(settings.aUnit))
-            if (rotation != null || point != Point3D.ZERO) {
+            if (point != Point3D.ZERO) {
                 rotation = point
             }
             //this@withPosition.rotationOrder = RotationOrder.ZXY
         }
         newScale?.let {
             val point = Point3D(it.x, it.y, it.z)
-            if (scale != null || point != Point3D.ONE) {
+            if (point != Point3D.ONE) {
                 scale = point
             }
         }
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt
index f7325d2b..1b9ecd0f 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt
@@ -3,7 +3,6 @@ package space.kscience.visionforge.solid
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import space.kscience.dataforge.meta.update
-import space.kscience.dataforge.names.NameToken
 import space.kscience.visionforge.*
 
 public enum class CompositeType {
@@ -18,15 +17,15 @@ public class Composite(
     public val compositeType: CompositeType,
     public val first: Solid,
     public val second: Solid,
-) : SolidBase(), Solid, VisionGroup {
-
-    init {
-        first.parent = this
-        second.parent = this
-    }
-
-    override val children: Map<NameToken, Vision>
-        get() = mapOf(NameToken("first") to first, NameToken("second") to second)
+) : SolidBase(), Solid {
+//
+//    init {
+//        first.parent = this
+//        second.parent = this
+//    }
+//
+//    override val children: Map<NameToken, Vision>
+//        get() = mapOf(NameToken("first") to first, NameToken("second") to second)
 }
 
 @VisionBuilder
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt
index 77e66a53..e69f729c 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt
@@ -12,15 +12,13 @@ import space.kscience.visionforge.VisionChange
 
 @Serializable
 @SerialName("solid")
-public open class SolidBase : VisionBase(), Solid {
+public open class SolidBase(
+    override var position: Point3D? = null,
+    override var rotation: Point3D? = null,
+    override var scale: Point3D? = null,
+) : VisionBase(), Solid {
     override val descriptor: NodeDescriptor get() = Solid.descriptor
 
-    override var position: Point3D? = null
-
-    override var rotation: Point3D? = null
-
-    override var scale: Point3D? = null
-
     override fun update(change: VisionChange) {
         updatePosition(change.properties)
         super.update(change)
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
index c9c987a2..20ca8afc 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
@@ -29,6 +29,9 @@ public interface PrototypeHolder {
 @SerialName("group.solid")
 public class SolidGroup(
     @Serializable(PrototypeSerializer::class) internal var prototypes: MutableVisionGroup? = null,
+    override var position: Point3D? = null,
+    override var rotation: Point3D? = null,
+    override var scale: Point3D? = null,
 ) : VisionGroupBase(), Solid, PrototypeHolder {
 
     init {
@@ -53,12 +56,6 @@ public class SolidGroup(
         }).run(builder)
     }
 
-    override var position: Point3D? = null
-
-    override var rotation: Point3D? = null
-
-    override var scale: Point3D? = null
-
 //    /**
 //     * TODO add special static group to hold statics without propagation
 //     */
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt
index f65bd7d2..1a83d2cb 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt
@@ -54,6 +54,7 @@ public class Solids(meta: Meta) : VisionPlugin(meta) {
         }
 
         internal val jsonForSolids: Json = Json(VisionManager.defaultJson) {
+            encodeDefaults = false
             serializersModule = serializersModuleForSolids
         }
 
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt
index aa7cb258..4a7686b4 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt
@@ -9,6 +9,15 @@ import space.kscience.visionforge.scheme
 import space.kscience.visionforge.value
 import space.kscience.visionforge.widgetType
 
+public class ClippingPlane: Scheme(){
+    public var x: Double by double(0.0)
+    public var y: Double by double(0.0)
+    public var z: Double by double(0.0)
+
+    public companion object: SchemeSpec<ClippingPlane>(::ClippingPlane)
+}
+
+
 public class Canvas3DOptions : Scheme() {
     public var axes: Axes by spec(Axes)
     public var light: Light by spec(Light)
@@ -25,6 +34,8 @@ public class Canvas3DOptions : Scheme() {
 
     public var layers: List<Number> by numberList(0)
 
+    //public var clippingPlanes: List<ClippingPlane> by list
+
     public var onSelect: ((Name?) -> Unit)? = null
 
 
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
index e9c7a61a..306bdbaf 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
@@ -11,6 +11,7 @@ import info.laht.threekt.geometries.EdgesGeometry
 import info.laht.threekt.helpers.AxesHelper
 import info.laht.threekt.lights.AmbientLight
 import info.laht.threekt.materials.LineBasicMaterial
+import info.laht.threekt.math.Box3
 import info.laht.threekt.math.Vector2
 import info.laht.threekt.objects.LineSegments
 import info.laht.threekt.objects.Mesh
@@ -43,7 +44,13 @@ public class ThreeCanvas(
     public val three: ThreePlugin,
     public val options: Canvas3DOptions,
 ) {
+
+    private var boundingBox: Box3? = null
     private var root: Object3D? = null
+        set(value) {
+            field = value
+            if (value != null) boundingBox = Box3().setFromObject(value)
+        }
 
     private val raycaster = Raycaster()
     private val mousePosition: Vector2 = Vector2()
@@ -84,7 +91,7 @@ public class ThreeCanvas(
             (0..31).forEach {
                 if (it in selectedLayers) {
                     this@apply.layers.enable(it)
-                } else{
+                } else {
                     this@apply.layers.disable(it)
                 }
             }

From bdbff04d78b5d25d101f552cc8a49bbea1b07796 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 11 May 2021 15:28:05 +0300
Subject: [PATCH 116/151] Clipping implemented

---
 CHANGELOG.md                                  |  1 +
 .../visionforge/react/RangeValueChooser.kt    | 43 +++++++++++++++++++
 .../visionforge/react/valueChooser.kt         |  1 +
 .../kscience/visionforge/schemeDesctiptors.kt |  5 +++
 .../kscience/visionforge/solid/Composite.kt   | 11 +----
 .../solid/specifications/Canvas3DOptions.kt   | 42 +++++++++++++++---
 .../info/laht/threekt/helpers/PlaneHelper.kt  | 15 +++++++
 .../kotlin/info/laht/threekt/math/Plane.kt    |  4 +-
 .../visionforge/solid/three/ThreeCanvas.kt    | 39 +++++++++++++----
 .../solid/three/ThreeCanvasLabelFactory.kt    |  2 +-
 10 files changed, 134 insertions(+), 29 deletions(-)
 create mode 100644 ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt
 create mode 100644 visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/PlaneHelper.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91d20f96..8ea6fc9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - SphereLayer solid
 - Hexagon interface and GenericHexagon implementation (Box inherits Hexagon)
 - Increased the default detail level for spheres and cones to 32
+- Simple clipping for Solids in ThreeJs
 
 ### Changed
 - Vision does not implement ItemProvider anymore. Property changes are done via `getProperty`/`setProperty` and `property` delegate.
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt
new file mode 100644
index 00000000..5ad257c8
--- /dev/null
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt
@@ -0,0 +1,43 @@
+package space.kscience.visionforge.react
+
+import kotlinx.html.InputType
+import kotlinx.html.js.onChangeFunction
+import org.w3c.dom.HTMLInputElement
+import org.w3c.dom.events.Event
+import react.FunctionalComponent
+import react.functionalComponent
+import react.useState
+import space.kscience.dataforge.meta.get
+import space.kscience.dataforge.meta.string
+import space.kscience.dataforge.values.asValue
+import styled.styledInput
+
+@JsExport
+public val RangeValueChooser: FunctionalComponent<ValueChooserProps> =
+    functionalComponent("RangeValueChooser") { props ->
+        var innerValue by useState(props.item.string)
+
+        val handleChange: (Event) -> Unit = {
+            val newValue = (it.target as HTMLInputElement).value
+            props.valueChanged?.invoke(newValue.toDoubleOrNull()?.asValue())
+            innerValue = newValue
+        }
+
+        styledInput(type = InputType.range) {
+            attrs {
+                value = innerValue ?: ""
+                onChangeFunction = 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/main/kotlin/space/kscience/visionforge/react/valueChooser.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
index b0b448bb..7a4960c1 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
@@ -153,6 +153,7 @@ public val ValueChooser: FunctionalComponent<ValueChooserProps> = functionalComp
         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)
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/schemeDesctiptors.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/schemeDesctiptors.kt
index 8c43d0e0..8f342b52 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/schemeDesctiptors.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/schemeDesctiptors.kt
@@ -23,6 +23,11 @@ public inline fun <S : Scheme, reified T> NodeDescriptorBuilder.value(
                 type(ValueType.NUMBER)
                 block()
             }
+        typeOf<Number?>(), typeOf<Int?>(), typeOf<Double?>(), typeOf<Short?>(), typeOf<Long?>(), typeOf<Float?>() ->
+            value(property.name) {
+                type(ValueType.NUMBER)
+                block()
+            }
         typeOf<Boolean>() -> value(property.name) {
             type(ValueType.BOOLEAN)
             block()
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt
index 1b9ecd0f..35cf7ab6 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt
@@ -17,16 +17,7 @@ public class Composite(
     public val compositeType: CompositeType,
     public val first: Solid,
     public val second: Solid,
-) : SolidBase(), Solid {
-//
-//    init {
-//        first.parent = this
-//        second.parent = this
-//    }
-//
-//    override val children: Map<NameToken, Vision>
-//        get() = mapOf(NameToken("first") to first, NameToken("second") to second)
-}
+) : SolidBase(), Solid
 
 @VisionBuilder
 public inline fun VisionContainerBuilder<Solid>.composite(
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt
index 4a7686b4..1e23d1ad 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt
@@ -2,6 +2,7 @@ package space.kscience.visionforge.solid.specifications
 
 import space.kscience.dataforge.meta.*
 import space.kscience.dataforge.meta.descriptors.NodeDescriptor
+import space.kscience.dataforge.meta.descriptors.attributes
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.values.ValueType
 import space.kscience.visionforge.hide
@@ -9,15 +10,41 @@ import space.kscience.visionforge.scheme
 import space.kscience.visionforge.value
 import space.kscience.visionforge.widgetType
 
-public class ClippingPlane: Scheme(){
-    public var x: Double by double(0.0)
-    public var y: Double by double(0.0)
-    public var z: Double by double(0.0)
+public class Clipping : Scheme() {
+    public var x: Double? by double()
+    public var y: Double? by double()
+    public var z: Double? by double()
 
-    public companion object: SchemeSpec<ClippingPlane>(::ClippingPlane)
+    public companion object : SchemeSpec<Clipping>(::Clipping) {
+        override val descriptor: NodeDescriptor = NodeDescriptor {
+            value(Clipping::x) {
+                widgetType = "range"
+                attributes {
+                    set("min", 0.0)
+                    set("max", 1.0)
+                    set("step", 0.01)
+                }
+            }
+            value(Clipping::y) {
+                widgetType = "range"
+                attributes {
+                    set("min", 0.0)
+                    set("max", 1.0)
+                    set("step", 0.01)
+                }
+            }
+            value(Clipping::z) {
+                widgetType = "range"
+                attributes {
+                    set("min", 0.0)
+                    set("max", 1.0)
+                    set("step", 0.01)
+                }
+            }
+        }
+    }
 }
 
-
 public class Canvas3DOptions : Scheme() {
     public var axes: Axes by spec(Axes)
     public var light: Light by spec(Light)
@@ -34,7 +61,7 @@ public class Canvas3DOptions : Scheme() {
 
     public var layers: List<Number> by numberList(0)
 
-    //public var clippingPlanes: List<ClippingPlane> by list
+    public var clipping: Clipping by spec(Clipping)
 
     public var onSelect: ((Name?) -> Unit)? = null
 
@@ -75,6 +102,7 @@ public class Canvas3DOptions : Scheme() {
                     widgetType = "multiSelect"
                     allow(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
                 }
+                scheme(Canvas3DOptions::clipping, Clipping)
             }
         }
     }
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/PlaneHelper.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/PlaneHelper.kt
new file mode 100644
index 00000000..dbe6dc8d
--- /dev/null
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/helpers/PlaneHelper.kt
@@ -0,0 +1,15 @@
+@file:JsModule("three")
+@file:JsNonModule
+package info.laht.threekt.helpers
+
+import info.laht.threekt.math.Color
+import info.laht.threekt.math.Plane
+import info.laht.threekt.objects.LineSegments
+
+/**
+ * Helper object to visualize a [Plane].
+ */
+external class PlaneHelper(plane : Plane, size : Float, hex : Color): LineSegments{
+    var plane: Plane
+    var size: Float
+}
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Plane.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Plane.kt
index f91c0fef..2848938d 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Plane.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/math/Plane.kt
@@ -27,9 +27,7 @@
 
 package info.laht.threekt.math
 
-external class Plane {
-
-    constructor()
+external class Plane() {
     constructor(normal: Vector3, constant: Double)
 
     var normal: Vector3
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
index 306bdbaf..f5629cbd 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
@@ -12,7 +12,9 @@ import info.laht.threekt.helpers.AxesHelper
 import info.laht.threekt.lights.AmbientLight
 import info.laht.threekt.materials.LineBasicMaterial
 import info.laht.threekt.math.Box3
+import info.laht.threekt.math.Plane
 import info.laht.threekt.math.Vector2
+import info.laht.threekt.math.Vector3
 import info.laht.threekt.objects.LineSegments
 import info.laht.threekt.objects.Mesh
 import info.laht.threekt.scenes.Scene
@@ -25,10 +27,7 @@ import space.kscience.dataforge.context.logger
 import space.kscience.dataforge.meta.get
 import space.kscience.dataforge.meta.string
 import space.kscience.dataforge.meta.useProperty
-import space.kscience.dataforge.names.Name
-import space.kscience.dataforge.names.asName
-import space.kscience.dataforge.names.plus
-import space.kscience.dataforge.names.toName
+import space.kscience.dataforge.names.*
 import space.kscience.visionforge.Colors
 import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.specifications.*
@@ -59,7 +58,7 @@ public class ThreeCanvas(
         private set
 
     private val scene: Scene = Scene().apply {
-        options.useProperty(Canvas3DOptions::axes) { axesConfig ->
+        options.useProperty(Canvas3DOptions::axes, this) { axesConfig ->
             getObjectByName(AXES_NAME)?.let { remove(it) }
             val axesObject = AxesHelper(axes.size.toInt()).apply { visible = axes.visible }
             axesObject.name = AXES_NAME
@@ -67,7 +66,7 @@ public class ThreeCanvas(
         }
 
         //Set up light
-        options.useProperty(Canvas3DOptions::light) { lightConfig ->
+        options.useProperty(Canvas3DOptions::light, this) { lightConfig ->
             //remove old light if present
             getObjectByName(LIGHT_NAME)?.let { remove(it) }
             //add new light
@@ -87,7 +86,7 @@ public class ThreeCanvas(
         translateX(spec.distance * sin(spec.zenith) * sin(spec.azimuth))
         translateY(spec.distance * cos(spec.zenith))
         translateZ(spec.distance * sin(spec.zenith) * cos(spec.azimuth))
-        options.useProperty(Canvas3DOptions::layers) { selectedLayers ->
+        options.useProperty(Canvas3DOptions::layers, this) { selectedLayers ->
             (0..31).forEach {
                 if (it in selectedLayers) {
                     this@apply.layers.enable(it)
@@ -98,7 +97,6 @@ public class ThreeCanvas(
         }
     }
 
-
     public val camera: PerspectiveCamera = buildCamera(options.camera)
 
     private var picked: Object3D? = null
@@ -107,6 +105,30 @@ public class ThreeCanvas(
         antialias = true
     }.apply {
         setClearColor(Colors.skyblue, 1)
+        //Clipping planes
+        localClippingEnabled = true
+        options.onChange(this@ThreeCanvas) { name, _, _ ->
+            if (name.startsWith(Canvas3DOptions::clipping.name.asName())) {
+                val clipping = options.clipping
+                boundingBox?.let { boundingBox ->
+                    val xClippingPlane = clipping.x?.let {
+                        val absoluteValue = boundingBox.min.x + (boundingBox.max.x - boundingBox.min.x) * it
+                        Plane(Vector3(-1.0, 0.0, 0.0), absoluteValue)
+
+                    }
+                    val yClippingPlane = clipping.y?.let {
+                        val absoluteValue = boundingBox.min.y + (boundingBox.max.y - boundingBox.min.y) * it
+                        Plane(Vector3(0.0, -1.0, 0.0), absoluteValue)
+                    }
+
+                    val zClippingPlane = clipping.z?.let {
+                        val absoluteValue = boundingBox.min.z + (boundingBox.max.z - boundingBox.min.z) * it
+                        Plane(Vector3(0.0, 0.0, -1.0), absoluteValue)
+                    }
+                    clippingPlanes = listOfNotNull(xClippingPlane, yClippingPlane, zClippingPlane).toTypedArray()
+                }
+            }
+        }
     }
 
     private val canvas = (renderer.domElement as HTMLCanvasElement).apply {
@@ -291,5 +313,6 @@ public class ThreeCanvas(
         private const val SELECT_NAME = "@select"
         private const val LIGHT_NAME = "@light"
         private const val AXES_NAME = "@axes"
+        private const val CLIP_HELPER_NAME = "@clipping"
     }
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvasLabelFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvasLabelFactory.kt
index cae984d9..bbce8f19 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvasLabelFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvasLabelFactory.kt
@@ -26,7 +26,7 @@ public object ThreeCanvasLabelFactory : ThreeFactory<SolidLabel> {
         val canvas = document.createElement("canvas") as HTMLCanvasElement
         val context = canvas.getContext("2d") as CanvasRenderingContext2D
         context.font = "Bold ${obj.fontSize}pt ${obj.fontFamily}"
-        context.fillStyle = obj.color ?: "black"
+        context.fillStyle = obj.color.value ?: "black"
         context.textBaseline = CanvasTextBaseline.MIDDLE
         val metrics = context.measureText(obj.text)
         //canvas.width = metrics.width.toInt()

From fb3ff4d6fc5fdc2cde373762f1b45c438a1d245e Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 4 Jun 2021 20:01:50 +0300
Subject: [PATCH 117/151] Update to DF 0.4.2

---
 build.gradle.kts                                         | 8 +++-----
 demo/muon-monitor/build.gradle.kts                       | 9 ++++-----
 .../kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt   | 2 --
 settings.gradle.kts                                      | 4 ++--
 .../space/kscience/visionforge/bootstrap/outputConfig.kt | 1 +
 .../space/kscience/visionforge/bootstrap/tabComponent.kt | 1 +
 ui/react/build.gradle.kts                                | 4 ++--
 .../space/kscience/visionforge/react/MetaViewer.kt       | 1 +
 .../kscience/visionforge/react/MultiSelectChooser.kt     | 1 +
 .../space/kscience/visionforge/react/ObjectTree.kt       | 1 +
 .../space/kscience/visionforge/react/PropertyEditor.kt   | 1 +
 .../kscience/visionforge/react/RangeValueChooser.kt      | 1 +
 .../kscience/visionforge/react/ThreeCanvasComponent.kt   | 2 +-
 .../space/kscience/visionforge/react/valueChooser.kt     | 1 +
 .../space.kscience.visionforge.ring/ringThreeControls.kt | 1 +
 visionforge-core/build.gradle.kts                        | 4 ++--
 visionforge-plotly/build.gradle.kts                      | 2 +-
 .../kscience/visionforge/three/server/VisionServer.kt    | 2 --
 18 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 65e355ac..9fd660c8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,8 +7,8 @@ plugins {
     id("ru.mipt.npm.gradle.js") apply false
 }
 
-val dataforgeVersion by extra("0.4.1")
-val kotlinWrappersVersion by extra("pre.152-kotlin-1.4.32")
+val dataforgeVersion by extra("0.4.2")
+val kotlinWrappersVersion by extra("pre.206-kotlin-1.5.10")
 val fxVersion by extra("11")
 
 allprojects {
@@ -17,12 +17,10 @@ allprojects {
         jcenter()
         maven("https://repo.kotlin.link")
         maven("https://maven.jzy3d.org/releases")
-        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers")
-        maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
     }
 
     group = "space.kscience"
-    version = "0.2.0-dev-17"
+    version = "0.2.0-dev-18"
 }
 
 subprojects {
diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts
index 3fe03042..3a8035ab 100644
--- a/demo/muon-monitor/build.gradle.kts
+++ b/demo/muon-monitor/build.gradle.kts
@@ -8,6 +8,7 @@ group = "ru.mipt.npm"
 val ktorVersion: String = ru.mipt.npm.gradle.KScienceVersions.ktorVersion
 
 kscience {
+    useCoroutines()
     useSerialization()
     application()
 }
@@ -23,9 +24,7 @@ kotlin {
         tasks.getByName<ProcessResources>("jvmProcessResources") {
             dependsOn(jsBrowserDistribution)
             duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-            afterEvaluate {
-                from(jsBrowserDistribution)
-            }
+            from(jsBrowserDistribution)
         }
     }
 
@@ -58,8 +57,8 @@ application {
     mainClass.set("ru.mipt.npm.muon.monitor.server.MMServerKt")
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile>(){
-    kotlinOptions{
+tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile>() {
+    kotlinOptions {
         freeCompilerArgs = freeCompilerArgs + "-Xir-property-lazy-initialization"
     }
 }
diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
index 336264e2..d22a762d 100644
--- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
+++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
@@ -19,7 +19,6 @@ import io.ktor.routing.get
 import io.ktor.serialization.json
 import io.ktor.server.cio.CIO
 import io.ktor.server.engine.embeddedServer
-import io.ktor.util.KtorExperimentalAPI
 import org.apache.commons.math3.random.JDKRandomGenerator
 import ru.mipt.npm.muon.monitor.Model
 import ru.mipt.npm.muon.monitor.sim.Cos2TrackGenerator
@@ -69,7 +68,6 @@ fun Application.module(context: Context = Global) {
     }
 }
 
-@OptIn(KtorExperimentalAPI::class)
 fun main() {
     embeddedServer(CIO, 8080, host = "localhost", module = Application::module).start(wait = true)
 }
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 11152323..8c2170f6 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
-    val kotlinVersion = "1.5.0"
-    val toolsVersion = "0.9.5"
+    val kotlinVersion = "1.5.10"
+    val toolsVersion = "0.9.10"
 
     repositories {
         maven("https://repo.kotlin.link")
diff --git a/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt
index accc68e2..2edbaab8 100644
--- a/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt
+++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt
@@ -10,6 +10,7 @@ import org.w3c.dom.events.Event
 import org.w3c.files.Blob
 import org.w3c.files.BlobPropertyBag
 import react.*
+import react.dom.attrs
 import react.dom.button
 import space.kscience.dataforge.meta.withDefault
 import space.kscience.visionforge.react.flexColumn
diff --git a/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/tabComponent.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/tabComponent.kt
index 1f29be59..5ff0d5e8 100644
--- a/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/tabComponent.kt
+++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/tabComponent.kt
@@ -4,6 +4,7 @@ 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
diff --git a/ui/react/build.gradle.kts b/ui/react/build.gradle.kts
index f20a63b8..151b92fe 100644
--- a/ui/react/build.gradle.kts
+++ b/ui/react/build.gradle.kts
@@ -6,8 +6,8 @@ val kotlinWrappersVersion: String by rootProject.extra
 
 dependencies{
     api(project(":visionforge-solid"))
-    api("org.jetbrains:kotlin-styled:5.2.3-$kotlinWrappersVersion")
-    api("org.jetbrains:kotlin-react-dom:17.0.2-$kotlinWrappersVersion")
+    api("org.jetbrains.kotlin-wrappers:kotlin-styled:5.3.0-$kotlinWrappersVersion")
+    api("org.jetbrains.kotlin-wrappers:kotlin-react-dom:17.0.2-$kotlinWrappersVersion")
 //    implementation(npm("react-select","4.3.0"))
     implementation(project(":visionforge-threejs"))
 }
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
index 58e651d8..f7de3070 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
@@ -4,6 +4,7 @@ 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.MetaItemNode
 import space.kscience.dataforge.meta.MetaItemValue
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/MultiSelectChooser.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MultiSelectChooser.kt
index 497256c8..a363fcd5 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/MultiSelectChooser.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MultiSelectChooser.kt
@@ -6,6 +6,7 @@ import org.w3c.dom.HTMLSelectElement
 import org.w3c.dom.asList
 import org.w3c.dom.events.Event
 import react.FunctionalComponent
+import react.dom.attrs
 import react.dom.option
 import react.dom.select
 import react.functionalComponent
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ObjectTree.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ObjectTree.kt
index d4d295c1..e7e7dd06 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ObjectTree.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ObjectTree.kt
@@ -3,6 +3,7 @@ package space.kscience.visionforge.react
 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
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
index 8052d576..5bb69714 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
@@ -13,6 +13,7 @@ import kotlinx.html.js.onClickFunction
 import org.w3c.dom.Element
 import org.w3c.dom.events.Event
 import react.*
+import react.dom.attrs
 import react.dom.render
 import space.kscience.dataforge.meta.*
 import space.kscience.dataforge.meta.descriptors.ItemDescriptor
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt
index 5ad257c8..6361ecfb 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt
@@ -5,6 +5,7 @@ import kotlinx.html.js.onChangeFunction
 import org.w3c.dom.HTMLInputElement
 import org.w3c.dom.events.Event
 import react.FunctionalComponent
+import react.dom.attrs
 import react.functionalComponent
 import react.useState
 import space.kscience.dataforge.meta.get
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
index 7446acce..4f645bf6 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
@@ -33,7 +33,7 @@ public external interface ThreeCanvasState : RState {
 public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functionalComponent(
     "ThreeCanvasComponent"
 ) { props ->
-    val elementRef = useRef<Element?>(null)
+    val elementRef = useRef<Element>(null)
     var canvas by useState<ThreeCanvas?>(null)
 
     val three: ThreePlugin = useMemo({props.context.fetch(ThreePlugin)}, arrayOf(props.context))
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
index 7a4960c1..5cfd8651 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
@@ -7,6 +7,7 @@ import org.w3c.dom.HTMLInputElement
 import org.w3c.dom.HTMLSelectElement
 import org.w3c.dom.events.Event
 import react.*
+import react.dom.attrs
 import react.dom.option
 import space.kscience.dataforge.meta.*
 import space.kscience.dataforge.meta.descriptors.ValueDescriptor
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
index 431fc2d6..1a0d101c 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
@@ -7,6 +7,7 @@ import org.w3c.dom.events.Event
 import org.w3c.files.Blob
 import org.w3c.files.BlobPropertyBag
 import react.*
+import react.dom.attrs
 import react.dom.button
 import react.dom.h2
 import ringui.island.ringIsland
diff --git a/visionforge-core/build.gradle.kts b/visionforge-core/build.gradle.kts
index 89a3b693..92c0bdd6 100644
--- a/visionforge-core/build.gradle.kts
+++ b/visionforge-core/build.gradle.kts
@@ -15,12 +15,12 @@ kotlin {
             dependencies {
                 api("space.kscience:dataforge-context:$dataforgeVersion")
                 api("org.jetbrains.kotlinx:kotlinx-html:${ru.mipt.npm.gradle.KScienceVersions.htmlVersion}")
-                api("org.jetbrains:kotlin-css:1.0.0-$kotlinWrappersVersion")
+                api("org.jetbrains.kotlin-wrappers:kotlin-css:1.0.0-$kotlinWrappersVersion")
             }
         }
         jsMain {
             dependencies {
-                api("org.jetbrains:kotlin-extensions:1.0.1-$kotlinWrappersVersion")
+                api("org.jetbrains.kotlin-wrappers:kotlin-extensions:1.0.1-$kotlinWrappersVersion")
             }
         }
     }
diff --git a/visionforge-plotly/build.gradle.kts b/visionforge-plotly/build.gradle.kts
index 9844b470..ea0aa763 100644
--- a/visionforge-plotly/build.gradle.kts
+++ b/visionforge-plotly/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     id("ru.mipt.npm.gradle.mpp")
 }
 
-val plotlyVersion = "0.4.0-dev-1"
+val plotlyVersion = "0.4.2"
 
 kscience {
     useSerialization()
diff --git a/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt b/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
index 06c13bfe..1c398e74 100644
--- a/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
@@ -16,7 +16,6 @@ import io.ktor.routing.*
 import io.ktor.server.cio.CIO
 import io.ktor.server.engine.ApplicationEngine
 import io.ktor.server.engine.embeddedServer
-import io.ktor.util.KtorExperimentalAPI
 import io.ktor.websocket.WebSockets
 import io.ktor.websocket.webSocket
 import kotlinx.coroutines.CoroutineScope
@@ -283,7 +282,6 @@ public fun Application.visionServer(context: Context, route: String = DEFAULT_PA
     return VisionServer(visionManager, this, route)
 }
 
-@OptIn(KtorExperimentalAPI::class)
 public fun VisionManager.serve(
     host: String = "localhost",
     port: Int = 7777,

From 359eb05f8398f7c86b84890da9ffce23b6209a4f Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 5 Jun 2021 22:31:16 +0300
Subject: [PATCH 118/151] Fix canvas update

---
 demo/gdml/build.gradle.kts                    |  1 -
 .../VisionForgePlayGroundForJupyter.kt        |  4 +-
 .../kotlin/ru/mipt/npm/muon/monitor/Model.kt  |  9 +-
 .../ru/mipt/npm/muon/monitor/MMDemoApp.kt     |  5 +-
 .../mipt/npm/muon/monitor/server/MMServer.kt  |  2 +-
 demo/sat-demo/build.gradle.kts                |  3 +-
 .../kscience/visionforge/solid/demo/demo.kt   |  9 +-
 .../visionforge/solid/demo/ThreeDemoGrid.kt   |  3 +-
 ui/material/build.gradle.kts                  | 15 ---
 .../hep/dataforge/vision/material/icons.kt    | 11 ---
 .../hep/dataforge/vision/material/misc.kt     | 97 -------------------
 .../dataforge/vision/material/objectTree.kt   | 94 ------------------
 .../materialui/components/slider/builder.kt   | 37 -------
 .../materialui/components/slider/enums.kt     | 18 ----
 .../materialui/components/slider/slider.kt    | 38 --------
 .../visionforge/react/ThreeCanvasComponent.kt |  8 +-
 .../space/kscience/visionforge/Vision.kt      |  9 +-
 .../space/kscience/visionforge/VisionBase.kt  | 18 ++--
 .../space/kscience/visionforge/VisionGroup.kt |  3 +-
 .../kscience/visionforge/VisionGroupBase.kt   | 14 ++-
 .../visionforge/html/HtmlVisionRenderer.kt    |  6 +-
 .../visionforge/html/VisionTagConsumer.kt     |  7 +-
 .../kscience/visionforge/html/HtmlTagTest.kt  | 13 ++-
 .../kscience/visionforge/VisionClient.kt      |  2 +-
 .../kscience/visionforge/elementOutput.kt     |  2 +-
 visionforge-plotly/build.gradle.kts           |  2 +-
 .../visionforge/plotly/VisionOfPlotly.kt      | 19 +++-
 .../kscience/visionforge/plotly/plotlyJs.kt   |  2 +
 .../visionforge/three/server/VisionServer.kt  | 39 ++++----
 .../kscience/visionforge/solid/Solids.kt      |  3 +-
 .../visionforge/solid/three/ThreeCanvas.kt    | 13 ++-
 .../visionforge/solid/three/ThreePlugin.kt    | 26 ++---
 32 files changed, 136 insertions(+), 396 deletions(-)
 delete mode 100644 ui/material/build.gradle.kts
 delete mode 100644 ui/material/src/main/kotlin/hep/dataforge/vision/material/icons.kt
 delete mode 100644 ui/material/src/main/kotlin/hep/dataforge/vision/material/misc.kt
 delete mode 100644 ui/material/src/main/kotlin/hep/dataforge/vision/material/objectTree.kt
 delete mode 100644 ui/material/src/main/kotlin/materialui/components/slider/builder.kt
 delete mode 100644 ui/material/src/main/kotlin/materialui/components/slider/enums.kt
 delete mode 100644 ui/material/src/main/kotlin/materialui/components/slider/slider.kt

diff --git a/demo/gdml/build.gradle.kts b/demo/gdml/build.gradle.kts
index cf9d8eb3..31232cc8 100644
--- a/demo/gdml/build.gradle.kts
+++ b/demo/gdml/build.gradle.kts
@@ -20,7 +20,6 @@ kotlin {
         useCommonJs()
         browser {
             commonWebpackConfig {
-                sourceMaps = false
                 cssSupport.enabled = false
             }
         }
diff --git a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
index e1e2a97f..88e4effb 100644
--- a/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
+++ b/demo/jupyter-playground/src/main/kotlin/hep/dataforge/playground/VisionForgePlayGroundForJupyter.kt
@@ -18,7 +18,7 @@ import space.kscience.visionforge.html.HtmlVisionFragment
 import space.kscience.visionforge.html.Page
 import space.kscience.visionforge.html.embedVisionFragment
 import space.kscience.visionforge.plotly.PlotlyPlugin
-import space.kscience.visionforge.plotly.toVision
+import space.kscience.visionforge.plotly.asVision
 import space.kscience.visionforge.solid.Solids
 import space.kscience.visionforge.visionManager
 
@@ -80,7 +80,7 @@ internal class VisionForgePlayGroundForJupyter : JupyterIntegration() {
 
         render<Plot> { plot ->
             val fragment = HtmlVisionFragment {
-                vision(plot.toVision())
+                vision(plot.asVision())
             }
 
             HTML(produceHtmlVisionString(fragment))
diff --git a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt
index 43f13028..c485a1e3 100644
--- a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt
+++ b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Model.kt
@@ -3,11 +3,13 @@ package ru.mipt.npm.muon.monitor
 import ru.mipt.npm.muon.monitor.Monitor.CENTRAL_LAYER_Z
 import ru.mipt.npm.muon.monitor.Monitor.LOWER_LAYER_Z
 import ru.mipt.npm.muon.monitor.Monitor.UPPER_LAYER_Z
+import space.kscience.visionforge.VisionManager
 import space.kscience.visionforge.removeAll
+import space.kscience.visionforge.root
 import space.kscience.visionforge.solid.*
 import kotlin.math.PI
 
-class Model {
+class Model(val manager: VisionManager) {
     private val map = HashMap<String, SolidGroup>()
     private val events = HashSet<Event>()
 
@@ -34,6 +36,7 @@ class Model {
     var tracks: SolidGroup
 
     val root: SolidGroup = SolidGroup().apply {
+        root(this@Model.manager)
         rotationX = PI / 2
         group("bottom") {
             Monitor.detectors.filter { it.center.z == LOWER_LAYER_Z }.forEach {
@@ -78,7 +81,5 @@ class Model {
         }
     }
 
-    companion object {
-        fun buildGeometry() = Model().root
-    }
+    fun encodeToString(): String = manager.encodeToString(this.root)
 }
\ No newline at end of file
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
index 45a34e06..2ae42bbb 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
@@ -7,13 +7,16 @@ import kotlinx.browser.document
 import react.child
 import react.dom.render
 import space.kscience.dataforge.context.Global
+import space.kscience.dataforge.context.fetch
 import space.kscience.visionforge.Application
+import space.kscience.visionforge.VisionManager
 import space.kscience.visionforge.bootstrap.useBootstrap
 import space.kscience.visionforge.startApplication
 
 private class MMDemoApp : Application {
 
-    private val model = Model()
+    private val visionManager = Global.fetch(VisionManager)
+    private val model = Model(visionManager)
 
     private val connection = HttpClient {
         install(JsonFeature) {
diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
index d22a762d..29abd7ca 100644
--- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
+++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/server/MMServer.kt
@@ -52,7 +52,7 @@ fun Application.module(context: Context = Global) {
         }
         get("/geometry") {
             call.respondText(
-                solidManager.visionManager.encodeToString(Model.buildGeometry()),
+                Model(solidManager.visionManager).encodeToString(),
                 contentType = ContentType.Application.Json,
                 status = HttpStatusCode.OK
             )
diff --git a/demo/sat-demo/build.gradle.kts b/demo/sat-demo/build.gradle.kts
index c2d4c852..267e4a82 100644
--- a/demo/sat-demo/build.gradle.kts
+++ b/demo/sat-demo/build.gradle.kts
@@ -15,8 +15,9 @@ group = "ru.mipt.npm"
 
 dependencies{
     implementation(project(":visionforge-threejs:visionforge-threejs-server"))
+    implementation("ch.qos.logback:logback-classic:1.2.3")
 }
 
 application {
-    mainClass.set("ru.mipt.npm.gradle.sat.SatServerKt")
+    mainClass.set("ru.mipt.npm.sat.SatServerKt")
 }
diff --git a/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt b/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt
index 18c56704..f084127d 100644
--- a/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt
+++ b/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt
@@ -1,6 +1,9 @@
 package space.kscience.visionforge.solid.demo
 
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
 import space.kscience.dataforge.meta.Meta
 import space.kscience.dataforge.meta.invoke
 import space.kscience.dataforge.names.toName
@@ -73,7 +76,7 @@ fun VisionLayout<Solid>.showcase() {
                 //override color for this cube
                 color(1530)
 
-                GlobalScope.launch(Dispatchers.Main) {
+                launch(Dispatchers.Main) {
                     while (isActive) {
                         delay(500)
                         visible = !(visible ?: false)
@@ -82,7 +85,7 @@ fun VisionLayout<Solid>.showcase() {
             }
         }
 
-        GlobalScope.launch(Dispatchers.Main) {
+        launch(Dispatchers.Main) {
             val random = Random(111)
             while (isActive) {
                 delay(1000)
diff --git a/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt
index b26e30aa..18e23381 100644
--- a/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt
+++ b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt
@@ -19,6 +19,7 @@ import space.kscience.visionforge.VisionLayout
 import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.three.ThreeCanvas
 import space.kscience.visionforge.solid.three.ThreePlugin
+import space.kscience.visionforge.solid.three.configure
 
 class ThreeDemoGrid(element: Element) : VisionLayout<Solid> {
     private lateinit var navigationElement: HTMLElement
@@ -70,7 +71,7 @@ class ThreeDemoGrid(element: Element) : VisionLayout<Solid> {
                 }
             }
             val element = document.getElementById("output-$name") ?: error("Element not found")
-            three.createCanvas(element, canvasOptions)
+            three.getOrCreateCanvas(element).also { it.configure(canvasOptions) }
         }.render(vision)
     }
 }
diff --git a/ui/material/build.gradle.kts b/ui/material/build.gradle.kts
deleted file mode 100644
index b68d5df2..00000000
--- a/ui/material/build.gradle.kts
+++ /dev/null
@@ -1,15 +0,0 @@
-plugins {
-    id("ru.mipt.npm.gradle.js")
-}
-
-val dataforgeVersion: String by rootProject.extra
-
-dependencies{
-    api(project(":ui:react"))
-
-    api("subroh0508.net.kotlinmaterialui:core:0.4.5")
-    api("subroh0508.net.kotlinmaterialui:lab:0.4.5")
-    api(npm("@material-ui/core","4.9.14"))
-    api(npm("@material-ui/lab","4.0.0-alpha.51"))
-    //api(npm("@material-ui/icons","4.9.1"))
-}
\ No newline at end of file
diff --git a/ui/material/src/main/kotlin/hep/dataforge/vision/material/icons.kt b/ui/material/src/main/kotlin/hep/dataforge/vision/material/icons.kt
deleted file mode 100644
index 1ad3f280..00000000
--- a/ui/material/src/main/kotlin/hep/dataforge/vision/material/icons.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package space.kscience.visionforge.material
-
-//@JsModule("@material-ui/icons/ExpandMore")
-//external class ExpandMoreIcon : Component<RProps, RState>{
-//    override fun render(): dynamic
-//}
-//
-//@JsModule("@material-ui/icons/ChevronRight")
-//external class ChevronRightIcon : Component<RProps, RState>{
-//    override fun render(): dynamic
-//}
\ No newline at end of file
diff --git a/ui/material/src/main/kotlin/hep/dataforge/vision/material/misc.kt b/ui/material/src/main/kotlin/hep/dataforge/vision/material/misc.kt
deleted file mode 100644
index a093c043..00000000
--- a/ui/material/src/main/kotlin/hep/dataforge/vision/material/misc.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-package space.kscience.visionforge.material
-
-import space.kscience.visionforge.react.component
-import space.kscience.visionforge.react.state
-import kotlinx.html.DIV
-import materialui.components.card.card
-import materialui.components.cardcontent.cardContent
-import materialui.components.cardheader.cardHeader
-import materialui.components.container.container
-import materialui.components.container.enums.ContainerMaxWidth
-import materialui.components.expansionpanel.expansionPanel
-import materialui.components.expansionpaneldetails.expansionPanelDetails
-import materialui.components.expansionpanelsummary.expansionPanelSummary
-import materialui.components.grid.GridElementBuilder
-import materialui.components.grid.enums.GridDirection
-import materialui.components.grid.enums.GridStyle
-import materialui.components.grid.grid
-import materialui.components.paper.paper
-import materialui.components.typography.typographyH5
-import react.RBuilder
-import react.RProps
-import react.child
-import react.dom.RDOMBuilder
-
-
-fun accordionComponent(elements: List<Pair<String, RDOMBuilder<DIV>.() -> Unit>>) =
-    component<RProps> {
-        val expandedIndex: Int? by state { null }
-
-        container {
-            attrs {
-                maxWidth = ContainerMaxWidth.`false`
-            }
-            elements.forEachIndexed { index, (header, body) ->
-                expansionPanel {
-                    attrs {
-                        expanded = index == expandedIndex
-                    }
-                    expansionPanelSummary {
-                        typographyH5 {
-                            +header
-                        }
-                    }
-                    expansionPanelDetails {
-                        this.body()
-                    }
-                }
-            }
-        }
-    }
-
-typealias RAccordionBuilder = MutableList<Pair<String, RDOMBuilder<DIV>.() -> Unit>>
-
-fun RAccordionBuilder.entry(title: String, builder: RDOMBuilder<DIV>.() -> Unit) {
-    add(title to builder)
-}
-
-fun RBuilder.accordion(builder: RAccordionBuilder.() -> Unit) {
-    val list: List<Pair<String, RDOMBuilder<DIV>.() -> Unit>> =
-        ArrayList<Pair<String, RDOMBuilder<DIV>.() -> Unit>>().apply(builder)
-    child(accordionComponent(list))
-}
-
-fun RBuilder.materialCard(title: String, block: RBuilder.() -> Unit) {
-    card {
-        cardHeader {
-            attrs {
-                this.title = typographyH5 {
-                    +title
-                }
-            }
-        }
-        cardContent {
-            paper {
-                this.block()
-            }
-        }
-    }
-}
-
-fun RBuilder.column(vararg classMap: Pair<GridStyle, String>, block: GridElementBuilder<DIV>.() -> Unit) =
-    grid(*classMap) {
-        attrs {
-            container = true
-            direction = GridDirection.column
-        }
-        block()
-    }
-
-fun RBuilder.row(vararg classMap: Pair<GridStyle, String>, block: GridElementBuilder<DIV>.() -> Unit) =
-    grid(*classMap) {
-        attrs {
-            container = true
-            direction = GridDirection.row
-        }
-        block()
-    }
diff --git a/ui/material/src/main/kotlin/hep/dataforge/vision/material/objectTree.kt b/ui/material/src/main/kotlin/hep/dataforge/vision/material/objectTree.kt
deleted file mode 100644
index d90d2904..00000000
--- a/ui/material/src/main/kotlin/hep/dataforge/vision/material/objectTree.kt
+++ /dev/null
@@ -1,94 +0,0 @@
-package space.kscience.visionforge.material
-
-import space.kscience.dataforge.names.Name
-import space.kscience.dataforge.names.plus
-import space.kscience.dataforge.names.toName
-import space.kscience.visionforge.Vision
-import space.kscience.visionforge.VisionGroup
-import space.kscience.visionforge.isEmpty
-import space.kscience.visionforge.react.component
-import space.kscience.visionforge.react.state
-import kotlinx.html.UL
-import materialui.lab.components.treeItem.treeItem
-import materialui.lab.components.treeView.SingleSelectTreeViewElementBuilder
-import materialui.lab.components.treeView.treeView
-import react.FunctionalComponent
-import react.RBuilder
-import react.RProps
-import react.child
-import react.dom.span
-
-interface ObjectTreeProps : RProps {
-    var name: Name
-    var selected: Name?
-    var obj: Vision
-    var clickCallback: (Name?) -> Unit
-}
-
-private fun RBuilder.treeBranch(name: Name, obj: Vision): Unit {
-    treeItem {
-        val token = name.last()?.toString() ?: "World"
-        attrs {
-            nodeId = name.toString()
-            label {
-                span {
-                    +token
-                }
-            }
-        }
-
-        if (obj is VisionGroup) {
-            obj.children.entries
-                .filter { !it.key.toString().startsWith("@") } // ignore statics and other hidden children
-                .sortedBy { (it.value as? VisionGroup)?.isEmpty ?: true }
-                .forEach { (childToken, child) ->
-                    treeBranch(name + childToken, child)
-                }
-        }
-    }
-}
-
-val ObjectTree: FunctionalComponent<ObjectTreeProps> = component { props ->
-    var selected: String? by state { props.selected.toString() }
-    treeView {
-        this as SingleSelectTreeViewElementBuilder<UL>
-        attrs {
-            this.selected = selected
-            this.onNodeSelect{ _, selectedItem ->
-                selected = selectedItem
-                val itemName = selected?.toName()
-                props.clickCallback(itemName)
-                Unit
-            }
-            defaultCollapseIcon {
-                span{
-                    +"-"
-                }
-                //child(ExpandMoreIcon::class) {}
-            }//{<ExpandMoreIcon />}
-            defaultExpandIcon {
-                span{
-                    +"+"
-                }
-                //child(ChevronRightIcon::class) {}
-            }//{<ChevronRightIcon />}
-        }
-        treeBranch(props.name, props.obj)
-    }
-}
-
-fun RBuilder.objectTree(
-    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/material/src/main/kotlin/materialui/components/slider/builder.kt b/ui/material/src/main/kotlin/materialui/components/slider/builder.kt
deleted file mode 100644
index 3e764c15..00000000
--- a/ui/material/src/main/kotlin/materialui/components/slider/builder.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package materialui.components.slider
-
-import kotlinx.html.DIV
-import kotlinx.html.Tag
-import materialui.components.MaterialElementBuilder
-import materialui.components.getValue
-import materialui.components.inputbase.enums.InputBaseStyle
-import materialui.components.setValue
-import react.RClass
-import react.ReactElement
-
-class SliderElementBuilder<Props: SliderProps> internal constructor(
-    type: RClass<Props>,
-    classMap: List<Pair<Enum<*>, String>>
-) : MaterialElementBuilder<DIV, Props>(type, classMap, { DIV(mapOf(), it) }) {
-    fun Tag.classes(vararg classMap: Pair<InputBaseStyle, String>) {
-        classes(classMap.toList())
-    }
-    var Tag.defaultValue: Number? by materialProps
-    var Tag.disabled: Boolean? by materialProps// = false
-    var Tag.getAriaLabel: String? by materialProps
-    var Tag.getAriaValueText: String? by materialProps
-    var Tag.marks: Array<String>? by materialProps
-    var Tag.max: Number? by materialProps// = 100
-    var Tag.min: Number? by materialProps// = 0,
-    var Tag.name: String? by materialProps
-    var Tag.onChange: ((dynamic, Number) -> Unit)? by materialProps
-    var Tag.onChangeCommitted: ((dynamic, Number) -> Unit)? by materialProps
-    var Tag.orientation: SliderOrientation? by materialProps
-    var Tag.scale: ((Number) -> Number)? by materialProps// {it}
-    var Tag.step: Number? by materialProps// = 1,
-    //ThumbComponent = 'span',
-    var Tag.track: SliderTrack by materialProps
-    var Tag.value: Number? by materialProps
-    var Tag.ValueLabelComponent: ReactElement? by materialProps
-    var Tag.valueLabelDisplay: SliderValueLabelDisplay by materialProps
-}
\ No newline at end of file
diff --git a/ui/material/src/main/kotlin/materialui/components/slider/enums.kt b/ui/material/src/main/kotlin/materialui/components/slider/enums.kt
deleted file mode 100644
index 8a8f9148..00000000
--- a/ui/material/src/main/kotlin/materialui/components/slider/enums.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package materialui.components.slider
-
-enum class SliderOrientation {
-    horizontal,
-    vertical
-}
-
-enum class SliderTrack{
-    normal,
-    `false`,
-    inverted,
-}
-
-enum class SliderValueLabelDisplay{
-    on,
-    auto,
-    off
-}
\ No newline at end of file
diff --git a/ui/material/src/main/kotlin/materialui/components/slider/slider.kt b/ui/material/src/main/kotlin/materialui/components/slider/slider.kt
deleted file mode 100644
index 12a8f8e0..00000000
--- a/ui/material/src/main/kotlin/materialui/components/slider/slider.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package materialui.components.slider
-
-import materialui.components.StandardProps
-import materialui.components.input.enums.InputStyle
-import react.RBuilder
-import react.RClass
-import react.ReactElement
-
-@JsModule("@material-ui/core/Slider")
-private external val sliderModule: dynamic
-
-external interface SliderProps : StandardProps {
-    var defaultValue: Number?
-    var disabled: Boolean?// = false
-    var getAriaLabel: String?
-    var getAriaValueText: String?
-    var marks: Array<String>?
-    var max: Number?// = 100
-    var min: Number?// = 0,
-    var name: String?
-    var onChange: ((dynamic, Number) -> Unit)?
-    var onChangeCommitted: ((dynamic, Number) -> Unit)?
-    var orientation: SliderOrientation?
-    var scale: ((Number) -> Number)?// {it}
-    var step: Number? // = 1,
-    //ThumbComponent = 'span',
-    var track: SliderTrack
-    var value: Number?
-    var ValueLabelComponent: ReactElement?
-    var valueLabelDisplay: SliderValueLabelDisplay
-    //valueLabelFormat = Identity,
-}
-
-@Suppress("UnsafeCastFromDynamic")
-private val sliderComponent: RClass<SliderProps> = sliderModule.default
-
-fun RBuilder.slider(vararg classMap: Pair<InputStyle, String>, block: SliderElementBuilder<SliderProps>.() -> Unit) =
-    child(SliderElementBuilder(sliderComponent, classMap.toList()).apply(block).create())
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
index 4f645bf6..f18854a6 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
@@ -14,6 +14,7 @@ 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 space.kscience.visionforge.solid.three.configure
 import styled.css
 import styled.styledDiv
 
@@ -36,12 +37,15 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
     val elementRef = useRef<Element>(null)
     var canvas by useState<ThreeCanvas?>(null)
 
-    val three: ThreePlugin = useMemo({props.context.fetch(ThreePlugin)}, arrayOf(props.context))
+    val three: ThreePlugin = useMemo({ props.context.fetch(ThreePlugin) }, arrayOf(props.context))
 
     useEffect(listOf(props.obj, props.options, elementRef)) {
         if (canvas == null) {
             val element = elementRef.current as? HTMLElement ?: error("Canvas element not found")
-            val newCanvas: ThreeCanvas = three.createCanvas(element, props.options ?: Canvas3DOptions.empty())
+            val newCanvas: ThreeCanvas = three.getOrCreateCanvas(element)
+            props.options?.let {
+                newCanvas.configure(it)
+            }
             props.canvasCallback?.invoke(newCanvas)
             canvas = newCanvas
         }
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt
index 9ca20f6b..23779bd1 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt
@@ -13,18 +13,25 @@ import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.asName
 import space.kscience.dataforge.names.toName
 import space.kscience.visionforge.Vision.Companion.TYPE
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
 
 /**
  * A root type for display hierarchy
  */
 @Type(TYPE)
-public interface Vision : Described {
+public interface Vision : Described, CoroutineScope {
 
     /**
      * The parent object of this one. If null, this one is a root.
      */
     public var parent: VisionGroup?
 
+    public val manager: VisionManager? get() = parent?.manager
+
+    override val coroutineContext: CoroutineContext
+        get() = manager?.context?.coroutineContext ?: EmptyCoroutineContext
+
     /**
      * Get property.
      * @param inherit toggles parent node property lookup. Null means inference from descriptor. Default is false.
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
index 26ec2523..47ed889e 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
@@ -1,7 +1,5 @@
 package space.kscience.visionforge
 
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
@@ -30,14 +28,14 @@ internal data class PropertyListener(
  */
 @Serializable
 @SerialName("vision")
-public open class VisionBase(
-    internal var properties: Config? = null,
-    @Transient override var parent: VisionGroup? = null,
-    @Transient public val coroutineScope: CoroutineScope = GlobalScope,
-) : Vision {
+public open class VisionBase : Vision {
+    protected var properties: Config? = null
+
+    @Transient
+    override var parent: VisionGroup? = null
 
     @Synchronized
-    protected fun getOrCreateConfig(): Config {
+    protected fun getOrCreateProperties(): Config {
         if (properties == null) {
             val newProperties = Config()
             properties = newProperties
@@ -77,7 +75,7 @@ public open class VisionBase(
     }
 
     override fun setProperty(name: Name, item: MetaItem?, notify: Boolean) {
-        getOrCreateConfig().setItem(name, item)
+        getOrCreateProperties().setItem(name, item)
         if (notify) {
             invalidateProperty(name)
         }
@@ -104,7 +102,7 @@ public open class VisionBase(
         get() = propertyInvalidationFlow
 
     override fun invalidateProperty(propertyName: Name) {
-        coroutineScope.launch {
+        launch {
             if (propertyName == STYLE_KEY) {
                 updateStyles(styles)
             }
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroup.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroup.kt
index fa22d072..4f16982b 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroup.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroup.kt
@@ -79,6 +79,7 @@ public operator fun <V : Vision> VisionContainer<V>.get(str: String): V? = get(s
 public operator fun <V : Vision> VisionContainerBuilder<V>.set(token: NameToken, child: V?): Unit =
     set(token.asName(), child)
 
-public operator fun <V : Vision> VisionContainerBuilder<V>.set(key: String?, child: V?): Unit = set(key?.toName(), child)
+public operator fun <V : Vision> VisionContainerBuilder<V>.set(key: String?, child: V?): Unit =
+    set(key?.toName(), child)
 
 public fun MutableVisionGroup.removeAll(): Unit = children.keys.map { it.asName() }.forEach { this[it] = null }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt
index f7f703ab..3e43c81d 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt
@@ -48,7 +48,7 @@ public open class VisionGroupBase(
      * Propagate children change event upwards
      */
     private fun childrenChanged(name: NameToken, before: Vision?, after: Vision?) {
-        coroutineScope.launch {
+        launch {
             _structureChanges.emit(MutableVisionGroup.StructureChange(name, before, after))
         }
     }
@@ -141,4 +141,16 @@ public open class VisionGroupBase(
         }
         super.update(change)
     }
+}
+
+/**
+ * Non-serializable root group used to propagate manager to its children
+ */
+internal class RootVisionGroup(override val manager: VisionManager) : VisionGroupBase()
+
+/**
+ * Designate this [VisionGroup] as a root group and assign a [VisionManager] as its parent
+ */
+public fun Vision.root(manager: VisionManager){
+    parent = RootVisionGroup(manager)
 }
\ No newline at end of file
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionRenderer.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionRenderer.kt
index 2e902d4d..e45e4f08 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionRenderer.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/HtmlVisionRenderer.kt
@@ -14,7 +14,7 @@ public fun TagConsumer<*>.embedVisionFragment(
     fragment: HtmlVisionFragment,
 ): Map<Name, Vision> {
     val visionMap = HashMap<Name, Vision>()
-    val consumer = object : VisionTagConsumer<Any?>(this@embedVisionFragment, idPrefix) {
+    val consumer = object : VisionTagConsumer<Any?>(this@embedVisionFragment, manager, idPrefix) {
         override fun DIV.renderVision(name: Name, vision: Vision, outputMeta: Meta) {
             visionMap[name] = vision
             script {
@@ -34,13 +34,13 @@ public fun FlowContent.embedVisionFragment(
     manager: VisionManager,
     idPrefix: String? = null,
     fragment: HtmlVisionFragment,
-): Map<Name, Vision>  = consumer.embedVisionFragment(manager, idPrefix, fragment)
+): Map<Name, Vision> = consumer.embedVisionFragment(manager, idPrefix, fragment)
 
 
 internal const val RENDER_FUNCTION_NAME = "renderAllVisionsById"
 
 @DFExperimental
-public fun TagConsumer<*>.embedAndRenderVisionFragment(manager: VisionManager, id: Any, fragment: HtmlVisionFragment){
+public fun TagConsumer<*>.embedAndRenderVisionFragment(manager: VisionManager, id: Any, fragment: HtmlVisionFragment) {
     div {
         div {
             this.id = id.toString()
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt
index 967e1851..18c53e4f 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt
@@ -17,7 +17,7 @@ import kotlin.collections.set
  * A placeholder object to attach inline vision builders.
  */
 @DFExperimental
-public class VisionOutput @PublishedApi internal constructor() {
+public class VisionOutput @PublishedApi internal constructor(public val manager: VisionManager) {
     public var meta: Meta = Meta.EMPTY
 
     //TODO expose a way to define required plugins.
@@ -32,6 +32,7 @@ public class VisionOutput @PublishedApi internal constructor() {
  */
 public abstract class VisionTagConsumer<R>(
     private val root: TagConsumer<R>,
+    public val manager:VisionManager,
     private val idPrefix: String? = null,
 ) : TagConsumer<R> by root {
 
@@ -62,7 +63,7 @@ public abstract class VisionTagConsumer<R>(
             script {
                 attributes["class"] = OUTPUT_META_CLASS
                 unsafe {
-                    +VisionManager.defaultJson.encodeToString(MetaSerializer, outputMeta)
+                    +manager.jsonFormat.encodeToString(MetaSerializer, outputMeta)
                 }
             }
         }
@@ -76,7 +77,7 @@ public abstract class VisionTagConsumer<R>(
         name: Name,
         visionProvider: VisionOutput.() -> Vision,
     ): T {
-        val output = VisionOutput()
+        val output = VisionOutput(manager)
         val vision = output.visionProvider()
         return vision(name, vision, output.meta)
     }
diff --git a/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt b/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt
index e50c13b3..1199b89b 100644
--- a/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt
+++ b/visionforge-core/src/commonTest/kotlin/space/kscience/visionforge/html/HtmlTagTest.kt
@@ -2,14 +2,13 @@ package space.kscience.visionforge.html
 
 import kotlinx.html.*
 import kotlinx.html.stream.createHTML
+import space.kscience.dataforge.context.Global
+import space.kscience.dataforge.context.fetch
 import space.kscience.dataforge.meta.Meta
 import space.kscience.dataforge.meta.set
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.dataforge.names.Name
-import space.kscience.visionforge.Vision
-import space.kscience.visionforge.VisionBase
-import space.kscience.visionforge.configure
-import space.kscience.visionforge.meta
+import space.kscience.visionforge.*
 import kotlin.test.Test
 
 typealias HtmlVisionRenderer = FlowContent.(name: Name, vision: Vision, meta: Meta) -> Unit
@@ -20,7 +19,7 @@ fun FlowContent.renderVisionFragment(
     fragment: HtmlVisionFragment,
 ): Map<Name, Vision> {
     val visionMap = HashMap<Name, Vision>()
-    val consumer = object : VisionTagConsumer<Any?>(consumer, idPrefix) {
+    val consumer = object : VisionTagConsumer<Any?>(consumer, Global.fetch(VisionManager), idPrefix) {
         override fun DIV.renderVision(name: Name, vision: Vision, outputMeta: Meta) {
             visionMap[name] = vision
             renderer(name, vision, outputMeta)
@@ -37,7 +36,7 @@ class HtmlTagTest {
     fun VisionOutput.base(block: VisionBase.() -> Unit) =
         VisionBase().apply(block)
 
-     val fragment: HtmlVisionFragment = {
+    val fragment: HtmlVisionFragment = {
         div {
             h1 { +"Head" }
             vision("ddd") {
@@ -72,7 +71,7 @@ class HtmlTagTest {
     @Test
     fun testStringRender() {
         println(
-            createHTML().div{
+            createHTML().div {
                 renderVisionFragment(simpleVisionRenderer, fragment = fragment)
             }
         )
diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
index 22d670dd..98803115 100644
--- a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
@@ -128,7 +128,7 @@ public class VisionClient : AbstractPlugin() {
 
             logger.info { "Updating vision data from $wsUrl" }
 
-            val ws = WebSocket(wsUrl.toString()).apply {
+            WebSocket(wsUrl.toString()).apply {
                 onmessage = { messageEvent ->
                     val stringData: String? = messageEvent.data as? String
                     if (stringData != null) {
diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/elementOutput.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/elementOutput.kt
index 555e4627..f85fdabb 100644
--- a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/elementOutput.kt
+++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/elementOutput.kt
@@ -17,7 +17,7 @@ public interface ElementVisionRenderer {
     /**
      * Display the [vision] inside a given [element] replacing its current content
      */
-    public fun render(element: Element, vision: Vision, meta: Meta = Meta.EMPTY): Unit
+    public fun render(element: Element, vision: Vision, meta: Meta = Meta.EMPTY)
 
     public companion object {
         public const val TYPE: String = "elementVisionRenderer"
diff --git a/visionforge-plotly/build.gradle.kts b/visionforge-plotly/build.gradle.kts
index ea0aa763..b62876ab 100644
--- a/visionforge-plotly/build.gradle.kts
+++ b/visionforge-plotly/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     id("ru.mipt.npm.gradle.mpp")
 }
 
-val plotlyVersion = "0.4.2"
+val plotlyVersion = "0.4.3"
 
 kscience {
     useSerialization()
diff --git a/visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/VisionOfPlotly.kt b/visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/VisionOfPlotly.kt
index c9d6db78..773ff4bf 100644
--- a/visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/VisionOfPlotly.kt
+++ b/visionforge-plotly/src/commonMain/kotlin/space/kscience/visionforge/plotly/VisionOfPlotly.kt
@@ -1,5 +1,6 @@
 package space.kscience.visionforge.plotly
 
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import space.kscience.dataforge.meta.Config
 import space.kscience.dataforge.misc.DFExperimental
@@ -7,13 +8,23 @@ import space.kscience.plotly.Plot
 import space.kscience.plotly.Plotly
 import space.kscience.visionforge.VisionBase
 import space.kscience.visionforge.html.VisionOutput
+import space.kscience.visionforge.root
 
 @Serializable
-public class VisionOfPlotly(private val plotConfig: Config) : VisionBase(plotConfig){
-    public val plot: Plot get() = Plot(plotConfig)
+@SerialName("vision.plotly")
+public class VisionOfPlotly private constructor() : VisionBase() {
+    public constructor(plot: Plot) : this() {
+        properties = plot.config
+    }
+
+    public val plot: Plot get() = Plot(properties ?: Config())
 }
 
-public fun Plot.toVision(): VisionOfPlotly = VisionOfPlotly(config)
+public fun Plot.asVision(): VisionOfPlotly = VisionOfPlotly(this)
 
 @DFExperimental
-public inline fun VisionOutput.plotly(block: Plot.() -> Unit): VisionOfPlotly = VisionOfPlotly(Plotly.plot(block).config)
\ No newline at end of file
+public inline fun VisionOutput.plotly(
+    block: Plot.() -> Unit,
+): VisionOfPlotly = VisionOfPlotly(Plotly.plot(block)).apply {
+    root(this@plotly.manager)
+}
\ No newline at end of file
diff --git a/visionforge-plotly/src/jsMain/kotlin/space/kscience/visionforge/plotly/plotlyJs.kt b/visionforge-plotly/src/jsMain/kotlin/space/kscience/visionforge/plotly/plotlyJs.kt
index 317a6930..be9e1e08 100644
--- a/visionforge-plotly/src/jsMain/kotlin/space/kscience/visionforge/plotly/plotlyJs.kt
+++ b/visionforge-plotly/src/jsMain/kotlin/space/kscience/visionforge/plotly/plotlyJs.kt
@@ -31,6 +31,8 @@ public actual class PlotlyPlugin : VisionPlugin(), ElementVisionRenderer {
     override fun render(element: Element, vision: Vision, meta: Meta) {
         val plot = (vision as? VisionOfPlotly)?.plot ?: error("VisionOfPlotly expected but ${vision::class} found")
         val config = PlotlyConfig.read(meta)
+        println(plot.config)
+        println(plot.data[0].toMeta())
         element.plot(plot, config)
     }
 
diff --git a/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt b/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
index 1c398e74..6f0a3959 100644
--- a/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
@@ -43,12 +43,6 @@ import java.net.URI
 import kotlin.collections.set
 import kotlin.time.Duration
 
-public enum class VisionServerDataMode {
-    EMBED,
-    FETCH,
-    CONNECT
-}
-
 
 /**
  * A ktor plugin container with given [routing]
@@ -61,7 +55,9 @@ public class VisionServer internal constructor(
     override val config: Config = Config()
     public var updateInterval: Long by config.long(300, key = UPDATE_INTERVAL_KEY)
     public var cacheFragments: Boolean by config.boolean(true)
-    public var dataMode: VisionServerDataMode = VisionServerDataMode.CONNECT
+    public var dataEmbed: Boolean by config.boolean(true, "data.embed".toName())
+    public var dataFetch: Boolean by config.boolean(false, "data.fetch".toName())
+    public var dataConnect: Boolean by config.boolean(true, "data.connect".toName())
 
     /**
      * a list of headers that should be applied to all pages
@@ -79,25 +75,26 @@ public class VisionServer internal constructor(
     ): Map<Name, Vision> {
         val visionMap = HashMap<Name, Vision>()
 
-        val consumer = object : VisionTagConsumer<Any?>(consumer) {
+        val consumer = object : VisionTagConsumer<Any?>(consumer, visionManager) {
             override fun DIV.renderVision(name: Name, vision: Vision, outputMeta: Meta) {
                 visionMap[name] = vision
                 // Toggle update mode
-                when (dataMode) {
-                    VisionServerDataMode.EMBED -> {
-                        script {
-                            attributes["class"] = OUTPUT_DATA_CLASS
-                            unsafe {
-                                +"\n${visionManager.encodeToString(vision)}\n"
-                            }
+                if (dataConnect) {
+                    attributes[OUTPUT_CONNECT_ATTRIBUTE] = "auto"
+                }
+
+                if (dataFetch) {
+                    attributes[OUTPUT_FETCH_ATTRIBUTE] = "auto"
+                }
+
+                if (dataEmbed) {
+                    script {
+                        type = "text/json"
+                        attributes["class"] = OUTPUT_DATA_CLASS
+                        unsafe {
+                            +"\n${visionManager.encodeToString(vision)}\n"
                         }
                     }
-                    VisionServerDataMode.FETCH -> {
-                        attributes[OUTPUT_FETCH_ATTRIBUTE] = "auto"
-                    }
-                    VisionServerDataMode.CONNECT -> {
-                        attributes[OUTPUT_CONNECT_ATTRIBUTE] = "auto"
-                    }
                 }
             }
         }
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt
index 1a83d2cb..67224699 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solids.kt
@@ -68,4 +68,5 @@ public class Solids(meta: Meta) : VisionPlugin(meta) {
 
 @VisionBuilder
 @DFExperimental
-public inline fun VisionOutput.solid(block: SolidGroup.() -> Unit): SolidGroup = SolidGroup().apply(block)
+public inline fun VisionOutput.solid(block: SolidGroup.() -> Unit): SolidGroup =
+    SolidGroup().apply(block).apply { root(this@solid.manager) }
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
index f5629cbd..e62b4cb2 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
@@ -24,9 +24,7 @@ import org.w3c.dom.Node
 import org.w3c.dom.events.MouseEvent
 import space.kscience.dataforge.context.info
 import space.kscience.dataforge.context.logger
-import space.kscience.dataforge.meta.get
-import space.kscience.dataforge.meta.string
-import space.kscience.dataforge.meta.useProperty
+import space.kscience.dataforge.meta.*
 import space.kscience.dataforge.names.*
 import space.kscience.visionforge.Colors
 import space.kscience.visionforge.solid.Solid
@@ -41,8 +39,8 @@ import kotlin.math.sin
  */
 public class ThreeCanvas(
     public val three: ThreePlugin,
-    public val options: Canvas3DOptions,
 ) {
+    public val options = Canvas3DOptions()
 
     private var boundingBox: Box3? = null
     private var root: Object3D? = null
@@ -315,4 +313,11 @@ public class ThreeCanvas(
         private const val AXES_NAME = "@axes"
         private const val CLIP_HELPER_NAME = "@clipping"
     }
+}
+
+public fun ThreeCanvas.configure(options: Canvas3DOptions) {
+    this.options.update(options.toMeta())
+    options.onChange(this) { name, _, newItem ->
+        options[name] = newItem
+    }
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
index da3a94b6..3c4e8d7a 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
@@ -8,6 +8,7 @@ import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
 import space.kscience.dataforge.context.*
 import space.kscience.dataforge.meta.Meta
+import space.kscience.dataforge.meta.update
 import space.kscience.dataforge.names.*
 import space.kscience.visionforge.ElementVisionRenderer
 import space.kscience.visionforge.Vision
@@ -111,12 +112,13 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
         }
     }
 
-    public fun createCanvas(
+    private val canvasCache = HashMap<Element, ThreeCanvas>()
+
+    public fun getOrCreateCanvas(
         element: Element,
-        options: Canvas3DOptions = Canvas3DOptions.empty(),
-    ): ThreeCanvas = ThreeCanvas(this, options).apply {
+    ): ThreeCanvas = canvasCache.getOrPut(element){ThreeCanvas(this).apply {
         attach(element)
-    }
+    }}
 
     override fun content(target: String): Map<Name, Any> {
         return when (target) {
@@ -128,11 +130,10 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
     override fun rateVision(vision: Vision): Int =
         if (vision is Solid) ElementVisionRenderer.DEFAULT_RATING else ElementVisionRenderer.ZERO_RATING
 
-    public fun renderSolid(
+    fun renderSolid(
         element: Element,
         vision: Solid,
-        options: Canvas3DOptions,
-    ): ThreeCanvas = createCanvas(element, options).apply {
+    ): ThreeCanvas = getOrCreateCanvas(element).apply {
         render(vision)
     }
 
@@ -140,8 +141,9 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
         renderSolid(
             element,
             vision as? Solid ?: error("Solid expected but ${vision::class} found"),
-            Canvas3DOptions.read(meta)
-        )
+        ).apply {
+            options.update(meta)
+        }
     }
 
     public companion object : PluginFactory<ThreePlugin> {
@@ -154,8 +156,10 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
 public fun ThreePlugin.render(
     element: HTMLElement,
     obj: Solid,
-    options: Canvas3DOptions.() -> Unit = {},
-): ThreeCanvas = renderSolid(element, obj, Canvas3DOptions(options))
+    optionsBuilder: Canvas3DOptions.() -> Unit = {},
+): ThreeCanvas = renderSolid(element, obj).apply {
+    options.apply(optionsBuilder)
+}
 
 internal operator fun Object3D.set(token: NameToken, object3D: Object3D) {
     object3D.name = token.toString()

From 288307eaa833671ce5672058170799e6cd4c02c9 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 6 Jun 2021 20:57:39 +0300
Subject: [PATCH 119/151] Finish ThreeCancas encapsulation

---
 .../visionforge/gdml/demo/GDMLAppComponent.kt | 30 +++++------
 .../visionforge/gdml/demo/GdmlJsDemoApp.kt    |  2 +-
 .../mipt/npm/muon/monitor/MMAppComponent.kt   | 23 ++++----
 .../visionforge/solid/demo/ThreeDemoGrid.kt   |  3 +-
 .../visionforge/bootstrap/outputConfig.kt     | 35 ++++++-------
 .../visionforge/bootstrap/threeControls.kt    | 20 +++----
 .../visionforge/react/ThreeCanvasComponent.kt | 15 ++----
 .../ThreeViewWithControls.kt                  | 34 +++++-------
 .../ThreeWithControls.kt                      |  2 +-
 .../ringThreeControls.kt                      | 52 +++++++++----------
 .../space/kscience/visionforge/Vision.kt      |  5 +-
 .../space/kscience/visionforge/VisionBase.kt  |  1 -
 .../kscience/visionforge/VisionChange.kt      |  8 ++-
 .../kscience/visionforge/VisionGroupBase.kt   |  2 +-
 .../kscience/visionforge/VisionManager.kt     |  5 +-
 .../visionforge/solid/three/ThreeCanvas.kt    | 19 +++----
 .../visionforge/solid/three/ThreePlugin.kt    |  9 ++--
 17 files changed, 122 insertions(+), 143 deletions(-)

diff --git a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
index 2122e8bd..c9afca38 100644
--- a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
@@ -11,7 +11,6 @@ import space.kscience.dataforge.context.fetch
 import space.kscience.dataforge.names.Name
 import space.kscience.gdml.Gdml
 import space.kscience.gdml.decodeFromString
-import space.kscience.visionforge.Vision
 import space.kscience.visionforge.bootstrap.gridRow
 import space.kscience.visionforge.bootstrap.nameCrumbs
 import space.kscience.visionforge.gdml.toVision
@@ -21,27 +20,31 @@ import space.kscience.visionforge.ring.ringThreeControls
 import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.Solids
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
-import space.kscience.visionforge.solid.three.ThreeCanvas
 import styled.css
 import styled.styledDiv
 
 external interface GDMLAppProps : RProps {
     var context: Context
-    var rootVision: Vision?
+    var vision: Solid?
     var selected: Name?
 }
 
 @JsExport
 val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
     var selected by useState { props.selected }
-    var canvas: ThreeCanvas? by useState { null }
-    var vision: Vision? by useState { props.rootVision }
+    var vision: Solid? by useState { props.vision }
 
     val onSelect: (Name?) -> Unit = {
         selected = it
     }
 
-    val visionManager = useMemo({ props.context.fetch(Solids).visionManager }, arrayOf(props.context))
+    val options = useMemo {
+        Canvas3DOptions.invoke {
+            this.onSelect = onSelect
+        }
+    }
+
+    val visionManager = useMemo(props.context) { props.context.fetch(Solids).visionManager }
 
     fun loadData(name: String, data: String) {
         val parsedVision = when {
@@ -56,7 +59,7 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
             }
         }
 
-        vision = parsedVision
+        vision = parsedVision as? Solid ?: error("Parsed vision is not a solid")
     }
 
     gridRow {
@@ -78,14 +81,9 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
             child(ThreeCanvasComponent) {
                 attrs {
                     this.context = props.context
-                    this.obj = vision as? Solid
+                    this.obj = vision
                     this.selected = selected
-                    this.options = Canvas3DOptions.invoke {
-                        this.onSelect = onSelect
-                    }
-                    this.canvasCallback = {
-                        canvas = it
-                    }
+                    this.options = options
                 }
             }
 
@@ -111,9 +109,7 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
                     }
                 }
             }
-            canvas?.let {
-                ringThreeControls(it, selected, onSelect)
-            }
+            ringThreeControls(options, props.vision, selected, onSelect)
         }
     }
 }
diff --git a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt
index 1b40155e..aefb24be 100644
--- a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt
+++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt
@@ -29,7 +29,7 @@ private class GDMLDemoApp : Application {
                 //println(context.plugins.fetch(VisionManager).encodeToString(vision))
                 attrs {
                     this.context = context
-                    this.rootVision = vision
+                    this.vision = vision
                 }
             }
         }
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
index 8eb251ad..368bef5f 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
@@ -6,11 +6,8 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.css.*
 import kotlinx.html.js.onClickFunction
-import react.RProps
-import react.child
+import react.*
 import react.dom.*
-import react.functionalComponent
-import react.useState
 import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.NameToken
@@ -26,7 +23,6 @@ import space.kscience.visionforge.react.flexColumn
 import space.kscience.visionforge.react.objectTree
 import space.kscience.visionforge.solid.specifications.Camera
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
-import space.kscience.visionforge.solid.three.ThreeCanvas
 import styled.css
 import styled.styledDiv
 import kotlin.math.PI
@@ -49,12 +45,17 @@ private val canvasConfig = Canvas3DOptions {
 @JsExport
 val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
     var selected by useState { props.selected }
-    var canvas: ThreeCanvas? by useState { null }
 
     val onSelect: (Name?) -> Unit = {
         selected = it
     }
 
+    val options = useMemo {
+        Canvas3DOptions.invoke {
+            this.onSelect = onSelect
+        }
+    }
+
     val root = props.model.root
 
     gridRow {
@@ -95,9 +96,6 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                     this.options = canvasConfig.apply {
                         this.onSelect = onSelect
                     }
-                    this.canvasCallback = {
-                        canvas = it
-                    }
                 }
             }
         }
@@ -113,11 +111,10 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                     flex(0.0, 1.0, FlexBasis.zero)
                 }
                 //settings
-                canvas?.let {
-                    card("Canvas configuration") {
-                        canvasControls(it)
-                    }
+                card("Canvas configuration") {
+                    canvasControls(options, root)
                 }
+
                 card("Events") {
                     button {
                         +"Next"
diff --git a/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt
index 18e23381..bef5404f 100644
--- a/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt
+++ b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/ThreeDemoGrid.kt
@@ -19,7 +19,6 @@ import space.kscience.visionforge.VisionLayout
 import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.three.ThreeCanvas
 import space.kscience.visionforge.solid.three.ThreePlugin
-import space.kscience.visionforge.solid.three.configure
 
 class ThreeDemoGrid(element: Element) : VisionLayout<Solid> {
     private lateinit var navigationElement: HTMLElement
@@ -71,7 +70,7 @@ class ThreeDemoGrid(element: Element) : VisionLayout<Solid> {
                 }
             }
             val element = document.getElementById("output-$name") ?: error("Element not found")
-            three.getOrCreateCanvas(element).also { it.configure(canvasOptions) }
+            three.getOrCreateCanvas(element, canvasOptions)
         }.render(vision)
     }
 }
diff --git a/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt
index 2edbaab8..3423baf8 100644
--- a/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt
+++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/outputConfig.kt
@@ -13,12 +13,11 @@ import react.*
 import react.dom.attrs
 import react.dom.button
 import space.kscience.dataforge.meta.withDefault
+import space.kscience.visionforge.Vision
 import space.kscience.visionforge.react.flexColumn
 import space.kscience.visionforge.react.flexRow
 import space.kscience.visionforge.react.propertyEditor
-import space.kscience.visionforge.solid.SolidGroup
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
-import space.kscience.visionforge.solid.three.ThreeCanvas
 import styled.css
 
 private fun saveData(event: Event, fileName: String, mimeType: String = "text/plain", dataBuilder: () -> String) {
@@ -30,37 +29,33 @@ private fun saveData(event: Event, fileName: String, mimeType: String = "text/pl
     fileSaver.saveAs(blob, fileName)
 }
 
-public fun RBuilder.canvasControls(canvas: ThreeCanvas): ReactElement {
+public fun RBuilder.canvasControls(canvasOptions: Canvas3DOptions, vision: Vision?): ReactElement {
     return child(CanvasControls) {
         attrs {
-            this.canvas = canvas
+            this.canvasOptions = canvasOptions
+            this.vision = vision
         }
     }
 }
 
 public external interface CanvasControlsProps : RProps {
-    public var canvas: ThreeCanvas
+    public var canvasOptions: Canvas3DOptions
+    public var vision: Vision?
 }
 
 public val CanvasControls: FunctionalComponent<CanvasControlsProps> = functionalComponent("CanvasControls") { props ->
-    val visionManager = useMemo(
-        { props.canvas.three.solids.visionManager },
-        arrayOf(props.canvas)
-    )
     flexColumn {
         flexRow {
-            css{
+            css {
                 border(1.px, BorderStyle.solid, Color.blue)
                 padding(4.px)
             }
-            button {
-                +"Export"
-                attrs {
-                    onClickFunction = {
-                        val json = (props.canvas.content as? SolidGroup)?.let { group ->
-                            visionManager.encodeToString(group)
-                        }
-                        if (json != null) {
+            props.vision?.manager?.let { manager ->
+                button {
+                    +"Export"
+                    attrs {
+                        onClickFunction = {
+                            val json = manager.encodeToString(props.vision!!)
                             saveData(it, "object.json", "text/json") {
                                 json
                             }
@@ -70,8 +65,8 @@ public val CanvasControls: FunctionalComponent<CanvasControlsProps> = functional
             }
         }
         propertyEditor(
-            ownProperties = props.canvas.options,
-            allProperties = props.canvas.options.withDefault(Canvas3DOptions.descriptor.defaultMeta),
+            ownProperties = props.canvasOptions,
+            allProperties = props.canvasOptions.withDefault(Canvas3DOptions.descriptor.defaultMeta),
             descriptor = Canvas3DOptions.descriptor,
             expanded = false
         )
diff --git a/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt
index a0af57aa..dc384067 100644
--- a/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt
+++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt
@@ -9,23 +9,23 @@ import space.kscience.dataforge.names.isEmpty
 import space.kscience.visionforge.Vision
 import space.kscience.visionforge.VisionGroup
 import space.kscience.visionforge.react.objectTree
-import space.kscience.visionforge.solid.three.ThreeCanvas
+import space.kscience.visionforge.solid.specifications.Canvas3DOptions
 import styled.css
 import styled.styledDiv
 
 public external interface ThreeControlsProps : RProps {
-    public var canvas: ThreeCanvas
+    public var canvasOptions: Canvas3DOptions
+    public var vision: Vision?
     public var selected: Name?
     public var onSelect: (Name) -> Unit
 }
 
 @JsExport
 public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalComponent { props ->
-    val vision = props.canvas.content
     tabPane(if (props.selected != null) "Properties" else null) {
         tab("Canvas") {
             card("Canvas configuration") {
-                canvasControls(props.canvas)
+                canvasControls(props.canvasOptions, props.vision)
             }
         }
         tab("Tree") {
@@ -38,7 +38,7 @@ public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalCo
                 css {
                     flex(1.0, 1.0, FlexBasis.inherit)
                 }
-                props.canvas.content?.let {
+                props.vision?.let {
                     objectTree(it, props.selected, props.onSelect)
                 }
             }
@@ -47,8 +47,8 @@ public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalCo
             props.selected.let { selected ->
                 val selectedObject: Vision? = when {
                     selected == null -> null
-                    selected.isEmpty() -> vision
-                    else -> (vision as? VisionGroup)?.get(selected)
+                    selected.isEmpty() -> props.vision
+                    else -> (props.vision as? VisionGroup)?.get(selected)
                 }
                 if (selectedObject != null) {
                     visionPropertyEditor(selectedObject, key = selected)
@@ -62,13 +62,15 @@ public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalCo
 }
 
 public fun RBuilder.threeControls(
-    canvas: ThreeCanvas,
+    canvasOptions: Canvas3DOptions,
+    vision: Vision?,
     selected: Name?,
     onSelect: (Name) -> Unit = {},
     builder: TabBuilder.() -> Unit = {},
 ): ReactElement = child(ThreeControls) {
     attrs {
-        this.canvas = canvas
+        this.canvasOptions = canvasOptions
+        this.vision = vision
         this.selected = selected
         this.onSelect = onSelect
     }
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
index f18854a6..1b1d6ce6 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
@@ -14,16 +14,14 @@ 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 space.kscience.visionforge.solid.three.configure
 import styled.css
 import styled.styledDiv
 
 public external interface ThreeCanvasProps : RProps {
     public var context: Context
+    public var options: Canvas3DOptions
     public var obj: Solid?
-    public var options: Canvas3DOptions?
     public var selected: Name?
-    public var canvasCallback: ((ThreeCanvas?) -> Unit)?
 }
 
 public external interface ThreeCanvasState : RState {
@@ -42,20 +40,13 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
     useEffect(listOf(props.obj, props.options, elementRef)) {
         if (canvas == null) {
             val element = elementRef.current as? HTMLElement ?: error("Canvas element not found")
-            val newCanvas: ThreeCanvas = three.getOrCreateCanvas(element)
-            props.options?.let {
-                newCanvas.configure(it)
-            }
-            props.canvasCallback?.invoke(newCanvas)
-            canvas = newCanvas
+            canvas = three.getOrCreateCanvas(element, props.options)
         }
     }
 
     useEffect(listOf(canvas, props.obj)) {
         props.obj?.let { obj ->
-            if (canvas?.content != obj) {
-                canvas?.render(obj)
-            }
+            canvas?.render(obj)
         }
     }
 
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
index 2b1dca09..59099f60 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
@@ -1,10 +1,7 @@
 package space.kscience.visionforge.ring
 
 import kotlinx.css.*
-import react.RProps
-import react.child
-import react.functionalComponent
-import react.useState
+import react.*
 import ringui.grid.ringCol
 import ringui.grid.ringGrid
 import ringui.grid.ringRow
@@ -14,25 +11,27 @@ import space.kscience.visionforge.Vision
 import space.kscience.visionforge.react.ThreeCanvasComponent
 import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
-import space.kscience.visionforge.solid.three.ThreeCanvas
 import styled.css
 import styled.styledDiv
 
-public external interface GdmlViewProps : RProps {
+public external interface ThreeWithControlsProps : RProps {
     public var context: Context
-    public var rootVision: Vision?
+    public var vision: Vision?
     public var selected: Name?
 }
 
 @JsExport
-public val ThreeViewWithControls: (props: GdmlViewProps) -> dynamic =
-    functionalComponent<GdmlViewProps>("ThreeViewWithControls") { props ->
+public val ThreeViewWithControls: (props: ThreeWithControlsProps) -> dynamic =
+    functionalComponent("ThreeViewWithControls") { props ->
         var selected by useState { props.selected }
-        var canvas: ThreeCanvas? by useState { null }
-
         val onSelect: (Name?) -> Unit = {
             selected = it
         }
+        val options = useMemo {
+            Canvas3DOptions.invoke {
+                this.onSelect = onSelect
+            }
+        }
 
         styledDiv {
             css {
@@ -50,14 +49,9 @@ public val ThreeViewWithControls: (props: GdmlViewProps) -> dynamic =
                         child(ThreeCanvasComponent) {
                             attrs {
                                 this.context = props.context
-                                this.obj = props.rootVision as? Solid
+                                this.obj = props.vision as? Solid
                                 this.selected = selected
-                                this.options = Canvas3DOptions.invoke {
-                                    this.onSelect = onSelect
-                                }
-                                this.canvasCallback = {
-                                    canvas = it
-                                }
+                                this.options = options
                             }
                         }
 
@@ -76,9 +70,7 @@ public val ThreeViewWithControls: (props: GdmlViewProps) -> dynamic =
                                 height = 100.pct
                                 overflowY = Overflow.auto
                             }
-                            canvas?.let {
-                                ringThreeControls(it, selected, onSelect)
-                            }
+                            ringThreeControls(options, props.vision, selected, onSelect)
                         }
                     }
                 }
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControls.kt
index 6d7aaa0b..6af8450c 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControls.kt
@@ -28,7 +28,7 @@ public class ThreeWithControls : AbstractPlugin(), ElementVisionRenderer {
             child(ThreeViewWithControls) {
                 attrs {
                     this.context = this@ThreeWithControls.context
-                    this.rootVision = vision
+                    this.vision = vision
                 }
             }
         }
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
index 1a0d101c..c88838d6 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
@@ -18,13 +18,12 @@ import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.isEmpty
 import space.kscience.visionforge.Vision
 import space.kscience.visionforge.VisionGroup
+import space.kscience.visionforge.encodeToString
 import space.kscience.visionforge.react.flexColumn
 import space.kscience.visionforge.react.flexRow
 import space.kscience.visionforge.react.objectTree
 import space.kscience.visionforge.react.propertyEditor
-import space.kscience.visionforge.solid.SolidGroup
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
-import space.kscience.visionforge.solid.three.ThreeCanvas
 import styled.css
 import styled.styledDiv
 
@@ -37,48 +36,45 @@ internal fun saveData(event: Event, fileName: String, mimeType: String = "text/p
     fileSaver.saveAs(blob, fileName)
 }
 
-internal fun RBuilder.canvasControls(canvas: ThreeCanvas): ReactElement {
+internal fun RBuilder.canvasControls(options: Canvas3DOptions, vision: Vision?): ReactElement {
     return child(CanvasControls) {
         attrs {
-            this.canvas = canvas
+            this.options = options
+            this.vision = vision
         }
     }
 }
 
 internal external interface CanvasControlsProps : RProps {
-    public var canvas: ThreeCanvas
+    public var options: Canvas3DOptions
+    public var vision: Vision?
 }
 
 internal val CanvasControls: FunctionalComponent<CanvasControlsProps> = functionalComponent("CanvasControls") { props ->
-    val visionManager = useMemo(
-        { props.canvas.three.solids.visionManager },
-        arrayOf(props.canvas)
-    )
     flexColumn {
         flexRow {
             css {
                 border(1.px, BorderStyle.solid, Color.blue)
                 padding(4.px)
             }
-            button {
-                +"Export"
-                attrs {
-                    onClickFunction = {
-                        val json = (props.canvas.content as? SolidGroup)?.let { group ->
-                            visionManager.encodeToString(group)
-                        }
-                        if (json != null) {
+            props.vision?.let { vision ->
+                button {
+                    +"Export"
+                    attrs {
+                        onClickFunction = {
+                            val json = vision.encodeToString()
                             saveData(it, "object.json", "text/json") {
                                 json
                             }
+
                         }
                     }
                 }
             }
         }
         propertyEditor(
-            ownProperties = props.canvas.options,
-            allProperties = props.canvas.options.withDefault(Canvas3DOptions.descriptor.defaultMeta),
+            ownProperties = props.options,
+            allProperties = props.options.withDefault(Canvas3DOptions.descriptor.defaultMeta),
             descriptor = Canvas3DOptions.descriptor,
             expanded = false
         )
@@ -88,18 +84,18 @@ internal val CanvasControls: FunctionalComponent<CanvasControlsProps> = function
 
 
 public external interface ThreeControlsProps : RProps {
-    public var canvas: ThreeCanvas
+    public var canvasOptions: Canvas3DOptions
+    public var vision: Vision?
     public var selected: Name?
     public var onSelect: (Name) -> Unit
 }
 
 @JsExport
 public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalComponent { props ->
-    val vision = props.canvas.content
     ringSmartTabs(if (props.selected != null) "Properties" else null) {
         ringTab("Canvas") {
             ringIsland("Canvas configuration") {
-                canvasControls(props.canvas)
+                canvasControls(props.canvasOptions, props.vision)
             }
         }
         ringTab("Tree") {
@@ -113,7 +109,7 @@ public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalCo
                     css {
                         flex(1.0, 1.0, FlexBasis.inherit)
                     }
-                    props.canvas.content?.let {
+                    props.vision?.let {
                         objectTree(it, props.selected, props.onSelect)
                     }
                 }
@@ -123,8 +119,8 @@ public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalCo
             props.selected.let { selected ->
                 val selectedObject: Vision? = when {
                     selected == null -> null
-                    selected.isEmpty() -> vision
-                    else -> (vision as? VisionGroup)?.get(selected)
+                    selected.isEmpty() -> props.vision
+                    else -> (props.vision as? VisionGroup)?.get(selected)
                 }
                 if (selectedObject != null) {
                     ringPropertyEditor(selectedObject, key = selected)
@@ -136,13 +132,15 @@ public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalCo
 }
 
 public fun RBuilder.ringThreeControls(
-    canvas: ThreeCanvas,
+    canvasOptions: Canvas3DOptions,
+    vision: Vision?,
     selected: Name?,
     onSelect: (Name) -> Unit = {},
     builder: RBuilder.() -> Unit = {},
 ): ReactElement = child(ThreeControls) {
     attrs {
-        this.canvas = canvas
+        this.canvasOptions = canvasOptions
+        this.vision = vision
         this.selected = selected
         this.onSelect = onSelect
     }
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt
index 23779bd1..07f063ca 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/Vision.kt
@@ -27,6 +27,9 @@ public interface Vision : Described, CoroutineScope {
      */
     public var parent: VisionGroup?
 
+    /**
+     * Owner [VisionManager]. Used to define coroutine scope a serialization
+     */
     public val manager: VisionManager? get() = parent?.manager
 
     override val coroutineContext: CoroutineContext
@@ -69,7 +72,7 @@ public interface Vision : Described, CoroutineScope {
     /**
      * Notify all listeners that a property has been changed and should be invalidated
      */
-    public fun invalidateProperty(propertyName: Name): Unit
+    public fun invalidateProperty(propertyName: Name)
 
     /**
      * Update this vision using a dif represented by [VisionChange].
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
index 47ed889e..c9b68219 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
@@ -92,7 +92,6 @@ public open class VisionBase : Vision {
             }
     }
 
-
     //TODO check memory consumption for the flow
     @Transient
     private val propertyInvalidationFlow: MutableSharedFlow<Name> = MutableSharedFlow()
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionChange.kt
index 25e0dc8e..85b147ab 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionChange.kt
@@ -64,9 +64,15 @@ private fun Vision.isolate(manager: VisionManager): Vision {
     return manager.decodeFromJson(json)
 }
 
+/**
+ * @param void flag showing that this vision child should be removed
+ * @param vision a new value for vision content
+ * @param properties updated properties
+ * @param children a map of children changed in ths [VisionChange]. If a child to be removed, set [void] flag to true.
+ */
 @Serializable
 public data class VisionChange(
-    public val reset: Boolean = false,
+    public val void: Boolean = false,
     public val vision: Vision? = null,
     @Serializable(MetaSerializer::class) public val properties: Meta? = null,
     public val children: Map<Name, VisionChange>? = null,
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt
index 3e43c81d..44800673 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt
@@ -134,7 +134,7 @@ public open class VisionGroupBase(
     override fun update(change: VisionChange) {
         change.children?.forEach { (name, change) ->
             when {
-                change.reset -> set(name, null)
+                change.void -> set(name, null)
                 change.vision != null -> set(name, change.vision)
                 else -> get(name)?.update(change)
             }
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt
index d45cc906..b3e9faf4 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt
@@ -95,4 +95,7 @@ public abstract class VisionPlugin(meta: Meta = Meta.EMPTY) : AbstractPlugin(met
 /**
  * Fetch a [VisionManager] from this plugin or create a child plugin with a [VisionManager]
  */
-public val Context.visionManager: VisionManager get() = fetch(VisionManager)
\ No newline at end of file
+public val Context.visionManager: VisionManager get() = fetch(VisionManager)
+
+public fun Vision.encodeToString(): String =
+    manager?.encodeToString(this) ?: error("VisionManager not defined in Vision")
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
index e62b4cb2..6a978e9e 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
@@ -39,9 +39,8 @@ import kotlin.math.sin
  */
 public class ThreeCanvas(
     public val three: ThreePlugin,
+    public val options: Canvas3DOptions = Canvas3DOptions()
 ) {
-    public val options = Canvas3DOptions()
-
     private var boundingBox: Box3? = null
     private var root: Object3D? = null
         set(value) {
@@ -52,9 +51,6 @@ public class ThreeCanvas(
     private val raycaster = Raycaster()
     private val mousePosition: Vector2 = Vector2()
 
-    public var content: Solid? = null
-        private set
-
     private val scene: Scene = Scene().apply {
         options.useProperty(Canvas3DOptions::axes, this) { axesConfig ->
             getObjectByName(AXES_NAME)?.let { remove(it) }
@@ -251,7 +247,6 @@ public class ThreeCanvas(
         val object3D = three.buildObject3D(vision)
         object3D.name = "@root"
         scene.add(object3D)
-        content = vision
         root = object3D
     }
 
@@ -315,9 +310,9 @@ public class ThreeCanvas(
     }
 }
 
-public fun ThreeCanvas.configure(options: Canvas3DOptions) {
-    this.options.update(options.toMeta())
-    options.onChange(this) { name, _, newItem ->
-        options[name] = newItem
-    }
-}
\ No newline at end of file
+//public fun ThreeCanvas.configure(newOptions: Canvas3DOptions) {
+//    this.options.update(newOptions.toMeta())
+//    options.onChange(this) { name, _, newItem ->
+//        this.options[name] = newItem
+//    }
+//}
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
index 3c4e8d7a..4d1f63b3 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
@@ -116,9 +116,12 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
 
     public fun getOrCreateCanvas(
         element: Element,
-    ): ThreeCanvas = canvasCache.getOrPut(element){ThreeCanvas(this).apply {
-        attach(element)
-    }}
+        options: Canvas3DOptions = Canvas3DOptions(),
+    ): ThreeCanvas = canvasCache.getOrPut(element) {
+        ThreeCanvas(this, options).apply {
+            attach(element)
+        }
+    }
 
     override fun content(target: String): Map<Name, Any> {
         return when (target) {

From bd1f7d75fcdcea10d0a609ed50a71508c391d229 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 6 Jun 2021 22:42:50 +0300
Subject: [PATCH 120/151] Fix reference child bug

---
 .../visionforge/gdml/demo/GDMLAppComponent.kt    |  2 +-
 demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt   |  3 ++-
 .../ThreeViewWithControls.kt                     |  6 ++++--
 .../visionforge/html/VisionTagConsumer.kt        |  5 +++++
 .../kscience/visionforge/solid/SolidReference.kt |  7 ++++++-
 .../visionforge/solid/three/ThreeCanvas.kt       | 16 ++++++++++------
 .../visionforge/solid/three/ThreePlugin.kt       |  4 +---
 7 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
index c9afca38..0a0e83b9 100644
--- a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
@@ -109,7 +109,7 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
                     }
                 }
             }
-            ringThreeControls(options, props.vision, selected, onSelect)
+            ringThreeControls(options, vision, selected, onSelect)
         }
     }
 }
diff --git a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
index a9070af7..344c5c97 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
@@ -3,6 +3,7 @@ package space.kscience.visionforge.examples
 import space.kscience.dataforge.context.Context
 import space.kscience.gdml.GdmlShowCase
 import space.kscience.visionforge.gdml.toVision
+import space.kscience.visionforge.html.ResourceLocation
 import space.kscience.visionforge.solid.Solids
 
 fun main() {
@@ -10,7 +11,7 @@ fun main() {
         plugin(Solids)
     }
 
-    context.makeVisionFile {
+    context.makeVisionFile(        resourceLocation = ResourceLocation.EMBED) {
         vision("canvas") { GdmlShowCase.babyIaxo().toVision() }
     }
 }
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
index 59099f60..10d5fdfb 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
@@ -14,14 +14,14 @@ import space.kscience.visionforge.solid.specifications.Canvas3DOptions
 import styled.css
 import styled.styledDiv
 
-public external interface ThreeWithControlsProps : RProps {
+public external interface ThreeViewWithControlsProps : RProps {
     public var context: Context
     public var vision: Vision?
     public var selected: Name?
 }
 
 @JsExport
-public val ThreeViewWithControls: (props: ThreeWithControlsProps) -> dynamic =
+public val ThreeViewWithControls: (props: ThreeViewWithControlsProps) -> dynamic =
     functionalComponent("ThreeViewWithControls") { props ->
         var selected by useState { props.selected }
         val onSelect: (Name?) -> Unit = {
@@ -36,6 +36,8 @@ public val ThreeViewWithControls: (props: ThreeWithControlsProps) -> dynamic =
         styledDiv {
             css {
                 height = 100.pct
+                maxHeight = 100.vh
+                maxWidth = 100.vw
             }
             ringGrid {
                 ringRow {
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt
index 18c53e4f..287f32bc 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/html/VisionTagConsumer.kt
@@ -12,11 +12,14 @@ import space.kscience.visionforge.Vision
 import space.kscience.visionforge.VisionManager
 import kotlin.collections.set
 
+@DslMarker
+public annotation class VisionDSL
 
 /**
  * A placeholder object to attach inline vision builders.
  */
 @DFExperimental
+@VisionDSL
 public class VisionOutput @PublishedApi internal constructor(public val manager: VisionManager) {
     public var meta: Meta = Meta.EMPTY
 
@@ -30,6 +33,7 @@ public class VisionOutput @PublishedApi internal constructor(public val manager:
 /**
  * Modified  [TagConsumer] that allows rendering output fragments and visions in them
  */
+@VisionDSL
 public abstract class VisionTagConsumer<R>(
     private val root: TagConsumer<R>,
     public val manager:VisionManager,
@@ -86,6 +90,7 @@ public abstract class VisionTagConsumer<R>(
      * TODO to be replaced by multi-receiver
      */
     @OptIn(DFExperimental::class)
+    @VisionDSL
     public inline fun <T> TagConsumer<T>.vision(
         name: String = DEFAULT_VISION_NAME,
         visionProvider: VisionOutput.() -> Vision,
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
index d5d43100..066de405 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
@@ -74,8 +74,13 @@ public class SolidReferenceGroup(
 
     private fun prototypeFor(name: Name): Solid {
         return if (name.isEmpty()) prototype else {
-            (prototype as? SolidGroup)?.get(name) as? Solid
+            val proto = (prototype as? SolidGroup)?.get(name)
                 ?: error("Prototype with name $name not found in SolidReferenceGroup $refName")
+            when (proto) {
+                is Solid -> proto
+                is SolidReference -> proto.prototype
+                else -> error("Prototype with name $name is ${proto::class} but expected Solid")
+            }
         }
     }
 
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
index 6a978e9e..0d937565 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
@@ -39,8 +39,11 @@ import kotlin.math.sin
  */
 public class ThreeCanvas(
     public val three: ThreePlugin,
+    public val element: Element,
     public val options: Canvas3DOptions = Canvas3DOptions()
 ) {
+
+
     private var boundingBox: Box3? = null
     private var root: Object3D? = null
         set(value) {
@@ -136,6 +139,13 @@ public class ThreeCanvas(
         }
     }
 
+    init {
+        check(element.getElementsByClassName("three-canvas").length == 0) {
+            "Three canvas already created in this element"
+        }
+        element.appendChild(canvas)
+        updateSize()
+    }
 
     /**
      * Force camera aspect ration and renderer size recalculation
@@ -191,12 +201,6 @@ public class ThreeCanvas(
         }
     }
 
-    internal fun attach(element: Element) {
-        check(element.getElementsByClassName("three-canvas").length == 0) { "Three canvas already created in this element" }
-        element.appendChild(canvas)
-        updateSize()
-    }
-
     /**
      * Resolve full name of the object relative to the global root
      */
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
index 4d1f63b3..95c3a322 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
@@ -118,9 +118,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
         element: Element,
         options: Canvas3DOptions = Canvas3DOptions(),
     ): ThreeCanvas = canvasCache.getOrPut(element) {
-        ThreeCanvas(this, options).apply {
-            attach(element)
-        }
+        ThreeCanvas(this, element, options)
     }
 
     override fun content(target: String): Map<Name, Any> {

From dfc0ffda38c4f8a750bf221549a11d79ea4b7d31 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 8 Jun 2021 18:45:03 +0300
Subject: [PATCH 121/151] Fix crash with single style properties

---
 .../visionforge/gdml/demo/GDMLAppComponent.kt | 91 ++++++++++---------
 .../visionforge/gdml/demo/fileDrop.kt         |  1 +
 demo/js-playground/build.gradle.kts           | 27 ++++++
 .../src/main/kotlin/JsPlaygroundApp.kt        | 51 +++++++++++
 .../src/main/resources/index.html             | 11 +++
 .../js-playground/webpack.config.d/01.ring.js |  3 +
 .../mipt/npm/muon/monitor/MMAppComponent.kt   | 27 +++---
 .../ru/mipt/npm/muon/monitor/MMDemoApp.kt     |  3 +-
 .../playground/src/jvmMain/kotlin/gdmlIaxo.kt |  3 +-
 settings.gradle.kts                           |  3 +-
 .../kscience/visionforge/react/MetaViewer.kt  |  7 +-
 .../visionforge/react/PropertyEditor.kt       |  1 +
 .../visionforge/react/RangeValueChooser.kt    | 58 +++++++++---
 .../visionforge/react/ThreeCanvasComponent.kt | 23 +++--
 .../visionforge/react/valueChooser.kt         |  1 +
 .../src/main/kotlin/ringui/tabs/SmartTabs.kt  |  8 +-
 ui/ring/src/main/kotlin/ringui/tabs/Tabs.kt   |  3 +-
 .../ThreeViewWithControls.kt                  | 11 +--
 .../ThreeWithControls.kt                      |  4 +-
 .../ringPropertyEditor.kt                     | 69 +++++++++-----
 .../ringThreeControls.kt                      | 29 +++---
 .../visionforge/solid/SolidReference.kt       | 24 +++--
 .../visionforge/solid/three/ThreeCanvas.kt    | 32 ++++---
 23 files changed, 331 insertions(+), 159 deletions(-)
 create mode 100644 demo/js-playground/build.gradle.kts
 create mode 100644 demo/js-playground/src/main/kotlin/JsPlaygroundApp.kt
 create mode 100644 demo/js-playground/src/main/resources/index.html
 create mode 100644 demo/js-playground/webpack.config.d/01.ring.js

diff --git a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
index 0a0e83b9..cf115e5e 100644
--- a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
@@ -1,17 +1,20 @@
 package space.kscience.visionforge.gdml.demo
 
 import kotlinx.browser.window
-import kotlinx.css.*
+import kotlinx.css.height
+import kotlinx.css.vh
 import org.w3c.files.FileReader
 import org.w3c.files.get
 import react.*
 import react.dom.h1
+import ringui.grid.ringCol
+import ringui.grid.ringGrid
+import ringui.grid.ringRow
 import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.context.fetch
 import space.kscience.dataforge.names.Name
 import space.kscience.gdml.Gdml
 import space.kscience.gdml.decodeFromString
-import space.kscience.visionforge.bootstrap.gridRow
 import space.kscience.visionforge.bootstrap.nameCrumbs
 import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.react.ThreeCanvasComponent
@@ -21,7 +24,6 @@ import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.Solids
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
 import styled.css
-import styled.styledDiv
 
 external interface GDMLAppProps : RProps {
     var context: Context
@@ -62,54 +64,57 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
         vision = parsedVision as? Solid ?: error("Parsed vision is not a solid")
     }
 
-    gridRow {
-        flexColumn {
-            css {
-                +"col-lg-9"
-                height = 100.vh
-            }
-            styledDiv {
-                css {
-                    +"mx-auto"
-                    +"page-header"
-                }
-                h1 { +"GDML/JSON loader demo" }
-            }
-            nameCrumbs(selected, "World", onSelect)
-            //canvas
 
-            child(ThreeCanvasComponent) {
+    ringGrid {
+        ringRow {
+            ringCol {
                 attrs {
-                    this.context = props.context
-                    this.obj = vision
-                    this.selected = selected
-                    this.options = options
+                    lg = 9
                 }
-            }
+                flexColumn {
+                    css {
+                        height = 100.vh
+                    }
+                    h1 { +"GDML/JSON loader demo" }
+                    //canvas
 
-        }
-        flexColumn {
-            css {
-                +"col-lg-3"
-                padding(top = 4.px)
-                //border(1.px, BorderStyle.solid, Color.lightGray)
-                height = 100.vh
-                overflowY = Overflow.auto
-            }
-            fileDrop("(drag file here)") { files ->
-                val file = files?.get(0)
-                if (file != null) {
-
-                    FileReader().apply {
-                        onload = {
-                            val string = result as String
-                            loadData(file.name, string)
+                    child(ThreeCanvasComponent) {
+                        attrs {
+                            this.context = props.context
+                            this.solid = vision
+                            this.selected = selected
+                            this.options = options
                         }
-                        readAsText(file)
                     }
                 }
+
+            }
+            ringCol {
+                attrs {
+                    lg = 3
+                }
+                flexColumn {
+                    css {
+                        height = 100.vh
+                    }
+                    fileDrop("(drag file here)") { files ->
+                        val file = files?.get(0)
+                        if (file != null) {
+
+                            FileReader().apply {
+                                onload = {
+                                    val string = result as String
+                                    loadData(file.name, string)
+                                }
+                                readAsText(file)
+                            }
+                        }
+                    }
+                    nameCrumbs(selected, "World", onSelect)
+                    ringThreeControls(options, vision, selected, onSelect)
+                }
             }
-            ringThreeControls(options, vision, selected, onSelect)
         }
     }
 }
+
diff --git a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/fileDrop.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/fileDrop.kt
index dcd7b4eb..e91fedee 100644
--- a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/fileDrop.kt
+++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/fileDrop.kt
@@ -14,6 +14,7 @@ fun RBuilder.fileDrop(title: String, action: (files: FileList?) -> Unit) {
     styledDiv {
         css {
             border(style = BorderStyle.dashed, width = 1.px, color = Color.orange)
+            flexGrow = 0.0
             alignContent = Align.center
         }
 
diff --git a/demo/js-playground/build.gradle.kts b/demo/js-playground/build.gradle.kts
new file mode 100644
index 00000000..4a908719
--- /dev/null
+++ b/demo/js-playground/build.gradle.kts
@@ -0,0 +1,27 @@
+plugins {
+    id("ru.mipt.npm.gradle.js")
+}
+
+kscience{
+    useCoroutines()
+    application()
+}
+
+kotlin{
+    js(IR){
+        useCommonJs()
+        browser {
+            commonWebpackConfig {
+                cssSupport.enabled = false
+            }
+        }
+    }
+}
+
+
+dependencies{
+    implementation(project(":visionforge-gdml"))
+    implementation(project(":visionforge-plotly"))
+    implementation(project(":visionforge-threejs"))
+    implementation(project(":ui:ring"))
+}
\ No newline at end of file
diff --git a/demo/js-playground/src/main/kotlin/JsPlaygroundApp.kt b/demo/js-playground/src/main/kotlin/JsPlaygroundApp.kt
new file mode 100644
index 00000000..8fa66e74
--- /dev/null
+++ b/demo/js-playground/src/main/kotlin/JsPlaygroundApp.kt
@@ -0,0 +1,51 @@
+import kotlinx.browser.document
+import kotlinx.css.height
+import kotlinx.css.vh
+import kotlinx.css.vw
+import kotlinx.css.width
+import react.child
+import react.dom.render
+import space.kscience.dataforge.context.Context
+import space.kscience.gdml.GdmlShowCase
+import space.kscience.visionforge.Application
+import space.kscience.visionforge.VisionClient
+import space.kscience.visionforge.gdml.toVision
+import space.kscience.visionforge.ring.ThreeCanvasWithControls
+import space.kscience.visionforge.ring.ThreeWithControls
+import space.kscience.visionforge.startApplication
+import styled.css
+import styled.styledDiv
+
+private class JsPlaygroundApp : Application {
+
+    override fun start(state: Map<String, Any>) {
+
+        val playgroundContext = Context {
+            plugin(ThreeWithControls)
+            plugin(VisionClient)
+        }
+
+        val element = document.getElementById("playground") ?: error("Element with id 'playground' not found on page")
+
+        val visionOfD0 = GdmlShowCase.babyIaxo().toVision()
+
+        render(element) {
+            styledDiv {
+                css{
+                    height = 100.vh
+                    width = 100.vw
+                }
+                child(ThreeCanvasWithControls) {
+                    attrs {
+                        context = playgroundContext
+                        solid = visionOfD0
+                    }
+                }
+            }
+        }
+    }
+}
+
+public fun main() {
+    startApplication(::JsPlaygroundApp)
+}
\ No newline at end of file
diff --git a/demo/js-playground/src/main/resources/index.html b/demo/js-playground/src/main/resources/index.html
new file mode 100644
index 00000000..7a777ef1
--- /dev/null
+++ b/demo/js-playground/src/main/resources/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>js-playground</title>
+    <script src="js-playground.js"></script>
+</head>
+<body>
+<div id="playground"></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/demo/js-playground/webpack.config.d/01.ring.js b/demo/js-playground/webpack.config.d/01.ring.js
new file mode 100644
index 00000000..41da041c
--- /dev/null
+++ b/demo/js-playground/webpack.config.d/01.ring.js
@@ -0,0 +1,3 @@
+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/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
index 368bef5f..f8d2030c 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
@@ -34,14 +34,6 @@ external interface MMAppProps : RProps {
     var selected: Name?
 }
 
-private val canvasConfig = Canvas3DOptions {
-    camera = Camera {
-        distance = 2100.0
-        latitude = PI / 6
-        azimuth = PI + PI / 6
-    }
-}
-
 @JsExport
 val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
     var selected by useState { props.selected }
@@ -50,8 +42,13 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
         selected = it
     }
 
-    val options = useMemo {
-        Canvas3DOptions.invoke {
+    val mmOptions = useMemo {
+        Canvas3DOptions {
+            camera = Camera {
+                distance = 2100.0
+                latitude = PI / 6
+                azimuth = PI + PI / 6
+            }
             this.onSelect = onSelect
         }
     }
@@ -91,11 +88,9 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
             child(ThreeCanvasComponent) {
                 attrs {
                     this.context = props.context
-                    this.obj = root
+                    this.solid = root
                     this.selected = selected
-                    this.options = canvasConfig.apply {
-                        this.onSelect = onSelect
-                    }
+                    this.options = mmOptions
                 }
             }
         }
@@ -112,7 +107,7 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                 }
                 //settings
                 card("Canvas configuration") {
-                    canvasControls(options, root)
+                    canvasControls(mmOptions, root)
                 }
 
                 card("Events") {
@@ -151,7 +146,7 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                                 +"World"
                                 attrs {
                                     onClickFunction = {
-                                        selected = space.kscience.dataforge.names.Name.EMPTY
+                                        selected = Name.EMPTY
                                     }
                                 }
                             }
diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
index 2ae42bbb..5c4a589a 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMDemoApp.kt
@@ -6,6 +6,7 @@ import io.ktor.client.features.json.serializer.KotlinxSerializer
 import kotlinx.browser.document
 import react.child
 import react.dom.render
+import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.context.Global
 import space.kscience.dataforge.context.fetch
 import space.kscience.visionforge.Application
@@ -29,7 +30,7 @@ private class MMDemoApp : Application {
 
         val element = document.getElementById("app") ?: error("Element with id 'app' not found on page")
 
-        val context = Global.buildContext("demo") {}
+        val context = Context("demo")
         render(element) {
             child(MMApp) {
                 attrs {
diff --git a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
index 344c5c97..a9070af7 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
@@ -3,7 +3,6 @@ package space.kscience.visionforge.examples
 import space.kscience.dataforge.context.Context
 import space.kscience.gdml.GdmlShowCase
 import space.kscience.visionforge.gdml.toVision
-import space.kscience.visionforge.html.ResourceLocation
 import space.kscience.visionforge.solid.Solids
 
 fun main() {
@@ -11,7 +10,7 @@ fun main() {
         plugin(Solids)
     }
 
-    context.makeVisionFile(        resourceLocation = ResourceLocation.EMBED) {
+    context.makeVisionFile {
         vision("canvas") { GdmlShowCase.babyIaxo().toVision() }
     }
 }
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8c2170f6..630dc8dc 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -46,5 +46,6 @@ include(
     ":demo:playground",
     ":demo:jupyter-playground",
     ":demo:plotly-fx",
+    ":demo:js-playground",
     ":jupyter:visionforge-gdml-jupyter"
-)
\ No newline at end of file
+)
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
index f7de3070..4ce84033 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
@@ -24,6 +24,11 @@ public external interface MetaViewerProps : RProps {
      */
     public var root: Meta
 
+    /**
+     * The title of root node
+     */
+    public var rootName: String?
+
     /**
      * Full path to the displayed node in [root]. Could be empty
      */
@@ -45,7 +50,7 @@ private fun RBuilder.metaViewerItem(props: MetaViewerProps) {
     val descriptorItem: ItemDescriptor? = props.descriptor?.get(props.name)
     val actualItem = item ?: descriptorItem?.defaultValue
 
-    val token = props.name.lastOrNull()?.toString() ?: "Meta"
+    val token = props.name.lastOrNull()?.toString() ?: props.rootName ?: ""
 
     val expanderClick: (Event) -> Unit = {
         expanded = !expanded
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
index 5bb69714..7435f388 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
@@ -231,6 +231,7 @@ public val PropertyEditor: FunctionalComponent<PropertyEditorProps> = functional
             this.name = Name.EMPTY
             this.descriptor = props.descriptor
             this.scope = props.scope
+            this.expanded = props.expanded
         }
     }
 }
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt
index 6361ecfb..035ca3e7 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt
@@ -1,5 +1,8 @@
 package space.kscience.visionforge.react
 
+import kotlinx.css.margin
+import kotlinx.css.padding
+import kotlinx.css.px
 import kotlinx.html.InputType
 import kotlinx.html.js.onChangeFunction
 import org.w3c.dom.HTMLInputElement
@@ -8,36 +11,63 @@ import react.FunctionalComponent
 import react.dom.attrs
 import react.functionalComponent
 import react.useState
+import space.kscience.dataforge.meta.double
 import space.kscience.dataforge.meta.get
 import space.kscience.dataforge.meta.string
 import space.kscience.dataforge.values.asValue
+import styled.css
 import styled.styledInput
 
 @JsExport
 public val RangeValueChooser: FunctionalComponent<ValueChooserProps> =
     functionalComponent("RangeValueChooser") { props ->
-        var innerValue by useState(props.item.string)
+        var innerValue by useState(props.item.double)
+        var rangeDisabled: Boolean by useState(props.item == null)
+
+        val handleDisable: (Event) -> Unit = {
+            val checkBoxValue = (it.target as HTMLInputElement).checked
+            rangeDisabled = !checkBoxValue
+            if(!checkBoxValue) {
+                props.valueChanged?.invoke(null)
+            } else {
+                props.valueChanged?.invoke(innerValue?.asValue())
+            }
+        }
 
         val handleChange: (Event) -> Unit = {
             val newValue = (it.target as HTMLInputElement).value
             props.valueChanged?.invoke(newValue.toDoubleOrNull()?.asValue())
-            innerValue = newValue
+            innerValue = newValue.toDoubleOrNull()
         }
 
-        styledInput(type = InputType.range) {
-            attrs {
-                value = innerValue ?: ""
-                onChangeFunction = handleChange
-                val minValue = props.descriptor?.attributes?.get("min").string
-                minValue?.let {
-                    min = it
+        flexRow {
+            styledInput(type = InputType.checkBox) {
+                css{
+                    padding(0.px)
+                    margin(0.px)
                 }
-                val maxValue = props.descriptor?.attributes?.get("max").string
-                maxValue?.let {
-                    max = it
+                attrs {
+                    defaultChecked = rangeDisabled.not()
+                    onChangeFunction = handleDisable
                 }
-                props.descriptor?.attributes?.get("step").string?.let {
-                    step = it
+            }
+
+            styledInput(type = InputType.range) {
+                attrs {
+                    disabled = rangeDisabled
+                    value = innerValue?.toString() ?: ""
+                    onChangeFunction = 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
+                    }
                 }
             }
         }
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
index 1b1d6ce6..c2e7e8d6 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
@@ -1,9 +1,8 @@
 package space.kscience.visionforge.react
 
-import kotlinx.css.Display
-import kotlinx.css.display
-import kotlinx.css.height
-import kotlinx.css.pct
+import kotlinx.css.FlexBasis
+import kotlinx.css.flexBasis
+import kotlinx.css.flexGrow
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
 import react.*
@@ -19,8 +18,8 @@ import styled.styledDiv
 
 public external interface ThreeCanvasProps : RProps {
     public var context: Context
-    public var options: Canvas3DOptions
-    public var obj: Solid?
+    public var options: Canvas3DOptions?
+    public var solid: Solid?
     public var selected: Name?
 }
 
@@ -37,15 +36,15 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
 
     val three: ThreePlugin = useMemo({ props.context.fetch(ThreePlugin) }, arrayOf(props.context))
 
-    useEffect(listOf(props.obj, props.options, elementRef)) {
+    useEffect(listOf(props.solid, props.options, elementRef)) {
         if (canvas == null) {
             val element = elementRef.current as? HTMLElement ?: error("Canvas element not found")
-            canvas = three.getOrCreateCanvas(element, props.options)
+            canvas = three.getOrCreateCanvas(element, props.options ?: Canvas3DOptions())
         }
     }
 
-    useEffect(listOf(canvas, props.obj)) {
-        props.obj?.let { obj ->
+    useEffect(listOf(canvas, props.solid)) {
+        props.solid?.let { obj ->
             canvas?.render(obj)
         }
     }
@@ -56,8 +55,8 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
 
     styledDiv {
         css {
-            display = Display.contents
-            height = 100.pct
+            flexGrow = 1.0
+            flexBasis = FlexBasis.fill
         }
         ref = elementRef
     }
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
index 5cfd8651..7a32ef4f 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
@@ -21,6 +21,7 @@ import styled.styledSelect
 public external interface ValueChooserProps : RProps {
     public var item: MetaItem?
     public var descriptor: ValueDescriptor?
+    public var nullable: Boolean?
     public var valueChanged: ((Value?) -> Unit)?
 }
 
diff --git a/ui/ring/src/main/kotlin/ringui/tabs/SmartTabs.kt b/ui/ring/src/main/kotlin/ringui/tabs/SmartTabs.kt
index 574224ef..081181a3 100644
--- a/ui/ring/src/main/kotlin/ringui/tabs/SmartTabs.kt
+++ b/ui/ring/src/main/kotlin/ringui/tabs/SmartTabs.kt
@@ -4,14 +4,14 @@ import react.RBuilder
 import react.RHandler
 import react.dom.WithClassName
 
-public external interface SmartTabsProps: WithClassName {
+public external interface SmartTabsProps : WithClassName {
     public var initSelected: String
 }
 
 
-public fun RBuilder.ringSmartTabs(active: String? = null, handler: RHandler<SmartTabsProps>){
-    TabsModule.SmartTabs{
-        active?.let{
+public fun RBuilder.ringSmartTabs(active: String? = null, handler: RHandler<SmartTabsProps>) {
+    TabsModule.SmartTabs {
+        active?.let {
             attrs {
                 initSelected = active
             }
diff --git a/ui/ring/src/main/kotlin/ringui/tabs/Tabs.kt b/ui/ring/src/main/kotlin/ringui/tabs/Tabs.kt
index ec30223b..6c029110 100644
--- a/ui/ring/src/main/kotlin/ringui/tabs/Tabs.kt
+++ b/ui/ring/src/main/kotlin/ringui/tabs/Tabs.kt
@@ -40,10 +40,11 @@ public fun RBuilder.ringTabs(active: String? = null, handler: RHandler<TabsProps
     }
 }
 
-public fun RBuilder.ringTab(title: dynamic, handler: RHandler<TabProps>) {
+public fun RBuilder.ringTab(title: dynamic, id: String = title.toString(), handler: RHandler<TabProps>) {
     TabsModule.Tab {
         attrs {
             this.title = title
+            this.id = id
         }
         handler()
     }
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
index 10d5fdfb..5336de06 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
@@ -7,21 +7,20 @@ import ringui.grid.ringGrid
 import ringui.grid.ringRow
 import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.names.Name
-import space.kscience.visionforge.Vision
 import space.kscience.visionforge.react.ThreeCanvasComponent
 import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
 import styled.css
 import styled.styledDiv
 
-public external interface ThreeViewWithControlsProps : RProps {
+public external interface ThreeCanvasWithControlsProps : RProps {
     public var context: Context
-    public var vision: Vision?
+    public var solid: Solid?
     public var selected: Name?
 }
 
 @JsExport
-public val ThreeViewWithControls: (props: ThreeViewWithControlsProps) -> dynamic =
+public val ThreeCanvasWithControls: (props: ThreeCanvasWithControlsProps) -> dynamic =
     functionalComponent("ThreeViewWithControls") { props ->
         var selected by useState { props.selected }
         val onSelect: (Name?) -> Unit = {
@@ -51,7 +50,7 @@ public val ThreeViewWithControls: (props: ThreeViewWithControlsProps) -> dynamic
                         child(ThreeCanvasComponent) {
                             attrs {
                                 this.context = props.context
-                                this.obj = props.vision as? Solid
+                                this.solid = props.solid as? Solid
                                 this.selected = selected
                                 this.options = options
                             }
@@ -72,7 +71,7 @@ public val ThreeViewWithControls: (props: ThreeViewWithControlsProps) -> dynamic
                                 height = 100.pct
                                 overflowY = Overflow.auto
                             }
-                            ringThreeControls(options, props.vision, selected, onSelect)
+                            ringThreeControls(options, props.solid, selected, onSelect)
                         }
                     }
                 }
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControls.kt
index 6af8450c..52586fc5 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControls.kt
@@ -25,10 +25,10 @@ public class ThreeWithControls : AbstractPlugin(), ElementVisionRenderer {
 
     override fun render(element: Element, vision: Vision, meta: Meta) {
         react.dom.render(element) {
-            child(ThreeViewWithControls) {
+            child(ThreeCanvasWithControls) {
                 attrs {
                     this.context = this@ThreeWithControls.context
-                    this.vision = vision
+                    this.solid = vision as? Solid
                 }
             }
         }
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt
index 680bc6bf..ed082f03 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt
@@ -2,7 +2,9 @@ package space.kscience.visionforge.ring
 
 import org.w3c.dom.Element
 import react.RBuilder
+import react.dom.p
 import react.dom.render
+import react.useMemo
 import ringui.island.ringIsland
 import ringui.island.ringIslandContent
 import ringui.island.ringIslandHeader
@@ -10,6 +12,7 @@ import ringui.tabs.ringSmartTabs
 import ringui.tabs.ringTab
 import space.kscience.dataforge.meta.descriptors.NodeDescriptor
 import space.kscience.visionforge.*
+import space.kscience.visionforge.react.flexColumn
 import space.kscience.visionforge.react.metaViewer
 import space.kscience.visionforge.react.propertyEditor
 import space.kscience.visionforge.solid.SolidReference
@@ -20,37 +23,55 @@ public fun RBuilder.ringPropertyEditor(
     key: Any? = null,
 ) {
 
-    ringIsland("Properties") {
-        propertyEditor(
-            ownProperties = vision.ownProperties,
-            allProperties = vision.allProperties(),
-            updateFlow = vision.propertyChanges,
-            descriptor = descriptor,
-            key = key
-        )
+    val styles = useMemo(vision, key) {
+        if (vision is SolidReference) {
+            (vision.styles + vision.prototype.styles).distinct()
+        } else {
+            vision.styles
+        }
     }
-    val styles = if (vision is SolidReference) {
-        (vision.styles + vision.prototype.styles).distinct()
-    } else {
-        vision.styles
-    }
-    if (styles.isNotEmpty()) {
-        ringIsland {
-            ringIslandHeader {
-                attrs {
-                    border = true
+    flexColumn {
+        ringIsland("Properties") {
+            propertyEditor(
+                ownProperties = vision.ownProperties,
+                allProperties = vision.allProperties(),
+                updateFlow = vision.propertyChanges,
+                descriptor = descriptor,
+                key = key
+            )
+        }
+
+        if (styles.isNotEmpty()) {
+            ringIsland {
+                ringIslandHeader {
+                    attrs {
+                        border = true
+                    }
+                    +"Styles"
                 }
-                +"Styles"
-            }
-            ringIslandContent {
-                ringSmartTabs {
-                    styles.forEach { styleName ->
+                ringIslandContent {
+                    if (styles.size == 1) {
+                        val styleName = styles.first()
+                        p{
+                            +styleName
+                        }
                         val style = vision.getStyle(styleName)
                         if (style != null) {
-                            ringTab(styleName) {
+                            ringTab(styleName, id = styleName) {
                                 metaViewer(style)
                             }
                         }
+                    } else {
+                        ringSmartTabs {
+                            styles.forEach { styleName ->
+                                val style = vision.getStyle(styleName)
+                                if (style != null) {
+                                    ringTab(styleName, id = styleName) {
+                                        metaViewer(style)
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
             }
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
index c88838d6..38ed513d 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
@@ -92,22 +92,25 @@ public external interface ThreeControlsProps : RProps {
 
 @JsExport
 public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalComponent { props ->
-    ringSmartTabs(if (props.selected != null) "Properties" else null) {
+    ringSmartTabs(if (props.selected != null) "Properties" else "Tree") {
         ringTab("Canvas") {
             ringIsland("Canvas configuration") {
                 canvasControls(props.canvasOptions, props.vision)
             }
         }
         ringTab("Tree") {
-            styledDiv {
+            flexColumn {
                 css {
                     border(1.px, BorderStyle.solid, Color.lightGray)
                     padding(10.px)
+                    flexGrow = 1.0
+                    flexWrap = FlexWrap.wrap
                 }
                 h2 { +"Object tree" }
                 styledDiv {
                     css {
-                        flex(1.0, 1.0, FlexBasis.inherit)
+                        overflowY = Overflow.auto
+                        flexGrow = 1.0
                     }
                     props.vision?.let {
                         objectTree(it, props.selected, props.onSelect)
@@ -115,15 +118,17 @@ public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalCo
                 }
             }
         }
-        ringTab("Properties") {
-            props.selected.let { selected ->
-                val selectedObject: Vision? = when {
-                    selected == null -> null
-                    selected.isEmpty() -> props.vision
-                    else -> (props.vision as? VisionGroup)?.get(selected)
-                }
-                if (selectedObject != null) {
-                    ringPropertyEditor(selectedObject, key = selected)
+        if (props.selected != null) {
+            ringTab("Properties") {
+                props.selected.let { selected ->
+                    val selectedObject: Vision? = when {
+                        selected == null -> null
+                        selected.isEmpty() -> props.vision
+                        else -> (props.vision as? VisionGroup)?.get(selected)
+                    }
+                    if (selectedObject != null) {
+                        ringPropertyEditor(selectedObject, key = selected)
+                    }
                 }
             }
         }
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
index 066de405..bab671d9 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
@@ -11,7 +11,7 @@ import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.dataforge.names.*
 import space.kscience.visionforge.*
 
-public interface SolidReference : Vision {
+public interface SolidReference : Solid {
     public val prototype: Solid
 }
 
@@ -76,11 +76,7 @@ public class SolidReferenceGroup(
         return if (name.isEmpty()) prototype else {
             val proto = (prototype as? SolidGroup)?.get(name)
                 ?: error("Prototype with name $name not found in SolidReferenceGroup $refName")
-            when (proto) {
-                is Solid -> proto
-                is SolidReference -> proto.prototype
-                else -> error("Prototype with name $name is ${proto::class} but expected Solid")
-            }
+            proto as? Solid ?: error("Prototype with name $name is ${proto::class} but expected Solid")
         }
     }
 
@@ -100,6 +96,22 @@ public class SolidReferenceGroup(
      */
     private inner class ReferenceChild(private val childName: Name) : SolidReference, VisionGroup {
 
+        //TODO replace by properties
+        override var position: Point3D?
+            get() = prototype.position
+            set(value) {
+                error("Can't set position of reference")
+            }
+        override var rotation: Point3D?
+            get() = prototype.rotation
+            set(value) {
+                error("Can't set position of reference")
+            }
+        override var scale: Point3D?
+            get() = prototype.scale
+            set(value) {
+                error("Can't set position of reference")
+            }
         override val prototype: Solid get() = prototypeFor(childName)
 
         override val children: Map<NameToken, Vision>
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
index 0d937565..525bf402 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
@@ -103,27 +103,31 @@ public class ThreeCanvas(
     }.apply {
         setClearColor(Colors.skyblue, 1)
         //Clipping planes
-        localClippingEnabled = true
         options.onChange(this@ThreeCanvas) { name, _, _ ->
             if (name.startsWith(Canvas3DOptions::clipping.name.asName())) {
+                localClippingEnabled = true
                 val clipping = options.clipping
-                boundingBox?.let { boundingBox ->
-                    val xClippingPlane = clipping.x?.let {
-                        val absoluteValue = boundingBox.min.x + (boundingBox.max.x - boundingBox.min.x) * it
-                        Plane(Vector3(-1.0, 0.0, 0.0), absoluteValue)
+                if(!clipping.isEmpty()) {
+                    boundingBox?.let { boundingBox ->
+                        val xClippingPlane = clipping.x?.let {
+                            val absoluteValue = boundingBox.min.x + (boundingBox.max.x - boundingBox.min.x) * it
+                            Plane(Vector3(-1.0, 0.0, 0.0), absoluteValue)
 
-                    }
-                    val yClippingPlane = clipping.y?.let {
-                        val absoluteValue = boundingBox.min.y + (boundingBox.max.y - boundingBox.min.y) * it
-                        Plane(Vector3(0.0, -1.0, 0.0), absoluteValue)
-                    }
+                        }
+                        val yClippingPlane = clipping.y?.let {
+                            val absoluteValue = boundingBox.min.y + (boundingBox.max.y - boundingBox.min.y) * it
+                            Plane(Vector3(0.0, -1.0, 0.0), absoluteValue)
+                        }
 
-                    val zClippingPlane = clipping.z?.let {
-                        val absoluteValue = boundingBox.min.z + (boundingBox.max.z - boundingBox.min.z) * it
-                        Plane(Vector3(0.0, 0.0, -1.0), absoluteValue)
+                        val zClippingPlane = clipping.z?.let {
+                            val absoluteValue = boundingBox.min.z + (boundingBox.max.z - boundingBox.min.z) * it
+                            Plane(Vector3(0.0, 0.0, -1.0), absoluteValue)
+                        }
+                        clippingPlanes = listOfNotNull(xClippingPlane, yClippingPlane, zClippingPlane).toTypedArray()
                     }
-                    clippingPlanes = listOfNotNull(xClippingPlane, yClippingPlane, zClippingPlane).toTypedArray()
                 }
+            } else {
+                localClippingEnabled = false
             }
         }
     }

From 91e7e8573edf6a44649210024b62d36cdf4a8f90 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 9 Jun 2021 11:48:03 +0300
Subject: [PATCH 122/151] Yet another css overhaul.

---
 build.gradle.kts                              |   2 +-
 .../visionforge/gdml/demo/GDMLAppComponent.kt |  70 ++---------
 .../src/main/kotlin/JsPlaygroundApp.kt        |   4 +-
 .../src/jsMain/kotlin/playgroundMain.kt       |   4 +-
 .../src/jsMain/kotlin/gdmlJupyter.kt          |   4 +-
 .../visionforge/react/RangeValueChooser.kt    |   8 --
 .../visionforge/react/ThreeCanvasComponent.kt |  12 +-
 .../ThreeViewWithControls.kt                  |  23 +++-
 ...Controls.kt => ThreeWithControlsPlugin.kt} |  10 +-
 .../solid/specifications/Canvas3DOptions.kt   |  52 ++++----
 .../visionforge/solid/three/ThreeCanvas.kt    | 114 +++++++++---------
 11 files changed, 131 insertions(+), 172 deletions(-)
 rename ui/ring/src/main/kotlin/space.kscience.visionforge.ring/{ThreeWithControls.kt => ThreeWithControlsPlugin.kt} (81%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9fd660c8..4170628c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,7 +20,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.2.0-dev-18"
+    version = "0.2.0-dev-19"
 }
 
 subprojects {
diff --git a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
index cf115e5e..d26a5ad8 100644
--- a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
@@ -1,29 +1,20 @@
 package space.kscience.visionforge.gdml.demo
 
 import kotlinx.browser.window
-import kotlinx.css.height
-import kotlinx.css.vh
 import org.w3c.files.FileReader
 import org.w3c.files.get
 import react.*
-import react.dom.h1
-import ringui.grid.ringCol
-import ringui.grid.ringGrid
-import ringui.grid.ringRow
 import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.context.fetch
 import space.kscience.dataforge.names.Name
 import space.kscience.gdml.Gdml
 import space.kscience.gdml.decodeFromString
-import space.kscience.visionforge.bootstrap.nameCrumbs
 import space.kscience.visionforge.gdml.toVision
-import space.kscience.visionforge.react.ThreeCanvasComponent
-import space.kscience.visionforge.react.flexColumn
-import space.kscience.visionforge.ring.ringThreeControls
+import space.kscience.visionforge.ring.ThreeCanvasWithControls
+import space.kscience.visionforge.ring.tab
 import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.Solids
-import space.kscience.visionforge.solid.specifications.Canvas3DOptions
-import styled.css
+import styled.styledDiv
 
 external interface GDMLAppProps : RProps {
     var context: Context
@@ -33,19 +24,7 @@ external interface GDMLAppProps : RProps {
 
 @JsExport
 val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
-    var selected by useState { props.selected }
     var vision: Solid? by useState { props.vision }
-
-    val onSelect: (Name?) -> Unit = {
-        selected = it
-    }
-
-    val options = useMemo {
-        Canvas3DOptions.invoke {
-            this.onSelect = onSelect
-        }
-    }
-
     val visionManager = useMemo(props.context) { props.context.fetch(Solids).visionManager }
 
     fun loadData(name: String, data: String) {
@@ -64,43 +43,16 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
         vision = parsedVision as? Solid ?: error("Parsed vision is not a solid")
     }
 
-
-    ringGrid {
-        ringRow {
-            ringCol {
-                attrs {
-                    lg = 9
-                }
-                flexColumn {
-                    css {
-                        height = 100.vh
-                    }
-                    h1 { +"GDML/JSON loader demo" }
-                    //canvas
-
-                    child(ThreeCanvasComponent) {
-                        attrs {
-                            this.context = props.context
-                            this.solid = vision
-                            this.selected = selected
-                            this.options = options
-                        }
-                    }
-                }
-
-            }
-            ringCol {
-                attrs {
-                    lg = 3
-                }
-                flexColumn {
-                    css {
-                        height = 100.vh
-                    }
+    styledDiv {
+        child(ThreeCanvasWithControls) {
+            attrs {
+                this.context = props.context
+                this.solid = vision
+                this.selected = props.selected
+                tab("Load") {
                     fileDrop("(drag file here)") { files ->
                         val file = files?.get(0)
                         if (file != null) {
-
                             FileReader().apply {
                                 onload = {
                                     val string = result as String
@@ -110,8 +62,6 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
                             }
                         }
                     }
-                    nameCrumbs(selected, "World", onSelect)
-                    ringThreeControls(options, vision, selected, onSelect)
                 }
             }
         }
diff --git a/demo/js-playground/src/main/kotlin/JsPlaygroundApp.kt b/demo/js-playground/src/main/kotlin/JsPlaygroundApp.kt
index 8fa66e74..b43ce062 100644
--- a/demo/js-playground/src/main/kotlin/JsPlaygroundApp.kt
+++ b/demo/js-playground/src/main/kotlin/JsPlaygroundApp.kt
@@ -11,7 +11,7 @@ import space.kscience.visionforge.Application
 import space.kscience.visionforge.VisionClient
 import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.ring.ThreeCanvasWithControls
-import space.kscience.visionforge.ring.ThreeWithControls
+import space.kscience.visionforge.ring.ThreeWithControlsPlugin
 import space.kscience.visionforge.startApplication
 import styled.css
 import styled.styledDiv
@@ -21,7 +21,7 @@ private class JsPlaygroundApp : Application {
     override fun start(state: Map<String, Any>) {
 
         val playgroundContext = Context {
-            plugin(ThreeWithControls)
+            plugin(ThreeWithControlsPlugin)
             plugin(VisionClient)
         }
 
diff --git a/demo/playground/src/jsMain/kotlin/playgroundMain.kt b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
index 42cb97e2..71431841 100644
--- a/demo/playground/src/jsMain/kotlin/playgroundMain.kt
+++ b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
@@ -1,10 +1,10 @@
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.visionforge.plotly.PlotlyPlugin
-import space.kscience.visionforge.ring.ThreeWithControls
+import space.kscience.visionforge.ring.ThreeWithControlsPlugin
 import space.kscience.visionforge.runVisionClient
 
 @DFExperimental
 fun main() = runVisionClient {
     plugin(PlotlyPlugin)
-    plugin(ThreeWithControls)
+    plugin(ThreeWithControlsPlugin)
 }
\ No newline at end of file
diff --git a/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/gdmlJupyter.kt b/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/gdmlJupyter.kt
index 3356c20d..fef274a2 100644
--- a/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/gdmlJupyter.kt
+++ b/jupyter/visionforge-gdml-jupyter/src/jsMain/kotlin/gdmlJupyter.kt
@@ -1,12 +1,12 @@
 package space.kscience.visionforge.gdml.jupyter
 
 import space.kscience.dataforge.misc.DFExperimental
-import space.kscience.visionforge.ring.ThreeWithControls
+import space.kscience.visionforge.ring.ThreeWithControlsPlugin
 import space.kscience.visionforge.runVisionClient
 
 @DFExperimental
 @JsExport
 fun main(): Unit = runVisionClient {
-    plugin(ThreeWithControls)
+    plugin(ThreeWithControlsPlugin)
 }
 
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt
index 035ca3e7..abeeaa86 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt
@@ -1,8 +1,5 @@
 package space.kscience.visionforge.react
 
-import kotlinx.css.margin
-import kotlinx.css.padding
-import kotlinx.css.px
 import kotlinx.html.InputType
 import kotlinx.html.js.onChangeFunction
 import org.w3c.dom.HTMLInputElement
@@ -15,7 +12,6 @@ import space.kscience.dataforge.meta.double
 import space.kscience.dataforge.meta.get
 import space.kscience.dataforge.meta.string
 import space.kscience.dataforge.values.asValue
-import styled.css
 import styled.styledInput
 
 @JsExport
@@ -42,10 +38,6 @@ public val RangeValueChooser: FunctionalComponent<ValueChooserProps> =
 
         flexRow {
             styledInput(type = InputType.checkBox) {
-                css{
-                    padding(0.px)
-                    margin(0.px)
-                }
                 attrs {
                     defaultChecked = rangeDisabled.not()
                     onChangeFunction = handleDisable
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
index c2e7e8d6..33b5754f 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
@@ -1,8 +1,6 @@
 package space.kscience.visionforge.react
 
-import kotlinx.css.FlexBasis
-import kotlinx.css.flexBasis
-import kotlinx.css.flexGrow
+import kotlinx.css.*
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
 import react.*
@@ -39,7 +37,7 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
     useEffect(listOf(props.solid, props.options, elementRef)) {
         if (canvas == null) {
             val element = elementRef.current as? HTMLElement ?: error("Canvas element not found")
-            canvas = three.getOrCreateCanvas(element, props.options ?: Canvas3DOptions())
+            canvas = ThreeCanvas(three, element, props.options ?: Canvas3DOptions())
         }
     }
 
@@ -55,8 +53,10 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
 
     styledDiv {
         css {
-            flexGrow = 1.0
-            flexBasis = FlexBasis.fill
+            maxWidth = 100.vw
+            maxHeight = 100.vh
+            display = Display.block
+            bottom = 0.px
         }
         ref = elementRef
     }
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
index 5336de06..60734c63 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
@@ -2,9 +2,11 @@ package space.kscience.visionforge.ring
 
 import kotlinx.css.*
 import react.*
+import ringui.grid.RowPosition
 import ringui.grid.ringCol
 import ringui.grid.ringGrid
 import ringui.grid.ringRow
+import ringui.tabs.ringTab
 import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.names.Name
 import space.kscience.visionforge.react.ThreeCanvasComponent
@@ -17,6 +19,11 @@ public external interface ThreeCanvasWithControlsProps : RProps {
     public var context: Context
     public var solid: Solid?
     public var selected: Name?
+    public var additionalTabs: Map<String, RBuilder.() -> Unit>?
+}
+
+public fun ThreeCanvasWithControlsProps.tab(title: String, block: RBuilder.()->Unit){
+    additionalTabs = (additionalTabs?: emptyMap()) + (title to block)
 }
 
 @JsExport
@@ -35,11 +42,15 @@ public val ThreeCanvasWithControls: (props: ThreeCanvasWithControlsProps) -> dyn
         styledDiv {
             css {
                 height = 100.pct
+                width = 100.pct
                 maxHeight = 100.vh
                 maxWidth = 100.vw
             }
             ringGrid {
                 ringRow {
+                    attrs {
+                        start = RowPosition.sm
+                    }
                     ringCol {
                         attrs {
                             xs = 12
@@ -50,12 +61,11 @@ public val ThreeCanvasWithControls: (props: ThreeCanvasWithControlsProps) -> dyn
                         child(ThreeCanvasComponent) {
                             attrs {
                                 this.context = props.context
-                                this.solid = props.solid as? Solid
+                                this.solid = props.solid
                                 this.selected = selected
                                 this.options = options
                             }
                         }
-
                     }
                     ringCol {
                         attrs {
@@ -67,11 +77,14 @@ public val ThreeCanvasWithControls: (props: ThreeCanvasWithControlsProps) -> dyn
                         styledDiv {
                             css {
                                 padding(top = 4.px)
+                                width = 100.pct
                                 //border(1.px, BorderStyle.solid, Color.lightGray)
-                                height = 100.pct
-                                overflowY = Overflow.auto
                             }
-                            ringThreeControls(options, props.solid, selected, onSelect)
+                            ringThreeControls(options, props.solid, selected, onSelect) {
+                                props.additionalTabs?.forEach { (title, builder) ->
+                                    ringTab(title, title, builder)
+                                }
+                            }
                         }
                     }
                 }
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControlsPlugin.kt
similarity index 81%
rename from ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControls.kt
rename to ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControlsPlugin.kt
index 52586fc5..c4cf64a7 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeWithControlsPlugin.kt
@@ -15,7 +15,7 @@ import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.three.ThreePlugin
 import kotlin.reflect.KClass
 
-public class ThreeWithControls : AbstractPlugin(), ElementVisionRenderer {
+public class ThreeWithControlsPlugin : AbstractPlugin(), ElementVisionRenderer {
     public val three: ThreePlugin by require(ThreePlugin)
 
     override val tag: PluginTag get() = Companion.tag
@@ -27,7 +27,7 @@ public class ThreeWithControls : AbstractPlugin(), ElementVisionRenderer {
         react.dom.render(element) {
             child(ThreeCanvasWithControls) {
                 attrs {
-                    this.context = this@ThreeWithControls.context
+                    this.context = this@ThreeWithControlsPlugin.context
                     this.solid = vision as? Solid
                 }
             }
@@ -41,9 +41,9 @@ public class ThreeWithControls : AbstractPlugin(), ElementVisionRenderer {
         }
     }
 
-    public companion object : PluginFactory<ThreeWithControls> {
+    public companion object : PluginFactory<ThreeWithControlsPlugin> {
         override val tag: PluginTag = PluginTag("vision.threejs.withControls", PluginTag.DATAFORGE_GROUP)
-        override val type: KClass<ThreeWithControls> = ThreeWithControls::class
-        override fun invoke(meta: Meta, context: Context): ThreeWithControls = ThreeWithControls()
+        override val type: KClass<ThreeWithControlsPlugin> = ThreeWithControlsPlugin::class
+        override fun invoke(meta: Meta, context: Context): ThreeWithControlsPlugin = ThreeWithControlsPlugin()
     }
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt
index 1e23d1ad..11dd5800 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Canvas3DOptions.kt
@@ -45,12 +45,7 @@ public class Clipping : Scheme() {
     }
 }
 
-public class Canvas3DOptions : Scheme() {
-    public var axes: Axes by spec(Axes)
-    public var light: Light by spec(Light)
-    public var camera: Camera by spec(Camera)
-    public var controls: Controls by spec(Controls)
-
+public class CanvasSize : Scheme() {
     public var minSize: Int by int(400)
     public var minWith: Number by number { minSize }
     public var minHeight: Number by number { minSize }
@@ -59,6 +54,26 @@ public class Canvas3DOptions : Scheme() {
     public var maxWith: Number by number { maxSize }
     public var maxHeight: Number by number { maxSize }
 
+    public companion object : SchemeSpec<CanvasSize>(::CanvasSize) {
+        override val descriptor: NodeDescriptor = NodeDescriptor {
+            value(CanvasSize::minSize)
+            value(CanvasSize::minWith)
+            value(CanvasSize::minHeight)
+            value(CanvasSize::maxSize)
+            value(CanvasSize::maxWith)
+            value(CanvasSize::maxHeight)
+        }
+    }
+}
+
+public class Canvas3DOptions : Scheme() {
+    public var axes: Axes by spec(Axes)
+    public var light: Light by spec(Light)
+    public var camera: Camera by spec(Camera)
+    public var controls: Controls by spec(Controls)
+
+    public var size: CanvasSize by spec(CanvasSize)
+
     public var layers: List<Number> by numberList(0)
 
     public var clipping: Clipping by spec(Clipping)
@@ -71,30 +86,19 @@ public class Canvas3DOptions : Scheme() {
             NodeDescriptor {
                 scheme(Canvas3DOptions::axes, Axes)
                 scheme(Canvas3DOptions::light, Light)
+
                 scheme(Canvas3DOptions::camera, Camera) {
                     hide()
                 }
+
                 scheme(Canvas3DOptions::controls, Controls) {
                     hide()
                 }
-                value(Canvas3DOptions::minSize) {
-                    hide()
-                }
-                value(Canvas3DOptions::minWith) {
-                    hide()
-                }
-                value(Canvas3DOptions::minHeight) {
-                    hide()
-                }
-                value(Canvas3DOptions::maxSize) {
-                    hide()
-                }
-                value(Canvas3DOptions::maxWith) {
-                    hide()
-                }
-                value(Canvas3DOptions::maxHeight) {
+
+                scheme(Canvas3DOptions::size, CanvasSize) {
                     hide()
                 }
+
                 value(Canvas3DOptions::layers) {
                     type(ValueType.NUMBER)
                     multiple = true
@@ -108,8 +112,8 @@ public class Canvas3DOptions : Scheme() {
     }
 }
 
-public fun Canvas3DOptions.computeWidth(external: Number): Int =
+public fun CanvasSize.computeWidth(external: Number): Int =
     (external.toInt()).coerceIn(minWith.toInt()..maxWith.toInt())
 
-public fun Canvas3DOptions.computeHeight(external: Number): Int =
+public fun CanvasSize.computeHeight(external: Number): Int =
     (external.toInt()).coerceIn(minHeight.toInt()..maxHeight.toInt())
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
index 525bf402..f61aaebf 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
@@ -20,6 +20,7 @@ import info.laht.threekt.objects.Mesh
 import info.laht.threekt.scenes.Scene
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLCanvasElement
+import org.w3c.dom.HTMLElement
 import org.w3c.dom.Node
 import org.w3c.dom.events.MouseEvent
 import space.kscience.dataforge.context.info
@@ -40,10 +41,8 @@ import kotlin.math.sin
 public class ThreeCanvas(
     public val three: ThreePlugin,
     public val element: Element,
-    public val options: Canvas3DOptions = Canvas3DOptions()
+    public val options: Canvas3DOptions = Canvas3DOptions(),
 ) {
-
-
     private var boundingBox: Box3? = null
     private var root: Object3D? = null
         set(value) {
@@ -102,40 +101,10 @@ public class ThreeCanvas(
         antialias = true
     }.apply {
         setClearColor(Colors.skyblue, 1)
-        //Clipping planes
-        options.onChange(this@ThreeCanvas) { name, _, _ ->
-            if (name.startsWith(Canvas3DOptions::clipping.name.asName())) {
-                localClippingEnabled = true
-                val clipping = options.clipping
-                if(!clipping.isEmpty()) {
-                    boundingBox?.let { boundingBox ->
-                        val xClippingPlane = clipping.x?.let {
-                            val absoluteValue = boundingBox.min.x + (boundingBox.max.x - boundingBox.min.x) * it
-                            Plane(Vector3(-1.0, 0.0, 0.0), absoluteValue)
-
-                        }
-                        val yClippingPlane = clipping.y?.let {
-                            val absoluteValue = boundingBox.min.y + (boundingBox.max.y - boundingBox.min.y) * it
-                            Plane(Vector3(0.0, -1.0, 0.0), absoluteValue)
-                        }
-
-                        val zClippingPlane = clipping.z?.let {
-                            val absoluteValue = boundingBox.min.z + (boundingBox.max.z - boundingBox.min.z) * it
-                            Plane(Vector3(0.0, 0.0, -1.0), absoluteValue)
-                        }
-                        clippingPlanes = listOfNotNull(xClippingPlane, yClippingPlane, zClippingPlane).toTypedArray()
-                    }
-                }
-            } else {
-                localClippingEnabled = false
-            }
-        }
     }
 
     private val canvas = (renderer.domElement as HTMLCanvasElement).apply {
         className += "three-canvas"
-        width = 600
-        height = 600
         style.apply {
             width = "100%"
             height = "100%"
@@ -143,35 +112,29 @@ public class ThreeCanvas(
         }
     }
 
+    /**
+     * Force camera aspect ration and renderer size recalculation
+     */
+    private fun updateSize() {
+        val width = element.clientWidth
+        val height = element.clientHeight
+        canvas.width = width
+        canvas.height = height
+        renderer.setSize(width, height, false)
+        camera.aspect = width.toDouble() / height.toDouble()
+        camera.updateProjectionMatrix()
+    }
+
+
+    /**
+     * Attach canvas to given [HTMLElement]
+     */
     init {
         check(element.getElementsByClassName("three-canvas").length == 0) {
             "Three canvas already created in this element"
         }
         element.appendChild(canvas)
         updateSize()
-    }
-
-    /**
-     * Force camera aspect ration and renderer size recalculation
-     */
-    public fun updateSize() {
-        val width = canvas.clientWidth
-        val height = canvas.clientHeight
-        canvas.style.apply {
-            minWidth = "${options.minWith.toInt()}px"
-            maxWidth = "${options.maxWith.toInt()}px"
-            minHeight = "${options.minHeight.toInt()}px"
-            maxHeight = "${options.maxHeight.toInt()}px"
-        }
-        renderer.setSize(width, height, false)
-        camera.aspect = width.toDouble() / height.toDouble()
-        camera.updateProjectionMatrix()
-    }
-
-    /**
-     * Attach canvas to given [HTMLElement]
-     */
-    init {
         canvas.addEventListener("pointerdown", {
             val picked = pick()
             options.onSelect?.invoke(picked?.fullName())
@@ -186,7 +149,7 @@ public class ThreeCanvas(
             }
         }, false)
 
-        canvas.onresize = {
+        (element as? HTMLElement)?.onresize = {
             updateSize()
         }
 
@@ -203,6 +166,43 @@ public class ThreeCanvas(
 
             renderer.render(scene, camera)
         }
+
+        //Clipping planes
+        options.onChange(this@ThreeCanvas) { name, _, _ ->
+            if (name.startsWith(Canvas3DOptions::clipping.name.asName())) {
+                val clipping = options.clipping
+                if (!clipping.isEmpty()) {
+                    renderer.localClippingEnabled = true
+                    boundingBox?.let { boundingBox ->
+                        val xClippingPlane = clipping.x?.let {
+                            val absoluteValue = boundingBox.min.x + (boundingBox.max.x - boundingBox.min.x) * it
+                            Plane(Vector3(-1.0, 0.0, 0.0), absoluteValue)
+
+                        }
+                        val yClippingPlane = clipping.y?.let {
+                            val absoluteValue = boundingBox.min.y + (boundingBox.max.y - boundingBox.min.y) * it
+                            Plane(Vector3(0.0, -1.0, 0.0), absoluteValue)
+                        }
+
+                        val zClippingPlane = clipping.z?.let {
+                            val absoluteValue = boundingBox.min.z + (boundingBox.max.z - boundingBox.min.z) * it
+                            Plane(Vector3(0.0, 0.0, -1.0), absoluteValue)
+                        }
+                        renderer.clippingPlanes = listOfNotNull(xClippingPlane, yClippingPlane, zClippingPlane).toTypedArray()
+                    }
+                } else {
+                    renderer.localClippingEnabled = false
+                }
+            } else if (name.startsWith(Canvas3DOptions::size.name.asName())) {
+                canvas.style.apply {
+                    minWidth = "${options.size.minWith.toInt()}px"
+                    maxWidth = "${options.size.maxWith.toInt()}px"
+                    minHeight = "${options.size.minHeight.toInt()}px"
+                    maxHeight = "${options.size.maxHeight.toInt()}px"
+                }
+            }
+
+        }
     }
 
     /**

From 9b99df88a5dec2ac0e0146b02273e556dc04a26e Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 13 Jun 2021 21:24:02 +0300
Subject: [PATCH 123/151] Style update

---
 .../mipt/npm/muon/monitor/MMAppComponent.kt   |  4 +--
 .../kscience/visionforge/solid/demo/demo.kt   |  4 ++-
 .../visionforge/bootstrap/threeControls.kt    |  4 +--
 .../kscience/visionforge/react/MetaViewer.kt  |  8 +++--
 .../visionforge/react/PropertyEditor.kt       |  9 +++--
 .../kscience/visionforge/react/TreeStyles.kt  |  2 +-
 .../react/{ObjectTree.kt => VisionTree.kt}    | 15 ++++----
 .../main/kotlin/ringui/datalist/Selection.kt  | 27 +++++++++++++++
 .../ringThreeControls.kt                      | 34 ++++++-------------
 9 files changed, 66 insertions(+), 41 deletions(-)
 rename ui/react/src/main/kotlin/space/kscience/visionforge/react/{ObjectTree.kt => VisionTree.kt} (93%)
 create mode 100644 ui/ring/src/main/kotlin/ringui/datalist/Selection.kt

diff --git a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
index f8d2030c..75b610ac 100644
--- a/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
+++ b/demo/muon-monitor/src/jsMain/kotlin/ru/mipt/npm/muon/monitor/MMAppComponent.kt
@@ -20,7 +20,7 @@ import space.kscience.visionforge.bootstrap.gridRow
 import space.kscience.visionforge.bootstrap.visionPropertyEditor
 import space.kscience.visionforge.react.ThreeCanvasComponent
 import space.kscience.visionforge.react.flexColumn
-import space.kscience.visionforge.react.objectTree
+import space.kscience.visionforge.react.visionTree
 import space.kscience.visionforge.solid.specifications.Camera
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
 import styled.css
@@ -70,7 +70,7 @@ val MMApp = functionalComponent<MMAppProps>("Muon monitor") { props ->
                 css {
                     flex(1.0, 1.0, FlexBasis.auto)
                 }
-                objectTree(root, selected, onSelect)
+                visionTree(root, selected, onSelect)
             }
         }
         flexColumn {
diff --git a/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt b/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt
index f084127d..bfa90827 100644
--- a/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt
+++ b/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt
@@ -27,7 +27,9 @@ fun VisionLayout<Solid>.demo(name: String, title: String = name, block: SolidGro
 }
 
 val canvasOptions = Canvas3DOptions {
-    minSize = 400
+    size{
+        minSize = 400
+    }
     axes {
         size = 500.0
         visible = true
diff --git a/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt
index dc384067..e8166f35 100644
--- a/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt
+++ b/ui/bootstrap/src/main/kotlin/space/kscience/visionforge/bootstrap/threeControls.kt
@@ -8,7 +8,7 @@ import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.isEmpty
 import space.kscience.visionforge.Vision
 import space.kscience.visionforge.VisionGroup
-import space.kscience.visionforge.react.objectTree
+import space.kscience.visionforge.react.visionTree
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
 import styled.css
 import styled.styledDiv
@@ -39,7 +39,7 @@ public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalCo
                     flex(1.0, 1.0, FlexBasis.inherit)
                 }
                 props.vision?.let {
-                    objectTree(it, props.selected, props.onSelect)
+                    visionTree(it, props.selected, props.onSelect)
                 }
             }
         }
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
index 4ce84033..2a786f20 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
@@ -16,7 +16,9 @@ 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.*
+import styled.css
+import styled.styledDiv
+import styled.styledSpan
 
 public external interface MetaViewerProps : RProps {
     /**
@@ -84,7 +86,7 @@ private fun RBuilder.metaViewerItem(props: MetaViewerProps) {
                 }
             }
             if (expanded) {
-                styledUl {
+                flexColumn {
                     css {
                         +TreeStyles.tree
                     }
@@ -96,7 +98,7 @@ private fun RBuilder.metaViewerItem(props: MetaViewerProps) {
                     }
 
                     keys.filter { !it.body.startsWith("@") }.forEach { token ->
-                        styledLi {
+                        styledDiv {
                             css {
                                 +TreeStyles.treeItem
                             }
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
index 7435f388..f48b258b 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
@@ -26,7 +26,10 @@ import space.kscience.dataforge.names.lastOrNull
 import space.kscience.dataforge.names.plus
 import space.kscience.dataforge.values.Value
 import space.kscience.visionforge.hidden
-import styled.*
+import styled.css
+import styled.styledButton
+import styled.styledDiv
+import styled.styledSpan
 
 public external interface PropertyEditorProps : RProps {
 
@@ -150,12 +153,12 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
             }
         }
         if (expanded) {
-            styledUl {
+            flexColumn {
                 css {
                     +TreeStyles.tree
                 }
                 keys.forEach { token ->
-                    styledLi {
+                    styledDiv {
                         css {
                             +TreeStyles.treeItem
                         }
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/TreeStyles.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/TreeStyles.kt
index 654c31eb..59bee78f 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/TreeStyles.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/TreeStyles.kt
@@ -9,7 +9,7 @@ public object TreeStyles : StyleSheet("treeStyles", true) {
      * Remove default bullets
      */
     public val tree: RuleSet by css {
-        paddingLeft = 8.px
+        paddingLeft = 5.px
         marginLeft = 0.px
         listStyleType = ListStyleType.none
     }
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ObjectTree.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/VisionTree.kt
similarity index 93%
rename from ui/react/src/main/kotlin/space/kscience/visionforge/react/ObjectTree.kt
rename to ui/react/src/main/kotlin/space/kscience/visionforge/react/VisionTree.kt
index e7e7dd06..3e715342 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ObjectTree.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/VisionTree.kt
@@ -11,7 +11,10 @@ import space.kscience.dataforge.names.startsWith
 import space.kscience.visionforge.Vision
 import space.kscience.visionforge.VisionGroup
 import space.kscience.visionforge.isEmpty
-import styled.*
+import styled.css
+import styled.styledButton
+import styled.styledDiv
+import styled.styledSpan
 
 public external interface ObjectTreeProps : RProps {
     public var name: Name
@@ -20,7 +23,7 @@ public external interface ObjectTreeProps : RProps {
     public var clickCallback: (Name) -> Unit
 }
 
-private fun RBuilder.objectTree(props: ObjectTreeProps): Unit {
+private fun RBuilder.visionTree(props: ObjectTreeProps): Unit {
     var expanded: Boolean by useState { props.selected?.startsWith(props.name) ?: false }
 
     val onClick: (Event) -> Unit = {
@@ -69,7 +72,7 @@ private fun RBuilder.objectTree(props: ObjectTreeProps): Unit {
             treeLabel(token)
         }
         if (expanded) {
-            styledUl {
+            flexColumn {
                 css {
                     +TreeStyles.tree
                 }
@@ -77,7 +80,7 @@ private fun RBuilder.objectTree(props: ObjectTreeProps): Unit {
                     .filter { !it.key.toString().startsWith("@") } // ignore statics and other hidden children
                     .sortedBy { (it.value as? VisionGroup)?.isEmpty ?: true } // ignore empty groups
                     .forEach { (childToken, child) ->
-                        styledLi {
+                        styledDiv {
                             css {
                                 +TreeStyles.treeItem
                             }
@@ -105,10 +108,10 @@ private fun RBuilder.objectTree(props: ObjectTreeProps): Unit {
 
 @JsExport
 public val ObjectTree: FunctionalComponent<ObjectTreeProps> = functionalComponent("ObjectTree") { props ->
-    objectTree(props)
+    visionTree(props)
 }
 
-public fun RBuilder.objectTree(
+public fun RBuilder.visionTree(
     vision: Vision,
     selected: Name? = null,
     clickCallback: (Name) -> Unit = {}
diff --git a/ui/ring/src/main/kotlin/ringui/datalist/Selection.kt b/ui/ring/src/main/kotlin/ringui/datalist/Selection.kt
new file mode 100644
index 00000000..552d6e6f
--- /dev/null
+++ b/ui/ring/src/main/kotlin/ringui/datalist/Selection.kt
@@ -0,0 +1,27 @@
+@file:JsModule("@jetbrains/ring-ui/components/data-list/selection")
+package ringui.datalist
+
+public external interface SelectionProperties<T> {
+    public var data: Array<dynamic>
+    public var selected: Set<T>
+    public var focused: T?
+    public var getKey: (T) -> dynamic
+    public var getChildren: (T) -> Array<T>
+    public var isItemSelectable: (T) -> Boolean
+}
+
+@JsName("default")
+public external class Selection<T>(args: SelectionProperties<T> = definedExternally) {
+    public fun select(item: T = definedExternally)
+    public fun deselect(item: T = definedExternally)
+    public fun toggleSelection(item: T = definedExternally)
+    public fun selectAll()
+    public fun resetFocus()
+    public fun resetSelection()
+    public fun reset()
+    public fun isFocused(value: T): Boolean
+    public fun isSelected(value: T): Boolean
+    public fun getFocused(): T
+    public fun getSelected(): Set<T>
+    public fun getActive(): Set<T>
+}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
index 38ed513d..6d93088b 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
@@ -1,7 +1,10 @@
 package space.kscience.visionforge.ring
 
-import kotlinx.css.*
+import kotlinx.css.BorderStyle
+import kotlinx.css.Color
+import kotlinx.css.padding
 import kotlinx.css.properties.border
+import kotlinx.css.px
 import kotlinx.html.js.onClickFunction
 import org.w3c.dom.events.Event
 import org.w3c.files.Blob
@@ -9,7 +12,6 @@ import org.w3c.files.BlobPropertyBag
 import react.*
 import react.dom.attrs
 import react.dom.button
-import react.dom.h2
 import ringui.island.ringIsland
 import ringui.tabs.ringSmartTabs
 import ringui.tabs.ringTab
@@ -21,11 +23,10 @@ import space.kscience.visionforge.VisionGroup
 import space.kscience.visionforge.encodeToString
 import space.kscience.visionforge.react.flexColumn
 import space.kscience.visionforge.react.flexRow
-import space.kscience.visionforge.react.objectTree
 import space.kscience.visionforge.react.propertyEditor
+import space.kscience.visionforge.react.visionTree
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
 import styled.css
-import styled.styledDiv
 
 internal fun saveData(event: Event, fileName: String, mimeType: String = "text/plain", dataBuilder: () -> String) {
     event.stopPropagation();
@@ -87,7 +88,7 @@ public external interface ThreeControlsProps : RProps {
     public var canvasOptions: Canvas3DOptions
     public var vision: Vision?
     public var selected: Name?
-    public var onSelect: (Name) -> Unit
+    public var onSelect: (Name?) -> Unit
 }
 
 @JsExport
@@ -98,23 +99,10 @@ public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalCo
                 canvasControls(props.canvasOptions, props.vision)
             }
         }
-        ringTab("Tree") {
-            flexColumn {
-                css {
-                    border(1.px, BorderStyle.solid, Color.lightGray)
-                    padding(10.px)
-                    flexGrow = 1.0
-                    flexWrap = FlexWrap.wrap
-                }
-                h2 { +"Object tree" }
-                styledDiv {
-                    css {
-                        overflowY = Overflow.auto
-                        flexGrow = 1.0
-                    }
-                    props.vision?.let {
-                        objectTree(it, props.selected, props.onSelect)
-                    }
+        props.vision?.let {
+            ringTab("Tree") {
+                ringIsland("Vision tree") {
+                    visionTree(it, props.selected, props.onSelect)
                 }
             }
         }
@@ -140,7 +128,7 @@ public fun RBuilder.ringThreeControls(
     canvasOptions: Canvas3DOptions,
     vision: Vision?,
     selected: Name?,
-    onSelect: (Name) -> Unit = {},
+    onSelect: (Name?) -> Unit = {},
     builder: RBuilder.() -> Unit = {},
 ): ReactElement = child(ThreeControls) {
     attrs {

From 9cc3f65a18ce8a8ecc0ce1535f7300077ba123e0 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 13 Jun 2021 21:30:19 +0300
Subject: [PATCH 124/151] Remove datalist parts

---
 .../main/kotlin/ringui/datalist/Selection.kt  | 27 -------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 ui/ring/src/main/kotlin/ringui/datalist/Selection.kt

diff --git a/ui/ring/src/main/kotlin/ringui/datalist/Selection.kt b/ui/ring/src/main/kotlin/ringui/datalist/Selection.kt
deleted file mode 100644
index 552d6e6f..00000000
--- a/ui/ring/src/main/kotlin/ringui/datalist/Selection.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-@file:JsModule("@jetbrains/ring-ui/components/data-list/selection")
-package ringui.datalist
-
-public external interface SelectionProperties<T> {
-    public var data: Array<dynamic>
-    public var selected: Set<T>
-    public var focused: T?
-    public var getKey: (T) -> dynamic
-    public var getChildren: (T) -> Array<T>
-    public var isItemSelectable: (T) -> Boolean
-}
-
-@JsName("default")
-public external class Selection<T>(args: SelectionProperties<T> = definedExternally) {
-    public fun select(item: T = definedExternally)
-    public fun deselect(item: T = definedExternally)
-    public fun toggleSelection(item: T = definedExternally)
-    public fun selectAll()
-    public fun resetFocus()
-    public fun resetSelection()
-    public fun reset()
-    public fun isFocused(value: T): Boolean
-    public fun isSelected(value: T): Boolean
-    public fun getFocused(): T
-    public fun getSelected(): Set<T>
-    public fun getActive(): Set<T>
-}
\ No newline at end of file

From ea5f0abbf6460a3d4f4c0a75ff5fa49057835aca Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 14 Jun 2021 16:42:02 +0300
Subject: [PATCH 125/151] Css revamp

---
 .../visionforge/gdml/demo/GDMLAppComponent.kt |  39 ++--
 .../visionforge/gdml/demo/GdmlJsDemoApp.kt    |  29 ++-
 demo/gdml/src/jsMain/resources/index.html     |   2 +-
 .../visionforge/react/ThreeCanvasComponent.kt |   8 +-
 ui/ring/src/main/kotlin/ringui/Alert.kt       |   9 +-
 ui/ring/src/main/kotlin/ringui/Button.kt      |  10 +-
 ui/ring/src/main/kotlin/ringui/Dialog.kt      |   9 +-
 ui/ring/src/main/kotlin/ringui/Dropdown.kt    |  46 ++++
 ui/ring/src/main/kotlin/ringui/Icon.kt        |   9 +-
 ui/ring/src/main/kotlin/ringui/Link.kt        |   9 +-
 ui/ring/src/main/kotlin/ringui/RingUI.kt      |  14 --
 .../src/main/kotlin/ringui/header/Header.kt   |   6 +-
 .../ThreeViewWithControls.kt                  | 204 ++++++++++++------
 .../ringPropertyEditor.kt                     |  15 +-
 .../ringThreeControls.kt                      |  53 ++---
 15 files changed, 307 insertions(+), 155 deletions(-)
 create mode 100644 ui/ring/src/main/kotlin/ringui/Dropdown.kt
 delete mode 100644 ui/ring/src/main/kotlin/ringui/RingUI.kt

diff --git a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
index d26a5ad8..1d619dfb 100644
--- a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
@@ -4,6 +4,7 @@ import kotlinx.browser.window
 import org.w3c.files.FileReader
 import org.w3c.files.get
 import react.*
+import react.dom.h2
 import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.context.fetch
 import space.kscience.dataforge.names.Name
@@ -12,9 +13,9 @@ import space.kscience.gdml.decodeFromString
 import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.ring.ThreeCanvasWithControls
 import space.kscience.visionforge.ring.tab
+import space.kscience.visionforge.root
 import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.Solids
-import styled.styledDiv
 
 external interface GDMLAppProps : RProps {
     var context: Context
@@ -24,8 +25,8 @@ external interface GDMLAppProps : RProps {
 
 @JsExport
 val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
-    var vision: Solid? by useState { props.vision }
     val visionManager = useMemo(props.context) { props.context.fetch(Solids).visionManager }
+    var vision: Solid? by useState { props.vision?.apply { root(visionManager) } }
 
     fun loadData(name: String, data: String) {
         val parsedVision = when {
@@ -43,28 +44,30 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
         vision = parsedVision as? Solid ?: error("Parsed vision is not a solid")
     }
 
-    styledDiv {
-        child(ThreeCanvasWithControls) {
-            attrs {
-                this.context = props.context
-                this.solid = vision
-                this.selected = props.selected
-                tab("Load") {
-                    fileDrop("(drag file here)") { files ->
-                        val file = files?.get(0)
-                        if (file != null) {
-                            FileReader().apply {
-                                onload = {
-                                    val string = result as String
-                                    loadData(file.name, string)
-                                }
-                                readAsText(file)
+    child(ThreeCanvasWithControls) {
+        attrs {
+            this.context = props.context
+            this.solid = vision
+            this.selected = props.selected
+            tab("Load") {
+                h2 {
+                    +"Drag and drop .gdml or .json VisionForge files here"
+                }
+                fileDrop("(drag file here)") { files ->
+                    val file = files?.get(0)
+                    if (file != null) {
+                        FileReader().apply {
+                            onload = {
+                                val string = result as String
+                                loadData(file.name, string)
                             }
+                            readAsText(file)
                         }
                     }
                 }
             }
         }
+
     }
 }
 
diff --git a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt
index aefb24be..dc659c7c 100644
--- a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt
+++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GdmlJsDemoApp.kt
@@ -1,28 +1,45 @@
 package space.kscience.visionforge.gdml.demo
 
 import kotlinx.browser.document
+import kotlinx.css.*
 import react.child
 import react.dom.render
 import space.kscience.dataforge.context.Global
 import space.kscience.gdml.GdmlShowCase
 import space.kscience.visionforge.Application
-import space.kscience.visionforge.bootstrap.useBootstrap
 import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.solid.three.ThreePlugin
 import space.kscience.visionforge.startApplication
+import styled.injectGlobal
 
 
 private class GDMLDemoApp : Application {
 
     override fun start(state: Map<String, Any>) {
-        useBootstrap()
-
-        val element = document.getElementById("app") ?: error("Element with id 'app' not found on page")
-
-        val context = Global.buildContext("demo"){
+        val context = Global.buildContext("gdml-demo"){
             plugin(ThreePlugin)
         }
 
+        injectGlobal {
+            html{
+                height = 100.pct
+            }
+
+            body{
+                height = 100.pct
+                display = Display.flex
+                alignItems = Align.stretch
+            }
+
+            "#application"{
+                width = 100.pct
+                display = Display.flex
+                alignItems = Align.stretch
+            }
+        }
+
+        val element = document.getElementById("application") ?: error("Element with id 'application' not found on page")
+
         render(element) {
             child(GDMLApp) {
                 val vision = GdmlShowCase.cubes().toVision()
diff --git a/demo/gdml/src/jsMain/resources/index.html b/demo/gdml/src/jsMain/resources/index.html
index 8f5ca1ef..c468cbd5 100644
--- a/demo/gdml/src/jsMain/resources/index.html
+++ b/demo/gdml/src/jsMain/resources/index.html
@@ -8,6 +8,6 @@
     <link rel="stylesheet" href="css/fileDrop.css">
 </head>
 <body class="application">
-<div class="container-fluid max-vh-100" id = "app"> </div>
+<div id = "application"></div>
 </body>
 </html>
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
index 33b5754f..2534e746 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
@@ -21,11 +21,6 @@ public external interface ThreeCanvasProps : RProps {
     public var selected: Name?
 }
 
-public external interface ThreeCanvasState : RState {
-    public var element: Element?
-//    var canvas: ThreeCanvas?
-}
-
 public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functionalComponent(
     "ThreeCanvasComponent"
 ) { props ->
@@ -55,8 +50,7 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
         css {
             maxWidth = 100.vw
             maxHeight = 100.vh
-            display = Display.block
-            bottom = 0.px
+            flex(1.0, 1.0, FlexBasis.auto)
         }
         ref = elementRef
     }
diff --git a/ui/ring/src/main/kotlin/ringui/Alert.kt b/ui/ring/src/main/kotlin/ringui/Alert.kt
index 05cebfe0..db2647cb 100644
--- a/ui/ring/src/main/kotlin/ringui/Alert.kt
+++ b/ui/ring/src/main/kotlin/ringui/Alert.kt
@@ -1,6 +1,7 @@
 package ringui
 
 import react.RBuilder
+import react.RClass
 import react.RHandler
 import react.dom.WithClassName
 
@@ -27,8 +28,14 @@ public object AlertTypes {
     public var LOADING: String = "loading"
 }
 
+@JsModule("@jetbrains/ring-ui/components/alert/alert")
+internal external object AlertModule {
+    @JsName("default")
+    val Alert: RClass<AlertProps>
+}
+
 public fun RBuilder.ringAlert(handler: RHandler<AlertProps>) {
-    RingUI.Alert {
+    AlertModule.Alert {
         handler()
     }
 }
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/Button.kt b/ui/ring/src/main/kotlin/ringui/Button.kt
index 040bb5da..421de6ce 100644
--- a/ui/ring/src/main/kotlin/ringui/Button.kt
+++ b/ui/ring/src/main/kotlin/ringui/Button.kt
@@ -2,6 +2,7 @@ package ringui
 
 import org.w3c.dom.events.MouseEvent
 import react.RBuilder
+import react.RClass
 import react.RHandler
 import react.dom.WithClassName
 
@@ -28,8 +29,15 @@ public external interface ButtonProps : WithClassName {
     public var onMouseDown: (MouseEvent) -> Unit
 }
 
+@JsModule("@jetbrains/ring-ui/components/button/button")
+internal external object ButtonModule {
+    @JsName("default")
+    val Button: RClass<ButtonProps>
+}
+
+
 public fun RBuilder.ringButton(handler: RHandler<ButtonProps>) {
-    RingUI.Button {
+    ButtonModule.Button {
         handler()
     }
 }
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/Dialog.kt b/ui/ring/src/main/kotlin/ringui/Dialog.kt
index 90ac16b9..7df7df1a 100644
--- a/ui/ring/src/main/kotlin/ringui/Dialog.kt
+++ b/ui/ring/src/main/kotlin/ringui/Dialog.kt
@@ -1,6 +1,7 @@
 package ringui
 
 import react.RBuilder
+import react.RClass
 import react.RHandler
 import react.dom.WithClassName
 
@@ -20,8 +21,14 @@ public external interface DialogProps : WithClassName {
     public var autoFocusFirst: Boolean
 }
 
+@JsModule("@jetbrains/ring-ui/components/dialog/dialog")
+internal external object DialogModule {
+    @JsName("default")
+    val Dialog: RClass<DialogProps>
+}
+
 public fun RBuilder.ringDialog(show: Boolean, handler: RHandler<DialogProps>) {
-    RingUI.Dialog {
+    DialogModule.Dialog {
         attrs.show = show
         handler()
     }
diff --git a/ui/ring/src/main/kotlin/ringui/Dropdown.kt b/ui/ring/src/main/kotlin/ringui/Dropdown.kt
new file mode 100644
index 00000000..4fde43c6
--- /dev/null
+++ b/ui/ring/src/main/kotlin/ringui/Dropdown.kt
@@ -0,0 +1,46 @@
+package ringui
+
+import org.w3c.dom.events.Event
+import react.RBuilder
+import react.RClass
+import react.RHandler
+import react.ReactElement
+import react.dom.WithClassName
+
+public external interface AnchorProps : WithClassName
+
+public external interface DropdownProps : WithClassName {
+    /**
+     * Can be string, React element, or a function accepting an object with {active, pinned} properties and returning a React element
+     * React element should render some interactive HTML element like `button` or `a`
+     */
+    public var anchor: dynamic //: PropTypes.oneOfType([PropTypes.node, PropTypes.func]).isRequired,
+    public var initShown: Boolean
+    public var activeClassName: String
+    public var clickMode: Boolean
+    public var hoverMode: Boolean
+    public var hoverShowTimeOut: Number
+    public var hoverHideTimeOut: Number
+    public var onShow: () -> Unit
+    public var onHide: () -> Unit
+    public var onMouseEnter: (Event) -> Unit
+    public var onMouseLeave: (Event) -> Unit
+    //'data-test': PropTypes.string
+}
+
+@JsModule("@jetbrains/ring-ui/components/dropdown/dropdown")
+public external object DropdownModule {
+    public val Anchor: RClass<AnchorProps>
+
+    @JsName("default")
+    public val Dropdown: RClass<DropdownProps>
+}
+
+
+public fun RBuilder.ringDropdown(anchor: dynamic, handler: RHandler<DropdownProps>): ReactElement =
+    DropdownModule.Dropdown {
+        attrs {
+            this.anchor = anchor
+        }
+        handler()
+    }
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/Icon.kt b/ui/ring/src/main/kotlin/ringui/Icon.kt
index a8ea7d66..ad41b18a 100644
--- a/ui/ring/src/main/kotlin/ringui/Icon.kt
+++ b/ui/ring/src/main/kotlin/ringui/Icon.kt
@@ -1,6 +1,7 @@
 package ringui
 
 import react.RBuilder
+import react.RClass
 import react.RHandler
 import react.dom.WithClassName
 
@@ -14,8 +15,14 @@ public external interface IconProps : WithClassName {
     public var loading: Boolean
 }
 
+@JsModule("@jetbrains/ring-ui/components/icon/icon")
+internal external object IconModule {
+    @JsName("default")
+    val Icon: RClass<IconProps>
+}
+
 public fun RBuilder.ringIcon(handler: RHandler<IconProps>) {
-    RingUI.Icon {
+    IconModule.Icon {
         handler()
     }
 }
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/Link.kt b/ui/ring/src/main/kotlin/ringui/Link.kt
index 7688c5ce..712a30ca 100644
--- a/ui/ring/src/main/kotlin/ringui/Link.kt
+++ b/ui/ring/src/main/kotlin/ringui/Link.kt
@@ -2,6 +2,7 @@ package ringui
 
 import org.w3c.dom.events.MouseEvent
 import react.RBuilder
+import react.RClass
 import react.RHandler
 import react.dom.WithClassName
 
@@ -17,8 +18,14 @@ public external interface LinkProps : WithClassName {
     public var onClick: (MouseEvent) -> Unit
 }
 
+@JsModule("@jetbrains/ring-ui/components/link/link")
+internal external object LinkModule {
+    @JsName("default")
+    val Link: RClass<LinkProps>
+}
+
 public fun RBuilder.ringLink(handler: RHandler<LinkProps>) {
-    RingUI.Link {
+    LinkModule.Link {
         handler()
     }
 }
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/RingUI.kt b/ui/ring/src/main/kotlin/ringui/RingUI.kt
deleted file mode 100644
index 816627de..00000000
--- a/ui/ring/src/main/kotlin/ringui/RingUI.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package ringui
-
-import react.RClass
-import ringui.header.HeaderProps
-
-@JsModule("@jetbrains/ring-ui")
-public external object RingUI {
-    public val Alert: RClass<AlertProps>
-    public val Button: RClass<ButtonProps>
-    public val Dialog: RClass<DialogProps>
-    public val Header: RClass<HeaderProps>
-    public val Link: RClass<LinkProps>
-    public val Icon: RClass<IconProps>
-}
diff --git a/ui/ring/src/main/kotlin/ringui/header/Header.kt b/ui/ring/src/main/kotlin/ringui/header/Header.kt
index 379e2539..182fe6de 100644
--- a/ui/ring/src/main/kotlin/ringui/header/Header.kt
+++ b/ui/ring/src/main/kotlin/ringui/header/Header.kt
@@ -4,10 +4,11 @@ import react.RBuilder
 import react.RClass
 import react.RHandler
 import react.dom.WithClassName
-import ringui.RingUI
 
 @JsModule("@jetbrains/ring-ui/components/header/header")
 internal external object HeaderModule {
+    @JsName("default")
+    val Header: RClass<HeaderProps>
     val RerenderableHeader: RClass<HeaderProps>
     val Logo: RClass<HeaderLogoProps>
     val Tray: RClass<HeaderTrayProps>
@@ -24,8 +25,9 @@ public external interface HeaderProps : WithClassName {
     public var theme: String
 }
 
+
 public fun RBuilder.ringHeader(handler: RHandler<HeaderProps>) {
-    RingUI.Header {
+    HeaderModule.Header {
         handler()
     }
 }
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
index 60734c63..6fb32a4e 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
@@ -2,14 +2,21 @@ package space.kscience.visionforge.ring
 
 import kotlinx.css.*
 import react.*
-import ringui.grid.RowPosition
-import ringui.grid.ringCol
-import ringui.grid.ringGrid
-import ringui.grid.ringRow
-import ringui.tabs.ringTab
+import react.dom.div
+import react.dom.span
+import ringui.ringLink
 import space.kscience.dataforge.context.Context
 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.VisionGroup
+import space.kscience.visionforge.allProperties
+import space.kscience.visionforge.ownProperties
 import space.kscience.visionforge.react.ThreeCanvasComponent
+import space.kscience.visionforge.react.flexColumn
+import space.kscience.visionforge.react.flexRow
+import space.kscience.visionforge.react.propertyEditor
 import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
 import styled.css
@@ -22,72 +29,143 @@ public external interface ThreeCanvasWithControlsProps : RProps {
     public var additionalTabs: Map<String, RBuilder.() -> Unit>?
 }
 
-public fun ThreeCanvasWithControlsProps.tab(title: String, block: RBuilder.()->Unit){
-    additionalTabs = (additionalTabs?: emptyMap()) + (title to block)
+public fun ThreeCanvasWithControlsProps.tab(title: String, block: RBuilder.() -> Unit) {
+    additionalTabs = (additionalTabs ?: emptyMap()) + (title to block)
 }
 
-@JsExport
-public val ThreeCanvasWithControls: (props: ThreeCanvasWithControlsProps) -> dynamic =
-    functionalComponent("ThreeViewWithControls") { props ->
-        var selected by useState { props.selected }
-        val onSelect: (Name?) -> Unit = {
-            selected = it
-        }
-        val options = useMemo {
-            Canvas3DOptions.invoke {
-                this.onSelect = onSelect
+
+public fun RBuilder.nameCrumbs(name: Name?, link: (Name) -> Unit): ReactElement = styledDiv {
+    div {
+        ringLink {
+            attrs {
+                onClick = {
+                    link(Name.EMPTY)
+                }
             }
+            +"\u2302"
         }
 
-        styledDiv {
-            css {
-                height = 100.pct
-                width = 100.pct
-                maxHeight = 100.vh
-                maxWidth = 100.vw
-            }
-            ringGrid {
-                ringRow {
+        if (name != null) {
+            val tokens = ArrayList<NameToken>(name.length)
+            name.tokens.forEach { token ->
+                tokens.add(token)
+                val fullName = Name(tokens.toList())
+                span { +"/" }
+                ringLink {
+                    +token.toString()
                     attrs {
-                        start = RowPosition.sm
-                    }
-                    ringCol {
-                        attrs {
-                            xs = 12
-                            sm = 12
-                            md = 8
-                            lg = 9
-                        }
-                        child(ThreeCanvasComponent) {
-                            attrs {
-                                this.context = props.context
-                                this.solid = props.solid
-                                this.selected = selected
-                                this.options = options
-                            }
-                        }
-                    }
-                    ringCol {
-                        attrs {
-                            xs = 12
-                            sm = 12
-                            md = 4
-                            lg = 3
-                        }
-                        styledDiv {
-                            css {
-                                padding(top = 4.px)
-                                width = 100.pct
-                                //border(1.px, BorderStyle.solid, Color.lightGray)
-                            }
-                            ringThreeControls(options, props.solid, selected, onSelect) {
-                                props.additionalTabs?.forEach { (title, builder) ->
-                                    ringTab(title, title, builder)
-                                }
-                            }
+                        onClick = {
+                            console.log("Selected = $fullName")
+                            link(fullName)
                         }
                     }
                 }
             }
         }
-    }
\ No newline at end of file
+    }
+
+}
+
+@JsExport
+public val ThreeCanvasWithControls: FunctionalComponent<ThreeCanvasWithControlsProps> =
+    functionalComponent("ThreeViewWithControls") { props ->
+        var selected by useState { props.selected }
+
+        val onSelect: (Name?) -> Unit = {
+            selected = it
+        }
+
+        val options = useMemo(props.context) {
+            Canvas3DOptions.invoke {
+                this.onSelect = onSelect
+            }
+        }
+
+        val selectedVision = useMemo(selected) {
+            selected?.let {
+                when {
+                    it.isEmpty() -> props.solid
+                    else -> (props.solid as? VisionGroup)?.get(it)
+                }
+            }
+        }
+
+        flexRow {
+            css {
+                flex(1.0, 1.0, FlexBasis.auto)
+                flexWrap = FlexWrap.wrap
+                alignItems = Align.stretch
+                alignContent = Align.stretch
+            }
+
+            flexColumn {
+                css {
+                    minWidth = 600.px
+                    flex(10.0, 1.0, FlexBasis("600px"))
+                    position = Position.relative
+                }
+
+                child(ThreeCanvasComponent) {
+                    attrs {
+                        this.context = props.context
+                        this.solid = props.solid
+                        this.selected = selected
+                        this.options = options
+                    }
+                }
+
+                selectedVision?.let { vision ->
+                    styledDiv {
+                        css {
+                            position = Position.absolute
+                            top = 10.px
+                            right = 10.px
+                        }
+                        styledDiv {
+                            css {
+                                minWidth = 450.px
+                                backgroundColor = Color.white
+                                borderRadius = 3.px
+                                borderColor = Color.blue
+                                borderWidth = 1.px
+                                borderStyle = BorderStyle.solid
+                                padding(3.px)
+                            }
+                            propertyEditor(
+                                ownProperties = vision.ownProperties,
+                                allProperties = vision.allProperties(),
+                                updateFlow = vision.propertyChanges,
+                                descriptor = vision.descriptor,
+                                key = selected
+                            )
+                        }
+                    }
+                    styledDiv {
+                        css {
+                            position = Position.absolute
+                            bottom = 10.px
+                            left = 10.px
+                            backgroundColor = Color.white
+                            borderRadius = 3.px
+                            borderColor = Color.blue
+                            borderWidth = 1.px
+                            borderStyle = BorderStyle.solid
+                            padding(3.px)
+                        }
+                        nameCrumbs(selected) { selected = it }
+                    }
+                }
+            }
+            flexColumn {
+                css {
+                    padding(4.px)
+                    minWidth = 400.px
+                    flex(1.0, 10.0, FlexBasis("300px"))
+                    alignItems = Align.stretch
+                    alignContent = Align.stretch
+                    //border(1.px, BorderStyle.solid, Color.lightGray)
+                }
+                ringThreeControls(options, props.solid, selected, onSelect, additionalTabs = props.additionalTabs)
+            }
+        }
+    }
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt
index ed082f03..5ef7da96 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt
@@ -4,7 +4,6 @@ import org.w3c.dom.Element
 import react.RBuilder
 import react.dom.p
 import react.dom.render
-import react.useMemo
 import ringui.island.ringIsland
 import ringui.island.ringIslandContent
 import ringui.island.ringIslandHeader
@@ -22,14 +21,12 @@ public fun RBuilder.ringPropertyEditor(
     descriptor: NodeDescriptor? = vision.descriptor,
     key: Any? = null,
 ) {
-
-    val styles = useMemo(vision, key) {
-        if (vision is SolidReference) {
-            (vision.styles + vision.prototype.styles).distinct()
-        } else {
-            vision.styles
-        }
+    val styles = if (vision is SolidReference) {
+        (vision.styles + vision.prototype.styles).distinct()
+    } else {
+        vision.styles
     }
+
     flexColumn {
         ringIsland("Properties") {
             propertyEditor(
@@ -52,7 +49,7 @@ public fun RBuilder.ringPropertyEditor(
                 ringIslandContent {
                     if (styles.size == 1) {
                         val styleName = styles.first()
-                        p{
+                        p {
                             +styleName
                         }
                         val style = vision.getStyle(styleName)
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
index 6d93088b..58b7839f 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
@@ -1,10 +1,7 @@
 package space.kscience.visionforge.ring
 
-import kotlinx.css.BorderStyle
-import kotlinx.css.Color
-import kotlinx.css.padding
+import kotlinx.css.*
 import kotlinx.css.properties.border
-import kotlinx.css.px
 import kotlinx.html.js.onClickFunction
 import org.w3c.dom.events.Event
 import org.w3c.files.Blob
@@ -17,9 +14,7 @@ import ringui.tabs.ringSmartTabs
 import ringui.tabs.ringTab
 import space.kscience.dataforge.meta.withDefault
 import space.kscience.dataforge.names.Name
-import space.kscience.dataforge.names.isEmpty
 import space.kscience.visionforge.Vision
-import space.kscience.visionforge.VisionGroup
 import space.kscience.visionforge.encodeToString
 import space.kscience.visionforge.react.flexColumn
 import space.kscience.visionforge.react.flexRow
@@ -27,6 +22,7 @@ import space.kscience.visionforge.react.propertyEditor
 import space.kscience.visionforge.react.visionTree
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
 import styled.css
+import styled.styledDiv
 
 internal fun saveData(event: Event, fileName: String, mimeType: String = "text/plain", dataBuilder: () -> String) {
     event.stopPropagation();
@@ -89,38 +85,35 @@ public external interface ThreeControlsProps : RProps {
     public var vision: Vision?
     public var selected: Name?
     public var onSelect: (Name?) -> Unit
+    public var additionalTabs: Map<String, RBuilder.() -> Unit>
 }
 
 @JsExport
 public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalComponent { props ->
-    ringSmartTabs(if (props.selected != null) "Properties" else "Tree") {
-        ringTab("Canvas") {
+    ringSmartTabs("Tree") {
+        props.vision?.let {
+            ringTab("Tree") {
+                styledDiv {
+                    css {
+                        height = 100.pct
+                        overflowY = Overflow.auto
+                    }
+                    ringIsland("Vision tree") {
+                        visionTree(it, props.selected, props.onSelect)
+                    }
+                }
+            }
+        }
+        ringTab("Settings") {
             ringIsland("Canvas configuration") {
                 canvasControls(props.canvasOptions, props.vision)
             }
         }
-        props.vision?.let {
-            ringTab("Tree") {
-                ringIsland("Vision tree") {
-                    visionTree(it, props.selected, props.onSelect)
-                }
+        props.additionalTabs.forEach { (name, handler) ->
+            ringTab(name){
+                handler()
             }
         }
-        if (props.selected != null) {
-            ringTab("Properties") {
-                props.selected.let { selected ->
-                    val selectedObject: Vision? = when {
-                        selected == null -> null
-                        selected.isEmpty() -> props.vision
-                        else -> (props.vision as? VisionGroup)?.get(selected)
-                    }
-                    if (selectedObject != null) {
-                        ringPropertyEditor(selectedObject, key = selected)
-                    }
-                }
-            }
-        }
-        props.children()
     }
 }
 
@@ -129,13 +122,13 @@ public fun RBuilder.ringThreeControls(
     vision: Vision?,
     selected: Name?,
     onSelect: (Name?) -> Unit = {},
-    builder: RBuilder.() -> Unit = {},
+    additionalTabs: Map<String, RBuilder.() -> Unit>? = null
 ): ReactElement = child(ThreeControls) {
     attrs {
         this.canvasOptions = canvasOptions
         this.vision = vision
         this.selected = selected
         this.onSelect = onSelect
+        this.additionalTabs = additionalTabs?: emptyMap()
     }
-    builder()
 }
\ No newline at end of file

From 7cf819d7ce57378f099cea943c6554fa801a09ae Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 29 Jun 2021 11:49:41 +0300
Subject: [PATCH 126/151] Move to external RingUI implementation. wrappers-bom

---
 build.gradle.kts                              | 17 +++---
 demo/gdml/build.gradle.kts                    |  1 -
 demo/gdml/webpack.config.d/02.boostrap.js     |  7 ---
 demo/solid-showcase/build.gradle.kts          | 12 ++---
 gradle.properties                             |  3 --
 .../visionforge-gdml-jupyter/build.gradle.kts |  6 ++-
 settings.gradle.kts                           |  8 +--
 ui/build.gradle.kts                           |  0
 ui/react/build.gradle.kts                     |  6 +--
 .../kscience/visionforge/react/MetaViewer.kt  | 17 +++---
 .../visionforge/react/PropertyEditor.kt       |  6 ++-
 .../visionforge/react/ThreeCanvasComponent.kt |  8 +--
 ui/ring/build.gradle.kts                      |  2 +
 ui/ring/src/main/kotlin/ringui/Alert.kt       | 41 --------------
 ui/ring/src/main/kotlin/ringui/Button.kt      | 43 ---------------
 ui/ring/src/main/kotlin/ringui/Dialog.kt      | 35 ------------
 ui/ring/src/main/kotlin/ringui/Dropdown.kt    | 46 ----------------
 ui/ring/src/main/kotlin/ringui/Icon.kt        | 28 ----------
 ui/ring/src/main/kotlin/ringui/Link.kt        | 31 -----------
 ui/ring/src/main/kotlin/ringui/UserCard.kt    | 38 -------------
 ui/ring/src/main/kotlin/ringui/grid/Col.kt    | 23 --------
 ui/ring/src/main/kotlin/ringui/grid/Grid.kt   | 20 -------
 ui/ring/src/main/kotlin/ringui/grid/Row.kt    | 33 ------------
 .../src/main/kotlin/ringui/header/Header.kt   | 33 ------------
 ui/ring/src/main/kotlin/ringui/header/Logo.kt | 21 --------
 ui/ring/src/main/kotlin/ringui/header/Tray.kt | 26 ---------
 .../src/main/kotlin/ringui/island/Content.kt  | 20 -------
 .../src/main/kotlin/ringui/island/Header.kt   | 18 -------
 .../src/main/kotlin/ringui/island/Island.kt   | 45 ----------------
 .../src/main/kotlin/ringui/tabs/SmartTabs.kt  | 21 --------
 ui/ring/src/main/kotlin/ringui/tabs/Tabs.kt   | 51 ------------------
 .../ThreeViewWithControls.kt                  |  6 +--
 .../ringPropertyEditor.kt                     | 53 ++++++++-----------
 .../ringThreeControls.kt                      | 20 +++----
 visionforge-core/build.gradle.kts             |  5 +-
 visionforge-fx/build.gradle.kts               |  2 -
 .../visionforge/solid/SolidReference.kt       |  6 +--
 visionforge-threejs/build.gradle.kts          |  7 ---
 38 files changed, 80 insertions(+), 685 deletions(-)
 delete mode 100644 demo/gdml/webpack.config.d/02.boostrap.js
 delete mode 100644 ui/build.gradle.kts
 delete mode 100644 ui/ring/src/main/kotlin/ringui/Alert.kt
 delete mode 100644 ui/ring/src/main/kotlin/ringui/Button.kt
 delete mode 100644 ui/ring/src/main/kotlin/ringui/Dialog.kt
 delete mode 100644 ui/ring/src/main/kotlin/ringui/Dropdown.kt
 delete mode 100644 ui/ring/src/main/kotlin/ringui/Icon.kt
 delete mode 100644 ui/ring/src/main/kotlin/ringui/Link.kt
 delete mode 100644 ui/ring/src/main/kotlin/ringui/UserCard.kt
 delete mode 100644 ui/ring/src/main/kotlin/ringui/grid/Col.kt
 delete mode 100644 ui/ring/src/main/kotlin/ringui/grid/Grid.kt
 delete mode 100644 ui/ring/src/main/kotlin/ringui/grid/Row.kt
 delete mode 100644 ui/ring/src/main/kotlin/ringui/header/Header.kt
 delete mode 100644 ui/ring/src/main/kotlin/ringui/header/Logo.kt
 delete mode 100644 ui/ring/src/main/kotlin/ringui/header/Tray.kt
 delete mode 100644 ui/ring/src/main/kotlin/ringui/island/Content.kt
 delete mode 100644 ui/ring/src/main/kotlin/ringui/island/Header.kt
 delete mode 100644 ui/ring/src/main/kotlin/ringui/island/Island.kt
 delete mode 100644 ui/ring/src/main/kotlin/ringui/tabs/SmartTabs.kt
 delete mode 100644 ui/ring/src/main/kotlin/ringui/tabs/Tabs.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 4170628c..b75039f7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,14 +1,14 @@
 plugins {
     id("ru.mipt.npm.gradle.project")
-    kotlin("multiplatform") apply false
-    kotlin("jvm") apply false
-    kotlin("js") apply false
-    kotlin("jupyter.api") apply false
-    id("ru.mipt.npm.gradle.js") apply false
+
+    //Override kotlin version
+//    val kotlinVersion = "1.5.20-RC"
+//    kotlin("multiplatform") version(kotlinVersion) apply false
+//    kotlin("jvm") version(kotlinVersion) apply false
+//    kotlin("js") version(kotlinVersion) apply false
 }
 
-val dataforgeVersion by extra("0.4.2")
-val kotlinWrappersVersion by extra("pre.206-kotlin-1.5.10")
+val dataforgeVersion by extra("0.4.3")
 val fxVersion by extra("11")
 
 allprojects {
@@ -17,10 +17,11 @@ allprojects {
         jcenter()
         maven("https://repo.kotlin.link")
         maven("https://maven.jzy3d.org/releases")
+        maven("https://maven.pkg.jetbrains.space/mipt-npm/p/mipt-npm/maven")
     }
 
     group = "space.kscience"
-    version = "0.2.0-dev-19"
+    version = "0.2.0-dev-20"
 }
 
 subprojects {
diff --git a/demo/gdml/build.gradle.kts b/demo/gdml/build.gradle.kts
index 31232cc8..391db4f9 100644
--- a/demo/gdml/build.gradle.kts
+++ b/demo/gdml/build.gradle.kts
@@ -38,7 +38,6 @@ kotlin {
         }
         jsMain {
             dependencies {
-                implementation(project(":ui:bootstrap"))
                 implementation(project(":ui:ring"))
                 implementation(project(":visionforge-threejs"))
                 implementation(npm("react-file-drop", "3.0.6"))
diff --git a/demo/gdml/webpack.config.d/02.boostrap.js b/demo/gdml/webpack.config.d/02.boostrap.js
deleted file mode 100644
index e1d53b36..00000000
--- a/demo/gdml/webpack.config.d/02.boostrap.js
+++ /dev/null
@@ -1,7 +0,0 @@
-config.module.rules.push({
-    test: /\.css$/,
-    include: [
-        require.resolve('bootstrap/dist/css/bootstrap.min.css')
-    ],
-    use: ['style-loader', 'css-loader']
-});
\ No newline at end of file
diff --git a/demo/solid-showcase/build.gradle.kts b/demo/solid-showcase/build.gradle.kts
index a4b38e82..bc391b9d 100644
--- a/demo/solid-showcase/build.gradle.kts
+++ b/demo/solid-showcase/build.gradle.kts
@@ -13,14 +13,10 @@ kscience {
     application()
 }
 
-val kotlinWrappersVersion: String by rootProject.extra
-
 kotlin {
 
     jvm {
-        afterEvaluate {
-            withJava()
-        }
+        withJava()
     }
 
     sourceSets {
@@ -30,12 +26,12 @@ kotlin {
 //                implementation(project(":visionforge-gdml"))
             }
         }
-        jvmMain{
-            dependencies{
+        jvmMain {
+            dependencies {
                 implementation(project(":visionforge-fx"))
             }
         }
-        jsMain{
+        jsMain {
             dependencies {
                 implementation(project(":visionforge-threejs"))
             }
diff --git a/gradle.properties b/gradle.properties
index d9bddc47..2ffacd8f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,10 +1,7 @@
 kotlin.code.style=official
-
 kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.stability.nowarn=true
-
 kotlin.native.enableDependencyPropagation=false
-kotlin.parallel.tasks.in.project=true
 
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
 org.gradle.parallel=true
\ No newline at end of file
diff --git a/jupyter/visionforge-gdml-jupyter/build.gradle.kts b/jupyter/visionforge-gdml-jupyter/build.gradle.kts
index 48391b5d..e2d1db03 100644
--- a/jupyter/visionforge-gdml-jupyter/build.gradle.kts
+++ b/jupyter/visionforge-gdml-jupyter/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     id("ru.mipt.npm.gradle.mpp")
-    kotlin("jupyter.api")
 }
 
 description = "Jupyter api artifact for GDML rendering"
@@ -41,7 +40,6 @@ kotlin{
         jvmMain{
             dependencies {
                 implementation(project(":visionforge-gdml"))
-                implementation(kotlin("script-runtime"))
             }
         }
         jsMain {
@@ -54,6 +52,10 @@ kotlin{
     }
 }
 
+kscience{
+    useJupyter()
+}
+
 readme{
     maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
 }
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 630dc8dc..bc62b31e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
-    val kotlinVersion = "1.5.10"
-    val toolsVersion = "0.9.10"
+
+    val toolsVersion = "0.10.0"
 
     repositories {
         maven("https://repo.kotlin.link")
@@ -13,10 +13,6 @@ pluginManagement {
         id("ru.mipt.npm.gradle.mpp") version toolsVersion
         id("ru.mipt.npm.gradle.jvm") version toolsVersion
         id("ru.mipt.npm.gradle.js") version toolsVersion
-        kotlin("multiplatform") version kotlinVersion
-        kotlin("jvm") version kotlinVersion
-        kotlin("js") version kotlinVersion
-        kotlin("jupyter.api") version "0.9.1-20"
     }
 }
 
diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
deleted file mode 100644
index e69de29b..00000000
diff --git a/ui/react/build.gradle.kts b/ui/react/build.gradle.kts
index 151b92fe..40853ca9 100644
--- a/ui/react/build.gradle.kts
+++ b/ui/react/build.gradle.kts
@@ -2,12 +2,10 @@ plugins {
     id("ru.mipt.npm.gradle.js")
 }
 
-val kotlinWrappersVersion: String by rootProject.extra
-
 dependencies{
     api(project(":visionforge-solid"))
-    api("org.jetbrains.kotlin-wrappers:kotlin-styled:5.3.0-$kotlinWrappersVersion")
-    api("org.jetbrains.kotlin-wrappers:kotlin-react-dom:17.0.2-$kotlinWrappersVersion")
+    api("org.jetbrains.kotlin-wrappers:kotlin-styled")
+    api("org.jetbrains.kotlin-wrappers:kotlin-react-dom")
 //    implementation(npm("react-select","4.3.0"))
     implementation(project(":visionforge-threejs"))
 }
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
index 2a786f20..b86f11fc 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
@@ -145,16 +145,17 @@ private fun RBuilder.metaViewerItem(props: MetaViewerProps) {
 }
 
 @JsExport
-public val MetaViewer:FunctionalComponent<MetaViewerProps>  = functionalComponent<MetaViewerProps>("MetaViewer") { props ->
-    child(MetaViewerItem) {
-        attrs {
-            this.key = ""
-            this.root = props.root
-            this.name = Name.EMPTY
-            this.descriptor = props.descriptor
+public val MetaViewer: FunctionalComponent<MetaViewerProps> =
+    functionalComponent<MetaViewerProps>("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: NodeDescriptor? = null, key: Any? = null) {
     child(MetaViewer) {
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
index f48b258b..66779588 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
@@ -87,13 +87,15 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
     }
 
     if (props.updateFlow != null) {
-        useEffectWithCleanup(listOf(props.ownProperties, props.updateFlow)) {
+        useEffect(props.ownProperties, props.updateFlow) {
             val updateJob = props.updateFlow!!.onEach { updatedName ->
                 if (updatedName == props.name) {
                     update()
                 }
             }.launchIn(props.scope ?: GlobalScope)
-            return@useEffectWithCleanup { updateJob.cancel() }
+            cleanup {
+                updateJob.cancel()
+            }
         }
     }
 
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
index 2534e746..0c42caf3 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
@@ -27,22 +27,22 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
     val elementRef = useRef<Element>(null)
     var canvas by useState<ThreeCanvas?>(null)
 
-    val three: ThreePlugin = useMemo({ props.context.fetch(ThreePlugin) }, arrayOf(props.context))
+    val three: ThreePlugin = useMemo(props.context){ props.context.fetch(ThreePlugin) }
 
-    useEffect(listOf(props.solid, props.options, elementRef)) {
+    useEffect(props.solid, props.options, elementRef) {
         if (canvas == null) {
             val element = elementRef.current as? HTMLElement ?: error("Canvas element not found")
             canvas = ThreeCanvas(three, element, props.options ?: Canvas3DOptions())
         }
     }
 
-    useEffect(listOf(canvas, props.solid)) {
+    useEffect(canvas, props.solid) {
         props.solid?.let { obj ->
             canvas?.render(obj)
         }
     }
 
-    useEffect(listOf(canvas, props.selected)) {
+    useEffect(canvas, props.selected) {
         canvas?.select(props.selected)
     }
 
diff --git a/ui/ring/build.gradle.kts b/ui/ring/build.gradle.kts
index 54d6b737..84d33b43 100644
--- a/ui/ring/build.gradle.kts
+++ b/ui/ring/build.gradle.kts
@@ -17,6 +17,8 @@ kotlin{
 
 dependencies{
     api(project(":ui:react"))
+    //TODO replace by kotlin-wrappers
+    api("ru.mipt.npm:ring-ui:0.1.0")
 
     implementation(npm("@jetbrains/icons", "3.14.1"))
     implementation(npm("@jetbrains/ring-ui", "4.0.7"))
diff --git a/ui/ring/src/main/kotlin/ringui/Alert.kt b/ui/ring/src/main/kotlin/ringui/Alert.kt
deleted file mode 100644
index db2647cb..00000000
--- a/ui/ring/src/main/kotlin/ringui/Alert.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package ringui
-
-import react.RBuilder
-import react.RClass
-import react.RHandler
-import react.dom.WithClassName
-
-// https://github.com/JetBrains/ring-ui/blob/master/components/alert/alert.js
-public external interface AlertProps : WithClassName {
-    public var timeout: Number
-    public var onCloseRequest: () -> Unit
-    public var onClose: () -> Unit
-    public var isShaking: Boolean
-    public var isClosing: Boolean
-    public var inline: Boolean
-    public var showWithAnimation: Boolean
-    public var closeable: Boolean
-    public var type: AlertType
-}
-
-public typealias AlertType = String
-
-public object AlertTypes {
-    public var ERROR: String = "error"
-    public var MESSAGE: String = "message"
-    public var SUCCESS: String = "success"
-    public var WARNING: String = "warning"
-    public var LOADING: String = "loading"
-}
-
-@JsModule("@jetbrains/ring-ui/components/alert/alert")
-internal external object AlertModule {
-    @JsName("default")
-    val Alert: RClass<AlertProps>
-}
-
-public fun RBuilder.ringAlert(handler: RHandler<AlertProps>) {
-    AlertModule.Alert {
-        handler()
-    }
-}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/Button.kt b/ui/ring/src/main/kotlin/ringui/Button.kt
deleted file mode 100644
index 421de6ce..00000000
--- a/ui/ring/src/main/kotlin/ringui/Button.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package ringui
-
-import org.w3c.dom.events.MouseEvent
-import react.RBuilder
-import react.RClass
-import react.RHandler
-import react.dom.WithClassName
-
-// https://github.com/JetBrains/ring-ui/blob/master/components/button/button.js
-public external interface ButtonProps : WithClassName {
-    public var theme: String
-    public var active: Boolean
-    public var danger: Boolean
-    public var delayed: Boolean
-    public var loader: Boolean
-    public var primary: Boolean
-
-    public var short: Boolean
-    public var text: Boolean
-    public var inline: Boolean
-    public var dropdown: Boolean
-
-    public var href: String
-
-    public var icon: dynamic /* string | func */
-    public var iconSize: Number
-    public var iconClassName: String
-
-    public var onMouseDown: (MouseEvent) -> Unit
-}
-
-@JsModule("@jetbrains/ring-ui/components/button/button")
-internal external object ButtonModule {
-    @JsName("default")
-    val Button: RClass<ButtonProps>
-}
-
-
-public fun RBuilder.ringButton(handler: RHandler<ButtonProps>) {
-    ButtonModule.Button {
-        handler()
-    }
-}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/Dialog.kt b/ui/ring/src/main/kotlin/ringui/Dialog.kt
deleted file mode 100644
index 7df7df1a..00000000
--- a/ui/ring/src/main/kotlin/ringui/Dialog.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package ringui
-
-import react.RBuilder
-import react.RClass
-import react.RHandler
-import react.dom.WithClassName
-
-// https://github.com/JetBrains/ring-ui/blob/master/components/dialog/dialog.js
-public external interface DialogProps : WithClassName {
-    public var contentClassName: String
-    public var show: Boolean
-    public var showCloseButton: Boolean
-    public var onOverlayClick: () -> Unit
-    public var onEscPress: () -> Unit
-    public var onCloseClick: () -> Unit
-    // onCloseAttempt is a common callback for ESC pressing and overlay clicking.
-    // Use it if you don't need different behaviors for this cases.
-    public var onCloseAttempt: () -> Unit
-    // focusTrap may break popups inside dialog, so use it carefully
-    public var trapFocus: Boolean
-    public var autoFocusFirst: Boolean
-}
-
-@JsModule("@jetbrains/ring-ui/components/dialog/dialog")
-internal external object DialogModule {
-    @JsName("default")
-    val Dialog: RClass<DialogProps>
-}
-
-public fun RBuilder.ringDialog(show: Boolean, handler: RHandler<DialogProps>) {
-    DialogModule.Dialog {
-        attrs.show = show
-        handler()
-    }
-}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/Dropdown.kt b/ui/ring/src/main/kotlin/ringui/Dropdown.kt
deleted file mode 100644
index 4fde43c6..00000000
--- a/ui/ring/src/main/kotlin/ringui/Dropdown.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package ringui
-
-import org.w3c.dom.events.Event
-import react.RBuilder
-import react.RClass
-import react.RHandler
-import react.ReactElement
-import react.dom.WithClassName
-
-public external interface AnchorProps : WithClassName
-
-public external interface DropdownProps : WithClassName {
-    /**
-     * Can be string, React element, or a function accepting an object with {active, pinned} properties and returning a React element
-     * React element should render some interactive HTML element like `button` or `a`
-     */
-    public var anchor: dynamic //: PropTypes.oneOfType([PropTypes.node, PropTypes.func]).isRequired,
-    public var initShown: Boolean
-    public var activeClassName: String
-    public var clickMode: Boolean
-    public var hoverMode: Boolean
-    public var hoverShowTimeOut: Number
-    public var hoverHideTimeOut: Number
-    public var onShow: () -> Unit
-    public var onHide: () -> Unit
-    public var onMouseEnter: (Event) -> Unit
-    public var onMouseLeave: (Event) -> Unit
-    //'data-test': PropTypes.string
-}
-
-@JsModule("@jetbrains/ring-ui/components/dropdown/dropdown")
-public external object DropdownModule {
-    public val Anchor: RClass<AnchorProps>
-
-    @JsName("default")
-    public val Dropdown: RClass<DropdownProps>
-}
-
-
-public fun RBuilder.ringDropdown(anchor: dynamic, handler: RHandler<DropdownProps>): ReactElement =
-    DropdownModule.Dropdown {
-        attrs {
-            this.anchor = anchor
-        }
-        handler()
-    }
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/Icon.kt b/ui/ring/src/main/kotlin/ringui/Icon.kt
deleted file mode 100644
index ad41b18a..00000000
--- a/ui/ring/src/main/kotlin/ringui/Icon.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package ringui
-
-import react.RBuilder
-import react.RClass
-import react.RHandler
-import react.dom.WithClassName
-
-// https://github.com/JetBrains/ring-ui/blob/master/components/icon/icon.js
-public external interface IconProps : WithClassName {
-    public var color: String
-    public var glyph: dynamic /* string | func */
-    public var height: Number
-    public var size: Number
-    public var width: Number
-    public var loading: Boolean
-}
-
-@JsModule("@jetbrains/ring-ui/components/icon/icon")
-internal external object IconModule {
-    @JsName("default")
-    val Icon: RClass<IconProps>
-}
-
-public fun RBuilder.ringIcon(handler: RHandler<IconProps>) {
-    IconModule.Icon {
-        handler()
-    }
-}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/Link.kt b/ui/ring/src/main/kotlin/ringui/Link.kt
deleted file mode 100644
index 712a30ca..00000000
--- a/ui/ring/src/main/kotlin/ringui/Link.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package ringui
-
-import org.w3c.dom.events.MouseEvent
-import react.RBuilder
-import react.RClass
-import react.RHandler
-import react.dom.WithClassName
-
-// https://github.com/JetBrains/ring-ui/blob/master/components/link/link.js
-public external interface LinkProps : WithClassName {
-    public var innerClassName: String
-    public var active: Boolean
-    public var inherit: Boolean
-    public var pseudo: Boolean
-    public var hover: Boolean
-    public var href: String
-    public var onPlainLeftClick: (MouseEvent) -> Unit
-    public var onClick: (MouseEvent) -> Unit
-}
-
-@JsModule("@jetbrains/ring-ui/components/link/link")
-internal external object LinkModule {
-    @JsName("default")
-    val Link: RClass<LinkProps>
-}
-
-public fun RBuilder.ringLink(handler: RHandler<LinkProps>) {
-    LinkModule.Link {
-        handler()
-    }
-}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/UserCard.kt b/ui/ring/src/main/kotlin/ringui/UserCard.kt
deleted file mode 100644
index 89ab105a..00000000
--- a/ui/ring/src/main/kotlin/ringui/UserCard.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package ringui
-
-import react.RBuilder
-import react.RClass
-import react.RHandler
-import react.RProps
-
-@JsModule("@jetbrains/ring-ui/components/user-card/user-card")
-private external object UserCardModule {
-    val UserCard: RClass<UserCardProps>
-}
-
-// https://github.com/JetBrains/ring-ui/blob/master/components/user-card/card.js
-public external interface UserCardProps : RProps {
-    public var user: UserCardModel
-    public var wording: UserCardWording
-}
-
-public data class UserCardModel(
-    val name: String,
-    val login: String,
-    val avatarUrl: String,
-    val email: String? = null,
-    val href: String? = null
-)
-
-public data class UserCardWording(
-    val banned: String,
-    val online: String,
-    val offline: String
-)
-
-public fun RBuilder.ringUserCard(user: UserCardModel, handler: RHandler<UserCardProps> = {}) {
-    UserCardModule.UserCard {
-        attrs.user = user
-        handler()
-    }
-}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/grid/Col.kt b/ui/ring/src/main/kotlin/ringui/grid/Col.kt
deleted file mode 100644
index 057415db..00000000
--- a/ui/ring/src/main/kotlin/ringui/grid/Col.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package ringui.grid
-
-import react.RBuilder
-import react.RHandler
-import react.dom.WithClassName
-
-public external interface ColProps : WithClassName {
-    public var xs: dynamic // number or boolean
-    public var sm: dynamic // number or boolean
-    public var md: dynamic // number or boolean
-    public var lg: dynamic // number or boolean
-    public var xsOffset: Number
-    public var smOffset: Number
-    public var mdOffset: Number
-    public var lgOffset: Number
-    public var reverse: Boolean
-}
-
-public fun RBuilder.ringCol(handler: RHandler<ColProps>){
-    GridModule.Col {
-        handler()
-    }
-}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/grid/Grid.kt b/ui/ring/src/main/kotlin/ringui/grid/Grid.kt
deleted file mode 100644
index 7613a6c4..00000000
--- a/ui/ring/src/main/kotlin/ringui/grid/Grid.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package ringui.grid
-
-import react.RBuilder
-import react.RClass
-import react.RHandler
-import react.RProps
-
-@JsModule("@jetbrains/ring-ui/components/grid/grid")
-internal external object GridModule {
-    val Grid: RClass<RProps>
-    val Row: RClass<RowProps>
-    val Col: RClass<dynamic>
-}
-
-
-public fun RBuilder.ringGrid(handler: RHandler<RProps>) {
-    GridModule.Grid {
-        handler()
-    }
-}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/grid/Row.kt b/ui/ring/src/main/kotlin/ringui/grid/Row.kt
deleted file mode 100644
index 78131971..00000000
--- a/ui/ring/src/main/kotlin/ringui/grid/Row.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package ringui.grid
-
-import react.RBuilder
-import react.RHandler
-import react.dom.WithClassName
-
-public enum class RowPosition {
-    xs,
-    sm,
-    md,
-    lg
-}
-
-public external interface RowProps : WithClassName {
-    public var reverse: Boolean
-    public var start: RowPosition
-    public var center: RowPosition
-    public var end: RowPosition
-    public var top: RowPosition
-    public var middle: RowPosition
-    public var baseline: RowPosition
-    public var bottom: RowPosition
-    public var around: RowPosition
-    public var between: RowPosition
-    public var first: RowPosition
-    public var last: RowPosition
-}
-
-public fun RBuilder.ringRow(handler: RHandler<RowProps>){
-    GridModule.Row {
-        handler()
-    }
-}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/header/Header.kt b/ui/ring/src/main/kotlin/ringui/header/Header.kt
deleted file mode 100644
index 182fe6de..00000000
--- a/ui/ring/src/main/kotlin/ringui/header/Header.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package ringui.header
-
-import react.RBuilder
-import react.RClass
-import react.RHandler
-import react.dom.WithClassName
-
-@JsModule("@jetbrains/ring-ui/components/header/header")
-internal external object HeaderModule {
-    @JsName("default")
-    val Header: RClass<HeaderProps>
-    val RerenderableHeader: RClass<HeaderProps>
-    val Logo: RClass<HeaderLogoProps>
-    val Tray: RClass<HeaderTrayProps>
-    val TrayIcon: RClass<WithClassName>
-    val Profile: RClass<WithClassName>
-    val SmartProfile: RClass<WithClassName>
-    val Services: RClass<WithClassName>
-    val SmartServices: RClass<WithClassName>
-}
-
-// https://github.com/JetBrains/ring-ui/blob/master/components/header/header.js
-public external interface HeaderProps : WithClassName {
-    public var spaced: Boolean
-    public var theme: String
-}
-
-
-public fun RBuilder.ringHeader(handler: RHandler<HeaderProps>) {
-    HeaderModule.Header {
-        handler()
-    }
-}
diff --git a/ui/ring/src/main/kotlin/ringui/header/Logo.kt b/ui/ring/src/main/kotlin/ringui/header/Logo.kt
deleted file mode 100644
index 5773517d..00000000
--- a/ui/ring/src/main/kotlin/ringui/header/Logo.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package ringui.header
-
-import kotlinx.html.A
-import react.RElementBuilder
-import react.RHandler
-import ringui.IconProps
-import styled.StyledDOMBuilder
-
-public external interface HeaderLogoProps : IconProps
-
-public fun StyledDOMBuilder<A>.ringLogo(handler: RHandler<HeaderLogoProps>) {
-    HeaderModule.Logo {
-        handler()
-    }
-}
-
-public fun RElementBuilder<HeaderProps>.ringLogo(handler: RHandler<HeaderLogoProps>) {
-    HeaderModule.Logo {
-        handler()
-    }
-}
diff --git a/ui/ring/src/main/kotlin/ringui/header/Tray.kt b/ui/ring/src/main/kotlin/ringui/header/Tray.kt
deleted file mode 100644
index b04e96a7..00000000
--- a/ui/ring/src/main/kotlin/ringui/header/Tray.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package ringui.header
-
-import react.RElementBuilder
-import react.RHandler
-import react.dom.WithClassName
-import ringui.ButtonProps
-
-// https://github.com/JetBrains/ring-ui/blob/master/components/header/tray.js
-public external interface HeaderTrayProps : WithClassName
-
-// https://github.com/JetBrains/ring-ui/blob/master/components/header/tray-icon.js
-public external interface HeaderTrayIconProps : ButtonProps {
-    public var rotatable: Boolean
-}
-
-public fun RElementBuilder<HeaderProps>.ringTray(handler: RHandler<HeaderTrayProps>) {
-    HeaderModule.Tray {
-        handler()
-    }
-}
-
-public fun RElementBuilder<HeaderTrayProps>.ringTrayIcon(handler: RHandler<WithClassName>) {
-    HeaderModule.TrayIcon {
-        handler()
-    }
-}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/island/Content.kt b/ui/ring/src/main/kotlin/ringui/island/Content.kt
deleted file mode 100644
index 63124dc2..00000000
--- a/ui/ring/src/main/kotlin/ringui/island/Content.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package ringui.island
-
-import react.RElementBuilder
-import react.RHandler
-import react.dom.WithClassName
-
-// https://github.com/JetBrains/ring-ui/blob/master/components/island/content.js
-public external interface IslandContentProps : WithClassName {
-    public var scrollableWrapperClassName: String
-    public var fade: Boolean
-    public var bottomBorder: Boolean
-    public var onScroll: () -> Unit
-    public var onScrollToBottom: () -> Unit
-}
-
-public fun RElementBuilder<IslandProps>.ringIslandContent(handler: RHandler<IslandContentProps>) {
-    IslandModule.Content {
-        handler()
-    }
-}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/island/Header.kt b/ui/ring/src/main/kotlin/ringui/island/Header.kt
deleted file mode 100644
index 1a970d89..00000000
--- a/ui/ring/src/main/kotlin/ringui/island/Header.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package ringui.island
-
-import react.RElementBuilder
-import react.RHandler
-import react.dom.WithClassName
-
-// https://github.com/JetBrains/ring-ui/blob/master/components/island/header.js
-public external interface IslandHeaderProps : WithClassName {
-    public var border: Boolean
-    public var wrapWithTitle: Boolean
-    public var phase: Number
-}
-
-public fun RElementBuilder<IslandProps>.ringIslandHeader(handler: RHandler<IslandHeaderProps>) {
-    IslandModule.Header {
-        handler()
-    }
-}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/island/Island.kt b/ui/ring/src/main/kotlin/ringui/island/Island.kt
deleted file mode 100644
index 03530902..00000000
--- a/ui/ring/src/main/kotlin/ringui/island/Island.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package ringui.island
-
-import react.RBuilder
-import react.RClass
-import react.RHandler
-import react.dom.WithClassName
-
-@JsModule("@jetbrains/ring-ui/components/island/island")
-internal external object IslandModule {
-    val default: RClass<IslandProps>
-    val Content: RClass<IslandContentProps>
-    val Header: RClass<IslandHeaderProps>
-    val AdaptiveIsland: RClass<IslandProps>
-}
-
-// https://github.com/JetBrains/ring-ui/blob/master/components/island/island.js
-public external interface IslandProps : WithClassName {
-    public val narrow: Boolean
-    public val withoutPaddings: Boolean
-}
-
-public fun RBuilder.ringIsland(handler: RHandler<IslandProps>) {
-    IslandModule.default {
-        handler()
-    }
-}
-
-public fun RBuilder.ringIsland(header: String, handler: RHandler<IslandContentProps>) {
-    ringIsland {
-        ringIslandHeader {
-            attrs{
-                border = true
-            }
-            +header
-        }
-        ringIslandContent(handler)
-    }
-}
-
-
-public fun RBuilder.ringAdaptiveIsland(handler: RHandler<IslandProps>) {
-    IslandModule.AdaptiveIsland {
-        handler()
-    }
-}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/tabs/SmartTabs.kt b/ui/ring/src/main/kotlin/ringui/tabs/SmartTabs.kt
deleted file mode 100644
index 081181a3..00000000
--- a/ui/ring/src/main/kotlin/ringui/tabs/SmartTabs.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package ringui.tabs
-
-import react.RBuilder
-import react.RHandler
-import react.dom.WithClassName
-
-public external interface SmartTabsProps : WithClassName {
-    public var initSelected: String
-}
-
-
-public fun RBuilder.ringSmartTabs(active: String? = null, handler: RHandler<SmartTabsProps>) {
-    TabsModule.SmartTabs {
-        active?.let {
-            attrs {
-                initSelected = active
-            }
-        }
-        handler()
-    }
-}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/ringui/tabs/Tabs.kt b/ui/ring/src/main/kotlin/ringui/tabs/Tabs.kt
deleted file mode 100644
index 6c029110..00000000
--- a/ui/ring/src/main/kotlin/ringui/tabs/Tabs.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package ringui.tabs
-
-import react.RBuilder
-import react.RClass
-import react.RHandler
-import react.dom.WithClassName
-
-@JsModule("@jetbrains/ring-ui/components/tabs/tabs")
-internal external object TabsModule {
-    val Tabs: RClass<TabsProps>
-    val Tab: RClass<TabProps>
-    val SmartTabs: RClass<SmartTabsProps>
-    //val CustomItem: RClass<CustomItemProps>
-}
-
-//https://github.com/JetBrains/ring-ui/blob/master/components/tabs/tabs.js
-public external interface TabsProps : WithClassName {
-    public var theme: String
-    public var selected: String
-    public var onSelect: (String) -> Unit
-    public var href: String
-    public var autoCollapse: Boolean
-}
-
-public external interface CustomItemProps : WithClassName
-
-public external interface TabProps : WithClassName {
-    public var title: dynamic // PropTypes.oneOfType([PropTypes.node, PropTypes.func]).isRequired,
-    public var id: String
-}
-
-public fun RBuilder.ringTabs(active: String? = null, handler: RHandler<TabsProps>) {
-    TabsModule.Tabs {
-        active?.let{
-            attrs {
-                selected = active
-            }
-        }
-        handler()
-    }
-}
-
-public fun RBuilder.ringTab(title: dynamic, id: String = title.toString(), handler: RHandler<TabProps>) {
-    TabsModule.Tab {
-        attrs {
-            this.title = title
-            this.id = id
-        }
-        handler()
-    }
-}
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
index 6fb32a4e..a6518bd2 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
@@ -4,7 +4,7 @@ import kotlinx.css.*
 import react.*
 import react.dom.div
 import react.dom.span
-import ringui.ringLink
+import ringui.Link
 import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.NameToken
@@ -36,7 +36,7 @@ public fun ThreeCanvasWithControlsProps.tab(title: String, block: RBuilder.() ->
 
 public fun RBuilder.nameCrumbs(name: Name?, link: (Name) -> Unit): ReactElement = styledDiv {
     div {
-        ringLink {
+        Link {
             attrs {
                 onClick = {
                     link(Name.EMPTY)
@@ -51,7 +51,7 @@ public fun RBuilder.nameCrumbs(name: Name?, link: (Name) -> Unit): ReactElement
                 tokens.add(token)
                 val fullName = Name(tokens.toList())
                 span { +"/" }
-                ringLink {
+                Link {
                     +token.toString()
                     attrs {
                         onClick = {
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt
index 5ef7da96..e33dfb2b 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringPropertyEditor.kt
@@ -4,11 +4,9 @@ import org.w3c.dom.Element
 import react.RBuilder
 import react.dom.p
 import react.dom.render
-import ringui.island.ringIsland
-import ringui.island.ringIslandContent
-import ringui.island.ringIslandHeader
-import ringui.tabs.ringSmartTabs
-import ringui.tabs.ringTab
+import ringui.Island
+import ringui.SmartTabs
+import ringui.Tab
 import space.kscience.dataforge.meta.descriptors.NodeDescriptor
 import space.kscience.visionforge.*
 import space.kscience.visionforge.react.flexColumn
@@ -28,7 +26,7 @@ public fun RBuilder.ringPropertyEditor(
     }
 
     flexColumn {
-        ringIsland("Properties") {
+        Island("Properties") {
             propertyEditor(
                 ownProperties = vision.ownProperties,
                 allProperties = vision.allProperties(),
@@ -39,33 +37,25 @@ public fun RBuilder.ringPropertyEditor(
         }
 
         if (styles.isNotEmpty()) {
-            ringIsland {
-                ringIslandHeader {
-                    attrs {
-                        border = true
+            Island("Styles") {
+                if (styles.size == 1) {
+                    val styleName = styles.first()
+                    p {
+                        +styleName
                     }
-                    +"Styles"
-                }
-                ringIslandContent {
-                    if (styles.size == 1) {
-                        val styleName = styles.first()
-                        p {
-                            +styleName
+                    val style = vision.getStyle(styleName)
+                    if (style != null) {
+                        Tab(styleName, id = styleName) {
+                            metaViewer(style)
                         }
-                        val style = vision.getStyle(styleName)
-                        if (style != null) {
-                            ringTab(styleName, id = styleName) {
-                                metaViewer(style)
-                            }
-                        }
-                    } else {
-                        ringSmartTabs {
-                            styles.forEach { styleName ->
-                                val style = vision.getStyle(styleName)
-                                if (style != null) {
-                                    ringTab(styleName, id = styleName) {
-                                        metaViewer(style)
-                                    }
+                    }
+                } else {
+                    SmartTabs {
+                        styles.forEach { styleName ->
+                            val style = vision.getStyle(styleName)
+                            if (style != null) {
+                                Tab(styleName, id = styleName) {
+                                    metaViewer(style)
                                 }
                             }
                         }
@@ -76,6 +66,7 @@ public fun RBuilder.ringPropertyEditor(
     }
 }
 
+
 public fun Element.ringPropertyEditor(
     item: Vision,
     descriptor: NodeDescriptor? = item.descriptor,
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
index 58b7839f..1104a52d 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
@@ -9,9 +9,9 @@ import org.w3c.files.BlobPropertyBag
 import react.*
 import react.dom.attrs
 import react.dom.button
-import ringui.island.ringIsland
-import ringui.tabs.ringSmartTabs
-import ringui.tabs.ringTab
+import ringui.Island
+import ringui.SmartTabs
+import ringui.Tab
 import space.kscience.dataforge.meta.withDefault
 import space.kscience.dataforge.names.Name
 import space.kscience.visionforge.Vision
@@ -90,27 +90,27 @@ public external interface ThreeControlsProps : RProps {
 
 @JsExport
 public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalComponent { props ->
-    ringSmartTabs("Tree") {
+    SmartTabs("Tree") {
         props.vision?.let {
-            ringTab("Tree") {
+            Tab("Tree") {
                 styledDiv {
                     css {
                         height = 100.pct
                         overflowY = Overflow.auto
                     }
-                    ringIsland("Vision tree") {
+                    Island("Vision tree") {
                         visionTree(it, props.selected, props.onSelect)
                     }
                 }
             }
         }
-        ringTab("Settings") {
-            ringIsland("Canvas configuration") {
+        Tab("Settings") {
+            Island("Canvas configuration") {
                 canvasControls(props.canvasOptions, props.vision)
             }
         }
         props.additionalTabs.forEach { (name, handler) ->
-            ringTab(name){
+            Tab(name) {
                 handler()
             }
         }
@@ -129,6 +129,6 @@ public fun RBuilder.ringThreeControls(
         this.vision = vision
         this.selected = selected
         this.onSelect = onSelect
-        this.additionalTabs = additionalTabs?: emptyMap()
+        this.additionalTabs = additionalTabs ?: emptyMap()
     }
 }
\ No newline at end of file
diff --git a/visionforge-core/build.gradle.kts b/visionforge-core/build.gradle.kts
index 92c0bdd6..3af5c602 100644
--- a/visionforge-core/build.gradle.kts
+++ b/visionforge-core/build.gradle.kts
@@ -3,7 +3,6 @@ plugins {
 }
 
 val dataforgeVersion: String by rootProject.extra
-val kotlinWrappersVersion: String by rootProject.extra
 
 kscience{
     useSerialization()
@@ -15,12 +14,12 @@ kotlin {
             dependencies {
                 api("space.kscience:dataforge-context:$dataforgeVersion")
                 api("org.jetbrains.kotlinx:kotlinx-html:${ru.mipt.npm.gradle.KScienceVersions.htmlVersion}")
-                api("org.jetbrains.kotlin-wrappers:kotlin-css:1.0.0-$kotlinWrappersVersion")
+                api("org.jetbrains.kotlin-wrappers:kotlin-css")
             }
         }
         jsMain {
             dependencies {
-                api("org.jetbrains.kotlin-wrappers:kotlin-extensions:1.0.1-$kotlinWrappersVersion")
+                api("org.jetbrains.kotlin-wrappers:kotlin-extensions")
             }
         }
     }
diff --git a/visionforge-fx/build.gradle.kts b/visionforge-fx/build.gradle.kts
index 2ba679a1..391517d7 100644
--- a/visionforge-fx/build.gradle.kts
+++ b/visionforge-fx/build.gradle.kts
@@ -3,8 +3,6 @@ plugins {
 }
 
 val dataforgeVersion: String by rootProject.extra
-val kotlinWrappersVersion: String by rootProject.extra
-val htmlVersion: String by rootProject.extra
 val fxVersion: String by rootProject.extra
 
 kscience{
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
index bab671d9..17ee9141 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
@@ -99,17 +99,17 @@ public class SolidReferenceGroup(
         //TODO replace by properties
         override var position: Point3D?
             get() = prototype.position
-            set(value) {
+            set(_) {
                 error("Can't set position of reference")
             }
         override var rotation: Point3D?
             get() = prototype.rotation
-            set(value) {
+            set(_) {
                 error("Can't set position of reference")
             }
         override var scale: Point3D?
             get() = prototype.scale
-            set(value) {
+            set(_) {
                 error("Can't set position of reference")
             }
         override val prototype: Solid get() = prototypeFor(childName)
diff --git a/visionforge-threejs/build.gradle.kts b/visionforge-threejs/build.gradle.kts
index 68ab9204..60c00061 100644
--- a/visionforge-threejs/build.gradle.kts
+++ b/visionforge-threejs/build.gradle.kts
@@ -2,13 +2,6 @@ plugins {
     id("ru.mipt.npm.gradle.js")
 }
 
-kotlin{
-    explicitApi = null
-    js{
-        binaries.library()
-    }
-}
-
 dependencies {
     api(project(":visionforge-solid"))
     implementation(npm("three", "0.124.0"))

From b0cd80a4e67e87119e06fbb95c7ae43c9b0decde Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 30 Jun 2021 15:44:12 +0300
Subject: [PATCH 127/151] Another style update

---
 build.gradle.kts                              |  3 +-
 .../kscience/visionforge/react/MetaViewer.kt  | 22 +++----
 .../visionforge/react/PropertyEditor.kt       | 44 ++++++++-----
 .../visionforge/react/RangeValueChooser.kt    |  6 ++
 .../visionforge/react/ThreeCanvasComponent.kt |  2 +-
 .../kscience/visionforge/react/TreeStyles.kt  | 63 ++-----------------
 .../kscience/visionforge/react/VisionTree.kt  | 60 +++++++++---------
 .../kscience/visionforge/react/layout.kt      | 32 +++++-----
 .../visionforge/react/valueChooser.kt         | 23 ++++++-
 .../ThreeViewWithControls.kt                  | 60 +++++++-----------
 .../ringThreeControls.kt                      | 16 ++---
 .../visionforge/solid/three/ThreeCanvas.kt    |  7 ++-
 12 files changed, 154 insertions(+), 184 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b75039f7..8236106e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,11 +17,10 @@ allprojects {
         jcenter()
         maven("https://repo.kotlin.link")
         maven("https://maven.jzy3d.org/releases")
-        maven("https://maven.pkg.jetbrains.space/mipt-npm/p/mipt-npm/maven")
     }
 
     group = "space.kscience"
-    version = "0.2.0-dev-20"
+    version = "0.2.0-dev-21"
 }
 
 subprojects {
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
index b86f11fc..a3972612 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/MetaViewer.kt
@@ -1,5 +1,7 @@
 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.*
@@ -60,9 +62,9 @@ private fun RBuilder.metaViewerItem(props: MetaViewerProps) {
 
     when (actualItem) {
         is MetaItemNode -> {
-            styledDiv {
+            flexRow {
                 css {
-                    +TreeStyles.treeLeaf
+                    alignItems = Align.center
                 }
                 styledSpan {
                     css {
@@ -117,22 +119,18 @@ private fun RBuilder.metaViewerItem(props: MetaViewerProps) {
             }
         }
         is MetaItemValue -> {
-            styledDiv {
+            flexRow {
                 css {
-                    +TreeStyles.treeLeaf
+                    alignItems = Align.center
                 }
-                styledDiv {
+                styledSpan {
                     css {
                         +TreeStyles.treeLabel
-                    }
-                    styledSpan {
-                        css {
-                            if (item == null) {
-                                +TreeStyles.treeLabelInactive
-                            }
+                        if (item == null) {
+                            +TreeStyles.treeLabelInactive
                         }
-                        +token
                     }
+                    +token
                 }
                 styledDiv {
                     a {
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
index 66779588..6e41555b 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/PropertyEditor.kt
@@ -9,6 +9,8 @@ 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.Element
 import org.w3c.dom.events.Event
@@ -129,10 +131,7 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
         // Do not show nodes without visible children
         if (keys.isEmpty()) return
 
-        styledDiv {
-            css {
-                +TreeStyles.treeLeaf
-            }
+        flexRow {
             styledSpan {
                 css {
                     +TreeStyles.treeCaret
@@ -179,26 +178,25 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
             }
         }
     } else {
-        styledDiv {
+        flexRow {
             css {
-                +TreeStyles.treeLeaf
+                alignItems = Align.center
             }
-            styledDiv {
+            styledSpan {
                 css {
                     +TreeStyles.treeLabel
-                }
-                styledSpan {
-                    css {
-                        if (ownProperty == null) {
-                            +TreeStyles.treeLabelInactive
-                        }
+                    if (ownProperty == null) {
+                        +TreeStyles.treeLabelInactive
                     }
-                    +token
                 }
+                +token
             }
+
             styledDiv {
                 css {
-                    +TreeStyles.resizeableInput
+                    //+TreeStyles.resizeableInput
+                    width = 160.px
+                    margin(1.px, 5.px)
                 }
                 valueChooser(
                     props.name,
@@ -207,9 +205,23 @@ private fun RBuilder.propertyEditorItem(props: PropertyEditorProps) {
                     valueChanged
                 )
             }
+
             styledButton {
                 css {
-                    +TreeStyles.removeButton
+                    width = 24.px
+                    alignSelf = Align.stretch
+                    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 {
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt
index abeeaa86..2b11143b 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/RangeValueChooser.kt
@@ -1,5 +1,7 @@
 package space.kscience.visionforge.react
 
+import kotlinx.css.pct
+import kotlinx.css.width
 import kotlinx.html.InputType
 import kotlinx.html.js.onChangeFunction
 import org.w3c.dom.HTMLInputElement
@@ -12,6 +14,7 @@ import space.kscience.dataforge.meta.double
 import space.kscience.dataforge.meta.get
 import space.kscience.dataforge.meta.string
 import space.kscience.dataforge.values.asValue
+import styled.css
 import styled.styledInput
 
 @JsExport
@@ -45,6 +48,9 @@ public val RangeValueChooser: FunctionalComponent<ValueChooserProps> =
             }
 
             styledInput(type = InputType.range) {
+                css{
+                    width = 100.pct
+                }
                 attrs {
                     disabled = rangeDisabled
                     value = innerValue?.toString() ?: ""
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
index 0c42caf3..6dd563de 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/ThreeCanvasComponent.kt
@@ -50,7 +50,7 @@ public val ThreeCanvasComponent: FunctionalComponent<ThreeCanvasProps> = functio
         css {
             maxWidth = 100.vw
             maxHeight = 100.vh
-            flex(1.0, 1.0, FlexBasis.auto)
+            flex(1.0)
         }
         ref = elementRef
     }
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/TreeStyles.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/TreeStyles.kt
index 59bee78f..5d693a3c 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/TreeStyles.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/TreeStyles.kt
@@ -1,7 +1,8 @@
 package space.kscience.visionforge.react
 
 import kotlinx.css.*
-import kotlinx.css.properties.*
+import kotlinx.css.properties.deg
+import kotlinx.css.properties.rotate
 import styled.StyleSheet
 
 public object TreeStyles : StyleSheet("treeStyles", true) {
@@ -48,21 +49,13 @@ public object TreeStyles : StyleSheet("treeStyles", true) {
         borderLeftStyle = BorderStyle.dashed
         borderLeftWidth = 1.px
         borderLeftColor = Color.lightGray
-        borderBottomStyle = BorderStyle.dashed
-        borderBottomWidth = 1.px
-        borderBottomColor = Color.lightGray
-    }
-
-    public val treeLeaf:RuleSet by css {
-        display = Display.flex
-        flexDirection = FlexDirection.row
-        flexWrap = FlexWrap.nowrap
-        //alignItems = Align.center
     }
 
     public val treeLabel:RuleSet by css {
-        overflow = Overflow.hidden
-        flex(flexGrow = 1.0, flexShrink = 1.0)
+        border = "none"
+        padding(left = 4.pt, right = 4.pt, top = 0.pt, bottom = 0.pt)
+        textAlign = TextAlign.left
+        flex(1.0)
     }
 
     public val treeLabelInactive: RuleSet by css {
@@ -73,48 +66,4 @@ public object TreeStyles : StyleSheet("treeStyles", true) {
         backgroundColor = Color.lightBlue
     }
 
-    public val linkButton:RuleSet by css {
-        backgroundColor = Color.white
-        border = "none"
-        padding(left = 4.pt, right = 4.pt, top = 0.pt, bottom = 0.pt)
-        textAlign = TextAlign.left
-        fontFamily = "arial,sans-serif"
-        color = Color("#069")
-        cursor = Cursor.pointer
-        hover {
-            textDecoration(TextDecorationLine.underline)
-        }
-    }
-
-    public val removeButton:RuleSet by css {
-        backgroundColor = Color.white
-        borderStyle = BorderStyle.solid
-        borderRadius = 2.px
-        padding(1.px, 5.px)
-        marginLeft = 4.px
-        textAlign = TextAlign.center
-        textDecoration = TextDecoration.none
-        display = Display.inlineBlock
-        flexShrink = 1.0
-        cursor = Cursor.pointer
-        disabled {
-            cursor = Cursor.auto
-            borderStyle = BorderStyle.dashed
-            color = Color.lightGray
-        }
-    }
-
-    public val resizeableInput: RuleSet by css {
-        overflow = Overflow.hidden
-        maxWidth = 120.pt
-        flex(flexGrow = 2.0, flexShrink = 2.0, flexBasis = 60.pt)
-        input {
-            textAlign = TextAlign.right
-            width = 100.pct
-        }
-        select{
-            textAlign = TextAlign.right
-            width = 100.pct
-        }
-    }
 }
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/VisionTree.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/VisionTree.kt
index 3e715342..bcb7e84a 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/VisionTree.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/VisionTree.kt
@@ -1,5 +1,11 @@
 package space.kscience.visionforge.react
 
+import kotlinx.css.Color
+import kotlinx.css.Cursor
+import kotlinx.css.color
+import kotlinx.css.cursor
+import kotlinx.css.properties.TextDecorationLine
+import kotlinx.css.properties.textDecoration
 import kotlinx.html.js.onClickFunction
 import org.w3c.dom.events.Event
 import react.*
@@ -12,7 +18,6 @@ import space.kscience.visionforge.Vision
 import space.kscience.visionforge.VisionGroup
 import space.kscience.visionforge.isEmpty
 import styled.css
-import styled.styledButton
 import styled.styledDiv
 import styled.styledSpan
 
@@ -23,6 +28,27 @@ public external interface ObjectTreeProps : RProps {
     public var clickCallback: (Name) -> Unit
 }
 
+private val TreeLabel = functionalComponent<ObjectTreeProps> { props ->
+    val token = useMemo(props.name) { props.name.lastOrNull()?.toString() ?: "World" }
+    styledSpan {
+        css {
+            +TreeStyles.treeLabel
+            color = Color("#069")
+            cursor = Cursor.pointer
+            hover {
+                textDecoration(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 }
 
@@ -30,32 +56,11 @@ private fun RBuilder.visionTree(props: ObjectTreeProps): Unit {
         expanded = !expanded
     }
 
-    fun RBuilder.treeLabel(text: String) {
-        styledButton {
-            css {
-                //classes = mutableListOf("btn", "btn-link", "align-middle", "text-truncate", "p-0")
-                +TreeStyles.treeLabel
-                +TreeStyles.linkButton
-                if (props.name == props.selected) {
-                    +TreeStyles.treeLabelSelected
-                }
-            }
-            +text
-            attrs {
-                onClickFunction = { props.clickCallback(props.name) }
-            }
-        }
-    }
-
-    val token = props.name.lastOrNull()?.toString() ?: "World"
     val obj = props.obj
 
     //display as node if any child is visible
     if (obj is VisionGroup) {
-        styledDiv {
-            css {
-                +TreeStyles.treeLeaf
-            }
+        flexRow {
             if (obj.children.any { !it.key.body.startsWith("@") }) {
                 styledSpan {
                     css {
@@ -69,7 +74,7 @@ private fun RBuilder.visionTree(props: ObjectTreeProps): Unit {
                     }
                 }
             }
-            treeLabel(token)
+            child(TreeLabel, props = props)
         }
         if (expanded) {
             flexColumn {
@@ -97,12 +102,7 @@ private fun RBuilder.visionTree(props: ObjectTreeProps): Unit {
             }
         }
     } else {
-        styledDiv {
-            css {
-                +TreeStyles.treeLeaf
-            }
-            treeLabel(token)
-        }
+        child(TreeLabel, props = props)
     }
 }
 
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/layout.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/layout.kt
index 2f35bb24..e8d928f5 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/layout.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/layout.kt
@@ -11,20 +11,22 @@ import styled.StyledDOMBuilder
 import styled.css
 import styled.styledDiv
 
-public inline fun RBuilder.flexColumn(block: StyledDOMBuilder<DIV>.() -> Unit): ReactElement =
-    styledDiv {
-        css {
-            display = Display.flex
-            flexDirection = FlexDirection.column
-        }
-        block()
+public inline fun RBuilder.flexColumn(
+    block: StyledDOMBuilder<DIV>.() -> Unit
+): ReactElement = styledDiv {
+    css {
+        display = Display.flex
+        flexDirection = FlexDirection.column
     }
+    block()
+}
 
-public inline fun RBuilder.flexRow(block: StyledDOMBuilder<DIV>.() -> Unit): ReactElement =
-    styledDiv {
-        css {
-            display = Display.flex
-            flexDirection = FlexDirection.row
-        }
-        block()
-    }
\ No newline at end of file
+public inline fun RBuilder.flexRow(
+    block: StyledDOMBuilder<DIV>.() -> Unit
+): ReactElement = styledDiv {
+    css {
+        display = Display.flex
+        flexDirection = FlexDirection.row
+    }
+    block()
+}
\ No newline at end of file
diff --git a/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt b/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
index 7a32ef4f..2147b191 100644
--- a/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
+++ b/ui/react/src/main/kotlin/space/kscience/visionforge/react/valueChooser.kt
@@ -1,5 +1,9 @@
 package space.kscience.visionforge.react
 
+import kotlinx.css.margin
+import kotlinx.css.pct
+import kotlinx.css.px
+import kotlinx.css.width
 import kotlinx.html.InputType
 import kotlinx.html.js.onChangeFunction
 import kotlinx.html.js.onKeyDownFunction
@@ -15,13 +19,14 @@ import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.values.*
 import space.kscience.visionforge.Colors
 import space.kscience.visionforge.widgetType
+import styled.css
 import styled.styledInput
 import styled.styledSelect
 
 public external interface ValueChooserProps : RProps {
     public var item: MetaItem?
     public var descriptor: ValueDescriptor?
-    public var nullable: Boolean?
+    //public var nullable: Boolean?
     public var valueChanged: ((Value?) -> Unit)?
 }
 
@@ -41,6 +46,9 @@ public val StringValueChooser: FunctionalComponent<ValueChooserProps> =
             value = (it.target as HTMLInputElement).value
         }
         styledInput(type = InputType.text) {
+            css{
+                width = 100.pct
+            }
             attrs {
                 this.value = value
                 onKeyDownFunction = keyDown
@@ -57,6 +65,9 @@ public val BooleanValueChooser: FunctionalComponent<ValueChooserProps> =
             props.valueChanged?.invoke(newValue.asValue())
         }
         styledInput(type = InputType.checkBox) {
+            css{
+                width = 100.pct
+            }
             attrs {
                 //this.attributes["indeterminate"] = (props.item == null).toString()
                 defaultChecked = props.item.boolean ?: false
@@ -84,6 +95,9 @@ public val NumberValueChooser: FunctionalComponent<ValueChooserProps> =
             innerValue = (it.target as HTMLInputElement).value
         }
         styledInput(type = InputType.number) {
+            css{
+                width = 100.pct
+            }
             attrs {
                 value = innerValue
                 onKeyDownFunction = keyDown
@@ -110,6 +124,9 @@ public val ComboValueChooser: FunctionalComponent<ValueChooserProps> =
             props.valueChanged?.invoke(selected.asValue())
         }
         styledSelect {
+            css{
+                width = 100.pct
+            }
             props.descriptor?.allowedValues?.forEach {
                 option {
                     +it.string
@@ -137,6 +154,10 @@ public val ColorValueChooser: FunctionalComponent<ValueChooserProps> =
             props.valueChanged?.invoke(value.asValue())
         }
         styledInput(type = InputType.color) {
+            css{
+                width = 100.pct
+                margin(0.px)
+            }
             attrs {
                 this.value = value
                 onChangeFunction = handleChange
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
index a6518bd2..2bdb82a0 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
@@ -4,6 +4,9 @@ import kotlinx.css.*
 import react.*
 import react.dom.div
 import react.dom.span
+import ringui.Island
+import ringui.IslandContent
+import ringui.IslandHeader
 import ringui.Link
 import space.kscience.dataforge.context.Context
 import space.kscience.dataforge.names.Name
@@ -50,7 +53,7 @@ public fun RBuilder.nameCrumbs(name: Name?, link: (Name) -> Unit): ReactElement
             name.tokens.forEach { token ->
                 tokens.add(token)
                 val fullName = Name(tokens.toList())
-                span { +"/" }
+                span { +"." }
                 Link {
                     +token.toString()
                     attrs {
@@ -116,44 +119,30 @@ public val ThreeCanvasWithControls: FunctionalComponent<ThreeCanvasWithControlsP
 
                 selectedVision?.let { vision ->
                     styledDiv {
-                        css {
+                        css{
                             position = Position.absolute
-                            top = 10.px
-                            right = 10.px
+                            top = 5.px
+                            right = 5.px
+                            width = 450.px
                         }
-                        styledDiv {
-                            css {
-                                minWidth = 450.px
-                                backgroundColor = Color.white
-                                borderRadius = 3.px
-                                borderColor = Color.blue
-                                borderWidth = 1.px
-                                borderStyle = BorderStyle.solid
-                                padding(3.px)
+                        Island{
+                            IslandHeader{
+                                attrs {
+                                    border = true
+                                }
+                                nameCrumbs(selected) { selected = it }
+                            }
+                            IslandContent{
+                                propertyEditor(
+                                    ownProperties = vision.ownProperties,
+                                    allProperties = vision.allProperties(),
+                                    updateFlow = vision.propertyChanges,
+                                    descriptor = vision.descriptor,
+                                    key = selected
+                                )
                             }
-                            propertyEditor(
-                                ownProperties = vision.ownProperties,
-                                allProperties = vision.allProperties(),
-                                updateFlow = vision.propertyChanges,
-                                descriptor = vision.descriptor,
-                                key = selected
-                            )
                         }
                     }
-                    styledDiv {
-                        css {
-                            position = Position.absolute
-                            bottom = 10.px
-                            left = 10.px
-                            backgroundColor = Color.white
-                            borderRadius = 3.px
-                            borderColor = Color.blue
-                            borderWidth = 1.px
-                            borderStyle = BorderStyle.solid
-                            padding(3.px)
-                        }
-                        nameCrumbs(selected) { selected = it }
-                    }
                 }
             }
             flexColumn {
@@ -161,9 +150,6 @@ public val ThreeCanvasWithControls: FunctionalComponent<ThreeCanvasWithControlsP
                     padding(4.px)
                     minWidth = 400.px
                     flex(1.0, 10.0, FlexBasis("300px"))
-                    alignItems = Align.stretch
-                    alignContent = Align.stretch
-                    //border(1.px, BorderStyle.solid, Color.lightGray)
                 }
                 ringThreeControls(options, props.solid, selected, onSelect, additionalTabs = props.additionalTabs)
             }
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
index 1104a52d..b0fc188c 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ringThreeControls.kt
@@ -1,7 +1,10 @@
 package space.kscience.visionforge.ring
 
-import kotlinx.css.*
+import kotlinx.css.BorderStyle
+import kotlinx.css.Color
+import kotlinx.css.padding
 import kotlinx.css.properties.border
+import kotlinx.css.px
 import kotlinx.html.js.onClickFunction
 import org.w3c.dom.events.Event
 import org.w3c.files.Blob
@@ -22,7 +25,6 @@ import space.kscience.visionforge.react.propertyEditor
 import space.kscience.visionforge.react.visionTree
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
 import styled.css
-import styled.styledDiv
 
 internal fun saveData(event: Event, fileName: String, mimeType: String = "text/plain", dataBuilder: () -> String) {
     event.stopPropagation();
@@ -93,14 +95,8 @@ public val ThreeControls: FunctionalComponent<ThreeControlsProps> = functionalCo
     SmartTabs("Tree") {
         props.vision?.let {
             Tab("Tree") {
-                styledDiv {
-                    css {
-                        height = 100.pct
-                        overflowY = Overflow.auto
-                    }
-                    Island("Vision tree") {
-                        visionTree(it, props.selected, props.onSelect)
-                    }
+                Island("Vision tree") {
+                    visionTree(it, props.selected, props.onSelect)
                 }
             }
         }
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
index f61aaebf..7dd89a32 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
@@ -18,9 +18,9 @@ import info.laht.threekt.math.Vector3
 import info.laht.threekt.objects.LineSegments
 import info.laht.threekt.objects.Mesh
 import info.laht.threekt.scenes.Scene
+import kotlinx.browser.window
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLCanvasElement
-import org.w3c.dom.HTMLElement
 import org.w3c.dom.Node
 import org.w3c.dom.events.MouseEvent
 import space.kscience.dataforge.context.info
@@ -149,7 +149,7 @@ public class ThreeCanvas(
             }
         }, false)
 
-        (element as? HTMLElement)?.onresize = {
+        window.onresize = {
             updateSize()
         }
 
@@ -188,7 +188,8 @@ public class ThreeCanvas(
                             val absoluteValue = boundingBox.min.z + (boundingBox.max.z - boundingBox.min.z) * it
                             Plane(Vector3(0.0, 0.0, -1.0), absoluteValue)
                         }
-                        renderer.clippingPlanes = listOfNotNull(xClippingPlane, yClippingPlane, zClippingPlane).toTypedArray()
+                        renderer.clippingPlanes =
+                            listOfNotNull(xClippingPlane, yClippingPlane, zClippingPlane).toTypedArray()
                     }
                 } else {
                     renderer.localClippingEnabled = false

From 230cd5dc6110ce7c90c74694888cd56951c83adc Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 30 Jun 2021 18:23:30 +0300
Subject: [PATCH 128/151] Roll back to basic three renderer for examples

---
 .../src/jsMain/kotlin/playgroundMain.kt       |  4 ++--
 .../src/jvmMain/kotlin/randomSpheres.kt       | 24 ++++++++++---------
 .../visionforge/solid/three/ThreeMaterials.kt | 21 ++++++++--------
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/demo/playground/src/jsMain/kotlin/playgroundMain.kt b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
index 71431841..9ee2dc93 100644
--- a/demo/playground/src/jsMain/kotlin/playgroundMain.kt
+++ b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
@@ -1,10 +1,10 @@
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.visionforge.plotly.PlotlyPlugin
-import space.kscience.visionforge.ring.ThreeWithControlsPlugin
 import space.kscience.visionforge.runVisionClient
+import space.kscience.visionforge.solid.three.ThreePlugin
 
 @DFExperimental
 fun main() = runVisionClient {
     plugin(PlotlyPlugin)
-    plugin(ThreeWithControlsPlugin)
+    plugin(ThreePlugin)
 }
\ No newline at end of file
diff --git a/demo/playground/src/jvmMain/kotlin/randomSpheres.kt b/demo/playground/src/jvmMain/kotlin/randomSpheres.kt
index 855c99c1..383f3d3a 100644
--- a/demo/playground/src/jvmMain/kotlin/randomSpheres.kt
+++ b/demo/playground/src/jvmMain/kotlin/randomSpheres.kt
@@ -1,5 +1,6 @@
 package space.kscience.visionforge.examples
 
+import kotlinx.html.div
 import kotlinx.html.h1
 import space.kscience.dataforge.context.Context
 import space.kscience.visionforge.html.ResourceLocation
@@ -19,18 +20,19 @@ fun main() {
         resourceLocation = ResourceLocation.EMBED
     ) {
         h1 { +"Happy new year!" }
-        vision {
-            solid {
-                repeat(100) {
-                    sphere(5, name = "sphere[$it]") {
-                        x = random.nextDouble(-300.0, 300.0)
-                        y = random.nextDouble(-300.0, 300.0)
-                        z = random.nextDouble(-300.0, 300.0)
-                        material {
-                            color(random.nextInt())
-                            specularColor(random.nextInt())
+        div {
+            vision {
+                solid {
+                    repeat(100) {
+                        sphere(5, name = "sphere[$it]") {
+                            x = random.nextDouble(-300.0, 300.0)
+                            y = random.nextDouble(-300.0, 300.0)
+                            z = random.nextDouble(-300.0, 300.0)
+                            material {
+                                color(random.nextInt())
+                            }
+                            detail = 16
                         }
-                        detail = 16
                     }
                 }
             }
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeMaterials.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeMaterials.kt
index 7f79ce37..5f7ef051 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeMaterials.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeMaterials.kt
@@ -59,12 +59,12 @@ public object ThreeMaterials {
     private val materialCache = HashMap<Meta, Material>()
 
     internal fun buildMaterial(meta: Meta): Material {
-        return if (meta[SolidMaterial.SPECULAR_COLOR_KEY] != null) {
+        return meta[SolidMaterial.SPECULAR_COLOR_KEY]?.let { specularColor ->
             MeshPhongMaterial().apply {
                 color = meta[SolidMaterial.COLOR_KEY]?.getColor() ?: DEFAULT_COLOR
-                specular = meta[SolidMaterial.SPECULAR_COLOR_KEY]!!.getColor()
+                specular = specularColor.getColor()
                 emissive = specular
-                reflectivity = 1.0
+                reflectivity = 0.5
                 refractionRatio = 1.0
                 shininess = 100.0
                 opacity = meta[SolidMaterial.OPACITY_KEY]?.double ?: 1.0
@@ -72,15 +72,14 @@ public object ThreeMaterials {
                 wireframe = meta[SolidMaterial.WIREFRAME_KEY].boolean ?: false
                 needsUpdate = true
             }
-        } else {
-            MeshBasicMaterial().apply {
-                color = meta[SolidMaterial.COLOR_KEY]?.getColor() ?: DEFAULT_COLOR
-                opacity = meta[SolidMaterial.OPACITY_KEY]?.double ?: 1.0
-                transparent = opacity < 1.0
-                wireframe = meta[SolidMaterial.WIREFRAME_KEY].boolean ?: false
-                needsUpdate = true
-            }
+        } ?: MeshBasicMaterial().apply {
+            color = meta[SolidMaterial.COLOR_KEY]?.getColor() ?: DEFAULT_COLOR
+            opacity = meta[SolidMaterial.OPACITY_KEY]?.double ?: 1.0
+            transparent = opacity < 1.0
+            wireframe = meta[SolidMaterial.WIREFRAME_KEY].boolean ?: false
+            needsUpdate = true
         }
+
     }
 
     internal fun cacheMaterial(meta: Meta): Material = materialCache.getOrPut(meta) {

From a583030c1ccc2c8445a263e6fb0881f34a10b15d Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 30 Jun 2021 18:33:46 +0300
Subject: [PATCH 129/151] Fixed vertical size for demos

---
 demo/playground/src/jsMain/kotlin/playgroundMain.kt           | 4 ++--
 .../space.kscience.visionforge.ring/ThreeViewWithControls.kt  | 1 +
 .../space/kscience/visionforge/solid/three/ThreePlugin.kt     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/demo/playground/src/jsMain/kotlin/playgroundMain.kt b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
index 9ee2dc93..71431841 100644
--- a/demo/playground/src/jsMain/kotlin/playgroundMain.kt
+++ b/demo/playground/src/jsMain/kotlin/playgroundMain.kt
@@ -1,10 +1,10 @@
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.visionforge.plotly.PlotlyPlugin
+import space.kscience.visionforge.ring.ThreeWithControlsPlugin
 import space.kscience.visionforge.runVisionClient
-import space.kscience.visionforge.solid.three.ThreePlugin
 
 @DFExperimental
 fun main() = runVisionClient {
     plugin(PlotlyPlugin)
-    plugin(ThreePlugin)
+    plugin(ThreeWithControlsPlugin)
 }
\ No newline at end of file
diff --git a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
index 2bdb82a0..7b427fba 100644
--- a/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
+++ b/ui/ring/src/main/kotlin/space.kscience.visionforge.ring/ThreeViewWithControls.kt
@@ -95,6 +95,7 @@ public val ThreeCanvasWithControls: FunctionalComponent<ThreeCanvasWithControlsP
 
         flexRow {
             css {
+                height = 100.pct
                 flex(1.0, 1.0, FlexBasis.auto)
                 flexWrap = FlexWrap.wrap
                 alignItems = Align.stretch
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
index 95c3a322..68fa692a 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
@@ -131,7 +131,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
     override fun rateVision(vision: Vision): Int =
         if (vision is Solid) ElementVisionRenderer.DEFAULT_RATING else ElementVisionRenderer.ZERO_RATING
 
-    fun renderSolid(
+    internal fun renderSolid(
         element: Element,
         vision: Solid,
     ): ThreeCanvas = getOrCreateCanvas(element).apply {

From a7841edb3c9d09e13bb26324d3e30395d6858aaf Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 30 Jun 2021 18:39:56 +0300
Subject: [PATCH 130/151] Hide detail property for solids

---
 .../kotlin/space/kscience/visionforge/solid/Solid.kt         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
index d7d03c90..fda8531e 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
@@ -72,6 +72,11 @@ public interface Solid : Vision {
                     hide()
                 }
 
+                value(DETAIL_KEY){
+                    type(ValueType.NUMBER)
+                    hide()
+                }
+
                 item(SolidMaterial.MATERIAL_KEY.toString(), SolidMaterial.descriptor)
 
                 enum(ROTATION_ORDER_KEY, default = RotationOrder.XYZ) {

From 3fdd0d62d4b2d66a8e534842bb4408cb159e50fc Mon Sep 17 00:00:00 2001
From: kiruma524 <71787194+kiruma524@users.noreply.github.com>
Date: Fri, 9 Jul 2021 18:23:56 +0300
Subject: [PATCH 131/151] Update OrbitControls.kt

---
 .../kscience/visionforge/solid/OrbitControls.kt      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt
index 47c3c8e8..a32e44f5 100644
--- a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt
@@ -59,13 +59,13 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
 
     private val ry = Rotate(0.0, Rotate.Y_AXIS)
 
-    private val translate = Translate()
+    private val rz = Rotate(0.0, Rotate.Z_AXIS)
 
-    //private val rz = Rotate(180.0, Rotate.Z_AXIS)
+    private val translate = Translate()
 
 
     init {
-        camera.transforms.setAll(ry, rx, translate)
+        camera.transforms.setAll(rx, ry, rz, translate)
         update()
         val listener = InvalidationListener {
             update()
@@ -143,8 +143,8 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
             mouseOldY = mousePosY
             mousePosX = me.sceneX
             mousePosY = me.sceneY
-            mouseDeltaX = mousePosX - mouseOldX
-            mouseDeltaY = mousePosY - mouseOldY
+            mouseDeltaX = mouseOldX - mousePosX
+            mouseDeltaY = mouseOldY - mousePosY
 
             val modifier = when {
                 me.isControlDown -> CONTROL_MULTIPLIER
@@ -176,4 +176,4 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
 }
 
 fun Camera.orbitControls(canvas: SubScene, spec: CameraSpec) =
-    OrbitControls(this, canvas, spec)
\ No newline at end of file
+    OrbitControls(this, canvas, spec)

From 199cad1dc162b087d4867806b8c62f6368f09f27 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 10 Jul 2021 16:51:57 +0300
Subject: [PATCH 132/151] Refactor to ThreeJS v 130

---
 .../ru/mipt/npm/muon/monitor/Monitor.kt       |  14 +--
 .../ru/mipt/npm/muon/monitor/sim/Pixel.kt     |  20 ++--
 .../ru/mipt/npm/muon/monitor/sim/line.kt      |   2 +-
 .../ru/mipt/npm/muon/monitor/sim/monitor.kt   |   8 +-
 .../mipt/npm/muon/monitor/sim/simulation.kt   |  12 +-
 .../playground/src/jvmMain/kotlin/gdmlIaxo.kt |   3 +-
 .../visionforge/solid/demo/VariableBox.kt     |   4 +-
 .../visionforge-gdml-jupyter/build.gradle.kts |  16 ++-
 settings.gradle.kts                           |   2 -
 .../space/kscience/visionforge/VisionGroup.kt |   1 +
 .../kscience/visionforge/solid/FXCanvas3D.kt  |  42 +++----
 .../visionforge/solid/FXConvexFactory.kt      |   5 +-
 .../visionforge/solid/OrbitControls.kt        |  53 +++++----
 .../visionforge/gdml/GdmlTransformerEnv.kt    |  12 +-
 .../space/kscience/visionforge/solid/Solid.kt |  18 +--
 .../kscience/visionforge/solid/geometry.kt    |  45 ++++++--
 visionforge-threejs/build.gradle.kts          |   4 +-
 .../info/laht/threekt/core/BufferAttribute.kt |  34 ++++++
 .../info/laht/threekt/core/BufferGeometry.kt  |   6 +-
 .../info/laht/threekt/core/DirectGeometry.kt  |  48 --------
 .../kotlin/info/laht/threekt/core/Geometry.kt | 109 ------------------
 .../laht/threekt/geometries/BoxGeometry.kt    |  11 --
 .../laht/threekt/geometries/ConeGeometry.kt   |  12 +-
 .../threekt/geometries/CylinderGeometry.kt    |  12 --
 .../laht/threekt/geometries/EdgesGeometry.kt  |   5 +-
 ...ExtrudedGeometry.kt => ExtrudeGeometry.kt} |  13 ---
 .../laht/threekt/geometries/PlaneGeometry.kt  |  10 --
 .../laht/threekt/geometries/SphereGeometry.kt |  11 --
 ...{TextBufferGeometry.kt => TextGeometry.kt} |   7 +-
 .../laht/threekt/geometries/TorusGeometry.kt  |  10 +-
 .../laht/threekt/geometries/TubeGeometry.kt   |  21 +---
 .../threekt/geometries/WireframeGeometry.kt   |   8 +-
 .../info/laht/threekt/objects/LineSegments.kt |   2 -
 .../kotlin/info/laht/threekt/objects/Mesh.kt  |  10 +-
 .../solid/three/MeshThreeFactory.kt           |   3 -
 .../solid/three/ThreeBoxFactory.kt            |   8 +-
 .../solid/three/ThreeCanvasLabelFactory.kt    |   4 +-
 .../solid/three/ThreeCompositeFactory.kt      |   3 +-
 .../solid/three/ThreeConeFactory.kt           |   6 +-
 .../visionforge/solid/three/ThreeFactory.kt   |   8 +-
 .../solid/three/ThreeGeometryBuilder.kt       |  63 +++++-----
 .../solid/three/ThreeLineFactory.kt           |   6 +-
 .../solid/three/ThreeSphereFactory.kt         |   6 +-
 .../kscience/visionforge/solid/three/csg.kt   |  84 +++++++-------
 .../kscience/visionforge/solid/three/three.kt |  44 +------
 45 files changed, 304 insertions(+), 521 deletions(-)
 delete mode 100644 visionforge-threejs/src/main/kotlin/info/laht/threekt/core/DirectGeometry.kt
 delete mode 100644 visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Geometry.kt
 rename visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/{ExtrudedGeometry.kt => ExtrudeGeometry.kt} (83%)
 rename visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/{TextBufferGeometry.kt => TextGeometry.kt} (83%)

diff --git a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Monitor.kt b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Monitor.kt
index e87a2abc..17d5ac86 100644
--- a/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Monitor.kt
+++ b/demo/muon-monitor/src/commonMain/kotlin/ru/mipt/npm/muon/monitor/Monitor.kt
@@ -11,7 +11,7 @@ import space.kscience.visionforge.solid.plus
 class SC1(
     val name: String,
     val center: Point3D,
-    val xSize: Double = PIXEL_XY_SIZE, val ySize: Double = PIXEL_XY_SIZE, val zSize: Double = PIXEL_Z_SIZE
+    val xSize: Float = PIXEL_XY_SIZE, val ySize: Float = PIXEL_XY_SIZE, val zSize: Float = PIXEL_Z_SIZE
 )
 
 class SC16(
@@ -121,12 +121,12 @@ internal expect fun readMonitorConfig(): String
 object Monitor {
 
     const val GEOMETRY_TOLERANCE = 0.01
-    const val PIXEL_XY_SIZE = 122.0
-    const val PIXEL_XY_SPACING = 123.2
-    const val PIXEL_Z_SIZE = 30.0
-    const val CENTRAL_LAYER_Z = 0.0
-    const val UPPER_LAYER_Z = -166.0
-    const val LOWER_LAYER_Z = 180.0
+    const val PIXEL_XY_SIZE = 122.0f
+    const val PIXEL_XY_SPACING = 123.2f
+    const val PIXEL_Z_SIZE = 30.0f
+    const val CENTRAL_LAYER_Z = 0.0f
+    const val UPPER_LAYER_Z = -166.0f
+    const val LOWER_LAYER_Z = 180.0f
 
     /**
      * Build map for the whole monitor
diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/Pixel.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/Pixel.kt
index 71a96647..579bca15 100644
--- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/Pixel.kt
+++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/Pixel.kt
@@ -17,19 +17,19 @@ import kotlin.random.Random
 internal class SC1Aux(val sc: SC1, var efficiency: Double = 1.0) {
     //    val layer: Layer = findLayer(center.z);
     private val upLayer =
-        findLayer(sc.center.z + sc.zSize / 2.0)//Layer("${name}_up", center.z + zSize / 2.0);
+        findLayer(sc.center.z + sc.zSize / 2f)//Layer("${name}_up", center.z + zSize / 2.0);
     private val bottomLayer =
-        findLayer(sc.center.z - sc.zSize / 2.0)//Layer("${name}_bottom", center.z - zSize / 2.0);
+        findLayer(sc.center.z - sc.zSize / 2f)//Layer("${name}_bottom", center.z - zSize / 2.0);
     private val centralLayer = findLayer(sc.center.z)
 
-    private val center = Vector3D(sc.center.x, sc.center.y, sc.center.z)
+    private val center = Vector3D(sc.center.x.toDouble(), sc.center.y.toDouble(), sc.center.z.toDouble())
 
     private val sideLayers: Array<Plane> = arrayOf(
-        Plane(center.add(Vector3D(PIXEL_XY_SIZE / 2, 0.0, 0.0)), Vector3D(1.0, 0.0, 0.0), GEOMETRY_TOLERANCE),
-        Plane(center.add(Vector3D(-PIXEL_XY_SIZE / 2, 0.0, 0.0)), Vector3D(-1.0, 0.0, 0.0), GEOMETRY_TOLERANCE),
-        Plane(center.add(Vector3D(0.0, PIXEL_XY_SIZE / 2, 0.0)), Vector3D(0.0, 1.0, 0.0), GEOMETRY_TOLERANCE),
-        Plane(center.add(Vector3D(0.0, -PIXEL_XY_SIZE / 2, 0.0)), Vector3D(0.0, -1.0, 0.0), GEOMETRY_TOLERANCE)
-    );
+        Plane(center.add(Vector3D(PIXEL_XY_SIZE / 2.0, 0.0, 0.0)), Vector3D(1.0, 0.0, 0.0), GEOMETRY_TOLERANCE),
+        Plane(center.add(Vector3D(-PIXEL_XY_SIZE / 2.0, 0.0, 0.0)), Vector3D(-1.0, 0.0, 0.0), GEOMETRY_TOLERANCE),
+        Plane(center.add(Vector3D(0.0, PIXEL_XY_SIZE / 2.0, 0.0)), Vector3D(0.0, 1.0, 0.0), GEOMETRY_TOLERANCE),
+        Plane(center.add(Vector3D(0.0, -PIXEL_XY_SIZE / 2.0, 0.0)), Vector3D(0.0, -1.0, 0.0), GEOMETRY_TOLERANCE)
+    )
 
     //TODO add efficiency
     private fun containsPoint(x: Double, y: Double, z: Double, tolerance: Double = GEOMETRY_TOLERANCE): Boolean {
@@ -63,8 +63,8 @@ internal class SC1Aux(val sc: SC1, var efficiency: Double = 1.0) {
      * The layer number from up to bottom
      */
     fun getLayerNumber(): Int {
-        return when (this.center.z) {
-            UPPER_LAYER_Z -> 1;
+        return when (this.center.z.toFloat()) {
+            UPPER_LAYER_Z -> 1
             CENTRAL_LAYER_Z -> 2;
             LOWER_LAYER_Z -> 3;
             else -> throw RuntimeException("Unknown layer");
diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt
index de704441..c2578783 100644
--- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt
+++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/line.kt
@@ -45,7 +45,7 @@ fun makeTrack(start: Vector3D, direction: Vector3D): Line {
 fun makeTrack(x: Double, y: Double, theta: Double, phi: Double): Line {
     //TODO check angle definitions
     return makeTrack(
-        Vector3D(x, y, CENTRAL_LAYER_Z),
+        Vector3D(x, y, CENTRAL_LAYER_Z.toDouble()),
         Vector3D(phi, theta)
     )
 }
diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/monitor.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/monitor.kt
index a4e83c8b..d2ec7235 100644
--- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/monitor.kt
+++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/monitor.kt
@@ -13,12 +13,12 @@ import ru.mipt.npm.muon.monitor.readResource
 internal const val MINIMAL_TRACK_LENGTH = 10.0
 
 
-private val layerCache = HashMap<Double, Plane>()
+private val layerCache = HashMap<Float, Plane>()
 
-fun findLayer(z: Double): Plane = layerCache.getOrPut(z) {
+fun findLayer(z: Float): Plane = layerCache.getOrPut(z) {
     Plane(
-        Vector3D(0.0, 0.0, z), Vector3D(0.0, 0.0, 1.0),
-        Monitor.GEOMETRY_TOLERANCE
+        Vector3D(0.0, 0.0, z.toDouble()), Vector3D(0.0, 0.0, 1.0),
+        Monitor.GEOMETRY_TOLERANCE.toDouble()
     )
 }
 
diff --git a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/simulation.kt b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/simulation.kt
index 6019a94a..f8d45fd4 100644
--- a/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/simulation.kt
+++ b/demo/muon-monitor/src/jvmMain/kotlin/ru/mipt/npm/muon/monitor/sim/simulation.kt
@@ -28,8 +28,8 @@ interface TrackGenerator {
  */
 class UniformTrackGenerator(
     override val rnd: RandomGenerator,
-    val maxX: Double = 4 * PIXEL_XY_SIZE,
-    val maxY: Double = 4 * PIXEL_XY_SIZE
+    val maxX: Float = 4 * PIXEL_XY_SIZE,
+    val maxY: Float = 4 * PIXEL_XY_SIZE
 ) :
     TrackGenerator {
     override fun generate(): Line {
@@ -44,8 +44,8 @@ class UniformTrackGenerator(
 class FixedAngleGenerator(
     override val rnd: RandomGenerator,
     val phi: Double, val theta: Double,
-    val maxX: Double = 4 * PIXEL_XY_SIZE,
-    val maxY: Double = 4 * PIXEL_XY_SIZE
+    val maxX: Float = 4 * PIXEL_XY_SIZE,
+    val maxY: Float = 4 * PIXEL_XY_SIZE
 ) : TrackGenerator {
     override fun generate(): Line {
         val x = (1 - rnd.nextDouble() * 2.0) * maxX
@@ -60,8 +60,8 @@ class FixedAngleGenerator(
 class Cos2TrackGenerator(
     override val rnd: RandomGenerator,
     val power: Double = 2.0,
-    val maxX: Double = 4 * PIXEL_XY_SIZE,
-    val maxY: Double = 4 * PIXEL_XY_SIZE
+    val maxX: Float = 4 * PIXEL_XY_SIZE,
+    val maxY: Float = 4 * PIXEL_XY_SIZE
 ) :
     TrackGenerator {
     override fun generate(): Line {
diff --git a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
index a9070af7..fc2ebce3 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
@@ -3,6 +3,7 @@ package space.kscience.visionforge.examples
 import space.kscience.dataforge.context.Context
 import space.kscience.gdml.GdmlShowCase
 import space.kscience.visionforge.gdml.toVision
+import space.kscience.visionforge.html.ResourceLocation
 import space.kscience.visionforge.solid.Solids
 
 fun main() {
@@ -10,7 +11,7 @@ fun main() {
         plugin(Solids)
     }
 
-    context.makeVisionFile {
+    context.makeVisionFile(resourceLocation = ResourceLocation.EMBED) {
         vision("canvas") { GdmlShowCase.babyIaxo().toVision() }
     }
 }
\ No newline at end of file
diff --git a/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt
index e3961775..f372fa38 100644
--- a/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt
+++ b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt
@@ -1,7 +1,7 @@
 package space.kscience.visionforge.solid.demo
 
 import info.laht.threekt.core.Object3D
-import info.laht.threekt.geometries.BoxBufferGeometry
+import info.laht.threekt.geometries.BoxGeometry
 import info.laht.threekt.objects.Mesh
 import space.kscience.dataforge.meta.int
 import space.kscience.dataforge.meta.number
@@ -26,7 +26,7 @@ internal fun SolidGroup.varBox(
 internal class VariableBox(val xSize: Number, val ySize: Number) : ThreeVision() {
 
     override fun render(three: ThreePlugin): Object3D {
-        val geometry = BoxBufferGeometry(xSize, ySize, 1)
+        val geometry = BoxGeometry(xSize, ySize, 1)
 
         val material = ThreeMaterials.DEFAULT.clone()
 
diff --git a/jupyter/visionforge-gdml-jupyter/build.gradle.kts b/jupyter/visionforge-gdml-jupyter/build.gradle.kts
index e2d1db03..896b44a4 100644
--- a/jupyter/visionforge-gdml-jupyter/build.gradle.kts
+++ b/jupyter/visionforge-gdml-jupyter/build.gradle.kts
@@ -4,9 +4,9 @@ plugins {
 
 description = "Jupyter api artifact for GDML rendering"
 
-kotlin{
+kotlin {
     explicitApi = null
-    js{
+    js {
         useCommonJs()
         browser {
             webpackTask {
@@ -25,19 +25,17 @@ kotlin{
 
         tasks.getByName<ProcessResources>("jvmProcessResources") {
             dependsOn(jsBrowserDistribution)
-            afterEvaluate {
-                from(jsBrowserDistribution)
-            }
+            from(jsBrowserDistribution)
         }
     }
 
-    sourceSets{
+    sourceSets {
         commonMain {
             dependencies {
                 api(project(":visionforge-solid"))
             }
         }
-        jvmMain{
+        jvmMain {
             dependencies {
                 implementation(project(":visionforge-gdml"))
             }
@@ -52,10 +50,10 @@ kotlin{
     }
 }
 
-kscience{
+kscience {
     useJupyter()
 }
 
-readme{
+readme {
     maturity = ru.mipt.npm.gradle.Maturity.EXPERIMENTAL
 }
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index bc62b31e..6311841e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,8 +16,6 @@ pluginManagement {
     }
 }
 
-//enableFeaturePreview("GRADLE_METADATA")
-
 rootProject.name = "visionforge"
 
 
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroup.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroup.kt
index 4f16982b..6b35d971 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroup.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroup.kt
@@ -58,6 +58,7 @@ public operator fun VisionGroup.iterator(): Iterator<Vision> = children.values.i
 public val VisionGroup.isEmpty: Boolean get() = this.children.isEmpty()
 
 public interface VisionContainerBuilder<in V : Vision> {
+    //TODO add documentation
     public operator fun set(name: Name?, child: V?)
 }
 
diff --git a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCanvas3D.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCanvas3D.kt
index 171bc5a3..a05c844a 100644
--- a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCanvas3D.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCanvas3D.kt
@@ -4,6 +4,7 @@ import javafx.application.Platform
 import javafx.beans.property.ObjectProperty
 import javafx.beans.property.SimpleObjectProperty
 import javafx.scene.*
+import javafx.scene.layout.BorderPane
 import javafx.scene.paint.Color
 import org.fxyz3d.scene.Axes
 import space.kscience.dataforge.context.Context
@@ -11,31 +12,32 @@ import space.kscience.dataforge.context.ContextAware
 import space.kscience.visionforge.solid.specifications.Canvas3DOptions
 import tornadofx.*
 
-class FXCanvas3D(
-    val plugin: FX3DPlugin,
-    val spec: Canvas3DOptions = Canvas3DOptions.empty(),
+public class FXCanvas3D(
+    public val fx3d: FX3DPlugin,
+    public val options: Canvas3DOptions = Canvas3DOptions.empty(),
 ) : Fragment(), ContextAware {
 
-    override val context: Context get() = plugin.context
+    override val context: Context get() = fx3d.context
 
-    val world = Group().apply {
+    public val world: Group = Group().apply {
         //transforms.add(Rotate(180.0, Rotate.Z_AXIS))
     }
 
-    val axes = Axes().also {
-        it.setHeight(spec.axes.size)
-        it.setRadius(spec.axes.width)
-        it.isVisible = spec.axes.visible
+    public val axes: Axes = Axes().also {
+        it.setHeight(options.axes.size)
+        it.setRadius(options.axes.width)
+        it.isVisible = options.axes.visible
         world.add(it)
     }
 
-    val light = AmbientLight()
+    public val light: AmbientLight = AmbientLight()
 
     private val camera = PerspectiveCamera().apply {
-        nearClip = spec.camera.nearClip
-        farClip = spec.camera.farClip
-        fieldOfView = spec.camera.fov.toDouble()
-        this.add(light)
+        nearClip = options.camera.nearClip
+        farClip = options.camera.farClip
+        fieldOfView = options.camera.fov.toDouble()
+
+        add(light)
     }
 
     private val canvas = SubScene(
@@ -49,19 +51,19 @@ class FXCanvas3D(
         scene.camera = camera
     }
 
-    override val root = borderpane {
+    override val root: BorderPane = borderpane {
         center = canvas
     }
 
-    val controls = camera.orbitControls(canvas, spec.camera).also {
+    public val controls: OrbitControls = camera.orbitControls(canvas, options.camera).also {
         world.add(it.centerMarker)
     }
 
-    val rootObjectProperty: ObjectProperty<Solid> = SimpleObjectProperty()
-    var rootObject: Solid? by rootObjectProperty
+    public val rootObjectProperty: ObjectProperty<Solid> = SimpleObjectProperty()
+    public var rootObject: Solid? by rootObjectProperty
 
     private val rootNodeProperty = rootObjectProperty.objectBinding {
-        it?.let { plugin.buildNode(it) }
+        it?.let { fx3d.buildNode(it) }
     }
 
     init {
@@ -79,7 +81,7 @@ class FXCanvas3D(
         }
     }
 
-    fun render(vision: Solid) {
+    public fun render(vision: Solid) {
         rootObject = vision
     }
 }
\ No newline at end of file
diff --git a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXConvexFactory.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXConvexFactory.kt
index f2bbba54..7538d6c6 100644
--- a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXConvexFactory.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXConvexFactory.kt
@@ -11,7 +11,10 @@ object FXConvexFactory : FX3DFactory<Convex> {
     override val type: KClass<in Convex> get() = Convex::class
 
     override fun invoke(obj: Convex, binding: VisualObjectFXBinding): Node {
-        val hull = HullUtil.hull(obj.points.map { Vector3d.xyz(it.x, it.y, it.z) }, PropertyStorage())
+        val hull = HullUtil.hull(
+            obj.points.map { Vector3d.xyz(it.x.toDouble(), it.y.toDouble(), it.z.toDouble()) },
+            PropertyStorage()
+        )
         return hull.toNode()
     }
 
diff --git a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt
index a32e44f5..38a04a16 100644
--- a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt
@@ -1,6 +1,7 @@
 package space.kscience.visionforge.solid
 
 import javafx.beans.InvalidationListener
+import javafx.beans.property.SimpleBooleanProperty
 import javafx.beans.property.SimpleDoubleProperty
 import javafx.event.EventHandler
 import javafx.geometry.Point3D
@@ -17,26 +18,26 @@ import kotlin.math.*
 import space.kscience.visionforge.solid.specifications.Camera as CameraSpec
 
 
-class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec: CameraSpec) {
+public class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec: CameraSpec) {
 
-    val distanceProperty = SimpleDoubleProperty(spec.distance)
-    var distance by distanceProperty
+    public val distanceProperty: SimpleDoubleProperty = SimpleDoubleProperty(spec.distance)
+    public var distance: Double by distanceProperty
 
-    val azimuthProperty = SimpleDoubleProperty(spec.azimuth)
-    var azimuth by azimuthProperty
+    public val azimuthProperty: SimpleDoubleProperty = SimpleDoubleProperty(spec.azimuth)
+    public var azimuth: Double by azimuthProperty
 
-    val zenithProperty = SimpleDoubleProperty(PI / 2 - spec.latitude)
-    var zenith by zenithProperty
+    public val zenithProperty: SimpleDoubleProperty = SimpleDoubleProperty(PI / 2 - spec.latitude)
+    public var zenith: Double by zenithProperty
+//
+//    public val latitudeProperty: DoubleBinding = zenithProperty.unaryMinus().plus(PI / 2)
+//    public val latitude by latitudeProperty
 
-    val latitudeProperty = zenithProperty.unaryMinus().plus(PI / 2)
-    val latitude by latitudeProperty
-
-    val baseXProperty = SimpleDoubleProperty(0.0)
-    var x by baseXProperty
-    val baseYProperty = SimpleDoubleProperty(0.0)
-    var y by baseYProperty
-    val baseZProperty = SimpleDoubleProperty(0.0)
-    var z by baseZProperty
+    public val baseXProperty: SimpleDoubleProperty = SimpleDoubleProperty(0.0)
+    public var x: Double by baseXProperty
+    public val baseYProperty: SimpleDoubleProperty = SimpleDoubleProperty(0.0)
+    public var y: Double by baseYProperty
+    public val baseZProperty: SimpleDoubleProperty = SimpleDoubleProperty(0.0)
+    public var z: Double by baseZProperty
 
     private val baseTranslate = Translate()
 
@@ -47,13 +48,15 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
 //
 //    val basePosition by basePositionProperty
 
-    val centerMarker by lazy {
+    private val inProgressProperty = SimpleBooleanProperty(false)
+
+    public val centerMarker: Node by lazy {
         Sphere(10.0).also {
             it.transforms.setAll(baseTranslate)
+            it.visibleProperty().bind(inProgressProperty)
         }
     }
 
-    //private val center = Translate()
 
     private val rx = Rotate(0.0, Rotate.X_AXIS)
 
@@ -65,7 +68,7 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
 
 
     init {
-        camera.transforms.setAll(rx, ry, rz, translate)
+        camera.transforms.setAll(rx, ry, rz, baseTranslate, translate)
         update()
         val listener = InvalidationListener {
             update()
@@ -136,6 +139,7 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
             mousePosY = me.sceneY
             mouseOldX = me.sceneX
             mouseOldY = me.sceneY
+            inProgressProperty.set(true)
         }
 
         onMouseDragged = EventHandler<MouseEvent> { me ->
@@ -154,18 +158,23 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
 
             if (me.isPrimaryButtonDown) {
                 azimuth = (azimuth - mouseDeltaX * MOUSE_SPEED * modifier * ROTATION_SPEED).coerceIn(0.0, 2 * PI)
-                zenith = (zenith - mouseDeltaY * MOUSE_SPEED * modifier * ROTATION_SPEED).coerceIn(0.0,PI)
+                zenith = (zenith - mouseDeltaY * MOUSE_SPEED * modifier * ROTATION_SPEED).coerceIn(0.0, PI)
             } else if (me.isSecondaryButtonDown) {
                 x += MOUSE_SPEED * modifier * TRACK_SPEED * (mouseDeltaX * cos(azimuth) + mouseDeltaY * sin(azimuth))
                 z += MOUSE_SPEED * modifier * TRACK_SPEED * (-mouseDeltaX * sin(azimuth) + mouseDeltaY * cos(azimuth))
             }
         }
+
+        onMouseReleased = EventHandler {
+            inProgressProperty.set(false)
+        }
+
         onScroll = EventHandler<ScrollEvent> { event ->
             distance = max(1.0, distance - MOUSE_SPEED * event.deltaY * RESIZE_SPEED)
         }
     }
 
-    companion object {
+    public companion object {
         private const val CONTROL_MULTIPLIER = 0.1
         private const val SHIFT_MULTIPLIER = 10.0
         private const val MOUSE_SPEED = 0.1
@@ -175,5 +184,5 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
     }
 }
 
-fun Camera.orbitControls(canvas: SubScene, spec: CameraSpec) =
+public fun Camera.orbitControls(canvas: SubScene, spec: CameraSpec): OrbitControls =
     OrbitControls(this, canvas, spec)
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformerEnv.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformerEnv.kt
index ef41a214..76561fe8 100644
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformerEnv.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformerEnv.kt
@@ -41,7 +41,7 @@ public class GdmlTransformer {
 
     internal val styleCache = HashMap<Name, Meta>()
 
-    public fun Solid.useStyle(name: String, builder: MetaBuilder.() -> Unit) {
+    public fun Solid.registerAndUseStyle(name: String, builder: MetaBuilder.() -> Unit) {
         styleCache.getOrPut(name.toName()) {
             Meta(builder)
         }
@@ -49,7 +49,7 @@ public class GdmlTransformer {
     }
 
     public fun Solid.transparent() {
-        useStyle("transparent") {
+        registerAndUseStyle("transparent") {
             SolidMaterial.MATERIAL_OPACITY_KEY put 0.3
             "edges.enabled" put true
         }
@@ -75,7 +75,7 @@ public class GdmlTransformer {
 
             if (parent.physVolumes.isNotEmpty()) transparent()
 
-            useStyle(styleName) {
+            registerAndUseStyle(styleName) {
                 val vfMaterial = SolidMaterial().apply {
                     configurePaint(material, solid)
                 }
@@ -125,7 +125,11 @@ private class GdmlTransformerEnv(val settings: GdmlTransformer) {
 
     fun Solid.configureSolid(root: Gdml, parent: GdmlVolume, solid: GdmlSolid) {
         val material = parent.materialref.resolve(root) ?: GdmlElement(parent.materialref.ref)
-        settings.run { configureSolid(parent, solid, material) }
+        with(settings) {
+            with(this@configureSolid) {
+                configureSolid(parent, solid, material)
+            }
+        }
     }
 
     private fun proxySolid(root: Gdml, group: SolidGroup, solid: GdmlSolid, name: String): SolidReferenceGroup {
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
index fda8531e..9855c835 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
@@ -156,21 +156,21 @@ private fun Solid.position(): Point3D =
 public var Solid.x: Number
     get() = position?.x ?: 0f
     set(value) {
-        position().x = value.toDouble()
+        position().x = value.toFloat()
         invalidateProperty(Solid.X_POSITION_KEY)
     }
 
 public var Solid.y: Number
     get() = position?.y ?: 0f
     set(value) {
-        position().y = value.toDouble()
+        position().y = value.toFloat()
         invalidateProperty(Solid.Y_POSITION_KEY)
     }
 
 public var Solid.z: Number
     get() = position?.z ?: 0f
     set(value) {
-        position().z = value.toDouble()
+        position().z = value.toFloat()
         invalidateProperty(Solid.Z_POSITION_KEY)
     }
 
@@ -180,21 +180,21 @@ private fun Solid.rotation(): Point3D =
 public var Solid.rotationX: Number
     get() = rotation?.x ?: 0f
     set(value) {
-        rotation().x = value.toDouble()
+        rotation().x = value.toFloat()
         invalidateProperty(Solid.X_ROTATION_KEY)
     }
 
 public var Solid.rotationY: Number
     get() = rotation?.y ?: 0f
     set(value) {
-        rotation().y = value.toDouble()
+        rotation().y = value.toFloat()
         invalidateProperty(Solid.Y_ROTATION_KEY)
     }
 
 public var Solid.rotationZ: Number
     get() = rotation?.z ?: 0f
     set(value) {
-        rotation().z = value.toDouble()
+        rotation().z = value.toFloat()
         invalidateProperty(Solid.Z_ROTATION_KEY)
     }
 
@@ -204,20 +204,20 @@ private fun Solid.scale(): Point3D =
 public var Solid.scaleX: Number
     get() = scale?.x ?: 1f
     set(value) {
-        scale().x = value.toDouble()
+        scale().x = value.toFloat()
         invalidateProperty(Solid.X_SCALE_KEY)
     }
 
 public var Solid.scaleY: Number
     get() = scale?.y ?: 1f
     set(value) {
-        scale().y = value.toDouble()
+        scale().y = value.toFloat()
         invalidateProperty(Solid.Y_SCALE_KEY)
     }
 
 public var Solid.scaleZ: Number
     get() = scale?.z ?: 1f
     set(value) {
-        scale().z = value.toDouble()
+        scale().z = value.toFloat()
         invalidateProperty(Solid.Z_SCALE_KEY)
     }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/geometry.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/geometry.kt
index 35fc731f..28a90398 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/geometry.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/geometry.kt
@@ -3,29 +3,31 @@ package space.kscience.visionforge.solid
 import kotlinx.serialization.Serializable
 import space.kscience.dataforge.meta.Meta
 import space.kscience.dataforge.meta.MetaBuilder
-import space.kscience.dataforge.meta.double
+import space.kscience.dataforge.meta.float
 import space.kscience.dataforge.meta.get
 import kotlin.math.PI
+import kotlin.math.pow
+import kotlin.math.sqrt
 
 public const val PI2: Float = 2 * PI.toFloat()
 
 @Serializable
-public data class Point2D(public var x: Double, public var y: Double)
+public data class Point2D(public var x: Float, public var y: Float)
 
-public fun Point2D(x: Number, y: Number): Point2D = Point2D(x.toDouble(), y.toDouble())
+public fun Point2D(x: Number, y: Number): Point2D = Point2D(x.toFloat(), y.toFloat())
 
 public fun Point2D.toMeta(): Meta = Meta {
     Solid.X_KEY put x
     Solid.Y_KEY put y
 }
 
-internal fun Meta.point2D(): Point2D = Point2D(this["x"].double ?: 0.0, this["y"].double ?: 0.0)
+internal fun Meta.point2D(): Point2D = Point2D(this["x"].float ?: 0f, this["y"].float ?: 0f)
 
 @Serializable
 public data class Point3D(
-    public var x: Double,
-    public var y: Double,
-    public var z: Double,
+    public var x: Float,
+    public var y: Float,
+    public var z: Float,
 ) {
     public companion object {
         public val ZERO: Point3D = Point3D(0.0, 0.0, 0.0)
@@ -33,7 +35,7 @@ public data class Point3D(
     }
 }
 
-public fun Point3D(x: Number, y: Number, z: Number): Point3D = Point3D(x.toDouble(), y.toDouble(), z.toDouble())
+public fun Point3D(x: Number, y: Number, z: Number): Point3D = Point3D(x.toFloat(), y.toFloat(), z.toFloat())
 
 public operator fun Point3D.plus(other: Point3D): Point3D = Point3D(
     this.x + other.x,
@@ -41,7 +43,32 @@ public operator fun Point3D.plus(other: Point3D): Point3D = Point3D(
     this.z + other.z
 )
 
-internal fun Meta.point3D() = Point3D(this["x"].double ?: 0.0, this["y"].double ?: 0.0, this["y"].double ?: 0.0)
+public operator fun Point3D.minus(other: Point3D): Point3D = Point3D(
+    this.x - other.x,
+    this.y - other.y,
+    this.z - other.z
+)
+
+public operator fun Point3D.unaryMinus(): Point3D = Point3D(
+    -x,
+    -y,
+    -z
+)
+
+public infix fun Point3D.cross(other: Point3D): Point3D = Point3D(
+    y * other.z - z * other.y,
+    z * other.x - x * other.z,
+    x * other.y - y * other.x
+)
+
+public fun Point3D.normalizeInPlace(){
+    val norm = sqrt(x.pow(2) + y.pow(2) + z.pow(2))
+    x /= norm
+    y /= norm
+    z /= norm
+}
+
+internal fun Meta.point3D() = Point3D(this["x"].float ?: 0.0, this["y"].float ?: 0.0, this["y"].float ?: 0.0)
 
 public fun Point3D.toMeta(): MetaBuilder = Meta {
     Solid.X_KEY put x
diff --git a/visionforge-threejs/build.gradle.kts b/visionforge-threejs/build.gradle.kts
index 60c00061..32803a61 100644
--- a/visionforge-threejs/build.gradle.kts
+++ b/visionforge-threejs/build.gradle.kts
@@ -4,6 +4,6 @@ plugins {
 
 dependencies {
     api(project(":visionforge-solid"))
-    implementation(npm("three", "0.124.0"))
-    implementation(npm("three-csg-ts", "2.2.2"))
+    implementation(npm("three", "0.130.1"))
+    implementation(npm("three-csg-ts", "3.1.4"))
 }
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferAttribute.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferAttribute.kt
index 001aa20c..938deb7e 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferAttribute.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferAttribute.kt
@@ -44,6 +44,7 @@ abstract external class BufferAttribute protected constructor(
          * Default is 0. Position at whcih to start update.
          */
         var offset: Int
+
         /**
          * Default is -1, which means don't use update ranges.
 
@@ -56,16 +57,19 @@ abstract external class BufferAttribute protected constructor(
      * UUID of this object instance. This gets automatically assigned and this shouldn't be edited.
      */
     val uuid: String
+
     /**
      * Optional name for this attribute instance. Default is an empty string.
      */
     var name: String
 
     var array: dynamic
+
     /**
      * The length of vectors that are being stored in the array.
      */
     val itemSize: Int
+
     /**
      * Stores the array's length divided by the itemSize.
      *
@@ -73,6 +77,7 @@ abstract external class BufferAttribute protected constructor(
      * then this will count the number of such vectors stored.
      */
     val count: Int
+
     /**
      * Indicates how the underlying data in the buffer maps to the values in the GLSL shader code. See the constructor above for details.
      */
@@ -86,6 +91,7 @@ abstract external class BufferAttribute protected constructor(
      * This corresponds to the gl.DYNAMIC_DRAW flag.
      */
     var dynamic: Boolean
+
     /**
      * This can be used to only update some components of stored vectors (
      * for example, just the component related to color).
@@ -99,8 +105,16 @@ abstract external class BufferAttribute protected constructor(
      */
     var needsUpdate: Boolean
 
+    /**
+     * A callback function that is executed after the Renderer has transferred the attribute array data to the GPU.
+     */
     var onUploadCallback: () -> Unit
 
+    /**
+     * Sets the value of the [onUploadCallback] property.
+     */
+    fun onUpload(callback: () -> Unit)
+
     /**
      * A version number, incremented every time the needsUpdate property is set to true.
      */
@@ -119,6 +133,7 @@ abstract external class BufferAttribute protected constructor(
     fun getW(index: Int): Number
 
     fun copy(source: BufferAttribute): BufferAttribute
+
     /**
      * Copy a vector from bufferAttribute[index2] to array[index1].
      */
@@ -205,3 +220,22 @@ abstract external class BufferAttribute protected constructor(
      */
     fun setXYZW(index: Int, x: Number, y: Number, z: Number, w: Number)
 }
+
+
+external class Float32BufferAttribute(
+    array: FloatArray,
+    itemSize: Int,
+    normalized: Boolean = definedExternally
+) : BufferAttribute
+
+external class Int32BufferAttribute(
+    array: IntArray,
+    itemSize: Int,
+    normalized: Boolean = definedExternally
+) : BufferAttribute
+
+external class Int16BufferAttribute(
+    array: ShortArray,
+    itemSize: Int,
+    normalized: Boolean = definedExternally
+) : BufferAttribute
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferGeometry.kt
index c3fd093b..251627a7 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferGeometry.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferGeometry.kt
@@ -85,14 +85,14 @@ open external class BufferGeometry {
     fun clearGroups()
     fun addGroup(start: Int, count: Int, materialIndex: Int = definedExternally)
 
-    fun addAttribute(name: String, attribute: BufferAttribute)
+    fun setAttribute(name: String, attribute: BufferAttribute)
     fun getAttribute(name: String): BufferAttribute
-    fun removeAttribute(name: String): BufferGeometry
+    fun deleteAttribute(name: String): BufferGeometry
 
     fun setIndex(index: BufferAttribute)
+    fun setIndex(index: Array<Short>)
     fun setDrawRange(start: Int, count: Int)
 
-    fun fromGeometry(geometry: Geometry)
     fun setFromObject(`object`: Object3D): BufferGeometry
     fun updateFromObject(`object`: Object3D): BufferGeometry
     fun setFromPoints(points: Array<Vector3>): BufferGeometry
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/DirectGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/DirectGeometry.kt
deleted file mode 100644
index bae8ce28..00000000
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/DirectGeometry.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright 2017-2018 Lars Ivar Hatledal
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING  FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-@file:JsModule("three")
-@file:JsNonModule
-
-package info.laht.threekt.core
-
-import info.laht.threekt.math.Box3
-import info.laht.threekt.math.Sphere
-
-external class DirectGeometry {
-
-    var verticesNeedUpdate: Boolean
-    var normalsNeedUpdate: Boolean
-    var colorsNeedUpdate: Boolean
-    var uvsNeedUpdate: Boolean
-    var groupsNeedUpdate: Boolean
-
-    fun computeBoundingBox(): Box3
-    fun computeBoundingSphere(): Sphere
-
-    fun dispose()
-
-    fun fromGeometry(geometry: Geometry)
-
-}
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Geometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Geometry.kt
deleted file mode 100644
index 522ab07c..00000000
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/Geometry.kt
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright 2017-2018 Lars Ivar Hatledal
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING  FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-@file:JsModule("three")
-@file:JsNonModule
-
-package info.laht.threekt.core
-
-import info.laht.threekt.math.*
-import info.laht.threekt.objects.Mesh
-
-external interface MorphTarget {
-    val name: String
-    val vertices: Array<Vector3>
-}
-
-external interface MorphNormal {
-    val name: String
-    val normals: Array<Vector3>
-}
-
-open external class Geometry {
-
-    val id: Int
-
-    var vertices: Array<Vector3>
-    var colors: Array<Color>
-    var faces: Array<Face3>
-    var faceVertexUvs: Array<Array<Vector2>>
-
-    var morphTargets: Array<MorphTarget>
-    var morphNormals: Array<MorphNormal>
-
-    var skinWeights: Array<Vector4>
-    var skinIndices: Array<Vector4>
-
-    var lineDistances: List<Double>
-
-    var boundingBox: Box3?
-    var boundingSphere: Sphere?
-
-    // update flags
-
-    var elementsNeedUpdate: Boolean
-    var verticesNeedUpdate: Boolean
-    var uvsNeedUpdate: Boolean
-    var normalsNeedUpdate: Boolean
-    var colorsNeedUpdate: Boolean
-    var lineDistancesNeedUpdate: Boolean
-    var groupsNeedUpdate: Boolean
-
-    fun applyMatrix4(matrix: Matrix4): Geometry
-    fun rotateX(angle: Number): Geometry
-    fun rotateY(angle: Number): Geometry
-    fun rotateZ(angle: Number): Geometry
-    fun translate(x: Number, y: Number, z: Number): Geometry
-    fun scale(x: Number, y: Number, z: Number): Geometry
-    fun lookAt(vector: Vector3): Geometry
-    fun fromBufferGeometry(geometry: BufferGeometry): Geometry
-    fun addFace(a: Int, b: Int, c: Int, materialIndexOffset: Int = definedExternally)
-    fun center(): Vector3
-    fun normalize(): Geometry
-    fun computeFaceNormals()
-    fun computeVertexNormals(areaWeighted: Boolean = definedExternally)
-    fun computeFlatVertexNormals()
-    fun computeMorphNormals()
-    fun computeLineDistances()
-    fun computeBoundingBox()
-    fun computeBoundingSphere()
-
-    fun merge(geometry: Geometry, matrix: Matrix4 = definedExternally, materialIndexOffset: Int = definedExternally)
-
-    fun mergeMesh(mesh: Mesh)
-
-    fun mergeVertices()
-
-    fun setFromPoint(points: Array<Vector3>): Geometry
-
-    fun sortFacesByMaterialIndex()
-
-    fun toJSON(): Any
-
-    open fun clone(): Geometry
-    fun copy(geometry: Geometry): Geometry
-
-    fun dispose()
-
-}
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/BoxGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/BoxGeometry.kt
index 6cf5d5a7..8d0e5ec5 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/BoxGeometry.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/BoxGeometry.kt
@@ -4,7 +4,6 @@
 package info.laht.threekt.geometries
 
 import info.laht.threekt.core.BufferGeometry
-import info.laht.threekt.core.Geometry
 
 
 external class BoxGeometry(
@@ -14,14 +13,4 @@ external class BoxGeometry(
     widthSegments: Int = definedExternally,
     heightSegments: Int = definedExternally,
     depthSegments: Int = definedExternally
-) : Geometry
-
-
-external class BoxBufferGeometry(
-    width: Number,
-    height: Number,
-    depth: Number,
-    widthSegments: Int = definedExternally,
-    heightSegments: Int = definedExternally,
-    depthSegments: Int = definedExternally
 ) : BufferGeometry
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/ConeGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/ConeGeometry.kt
index ae143fa8..f98ad2dd 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/ConeGeometry.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/ConeGeometry.kt
@@ -4,7 +4,7 @@
 package info.laht.threekt.geometries
 
 import info.laht.threekt.core.BufferGeometry
-import info.laht.threekt.core.Geometry
+
 
 external class ConeGeometry(
     radius: Number = definedExternally,
@@ -14,14 +14,4 @@ external class ConeGeometry(
     openEnded: Boolean = definedExternally,
     thetaStart: Boolean = definedExternally,
     thetaLength: Boolean = definedExternally
-) : Geometry
-
-external class ConeBufferGeometry(
-    radius: Number = definedExternally,
-    height: Number = definedExternally,
-    radialSegments: Int = definedExternally,
-    heightSegments: Int = definedExternally,
-    openEnded: Boolean = definedExternally,
-    thetaStart: Boolean = definedExternally,
-    thetaLength: Boolean = definedExternally
 ) : BufferGeometry
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt
index a4801453..b10e5c11 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/CylinderGeometry.kt
@@ -4,7 +4,6 @@
 package info.laht.threekt.geometries
 
 import info.laht.threekt.core.BufferGeometry
-import info.laht.threekt.core.Geometry
 
 external class CylinderGeometry(
     radiusTop: Number,
@@ -15,15 +14,4 @@ external class CylinderGeometry(
     openEnded: Boolean = definedExternally,
     thetaStart: Number = definedExternally,
     thetaLength: Number = definedExternally
-) : Geometry
-
-external class CylinderBufferGeometry(
-    radiusTop: Number,
-    radiusBottom: Number,
-    height: Number,
-    radialSegments: Int = definedExternally,
-    heightSegments: Int = definedExternally,
-    openEnded: Boolean = definedExternally,
-    thetaStart: Number = definedExternally,
-    thetaLength: Number = definedExternally
 ) : BufferGeometry
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt
index 8e6568da..b0a5c91b 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/EdgesGeometry.kt
@@ -4,8 +4,5 @@
 package info.laht.threekt.geometries
 
 import info.laht.threekt.core.BufferGeometry
-import info.laht.threekt.core.Geometry
 
-external class EdgesGeometry(geometry: Geometry, thresholdAngle: Int = definedExternally) : BufferGeometry {
-    constructor(geometry: BufferGeometry, thresholdAngle: Int = definedExternally)
-}
\ No newline at end of file
+public external class EdgesGeometry(geometry: BufferGeometry, thresholdAngle: Int = definedExternally) : BufferGeometry
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/ExtrudeGeometry.kt
similarity index 83%
rename from visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/ExtrudeGeometry.kt
index ab17c116..4b30e7af 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/ExtrudedGeometry.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/ExtrudeGeometry.kt
@@ -11,7 +11,6 @@
 package info.laht.threekt.geometries
 
 import info.laht.threekt.core.BufferGeometry
-import info.laht.threekt.core.Geometry
 import info.laht.threekt.extras.core.Shape
 import info.laht.threekt.math.Vector2
 
@@ -78,15 +77,3 @@ external open class ExtrudeBufferGeometry : BufferGeometry {
         var WorldUVGenerator: UVGenerator
     }
 }
-
-external open class ExtrudeGeometry : Geometry {
-    constructor(shapes: Shape, options: ExtrudeGeometryOptions?)
-    constructor(shapes: Array<Shape>, options: ExtrudeGeometryOptions?)
-
-    open fun addShapeList(shapes: Array<Shape>, options: Any? = definedExternally)
-    open fun addShape(shape: Shape, options: Any? = definedExternally)
-
-    companion object {
-        var WorldUVGenerator: UVGenerator
-    }
-}
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt
index ad758af4..0b1072ef 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/PlaneGeometry.kt
@@ -4,7 +4,6 @@
 package info.laht.threekt.geometries
 
 import info.laht.threekt.core.BufferGeometry
-import info.laht.threekt.core.Geometry
 
 external class PlaneGeometry(
 
@@ -13,13 +12,4 @@ external class PlaneGeometry(
     widthSegments: Int = definedExternally,
     heightSegments: Int = definedExternally
 
-) : Geometry
-
-external class PlaneBufferGeometry(
-
-    width: Number,
-    height: Number,
-    widthSegments: Int = definedExternally,
-    heightSegments: Int = definedExternally
-
 ) : BufferGeometry
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/SphereGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/SphereGeometry.kt
index 8117ff4c..5b0c9fc6 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/SphereGeometry.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/SphereGeometry.kt
@@ -4,7 +4,6 @@
 package info.laht.threekt.geometries
 
 import info.laht.threekt.core.BufferGeometry
-import info.laht.threekt.core.Geometry
 
 external class SphereGeometry(
     radius: Number,
@@ -14,14 +13,4 @@ external class SphereGeometry(
     phiLength: Number = definedExternally,
     thetaStart: Number = definedExternally,
     thetaLength: Number = definedExternally
-) : Geometry
-
-external class SphereBufferGeometry(
-    radius: Number,
-    widthSegments: Int = definedExternally,
-    heightSegments: Int = definedExternally,
-    phiStart: Number = definedExternally,
-    phiLength: Number = definedExternally,
-    thetaStart: Number = definedExternally,
-    thetaLength: Number = definedExternally
 ) : BufferGeometry
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TextGeometry.kt
similarity index 83%
rename from visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt
rename to visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TextGeometry.kt
index ca9f93b3..b8c935f3 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TextBufferGeometry.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TextGeometry.kt
@@ -34,10 +34,7 @@ external interface TextGeometryParameters {
         set(value) = definedExternally
 }
 
-external class TextBufferGeometry(text: String, parameters: TextGeometryParameters? = definedExternally) : ExtrudeBufferGeometry {
-    val parameters: TextGeometryParameters
-}
-
-external class TextGeometry(text: String, parameters: TextGeometryParameters? = definedExternally) : ExtrudeGeometry {
+external class TextBufferGeometry(text: String, parameters: TextGeometryParameters? = definedExternally) :
+    ExtrudeBufferGeometry {
     val parameters: TextGeometryParameters
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TorusGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TorusGeometry.kt
index 7406afb3..0a53525f 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TorusGeometry.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TorusGeometry.kt
@@ -4,7 +4,7 @@
 package info.laht.threekt.geometries
 
 import info.laht.threekt.core.BufferGeometry
-import info.laht.threekt.core.Geometry
+
 
 external class TorusGeometry(
     radius: Number = definedExternally,
@@ -12,12 +12,4 @@ external class TorusGeometry(
     radialSegments: Int = definedExternally,
     tubularSegments: Int = definedExternally,
     arc: Number = definedExternally
-) : Geometry
-
-external class TorusBufferGeometry(
-    radius: Number = definedExternally,
-    tube: Number = definedExternally,
-    radialSegments: Int = definedExternally,
-    tubularSegments: Int = definedExternally,
-    arc: Number = definedExternally
 ) : BufferGeometry
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TubeGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TubeGeometry.kt
index 38bc560a..36afa6ae 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TubeGeometry.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/TubeGeometry.kt
@@ -1,10 +1,10 @@
 package info.laht.threekt.geometries
 
 import info.laht.threekt.core.BufferGeometry
-import info.laht.threekt.core.Geometry
 import info.laht.threekt.extras.core.Curve
 import info.laht.threekt.math.Vector3
 
+
 /**
  * Creates a tube that extrudes along a 3d curve.
  */
@@ -16,25 +16,6 @@ external class TubeGeometry(
     radiusSegments: Int = definedExternally,
     closed: Boolean = definedExternally
 
-) : Geometry {
-
-    var tangents: Array<Vector3>
-    var normals: Array<Vector3>
-    var binormals: Array<Vector3>
-
-}
-
-/**
- * Creates a tube that extrudes along a 3d curve.
- */
-external class TubeBufferGeometry(
-
-    path: Curve<Vector3>,
-    tubularSegments: Int = definedExternally,
-    radius: Number = definedExternally,
-    radiusSegments: Int = definedExternally,
-    closed: Boolean = definedExternally
-
 ) : BufferGeometry {
 
     val parameters: dynamic
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt
index 4c0a72ee..f52c61cc 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/geometries/WireframeGeometry.kt
@@ -4,14 +4,8 @@
 package info.laht.threekt.geometries
 
 import info.laht.threekt.core.BufferGeometry
-import info.laht.threekt.core.Geometry
 
 /**
  * This can be used as a helper object to view a Geometry object as a wireframe.
  */
-external class WireframeGeometry : BufferGeometry {
-
-    constructor(geometry: Geometry)
-    constructor(geometry: BufferGeometry)
-
-}
\ No newline at end of file
+external class WireframeGeometry(geometry: BufferGeometry) : BufferGeometry
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/LineSegments.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/LineSegments.kt
index b5a83ff0..03bef34e 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/LineSegments.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/LineSegments.kt
@@ -28,12 +28,10 @@
 package info.laht.threekt.objects
 
 import info.laht.threekt.core.BufferGeometry
-import info.laht.threekt.core.Geometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.materials.Material
 
 open external class LineSegments(geometry: BufferGeometry, material: Material) : Object3D {
-    constructor(geometry: Geometry, material: Material)
 
     var geometry: BufferGeometry
     var material: Material
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Mesh.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Mesh.kt
index 78dcb9f6..54669b1f 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Mesh.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Mesh.kt
@@ -27,14 +27,14 @@
 
 package info.laht.threekt.objects
 
-import info.laht.threekt.core.*
+import info.laht.threekt.core.BufferGeometry
+import info.laht.threekt.core.Intersect
+import info.laht.threekt.core.Object3D
+import info.laht.threekt.core.Raycaster
 import info.laht.threekt.materials.Material
 
 
-open external class Mesh : Object3D {
-
-    constructor(geometry: Geometry?, material: Material?)
-    constructor(geometry: BufferGeometry?, material: Material?)
+open external class Mesh(geometry: BufferGeometry?, material: Material?) : Object3D {
 
     var geometry: dynamic
     var material: Material
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/MeshThreeFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/MeshThreeFactory.kt
index b01dbd1a..00313d3a 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/MeshThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/MeshThreeFactory.kt
@@ -30,9 +30,6 @@ public abstract class MeshThreeFactory<in T : Solid>(
     override fun invoke(three: ThreePlugin, obj: T): Mesh {
         val geometry = buildGeometry(obj)
 
-        //JS sometimes tries to pass Geometry as BufferGeometry
-        @Suppress("USELESS_IS_CHECK") if (geometry !is BufferGeometry) error("BufferGeometry expected")
-
         //val meshMeta: Meta = obj.properties[Material3D.MATERIAL_KEY]?.node ?: Meta.empty
 
         val mesh = Mesh(geometry, ThreeMaterials.DEFAULT).apply {
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeBoxFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeBoxFactory.kt
index dad57066..a5b50688 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeBoxFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeBoxFactory.kt
@@ -1,12 +1,12 @@
 package space.kscience.visionforge.solid.three
 
-import info.laht.threekt.geometries.BoxBufferGeometry
+import info.laht.threekt.geometries.BoxGeometry
 import space.kscience.visionforge.solid.Box
 import space.kscience.visionforge.solid.detail
 
 public object ThreeBoxFactory : MeshThreeFactory<Box>(Box::class) {
-    override fun buildGeometry(obj: Box): BoxBufferGeometry =
+    override fun buildGeometry(obj: Box): BoxGeometry =
         obj.detail?.let { detail ->
-            BoxBufferGeometry(obj.xSize, obj.ySize, obj.zSize, detail, detail, detail)
-        } ?: BoxBufferGeometry(obj.xSize, obj.ySize, obj.zSize)
+            BoxGeometry(obj.xSize, obj.ySize, obj.zSize, detail, detail, detail)
+        } ?: BoxGeometry(obj.xSize, obj.ySize, obj.zSize)
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvasLabelFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvasLabelFactory.kt
index bbce8f19..4855abcd 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvasLabelFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvasLabelFactory.kt
@@ -2,7 +2,7 @@ package space.kscience.visionforge.solid.three
 
 import info.laht.threekt.DoubleSide
 import info.laht.threekt.core.Object3D
-import info.laht.threekt.geometries.PlaneBufferGeometry
+import info.laht.threekt.geometries.PlaneGeometry
 import info.laht.threekt.materials.MeshBasicMaterial
 import info.laht.threekt.objects.Mesh
 import info.laht.threekt.textures.Texture
@@ -46,7 +46,7 @@ public object ThreeCanvasLabelFactory : ThreeFactory<SolidLabel> {
         }
 
         val mesh = Mesh(
-            PlaneBufferGeometry(canvas.width, canvas.height),
+            PlaneGeometry(canvas.width, canvas.height),
             material
         )
 
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCompositeFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCompositeFactory.kt
index 1f8c9328..270e63a6 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCompositeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCompositeFactory.kt
@@ -2,6 +2,7 @@ package space.kscience.visionforge.solid.three
 
 import CSG
 import info.laht.threekt.core.BufferGeometry
+import info.laht.threekt.math.Matrix4
 import info.laht.threekt.objects.Mesh
 import space.kscience.visionforge.solid.Composite
 import space.kscience.visionforge.solid.CompositeType
@@ -23,7 +24,7 @@ public class ThreeCompositeFactory(public val three: ThreePlugin) : MeshThreeFac
             CompositeType.INTERSECT -> firstCSG.intersect(secondCSG)
             CompositeType.SUBTRACT -> firstCSG.subtract(secondCSG)
         }
-        return resultCSG.toGeometry().toBufferGeometry()
+        return resultCSG.toGeometry(Matrix4())
     }
 
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeConeFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeConeFactory.kt
index c8eece9a..5789c30e 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeConeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeConeFactory.kt
@@ -1,7 +1,7 @@
 package space.kscience.visionforge.solid.three
 
 import info.laht.threekt.core.BufferGeometry
-import info.laht.threekt.geometries.CylinderBufferGeometry
+import info.laht.threekt.geometries.CylinderGeometry
 import space.kscience.visionforge.solid.ConeSegment
 import space.kscience.visionforge.solid.detail
 import kotlin.math.PI
@@ -11,7 +11,7 @@ public object ThreeConeFactory : MeshThreeFactory<ConeSegment>(ConeSegment::clas
     override fun buildGeometry(obj: ConeSegment): BufferGeometry {
         val cylinder =  obj.detail?.let {
             val segments = it.toDouble().pow(0.5).toInt()
-            CylinderBufferGeometry(
+            CylinderGeometry(
                 radiusTop = obj.topRadius,
                 radiusBottom = obj.bottomRadius,
                 height = obj.height,
@@ -21,7 +21,7 @@ public object ThreeConeFactory : MeshThreeFactory<ConeSegment>(ConeSegment::clas
                 thetaStart = obj.startAngle,
                 thetaLength = obj.angle
             )
-        } ?: CylinderBufferGeometry(
+        } ?: CylinderGeometry(
             radiusTop = obj.topRadius,
             radiusBottom = obj.bottomRadius,
             height = obj.height,
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeFactory.kt
index e231c4ce..c62abd77 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeFactory.kt
@@ -63,9 +63,7 @@ public fun Object3D.updateProperty(source: Vision, propertyName: Name) {
  * Generic factory for elements which provide inside geometry builder
  */
 public object ThreeShapeFactory : MeshThreeFactory<GeometrySolid>(GeometrySolid::class) {
-    override fun buildGeometry(obj: GeometrySolid): BufferGeometry {
-        return obj.run {
-            ThreeGeometryBuilder().apply { toGeometry(this) }.build()
-        }
-    }
+    override fun buildGeometry(obj: GeometrySolid): BufferGeometry = ThreeGeometryBuilder().apply {
+        obj.toGeometry(this)
+    }.build()
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt
index c1568ffd..4ba19cf9 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt
@@ -1,52 +1,61 @@
 package space.kscience.visionforge.solid.three
 
 import info.laht.threekt.core.BufferGeometry
-import info.laht.threekt.core.Face3
-import info.laht.threekt.core.Geometry
+import info.laht.threekt.core.Float32BufferAttribute
 import info.laht.threekt.math.Vector3
 import space.kscience.dataforge.meta.Meta
-import space.kscience.dataforge.meta.get
-import space.kscience.dataforge.meta.int
 import space.kscience.visionforge.solid.GeometryBuilder
 import space.kscience.visionforge.solid.Point3D
+import space.kscience.visionforge.solid.cross
+import space.kscience.visionforge.solid.minus
 
 internal fun Point3D.toVector() = Vector3(x, y, z)
 
+internal fun <T> MutableList<T>.add(f1: T, f2: T, f3: T) {
+    add(f1)
+    add(f2)
+    add(f3)
+}
+
 /**
  * An implementation of geometry builder for Three.js [BufferGeometry]
  */
 public class ThreeGeometryBuilder : GeometryBuilder<BufferGeometry> {
 
-    private val vertices = ArrayList<Vector3>()
-    private val faces = ArrayList<Face3>()
+    private val indices = ArrayList<Short>()
+    private val positions = ArrayList<Float>()
+    private val normals = ArrayList<Float>()
+    private val colors = ArrayList<Float>()
 
-    private val vertexCache = HashMap<Point3D, Int>()
+    private val vertexCache = HashMap<Point3D, Short>()
+    private var counter: Short = -1
 
-    private fun append(vertex: Point3D): Int {
-        val index = vertexCache[vertex] ?: -1//vertices.indexOf(vertex)
-        return if (index > 0) {
-            index
-        } else {
-            vertices.add(vertex.toVector())
-            vertexCache[vertex] = vertices.size - 1
-            vertices.size - 1
-        }
+    private fun indexOf(vertex: Point3D, normal: Point3D): Short = vertexCache.getOrPut(vertex) {
+        //add vertex and update cache if needed
+        positions.add(vertex.x, vertex.y, vertex.z)
+        normals.add(normal.x, vertex.y, vertex.z)
+        colors.add(1f, 1f, 1f)
+        counter++
+        counter
     }
 
     override fun face(vertex1: Point3D, vertex2: Point3D, vertex3: Point3D, normal: Point3D?, meta: Meta) {
-        val face = Face3(append(vertex1), append(vertex2), append(vertex3), normal?.toVector() ?: Vector3(0, 0, 0))
-        meta["materialIndex"].int?.let { face.materialIndex = it }
-        meta["color"]?.getColor()?.let { face.color = it }
-        faces.add(face)
+        val actualNormal: Point3D = normal ?: (vertex3 - vertex2) cross (vertex1 - vertex2)
+        indices.add(
+            indexOf(vertex1, actualNormal),
+            indexOf(vertex2, actualNormal),
+            indexOf(vertex3, actualNormal)
+        )
     }
 
 
-    override fun build(): BufferGeometry {
-        return Geometry().apply {
-            vertices = this@ThreeGeometryBuilder.vertices.toTypedArray()
-            faces = this@ThreeGeometryBuilder.faces.toTypedArray()
-            computeBoundingSphere()
-            computeFaceNormals()
-        }.toBufferGeometry()
+    override fun build(): BufferGeometry = BufferGeometry().apply {
+        //setIndex(Int16BufferAttribute(indices.toShortArray(), 1))
+        setIndex(indices.toTypedArray())
+        setAttribute("position", Float32BufferAttribute(positions.toFloatArray(), 3))
+        setAttribute("normal", Float32BufferAttribute(normals.toFloatArray(), 3))
+        //setAttribute("color", Float32BufferAttribute(colors.toFloatArray(), 3))
+
+        computeBoundingSphere()
     }
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeLineFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeLineFactory.kt
index cc9c58ce..b2858fdb 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeLineFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeLineFactory.kt
@@ -1,6 +1,6 @@
 package space.kscience.visionforge.solid.three
 
-import info.laht.threekt.core.Geometry
+import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.core.Object3D
 import info.laht.threekt.math.Color
 import info.laht.threekt.objects.LineSegments
@@ -16,8 +16,8 @@ public object ThreeLineFactory : ThreeFactory<PolyLine> {
     override val type: KClass<PolyLine> get() = PolyLine::class
 
     override fun invoke(three: ThreePlugin, obj: PolyLine): Object3D {
-        val geometry = Geometry().apply {
-            vertices = Array(obj.points.size) { obj.points[it].toVector() }
+        val geometry = BufferGeometry().apply {
+            setFromPoints(Array(obj.points.size) { obj.points[it].toVector() })
         }
 
         val material = ThreeMaterials.getLineMaterial(obj.getProperty(MeshThreeFactory.EDGES_MATERIAL_KEY).node, true)
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeSphereFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeSphereFactory.kt
index 8f117516..8932a6c8 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeSphereFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeSphereFactory.kt
@@ -1,14 +1,14 @@
 package space.kscience.visionforge.solid.three
 
 import info.laht.threekt.core.BufferGeometry
-import info.laht.threekt.geometries.SphereBufferGeometry
+import info.laht.threekt.geometries.SphereGeometry
 import space.kscience.visionforge.solid.Sphere
 import space.kscience.visionforge.solid.detail
 
 public object ThreeSphereFactory : MeshThreeFactory<Sphere>(Sphere::class) {
     override fun buildGeometry(obj: Sphere): BufferGeometry {
         return obj.detail?.let {detail ->
-            SphereBufferGeometry(
+            SphereGeometry(
                 radius = obj.radius,
                 phiStart = obj.phiStart,
                 phiLength = obj.phi,
@@ -17,7 +17,7 @@ public object ThreeSphereFactory : MeshThreeFactory<Sphere>(Sphere::class) {
                 widthSegments = detail,
                 heightSegments = detail
             )
-        }?: SphereBufferGeometry(
+        }?: SphereGeometry(
             radius = obj.radius,
             phiStart = obj.phiStart,
             phiLength = obj.phi,
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/csg.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/csg.kt
index af99f66e..d7b0d46b 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/csg.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/csg.kt
@@ -1,28 +1,34 @@
-@file:Suppress("INTERFACE_WITH_SUPERCLASS",
+@file:Suppress(
+    "INTERFACE_WITH_SUPERCLASS",
     "OVERRIDING_FINAL_MEMBER",
     "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
     "CONFLICTING_OVERLOADS",
-    "EXTERNAL_DELEGATION")
+    "EXTERNAL_DELEGATION"
+)
 
 @file:JsModule("three-csg-ts")
 @file:JsNonModule
 
+import info.laht.threekt.core.BufferGeometry
 import info.laht.threekt.math.Matrix4
 import info.laht.threekt.math.Vector3
 import info.laht.threekt.objects.Mesh
 
-external open class CSG {
-    open fun clone(): CSG
-    open fun toPolygons(): Array<Polygon>
-    open fun union(csg: CSG): CSG
-    open fun subtract(csg: CSG): CSG
-    open fun intersect(csg: CSG): CSG
-    open fun inverse(): CSG
+external class CSG {
+    fun clone(): CSG
+    fun toPolygons(): Array<Polygon>
+    fun toGeometry(toMatrix: Matrix4): BufferGeometry
+    fun union(csg: CSG): CSG
+    fun subtract(csg: CSG): CSG
+    fun intersect(csg: CSG): CSG
+    fun inverse(): CSG
+
 
     companion object {
         fun fromPolygons(polygons: Array<Polygon>): CSG
-        fun fromGeometry(geom: Any): CSG
-        fun fromMesh(mesh: Mesh): CSG
+        fun fromGeometry(geom: BufferGeometry, objectIndex: dynamic = definedExternally): CSG
+        fun fromMesh(mesh: Mesh, objectIndex: dynamic = definedExternally): CSG
+        fun toGeometry(csg: CSG, toMatrix: Matrix4): BufferGeometry
         fun toMesh(csg: CSG, toMatrix: Matrix4): Mesh
         fun iEval(tokens: Mesh, index: Number? = definedExternally)
         fun eval(tokens: Mesh, doRemove: Boolean): Mesh
@@ -35,15 +41,15 @@ external open class CSG {
     }
 }
 
-external open class Vector(x: Number, y: Number, z: Number) : Vector3 {
-    open fun negated(): Vector
-    open fun plus(a: Vector): Vector
-    open fun minus(a: Vector): Vector
-    open fun times(a: Number): Vector
-    open fun dividedBy(a: Number): Vector
-    open fun lerp(a: Vector, t: Number): Any
-    open fun unit(): Vector
-    open fun cross(a: Vector): Any
+external class Vector(x: Number, y: Number, z: Number) : Vector3 {
+    fun negated(): Vector
+    fun plus(a: Vector): Vector
+    fun minus(a: Vector): Vector
+    fun times(a: Number): Vector
+    fun dividedBy(a: Number): Vector
+    fun lerp(a: Vector, t: Number): Any
+    fun unit(): Vector
+    fun cross(a: Vector): Any
 }
 
 external interface IVector {
@@ -52,21 +58,21 @@ external interface IVector {
     var z: Number
 }
 
-external open class Vertex(pos: IVector, normal: IVector, uv: IVector? = definedExternally) {
-    open var pos: Vector
-    open var normal: Vector
-    open var uv: Vector
-    open fun clone(): Vertex
-    open fun flip()
-    open fun interpolate(other: Vertex, t: Number): Vertex
+external class Vertex(pos: IVector, normal: IVector, uv: IVector? = definedExternally) {
+    var pos: Vector
+    var normal: Vector
+    var uv: Vector
+    fun clone(): Vertex
+    fun flip()
+    fun interpolate(other: Vertex, t: Number): Vertex
 }
 
-external open class Plane(normal: Vector, w: Number) {
-    open var normal: Vector
-    open var w: Number
-    open fun clone(): Plane
-    open fun flip()
-    open fun splitPolygon(
+external class Plane(normal: Vector, w: Number) {
+    var normal: Vector
+    var w: Number
+    fun clone(): Plane
+    fun flip()
+    fun splitPolygon(
         polygon: Polygon,
         coplanarFront: Array<Polygon>,
         coplanarBack: Array<Polygon>,
@@ -80,10 +86,10 @@ external open class Plane(normal: Vector, w: Number) {
     }
 }
 
-external open class Polygon(vertices: Array<Vertex>, shared: Any? = definedExternally) {
-    open var plane: Plane
-    open var vertices: Array<Vertex>
-    open var shared: Any
-    open fun clone(): Polygon
-    open fun flip()
+external class Polygon(vertices: Array<Vertex>, shared: Any? = definedExternally) {
+    var plane: Plane
+    var vertices: Array<Vertex>
+    var shared: Any
+    fun clone(): Polygon
+    fun flip()
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/three.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/three.kt
index fa13e91d..9e78800b 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/three.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/three.kt
@@ -1,7 +1,7 @@
 package space.kscience.visionforge.solid.three
 
-import CSG
-import info.laht.threekt.core.*
+import info.laht.threekt.core.BufferGeometry
+import info.laht.threekt.core.Layers
 import info.laht.threekt.external.controls.OrbitControls
 import info.laht.threekt.materials.Material
 import info.laht.threekt.math.Euler
@@ -19,53 +19,13 @@ public val Solid.euler: Euler get() = Euler(rotationX, rotationY, rotationZ, rot
 
 public val MetaItem.vector: Vector3 get() = Vector3(node["x"].float ?: 0f, node["y"].float ?: 0f, node["z"].float ?: 0f)
 
-public fun Geometry.toBufferGeometry(): BufferGeometry = BufferGeometry().apply { fromGeometry(this@toBufferGeometry) }
 
 internal fun Double.toRadians() = this * PI / 180
 
-public fun CSG.toGeometry(): Geometry {
-    val geom = Geometry()
-
-    val vertices = ArrayList<Vector3>()
-    val faces = ArrayList<Face3>()
-
-    for (polygon in toPolygons()) {
-        val v0 = vertices.size
-        val pvs = polygon.vertices
-
-        for (pv in pvs) {
-            vertices.add(Vector3().copy(pv.pos))
-        }
-
-        for (j in 3..polygon.vertices.size) {
-            val fc = Face3(v0, v0 + j - 2, v0 + j - 1, Vector3())
-            fc.vertexNormals = arrayOf(
-                Vector3().copy(pvs[0].normal),
-                Vector3().copy(pvs[j - 2].normal),
-                Vector3().copy(pvs[j - 1].normal)
-            )
-
-            fc.normal = Vector3().copy(polygon.plane.normal)
-            faces.add(fc)
-        }
-    }
-    geom.vertices = vertices.toTypedArray()
-    geom.faces = faces.toTypedArray()
-//    val inv: Matrix4 = Matrix4().apply { getInverse(toMatrix) }
-//    geom.applyMatrix(toMatrix)
-    geom.verticesNeedUpdate = true
-    geom.elementsNeedUpdate = true
-    geom.normalsNeedUpdate = true
-    geom.computeBoundingSphere()
-    geom.computeBoundingBox()
-    return geom
-}
 
 internal fun Any.dispose() {
     when (this) {
-        is Geometry -> dispose()
         is BufferGeometry -> dispose()
-        is DirectGeometry -> dispose()
         is Material -> dispose()
         is Mesh -> {
             geometry.dispose()

From c82c0ecea3b6f9fb17d7a86b9d4a39ee9952b7f7 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 10 Jul 2021 17:37:56 +0300
Subject: [PATCH 133/151] Refactor to ThreeJS v 130

---
 .../info/laht/threekt/core/BufferAttribute.kt |  2 +-
 .../kotlin/info/laht/threekt/objects/Mesh.kt  |  2 +-
 .../solid/three/MeshThreeFactory.kt           |  3 +-
 .../solid/three/ThreeCompositeFactory.kt      | 58 ++++++++++++++-----
 .../solid/three/ThreeGeometryBuilder.kt       |  4 +-
 .../kscience/visionforge/solid/three/csg.kt   |  9 +--
 6 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferAttribute.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferAttribute.kt
index 938deb7e..6a773330 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferAttribute.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/core/BufferAttribute.kt
@@ -223,7 +223,7 @@ abstract external class BufferAttribute protected constructor(
 
 
 external class Float32BufferAttribute(
-    array: FloatArray,
+    array: Array<Float>,
     itemSize: Int,
     normalized: Boolean = definedExternally
 ) : BufferAttribute
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Mesh.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Mesh.kt
index 54669b1f..fc91e333 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Mesh.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/objects/Mesh.kt
@@ -36,7 +36,7 @@ import info.laht.threekt.materials.Material
 
 open external class Mesh(geometry: BufferGeometry?, material: Material?) : Object3D {
 
-    var geometry: dynamic
+    var geometry: BufferGeometry
     var material: Material
 
     var drawMode: Int
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/MeshThreeFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/MeshThreeFactory.kt
index 00313d3a..14665a8b 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/MeshThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/MeshThreeFactory.kt
@@ -36,7 +36,8 @@ public abstract class MeshThreeFactory<in T : Solid>(
             matrixAutoUpdate = false
             //set position for mesh
             updatePosition(obj)
-        }.applyProperties(obj)
+            applyProperties(obj)
+        }
 
         //add listener to object properties
         obj.onPropertyChange(three.updateScope) { name ->
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCompositeFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCompositeFactory.kt
index 270e63a6..33304b72 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCompositeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCompositeFactory.kt
@@ -1,30 +1,60 @@
 package space.kscience.visionforge.solid.three
 
 import CSG
-import info.laht.threekt.core.BufferGeometry
-import info.laht.threekt.math.Matrix4
+import info.laht.threekt.core.Object3D
 import info.laht.threekt.objects.Mesh
+import space.kscience.dataforge.names.startsWith
+import space.kscience.visionforge.onPropertyChange
 import space.kscience.visionforge.solid.Composite
 import space.kscience.visionforge.solid.CompositeType
+import kotlin.reflect.KClass
 
 /**
  * This should be inner, because it uses object builder
  */
-public class ThreeCompositeFactory(public val three: ThreePlugin) : MeshThreeFactory<Composite>(Composite::class) {
+public class ThreeCompositeFactory(public val three: ThreePlugin) : ThreeFactory<Composite> {
 
-    override fun buildGeometry(obj: Composite): BufferGeometry {
+//    override fun buildGeometry(obj: Composite): BufferGeometry {
+//        val first = three.buildObject3D(obj.first) as? Mesh ?: error("First part of composite is not a mesh")
+//        //first.updateMatrix()
+//        val second = three.buildObject3D(obj.second) as? Mesh ?: error("Second part of composite is not a mesh")
+//        //second.updateMatrix()
+//        val firstCSG = CSG.fromMesh(first)
+//        val secondCSG = CSG.fromMesh(second)
+////        val resultCSG = when (obj.compositeType) {
+////            CompositeType.UNION -> firstCSG.union(secondCSG)
+////            CompositeType.INTERSECT -> firstCSG.intersect(secondCSG)
+////            CompositeType.SUBTRACT -> firstCSG.subtract(secondCSG)
+////        }
+////        return resultCSG.toGeometry(second.matrix)
+//
+//        val resultMesh: Mesh = when (obj.compositeType) {
+//            CompositeType.UNION -> CSG.union(first,second)
+//            CompositeType.INTERSECT -> CSG.intersect(first,second)
+//            CompositeType.SUBTRACT -> CSG.subtract(first,second)
+//        }
+//        return resultMesh.geometry
+//    }
+
+    override val type: KClass<in Composite> get() = Composite::class
+
+    override fun invoke(three: ThreePlugin, obj: Composite): Object3D {
         val first = three.buildObject3D(obj.first) as? Mesh ?: error("First part of composite is not a mesh")
-        first.updateMatrix()
         val second = three.buildObject3D(obj.second) as? Mesh ?: error("Second part of composite is not a mesh")
-        second.updateMatrix()
-        val firstCSG = CSG.fromMesh(first)
-        val secondCSG = CSG.fromMesh(second)
-        val resultCSG = when (obj.compositeType) {
-            CompositeType.UNION -> firstCSG.union(secondCSG)
-            CompositeType.INTERSECT -> firstCSG.intersect(secondCSG)
-            CompositeType.SUBTRACT -> firstCSG.subtract(secondCSG)
+        return when (obj.compositeType) {
+            CompositeType.UNION -> CSG.union(first,second)
+            CompositeType.INTERSECT -> CSG.intersect(first,second)
+            CompositeType.SUBTRACT -> CSG.subtract(first,second)
+        }.apply {
+            updatePosition(obj)
+            applyProperties(obj)
+            obj.onPropertyChange(three.updateScope) { name ->
+                when {
+                    //name.startsWith(WIREFRAME_KEY) -> mesh.applyWireFrame(obj)
+                    name.startsWith(MeshThreeFactory.EDGES_KEY) -> applyEdges(obj)
+                    else -> updateProperty(obj, name)
+                }
+            }
         }
-        return resultCSG.toGeometry(Matrix4())
     }
-
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt
index 4ba19cf9..d2a79ef5 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt
@@ -52,8 +52,8 @@ public class ThreeGeometryBuilder : GeometryBuilder<BufferGeometry> {
     override fun build(): BufferGeometry = BufferGeometry().apply {
         //setIndex(Int16BufferAttribute(indices.toShortArray(), 1))
         setIndex(indices.toTypedArray())
-        setAttribute("position", Float32BufferAttribute(positions.toFloatArray(), 3))
-        setAttribute("normal", Float32BufferAttribute(normals.toFloatArray(), 3))
+        setAttribute("position", Float32BufferAttribute(positions.toTypedArray(), 3))
+        setAttribute("normal", Float32BufferAttribute(normals.toTypedArray(), 3))
         //setAttribute("color", Float32BufferAttribute(colors.toFloatArray(), 3))
 
         computeBoundingSphere()
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/csg.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/csg.kt
index d7b0d46b..2bee0a7a 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/csg.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/csg.kt
@@ -32,12 +32,9 @@ external class CSG {
         fun toMesh(csg: CSG, toMatrix: Matrix4): Mesh
         fun iEval(tokens: Mesh, index: Number? = definedExternally)
         fun eval(tokens: Mesh, doRemove: Boolean): Mesh
-        var _tmpm3: Any
-        var doRemove: Any
-        var currentOp: Any
-        var currentPrim: Any
-        var nextPrim: Any
-        var sourceMesh: Any
+        fun union(meshA: Mesh, meshB: Mesh): Mesh
+        fun subtract(meshA: Mesh, meshB: Mesh): Mesh
+        fun intersect(meshA: Mesh, meshB: Mesh): Mesh
     }
 }
 

From ba637413c770910060202e03a557d5a22ddccd2e Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 11 Jul 2021 09:58:01 +0300
Subject: [PATCH 134/151] Workaround for csg uv bug

---
 .../src/main/kotlin/JsPlaygroundApp.kt        |  7 +++---
 .../src/main/resources/index.html             |  3 ++-
 .../playground/src/jvmMain/kotlin/gdmlIaxo.kt |  3 +--
 .../main/kotlin/info/laht/threekt/THREE.kt    |  1 +
 .../solid/three/ThreeGeometryBuilder.kt       | 24 ++++++++++---------
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/demo/js-playground/src/main/kotlin/JsPlaygroundApp.kt b/demo/js-playground/src/main/kotlin/JsPlaygroundApp.kt
index b43ce062..edf159cd 100644
--- a/demo/js-playground/src/main/kotlin/JsPlaygroundApp.kt
+++ b/demo/js-playground/src/main/kotlin/JsPlaygroundApp.kt
@@ -1,7 +1,6 @@
 import kotlinx.browser.document
 import kotlinx.css.height
-import kotlinx.css.vh
-import kotlinx.css.vw
+import kotlinx.css.pct
 import kotlinx.css.width
 import react.child
 import react.dom.render
@@ -32,8 +31,8 @@ private class JsPlaygroundApp : Application {
         render(element) {
             styledDiv {
                 css{
-                    height = 100.vh
-                    width = 100.vw
+                    height = 100.pct
+                    width = 100.pct
                 }
                 child(ThreeCanvasWithControls) {
                     attrs {
diff --git a/demo/js-playground/src/main/resources/index.html b/demo/js-playground/src/main/resources/index.html
index 7a777ef1..83a9016e 100644
--- a/demo/js-playground/src/main/resources/index.html
+++ b/demo/js-playground/src/main/resources/index.html
@@ -2,10 +2,11 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>js-playground</title>
     <script src="js-playground.js"></script>
 </head>
-<body>
+<body class="application">
 <div id="playground"></div>
 </body>
 </html>
\ No newline at end of file
diff --git a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
index fc2ebce3..a9070af7 100644
--- a/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
+++ b/demo/playground/src/jvmMain/kotlin/gdmlIaxo.kt
@@ -3,7 +3,6 @@ package space.kscience.visionforge.examples
 import space.kscience.dataforge.context.Context
 import space.kscience.gdml.GdmlShowCase
 import space.kscience.visionforge.gdml.toVision
-import space.kscience.visionforge.html.ResourceLocation
 import space.kscience.visionforge.solid.Solids
 
 fun main() {
@@ -11,7 +10,7 @@ fun main() {
         plugin(Solids)
     }
 
-    context.makeVisionFile(resourceLocation = ResourceLocation.EMBED) {
+    context.makeVisionFile {
         vision("canvas") { GdmlShowCase.babyIaxo().toVision() }
     }
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/THREE.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/THREE.kt
index d3844561..3f8028cb 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/THREE.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/THREE.kt
@@ -24,6 +24,7 @@
 
 @file:JsModule("three")
 @file:JsNonModule
+@file:Suppress("NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING", "unused")
 
 package info.laht.threekt
 
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt
index d2a79ef5..c1c5aa72 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt
@@ -11,10 +11,10 @@ import space.kscience.visionforge.solid.minus
 
 internal fun Point3D.toVector() = Vector3(x, y, z)
 
-internal fun <T> MutableList<T>.add(f1: T, f2: T, f3: T) {
-    add(f1)
-    add(f2)
-    add(f3)
+internal fun <T> MutableList<T>.add(vararg values: T) {
+    values.forEach {
+        add(it)
+    }
 }
 
 /**
@@ -25,16 +25,16 @@ public class ThreeGeometryBuilder : GeometryBuilder<BufferGeometry> {
     private val indices = ArrayList<Short>()
     private val positions = ArrayList<Float>()
     private val normals = ArrayList<Float>()
-    private val colors = ArrayList<Float>()
+//    private val colors = ArrayList<Float>()
 
     private val vertexCache = HashMap<Point3D, Short>()
     private var counter: Short = -1
 
-    private fun indexOf(vertex: Point3D, normal: Point3D): Short = vertexCache.getOrPut(vertex) {
+    private fun vertex(vertex: Point3D, normal: Point3D): Short = vertexCache.getOrPut(vertex) {
         //add vertex and update cache if needed
         positions.add(vertex.x, vertex.y, vertex.z)
         normals.add(normal.x, vertex.y, vertex.z)
-        colors.add(1f, 1f, 1f)
+        //colors.add(1f, 1f, 1f)
         counter++
         counter
     }
@@ -42,19 +42,21 @@ public class ThreeGeometryBuilder : GeometryBuilder<BufferGeometry> {
     override fun face(vertex1: Point3D, vertex2: Point3D, vertex3: Point3D, normal: Point3D?, meta: Meta) {
         val actualNormal: Point3D = normal ?: (vertex3 - vertex2) cross (vertex1 - vertex2)
         indices.add(
-            indexOf(vertex1, actualNormal),
-            indexOf(vertex2, actualNormal),
-            indexOf(vertex3, actualNormal)
+            vertex(vertex1, actualNormal),
+            vertex(vertex2, actualNormal),
+            vertex(vertex3, actualNormal)
         )
     }
 
 
     override fun build(): BufferGeometry = BufferGeometry().apply {
-        //setIndex(Int16BufferAttribute(indices.toShortArray(), 1))
         setIndex(indices.toTypedArray())
         setAttribute("position", Float32BufferAttribute(positions.toTypedArray(), 3))
         setAttribute("normal", Float32BufferAttribute(normals.toTypedArray(), 3))
         //setAttribute("color", Float32BufferAttribute(colors.toFloatArray(), 3))
+        //a temporary fix for CSG problem
+        val uvsArray = Array<Float>((counter+1)*2){0f}
+        setAttribute("uv", Float32BufferAttribute(uvsArray, 2))
 
         computeBoundingSphere()
     }

From 2b6942b827f055df13709aa280185b81dd675594 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 11 Jul 2021 12:07:04 +0300
Subject: [PATCH 135/151] Reimplemented coordinates as properties

---
 .../src/main/kotlin/JsPlaygroundApp.kt        |  10 +-
 .../visionforge/gdml/GdmlOptimizer.kt         |  18 +--
 .../space/kscience/visionforge/solid/Solid.kt | 139 +++++++-----------
 .../kscience/visionforge/solid/SolidBase.kt   |   6 +-
 .../kscience/visionforge/solid/SolidGroup.kt  |   6 +-
 .../visionforge/solid/SolidReference.kt       |  32 ++--
 .../kscience/visionforge/solid/geometry.kt    |  67 ++++++---
 .../solid/transform/RemoveSingleChild.kt      |  20 +--
 .../laht/threekt/animation/AnimationAction.kt |   1 +
 9 files changed, 142 insertions(+), 157 deletions(-)

diff --git a/demo/js-playground/src/main/kotlin/JsPlaygroundApp.kt b/demo/js-playground/src/main/kotlin/JsPlaygroundApp.kt
index edf159cd..ec28649c 100644
--- a/demo/js-playground/src/main/kotlin/JsPlaygroundApp.kt
+++ b/demo/js-playground/src/main/kotlin/JsPlaygroundApp.kt
@@ -1,7 +1,5 @@
 import kotlinx.browser.document
-import kotlinx.css.height
-import kotlinx.css.pct
-import kotlinx.css.width
+import kotlinx.css.*
 import react.child
 import react.dom.render
 import space.kscience.dataforge.context.Context
@@ -31,8 +29,10 @@ private class JsPlaygroundApp : Application {
         render(element) {
             styledDiv {
                 css{
-                    height = 100.pct
-                    width = 100.pct
+                    padding(0.pt)
+                    margin(0.pt)
+                    height = 100.vh
+                    width = 100.vw
                 }
                 child(ThreeCanvasWithControls) {
                     attrs {
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlOptimizer.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlOptimizer.kt
index a35e845c..b2075e3a 100644
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlOptimizer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlOptimizer.kt
@@ -11,22 +11,14 @@ public expect class Counter() {
     public fun incrementAndGet(): Int
 }
 
-private fun Point3D?.safePlus(other: Point3D?): Point3D? = if (this == null && other == null) {
-    null
-} else {
-    (this ?: Point3D(0, 0, 0)) + (other ?: Point3D(0, 0, 0))
-}
-
 @DFExperimental
 internal fun Vision.updateFrom(other: Vision): Vision {
     if (this is Solid && other is Solid) {
-        position = position.safePlus(other.position)
-        rotation = rotation.safePlus(other.rotation)
-        if (this.scale != null || other.scale != null) {
-            scaleX = scaleX.toDouble() * other.scaleX.toDouble()
-            scaleY = scaleY.toDouble() * other.scaleY.toDouble()
-            scaleZ = scaleZ.toDouble() * other.scaleZ.toDouble()
-        }
+        position += other.position
+        rotation += other.rotation
+        scaleX = scaleX.toDouble() * other.scaleX.toDouble()
+        scaleY = scaleY.toDouble() * other.scaleY.toDouble()
+        scaleZ = scaleZ.toDouble() * other.scaleZ.toDouble()
         other.meta.itemSequence().forEach { (name, item) ->
             if (getProperty(name) == null) {
                 setProperty(name, item)
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
index 9855c835..f2b14f2a 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
@@ -1,9 +1,7 @@
 package space.kscience.visionforge.solid
 
-import space.kscience.dataforge.meta.boolean
+import space.kscience.dataforge.meta.*
 import space.kscience.dataforge.meta.descriptors.NodeDescriptor
-import space.kscience.dataforge.meta.enum
-import space.kscience.dataforge.meta.int
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.asName
 import space.kscience.dataforge.names.plus
@@ -14,15 +12,28 @@ import space.kscience.visionforge.Vision.Companion.VISIBLE_KEY
 import space.kscience.visionforge.solid.Solid.Companion.DETAIL_KEY
 import space.kscience.visionforge.solid.Solid.Companion.IGNORE_KEY
 import space.kscience.visionforge.solid.Solid.Companion.LAYER_KEY
+import space.kscience.visionforge.solid.Solid.Companion.POSITION_KEY
+import space.kscience.visionforge.solid.Solid.Companion.ROTATION_KEY
+import space.kscience.visionforge.solid.Solid.Companion.SCALE_KEY
+import space.kscience.visionforge.solid.Solid.Companion.X_KEY
+import space.kscience.visionforge.solid.Solid.Companion.X_POSITION_KEY
+import space.kscience.visionforge.solid.Solid.Companion.X_ROTATION_KEY
+import space.kscience.visionforge.solid.Solid.Companion.X_SCALE_KEY
+import space.kscience.visionforge.solid.Solid.Companion.Y_KEY
+import space.kscience.visionforge.solid.Solid.Companion.Y_POSITION_KEY
+import space.kscience.visionforge.solid.Solid.Companion.Y_ROTATION_KEY
+import space.kscience.visionforge.solid.Solid.Companion.Y_SCALE_KEY
+import space.kscience.visionforge.solid.Solid.Companion.Z_KEY
+import space.kscience.visionforge.solid.Solid.Companion.Z_POSITION_KEY
+import space.kscience.visionforge.solid.Solid.Companion.Z_ROTATION_KEY
+import space.kscience.visionforge.solid.Solid.Companion.Z_SCALE_KEY
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
 
 /**
  * Interface for 3-dimensional [Vision]
  */
 public interface Solid : Vision {
-    public var position: Point3D?
-    public var rotation: Point3D?
-    public var scale: Point3D?
-
     override val descriptor: NodeDescriptor get() = Companion.descriptor
 
     public companion object {
@@ -72,7 +83,7 @@ public interface Solid : Vision {
                     hide()
                 }
 
-                value(DETAIL_KEY){
+                value(DETAIL_KEY) {
                     type(ValueType.NUMBER)
                     hide()
                 }
@@ -84,22 +95,6 @@ public interface Solid : Vision {
                 }
             }
         }
-
-        internal fun solidEquals(first: Solid, second: Solid): Boolean {
-            if (first.position != second.position) return false
-            if (first.rotation != second.rotation) return false
-            if (first.scale != second.scale) return false
-            if (first.meta != second.meta) return false
-            return true
-        }
-
-        internal fun solidHashCode(solid: Solid): Int {
-            var result = +(solid.position?.hashCode() ?: 0)
-            result = 31 * result + (solid.rotation?.hashCode() ?: 0)
-            result = 31 * result + (solid.scale?.hashCode() ?: 0)
-            result = 31 * result + solid.allProperties().hashCode()
-            return result
-        }
     }
 }
 
@@ -150,74 +145,44 @@ public var Vision.ignore: Boolean?
 //    get() = getProperty(SELECTED_KEY).boolean
 //    set(value) = setProperty(SELECTED_KEY, value)
 
-private fun Solid.position(): Point3D =
-    position ?: Point3D(0.0, 0.0, 0.0).also { position = it }
+internal fun number(name: Name, default: Number): ReadWriteProperty<Solid, Number> =
+    object : ReadWriteProperty<Solid, Number> {
+        override fun getValue(thisRef: Solid, property: KProperty<*>): Number {
+            return thisRef.getOwnProperty(name)?.number ?: default
+        }
 
-public var Solid.x: Number
-    get() = position?.x ?: 0f
-    set(value) {
-        position().x = value.toFloat()
-        invalidateProperty(Solid.X_POSITION_KEY)
+        override fun setValue(thisRef: Solid, property: KProperty<*>, value: Number) {
+            thisRef.setProperty(name, value)
+        }
     }
 
-public var Solid.y: Number
-    get() = position?.y ?: 0f
-    set(value) {
-        position().y = value.toFloat()
-        invalidateProperty(Solid.Y_POSITION_KEY)
+internal fun point(name: Name, default: Float): ReadWriteProperty<Solid, Point3D> =
+    object : ReadWriteProperty<Solid, Point3D> {
+        override fun getValue(thisRef: Solid, property: KProperty<*>): Point3D = object : Point3D {
+            override val x: Float get() = thisRef.getOwnProperty(name + X_KEY)?.float ?: default
+            override val y: Float get() = thisRef.getOwnProperty(name + Y_KEY)?.float ?: default
+            override val z: Float get() = thisRef.getOwnProperty(name + Z_KEY)?.float ?: default
+        }
+
+        override fun setValue(thisRef: Solid, property: KProperty<*>, value: Point3D) {
+            thisRef.setProperty(name + X_KEY, value.x)
+            thisRef.setProperty(name + Y_KEY, value.y)
+            thisRef.setProperty(name + Z_KEY, value.z)
+        }
     }
 
-public var Solid.z: Number
-    get() = position?.z ?: 0f
-    set(value) {
-        position().z = value.toFloat()
-        invalidateProperty(Solid.Z_POSITION_KEY)
-    }
+public var Solid.position: Point3D by point(POSITION_KEY, 0f)
+public var Solid.rotation: Point3D by point(ROTATION_KEY, 0f)
+public var Solid.scale: Point3D by point(SCALE_KEY, 1f)
 
-private fun Solid.rotation(): Point3D =
-    rotation ?: Point3D(0.0, 0.0, 0.0).also { rotation = it }
+public var Solid.x: Number by number(X_POSITION_KEY, 0f)
+public var Solid.y: Number by number(Y_POSITION_KEY, 0f)
+public var Solid.z: Number by number(Z_POSITION_KEY, 0f)
 
-public var Solid.rotationX: Number
-    get() = rotation?.x ?: 0f
-    set(value) {
-        rotation().x = value.toFloat()
-        invalidateProperty(Solid.X_ROTATION_KEY)
-    }
+public var Solid.rotationX: Number by number(X_ROTATION_KEY, 0f)
+public var Solid.rotationY: Number by number(Y_ROTATION_KEY, 0f)
+public var Solid.rotationZ: Number by number(Z_ROTATION_KEY, 0f)
 
-public var Solid.rotationY: Number
-    get() = rotation?.y ?: 0f
-    set(value) {
-        rotation().y = value.toFloat()
-        invalidateProperty(Solid.Y_ROTATION_KEY)
-    }
-
-public var Solid.rotationZ: Number
-    get() = rotation?.z ?: 0f
-    set(value) {
-        rotation().z = value.toFloat()
-        invalidateProperty(Solid.Z_ROTATION_KEY)
-    }
-
-private fun Solid.scale(): Point3D =
-    scale ?: Point3D(1.0, 1.0, 1.0).also { scale = it }
-
-public var Solid.scaleX: Number
-    get() = scale?.x ?: 1f
-    set(value) {
-        scale().x = value.toFloat()
-        invalidateProperty(Solid.X_SCALE_KEY)
-    }
-
-public var Solid.scaleY: Number
-    get() = scale?.y ?: 1f
-    set(value) {
-        scale().y = value.toFloat()
-        invalidateProperty(Solid.Y_SCALE_KEY)
-    }
-
-public var Solid.scaleZ: Number
-    get() = scale?.z ?: 1f
-    set(value) {
-        scale().z = value.toFloat()
-        invalidateProperty(Solid.Z_SCALE_KEY)
-    }
\ No newline at end of file
+public var Solid.scaleX: Number by number(X_SCALE_KEY, 1f)
+public var Solid.scaleY: Number by number(Y_SCALE_KEY, 1f)
+public var Solid.scaleZ: Number by number(Z_SCALE_KEY, 1f)
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt
index e69f729c..1f86bdb3 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt
@@ -13,9 +13,9 @@ import space.kscience.visionforge.VisionChange
 @Serializable
 @SerialName("solid")
 public open class SolidBase(
-    override var position: Point3D? = null,
-    override var rotation: Point3D? = null,
-    override var scale: Point3D? = null,
+//    override var position: Point3D? = null,
+//    override var rotation: Point3D? = null,
+//    override var scale: Point3D? = null,
 ) : VisionBase(), Solid {
     override val descriptor: NodeDescriptor get() = Solid.descriptor
 
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
index 20ca8afc..ad2107f0 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
@@ -29,9 +29,9 @@ public interface PrototypeHolder {
 @SerialName("group.solid")
 public class SolidGroup(
     @Serializable(PrototypeSerializer::class) internal var prototypes: MutableVisionGroup? = null,
-    override var position: Point3D? = null,
-    override var rotation: Point3D? = null,
-    override var scale: Point3D? = null,
+//    override var position: Point3D? = null,
+//    override var rotation: Point3D? = null,
+//    override var scale: Point3D? = null,
 ) : VisionGroupBase(), Solid, PrototypeHolder {
 
     init {
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
index 17ee9141..3d067a62 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
@@ -96,22 +96,22 @@ public class SolidReferenceGroup(
      */
     private inner class ReferenceChild(private val childName: Name) : SolidReference, VisionGroup {
 
-        //TODO replace by properties
-        override var position: Point3D?
-            get() = prototype.position
-            set(_) {
-                error("Can't set position of reference")
-            }
-        override var rotation: Point3D?
-            get() = prototype.rotation
-            set(_) {
-                error("Can't set position of reference")
-            }
-        override var scale: Point3D?
-            get() = prototype.scale
-            set(_) {
-                error("Can't set position of reference")
-            }
+//        //TODO replace by properties
+//        override var position: Point3D?
+//            get() = prototype.position
+//            set(_) {
+//                error("Can't set position of reference")
+//            }
+//        override var rotation: Point3D?
+//            get() = prototype.rotation
+//            set(_) {
+//                error("Can't set position of reference")
+//            }
+//        override var scale: Point3D?
+//            get() = prototype.scale
+//            set(_) {
+//                error("Can't set position of reference")
+//            }
         override val prototype: Solid get() = prototypeFor(childName)
 
         override val children: Map<NameToken, Vision>
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/geometry.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/geometry.kt
index 28a90398..e8813779 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/geometry.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/geometry.kt
@@ -1,10 +1,14 @@
 package space.kscience.visionforge.solid
 
+import kotlinx.serialization.KSerializer
 import kotlinx.serialization.Serializable
-import space.kscience.dataforge.meta.Meta
-import space.kscience.dataforge.meta.MetaBuilder
-import space.kscience.dataforge.meta.float
-import space.kscience.dataforge.meta.get
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import space.kscience.dataforge.meta.*
+import space.kscience.visionforge.solid.Solid.Companion.X_KEY
+import space.kscience.visionforge.solid.Solid.Companion.Y_KEY
+import space.kscience.visionforge.solid.Solid.Companion.Z_KEY
 import kotlin.math.PI
 import kotlin.math.pow
 import kotlin.math.sqrt
@@ -17,25 +21,48 @@ public data class Point2D(public var x: Float, public var y: Float)
 public fun Point2D(x: Number, y: Number): Point2D = Point2D(x.toFloat(), y.toFloat())
 
 public fun Point2D.toMeta(): Meta = Meta {
-    Solid.X_KEY put x
-    Solid.Y_KEY put y
+    X_KEY put x
+    Y_KEY put y
 }
 
 internal fun Meta.point2D(): Point2D = Point2D(this["x"].float ?: 0f, this["y"].float ?: 0f)
 
-@Serializable
-public data class Point3D(
-    public var x: Float,
-    public var y: Float,
-    public var z: Float,
-) {
+@Serializable(Point3DSerializer::class)
+public interface Point3D {
+    public val x: Float
+    public val y: Float
+    public val z: Float
+
     public companion object {
         public val ZERO: Point3D = Point3D(0.0, 0.0, 0.0)
         public val ONE: Point3D = Point3D(1.0, 1.0, 1.0)
     }
 }
 
-public fun Point3D(x: Number, y: Number, z: Number): Point3D = Point3D(x.toFloat(), y.toFloat(), z.toFloat())
+@Serializable(Point3DSerializer::class)
+public interface MutablePoint3D : Point3D {
+    override var x: Float
+    override var y: Float
+    override var z: Float
+}
+
+@Serializable
+private class Point3DImpl(override var x: Float, override var y: Float, override var z: Float) : MutablePoint3D
+
+internal object Point3DSerializer : KSerializer<Point3D> {
+
+    override val descriptor: SerialDescriptor = Point3DImpl.serializer().descriptor
+
+
+    override fun deserialize(decoder: Decoder): Point3D = decoder.decodeSerializableValue(Point3DImpl.serializer())
+
+    override fun serialize(encoder: Encoder, value: Point3D) {
+        val impl: Point3DImpl = (value as? Point3DImpl) ?: Point3DImpl(value.x, value.y, value.z)
+        encoder.encodeSerializableValue(Point3DImpl.serializer(), impl)
+    }
+}
+
+public fun Point3D(x: Number, y: Number, z: Number): Point3D = Point3DImpl(x.toFloat(), y.toFloat(), z.toFloat())
 
 public operator fun Point3D.plus(other: Point3D): Point3D = Point3D(
     this.x + other.x,
@@ -61,17 +88,21 @@ public infix fun Point3D.cross(other: Point3D): Point3D = Point3D(
     x * other.y - y * other.x
 )
 
-public fun Point3D.normalizeInPlace(){
+public fun MutablePoint3D.normalizeInPlace() {
     val norm = sqrt(x.pow(2) + y.pow(2) + z.pow(2))
     x /= norm
     y /= norm
     z /= norm
 }
 
-internal fun Meta.point3D() = Point3D(this["x"].float ?: 0.0, this["y"].float ?: 0.0, this["y"].float ?: 0.0)
+internal fun ItemProvider.point3D(default: Float = 0f) = object : Point3D {
+    override val x: Float by float(default)
+    override val y: Float by float(default)
+    override val z: Float by float(default)
+}
 
 public fun Point3D.toMeta(): MetaBuilder = Meta {
-    Solid.X_KEY put x
-    Solid.Y_KEY put y
-    Solid.Z_KEY put z
+    X_KEY put x
+    Y_KEY put y
+    Z_KEY put z
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/RemoveSingleChild.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/RemoveSingleChild.kt
index 5d07303e..c0c02bc7 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/RemoveSingleChild.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/RemoveSingleChild.kt
@@ -14,18 +14,14 @@ internal fun mergeChild(parent: VisionGroup, child: Vision): Vision {
         //parent.properties?.let { config.update(it) }
 
         if (this is Solid && parent is Solid) {
-            position = (position ?: Point3D.ZERO) + (parent.position ?: Point3D.ZERO)
-            rotation = (parent.rotation ?: Point3D.ZERO) + (parent.rotation ?: Point3D.ZERO)
-            scale = when {
-                scale == null && parent.scale == null -> null
-                scale == null -> parent.scale
-                parent.scale == null -> scale
-                else -> Point3D(
-                    scale!!.x * parent.scale!!.x,
-                    scale!!.y * parent.scale!!.y,
-                    scale!!.z * parent.scale!!.z
-                )
-            }
+            position += parent.position
+            rotation += parent.rotation
+            scale = Point3D(
+                scale.x * parent.scale.x,
+                scale.y * parent.scale.y,
+                scale.z * parent.scale.z
+            )
+
         }
 
     }
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationAction.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationAction.kt
index 8abbc8ae..d0e9b073 100644
--- a/visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationAction.kt
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/animation/AnimationAction.kt
@@ -1,3 +1,4 @@
+@file:Suppress("NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING", "unused")
 @file:JsModule("three")
 @file:JsNonModule
 

From 7b30b62849c60c7a7aaec7508b9f74e23bbfaa4b Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 11 Jul 2021 13:43:56 +0300
Subject: [PATCH 136/151] Reimplemented coordinates as properties

---
 .../visionforge/solid/FXCompositeFactory.kt   |  2 +-
 .../visionforge/gdml/GdmlOptimizer.kt         | 75 -------------------
 ...mlTransformerEnv.kt => GdmlTransformer.kt} | 31 ++++----
 .../space/kscience/visionforge/gdml/gdmlJs.kt |  8 --
 .../kscience/visionforge/gdml/gdmlJVM.kt      |  3 -
 .../kscience/visionforge/solid/Composite.kt   |  3 +-
 .../space/kscience/visionforge/solid/Solid.kt | 67 +++++++++++------
 .../solid/transform/RemoveSingleChild.kt      | 45 ++++++-----
 .../visionforge/solid/transform/UnRef.kt      |  2 +-
 .../laht/threekt/utils/BufferGeometryUtils.kt | 15 ++++
 .../solid/three/ThreeCompositeFactory.kt      |  6 +-
 11 files changed, 107 insertions(+), 150 deletions(-)
 delete mode 100644 visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlOptimizer.kt
 rename visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/{GdmlTransformerEnv.kt => GdmlTransformer.kt} (95%)
 delete mode 100644 visionforge-gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/gdmlJs.kt
 create mode 100644 visionforge-threejs/src/main/kotlin/info/laht/threekt/utils/BufferGeometryUtils.kt

diff --git a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCompositeFactory.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCompositeFactory.kt
index 5aa7619e..663a927b 100644
--- a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCompositeFactory.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCompositeFactory.kt
@@ -48,7 +48,7 @@ class FXCompositeFactory(val plugin: FX3DPlugin) : FX3DFactory<Composite> {
         val firstCSG = first.toCSG()
         val secondCSG = second.toCSG()
         val resultCSG = when (obj.compositeType) {
-            CompositeType.UNION -> firstCSG.union(secondCSG)
+            CompositeType.SUM, CompositeType.UNION -> firstCSG.union(secondCSG)
             CompositeType.INTERSECT -> firstCSG.intersect(secondCSG)
             CompositeType.SUBTRACT -> firstCSG.difference(secondCSG)
         }
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlOptimizer.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlOptimizer.kt
deleted file mode 100644
index b2075e3a..00000000
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlOptimizer.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-package space.kscience.visionforge.gdml
-
-import space.kscience.dataforge.meta.itemSequence
-import space.kscience.dataforge.misc.DFExperimental
-import space.kscience.visionforge.Vision
-import space.kscience.visionforge.meta
-import space.kscience.visionforge.solid.*
-
-public expect class Counter() {
-    public fun get(): Int
-    public fun incrementAndGet(): Int
-}
-
-@DFExperimental
-internal fun Vision.updateFrom(other: Vision): Vision {
-    if (this is Solid && other is Solid) {
-        position += other.position
-        rotation += other.rotation
-        scaleX = scaleX.toDouble() * other.scaleX.toDouble()
-        scaleY = scaleY.toDouble() * other.scaleY.toDouble()
-        scaleZ = scaleZ.toDouble() * other.scaleZ.toDouble()
-        other.meta.itemSequence().forEach { (name, item) ->
-            if (getProperty(name) == null) {
-                setProperty(name, item)
-            }
-        }
-    }
-    return this
-}
-//
-//@DFExperimental
-//private class GdmlOptimizer() : VisionVisitor {
-//    val logger = KotlinLogging.logger("SingleChildReducer")
-//
-//    private val depthCount = HashMap<Int, Counter>()
-//
-//    override suspend fun visit(name: Name, vision: Vision) {
-//        val depth = name.length
-//        depthCount.getOrPut(depth) { Counter() }.incrementAndGet()
-//    }
-//
-//    override fun skip(name: Name, vision: Vision): Boolean = vision is Proxy.ProxyChild
-//
-//    override suspend fun visitChildren(name: Name, group: VisionGroup) {
-//        if (name == "volumes".toName()) return
-//        if (group !is MutableVisionGroup) return
-//
-//        val newChildren = group.children.entries.associate { (visionToken, vision) ->
-//            //Reduce single child groups
-//            if (vision is VisionGroup && vision !is Proxy && vision.children.size == 1) {
-//                val (token, child) = vision.children.entries.first()
-//                child.parent = null
-//                if (token != visionToken) {
-//                    child.config["solidName"] = token.toString()
-//                }
-//                visionToken to child.updateFrom(vision)
-//            } else {
-//                visionToken to vision
-//            }
-//        }
-//        if (newChildren != group.children) {
-//            group.removeAll()
-//            newChildren.forEach { (token, child) ->
-//                group[token] = child
-//            }
-//        }
-//    }
-//}
-//
-//@DFExperimental
-//suspend fun SolidGroup.optimizeGdml(): Job = coroutineScope {
-//    prototypes?.let {
-//        VisionVisitor.visitTree(GdmlOptimizer(), this, it)
-//    } ?: CompletableDeferred(Unit)
-//}
\ No newline at end of file
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformerEnv.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
similarity index 95%
rename from visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformerEnv.kt
rename to visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
index 76561fe8..3a7b48af 100644
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformerEnv.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
@@ -163,25 +163,26 @@ private class GdmlTransformerEnv(val settings: GdmlTransformer) {
         newScale: GdmlScale? = null,
     ): T = apply {
         newPos?.let {
-            val point = Point3D(it.x(settings.lUnit), it.y(settings.lUnit), it.z(settings.lUnit))
-            if (point != Point3D.ZERO) {
-                position = point
-            }
+            val gdmlX = it.x(settings.lUnit)
+            if (gdmlX != 0f) x = gdmlX
+            val gdmlY = it.y(settings.lUnit)
+            if (gdmlY != 0f) y = gdmlY
+            val gdmlZ = it.z(settings.lUnit)
+            if (gdmlZ != 0f) z = gdmlZ
         }
         newRotation?.let {
-            val point = Point3D(it.x(settings.aUnit), it.y(settings.aUnit), it.z(settings.aUnit))
-            if (point != Point3D.ZERO) {
-                rotation = point
-            }
-            //this@withPosition.rotationOrder = RotationOrder.ZXY
+            val gdmlX = it.x(settings.aUnit)
+            if (gdmlX != 0f) rotationX = gdmlX
+            val gdmlY = it.y(settings.aUnit)
+            if (gdmlY != 0f) rotationY = gdmlY
+            val gdmlZ = it.z(settings.aUnit)
+            if (gdmlZ != 0f) rotationZ = gdmlZ
         }
         newScale?.let {
-            val point = Point3D(it.x, it.y, it.z)
-            if (point != Point3D.ONE) {
-                scale = point
-            }
+            if (it.x != 1f) scaleX = it.x
+            if (it.y != 1f) scaleY = it.y
+            if (it.z != 1f) scaleZ = it.z
         }
-        //TODO convert units if needed
     }
 
     fun <T : Solid> T.withPosition(root: Gdml, physVolume: GdmlPhysVolume): T = withPosition(
@@ -301,7 +302,7 @@ private class GdmlTransformerEnv(val settings: GdmlTransformer) {
                 val first: GdmlSolid = solid.first.resolve(root) ?: error("")
                 val second: GdmlSolid = solid.second.resolve(root) ?: error("")
                 val type: CompositeType = when (solid) {
-                    is GdmlUnion -> CompositeType.UNION
+                    is GdmlUnion -> CompositeType.SUM // dumb sum for better performance
                     is GdmlSubtraction -> CompositeType.SUBTRACT
                     is GdmlIntersection -> CompositeType.INTERSECT
                 }
diff --git a/visionforge-gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/gdmlJs.kt b/visionforge-gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/gdmlJs.kt
deleted file mode 100644
index f90eec29..00000000
--- a/visionforge-gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/gdmlJs.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package space.kscience.visionforge.gdml
-
-public actual class Counter {
-    private var count: Int = 0
-    public actual fun get(): Int = count
-
-    public actual fun incrementAndGet(): Int = count++
-}
\ No newline at end of file
diff --git a/visionforge-gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/gdmlJVM.kt b/visionforge-gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/gdmlJVM.kt
index 7bd17a5c..b67e231e 100644
--- a/visionforge-gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/gdmlJVM.kt
+++ b/visionforge-gdml/src/jvmMain/kotlin/space/kscience/visionforge/gdml/gdmlJVM.kt
@@ -4,9 +4,6 @@ import space.kscience.gdml.Gdml
 import space.kscience.gdml.decodeFromFile
 import space.kscience.visionforge.solid.SolidGroup
 import java.nio.file.Path
-import java.util.concurrent.atomic.AtomicInteger
-
-public actual typealias Counter = AtomicInteger
 
 public fun SolidGroup.gdml(
     file: Path,
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt
index 35cf7ab6..d1d41d09 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Composite.kt
@@ -6,7 +6,8 @@ import space.kscience.dataforge.meta.update
 import space.kscience.visionforge.*
 
 public enum class CompositeType {
-    UNION,
+    SUM, // Dumb sum of meshes
+    UNION, //CSG union
     INTERSECT,
     SUBTRACT
 }
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
index f2b14f2a..0b3dee57 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
@@ -48,7 +48,7 @@ public interface Solid : Vision {
         public val Y_KEY: Name = "y".asName()
         public val Z_KEY: Name = "z".asName()
 
-        public val POSITION_KEY: Name = "pos".asName()
+        public val POSITION_KEY: Name = "position".asName()
 
         public val X_POSITION_KEY: Name = POSITION_KEY + X_KEY
         public val Y_POSITION_KEY: Name = POSITION_KEY + Y_KEY
@@ -83,6 +83,18 @@ public interface Solid : Vision {
                     hide()
                 }
 
+                node(POSITION_KEY){
+                    hide()
+                }
+
+                node(ROTATION_KEY){
+                    hide()
+                }
+
+                node(SCALE_KEY){
+                    hide()
+                }
+
                 value(DETAIL_KEY) {
                     type(ValueType.NUMBER)
                     hide()
@@ -145,7 +157,7 @@ public var Vision.ignore: Boolean?
 //    get() = getProperty(SELECTED_KEY).boolean
 //    set(value) = setProperty(SELECTED_KEY, value)
 
-internal fun number(name: Name, default: Number): ReadWriteProperty<Solid, Number> =
+internal fun float(name: Name, default: Number): ReadWriteProperty<Solid, Number> =
     object : ReadWriteProperty<Solid, Number> {
         override fun getValue(thisRef: Solid, property: KProperty<*>): Number {
             return thisRef.getOwnProperty(name)?.number ?: default
@@ -156,33 +168,40 @@ internal fun number(name: Name, default: Number): ReadWriteProperty<Solid, Numbe
         }
     }
 
-internal fun point(name: Name, default: Float): ReadWriteProperty<Solid, Point3D> =
-    object : ReadWriteProperty<Solid, Point3D> {
-        override fun getValue(thisRef: Solid, property: KProperty<*>): Point3D = object : Point3D {
-            override val x: Float get() = thisRef.getOwnProperty(name + X_KEY)?.float ?: default
-            override val y: Float get() = thisRef.getOwnProperty(name + Y_KEY)?.float ?: default
-            override val z: Float get() = thisRef.getOwnProperty(name + Z_KEY)?.float ?: default
+internal fun point(name: Name, default: Float): ReadWriteProperty<Solid, Point3D?> =
+    object : ReadWriteProperty<Solid, Point3D?> {
+        override fun getValue(thisRef: Solid, property: KProperty<*>): Point3D? {
+            val item = thisRef.getOwnProperty(name) ?: return null
+            return object : Point3D {
+                override val x: Float get() = item[X_KEY]?.float ?: default
+                override val y: Float get() = item[Y_KEY]?.float ?: default
+                override val z: Float get() = item[Z_KEY]?.float ?: default
+            }
         }
 
-        override fun setValue(thisRef: Solid, property: KProperty<*>, value: Point3D) {
-            thisRef.setProperty(name + X_KEY, value.x)
-            thisRef.setProperty(name + Y_KEY, value.y)
-            thisRef.setProperty(name + Z_KEY, value.z)
+        override fun setValue(thisRef: Solid, property: KProperty<*>, value: Point3D?) {
+            if (value == null) {
+                thisRef.setProperty(name, null)
+            } else {
+                thisRef.setProperty(name + X_KEY, value.x)
+                thisRef.setProperty(name + Y_KEY, value.y)
+                thisRef.setProperty(name + Z_KEY, value.z)
+            }
         }
     }
 
-public var Solid.position: Point3D by point(POSITION_KEY, 0f)
-public var Solid.rotation: Point3D by point(ROTATION_KEY, 0f)
-public var Solid.scale: Point3D by point(SCALE_KEY, 1f)
+public var Solid.position: Point3D? by point(POSITION_KEY, 0f)
+public var Solid.rotation: Point3D? by point(ROTATION_KEY, 0f)
+public var Solid.scale: Point3D? by point(SCALE_KEY, 1f)
 
-public var Solid.x: Number by number(X_POSITION_KEY, 0f)
-public var Solid.y: Number by number(Y_POSITION_KEY, 0f)
-public var Solid.z: Number by number(Z_POSITION_KEY, 0f)
+public var Solid.x: Number by float(X_POSITION_KEY, 0f)
+public var Solid.y: Number by float(Y_POSITION_KEY, 0f)
+public var Solid.z: Number by float(Z_POSITION_KEY, 0f)
 
-public var Solid.rotationX: Number by number(X_ROTATION_KEY, 0f)
-public var Solid.rotationY: Number by number(Y_ROTATION_KEY, 0f)
-public var Solid.rotationZ: Number by number(Z_ROTATION_KEY, 0f)
+public var Solid.rotationX: Number by float(X_ROTATION_KEY, 0f)
+public var Solid.rotationY: Number by float(Y_ROTATION_KEY, 0f)
+public var Solid.rotationZ: Number by float(Z_ROTATION_KEY, 0f)
 
-public var Solid.scaleX: Number by number(X_SCALE_KEY, 1f)
-public var Solid.scaleY: Number by number(Y_SCALE_KEY, 1f)
-public var Solid.scaleZ: Number by number(Z_SCALE_KEY, 1f)
\ No newline at end of file
+public var Solid.scaleX: Number by float(X_SCALE_KEY, 1f)
+public var Solid.scaleY: Number by float(Y_SCALE_KEY, 1f)
+public var Solid.scaleZ: Number by float(Z_SCALE_KEY, 1f)
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/RemoveSingleChild.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/RemoveSingleChild.kt
index c0c02bc7..a51aaa25 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/RemoveSingleChild.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/RemoveSingleChild.kt
@@ -1,32 +1,39 @@
 package space.kscience.visionforge.solid.transform
 
+import space.kscience.dataforge.meta.itemSequence
 import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.dataforge.names.asName
-import space.kscience.visionforge.*
+import space.kscience.visionforge.MutableVisionGroup
+import space.kscience.visionforge.Vision
+import space.kscience.visionforge.VisionGroup
+import space.kscience.visionforge.meta
 import space.kscience.visionforge.solid.*
 
+private operator fun Number.plus(other: Number) = toFloat() + other.toFloat()
+private operator fun Number.times(other: Number) = toFloat() * other.toFloat()
+
 @DFExperimental
-internal fun mergeChild(parent: VisionGroup, child: Vision): Vision {
-    return child.apply {
-
-        configure(parent.meta)
-
-        //parent.properties?.let { config.update(it) }
-
-        if (this is Solid && parent is Solid) {
-            position += parent.position
-            rotation += parent.rotation
-            scale = Point3D(
-                scale.x * parent.scale.x,
-                scale.y * parent.scale.y,
-                scale.z * parent.scale.z
-            )
-
+internal fun Vision.updateFrom(other: Vision): Vision {
+    if (this is Solid && other is Solid) {
+        x += other.x
+        y += other.y
+        z += other.y
+        rotationX += other.rotationX
+        rotationY += other.rotationY
+        rotationZ += other.rotationZ
+        scaleX *= other.scaleX
+        scaleY *= other.scaleY
+        scaleZ *= other.scaleZ
+        other.meta.itemSequence().forEach { (name, item) ->
+            if (getProperty(name) == null) {
+                setProperty(name, item)
+            }
         }
-
     }
+    return this
 }
 
+
 @DFExperimental
 internal object RemoveSingleChild : VisualTreeTransform<SolidGroup>() {
 
@@ -39,7 +46,7 @@ internal object RemoveSingleChild : VisualTreeTransform<SolidGroup>() {
                 }
                 if (parent is VisionGroup && parent.children.size == 1) {
                     val child = parent.children.values.first()
-                    val newParent = mergeChild(parent, child)
+                    val newParent = child.updateFrom(parent)
                     newParent.parent = null
                     set(childName.asName(), newParent)
                 }
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/UnRef.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/UnRef.kt
index b6d7c2e6..890c8291 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/UnRef.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/UnRef.kt
@@ -31,7 +31,7 @@ internal object UnRef : VisualTreeTransform<SolidGroup>() {
         }
         children.filter { (it.value as? SolidReferenceGroup)?.refName == name }.forEach { (key, value) ->
             val reference = value as SolidReferenceGroup
-            val newChild = mergeChild(reference, reference.prototype)
+            val newChild = reference.prototype.updateFrom(reference)
             newChild.parent = null
             set(key.asName(), newChild) // replace proxy with merged object
         }
diff --git a/visionforge-threejs/src/main/kotlin/info/laht/threekt/utils/BufferGeometryUtils.kt b/visionforge-threejs/src/main/kotlin/info/laht/threekt/utils/BufferGeometryUtils.kt
new file mode 100644
index 00000000..dd15b514
--- /dev/null
+++ b/visionforge-threejs/src/main/kotlin/info/laht/threekt/utils/BufferGeometryUtils.kt
@@ -0,0 +1,15 @@
+@file:JsModule("three/examples/jsm/utils/BufferGeometryUtils")
+@file:JsNonModule
+package info.laht.threekt.utils
+
+import info.laht.threekt.core.BufferGeometry
+
+
+public external object BufferGeometryUtils {
+    /**
+     * Merges a set of geometries into a single instance. All geometries must have compatible attributes. If merge does not succeed, the method returns null.
+     * @param geometries -- Array of BufferGeometry instances.
+     * @param useGroups -- Whether groups should be generated for the merged geometry or not.
+     */
+    public fun mergeBufferGeometries(geometries: Array<BufferGeometry>, useGroups: Boolean): BufferGeometry
+}
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCompositeFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCompositeFactory.kt
index 33304b72..2cdd12d3 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCompositeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCompositeFactory.kt
@@ -42,9 +42,9 @@ public class ThreeCompositeFactory(public val three: ThreePlugin) : ThreeFactory
         val first = three.buildObject3D(obj.first) as? Mesh ?: error("First part of composite is not a mesh")
         val second = three.buildObject3D(obj.second) as? Mesh ?: error("Second part of composite is not a mesh")
         return when (obj.compositeType) {
-            CompositeType.UNION -> CSG.union(first,second)
-            CompositeType.INTERSECT -> CSG.intersect(first,second)
-            CompositeType.SUBTRACT -> CSG.subtract(first,second)
+            CompositeType.SUM, CompositeType.UNION -> CSG.union(first, second)
+            CompositeType.INTERSECT -> CSG.intersect(first, second)
+            CompositeType.SUBTRACT -> CSG.subtract(first, second)
         }.apply {
             updatePosition(obj)
             applyProperties(obj)

From 42e2530f6fb3b8db94a8c55f50817a2d1a13a7ad Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 11 Jul 2021 15:16:04 +0300
Subject: [PATCH 137/151] cleanup

---
 .../kscience/visionforge/VisionGroupBase.kt     |  2 +-
 .../kscience/visionforge/solid/SolidGroup.kt    |  3 ---
 .../visionforge/solid/SolidReference.kt         | 17 -----------------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt
index 44800673..997789c1 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt
@@ -17,7 +17,7 @@ import space.kscience.dataforge.names.*
 @Serializable
 @SerialName("vision.group")
 public open class VisionGroupBase(
-    @SerialName("children") internal val childrenInternal: MutableMap<NameToken, Vision> = LinkedHashMap(),
+    @SerialName("children") protected val childrenInternal: MutableMap<NameToken, Vision> = LinkedHashMap(),
 ) : VisionBase(), MutableVisionGroup {
 
     /**
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
index ad2107f0..513a6fc9 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
@@ -29,9 +29,6 @@ public interface PrototypeHolder {
 @SerialName("group.solid")
 public class SolidGroup(
     @Serializable(PrototypeSerializer::class) internal var prototypes: MutableVisionGroup? = null,
-//    override var position: Point3D? = null,
-//    override var rotation: Point3D? = null,
-//    override var scale: Point3D? = null,
 ) : VisionGroupBase(), Solid, PrototypeHolder {
 
     init {
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
index 3d067a62..8778657f 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
@@ -95,23 +95,6 @@ public class SolidReferenceGroup(
      * (properties are stored in external cache) and created and destroyed on-demand).
      */
     private inner class ReferenceChild(private val childName: Name) : SolidReference, VisionGroup {
-
-//        //TODO replace by properties
-//        override var position: Point3D?
-//            get() = prototype.position
-//            set(_) {
-//                error("Can't set position of reference")
-//            }
-//        override var rotation: Point3D?
-//            get() = prototype.rotation
-//            set(_) {
-//                error("Can't set position of reference")
-//            }
-//        override var scale: Point3D?
-//            get() = prototype.scale
-//            set(_) {
-//                error("Can't set position of reference")
-//            }
         override val prototype: Solid get() = prototypeFor(childName)
 
         override val children: Map<NameToken, Vision>

From 073d374a9e84255b0997ed687add95847448210c Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 12 Jul 2021 10:01:21 +0300
Subject: [PATCH 138/151] Fix tests with new prototype location

---
 .../{GDMLVisualTest.kt => GDMLVisionTest.kt}  |   2 +-
 .../space/kscience/visionforge/VisionBase.kt  |   7 +-
 .../kscience/visionforge/gdml/layerMarker.kt  |  23 ++++
 .../src/commonTest/kotlin/TestCubes.kt        |   2 +-
 .../visionforge/gdml/bmanStatistics.kt        |   3 +-
 .../space/kscience/visionforge/solid/Solid.kt |   1 +
 .../kscience/visionforge/solid/SolidBase.kt   |   6 +-
 .../kscience/visionforge/solid/SolidGroup.kt  |  82 +++-----------
 .../visionforge/solid/SolidReference.kt       | 100 +++++++++---------
 9 files changed, 96 insertions(+), 130 deletions(-)
 rename demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/{GDMLVisualTest.kt => GDMLVisionTest.kt} (97%)
 create mode 100644 visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/layerMarker.kt

diff --git a/demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/GDMLVisualTest.kt b/demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/GDMLVisionTest.kt
similarity index 97%
rename from demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/GDMLVisualTest.kt
rename to demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/GDMLVisionTest.kt
index c12c7215..17bdc014 100644
--- a/demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/GDMLVisualTest.kt
+++ b/demo/gdml/src/commonTest/kotlin/space/kscience/visionforge/gdml/GDMLVisionTest.kt
@@ -10,7 +10,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 
-class GDMLVisualTest {
+class GDMLVisionTest {
 
 //    @Test
 //    fun testCubesStyles(){
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
index c9b68219..62f90f52 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
@@ -28,11 +28,10 @@ internal data class PropertyListener(
  */
 @Serializable
 @SerialName("vision")
-public open class VisionBase : Vision {
+public open class VisionBase(
+    override @Transient var parent: VisionGroup? = null,
     protected var properties: Config? = null
-
-    @Transient
-    override var parent: VisionGroup? = null
+) : Vision {
 
     @Synchronized
     protected fun getOrCreateProperties(): Config {
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/layerMarker.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/layerMarker.kt
new file mode 100644
index 00000000..17b75e79
--- /dev/null
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/layerMarker.kt
@@ -0,0 +1,23 @@
+package space.kscience.visionforge.gdml
+
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.plus
+import space.kscience.visionforge.VisionGroup
+
+private fun VisionGroup.countChildren(namePrefix: Name, cache: MutableMap<Name, Int> = hashMapOf()): Int {
+    var counter = 0
+    children.forEach { (token, child) ->
+        if (child is VisionGroup) {
+            counter += child.countChildren(namePrefix + token, cache)
+        } else {
+            counter++
+        }
+    }
+    cache[namePrefix] = counter
+    return counter
+}
+
+
+public fun VisionGroup.processLayers() {
+
+}
\ No newline at end of file
diff --git a/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt b/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt
index a364996c..9fb80095 100644
--- a/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt
+++ b/visionforge-gdml/src/commonTest/kotlin/TestCubes.kt
@@ -26,7 +26,7 @@ class TestCubes {
         val smallBoxPrototype = vision.getPrototype("solids.smallBox".toName()) as? Box
         assertNotNull(smallBoxPrototype)
         assertEquals(30.0, smallBoxPrototype.xSize.toDouble())
-        val smallBoxVision = vision["composite-111.smallBox"]?.prototype as? Box
+        val smallBoxVision = vision["composite-111.smallBox"]?.unref as? Box
         assertNotNull(smallBoxVision)
         assertEquals(30.0, smallBoxVision.xSize.toDouble())
     }
diff --git a/visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/bmanStatistics.kt b/visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/bmanStatistics.kt
index eccac343..1f1da074 100644
--- a/visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/bmanStatistics.kt
+++ b/visionforge-gdml/src/jvmTest/kotlin/space/kscience/visionforge/gdml/bmanStatistics.kt
@@ -5,7 +5,6 @@ import kotlinx.coroutines.withContext
 import nl.adaptivity.xmlutil.StAXReader
 import space.kscience.gdml.Gdml
 import space.kscience.gdml.decodeFromReader
-import space.kscience.visionforge.solid.prototype
 import space.kscience.visionforge.visitor.countDistinct
 import space.kscience.visionforge.visitor.flowStatistics
 import java.io.File
@@ -23,7 +22,7 @@ suspend fun main() {
 
 
         vision.flowStatistics<KClass<*>>{ _, child ->
-            child.prototype::class
+            child::class
         }.countDistinct().forEach { (depth, size) ->
             println("$depth\t$size")
         }
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
index 0b3dee57..a4c8e69c 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
@@ -34,6 +34,7 @@ import kotlin.reflect.KProperty
  * Interface for 3-dimensional [Vision]
  */
 public interface Solid : Vision {
+
     override val descriptor: NodeDescriptor get() = Companion.descriptor
 
     public companion object {
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt
index 1f86bdb3..c88052b2 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt
@@ -12,11 +12,7 @@ import space.kscience.visionforge.VisionChange
 
 @Serializable
 @SerialName("solid")
-public open class SolidBase(
-//    override var position: Point3D? = null,
-//    override var rotation: Point3D? = null,
-//    override var scale: Point3D? = null,
-) : VisionBase(), Solid {
+public open class SolidBase : VisionBase(), Solid {
     override val descriptor: NodeDescriptor get() = Solid.descriptor
 
     override fun update(change: VisionChange) {
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
index 513a6fc9..27f95c17 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
@@ -1,14 +1,7 @@
 package space.kscience.visionforge.solid
 
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.PolymorphicSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.builtins.MapSerializer
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import space.kscience.dataforge.meta.MetaItem
 import space.kscience.dataforge.meta.descriptors.NodeDescriptor
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.NameToken
@@ -27,37 +20,35 @@ public interface PrototypeHolder {
  */
 @Serializable
 @SerialName("group.solid")
-public class SolidGroup(
-    @Serializable(PrototypeSerializer::class) internal var prototypes: MutableVisionGroup? = null,
-) : VisionGroupBase(), Solid, PrototypeHolder {
+public class SolidGroup : VisionGroupBase(), Solid, PrototypeHolder {
+
+    override val children: Map<NameToken, Vision> get() = super.childrenInternal.filter { it.key != PROTOTYPES_TOKEN }
+
+    public var prototypes: MutableVisionGroup?
+        get() = childrenInternal[PROTOTYPES_TOKEN] as? MutableVisionGroup
+        set(value) {
+            set(PROTOTYPES_TOKEN, value)
+        }
 
-    init {
-        prototypes?.parent = this
-    }
 
     override val descriptor: NodeDescriptor get() = Solid.descriptor
 
     /**
-     * Ger a prototype redirecting the request to the parent if prototype is not found
+     * Get a prototype redirecting the request to the parent if prototype is not found.
+     * If prototype is a ref, then it is unfolded until
      */
     override fun getPrototype(name: Name): Solid? =
-        (prototypes?.get(name) as? Solid) ?: (parent as? PrototypeHolder)?.getPrototype(name)
+        prototypes?.get(name)?.unref ?: (parent as? PrototypeHolder)?.getPrototype(name)
 
     /**
      * Create or edit prototype node as a group
      */
     override fun prototypes(builder: VisionContainerBuilder<Solid>.() -> Unit): Unit {
-        (prototypes ?: Prototypes().also {
+        (prototypes ?: SolidGroup().also {
             prototypes = it
-            it.parent = this
         }).run(builder)
     }
 
-//    /**
-//     * TODO add special static group to hold statics without propagation
-//     */
-//    override fun addStatic(child: VisualObject) = setChild(NameToken("@static(${child.hashCode()})"), child)
-
     override fun createGroup(): SolidGroup = SolidGroup()
 
     override fun update(change: VisionChange) {
@@ -87,50 +78,3 @@ public fun VisionContainerBuilder<Vision>.group(
 @VisionBuilder
 public fun VisionContainerBuilder<Vision>.group(name: String, action: SolidGroup.() -> Unit = {}): SolidGroup =
     SolidGroup().apply(action).also { set(name, it) }
-
-/**
- * A special class which works as a holder for prototypes
- */
-internal class Prototypes(
-    children: MutableMap<NameToken, Vision> = hashMapOf(),
-) : VisionGroupBase(children), PrototypeHolder {
-
-    override fun getProperty(
-        name: Name,
-        inherit: Boolean,
-        includeStyles: Boolean,
-        includeDefaults: Boolean,
-    ): MetaItem? = null
-
-    override fun setProperty(name: Name, item: MetaItem?, notify: Boolean) {
-        error("Can't set property of a prototypes container")
-    }
-
-    override val descriptor: NodeDescriptor? = null
-
-    override fun prototypes(builder: VisionContainerBuilder<Solid>.() -> Unit) {
-        apply(builder)
-    }
-
-    override fun getPrototype(name: Name): Solid? = get(name) as? Solid
-}
-
-internal class PrototypeSerializer : KSerializer<MutableVisionGroup> {
-
-    private val mapSerializer: KSerializer<Map<NameToken, Vision>> =
-        MapSerializer(
-            NameToken.serializer(),
-            PolymorphicSerializer(Vision::class)
-        )
-
-    override val descriptor: SerialDescriptor get() = mapSerializer.descriptor
-
-    override fun deserialize(decoder: Decoder): MutableVisionGroup {
-        val map = mapSerializer.deserialize(decoder)
-        return Prototypes(map.toMutableMap())
-    }
-
-    override fun serialize(encoder: Encoder, value: MutableVisionGroup) {
-        mapSerializer.serialize(encoder, value.children)
-    }
-}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
index 8778657f..401f8097 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
@@ -11,10 +11,27 @@ import space.kscience.dataforge.misc.DFExperimental
 import space.kscience.dataforge.names.*
 import space.kscience.visionforge.*
 
-public interface SolidReference : Solid {
+
+public interface SolidReference : VisionGroup {
+    /**
+     * The prototype for this reference. Always returns a "real" prototype, not a reference
+     */
     public val prototype: Solid
 }
 
+
+/**
+ * Get a vision prototype if it is a [SolidReference] or vision itself if it is not.
+ * Unref is recursive, so it always returns a non-reference.
+ */
+public val Vision.unref: Solid
+    get() = when (this) {
+        is SolidReference -> prototype.unref
+        is Solid -> this
+        else -> error("This Vision is neither Solid nor SolidReference")
+    }
+
+
 private fun SolidReference.getRefProperty(
     name: Name,
     inherit: Boolean,
@@ -31,6 +48,12 @@ private fun SolidReference.getRefProperty(
     }
 }.merge()
 
+private fun childToken(childName: Name): NameToken =
+    NameToken(SolidReferenceGroup.REFERENCE_CHILD_PROPERTY_PREFIX, childName.toString())
+
+private fun childPropertyName(childName: Name, propertyName: Name): Name =
+    childToken(childName) + propertyName
+
 /**
  * A reference [Solid] to reuse a template object
  */
@@ -38,48 +61,24 @@ private fun SolidReference.getRefProperty(
 @SerialName("solid.ref")
 public class SolidReferenceGroup(
     public val refName: Name,
-) : SolidBase(), SolidReference, VisionGroup {
+) : VisionBase(), SolidReference, VisionGroup, Solid {
 
     /**
      * Recursively search for defined template in the parent
      */
-    override val prototype: Solid
-        get() {
-            if (parent == null) error("No parent is present for SolidReferenceGroup")
-            if (parent !is SolidGroup) error("Reference parent is not a group")
-            return (parent as? SolidGroup)?.getPrototype(refName)
-                ?: error("Prototype with name $refName not found")
-        }
+    override val prototype: Solid by lazy {
+        if (parent == null) error("No parent is present for SolidReferenceGroup")
+        if (parent !is PrototypeHolder) error("Parent does not hold prototypes")
+        (parent as? PrototypeHolder)?.getPrototype(refName) ?: error("Prototype with name $refName not found")
+    }
 
     override val children: Map<NameToken, Vision>
         get() = (prototype as? VisionGroup)?.children
-            ?.filter { !it.key.toString().startsWith("@") }
+            ?.filter { it.key != SolidGroup.PROTOTYPES_TOKEN }
             ?.mapValues {
-                ReferenceChild(it.key.asName())
+                ReferenceChild(this, it.key.asName())
             } ?: emptyMap()
 
-    private fun childToken(childName: Name): NameToken =
-        NameToken(REFERENCE_CHILD_PROPERTY_PREFIX, childName.toString())
-
-    private fun childPropertyName(childName: Name, propertyName: Name): Name =
-        childToken(childName) + propertyName
-
-    private fun getChildProperty(childName: Name, propertyName: Name): MetaItem? {
-        return getOwnProperty(childPropertyName(childName, propertyName))
-    }
-
-    private fun setChildProperty(childName: Name, propertyName: Name, item: MetaItem?, notify: Boolean) {
-        setProperty(childPropertyName(childName, propertyName), item, notify)
-    }
-
-    private fun prototypeFor(name: Name): Solid {
-        return if (name.isEmpty()) prototype else {
-            val proto = (prototype as? SolidGroup)?.get(name)
-                ?: error("Prototype with name $name not found in SolidReferenceGroup $refName")
-            proto as? Solid ?: error("Prototype with name $name is ${proto::class} but expected Solid")
-        }
-    }
-
     override fun getProperty(
         name: Name,
         inherit: Boolean,
@@ -94,20 +93,31 @@ public class SolidReferenceGroup(
      * A ProxyChild is created temporarily only to interact with properties, it does not store any values
      * (properties are stored in external cache) and created and destroyed on-demand).
      */
-    private inner class ReferenceChild(private val childName: Name) : SolidReference, VisionGroup {
-        override val prototype: Solid get() = prototypeFor(childName)
+    private class ReferenceChild(
+        val owner: SolidReferenceGroup,
+        private val childName: Name
+    ) : SolidReference, VisionGroup {
+
+        override val prototype: Solid by lazy {
+            if (childName.isEmpty()) owner.prototype else {
+                val proto = (owner.prototype as? VisionGroup)?.get(childName)
+                    ?: error("Prototype with name $childName not found in SolidReferenceGroup ${owner.refName}")
+                proto.unref as? Solid ?: error("Prototype with name $childName is ${proto::class} but expected Solid")
+            }
+        }
 
         override val children: Map<NameToken, Vision>
             get() = (prototype as? VisionGroup)?.children
-                ?.filter { !it.key.toString().startsWith("@") }
+                ?.filter { it.key != SolidGroup.PROTOTYPES_TOKEN }
                 ?.mapValues { (key, _) ->
-                    ReferenceChild(childName + key.asName())
+                    ReferenceChild(owner, childName + key.asName())
                 } ?: emptyMap()
 
-        override fun getOwnProperty(name: Name): MetaItem? = getChildProperty(childName, name)
+        override fun getOwnProperty(name: Name): MetaItem? =
+            owner.getOwnProperty(childPropertyName(childName, name))
 
         override fun setProperty(name: Name, item: MetaItem?, notify: Boolean) {
-            setChildProperty(childName, name, item, notify)
+            owner.setProperty(childPropertyName(childName, name), item, notify)
         }
 
         override fun getProperty(
@@ -124,7 +134,7 @@ public class SolidReferenceGroup(
         override var parent: VisionGroup?
             get() {
                 val parentName = childName.cutLast()
-                return if (parentName.isEmpty()) this@SolidReferenceGroup else ReferenceChild(parentName)
+                return if (parentName.isEmpty()) owner else ReferenceChild(owner, parentName)
             }
             set(_) {
                 error("Setting a parent for a reference child is not possible")
@@ -132,7 +142,7 @@ public class SolidReferenceGroup(
 
         @DFExperimental
         override val propertyChanges: Flow<Name>
-            get() = this@SolidReferenceGroup.propertyChanges.mapNotNull { name ->
+            get() = owner.propertyChanges.mapNotNull { name ->
                 if (name.startsWith(childToken(childName))) {
                     name.cutFirst()
                 } else {
@@ -141,7 +151,7 @@ public class SolidReferenceGroup(
             }
 
         override fun invalidateProperty(propertyName: Name) {
-            this@SolidReferenceGroup.invalidateProperty(childPropertyName(childName, propertyName))
+            owner.invalidateProperty(childPropertyName(childName, propertyName))
         }
 
         override fun update(change: VisionChange) {
@@ -159,12 +169,6 @@ public class SolidReferenceGroup(
     }
 }
 
-/**
- * Get a vision prototype if it is a [SolidReferenceGroup] or vision itself if it is not
- */
-public val Vision.prototype: Vision
-    get() = if (this is SolidReference) prototype.prototype else this
-
 /**
  * Create ref for existing prototype
  */

From 5af8fe3e994b0b61b130535442a704bd5c043066 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 12 Jul 2021 13:23:25 +0300
Subject: [PATCH 139/151] Minor ref cleanup

---
 .../kscience/visionforge/solid/SolidGroup.kt  | 13 ++++++--
 .../visionforge/solid/SolidReference.kt       | 33 ++++++++++---------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
index 27f95c17..b78ec4a5 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidGroup.kt
@@ -7,10 +7,19 @@ import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.NameToken
 import space.kscience.visionforge.*
 
+/**
+ * A container with prototype support
+ */
 public interface PrototypeHolder {
+    /**
+     * Build or update prototype tree
+     */
     @VisionBuilder
     public fun prototypes(builder: VisionContainerBuilder<Solid>.() -> Unit)
 
+    /**
+     * Resolve a prototype from this container. Should never return a ref.
+     */
     public fun getPrototype(name: Name): Solid?
 }
 
@@ -24,7 +33,7 @@ public class SolidGroup : VisionGroupBase(), Solid, PrototypeHolder {
 
     override val children: Map<NameToken, Vision> get() = super.childrenInternal.filter { it.key != PROTOTYPES_TOKEN }
 
-    public var prototypes: MutableVisionGroup?
+    private var prototypes: MutableVisionGroup?
         get() = childrenInternal[PROTOTYPES_TOKEN] as? MutableVisionGroup
         set(value) {
             set(PROTOTYPES_TOKEN, value)
@@ -35,7 +44,7 @@ public class SolidGroup : VisionGroupBase(), Solid, PrototypeHolder {
 
     /**
      * Get a prototype redirecting the request to the parent if prototype is not found.
-     * If prototype is a ref, then it is unfolded until
+     * If prototype is a ref, then it is unfolded automatically.
      */
     override fun getPrototype(name: Name): Solid? =
         prototypes?.get(name)?.unref ?: (parent as? PrototypeHolder)?.getPrototype(name)
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
index 401f8097..2b7a8358 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
@@ -37,16 +37,20 @@ private fun SolidReference.getRefProperty(
     inherit: Boolean,
     includeStyles: Boolean,
     includeDefaults: Boolean,
-): MetaItem? = buildList {
-    add(getOwnProperty(name))
-    if (includeStyles) {
-        addAll(getStyleItems(name))
-    }
-    add(prototype.getProperty(name, inherit, includeStyles, includeDefaults))
-    if (inherit) {
-        add(parent?.getProperty(name, inherit))
-    }
-}.merge()
+): MetaItem? = if (!inherit && !includeStyles && !includeDefaults) {
+    getOwnProperty(name)
+} else {
+    buildList {
+        add(getOwnProperty(name))
+        if (includeStyles) {
+            addAll(getStyleItems(name))
+        }
+        add(prototype.getProperty(name, inherit, includeStyles, includeDefaults))
+        if (inherit) {
+            add(parent?.getProperty(name, inherit))
+        }
+    }.merge()
+}
 
 private fun childToken(childName: Name): NameToken =
     NameToken(SolidReferenceGroup.REFERENCE_CHILD_PROPERTY_PREFIX, childName.toString())
@@ -102,7 +106,8 @@ public class SolidReferenceGroup(
             if (childName.isEmpty()) owner.prototype else {
                 val proto = (owner.prototype as? VisionGroup)?.get(childName)
                     ?: error("Prototype with name $childName not found in SolidReferenceGroup ${owner.refName}")
-                proto.unref as? Solid ?: error("Prototype with name $childName is ${proto::class} but expected Solid")
+                proto.unref as? Solid
+                    ?: error("Prototype with name $childName is ${proto::class} but expected Solid")
             }
         }
 
@@ -125,11 +130,7 @@ public class SolidReferenceGroup(
             inherit: Boolean,
             includeStyles: Boolean,
             includeDefaults: Boolean,
-        ): MetaItem? = if (!inherit && !includeStyles && !includeDefaults) {
-            getOwnProperty(name)
-        } else {
-            getRefProperty(name, inherit, includeStyles, includeDefaults)
-        }
+        ): MetaItem? = getRefProperty(name, inherit, includeStyles, includeDefaults)
 
         override var parent: VisionGroup?
             get() {

From 0d53b6f77dc2463120de8709e16663f7d99e8837 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 12 Jul 2021 15:22:02 +0300
Subject: [PATCH 140/151] Make solid arguments immutable

---
 CHANGELOG.md                                  |  2 +
 .../kscience/visionforge/solid/demo/demo.kt   |  7 ++-
 .../visionforge/solid/demo/VariableBox.kt     |  2 +-
 .../visionforge/VisionPropertyContainer.kt    | 19 +++++++-
 .../visionforge/gdml/GdmlTransformer.kt       | 29 ++++++------
 .../kscience/visionforge/solid/ConeSegment.kt | 16 ++++---
 .../kscience/visionforge/solid/ConeSurface.kt | 18 +++++---
 .../kscience/visionforge/solid/Extruded.kt    | 45 +++++++++++--------
 .../kscience/visionforge/solid/PolyLine.kt    |  2 +-
 .../space/kscience/visionforge/solid/Solid.kt |  2 +
 .../kscience/visionforge/solid/SolidBase.kt   | 16 -------
 .../kscience/visionforge/solid/SolidLabel.kt  |  6 +--
 .../kscience/visionforge/solid/Sphere.kt      | 13 +++---
 .../kscience/visionforge/solid/SphereLayer.kt | 20 ++++++---
 .../kscience/visionforge/solid/geometry.kt    | 13 ++++++
 .../{ThreeVision.kt => ThreeJsVision.kt}      |  2 +-
 .../visionforge/solid/three/ThreePlugin.kt    |  2 +-
 17 files changed, 128 insertions(+), 86 deletions(-)
 rename visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/{ThreeVision.kt => ThreeJsVision.kt} (83%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ea6fc9b..aff57288 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@
 - VisionGroup builder accepts `null` as name for statics instead of `""`
 - gdml sphere is rendered as a SphereLayer instead of Sphere (#35)
 - Tube is replaced by more general ConeSurface
+- position, rotation and size moved to properties
+- prototypes moved to children
 
 ### Deprecated
 
diff --git a/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt b/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt
index bfa90827..2385fef1 100644
--- a/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt
+++ b/demo/solid-showcase/src/commonMain/kotlin/space/kscience/visionforge/solid/demo/demo.kt
@@ -27,7 +27,7 @@ fun VisionLayout<Solid>.demo(name: String, title: String = name, block: SolidGro
 }
 
 val canvasOptions = Canvas3DOptions {
-    size{
+    size {
         minSize = 400
     }
     axes {
@@ -57,9 +57,8 @@ fun VisionLayout<Solid>.showcase() {
             rotationX = PI / 4
             color("blue")
         }
-        sphereLayer(50,40){
-            theta = (PI/2).toFloat()
-            rotationX = - PI * 3 / 4
+        sphereLayer(50, 40, theta = PI / 2) {
+            rotationX = -PI * 3 / 4
             z = 110
             color(Colors.pink)
         }
diff --git a/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt
index f372fa38..22cac2c6 100644
--- a/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt
+++ b/demo/solid-showcase/src/jsMain/kotlin/space/kscience/visionforge/solid/demo/VariableBox.kt
@@ -23,7 +23,7 @@ internal fun SolidGroup.varBox(
     action: VariableBox.() -> Unit = {},
 ): VariableBox = VariableBox(xSize, ySize).apply(action).also { set(name, it) }
 
-internal class VariableBox(val xSize: Number, val ySize: Number) : ThreeVision() {
+internal class VariableBox(val xSize: Number, val ySize: Number) : ThreeJsVision() {
 
     override fun render(three: ThreePlugin): Object3D {
         val geometry = BoxGeometry(xSize, ySize, 1)
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionPropertyContainer.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionPropertyContainer.kt
index 68567ee3..112295c9 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionPropertyContainer.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionPropertyContainer.kt
@@ -1,12 +1,15 @@
 package space.kscience.visionforge
 
+import space.kscience.dataforge.meta.Config
 import space.kscience.dataforge.meta.MetaItem
+import space.kscience.dataforge.meta.get
+import space.kscience.dataforge.meta.set
 import space.kscience.dataforge.names.Name
 
 /**
  * Property containers are used to create a symmetric behaviors for vision properties and style builders
  */
-public interface VisionPropertyContainer<out T> {
+public interface VisionPropertyContainer<out V: Vision> {
     public fun getProperty(
         name: Name,
         inherit: Boolean = false,
@@ -15,4 +18,18 @@ public interface VisionPropertyContainer<out T> {
     ): MetaItem?
 
     public fun setProperty(name: Name, item: MetaItem?, notify: Boolean = true)
+}
+
+public open class SimpleVisionPropertyContainer<out V: Vision>(protected val config: Config): VisionPropertyContainer<V>{
+    override fun getProperty(
+        name: Name,
+        inherit: Boolean,
+        includeStyles: Boolean,
+        includeDefaults: Boolean
+    ): MetaItem? = config[name]
+
+    override fun setProperty(name: Name, item: MetaItem?, notify: Boolean) {
+        config[name] = item
+    }
+
 }
\ No newline at end of file
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
index 3a7b48af..98b4509e 100644
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/GdmlTransformer.kt
@@ -232,11 +232,10 @@ private class GdmlTransformerEnv(val settings: GdmlTransformer) {
                     bottomRadius = solid.rmax1 * lScale,
                     height = solid.z * lScale,
                     upperRadius = solid.rmax2 * lScale,
+                    startAngle = solid.startphi * aScale,
+                    angle = solid.deltaphi * aScale,
                     name = name
-                ) {
-                    startAngle = solid.startphi * aScale
-                    angle = solid.deltaphi * aScale
-                }
+                )
             } else {
                 coneSurface(
                     bottomOuterRadius = solid.rmax1 * lScale,
@@ -244,11 +243,10 @@ private class GdmlTransformerEnv(val settings: GdmlTransformer) {
                     height = solid.z * lScale,
                     topOuterRadius = solid.rmax2 * lScale,
                     topInnerRadius = solid.rmin2 * lScale,
+                    startAngle = solid.startphi * aScale,
+                    angle = solid.deltaphi * aScale,
                     name = name
-                ) {
-                    startAngle = solid.startphi * aScale
-                    angle = solid.deltaphi * aScale
-                }
+                )
             }
             is GdmlXtru -> extrude(name) {
                 shape {
@@ -276,12 +274,15 @@ private class GdmlTransformerEnv(val settings: GdmlTransformer) {
                     scaleZ = solid.scale.z.toFloat()
                 }
             }
-            is GdmlSphere -> sphereLayer(solid.rmax * lScale, solid.rmin * lScale, name) {
-                phi = solid.deltaphi * aScale
-                theta = solid.deltatheta * aScale
-                phiStart = solid.startphi * aScale
-                thetaStart = solid.starttheta * aScale
-            }
+            is GdmlSphere -> sphereLayer(
+                outerRadius = solid.rmax * lScale,
+                innerRadius = solid.rmin * lScale,
+                phi = solid.deltaphi * aScale,
+                theta = solid.deltatheta * aScale,
+                phiStart = solid.startphi * aScale,
+                thetaStart = solid.starttheta * aScale,
+                name = name,
+            )
             is GdmlOrb -> sphere(solid.r * lScale, name = name)
             is GdmlPolyhedra -> extrude(name) {
                 //getting the radius of first
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt
index 211e3af2..560ec496 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSegment.kt
@@ -15,11 +15,11 @@ import kotlin.math.sin
 @Serializable
 @SerialName("solid.cone")
 public class ConeSegment(
-    public var bottomRadius: Float,
-    public var height: Float,
-    public var topRadius: Float,
-    public var startAngle: Float = 0f,
-    public var angle: Float = PI2
+    public val bottomRadius: Float,
+    public val height: Float,
+    public val topRadius: Float,
+    public val startAngle: Float = 0f,
+    public val angle: Float = PI2
 ) : SolidBase(), GeometrySolid {
 
     override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>) {
@@ -83,10 +83,14 @@ public inline fun VisionContainerBuilder<Solid>.cone(
     bottomRadius: Number,
     height: Number,
     upperRadius: Number = 0.0,
+    startAngle: Number = 0f,
+    angle: Number = PI2,
     name: String? = null,
     block: ConeSegment.() -> Unit = {}
 ): ConeSegment = ConeSegment(
     bottomRadius.toFloat(),
     height.toFloat(),
-    topRadius = upperRadius.toFloat()
+    topRadius = upperRadius.toFloat(),
+    startAngle = startAngle.toFloat(),
+    angle = angle.toFloat()
 ).apply(block).also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSurface.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSurface.kt
index caa8c746..a9c5622b 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSurface.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/ConeSurface.kt
@@ -16,13 +16,13 @@ import kotlin.math.sin
 @Serializable
 @SerialName("solid.coneSurface")
 public class ConeSurface(
-    public var bottomRadius: Float,
-    public var bottomInnerRadius: Float,
-    public var height: Float,
-    public var topRadius: Float,
-    public var topInnerRadius: Float,
-    public var startAngle: Float = 0f,
-    public var angle: Float = PI2,
+    public val bottomRadius: Float,
+    public val bottomInnerRadius: Float,
+    public val height: Float,
+    public val topRadius: Float,
+    public val topInnerRadius: Float,
+    public val startAngle: Float = 0f,
+    public val angle: Float = PI2,
 ) : SolidBase(), GeometrySolid {
 
     init {
@@ -148,6 +148,8 @@ public inline fun VisionContainerBuilder<Solid>.coneSurface(
     height: Number,
     topOuterRadius: Number,
     topInnerRadius: Number,
+    startAngle: Number = 0f,
+    angle: Number = PI2,
     name: String? = null,
     block: ConeSurface.() -> Unit = {},
 ): ConeSurface = ConeSurface(
@@ -156,4 +158,6 @@ public inline fun VisionContainerBuilder<Solid>.coneSurface(
     height = height.toFloat(),
     topRadius = topOuterRadius.toFloat(),
     topInnerRadius = topInnerRadius.toFloat(),
+    startAngle = startAngle.toFloat(),
+    angle = angle.toFloat()
 ).apply(block).also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Extruded.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Extruded.kt
index d5943e3a..40e03512 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Extruded.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Extruded.kt
@@ -2,9 +2,8 @@ package space.kscience.visionforge.solid
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import space.kscience.visionforge.VisionBuilder
-import space.kscience.visionforge.VisionContainerBuilder
-import space.kscience.visionforge.set
+import space.kscience.dataforge.meta.Config
+import space.kscience.visionforge.*
 import kotlin.math.PI
 import kotlin.math.cos
 import kotlin.math.sin
@@ -13,7 +12,7 @@ import kotlin.math.sin
 public typealias Shape2D = List<Point2D>
 
 @Serializable
-public class Shape2DBuilder(private val points: MutableList<Point2D> = ArrayList()) {
+public class Shape2DBuilder(private val points: ArrayList<Point2D> = ArrayList()) {
 
     public fun point(x: Number, y: Number) {
         points.add(Point2D(x, y))
@@ -38,19 +37,9 @@ public data class Layer(var x: Float, var y: Float, var z: Float, var scale: Flo
 @Serializable
 @SerialName("solid.extrude")
 public class Extruded(
-    public var shape: List<Point2D> = ArrayList(),
-    public var layers: MutableList<Layer> = ArrayList()
-) : SolidBase(), GeometrySolid {
-
-    public fun shape(block: Shape2DBuilder.() -> Unit) {
-        this.shape = Shape2DBuilder().apply(block).build()
-        //TODO send invalidation signal
-    }
-
-    public fun layer(z: Number, x: Number = 0.0, y: Number = 0.0, scale: Number = 1.0) {
-        layers.add(Layer(x.toFloat(), y.toFloat(), z.toFloat(), scale.toFloat()))
-        //TODO send invalidation signal
-    }
+    public val shape: List<Point2D>,
+    public val layers: List<Layer>
+) : SolidBase(), GeometrySolid, VisionPropertyContainer<Extruded> {
 
     override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>) {
         val shape: Shape2D = shape
@@ -103,6 +92,24 @@ public class Extruded(
     }
 }
 
+public class ExtrudeBuilder(
+    public var shape: List<Point2D> = emptyList(),
+    public var layers: ArrayList<Layer> = ArrayList(),
+    config: Config = Config()
+) : SimpleVisionPropertyContainer<Extruded>(config) {
+    public fun shape(block: Shape2DBuilder.() -> Unit) {
+        this.shape = Shape2DBuilder().apply(block).build()
+    }
+
+    public fun layer(z: Number, x: Number = 0.0, y: Number = 0.0, scale: Number = 1.0) {
+        layers.add(Layer(x.toFloat(), y.toFloat(), z.toFloat(), scale.toFloat()))
+    }
+
+    internal fun build(): Extruded = Extruded(shape, layers).apply { configure(config) }
+}
+
 @VisionBuilder
-public fun VisionContainerBuilder<Solid>.extrude(name: String? = null, action: Extruded.() -> Unit = {}): Extruded =
-    Extruded().apply(action).also { set(name, it) }
\ No newline at end of file
+public fun VisionContainerBuilder<Solid>.extrude(
+    name: String? = null,
+    action: ExtrudeBuilder.() -> Unit = {}
+): Extruded = ExtrudeBuilder().apply(action).build().also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/PolyLine.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/PolyLine.kt
index 41fe9903..cd9f2cbd 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/PolyLine.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/PolyLine.kt
@@ -13,7 +13,7 @@ import space.kscience.visionforge.set
 
 @Serializable
 @SerialName("solid.line")
-public class PolyLine(public var points: List<Point3D>) : SolidBase(), Solid {
+public class PolyLine(public val points: List<Point3D>) : SolidBase(), Solid {
 
     //var lineType by string()
     public var thickness: Number by allProperties(inherit = false).number(1.0,
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
index a4c8e69c..0a59d141 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
@@ -37,6 +37,8 @@ public interface Solid : Vision {
 
     override val descriptor: NodeDescriptor get() = Companion.descriptor
 
+
+
     public companion object {
         //        val SELECTED_KEY = "selected".asName()
         public val DETAIL_KEY: Name = "detail".asName()
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt
index c88052b2..d2fee33a 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidBase.kt
@@ -2,11 +2,7 @@ package space.kscience.visionforge.solid
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import space.kscience.dataforge.meta.Meta
 import space.kscience.dataforge.meta.descriptors.NodeDescriptor
-import space.kscience.dataforge.meta.float
-import space.kscience.dataforge.meta.get
-import space.kscience.dataforge.meta.node
 import space.kscience.visionforge.VisionBase
 import space.kscience.visionforge.VisionChange
 
@@ -20,15 +16,3 @@ public open class SolidBase : VisionBase(), Solid {
         super.update(change)
     }
 }
-
-internal fun Meta.toVector(default: Float = 0f) = Point3D(
-    this[Solid.X_KEY].float ?: default,
-    this[Solid.Y_KEY].float ?: default,
-    this[Solid.Z_KEY].float ?: default
-)
-
-internal fun Solid.updatePosition(meta: Meta?) {
-    meta[Solid.POSITION_KEY].node?.toVector()?.let { position = it }
-    meta[Solid.ROTATION_KEY].node?.toVector()?.let { rotation = it }
-    meta[Solid.SCALE_KEY].node?.toVector(1f)?.let { scale = it }
-}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidLabel.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidLabel.kt
index ac45e22e..3e725d0d 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidLabel.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidLabel.kt
@@ -9,9 +9,9 @@ import space.kscience.visionforge.set
 @Serializable
 @SerialName("solid.label")
 public class SolidLabel(
-    public var text: String,
-    public var fontSize: Double,
-    public var fontFamily: String,
+    public val text: String,
+    public val fontSize: Double,
+    public val fontFamily: String,
 ) : SolidBase(), Solid
 
 @VisionBuilder
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Sphere.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Sphere.kt
index c4d67f97..a6af3cd8 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Sphere.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Sphere.kt
@@ -4,6 +4,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import space.kscience.visionforge.VisionBuilder
 import space.kscience.visionforge.VisionContainerBuilder
+import space.kscience.visionforge.VisionPropertyContainer
 import space.kscience.visionforge.set
 import kotlin.math.PI
 import kotlin.math.cos
@@ -12,12 +13,12 @@ import kotlin.math.sin
 @Serializable
 @SerialName("solid.sphere")
 public class Sphere(
-    public var radius: Float,
-    public var phiStart: Float = 0f,
-    public var phi: Float = PI2,
-    public var thetaStart: Float = 0f,
-    public var theta: Float = PI.toFloat(),
-) : SolidBase(), GeometrySolid {
+    public val radius: Float,
+    public val phiStart: Float = 0f,
+    public val phi: Float = PI2,
+    public val thetaStart: Float = 0f,
+    public val theta: Float = PI.toFloat(),
+) : SolidBase(), GeometrySolid, VisionPropertyContainer<Sphere> {
 
     override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>) {
         fun point3DfromSphCoord(r: Float, theta: Float, phi: Float): Point3D {
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SphereLayer.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SphereLayer.kt
index 83e358e2..05149e2e 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SphereLayer.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SphereLayer.kt
@@ -15,12 +15,12 @@ import kotlin.math.sin
 @Serializable
 @SerialName("solid.sphereLayer")
 public class SphereLayer(
-    public var outerRadius: Float,
-    public var innerRadius: Float,
-    public var phiStart: Float = 0f,
-    public var phi: Float = PI2,
-    public var thetaStart: Float = 0f,
-    public var theta: Float = PI.toFloat(),
+    public val outerRadius: Float,
+    public val innerRadius: Float,
+    public val phiStart: Float = 0f,
+    public val phi: Float = PI2,
+    public val thetaStart: Float = 0f,
+    public val theta: Float = PI.toFloat(),
 ) : SolidBase(), GeometrySolid {
 
     override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>): Unit = geometryBuilder.run {
@@ -72,9 +72,17 @@ public class SphereLayer(
 public inline fun VisionContainerBuilder<Solid>.sphereLayer(
     outerRadius: Number,
     innerRadius: Number,
+    phiStart: Number = 0f,
+    phi: Number = PI2,
+    thetaStart: Number = 0f,
+    theta: Number = PI.toFloat(),
     name: String? = null,
     action: SphereLayer.() -> Unit = {},
 ): SphereLayer = SphereLayer(
     outerRadius.toFloat(),
     innerRadius.toFloat(),
+    phiStart.toFloat(),
+    phi.toFloat(),
+    thetaStart.toFloat(),
+    theta.toFloat()
 ).apply(action).also { set(name, it) }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/geometry.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/geometry.kt
index e8813779..f5aa2d4a 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/geometry.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/geometry.kt
@@ -105,4 +105,17 @@ public fun Point3D.toMeta(): MetaBuilder = Meta {
     X_KEY put x
     Y_KEY put y
     Z_KEY put z
+}
+
+
+internal fun Meta.toVector(default: Float = 0f) = Point3D(
+    this[Solid.X_KEY].float ?: default,
+    this[Solid.Y_KEY].float ?: default,
+    this[Solid.Z_KEY].float ?: default
+)
+
+internal fun Solid.updatePosition(meta: Meta?) {
+    meta[Solid.POSITION_KEY].node?.toVector()?.let { position = it }
+    meta[Solid.ROTATION_KEY].node?.toVector()?.let { rotation = it }
+    meta[Solid.SCALE_KEY].node?.toVector(1f)?.let { scale = it }
 }
\ No newline at end of file
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeVision.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeJsVision.kt
similarity index 83%
rename from visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeVision.kt
rename to visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeJsVision.kt
index 16d1bd4f..27a5da44 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeVision.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeJsVision.kt
@@ -6,6 +6,6 @@ import space.kscience.visionforge.solid.SolidBase
 /**
  * A custom visual object that has its own Three.js renderer
  */
-public abstract class ThreeVision : SolidBase() {
+public abstract class ThreeJsVision : SolidBase() {
     public abstract fun render(three: ThreePlugin): Object3D
 }
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
index 68fa692a..e6d85dc5 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreePlugin.kt
@@ -49,7 +49,7 @@ public class ThreePlugin : AbstractPlugin(), ElementVisionRenderer {
     }
 
     public fun buildObject3D(obj: Solid): Object3D = when (obj) {
-        is ThreeVision -> obj.render(this)
+        is ThreeJsVision -> obj.render(this)
         is SolidReferenceGroup -> ThreeReferenceFactory(this, obj)
         is SolidGroup -> {
             val group = ThreeGroup()

From f2e7e16d624479fdb41545beb312ff31c6a7e3d2 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Mon, 12 Jul 2021 22:50:00 +0300
Subject: [PATCH 141/151] [WIP] layer marking

---
 CHANGELOG.md                                  |  1 +
 .../visionforge/gdml/demo/GDMLAppComponent.kt |  5 +-
 .../kscience/visionforge/gdml/layerMarker.kt  | 23 -------
 .../kscience/visionforge/gdml/markLayers.kt   | 62 +++++++++++++++++++
 .../visionforge/solid/SolidReference.kt       |  2 +-
 .../kscience/visionforge/solid/Sphere.kt      |  2 +-
 visionforge-threejs/build.gradle.kts          |  2 +-
 .../solid/three/ThreeGeometryBuilder.kt       |  3 -
 8 files changed, 70 insertions(+), 30 deletions(-)
 delete mode 100644 visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/layerMarker.kt
 create mode 100644 visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/markLayers.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aff57288..8c84f7aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - Tube is replaced by more general ConeSurface
 - position, rotation and size moved to properties
 - prototypes moved to children
+- Immutable Solid instances
 
 ### Deprecated
 
diff --git a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
index 1d619dfb..fe2d377c 100644
--- a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
@@ -32,7 +32,10 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
         val parsedVision = when {
             name.endsWith(".gdml") || name.endsWith(".xml") -> {
                 val gdml = Gdml.decodeFromString(data)
-                gdml.toVision()
+                gdml.toVision().apply {
+//                    console.info("Marking layers for file $name")
+//                    markLayers()
+                }
             }
             name.endsWith(".json") -> visionManager.decodeFromString(data)
             else -> {
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/layerMarker.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/layerMarker.kt
deleted file mode 100644
index 17b75e79..00000000
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/layerMarker.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package space.kscience.visionforge.gdml
-
-import space.kscience.dataforge.names.Name
-import space.kscience.dataforge.names.plus
-import space.kscience.visionforge.VisionGroup
-
-private fun VisionGroup.countChildren(namePrefix: Name, cache: MutableMap<Name, Int> = hashMapOf()): Int {
-    var counter = 0
-    children.forEach { (token, child) ->
-        if (child is VisionGroup) {
-            counter += child.countChildren(namePrefix + token, cache)
-        } else {
-            counter++
-        }
-    }
-    cache[namePrefix] = counter
-    return counter
-}
-
-
-public fun VisionGroup.processLayers() {
-
-}
\ No newline at end of file
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/markLayers.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/markLayers.kt
new file mode 100644
index 00000000..2689d1d6
--- /dev/null
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/markLayers.kt
@@ -0,0 +1,62 @@
+package space.kscience.visionforge.gdml
+
+import space.kscience.dataforge.names.Name
+import space.kscience.dataforge.names.NameToken
+import space.kscience.dataforge.names.length
+import space.kscience.dataforge.names.plus
+import space.kscience.visionforge.VisionGroup
+import space.kscience.visionforge.solid.Solid
+import space.kscience.visionforge.solid.SolidGroup
+import space.kscience.visionforge.solid.layer
+
+private class VisionCounterTree(
+    val name: Name,
+    val vision: Solid,
+) {
+    val children: Map<NameToken, VisionCounterTree> =
+        (vision as? VisionGroup)?.children?.mapValues {
+            VisionCounterTree(name + it.key, it.value as Solid)
+        } ?: emptyMap()
+
+//
+//    val directChildrenCount: Int by lazy {
+//        children.size
+//    }
+
+    val childrenCount: Int =
+        children.values.sumOf { it.childrenCount + 1 }
+
+}
+
+
+private fun VisionCounterTree.topToBottom(): Sequence<VisionCounterTree> = sequence {
+    yield(this@topToBottom)
+    children.values.forEach {
+        yieldAll(it.topToBottom())
+    }
+}
+
+public fun SolidGroup.markLayers(thresholds: List<Int> = listOf(1000, 20000, 100000)) {
+    val counterTree = VisionCounterTree(Name.EMPTY, this)
+    val totalCount = counterTree.childrenCount
+    if (totalCount > thresholds.firstOrNull() ?: 0) {
+        val allNodes = counterTree.topToBottom().toMutableList()
+        //println("tree construction finished")
+        allNodes.sortWith(compareBy<VisionCounterTree>({ it.name.length }, { it.childrenCount }).reversed())
+
+        //mark layers
+        var removed = 0
+        var thresholdIndex = thresholds.indexOfLast { it < totalCount }
+
+        for (node in allNodes) {
+            node.vision.layer = thresholdIndex + 1
+            removed++
+            if (totalCount - removed < thresholds[thresholdIndex]) {
+                thresholdIndex--
+            }
+            if (thresholdIndex < 0) break
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
index 2b7a8358..1ba659b9 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
@@ -100,7 +100,7 @@ public class SolidReferenceGroup(
     private class ReferenceChild(
         val owner: SolidReferenceGroup,
         private val childName: Name
-    ) : SolidReference, VisionGroup {
+    ) : SolidReference, VisionGroup, Solid {
 
         override val prototype: Solid by lazy {
             if (childName.isEmpty()) owner.prototype else {
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Sphere.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Sphere.kt
index a6af3cd8..bae8d83d 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Sphere.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Sphere.kt
@@ -17,7 +17,7 @@ public class Sphere(
     public val phiStart: Float = 0f,
     public val phi: Float = PI2,
     public val thetaStart: Float = 0f,
-    public val theta: Float = PI.toFloat(),
+    public val theta: Float = PI .toFloat(),
 ) : SolidBase(), GeometrySolid, VisionPropertyContainer<Sphere> {
 
     override fun <T : Any> toGeometry(geometryBuilder: GeometryBuilder<T>) {
diff --git a/visionforge-threejs/build.gradle.kts b/visionforge-threejs/build.gradle.kts
index 32803a61..a862f776 100644
--- a/visionforge-threejs/build.gradle.kts
+++ b/visionforge-threejs/build.gradle.kts
@@ -5,5 +5,5 @@ plugins {
 dependencies {
     api(project(":visionforge-solid"))
     implementation(npm("three", "0.130.1"))
-    implementation(npm("three-csg-ts", "3.1.4"))
+    implementation(npm("three-csg-ts", "3.1.5"))
 }
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt
index c1c5aa72..4f3e0b58 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt
@@ -54,9 +54,6 @@ public class ThreeGeometryBuilder : GeometryBuilder<BufferGeometry> {
         setAttribute("position", Float32BufferAttribute(positions.toTypedArray(), 3))
         setAttribute("normal", Float32BufferAttribute(normals.toTypedArray(), 3))
         //setAttribute("color", Float32BufferAttribute(colors.toFloatArray(), 3))
-        //a temporary fix for CSG problem
-        val uvsArray = Array<Float>((counter+1)*2){0f}
-        setAttribute("uv", Float32BufferAttribute(uvsArray, 2))
 
         computeBoundingSphere()
     }

From 8f95d6f48592018896bcb040823ed528915c8c9c Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 14 Jul 2021 15:45:01 +0300
Subject: [PATCH 142/151] layer marking

---
 .../visionforge/gdml/demo/GDMLAppComponent.kt |  6 +-
 .../kscience/visionforge/gdml/markLayers.kt   | 72 +++++++++++++------
 .../visionforge/solid/SolidReference.kt       | 22 +++---
 .../solid/three/MeshThreeFactory.kt           |  4 +-
 .../visionforge/solid/three/ThreeCanvas.kt    |  7 +-
 .../solid/three/ThreeGeometryBuilder.kt       |  3 +
 6 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
index fe2d377c..4f6560b6 100644
--- a/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
+++ b/demo/gdml/src/jsMain/kotlin/space/kscience/visionforge/gdml/demo/GDMLAppComponent.kt
@@ -10,6 +10,7 @@ import space.kscience.dataforge.context.fetch
 import space.kscience.dataforge.names.Name
 import space.kscience.gdml.Gdml
 import space.kscience.gdml.decodeFromString
+import space.kscience.visionforge.gdml.markLayers
 import space.kscience.visionforge.gdml.toVision
 import space.kscience.visionforge.ring.ThreeCanvasWithControls
 import space.kscience.visionforge.ring.tab
@@ -33,8 +34,9 @@ val GDMLApp = functionalComponent<GDMLAppProps>("GDMLApp") { props ->
             name.endsWith(".gdml") || name.endsWith(".xml") -> {
                 val gdml = Gdml.decodeFromString(data)
                 gdml.toVision().apply {
-//                    console.info("Marking layers for file $name")
-//                    markLayers()
+                    root(visionManager)
+                    console.info("Marking layers for file $name")
+                    markLayers()
                 }
             }
             name.endsWith(".json") -> visionManager.decodeFromString(data)
diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/markLayers.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/markLayers.kt
index 2689d1d6..a47374d0 100644
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/markLayers.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/markLayers.kt
@@ -1,5 +1,7 @@
 package space.kscience.visionforge.gdml
 
+import space.kscience.dataforge.context.info
+import space.kscience.dataforge.context.logger
 import space.kscience.dataforge.names.Name
 import space.kscience.dataforge.names.NameToken
 import space.kscience.dataforge.names.length
@@ -7,24 +9,36 @@ import space.kscience.dataforge.names.plus
 import space.kscience.visionforge.VisionGroup
 import space.kscience.visionforge.solid.Solid
 import space.kscience.visionforge.solid.SolidGroup
+import space.kscience.visionforge.solid.SolidReferenceGroup
 import space.kscience.visionforge.solid.layer
 
+
 private class VisionCounterTree(
     val name: Name,
     val vision: Solid,
+    val prototypes: HashMap<Name, VisionCounterTree>
 ) {
-    val children: Map<NameToken, VisionCounterTree> =
-        (vision as? VisionGroup)?.children?.mapValues {
-            VisionCounterTree(name + it.key, it.value as Solid)
+
+    // self count for prototypes
+    var selfCount = 1
+
+    val children: Map<NameToken, VisionCounterTree> by lazy {
+        (vision as? VisionGroup)?.children?.mapValues { (key, vision) ->
+            if (vision is SolidReferenceGroup) {
+                prototypes.getOrPut(vision.refName) {
+                    VisionCounterTree(vision.refName, vision.prototype, prototypes)
+                }.apply {
+                    selfCount += 1
+                }
+            } else {
+                VisionCounterTree(name + key, vision as Solid, prototypes)
+            }
         } ?: emptyMap()
+    }
 
-//
-//    val directChildrenCount: Int by lazy {
-//        children.size
-//    }
-
-    val childrenCount: Int =
+    val childrenCount: Int by lazy {
         children.values.sumOf { it.childrenCount + 1 }
+    }
 
 }
 
@@ -36,27 +50,41 @@ private fun VisionCounterTree.topToBottom(): Sequence<VisionCounterTree> = seque
     }
 }
 
-public fun SolidGroup.markLayers(thresholds: List<Int> = listOf(1000, 20000, 100000)) {
-    val counterTree = VisionCounterTree(Name.EMPTY, this)
+public fun SolidGroup.markLayers(thresholds: List<Int> = listOf(500, 1000, 20000, 50000)) {
+    val logger = manager?.context?.logger
+    val counterTree = VisionCounterTree(Name.EMPTY, this, hashMapOf())
     val totalCount = counterTree.childrenCount
     if (totalCount > thresholds.firstOrNull() ?: 0) {
-        val allNodes = counterTree.topToBottom().toMutableList()
+        val allNodes = counterTree.topToBottom().filter { it.selfCount > 1 }.distinct().toMutableList()
         //println("tree construction finished")
-        allNodes.sortWith(compareBy<VisionCounterTree>({ it.name.length }, { it.childrenCount }).reversed())
+        allNodes.sortWith(
+            compareBy<VisionCounterTree>(
+                { it.name.length },
+                { it.childrenCount * it.selfCount }
+            ).reversed()
+        )
 
         //mark layers
-        var removed = 0
-        var thresholdIndex = thresholds.indexOfLast { it < totalCount }
+        var remaining = totalCount
 
         for (node in allNodes) {
-            node.vision.layer = thresholdIndex + 1
-            removed++
-            if (totalCount - removed < thresholds[thresholdIndex]) {
-                thresholdIndex--
+            val layerIndex = if (remaining > thresholds.last())
+                thresholds.size
+            else
+                thresholds.indexOfLast { remaining < it }
+
+            if (layerIndex == 0) break
+
+            node.vision.layer = layerIndex
+            val removedCount = node.selfCount * node.children.size
+            logger?.apply {
+                if (node.selfCount > 1) {
+                    info { "Prototype with name ${node.name} moved to layer $layerIndex" }
+                } else {
+                    info { "Vision with name ${node.name} moved to layer $layerIndex" }
+                }
             }
-            if (thresholdIndex < 0) break
+            remaining -= removedCount
         }
-
-
     }
 }
\ No newline at end of file
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
index 1ba659b9..1cb5eac8 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/SolidReference.kt
@@ -99,15 +99,15 @@ public class SolidReferenceGroup(
      */
     private class ReferenceChild(
         val owner: SolidReferenceGroup,
-        private val childName: Name
+        private val refName: Name
     ) : SolidReference, VisionGroup, Solid {
 
         override val prototype: Solid by lazy {
-            if (childName.isEmpty()) owner.prototype else {
-                val proto = (owner.prototype as? VisionGroup)?.get(childName)
-                    ?: error("Prototype with name $childName not found in SolidReferenceGroup ${owner.refName}")
+            if (refName.isEmpty()) owner.prototype else {
+                val proto = (owner.prototype as? VisionGroup)?.get(refName)
+                    ?: error("Prototype with name $refName not found in SolidReferenceGroup ${owner.refName}")
                 proto.unref as? Solid
-                    ?: error("Prototype with name $childName is ${proto::class} but expected Solid")
+                    ?: error("Prototype with name $refName is ${proto::class} but expected Solid")
             }
         }
 
@@ -115,14 +115,14 @@ public class SolidReferenceGroup(
             get() = (prototype as? VisionGroup)?.children
                 ?.filter { it.key != SolidGroup.PROTOTYPES_TOKEN }
                 ?.mapValues { (key, _) ->
-                    ReferenceChild(owner, childName + key.asName())
+                    ReferenceChild(owner, refName + key.asName())
                 } ?: emptyMap()
 
         override fun getOwnProperty(name: Name): MetaItem? =
-            owner.getOwnProperty(childPropertyName(childName, name))
+            owner.getOwnProperty(childPropertyName(refName, name))
 
         override fun setProperty(name: Name, item: MetaItem?, notify: Boolean) {
-            owner.setProperty(childPropertyName(childName, name), item, notify)
+            owner.setProperty(childPropertyName(refName, name), item, notify)
         }
 
         override fun getProperty(
@@ -134,7 +134,7 @@ public class SolidReferenceGroup(
 
         override var parent: VisionGroup?
             get() {
-                val parentName = childName.cutLast()
+                val parentName = refName.cutLast()
                 return if (parentName.isEmpty()) owner else ReferenceChild(owner, parentName)
             }
             set(_) {
@@ -144,7 +144,7 @@ public class SolidReferenceGroup(
         @DFExperimental
         override val propertyChanges: Flow<Name>
             get() = owner.propertyChanges.mapNotNull { name ->
-                if (name.startsWith(childToken(childName))) {
+                if (name.startsWith(childToken(refName))) {
                     name.cutFirst()
                 } else {
                     null
@@ -152,7 +152,7 @@ public class SolidReferenceGroup(
             }
 
         override fun invalidateProperty(propertyName: Name) {
-            owner.invalidateProperty(childPropertyName(childName, propertyName))
+            owner.invalidateProperty(childPropertyName(refName, propertyName))
         }
 
         override fun update(change: VisionChange) {
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/MeshThreeFactory.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/MeshThreeFactory.kt
index 14665a8b..7cbd4d3d 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/MeshThreeFactory.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/MeshThreeFactory.kt
@@ -74,9 +74,9 @@ internal fun Mesh.applyProperties(obj: Solid): Mesh = apply {
     updateMaterial(obj)
     applyEdges(obj)
     //applyWireFrame(obj)
-    layers.enable(obj.layer)
+    layers.set(obj.layer)
     children.forEach {
-        it.layers.enable(obj.layer)
+        it.layers.set(obj.layer)
     }
 }
 
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
index 7dd89a32..3afb6776 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeCanvas.kt
@@ -250,8 +250,11 @@ public class ThreeCanvas(
     }
 
     public fun render(vision: Solid) {
-        three.logger.info { "Replacing root node in three canvas" }
-        scene.findChild("@root".asName())?.let { scene.remove(it) }
+        if (root != null) {
+            three.logger.info { "Replacing root node in three canvas" }
+            scene.findChild("@root".asName())?.let { scene.remove(it) }
+            root?.dispose()
+        }
 
         val object3D = three.buildObject3D(vision)
         object3D.name = "@root"
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt
index 4f3e0b58..c1c5aa72 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/ThreeGeometryBuilder.kt
@@ -54,6 +54,9 @@ public class ThreeGeometryBuilder : GeometryBuilder<BufferGeometry> {
         setAttribute("position", Float32BufferAttribute(positions.toTypedArray(), 3))
         setAttribute("normal", Float32BufferAttribute(normals.toTypedArray(), 3))
         //setAttribute("color", Float32BufferAttribute(colors.toFloatArray(), 3))
+        //a temporary fix for CSG problem
+        val uvsArray = Array<Float>((counter+1)*2){0f}
+        setAttribute("uv", Float32BufferAttribute(uvsArray, 2))
 
         computeBoundingSphere()
     }

From 38c76e824d550bcadbd9ff1ab3feb04b28e50e23 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 14 Jul 2021 15:50:56 +0300
Subject: [PATCH 143/151] layer marking

---
 .../kotlin/space/kscience/visionforge/gdml/markLayers.kt   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/markLayers.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/markLayers.kt
index a47374d0..dfee104e 100644
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/markLayers.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/markLayers.kt
@@ -76,15 +76,14 @@ public fun SolidGroup.markLayers(thresholds: List<Int> = listOf(500, 1000, 20000
             if (layerIndex == 0) break
 
             node.vision.layer = layerIndex
-            val removedCount = node.selfCount * node.children.size
+            remaining -= node.selfCount * node.childrenCount
             logger?.apply {
                 if (node.selfCount > 1) {
-                    info { "Prototype with name ${node.name} moved to layer $layerIndex" }
+                    info { "Prototype with name ${node.name} moved to layer $layerIndex. $remaining nodes remains" }
                 } else {
-                    info { "Vision with name ${node.name} moved to layer $layerIndex" }
+                    info { "Vision with name ${node.name} moved to layer $layerIndex. $remaining nodes remains" }
                 }
             }
-            remaining -= removedCount
         }
     }
 }
\ No newline at end of file

From e1138be8618fcb1bf52038c0915ff3b0085748cb Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 15 Jul 2021 12:28:25 +0300
Subject: [PATCH 144/151] layer marking

---
 .../kotlin/space/kscience/visionforge/gdml/markLayers.kt    | 6 +++---
 .../kotlin/space/kscience/visionforge/solid/Solid.kt        | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/markLayers.kt b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/markLayers.kt
index dfee104e..befc69bb 100644
--- a/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/markLayers.kt
+++ b/visionforge-gdml/src/commonMain/kotlin/space/kscience/visionforge/gdml/markLayers.kt
@@ -55,12 +55,12 @@ public fun SolidGroup.markLayers(thresholds: List<Int> = listOf(500, 1000, 20000
     val counterTree = VisionCounterTree(Name.EMPTY, this, hashMapOf())
     val totalCount = counterTree.childrenCount
     if (totalCount > thresholds.firstOrNull() ?: 0) {
-        val allNodes = counterTree.topToBottom().filter { it.selfCount > 1 }.distinct().toMutableList()
+        val allNodes = counterTree.topToBottom().distinct().toMutableList()
         //println("tree construction finished")
         allNodes.sortWith(
             compareBy<VisionCounterTree>(
                 { it.name.length },
-                { it.childrenCount * it.selfCount }
+                { (it.children.size + 1) * it.selfCount }
             ).reversed()
         )
 
@@ -76,7 +76,7 @@ public fun SolidGroup.markLayers(thresholds: List<Int> = listOf(500, 1000, 20000
             if (layerIndex == 0) break
 
             node.vision.layer = layerIndex
-            remaining -= node.selfCount * node.childrenCount
+            remaining -= node.selfCount * (node.children.size + 1)
             logger?.apply {
                 if (node.selfCount > 1) {
                     info { "Prototype with name ${node.name} moved to layer $layerIndex. $remaining nodes remains" }
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
index 0a59d141..a4c8e69c 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Solid.kt
@@ -37,8 +37,6 @@ public interface Solid : Vision {
 
     override val descriptor: NodeDescriptor get() = Companion.descriptor
 
-
-
     public companion object {
         //        val SELECTED_KEY = "selected".asName()
         public val DETAIL_KEY: Name = "detail".asName()

From 95220422cc15cd25ed1b18b1a38f8597d51d5a16 Mon Sep 17 00:00:00 2001
From: kiruma524 <71787194+kiruma524@users.noreply.github.com>
Date: Thu, 15 Jul 2021 12:47:25 +0300
Subject: [PATCH 145/151] Updated OrbitControls

Made some changes, but there're still some problems
---
 .../visionforge/solid/OrbitControls.kt        | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt
index a32e44f5..6b82e2a0 100644
--- a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt
@@ -38,7 +38,7 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
     val baseZProperty = SimpleDoubleProperty(0.0)
     var z by baseZProperty
 
-    private val baseTranslate = Translate()
+    private val baseTranslate = Translate(0.0, 0.0, 0.0)
 
 //    val basePositionProperty: ObjectBinding<Point3D> =
 //        nonNullObjectBinding(baseXProperty, baseYProperty, baseZProperty) {
@@ -59,13 +59,13 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
 
     private val ry = Rotate(0.0, Rotate.Y_AXIS)
 
-    private val rz = Rotate(0.0, Rotate.Z_AXIS)
+    private val translate = Translate(0.0, 0.0, 0.0)
 
-    private val translate = Translate()
+    //private val rz = Rotate(0.0, Rotate.Z_AXIS)
 
 
     init {
-        camera.transforms.setAll(rx, ry, rz, translate)
+        camera.transforms.setAll(baseTranslate, ry, rx, translate)
         update()
         val listener = InvalidationListener {
             update()
@@ -78,8 +78,8 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
         baseZProperty.addListener(listener)
 
         canvas.apply {
-//            center.xProperty().bind(widthProperty().divide(2))
-//            center.zProperty().bind(heightProperty().divide(2))
+            //center.xProperty().bind(widthProperty().divide(2))
+            //center.zProperty().bind(heightProperty().divide(2))
             handleMouse()
         }
 //        coordinateContainer?.vbox {
@@ -93,32 +93,32 @@ class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec:
         val spherePosition = Point3D(
             sin(zenith) * sin(azimuth),
             cos(zenith),
-            sin(zenith) * cos(azimuth)
+            sin(zenith) * cos(azimuth),
         ).times(distance)
         val basePosition = Point3D(x, y, z)
         baseTranslate.x = x
         baseTranslate.y = y
         baseTranslate.z = z
         //Create direction vector
-        val cameraPosition = basePosition + spherePosition
+        val camPosition = basePosition+spherePosition
         val camDirection: Point3D = (-spherePosition).normalize()
 
         val xRotation = Math.toDegrees(asin(-camDirection.y))
         val yRotation = Math.toDegrees(atan2(camDirection.x, camDirection.z))
 
-        rx.pivotX = cameraPosition.x
-        rx.pivotY = cameraPosition.y
-        rx.pivotZ = cameraPosition.z
+        rx.pivotX = camPosition.x
+        rx.pivotY = camPosition.y
+        rx.pivotZ = camPosition.z
         rx.angle = xRotation
 
-        ry.pivotX = cameraPosition.x
-        ry.pivotY = cameraPosition.y
-        ry.pivotZ = cameraPosition.z
+        ry.pivotX = camPosition.x
+        ry.pivotY = camPosition.y
+        ry.pivotZ = camPosition.z
         ry.angle = yRotation
 
-        translate.x = cameraPosition.x
-        translate.y = cameraPosition.y
-        translate.z = cameraPosition.z
+        translate.x = camPosition.x
+        translate.y = camPosition.y
+        translate.z = camPosition.z
     }
 
 

From 493c527743d34c38d8be3b8fc49ad6d0221f664d Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 15 Jul 2021 18:39:43 +0300
Subject: [PATCH 146/151] OrbitControls for FX finally working

---
 visionforge-fx/build.gradle.kts               |   2 +-
 .../visionforge/solid/OrbitControls.kt        | 150 +++++++-----------
 2 files changed, 58 insertions(+), 94 deletions(-)

diff --git a/visionforge-fx/build.gradle.kts b/visionforge-fx/build.gradle.kts
index 391517d7..09adb66a 100644
--- a/visionforge-fx/build.gradle.kts
+++ b/visionforge-fx/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
         exclude(group = "org.openjfx")
     }
 
-    api("org.fxyz3d:fxyz3d:0.5.2") {
+    api("org.fxyz3d:fxyz3d:0.5.4") {
         exclude(module = "slf4j-simple")
     }
     api("org.jetbrains.kotlinx:kotlinx-coroutines-javafx:${ru.mipt.npm.gradle.KScienceVersions.coroutinesVersion}")
diff --git a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt
index 32d17d63..5f15fe37 100644
--- a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt
@@ -1,55 +1,73 @@
 package space.kscience.visionforge.solid
 
-import javafx.beans.InvalidationListener
 import javafx.beans.property.SimpleBooleanProperty
 import javafx.beans.property.SimpleDoubleProperty
 import javafx.event.EventHandler
-import javafx.geometry.Point3D
 import javafx.scene.Camera
 import javafx.scene.Node
 import javafx.scene.SubScene
-import javafx.scene.input.MouseEvent
-import javafx.scene.input.ScrollEvent
 import javafx.scene.shape.Sphere
 import javafx.scene.transform.Rotate
+import javafx.scene.transform.Rotate.X_AXIS
+import javafx.scene.transform.Rotate.Y_AXIS
 import javafx.scene.transform.Translate
+import space.kscience.dataforge.meta.useProperty
 import tornadofx.*
-import kotlin.math.*
+import kotlin.math.PI
+import kotlin.math.cos
+import kotlin.math.max
+import kotlin.math.sin
 import space.kscience.visionforge.solid.specifications.Camera as CameraSpec
 
-
 public class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec: CameraSpec) {
 
-    public val distanceProperty: SimpleDoubleProperty = SimpleDoubleProperty(spec.distance)
-    public var distance: Double by distanceProperty
-
     public val azimuthProperty: SimpleDoubleProperty = SimpleDoubleProperty(spec.azimuth)
     public var azimuth: Double by azimuthProperty
 
     public val zenithProperty: SimpleDoubleProperty = SimpleDoubleProperty(PI / 2 - spec.latitude)
     public var zenith: Double by zenithProperty
-//
-//    public val latitudeProperty: DoubleBinding = zenithProperty.unaryMinus().plus(PI / 2)
-//    public val latitude by latitudeProperty
 
-    public val baseXProperty: SimpleDoubleProperty = SimpleDoubleProperty(0.0)
-    public var x: Double by baseXProperty
-    public val baseYProperty: SimpleDoubleProperty = SimpleDoubleProperty(0.0)
-    public var y: Double by baseYProperty
-    public val baseZProperty: SimpleDoubleProperty = SimpleDoubleProperty(0.0)
-    public var z: Double by baseZProperty
 
     private val baseTranslate = Translate(0.0, 0.0, 0.0)
 
-//    val basePositionProperty: ObjectBinding<Point3D> =
-//        nonNullObjectBinding(baseXProperty, baseYProperty, baseZProperty) {
-//            Point3D(x, y, z)
-//        }
-//
-//    val basePosition by basePositionProperty
+    public var x: Double by baseTranslate.xProperty()
+    public var y: Double by baseTranslate.yProperty()
+    public var z: Double by baseTranslate.zProperty()
+
+    private val distanceProperty = SimpleDoubleProperty().apply {
+        spec.useProperty(CameraSpec::distance) {
+            set(it)
+        }
+    }
+
+    private val distanceTranslation = Translate().apply {
+        zProperty().bind(-distanceProperty)
+    }
+
+    public var distance: Double by distanceProperty
+
+    private val centering = Translate().apply {
+        xProperty().bind(-canvas.widthProperty() / 2)
+        yProperty().bind(-canvas.heightProperty() / 2)
+    }
+
+    private val yUpRotation = Rotate(180.0, X_AXIS)
+
+    private val azimuthRotation = Rotate().apply {
+        axis = Y_AXIS
+        angleProperty().bind(azimuthProperty * (180.0 / PI))
+    }
+
+    private val zenithRotation = Rotate().apply {
+        axisProperty().bind(objectBinding(azimuthProperty) {
+            azimuthRotation.inverseTransform(X_AXIS)
+        })
+        angleProperty().bind(-zenithProperty * (180.0 / PI))
+    }
 
     private val inProgressProperty = SimpleBooleanProperty(false)
 
+
     public val centerMarker: Node by lazy {
         Sphere(10.0).also {
             it.transforms.setAll(baseTranslate)
@@ -57,75 +75,21 @@ public class OrbitControls internal constructor(camera: Camera, canvas: SubScene
         }
     }
 
-
-    private val rx = Rotate(0.0, Rotate.X_AXIS)
-
-    private val ry = Rotate(0.0, Rotate.Y_AXIS)
-
-    private val translate = Translate(0.0, 0.0, 0.0)
-
-    //private val rz = Rotate(0.0, Rotate.Z_AXIS)
-
-
     init {
-        camera.transforms.setAll(baseTranslate, ry, rx, translate)
-
-        update()
-        val listener = InvalidationListener {
-            update()
-        }
-        distanceProperty.addListener(listener)
-        azimuthProperty.addListener(listener)
-        zenithProperty.addListener(listener)
-        baseXProperty.addListener(listener)
-        baseYProperty.addListener(listener)
-        baseZProperty.addListener(listener)
+        camera.transforms.setAll(
+            baseTranslate,
+            yUpRotation,
+            azimuthRotation,
+            zenithRotation,
+            distanceTranslation,
+            centering,
+        )
 
         canvas.apply {
-            //center.xProperty().bind(widthProperty().divide(2))
-            //center.zProperty().bind(heightProperty().divide(2))
             handleMouse()
         }
-//        coordinateContainer?.vbox {
-//            label(distanceProperty.asString())
-//            label(azimuthProperty.asString())
-//            label(zenithProperty.asString())
-//        }
     }
 
-    private fun update() {
-        val spherePosition = Point3D(
-            sin(zenith) * sin(azimuth),
-            cos(zenith),
-            sin(zenith) * cos(azimuth),
-        ).times(distance)
-        val basePosition = Point3D(x, y, z)
-        baseTranslate.x = x
-        baseTranslate.y = y
-        baseTranslate.z = z
-        //Create direction vector
-        val camPosition = basePosition+spherePosition
-        val camDirection: Point3D = (-spherePosition).normalize()
-
-        val xRotation = Math.toDegrees(asin(-camDirection.y))
-        val yRotation = Math.toDegrees(atan2(camDirection.x, camDirection.z))
-
-        rx.pivotX = camPosition.x
-        rx.pivotY = camPosition.y
-        rx.pivotZ = camPosition.z
-        rx.angle = xRotation
-
-        ry.pivotX = camPosition.x
-        ry.pivotY = camPosition.y
-        ry.pivotZ = camPosition.z
-        ry.angle = yRotation
-
-        translate.x = camPosition.x
-        translate.y = camPosition.y
-        translate.z = camPosition.z
-    }
-
-
     private fun Node.handleMouse() {
 
         var mousePosX = 0.0
@@ -135,7 +99,7 @@ public class OrbitControls internal constructor(camera: Camera, canvas: SubScene
         var mouseDeltaX: Double
         var mouseDeltaY: Double
 
-        onMousePressed = EventHandler<MouseEvent> { me ->
+        onMousePressed = EventHandler { me ->
             mousePosX = me.sceneX
             mousePosY = me.sceneY
             mouseOldX = me.sceneX
@@ -143,7 +107,7 @@ public class OrbitControls internal constructor(camera: Camera, canvas: SubScene
             inProgressProperty.set(true)
         }
 
-        onMouseDragged = EventHandler<MouseEvent> { me ->
+        onMouseDragged = EventHandler { me ->
             mouseOldX = mousePosX
             mouseOldY = mousePosY
             mousePosX = me.sceneX
@@ -158,11 +122,11 @@ public class OrbitControls internal constructor(camera: Camera, canvas: SubScene
             }
 
             if (me.isPrimaryButtonDown) {
-                azimuth = (azimuth - mouseDeltaX * MOUSE_SPEED * modifier * ROTATION_SPEED).coerceIn(0.0, 2 * PI)
-                zenith = (zenith - mouseDeltaY * MOUSE_SPEED * modifier * ROTATION_SPEED).coerceIn(0.0, PI)
+                azimuth = (azimuth - mouseDeltaX * MOUSE_SPEED * modifier * ROTATION_SPEED)
+                zenith = (zenith - mouseDeltaY * MOUSE_SPEED * modifier * ROTATION_SPEED).coerceIn(-PI, PI)
             } else if (me.isSecondaryButtonDown) {
-                x += MOUSE_SPEED * modifier * TRACK_SPEED * (mouseDeltaX * cos(azimuth) + mouseDeltaY * sin(azimuth))
-                z += MOUSE_SPEED * modifier * TRACK_SPEED * (-mouseDeltaX * sin(azimuth) + mouseDeltaY * cos(azimuth))
+                x += MOUSE_SPEED * modifier * TRACK_SPEED * (mouseDeltaX * cos(azimuth) - mouseDeltaY * sin(azimuth))
+                z += MOUSE_SPEED * modifier * TRACK_SPEED * ( mouseDeltaX * sin(azimuth) + mouseDeltaY * cos(azimuth))
             }
         }
 
@@ -170,7 +134,7 @@ public class OrbitControls internal constructor(camera: Camera, canvas: SubScene
             inProgressProperty.set(false)
         }
 
-        onScroll = EventHandler<ScrollEvent> { event ->
+        onScroll = EventHandler { event ->
             distance = max(1.0, distance - MOUSE_SPEED * event.deltaY * RESIZE_SPEED)
         }
     }

From c1627b450413893e10820925f3f084ca536e0cfd Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 15 Jul 2021 18:56:29 +0300
Subject: [PATCH 147/151] Minor FX fixes

---
 .../kscience/visionforge/solid/FX3DPlugin.kt  | 19 +++++++++--------
 .../visionforge/solid/FXCompositeFactory.kt   |  2 +-
 .../visionforge/solid/FXConvexFactory.kt      |  2 +-
 .../visionforge/solid/FXShapeFactory.kt       |  2 +-
 .../visionforge/solid/OrbitControls.kt        | 21 ++++++++++++++++---
 .../solid/specifications/Camera.kt            |  5 +++--
 6 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt
index 6bd56fcf..aac30150 100644
--- a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt
@@ -65,6 +65,7 @@ class FX3DPlugin : AbstractPlugin() {
             }
             is SolidLabel -> Text(obj.text).apply {
                 font = Font.font(obj.fontFamily, obj.fontSize)
+
                 x = -layoutBounds.width / 2
                 y = layoutBounds.height / 2
             }
@@ -129,10 +130,10 @@ class FX3DPlugin : AbstractPlugin() {
         }
     }
 
-    companion object : PluginFactory<FX3DPlugin> {
-        override val tag = PluginTag("vision.fx3D", PluginTag.DATAFORGE_GROUP)
-        override val type = FX3DPlugin::class
-        override fun invoke(meta: Meta, context: Context) = FX3DPlugin()
+    public companion object : PluginFactory<FX3DPlugin> {
+        override val tag: PluginTag = PluginTag("vision.fx3D", PluginTag.DATAFORGE_GROUP)
+        override val type: KClass<FX3DPlugin> = FX3DPlugin::class
+        override fun invoke(meta: Meta, context: Context): FX3DPlugin = FX3DPlugin()
     }
 }
 
@@ -140,14 +141,14 @@ class FX3DPlugin : AbstractPlugin() {
  * Builder and updater for three.js object
  */
 @Type(TYPE)
-interface FX3DFactory<in T : Solid> {
+public interface FX3DFactory<in T : Solid> {
 
-    val type: KClass<in T>
+    public val type: KClass<in T>
 
-    operator fun invoke(obj: T, binding: VisualObjectFXBinding): Node
+    public operator fun invoke(obj: T, binding: VisualObjectFXBinding): Node
 
-    companion object {
-        const val TYPE = "fx3DFactory"
+    public companion object {
+        public const val TYPE = "fx3DFactory"
     }
 }
 
diff --git a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCompositeFactory.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCompositeFactory.kt
index 663a927b..1cdcf914 100644
--- a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCompositeFactory.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXCompositeFactory.kt
@@ -38,7 +38,7 @@ private fun MeshView.toCSG(): CSG {
     return CSG.fromPolygons(polygons)
 }
 
-class FXCompositeFactory(val plugin: FX3DPlugin) : FX3DFactory<Composite> {
+public class FXCompositeFactory(public val plugin: FX3DPlugin) : FX3DFactory<Composite> {
     override val type: KClass<in Composite>
         get() = Composite::class
 
diff --git a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXConvexFactory.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXConvexFactory.kt
index 7538d6c6..7bc44207 100644
--- a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXConvexFactory.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXConvexFactory.kt
@@ -7,7 +7,7 @@ import javafx.scene.Node
 import kotlin.reflect.KClass
 
 
-object FXConvexFactory : FX3DFactory<Convex> {
+public object FXConvexFactory : FX3DFactory<Convex> {
     override val type: KClass<in Convex> get() = Convex::class
 
     override fun invoke(obj: Convex, binding: VisualObjectFXBinding): Node {
diff --git a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXShapeFactory.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXShapeFactory.kt
index ad88aac0..116075ce 100644
--- a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXShapeFactory.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FXShapeFactory.kt
@@ -8,7 +8,7 @@ import org.fxyz3d.geometry.Face3
 import space.kscience.dataforge.meta.Meta
 import kotlin.reflect.KClass
 
-object FXShapeFactory : FX3DFactory<GeometrySolid> {
+public object FXShapeFactory : FX3DFactory<GeometrySolid> {
     override val type: KClass<in GeometrySolid> get() = GeometrySolid::class
 
     override fun invoke(obj: GeometrySolid, binding: VisualObjectFXBinding): MeshView {
diff --git a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt
index 5f15fe37..2fe573e0 100644
--- a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/OrbitControls.kt
@@ -21,10 +21,25 @@ import space.kscience.visionforge.solid.specifications.Camera as CameraSpec
 
 public class OrbitControls internal constructor(camera: Camera, canvas: SubScene, spec: CameraSpec) {
 
-    public val azimuthProperty: SimpleDoubleProperty = SimpleDoubleProperty(spec.azimuth)
+    /**
+     * Azimuth angle in radians
+     */
+    public val azimuthProperty: SimpleDoubleProperty = SimpleDoubleProperty().apply {
+        spec.useProperty(CameraSpec::azimuth){
+            set(spec.azimuth)
+        }
+    }
     public var azimuth: Double by azimuthProperty
 
-    public val zenithProperty: SimpleDoubleProperty = SimpleDoubleProperty(PI / 2 - spec.latitude)
+    /**
+     * Zenith angle in radians
+     */
+    public val zenithProperty: SimpleDoubleProperty = SimpleDoubleProperty().apply {
+        spec.useProperty(CameraSpec::latitude){
+            set(PI / 2 - spec.latitude)
+        }
+    }
+
     public var zenith: Double by zenithProperty
 
 
@@ -123,7 +138,7 @@ public class OrbitControls internal constructor(camera: Camera, canvas: SubScene
 
             if (me.isPrimaryButtonDown) {
                 azimuth = (azimuth - mouseDeltaX * MOUSE_SPEED * modifier * ROTATION_SPEED)
-                zenith = (zenith - mouseDeltaY * MOUSE_SPEED * modifier * ROTATION_SPEED).coerceIn(-PI, PI)
+                zenith = (zenith - mouseDeltaY * MOUSE_SPEED * modifier * ROTATION_SPEED).coerceIn(-PI/2, PI/2)
             } else if (me.isSecondaryButtonDown) {
                 x += MOUSE_SPEED * modifier * TRACK_SPEED * (mouseDeltaX * cos(azimuth) - mouseDeltaY * sin(azimuth))
                 z += MOUSE_SPEED * modifier * TRACK_SPEED * ( mouseDeltaX * sin(azimuth) + mouseDeltaY * cos(azimuth))
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Camera.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Camera.kt
index b6209b54..905fa234 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Camera.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/specifications/Camera.kt
@@ -18,7 +18,6 @@ public class Camera : Scheme() {
     public var distance: Double by double(INITIAL_DISTANCE)
     public var azimuth: Double by double(INITIAL_AZIMUTH)
     public var latitude: Double by double(INITIAL_LATITUDE)
-    public val zenith: Double get() = PI / 2 - latitude
 
     public companion object : SchemeSpec<Camera>(::Camera) {
         public const val INITIAL_DISTANCE: Double = 300.0
@@ -51,4 +50,6 @@ public class Camera : Scheme() {
             }
         }
     }
-}
\ No newline at end of file
+}
+
+public val Camera.zenith: Double get() = PI / 2 - latitude
\ No newline at end of file

From a87692ae1f33fe08bffcd1a42d68dc82ff7ca10d Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 15 Jul 2021 19:45:43 +0300
Subject: [PATCH 148/151] Fix labels for JavaFX

---
 .../kotlin/space/kscience/visionforge/solid/demo/FXDemoApp.kt  | 1 +
 .../main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoApp.kt b/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoApp.kt
index 1ed557ea..3ce92f0f 100644
--- a/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoApp.kt
+++ b/demo/solid-showcase/src/jvmMain/kotlin/space/kscience/visionforge/solid/demo/FXDemoApp.kt
@@ -14,6 +14,7 @@ class FXDemoApp : App(FXDemoGrid::class) {
         stage.height = 600.0
 
         view.showcase()
+        view.showcaseCSG()
     }
 }
 
diff --git a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt
index aac30150..f843e02c 100644
--- a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt
@@ -65,7 +65,8 @@ class FX3DPlugin : AbstractPlugin() {
             }
             is SolidLabel -> Text(obj.text).apply {
                 font = Font.font(obj.fontFamily, obj.fontSize)
-
+                transforms.add(Rotate(180.0, Rotate.Y_AXIS))
+                transforms.add(Rotate(180.0, Rotate.Z_AXIS))
                 x = -layoutBounds.width / 2
                 y = layoutBounds.height / 2
             }

From 87260cea86b3732d0820a0956d1657b92005894b Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 16 Jul 2021 20:52:01 +0300
Subject: [PATCH 149/151] Feedback connection for client.

---
 CHANGELOG.md                                  |   2 +
 .../space/kscience/visionforge/VisionBase.kt  |   9 +-
 .../kscience/visionforge/VisionChange.kt      |   6 +-
 .../kscience/visionforge/VisionGroupBase.kt   |   2 +-
 .../kscience/visionforge/VisionManager.kt     |   2 +
 .../kscience/visionforge/VisionClient.kt      | 163 ++++++++++--------
 .../visionforge/three/server/VisionServer.kt  |  11 ++
 .../kscience/visionforge/solid/three/csg.kt   |  18 +-
 8 files changed, 125 insertions(+), 88 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c84f7aa..d638f0c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,8 @@
 - position, rotation and size moved to properties
 - prototypes moved to children
 - Immutable Solid instances
+- Property listeners are not triggered if there are no changes.
+- Feedback websocket connection in the client.
 
 ### Deprecated
 
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
index 62f90f52..78b75124 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionBase.kt
@@ -74,9 +74,12 @@ public open class VisionBase(
     }
 
     override fun setProperty(name: Name, item: MetaItem?, notify: Boolean) {
-        getOrCreateProperties().setItem(name, item)
-        if (notify) {
-            invalidateProperty(name)
+        val oldItem = properties?.getItem(name)
+        if(oldItem!= item) {
+            getOrCreateProperties().setItem(name, item)
+            if (notify) {
+                invalidateProperty(name)
+            }
         }
     }
 
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionChange.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionChange.kt
index 85b147ab..06ccb7bc 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionChange.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionChange.kt
@@ -65,14 +65,14 @@ private fun Vision.isolate(manager: VisionManager): Vision {
 }
 
 /**
- * @param void flag showing that this vision child should be removed
+ * @param delete flag showing that this vision child should be removed
  * @param vision a new value for vision content
  * @param properties updated properties
- * @param children a map of children changed in ths [VisionChange]. If a child to be removed, set [void] flag to true.
+ * @param children a map of children changed in ths [VisionChange]. If a child to be removed, set [delete] flag to true.
  */
 @Serializable
 public data class VisionChange(
-    public val void: Boolean = false,
+    public val delete: Boolean = false,
     public val vision: Vision? = null,
     @Serializable(MetaSerializer::class) public val properties: Meta? = null,
     public val children: Map<Name, VisionChange>? = null,
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt
index 997789c1..933b55cd 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionGroupBase.kt
@@ -134,7 +134,7 @@ public open class VisionGroupBase(
     override fun update(change: VisionChange) {
         change.children?.forEach { (name, change) ->
             when {
-                change.void -> set(name, null)
+                change.delete -> set(name, null)
                 change.vision != null -> set(name, change.vision)
                 else -> get(name)?.update(change)
             }
diff --git a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt
index b3e9faf4..4f01e839 100644
--- a/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt
+++ b/visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/VisionManager.kt
@@ -39,6 +39,8 @@ public class VisionManager(meta: Meta) : AbstractPlugin(meta) {
     public fun decodeFromString(string: String): Vision = jsonFormat.decodeFromString(visionSerializer, string)
 
     public fun encodeToString(vision: Vision): String = jsonFormat.encodeToString(visionSerializer, vision)
+    public fun encodeToString(change: VisionChange): String =
+        jsonFormat.encodeToString(VisionChange.serializer(), change)
 
     public fun decodeFromJson(json: JsonElement): Vision = jsonFormat.decodeFromJsonElement(visionSerializer, json)
 
diff --git a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
index 98803115..017c615d 100644
--- a/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
+++ b/visionforge-core/src/jsMain/kotlin/space/kscience/visionforge/VisionClient.kt
@@ -2,6 +2,9 @@ package space.kscience.visionforge
 
 import kotlinx.browser.document
 import kotlinx.browser.window
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import org.w3c.dom.*
 import org.w3c.dom.url.URL
 import space.kscience.dataforge.context.*
@@ -13,14 +16,14 @@ import space.kscience.visionforge.html.VisionTagConsumer.Companion.OUTPUT_CONNEC
 import space.kscience.visionforge.html.VisionTagConsumer.Companion.OUTPUT_ENDPOINT_ATTRIBUTE
 import space.kscience.visionforge.html.VisionTagConsumer.Companion.OUTPUT_FETCH_ATTRIBUTE
 import space.kscience.visionforge.html.VisionTagConsumer.Companion.OUTPUT_NAME_ATTRIBUTE
-import kotlin.collections.set
 import kotlin.reflect.KClass
+import kotlin.time.Duration
 
 public class VisionClient : AbstractPlugin() {
     override val tag: PluginTag get() = Companion.tag
     private val visionManager: VisionManager by require(VisionManager)
 
-    private val visionMap = HashMap<Element, Vision>()
+    //private val visionMap = HashMap<Element, Vision>()
 
     /**
      * Up-going tree traversal in search for endpoint attribute
@@ -53,11 +56,73 @@ public class VisionClient : AbstractPlugin() {
 
     private fun Element.getFlag(attribute: String): Boolean = attributes[attribute]?.value != null
 
-    private fun renderVision(element: Element, vision: Vision?, outputMeta: Meta) {
+    private fun renderVision(name: String, element: Element, vision: Vision?, outputMeta: Meta) {
         if (vision != null) {
-            visionMap[element] = vision
             val renderer = findRendererFor(vision) ?: error("Could nof find renderer for $vision")
             renderer.render(element, vision, outputMeta)
+
+            element.attributes[OUTPUT_CONNECT_ATTRIBUTE]?.let { attr ->
+                val wsUrl = if (attr.value.isBlank() || attr.value == "auto") {
+                    val endpoint = resolveEndpoint(element)
+                    logger.info { "Vision server is resolved to $endpoint" }
+                    URL(endpoint).apply {
+                        pathname += "/ws"
+                    }
+                } else {
+                    URL(attr.value)
+                }.apply {
+                    protocol = "ws"
+                    searchParams.append("name", name)
+                }
+
+                logger.info { "Updating vision data from $wsUrl" }
+
+                //Individual websocket for this element
+                WebSocket(wsUrl.toString()).apply {
+                    onmessage = { messageEvent ->
+                        val stringData: String? = messageEvent.data as? String
+                        if (stringData != null) {
+                            val change: VisionChange = visionManager.jsonFormat.decodeFromString(
+                                VisionChange.serializer(),
+                                stringData
+                            )
+
+                            if (change.vision != null) {
+                                renderer.render(element, vision, outputMeta)
+                            }
+
+                            logger.debug { "Got update $change for output with name $name" }
+                            vision.update(change)
+                        } else {
+                            console.error("WebSocket message data is not a string")
+                        }
+                    }
+
+
+                    //Backward change propagation
+                    var feedbackJob: Job? = null
+
+                    onopen = {
+                        feedbackJob = vision.flowChanges(
+                            visionManager,
+                            Duration.Companion.milliseconds(300)
+                        ).onEach { change ->
+                            send(visionManager.encodeToString(change))
+                        }.launchIn(visionManager.context)
+
+                        console.info("WebSocket update channel established for output '$name'")
+                    }
+
+                    onclose = {
+                        feedbackJob?.cancel()
+                        console.info("WebSocket update channel closed for output '$name'")
+                    }
+                    onerror = {
+                        feedbackJob?.cancel()
+                        console.error("WebSocket update channel error for output '$name'")
+                    }
+                }
+            }
         }
     }
 
@@ -79,85 +144,39 @@ public class VisionClient : AbstractPlugin() {
             visionManager.decodeFromString(it)
         }
 
-        if (embeddedVision != null) {
-            logger.info { "Found embedded vision for output with name $name" }
-            renderVision(element, embeddedVision, outputMeta)
-        }
-
-        element.attributes[OUTPUT_FETCH_ATTRIBUTE]?.let { attr ->
-
-            val fetchUrl = if (attr.value.isBlank() || attr.value == "auto") {
-                val endpoint = resolveEndpoint(element)
-                logger.info { "Vision server is resolved to $endpoint" }
-                URL(endpoint).apply {
-                    pathname += "/vision"
-                }
-            } else {
-                URL(attr.value)
-            }.apply {
-                searchParams.append("name", name)
+        when {
+            embeddedVision != null -> {
+                logger.info { "Found embedded vision for output with name $name" }
+                renderVision(name, element, embeddedVision, outputMeta)
             }
+            element.attributes[OUTPUT_FETCH_ATTRIBUTE] != null -> {
+                val attr = element.attributes[OUTPUT_FETCH_ATTRIBUTE]!!
 
-            logger.info { "Fetching vision data from $fetchUrl" }
-            window.fetch(fetchUrl).then { response ->
-                if (response.ok) {
-                    response.text().then { text ->
-                        val vision = visionManager.decodeFromString(text)
-                        renderVision(element, vision, outputMeta)
+                val fetchUrl = if (attr.value.isBlank() || attr.value == "auto") {
+                    val endpoint = resolveEndpoint(element)
+                    logger.info { "Vision server is resolved to $endpoint" }
+                    URL(endpoint).apply {
+                        pathname += "/vision"
                     }
                 } else {
-                    logger.error { "Failed to fetch initial vision state from $fetchUrl" }
+                    URL(attr.value)
+                }.apply {
+                    searchParams.append("name", name)
                 }
 
-            }
-        }
-
-        element.attributes[OUTPUT_CONNECT_ATTRIBUTE]?.let { attr ->
-            val wsUrl = if (attr.value.isBlank() || attr.value == "auto") {
-                val endpoint = resolveEndpoint(element)
-                logger.info { "Vision server is resolved to $endpoint" }
-                URL(endpoint).apply {
-                    pathname += "/ws"
-                }
-            } else {
-                URL(attr.value)
-            }.apply {
-                protocol = "ws"
-                searchParams.append("name", name)
-            }
-
-            logger.info { "Updating vision data from $wsUrl" }
-
-            WebSocket(wsUrl.toString()).apply {
-                onmessage = { messageEvent ->
-                    val stringData: String? = messageEvent.data as? String
-                    if (stringData != null) {
-                        val change = visionManager.jsonFormat.decodeFromString(
-                            VisionChange.serializer(),
-                            stringData
-                        )
-
-                        if (change.vision != null) {
-                            renderVision(element, change.vision, outputMeta)
+                logger.info { "Fetching vision data from $fetchUrl" }
+                window.fetch(fetchUrl).then { response ->
+                    if (response.ok) {
+                        response.text().then { text ->
+                            val vision = visionManager.decodeFromString(text)
+                            renderVision(name, element, vision, outputMeta)
                         }
-
-                        logger.debug { "Got update $change for output with name $name" }
-                        visionMap[element]?.update(change)
-                            ?: console.info("Target vision for element $element with name $name not found")
                     } else {
-                        console.error("WebSocket message data is not a string")
+                        logger.error { "Failed to fetch initial vision state from $fetchUrl" }
                     }
                 }
-                onopen = {
-                    console.info("WebSocket update channel established for output '$name'")
-                }
-                onclose = {
-                    console.info("WebSocket update channel closed for output '$name'")
-                }
-                onerror = {
-                    console.error("WebSocket update channel error for output '$name'")
-                }
             }
+            else -> error("No embedded vision data / fetch url for $name")
         }
     }
 
diff --git a/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt b/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
index 6f0a3959..2c9ed631 100644
--- a/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
+++ b/visionforge-server/src/main/kotlin/space/kscience/visionforge/three/server/VisionServer.kt
@@ -19,7 +19,9 @@ import io.ktor.server.engine.embeddedServer
 import io.ktor.websocket.WebSockets
 import io.ktor.websocket.webSocket
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.channels.consumeEach
 import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.html.*
 import kotlinx.html.stream.createHTML
@@ -131,6 +133,15 @@ public class VisionServer internal constructor(
             application.log.debug("Opened server socket for $name")
             val vision: Vision = visions[name.toName()] ?: error("Plot with id='$name' not registered")
 
+            launch {
+                incoming.consumeEach {
+                    val change = visionManager.jsonFormat.decodeFromString(
+                        VisionChange.serializer(), it.data.decodeToString()
+                    )
+                    vision.update(change)
+                }
+            }
+
             try {
                 withContext(visionManager.context.coroutineContext) {
                     vision.flowChanges(visionManager, Duration.milliseconds(updateInterval)).collect { update ->
diff --git a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/csg.kt b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/csg.kt
index 2bee0a7a..50e48ee9 100644
--- a/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/csg.kt
+++ b/visionforge-threejs/src/main/kotlin/space/kscience/visionforge/solid/three/csg.kt
@@ -14,17 +14,17 @@ import info.laht.threekt.math.Matrix4
 import info.laht.threekt.math.Vector3
 import info.laht.threekt.objects.Mesh
 
-external class CSG {
-    fun clone(): CSG
-    fun toPolygons(): Array<Polygon>
-    fun toGeometry(toMatrix: Matrix4): BufferGeometry
-    fun union(csg: CSG): CSG
-    fun subtract(csg: CSG): CSG
-    fun intersect(csg: CSG): CSG
-    fun inverse(): CSG
+public external class CSG {
+    public fun clone(): CSG
+    public fun toPolygons(): Array<Polygon>
+    public fun toGeometry(toMatrix: Matrix4): BufferGeometry
+    public fun union(csg: CSG): CSG
+    public fun subtract(csg: CSG): CSG
+    public fun intersect(csg: CSG): CSG
+    public fun inverse(): CSG
 
 
-    companion object {
+    public companion object {
         fun fromPolygons(polygons: Array<Polygon>): CSG
         fun fromGeometry(geom: BufferGeometry, objectIndex: dynamic = definedExternally): CSG
         fun fromMesh(mesh: Mesh, objectIndex: dynamic = definedExternally): CSG

From 01ea6b5494daca7c82ee8fa291c888bfd90cf579 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 17 Jul 2021 10:27:51 +0300
Subject: [PATCH 150/151] Bump version

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 8236106e..4ab2a7d5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,7 +20,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.2.0-dev-21"
+    version = "0.2.0-dev-22"
 }
 
 subprojects {

From e50e266f9496f39daad51840bc0abe44eb58b0e8 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sat, 17 Jul 2021 10:55:02 +0300
Subject: [PATCH 151/151] Updated three-csg to 3.1.6 fix issues

---
 visionforge-threejs/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/visionforge-threejs/build.gradle.kts b/visionforge-threejs/build.gradle.kts
index a862f776..a6407d13 100644
--- a/visionforge-threejs/build.gradle.kts
+++ b/visionforge-threejs/build.gradle.kts
@@ -5,5 +5,5 @@ plugins {
 dependencies {
     api(project(":visionforge-solid"))
     implementation(npm("three", "0.130.1"))
-    implementation(npm("three-csg-ts", "3.1.5"))
+    implementation(npm("three-csg-ts", "3.1.6"))
 }