ServerSideRender: Fix loading state (#37623)

WordPress · Dec 24, 2021 · cfdeb6e · cfdeb6e
1 parent f8b40d6
commit cfdeb6e
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/packages/server-side-render/src/server-side-render.js b/packages/server-side-render/src/server-side-render.js
@@ -182,14 +182,6 @@ export default function ServerSideRender( props ) {
  const hasEmptyResponse = response === '';
  const hasError = response?.error;
 
- if ( hasEmptyResponse || ! hasResponse ) {
- return <EmptyResponsePlaceholder { ...props } />;
- }
-
- if ( hasError ) {
- return <ErrorResponsePlaceholder response={ response } { ...props } />;
- }
-
  if ( isLoading ) {
  return (
  <LoadingResponsePlaceholder { ...props } showLoader={ showLoader }>
@@ -200,5 +192,13 @@ export default function ServerSideRender( props ) {
  );
  }
 
+ if ( hasEmptyResponse || ! hasResponse ) {
+ return <EmptyResponsePlaceholder { ...props } />;
+ }
+
+ if ( hasError ) {
+ return <ErrorResponsePlaceholder response={ response } { ...props } />;
+ }
+
  return <RawHTML className={ className }>{ response }</RawHTML>;
 }