fix: shows current week as selected in correct year (#313)

* fix: shows current week as selected in correct year * test: add test case --------- Co-authored-by: 二货机器人 <smith3816@gmail.com>
react-component · Jul 25, 2023 · ec9c4ad · ec9c4ad · vercel · Jul 25, 2023
1 parent c377ca0
commit ec9c4ad
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git 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!)
   );
 }

diff --git 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();
+  });
 });