Merge pull request #88 from Konyaco/update_tab_row_layout

[fluent] Fix: Prevent TabView from exceeding its bounds
Konyaco · Dec 1, 2024 · 5a56a23 · 5a56a23
2 parents eec0334 + 67ee464
commit 5a56a23
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/fluent/src/commonMain/kotlin/com/konyaco/fluent/component/TabView.kt b/fluent/src/commonMain/kotlin/com/konyaco/fluent/component/TabView.kt
@@ -20,6 +20,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyListItemInfo
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.LazyListState
@@ -154,6 +155,7 @@ fun TabRow(
                 modifier = Modifier
                     .onGloballyPositioned { rowRect.value = it.boundsInParent() }
                     .weight(1f)
+                    .wrapContentWidth(Alignment.Start)
                     .height(TabViewHeight)
                     .zIndex(1f)
             )

diff --git a/gallery/src/commonMain/kotlin/com/konyaco/fluent/gallery/screen/navigation/TabViewScreen.kt b/gallery/src/commonMain/kotlin/com/konyaco/fluent/gallery/screen/navigation/TabViewScreen.kt
@@ -151,7 +151,7 @@ internal fun TabViewWindowContent(
 ) {
     Column(modifier = Modifier.windowInsetsPadding(paddingInsets)) {
         val selectedIndex = remember { mutableStateOf(1) }
-        val tabItems = remember { mutableStateListOf(*Array(100) { it + 1 }) }
+        val tabItems = remember { mutableStateListOf(*Array(6) { it + 1 }) }
         val state = rememberLazyListState()
         val endDividerController = rememberTabItemEndDividerController(
             selectedKey = { selectedIndex.value },