Fix Input className to wrapper, close #6809

components/auto-complete/demo/antd.md

@@ -14,7 +14,8 @@ title:
 Customize Input Component
 
 ````jsx
-import { AutoComplete } from 'antd';
+import { AutoComplete, Input } from 'antd';
+const { TextArea } = Input;
 
 function onSelect(value) {
   console.log('onSelect', value);
@@ -49,7 +50,7 @@ class Complete extends React.Component {
         onSearch={this.handleSearch}
         placeholder="input here"
       >
-        <textarea onKeyPress={this.handleKeyPress} style={{ height: 50 }} />
+        <TextArea onKeyPress={this.handleKeyPress} style={{ height: 50 }} />
       </AutoComplete>
     );
   }

components/auto-complete/index.tsx

@@ -50,15 +50,9 @@ export default class AutoComplete extends React.Component<AutoCompleteProps, any
   getInputElement = () => {
     const { children } = this.props;
     const element = children && React.isValidElement(children) && children.type !== Option ?
-      React.Children.only(this.props.children) :
+      React.Children.only(this.props.children) : <Input />;
-      <Input/>;
     return (
-      <InputElement
+      <InputElement {...element.props}>{element}</InputElement>
-        {...element.props}
-        className={classNames('ant-input', element.props.className)}
-      >
-        {element}
-      </InputElement>
     );
   }
 

components/input/Input.tsx

@@ -100,6 +100,15 @@ export default class Input extends Component<InputProps, any> {
     this.refs.input.blur();
   }
 
+  getInputClassName() {
+    const { prefixCls, size, disabled } = this.props;
+    return classNames(prefixCls, {
+      [`${prefixCls}-sm`]: size === 'small',
+      [`${prefixCls}-lg`]: size === 'large',
+      [`${prefixCls}-disabled`]: disabled,
+    });
+  }
+
   renderLabeledInput(children) {
     const props = this.props;
     // Not wrap when there is not addons
@@ -169,20 +178,21 @@ export default class Input extends Component<InputProps, any> {
     ) : null;
 
     return (
-      <span className={`${props.prefixCls}-affix-wrapper`} style={props.style}>
+      <span
+        className={classNames(props.className, `${props.prefixCls}-affix-wrapper`)}
+        style={props.style}
+      >
         {prefix}
-        {cloneElement(children, { style: null })}
+        {cloneElement(children, { style: null, className: this.getInputClassName() })}
         {suffix}
       </span>
     );
   }
 
   renderInput() {
-    const props = {
+    const { value, className } = this.props;
-      ...this.props,
-    };
     // Fix https://fb.me/react-unknown-prop
-    const otherProps = omit(props, [
+    const otherProps = omit(this.props, [
       'prefixCls',
       'onPressEnter',
       'addonBefore',
@@ -191,15 +201,8 @@ export default class Input extends Component<InputProps, any> {
       'suffix',
     ]);
 
-    const prefixCls = props.prefixCls;
+    if ('value' in this.props) {
-    const inputClassName = classNames(prefixCls, props.className, {
+      otherProps.value = fixControlledValue(value);
-      [`${prefixCls}-sm`]: props.size === 'small',
-      [`${prefixCls}-lg`]: props.size === 'large',
-      [`${prefixCls}-disabled`]: props.disabled,
-    });
-
-    if ('value' in props) {
-      otherProps.value = fixControlledValue(props.value);
       // Input elements must be either controlled or uncontrolled,
       // specify either the value prop, or the defaultValue prop, but not both.
       delete otherProps.defaultValue;
@@ -207,7 +210,7 @@ export default class Input extends Component<InputProps, any> {
     return this.renderLabeledIcon(
       <input
         {...otherProps}
-        className={inputClassName}
+        className={classNames(this.getInputClassName(), className)}
         onKeyDown={this.handleKeyDown}
         ref="input"
       />,