From 1319d555421b87b3041e3a90f5d949064b94952a Mon Sep 17 00:00:00 2001
From: NgChiKin <ng_chikin@163.com>
Date: Thu, 4 Nov 2021 10:46:33 +0800
Subject: [PATCH 1/2] fix: shows current week as selected in correct year

---
 src/utils/dateUtil.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/utils/dateUtil.ts b/src/utils/dateUtil.ts
index 677d73416..d84aaa3b1 100644
--- a/src/utils/dateUtil.ts
+++ b/src/utils/dateUtil.ts
@@ -125,6 +125,7 @@ export function isSameWeek<DateType>(
   }
 
   return (
+    isSameYear(generateConfig, date1!, date2!) &&
     generateConfig.locale.getWeek(locale, date1!) === generateConfig.locale.getWeek(locale, date2!)
   );
 }

From 377cf69710369ca30b04f83a546a6f2d7131cba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 <smith3816@gmail.com>
Date: Tue, 25 Jul 2023 17:20:32 +0800
Subject: [PATCH 2/2] test: add test case

---
 tests/panel.spec.tsx | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/panel.spec.tsx b/tests/panel.spec.tsx
index a5a3b5ad6..e3415739b 100644
--- a/tests/panel.spec.tsx
+++ b/tests/panel.spec.tsx
@@ -682,4 +682,18 @@ describe('Picker.Panel', () => {
       expect(container).toMatchSnapshot();
     });
   });
+
+  it('week picker current should check year', () => {
+    const { container } = render(
+      <MomentPickerPanel picker="week" value={getMoment('1990-09-03')} />,
+    );
+    expect(
+      container.querySelector('.rc-picker-week-panel-row-selected td[title="1990-09-03"]'),
+    ).toBeTruthy();
+
+    // Diff year
+    fireEvent.click(container.querySelector('.rc-picker-header-super-next-btn'));
+    expect(container.querySelector('td[title="1991-09-03"]')).toBeTruthy();
+    expect(container.querySelector('.rc-picker-week-panel-row-selected')).toBeFalsy();
+  });
 });