Skip to content

Commit d8a5ea0

Browse files
committed
fix(blueprint): Merge exported component prop types into single type.
1 parent e2328dc commit d8a5ea0

File tree

11 files changed

+45
-23
lines changed

11 files changed

+45
-23
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ export interface CheckboxOption extends AnyObject {
88
label: ReactNode;
99
}
1010

11-
export interface CheckboxProps extends ICheckboxProps {
11+
interface InternalCheckboxProps extends ICheckboxProps {
1212
options?: CheckboxOption[];
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/blueprint-component-mapper/src/files/date-picker.d.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ export interface DatePickerValueRenderer {
77
(value?: string | Date): string;
88
}
99

10-
export interface DatePickerProps extends IDatePickerProps {
10+
interface InternalDatePickerProps extends IDatePickerProps {
1111
disabled?: boolean;
1212
valueRenderer?: DatePickerValueRenderer;
1313
PopoverProps?: IPopoverProps;
1414
ButtonProps: IButtonProps;
1515
}
1616

17-
declare const DatePicker: React.ComponentType<DatePickerProps & FormGroupProps & UseFieldApiComponentConfig>
17+
export type DatePickerProps = InternalDatePickerProps & FormGroupProps & UseFieldApiComponentConfig;
18+
19+
declare const DatePicker: React.ComponentType<DatePickerProps>;
1820

1921
export default DatePicker;

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

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

11-
export interface DualListSelectProps {
11+
interface InternalDualListSelectProps {
1212
leftTitle?: ReactNode;
1313
rightTitle?: ReactNode;
1414
moveLeftTitle?: ReactNode;
@@ -46,6 +46,8 @@ export interface DualListSelectProps {
4646
RightMenuItemProps?: IMenuItemProps;
4747
}
4848

49-
declare const DualListSelect: React.ComponentType<DualListSelectProps & FormGroupProps & UseFieldApiComponentConfig>
49+
export type DualListSelectProps = InternalDualListSelectProps & FormGroupProps & UseFieldApiComponentConfig;
50+
51+
declare const DualListSelect: React.ComponentType<DualListSelectProps>;
5052

5153
export default DualListSelect;

packages/blueprint-component-mapper/src/files/form-group.d.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { UseFieldApiComponentConfig, AnyObject } from "@data-driven-forms/react-
22
import { IFormGroupProps } from '@blueprintjs/core';
33
import { ReactNode } from "react";
44

5-
export interface FormGroupProps extends IFormGroupProps {
5+
interface InternalFormGroupProps extends IFormGroupProps {
66
isDisabled?: boolean;
77
FormGroupProps?: IFormGroupProps;
88
isReadOnly?: boolean;
@@ -14,14 +14,16 @@ export interface FormGroupProps extends IFormGroupProps {
1414
hideLabel?: boolean;
1515
}
1616

17-
export interface FormGroupInternalProps extends FormGroupProps {
17+
export interface FormGroupInternalProps extends InternalFormGroupProps {
1818
meta: AnyObject;
1919
input: AnyObject;
2020
Component: React.ComponentType;
2121
}
2222

2323
export const FormGroupInternal: React.ComponentType<FormGroupInternalProps>;
2424

25-
declare const FormGroup: React.ComponentType<FormGroupProps & UseFieldApiComponentConfig>;
25+
export type FormGroupProps = InternalFormGroupProps & UseFieldApiComponentConfig;
26+
27+
declare const FormGroup: React.ComponentType<FormGroupProps>;
2628

2729
export default FormGroup;

packages/blueprint-component-mapper/src/files/radio.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 { IRadioGroupProps } from "@blueprintjs/core";
44

5-
export interface RadioProps extends IRadioGroupProps {}
5+
interface InternalRadioProps extends IRadioGroupProps {}
66

7-
declare const Radio: React.ComponentType<RadioProps & FormGroupProps & UseFieldApiComponentConfig>;
7+
export type RadioProps = InternalRadioProps & FormGroupProps & UseFieldApiComponentConfig;
8+
9+
declare const Radio: React.ComponentType<RadioProps>;
810

911
export default Radio;

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

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

11-
export interface SelectProps extends ISelectProps<SelectOption> {
11+
interface InternalSelectProps extends ISelectProps<SelectOption> {
1212
options: SelectOption[];
1313
placeholder?: ReactNode;
1414
isSearchable?: boolean;
@@ -17,6 +17,8 @@ export interface SelectProps extends ISelectProps<SelectOption> {
1717
disabled?: boolean;
1818
}
1919

20-
declare const Select: React.ComponentType<SelectProps & FormGroupProps & UseFieldApiComponentConfig>;
20+
export type SelectProps = InternalSelectProps & FormGroupProps & UseFieldApiComponentConfig;
21+
22+
declare const Select: React.ComponentType<SelectProps>;
2123

2224
export default Select;

packages/blueprint-component-mapper/src/files/slider.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 { ISliderProps } from "@blueprintjs/core";
44

5-
export interface SliderProps extends ISliderProps {
5+
interface InternalSliderProps extends ISliderProps {
66
step?: string | number;
77
}
88

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

1113
export default Slider;

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-render
33
import { ISwitchProps } from "@blueprintjs/core";
44
import { ReactNode } from "react";
55

6-
export interface SwitchProps extends ISwitchProps {
6+
interface InternalSwitchProps extends ISwitchProps {
77
onText?: ReactNode;
88
offText?: ReactNode;
99
}
1010

11-
declare const Switch: React.ComponentType<SwitchProps & FormGroupProps & UseFieldApiComponentConfig>;
11+
export type SwitchProps = InternalSwitchProps & FormGroupProps & UseFieldApiComponentConfig;
12+
13+
declare const Switch: React.ComponentType<SwitchProps>;
1214

1315
export default Switch;

packages/blueprint-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 { IInputGroupProps } from "@blueprintjs/core";
44

5-
export interface TextFieldProps extends IInputGroupProps {}
5+
interface InternalTextFieldProps extends IInputGroupProps {}
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/blueprint-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 { ITextAreaProps } from "@blueprintjs/core";
44

5-
export interface TextareaProps extends ITextAreaProps {}
5+
interface InternalTextareaProps extends ITextAreaProps {}
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;

0 commit comments

Comments
 (0)