-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Basic suppport for gridRow and gridColumn in CSS API
This contributes to #895
- Loading branch information
Showing
2 changed files
with
179 additions
and
0 deletions.
There are no files selected for viewing
49 changes: 49 additions & 0 deletions
49
web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/properties/grid.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/* | ||
* Copyright 2020-2021 JetBrains s.r.o. and respective authors and developers. | ||
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. | ||
*/ | ||
|
||
package org.jetbrains.compose.web.css | ||
|
||
// https://developer.mozilla.org/en-US/docs/Web/CSS/grid-column | ||
fun StyleBuilder.gridColumn(value: String) { | ||
property("grid-column", value) | ||
} | ||
|
||
fun StyleBuilder.gridColumn(start: String, end: String) { | ||
property("grid-column", "$start / $end") | ||
} | ||
|
||
fun StyleBuilder.gridColumn(start: String, end: Int) { | ||
property("grid-column", "$start / $end") | ||
} | ||
|
||
fun StyleBuilder.gridColumn(start: Int, end: String) { | ||
property("grid-column", "$start / $end") | ||
} | ||
|
||
fun StyleBuilder.gridColumn(start: Int, end: Int) { | ||
property("grid-column", "$start / $end") | ||
} | ||
|
||
|
||
// https://developer.mozilla.org/en-US/docs/Web/CSS/grid-row | ||
fun StyleBuilder.gridRow(value: String) { | ||
property("grid-row", value) | ||
} | ||
|
||
fun StyleBuilder.gridRow(start: String, end: String) { | ||
property("grid-row", "$start / $end") | ||
} | ||
|
||
fun StyleBuilder.gridRow(start: String, end: Int) { | ||
property("grid-row", "$start / $end") | ||
} | ||
|
||
fun StyleBuilder.gridRow(start: Int, end: String) { | ||
property("grid-row", "$start / $end") | ||
} | ||
|
||
fun StyleBuilder.gridRow(start: Int, end: Int) { | ||
property("grid-row", "$start / $end") | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,130 @@ | ||
/* | ||
* Copyright 2020-2021 JetBrains s.r.o. and respective authors and developers. | ||
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. | ||
*/ | ||
|
||
package org.jetbrains.compose.web.core.tests.css | ||
|
||
import org.jetbrains.compose.web.core.tests.runTest | ||
import org.jetbrains.compose.web.css.gridColumn | ||
import org.jetbrains.compose.web.css.gridRow | ||
import org.jetbrains.compose.web.dom.Div | ||
import org.w3c.dom.HTMLElement | ||
import org.w3c.dom.get | ||
import kotlin.test.Test | ||
import kotlin.test.assertEquals | ||
|
||
class GridColumnTests { | ||
@Test | ||
fun gridColumnOneValue() = runTest { | ||
composition { | ||
Div({ style { gridColumn("1") } }) | ||
} | ||
|
||
val el = (root.children[0] as HTMLElement).style.asDynamic() | ||
assertEquals("1", el.gridColumnStart) | ||
assertEquals("auto", el.gridColumnEnd) | ||
} | ||
|
||
@Test | ||
fun gridColumnTwoValues() = runTest { | ||
composition { | ||
Div({ style { gridColumn(1, 3) } }) | ||
} | ||
|
||
val el = (root.children[0] as HTMLElement).style.asDynamic() | ||
assertEquals("1", el.gridColumnStart) | ||
assertEquals("3", el.gridColumnEnd) | ||
} | ||
|
||
@Test | ||
fun gridColumnLineNames() = runTest { | ||
composition { | ||
Div({ style { gridColumn("main-start") } }) | ||
Div({ style { gridColumn("main-start", "main-end") } }) | ||
} | ||
|
||
assertEquals("main-start", (root.children[0] as HTMLElement).style.asDynamic().gridColumnStart) | ||
assertEquals("main-start", (root.children[1] as HTMLElement).style.asDynamic().gridColumnStart) | ||
assertEquals("main-end", (root.children[1] as HTMLElement).style.asDynamic().gridColumnEnd) | ||
} | ||
|
||
|
||
@Test | ||
fun gridColumnGlobalValues() = runTest { | ||
composition { | ||
Div({ style { gridColumn("inherit") } }) | ||
Div({ style { gridColumn("initial") } }) | ||
Div({ style { gridColumn("revert") } }) | ||
Div({ style { gridColumn("unset") } }) | ||
} | ||
|
||
assertEquals("inherit", (root.children[0] as HTMLElement).style.asDynamic().gridColumnStart) | ||
assertEquals("initial", (root.children[1] as HTMLElement).style.asDynamic().gridColumnStart) | ||
assertEquals("revert", (root.children[2] as HTMLElement).style.asDynamic().gridColumnStart) | ||
assertEquals("unset", (root.children[3] as HTMLElement).style.asDynamic().gridColumnStart) | ||
} | ||
} | ||
|
||
class GridRawTests { | ||
|
||
@Test | ||
fun gridRowOneValue() = runTest { | ||
composition { | ||
Div({ style { gridRow("1") } }) | ||
} | ||
|
||
val el = (root.children[0] as HTMLElement).style.asDynamic() | ||
assertEquals("1", el.gridRowStart) | ||
assertEquals("auto", el.gridRowEnd) | ||
} | ||
|
||
@Test | ||
fun gridRowTwoValues() = runTest { | ||
composition { | ||
Div({ style { gridRow(2, -1) } }) | ||
} | ||
|
||
val el = (root.children[0] as HTMLElement).style.asDynamic() | ||
assertEquals("2", el.gridRowStart) | ||
assertEquals("-1", el.gridRowEnd) | ||
} | ||
|
||
@Test | ||
fun gridRowCustomIndentValuesStrInt() = runTest { | ||
composition { | ||
Div({ style { gridRow("4 somegridarea", 6) } }) | ||
} | ||
|
||
val el = (root.children[0] as HTMLElement).style.asDynamic() | ||
assertEquals("4 somegridarea", el.gridRowStart) | ||
assertEquals("6", el.gridRowEnd) | ||
} | ||
|
||
@Test | ||
fun gridRowCustomIndentValuesIntStr() = runTest { | ||
composition { | ||
Div({ style { gridRow(5, "4 somegridarea") } }) | ||
} | ||
|
||
val el = (root.children[0] as HTMLElement).style.asDynamic() | ||
assertEquals("5", el.gridRowStart) | ||
assertEquals("4 somegridarea", el.gridRowEnd) | ||
} | ||
|
||
|
||
@Test | ||
fun gridRowGlobalValues() = runTest { | ||
composition { | ||
Div({ style { gridRow("inherit") } }) | ||
Div({ style { gridRow("initial") } }) | ||
Div({ style { gridRow("revert") } }) | ||
Div({ style { gridRow("unset") } }) | ||
} | ||
|
||
assertEquals("inherit", (root.children[0] as HTMLElement).style.asDynamic().gridRowStart) | ||
assertEquals("initial", (root.children[1] as HTMLElement).style.asDynamic().gridRowStart) | ||
assertEquals("revert", (root.children[2] as HTMLElement).style.asDynamic().gridRowStart) | ||
assertEquals("unset", (root.children[3] as HTMLElement).style.asDynamic().gridRowStart) | ||
} | ||
} |