forked from Github/frigate
Reduce rerenders on some components (#10068)
* Remove direct callback * don't rerender for callback * Move websocket to top level events * Be smarter about updating timeago * Cleanup
This commit is contained in:
@@ -8,7 +8,7 @@ interface IProp {
|
||||
/** OPTIONAL: boolean that determines whether to show the time-ago text in dense format */
|
||||
dense?: boolean;
|
||||
/** OPTIONAL: set custom refresh interval in milliseconds, default 1000 (1 sec) */
|
||||
refreshInterval?: number;
|
||||
manualRefreshInterval?: number;
|
||||
}
|
||||
|
||||
type TimeUnit = {
|
||||
@@ -17,24 +17,28 @@ type TimeUnit = {
|
||||
value: number;
|
||||
};
|
||||
|
||||
const timeAgo = ({ time, currentTime = new Date(), dense = false }: IProp): string => {
|
||||
if (typeof time !== 'number' || time < 0) return 'Invalid Time Provided';
|
||||
const timeAgo = ({
|
||||
time,
|
||||
currentTime = new Date(),
|
||||
dense = false,
|
||||
}: IProp): string => {
|
||||
if (typeof time !== "number" || time < 0) return "Invalid Time Provided";
|
||||
|
||||
const pastTime: Date = new Date(time);
|
||||
const elapsedTime: number = currentTime.getTime() - pastTime.getTime();
|
||||
|
||||
const timeUnits: TimeUnit[] = [
|
||||
{ unit: 'yr', full: 'year', value: 31536000 },
|
||||
{ unit: 'mo', full: 'month', value: 0 },
|
||||
{ unit: 'd', full: 'day', value: 86400 },
|
||||
{ unit: 'h', full: 'hour', value: 3600 },
|
||||
{ unit: 'm', full: 'minute', value: 60 },
|
||||
{ unit: 's', full: 'second', value: 1 },
|
||||
{ unit: "yr", full: "year", value: 31536000 },
|
||||
{ unit: "mo", full: "month", value: 0 },
|
||||
{ unit: "d", full: "day", value: 86400 },
|
||||
{ unit: "h", full: "hour", value: 3600 },
|
||||
{ unit: "m", full: "minute", value: 60 },
|
||||
{ unit: "s", full: "second", value: 1 },
|
||||
];
|
||||
|
||||
const elapsed: number = elapsedTime / 1000;
|
||||
if (elapsed < 10) {
|
||||
return 'just now';
|
||||
return "just now";
|
||||
}
|
||||
|
||||
for (let i = 0; i < timeUnits.length; i++) {
|
||||
@@ -48,7 +52,8 @@ const timeAgo = ({ time, currentTime = new Date(), dense = false }: IProp): stri
|
||||
const currentMonth = currentTime.getUTCMonth();
|
||||
const currentYear = currentTime.getUTCFullYear();
|
||||
|
||||
let monthDiff = (currentYear - pastYear) * 12 + (currentMonth - pastMonth);
|
||||
let monthDiff =
|
||||
(currentYear - pastYear) * 12 + (currentMonth - pastMonth);
|
||||
|
||||
// check if the time provided is the previous month but not exceeded 1 month ago.
|
||||
if (currentTime.getUTCDate() < pastTime.getUTCDate()) {
|
||||
@@ -57,18 +62,37 @@ const timeAgo = ({ time, currentTime = new Date(), dense = false }: IProp): stri
|
||||
|
||||
if (monthDiff > 0) {
|
||||
const unitAmount = monthDiff;
|
||||
return `${unitAmount}${dense ? timeUnits[i].unit : ` ${timeUnits[i].full}`}${dense ? '' : 's'} ago`;
|
||||
return `${unitAmount}${dense ? timeUnits[i].unit : ` ${timeUnits[i].full}`}${dense ? "" : "s"} ago`;
|
||||
}
|
||||
} else if (elapsed >= timeUnits[i].value) {
|
||||
const unitAmount: number = Math.floor(elapsed / timeUnits[i].value);
|
||||
return `${unitAmount}${dense ? timeUnits[i].unit : ` ${timeUnits[i].full}`}${dense ? '' : 's'} ago`;
|
||||
return `${unitAmount}${dense ? timeUnits[i].unit : ` ${timeUnits[i].full}`}${dense ? "" : "s"} ago`;
|
||||
}
|
||||
}
|
||||
return 'Invalid Time';
|
||||
return "Invalid Time";
|
||||
};
|
||||
|
||||
const TimeAgo: FunctionComponent<IProp> = ({ refreshInterval = 1000, ...rest }): JSX.Element => {
|
||||
const TimeAgo: FunctionComponent<IProp> = ({
|
||||
time,
|
||||
manualRefreshInterval,
|
||||
...rest
|
||||
}): JSX.Element => {
|
||||
const [currentTime, setCurrentTime] = useState<Date>(new Date());
|
||||
const refreshInterval = useMemo(() => {
|
||||
if (manualRefreshInterval) {
|
||||
return manualRefreshInterval;
|
||||
}
|
||||
|
||||
const currentTs = currentTime.getTime() / 1000;
|
||||
if (currentTs - time < 60) {
|
||||
return 1000; // refresh every second
|
||||
} else if (currentTs - time < 3600) {
|
||||
return 60000; // refresh every minute
|
||||
} else {
|
||||
return 3600000; // refresh every hour
|
||||
}
|
||||
}, [currentTime, manualRefreshInterval]);
|
||||
|
||||
useEffect(() => {
|
||||
const intervalId: NodeJS.Timeout = setInterval(() => {
|
||||
setCurrentTime(new Date());
|
||||
@@ -76,7 +100,10 @@ const TimeAgo: FunctionComponent<IProp> = ({ refreshInterval = 1000, ...rest }):
|
||||
return () => clearInterval(intervalId);
|
||||
}, [refreshInterval]);
|
||||
|
||||
const timeAgoValue = useMemo(() => timeAgo({ currentTime, ...rest }), [currentTime, rest]);
|
||||
const timeAgoValue = useMemo(
|
||||
() => timeAgo({ time, currentTime, ...rest }),
|
||||
[currentTime, rest]
|
||||
);
|
||||
|
||||
return <span>{timeAgoValue}</span>;
|
||||
};
|
||||
|
||||
@@ -26,8 +26,8 @@ type PreviewPlayerProps = {
|
||||
review: ReviewSegment;
|
||||
relevantPreview?: Preview;
|
||||
autoPlayback?: boolean;
|
||||
setReviewed?: () => void;
|
||||
onClick?: () => void;
|
||||
setReviewed?: (reviewId: string) => void;
|
||||
onClick?: (reviewId: string) => void;
|
||||
};
|
||||
|
||||
type Preview = {
|
||||
@@ -53,6 +53,22 @@ export default function PreviewThumbnailPlayer({
|
||||
const [progress, setProgress] = useState(0);
|
||||
const [imgRef, imgLoaded, onImgLoad] = useImageLoaded();
|
||||
|
||||
// interaction
|
||||
|
||||
const handleOnClick = useCallback(() => {
|
||||
if (onClick) {
|
||||
onClick(review.id);
|
||||
}
|
||||
}, [review, onClick]);
|
||||
|
||||
const handleSetReviewed = useCallback(() => {
|
||||
if (setReviewed) {
|
||||
setReviewed(review.id);
|
||||
}
|
||||
}, [review, setReviewed]);
|
||||
|
||||
// playback
|
||||
|
||||
const playingBack = useMemo(() => playback, [playback, autoPlayback]);
|
||||
|
||||
useEffect(() => {
|
||||
@@ -110,7 +126,7 @@ export default function PreviewThumbnailPlayer({
|
||||
className="relative w-full h-full cursor-pointer"
|
||||
onMouseEnter={isMobile ? undefined : () => onPlayback(true)}
|
||||
onMouseLeave={isMobile ? undefined : () => onPlayback(false)}
|
||||
onClick={onClick}
|
||||
onClick={handleOnClick}
|
||||
>
|
||||
{playingBack && (
|
||||
<div className="absolute left-0 top-0 right-0 bottom-0 animate-in fade-in">
|
||||
@@ -118,7 +134,7 @@ export default function PreviewThumbnailPlayer({
|
||||
review={review}
|
||||
relevantPreview={relevantPreview}
|
||||
setProgress={setProgress}
|
||||
setReviewed={setReviewed}
|
||||
setReviewed={handleSetReviewed}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
@@ -184,7 +200,7 @@ export default function PreviewThumbnailPlayer({
|
||||
)}
|
||||
</div>
|
||||
</ContextMenuTrigger>
|
||||
<PreviewContextItems review={review} setReviewed={setReviewed} />
|
||||
<PreviewContextItems review={review} setReviewed={handleSetReviewed} />
|
||||
</ContextMenu>
|
||||
);
|
||||
}
|
||||
@@ -321,7 +337,7 @@ const MIN_LOAD_TIMEOUT_MS = 200;
|
||||
type InProgressPreviewProps = {
|
||||
review: ReviewSegment;
|
||||
setProgress?: (progress: number) => void;
|
||||
setReviewed?: () => void;
|
||||
setReviewed?: (reviewId: string) => void;
|
||||
};
|
||||
function InProgressPreview({
|
||||
review,
|
||||
@@ -355,7 +371,7 @@ function InProgressPreview({
|
||||
}
|
||||
|
||||
if (setReviewed && key == Math.floor(previewFrames.length / 2)) {
|
||||
setReviewed();
|
||||
setReviewed(review.id);
|
||||
}
|
||||
|
||||
setKey(key + 1);
|
||||
|
||||
Reference in New Issue
Block a user