From bfa4558c8d2ac94ec121a21be012ebc15b9c8b6b Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Sat, 2 Dec 2023 10:33:40 +0800 Subject: [PATCH] refactor: add LocalInSurface provided the padding in Navigation --- .../kotlin/com/highcapable/flexiui/component/Navigation.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Navigation.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Navigation.kt index be74ac0..aa4ce1d 100644 --- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Navigation.kt +++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Navigation.kt @@ -55,7 +55,6 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Shape import androidx.compose.ui.semantics.Role import androidx.compose.ui.unit.Dp -import androidx.compose.ui.unit.dp import com.highcapable.flexiui.LocalColors import com.highcapable.flexiui.LocalSizes import com.highcapable.flexiui.extension.orElse @@ -239,8 +238,8 @@ private fun defaultNavigationColors() = NavigationColors( @Composable @ReadOnlyComposable private fun defaultNavigationStyle() = NavigationStyle( - padding = when (LocalInAreaBox.current) { - true -> PaddingValues(0.dp) + padding = when { + LocalInSurface.current || LocalInAreaBox.current -> PaddingValues() else -> PaddingValues( horizontal = LocalSizes.current.spacingPrimary, vertical = LocalSizes.current.spacingSecondary