Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: typescript React import #3179

Merged
merged 3 commits into from
Apr 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/accordion/index.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import RcCollapse, { Panel } from 'rc-collapse';
import React, { CSSProperties } from 'react';
import * as React from 'react';
import { AccordionPropsTypes } from './PropsType';

export interface AccordionProps extends AccordionPropsTypes {
className?: string;
prefixCls?: string;
openAnimation?: any;
accordion?: boolean;
style?: CSSProperties;
style?: React.CSSProperties;
}

export default class Accordion extends React.Component<AccordionProps, any> {
Expand Down
4 changes: 2 additions & 2 deletions components/action-sheet/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* tslint:disable:jsx-no-multiline-js */
import classnames from 'classnames';
import React from 'react';
import ReactDOM from 'react-dom';
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import Dialog from 'rmc-dialog';
import TouchFeedback from 'rmc-feedback';
import getDataAttr from '../_util/getDataAttr';
Expand Down
2 changes: 1 addition & 1 deletion components/activity-indicator/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* tslint:disable:jsx-no-multiline-js */
import classnames from 'classnames';
import React from 'react';
import * as React from 'react';
import { ActivityIndicatorPropTypes } from './PropsType';

export interface ActivityIndicatorProps extends ActivityIndicatorPropTypes {
Expand Down
4 changes: 2 additions & 2 deletions components/badge/index.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import classnames from 'classnames';
import React, { CSSProperties } from 'react';
import * as React from 'react';
import { BadgePropsTypes } from './PropsType';

export interface BadgeProps extends BadgePropsTypes {
prefixCls?: string;
className?: string;
hot?: boolean;
style?: CSSProperties;
style?: React.CSSProperties;
}

export default class Badge extends React.Component<BadgeProps, any> {
Expand Down
6 changes: 3 additions & 3 deletions components/button/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import classnames from 'classnames';
import React, { CSSProperties, MouseEventHandler } from 'react';
import * as React from 'react';
import TouchFeedback from 'rmc-feedback';
import Icon from '../icon';
import { ButtonPropsType } from './PropsType';
Expand All @@ -11,9 +11,9 @@ export interface ButtonProps extends ButtonPropsType {
inline?: boolean;
icon?: React.ReactNode;
activeClassName?: string;
activeStyle?: boolean | CSSProperties;
activeStyle?: boolean | React.CSSProperties;
style?: React.CSSProperties;
onClick?: MouseEventHandler<HTMLAnchorElement>;
onClick?: React.MouseEventHandler<HTMLAnchorElement>;
}

const rxTwoCNChar = /^[\u4e00-\u9fa5]{2}$/;
Expand Down
4 changes: 2 additions & 2 deletions components/calendar/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from 'prop-types';
import React from 'react';
import * as PropTypes from 'prop-types';
import * as React from 'react';
import { Calendar as RMCalendar } from 'rmc-calendar';
import { getComponentLocale } from '../_util/getLocale';
import Icon from '../icon';
Expand Down
2 changes: 1 addition & 1 deletion components/card/CardBody.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import classnames from 'classnames';
import React from 'react';
import * as React from 'react';

export interface CardBodyProps extends React.HTMLProps<HTMLDivElement> {
prefixCls?: string;
Expand Down
2 changes: 1 addition & 1 deletion components/card/CardFooter.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import classnames from 'classnames';
import React from 'react';
import * as React from 'react';
import { CardFooterPropsType } from './PropsType';

export interface CardFooterProps extends CardFooterPropsType {
Expand Down
6 changes: 3 additions & 3 deletions components/card/CardHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import classnames from 'classnames';
import React, { CSSProperties } from 'react';
import * as React from 'react';
import { CardHeaderPropsType } from './PropsType';

export interface CardHeaderProps extends CardHeaderPropsType {
prefixCls?: string;
className?: string;
style?: CSSProperties;
thumbStyle?: CSSProperties;
style?: React.CSSProperties;
thumbStyle?: React.CSSProperties;
}

export default class CardHeader extends React.Component<CardHeaderProps, any> {
Expand Down
2 changes: 1 addition & 1 deletion components/card/PropsType.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import * as React from 'react';

export interface CardPropsType {
full?: boolean;
Expand Down
2 changes: 1 addition & 1 deletion components/card/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import classnames from 'classnames';
import React from 'react';
import * as React from 'react';
import CardBody from './CardBody';
import CardFooter from './CardFooter';
import CardHeader from './CardHeader';
Expand Down
8 changes: 4 additions & 4 deletions components/carousel/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import classnames from 'classnames';
import React, { CSSProperties } from 'react';
import * as React from 'react';
import ReactCarousel from 'rmc-nuka-carousel';
import { CarouselPropsType } from './PropsType';

Expand All @@ -12,9 +12,9 @@ export interface CarouselProps extends CarouselPropsType {
afterChange?: (current: number) => void;
swipeSpeed?: number;
easing?: () => void;
style?: CSSProperties;
dotStyle?: CSSProperties;
dotActiveStyle?: CSSProperties;
style?: React.CSSProperties;
dotStyle?: React.CSSProperties;
dotActiveStyle?: React.CSSProperties;
frameOverflow?: IFrameOverFlow;
cellSpacing?: number;
slideWidth?: string | number;
Expand Down
2 changes: 1 addition & 1 deletion components/checkbox/AgreeItem.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import classnames from 'classnames';
import React from 'react';
import * as React from 'react';
import getDataAttr from '../_util/getDataAttr';
import Checkbox from './Checkbox';
import { CheckboxPropsType } from './PropsType';
Expand Down
2 changes: 1 addition & 1 deletion components/checkbox/Checkbox.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import classnames from 'classnames';
import RcCheckbox from 'rc-checkbox';
import React from 'react';
import * as React from 'react';

import { CheckboxPropsType } from './PropsType';

Expand Down
2 changes: 1 addition & 1 deletion components/checkbox/CheckboxItem.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import classnames from 'classnames';
import React from 'react';
import * as React from 'react';
import List from '../list';
import Checkbox, { CheckboxProps } from './Checkbox';
import { CheckboxItemPropsType } from './PropsType';
Expand Down
4 changes: 2 additions & 2 deletions components/date-picker-view/date-picker-view.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from 'prop-types';
import React from 'react';
import * as PropTypes from 'prop-types';
import * as React from 'react';
import RCDatePicker from 'rmc-date-picker/lib/DatePicker';
import { getComponentLocale } from '../_util/getLocale';
import { DatePickerProps } from './PropsType';
Expand Down
2 changes: 1 addition & 1 deletion components/date-picker/PropsType.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import * as React from 'react';

export interface DatePickerPropsType {
value?: Date;
Expand Down
4 changes: 2 additions & 2 deletions components/date-picker/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* tslint:disable:jsx-no-multiline-js */
import PropTypes from 'prop-types';
import React from 'react';
import * as PropTypes from 'prop-types';
import * as React from 'react';
import RCDatePicker from 'rmc-date-picker/lib/DatePicker';
import PopupDatePicker from 'rmc-date-picker/lib/Popup';
import { getComponentLocale } from '../_util/getLocale';
Expand Down
12 changes: 6 additions & 6 deletions components/drawer/PropsType.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { CSSProperties } from 'react';
import * as React from 'react';

export interface DrawerProps {
onOpenChange?: (isOpen: boolean) => void;
Expand All @@ -8,15 +8,15 @@ export interface DrawerProps {
}

export interface DrawerWebProps extends DrawerProps {
sidebarStyle?: CSSProperties;
contentStyle?: CSSProperties;
overlayStyle?: CSSProperties;
dragHandleStyle?: CSSProperties;
sidebarStyle?: React.CSSProperties;
contentStyle?: React.CSSProperties;
overlayStyle?: React.CSSProperties;
dragHandleStyle?: React.CSSProperties;
docked?: boolean;
transitions?: boolean;
touch?: boolean;
dragToggleDistance?: number;
prefixCls?: string;
className?: string;
style?: CSSProperties;
style?: React.CSSProperties;
}
2 changes: 1 addition & 1 deletion components/drawer/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import RmcDrawer from 'rmc-drawer';
import React from 'react';
import * as React from 'react';
import { DrawerWebProps } from './PropsType';

export default class Drawer extends React.Component<DrawerWebProps, any> {
Expand Down
2 changes: 1 addition & 1 deletion components/flex/Flex.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import classnames from 'classnames';
import React from 'react';
import * as React from 'react';
import { FlexPropsType as BasePropsType } from './PropsType';

export interface FlexProps extends BasePropsType {
Expand Down
2 changes: 1 addition & 1 deletion components/flex/FlexItem.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import classnames from 'classnames';
import React from 'react';
import * as React from 'react';
import { FlexItemPropsType } from './PropsType';

export interface FlexItemProps extends FlexItemPropsType {
Expand Down
2 changes: 1 addition & 1 deletion components/grid/PropsType.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import * as React from 'react';

export interface DataItem {
icon?: any;
Expand Down
2 changes: 1 addition & 1 deletion components/grid/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* tslint:disable:jsx-no-multiline-js */
import classnames from 'classnames';
import React from 'react';
import * as React from 'react';
import TouchFeedback from 'rmc-feedback';
import Carousel from '../carousel';
import Flex from '../flex';
Expand Down
2 changes: 1 addition & 1 deletion components/icon/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import classnames from 'classnames';
import React from 'react';
import * as React from 'react';
import loadSprite from './loadSprite';
import { IconPropsType } from './PropsType';
import { Omit } from '../_util/types';
Expand Down
2 changes: 1 addition & 1 deletion components/image-picker/PropsType.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// import React from 'react';
// import * as React from 'react';

export interface ImagePickerPropTypes {
style?: {};
Expand Down
2 changes: 1 addition & 1 deletion components/image-picker/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* tslint:disable:no-bitwise */
import classnames from 'classnames';
import React from 'react';
import * as React from 'react';
import TouchFeedback from 'rmc-feedback';
import Flex from '../flex';
import { ImagePickerPropTypes as BasePropsType } from './PropsType';
Expand Down
4 changes: 2 additions & 2 deletions components/input-item/CustomInput.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import classnames from 'classnames';
import React from 'react';
import ReactDOM from 'react-dom';
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import { addClass, removeClass } from '../_util/class';
import CustomKeyboard from './CustomKeyboard';
import Portal from './Portal';
Expand Down
2 changes: 1 addition & 1 deletion components/input-item/CustomKeyboard.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import classnames from 'classnames';
import React from 'react';
import * as React from 'react';
import TouchFeedback from 'rmc-feedback';
import { Omit } from '../_util/types';
import { IS_IOS } from '../_util/exenv';
Expand Down
2 changes: 1 addition & 1 deletion components/input-item/Input.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import * as React from 'react';
import { InputEventHandler } from './PropsType';
import { Omit } from '../_util/types';

Expand Down
4 changes: 2 additions & 2 deletions components/input-item/Portal.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import ReactDOM from 'react-dom';
import * as React from 'react';
import * as ReactDOM from 'react-dom';

const createPortal = ReactDOM.createPortal;
export interface PortalProps {
Expand Down
2 changes: 1 addition & 1 deletion components/input-item/PropsType.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import * as React from 'react';
export type InputEventHandler = (value?: string) => void;

export interface InputItemPropsType {
Expand Down
4 changes: 2 additions & 2 deletions components/input-item/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* tslint:disable:jsx-no-multiline-js */
import classnames from 'classnames';
import PropTypes from 'prop-types';
import React from 'react';
import * as PropTypes from 'prop-types';
import * as React from 'react';
import TouchFeedback from 'rmc-feedback';
import { getComponentLocale } from '../_util/getLocale';
import CustomInput from './CustomInput';
Expand Down
2 changes: 1 addition & 1 deletion components/list-view/Indexed.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import * as React from 'react';
import MListView from 'rmc-list-view';
import handleProps from './handleProps';
import { ListViewPropsType } from './PropsType';
Expand Down
2 changes: 1 addition & 1 deletion components/list-view/PropsType.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import * as React from 'react';
export interface ListViewPropsType {
dataSource: any;
initialListSize?: number;
Expand Down
2 changes: 1 addition & 1 deletion components/list-view/handleProps.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* tslint:disable:no-unused-variable */
import React from 'react';
import * as React from 'react';
/* tslint:enable:no-unused-variable */
import List from '../list';
import { ListViewProps } from './index';
Expand Down
2 changes: 1 addition & 1 deletion components/list-view/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import * as React from 'react';
import MListView from 'rmc-list-view';
import handleProps from './handleProps';
import IndexedList from './Indexed';
Expand Down
4 changes: 2 additions & 2 deletions components/list/ListItem.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* tslint:disable:jsx-no-multiline-js */
import classnames from 'classnames';
import React, { MouseEventHandler } from 'react';
import * as React from 'react';
import TouchFeedback from 'rmc-feedback';
import {
BriefProps as BriefBasePropsType,
Expand All @@ -12,7 +12,7 @@ export interface ListItemProps extends ListItemBasePropsType {
className?: string;
role?: string;
style?: React.CSSProperties;
onClick?: MouseEventHandler<HTMLDivElement>;
onClick?: React.MouseEventHandler<HTMLDivElement>;
}

export interface BriefProps extends BriefBasePropsType {
Expand Down
10 changes: 5 additions & 5 deletions components/list/PropsType.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { ReactNode } from 'react';
import * as React from 'react';
// export type ListType = JSX.Element
export interface ListPropsType {
renderHeader?: (() => React.ReactType) | string | JSX.Element;
Expand All @@ -10,9 +10,9 @@ export interface ListItemPropsType {
align?: 'top' | 'middle' | 'bottom';
disabled?: boolean;
multipleLine?: boolean;
children?: ReactNode;
thumb?: ReactNode | null;
extra?: ReactNode;
children?: React.ReactNode;
thumb?: React.ReactNode | null;
extra?: React.ReactNode;
arrow?: 'horizontal' | 'down' | 'up' | 'empty' | '';
wrap?: boolean;
activeStyle?: React.CSSProperties;
Expand All @@ -21,7 +21,7 @@ export interface ListItemPropsType {
}

export interface BriefProps {
children?: ReactNode;
children?: React.ReactNode;
wrap?: boolean;
style?: React.CSSProperties | {} | Array<{}>;
}
2 changes: 1 addition & 1 deletion components/list/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* tslint:disable:jsx-no-multiline-js */
import classnames from 'classnames';
import React from 'react';
import * as React from 'react';
import Item from './ListItem';
import { ListPropsType } from './PropsType';

Expand Down
4 changes: 2 additions & 2 deletions components/locale-provider/locale-provider.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from 'prop-types';
import React from 'react';
import * as PropTypes from 'prop-types';
import * as React from 'react';

export interface LocaleProviderProps {
locale: {
Expand Down
Loading