Merge pull request #2 from ryanhefner/develop

v0.1.1

Author: ryanhefner

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-timer-wrapper",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "license": "MIT",
   "description": "Composable React Timer component that passes its status to its children.",
   "repository": "ryanhefner/react-timer-wrapper",

src/index.js

@@ -41,7 +41,7 @@ class TimerWrapper extends Component {
 
       switch (active) {
         case true:
-          const nextTime = duration !== null && this.state.time === duration
+          const nextTime = duration !== null && this.state.time >= duration
             ? 0
             : this.state.time;
 
@@ -107,34 +107,33 @@ class TimerWrapper extends Component {
       time: nextTime,
     });
 
-    if (duration !== null && progress === 1) {
+    this.setState({
+      time: nextTime,
+    });
+
+    if (duration !== null && this.state.time >= duration) {
       onFinish({
         duration,
         progress,
         time: nextTime,
       });
 
-      if (loop) {
-        nextTime = 0;
-        onStart({
-          duration,
-          progress: 0,
-          time: nextTime,
-        });
-
-        this.setState({
-          startTime: Date.now(),
-        });
-      }
-      else {
+      if (!loop) {
         cancelAnimationFrame(this.animationFrame);
         return;
       }
-    }
 
-    this.setState({
-      time: nextTime,
-    });
+      nextTime = 0;
+      onStart({
+        duration,
+        progress: 0,
+        time: nextTime,
+      });
+
+      this.setState({
+        startTime: Date.now(),
+      });
+    }
 
     this.animationFrame = requestAnimationFrame(this.tick);
   }

yarn.lock

@@ -1814,8 +1814,8 @@ js-tokens@^3.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
 js-yaml@^3.7.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.0.tgz#4ffbbf25c2ac963b8299dc74da7e3740de1c18ce"
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.1.tgz#08775cebdfdd359209f0d2acd383c8f86a6904a0"
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -2800,8 +2800,8 @@ uglify-js@^2.6:
     uglify-to-browserify "~1.0.0"
 
 uglify-js@^3.0.9:
-  version "3.0.26"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.26.tgz#ba279ca597b13fe6c62c2d87dd5188e57a7a3233"
+  version "3.0.27"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.27.tgz#a97db8c8ba6b9dba4e2f88d86aa9548fa6320034"
   dependencies:
     commander "~2.11.0"
     source-map "~0.5.1"