better top-aligning for static html cols

Author: Jolanrensen

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt

@@ -15,10 +15,12 @@ import org.jetbrains.kotlinx.dataframe.api.isEmpty
 import org.jetbrains.kotlinx.dataframe.api.isNumber
 import org.jetbrains.kotlinx.dataframe.api.isSubtypeOf
 import org.jetbrains.kotlinx.dataframe.api.rows
+import org.jetbrains.kotlinx.dataframe.api.sumOf
 import org.jetbrains.kotlinx.dataframe.api.take
 import org.jetbrains.kotlinx.dataframe.columns.BaseColumn
 import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
 import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath
+import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
 import org.jetbrains.kotlinx.dataframe.columns.depth
 import org.jetbrains.kotlinx.dataframe.impl.DataFrameSize
 import org.jetbrains.kotlinx.dataframe.impl.columns.addPath
@@ -238,7 +240,7 @@ public fun AnyFrame.toStaticHtml(
 
     // Adds a single cell to the html. DataRows from column groups already need to be split up into separate cells.
     fun StringBuilder.emitCell(cellValue: Any?, borders: Set<Border>): Unit =
-        emitTag("td", borders.toClass()) {
+        emitTag("td", "${borders.toClass()} style=\"vertical-align:top\"") {
             when (cellValue) {
                 // uses the <details> and <summary> to create a collapsible cell for dataframes
                 is AnyFrame ->
@@ -347,6 +349,15 @@ internal fun BaseColumn<*>.maxWidth(): Int =
     if (this is ColumnGroup<*>) columns().sumOf { it.maxWidth() }.coerceAtLeast(1)
     else 1
 
+internal fun BaseColumn<*>.maxNumberOfRows(): Int =
+    if (this is ColumnGroup<*>) {
+        columns().maxOfOrNull { it.maxNumberOfRows() } ?: 0
+    } else if (this is FrameColumn<*>) {
+        values().sumOf { it.asColumnGroup("").maxNumberOfRows() }
+    } else {
+        this.size()
+    }
+
 /**
  * Given a [DataFrame], this function returns a depth-first "matrix" containing all columns
  * laid out in such a way that they can be used to render the header of a table. The

core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/rendering/RenderingTests.kt

@@ -184,7 +184,7 @@ class RenderingTests : TestBase() {
         val df = DataFrame.read("https://raw.githubusercontent.com/Kotlin/dataframe/master/data/jetbrains.json")
 
 //        df.toHTML().openInBrowser()
-        df.toStaticHtml(openNestedDfs = true).copy(script = "").openInBrowser()
+        df.toStaticHtml(openNestedDfs = true, includeCss = false).copy(script = "").openInBrowser()
 //        df.get(frameColumn("repos")).get(0).toStaticHtml(openNestedDfs = false).copy(script = "").openInBrowser()
     }
 }

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt

@@ -15,10 +15,12 @@ import org.jetbrains.kotlinx.dataframe.api.isEmpty
 import org.jetbrains.kotlinx.dataframe.api.isNumber
 import org.jetbrains.kotlinx.dataframe.api.isSubtypeOf
 import org.jetbrains.kotlinx.dataframe.api.rows
+import org.jetbrains.kotlinx.dataframe.api.sumOf
 import org.jetbrains.kotlinx.dataframe.api.take
 import org.jetbrains.kotlinx.dataframe.columns.BaseColumn
 import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
 import org.jetbrains.kotlinx.dataframe.columns.ColumnWithPath
+import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
 import org.jetbrains.kotlinx.dataframe.columns.depth
 import org.jetbrains.kotlinx.dataframe.impl.DataFrameSize
 import org.jetbrains.kotlinx.dataframe.impl.columns.addPath
@@ -238,7 +240,7 @@ public fun AnyFrame.toStaticHtml(
 
     // Adds a single cell to the html. DataRows from column groups already need to be split up into separate cells.
     fun StringBuilder.emitCell(cellValue: Any?, borders: Set<Border>): Unit =
-        emitTag("td", borders.toClass()) {
+        emitTag("td", "${borders.toClass()} style=\"vertical-align:top\"") {
             when (cellValue) {
                 // uses the <details> and <summary> to create a collapsible cell for dataframes
                 is AnyFrame ->

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/rendering/RenderingTests.kt

@@ -3,10 +3,13 @@ package org.jetbrains.kotlinx.dataframe.rendering
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.string.shouldContain
 import io.kotest.matchers.string.shouldNotContain
+import org.jetbrains.kotlinx.dataframe.DataFrame
 import org.jetbrains.kotlinx.dataframe.api.add
+import org.jetbrains.kotlinx.dataframe.api.asColumnGroup
 import org.jetbrains.kotlinx.dataframe.api.columnOf
 import org.jetbrains.kotlinx.dataframe.api.dataFrameOf
 import org.jetbrains.kotlinx.dataframe.api.emptyDataFrame
+import org.jetbrains.kotlinx.dataframe.api.frameColumn
 import org.jetbrains.kotlinx.dataframe.api.group
 import org.jetbrains.kotlinx.dataframe.api.into
 import org.jetbrains.kotlinx.dataframe.api.move
@@ -16,13 +19,20 @@ import org.jetbrains.kotlinx.dataframe.io.DisplayConfiguration
 import org.jetbrains.kotlinx.dataframe.io.escapeHTML
 import org.jetbrains.kotlinx.dataframe.io.formatter
 import org.jetbrains.kotlinx.dataframe.io.maxDepth
+import org.jetbrains.kotlinx.dataframe.io.maxWidth
 import org.jetbrains.kotlinx.dataframe.io.print
+import org.jetbrains.kotlinx.dataframe.io.read
 import org.jetbrains.kotlinx.dataframe.io.renderToString
 import org.jetbrains.kotlinx.dataframe.io.renderToStringTable
 import org.jetbrains.kotlinx.dataframe.io.toHTML
+import org.jetbrains.kotlinx.dataframe.io.toStaticHtml
 import org.jetbrains.kotlinx.dataframe.jupyter.DefaultCellRenderer
 import org.jetbrains.kotlinx.dataframe.jupyter.RenderedContent
 import org.jetbrains.kotlinx.dataframe.samples.api.TestBase
+import org.jetbrains.kotlinx.dataframe.samples.api.firstName
+import org.jetbrains.kotlinx.dataframe.samples.api.lastName
+import org.jetbrains.kotlinx.dataframe.samples.api.name
+import org.jetbrains.kotlinx.dataframe.samples.api.secondName
 import org.jsoup.Jsoup
 import org.junit.Test
 import java.net.URL
@@ -162,6 +172,19 @@ class RenderingTests : TestBase() {
 
     @Test
     fun `max width`() {
-        // TODO
+        dfGroup.asColumnGroup("").maxWidth() shouldBe 8
+        dfGroup.name.maxWidth() shouldBe 4
+        dfGroup.name.firstName.maxWidth() shouldBe 3
+        dfGroup.name.lastName.maxWidth() shouldBe 1
+        dfGroup.name.firstName.secondName.maxWidth() shouldBe 1
+    }
+
+    @Test
+    fun `test static rendering TODO temp`() {
+        val df = DataFrame.read("https://raw.githubusercontent.com/Kotlin/dataframe/master/data/jetbrains.json")
+
+//        df.toHTML().openInBrowser()
+        df.toStaticHtml(openNestedDfs = true, includeCss = false).copy(script = "").openInBrowser()
+//        df.get(frameColumn("repos")).get(0).toStaticHtml(openNestedDfs = false).copy(script = "").openInBrowser()
     }
 }