Skip to content

Commit

Permalink
Fixes for supporting TypeScript 2.0.3 (ant-design#3358)
Browse files Browse the repository at this point in the history
  • Loading branch information
AlbertZheng committed Oct 19, 2016
1 parent 40ea091 commit ceea6ca
Show file tree
Hide file tree
Showing 15 changed files with 34 additions and 20 deletions.
2 changes: 1 addition & 1 deletion components/alert/index.tsx
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export interface AlertProps {
/** Additional content of Alert */
description?: React.ReactNode;
/** Callback when close Alert */
onClose?: (event) => void;
onClose?: React.MouseEventHandler;
/** Whether to show icon */
showIcon?: boolean;
style?: React.CSSProperties;
Expand Down
9 changes: 5 additions & 4 deletions components/auto-complete/index.tsx
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react';
import Select, { Option, OptGroup } from '../select';
import Select, { OptionProps, OptGroupProps } from '../select';
import { Option, OptGroup } from 'rc-select';
import classNames from 'classnames';

export interface SelectedValue {
Expand All @@ -23,13 +24,13 @@ export interface AutoCompleteProps {
defaultValue?: string | Array<any> | SelectedValue | Array<SelectedValue>;
value?: string | Array<any> | SelectedValue | Array<SelectedValue>;
allowClear?: boolean;
onChange?: (value) => void;
onChange?: (value: string | Array<any> | SelectedValue | Array<SelectedValue>) => void;
disabled?: boolean;
}

export default class AutoComplete extends React.Component<AutoCompleteProps, any> {
static Option = Option;
static OptGroup = OptGroup;
static Option = Option as React.ClassicComponentClass<OptionProps>;
static OptGroup = OptGroup as React.ClassicComponentClass<OptGroupProps>;

static defaultProps = {
prefixCls: 'ant-select',
Expand Down
2 changes: 1 addition & 1 deletion components/back-top/index.tsx
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const easeInOutCubic = (t, b, c, d) => {

export interface BackTopProps {
visibilityHeight?: number;
onClick?: (event) => void;
onClick?: React.MouseEventHandler;
target?: () => HTMLElement | Window;
prefixCls?: string;
className?: string;
Expand Down
2 changes: 1 addition & 1 deletion components/breadcrumb/Breadcrumb.tsx
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export interface BreadcrumbProps {
routes?: Array<any>;
params?: Object;
separator?: string | React.ReactNode;
itemRender?: (route, params, routes, paths) => React.ReactNode;
itemRender?: (route: any, params: any, routes: Array<any>, paths: Array<string>) => React.ReactNode;
style?: React.CSSProperties;
};

Expand Down
2 changes: 1 addition & 1 deletion components/date-picker/index.tsx
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export interface PickerProps {
popupStyle?: React.CSSProperties;
locale?: any;
size?: 'large' | 'small' | 'default';
getCalendarContainer?: (trigger) => React.ReactNode;
getCalendarContainer?: (trigger: any) => React.ReactNode;
prefixCls?: string;
inputPrefixCls?: string;
}
Expand Down
2 changes: 1 addition & 1 deletion components/form/Form.tsx
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export type WrappedFormUtils = {
/** 收集子节点的值的时机 */
trigger?: string;
/** 可以把 onChange 的参数转化为控件的值,例如 DatePicker 可设为:(date, dateString) => dateString */
getValueFromEvent?: (...args) => any;
getValueFromEvent?: (...args: any[]) => any;
/** 校验子节点值的时机 */
validateTrigger?: string;
/** 校验规则,参见 [async-validator](https://github.com/yiminghe/async-validator) */
Expand Down
2 changes: 1 addition & 1 deletion components/icon/index.tsx
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export interface IconProps {
type: string;
className?: string;
title?: string;
onClick?: (e) => void;
onClick?: React.MouseEventHandler;
spin?: boolean;
}

Expand Down
4 changes: 2 additions & 2 deletions components/message/index.tsx
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function notice(

type ConfigContent = React.ReactNode | string;
type ConfigDuration = number;
type ConfigOnClose = () => void;
export type ConfigOnClose = () => void;

export interface ConfigOptions {
top?: number;
Expand All @@ -64,7 +64,7 @@ export interface ConfigOptions {
}

export default {
info(content: ConfigContent, duration?: ConfigDuration, onClose?: ConfigOnClose) {
info(content: ConfigContent, duration?: ConfigDuration, onClose?: () => ConfigOnClose) {
return notice(content, duration, 'info', onClose);
},
success(content: ConfigContent, duration?: ConfigDuration, onClose?: ConfigOnClose) {
Expand Down
15 changes: 13 additions & 2 deletions components/notification/index.tsx
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,19 @@ function notice(args) {
});
}

const api = {
open(args) {
const api: {
success?(args: ArgsProps): void;
error?(args: ArgsProps): void;
info?(args: ArgsProps): void;
warn?(args: ArgsProps): void;
warning?(args: ArgsProps): void;

open(args: ArgsProps): void;
close(key: string): void;
config(options: ConfigProps): void;
destroy(): void;
} = {
open(args: ArgsProps) {
notice(args);
},
close(key) {
Expand Down
5 changes: 3 additions & 2 deletions components/select/index.tsx
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export interface SelectProps {
style?: React.CSSProperties;
dropdownStyle?: React.CSSProperties;
dropdownMenuStyle?: React.CSSProperties;
onChange?: (value) => void;
onChange?: (value: SelectValue) => void;
}

export interface OptionProps {
Expand All @@ -53,7 +53,8 @@ export interface SelectContext {
};
}

export { Option, OptGroup };
// => It is needless to export the declaration of below two inner components.
// export { Option, OptGroup };

export default class Select extends React.Component<SelectProps, any> {
static Option = Option as React.ClassicComponentClass<OptionProps>;
Expand Down
1 change: 1 addition & 0 deletions components/switch/index.tsx
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export interface SwitchProps {
onChange?: (checked: boolean) => any;
checkedChildren?: React.ReactNode;
unCheckedChildren?: React.ReactNode;
disabled?: boolean;
}

export default class Switch extends React.Component<SwitchProps, any> {
Expand Down
2 changes: 1 addition & 1 deletion components/table/Table.tsx
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ export default class Table extends React.Component<TableProps, any> {
const { pagination } = this.state;
if (pagination.size) {
size = pagination.size;
} else if (this.props.size === 'middle' || this.props.size === 'small') {
} else if (this.props.size as string === 'middle' || this.props.size === 'small') {
size = 'small';
}
let total = pagination.total || this.getLocalData().length;
Expand Down
2 changes: 1 addition & 1 deletion components/table/filterDropdown.tsx
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Checkbox from '../checkbox';
import Radio from '../radio';

export interface FilterDropdownMenuWrapperProps {
onClick?: Function;
onClick?: React.MouseEventHandler;
children?: any;
className?: string;
}
Expand Down
2 changes: 1 addition & 1 deletion components/tabs/index.tsx
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export default class Tabs extends React.Component<TabsProps, any> {
} = this.props;
let className = classNames({
[this.props.className]: !!this.props.className,
[`${prefixCls}-mini`]: size === 'small' || size === 'mini',
[`${prefixCls}-mini`]: size === 'small' || size as string === 'mini',
[`${prefixCls}-vertical`]: tabPosition === 'left' || tabPosition === 'right',
[`${prefixCls}-card`]: type.indexOf('card') >= 0,
[`${prefixCls}-${type}`]: true,
Expand Down
2 changes: 1 addition & 1 deletion components/upload/interface.tsx
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export interface UploadProps {
defaultFileList?: Array<File>;
fileList?: Array<File>;
action: string;
data?: Object | ((File) => any);
data?: Object | ((file: File) => any);
headers?: HttpRequestHeader;
showUploadList?: boolean;
multiple?: boolean;
Expand Down

0 comments on commit ceea6ca

Please sign in to comment.