improve grid attributes

0.1.9

CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## 0.1.10
+
+* `Grid` support improvements
+
+## 0.1.9
+
+* `Artile` elements become supported
+* `Iconnav` elements become supported
+* `Leader` elements become supported
+* `Grid` support improvements
+
+## 0.1.8
+
+* `Compose`: `1.2.0-alpha01-dev731`
+
+## 0.1.7
+
+Add Toggle builder
+
+## 0.1.6
+
+* Add support of UIKitButton size and group
+
+## 0.1.5
+
+* Fix access to `UIKitSticky`
+
+## 0.1.4
+
+* Improvements in `UIKitGrid`
+* Add support of `UIKitSticky`
+
 ## 0.1.3
 
 * Add support of sections

github_release.gradle

@@ -21,7 +21,7 @@ if (new File(projectDir, "secret.gradle").exists()) {
         owner "InsanusMokrassar"
         repo "JSUIKitKBindings"
 
-        tagName "${project.version}"
+        tagName "v${project.version}"
         releaseName "${project.version}"
         targetCommitish "${project.version}"
 

gradle.properties

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

gradle/libs.versions.toml

@@ -1,9 +1,9 @@
 [versions]
 
 kt = "1.6.21"
-jb-compose = "1.2.0-alpha01-dev686"
+jb-compose = "1.2.0-alpha01-dev731"
 jb-dokka = "1.6.21"
-gh-release = "2.3.7"
+gh-release = "2.4.1"
 
 [libraries]
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -0,0 +1,57 @@
+package dev.inmo.jsuikit.elements
+
+import androidx.compose.runtime.Composable
+import dev.inmo.jsuikit.modifiers.UIKitArticle
+import dev.inmo.jsuikit.modifiers.include
+import dev.inmo.jsuikit.utils.Attrs
+import dev.inmo.jsuikit.utils.optionallyDraw
+import org.jetbrains.compose.web.dom.*
+import org.jetbrains.compose.web.dom.Text
+import org.w3c.dom.*
+
+@Composable
+fun UIKitArticleElement (
+    headerBuilder: ContentBuilder<HTMLHeadingElement>,
+    headerAttrs: Attrs<HTMLHeadingElement> = Attrs.empty(),
+    metaBuilder: ContentBuilder<HTMLParagraphElement>? = null,
+    metaAttrs: Attrs<HTMLParagraphElement>? = null,
+    otherContentBuilder: ContentBuilder<HTMLElement>
+) = Article(
+    {
+        include(UIKitArticle)
+    }
+) {
+    H1(
+        {
+            include(UIKitArticle.Title)
+            headerAttrs.builder(this)
+        },
+        headerBuilder
+    )
+    optionallyDraw(metaAttrs, metaBuilder) {
+        P(
+            {
+                include(UIKitArticle.Meta)
+                metaAttrs ?.builder ?.invoke(this)
+            },
+            metaBuilder ?: {}
+        )
+    }
+
+    otherContentBuilder()
+}
+
+@Composable
+fun UIKitArticleElement (
+    header: String,
+    meta: String? = null,
+    otherContentBuilder: ContentBuilder<HTMLElement>
+) = UIKitArticleElement(
+    { Text(header) },
+    metaBuilder = meta ?.let {
+        {
+            Text(meta)
+        }
+    },
+    otherContentBuilder = otherContentBuilder
+)

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

@@ -1,8 +1,8 @@
 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.buildAttribute
 import org.jetbrains.compose.web.dom.*
 import org.w3c.dom.HTMLDivElement
 
@@ -26,23 +26,18 @@ fun GridColumn(
 fun Grid(
     vararg modifiers: UIKitModifier,
     masonry: Boolean = false,
-    parallax: Int? = null,
-    marginClass: String? = null,
+    parallax: UInt? = null,
+    marginClass: UIKitMargin? = null,
     firstColumnClass: String? = null,
     attributesCustomizer: AttrBuilderContext<HTMLDivElement> = {},
-    builder: @Composable ElementScope<HTMLDivElement>.() -> Unit = {}
+    builder: ContentBuilder<HTMLDivElement> = {}
 ) {
-    val attrs = listOfNotNull(
-        if (masonry) "masonry" to "true" else null,
-        parallax ?.let { "parallax" to it.toString() },
-        marginClass ?.let { "margin" to it },
-        firstColumnClass ?.let { "first-column" to it },
-    )
     Div(
         {
-            attr("uk-grid", attrs.joinToString(";") { (k, v) -> "$k: $v" })
-            classes("uk-grid")
-            include(*modifiers)
+            include(
+                UIKitGrid.invoke(marginClass, firstColumnClass, masonry, parallax),
+                *modifiers
+            )
             attributesCustomizer()
         }
     ) {

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

@@ -0,0 +1,33 @@
+package dev.inmo.jsuikit.elements
+
+import androidx.compose.runtime.Composable
+import dev.inmo.jsuikit.modifiers.UIKitIconnav
+import dev.inmo.jsuikit.modifiers.include
+import dev.inmo.jsuikit.utils.Attrs
+import org.jetbrains.compose.web.attributes.AttrsScope
+import org.jetbrains.compose.web.dom.*
+import org.w3c.dom.HTMLLIElement
+import org.w3c.dom.HTMLUListElement
+
+@Composable
+fun <T> Iconnav(
+    data: Iterable<T>,
+    listAttrs: Attrs<HTMLUListElement> = Attrs.empty(),
+    elementAttrsBuilder: AttrsScope<HTMLLIElement>.(T) -> Unit = {},
+    elementBuilder: @Composable ElementScope<HTMLLIElement>.(T) -> Unit
+) {
+    Ul(
+        {
+            include(UIKitIconnav)
+            listAttrs.builder(this)
+        }
+    ) {
+        data.forEach {
+            Li(
+                {
+                    elementAttrsBuilder.invoke(this, it)
+                }
+            ) { elementBuilder(this, it) }
+        }
+    }
+}

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

@@ -0,0 +1,26 @@
+package dev.inmo.jsuikit.elements
+
+import androidx.compose.runtime.Composable
+import dev.inmo.jsuikit.modifiers.UIKitToggle
+import dev.inmo.jsuikit.modifiers.include
+import dev.inmo.jsuikit.utils.Attrs
+import org.jetbrains.compose.web.attributes.ButtonType
+import org.jetbrains.compose.web.attributes.type
+import org.jetbrains.compose.web.dom.Button
+import org.jetbrains.compose.web.dom.ContentBuilder
+import org.w3c.dom.HTMLButtonElement
+
+@Composable
+fun Toggle(
+    attrs: Attrs<HTMLButtonElement>,
+    contentBuilder: ContentBuilder<HTMLButtonElement>
+) {
+    Button(
+        {
+            include(UIKitToggle)
+            type(ButtonType.Button)
+            attrs.builder(this)
+        },
+        contentBuilder
+    )
+}

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

@@ -0,0 +1,12 @@
+package dev.inmo.jsuikit.modifiers
+
+sealed class UIKitArticle(
+    override val classes: Array<String>
+) : UIKitModifier {
+
+    object Title : UIKitArticle(arrayOf("uk-article-title"))
+    object Meta : UIKitArticle(arrayOf("uk-article-meta"))
+
+    companion object : UIKitArticle(arrayOf("uk-article"))
+
+}

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

@@ -12,5 +12,12 @@ sealed class UIKitButton(suffix: String?) : UIKitModifier {
         object Link : Type("link")
     }
 
+    sealed class Size(suffix: String) : UIKitButton(suffix) {
+        object Small : Size("small")
+        object Large : Size("large")
+    }
+
+    object Group : UIKitButton("group")
+
     companion object : UIKitButton(null)
 }

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

@@ -1,20 +1,59 @@
 package dev.inmo.jsuikit.modifiers
 
-sealed class UIKitGrid(suffix: String) : UIKitModifier {
-    override val classes: Array<String> = arrayOf("uk-grid-$suffix")
+import dev.inmo.jsuikit.utils.buildAttribute
 
-    sealed class Gap(suffix: String) : UIKitGrid(suffix) {
+sealed class UIKitGrid(vararg classnames: String) : UIKitModifier {
+    override val classes: Array<String> = classnames as Array<String>
 
-        object Small : Gap("small")
-        object Medium : Gap("medium")
-        object Large : Gap("large")
-        object Collapse : Gap("collapse")
+    sealed class Gap(classname: String) : UIKitGrid(classname) {
+
+        object Small : Gap("uk-grid-small")
+        object Medium : Gap("uk-grid-medium")
+        object Large : Gap("uk-grid-large")
+        object Collapse : Gap("uk-grid-collapse")
 
     }
 
-    object Divider : UIKitGrid("divider")
+    sealed class Column(classname: String) : UIKitGrid(classname) {
 
-    object MatchHeight : UIKitGrid("match")
-    object ItemMatchHeight : UIKitGrid("item-match")
+        object Small : Column("uk-grid-column-small")
+        object Medium : Column("uk-grid-column-medium")
+        object Large : Column("uk-grid-column-large")
+        object Collapse : Column("uk-grid-column-collapse")
 
+    }
+
+    sealed class Row(classname: String) : UIKitGrid(classname) {
+
+        object Small : Row("uk-grid-row-small")
+        object Medium : Row("uk-grid-row-medium")
+        object Large : Row("uk-grid-row-large")
+        object Collapse : Row("uk-grid-row-collapse")
+
+    }
+
+    object Divider : UIKitGrid("uk-grid-divider")
+
+    object MatchHeight : UIKitGrid("uk-grid-match")
+    object ItemMatchHeight : UIKitGrid("uk-grid-item-match")
+
+    class Custom internal constructor(override val otherAttrs: Map<String, String>) : UIKitGrid("uk-grid")
+
+    companion object : UIKitGrid("uk-grid") {
+        operator fun invoke(
+            margin: UIKitMargin? = null,
+            firstColumnClass: String? = null,
+            masonry: Boolean? = null,
+            parallax: UInt? = null
+        ) = Custom(
+            mapOf(
+                buildAttribute("uk-grid") {
+                    margin to margin ?.classes ?.joinToString(" ")
+                    "first-column" to firstColumnClass
+                    "masonry" to masonry
+                    "parallax" to parallax
+                }
+            )
+        )
+    }
 }

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

@@ -0,0 +1,11 @@
+package dev.inmo.jsuikit.modifiers
+
+sealed class UIKitIconnav(
+    override val classes: Array<String>
+) : UIKitModifier {
+
+    object Vertical : UIKitIconnav(arrayOf("uk-iconnav-vertical"))
+
+    companion object : UIKitIconnav(arrayOf("uk-iconnav"))
+
+}

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

@@ -0,0 +1,28 @@
+package dev.inmo.jsuikit.modifiers
+
+import dev.inmo.jsuikit.utils.buildAttribute
+
+sealed class UIKitLeader(
+    override val classes: Array<String>,
+    override val otherAttrs: Map<String, String>
+) : UIKitModifier {
+
+    class Custom(
+        otherAttrs: Map<String, String>
+    ) : UIKitLeader(arrayOf("uk-leader"), otherAttrs)
+
+    companion object : UIKitLeader(arrayOf("uk-leader"), emptyMap()) {
+        operator fun invoke(
+            media: String? = null,
+            fill: String? = null
+        ) = Custom(
+            mapOf(
+                buildAttribute("uk-leader") {
+                    "fill" to fill
+                    "media" to media
+                }
+            )
+        )
+    }
+
+}

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

@@ -0,0 +1,47 @@
+package dev.inmo.jsuikit.modifiers
+
+import dev.inmo.jsuikit.utils.buildAttribute
+import org.jetbrains.compose.web.css.CSSUnitLengthOrPercentage
+import org.jetbrains.compose.web.css.CSSUnitValueTyped
+
+class UIKitSticky(
+    position: Position? = null,
+    start: String? = null,
+    end: String? = null,
+    offset: CSSUnitValueTyped<CSSUnitLengthOrPercentage>? = null,
+    overflowFlip: Boolean? = null,
+    animation: UIKitAnimation? = null,
+    classForActiveItems: String? = null,
+    classForInactiveItems: String? = null,
+    showOnUp: Boolean? = null,
+    media: String? = null,
+    targetOffset: CSSUnitValueTyped<CSSUnitLengthOrPercentage>? = null
+) : UIKitModifier {
+    override val otherAttrs: Map<String, String> = mapOf(
+        buildAttribute("uk-sticky") {
+            "position" to position ?.name
+            "start" to start
+            "end" to end
+            "offset" to offset ?.toString()
+            "overflow-flip" to overflowFlip
+            "animation" to animation
+            "cls-active" to classForActiveItems
+            "cls-inactive" to classForInactiveItems
+            "show-on-up" to showOnUp
+            "media" to media
+            "target-offset" to targetOffset ?.toString()
+        }
+    )
+
+    sealed interface Position {
+        val name: String
+        object Top : Position {
+            override val name: String
+                get() = "top"
+        }
+        object Bottom : Position {
+            override val name: String
+                get() = "bottom"
+        }
+    }
+}

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

@@ -38,7 +38,7 @@ sealed class UIKitToggle(
 
     class Custom internal constructor(otherAttrs: Map<String, String>) : UIKitToggle(otherAttrs = otherAttrs)
 
-    companion object {
+    companion object : UIKitToggle(otherAttrs = mapOf("uk-toggle" to "")) {
         operator fun invoke(
             target: String? = null,
             mode: Mode? = null,