Skip to content

remove recursion #11877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2024
Merged

remove recursion #11877

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions polaris-react/src/components/EmptyState/EmptyState.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, {useState, useCallback, useRef, useEffect} from 'react';
import React, {useState, useRef, useEffect} from 'react';

import {classNames} from '../../utilities/css';
import type {ComplexAction} from '../../types';
Expand Down Expand Up @@ -49,22 +49,9 @@ export function EmptyState({
const [imageLoaded, setImageLoaded] = useState<boolean>(false);
const imageRef = useRef<HTMLImageElement>(null);

const handleLoad = useCallback((image: HTMLImageElement) => {
if (image.complete) {
setImageLoaded(true);
return;
}

requestAnimationFrame(() => handleLoad(image));
}, []);

useEffect(() => {
const imageElement = imageRef.current;

if (imageElement) {
handleLoad(imageElement);
}
}, [handleLoad]);
if (imageRef.current?.complete) setImageLoaded(true);
}, []);

const imageClassNames = classNames(
styles.Image,
Expand All @@ -84,6 +71,7 @@ export function EmptyState({
{source: largeImage, descriptor: '1136w'},
]}
sizes="(max-width: 568px) 60vw"
onLoad={() => setImageLoaded(true)}
/>
) : (
<Image
Expand All @@ -92,6 +80,7 @@ export function EmptyState({
ref={imageRef}
className={imageClassNames}
source={image}
onLoad={() => setImageLoaded(true)}
/>
);

Expand Down