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: revert unknown to any #17249

Merged
merged 5 commits into from
Jun 24, 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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/auto-complete/InputElement.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import * as ReactDOM from 'react-dom';

export interface InputElementProps {
children: React.ReactElement<unknown>;
children: React.ReactElement<any>;
}

export default class InputElement extends React.Component<InputElementProps, any> {
Expand Down
6 changes: 3 additions & 3 deletions components/auto-complete/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ export type DataSourceItemType =
| React.ReactElement<OptGroupProps>;

export interface AutoCompleteInputProps {
onChange?: React.FormEventHandler<unknown>;
value: unknown;
onChange?: React.FormEventHandler<any>;
value: any;
}

export type ValidInputElement =
Expand All @@ -34,7 +34,7 @@ export interface AutoCompleteProps extends AbstractSelectProps {
backfill?: boolean;
optionLabelProp?: string;
onChange?: (value: SelectValue) => void;
onSelect?: (value: SelectValue, option: Object) => unknown;
onSelect?: (value: SelectValue, option: Object) => any;
onBlur?: (value: SelectValue) => void;
onFocus?: () => void;
children?:
Expand Down
4 changes: 2 additions & 2 deletions components/breadcrumb/Breadcrumb.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ export interface Route {
export interface BreadcrumbProps {
prefixCls?: string;
routes?: Route[];
params?: unknown;
params?: any;
separator?: React.ReactNode;
itemRender?: (
route: Route,
params: unknown,
params: any,
routes: Array<Route>,
paths: Array<string>,
) => React.ReactNode;
Expand Down
4 changes: 2 additions & 2 deletions components/button/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ export type AnchorButtonProps = {
target?: string;
onClick?: React.MouseEventHandler<HTMLElement>;
} & BaseButtonProps &
Omit<React.AnchorHTMLAttributes<unknown>, 'type' | 'onClick'>;
Omit<React.AnchorHTMLAttributes<any>, 'type' | 'onClick'>;

export type NativeButtonProps = {
htmlType?: ButtonHTMLType;
onClick?: React.MouseEventHandler<HTMLElement>;
} & BaseButtonProps &
Omit<React.ButtonHTMLAttributes<unknown>, 'type' | 'onClick'>;
Omit<React.ButtonHTMLAttributes<any>, 'type' | 'onClick'>;

export type ButtonProps = Partial<AnchorButtonProps & NativeButtonProps>;

Expand Down
2 changes: 1 addition & 1 deletion components/checkbox/Checkbox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export interface AbstractCheckboxProps<T> {
onMouseLeave?: React.MouseEventHandler<HTMLElement>;
onKeyPress?: React.KeyboardEventHandler<HTMLElement>;
onKeyDown?: React.KeyboardEventHandler<HTMLElement>;
value?: unknown;
value?: any;
tabIndex?: number;
name?: string;
children?: React.ReactNode;
Expand Down
2 changes: 1 addition & 1 deletion components/checkbox/Group.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export interface CheckboxGroupState {
export interface CheckboxGroupContext {
checkboxGroup: {
toggleOption: (option: CheckboxOptionType) => void;
value: unknown;
value: any;
disabled: boolean;
};
}
Expand Down
2 changes: 1 addition & 1 deletion components/date-picker/interface.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export interface PickerProps {
style?: React.CSSProperties;
popupStyle?: React.CSSProperties;
dropdownClassName?: string;
locale?: unknown;
locale?: any;
size?: 'large' | 'small' | 'default';
getCalendarContainer?: (triggerNode: Element) => HTMLElement;
open?: boolean;
Expand Down
40 changes: 16 additions & 24 deletions components/form/Form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ import { FIELD_META_PROP, FIELD_DATA_PROP } from './constants';
import { FormContext } from './context';
import { FormWrappedProps } from './interface';

type FormCreateOptionMessagesCallback = (...args: unknown[]) => string;
type FormCreateOptionMessagesCallback = (...args: any[]) => string;

interface FormCreateOptionMessages {
[messageId: string]: string | FormCreateOptionMessagesCallback | FormCreateOptionMessages;
}

export interface FormCreateOption<T> {
onFieldsChange?: (props: T, fields: unknown, allFields: unknown) => void;
onValuesChange?: (props: T, changedValues: unknown, allValues: unknown) => void;
onFieldsChange?: (props: T, fields: any, allFields: any) => void;
onValuesChange?: (props: T, changedValues: any, allValues: any) => void;
mapPropsToFields?: (props: T) => void;
validateMessages?: FormCreateOptionMessages;
withRef?: boolean;
Expand Down Expand Up @@ -71,38 +71,32 @@ export type ValidationRule = {
/** validate from a regular expression */
pattern?: RegExp;
/** transform a value before validation */
transform?: (value: unknown) => unknown;
transform?: (value: any) => any;
/** custom validate function (Note: callback must be called) */
validator?: (
rule: unknown,
value: unknown,
callback: unknown,
source?: unknown,
options?: unknown,
) => unknown;
validator?: (rule: any, value: any, callback: any, source?: any, options?: any) => any;
};

export type ValidateCallback<V> = (errors: unknown, values: V) => void;
export type ValidateCallback<V> = (errors: any, values: V) => void;

export type GetFieldDecoratorOptions = {
/** 子节点的值的属性,如 Checkbox 的是 'checked' */
valuePropName?: string;
/** 子节点的初始值,类型、可选值均由子节点决定 */
initialValue?: unknown;
initialValue?: any;
/** 收集子节点的值的时机 */
trigger?: string;
/** 可以把 onChange 的参数转化为控件的值,例如 DatePicker 可设为:(date, dateString) => dateString */
getValueFromEvent?: (...args: unknown[]) => unknown;
getValueFromEvent?: (...args: any[]) => any;
/** Get the component props according to field value. */
getValueProps?: (value: unknown) => unknown;
getValueProps?: (value: any) => any;
/** 校验子节点值的时机 */
validateTrigger?: string | string[];
/** 校验规则,参见 [async-validator](https://github.com/yiminghe/async-validator) */
rules?: ValidationRule[];
/** 是否和其他控件互斥,特别用于 Radio 单选控件 */
exclusive?: boolean;
/** Normalize value to form component */
normalize?: (value: unknown, prevValue: unknown, allValues: unknown) => unknown;
normalize?: (value: any, prevValue: any, allValues: any) => any;
/** Whether stop validate on first rule of error for this field. */
validateFirst?: boolean;
/** 是否一直保留子节点的信息 */
Expand Down Expand Up @@ -141,11 +135,11 @@ export type ValidateFieldsOptions = {
};

// function create
export type WrappedFormUtils<V = unknown> = {
export type WrappedFormUtils<V = any> = {
/** 获取一组输入控件的值,如不传入参数,则获取全部组件的值 */
getFieldsValue(fieldNames?: Array<string>): { [field: string]: unknown };
getFieldsValue(fieldNames?: Array<string>): { [field: string]: any };
/** 获取一个输入控件的值 */
getFieldValue(fieldName: string): unknown;
getFieldValue(fieldName: string): any;
/** 设置一组输入控件的值 */
setFieldsValue(obj: Object): void;
/** 设置一组输入控件的值 */
Expand Down Expand Up @@ -192,17 +186,15 @@ export type WrappedFormUtils<V = unknown> = {
): (node: React.ReactNode) => React.ReactNode;
};

export interface WrappedFormInternalProps<V = unknown> {
export interface WrappedFormInternalProps<V = any> {
form: WrappedFormUtils<V>;
}

export interface RcBaseFormProps {
wrappedComponentRef?: unknown;
wrappedComponentRef?: any;
}

export interface FormComponentProps<V = unknown>
extends WrappedFormInternalProps<V>,
RcBaseFormProps {
export interface FormComponentProps<V = any> extends WrappedFormInternalProps<V>, RcBaseFormProps {
form: WrappedFormUtils<V>;
}

Expand Down
2 changes: 1 addition & 1 deletion components/icon/IconFont.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const customCache = new Set<string>();

export interface CustomIconOptions {
scriptUrl?: string;
extraCommonProps?: { [key: string]: unknown };
extraCommonProps?: { [key: string]: any };
}

export default function create(options: CustomIconOptions = {}): React.SFC<IconProps> {
Expand Down
16 changes: 8 additions & 8 deletions components/mention/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,29 @@ export interface MentionProps {
prefixCls?: string;
suggestionStyle?: React.CSSProperties;
defaultSuggestions?: Array<SuggestionItme>;
suggestions?: Array<React.ReactElement<unknown>>;
onSearchChange?: (value: string, trigger: string) => unknown;
onChange?: (contentState: unknown) => void;
notFoundContent?: unknown;
suggestions?: Array<React.ReactElement<any>>;
onSearchChange?: (value: string, trigger: string) => any;
onChange?: (contentState: any) => void;
notFoundContent?: any;
loading?: boolean;
style?: React.CSSProperties;
defaultValue?: unknown;
value?: unknown;
defaultValue?: any;
value?: any;
className?: string;
multiLines?: boolean;
prefix?: string | string[];
placeholder?: string;
getSuggestionContainer?: (triggerNode: Element) => HTMLElement;
onFocus?: React.FocusEventHandler<HTMLElement>;
onBlur?: React.FocusEventHandler<HTMLElement>;
onSelect?: (suggestion: string, data?: unknown) => void;
onSelect?: (suggestion: string, data?: any) => void;
readOnly?: boolean;
disabled?: boolean;
placement?: MentionPlacement;
}

export interface MentionState {
filteredSuggestions?: Array<unknown>;
filteredSuggestions?: Array<any>;
focus?: Boolean;
}

Expand Down
2 changes: 1 addition & 1 deletion components/mentions/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export type MentionPlacement = 'top' | 'bottom';
export interface OptionProps {
value: string;
children: React.ReactNode;
[key: string]: unknown;
[key: string]: any;
}

export interface MentionProps extends RcMentionsProps {
Expand Down
4 changes: 2 additions & 2 deletions components/menu/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ import raf from '../_util/raf';
export interface SelectParam {
key: string;
keyPath: Array<string>;
item: unknown;
item: any;
domEvent: Event;
selectedKeys: Array<string>;
}

export interface ClickParam {
key: string;
keyPath: Array<string>;
item: unknown;
item: any;
domEvent: Event;
}

Expand Down
2 changes: 1 addition & 1 deletion components/message/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function getMessageInstance(callback: (i: any) => void) {
type NoticeType = 'info' | 'success' | 'error' | 'warning' | 'loading';

export interface ThenableArgument {
(val: unknown): void;
(val: any): void;
}

export interface MessageType {
Expand Down
8 changes: 4 additions & 4 deletions components/modal/Modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export interface ModalProps {
maskStyle?: React.CSSProperties;
mask?: boolean;
keyboard?: boolean;
wrapProps?: unknown;
wrapProps?: any;
prefixCls?: string;
}

Expand All @@ -85,8 +85,8 @@ export interface ModalFuncProps {
title?: React.ReactNode;
content?: React.ReactNode;
// TODO: find out exact types
onOk?: (...args: unknown[]) => unknown;
onCancel?: (...args: unknown[]) => unknown;
onOk?: (...args: any[]) => any;
onCancel?: (...args: any[]) => any;
okButtonProps?: NativeButtonProps;
cancelButtonProps?: NativeButtonProps;
centered?: boolean;
Expand Down Expand Up @@ -214,7 +214,7 @@ export default class Modal extends React.Component<ModalProps, {}> {

const closeIcon = (
<span className={`${prefixCls}-close-x`}>
<Icon className={`${prefixCls}-close-icon`} type={'close'} />
<Icon className={`${prefixCls}-close-icon`} type="close" />
</span>
);

Expand Down
8 changes: 4 additions & 4 deletions components/radio/interface.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { AbstractCheckboxProps } from '../checkbox/Checkbox';
export type RadioGroupButtonStyle = 'outline' | 'solid';

export interface RadioGroupProps extends AbstractCheckboxGroupProps {
defaultValue?: unknown;
value?: unknown;
defaultValue?: any;
value?: any;
onChange?: (e: RadioChangeEvent) => void;
size?: 'large' | 'default' | 'small';
onMouseEnter?: React.MouseEventHandler<HTMLDivElement>;
Expand All @@ -18,13 +18,13 @@ export interface RadioGroupProps extends AbstractCheckboxGroupProps {
}

export interface RadioGroupState {
value: unknown;
value: any;
}

export interface RadioGroupContext {
radioGroup: {
onChange: React.ChangeEventHandler<HTMLInputElement>;
value: unknown;
value: any;
disabled: boolean;
name: string;
};
Expand Down
6 changes: 3 additions & 3 deletions components/select/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ export interface SelectProps<T = SelectValue> extends AbstractSelectProps {
firstActiveValue?: string | string[];
onChange?: (
value: T,
option: React.ReactElement<unknown> | React.ReactElement<unknown>[],
option: React.ReactElement<any> | React.ReactElement<any>[],
) => void;
onSelect?: (value: T extends (infer I)[] ? I : T, option: React.ReactElement<unknown>) => void;
onSelect?: (value: T extends (infer I)[] ? I : T, option: React.ReactElement<any>) => void;
onDeselect?: (value: T extends (infer I)[] ? I : T) => void;
onBlur?: (value: T) => void;
onFocus?: () => void;
Expand All @@ -75,7 +75,7 @@ export interface SelectProps<T = SelectValue> extends AbstractSelectProps {
optionFilterProp?: string;
labelInValue?: boolean;
tokenSeparators?: string[];
getInputElement?: () => React.ReactElement<unknown>;
getInputElement?: () => React.ReactElement<any>;
autoFocus?: boolean;
suffixIcon?: React.ReactNode;
removeIcon?: React.ReactNode;
Expand Down
2 changes: 1 addition & 1 deletion components/table/Table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import warning from '../_util/warning';

function noop() {}

function stopPropagation(e: React.SyntheticEvent<unknown>) {
function stopPropagation(e: React.SyntheticEvent<any>) {
e.stopPropagation();
if (e.nativeEvent.stopImmediatePropagation) {
e.nativeEvent.stopImmediatePropagation();
Expand Down
2 changes: 1 addition & 1 deletion components/table/filterDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import FilterDropdownMenuWrapper from './FilterDropdownMenuWrapper';
import { FilterMenuProps, FilterMenuState, ColumnProps, ColumnFilterItem } from './interface';
import { generateValueMaps } from './util';

function stopPropagation(e: React.SyntheticEvent<unknown>) {
function stopPropagation(e: React.SyntheticEvent<any>) {
e.stopPropagation();
if (e.nativeEvent.stopImmediatePropagation) {
e.nativeEvent.stopImmediatePropagation();
Expand Down