Merge branch 'develop'

glennflanagan · Feb 25, 2019 · cce5b4b · cce5b4b
2 parents 5f848bb + 6217f06
commit cce5b4b
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/Collapsible.js b/src/Collapsible.js
@@ -5,6 +5,8 @@ class Collapsible extends Component {
   constructor(props) {
     super(props)
 
+    this.timeout = undefined;
+
     // Bind class methods
     this.handleTriggerClick = this.handleTriggerClick.bind(this);
     this.handleTransitionEnd = this.handleTransitionEnd.bind(this);
@@ -41,7 +43,8 @@ class Collapsible extends Component {
     }
 
     if (prevState.height === 'auto' && this.state.shouldSwitchAutoOnNextCycle === true) {
-      window.setTimeout(() => { // Set small timeout to ensure a true re-render
+      window.clearTimeout(this.timeout);
+      this.timeout = window.setTimeout(() => { // Set small timeout to ensure a true re-render
         this.setState({
           height: 0,
           overflow: 'hidden',
@@ -62,6 +65,10 @@ class Collapsible extends Component {
       }
     }
   }
+
+  componentWillUnmount () {
+    window.clearTimeout(this.timeout);
+  }
 
   closeCollapsible() {
     this.setState({
@@ -92,11 +99,12 @@ class Collapsible extends Component {
   }
 
   handleTriggerClick(event) {
-    event.preventDefault();
-
     if (this.props.triggerDisabled) {
       return
     }
+
+    event.preventDefault();
+
 
     if (this.props.handleTriggerClick) {
       this.props.handleTriggerClick(this.props.accordionPosition);
@@ -139,7 +147,7 @@ class Collapsible extends Component {
   }
 
   render() {
-    var dropdownStyle = {
+    const dropdownStyle = {
       height: this.state.height,
       WebkitTransition: this.state.transition,
       msTransition: this.state.transition,