CustomSelectControl: Refactor and revert code changes made in #67733

WordPress · Dec 11, 2024 · 39ac45a · 39ac45a
1 parent 2ec0a2e
commit 39ac45a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/packages/components/src/custom-select-control/index.tsx b/packages/components/src/custom-select-control/index.tsx
@@ -116,8 +116,6 @@ function CustomSelectControl< T extends CustomSelectOption >(
 		defaultValue: options[ 0 ]?.name,
 	} );
 
-	const { value: currentValue } = Ariakit.useStoreState( store );
-
 	const children = options
 		.map( applyOptionDeprecations )
 		.map( ( { name, key, hint, style, className } ) => {
@@ -151,10 +149,12 @@ function CustomSelectControl< T extends CustomSelectOption >(
 			);
 		} );
 
+	const { value: currentValue } = Ariakit.useStoreState( store );
+
 	const renderSelectedValueHint = () => {
 		const selectedOptionHint = options
 			?.map( applyOptionDeprecations )
-			?.find( ( { name } ) => store.getState().value === name )?.hint;
+			?.find( ( { name } ) => currentValue === name )?.hint;
 
 		return (
 			<Styled.SelectedExperimentalHintWrapper>