update useTime to use only seconds state

Author: amrlabib

src/useTime.js

@@ -1,63 +1,33 @@
 import { useState, useEffect, useRef } from 'react';
+import { Time } from './utils';
 
 export default function useTime(settings) {
   const { format } = settings || {};
 
-  const [seconds, setSeconds] = useState(0);
-  const [minutes, setMinutes] = useState(0);
-  const [hours, setHours] = useState(0);
-  const [ampm, setAmPm] = useState('');
+  const [seconds, setSeconds] = useState(Time.getSecondsFromTimeNow());
   const intervalRef = useRef();
 
-  function formatHours(hoursValue) {
-    if (format === '12-hour') {
-      const ampmValue = hoursValue >= 12 ? 'pm' : 'am';
-      let formattedHours = hoursValue % 12;
-      formattedHours = formattedHours || 12;
-      return { hoursValue: formattedHours, ampmValue };
+  function clearIntervalRef() {
+    if (intervalRef.current) {
+      clearInterval(intervalRef.current);
+      intervalRef.current = undefined;
     }
-    return { hoursValue, ampmValue: '' };
   }
 
-  function setCurrentTime() {
-    const now = new Date();
-    const secondsValue = now.getSeconds();
-    const minutesValue = now.getMinutes();
-    const { hoursValue, ampmValue } = formatHours(now.getHours());
-
-    setSeconds(secondsValue);
-    setMinutes(minutesValue);
-    setHours(hoursValue);
-    setAmPm(ampmValue);
-  }
-
-
   function start() {
     if (!intervalRef.current) {
-      setCurrentTime();
-      intervalRef.current = setInterval(() => setCurrentTime(), 1000);
-    }
-  }
-
-  function reset() {
-    if (intervalRef.current) {
-      clearInterval(intervalRef.current);
-      intervalRef.current = undefined;
+      intervalRef.current = setInterval(() => setSeconds(Time.getSecondsFromTimeNow()), 1000);
     }
-    setSeconds(0);
-    setMinutes(0);
-    setHours(0);
-    setAmPm('');
   }
 
   // didMount effect
   useEffect(() => {
     start();
-    return reset;
+    return clearIntervalRef;
   }, []);
 
 
   return {
-    seconds, minutes, hours, ampm,
+    ...Time.getFormattedTimeFromSeconds(seconds, format),
   };
 }

src/utils/Time.js

@@ -21,4 +21,29 @@ export default class Time {
     }
     return 0;
   }
+
+  static getSecondsFromTimeNow() {
+    const now = new Date();
+    const currentTimestamp = now.getTime();
+    const offset = (now.getTimezoneOffset() * 60);
+    return (currentTimestamp / 1000) - offset;
+  }
+
+  static getFormattedTimeFromSeconds(totalSeconds, format) {
+    const { seconds: secondsValue, minutes, hours } = Time.getTimeFromSeconds(totalSeconds);
+    let ampm = '';
+    let hoursValue = hours;
+
+    if (format === '12-hour') {
+      ampm = hours >= 12 ? 'pm' : 'am';
+      hoursValue = hours % 12;
+    }
+
+    return {
+      seconds: secondsValue,
+      minutes,
+      hours: hoursValue,
+      ampm,
+    };
+  }
 }