From 2b728d281815bcdc06e3fa3f02da3f2117e9a900 Mon Sep 17 00:00:00 2001 From: zombiej Date: Sun, 8 Mar 2020 19:26:25 +0800 Subject: [PATCH 1/2] add clear --- src/Picker.tsx | 4 ++++ src/RangePicker.tsx | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/Picker.tsx b/src/Picker.tsx index dd7e00854..975e0c41e 100644 --- a/src/Picker.tsx +++ b/src/Picker.tsx @@ -405,6 +405,10 @@ function InnerPicker(props: PickerProps) { onMouseDown={e => { e.preventDefault(); e.stopPropagation(); + }} + onMouseUp={e => { + e.preventDefault(); + e.stopPropagation(); triggerChange(null); triggerOpen(false, true); }} diff --git a/src/RangePicker.tsx b/src/RangePicker.tsx index 4b289feeb..c8968c927 100644 --- a/src/RangePicker.tsx +++ b/src/RangePicker.tsx @@ -907,6 +907,10 @@ function InnerRangePicker(props: RangePickerProps) { onMouseDown={e => { e.preventDefault(); e.stopPropagation(); + }} + onMouseUp={e => { + e.preventDefault(); + e.stopPropagation(); let values = mergedValue; if (!mergedDisabled[0]) { From 0b5be6ffa4677bb493db00a4adc93193254b353e Mon Sep 17 00:00:00 2001 From: zombiej Date: Sun, 8 Mar 2020 19:28:17 +0800 Subject: [PATCH 2/2] fix test case --- tests/setup.js | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/setup.js b/tests/setup.js index b340fcf68..ae08bc0b1 100644 --- a/tests/setup.js +++ b/tests/setup.js @@ -74,6 +74,7 @@ Object.assign(Enzyme.ReactWrapper.prototype, { }, clearValue() { this.find('.rc-picker-clear-btn').simulate('mouseDown'); + this.find('.rc-picker-clear-btn').simulate('mouseUp'); }, keyDown(which, info = {}, index = 0) { this.find('input')