Make DomElementWrapper private (#1749)

web/core/src/jsMain/kotlin/org/jetbrains/compose/web/css/StyleBuilder.kt

@@ -7,9 +7,7 @@
 
 package org.jetbrains.compose.web.css
 
-import org.jetbrains.compose.web.internal.runtime.DomElementWrapper
 import org.jetbrains.compose.web.internal.runtime.ComposeWebInternalApi
-import org.w3c.dom.css.CSSStyleDeclaration
 import kotlin.properties.ReadOnlyProperty
 
 /**

web/core/src/jsMain/kotlin/org/jetbrains/compose/web/elements/Base.kt

@@ -4,8 +4,9 @@ import androidx.compose.runtime.*
 import org.jetbrains.compose.web.attributes.AttrsBuilder
 import org.jetbrains.compose.web.ExperimentalComposeWebApi
 import org.jetbrains.compose.web.css.StyleHolder
-import org.jetbrains.compose.web.internal.runtime.DomElementWrapper
 import org.jetbrains.compose.web.internal.runtime.ComposeWebInternalApi
+import org.jetbrains.compose.web.internal.runtime.DomNodeWrapper
+import org.jetbrains.compose.web.internal.runtime.NamedEventListener
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
 import org.w3c.dom.css.ElementCSSInlineStyle
@@ -35,18 +36,31 @@ private inline fun <TScope, T> ComposeDomNode(
     currentComposer.endNode()
 }
 
+@ComposeWebInternalApi
+private class DomElementWrapper(override val node: Element): DomNodeWrapper(node) {
+    private var currentListeners = emptyList<NamedEventListener>()
 
-@OptIn(ComposeWebInternalApi::class)
-private fun DomElementWrapper.updateProperties(applicators: List<Pair<(Element, Any) -> Unit, Any>>) {
+    fun updateEventListeners(list: List<NamedEventListener>) {
+        currentListeners.forEach {
+            node.removeEventListener(it.name, it)
+        }
+
+        currentListeners = list
+
+        currentListeners.forEach {
+            node.addEventListener(it.name, it)
+        }
+    }
+
+    fun updateProperties(applicators: List<Pair<(Element, Any) -> Unit, Any>>) {
         node.removeAttribute("class")
 
         applicators.forEach { (applicator, item) ->
             applicator(node, item)
         }
-}
+    }
 
-@OptIn(ComposeWebInternalApi::class)
-private fun DomElementWrapper.updateStyleDeclarations(styleApplier: StyleHolder) {
+    fun updateStyleDeclarations(styleApplier: StyleHolder) {
         when (node) {
             is HTMLElement, is SVGElement -> {
                 node.removeAttribute("style")
@@ -62,10 +76,9 @@ private fun DomElementWrapper.updateStyleDeclarations(styleApplier: StyleHolder)
                 }
             }
         }
-}
+    }
 
-@OptIn(ComposeWebInternalApi::class)
-fun DomElementWrapper.updateAttrs(attrs: Map<String, String>) {
+    fun updateAttrs(attrs: Map<String, String>) {
         node.getAttributeNames().forEach { name ->
             if (name == "style") return@forEach
             node.removeAttribute(name)
@@ -74,6 +87,7 @@ fun DomElementWrapper.updateAttrs(attrs: Map<String, String>) {
         attrs.forEach {
             node.setAttribute(it.key, it.value)
         }
+    }
 }
 
 

web/internal-web-core-runtime/src/jsMain/kotlin/org/jetbrains/compose/web/internal/runtime/DomApplier.kt

@@ -72,20 +72,3 @@ open class DomNodeWrapper(open val node: Node) {
         }
     }
 }
-
-@ComposeWebInternalApi
-class DomElementWrapper(override val node: Element): DomNodeWrapper(node) {
-    private var currentListeners = emptyList<NamedEventListener>()
-
-    fun updateEventListeners(list: List<NamedEventListener>) {
-        currentListeners.forEach {
-            node.removeEventListener(it.name, it)
-        }
-
-        currentListeners = list
-
-        currentListeners.forEach {
-            node.addEventListener(it.name, it)
-        }
-    }
-}