mirror of
https://github.com/Psychotoxical/psysonic.git
synced 2026-07-22 07:15:47 +00:00
0119e27f6d
CachedImage now shows /logo-psysonic.png when an image fails to load instead of a broken icon. The fallback switches to object-fit: contain with a card background so the logo stays proportional inside the container. If the caller provides a custom onError (e.g. to hide the element), that handler is used instead. A separate fallbackSrc state prevents React from re-writing the broken URL on re-renders. The DOM-level onerror = null guard prevents any infinite error loop. extractCoverColors skips color extraction when the logo fallback is active, falling back to the theme accent color instead. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
85 lines
3.1 KiB
TypeScript
85 lines
3.1 KiB
TypeScript
import React, { useEffect, useRef, useState } from 'react';
|
|
import { getCachedUrl } from '../utils/imageCache';
|
|
|
|
interface CachedImageProps extends React.ImgHTMLAttributes<HTMLImageElement> {
|
|
src: string;
|
|
cacheKey: string;
|
|
}
|
|
|
|
/**
|
|
* @param fallbackToFetch If true (default), returns the raw fetchUrl while the
|
|
* blob is still resolving — useful for <img> tags so the browser starts
|
|
* loading immediately. Pass false for CSS background-image consumers that
|
|
* should only see a stable blob URL (prevents a double crossfade).
|
|
*/
|
|
export function useCachedUrl(fetchUrl: string, cacheKey: string, fallbackToFetch = true): string {
|
|
const [resolved, setResolved] = useState('');
|
|
useEffect(() => {
|
|
if (!fetchUrl) { setResolved(''); return; }
|
|
const controller = new AbortController();
|
|
setResolved('');
|
|
getCachedUrl(fetchUrl, cacheKey, controller.signal).then(url => {
|
|
if (!controller.signal.aborted) setResolved(url);
|
|
});
|
|
return () => { controller.abort(); };
|
|
}, [fetchUrl, cacheKey]);
|
|
return fallbackToFetch ? (resolved || fetchUrl) : resolved;
|
|
}
|
|
|
|
export default function CachedImage({ src, cacheKey, style, onLoad, onError, ...props }: CachedImageProps) {
|
|
const [inView, setInView] = useState(false);
|
|
const [fallbackSrc, setFallbackSrc] = useState<string | undefined>(undefined);
|
|
const imgRef = useRef<HTMLImageElement>(null);
|
|
|
|
useEffect(() => {
|
|
const el = imgRef.current;
|
|
if (!el) return;
|
|
const observer = new IntersectionObserver(
|
|
([entry]) => { if (entry.isIntersecting) { setInView(true); observer.disconnect(); } },
|
|
{ rootMargin: '300px' }, // start fetching 300px before entering viewport
|
|
);
|
|
observer.observe(el);
|
|
return () => observer.disconnect();
|
|
}, []);
|
|
|
|
// Pass empty string when not yet in view so useCachedUrl skips the fetch entirely.
|
|
const resolvedSrc = useCachedUrl(inView ? src : '', cacheKey);
|
|
const [loaded, setLoaded] = useState(false);
|
|
|
|
// Reset only when the logical image changes (cacheKey), not on fetchUrl→blobUrl
|
|
// URL upgrades within the same image — avoids the end-of-load flash.
|
|
useEffect(() => {
|
|
setLoaded(false);
|
|
setFallbackSrc(undefined);
|
|
}, [cacheKey]);
|
|
|
|
const handleError = (e: React.SyntheticEvent<HTMLImageElement>) => {
|
|
if (onError) {
|
|
// Caller wants custom error handling (e.g. hide the element)
|
|
onError(e);
|
|
} else {
|
|
// Nullify the DOM-level handler first to prevent any infinite loop
|
|
e.currentTarget.onerror = null;
|
|
setFallbackSrc('/logo-psysonic.png');
|
|
}
|
|
};
|
|
|
|
const isFallback = fallbackSrc !== undefined;
|
|
const finalSrc = fallbackSrc ?? (resolvedSrc || undefined);
|
|
|
|
const fallbackStyle: React.CSSProperties = isFallback
|
|
? { objectFit: 'contain', background: 'var(--bg-card, var(--ctp-surface0, #313244))', padding: '15%' }
|
|
: {};
|
|
|
|
return (
|
|
<img
|
|
ref={imgRef}
|
|
src={finalSrc}
|
|
style={{ ...style, opacity: loaded ? 1 : 0, transition: 'opacity 0.15s ease', ...fallbackStyle }}
|
|
onLoad={e => { setLoaded(true); onLoad?.(e); }}
|
|
onError={handleError}
|
|
{...props}
|
|
/>
|
|
);
|
|
}
|