From 17ae0b119b353a5b1fdfe4418388ccd9898d0da8 Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Tue, 15 Nov 2022 21:50:15 +0600
Subject: [PATCH] StandardInput improvements

---
 CHANGELOG.md                                  |  2 ++
 .../inmo/jsuikit/elements/StandardInput.kt    | 34 ++++++++++++++-----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d69d984..218050d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 0.4.1
 
+* Now it is possible to use `StandardInput` with simple `T` types instead of states
+
 ## 0.4.0
 
 * `Kotlin`: `1.7.20`
diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/StandardInput.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/StandardInput.kt
index f5d5dd4..20d5965 100644
--- a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/StandardInput.kt
+++ b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/StandardInput.kt
@@ -11,11 +11,12 @@ import org.w3c.dom.HTMLInputElement
 @Composable
 fun <T> StandardInput(
     type: InputType<T>,
-    state: MutableState<T>,
-    disabledState: State<Boolean>? = null,
+    value: T,
+    disabled: Boolean = false,
     placeholder: String? = null,
     vararg modifiers: UIKitModifier,
     attributesCustomizer: AttrBuilderContext<HTMLInputElement> = {},
+    onChange: (T) -> Unit
 ) {
     Input(type) {
         classes("uk-input")
@@ -23,7 +24,7 @@ fun <T> StandardInput(
 
         placeholder ?.let(::placeholder)
 
-        state.value.let {
+        value.let {
             when (it) {
                 is String -> value(it)
                 is Number -> value(it)
@@ -31,13 +32,30 @@ fun <T> StandardInput(
             }
         }
 
-        onInput { state.value = it.value }
+        onInput { onChange(it.value) }
 
-        disabledState ?.let {
-            if (it.value) {
-                disabled()
-            }
+        if (disabled) {
+            disabled()
         }
         attributesCustomizer()
     }
 }
+
+@Composable
+fun <T> StandardInput(
+    type: InputType<T>,
+    state: MutableState<T>,
+    disabledState: State<Boolean>? = null,
+    placeholder: String? = null,
+    vararg modifiers: UIKitModifier,
+    attributesCustomizer: AttrBuilderContext<HTMLInputElement> = {},
+) = StandardInput(
+    type,
+    state.value,
+    disabledState ?.value == true,
+    placeholder,
+    modifiers = modifiers,
+    attributesCustomizer = attributesCustomizer
+) {
+    state.value = it
+}