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

fix(shift): subscribe shiftPattern to trigger recomposition on refresh

Browse Source
This commit is contained in:
xfy 2026-07-06 19:09:26 +08:00
parent a5795b16dc
commit 32d66f0a42
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/kotlin/plus/rua/project/ui/CalendarMonthView.kt
View File

@ -142,6 +142,7 @@ fun CalendarMonthView(
val today = remember { Clock.System.todayIn(TimeZone.currentSystemDefault()) } val today = remember { Clock.System.todayIn(TimeZone.currentSystemDefault()) }
val uiState by viewModel.uiState.collectAsState() val uiState by viewModel.uiState.collectAsState()
val shiftPattern by viewModel.shiftPattern.collectAsState()
val selectedDate = uiState.selectedDate val selectedDate = uiState.selectedDate
val currentYear = selectedDate.year val currentYear = selectedDate.year
val currentMonth = selectedDate.month.number val currentMonth = selectedDate.month.number
@ -270,7 +271,7 @@ fun CalendarMonthView(
viewModel.selectDate(date) viewModel.selectDate(date)
} }
} }
val shiftKindAt = remember(viewModel) { val shiftKindAt = remember(viewModel, shiftPattern) {
{ date: LocalDate -> viewModel.shiftKindAt(date) } { date: LocalDate -> viewModel.shiftKindAt(date) }
} }
val onRowHeightMeasured = remember { val onRowHeightMeasured = remember {
@ -626,6 +627,7 @@ private fun BottomCardArea(
val shouldShow = hasLoaded val shouldShow = hasLoaded
val uiState by viewModel.uiState.collectAsState() val uiState by viewModel.uiState.collectAsState()
val shiftPattern by viewModel.shiftPattern.collectAsState()
val shiftKind = viewModel.shiftKindAt(uiState.selectedDate) val shiftKind = viewModel.shiftKindAt(uiState.selectedDate)
if (shouldShow) { if (shouldShow) {