Tabs - Avoid passing a list of Composable tag content

Tweener · Jul 21, 2024 · 443df9d · 443df9d
1 parent 4204b6d
commit 443df9d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/czan/build.gradle.kts b/czan/build.gradle.kts
@@ -53,7 +53,6 @@ kotlin {
     androidTarget {
         publishLibraryVariants("release")
 
-
         @OptIn(ExperimentalKotlinGradlePluginApi::class)
         compilerOptions {
             jvmTarget.set(JvmTarget.fromTarget(ProjectConfiguration.Compiler.jvmTarget))
@@ -72,7 +71,6 @@ kotlin {
     }
 
     sourceSets {
-
         commonMain.dependencies {
             implementation(project.dependencies.platform(libs.tweener.bom))
             implementation(libs.tweener.common)

diff --git a/czan/src/commonMain/kotlin/com/tweener/czan/designsystem/molecule/tabs/Tabs.kt b/czan/src/commonMain/kotlin/com/tweener/czan/designsystem/molecule/tabs/Tabs.kt
@@ -46,6 +46,7 @@ import org.jetbrains.compose.resources.DrawableResource
 import org.jetbrains.compose.resources.StringResource
 
 class TabItem(
+    val id: String,
     val title: StringResource,
     val icon: DrawableResource? = null,
 )
@@ -54,13 +55,13 @@ class TabItem(
 @Composable
 fun PrimaryTabs(
     tabItems: List<TabItem>,
-    tabsContents: List<@Composable () -> Unit>,
     modifier: Modifier = Modifier,
     colors: TabsColors = TabsDefaults.colors(),
     textStyle: TextStyle = MaterialTheme.typography.bodyMedium,
     shape: Shape = RoundedCornerShape(Size.Padding.Small),
     contentPadding: PaddingValues = TabsDefaults.ContentPadding,
     showDivider: Boolean = false,
+    onTabChanged: (@Composable (String) -> Unit)? = null,
 ) {
     var selectedTabIndex by remember { mutableIntStateOf(0) }
 
@@ -92,21 +93,21 @@ fun PrimaryTabs(
             }
         }
 
-        tabsContents.getOrNull(selectedTabIndex)?.invoke()
+        onTabChanged?.invoke(tabItems[selectedTabIndex].id)
     }
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun SecondaryTabs(
     tabItems: List<TabItem>,
-    tabsContents: List<@Composable () -> Unit>,
     modifier: Modifier = Modifier,
     colors: TabsColors = TabsDefaults.colors(),
     textStyle: TextStyle = MaterialTheme.typography.bodyMedium,
     shape: Shape = RoundedCornerShape(Size.Padding.Small),
     contentPadding: PaddingValues = TabsDefaults.ContentPadding,
     showDivider: Boolean = false,
+    onTabChanged: (@Composable (String) -> Unit)? = null,
 ) {
     var selectedTabIndex by remember { mutableIntStateOf(0) }
 
@@ -138,7 +139,7 @@ fun SecondaryTabs(
             }
         }
 
-        tabsContents.getOrNull(selectedTabIndex)?.invoke()
+        onTabChanged?.invoke(tabItems[selectedTabIndex].id)
     }
 }