From f7e480ad53a52287ed4b69fc5d05fc732ab72593 Mon Sep 17 00:00:00 2001
From: Benjy Cui <benjytrys@gmail.com>
Date: Fri, 28 Oct 2016 10:10:02 +0800
Subject: [PATCH] feat: add DatePicker[allowClear], close: #3618

---
 components/date-picker/RangePicker.tsx  | 3 ++-
 components/date-picker/createPicker.tsx | 5 +++--
 components/date-picker/index.tsx        | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/components/date-picker/RangePicker.tsx b/components/date-picker/RangePicker.tsx
index a664c04909..bcc6693f36 100644
--- a/components/date-picker/RangePicker.tsx
+++ b/components/date-picker/RangePicker.tsx
@@ -8,6 +8,7 @@ import Icon from '../icon';
 export default class RangePicker extends React.Component<any, any> {
   static defaultProps = {
     prefixCls: 'ant-calendar',
+    allowClear: true,
   };
 
   constructor(props) {
@@ -85,7 +86,7 @@ export default class RangePicker extends React.Component<any, any> {
       />
     );
 
-    const clearIcon = (!props.disabled && state.value && (state.value[0] || state.value[1]))
+    const clearIcon = (!props.disabled && props.allowClear && state.value && (state.value[0] || state.value[1]))
       ? <Icon
         type="cross-circle"
         className={`${prefixCls}-picker-clear`}
diff --git a/components/date-picker/createPicker.tsx b/components/date-picker/createPicker.tsx
index fff4062f5c..fb06424a2b 100644
--- a/components/date-picker/createPicker.tsx
+++ b/components/date-picker/createPicker.tsx
@@ -14,10 +14,11 @@ export interface PickerProps {
 
 export default function createPicker(TheCalendar) {
   // use class typescript error
-  const CalenderWrapper = React.createClass({
+  const CalenderWrapper = React.createClass<any, any>({
     getDefaultProps() {
       return {
         prefixCls: 'ant-calendar',
+        allowClear: true,
       };
     },
 
@@ -128,7 +129,7 @@ export default function createPicker(TheCalendar) {
         pickerStyle.width = 180;
       }
 
-      const clearIcon = (!props.disabled && this.state.value) ?
+      const clearIcon = (!props.disabled && props.allowClear && this.state.value) ?
         <Icon type="cross-circle"
           className={`${prefixCls}-picker-clear`}
           onClick={this.clearSelection}
diff --git a/components/date-picker/index.tsx b/components/date-picker/index.tsx
index ea8188a38d..e34a5ffbc2 100755
--- a/components/date-picker/index.tsx
+++ b/components/date-picker/index.tsx
@@ -10,15 +10,16 @@ import Calendar from './Calendar';
 import { TimePickerProps } from '../time-picker';
 
 export interface PickerProps {
+  prefixCls?: string;
+  inputPrefixCls?: string;
   format?: string;
   disabled?: boolean;
+  allowClear?: boolean;
   style?: React.CSSProperties;
   popupStyle?: React.CSSProperties;
   locale?: any;
   size?: 'large' | 'small' | 'default';
   getCalendarContainer?: (trigger: any) => React.ReactNode;
-  prefixCls?: string;
-  inputPrefixCls?: string;
 }
 
 export interface SinglePickerProps {