refactor: replace DefaultDropdownListMenuOffset with padding in Dropdown

This commit is contained in:
2023-11-29 20:20:46 +08:00
parent 70025a7a9f
commit 94a5eb53e0

View File

@@ -107,6 +107,8 @@ import com.highcapable.flexiui.LocalColors
import com.highcapable.flexiui.LocalShapes import com.highcapable.flexiui.LocalShapes
import com.highcapable.flexiui.LocalSizes import com.highcapable.flexiui.LocalSizes
import com.highcapable.flexiui.extension.borderOrNot import com.highcapable.flexiui.extension.borderOrNot
import com.highcapable.flexiui.extension.calculateEnd
import com.highcapable.flexiui.extension.calculateStart
import com.highcapable.flexiui.extension.horizontal import com.highcapable.flexiui.extension.horizontal
import com.highcapable.flexiui.extension.orElse import com.highcapable.flexiui.extension.orElse
import com.highcapable.flexiui.extension.solidColor import com.highcapable.flexiui.extension.solidColor
@@ -224,7 +226,7 @@ fun DropdownList(
DropdownMenu( DropdownMenu(
expanded = expanded, expanded = expanded,
onDismissRequest = { onExpandedChange(false) }, onDismissRequest = { onExpandedChange(false) },
offset = DefaultDropdownListMenuOffset, offset = DpOffset(-style.padding.calculateStart(), style.padding.calculateEnd()),
modifier = Modifier.width(menuMaxWidth).heightIn(max = menuMaxHeight), modifier = Modifier.width(menuMaxWidth).heightIn(max = menuMaxHeight),
colors = menuColors, colors = menuColors,
style = menuStyle, style = menuStyle,
@@ -595,8 +597,6 @@ private fun defaultDropdownListInactiveBorder() = BorderStroke(LocalSizes.curren
@ReadOnlyComposable @ReadOnlyComposable
private fun defaultDropdownListActiveBorder() = BorderStroke(LocalSizes.current.borderSizePrimary, LocalColors.current.themePrimary) private fun defaultDropdownListActiveBorder() = BorderStroke(LocalSizes.current.borderSizePrimary, LocalColors.current.themePrimary)
private val DefaultDropdownListMenuOffset = DpOffset((-10).dp, 10.dp)
private val DefaultMenuContentPadding = 16.dp private val DefaultMenuContentPadding = 16.dp
private const val DefaultInTransitionDuration = 120 private const val DefaultInTransitionDuration = 120