Skip to content

Commit d003e0c

Browse files
committed
fix(mui): Merge exported component prop types into single type.
1 parent a2f0480 commit d003e0c

File tree

11 files changed

+41
-21
lines changed

11 files changed

+41
-21
lines changed
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { UseFieldApiComponentConfig } from '@data-driven-forms/react-form-renderer';
22
import { CheckboxProps as MuiCheckboxProps, GridProps, FormControlProps, FormGroupProps, FormControlLabelProps, FormLabelProps, FormHelperTextProps } from '@material-ui/core';
33

4-
export interface CheckboxProps extends MuiCheckboxProps {
4+
interface InternalCheckboxProps extends MuiCheckboxProps {
55
FormFieldGridProps?: GridProps;
66
FormControlProps?: FormControlProps;
77
FormGroupProps?: FormGroupProps;
@@ -11,6 +11,8 @@ export interface CheckboxProps extends MuiCheckboxProps {
1111
FormHelperTextProps: FormHelperTextProps;
1212
}
1313

14-
declare const Checkbox: React.ComponentType<CheckboxProps & UseFieldApiComponentConfig>;
14+
export type CheckboxProps = InternalCheckboxProps & UseFieldApiComponentConfig;
15+
16+
declare const Checkbox: React.ComponentType<CheckboxProps>;
1517

1618
export default Checkbox;

packages/mui-component-mapper/src/files/component-mapper.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ interface componentMapper {
3636

3737
declare const componentMapper: componentMapper;
3838

39-
export const Components: components;
39+
export const Components: Components;
4040

4141
export default componentMapper;

packages/mui-component-mapper/src/files/date-picker.d.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-render
33
import { GridProps } from "@material-ui/core";
44
import { MuiPickersUtilsProviderProps } from "material-ui-pickers/MuiPickersUtilsProvider";
55

6-
export interface DatePickerProps extends MuiDatePickerProps {
6+
interface InternalDatePickerProps extends MuiDatePickerProps {
77
FormFieldGridProps: GridProps;
88
MuiPickersUtilsProviderProps: MuiPickersUtilsProviderProps;
99
DatePickerProps: MuiDatePickerProps;
1010
}
1111

12-
declare const DatePicker: React.ComponentType<DatePickerProps & UseFieldApiComponentConfig>;
12+
export type DatePickerProps = InternalDatePickerProps & UseFieldApiComponentConfig;
13+
14+
declare const DatePicker: React.ComponentType<DatePickerProps>;
1315

1416
export default DatePicker;

packages/mui-component-mapper/src/files/dual-list-select.d.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export interface DualListOption extends AnyObject {
2222
label: ReactNode;
2323
}
2424

25-
export interface DualListSelectProps {
25+
interface InternalDualListSelectProps {
2626
leftTitle?: ReactNode;
2727
rightTitle?: ReactNode;
2828
moveLeftTitle?: ReactNode;
@@ -102,6 +102,8 @@ export interface DualListSelectProps {
102102
RightTitleProps?: TypographyProps;
103103
}
104104

105-
declare const DualListSelect: React.ComponentType<DualListSelectProps & UseFieldApiComponentConfig>;
105+
export type DualListSelectProps = InternalDualListSelectProps & UseFieldApiComponentConfig;
106+
107+
declare const DualListSelect: React.ComponentType<DualListSelectProps>;
106108

107109
export default DualListSelect;

packages/mui-component-mapper/src/files/radio.d.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export interface RadioOption extends AnyObject {
66
label: ReactNode;
77
value?: any;
88
}
9-
export interface RadioProps extends MuiRadioProps {
9+
interface InternalRadioProps extends MuiRadioProps {
1010
options?: RadioOption[];
1111
FormFieldGridProps?: GridProps;
1212
FormControlProps?: FormControlProps;
@@ -20,6 +20,8 @@ export interface RadioProps extends MuiRadioProps {
2020
validateOnMount?: boolean;
2121
}
2222

23-
declare const Radio: React.ComponentType<RadioProps & UseFieldApiComponentConfig>;
23+
export type RadioProps = InternalRadioProps & UseFieldApiComponentConfig;
24+
25+
declare const Radio: React.ComponentType<RadioProps>;
2426

2527
export default Radio;

packages/mui-component-mapper/src/files/select.d.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { AutocompleteProps } from "@material-ui/lab/Autocomplete";
33
import { ReactNode } from "react";
44
import { GridProps, TextFieldProps, InputProps } from "@material-ui/core";
55

6-
export interface SelectProps<T> extends AutocompleteProps<T> {
6+
interface InternalSelectProps<T> extends AutocompleteProps<T> {
77
isRequired?: boolean;
88
isDisabled?: boolean;
99
isReadOnly?: boolean;
@@ -22,6 +22,8 @@ export interface SelectProps<T> extends AutocompleteProps<T> {
2222
inputProps?: InputProps;
2323
}
2424

25-
declare const Select: React.ComponentType<SelectProps<any> & UseFieldApiComponentConfig>;
25+
export type SelectProps<T> = InternalSelectProps<T> & UseFieldApiComponentConfig;
26+
27+
declare const Select: React.ComponentType<SelectProps<any>>;
2628

2729
export default Select;

packages/mui-component-mapper/src/files/slider.d.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-render
22
import { SliderProps as MuiSliderProps, GridProps, FormControlProps, FormGroupProps, FormLabelProps, FormHelperTextProps } from '@material-ui/core';
33
import { ReactNode } from "react";
44

5-
export interface SliderProps extends MuiSliderProps {
5+
interface InternalSliderProps extends MuiSliderProps {
66
isReadOnly?: boolean;
77
isDisabled?: boolean;
88
isRequired?: boolean;
@@ -23,6 +23,8 @@ export interface SliderProps extends MuiSliderProps {
2323
AfterGridProps?: GridProps;
2424
}
2525

26-
declare const Slider: React.ComponentType<SliderProps & UseFieldApiComponentConfig>;
26+
export type SliderProps = InternalSliderProps & UseFieldApiComponentConfig;
27+
28+
declare const Slider: React.ComponentType<SliderProps>;
2729

2830
export default Slider;

packages/mui-component-mapper/src/files/switch.d.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-render
22
import { SwitchProps as MuiSwitchProps, GridProps, FormControlProps, FormGroupProps, FormControlLabelProps, FormLabelProps, FormHelperTextProps } from '@material-ui/core';
33
import { ReactNode } from "react";
44

5-
export interface SwitchProps extends MuiSwitchProps {
5+
interface InternalSwitchProps extends MuiSwitchProps {
66
isReadOnly?: boolean;
77
isDisabled?: boolean;
88
isRequired?: boolean;
@@ -21,6 +21,8 @@ export interface SwitchProps extends MuiSwitchProps {
2121
FormHelperTextProps?: FormHelperTextProps;
2222
}
2323

24-
declare const Switch: React.ComponentType<SwitchProps & UseFieldApiComponentConfig>;
24+
export type SwitchProps = InternalSwitchProps & UseFieldApiComponentConfig;
25+
26+
declare const Switch: React.ComponentType<SwitchProps>;
2527

2628
export default Switch;

packages/mui-component-mapper/src/files/text-field.d.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-render
22
import { TextFieldProps as MuiTextFieldProps, GridProps } from '@material-ui/core';
33
import { ReactNode } from "react";
44

5-
export interface TextFieldProps {
5+
interface InternalTextFieldProps {
66
isReadOnly?: boolean;
77
isDisabled?: boolean;
88
isRequired?: boolean;
@@ -11,6 +11,8 @@ export interface TextFieldProps {
1111
FormFieldGridProps?: GridProps;
1212
}
1313

14-
declare const TextField: React.ComponentType<TextFieldProps & MuiTextFieldProps & UseFieldApiComponentConfig>;
14+
export type TextFieldProps = InternalTextFieldProps & MuiTextFieldProps & UseFieldApiComponentConfig;
15+
16+
declare const TextField: React.ComponentType<TextFieldProps>;
1517

1618
export default TextField;

packages/mui-component-mapper/src/files/textarea.d.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-render
22
import { TextFieldProps, GridProps, InputProps } from "@material-ui/core";
33
import { ReactNode } from "react";
44

5-
export interface TextareaProps {
5+
interface InternalTextareaProps {
66
isReadOnly?: boolean;
77
isDisabled?: boolean;
88
isRequired?: boolean;
@@ -12,6 +12,8 @@ export interface TextareaProps {
1212
inputProps?: InputProps;
1313
}
1414

15-
declare const Textarea: React.ComponentType<TextareaProps & TextFieldProps & UseFieldApiComponentConfig>;
15+
export type TextareaProps = InternalTextareaProps & TextFieldProps & UseFieldApiComponentConfig;
16+
17+
declare const Textarea: React.ComponentType<TextareaProps>;
1618

1719
export default Textarea;

0 commit comments

Comments
 (0)