From 7981f101ad8a47ffc2a875b3f1d2fb584543d224 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Tue, 22 Dec 2020 16:05:15 -0700
Subject: [PATCH 1/3] ComboboxControl: add a spinner when isLoading.

---
 packages/components/src/combobox-control/index.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/components/src/combobox-control/index.js b/packages/components/src/combobox-control/index.js
index d1434c1787cfd..0f02d8eb816ae 100644
--- a/packages/components/src/combobox-control/index.js
+++ b/packages/components/src/combobox-control/index.js
@@ -26,6 +26,7 @@ import TokenInput from '../form-token-field/token-input';
 import SuggestionsList from '../form-token-field/suggestions-list';
 import BaseControl from '../base-control';
 import Button from '../button';
+import Spinner from '../spinner';
 import { Flex, FlexBlock, FlexItem } from '../flex';
 import withFocusOutside from '../higher-order/with-focus-outside';
 
@@ -51,6 +52,7 @@ function ComboboxControl( {
 	help,
 	allowReset = true,
 	className,
+	isLoading = false,
 	messages = {
 		selected: __( 'Item selected.' ),
 	},
@@ -216,6 +218,7 @@ function ComboboxControl( {
 								onChange={ onInputChange }
 							/>
 						</FlexBlock>
+						{ isLoading && <Spinner /> }
 						{ allowReset && (
 							<FlexItem>
 								<Button

From a214e19a641f07f40202d3f6aab234357bd1aef3 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Fri, 15 Jan 2021 13:42:12 -0700
Subject: [PATCH 2/3] Correct isLoading selector.

---
 packages/editor/src/components/post-author/combobox.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor/src/components/post-author/combobox.js b/packages/editor/src/components/post-author/combobox.js
index be100bddefd86..ce56c56822006 100644
--- a/packages/editor/src/components/post-author/combobox.js
+++ b/packages/editor/src/components/post-author/combobox.js
@@ -29,7 +29,7 @@ function PostAuthorCombobox() {
 				authorId: getEditedPostAttribute( 'author' ),
 				postAuthor: author,
 				authors: getAuthors( query ),
-				isLoading: isResolving( 'core', 'getAuthors', [ query ] ),
+				isLoading: isResolving( 'getAuthors', [ query ] ),
 			};
 		},
 		[ fieldValue ]

From e0d063214f9b0203e209b9449f0ca9f364843e8f Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Fri, 22 Jan 2021 11:59:15 -0700
Subject: [PATCH 3/3] CSS improvements from @jasmussen.

---
 packages/components/src/combobox-control/style.scss | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/components/src/combobox-control/style.scss b/packages/components/src/combobox-control/style.scss
index 3cb0a8272e65c..246c42409b09f 100644
--- a/packages/components/src/combobox-control/style.scss
+++ b/packages/components/src/combobox-control/style.scss
@@ -36,6 +36,17 @@ input.components-combobox-control__input[type="text"] {
 	&:focus-within {
 		@include input-style__focus();
 	}
+
+	.components-spinner {
+		margin-top: auto;
+		margin-bottom: auto;
+		margin-right: 2px;
+		margin-left: $grid-unit-30;
+	}
+
+	.components-form-token-field__suggestions-list:empty {
+		border-top: none;
+	}
 }
 
 .components-combobox-control__reset.components-button {