Add disableValue to type ChoicesProps and refactor componentes using ChoicesProps

Author: WiXSL

packages/ra-core/src/form/choices/useChoices.tsx

@@ -20,6 +20,7 @@ export interface ChoicesProps {
     optionValue?: string;
     optionText?: OptionText;
     translateChoice?: boolean;
+    disableValue?: string;
 }
 
 export interface UseChoicesOptions {

packages/ra-ui-materialui/src/field/SelectField.tsx

@@ -138,7 +138,7 @@ export const SelectField = genericMemo(SelectFieldImpl);
 
 export interface SelectFieldProps<
     RecordType extends Record<string, any> = Record<string, any>,
-> extends ChoicesProps,
+> extends Omit<ChoicesProps, 'disableValue'>,
         FieldProps<RecordType>,
         Omit<TypographyProps, 'textAlign'> {}
 

packages/ra-ui-materialui/src/input/AutocompleteInput.tsx

@@ -780,7 +780,7 @@ export interface AutocompleteInputProps<
     DisableClearable extends boolean | undefined = false,
     SupportCreate extends boolean | undefined = false,
 > extends Omit<CommonInputProps, 'source' | 'onChange'>,
-        ChoicesProps,
+        Omit<ChoicesProps, 'disableValue'>,
         UseSuggestionsOptions,
         Omit<SupportCreateSuggestionOptions, 'handleChange' | 'optionText'>,
         Omit<

packages/ra-ui-materialui/src/input/DatagridInput.tsx

@@ -177,7 +177,7 @@ export type DatagridInputProps = Omit<
     CommonInputProps,
     'source' | 'readOnly' | 'disabled'
 > &
-    ChoicesProps &
+    Omit<ChoicesProps, 'disableValue'> &
     Omit<SupportCreateSuggestionOptions, 'handleChange'> &
     DatagridProps & {
         children?: ReactNode;

packages/ra-ui-materialui/src/input/RadioButtonGroupInput.tsx

@@ -296,7 +296,6 @@ export type RadioButtonGroupInputProps = Omit<CommonInputProps, 'source'> &
     RadioGroupProps & {
         options?: RadioGroupProps;
         source?: string;
-        disableValue?: string;
     };
 
 const PREFIX = 'RaRadioButtonGroupInput';

packages/ra-ui-materialui/src/input/RadioButtonGroupInputItem.tsx

@@ -54,10 +54,12 @@ export default RadioButtonGroupInputItem;
 
 export interface RadioButtonGroupInputItemProps
     extends Omit<FormControlLabelProps, 'control' | 'label'>,
-        Pick<ChoicesProps, 'optionValue' | 'optionText' | 'translateChoice'> {
+        Pick<
+            ChoicesProps,
+            'optionValue' | 'optionText' | 'translateChoice' | 'disableValue'
+        > {
     choice: any;
     source: any;
-    disableValue?: string;
 }
 
 const PREFIX = 'RaRadioButtonGroupInputItem';

packages/ra-ui-materialui/src/input/SelectArrayInput.tsx

@@ -380,7 +380,6 @@ export type SelectArrayInputProps = ChoicesProps &
     Omit<CommonInputProps, 'source'> &
     Omit<FormControlProps, 'defaultValue' | 'onBlur' | 'onChange'> & {
         options?: SelectProps;
-        disableValue?: string;
         source?: string;
         onChange?: (event: ChangeEvent<HTMLInputElement> | RaRecord) => void;
     };

packages/ra-ui-materialui/src/input/SelectInput.tsx

@@ -415,7 +415,6 @@ export type SelectInputProps = Omit<CommonInputProps, 'source'> &
     ChoicesProps &
     Omit<SupportCreateSuggestionOptions, 'handleChange'> &
     Omit<TextFieldProps, 'label' | 'helperText' | 'classes' | 'onChange'> & {
-        disableValue?: string;
         emptyText?: string | ReactElement;
         emptyValue?: any;
         resettable?: boolean;