From 295d4dbcde55449baa4c3a181315edca6ca9c088 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?= Date: Wed, 13 Nov 2024 17:18:17 +0800 Subject: [PATCH 1/2] fix: year lock --- docs/examples/debug.tsx | 8 +++++++- src/PickerPanel/DecadePanel/index.tsx | 2 +- src/PickerPanel/YearPanel/index.tsx | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/examples/debug.tsx b/docs/examples/debug.tsx index fb459c797..9aadb22e5 100644 --- a/docs/examples/debug.tsx +++ b/docs/examples/debug.tsx @@ -83,7 +83,13 @@ export default () => { // }} /> - + {/* ( const [info] = useInfo(props, 'decade'); const getStartYear = (date: DateType) => { - const startYear = Math.floor(generateConfig.getYear(pickerValue) / 100) * 100; + const startYear = Math.floor(generateConfig.getYear(date) / 100) * 100; return generateConfig.setYear(date, startYear); }; const getEndYear = (date: DateType) => { diff --git a/src/PickerPanel/YearPanel/index.tsx b/src/PickerPanel/YearPanel/index.tsx index fad63562a..71b4a473b 100644 --- a/src/PickerPanel/YearPanel/index.tsx +++ b/src/PickerPanel/YearPanel/index.tsx @@ -23,7 +23,7 @@ export default function YearPanel( // ========================== Base ========================== const [info] = useInfo(props, 'year'); const getStartYear = (date: DateType) => { - const startYear = Math.floor(generateConfig.getYear(pickerValue) / 10) * 10; + const startYear = Math.floor(generateConfig.getYear(date) / 10) * 10; return generateConfig.setYear(date, startYear); }; const getEndYear = (date: DateType) => { From 6b27e5fbcc496281c2ae699ceedd73baface5236 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?= Date: Wed, 13 Nov 2024 17:26:41 +0800 Subject: [PATCH 2/2] test: add test case --- tests/new-range.spec.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/new-range.spec.tsx b/tests/new-range.spec.tsx index 97427cf69..41397ae44 100644 --- a/tests/new-range.spec.tsx +++ b/tests/new-range.spec.tsx @@ -1098,7 +1098,7 @@ describe('NewPicker.Range', () => { it('pass tabIndex', () => { const { container } = render(
- +
, ); @@ -1255,6 +1255,13 @@ describe('NewPicker.Range', () => { }); expect(onChange).toHaveBeenCalled(); }); + + it('should disabled super prev correctly', () => { + render(); + + // Expect super prev disabled + expect(document.querySelector('.rc-picker-header-super-prev-btn-disabled')).toBeDisabled(); + }); }); it('double click now button', () => {