From ce7b5a7c5db381a4a507e2b12e9bcb3c3b8f8a35 Mon Sep 17 00:00:00 2001 From: tangwenhui Date: Sun, 6 Nov 2022 18:18:41 +0800 Subject: [PATCH 1/4] feat: update picker version --- components/date-picker/demo/select-in-range.md | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/date-picker/demo/select-in-range.md b/components/date-picker/demo/select-in-range.md index 25a6e5de608f..66ac734582b5 100644 --- a/components/date-picker/demo/select-in-range.md +++ b/components/date-picker/demo/select-in-range.md @@ -50,6 +50,7 @@ const App: React.FC = () => { onCalendarChange={val => setDates(val)} onChange={val => setValue(val)} onOpenChange={onOpenChange} + onBlur={() => console.log('blur has been triggered')} /> ); }; diff --git a/package.json b/package.json index bbc1f808dede..8dd152bef890 100644 --- a/package.json +++ b/package.json @@ -139,7 +139,7 @@ "rc-motion": "^2.6.1", "rc-notification": "~4.6.0", "rc-pagination": "~3.2.0", - "rc-picker": "~2.6.11", + "rc-picker": "^2.7.0", "rc-progress": "~3.4.1", "rc-rate": "~2.9.0", "rc-resize-observer": "^1.2.0", From 5ef5dcd61223f1540742e06276f11d9c11bb07ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kiner-tang=28=E6=96=87=E8=BE=89=29?= <1127031143@qq.com> Date: Sun, 6 Nov 2022 18:23:51 +0800 Subject: [PATCH 2/4] Update package.json Co-authored-by: afc163 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8dd152bef890..99fac19a168c 100644 --- a/package.json +++ b/package.json @@ -139,7 +139,7 @@ "rc-motion": "^2.6.1", "rc-notification": "~4.6.0", "rc-pagination": "~3.2.0", - "rc-picker": "^2.7.0", + "rc-picker": "~2.7.0", "rc-progress": "~3.4.1", "rc-rate": "~2.9.0", "rc-resize-observer": "^1.2.0", From 5af775ba28a9ce012456bb74e36afa95b8763616 Mon Sep 17 00:00:00 2001 From: tangwenhui Date: Sun, 6 Nov 2022 18:43:16 +0800 Subject: [PATCH 3/4] feat: update test case --- tests/shared/focusTest.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/shared/focusTest.tsx b/tests/shared/focusTest.tsx index b92ec0d0b107..c200fa9b63e0 100644 --- a/tests/shared/focusTest.tsx +++ b/tests/shared/focusTest.tsx @@ -110,7 +110,7 @@ export default function focusTest( expect(blurred).toBeTruthy(); fireEvent.blur(getElement(container)); - await sleep(0); + await sleep(110); expect(onBlur).toHaveBeenCalled(); }); From 5d5c0513b1a59927423d87066f16e89d6d1a7514 Mon Sep 17 00:00:00 2001 From: tangwenhui Date: Sun, 6 Nov 2022 20:07:18 +0800 Subject: [PATCH 4/4] feat: RangePicker blurDelay --- components/date-picker/__tests__/RangePicker.test.tsx | 2 +- tests/shared/focusTest.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/date-picker/__tests__/RangePicker.test.tsx b/components/date-picker/__tests__/RangePicker.test.tsx index 13f25f9da440..aca3b3ac3ff5 100644 --- a/components/date-picker/__tests__/RangePicker.test.tsx +++ b/components/date-picker/__tests__/RangePicker.test.tsx @@ -11,7 +11,7 @@ import { closePicker, openPicker, selectCell } from './utils'; const { RangePicker } = DatePicker; describe('RangePicker', () => { - focusTest(RangePicker, { refFocus: true }); + focusTest(RangePicker, { refFocus: true, blurDelay: 110 }); beforeEach(() => { setMockDate(); diff --git a/tests/shared/focusTest.tsx b/tests/shared/focusTest.tsx index c200fa9b63e0..aff5df822228 100644 --- a/tests/shared/focusTest.tsx +++ b/tests/shared/focusTest.tsx @@ -4,7 +4,7 @@ import { sleep, render, fireEvent } from '../utils'; // eslint-disable-next-line jest/no-export export default function focusTest( Component: React.ComponentType, - { refFocus = false, testLib = false } = {}, + { refFocus = false, testLib = false, blurDelay = 0 } = {}, ) { describe('focus and blur', () => { let focused = false; @@ -110,7 +110,7 @@ export default function focusTest( expect(blurred).toBeTruthy(); fireEvent.blur(getElement(container)); - await sleep(110); + await sleep(blurDelay); expect(onBlur).toHaveBeenCalled(); });