Update compiler

build.gradle.kts

@@ -10,7 +10,7 @@ val plotlyVersion by extra("2.29.0")
 
 allprojects {
     group = "space.kscience"
-    version = "0.7.0-dev-1"
+    version = "0.7.0-dev-2"
 }
 
 apiValidation {

examples/build.gradle.kts

@@ -29,8 +29,8 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
 val copyPlotlyResources by tasks.creating(Copy::class){
     dependsOn(":plotlykt-core:jvmProcessResources")
     mustRunAfter(":plotlykt-core:jvmTestProcessResources")
-    from(project(":plotlykt-core").buildDir.resolve("processedResources/jvm"))
-    into(buildDir.resolve("resources"))
+    from(project(":plotlykt-core").layout.buildDirectory.file("processedResources/jvm"))
+    into(layout.buildDirectory.file("resources"))
 }
 
 tasks.getByName("classes").dependsOn(copyPlotlyResources)

examples/src/main/kotlin/tabPageLayout.kt

@@ -1,3 +1,4 @@
+import kotlinx.html.*
 import space.kscience.plotly.*
 import space.kscience.plotly.models.Trace
 import space.kscience.plotly.models.invoke
@@ -6,6 +7,60 @@ import kotlin.math.PI
 import kotlin.math.cos
 import kotlin.math.sin
 
+
+public class PlotTabs {
+    public data class Tab(val title: String, val id: String, val content: PlotlyFragment)
+
+    private val _tabs = ArrayList<Tab>()
+    public val tabs: List<Tab> get() = _tabs
+
+    public fun tab(title: String, id: String = title, block: FlowContent.(renderer: PlotlyRenderer) -> Unit) {
+        _tabs.add(Tab(title, id, PlotlyFragment(block)))
+    }
+}
+
+public fun Plotly.tabs(tabsID: String = "tabs", block: PlotTabs.() -> Unit): PlotlyPage {
+    val grid = PlotTabs().apply(block)
+
+    return page(cdnBootstrap, cdnPlotlyHeader) { container ->
+        ul("nav nav-tabs") {
+            role = "tablist"
+            id = tabsID
+            grid.tabs.forEachIndexed { index, tab ->
+                li("nav-item") {
+                    a(classes = "nav-link") {
+                        if (index == 0) {
+                            classes = classes + "active"
+                        }
+                        id = "${tab.id}-tab"
+                        attributes["data-toggle"] = "tab"
+                        href = "#${tab.id}"
+                        role = "tab"
+                        attributes["aria-controls"] = tab.id
+                        attributes["aria-selected"] = "true"
+                        +tab.title
+                    }
+                }
+            }
+        }
+        div("tab-content") {
+            id = "$tabsID-content"
+            grid.tabs.forEachIndexed { index, tab ->
+                div("tab-pane fade") {
+                    if (index == 0) {
+                        classes = classes + setOf("show", "active")
+                    }
+                    id = tab.id
+                    role = "tabpanel"
+                    attributes["aria-labelledby"] = "${tab.id}-tab"
+                    tab.content.render(this, container)
+                }
+            }
+        }
+    }
+}
+
+
 @Suppress("DEPRECATION")
 @UnstablePlotlyAPI
 fun main() {
@@ -26,14 +81,14 @@ fun main() {
 
     }
 
-    val responsive = PlotlyConfig{
+    val responsive = PlotlyConfig {
         responsive = true
     }
 
     val plot = Plotly.tabs {
 
-        tab("First"){
-            plot (config = responsive){
+        tab("First") {
+            plot(config = responsive) {
                 traces(trace1)
                 layout {
                     title = "First graph"
@@ -42,7 +97,7 @@ fun main() {
                 }
             }
         }
-        tab("Second"){
+        tab("Second") {
             plot(config = responsive) {
                 traces(trace2)
                 layout {

gradle.properties

@@ -6,4 +6,4 @@ kotlin.mpp.stability.nowarn=true
 kotlin.jupyter.add.scanner=false
 kotlin.incremental.js.ir=true
 
-toolsVersion=0.15.2-kotlin-1.9.21
+toolsVersion=0.15.2-kotlin-1.9.22

plotlykt-core/build.gradle.kts

@@ -18,8 +18,8 @@ kscience {
 
     dependencies {
         api("space.kscience:dataforge-meta:$dataforgeVersion")
-        //api(spclibs.kotlinx.html)
-        api("org.jetbrains.kotlinx:kotlinx-html:0.11.0")
+        api(spclibs.kotlinx.html)
+//        api("org.jetbrains.kotlinx:kotlinx-html:0.11.0")
     }
 
     jsMain{