Fix bad rebase and bad types

WordPress · sarayourfriend · Aug 10, 2021 · Jul 23, 2021 · Jul 26, 2021 · Jul 27, 2021
commit 630d060dce63af20b970c34bd889c11d62347a25
@@ -2,16 +2,12 @@
  * External dependencies
  */
 // eslint-disable-next-line no-restricted-imports
-<<<<<<< HEAD
 import type {
 	CSSProperties,
 	ReactNode,
 	ChangeEvent,
 	SyntheticEvent,
 } from 'react';
-=======
-import type { CSSProperties, ReactNode, ChangeEvent } from 'react';
->>>>>>> 38b7df613c (Add back event to onChange)
 import type { useDrag } from 'react-use-gesture';
 
 /**
@@ -67,17 +63,20 @@ export interface InputBaseProps extends BaseProps, FlexProps {
 }
 
 export interface InputControlProps
-	extends Omit< InputBaseProps, 'children' >,
+	extends Omit< InputBaseProps, 'children' | 'isFocused' >,
 		/**
 		 * The `prefix` prop in `PolymorphicComponentProps< InputFieldProps, 'input', false >` comes from the
 		 * `HTMLInputAttributes` and clashes with the one from `InputBaseProps`. So we have to omit it from
 		 * `PolymorphicComponentProps< InputFieldProps, 'input', false >` in order that `InputBaseProps[ 'prefix' ]`
 		 * be the only prefix prop. Otherwise it tries to do a union of the two prefix properties and you end up
 		 * with an unresolvable type.
+		 *
+		 * `isFocused` and `setIsFocused` are managed internally by the InputControl, but the rest of the props
+		 * for InputField are passed through.
 		 */
 		Omit<
 			PolymorphicComponentProps< InputFieldProps, 'input', false >,
-			'stateReducer' | 'prefix'
+			'stateReducer' | 'prefix' | 'isFocused' | 'setIsFocused'
 		> {
 	__unstableStateReducer?: InputFieldProps[ 'stateReducer' ];
 }

@@ -30,7 +30,8 @@ function useUniqueId( idProp?: string ) {
 	return idProp || id;
 }
 
-export interface SelectControlProps extends Omit< InputBaseProps, 'children' > {
+export interface SelectControlProps
+	extends Omit< InputBaseProps, 'children' | 'isFocused' > {
 	help?: string;
 	hideLabelFromVision?: boolean;
 	multiple?: boolean;