Update CHANGELOG.md

0.5.1

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.5.2
+
+* More fixes in Dialogs
+* Badge supported
+* Inline creation support
+
+## 0.5.1
+
+* Fixes in new `Dialog`s
+
 ## 0.5.0
 
 * Fully rework `Dialog` elements

gradle.properties

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

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

@@ -0,0 +1,25 @@
+package dev.inmo.jsuikit.elements
+
+import androidx.compose.runtime.Composable
+import dev.inmo.jsuikit.modifiers.UIKitBadge
+import dev.inmo.jsuikit.modifiers.include
+import org.jetbrains.compose.web.dom.AttrBuilderContext
+import org.jetbrains.compose.web.dom.ContentBuilder
+import org.jetbrains.compose.web.dom.Span
+import org.jetbrains.compose.web.dom.Text
+import org.w3c.dom.HTMLSpanElement
+
+@Composable
+fun Badge(
+    text: String,
+    onAfterText: ContentBuilder<HTMLSpanElement>? = null,
+    onBeforeText: ContentBuilder<HTMLSpanElement>? = null,
+    attrs: AttrBuilderContext<HTMLSpanElement>? = null
+) = Span({
+    include(UIKitBadge)
+    attrs ?.invoke(this)
+}) {
+    onAfterText ?.invoke(this)
+    Text(text)
+    onBeforeText ?.invoke(this)
+}

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

@@ -8,8 +8,6 @@ import dev.inmo.jsuikit.modifiers.*
 import org.jetbrains.compose.web.dom.*
 import org.jetbrains.compose.web.renderComposableInBody
 import org.w3c.dom.HTMLDivElement
-import org.w3c.dom.MutationObserver
-import org.w3c.dom.MutationObserverInit
 import kotlin.random.Random
 import kotlin.random.nextUInt
 
@@ -31,83 +29,90 @@ fun Dialog(
     removeOnHide: Boolean = true,
     bodyBuilder: ContentBuilder<HTMLDivElement> = {}
 ) {
-    val drawDiv = remember { mutableStateOf(true) }
+    val draw = remember { mutableStateOf(true) }
-    val composition = remember {
+
+    remember {
         renderComposableInBody {
-            Div(
+            if (draw.value) {
-                {
-                    if (modifiers.none { it is UIKitModal.WithCustomAttributes }) {
-                        include(UIKitModal)
-                    }
-                    id("dialog${Random.nextUInt()}")
-                    include(*modifiers)
-
-                    attributesCustomizer()
-                }
-            ) {
-                DisposableEffect(true) {
-                    val htmlElement = scopeElement
-
-                    if (autoShow) {
-                        UIKit.modal(htmlElement).show()
-                    }
-
-                    if (onHidden != null || removeOnHide) {
-                        htmlElement.addEventListener("hidden", {
-                            onHidden ?.invoke(htmlElement)
-
-                            if (removeOnHide) {
-                                htmlElement.remove()
-                            }
-                        })
-                    }
-
-                    onShown ?.let {
-                        htmlElement.addEventListener("shown", {
-                            onShown(htmlElement)
-                        })
-                    }
-
-
-                    onDispose {
-                        drawDiv.value = false
-                    }
-                }
-
                 Div(
                     {
-                        include(UIKitModal.Dialog)
+                        if (modifiers.none { it is UIKitModal.WithCustomAttributes }) {
-                        dialogAttrsBuilder ?.let { it() } ?: include(UIKitMargin.Auto.Vertical)
+                            include(UIKitModal)
+                        }
+                        id("dialog${Random.nextUInt()}")
+                        include(*modifiers)
+
+                        attributesCustomizer()
                     }
                 ) {
-                    headerBuilder ?.let {
+                    DisposableEffect(true) {
-                        Div(
+                        val htmlElement = scopeElement
-                            {
+
-                                include(UIKitModal.Header)
+                        if (autoShow) {
-                                headerAttrsBuilder ?.let { it() }
+                            UIKit.modal(htmlElement).show()
-                            }
+                        }
-                        ) {
+
-                            it()
+                        if (onHidden != null || removeOnHide) {
+                            htmlElement.addEventListener("hidden", {
+                                if (it.target != htmlElement) return@addEventListener
+
+                                onHidden ?.invoke(htmlElement)
+
+                                if (removeOnHide) {
+                                    htmlElement.remove()
+                                }
+                            })
+                        }
+
+                        onShown ?.let {
+                            htmlElement.addEventListener("shown", {
+                                if (it.target != htmlElement) return@addEventListener
+
+                                onShown(htmlElement)
+                            })
+                        }
+
+
+                        onDispose {
+                            draw.value = false
                         }
                     }
-                    afterHeaderBuilder ?.let { it() }
+
                     Div(
                         {
-                            include(UIKitModal.Body)
+                            include(UIKitModal.Dialog)
-                            bodyAttrsBuilder ?.let { it() }
+                            dialogAttrsBuilder ?.let { it() } ?: include(UIKitMargin.Auto.Vertical)
                         }
                     ) {
-                        bodyBuilder()
+                        headerBuilder ?.let {
-                    }
+                            Div(
-                    beforeFooterBuilder ?.let { it() }
+                                {
-                    footerBuilder ?.let {
+                                    include(UIKitModal.Header)
+                                    headerAttrsBuilder ?.let { it() }
+                                }
+                            ) {
+                                it()
+                            }
+                        }
+                        afterHeaderBuilder ?.let { it() }
                         Div(
                             {
-                                include(UIKitModal.Footer)
+                                include(UIKitModal.Body)
-                                footerAttrsBuilder ?.let { it() } ?: include(UIKitText.Alignment.Horizontal.Right)
+                                bodyAttrsBuilder ?.let { it() }
                             }
                         ) {
-                            it()
+                            bodyBuilder()
+                        }
+                        beforeFooterBuilder ?.let { it() }
+                        footerBuilder ?.let {
+                            Div(
+                                {
+                                    include(UIKitModal.Footer)
+                                    footerAttrsBuilder ?.let { it() } ?: include(UIKitText.Alignment.Horizontal.Right)
+                                }
+                            ) {
+                                it()
+                            }
                         }
                     }
                 }
@@ -115,18 +120,14 @@ fun Dialog(
         }
     }
 
-    if (drawDiv.value) {
+    Div({
-        Div({
+        hidden()
-            hidden()
+        ref {
-            ref {
+            onDispose {
-                onDispose {
+                draw.value = false
-                    composition.dispose()
-                }
             }
-        })
+        }
-    } else {
+    })
-        runCatching { composition.dispose() }
-    }
 }
 
 @Composable

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

@@ -0,0 +1,18 @@
+package dev.inmo.jsuikit.elements
+
+import androidx.compose.runtime.Composable
+import dev.inmo.jsuikit.modifiers.UIKitUtility
+import dev.inmo.jsuikit.modifiers.include
+import org.jetbrains.compose.web.dom.AttrBuilderContext
+import org.jetbrains.compose.web.dom.ContentBuilder
+import org.jetbrains.compose.web.dom.Div
+import org.w3c.dom.HTMLDivElement
+
+@Composable
+fun Inline(
+    attrBuilderContext: AttrBuilderContext<HTMLDivElement>? = null,
+    contentBuilder: ContentBuilder<HTMLDivElement>
+) = Div({
+    include(UIKitUtility.Inline)
+    attrBuilderContext ?.invoke(this)
+}, contentBuilder)

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

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