From f77c21ac51ff95edce2f036213bd565e7cf037e6 Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Wed, 2 Mar 2022 18:40:07 +0600
Subject: [PATCH] fixes in DropAre and new type of attrs

---
 .../kotlin/dev/inmo/jsuikit/elements/DropArea.kt |  7 +++++--
 .../inmo/jsuikit/utils/AttributesCollection.kt   | 16 ++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/DropArea.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/DropArea.kt
index 9901aff..ec24ed4 100644
--- a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/DropArea.kt
+++ b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/DropArea.kt
@@ -3,6 +3,7 @@ package dev.inmo.jsuikit.elements
 import androidx.compose.runtime.Composable
 import dev.inmo.jsuikit.modifiers.*
 import dev.inmo.jsuikit.utils.Attrs
+import dev.inmo.jsuikit.utils.InputAttrs
 import org.jetbrains.compose.web.attributes.InputType
 import org.jetbrains.compose.web.dom.*
 import org.w3c.dom.HTMLDivElement
@@ -11,7 +12,7 @@ import org.w3c.dom.HTMLInputElement
 @Composable
 fun DropArea(
     attrs: Attrs<HTMLDivElement> = Attrs.empty(),
-    inputAttrs: Attrs<HTMLInputElement> = Attrs.empty(),
+    inputAttrs: InputAttrs<String> = Attrs.empty(),
     contentBuilder: ContentBuilder<HTMLDivElement> = {}
 ) = Div(
     {
@@ -19,6 +20,8 @@ fun DropArea(
         attrs.builder(this)
     }
 ) {
-    Input(InputType.File, attrs = { inputAttrs.builder.invoke(this) })
+    FileInput {
+        inputAttrs.builder.invoke(this)
+    }
     contentBuilder(this)
 }
diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/utils/AttributesCollection.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/utils/AttributesCollection.kt
index c71d37d..d7635ad 100644
--- a/src/jsMain/kotlin/dev/inmo/jsuikit/utils/AttributesCollection.kt
+++ b/src/jsMain/kotlin/dev/inmo/jsuikit/utils/AttributesCollection.kt
@@ -3,19 +3,22 @@ package dev.inmo.jsuikit.utils
 import dev.inmo.jsuikit.modifiers.UIKitModifier
 import dev.inmo.jsuikit.modifiers.include
 import org.jetbrains.compose.web.attributes.AttrsBuilder
+import org.jetbrains.compose.web.attributes.InputType
+import org.jetbrains.compose.web.attributes.builders.InputAttrsBuilder
 import org.jetbrains.compose.web.dom.AttrBuilderContext
 import org.w3c.dom.Element
+import org.w3c.dom.HTMLInputElement
 
-class AttributesCollection<T : Element> (
+class AttributesCollection<T : Element, Builder : AttrsBuilder<T>> (
     private vararg val modifiers: UIKitModifier,
-    private val attrs: AttrBuilderContext<T> = {}
+    private val attrs: Builder.() -> Unit = {}
 ) {
-    val builder: AttrBuilderContext<T> = {
+    val builder: Builder.() -> Unit = {
         include(*modifiers)
         attrs()
     }
 
-    operator fun plus(other: AttributesCollection<T>) = AttributesCollection<T>(
+    operator fun plus(other: AttributesCollection<T, Builder>) = AttributesCollection<T, Builder>(
         *(modifiers + other.modifiers).distinct().toTypedArray()
     ) {
         this@AttributesCollection.attrs.invoke(this)
@@ -26,8 +29,9 @@ class AttributesCollection<T : Element> (
         val Empty = Attrs<Element>()
 
         @Suppress("UNCHECKED_CAST")
-        fun <T : Element> empty() = Empty as Attrs<T>
+        fun <T : Element, Builder : AttrsBuilder<T>> empty() = Empty as AttributesCollection<T, Builder>
     }
 }
 
-typealias Attrs<T> = AttributesCollection<T>
+typealias Attrs<T> = AttributesCollection<T, AttrsBuilder<T>>
+typealias InputAttrs<T> = AttributesCollection<HTMLInputElement, InputAttrsBuilder<T>>