Try mounting on first render to avoid required defaultValue

WordPress · Feb 1, 2024 · e3c328f · e3c328f
1 parent 583d16e
commit e3c328f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/packages/components/src/custom-select-control-v2/custom-select.tsx b/packages/components/src/custom-select-control-v2/custom-select.tsx
@@ -1,7 +1,12 @@
 /**
  * WordPress dependencies
  */
-import { createContext, useMemo, useState } from '@wordpress/element';
+import {
+	createContext,
+	useEffect,
+	useMemo,
+	useState,
+} from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
 import { Icon, chevronDown } from '@wordpress/icons';
 
@@ -104,7 +109,11 @@ function _CustomSelect( props: _CustomSelectProps & CustomSelectStore ) {
 		...restProps
 	} = props;
 
-	const [ unmountOnHide, setUnmountOnHide ] = useState( true );
+	const [ unmountOnHide, setUnmountOnHide ] = useState( false );
+
+	useEffect( () => {
+		setUnmountOnHide( true );
+	}, [] );
 
 	return (
 		<>

diff --git a/packages/components/src/custom-select-control-v2/legacy-component/index.tsx b/packages/components/src/custom-select-control-v2/legacy-component/index.tsx
@@ -51,7 +51,6 @@ function _LegacyCustomSelect( props: LegacyCustomSelectProps ) {
 			};
 			onChange( changeObject );
 		},
-		defaultValue: options[ 0 ].name,
 	} );
 
 	const children = options.map(

diff --git a/packages/components/src/custom-select-control-v2/stories/default.story.tsx b/packages/components/src/custom-select-control-v2/stories/default.story.tsx
@@ -140,7 +140,6 @@ const renderControlledValue = ( gravatar: string | string[] ) => {
 export const Controlled = ControlledTemplate.bind( {} );
 Controlled.args = {
 	label: 'Default Gravatars',
-	defaultValue: 'wavatar',
 	renderSelectedValue: renderControlledValue,
 	children: (
 		<>
-Original file line number
+Diff line change
@@ Expand Up @@
     			};
     			onChange( changeObject );
     		},
-    		defaultValue: options[ 0 ].name,
     	} );
     	const children = options.map(
@@ Expand Down @@