Skip to content

fix: Switch crash with off state. #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 24, 2025
Merged

fix: Switch crash with off state. #95

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a403dc
fix: Switch crash with off state.
HChenX Jul 24, 2025
c8f455a
fix: Switch crash with off state.
HChenX Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Switch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ fun Switch(
colors: SwitchColors = SwitchDefaults.switchColors(),
enabled: Boolean = true
) {
val isChecked by rememberUpdatedState(checked)
val currentOnCheckedChange by rememberUpdatedState(onCheckedChange)

val interactionSource = remember { MutableInteractionSource() }
Expand All @@ -86,7 +87,7 @@ fun Switch(

var dragOffset by remember { mutableStateOf(0f) }
val thumbOffset by animateDpAsState(
targetValue = if (checked) {
targetValue = if (isChecked) {
if (!enabled) 26.dp else if (isPressed || isDragged || isHovered) 24.dp else 26.dp
} else {
if (!enabled) 4.dp else if (isPressed || isDragged || isHovered) 3.dp else 4.dp
Expand All @@ -100,11 +101,11 @@ fun Switch(
)

val thumbColor by animateColorAsState(
if (checked) colors.checkedThumbColor(enabled) else colors.uncheckedThumbColor(enabled)
if (isChecked) colors.checkedThumbColor(enabled) else colors.uncheckedThumbColor(enabled)
)

val backgroundColor by animateColorAsState(
if (checked) colors.checkedTrackColor(enabled) else colors.uncheckedTrackColor(enabled),
if (isChecked) colors.checkedTrackColor(enabled) else colors.uncheckedTrackColor(enabled),
animationSpec = tween(durationMillis = 200)
)

Expand Down Expand Up @@ -142,16 +143,16 @@ fun Switch(
} while (event.changes.all { it.pressed })

if (validHorizontalDrag && !isPressed && !isDragged) {
currentOnCheckedChange?.invoke(!checked)
currentOnCheckedChange?.invoke(!isChecked)
hapticFeedback.performHapticFeedback(
if (checked) HapticFeedbackType.ToggleOff
if (isChecked) HapticFeedbackType.ToggleOff
else HapticFeedbackType.ToggleOn
)
}
}
}
.toggleable(
value = checked,
value = isChecked,
onValueChange = {
if (currentOnCheckedChange == null) return@toggleable
currentOnCheckedChange?.invoke(it)
Expand Down Expand Up @@ -201,11 +202,11 @@ fun Switch(
hasVibratedOnce = false
},
onDragEnd = {
if (dragOffset.absoluteValue > 21f / 2) currentOnCheckedChange?.invoke(!checked)
if (dragOffset.absoluteValue > 21f / 2) currentOnCheckedChange?.invoke(!isChecked)
if (!hasVibratedOnce && dragOffset.absoluteValue >= 1f) {
if ((checked && dragOffset <= -11f) || (!checked && dragOffset <= 10f)) {
if ((isChecked && dragOffset <= -11f) || (!isChecked && dragOffset <= 10f)) {
hapticFeedback.performHapticFeedback(HapticFeedbackType.ToggleOff)
} else if ((checked && dragOffset >= -10f) || (!checked && dragOffset >= 11f)) {
} else if ((isChecked && dragOffset >= -10f) || (!isChecked && dragOffset >= 11f)) {
hapticFeedback.performHapticFeedback(HapticFeedbackType.ToggleOn)
}
}
Expand All @@ -218,18 +219,18 @@ fun Switch(
}
) { _, dragAmount ->
dragOffset = (dragOffset + dragAmount / 2).let {
if (checked) it.coerceIn(-21f, 0f) else it.coerceIn(0f, 21f)
if (isChecked) it.coerceIn(-21f, 0f) else it.coerceIn(0f, 21f)
}
if (dragOffset in -11f..-10f || dragOffset in 10f..11f) {
hasVibratedOnce = false
} else if (dragOffset in -20f..-1f || dragOffset in 1f..20f) {
hasVibrated = false
} else if (!hasVibrated) {
if ((checked && dragOffset == -21f) || (!checked && dragOffset == 0f)) {
if ((isChecked && dragOffset == -21f) || (!isChecked && dragOffset == 0f)) {
hapticFeedback.performHapticFeedback(HapticFeedbackType.ToggleOff)
hasVibrated = true
hasVibratedOnce = true
} else if ((checked && dragOffset == 0f) || (!checked && dragOffset == 21f)) {
} else if ((isChecked && dragOffset == 0f) || (!isChecked && dragOffset == 21f)) {
hapticFeedback.performHapticFeedback(HapticFeedbackType.ToggleOn)
hasVibrated = true
hasVibratedOnce = true
Expand Down
Loading