From 352e8ef3a1ebd1fe2cae5bc2621d334cdceb4bbe Mon Sep 17 00:00:00 2001 From: Konv Suu <2583695112@qq.com> Date: Tue, 1 Jul 2025 00:20:02 +0800 Subject: [PATCH] Merge pull request #4042 from kovsu/feat/preview-media feat(desktop): pass loading prop correctly --- .../src/components/ui/media/PreviewMediaContent.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/desktop/layer/renderer/src/components/ui/media/PreviewMediaContent.tsx b/apps/desktop/layer/renderer/src/components/ui/media/PreviewMediaContent.tsx index bad6248a4..d14a24e14 100644 --- a/apps/desktop/layer/renderer/src/components/ui/media/PreviewMediaContent.tsx +++ b/apps/desktop/layer/renderer/src/components/ui/media/PreviewMediaContent.tsx @@ -432,7 +432,7 @@ const FallbackableImage: FC< blurhash?: string onZoomChange?: (isZoomed: boolean) => void } -> = ({ src, fallbackUrl, containerClassName, onZoomChange }) => { +> = ({ src, fallbackUrl, containerClassName, onZoomChange, loading }) => { const [currentSrc, setCurrentSrc] = useState(() => replaceImgUrlIfNeed(src)) const [isAllError, setIsAllError] = useState(false) @@ -480,6 +480,7 @@ const FallbackableImage: FC< maxZoom={2} src={currentSrc} alt="preview" + loading={loading} highResLoaded={!isLoading} onLoad={() => setIsLoading(false)} onError={handleError} @@ -551,6 +552,7 @@ const DOMImageViewer: FC<{ src: string alt: string highResLoaded: boolean + loading?: "lazy" | "eager" onLoad?: () => void onError?: () => void }> = ({ @@ -562,6 +564,7 @@ const DOMImageViewer: FC<{ src, alt, highResLoaded, + loading = "eager", onLoad, onError, }) => { @@ -649,7 +652,7 @@ const DOMImageViewer: FC<{ highResLoaded ? "opacity-100" : "opacity-0", )} draggable={false} - loading="eager" + loading={loading} decoding="async" onLoad={onLoad} onClick={stopPropagation}