Release v2.7.4

Do not set second interval if loading bar is shown
mironov · Mar 19, 2017 · b958e75 · b958e75
1 parent 960db4b
commit b958e75
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Release History
 
+## 2.7.4
+   - Do not set second interval if loading bar is shown
+
 ## 2.7.3
    - Fix race condition when `showLoading` is called right after `hideLoading`
 

diff --git a/build/loading_bar.js b/build/loading_bar.js
@@ -98,12 +98,16 @@ var LoadingBar = exports.LoadingBar = function (_React$Component) {
       var loadingBarNotShown = !progressInterval;
       var endingAnimationGoing = percent === 100;
 
-      if (loadingBarNotShown || endingAnimationGoing) {
+      if (loadingBarNotShown) {
         progressInterval = setInterval(this.boundSimulateProgress, this.props.updateTime);
+      }
+
+      if (endingAnimationGoing) {
         clearTimeout(endingAnimationTimeout);
-        percent = 0;
       }
 
+      percent = 0;
+
       this.setState({ progressInterval: progressInterval, percent: percent });
     }
   }, {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-redux-loading-bar",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "description": "Simple Loading Bar for Redux and React",
   "main": "build/index.js",
   "typings": "index.d.ts",

diff --git a/spec/loading_bar.js b/spec/loading_bar.js
@@ -187,6 +187,16 @@ describe('LoadingBar', () => {
       expect(spySimulateProgress).toHaveBeenCalled()
       expect(spySimulateProgress.calls.length).toEqual(2)
     })
+
+    it('does not set second interval if loading bar is shown', () => {
+      const wrapper = shallow(<LoadingBar />)
+      wrapper.setProps({ loading: 1 })
+      const intervalId = wrapper.state().progressInterval
+      wrapper.setProps({ loading: 0 })
+      expect(wrapper.state().percent).toBe(100)
+      wrapper.setProps({ loading: 1 })
+      expect(wrapper.state().progressInterval).toEqual(intervalId)
+    })
   })
 
   describe('#simulateProgress', () => {

diff --git a/src/loading_bar.js b/src/loading_bar.js
@@ -60,15 +60,19 @@ export class LoadingBar extends React.Component {
     const loadingBarNotShown = !progressInterval
     const endingAnimationGoing = percent === 100
 
-    if (loadingBarNotShown || endingAnimationGoing) {
+    if (loadingBarNotShown) {
       progressInterval = setInterval(
         this.boundSimulateProgress,
         this.props.updateTime,
       )
+    }
+
+    if (endingAnimationGoing) {
       clearTimeout(endingAnimationTimeout)
-      percent = 0
     }
 
+    percent = 0
+
     this.setState({ progressInterval, percent })
   }