fixes for build

0.0.28

.gitignore

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

CHANGELOG.md

@@ -1,3 +1,97 @@
+# Changelog
+
+## 0.0.29
+
+* Unfilling of `UIKitText`
+
+## 0.0.28
+
+* Fixes in `UIKitWidth`
+
+## 0.0.27
+
+* `TextField` has been renamed to `StandardInput`
+* `StandardInput` now will look for changes in state
+
+## 0.0.26
+
+* Add UIKitColumn
+
+## 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
+
+## 0.0.19
+
+* Create `Card`s implementation
+* Upgrade `Label` composable draw and create `UIKitLabel` modifiers
+
+## 0.0.18
+
+* Add base companion for `UIKitFlex` with result class `uk-flex`
+
+## 0.0.17
+
+* In `DefaultTable` `headingCustomizer` has been renamed to `headerCellCustomizer`
+* Add index and title parameters for `headerCellCustomizer` in `DefaultTable`
+
+## 0.0.16
+
+* Add opportunity to customize `NavDivider`
+
+## 0.0.15
+
+* Add support of link icons
+
+## 0.0.14
+
+* Add DefaultTable parameter cellCustomizer
+
+## 0.0.13
+
+* Add `Icon#Custom`
+
+## 0.0.12
+
+* Add `rowAttributes` to table fun
+
+## 0.0.11
+
+* Upfill `Nav` and `UIKitNav`
+
+## 0.0.10
+
+* Filling of `UIKitUtility`
+
+## 0.0.9
+
+* Improving of `Nav` support
+
+## 0.0.8
+
+Removing of redundant non standard things
+
 ## 0.0.7
 
 Rewrite project onto multiplatform paradigm and return back varargs instead of most `Array<UIKitModifier>`

README.md

@@ -1,8 +1,5 @@
 # JSUIKit Kotlin
 
-**IMPORTANT NOTICE**: ___Currently it is possible that you will have issues with `vararg` arguments passing to the functions.
-Use `arrayOf(...)` instead___
-
 Hello :) This library is a wrapper for JavaScript/CSS [UIKit](https://getuikit.com) framework. It uses the same
 structure as in [UIKit Docs](https://getuikit.com/docs/introduction) and in most cases you may use it.
 
@@ -11,10 +8,10 @@ for you in case you are using it too.
 
 ## How to include
 
-Last version: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/jsuikitkotlin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/jsuikitkotlin)
+Last version: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/kjsuikit/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/kjsuikit)
 
 ```groovy
-implementation "dev.inmo:jsuikitkotlin:$jsuikitkotlin_version"
+implementation "dev.inmo:kjsuikit:$kjsuikit_version"
 ```
 
 **THIS LIBRARY DO NOT ADD ANY JS OR CSS**. So, you must download and include UIKit js/css by yourself. See

gradle.properties

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

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/Button.kt

