From 8b55f0e54ba05853941e875762ca8037bfda0f9f Mon Sep 17 00:00:00 2001
From: akasunil <sdprajapati999@gmail.com>
Date: Fri, 30 Aug 2024 12:48:40 +0530
Subject: [PATCH 1/2] Fix loader alignment issue in site logo block

---
 packages/block-library/src/site-logo/edit.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/block-library/src/site-logo/edit.js b/packages/block-library/src/site-logo/edit.js
index 81217e6cb5135..21f3ca184c25a 100644
--- a/packages/block-library/src/site-logo/edit.js
+++ b/packages/block-library/src/site-logo/edit.js
@@ -654,8 +654,9 @@ export default function LogoEdit( {
 			{ controls }
 			{ mediaInspectorPanel }
 			{ ( !! logoUrl || !! temporaryURL ) && logoImage }
-			{ ! temporaryURL && ! logoUrl && ! canUserEdit && (
-				<Placeholder className="site-logo_placeholder">
+			{ ( !! isLoading ||
+				( ! temporaryURL && ! logoUrl && ! canUserEdit ) ) && (
+				<Placeholder className="site-logo_placeholder" withIllustration>
 					{ !! isLoading && (
 						<span className="components-placeholder__preview">
 							<Spinner />
@@ -663,7 +664,7 @@ export default function LogoEdit( {
 					) }
 				</Placeholder>
 			) }
-			{ ! temporaryURL && ! logoUrl && canUserEdit && (
+			{ ! isLoading && ! temporaryURL && ! logoUrl && canUserEdit && (
 				<MediaPlaceholder
 					onSelect={ onInitialSelectLogo }
 					accept={ ACCEPT_MEDIA_STRING }

From b17f932e5e5deac9d85a40b52f477dfd4a4959f6 Mon Sep 17 00:00:00 2001
From: akasunil <sdprajapati999@gmail.com>
Date: Mon, 2 Sep 2024 09:54:08 +0530
Subject: [PATCH 2/2] Update isLoading check

---
 packages/block-library/src/site-logo/edit.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/site-logo/edit.js b/packages/block-library/src/site-logo/edit.js
index 21f3ca184c25a..edf8bbccfeb65 100644
--- a/packages/block-library/src/site-logo/edit.js
+++ b/packages/block-library/src/site-logo/edit.js
@@ -654,10 +654,10 @@ export default function LogoEdit( {
 			{ controls }
 			{ mediaInspectorPanel }
 			{ ( !! logoUrl || !! temporaryURL ) && logoImage }
-			{ ( !! isLoading ||
+			{ ( isLoading ||
 				( ! temporaryURL && ! logoUrl && ! canUserEdit ) ) && (
 				<Placeholder className="site-logo_placeholder" withIllustration>
-					{ !! isLoading && (
+					{ isLoading && (
 						<span className="components-placeholder__preview">
 							<Spinner />
 						</span>