InsanusMokrassar/JSUIKitKBindings
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/JSUIKitKBindings.git synced 2024-12-22 08:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20 from InsanusMokrassar/0.0.20

Browse Source 
0.0.20
This commit is contained in:
InsanusMokrassar 2022-01-25 12:54:38 +06:00 committed by GitHub
commit 4943490910
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,5 +1,9 @@
# Changelog # Changelog
## 0.0.20
* Remove type of button from `DefaultButton` and add companion to `UIKitButton` to be able to use `uk-button` class
## 0.0.19 ## 0.0.19
* Create `Card`s implementation * Create `Card`s implementation

2
gradle.properties
View File

@ -9,4 +9,4 @@ android.enableJetifier=true
# Project data # Project data
group=dev.inmo group=dev.inmo
version=0.0.19 version=0.0.20

7
src/jsMain/kotlin/dev/inmo/jsuikit/elements/Button.kt
View File

@ -14,7 +14,6 @@ import org.w3c.dom.events.Event
fun DefaultButton( fun DefaultButton(
vararg modifiers: UIKitModifier, vararg modifiers: UIKitModifier,
disabled: Boolean = false, disabled: Boolean = false,
buttonType: UIKitButton.Type = UIKitButton.Type.Default,
onClick: ((SyntheticMouseEvent) -> Unit)? = null, onClick: ((SyntheticMouseEvent) -> Unit)? = null,
attributesCustomizer: AttrBuilderContext<HTMLButtonElement> = {}, attributesCustomizer: AttrBuilderContext<HTMLButtonElement> = {},
contentAllocator: ContentBuilder<HTMLButtonElement> contentAllocator: ContentBuilder<HTMLButtonElement>
@ -22,8 +21,7 @@ fun DefaultButton(
Button( Button(
{ {
onClick ?.let { onClick(it) } onClick ?.let { onClick(it) }
classes("uk-button") include(UIKitButton, *modifiers)
include(*modifiers, buttonType)
if (disabled) { if (disabled) {
disabled() disabled()
} }
@ -39,12 +37,11 @@ fun DefaultButton(
text: String, text: String,
vararg modifiers: UIKitModifier, vararg modifiers: UIKitModifier,
disabled: Boolean = false, disabled: Boolean = false,
buttonType: UIKitButton.Type = UIKitButton.Type.Default,
preTextContentAllocator: ContentBuilder<HTMLButtonElement>? = null, preTextContentAllocator: ContentBuilder<HTMLButtonElement>? = null,
afterTextContentAllocator: ContentBuilder<HTMLButtonElement>? = null, afterTextContentAllocator: ContentBuilder<HTMLButtonElement>? = null,
attributesCustomizer: AttrBuilderContext<HTMLButtonElement> = {}, attributesCustomizer: AttrBuilderContext<HTMLButtonElement> = {},
onClick: ((SyntheticMouseEvent) -> Unit)? = null onClick: ((SyntheticMouseEvent) -> Unit)? = null
) = DefaultButton(*modifiers, disabled = disabled, buttonType = buttonType, onClick = onClick, attributesCustomizer = attributesCustomizer) { ) = DefaultButton(*modifiers, disabled = disabled, onClick = onClick, attributesCustomizer = attributesCustomizer) {
preTextContentAllocator ?.apply { preTextContentAllocator() } preTextContentAllocator ?.apply { preTextContentAllocator() }
Text(text) Text(text)
afterTextContentAllocator ?.apply { afterTextContentAllocator() } afterTextContentAllocator ?.apply { afterTextContentAllocator() }

6
src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitButton.kt
View File

@ -1,7 +1,7 @@
package dev.inmo.jsuikit.modifiers package dev.inmo.jsuikit.modifiers
sealed class UIKitButton(suffix: String) : UIKitModifier { sealed class UIKitButton(suffix: String?) : UIKitModifier {
override val classes: Array<String> = arrayOf("uk-button-$suffix") override val classes: Array<String> = arrayOf("uk-button${suffix?.let { "-$it" } ?: ""}")
sealed class Type(suffix: String) : UIKitButton(suffix) { sealed class Type(suffix: String) : UIKitButton(suffix) {
object Default : Type("default") object Default : Type("default")
@ -11,4 +11,6 @@ sealed class UIKitButton(suffix: String) : UIKitModifier {
object Text : Type("text") object Text : Type("text")
object Link : Type("link") object Link : Type("link")
} }
companion object : UIKitButton(null)
} }