fixes

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,7 +32,8 @@ fun Dialog(
     bodyBuilder: ContentBuilder<HTMLDivElement> = {}
 ) {
     val drawDiv = remember { mutableStateOf(true) }
-    val composition = renderComposableInBody {
+    val composition = remember {
+        renderComposableInBody {
             Div(
                 {
                     if (modifiers.none { it is UIKitModal.WithCustomAttributes }) {
@@ -40,42 +42,38 @@ fun Dialog(
                     id("dialog${Random.nextUInt()}")
                     include(*modifiers)
 
-                ref { htmlElement ->
+                    attributesCustomizer()
-                    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
+                DisposableEffect(true) {
-
+                    val htmlElement = scopeElement
-                        if (removeOnHide && !currentStateIsShown) {
-                            htmlElement.remove()
-                        }
-                    }
-
-                    observer.observe(htmlElement, MutationObserverInit(attributes = true, attributeFilter = arrayOf("class")))
 
                     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)
@@ -115,6 +113,7 @@ fun Dialog(
                 }
             }
         }
+    }
 
     if (drawDiv.value) {
         Div({
@@ -150,23 +149,23 @@ fun Dialog(
     bodyBuilder: ContentBuilder<HTMLDivElement> = {}
 ) = Dialog(
     modifiers = modifiers,
-    attributesCustomizer,
+    attributesCustomizer = attributesCustomizer,
-    onHidden,
+    onHidden = onHidden,
-    onShown,
+    onShown = onShown,
-    dialogAttrsBuilder,
+    dialogAttrsBuilder = dialogAttrsBuilder,
-    headerAttrsBuilder,
+    headerAttrsBuilder = headerAttrsBuilder,
     headerBuilder = {
         H2({ include(UIKitModal.Title) }) {
             Text(title)
         }
         headerBuilder ?.invoke(this)
     },
-    afterHeaderBuilder,
+    afterHeaderBuilder = afterHeaderBuilder,
-    beforeFooterBuilder,
+    beforeFooterBuilder = beforeFooterBuilder,
-    footerAttrsBuilder,
+    footerAttrsBuilder = footerAttrsBuilder,
-    footerBuilder,
+    footerBuilder = footerBuilder,
-    bodyAttrsBuilder,
+    bodyAttrsBuilder = bodyAttrsBuilder,
-    autoShow,
+    autoShow = autoShow,
-    removeOnHide,
+    removeOnHide = removeOnHide,
-    bodyBuilder
+    bodyBuilder = bodyBuilder
 )

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)

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)
+}

src/jsMain/kotlin/dev/inmo/jsuikit/types/UIKitUtilConstants.kt

@@ -0,0 +1,4 @@
+package dev.inmo.jsuikit.types
+
+object UIKitUtilConstants {
+}

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 <T : Element> AttrBuilderContext<T>.plus(other: AttrBuilderContext<T>): AttrBuilderContext<T> = {
+    this@plus()
+    other()
+}