Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions src/useStopwatch.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState } from 'react';
import { useState, useCallback } from 'react';
import { Time } from './utils';
import { useInterval } from './hooks';

Expand All @@ -12,26 +12,26 @@ export default function useStopwatch({ autoStart, offsetTimestamp }) {
setSeconds(passedSeconds + Time.getSecondsFromPrevTime(prevTime, true));
}, isRunning ? 1000 : null);

function start() {
const start = useCallback(() => {
const newPrevTime = new Date();
setPrevTime(newPrevTime);
setIsRunning(true);
setSeconds(passedSeconds + Time.getSecondsFromPrevTime(newPrevTime, true));
}
}, [passedSeconds]);

function pause() {
const pause = useCallback(() => {
setPassedSeconds(seconds);
setIsRunning(false);
}
}, [seconds]);

function reset(offset = 0, newAutoStart = true) {
const reset = useCallback((offset = 0, newAutoStart = true) => {
const newPassedSeconds = Time.getSecondsFromExpiry(offset, true) || 0;
const newPrevTime = new Date();
setPrevTime(newPrevTime);
setPassedSeconds(newPassedSeconds);
setIsRunning(newAutoStart);
setSeconds(newPassedSeconds + Time.getSecondsFromPrevTime(newPrevTime, true));
}
}, []);

return {
...Time.getTimeFromSeconds(seconds), start, pause, reset, isRunning,
Expand Down
22 changes: 11 additions & 11 deletions src/useTimer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState } from 'react';
import { useState, useCallback } from 'react';
import { Time, Validate } from './utils';
import { useInterval } from './hooks';

Expand All @@ -20,38 +20,38 @@ export default function useTimer({ expiryTimestamp: expiry, onExpire, autoStart
const [didStart, setDidStart] = useState(autoStart);
const [delay, setDelay] = useState(getDelayFromExpiryTimestamp(expiryTimestamp));

function handleExpire() {
const handleExpire = useCallback(() => {
Validate.onExpire(onExpire) && onExpire();
setIsRunning(false);
setDelay(null);
}
}, [onExpire]);

function pause() {
const pause = useCallback(() => {
setIsRunning(false);
}
}, []);

function restart(newExpiryTimestamp, newAutoStart = true) {
const restart = useCallback((newExpiryTimestamp, newAutoStart = true) => {
setDelay(getDelayFromExpiryTimestamp(newExpiryTimestamp));
setDidStart(newAutoStart);
setIsRunning(newAutoStart);
setExpiryTimestamp(newExpiryTimestamp);
setSeconds(Time.getSecondsFromExpiry(newExpiryTimestamp));
}
}, []);

function resume() {
const resume = useCallback(() => {
const time = new Date();
time.setMilliseconds(time.getMilliseconds() + (seconds * 1000));
restart(time);
}
}, [seconds, restart]);

function start() {
const start = useCallback(() => {
if (didStart) {
setSeconds(Time.getSecondsFromExpiry(expiryTimestamp));
setIsRunning(true);
} else {
resume();
}
}
}, [expiryTimestamp, didStart, resume]);

useInterval(() => {
if (delay !== DEFAULT_DELAY) {
Expand Down