From e403c683f6a6d3cb7d64ae7682e1cec192d7ebed Mon Sep 17 00:00:00 2001
From: meyou <2636699780@qq.com>
Date: Sat, 16 May 2026 12:24:12 +0800
Subject: [PATCH] Sync CalendarPager to selectedDate month when expanding from
 week view

---
 .../plus/rua/project/ui/CalendarMonthView.kt    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthView.kt b/shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthView.kt
index c24ae65..d805129 100644
--- a/shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthView.kt
+++ b/shared/src/commonMain/kotlin/plus/rua/project/ui/CalendarMonthView.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
@@ -60,6 +61,22 @@ fun CalendarMonthView(
 
     val pagerState = rememberPagerState(initialPage = START_PAGE, pageCount = { Int.MAX_VALUE })
 
+    // 展开时同步 CalendarPager 页面到 selectedDate 所在月份
+    LaunchedEffect(viewModel.isCollapsed) {
+        if (!viewModel.isCollapsed) {
+            @Suppress("DEPRECATION") // monthNumber 无替代 API
+            val targetPage = yearMonthToPage(
+                viewModel.selectedDate.year,
+                viewModel.selectedDate.month.number,
+                today.year,
+                today.month.number
+            )
+            if (targetPage != pagerState.currentPage) {
+                pagerState.scrollToPage(targetPage)
+            }
+        }
+    }
+
     val collapseProgress = viewModel.collapseProgress
     val headerHeightPx = monthHeaderHeightPx + weekdayHeaderHeightPx
     val rowPaddingPx = with(density) { ROW_PADDING_DP.dp.toPx() }.toInt()