Merge branch '1.x-stable' of github.com:ant-design/ant-design into 1.x-stable

This commit is contained in:
afc163 2016-07-25 19:31:12 +08:00
commit 47d273669d

View File

@ -52,12 +52,13 @@ export default class Spin extends React.Component {
}
componentWillReceiveProps(nextProps) {
const currentSpinning = this.getSpinning(this.props);
const spinning = this.getSpinning(nextProps);
if (this.debounceTimeout) {
clearTimeout(this.debounceTimeout);
}
if (spinning) {
this.debounceTimeout = setTimeout(() => this.setState({ spinning }), 250);
if (currentSpinning && !spinning) {
this.debounceTimeout = setTimeout(() => this.setState({ spinning }), 500);
} else {
this.setState({ spinning });
}