Skip to content

Commit 9c3932b

Browse files
committed
Use definitelytyped for carbon components
1 parent 576c401 commit 9c3932b

File tree

12 files changed

+60
-31
lines changed

12 files changed

+60
-31
lines changed

packages/carbon-component-mapper/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"@carbon/icons-react": "^10.17.0",
3434
"@semantic-release/git": "^7.0.5",
3535
"@semantic-release/npm": "^5.1.1",
36+
"@types/carbon-components-react": "^7.10.9",
3637
"babel-core": "^7.0.0-bridge.0",
3738
"babel-eslint": "9.x",
3839
"babel-jest": "^23.6.0",

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
import { UseFieldApiComponentConfig, AnyObject } from "@data-driven-forms/react-form-renderer";
1+
import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-renderer";
22
import { ReactNode } from "react";
33
import { FormGroupProps } from "./form-group";
44

5-
export interface CheckboxOption extends AnyObject {
5+
import { CheckboxProps as CarbonCheckboxProps } from 'carbon-components-react';
6+
7+
export interface CheckboxOption extends CarbonCheckboxProps {
68
value?: any;
79
label: ReactNode;
810
}
911

10-
interface InternalCheckboxProps extends AnyObject, React.HTMLProps<HTMLInputElement> {
12+
interface InternalCheckboxProps extends CarbonCheckboxProps {
1113
options?: CheckboxOption[];
1214
}
1315

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
import { FormGroupProps } from "./form-group";
22
import { UseFieldApiComponentConfig, AnyObject } from "@data-driven-forms/react-form-renderer";
33

4-
interface InternalDatePickerProps extends AnyObject, React.HTMLProps<HTMLInputElement> {
4+
import { DatePickerProps as CarbonDatePickerProps, DatePickerInputProps } from 'carbon-components-react';
5+
6+
7+
interface InternalDatePickerProps extends DatePickerInputProps {
58
datePickerType?: string;
6-
DatePickerProps?: AnyObject;
9+
DatePickerProps?: DatePickerProps;
710
}
811

912
export type DatePickerProps = InternalDatePickerProps & FormGroupProps & UseFieldApiComponentConfig;

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1-
import { FormGroupProps } from "./form-group";
1+
import { FormGroupProps as CommonFormGroupProps } from "./form-group";
22
import { UseFieldApiComponentConfig, AnyObject } from "@data-driven-forms/react-form-renderer";
33
import { ReactNode } from "react";
44

5-
export interface RadioOption extends AnyObject {
5+
import { FormGroupProps, RadioButtonGroupProps, RadioButtonProps} from 'carbon-components-react';
6+
7+
export interface RadioOption extends RadioButtonProps {
68
value: any;
79
label?: ReactNode;
810
}
911

10-
interface InternalRadioProps extends AnyObject {
12+
interface InternalRadioProps extends RadioButtonGroupProps {
1113
isDisabled?: boolean;
1214
label?: ReactNode;
1315
options: RadioOption[];
14-
FormGroupProps?: AnyObject;
16+
FormGroupProps?: FormGroupProps;
1517
}
1618

17-
export type RadioProps = InternalRadioProps & FormGroupProps & UseFieldApiComponentConfig;
19+
export type RadioProps = InternalRadioProps & CommonFormGroupProps & UseFieldApiComponentConfig;
1820

1921
declare const Radio: React.ComponentType<RadioProps>;
2022

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import { FormGroupProps } from "./form-group";
2-
import { UseFieldApiComponentConfig, AnyObject } from "@data-driven-forms/react-form-renderer";
3-
import { ReactNode } from "react";
2+
import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-renderer";
43

5-
export interface SelectOption extends AnyObject {
6-
value?: any;
7-
label: ReactNode;
4+
import { SelectItemProps, SelectProps as CarbonSelectProps } from 'carbon-components-react';
5+
6+
export interface SelectOption extends SelectItemProps {
7+
value: any;
8+
label: string | undefined;
89
}
910

10-
interface InternalSelectProps extends React.HTMLProps<HTMLSelectElement> {
11+
interface InternalSelectProps extends CarbonSelectProps {
1112
options: SelectOption[];
1213
isDisabled?: boolean;
1314
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { FormGroupProps } from "./form-group";
2-
import { UseFieldApiComponentConfig, AnyObject } from "@data-driven-forms/react-form-renderer";
2+
import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-renderer";
33

4-
interface InternalSliderProps extends AnyObject, React.HTMLProps<HTMLInputElement> {
4+
import { SliderProps as CarbonSliderProps } from 'carbon-components-react';
5+
6+
interface InternalSliderProps extends CarbonSliderProps {
57
}
68

79
export type SliderProps = InternalSliderProps & FormGroupProps & UseFieldApiComponentConfig;

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { FormGroupProps } from "./form-group";
2-
import { UseFieldApiComponentConfig, AnyObject } from "@data-driven-forms/react-form-renderer";
2+
import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-renderer";
33

4-
interface InternalSwitchProps extends AnyObject, React.HTMLProps<HTMLInputElement> { }
4+
import { ToggleProps } from 'carbon-components-react';
5+
6+
interface InternalSwitchProps extends ToggleProps { }
57

68
export type SwitchProps = InternalSwitchProps & FormGroupProps & UseFieldApiComponentConfig;
79

packages/carbon-component-mapper/src/files/tabs.d.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
import { ReactNode } from "react";
2-
import { Field, AnyObject } from "@data-driven-forms/react-form-renderer";
2+
import { Field } from "@data-driven-forms/react-form-renderer";
33

4-
export interface TabField extends AnyObject {
4+
import { TabsProps as CarbonTabsProps, TabProps } from 'carbon-components-react';
5+
6+
export interface TabField extends TabProps {
57
name: string;
6-
title?: ReactNode;
8+
title?: string | undefined;
79
label?: ReactNode;
810
fields: Field[];
911
}
1012

11-
export interface TabsProps extends AnyObject {
13+
export interface TabsProps extends CarbonTabsProps {
1214
fields: TabField[];
1315
}
1416

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { FormGroupProps } from "./form-group";
2-
import { UseFieldApiComponentConfig, AnyObject } from "@data-driven-forms/react-form-renderer";
2+
import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-renderer";
33

4-
interface InternalTextFieldProps extends AnyObject, React.HTMLProps<HTMLInputElement> {
4+
import { TextInputProps } from 'carbon-components-react';
5+
6+
interface InternalTextFieldProps extends TextInputProps {
57
}
68

79
export type TextFieldProps = InternalTextFieldProps & FormGroupProps & UseFieldApiComponentConfig;

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { FormGroupProps } from "./form-group";
2-
import { UseFieldApiComponentConfig, AnyObject } from "@data-driven-forms/react-form-renderer";
2+
import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-renderer";
33

4-
interface InternalTextareaProps extends AnyObject, React.HTMLProps<HTMLInputElement> {
4+
import { TextAreaProps } from 'carbon-components-react';
5+
6+
interface InternalTextareaProps extends TextAreaProps {
57
}
68

79
export type TextareaProps = InternalTextareaProps & FormGroupProps & UseFieldApiComponentConfig;

0 commit comments

Comments
 (0)