Skip to content
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

Fix: Prevent empty renders in ServerSideRender component caused by changing props while already fetching markup #35433

Merged
merged 2 commits into from
Oct 9, 2021
Merged

Fix: Prevent empty renders in ServerSideRender component caused by changing props while already fetching markup #35433

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4468f0
fix refactor ServerSideRender to prevent empty renders
fabiankaegy Oct 7, 2021
c546927
fix refacror else if statements to early returning if statements
fabiankaegy Oct 7, 2021
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
44 changes: 28 additions & 16 deletions packages/server-side-render/src/server-side-render.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,15 @@ export default function ServerSideRender( props ) {
const [ showLoader, setShowLoader ] = useState( false );
const fetchRequestRef = useRef();
const [ response, setResponse ] = useState( null );
const prevResponse = usePrevious( response );
const prevProps = usePrevious( props );
const [ isLoading, setIsLoading ] = useState( false );

function fetchData() {
if ( ! isMountedRef.current ) {
return;
}
if ( null !== response ) {
setResponse( null );
}

setIsLoading( true );

const sanitizedAttributes =
attributes &&
Expand Down Expand Up @@ -130,6 +129,14 @@ export default function ServerSideRender( props ) {
errorMsg: error.message,
} );
}
} )
.finally( () => {
if (
isMountedRef.current &&
fetchRequest === fetchRequestRef.current
) {
setIsLoading( false );
}
} ) );

return fetchRequest;
Expand Down Expand Up @@ -162,30 +169,35 @@ export default function ServerSideRender( props ) {
* the request takes more than one second.
*/
useEffect( () => {
if ( response !== null ) {
if ( ! isLoading ) {
return;
}
const timeout = setTimeout( () => {
setShowLoader( true );
}, 1000 );
return () => clearTimeout( timeout );
}, [ response ] );
}, [ isLoading ] );

if ( response === '' ) {
const hasResponse = !! response;
const hasEmptyResponse = response === '';
const hasError = response?.error;

if ( hasEmptyResponse || ! hasResponse ) {
return <EmptyResponsePlaceholder { ...props } />;
} else if ( ! response ) {
}

if ( hasError ) {
return <ErrorResponsePlaceholder response={ response } { ...props } />;
}

if ( isLoading ) {
return (
<LoadingResponsePlaceholder
{ ...props }
showLoader={ ! prevResponse || showLoader }
>
{ !! prevResponse && (
<RawHTML className={ className }>{ prevResponse }</RawHTML>
<LoadingResponsePlaceholder { ...props } showLoader={ showLoader }>
{ hasResponse && (
<RawHTML className={ className }>{ response }</RawHTML>
) }
</LoadingResponsePlaceholder>
);
} else if ( response.error ) {
return <ErrorResponsePlaceholder response={ response } { ...props } />;
}

return <RawHTML className={ className }>{ response }</RawHTML>;
Expand Down