From 5d4ed89e83f1a4dfb1910eedd96d394f7d83c61b Mon Sep 17 00:00:00 2001
From: Kermit <kermitlx@outlook.com>
Date: Sun, 20 Sep 2020 17:08:58 +0800
Subject: [PATCH 1/2] fix: should can clear value when format is function

---
 src/Picker.tsx        |  8 ++++++--
 src/RangePicker.tsx   |  7 ++++++-
 src/utils/dateUtil.ts | 19 +++++++++++++++++++
 tests/picker.spec.tsx |  6 ++++++
 tests/range.spec.tsx  | 17 +++++++++++++++++
 5 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/src/Picker.tsx b/src/Picker.tsx
index 40321642e..f0980a324 100644
--- a/src/Picker.tsx
+++ b/src/Picker.tsx
@@ -22,7 +22,7 @@ import PickerPanel, {
   PickerPanelTimeProps,
 } from './PickerPanel';
 import PickerTrigger from './PickerTrigger';
-import { formatValue, isEqual } from './utils/dateUtil';
+import { formatValue, isEqual, parseValue } from './utils/dateUtil';
 import getDataOrAriaProps, { toArray } from './utils/miscUtil';
 import PanelContext, { ContextOperationRefProps } from './PanelContext';
 import { CustomFormat, PickerMode } from './interface';
@@ -225,7 +225,11 @@ function InnerPicker<DateType>(props: PickerProps<DateType>) {
   const [text, triggerTextChange, resetText] = useTextValueMapping({
     valueTexts,
     onTextChange: newText => {
-      const inputDate = generateConfig.locale.parse(locale.locale, newText, formatList as string[]);
+      const inputDate = parseValue(newText, {
+        locale,
+        formatList,
+        generateConfig,
+      });
       if (inputDate && (!disabledDate || !disabledDate(inputDate))) {
         setSelectedValue(inputDate);
       }
diff --git a/src/RangePicker.tsx b/src/RangePicker.tsx
index 5cbe6858d..f7268b1a3 100644
--- a/src/RangePicker.tsx
+++ b/src/RangePicker.tsx
@@ -19,6 +19,7 @@ import {
   isSameWeek,
   isSameQuarter,
   formatValue,
+  parseValue,
 } from './utils/dateUtil';
 import useValueTexts from './hooks/useValueTexts';
 import useTextValueMapping from './hooks/useTextValueMapping';
@@ -516,7 +517,11 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
   );
 
   const onTextChange = (newText: string, index: 0 | 1) => {
-    const inputDate = generateConfig.locale.parse(locale.locale, newText, formatList as string[]);
+    const inputDate = parseValue(newText, {
+      locale,
+      formatList,
+      generateConfig,
+    });
 
     const disabledFunc = index === 0 ? disabledStartDate : disabledEndDate;
 
diff --git a/src/utils/dateUtil.ts b/src/utils/dateUtil.ts
index 8d7a2f603..6181baad6 100644
--- a/src/utils/dateUtil.ts
+++ b/src/utils/dateUtil.ts
@@ -209,3 +209,22 @@ export function formatValue<DateType>(
     ? format(value)
     : generateConfig.locale.format(locale.locale, value, format);
 }
+
+export function parseValue<DateType>(
+  value: string,
+  {
+    generateConfig,
+    locale,
+    formatList,
+  }: {
+    generateConfig: GenerateConfig<DateType>;
+    locale: Locale;
+    formatList: Array<string | CustomFormat<DateType>>;
+  },
+) {
+  if (!value || formatList.some(item => typeof item === 'function')) {
+    return null;
+  }
+
+  return generateConfig.locale.parse(locale.locale, value, formatList as string[]);
+}
diff --git a/tests/picker.spec.tsx b/tests/picker.spec.tsx
index 7e5931b6c..92a44c488 100644
--- a/tests/picker.spec.tsx
+++ b/tests/picker.spec.tsx
@@ -729,6 +729,7 @@ describe('Picker.Basic', () => {
   it('custom format', () => {
     const wrapper = mount(
       <MomentPicker
+        allowClear
         defaultValue={getMoment('2020-09-17')}
         format={[(val: Moment) => `custom format:${val.format('YYYYMMDD')}`, 'YYYY-MM-DD']}
       />,
@@ -738,6 +739,11 @@ describe('Picker.Basic', () => {
     wrapper.selectCell(24);
     wrapper.closePicker();
     expect(wrapper.find('input').prop('value')).toEqual('custom format:20200924');
+
+    // clear
+    const clearNode = wrapper.find('.rc-picker-clear');
+    expect(clearNode.simulate.bind(clearNode, 'mouseUp')).not.toThrow();
+    expect(wrapper.find('input').prop('value')).toEqual('');
   });
 
   it('panelRender', () => {
diff --git a/tests/range.spec.tsx b/tests/range.spec.tsx
index d8c9e336f..3f4c1bcea 100644
--- a/tests/range.spec.tsx
+++ b/tests/range.spec.tsx
@@ -1256,6 +1256,7 @@ describe('Picker.Range', () => {
   it('custom format', () => {
     const wrapper = mount(
       <MomentRangePicker
+        allowClear
         format={[(val: Moment) => `custom format:${val.format('YYYYMMDD')}`, 'YYYY-MM-DD']}
         defaultValue={[getMoment('2020-09-17'), getMoment('2020-10-17')]}
       />,
@@ -1296,6 +1297,22 @@ describe('Picker.Range', () => {
         .last()
         .prop('value'),
     ).toEqual('custom format:20201024');
+
+    // clear
+    const clearNode = wrapper.find('.rc-picker-clear');
+    expect(clearNode.simulate.bind(clearNode, 'mouseUp')).not.toThrow();
+    expect(
+      wrapper
+        .find('input')
+        .first()
+        .prop('value'),
+    ).toEqual('');
+    expect(
+      wrapper
+        .find('input')
+        .last()
+        .prop('value'),
+    ).toEqual('');
   });
 
   describe('auto open', () => {

From 336c65a6767f87c127697417a08a2a0c15d133d6 Mon Sep 17 00:00:00 2001
From: Kermit <kermitlx@outlook.com>
Date: Sun, 20 Sep 2020 17:11:26 +0800
Subject: [PATCH 2/2] chore: parse value

---
 src/utils/dateUtil.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/dateUtil.ts b/src/utils/dateUtil.ts
index 6181baad6..3a718b31f 100644
--- a/src/utils/dateUtil.ts
+++ b/src/utils/dateUtil.ts
@@ -222,7 +222,7 @@ export function parseValue<DateType>(
     formatList: Array<string | CustomFormat<DateType>>;
   },
 ) {
-  if (!value || formatList.some(item => typeof item === 'function')) {
+  if (!value || typeof formatList[0] === 'function') {
     return null;
   }