From ce5281c52d2fcdaa47f5806f5d0f1e28b2fe3b45 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 23 Jan 2023 12:50:03 +0600 Subject: [PATCH 1/5] start 0.5.2 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3f8fe0..57309c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.5.2 + ## 0.5.1 * Fixes in new `Dialog`s diff --git a/gradle.properties b/gradle.properties index a8df07a..2f27757 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,4 @@ android.enableJetifier=true # Project data group=dev.inmo -version=0.5.1 +version=0.5.2 From 264bcae65ec224790daaf5f2aae0b44ccab747df Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 23 Jan 2023 12:50:50 +0600 Subject: [PATCH 2/5] fixes in dialogs --- src/jsMain/kotlin/dev/inmo/jsuikit/elements/Dialog.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Dialog.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Dialog.kt index 8531351..cb40954 100644 --- a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Dialog.kt +++ b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Dialog.kt @@ -54,6 +54,8 @@ fun Dialog( if (onHidden != null || removeOnHide) { htmlElement.addEventListener("hidden", { + if (it.target != htmlElement) return@addEventListener + onHidden ?.invoke(htmlElement) if (removeOnHide) { @@ -64,6 +66,8 @@ fun Dialog( onShown ?.let { htmlElement.addEventListener("shown", { + if (it.target != htmlElement) return@addEventListener + onShown(htmlElement) }) } From 1d6c0db692b0c880dbd6355e4b45ff584755fe53 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 24 Jan 2023 13:44:01 +0600 Subject: [PATCH 3/5] add badge support --- .../kotlin/dev/inmo/jsuikit/elements/Badge.kt | 25 +++++++++++++++++++ .../dev/inmo/jsuikit/modifiers/UIKitBadge.kt | 7 ++++++ 2 files changed, 32 insertions(+) create mode 100644 src/jsMain/kotlin/dev/inmo/jsuikit/elements/Badge.kt create mode 100644 src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitBadge.kt diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Badge.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Badge.kt new file mode 100644 index 0000000..6fb0b35 --- /dev/null +++ b/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? = null, + onBeforeText: ContentBuilder? = null, + attrs: AttrBuilderContext? = null +) = Span({ + include(UIKitBadge) + attrs ?.invoke(this) +}) { + onAfterText ?.invoke(this) + Text(text) + onBeforeText ?.invoke(this) +} diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitBadge.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitBadge.kt new file mode 100644 index 0000000..8c32e6c --- /dev/null +++ b/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 = arrayOf(classname) + + companion object : UIKitBadge("uk-badge") +} From d8be33d4f6f20615c22176811e9d9c3e7e2365b7 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 24 Jan 2023 18:06:16 +0600 Subject: [PATCH 4/5] add inline support --- .../kotlin/dev/inmo/jsuikit/elements/Inline.kt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/jsMain/kotlin/dev/inmo/jsuikit/elements/Inline.kt diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Inline.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Inline.kt new file mode 100644 index 0000000..c81c3ba --- /dev/null +++ b/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? = null, + contentBuilder: ContentBuilder +) = Div({ + include(UIKitUtility.Inline) + attrBuilderContext ?.invoke(this) +}, contentBuilder) From 2aca51d742d2773b28d944b10d8e8afb3668b0b3 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 26 Jan 2023 22:44:07 +0600 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57309c5..093a1c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## 0.5.2 +* More fixes in Dialogs +* Badge supported +* Inline creation support + ## 0.5.1 * Fixes in new `Dialog`s