Merge pull request #9 from InsanusMokrassar/0.0.9

0.0.9
This commit is contained in:
InsanusMokrassar 2022-01-20 20:06:36 +06:00 committed by GitHub
commit 20bf43b8a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 70 additions and 4 deletions

View File

@ -1,5 +1,9 @@
# Changelog # Changelog
## 0.0.9
* Improving of `Nav` support
## 0.0.8 ## 0.0.8
Removing of redundant non standard things Removing of redundant non standard things

View File

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

View File

@ -1,12 +1,13 @@
package dev.inmo.jsuikit.elements package dev.inmo.jsuikit.elements
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.snapshots.SnapshotStateList
import dev.inmo.jsuikit.buildAndAddAttribute import dev.inmo.jsuikit.buildAndAddAttribute
import dev.inmo.jsuikit.modifiers.* import dev.inmo.jsuikit.modifiers.*
import dev.inmo.jsuikit.utils.Milliseconds import dev.inmo.jsuikit.utils.Milliseconds
import org.jetbrains.compose.web.dom.* import org.jetbrains.compose.web.dom.*
import org.w3c.dom.HTMLLIElement import org.jetbrains.compose.web.dom.Text
import org.w3c.dom.HTMLUListElement import org.w3c.dom.*
@Composable @Composable
fun Nav( fun Nav(
@ -35,6 +36,62 @@ fun Nav(
} }
} }
@Composable
fun <T> Nav(
title: String,
data: SnapshotStateList<T>,
vararg ulModifiers: UIKitModifier,
titleModifiers: Array<UIKitModifier> = emptyArray(),
multiple: Boolean? = null,
collapsible: Boolean? = null,
animation: UIKitAnimation? = null,
duration: Milliseconds? = null,
besidesTitleAndList: ContentBuilder<HTMLUListElement>? = null,
titleCustomizer: AttrBuilderContext<HTMLLIElement> = {},
ulCustomizer: AttrBuilderContext<HTMLUListElement> = {},
elementAllocator: @Composable ElementScope<HTMLUListElement>.(T) -> Unit
) {
Ul(
{
buildAndAddAttribute("uk-nav") {
"multiple" to multiple ?.toString()
"collapsible" to collapsible ?.toString()
"animation" to animation
"duration" to duration ?.toString()
}
classes("uk-nav")
include(*ulModifiers)
ulCustomizer()
}
) {
NavHeader(
title,
*titleModifiers,
attributesCustomizer = titleCustomizer
)
besidesTitleAndList ?.let { it() }
data.forEach {
elementAllocator(it)
}
}
}
@Composable
fun NavHeader(
text: String,
vararg modifiers: UIKitModifier,
attributesCustomizer: AttrBuilderContext<HTMLLIElement> = {},
) {
Li(
{
include(*modifiers, UIKitNav.Header)
attributesCustomizer()
}
) {
Text(text)
}
}
@Composable @Composable
fun NavElement( fun NavElement(
vararg modifiers: UIKitModifier, vararg modifiers: UIKitModifier,
@ -44,9 +101,14 @@ fun NavElement(
Li( Li(
{ {
include(*modifiers) include(*modifiers)
attributesCustomizer attributesCustomizer()
} }
) { ) {
contentAllocator() contentAllocator()
} }
} }
@Composable
fun NavDivider() {
Li({ include(UIKitNav.Divider) })
}