Use text height, not baseline, to determine spacing
Bug: 234054906
Test: navigationBarItemContent_withLabel_sizeAndPosition
Change-Id: I810f9b5ea23359b3582b7d7c81522310177b6b03
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/NavigationBar.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/NavigationBar.kt
index c468caa..42541a1 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/NavigationBar.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/NavigationBar.kt
@@ -48,7 +48,6 @@
import androidx.compose.ui.draw.clip
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.LastBaseline
import androidx.compose.ui.layout.Layout
import androidx.compose.ui.layout.MeasureResult
import androidx.compose.ui.layout.MeasureScope
@@ -503,9 +502,8 @@
): MeasureResult {
val height = constraints.maxHeight
- val baseline = labelPlaceable[LastBaseline]
// Label should be `ItemVerticalPadding` from the bottom
- val labelY = height - baseline - NavigationBarItemVerticalPadding.roundToPx()
+ val labelY = height - labelPlaceable.height - NavigationBarItemVerticalPadding.roundToPx()
// Icon (when selected) should be `ItemVerticalPadding` from the top
val selectedIconY = NavigationBarItemVerticalPadding.roundToPx()