Merge branch 'master' of github.com:ant-design/ant-design

This commit is contained in:
afc163 2016-11-15 15:21:51 +08:00
commit aa635b9132
2 changed files with 3 additions and 12 deletions

View File

@ -24,8 +24,4 @@ const Group: React.StatelessComponent<GroupProps> = (props) => {
);
};
Group.propTypes = {
children: React.PropTypes.any,
};
export default Group;

View File

@ -85,16 +85,12 @@ export default class Input extends Component<InputProps, any> {
nextFrameActionId: number;
refs: {
[key: string]: any;
input: any;
};
constructor(props) {
super(props);
this.state = {
textareaStyles: null,
};
}
state = {
textareaStyles: null,
};
componentDidMount() {
this.resizeTextarea();
@ -173,7 +169,6 @@ export default class Input extends Component<InputProps, any> {
renderInput() {
const props = assign({}, this.props);
// Fix https://fb.me/react-unknown-prop
const otherProps = omit(this.props, [
'prefixCls',