xfy/yayacal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert 跨月周选中逻辑的两个提交，重新设计

Browse Source
This commit is contained in:
meyou 2026-05-16 13:28:29 +08:00
parent 857cf88cb0
commit 09e13e335c
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthView.kt
View File

@ -179,21 +179,9 @@ fun CalendarMonthView(
today = today,
onDateClick = { date -> viewModel.selectDate(date) },
onWeekChanged = { weekMonday ->
// 优先选中当周内的今天，否则选中该周周一
val weekSunday = weekMonday.plus(DatePeriod(days = 6))
val date = when {
today in weekMonday..weekSunday -> today
weekMonday.month != weekSunday.month -> {
if (weekMonday < viewModel.selectedDate) {
// 后退到跨月周（如从5月回到4月27-5月3）：选较晚月份1号
@Suppress("DEPRECATION") // monthNumber 无替代 API
LocalDate(weekSunday.year, weekSunday.month.number, 1)
} else {
// 前进到跨月周（如从4月前进到4月27-5月3）：选该周周一
weekMonday
}
}
else -> weekMonday
}
val date = if (today in weekMonday..weekSunday) today else weekMonday
viewModel.selectDate(date)
},
modifier = pagerModifier