extend divider

0.0.24

.gitignore

@@ -11,6 +11,7 @@ out/
 
 secret.gradle
 local.properties
+local.*
 
 kotlin-js-store/
 

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## 0.0.25
+
+* Full including of divider
+
+## 0.0.24
+
+* Add opportunity to fill space between header and body of table
+
+## 0.0.23
+
+* New parameter of tables `headerCustomizer`
+
+## 0.0.22
+
+* Add opportunity to customize table header cells
+
+## 0.0.21
+
+* Upfill `UIKitWidth`
+* New extension `UIKitModifier#applyWhenScreenSizeIs`
+
 ## 0.0.20
 
 * Remove type of button from `DefaultButton` and add companion to `UIKitButton` to be able to use `uk-button` class

gradle.properties

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

local.make_version.sh

@@ -0,0 +1 @@
+git add -A && git stash && git checkout master && git pull && git checkout -b "$1" && nano gradle.properties CHANGELOG.md && git add -A && git commit -m "start $1" && git stash pop && git add -A && nano CHANGELOG.md && git add -A && git commit -m "$2" && git push --set-upstream origin "$1" && ./gradlew clean && ./gradlew publishToMavenLocal

src/jsMain/kotlin/dev/inmo/jsuikit/elements/Divider.kt

@@ -1,7 +1,40 @@
 package dev.inmo.jsuikit.elements
 
 import androidx.compose.runtime.Composable
+import dev.inmo.jsuikit.modifiers.*
+import org.jetbrains.compose.web.dom.AttrBuilderContext
 import org.jetbrains.compose.web.dom.Hr
+import org.w3c.dom.HTMLHRElement
+
+object Divider {
+    @Composable
+    fun Common(
+        vararg modifiers: UIKitModifier,
+        attributesCustomizer: AttrBuilderContext<HTMLHRElement> = {}
+    ) = Hr {
+        include(*modifiers)
+        attributesCustomizer()
+    }
+    @Composable
+    fun Icon(
+        vararg modifiers: UIKitModifier,
+        attributesCustomizer: AttrBuilderContext<HTMLHRElement> = {}
+    ) = Common(
+        *(modifiers + UIKitDivider.Icon), attributesCustomizer = attributesCustomizer
+    )
+    @Composable
+    fun Small(
+        vararg modifiers: UIKitModifier,
+        attributesCustomizer: AttrBuilderContext<HTMLHRElement> = {}
+    ) = Common(
+        *(modifiers + UIKitDivider.Small), attributesCustomizer = attributesCustomizer
+    )
+    @Composable
+    fun Vertical(
+        vararg modifiers: UIKitModifier,
+        attributesCustomizer: AttrBuilderContext<HTMLHRElement> = {}
+    ) = Common(
+        *(modifiers + UIKitDivider.Vertical), attributesCustomizer = attributesCustomizer
+    )
+}
 
-@Composable
-fun Divider() = Hr({ classes("uk-divider-icon") })

src/jsMain/kotlin/dev/inmo/jsuikit/elements/Table.kt

