Skip to content

Add a way of explicit switching to dark color scheme. #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2022
Merged

Add a way of explicit switching to dark color scheme. #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,10 @@ internal fun AnyFrame.toHtmlData(
}
val body = getResourceText("/table.html", "ID" to rootId)
val script = scripts.joinToString("\n") + "\n" + getResourceText("/renderTable.js", "___ID___" to rootId)
return HtmlData("", body, script)
return HtmlData("", body, script, configuration.useDarkColorScheme)
}

public data class HtmlData(val style: String, val body: String, val script: String) {
public data class HtmlData(val style: String, val body: String, val script: String, val useDarkColorScheme: Boolean) {
override fun toString(): String = """
<html>
<head>
Expand All @@ -166,27 +166,39 @@ public data class HtmlData(val style: String, val body: String, val script: Stri
</style>
</head>
<body>
$body
<div${darkSchemeAttribute()}>
$body
</div>
</body>
<script>
$script
</script>
</html>
""".trimIndent()

private fun darkSchemeAttribute(): String {
return if (useDarkColorScheme) " class=\"dataframe_dark\"" else ""
}

public fun toJupyter(): MimeTypedResult = HTML(toString())

public operator fun plus(other: HtmlData): HtmlData =
HtmlData(style + "\n" + other.style, body + "\n" + other.body, script + "\n" + other.script)
HtmlData(
style + "\n" + other.style,
body + "\n" + other.body,
script + "\n" + other.script,
useDarkColorScheme || other.useDarkColorScheme
)
}

internal fun HtmlData.print() = println(this)

internal fun initHtml(includeJs: Boolean = true, includeCss: Boolean = true): HtmlData =
internal fun initHtml(includeJs: Boolean = true, includeCss: Boolean = true, useDarkColorScheme: Boolean = false): HtmlData =
HtmlData(
style = if (includeCss) getResources("/table.css") else "",
script = if (includeJs) getResourceText("/init.js") else "",
body = ""
body = "",
useDarkColorScheme = useDarkColorScheme,
)

public fun <T> DataFrame<T>.html(): String = toHTML(extraHtml = initHtml()).toString()
Expand All @@ -205,7 +217,7 @@ public fun <T> DataFrame<T>.toHTML(
} else "<p>$footer</p>"

val tableHtml = toHtmlData(configuration, cellRenderer)
val html = tableHtml + HtmlData("", bodyFooter, "")
val html = tableHtml + HtmlData("", bodyFooter, "", configuration.useDarkColorScheme)

return if (extraHtml != null) extraHtml + html else html
}
Expand All @@ -217,6 +229,7 @@ public data class DisplayConfiguration(
var decimalFormat: RendererDecimalFormat = RendererDecimalFormat.DEFAULT,
var isolatedOutputs: Boolean = flagFromEnv("LETS_PLOT_HTML_ISOLATED_FRAME"),
internal val localTesting: Boolean = flagFromEnv("KOTLIN_DATAFRAME_LOCAL_TESTING"),
var useDarkColorScheme: Boolean = false,
) {
public companion object {
public val DEFAULT: DisplayConfiguration = DisplayConfiguration()
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/jupyter/JupyterHtmlRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ internal inline fun <reified T : Any> JupyterHtmlRenderer.render(
reifiedDisplayConfiguration,
extraHtml = initHtml(
includeJs = reifiedDisplayConfiguration.isolatedOutputs,
includeCss = true
includeCss = true,
useDarkColorScheme = reifiedDisplayConfiguration.useDarkColorScheme
),
contextRenderer
) { footer }
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/table.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
--link-hover: #1a466c;
}

:root[theme="dark"], :root [data-jp-theme-light="false"]{
:root[theme="dark"], :root [data-jp-theme-light="false"], .dataframe_dark{
--background: #303030;
--background-odd: #3c3c3c;
--background-hover: #464646;
Expand Down