fix: WeekPicker logic (#664)

* fix: weekpicker

* test: update testcase

* test: update testcase

* test: rm block test

Author: zombieJ

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!)
   );
 }

tests/keyboard.spec.tsx

@@ -478,7 +478,7 @@ describe('Picker.Keyboard', () => {
           showTime
           onSelect={onSelect}
           onChange={onChange}
-          disabledDate={date => date.date() % 2 === 0}
+          disabledDate={(date) => date.date() % 2 === 0}
         />,
       );
       wrapper.find('input').simulate('focus');
@@ -509,7 +509,7 @@ describe('Picker.Keyboard', () => {
         <MomentPickerPanel
           onSelect={onSelect}
           onChange={onChange}
-          disabledDate={date => date.date() % 2 === 0}
+          disabledDate={(date) => date.date() % 2 === 0}
         />,
       );
 
@@ -541,7 +541,7 @@ describe('Picker.Keyboard', () => {
           picker="month"
           onSelect={onSelect}
           onChange={onChange}
-          disabledDate={date => date.month() < now.getMonth()}
+          disabledDate={(date) => date.month() < now.getMonth()}
         />,
       );
 

tests/panel.spec.tsx

@@ -6,6 +6,7 @@ import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
 import { mount, getMoment, isSame, MomentPickerPanel } from './util/commonUtil';
 import zhCN from '../src/locale/zh_CN';
 import enUS from '../src/locale/en_US';
+import { fireEvent, render } from '@testing-library/react';
 
 describe('Picker.Panel', () => {
   beforeAll(() => {
@@ -569,4 +570,18 @@ describe('Picker.Panel', () => {
       });
     });
   });
+
+  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();
+  });
 });

tests/picker.spec.tsx

@@ -133,7 +133,7 @@ describe('Picker.Basic', () => {
         act(() => {
           fireEvent.mouseDown(document.body);
         });
-        expect(onOpenChange).toHaveBeenCalledTimes(1);
+        expect(onOpenChange).toHaveBeenCalledTimes(i + 1);
       }
       act(() => {
         jest.runAllTimers();