fix of class in Alert

attribute builder now may skip nullable values

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.0.34
+
+* Add `Alert`
+* Add `Animation#KenBurns`
+
+## 0.0.33
+
+* Fixes in attributes building and related things
+
 ## 0.0.32
 
 * Support of `UIKitHeight`

gradle.properties

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

src/jsMain/kotlin/dev/inmo/jsuikit/UIKitAttributeValueBuilder.kt

@@ -1,8 +1,11 @@
 package dev.inmo.jsuikit
 
 import dev.inmo.jsuikit.modifiers.AttributeValue
+import dev.inmo.jsuikit.utils.AttributeBuilder
+import dev.inmo.jsuikit.utils.buildAttribute
 import org.jetbrains.compose.web.attributes.AttrsBuilder
 
+@Deprecated("Will be removed soon")
 class UIKitAttributeValueBuilder {
     private val attrs = mutableListOf<Pair<String, String>>()
 
@@ -21,7 +24,10 @@ class UIKitAttributeValueBuilder {
 
 fun AttrsBuilder<*>.buildAndAddAttribute(
     attributeName: String,
-    block: UIKitAttributeValueBuilder.() -> Unit
+    skipNullValues: Boolean = true,
+    block: AttributeBuilder.() -> Unit
 ) {
-    attr(attributeName, UIKitAttributeValueBuilder().apply(block).build())
+    buildAttribute(attributeName, skipNullValues, block).let {
+        attr(it.first, it.second)
+    }
 }

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

@@ -0,0 +1,49 @@
+package dev.inmo.jsuikit.elements
+
+import androidx.compose.runtime.Composable
+import dev.inmo.jsuikit.buildAndAddAttribute
+import dev.inmo.jsuikit.modifiers.*
+import dev.inmo.jsuikit.utils.Attrs
+import dev.inmo.jsuikit.utils.Milliseconds
+import org.jetbrains.compose.web.dom.*
+import org.w3c.dom.HTMLAnchorElement
+import org.w3c.dom.HTMLDivElement
+
+@Composable
+fun Alert(
+    attrs: Attrs<HTMLDivElement> = Attrs.empty(),
+    animation: UIKitAnimation? = UIKitAnimation.Fade,
+    duration: Milliseconds? = null,
+    selClose: String? = null,
+    content: ContentBuilder<HTMLDivElement>
+) = Div(
+    {
+        attrs.builder(this)
+        include(UIKitAlert)
+
+        buildAndAddAttribute("uk-alert") {
+            "animation" to animation ?.classes ?.firstOrNull()
+            "duration" to duration
+            "sel-close" to selClose
+        }
+    },
+    content
+)
+
+@Composable
+fun AlertCloseButton(
+    attrs: Attrs<HTMLAnchorElement> = Attrs.empty(),
+    content: ContentBuilder<HTMLAnchorElement> = @Composable {}
+) {
+    A(
+        null,
+        {
+            include(UIKitAlert.Close, UIKitIcon)
+            attr("uk-close", "")
+            classes("uk-close")
+            attrs.builder(this)
+        },
+        content
+    )
+
+}

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

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Composable
 import dev.inmo.jsuikit.buildAndAddAttribute
 import dev.inmo.jsuikit.modifiers.*
 import dev.inmo.jsuikit.utils.Milliseconds
+import dev.inmo.jsuikit.utils.buildAttribute
 import org.jetbrains.compose.web.dom.*
 import org.w3c.dom.HTMLDivElement
 

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

@@ -211,8 +211,7 @@ sealed class Icon(val name: String) {
         onClick: ((Event) -> Unit)? = null
     ) {
         val configurer: AttrBuilderContext<out HTMLElement> = {
-            classes("uk-icon")
-            include(*modifiers, type)
+            include(*modifiers, type, UIKitIcon)
             attr("uk-icon", "icon: $name${if (ratio != null) { "; ratio: $ratio" } else ""}")
             onClick ?.let { _ ->
                 onClick { onClick(it.nativeEvent) }

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

@@ -0,0 +1,18 @@
+package dev.inmo.jsuikit.modifiers
+
+sealed class UIKitAlert(classname: String) : UIKitModifier {
+    override val classes: Array<String> = arrayOf(classname)
+
+    sealed class Style(classname: String) : UIKitAlert(classname) {
+
+        object Primary : Style("uk-alert-primary")
+        object Success : Style("uk-alert-success")
+        object Warning : Style("uk-alert-warning")
+        object Danger : Style("uk-alert-danger")
+
+    }
+
+    object Close : UIKitAlert("uk-alert-close")
+
+    companion object : UIKitAlert("uk-alert")
+}

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

@@ -60,4 +60,6 @@ sealed class UIKitAnimation (name: String) : UIKitModifier, AttributeValue(name)
 
     object Fast : UIKitAnimation("fast")
 
+    object KenBurns : UIKitAnimation("kenburns")
+
 }

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

@@ -0,0 +1,7 @@
+package dev.inmo.jsuikit.modifiers
+
+sealed class UIKitIcon(classname: String) : UIKitModifier {
+    override val classes: Array<String> = arrayOf(classname)
+
+    companion object : UIKitIcon("uk-icon")
+}

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

@@ -2,11 +2,16 @@ package dev.inmo.jsuikit.utils
 
 class AttributeBuilder (
     val attributeName: String,
+    val skipNullValues: Boolean = true,
     private val parametersPreset: MutableMap<String, String?> = mutableMapOf()
 ) {
 
-    fun add(k: String, v: String? = null) = parametersPreset.set(k, v)
-    infix fun String.to(value: String?) = add(this, value)
+    fun add(k: String, v: Any? = null) {
+        if (v != null || !skipNullValues) {
+            parametersPreset[k] = v ?.toString()
+        }
+    }
+    infix fun String.to(value: Any?) = add(this, value)
     operator fun String.unaryPlus() = add(this, null)
 
     fun build(): Pair<String, String> = Pair(
@@ -16,6 +21,7 @@ class AttributeBuilder (
     )
 }
 
-inline fun buildAttribute(attributeName: String, block: AttributeBuilder.() -> Unit) = AttributeBuilder(
-    attributeName
+inline fun buildAttribute(attributeName: String, skipNullValues: Boolean = true, block: AttributeBuilder.() -> Unit) = AttributeBuilder(
+    attributeName,
+    skipNullValues
 ).apply(block).build()