Merge branch 'master' of https://github.com/xendora/react-timer into readme-update-3

Author: Bryze

.travis.yml

@@ -11,9 +11,9 @@ before_install:
   - echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
   - sudo apt-get update -qq
   - sudo apt-get install -y -qq yarn
-  - yarn jest:all
 cache:
   yarn: true
 script:
+  - yarn jest:all
   - yarn gh-pages-clean
   - yarn docz:deploy -u "${GITHUB_NAME} <${GITHUB_EMAIL}>" -m "Generated by Travis CI 🤖🤖🤖 - [Build#${TRAVIS_BUILD_NUMBER}]"

src/index.js

@@ -1,34 +1,52 @@
-import { useState, useEffect, useRef } from 'react';
+import { Component } from 'react';
 import PropTypes from 'prop-types';
 
-const ReactTimer = ({
-  children,
-  start = 0,
-  end = () => true,
-  interval = 1000,
-  onEnd = () => { },
-  onTick = () => { },
-}) => {
-  const [value, setValue] = useState(start);
-  const timerRef = useRef();
+class ReactTimer extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      value: props.start || 0,
+    };
+    this.timer = null;
+  }
 
-  useEffect(() => {
-    if (!timerRef.current) {
-      timerRef.current = setInterval(() => {
-        setValue((val) => onTick(val));
-      }, interval);
-    }
-    if (end(value)) {
-      clearInterval(timerRef.current);
-      onEnd(value);
+  componentDidMount() {
+    const {
+      onTick,
+      interval,
+      end,
+      onEnd,
+    } = this.props;
+    this.timer = setInterval(() => {
+      this.setState(({ value }) => (
+        { value: onTick(value) }
+      ), () => {
+        const { value: currentValue } = this.state;
+        if (end(currentValue)) {
+          clearInterval(this.timer);
+          onEnd(currentValue);
+        }
+      });
+    }, interval);
+  }
+
+  componentWillUnmount() {
+    if (this.timer) {
+      clearInterval(this.timer);
     }
-  }, [end, interval, onEnd, onTick, value]);
+  }
 
-  useEffect(() => () => {
-    clearInterval(timerRef.current);
-  }, []);
+  render() {
+    const { children } = this.props;
+    const { value } = this.state;
+    return children(value);
+  }
+}
 
-  return children(value);
+ReactTimer.defaultProps = {
+  interval: 1000,
+  onEnd: () => { },
+  onTick: () => { },
 };
 
 ReactTimer.propTypes = {