Fix spinner

WordPress · Nov 24, 2022 · 0aabc03 · 0aabc03
1 parent a077f25
commit 0aabc03
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/packages/editor/src/components/post-publish-panel/maybe-upload-media.js b/packages/editor/src/components/post-publish-panel/maybe-upload-media.js
@@ -120,7 +120,7 @@ export default function PostFormatPanel() {
 							} )
 					)
 			)
-		).then( () => {
+		).finally( () => {
 			setIsUploading( false );
 		} );
 	}
@@ -144,15 +144,18 @@ export default function PostFormatPanel() {
 						return <Image key={ image.clientId } { ...image } />;
 					} ) }
 				</AnimatePresence>
-				<Button
-					icon={ upload }
-					variant="primary"
-					onClick={ uploadImages }
-				>
-					{ __( 'Upload all' ) }
-				</Button>
+				{ isUploading ? (
+					<Spinner />
+				) : (
+					<Button
+						icon={ upload }
+						variant="primary"
+						onClick={ uploadImages }
+					>
+						{ __( 'Upload all' ) }
+					</Button>
+				) }
 			</div>
-			{ isUploading && <Spinner /> }
 		</PanelBody>
 	);
 }
diff --git a/packages/editor/src/components/post-publish-panel/style.scss b/packages/editor/src/components/post-publish-panel/style.scss
@@ -6,7 +6,7 @@
 	// Ensure the post-publish panel accounts for the header and footer height.
 	min-height: calc(100% - #{ $header-height + 84px });
 
-	.components-spinner {
+	> .components-spinner {
 		display: block;
 		margin: 100px auto 0;
 	}