Release v4.5.0

Cancel termination animation if Loading Bar should be restarted

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Release History
 
+## 4.5.0
+  - Cancel termination animation if Loading Bar should be restarted
+
 ## 4.4.0
   - Update react-redux peer dependency requirement (contributed by @hugomn)
 

build/loading_bar.js

@@ -113,6 +113,14 @@ var LoadingBar = function (_Component) {
   }, {
     key: 'start',
     value: function start() {
+      // There could be previous termination animation going, so we need to
+      // cancel it and forcefully reset the Loading Bar before starting
+      // the progress simulation from 0
+      if (this.terminatingAnimationTimeoutId) {
+        clearTimeout(this.terminatingAnimationTimeoutId);
+        this.reset();
+      }
+
       var updateTime = this.props.updateTime;
 
       this.progressIntervalId = setInterval(this.simulateProgress, updateTime);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-redux-loading-bar",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "description": "Simple Loading Bar for Redux and React",
   "main": "build/index.js",
   "typings": "index.d.ts",

spec/loading_bar.js

@@ -280,6 +280,21 @@ describe('LoadingBar', () => {
       expect(wrapper.instance().progressIntervalId).toNotExist()
     })
 
+    it('resets progress if loading becomes 0 and another progress '
+       + 'started right away (loading > 0)', () => {
+      const wrapper = shallow(<LoadingBar />)
+      wrapper.setProps({ loading: 1 })
+      clock.tick(UPDATE_TIME)
+      expect(wrapper.state().percent).toBeGreaterThan(0).toBeLessThan(100)
+
+      wrapper.setProps({ loading: 0 })
+      expect(wrapper.state().percent).toBe(100)
+
+      wrapper.setProps({ loading: 1 })
+      expect(wrapper.instance().terminatingAnimationTimeoutId).toNotExist()
+      expect(wrapper.state().percent).toBe(0)
+    })
+
     it('resets progress if loading becomes 0 and terminating animation '
        + 'finished', () => {
       const wrapper = shallow(<LoadingBar />)

src/loading_bar.js

@@ -126,6 +126,14 @@ class LoadingBar extends Component {
   }
 
   start() {
+    // There could be previous termination animation going, so we need to
+    // cancel it and forcefully reset the Loading Bar before starting
+    // the progress simulation from 0
+    if (this.terminatingAnimationTimeoutId) {
+      clearTimeout(this.terminatingAnimationTimeoutId)
+      this.reset()
+    }
+
     const { updateTime } = this.props
     this.progressIntervalId = setInterval(
       this.simulateProgress,