diff --git a/components/hoc/ActivableRenderer.js b/components/hoc/ActivableRenderer.js index edb6455c..fe344ff2 100644 --- a/components/hoc/ActivableRenderer.js +++ b/components/hoc/ActivableRenderer.js @@ -28,13 +28,6 @@ const ActivableRendererFactory = (options = { delay: 500 }) => clearTimeout(this.unrenderTimeout); } - renderAndActivate() { - if (this.unrenderTimeout) clearTimeout(this.unrenderTimeout); - this.setState({ rendered: true, active: false }, () => { - this.activateTimeout = setTimeout(() => this.setState({ active: true }), 20); - }); - } - deactivateAndUnrender() { this.setState({ rendered: true, active: false }, () => { this.unrenderTimeout = setTimeout(() => { @@ -44,6 +37,13 @@ const ActivableRendererFactory = (options = { delay: 500 }) => }); } + renderAndActivate() { + if (this.unrenderTimeout) clearTimeout(this.unrenderTimeout); + this.setState({ rendered: true, active: false }, () => { + this.activateTimeout = setTimeout(() => this.setState({ active: true }), 20); + }); + } + render() { const { delay, ...others } = this.props; // eslint-disable-line no-unused-vars const { active, rendered } = this.state; diff --git a/components/snackbar/Snackbar.js b/components/snackbar/Snackbar.js index bf355644..64c44d01 100644 --- a/components/snackbar/Snackbar.js +++ b/components/snackbar/Snackbar.js @@ -19,7 +19,7 @@ const factory = (Button) => { PropTypes.element, ]), onClick: PropTypes.func, - onTimeout: PropTypes.func, + onTimeout: PropTypes.func, // eslint-disable-line theme: PropTypes.shape({ accept: PropTypes.string, active: PropTypes.string, diff --git a/components/tabs/TabContent.js b/components/tabs/TabContent.js index c86f6f4c..8aa06b48 100644 --- a/components/tabs/TabContent.js +++ b/components/tabs/TabContent.js @@ -4,7 +4,7 @@ import classnames from 'classnames'; import { themr } from 'react-css-themr'; import { TABS } from '../identifiers'; -class TabContent extends Component { +class TabContent extends Component { // eslint-disable-line react/prefer-stateless-function static propTypes = { active: PropTypes.bool, children: PropTypes.node,