Skip to content

Commit ea0fff9

Browse files
committed
library: SearchBar: No Surface required
1 parent 1f0c699 commit ea0fff9

File tree

2 files changed

+35
-28
lines changed
  • example/src/commonMain/kotlin
  • miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic

2 files changed

+35
-28
lines changed

example/src/commonMain/kotlin/UITest.kt

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,13 +269,25 @@ fun UITest(
269269
@Composable
270270
fun floatingToolbarContent() {
271271
IconButton(onClick = { /* Action 1 */ }) {
272-
Icon(MiuixIcons.Useful.Edit, contentDescription = "Edit", tint = MiuixTheme.colorScheme.onPrimaryContainer)
272+
Icon(
273+
MiuixIcons.Useful.Edit,
274+
contentDescription = "Edit",
275+
tint = MiuixTheme.colorScheme.onPrimaryContainer
276+
)
273277
}
274278
IconButton(onClick = { /* Action 2 */ }) {
275-
Icon(MiuixIcons.Useful.Delete, contentDescription = "Delete", tint = MiuixTheme.colorScheme.onPrimaryContainer)
279+
Icon(
280+
MiuixIcons.Useful.Delete,
281+
contentDescription = "Delete",
282+
tint = MiuixTheme.colorScheme.onPrimaryContainer
283+
)
276284
}
277285
IconButton(onClick = { /* Action 3 */ }) {
278-
Icon(MiuixIcons.Useful.ImmersionMore, contentDescription = "More", tint = MiuixTheme.colorScheme.onPrimaryContainer)
286+
Icon(
287+
MiuixIcons.Useful.ImmersionMore,
288+
contentDescription = "More",
289+
tint = MiuixTheme.colorScheme.onPrimaryContainer
290+
)
279291
}
280292
}
281293
when (orientation) {

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/SearchBar.kt

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ import androidx.compose.ui.text.input.ImeAction
4646
import androidx.compose.ui.unit.DpSize
4747
import androidx.compose.ui.unit.dp
4848
import androidx.compose.ui.unit.sp
49-
import androidx.compose.ui.zIndex
5049
import kotlinx.coroutines.delay
5150
import top.yukonga.miuix.kmp.icon.MiuixIcons
5251
import top.yukonga.miuix.kmp.icon.icons.basic.Search
@@ -78,36 +77,32 @@ fun SearchBar(
7877
outsideRightAction: @Composable (() -> Unit)? = null,
7978
content: @Composable ColumnScope.() -> Unit
8079
) {
81-
Surface(
82-
modifier = modifier.zIndex(1f),
83-
) {
84-
Column {
85-
Row(
86-
modifier = Modifier.fillMaxWidth(),
87-
verticalAlignment = Alignment.CenterVertically,
80+
Column {
81+
Row(
82+
modifier = Modifier.fillMaxWidth(),
83+
verticalAlignment = Alignment.CenterVertically,
84+
) {
85+
Box(
86+
modifier = Modifier
87+
.weight(1f)
88+
.padding(vertical = insideMargin.height, horizontal = insideMargin.width)
8889
) {
89-
Box(
90-
modifier = Modifier
91-
.weight(1f)
92-
.padding(vertical = insideMargin.height, horizontal = insideMargin.width)
93-
) {
94-
inputField()
95-
}
96-
AnimatedVisibility(
97-
visible = expanded,
98-
enter = expandHorizontally() + slideInHorizontally(initialOffsetX = { it }),
99-
exit = shrinkHorizontally() + slideOutHorizontally(targetOffsetX = { it })
100-
) {
101-
outsideRightAction?.invoke()
102-
}
90+
inputField()
10391
}
104-
10592
AnimatedVisibility(
106-
visible = expanded
93+
visible = expanded,
94+
enter = expandHorizontally() + slideInHorizontally(initialOffsetX = { it }),
95+
exit = shrinkHorizontally() + slideOutHorizontally(targetOffsetX = { it })
10796
) {
108-
content()
97+
outsideRightAction?.invoke()
10998
}
11099
}
100+
101+
AnimatedVisibility(
102+
visible = expanded
103+
) {
104+
content()
105+
}
111106
}
112107

113108
BackHandler(enabled = expanded) {

0 commit comments

Comments
 (0)