From f73720d38d269589f23f31b170ac258009949773 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Tue, 28 Jan 2025 16:02:05 -0700
Subject: [PATCH 01/16] Add loading indicator to author selector

---
 packages/components/src/combobox-control/index.tsx     | 3 +++
 packages/components/src/combobox-control/types.ts      | 5 +++++
 packages/editor/src/components/post-author/combobox.js | 6 ++++--
 packages/editor/src/components/post-author/hook.js     | 7 ++++---
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/packages/components/src/combobox-control/index.tsx b/packages/components/src/combobox-control/index.tsx
index 28510c8653d02..33276ed0823f8 100644
--- a/packages/components/src/combobox-control/index.tsx
+++ b/packages/components/src/combobox-control/index.tsx
@@ -35,6 +35,7 @@ import type { TokenInputProps } from '../form-token-field/types';
 import { useDeprecated36pxDefaultSizeProp } from '../utils/use-deprecated-props';
 import { withIgnoreIMEEvents } from '../utils/with-ignore-ime-events';
 import { maybeWarnDeprecated36pxSize } from '../utils/deprecated-36px-size';
+import Spinner from '../spinner';
 
 const noop = () => {};
 
@@ -126,6 +127,7 @@ function ComboboxControl( props: ComboboxControlProps ) {
 		help,
 		allowReset = true,
 		className,
+		isLoading = false,
 		messages = {
 			selected: __( 'Item selected.' ),
 		},
@@ -362,6 +364,7 @@ function ComboboxControl( props: ComboboxControlProps ) {
 								onChange={ onInputChange }
 							/>
 						</FlexBlock>
+						{ isLoading && <Spinner /> }
 						{ allowReset && (
 							<Button
 								size="small"
diff --git a/packages/components/src/combobox-control/types.ts b/packages/components/src/combobox-control/types.ts
index 470b38c35e2c8..d01aa213554c8 100644
--- a/packages/components/src/combobox-control/types.ts
+++ b/packages/components/src/combobox-control/types.ts
@@ -86,4 +86,9 @@ export type ComboboxControlProps = Pick<
 	 * If passed, the combobox input will show a placeholder string if no values are present.
 	 */
 	placeholder?: string;
+
+	/**
+	 * When loading, combobox will show a spinner
+	 */
+	isLoading?: boolean;
 };
diff --git a/packages/editor/src/components/post-author/combobox.js b/packages/editor/src/components/post-author/combobox.js
index 867eca7947976..f95dd0db2dcbf 100644
--- a/packages/editor/src/components/post-author/combobox.js
+++ b/packages/editor/src/components/post-author/combobox.js
@@ -17,7 +17,8 @@ export default function PostAuthorCombobox() {
 	const [ fieldValue, setFieldValue ] = useState();
 
 	const { editPost } = useDispatch( editorStore );
-	const { authorId, authorOptions } = useAuthorsQuery( fieldValue );
+	const { authorId, authorOptions, isLoading } =
+		useAuthorsQuery( fieldValue );
 
 	/**
 	 * Handle author selection.
@@ -44,13 +45,14 @@ export default function PostAuthorCombobox() {
 		<ComboboxControl
 			__nextHasNoMarginBottom
 			__next40pxDefaultSize
-			label={ __( 'Author' ) }
+			label={ __( 'Authorz' ) }
 			options={ authorOptions }
 			value={ authorId }
 			onFilterValueChange={ debounce( handleKeydown, 300 ) }
 			onChange={ handleSelect }
 			allowReset={ false }
 			hideLabelFromVision
+			isLoading={ isLoading }
 		/>
 	);
 }
diff --git a/packages/editor/src/components/post-author/hook.js b/packages/editor/src/components/post-author/hook.js
index f251eba79e180..28c4c126547b8 100644
--- a/packages/editor/src/components/post-author/hook.js
+++ b/packages/editor/src/components/post-author/hook.js
@@ -14,9 +14,9 @@ import { store as editorStore } from '../../store';
 import { AUTHORS_QUERY, BASE_QUERY } from './constants';
 
 export function useAuthorsQuery( search ) {
-	const { authorId, authors, postAuthor } = useSelect(
+	const { authorId, authors, postAuthor, isLoading } = useSelect(
 		( select ) => {
-			const { getUser, getUsers } = select( coreStore );
+			const { getUser, getUsers, isResolving } = select( coreStore );
 			const { getEditedPostAttribute } = select( editorStore );
 			const _authorId = getEditedPostAttribute( 'author' );
 			const query = { ...AUTHORS_QUERY };
@@ -30,6 +30,7 @@ export function useAuthorsQuery( search ) {
 				authorId: _authorId,
 				authors: getUsers( query ),
 				postAuthor: getUser( _authorId, BASE_QUERY ),
+				isLoading: isResolving( 'getUsers', [ query ] ),
 			};
 		},
 		[ search ]
@@ -68,5 +69,5 @@ export function useAuthorsQuery( search ) {
 		return [ ...currentAuthor, ...fetchedAuthors ];
 	}, [ authors, postAuthor ] );
 
-	return { authorId, authorOptions, postAuthor };
+	return { authorId, authorOptions, postAuthor, isLoading };
 }

From 76488c1841a4932a3350c927ea739c4da4b5bbfd Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Wed, 29 Jan 2025 07:29:48 -0700
Subject: [PATCH 02/16] Only show "No items found" when isLoading is false

---
 packages/components/src/combobox-control/index.tsx          | 1 +
 packages/components/src/form-token-field/index.tsx          | 2 ++
 .../components/src/form-token-field/suggestions-list.tsx    | 3 ++-
 packages/components/src/form-token-field/types.ts           | 6 ++++++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/components/src/combobox-control/index.tsx b/packages/components/src/combobox-control/index.tsx
index 33276ed0823f8..fe0b6aaad30b5 100644
--- a/packages/components/src/combobox-control/index.tsx
+++ b/packages/components/src/combobox-control/index.tsx
@@ -399,6 +399,7 @@ function ComboboxControl( props: ComboboxControlProps ) {
 							__experimentalRenderItem={
 								__experimentalRenderItem
 							}
+							isLoading={ isLoading }
 						/>
 					) }
 				</div>
diff --git a/packages/components/src/form-token-field/index.tsx b/packages/components/src/form-token-field/index.tsx
index 987c75d769b72..95af52fa21ffd 100644
--- a/packages/components/src/form-token-field/index.tsx
+++ b/packages/components/src/form-token-field/index.tsx
@@ -77,6 +77,7 @@ export function FormTokenField( props: FormTokenFieldProps ) {
 		__experimentalAutoSelectFirstMatch = false,
 		__nextHasNoMarginBottom = false,
 		tokenizeOnBlur = false,
+		isLoading = false,
 	} = useDeprecated36pxDefaultSizeProp< FormTokenFieldProps >( props );
 
 	if ( ! __nextHasNoMarginBottom ) {
@@ -743,6 +744,7 @@ export function FormTokenField( props: FormTokenFieldProps ) {
 						onHover={ onSuggestionHovered }
 						onSelect={ onSuggestionSelected }
 						__experimentalRenderItem={ __experimentalRenderItem }
+						isLoading={ isLoading }
 					/>
 				) }
 			</div>
diff --git a/packages/components/src/form-token-field/suggestions-list.tsx b/packages/components/src/form-token-field/suggestions-list.tsx
index 1339e0cc189e3..bd073026666d3 100644
--- a/packages/components/src/form-token-field/suggestions-list.tsx
+++ b/packages/components/src/form-token-field/suggestions-list.tsx
@@ -31,6 +31,7 @@ export function SuggestionsList<
 	suggestions = [],
 	displayTransform,
 	instanceId,
+	isLoading,
 	__experimentalRenderItem,
 }: SuggestionsListProps< T > ) {
 	const listRef = useRefEffect< HTMLUListElement >(
@@ -157,7 +158,7 @@ export function SuggestionsList<
 				);
 				/* eslint-enable jsx-a11y/click-events-have-key-events */
 			} ) }
-			{ suggestions.length === 0 && (
+			{ suggestions.length === 0 && ! isLoading && (
 				<li className="components-form-token-field__suggestion is-empty">
 					{ __( 'No items found' ) }
 				</li>
diff --git a/packages/components/src/form-token-field/types.ts b/packages/components/src/form-token-field/types.ts
index 051f00a6cdeb0..989a5611149a0 100644
--- a/packages/components/src/form-token-field/types.ts
+++ b/packages/components/src/form-token-field/types.ts
@@ -190,6 +190,11 @@ export interface FormTokenFieldProps
 	 * @default false
 	 */
 	tokenizeOnBlur?: boolean;
+
+	/**
+	 * Is the component loading data?
+	 */
+	isLoading?: boolean;
 }
 
 /**
@@ -207,6 +212,7 @@ export interface SuggestionsListProps<
 	displayTransform: ( value: T ) => string;
 	instanceId: string | number;
 	__experimentalRenderItem?: ( args: { item: T } ) => ReactNode;
+	isLoading?: boolean;
 }
 
 export interface TokenProps extends TokenItem {

From 07690d647b154c48f265fd14edc39a98f0f727bb Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Fri, 31 Jan 2025 07:57:25 -0700
Subject: [PATCH 03/16] Remove unitended change

---
 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 f95dd0db2dcbf..9cc6e01f5b82c 100644
--- a/packages/editor/src/components/post-author/combobox.js
+++ b/packages/editor/src/components/post-author/combobox.js
@@ -45,7 +45,7 @@ export default function PostAuthorCombobox() {
 		<ComboboxControl
 			__nextHasNoMarginBottom
 			__next40pxDefaultSize
-			label={ __( 'Authorz' ) }
+			label={ __( 'Author' ) }
 			options={ authorOptions }
 			value={ authorId }
 			onFilterValueChange={ debounce( handleKeydown, 300 ) }

From 736c5ff4676edca030ab73795db5cd5aa8c74365 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamsilverstein@earthboundhosting.com>
Date: Fri, 31 Jan 2025 07:59:55 -0700
Subject: [PATCH 04/16] Update
 packages/components/src/combobox-control/types.ts

Co-authored-by: Marco Ciampini <marco.ciampo@gmail.com>
---
 packages/components/src/combobox-control/types.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/components/src/combobox-control/types.ts b/packages/components/src/combobox-control/types.ts
index d01aa213554c8..8ecdad501e6b8 100644
--- a/packages/components/src/combobox-control/types.ts
+++ b/packages/components/src/combobox-control/types.ts
@@ -88,7 +88,8 @@ export type ComboboxControlProps = Pick<
 	placeholder?: string;
 
 	/**
-	 * When loading, combobox will show a spinner
+	 * Show a spinner (and hide the suggestions dropdown) while data
+	 * about the matching suggestions (ie the `options` prop) is loading
 	 */
 	isLoading?: boolean;
 };

From fd97afccde43da4d5a55a24cb6bf08bb4ef220b9 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Fri, 31 Jan 2025 08:00:26 -0700
Subject: [PATCH 05/16] Revert "Only show "No items found" when isLoading is
 false"

This reverts commit 76488c1841a4932a3350c927ea739c4da4b5bbfd.
---
 packages/components/src/combobox-control/index.tsx          | 1 -
 packages/components/src/form-token-field/index.tsx          | 2 --
 .../components/src/form-token-field/suggestions-list.tsx    | 3 +--
 packages/components/src/form-token-field/types.ts           | 6 ------
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/packages/components/src/combobox-control/index.tsx b/packages/components/src/combobox-control/index.tsx
index fe0b6aaad30b5..33276ed0823f8 100644
--- a/packages/components/src/combobox-control/index.tsx
+++ b/packages/components/src/combobox-control/index.tsx
@@ -399,7 +399,6 @@ function ComboboxControl( props: ComboboxControlProps ) {
 							__experimentalRenderItem={
 								__experimentalRenderItem
 							}
-							isLoading={ isLoading }
 						/>
 					) }
 				</div>
diff --git a/packages/components/src/form-token-field/index.tsx b/packages/components/src/form-token-field/index.tsx
index 95af52fa21ffd..987c75d769b72 100644
--- a/packages/components/src/form-token-field/index.tsx
+++ b/packages/components/src/form-token-field/index.tsx
@@ -77,7 +77,6 @@ export function FormTokenField( props: FormTokenFieldProps ) {
 		__experimentalAutoSelectFirstMatch = false,
 		__nextHasNoMarginBottom = false,
 		tokenizeOnBlur = false,
-		isLoading = false,
 	} = useDeprecated36pxDefaultSizeProp< FormTokenFieldProps >( props );
 
 	if ( ! __nextHasNoMarginBottom ) {
@@ -744,7 +743,6 @@ export function FormTokenField( props: FormTokenFieldProps ) {
 						onHover={ onSuggestionHovered }
 						onSelect={ onSuggestionSelected }
 						__experimentalRenderItem={ __experimentalRenderItem }
-						isLoading={ isLoading }
 					/>
 				) }
 			</div>
diff --git a/packages/components/src/form-token-field/suggestions-list.tsx b/packages/components/src/form-token-field/suggestions-list.tsx
index bd073026666d3..1339e0cc189e3 100644
--- a/packages/components/src/form-token-field/suggestions-list.tsx
+++ b/packages/components/src/form-token-field/suggestions-list.tsx
@@ -31,7 +31,6 @@ export function SuggestionsList<
 	suggestions = [],
 	displayTransform,
 	instanceId,
-	isLoading,
 	__experimentalRenderItem,
 }: SuggestionsListProps< T > ) {
 	const listRef = useRefEffect< HTMLUListElement >(
@@ -158,7 +157,7 @@ export function SuggestionsList<
 				);
 				/* eslint-enable jsx-a11y/click-events-have-key-events */
 			} ) }
