Remove useDeprecatedProps hook and update adapter

packages/components/src/custom-select-control-v2/index.tsx

@@ -1,5 +1,5 @@
 /**
  * Internal dependencies
  */
-export { LegacyAdapter as CustomSelect } from './legacy-adapter';
+export { DefaultExport as CustomSelect } from './legacy-adapter';
 export { default as CustomSelectItem } from './custom-select-item';

packages/components/src/custom-select-control-v2/legacy-adapter.tsx

@@ -1,15 +1,23 @@
 /**
  * Internal dependencies
  */
-import CustomSelect from './custom-select';
-import type { LegacyCustomSelectProps } from './types';
-import { useDeprecatedProps } from './use-deprecated-props';
+import _LegacyCustomSelect from './legacy-component';
+import _NewCustomSelect from './default-component';
+import type { CustomSelectProps, LegacyCustomSelectProps } from './types';
 
-export function LegacyAdapter( props: LegacyCustomSelectProps ) {
+function isLegacy( props: any ): props is LegacyCustomSelectProps {
 	return (
-		<CustomSelect
-			{ ...useDeprecatedProps( props ) }
-			hideLabelFromVision={ props.hideLabelFromVision }
-		/>
+		typeof props.options !== 'undefined' ||
+		props.__experimentalShowSelectedHint !== undefined
 	);
 }
+
+export function DefaultExport(
+	props: LegacyCustomSelectProps | CustomSelectProps
+) {
+	if ( isLegacy( props ) ) {
+		return <_LegacyCustomSelect { ...props } />;
+	}
+
+	return <_NewCustomSelect { ...props } />;
+}

packages/components/src/custom-select-control-v2/types.ts

@@ -6,9 +6,7 @@ import type * as Ariakit from '@ariakit/react';
 /**
  * Internal dependencies
  */
-import type { useDeprecatedProps } from './use-deprecated-props';
 
-export type LegacyAdapterProps = Parameters< typeof useDeprecatedProps >[ 0 ];
 export type CustomSelectStore = {
 	/**
 	 * The store object returned by Ariakit's `useSelectStore` hook.
@@ -75,6 +73,8 @@ type Option = {
  */
 type OnChangeObject = {
 	selectedItem: Option;
+	highlightedIndex?: number;
+	isOpen?: boolean;
 };
 
 export type LegacyCustomSelectProps = {