From dcc6495030b82129bcaf4d2ec172032eabb903fd Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 5 Mar 2023 14:35:56 +0600 Subject: [PATCH 1/6] start 0.6.1 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58c0200..1b2fbb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.6.1 + ## 0.6.0 * `Kotlin`: `1.8.10` diff --git a/gradle.properties b/gradle.properties index e265d68..8cc9b98 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,4 @@ android.enableJetifier=true # Project data group=dev.inmo -version=0.6.0 +version=0.6.1 From 1765214c97224b081d53ec5aed367c3a158774fc Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 5 Mar 2023 14:36:16 +0600 Subject: [PATCH 2/6] remove redundant settings fromm gradle.properties --- gradle.properties | 2 -- 1 file changed, 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8cc9b98..860cb38 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,6 @@ org.gradle.parallel=true kotlin.js.generate.externals=true kotlin.incremental=true kotlin.incremental.js=true -android.useAndroidX=true -android.enableJetifier=true # Project data From 443043cff59659fc04c697cbe7f18ee2aef08118 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 5 Mar 2023 14:37:57 +0600 Subject: [PATCH 3/6] update dependencies --- CHANGELOG.md | 2 ++ gradle/libs.versions.toml | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b2fbb3..486b0d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 0.6.1 +* `Compose`: `1.3.1-rc02` + ## 0.6.0 * `Kotlin`: `1.8.10` diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 53c60ba..ebb7af5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] kt = "1.8.10" -jb-compose = "1.3.1-rc01" -jb-dokka = "1.7.20" +jb-compose = "1.3.1-rc02" +jb-dokka = "1.8.10" gh-release = "2.4.1" [libraries] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..774fae8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 6502e0923e0594a82cb9302ccdfa6e206e5b8552 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 5 Mar 2023 14:41:30 +0600 Subject: [PATCH 4/6] DefaultInput -> StandardInput --- CHANGELOG.md | 1 + .../inmo/jsuikit/elements/StandardInput.kt | 20 +++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 486b0d1..e5dfa5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 0.6.1 +* `DefaultInput` has been renamed to `StandardInput` * `Compose`: `1.3.1-rc02` ## 0.6.0 diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/StandardInput.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/StandardInput.kt index dab38d2..4c4aca0 100644 --- a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/StandardInput.kt +++ b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/StandardInput.kt @@ -9,12 +9,12 @@ import org.jetbrains.compose.web.dom.Input import org.w3c.dom.HTMLInputElement @Composable -fun DefaultInput( +fun StandardInput( type: InputType, value: T, + vararg modifiers: UIKitModifier, disabled: Boolean = false, placeholder: String? = null, - vararg modifiers: UIKitModifier, attributesCustomizer: AttrBuilderContext = {}, onChange: (T) -> Unit ) { @@ -41,6 +41,18 @@ fun DefaultInput( } } +@Deprecated("Renamed", ReplaceWith("StandardInput(type, value, *modifiers, disabled, placeholder, attributesCustomizer, onChange)")) +@Composable +fun DefaultInput( + type: InputType, + value: T, + disabled: Boolean = false, + placeholder: String? = null, + vararg modifiers: UIKitModifier, + attributesCustomizer: AttrBuilderContext = {}, + onChange: (T) -> Unit +) = StandardInput(type, value, modifiers = modifiers, disabled, placeholder, attributesCustomizer, onChange) + @Composable fun StandardInput( type: InputType, @@ -49,12 +61,12 @@ fun StandardInput( placeholder: String? = null, vararg modifiers: UIKitModifier, attributesCustomizer: AttrBuilderContext = {}, -) = DefaultInput( +) = StandardInput( type, state.value, + modifiers = modifiers, disabledState ?.value == true, placeholder, - modifiers = modifiers, attributesCustomizer = attributesCustomizer ) { state.value = it From 1eb14becdeb2c45f0d3b21438ed4783e2047fff0 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 5 Mar 2023 18:15:12 +0600 Subject: [PATCH 5/6] now StandardInput uses callback with input receiver --- .../kotlin/dev/inmo/jsuikit/elements/StandardInput.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/StandardInput.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/StandardInput.kt index 4c4aca0..320c642 100644 --- a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/StandardInput.kt +++ b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/StandardInput.kt @@ -16,7 +16,7 @@ fun StandardInput( disabled: Boolean = false, placeholder: String? = null, attributesCustomizer: AttrBuilderContext = {}, - onChange: (T) -> Unit + onChange: HTMLInputElement.(T) -> Unit ) { Input(type) { classes("uk-input") @@ -32,7 +32,7 @@ fun StandardInput( } } - onInput { onChange(it.value) } + onInput { event -> event.target.onChange(event.value) } if (disabled) { disabled() @@ -51,7 +51,9 @@ fun DefaultInput( vararg modifiers: UIKitModifier, attributesCustomizer: AttrBuilderContext = {}, onChange: (T) -> Unit -) = StandardInput(type, value, modifiers = modifiers, disabled, placeholder, attributesCustomizer, onChange) +) = StandardInput(type, value, modifiers = modifiers, disabled, placeholder, attributesCustomizer) { + onChange(it) +} @Composable fun StandardInput( From 8178fa9d397ef9204c1a96036f42972dc9dbd439 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 5 Mar 2023 18:50:59 +0600 Subject: [PATCH 6/6] value in StandardInput is nullable --- src/jsMain/kotlin/dev/inmo/jsuikit/elements/StandardInput.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/StandardInput.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/StandardInput.kt index 320c642..3361d99 100644 --- a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/StandardInput.kt +++ b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/StandardInput.kt @@ -11,7 +11,7 @@ import org.w3c.dom.HTMLInputElement @Composable fun StandardInput( type: InputType, - value: T, + value: T? = null, vararg modifiers: UIKitModifier, disabled: Boolean = false, placeholder: String? = null, @@ -24,7 +24,7 @@ fun StandardInput( placeholder ?.let(::placeholder) - value.let { + value ?.let { when (it) { is String -> value(it) is Number -> value(it)