InsanusMokrassar
/
kjsuikit
mirror of https://github.com/InsanusMokrassar/JSUIKitKBindings.git
1
0
Fork 0
Code Packages Releases Activity

Merge pull request #22 from InsanusMokrassar/0.0.22 

0.0.22
This commit is contained in:
InsanusMokrassar 2022-01-25 19:35:25 +06:00 committed by GitHub
parent 6f095de81d 13556a293c
commit 8e9ff07b71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,5 +1,9 @@
# Changelog # Changelog
## 0.0.22
* Add opportunity to customize table header cells
## 0.0.21 ## 0.0.21
* Upfill `UIKitWidth` * Upfill `UIKitWidth`

2
gradle.properties
View File

@ -9,4 +9,4 @@ android.enableJetifier=true
# Project data # Project data
group=dev.inmo group=dev.inmo
version=0.0.21 version=0.0.22

46
src/jsMain/kotlin/dev/inmo/jsuikit/elements/Table.kt
View File

@ -10,16 +10,16 @@ import org.w3c.dom.*
@Composable @Composable
fun <T> DefaultTable( fun <T> DefaultTable(
heading: List<String>, headerBuilders: List<ContentBuilder<HTMLTableCellElement>>,
dataList: SnapshotStateList<T>, dataList: SnapshotStateList<T>,
vararg tableModifiers: UIKitModifier, vararg tableModifiers: UIKitModifier,
attributesCustomizer: AttrBuilderContext<HTMLTableElement> = {}, attributesCustomizer: AttrBuilderContext<HTMLTableElement> = {},
headerCellCustomizer: AttrsBuilder<HTMLTableCellElement>.(i: Int, title: String) -> Unit = { _, _ -> }, headerCellCustomizer: AttrsBuilder<HTMLTableCellElement>.(i: Int) -> Unit = { },
rowAttributes: AttrsBuilder<HTMLTableRowElement>.(t: T) -> Unit = {}, rowAttributes: AttrsBuilder<HTMLTableRowElement>.(t: T) -> Unit = {},
cellCustomizer: AttrsBuilder<HTMLTableCellElement>.(i: Int, t: T) -> Unit = { _, _ -> }, cellCustomizer: AttrsBuilder<HTMLTableCellElement>.(i: Int, t: T) -> Unit = { _, _ -> },
cellFiller: @Composable ElementScope<HTMLTableCellElement>.(i: Int, t: T) -> Unit cellFiller: @Composable ElementScope<HTMLTableCellElement>.(i: Int, t: T) -> Unit
) { ) {
val headingIndexes = heading.indices val headingIndexes = headerBuilders.indices
Table( Table(
{ {
classes("uk-table") classes("uk-table")
@ -29,13 +29,13 @@ fun <T> DefaultTable(
) { ) {
Thead { Thead {
Tr { Tr {
heading.forEachIndexed { i, t -> headerBuilders.forEachIndexed { i, t ->
Th( Th(
{ {
headerCellCustomizer(i, t) headerCellCustomizer(i)
} }
) { ) {
Text(t) t()
} }
} }
} }
@ -61,3 +61,37 @@ fun <T> DefaultTable(
} }
} }
} }
@Composable
fun <T> DefaultTable(
heading: List<String>,
dataList: SnapshotStateList<T>,
vararg tableModifiers: UIKitModifier,
attributesCustomizer: AttrBuilderContext<HTMLTableElement> = {},
headerCellCustomizer: AttrsBuilder<HTMLTableCellElement>.(i: Int, title: String) -> Unit = { _, _ -> },
rowAttributes: AttrsBuilder<HTMLTableRowElement>.(t: T) -> Unit = {},
cellCustomizer: AttrsBuilder<HTMLTableCellElement>.(i: Int, t: T) -> Unit = { _, _ -> },
cellFiller: @Composable ElementScope<HTMLTableCellElement>.(i: Int, t: T) -> Unit
) {
val headersByIndex = heading.mapIndexed { index, s -> index to s }.toMap()
val headerCellCustomizer: AttrsBuilder<HTMLTableCellElement>.(i: Int) -> Unit = { i ->
val header = headersByIndex[i]
if (header != null) {
headerCellCustomizer(i, header)
}
}
inline fun headerFactory(header: String): ContentBuilder<HTMLTableCellElement> = {
Text(header)
}
val headerBuilders = heading.map(::headerFactory)
return DefaultTable(
headerBuilders,
dataList,
tableModifiers = tableModifiers,
attributesCustomizer,
headerCellCustomizer,
rowAttributes,
cellCustomizer,
cellFiller
)
}