chore: Change AutoCompleteProps to extend SelectProps (ant-design#4565)

* Change AutoCompleteProps to extend SelectProps * Extract common props into AbstractSelectProps
nanqiu · Jan 12, 2017 · c01ee02 · c01ee02
1 parent 477fde8
commit c01ee02
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 24 deletions.
diff --git a/components/auto-complete/index.tsx b/components/auto-complete/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import Select, { OptionProps, OptGroupProps } from '../select';
+import Select, { AbstractSelectProps, OptionProps, OptGroupProps } from '../select';
 import { Option, OptGroup } from 'rc-select';
 import classNames from 'classnames';
 
@@ -11,21 +11,12 @@ export interface SelectedValue {
 export interface DataSourceItemObject { value: string; text: string; };
 export type DataSourceItemType = string | DataSourceItemObject;
 
-export interface AutoCompleteProps {
-  size?: 'large' | 'small' | 'default';
-  className?: string;
-  notFoundContent?: Element;
+export interface AutoCompleteProps extends AbstractSelectProps {
   dataSource: DataSourceItemType[];
-  prefixCls?: string;
-  transitionName?: string;
-  optionLabelProp?: string;
-  choiceTransitionName?: string;
-  showSearch?: boolean;
   defaultValue?: string | Array<any> | SelectedValue | Array<SelectedValue>;
   value?: string | Array<any> | SelectedValue | Array<SelectedValue>;
-  allowClear?: boolean;
   onChange?: (value: string | Array<any> | SelectedValue | Array<SelectedValue>) => void;
-  disabled?: boolean;
+  onSelect?: (value: string | Array<any> | SelectedValue | Array<SelectedValue>, option: Object) => any;
 }
 
 export default class AutoComplete extends React.Component<AutoCompleteProps, any> {

diff --git a/components/select/index.tsx b/components/select/index.tsx
@@ -6,33 +6,36 @@ import classNames from 'classnames';
 export type SelectValue = string | any[] | { key: string, label: React.ReactNode } |
  Array<{ key: string, label: React.ReactNode }>;
 
-export interface SelectProps {
-  prefixCls?: string;
-  className?: string;
-  value?: SelectValue;
-  defaultValue?: SelectValue;
+export interface AbstractSelectProps {
   size?: 'default' | 'large' | 'small';
-  combobox?: boolean;
+  className?: string;
   notFoundContent?: React.ReactNode | null;
-  showSearch?: boolean;
+  prefixCls?: string;
   transitionName?: string;
+  optionLabelProp?: string;
   choiceTransitionName?: string;
-  multiple?: boolean;
+  showSearch?: boolean;
   allowClear?: boolean;
+  disabled?: boolean;
+  style?: React.CSSProperties;
+  placeholder?: string;
+}
+
+export interface SelectProps extends AbstractSelectProps {
+  value?: SelectValue;
+  defaultValue?: SelectValue;
+  combobox?: boolean;
+  multiple?: boolean;
   filterOption?: boolean | ((inputValue: string, option: Object) => any);
   tags?: boolean;
   onSelect?: (value: SelectValue, option: Object) => any;
   onDeselect?: (value: SelectValue) => any;
   onSearch?: (value: string) => any;
-  placeholder?: string;
   dropdownMatchSelectWidth?: boolean;
   optionFilterProp?: string;
-  optionLabelProp?: string;
-  disabled?: boolean;
   defaultActiveFirstOption?: boolean;
   labelInValue?: boolean;
   getPopupContainer?: (triggerNode: React.ReactNode) => React.ReactNode | HTMLElement;
-  style?: React.CSSProperties;
   dropdownStyle?: React.CSSProperties;
   dropdownMenuStyle?: React.CSSProperties;
   onChange?: (value: SelectValue) => void;