update release version

0.0.53

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 0.1.0
+
+* `Kotlin` = `1.6.21`
+* `Compose`: `1.2.0-alpha01-dev679`
+
+## 0.0.53
+
+* Improvements in `UIKitPadding`
+* Add support of UIKit lists
+
+## 0.0.52
+
+* Improve work with UIKitModifiers
+
 ## 0.0.51
 
 * New interface `Dropdown` which will be used to create (or retrieve) dropdown for an element

build.gradle

@@ -26,6 +26,7 @@ repositories {
     mavenLocal()
     mavenCentral()
     google()
+    maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" }
 }
 
 kotlin {

gradle.properties

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

gradle/libs.versions.toml

@@ -1,9 +1,9 @@
 [versions]
 
-kt = "1.6.10"
-jb-compose = "1.1.1"
-jb-dokka = "1.6.10"
-gh-release = "2.2.12"
+kt = "1.6.21"
+jb-compose = "1.2.0-alpha01-dev679"
+jb-dokka = "1.6.21"
+gh-release = "2.3.7"
 
 [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.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -2,14 +2,32 @@ package dev.inmo.jsuikit.elements
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.snapshots.SnapshotStateList
-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.HTMLHeadingElement
 import org.w3c.dom.HTMLUListElement
 
 @Composable
 fun <T> List(
+    data: SnapshotStateList<T>,
+    ukAttrs: Attrs<HTMLUListElement> = Attrs.empty(),
+    elementAllocator: @Composable ElementScope<HTMLUListElement>.(T) -> Unit
+) {
+    Ul(
+        {
+            include(UIKitList)
+            ukAttrs.builder(this)
+        }
+    ) {
+        data.forEach {
+            elementAllocator(it)
+        }
+    }
+}
+
+@Composable
+fun <T> ListWithTitle(
     title: String,
     data: SnapshotStateList<T>,
     vararg titleModifiers: UIKitModifier,
@@ -23,15 +41,27 @@ fun <T> List(
         Text(title)
     }
     besidesTitleAndList ?.invoke()
-    Ul(
-        {
-            classes("uk-list")
-            include(*ulModifiers)
-            ulCustomizer()
-        }
-    ) {
-        data.forEach {
-            elementAllocator(it)
-        }
-    }
+    List(data, Attrs(*ulModifiers) { ulCustomizer(this) }, elementAllocator)
 }
+
+@Deprecated("Renamed", ReplaceWith("ListWithTitle", "dev.inmo.jsuikit.elements.ListWithTitle"))
+@Composable
+fun <T> List(
+    title: String,
+    data: SnapshotStateList<T>,
+    vararg titleModifiers: UIKitModifier,
+    ulModifiers: Array<UIKitModifier> = emptyArray(),
+    besidesTitleAndList: (@Composable () -> Unit)? = null,
+    titleCustomizer: AttrBuilderContext<HTMLHeadingElement> = {},
+    ulCustomizer: AttrBuilderContext<HTMLUListElement> = {},
+    elementAllocator: @Composable ElementScope<HTMLUListElement>.(T) -> Unit
+) = ListWithTitle(
+    title,
+    data,
+    *titleModifiers,
+    ulModifiers = ulModifiers,
+    besidesTitleAndList = besidesTitleAndList,
+    titleCustomizer = titleCustomizer,
+    ulCustomizer = ulCustomizer,
+    elementAllocator = elementAllocator
+)

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

@@ -0,0 +1,46 @@
+package dev.inmo.jsuikit.modifiers
+
+sealed class UIKitList(
+    vararg classes: String,
+    override val otherAttrs: Map<String, String> = emptyMap()
+) : UIKitModifier {
+    @Suppress("UNCHECKED_CAST")
+    override val classes: Array<String> = classes as Array<String>
+
+    sealed class Style(vararg classes: String) : UIKitList(*classes) {
+
+        object Disc : Style("uk-list-disc")
+        object Circle : Style("uk-list-circle")
+        object Square : Style("uk-list-square")
+        object Decimal : Style("uk-list-decimal")
+        object Hyphen : Style("uk-list-hyphen")
+
+    }
+
+    sealed class Size(vararg classes: String) : UIKitList(*classes) {
+
+        object Large : Size("uk-list-large")
+        object Collapse : Size("uk-list-collapse")
+
+    }
+
+    sealed class Color(vararg classes: String) : UIKitList(*classes) {
+
+        object Muted : Color("uk-list-muted")
+        object Emphasis : Color("uk-list-emphasis")
+        object Primary : Color("uk-list-primary")
+        object Secondary : Color("uk-list-secondary")
+        companion object {
+            val Bullet = UIKitList.Bullet
+        }
+
+    }
+
+    object Bullet: UIKitList("uk-list-bullet")
+
+    object Divider: UIKitList("uk-list-divider")
+
+    object Striped: UIKitList("uk-list-striped")
+
+    companion object : UIKitList("uk-list")
+}

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

@@ -26,8 +26,8 @@ operator fun UIKitModifier.plus(other: UIKitModifier): UIKitModifier = UIKitCust
     classes + other.classes,
     otherAttrs + other.otherAttrs
 )
-fun <T: Element> UIKitModifier.builder() = Attrs<T>(this).builder
-fun <T: Element> Array<out UIKitModifier>.builder() = Attrs<T>(*this).builder
-inline fun <T: Element> attrsBuilder(vararg modifiers: UIKitModifier) = modifiers.builder<T>()
+fun <T: Element> UIKitModifier?.builder() = Attrs<T>(this).builder
+fun <T: Element> Array<out UIKitModifier?>.builder() = Attrs<T>(*this).builder
+inline fun <T: Element> attrsBuilder(vararg modifiers: UIKitModifier?) = modifiers.builder<T>()
 @JsName("plusBuilder")
-operator fun <T: Element> UIKitModifier.plus(other: UIKitModifier): AttrBuilderContext<T> = Attrs<T>(this@plus, other).builder
+operator fun <T: Element> UIKitModifier?.plus(other: UIKitModifier?): AttrBuilderContext<T> = Attrs<T>(this@plus, other).builder

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

@@ -8,7 +8,10 @@ sealed class UIKitPadding(suffix: String?) : UIKitModifier {
         object Small : Size("small")
         object Large : Size("large")
 
-        companion object : Size(null)
+        companion object : Size(null) {
+            val Default
+                get() = this
+        }
 
     }
 
@@ -25,5 +28,6 @@ sealed class UIKitPadding(suffix: String?) : UIKitModifier {
 
     }
 
+    companion object : Size(null)
 
 }