From 7c5a9ecc3d467216f3277fa4f4612896cc891081 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 13 Jan 2023 12:49:25 +0600 Subject: [PATCH 1/3] start 0.5.1 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f899ac9..9c4b67b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.5.1 + ## 0.5.0 * Fully rework `Dialog` elements diff --git a/gradle.properties b/gradle.properties index 9b1c18e..a8df07a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,4 @@ android.enableJetifier=true # Project data group=dev.inmo -version=0.5.0 +version=0.5.1 From c483bb67d8f50b9f057184b5810596adc6ba4781 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 13 Jan 2023 13:21:45 +0600 Subject: [PATCH 2/3] potential fix of modals composition cancelling --- .../dev/inmo/jsuikit/elements/Dialog.kt | 147 +++++++++--------- 1 file changed, 72 insertions(+), 75 deletions(-) diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Dialog.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Dialog.kt index 0558762..8531351 100644 --- a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Dialog.kt +++ b/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,86 @@ fun Dialog( removeOnHide: Boolean = true, bodyBuilder: ContentBuilder = {} ) { - val drawDiv = remember { mutableStateOf(true) } - val composition = remember { + val draw = remember { mutableStateOf(true) } + + remember { renderComposableInBody { - Div( - { - 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 - } - } - + if (draw.value) { Div( { - include(UIKitModal.Dialog) - dialogAttrsBuilder ?.let { it() } ?: include(UIKitMargin.Auto.Vertical) + if (modifiers.none { it is UIKitModal.WithCustomAttributes }) { + include(UIKitModal) + } + id("dialog${Random.nextUInt()}") + include(*modifiers) + + attributesCustomizer() } ) { - headerBuilder ?.let { - Div( - { - include(UIKitModal.Header) - headerAttrsBuilder ?.let { it() } - } - ) { - it() + 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 { + draw.value = false } } - afterHeaderBuilder ?.let { it() } + Div( { - include(UIKitModal.Body) - bodyAttrsBuilder ?.let { it() } + include(UIKitModal.Dialog) + dialogAttrsBuilder ?.let { it() } ?: include(UIKitMargin.Auto.Vertical) } ) { - bodyBuilder() - } - beforeFooterBuilder ?.let { it() } - footerBuilder ?.let { + headerBuilder ?.let { + Div( + { + include(UIKitModal.Header) + headerAttrsBuilder ?.let { it() } + } + ) { + it() + } + } + afterHeaderBuilder ?.let { it() } Div( { - include(UIKitModal.Footer) - footerAttrsBuilder ?.let { it() } ?: include(UIKitText.Alignment.Horizontal.Right) + include(UIKitModal.Body) + 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 +116,14 @@ fun Dialog( } } - if (drawDiv.value) { - Div({ - hidden() - ref { - onDispose { - composition.dispose() - } + Div({ + hidden() + ref { + onDispose { + draw.value = false } - }) - } else { - runCatching { composition.dispose() } - } + } + }) } @Composable From dbf9efa8f5f7715697d76401ffb714969d8a0066 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 13 Jan 2023 13:25:14 +0600 Subject: [PATCH 3/3] fill changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c4b67b..b3f8fe0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 0.5.1 +* Fixes in new `Dialog`s + ## 0.5.0 * Fully rework `Dialog` elements