@@ -14,7 +14,6 @@ import org.w3c.dom.events.Event
 fun DefaultButton(
     vararg modifiers: UIKitModifier,
     disabled: Boolean = false,
-    buttonType: UIKitButton.Type = UIKitButton.Type.Default,
     onClick: ((SyntheticMouseEvent) -> Unit)? = null,
     attributesCustomizer: AttrBuilderContext<HTMLButtonElement> = {},
     contentAllocator: ContentBuilder<HTMLButtonElement>
@@ -22,8 +21,7 @@ fun DefaultButton(
     Button(
         {
             onClick ?.let { onClick(it) }
-            classes("uk-button")
-            include(*modifiers, buttonType)
+            include(UIKitButton, *modifiers)
             if (disabled) {
                 disabled()
             }
@@ -39,12 +37,11 @@ fun DefaultButton(
     text: String,
     vararg modifiers: UIKitModifier,
     disabled: Boolean = false,
-    buttonType: UIKitButton.Type = UIKitButton.Type.Default,
     preTextContentAllocator: ContentBuilder<HTMLButtonElement>? = null,
     afterTextContentAllocator: ContentBuilder<HTMLButtonElement>? = null,
     attributesCustomizer: AttrBuilderContext<HTMLButtonElement> = {},
     onClick: ((SyntheticMouseEvent) -> Unit)? = null
-) = DefaultButton(*modifiers, disabled = disabled, buttonType = buttonType, onClick = onClick, attributesCustomizer = attributesCustomizer) {
+) = DefaultButton(*modifiers, disabled = disabled, onClick = onClick, attributesCustomizer = attributesCustomizer) {
     preTextContentAllocator ?.apply { preTextContentAllocator() }
     Text(text)
     afterTextContentAllocator ?.apply { afterTextContentAllocator() }

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

@@ -0,0 +1,79 @@
+package dev.inmo.jsuikit.elements
+
+import androidx.compose.runtime.Composable
+import dev.inmo.jsuikit.modifiers.*
+import dev.inmo.jsuikit.utils.Attrs
+import org.jetbrains.compose.web.dom.*
+import org.w3c.dom.*
+
+@Composable
+fun Card(
+    cardAttrs: Attrs<HTMLDivElement> = Attrs.empty(),
+    headerAttrs: Attrs<HTMLDivElement> = Attrs.empty(),
+    header: ContentBuilder<HTMLDivElement>? = null,
+    footerAttrs: Attrs<HTMLDivElement> = Attrs.empty(),
+    footer: ContentBuilder<HTMLDivElement>? = null,
+    bodyAttrs: Attrs<HTMLDivElement> = Attrs.empty(),
+    body: ContentBuilder<HTMLDivElement>
+) {
+    Div(
+        {
+            include(UIKitCard)
+            cardAttrs.builder(this)
+        }
+    ) {
+        header ?.let {
+            Div(
+                {
+                    include(UIKitCard.Parts.Header)
+                    headerAttrs.builder(this)
+                },
+                header
+            )
+        }
+        Div(
+            {
+                include(UIKitCard.Parts.Body)
+                bodyAttrs.builder(this)
+            },
+            body
+        )
+        footer ?.let {
+            Div(
+                {
+                    include(UIKitCard.Parts.Footer)
+                    footerAttrs.builder(this)
+                },
+                footer
+            )
+        }
+    }
+}
+
+@Composable
+fun CardTitle(
+    titleAttrs: Attrs<HTMLHeadingElement> = Attrs.empty(),
+    title: ContentBuilder<HTMLHeadingElement>
+) {
+    H3(
+        {
+            include(UIKitCard.Title)
+            titleAttrs.builder(this)
+        },
+        title
+    )
+}
+
+@Composable
+fun CardBadge(
+    badgeAttrs: Attrs<HTMLDivElement> = Attrs.empty(),
+    badge: ContentBuilder<HTMLDivElement>
+) {
+    Div(
+        {
+            include(UIKitCard.Badge, UIKitLabel)
+            badgeAttrs.builder(this)
+        },
+        badge
+    )
+}

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/Icon.kt

@@ -219,13 +219,15 @@ sealed class Icon(val name: String) {
             }
             attributesCustomizer()
         }
-        if (type == UIKitIconType.Button) {
-            Button(configurer)
-        } else {
-            Span(configurer)
+        when (type) {
+            UIKitIconType.Default -> Span(configurer)
+            UIKitIconType.Link -> A(href = "#", configurer)
+            UIKitIconType.Button -> Button(configurer)
         }
     }
 
+    class Custom(name: String) : Icon(name)
+
     @Composable
     fun drawAsButton(
         vararg modifiers: UIKitModifier,
@@ -241,4 +243,12 @@ sealed class Icon(val name: String) {
         attributesCustomizer: AttrBuilderContext<out HTMLElement> = {},
         onClick: ((Event) -> Unit)? = null
     ) = invoke(*modifiers, type = UIKitIconType.Default, ratio = ratio, onClick = onClick, attributesCustomizer = attributesCustomizer)
+
+    @Composable
+    fun drawAsLink(
+        vararg modifiers: UIKitModifier,
+        ratio: Float? = null,
+        attributesCustomizer: AttrBuilderContext<out HTMLElement> = {},
+        onClick: ((Event) -> Unit)? = null
+    ) = invoke(*modifiers, type = UIKitIconType.Link, ratio = ratio, onClick = onClick, attributesCustomizer = attributesCustomizer)
 }

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

@@ -1,41 +1,20 @@
 package dev.inmo.jsuikit.elements
 
 import androidx.compose.runtime.Composable
-import dev.inmo.jsuikit.modifiers.UIKitModifier
-import dev.inmo.jsuikit.modifiers.include
+import dev.inmo.jsuikit.modifiers.*
+import dev.inmo.jsuikit.utils.Attrs
 import org.jetbrains.compose.web.dom.*
 import org.w3c.dom.HTMLSpanElement
 
-sealed interface Label {
-    val suffix: String
-
-    @Composable
-    fun draw(
-        text: String,
-        vararg modifiers: UIKitModifier,
-        attributesCustomizer: AttrBuilderContext<HTMLSpanElement> = {},
-    ) = Span(
-        {
-            classes("uk-label", "uk-label-$suffix")
-            include(*modifiers)
-            attributesCustomizer()
-        }
-    ) {
-        Text(text)
-    }
-
-    object Success : Label {
-        override val suffix: String
-            get() = "success"
-    }
-
-    object Warning : Label {
-        override val suffix: String
-            get() = "warning"
-    }
-
-    object Error : Label {
-        override val suffix: String
-            get() = "danger"
+@Composable
+fun Label(
+    text: String,
+    attrs: Attrs<HTMLSpanElement>
+) = Span(
+    {
+        include(UIKitLabel)
+        attrs.builder(this)
     }
+) {
+    Text(text)
 }

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

@@ -1,12 +1,13 @@
 package dev.inmo.jsuikit.elements
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.snapshots.SnapshotStateList
 import dev.inmo.jsuikit.buildAndAddAttribute
 import dev.inmo.jsuikit.modifiers.*
 import dev.inmo.jsuikit.utils.Milliseconds
 import org.jetbrains.compose.web.dom.*
-import org.w3c.dom.HTMLLIElement
-import org.w3c.dom.HTMLUListElement
+import org.jetbrains.compose.web.dom.Text
+import org.w3c.dom.*
 
 @Composable
 fun Nav(
@@ -26,8 +27,7 @@ fun Nav(
                 "animation" to animation
                 "duration" to duration ?.toString()
             }
-            classes("uk-nav")
-            include(*modifiers)
+            include(*modifiers, UIKitNav)
             attributesCustomizer()
         }
     ) {
@@ -35,6 +35,223 @@ fun Nav(
     }
 }
 
+@Composable
+fun DefaultNav(
+    vararg modifiers: UIKitModifier,
+    multiple: Boolean? = null,
+    collapsible: Boolean? = null,
+    animation: UIKitAnimation? = null,
+    duration: Milliseconds? = null,
+    attributesCustomizer: AttrBuilderContext<HTMLUListElement> = {},
+    dataAllocator: ContentBuilder<HTMLUListElement>
+) = Nav(
+    modifiers = modifiers + UIKitNav.Default,
+    multiple,
+    collapsible,
+    animation,
+    duration,
+    attributesCustomizer,
+    dataAllocator
+)
+
+@Composable
+fun PrimaryNav(
+    vararg modifiers: UIKitModifier,
+    multiple: Boolean? = null,
+    collapsible: Boolean? = null,
+    animation: UIKitAnimation? = null,
+    duration: Milliseconds? = null,
+    attributesCustomizer: AttrBuilderContext<HTMLUListElement> = {},
+    dataAllocator: ContentBuilder<HTMLUListElement>
+) = Nav(
+    modifiers = modifiers + UIKitNav.Primary,
+    multiple,
+    collapsible,
+    animation,
+    duration,
+    attributesCustomizer,
+    dataAllocator
+)
+
+@Composable
+fun SubNav(
+    vararg modifiers: UIKitModifier,
+    multiple: Boolean? = null,
+    collapsible: Boolean? = null,
+    animation: UIKitAnimation? = null,
+    duration: Milliseconds? = null,
+    attributesCustomizer: AttrBuilderContext<HTMLUListElement> = {},
+    dataAllocator: ContentBuilder<HTMLUListElement>
+) = Nav(
+    modifiers = modifiers + UIKitNav.SubNav,
+    multiple,
+    collapsible,
+    animation,
+    duration,
+    attributesCustomizer,
+    dataAllocator
+)
+
+@Composable
+fun <T> Nav(
+    title: String,
+    data: SnapshotStateList<T>,
+    vararg ulModifiers: UIKitModifier,
+    titleModifiers: Array<UIKitModifier> = emptyArray(),
+    multiple: Boolean? = null,
+    collapsible: Boolean? = null,
+    animation: UIKitAnimation? = null,
+    duration: Milliseconds? = null,
+    besidesTitleAndList: ContentBuilder<HTMLUListElement>? = null,
+    titleCustomizer: AttrBuilderContext<HTMLLIElement> = {},
+    ulCustomizer: AttrBuilderContext<HTMLUListElement> = {},
+    elementAllocator: @Composable ElementScope<HTMLUListElement>.(T) -> Unit
+) {
+    Ul(
+        {
+            buildAndAddAttribute("uk-nav") {
+                "multiple" to multiple ?.toString()
+                "collapsible" to collapsible ?.toString()
+                "animation" to animation
+                "duration" to duration ?.toString()
+            }
+            include(*ulModifiers, UIKitNav)
+            ulCustomizer()
+        }
+    ) {
+        NavHeader(
+            title,
+            *titleModifiers,
+            attributesCustomizer = titleCustomizer
+        )
+        besidesTitleAndList ?.let { it() }
+        data.forEach {
+            elementAllocator(it)
+        }
+    }
+}
+
+@Composable
+fun <T> DefaultNav(
+    title: String,
+    data: SnapshotStateList<T>,
+    vararg ulModifiers: UIKitModifier,
+    titleModifiers: Array<UIKitModifier> = emptyArray(),
+    multiple: Boolean? = null,
+    collapsible: Boolean? = null,
+    animation: UIKitAnimation? = null,
+    duration: Milliseconds? = null,
+    besidesTitleAndList: ContentBuilder<HTMLUListElement>? = null,
+    titleCustomizer: AttrBuilderContext<HTMLLIElement> = {},
+    ulCustomizer: AttrBuilderContext<HTMLUListElement> = {},
+    elementAllocator: @Composable ElementScope<HTMLUListElement>.(T) -> Unit
+) = Nav(
+    title,
+    data,
+    ulModifiers = ulModifiers + UIKitNav.Default,
+    titleModifiers,
+    multiple,
+    collapsible,
+    animation,
+    duration,
+    besidesTitleAndList,
+    titleCustomizer,
+    ulCustomizer,
+    elementAllocator
+)
+
+@Composable
+fun <T> PrimaryNav(
+    title: String,
+    data: SnapshotStateList<T>,
+    vararg ulModifiers: UIKitModifier,
+    titleModifiers: Array<UIKitModifier> = emptyArray(),
+    multiple: Boolean? = null,
+    collapsible: Boolean? = null,
+    animation: UIKitAnimation? = null,
+    duration: Milliseconds? = null,
+    besidesTitleAndList: ContentBuilder<HTMLUListElement>? = null,
+    titleCustomizer: AttrBuilderContext<HTMLLIElement> = {},
+    ulCustomizer: AttrBuilderContext<HTMLUListElement> = {},
+    elementAllocator: @Composable ElementScope<HTMLUListElement>.(T) -> Unit
+) = Nav(
+    title,
+    data,
+    ulModifiers = ulModifiers + UIKitNav.Primary,
+    titleModifiers,
+    multiple,
+    collapsible,
+    animation,
+    duration,
+    besidesTitleAndList,
+    titleCustomizer,
+    ulCustomizer,
+    elementAllocator
+)
+
+@Composable
+fun <T> SubNav(
+    title: String,
+    data: SnapshotStateList<T>,
+    vararg ulModifiers: UIKitModifier,
+    titleModifiers: Array<UIKitModifier> = emptyArray(),
+    multiple: Boolean? = null,
+    collapsible: Boolean? = null,
+    animation: UIKitAnimation? = null,
+    duration: Milliseconds? = null,
+    besidesTitleAndList: ContentBuilder<HTMLUListElement>? = null,
+    titleCustomizer: AttrBuilderContext<HTMLLIElement> = {},
+    ulCustomizer: AttrBuilderContext<HTMLUListElement> = {},
+    elementAllocator: @Composable ElementScope<HTMLUListElement>.(T) -> Unit
+) = Nav(
+    title,
+    data,
+    ulModifiers = ulModifiers + UIKitNav.SubNav,
+    titleModifiers,
+    multiple,
+    collapsible,
+    animation,
+    duration,
+    besidesTitleAndList,
+    titleCustomizer,
+    ulCustomizer,
+    elementAllocator
+)
+
+@Composable
+fun NavHeader(
+    text: String,
+    vararg modifiers: UIKitModifier,
+    attributesCustomizer: AttrBuilderContext<HTMLLIElement> = {},
+) {
+    Li(
+        {
+            include(*modifiers, UIKitNav.Header)
+            attributesCustomizer()
+        }
+    ) {
+        Text(text)
+    }
+}
+
+@Composable
+fun NavItemElement(
+    vararg modifiers: UIKitModifier,
+    attributesCustomizer: AttrBuilderContext<HTMLLIElement> = {},
+    contentAllocator: ContentBuilder<HTMLAnchorElement>
+) {
+    Li(
+        {
+            include(*modifiers)
+            attributesCustomizer()
+        }
+    ) {
+        A("#") {
+            contentAllocator()
+        }
+    }
+}
+
 @Composable
 fun NavElement(
     vararg modifiers: UIKitModifier,
@@ -44,9 +261,17 @@ fun NavElement(
     Li(
         {
             include(*modifiers)
-            attributesCustomizer
+            attributesCustomizer()
         }
     ) {
         contentAllocator()
     }
 }
+
+@Composable
+fun NavDivider(
+    vararg modifiers: UIKitModifier,
+    attributesCustomizer: AttrBuilderContext<HTMLLIElement> = {},
+) {
+    Li({ include(UIKitNav.Divider, *modifiers);attributesCustomizer() })
+}

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

@@ -23,4 +23,4 @@ fun Spinner(
 }
 
 @Composable
-fun DefaultSpinner() = Spinner(UIKitAlign.Center, UIKitMargin.Small, UIKitText.Alignment.Center)
+fun DefaultSpinner() = Spinner(UIKitAlign.Center, UIKitMargin.Small, UIKitText.Alignment.Horizontal.Center, UIKitText.Alignment.Vertical.Middle)

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

@@ -9,7 +9,7 @@ import org.jetbrains.compose.web.dom.Input
 import org.w3c.dom.HTMLInputElement
 
 @Composable
-fun <T> TextField(
+fun <T> StandardInput(
     type: InputType<T>,
     state: MutableState<T>,
     disabledState: State<Boolean>? = null,
@@ -23,7 +23,16 @@ fun <T> TextField(
 
         placeholder ?.let(::placeholder)
 
-        onChange { state.value = it.value }
+        state.value.let {
+            when (it) {
+                is String -> value(it)
+                is Number -> value(it)
+                else -> {}
+            }
+        }
+
+        onInput { state.value = it.value }
+
         disabledState ?.let {
             if (it.value) {
                 disabled()
@@ -32,3 +41,14 @@ fun <T> TextField(
         attributesCustomizer()
     }
 }
+
+@Composable
+@Deprecated("Renamed", ReplaceWith("StandardInput", "dev.inmo.jsuikit.elements.StandardInput"))
+fun <T> TextField(
+    type: InputType<T>,
+    state: MutableState<T>,
+    disabledState: State<Boolean>? = null,
+    placeholder: String? = null,
+    vararg modifiers: UIKitModifier,
+    attributesCustomizer: AttrBuilderContext<HTMLInputElement> = {},
+) = StandardInput(type, state, disabledState, placeholder, modifiers = modifiers, attributesCustomizer)

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

@@ -3,19 +3,25 @@ package dev.inmo.jsuikit.elements
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.snapshots.SnapshotStateList
 import dev.inmo.jsuikit.modifiers.*
+import org.jetbrains.compose.web.attributes.AttrsBuilder
 import org.jetbrains.compose.web.dom.*
-import org.w3c.dom.HTMLProgressElement
-import org.w3c.dom.HTMLTableElement
+import org.jetbrains.compose.web.dom.Text
+import org.w3c.dom.*
 
 @Composable
 fun <T> DefaultTable(
-    heading: List<String>,
+    headerBuilders: List<ContentBuilder<HTMLTableCellElement>>,
     dataList: SnapshotStateList<T>,
     vararg tableModifiers: UIKitModifier,
     attributesCustomizer: AttrBuilderContext<HTMLTableElement> = {},
-    cellFiller: @Composable (i: Int, t: T) -> 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")
@@ -23,24 +29,33 @@ fun <T> DefaultTable(
             attributesCustomizer()
         }
     ) {
-        Thead {
+        Thead(headerCustomizer) {
             Tr {
-                heading.forEach {
+                headerBuilders.forEachIndexed { i, t ->
                     Th(
                         {
-                            include(UIKitExtension.TextTransformUnset)
+                            headerCellCustomizer(i)
                         }
                     ) {
-                        Text(it)
+                        t()
                     }
                 }
             }
         }
+        betweenHeaderAndBodyFiller()
         Tbody {
             dataList.forEach {
-                Tr {
+                Tr(
+                    {
+                        rowAttributes(it)
+                    }
+                ) {
                     headingIndexes.forEach { i ->
-                        Td {
+                        Td(
+                            {
+                                cellCustomizer(i, it)
+                            }
+                        ) {
                             cellFiller(i, it)
                         }
                     }
@@ -49,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/UIKitBase.kt

@@ -0,0 +1,14 @@
+package dev.inmo.jsuikit.modifiers
+
+sealed class UIKitBase(classname: String) : UIKitModifier {
+    override val classes: Array<String> = arrayOf(classname)
+
+    sealed class Heading(suffix: String) : UIKitBase("uk-h$suffix") {
+        object H1 : Heading("1")
+        object H2 : Heading("2")
+        object H3 : Heading("3")
+        object H4 : Heading("4")
+        object H5 : Heading("5")
+        object H6 : Heading("6")
+    }
+}

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

@@ -1,7 +1,7 @@
 package dev.inmo.jsuikit.modifiers
 
-sealed class UIKitButton(suffix: String) : UIKitModifier {
-    override val classes: Array<String> = arrayOf("uk-button-$suffix")
+sealed class UIKitButton(suffix: String?) : UIKitModifier {
+    override val classes: Array<String> = arrayOf("uk-button${suffix?.let { "-$it" } ?: ""}")
 
     sealed class Type(suffix: String) : UIKitButton(suffix) {
         object Default : Type("default")
@@ -11,4 +11,6 @@ sealed class UIKitButton(suffix: String) : UIKitModifier {
         object Text : Type("text")
         object Link : Type("link")
     }
+
+    companion object : UIKitButton(null)
 }

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

@@ -0,0 +1,35 @@
+package dev.inmo.jsuikit.modifiers
+
+sealed class UIKitCard(suffix: String?) : UIKitModifier {
+    override val classes: Array<String> = arrayOf("uk-card${suffix ?.let { "-$it" } ?: ""}")
+
+    object Title : UIKitCard("title")
+    object Hover : UIKitCard("hover")
+    object Badge : Parts("badge")
+
+    sealed class Parts(suffix: String) : UIKitCard(suffix) {
+        object Header : Parts("header")
+        object Body : Parts("body")
+        object Footer : Parts("footer")
+    }
+
+    sealed class Style(suffix: String) : UIKitCard(suffix) {
+        object Default : Style("default")
+        object Primary : Style("primary")
+        object Secondary : Style("secondary")
+    }
+
+    sealed class Size(suffix: String) : UIKitCard(suffix) {
+        object Small : Size("small")
+        object Large : Size("large")
+    }
+
+    sealed class Media(suffix: String) : UIKitCard("media-$suffix") {
+        object Top : Media("top")
+        object Right : Media("right")
+        object Bottom : Media("bottom")
+        object Left : Media("left")
+    }
+
+    companion object : UIKitCard(null)
+}

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

@@ -0,0 +1,15 @@
+package dev.inmo.jsuikit.modifiers
+
+sealed class UIKitColumn(classname: String) : UIKitModifier {
+    override val classes: Array<String> = arrayOf(classname)
+
+    object Two : UIKitColumn("uk-column-1-2")
+    object Three : UIKitColumn("uk-column-1-3")
+    object Four : UIKitColumn("uk-column-1-4")
+    object Five : UIKitColumn("uk-column-1-5")
+    object Six : UIKitColumn("uk-column-1-6")
+
+    object Divider : UIKitColumn("uk-column-divider")
+
+    object Span : UIKitColumn("uk-column-span")
+}

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/UIKitExtensions.kt

@@ -1,7 +0,0 @@
-package dev.inmo.jsuikit.modifiers
-
-sealed class UIKitExtension(classname: String) : UIKitModifier {
-    override val classes: Array<String> = arrayOf(classname)
-    object TextTransformUnset : UIKitExtension("text_transform_unset")
-    object CursorPointer : UIKitExtension("cursor_pointer")
-}

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

@@ -1,7 +1,7 @@
 package dev.inmo.jsuikit.modifiers
 
-sealed class UIKitFlex(suffix: String) : UIKitModifier {
-    override val classes: Array<String> = arrayOf("uk-flex-$suffix")
+sealed class UIKitFlex(suffix: String?) : UIKitModifier {
+    override val classes: Array<String> = arrayOf("uk-flex${suffix ?.let { "-$it" } ?: ""}")
 
     object Inline : UIKitFlex("inline")
 
@@ -76,4 +76,6 @@ sealed class UIKitFlex(suffix: String) : UIKitModifier {
 
     object NoWrap : UIKitFlex("nowrap")
 
+    companion object : UIKitFlex(null)
+
 }

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

@@ -0,0 +1,11 @@
+package dev.inmo.jsuikit.modifiers
+
+sealed class UIKitLabel(suffix: String?) : UIKitModifier {
+    override val classes: Array<String> = arrayOf("uk-label${suffix?.let { "-$it" } ?: ""}")
+
+    object Success : UIKitLabel("success")
+    object Warning : UIKitLabel("warning")
+    object Error : UIKitLabel("danger")
+
+    companion object : UIKitLabel(null)
+}

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

@@ -3,8 +3,8 @@ package dev.inmo.jsuikit.modifiers
 sealed class UIKitNav(classname: String) : UIKitModifier {
     override val classes: Array<String> = arrayOf(classname)
 
-    object Accordion : UIKitNav("uk-nav-parent-icon")
-    object Subnav : UIKitNav("uk-nav-sub")
+    object ParentIcon : UIKitNav("uk-nav-parent-icon")
+    object SubNav : UIKitNav("uk-nav-sub")
 
     object Header : UIKitNav("uk-nav-header")
     object Divider : UIKitNav("uk-nav-divider")
@@ -14,4 +14,6 @@ sealed class UIKitNav(classname: String) : UIKitModifier {
     object Primary : UIKitNav("uk-nav-primary")
 
     object Center : UIKitNav("uk-nav-center")
+
+    companion object : UIKitNav("uk-nav")
 }

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/UIKitText.kt

@@ -3,16 +3,34 @@ package dev.inmo.jsuikit.modifiers
 sealed class UIKitText(suffix: String) : UIKitModifier {
     override val classes: Array<String> = arrayOf("uk-text-$suffix")
 
-    object Lead : UIKitText("lead")
-    object Meta : UIKitText("meta")
-
-    sealed class Alignment(suffix: String) : UIKitText(suffix) {
-        object Left : Alignment("left")
-        object Right : Alignment("right")
-        object Center : Alignment("center")
-        object Justify : Alignment("justify")
+    sealed class Style(suffix: String) : UIKitText(suffix) {
+        object Lead : Style("lead")
+        object Meta : Style("meta")
+        object Italic : Style("italic")
     }
 
+    sealed class Size(suffix: String) : UIKitText(suffix) {
+        object Small : Size("small")
+        object Default : Size("default")
+        object Large : Size("large")
+    }
+
+    sealed class Weight(suffix: String) : UIKitText(suffix) {
+        object Light : Weight("light")
+        object Normal : Weight("normal")
+        object Bold : Weight("bold")
+        object Lighter : Weight("lighter")
+        object Bolder : Weight("bolder")
+    }
+
+    sealed class Transform(suffix: String) : UIKitText(suffix) {
+        object Capitalize : Transform("capitalize")
+        object Uppercase : Transform("uppercase")
+        object Lowercase : Transform("lowercase")
+    }
+
+    object DecorationNone : UIKitText("decoration-none")
+
     sealed class Color(suffix: String) : UIKitText(suffix) {
         object Muted : Color("muted")
         object Emphasis : Color("emphasis")
@@ -22,4 +40,32 @@ sealed class UIKitText(suffix: String) : UIKitModifier {
         object Warning : Color("warning")
         object Danger : Color("danger")
     }
+
+    object Background : UIKitText("background")
+
+    sealed class Alignment(suffix: String) : UIKitText(suffix) {
+
+        sealed class Horizontal(suffix: String) : Alignment(suffix) {
+            object Left : Horizontal("left")
+            object Right : Horizontal("right")
+            object Center : Horizontal("center")
+            object Justify : Horizontal("justify")
+        }
+
+        sealed class Vertical(suffix: String) : Alignment(suffix) {
+            object Top : Vertical("top")
+            object Middle : Vertical("middle")
+            object Bottom : Vertical("bottom")
+            object Baseline : Vertical("baseline")
+        }
+
+    }
+
+    sealed class Wrapping(suffix: String) : UIKitText(suffix) {
+
+        object Truncate : Wrapping("truncate")
+        object Break : Wrapping("break")
+        object NoWrap : Wrapping("nowrap")
+
+    }
 }

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

@@ -3,10 +3,110 @@ package dev.inmo.jsuikit.modifiers
 sealed class UIKitUtility(classname: String) : UIKitModifier {
     override val classes: Array<String> = arrayOf(classname)
 
+    object Panel : UIKitUtility("uk-panel")
+
+    sealed class Float(suffix: String) : UIKitUtility("uk-float-$suffix") {
+        object Left : Float("left")
+        object Right : Float("right")
+    }
+    object Clearfix : Float("clearfix")
+
     sealed class Overflow(suffix: String) : UIKitUtility("uk-overflow-$suffix") {
         object Hidden : Overflow("hidden")
         object Auto : Overflow("auto")
     }
 
+    sealed class Resize(suffix: String?) : UIKitUtility("uk-resize${suffix ?.let { "-$it" } ?: ""}") {
+        object Vertical : Resize("vertical")
+        companion object : Resize(null)
+    }
+
+    sealed class Display(suffix: String) : UIKitUtility("uk-display-$suffix") {
+        object Block : Display("block")
+        sealed class Inline(suffix: String?) : Display("inline${suffix ?.let { "-$it" } ?: ""}") {
+            object Block : Inline("block")
+            companion object : Inline(null)
+        }
+    }
+
+    sealed class Inline(suffix: String?) : UIKitUtility("uk-inline${suffix ?.let { "-$it" } ?: ""}") {
+        object Clip : Inline("clip")
+        companion object : Inline(null)
+    }
+
+    sealed class Responsive(suffix: String) : UIKitUtility("uk-responsive-$suffix") {
+        object Width : Responsive("width")
+        object Height : Responsive("height")
+    }
+    object PreserveWidth : UIKitUtility("uk-preserve-width")
+
+    sealed class Border(suffix: String) : UIKitUtility("uk-border-$suffix") {
+        object Rounded : Border("rounded")
+        object Circle : Border("circle")
+        object Pill : Border("pill")
+    }
+
+    sealed class BoxShadow(suffix: String) : UIKitUtility("uk-box-shadow-$suffix") {
+        object Small : BoxShadow("small")
+        object Medium : BoxShadow("medium")
+        object Large : BoxShadow("large")
+        object XLarge : BoxShadow("xlarge")
+
+        object Bottom : BoxShadow("bottom")
+
+        sealed class Hover(suffix: String) : BoxShadow("hover-$suffix") {
+            object Small : Hover("small")
+            object Medium : Hover("medium")
+            object Large : Hover("large")
+            object XLarge : Hover("xlarge")
+        }
+    }
+
+    object DropCap : UIKitUtility("uk-dropcap")
+
     object Logo : UIKitUtility("uk-logo")
+
+    sealed class Blend(suffix: String) : UIKitUtility("uk-blend-$suffix") {
+        object Multiply : Blend("multiply")
+        object Screen : Blend("screen")
+        object Overlay : Blend("overlay")
+        object Darken : Blend("darken")
+        object Lighten : Blend("lighten")
+        sealed class Color(suffix: String?) : Blend("color${suffix ?.let { "-$it" } ?: ""}") {
+            object Dodge : Color("dodge")
+            object Burn : Color("burn")
+            companion object : Color(null)
+        }
+        object HardLight : Blend("hard-light")
+        object SoftLight : Blend("soft-light")
+        object Difference : Blend("difference")
+        object Exclusion : Blend("exclusion")
+        object Hue : Blend("hue")
+        object Saturation : Blend("saturation")
+        object Luminosity : Blend("luminosity")
+    }
+
+    sealed class Transform(suffix: String) : UIKitUtility("uk-transform-$suffix") {
+        object Center : Transform("center")
+        sealed class Origin(suffix: String) : Transform("origin-$suffix") {
+            sealed class Top(suffix: String) : Origin("top-$suffix") {
+                object Left : Top("left")
+                object Center : Top("center")
+                object Right : Top("right")
+            }
+            sealed class Center(suffix: String) : Origin("center-$suffix") {
+                object Left : Center("left")
+                object Right : Center("right")
+            }
+            sealed class Bottom(suffix: String) : Origin("bottom-$suffix") {
+                object Left : Bottom("left")
+                object Center : Bottom("center")
+                object Right : Bottom("right")
+            }
+        }
+    }
+
+    object Disabled : UIKitUtility("uk-disabled")
+    object Drag : UIKitUtility("uk-drag")
+    object Active : UIKitUtility("uk-active")
 }

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

@@ -1,33 +1,82 @@
 package dev.inmo.jsuikit.modifiers
 
 sealed class UIKitWidth(classname: String) : UIKitModifier {
-    override val classes: Array<String> = arrayOf("uk-width-$classname")
+    override val classes: Array<String> = arrayOf(classname)
 
-    object Full : UIKitWidth("1-1")
-    object Expand : UIKitWidth("expand")
+    object Auto : UIKitWidth("uk-width-auto")
+    object Expand : UIKitWidth("uk-width-expand")
+    object Full : UIKitWidth("uk-width-1-1")
 
-    object Half : UIKitWidth("1-2")
+    object Half : UIKitWidth("uk-width-1-2")
 
-    object OneThird : UIKitWidth("1-3")
-    object TwoThird : UIKitWidth("2-3")
+    object OneThird : UIKitWidth("uk-width-1-3")
+    object TwoThird : UIKitWidth("uk-width-2-3")
 
-    object OneFourth : UIKitWidth("1-4")
-    val TwoFourth get() = Half
-    object ThreeFourth : UIKitWidth("3-4")
-    val FourFourth get() = Full
+    object OneFourth : UIKitWidth("uk-width-1-4")
+    object ThreeFourth : UIKitWidth("uk-width-3-4")
 
-    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 OneFifth : UIKitWidth("uk-width-1-5")
+    object TwoFifth : UIKitWidth("uk-width-2-5")
+    object ThreeFifth : UIKitWidth("uk-width-3-5")
+    object FourFifth : UIKitWidth("uk-width-4-5")
 
-    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
+    object OneSixth : UIKitWidth("uk-width-1-6")
+    object FiveSixth : UIKitWidth("uk-width-5-6")
+
+    sealed class Child(suffix: String) : UIKitWidth("uk-child-width-$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("uk-width-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
+    }
 }

src/jsMain/kotlin/dev/inmo/jsuikit/utils/AttributesCollection.kt

@@ -0,0 +1,26 @@
+package dev.inmo.jsuikit.utils
+
+import dev.inmo.jsuikit.modifiers.UIKitModifier
+import dev.inmo.jsuikit.modifiers.include
+import org.jetbrains.compose.web.attributes.AttrsBuilder
+import org.jetbrains.compose.web.dom.AttrBuilderContext
+import org.w3c.dom.Element
+
+class AttributesCollection<T : Element> (
+    private vararg val modifiers: UIKitModifier,
+    private val attrs: AttrBuilderContext<T> = {}
+) {
+    val builder: AttrBuilderContext<T> = {
+        include(*modifiers)
+        attrs()
+    }
+
+    companion object {
+        val Empty = Attrs<Element>()
+
+        @Suppress("UNCHECKED_CAST")
+        fun <T : Element> empty() = Empty as Attrs<T>
+    }
+}
+
+typealias Attrs<T> = AttributesCollection<T>