optimize picker/date-picker #210

ant-design · Sep 13, 2016 · adb5a45 · adb5a45
1 parent 1f0dcc4
commit adb5a45
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/components/date-picker/PropsType.tsx b/components/date-picker/PropsType.tsx
@@ -15,6 +15,8 @@ interface DatePickerProps {
   prefixCls?: string;
   pickerPrefixCls?: string;
   popupPrefixCls?: string;
+  dismissText?: string|React.ReactElement<any>; // React.ReactElement only for web
+  okText?: string|React.ReactElement<any>; // React.ReactElement only for web
 }
 
 export default DatePickerProps;
diff --git a/components/date-picker/index.web.tsx b/components/date-picker/index.web.tsx
@@ -19,7 +19,7 @@ export default class DatePicker extends React.Component<tsPropsType, any> {
 
   render() {
     const { props } = this;
-    const { children, extra, value, defaultDate } = props;
+    const { children, value, defaultDate, extra, okText, dismissText, popupPrefixCls } = props;
     const extraProps = {
       extra: value ? formatFn(this, value) : extra,
     };
@@ -37,12 +37,14 @@ export default class DatePicker extends React.Component<tsPropsType, any> {
     return (
       <PopupDatePicker
         datePicker={dataPicker}
-        {...props}
-        prefixCls={props.popupPrefixCls}
         WrapComponent="div"
         transitionName="am-slide-up"
         maskTransitionName="am-fade"
+        {...props}
+        prefixCls={popupPrefixCls}
         date={value || defaultDate}
+        dismissText={<span className={`${popupPrefixCls}-header-cancel-button`}>{dismissText}</span>}
+        okText={<span className={`${popupPrefixCls}-header-ok-button`}>{okText}</span>}
       >
         {React.cloneElement(children,
           children.type && children.type.myName === 'ListItem' ? extraProps : {})}

diff --git a/components/picker/index.web.tsx b/components/picker/index.web.tsx
@@ -43,7 +43,7 @@ export default class Picker extends React.Component<tsPropsType, any> {
 
   render() {
     const {props} = this;
-    const {children, value, okText, dismissText, title, extra, popupPrefixCls} = props;
+    const {children, value, extra, okText, dismissText, popupPrefixCls} = props;
     const extraProps = {
       extra: this.getSel() || extra,
     };
@@ -63,10 +63,9 @@ export default class Picker extends React.Component<tsPropsType, any> {
         WrapComponent="div"
         transitionName="am-slide-up"
         maskTransitionName="am-fade"
-        {...this.props}
+        {...props}
         prefixCls={popupPrefixCls}
         value={value}
-        title={title}
         dismissText={<span className={`${popupPrefixCls}-header-cancel-button`}>{dismissText}</span>}
         okText={<span className={`${popupPrefixCls}-header-ok-button`}>{okText}</span>}
       >

diff --git a/components/picker/style/picker.less b/components/picker/style/picker.less
@@ -24,6 +24,9 @@
     white-space: nowrap;
     text-overflow: ellipsis;
     direction: rtl;
+    &-selected {
+      font-size: @font-size-heading;
+    }
   }
 
   &-mask {