From 71ccc74c943f4b64a36e0d194eba1d5dcb30b588 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 12 Jan 2023 14:31:38 +0600 Subject: [PATCH] fixes --- .../dev/inmo/jsuikit/elements/Dialog.kt | 145 +++++++++--------- .../kotlin/dev/inmo/jsuikit/types/UIKit.kt | 1 + .../dev/inmo/jsuikit/types/UIKitUtil.kt | 8 + .../inmo/jsuikit/types/UIKitUtilConstants.kt | 4 + .../utils/AttributeBuilderContextSums.kt | 9 ++ 5 files changed, 94 insertions(+), 73 deletions(-) create mode 100644 src/jsMain/kotlin/dev/inmo/jsuikit/types/UIKitUtil.kt create mode 100644 src/jsMain/kotlin/dev/inmo/jsuikit/types/UIKitUtilConstants.kt create mode 100644 src/jsMain/kotlin/dev/inmo/jsuikit/utils/AttributeBuilderContextSums.kt diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Dialog.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Dialog.kt index 4a01603..0558762 100644 --- a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Dialog.kt +++ b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Dialog.kt @@ -1,6 +1,7 @@ package dev.inmo.jsuikit.elements import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import dev.inmo.jsuikit.modifiers.* @@ -31,85 +32,83 @@ fun Dialog( bodyBuilder: ContentBuilder = {} ) { val drawDiv = remember { mutableStateOf(true) } - val composition = renderComposableInBody { - Div( - { - if (modifiers.none { it is UIKitModal.WithCustomAttributes }) { - include(UIKitModal) - } - id("dialog${Random.nextUInt()}") - include(*modifiers) - - ref { htmlElement -> - inline fun isShown() = htmlElement.classList.contains(UIKitUtility.Open.classes.first()) - - var latestStateIsShown = isShown() - - val observer = MutationObserver { _, _ -> - val currentStateIsShown = isShown() - - when (currentStateIsShown) { - latestStateIsShown -> return@MutationObserver - true -> onShown ?.invoke(htmlElement) - false -> onHidden ?.invoke(htmlElement) - } - - latestStateIsShown = currentStateIsShown - - if (removeOnHide && !currentStateIsShown) { - htmlElement.remove() - } + val composition = remember { + renderComposableInBody { + Div( + { + if (modifiers.none { it is UIKitModal.WithCustomAttributes }) { + include(UIKitModal) } + id("dialog${Random.nextUInt()}") + include(*modifiers) - observer.observe(htmlElement, MutationObserverInit(attributes = true, attributeFilter = arrayOf("class"))) + attributesCustomizer() + } + ) { + DisposableEffect(true) { + val htmlElement = scopeElement if (autoShow) { - UIKit.modal("#${htmlElement.id}") ?.show() + 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 { - observer.disconnect() drawDiv.value = false } } - attributesCustomizer() - } - ) { - Div( - { - include(UIKitModal.Dialog) - dialogAttrsBuilder ?.let { it() } ?: include(UIKitMargin.Auto.Vertical) - } - ) { - headerBuilder ?.let { - Div( - { - include(UIKitModal.Header) - headerAttrsBuilder ?.let { it() } - } - ) { - it() - } - } - 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() + } } } } @@ -150,23 +149,23 @@ fun Dialog( bodyBuilder: ContentBuilder = {} ) = Dialog( modifiers = modifiers, - attributesCustomizer, - onHidden, - onShown, - dialogAttrsBuilder, - headerAttrsBuilder, + attributesCustomizer = attributesCustomizer, + onHidden = onHidden, + onShown = onShown, + dialogAttrsBuilder = dialogAttrsBuilder, + headerAttrsBuilder = headerAttrsBuilder, headerBuilder = { H2({ include(UIKitModal.Title) }) { Text(title) } headerBuilder ?.invoke(this) }, - afterHeaderBuilder, - beforeFooterBuilder, - footerAttrsBuilder, - footerBuilder, - bodyAttrsBuilder, - autoShow, - removeOnHide, - bodyBuilder + afterHeaderBuilder = afterHeaderBuilder, + beforeFooterBuilder = beforeFooterBuilder, + footerAttrsBuilder = footerAttrsBuilder, + footerBuilder = footerBuilder, + bodyAttrsBuilder = bodyAttrsBuilder, + autoShow = autoShow, + removeOnHide = removeOnHide, + bodyBuilder = bodyBuilder ) diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/types/UIKit.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/types/UIKit.kt index 8b5b718..155d9d4 100644 --- a/src/jsMain/kotlin/dev/inmo/jsuikit/types/UIKit.kt +++ b/src/jsMain/kotlin/dev/inmo/jsuikit/types/UIKit.kt @@ -6,6 +6,7 @@ import kotlin.js.Json external interface UIKit { val notification: UIKitNotifications val modal: UIKitDialogs + val util: UIKitUtil fun notification(message: String, parameters: Json) diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/types/UIKitUtil.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/types/UIKitUtil.kt new file mode 100644 index 0000000..cca85bc --- /dev/null +++ b/src/jsMain/kotlin/dev/inmo/jsuikit/types/UIKitUtil.kt @@ -0,0 +1,8 @@ +package dev.inmo.jsuikit.types + +import org.w3c.dom.HTMLElement + +external interface UIKitUtil { + fun on(selector: String, event: String, callback: () -> Unit) + fun on(element: HTMLElement, event: String, callback: () -> Unit) +} diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/types/UIKitUtilConstants.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/types/UIKitUtilConstants.kt new file mode 100644 index 0000000..17f5780 --- /dev/null +++ b/src/jsMain/kotlin/dev/inmo/jsuikit/types/UIKitUtilConstants.kt @@ -0,0 +1,4 @@ +package dev.inmo.jsuikit.types + +object UIKitUtilConstants { +} diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/utils/AttributeBuilderContextSums.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/utils/AttributeBuilderContextSums.kt new file mode 100644 index 0000000..7c3d25e --- /dev/null +++ b/src/jsMain/kotlin/dev/inmo/jsuikit/utils/AttributeBuilderContextSums.kt @@ -0,0 +1,9 @@ +package dev.inmo.jsuikit.utils + +import org.jetbrains.compose.web.dom.AttrBuilderContext +import org.w3c.dom.Element + +operator fun AttrBuilderContext.plus(other: AttrBuilderContext): AttrBuilderContext = { + this@plus() + other() +}