@@ -10,16 +10,18 @@ import org.w3c.dom.*
 
 @Composable
 fun <T> DefaultTable(
-    heading: List<String>,
+    headerBuilders: List<ContentBuilder<HTMLTableCellElement>>,
     dataList: SnapshotStateList<T>,
     vararg tableModifiers: UIKitModifier,
     attributesCustomizer: AttrBuilderContext<HTMLTableElement> = {},
-    headerCellCustomizer: AttrsBuilder<HTMLTableCellElement>.(i: Int, title: String) -> Unit = { _, _ -> },
+    headerCustomizer: AttrBuilderContext<HTMLTableSectionElement> = {},
+    headerCellCustomizer: AttrsBuilder<HTMLTableCellElement>.(i: Int) -> Unit = {},
     rowAttributes: AttrsBuilder<HTMLTableRowElement>.(t: T) -> Unit = {},
     cellCustomizer: AttrsBuilder<HTMLTableCellElement>.(i: Int, t: T) -> Unit = { _, _ -> },
+    betweenHeaderAndBodyFiller: ContentBuilder<HTMLTableElement> = {},
     cellFiller: @Composable ElementScope<HTMLTableCellElement>.(i: Int, t: T) -> Unit
 ) {
-    val headingIndexes = heading.indices
+    val headingIndexes = headerBuilders.indices
     Table(
         {
             classes("uk-table")
@@ -27,19 +29,20 @@ fun <T> DefaultTable(
             attributesCustomizer()
         }
     ) {
-        Thead {
+        Thead(headerCustomizer) {
             Tr {
-                heading.forEachIndexed { i, t ->
+                headerBuilders.forEachIndexed { i, t ->
                     Th(
                         {
-                            headerCellCustomizer(i, t)
+                            headerCellCustomizer(i)
                         }
                     ) {
-                        Text(t)
+                        t()
                     }
                 }
             }
         }
+        betweenHeaderAndBodyFiller()
         Tbody {
             dataList.forEach {
                 Tr(
@@ -61,3 +64,41 @@ fun <T> DefaultTable(
         }
     }
 }
+
+@Composable
+fun <T> DefaultTable(
+    heading: List<String>,
+    dataList: SnapshotStateList<T>,
+    vararg tableModifiers: UIKitModifier,
+    attributesCustomizer: AttrBuilderContext<HTMLTableElement> = {},
+    headerCustomizer: AttrBuilderContext<HTMLTableSectionElement> = {},
+    headerCellCustomizer: AttrsBuilder<HTMLTableCellElement>.(i: Int, title: String) -> Unit = { _, _ -> },
+    rowAttributes: AttrsBuilder<HTMLTableRowElement>.(t: T) -> Unit = {},
+    cellCustomizer: AttrsBuilder<HTMLTableCellElement>.(i: Int, t: T) -> Unit = { _, _ -> },
+    betweenHeaderAndBodyFiller: ContentBuilder<HTMLTableElement> = {},
+    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,
+        headerCustomizer,
+        headerCellCustomizer,
+        rowAttributes,
+        cellCustomizer,
+        betweenHeaderAndBodyFiller,
+        cellFiller
+    )
+}

src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitDivider.kt

@@ -0,0 +1,10 @@
+package dev.inmo.jsuikit.modifiers
+
+sealed class UIKitDivider(classname: String) : UIKitModifier {
+    override val classes: Array<String> = arrayOf(classname)
+
+    object Icon : UIKitDivider("uk-divider-icon")
+    object Small : UIKitDivider("uk-divider-small")
+    object Vertical : UIKitDivider("uk-divider-vertical")
+
+}

src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitScreenSizeModifier.kt

@@ -18,3 +18,5 @@ sealed class UIKitScreenSizeModifier(val name: String) {
         modifier
     )
 }
+
+fun UIKitModifier.applyWhenScreenSizeIs(size: UIKitScreenSizeModifier) = size.modify(this)

src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitWidth.kt

@@ -3,8 +3,9 @@ package dev.inmo.jsuikit.modifiers
 sealed class UIKitWidth(classname: String) : UIKitModifier {
     override val classes: Array<String> = arrayOf("uk-width-$classname")
 
-    object Full : UIKitWidth("1-1")
+    object Auto : UIKitWidth("auto")
     object Expand : UIKitWidth("expand")
+    object Full : UIKitWidth("1-1")
 
     object Half : UIKitWidth("1-2")
 
@@ -12,22 +13,70 @@ sealed class UIKitWidth(classname: String) : UIKitModifier {
     object TwoThird : UIKitWidth("2-3")
 
     object OneFourth : UIKitWidth("1-4")
-    val TwoFourth get() = Half
     object ThreeFourth : UIKitWidth("3-4")
-    val FourFourth get() = Full
 
     object OneFifth : UIKitWidth("1-5")
     object TwoFifth : UIKitWidth("2-5")
     object ThreeFifth : UIKitWidth("3-5")
     object FourFifth : UIKitWidth("4-5")
-    val FiveFifth get() = Full
 
     object OneSixth : UIKitWidth("1-6")
-    val TwoSixth get() = OneThird
-    val ThreeSixth get() = Half
-    val FourSixth get() = TwoThird
     object FiveSixth : UIKitWidth("5-6")
-    val SixSixth get() = Full
+
+    sealed class Child(suffix: String) : UIKitWidth("child-$suffix") {
+        object Full : Child("1-1")
+
+        object Half : Child("1-2")
+
+        object OneThird : Child("1-3")
+        object TwoThird : Child("2-3")
+
+        object OneFourth : Child("1-4")
+        object ThreeFourth : Child("3-4")
+
+        object OneFifth : Child("1-5")
+        object TwoFifth : Child("2-5")
+        object ThreeFifth : Child("3-5")
+        object FourFifth : Child("4-5")
+
+        object OneSixth : Child("1-6")
+        object FiveSixth : Child("5-6")
+
+        object Auto : Child("auto")
+        object Expand : Child("expand")
+
+        companion object {
+
+            val TwoFourth get() = Half
+            val TwoSixth get() = OneThird
+            val ThreeSixth get() = Half
+            val FourSixth get() = TwoThird
+            val FourFourth get() = Full
+            val FiveFifth get() = Full
+            val SixSixth get() = Full
+        }
+    }
+
+    sealed class Fixed(suffix: String) : UIKitWidth("fixed-$suffix") {
+
+        object Small : Fixed("small")
+        object Medium : Fixed("medium")
+        object Large : Fixed("large")
+        object XLarge : Fixed("xlarge")
+        object XXLarge : Fixed("2xlarge")
+
+    }
 
     override fun toString() = classes.first()
+
+    companion object {
+
+        val TwoFourth get() = Half
+        val TwoSixth get() = OneThird
+        val ThreeSixth get() = Half
+        val FourSixth get() = TwoThird
+        val FourFourth get() = Full
+        val FiveFifth get() = Full
+        val SixSixth get() = Full
+    }
 }