Skip to content

Commit e0b8af4

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

File tree

10 files changed

+39
-20
lines changed

10 files changed

+39
-20
lines changed

packages/pf4-component-mapper/src/files/checkbox.d.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ interface CheckboxOptions extends AnyObject {
77
value?: any;
88
}
99

10-
interface CheckboxProps extends PfCheckboxProps {
10+
interface InternalCheckboxProps extends PfCheckboxProps {
1111
isReadOnly?: boolean;
1212
options?: CheckboxOptions;
1313
}
1414

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

1719
export default Checkbox;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-render
22
import { TextInputProps } from "@patternfly/react-core";
33
import FormGroupProps from "./form-group";
44

5-
declare const DatePicker: React.ComponentType<TextInputProps & FormGroupProps & UseFieldApiComponentConfig>;
5+
export type DatePickerProps = TextInputProps & FormGroupProps & UseFieldApiComponentConfig;
6+
7+
declare const DatePicker: React.ComponentType<DatePickerProps>;
68

79
export default DatePicker;

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export interface DualListSelectOption extends AnyObject {
77
label: ReactNode;
88
}
99

10-
export interface DualListSelectProps {
10+
interface InternalDualListSelectProps {
1111
leftTitle?: ReactNode;
1212
rightTitle?: ReactNode;
1313
moveLeftTitle?: ReactNode;
@@ -26,6 +26,8 @@ export interface DualListSelectProps {
2626
rightValues: DualListSelectOption[];
2727
}
2828

29-
declare const DualListSelect: React.ComponentType<DualListSelectProps & FormGroupProps & UseFieldApiComponentConfig>;
29+
export type DualListSelectProps = InternalDualListSelectProps & FormGroupProps & UseFieldApiComponentConfig;
30+
31+
declare const DualListSelect: React.ComponentType<DualListSelectProps>;
3032

3133
export default DualListSelect;

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ export interface RadioOption extends AnyObject {
77
value?: any;
88
}
99

10-
export interface RadioProps {
10+
interface InternalRadioProps {
1111
name: string;
1212
options: RadioOption[];
1313
isReadOnly?: boolean;
1414
isDisabled?: boolean;
1515
}
1616

17-
declare const Radio: React.ComponentType<RadioProps & FormGroupProps & UseFieldApiComponentConfig>;
17+
export type RadioProps = InternalRadioProps & FormGroupProps & UseFieldApiComponentConfig;
18+
19+
declare const Radio: React.ComponentType<RadioProps>;
1820

1921
export default Radio;

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export interface SelectOption {
77
value?: any;
88
}
99

10-
export interface SelectProps {
10+
interface BaseSelectProps {
1111
options?: SelectOption[];
1212
selectVariant?: 'default' | 'createable';
1313
isSearchable?: boolean;
@@ -23,7 +23,7 @@ export interface SelectProps {
2323
placeholder?: ReactNode;
2424
}
2525

26-
export interface InternalSelectProps extends SelectProps {
26+
export interface InternalSelectProps extends BaseSelectProps {
2727
value?: any;
2828
onChange?: (option?: any) => void;
2929
invalid?: boolean;
@@ -32,6 +32,8 @@ export interface InternalSelectProps extends SelectProps {
3232

3333
export const InternalSelect: React.ComponentType<InternalSelectProps>;
3434

35-
declare const Select: React.ComponentType<SelectProps & FormGroupProps & UseFieldApiComponentConfig>;
35+
export type SelectProps = BaseSelectProps & FormGroupProps & UseFieldApiComponentConfig;
36+
37+
declare const Select: React.ComponentType<SelectProps>;
3638

3739
export default Select;
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-renderer";
22
import FormGroupProps from "./form-group";
3-
import { InputHTMLAttributes } from "react";
43

5-
export interface SliderProps extends React.HTMLProps<React.InputHTMLAttributes<any>> {
4+
interface InternalSliderProps extends React.HTMLProps<React.InputHTMLAttributes<any>> {
65
isReadOnly?: boolean;
76
}
87

9-
declare const Slider: React.ComponentType<SliderProps & FormGroupProps & UseFieldApiComponentConfig>;
8+
export type SliderProps = InternalSliderProps & FormGroupProps & UseFieldApiComponentConfig;
9+
10+
declare const Slider: React.ComponentType<SliderProps>;
1011

1112
export default Slider;

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ import FormGroupProps from "./form-group";
22
import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-renderer";
33
import { SwitchProps as PFSwitchProps } from '@patternfly/react-core';
44

5-
export interface SwitchProps extends PFSwitchProps {
5+
interface InternalSwitchProps extends PFSwitchProps {
66
isReadOnly?: boolean;
77
}
88

9-
declare const Switch: React.ComponentType<SwitchProps & FormGroupProps & UseFieldApiComponentConfig>;
9+
export type SwitchProps = InternalSwitchProps & FormGroupProps & UseFieldApiComponentConfig;
10+
11+
declare const Switch: React.ComponentType<SwitchProps>;
1012

1113
export default Switch;

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ import FormGroupProps from "./form-group"
22
import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-renderer"
33
import { TextInputProps } from "@patternfly/react-core";
44

5-
export interface TextFieldProps extends TextInputProps {}
5+
interface InternalTextFieldProps extends TextInputProps {}
66

7-
declare const TextField: React.ComponentType<TextFieldProps & FormGroupProps & UseFieldApiComponentConfig>;
7+
export type TextFieldProps = InternalTextFieldProps & FormGroupProps & UseFieldApiComponentConfig;
8+
9+
declare const TextField: React.ComponentType<TextFieldProps>;
810

911
export default TextField;

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ import FormGroupProps from "./form-group";
22
import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-renderer";
33
import { TextAreaProps as PfTextAreaProps } from '@patternfly/react-core';
44

5-
export interface TextareaProps extends PfTextAreaProps {}
5+
interface InternalTextareaProps extends PfTextAreaProps {}
66

7-
declare const Textarea: React.ComponentType<TextareaProps & FormGroupProps & UseFieldApiComponentConfig>;
7+
export type TextareaProps = InternalTextareaProps & FormGroupProps & UseFieldApiComponentConfig;
8+
9+
declare const Textarea: React.ComponentType<TextareaProps>;
810

911
export default Textarea;

packages/pf4-component-mapper/src/files/time-picker.d.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-render
22
import { TextInputProps } from "@patternfly/react-core";
33
import FormGroupProps from "./form-group";
44

5-
declare const TimePicker: React.ComponentType<TextInputProps & FormGroupProps & UseFieldApiComponentConfig>;
5+
export type TimePickerProps = TextInputProps & FormGroupProps & UseFieldApiComponentConfig;
6+
7+
declare const TimePicker: React.ComponentType<TimePickerProps>;
68

79
export default TimePicker;

0 commit comments

Comments
 (0)