change thumb loading to OnScreen loading and refetching on error|timeout at events accordion
This commit is contained in:
parent
11f0a9ed37
commit
49b1f03ca9
@ -1,11 +1,10 @@
|
|||||||
import { Button, Flex, Group, Text } from '@mantine/core';
|
import { Button, Flex, Group, Text } from '@mantine/core';
|
||||||
import { IconExternalLink } from '@tabler/icons-react';
|
import { IconExternalLink } from '@tabler/icons-react';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
import { proxyApi } from '../../../services/frigate.proxy/frigate.api';
|
import { proxyApi } from '../../../services/frigate.proxy/frigate.api';
|
||||||
import { EventFrigate } from '../../../types/event';
|
import { EventFrigate } from '../../../types/event';
|
||||||
import { getDurationFromTimestamps, unixTimeToDate } from '../../utils/dateUtil';
|
import { getDurationFromTimestamps, unixTimeToDate } from '../../utils/dateUtil';
|
||||||
import BlobImage from '../images/BlobImage';
|
|
||||||
import VideoPlayer from '../players/VideoPlayer';
|
import VideoPlayer from '../players/VideoPlayer';
|
||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
|
|
||||||
interface EventPanelProps {
|
interface EventPanelProps {
|
||||||
event: EventFrigate
|
event: EventFrigate
|
||||||
|
|||||||
@ -12,6 +12,7 @@ import { routesPath } from '../../../router/routes.path';
|
|||||||
import { proxyApi } from '../../../services/frigate.proxy/frigate.api';
|
import { proxyApi } from '../../../services/frigate.proxy/frigate.api';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import BlobImage from '../images/BlobImage';
|
import BlobImage from '../images/BlobImage';
|
||||||
|
import OnScreenImage from '../images/OnScreenImage';
|
||||||
|
|
||||||
|
|
||||||
interface EventsAccordionItemProps {
|
interface EventsAccordionItemProps {
|
||||||
@ -80,7 +81,7 @@ const EventsAccordionItem = ({
|
|||||||
<Accordion.Control key={event.id + 'Control'}>
|
<Accordion.Control key={event.id + 'Control'}>
|
||||||
<Flex justify='space-between'>
|
<Flex justify='space-between'>
|
||||||
{!hostName ? <></> :
|
{!hostName ? <></> :
|
||||||
<BlobImage
|
<OnScreenImage
|
||||||
maw={200}
|
maw={200}
|
||||||
mr='1rem'
|
mr='1rem'
|
||||||
fit="contain"
|
fit="contain"
|
||||||
|
|||||||
@ -1,29 +1,26 @@
|
|||||||
import { Image, ImageProps, Loader } from '@mantine/core';
|
import { Image, ImageProps, Loader } from '@mantine/core';
|
||||||
import React, { useEffect, useState } from 'react';
|
|
||||||
import { proxyApi } from '../../../services/frigate.proxy/frigate.api';
|
|
||||||
import { useIntersection } from '@mantine/hooks';
|
|
||||||
import { useQuery } from '@tanstack/react-query';
|
import { useQuery } from '@tanstack/react-query';
|
||||||
|
import { useEffect, useState } from 'react';
|
||||||
|
import { proxyApi } from '../../../services/frigate.proxy/frigate.api';
|
||||||
import RetryError from '../RetryError';
|
import RetryError from '../RetryError';
|
||||||
|
|
||||||
interface BlobImageProps extends ImageProps {
|
export interface BlobImageProps extends ImageProps {
|
||||||
src: string
|
src: string
|
||||||
|
refetchOnError?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
const BlobImage = ({
|
const BlobImage = ({
|
||||||
src,
|
src,
|
||||||
|
refetchOnError,
|
||||||
...rest
|
...rest
|
||||||
}: BlobImageProps) => {
|
}: BlobImageProps) => {
|
||||||
const [imageSrc, setImageSrc] = useState<string | null>(null);
|
const [imageSrc, setImageSrc] = useState<string | null>(null);
|
||||||
|
|
||||||
const { ref, entry } = useIntersection({ threshold: 0.1, })
|
|
||||||
const isVisible = entry?.isIntersecting
|
|
||||||
|
|
||||||
const { data: imageBlob, refetch, isPending, isError } = useQuery({
|
const { data: imageBlob, refetch, isPending, isError } = useQuery({
|
||||||
queryKey: [src],
|
queryKey: [src],
|
||||||
queryFn: () => proxyApi.getImageFrigate(src),
|
queryFn: () => proxyApi.getImageFrigate(src),
|
||||||
staleTime: 60 * 1000,
|
staleTime: Infinity,
|
||||||
gcTime: Infinity,
|
gcTime: Infinity,
|
||||||
refetchInterval: isVisible ? 30 * 1000 : undefined,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@ -41,7 +38,11 @@ const BlobImage = ({
|
|||||||
|
|
||||||
if (isPending || !imageSrc) return <Loader />
|
if (isPending || !imageSrc) return <Loader />
|
||||||
|
|
||||||
if (isError) return <RetryError onRetry={refetch} />
|
if (isError && refetchOnError) {
|
||||||
|
refetch()
|
||||||
|
} else if (isError) {
|
||||||
|
return <RetryError onRetry={refetch} />
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Image src={imageSrc} {...rest} />
|
<Image src={imageSrc} {...rest} />
|
||||||
|
|||||||
26
src/shared/components/images/OnScreenImage.tsx
Normal file
26
src/shared/components/images/OnScreenImage.tsx
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
import { useIntersection } from '@mantine/hooks';
|
||||||
|
import { FC, useEffect, useState } from 'react';
|
||||||
|
import BlobImage, { BlobImageProps } from './BlobImage';
|
||||||
|
|
||||||
|
const OnScreenImage: FC<BlobImageProps> = ({
|
||||||
|
...rest
|
||||||
|
}) => {
|
||||||
|
const [renderImage, setRenderImage] = useState<boolean>(false)
|
||||||
|
const { ref, entry } = useIntersection({ threshold: 0.1, })
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (entry?.isIntersecting)
|
||||||
|
setRenderImage(true)
|
||||||
|
}, [entry?.isIntersecting])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div ref={ref}>
|
||||||
|
{!renderImage ? null :
|
||||||
|
<BlobImage {...rest}/>
|
||||||
|
}
|
||||||
|
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default OnScreenImage;
|
||||||
Loading…
Reference in New Issue
Block a user