-			{ suggestions.length === 0 && ! isLoading && (
+			{ suggestions.length === 0 && (
 				<li className="components-form-token-field__suggestion is-empty">
 					{ __( 'No items found' ) }
 				</li>
diff --git a/packages/components/src/form-token-field/types.ts b/packages/components/src/form-token-field/types.ts
index 989a5611149a0..051f00a6cdeb0 100644
--- a/packages/components/src/form-token-field/types.ts
+++ b/packages/components/src/form-token-field/types.ts
@@ -190,11 +190,6 @@ export interface FormTokenFieldProps
 	 * @default false
 	 */
 	tokenizeOnBlur?: boolean;
-
-	/**
-	 * Is the component loading data?
-	 */
-	isLoading?: boolean;
 }
 
 /**
@@ -212,7 +207,6 @@ export interface SuggestionsListProps<
 	displayTransform: ( value: T ) => string;
 	instanceId: string | number;
 	__experimentalRenderItem?: ( args: { item: T } ) => ReactNode;
-	isLoading?: boolean;
 }
 
 export interface TokenProps extends TokenItem {

From 3a357c49486459f4c74e7911396ab08c174fd323 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Fri, 31 Jan 2025 08:19:49 -0700
Subject: [PATCH 06/16] =?UTF-8?q?Only=20show=20the=20suggestion=20list=20w?=
 =?UTF-8?q?hen=20the=20component=20isn=E2=80=99t=20loading=20data?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/components/src/combobox-control/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/src/combobox-control/index.tsx b/packages/components/src/combobox-control/index.tsx
index 33276ed0823f8..9c6bd2a4d75dd 100644
--- a/packages/components/src/combobox-control/index.tsx
+++ b/packages/components/src/combobox-control/index.tsx
@@ -378,7 +378,7 @@ function ComboboxControl( props: ComboboxControlProps ) {
 							/>
 						) }
 					</InputWrapperFlex>
-					{ isExpanded && (
+					{ isExpanded && ! isLoading && (
 						<SuggestionsList
 							instanceId={ instanceId }
 							// The empty string for `value` here is not actually used, but is

From 374b2b887626aa2b964a4e6c2b8222d2df53b956 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Fri, 31 Jan 2025 08:22:27 -0700
Subject: [PATCH 07/16] Document `isLoading` prop in readme

---
 packages/components/src/combobox-control/README.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/components/src/combobox-control/README.md b/packages/components/src/combobox-control/README.md
index 4089cf9c56e9b..94a2c08057a94 100644
--- a/packages/components/src/combobox-control/README.md
+++ b/packages/components/src/combobox-control/README.md
@@ -39,6 +39,7 @@ function MyComboboxControl() {
 			label="Font Size"
 			value={ fontSize }
 			onChange={ setFontSize }
+			isLoading={ isLoading }
 			options={ filteredOptions }
 			onFilterValueChange={ ( inputValue ) =>
 				setFilteredOptions(
@@ -112,13 +113,20 @@ If the control is clicked, the dropdown will expand regardless of this prop.
 -   Required: No
 -   Default: `true`
 
-### placeholder
+#### placeholder
 
 If passed, the combobox input will show a placeholder string if no values are present.
 
 -   Type: `string`
 -   Required: No
 
+#### isLoading
+
+If true, the dropdown will show a loading indicator.
+
+-   Type: `Boolean`
+-   Required: No
+
 #### __experimentalRenderItem
 
 Custom renderer invoked for each option in the suggestion list. The render prop receives as its argument an object containing, under the `item` key, the single option's data (directly from the array of data passed to the `options` prop).

From 45bbc6b0deb68ec0c53245fad841588e62cd7930 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Fri, 31 Jan 2025 09:17:39 -0700
Subject: [PATCH 08/16] Add is loading to Combobox storybook

---
 packages/components/src/combobox-control/stories/index.story.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/components/src/combobox-control/stories/index.story.tsx b/packages/components/src/combobox-control/stories/index.story.tsx
index f033742a33662..19eecea54f689 100644
--- a/packages/components/src/combobox-control/stories/index.story.tsx
+++ b/packages/components/src/combobox-control/stories/index.story.tsx
@@ -124,6 +124,7 @@ WithCustomRenderItem.args = {
 			</div>
 		);
 	},
+	isLoading: true,
 };
 
 /**

From cc0e64ac6811fd0bd6d1d9c390f8bc31896e96a2 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Fri, 31 Jan 2025 09:28:00 -0700
Subject: [PATCH 09/16] Match readme description to type.js description

---
 packages/components/src/combobox-control/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/src/combobox-control/README.md b/packages/components/src/combobox-control/README.md
index 94a2c08057a94..7a11c8b95fe2e 100644
--- a/packages/components/src/combobox-control/README.md
+++ b/packages/components/src/combobox-control/README.md
@@ -122,7 +122,7 @@ If passed, the combobox input will show a placeholder string if no values are pr
 
 #### isLoading
 
-If true, the dropdown will show a loading indicator.
+Show a spinner (and hide the suggestions dropdown) while data about the matching suggestions (ie the `options` prop) is loading
 
 -   Type: `Boolean`
 -   Required: No

From bcf4638e1fa2257fba5cec7858e102acf24f26f7 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Fri, 31 Jan 2025 09:32:44 -0700
Subject: [PATCH 10/16] Revert post author changes

---
 packages/editor/src/components/post-author/combobox.js | 4 +---
 packages/editor/src/components/post-author/hook.js     | 7 +++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/editor/src/components/post-author/combobox.js b/packages/editor/src/components/post-author/combobox.js
index 9cc6e01f5b82c..867eca7947976 100644
--- a/packages/editor/src/components/post-author/combobox.js
+++ b/packages/editor/src/components/post-author/combobox.js
@@ -17,8 +17,7 @@ export default function PostAuthorCombobox() {
 	const [ fieldValue, setFieldValue ] = useState();
 
 	const { editPost } = useDispatch( editorStore );
-	const { authorId, authorOptions, isLoading } =
-		useAuthorsQuery( fieldValue );
+	const { authorId, authorOptions } = useAuthorsQuery( fieldValue );
 
 	/**
 	 * Handle author selection.
@@ -52,7 +51,6 @@ export default function PostAuthorCombobox() {
 			onChange={ handleSelect }
 			allowReset={ false }
 			hideLabelFromVision
-			isLoading={ isLoading }
 		/>
 	);
 }
diff --git a/packages/editor/src/components/post-author/hook.js b/packages/editor/src/components/post-author/hook.js
index 28c4c126547b8..f251eba79e180 100644
--- a/packages/editor/src/components/post-author/hook.js
+++ b/packages/editor/src/components/post-author/hook.js
@@ -14,9 +14,9 @@ import { store as editorStore } from '../../store';
 import { AUTHORS_QUERY, BASE_QUERY } from './constants';
 
 export function useAuthorsQuery( search ) {
-	const { authorId, authors, postAuthor, isLoading } = useSelect(
+	const { authorId, authors, postAuthor } = useSelect(
 		( select ) => {
-			const { getUser, getUsers, isResolving } = select( coreStore );
+			const { getUser, getUsers } = select( coreStore );
 			const { getEditedPostAttribute } = select( editorStore );
 			const _authorId = getEditedPostAttribute( 'author' );
 			const query = { ...AUTHORS_QUERY };
@@ -30,7 +30,6 @@ export function useAuthorsQuery( search ) {
 				authorId: _authorId,
 				authors: getUsers( query ),
 				postAuthor: getUser( _authorId, BASE_QUERY ),
-				isLoading: isResolving( 'getUsers', [ query ] ),
 			};
 		},
 		[ search ]
@@ -69,5 +68,5 @@ export function useAuthorsQuery( search ) {
 		return [ ...currentAuthor, ...fetchedAuthors ];
 	}, [ authors, postAuthor ] );
 
-	return { authorId, authorOptions, postAuthor, isLoading };
+	return { authorId, authorOptions, postAuthor };
 }

From f7f3eac35d445fa842239ba5d5b9aed658288bc9 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamsilverstein@earthboundhosting.com>
Date: Tue, 4 Feb 2025 07:55:37 -0700
Subject: [PATCH 11/16] Update
 packages/components/src/combobox-control/types.ts

Co-authored-by: George Mamadashvili <georgemamadashvili@gmail.com>
---
 packages/components/src/combobox-control/types.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/components/src/combobox-control/types.ts b/packages/components/src/combobox-control/types.ts
index 8ecdad501e6b8..aaabc831bd727 100644
--- a/packages/components/src/combobox-control/types.ts
+++ b/packages/components/src/combobox-control/types.ts
@@ -86,7 +86,6 @@ export type ComboboxControlProps = Pick<
 	 * If passed, the combobox input will show a placeholder string if no values are present.
 	 */
 	placeholder?: string;
-
 	/**
 	 * Show a spinner (and hide the suggestions dropdown) while data
 	 * about the matching suggestions (ie the `options` prop) is loading

From 89584b1e5cd413005ad87b675ff39f2359834c78 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamsilverstein@earthboundhosting.com>
Date: Tue, 4 Feb 2025 07:56:08 -0700
Subject: [PATCH 12/16] Update
 packages/components/src/combobox-control/types.ts

Co-authored-by: George Mamadashvili <georgemamadashvili@gmail.com>
---
 packages/components/src/combobox-control/types.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/components/src/combobox-control/types.ts b/packages/components/src/combobox-control/types.ts
index aaabc831bd727..3398e9ee9a760 100644
--- a/packages/components/src/combobox-control/types.ts
+++ b/packages/components/src/combobox-control/types.ts
@@ -89,6 +89,8 @@ export type ComboboxControlProps = Pick<
 	/**
 	 * Show a spinner (and hide the suggestions dropdown) while data
 	 * about the matching suggestions (ie the `options` prop) is loading
+	 *
+	 * @default false
 	 */
 	isLoading?: boolean;
 };

From 304a5b773f67f262283f2610c996a66458e53cd8 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Tue, 4 Feb 2025 07:57:49 -0700
Subject: [PATCH 13/16] Remove storybook isLoading default

---
 packages/components/src/combobox-control/stories/index.story.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/components/src/combobox-control/stories/index.story.tsx b/packages/components/src/combobox-control/stories/index.story.tsx
index 19eecea54f689..f033742a33662 100644
--- a/packages/components/src/combobox-control/stories/index.story.tsx
+++ b/packages/components/src/combobox-control/stories/index.story.tsx
@@ -124,7 +124,6 @@ WithCustomRenderItem.args = {
 			</div>
 		);
 	},
-	isLoading: true,
 };
 
 /**

From e5262874b17838a95cedb0177311215fe7f9f9ba Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Tue, 4 Feb 2025 10:14:07 -0700
Subject: [PATCH 14/16] Ensire spinner margin is zero

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

diff --git a/packages/components/src/combobox-control/style.scss b/packages/components/src/combobox-control/style.scss
index c8fd8a168c0fb..90e9c84dddd58 100644
--- a/packages/components/src/combobox-control/style.scss
+++ b/packages/components/src/combobox-control/style.scss
@@ -36,5 +36,9 @@ input.components-combobox-control__input[type="text"] {
 	&:focus-within {
 		@include input-style__focus();
 	}
-}
 
+	.components-spinner {
+		margin: 0;
+	}
+
+}

From 782d82ab1372432c741bbf7e98860e4c15477355 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamjs@google.com>
Date: Tue, 4 Feb 2025 10:18:33 -0700
Subject: [PATCH 15/16] Add a changelog entry for the new spinner.

---
 packages/components/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index c487b0a17a288..a36773a8e16d6 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+-   `ComboboxControl`: Add an `isLoading` prop to show a loading spinner ([#68990](https://github.com/WordPress/gutenberg/pull/68990))
+
 ## 29.3.0 (2025-01-29)
 
 ### Enhancements

From d3bb5cb8f75ae7dec5d986de646f596083dfa5dd Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Wed, 5 Feb 2025 11:00:05 +0400
Subject: [PATCH 16/16] Empty space

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

diff --git a/packages/components/src/combobox-control/style.scss b/packages/components/src/combobox-control/style.scss
index 90e9c84dddd58..558475f6bd522 100644
--- a/packages/components/src/combobox-control/style.scss
+++ b/packages/components/src/combobox-control/style.scss
@@ -40,5 +40,4 @@ input.components-combobox-control__input[type="text"] {
 	.components-spinner {
 		margin: 0;
 	}
-
 }