cascader: suffix -> suffixIcon

sunjianqing · Sep 21, 2018 · 2d4a6db · 2d4a6db
1 parent 784984d
commit 2d4a6db
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/components/cascader/demo/suffix.md b/components/cascader/demo/suffix.md
@@ -48,13 +48,13 @@ function onChange(value) {
 ReactDOM.render(
   <div>
     <Cascader
-      suffix={<Icon type="smile" />}
+      suffixIcon={<Icon type="smile" />}
       options={options}
       onChange={onChange}
       placeholder="Please select"
     />
     <Cascader
-      suffix="ab"
+      suffixIcon="ab"
       style={{ marginTop: '1rem' }}
       options={options}
       onChange={onChange}

diff --git a/components/cascader/index.en-US.md b/components/cascader/index.en-US.md
@@ -40,7 +40,7 @@ Cascade selection box.
 | showSearch | Whether show search input in single mode. | boolean\|object | false |
 | size | input size, one of `large` `default` `small` | string | `default` |
 | style | additional style | string | - |
-| suffix | The custom suffix icon | ReactNode | - |
+| suffixIcon | The custom suffix icon | ReactNode | - |
 | value | selected value | string\[] | - |
 | onChange | callback when finishing cascader select | `(value, selectedOptions) => void` | - |
 | onPopupVisibleChange | callback when popup shown or hidden | `(value) => void` | - |

diff --git a/components/cascader/index.tsx b/components/cascader/index.tsx
@@ -83,7 +83,7 @@ export interface CascaderProps {
   getPopupContainer?: (triggerNode?: HTMLElement) => HTMLElement;
   popupVisible?: boolean;
   fieldNames?: FieldNamesType;
-  suffix?: React.ReactNode;
+  suffixIcon?: React.ReactNode;
 }
 
 export interface CascaderState {
@@ -342,7 +342,7 @@ export default class Cascader extends React.Component<CascaderProps, CascaderSta
     const { props, state } = this;
     const {
       prefixCls, inputPrefixCls, children, placeholder, size, disabled,
-      className, style, allowClear, showSearch = false, suffix, ...otherProps
+      className, style, allowClear, showSearch = false, suffixIcon, ...otherProps
     } = props;
     const { value, inputFocused } = state;
 
@@ -415,17 +415,17 @@ export default class Cascader extends React.Component<CascaderProps, CascaderSta
       dropdownMenuColumnStyle.width = this.input.input.offsetWidth;
     }
 
-    const inputIcon = suffix && (
-      React.isValidElement<{ className?: string }>(suffix)
+    const inputIcon = suffixIcon && (
+      React.isValidElement<{ className?: string }>(suffixIcon)
         ? React.cloneElement(
-          suffix,
+          suffixIcon,
           {
             className: classNames({
-              [suffix.props.className!]: suffix.props.className,
+              [suffixIcon.props.className!]: suffixIcon.props.className,
               [`${prefixCls}-picker-arrow`]: true,
             }),
           },
-        ) : <span className={`${prefixCls}-picker-arrow`}>{suffix}</span>) || (
+        ) : <span className={`${prefixCls}-picker-arrow`}>{suffixIcon}</span>) || (
         <Icon type="down" className={arrowCls} />
       );
 

diff --git a/components/cascader/index.zh-CN.md b/components/cascader/index.zh-CN.md
@@ -41,7 +41,7 @@ subtitle: 级联选择
 | showSearch | 在选择框中显示搜索框 | boolean | false |
 | size | 输入框大小，可选 `large` `default` `small` | string | `default` |
 | style | 自定义样式 | string | - |
-| suffix | 自定义的选择框后缀图标 | ReactNode | - |
+| suffixIcon | 自定义的选择框后缀图标 | ReactNode | - |
 | value | 指定选中项 | string\[] | - |
 | onChange | 选择完成后的回调 | `(value, selectedOptions) => void` | - |
 | onPopupVisibleChange | 显示/隐藏浮层的回调 | `(value) => void` | - |