ChoChoX/suwayomi-material-you-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Call "onImageLoad" callback only on successful load

Browse Source 
In case the image load was aborted, the success callback was incorrectly called
This commit is contained in:
schroda
2024-09-09 15:33:09 +02:00
parent df5ce4b08c
commit 3b20d64062
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/util/SpinnerImage.tsx
View File

@@ -43,11 +43,11 @@ export const SpinnerImage = forwardRef((props: IProps, imgRef: ForwardedRef<HTML
const [isLoading, setIsLoading] = useState<boolean | undefined>(undefined); const [isLoading, setIsLoading] = useState<boolean | undefined>(undefined);
const [hasError, setHasError] = useState(false); const [hasError, setHasError] = useState(false);
const updateImageState = (loading: boolean, error: boolean = false) => { const updateImageState = (loading: boolean, error: boolean = false, aborted: boolean = false) => {
setIsLoading(loading); setIsLoading(loading);
setHasError(error); setHasError(error);
if (!loading && !error) { if (!loading && !error && !aborted) {
onImageLoad?.(); onImageLoad?.();
} }
}; };
@@ -87,7 +87,7 @@ export const SpinnerImage = forwardRef((props: IProps, imgRef: ForwardedRef<HTML
} catch (e) { } catch (e) {
const wasAborted = const wasAborted =
e instanceof Error && (e.name === 'AbortError' || e.message === 'Component was unmounted'); e instanceof Error && (e.name === 'AbortError' || e.message === 'Component was unmounted');
updateImageState(false, !wasAborted); updateImageState(false, !wasAborted, wasAborted);
} }
}; };