fix(single-select): fix duplicate disabled/isDisabled prop and fix ty…

…ping (#559)
logicalclocks · Jan 11, 2024 · e6147f0 · e6147f0
1 parent c79e758
commit e6147f0
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/src/components/single-select/index.tsx b/src/components/single-select/index.tsx
@@ -3,6 +3,7 @@ import {
   BoxProps,
   Flex,
   FormControl,
+  FormControlProps,
   FormErrorMessage,
   FormLabel,
   HStack,
@@ -50,14 +51,14 @@ type Conditionals =
     };
 
 export type Props = ParentProps &
+  FormControlProps &
   CleanBoxProps &
   Conditionals & {
     editable?: boolean;
     value: SingleSelectOption['value'];
     options: SingleSelectOption[] | string[];
     placeholder?: string;
     label?: string;
-    disabled?: boolean;
     width?: string | number;
     maxListHeight?: string;
     labelAction?: React.ReactNode;
@@ -68,8 +69,6 @@ export type Props = ParentProps &
     isClearable?: boolean; // just show X or not
     labelPosition?: 'side' | 'inline' | 'outside';
     invertLabelPosition?: boolean;
-    isInvalid?: boolean;
-    isDisabled?: boolean;
     isLoading?: boolean;
     errorMessage?: ReactNode;
 
@@ -88,7 +87,6 @@ export const SingleSelect = ({
   value,
   onChange,
   placeholder,
-  disabled,
   label,
   labelAction,
   width,
@@ -99,8 +97,6 @@ export const SingleSelect = ({
   isClearable = false,
   labelPosition = 'outside',
   invertLabelPosition = false,
-  isInvalid,
-  isDisabled,
   isLoading,
   errorMessage = '',
   menuPlacement,
@@ -143,8 +139,6 @@ export const SingleSelect = ({
       alignItems="baseline"
       justifyContent="start"
       flexDirection={flexDirection}
-      isInvalid={isInvalid}
-      isDisabled={disabled}
       {...props}
     >
       {['outside', 'side'].includes(labelPosition) && label && (