split type definition, ref #1845

ant-design · Sep 14, 2017 · c30d049 · c30d049
1 parent c14ccaa
commit c30d049
Show file tree

Hide file tree

Showing 17 changed files with 110 additions and 90 deletions.
diff --git a/components/accordion/PropsType.tsx b/components/accordion/PropsType.tsx
@@ -1,12 +1,8 @@
 interface AccordionProps {
   styles?: any;
   style?: any;
-  /** below web only */
-  className?: string;
-  prefixCls?: string;
   activeKey?: string | Array<string>;
   defaultActiveKey?: string | Array<string>;
-  openAnimation?: any;
   accordion?: boolean;
   onChange?: (x: any) => void;
 }

diff --git a/components/accordion/index.tsx b/components/accordion/index.tsx
@@ -1,6 +1,12 @@
 import React from 'react';
 import RcCollapse, { Panel } from 'rc-collapse';
-import AccordionProps from './PropsType';
+import BasePropsType from './PropsType';
+
+export interface AccordionProps extends BasePropsType {
+  className?: string;
+  prefixCls?: string;
+  openAnimation?: any;
+}
 
 export default class Accordion extends React.Component<AccordionProps, any> {
   static Panel = Panel;

diff --git a/components/activity-indicator/PropsType.tsx b/components/activity-indicator/PropsType.tsx
@@ -5,9 +5,6 @@ interface ActivityIndicatorPropTypes {
   size?: 'large' | 'small';
   text?: string;
   styles?: any;
-  /** web only */
-  prefixCls?: string;
-  className?: string;
 }
 
 export default ActivityIndicatorPropTypes;
diff --git a/components/activity-indicator/index.tsx b/components/activity-indicator/index.tsx
@@ -1,7 +1,12 @@
 /* tslint:disable:jsx-no-multiline-js */
 import React from 'react';
 import classnames from 'classnames';
-import ActivityIndicatorProps from './PropsType';
+import BasePropsType from './PropsType';
+
+export interface ActivityIndicatorProps extends BasePropsType {
+  prefixCls?: string;
+  className?: string;
+}
 
 export default class ActivityIndicator extends React.Component<ActivityIndicatorProps, any> {
   static defaultProps = {
@@ -26,18 +31,18 @@ export default class ActivityIndicator extends React.Component<ActivityIndicator
       if (toast) {
         return (
           <div className={wrapClass}>
-          {
-            text ? (
-              <div className={`${prefixCls}-content`}>
-                <span className={spinnerClass} aria-hidden="true" />
-                <span className={`${prefixCls}-toast`}>{text}</span>
-              </div>
-            ) : (
-              <div className={`${prefixCls}-content`}>
-                <span className={spinnerClass} aria-label="Loading" />
-              </div>
-            )
-          }
+            {
+              text ? (
+                <div className={`${prefixCls}-content`}>
+                  <span className={spinnerClass} aria-hidden="true" />
+                  <span className={`${prefixCls}-toast`}>{text}</span>
+                </div>
+              ) : (
+                  <div className={`${prefixCls}-content`}>
+                    <span className={spinnerClass} aria-label="Loading" />
+                  </div>
+                )
+            }
           </div>
         );
       } else {
@@ -47,10 +52,10 @@ export default class ActivityIndicator extends React.Component<ActivityIndicator
             <span className={`${prefixCls}-tip`}>{text}</span>
           </div>
         ) : (
-          <div className={wrapClass}>
-            <span className={spinnerClass} aria-label="loading" />
-          </div>
-        );
+            <div className={wrapClass}>
+              <span className={spinnerClass} aria-label="loading" />
+            </div>
+          );
       }
     } else {
       return null;

diff --git a/components/badge/PropsType.tsx b/components/badge/PropsType.tsx
@@ -1,16 +1,10 @@
 interface BadgeProps {
-  size?: 'large'|'small';
+  size?: 'large' | 'small';
   overflowCount?: number;
   corner?: boolean;
   dot?: boolean;
   text?: any;
   style?: any;
-  /** rn only */
-  styles?: any;
-  /** web only */
-  prefixCls?: string;
-  className?: string;
-  hot?: boolean;
 }
 
 export default BadgeProps;
diff --git a/components/badge/index.tsx b/components/badge/index.tsx
@@ -1,6 +1,12 @@
 import React from 'react';
 import classnames from 'classnames';
-import BadgeProps from './PropsType';
+import BasePropsType from './PropsType';
+
+export interface BadgeProps extends BasePropsType {
+  prefixCls?: string;
+  className?: string;
+  hot?: boolean;
+}
 
 export default class Badge extends React.Component<BadgeProps, any> {
   static defaultProps = {

diff --git a/components/button/PropsType.tsx b/components/button/PropsType.tsx
@@ -3,25 +3,13 @@ import React from 'react';
 export interface ButtonProps {
   type?: 'primary' | 'warning' | 'ghost';
   size?: 'large' | 'small';
-  activeStyle?: boolean|Object;
+  activeStyle?: boolean | Object;
   disabled?: boolean;
   onClick?: (x?: any) => void;
   loading?: boolean;
   delayPressIn?: number;
   delayPressOut?: number;
   style?: React.CSSProperties;
-  /* for web */
-  prefixCls?: string;
-  className?: string;
-  role?: string;
-  inline?: boolean;
-  icon?: string;
-  activeClassName?: string;
-  /* for native */
-  onPressIn?: (x?: any) => void;
-  onPressOut?: (x?: any) => void;
-  onShowUnderlay?: (x?: any) => void;
-  onHideUnderlay?: (x?: any) => void;
   styles?: {
     primaryRawText?: {},
     warningRawText?: {},

diff --git a/components/button/index.native.tsx b/components/button/index.native.tsx
@@ -2,7 +2,14 @@
 import React from 'react';
 import { TouchableHighlight, Text, StyleSheet, View, ActivityIndicator } from 'react-native';
 import buttonStyle from './style/index.native';
-import { ButtonProps } from './PropsType';
+import { ButtonProps as BasePropsType } from './PropsType';
+
+export interface ButtonProps extends BasePropsType {
+  onPressIn?: (x?: any) => void;
+  onPressOut?: (x?: any) => void;
+  onShowUnderlay?: (x?: any) => void;
+  onHideUnderlay?: (x?: any) => void;
+}
 
 const buttonStyles = StyleSheet.create<any>(buttonStyle);
 
@@ -68,11 +75,11 @@ export default class Button extends React.Component<ButtonProps, any> {
     const _styles = styles!;
 
     ['activeOpacity', 'underlayColor', 'onPress', 'onPressIn',
-     'onPressOut', 'onShowUnderlay', 'onHideUnderlay'].forEach((prop) => {
-       if (restProps.hasOwnProperty(prop)) {
-         delete restProps[prop];
-       }
-     });
+      'onPressOut', 'onShowUnderlay', 'onHideUnderlay'].forEach((prop) => {
+        if (restProps.hasOwnProperty(prop)) {
+          delete restProps[prop];
+        }
+      });
 
     const textStyle = [
       _styles[`${size}RawText`],

diff --git a/components/button/index.tsx b/components/button/index.tsx
@@ -1,9 +1,18 @@
 import React from 'react';
 import classnames from 'classnames';
 import Icon from '../icon';
-import { ButtonProps } from './PropsType';
+import { ButtonProps as BasePropsType } from './PropsType';
 import TouchFeedback from 'rmc-feedback';
 
+export interface ButtonProps extends BasePropsType {
+  prefixCls?: string;
+  className?: string;
+  role?: string;
+  inline?: boolean;
+  icon?: string;
+  activeClassName?: string;
+}
+
 const rxTwoCNChar = /^[\u4e00-\u9fa5]{2}$/;
 const isTwoCNChar = rxTwoCNChar.test.bind(rxTwoCNChar);
 function isString(str) {

diff --git a/components/card/CardBody.native.tsx b/components/card/CardBody.native.tsx
@@ -1,6 +1,10 @@
 import React from 'react';
 import { View } from 'react-native';
-import { CardBodyProps } from './PropsType';
+import { CardBodyProps as BasePropsType } from './PropsType';
+
+export interface CardBodyProps extends BasePropsType {
+  styles?: any;
+}
 
 export default class CardBody extends React.Component<CardBodyProps, any> {
   static defaultProps = {

diff --git a/components/card/CardBody.tsx b/components/card/CardBody.tsx
@@ -1,6 +1,11 @@
 import React from 'react';
 import classnames from 'classnames';
-import { CardBodyProps } from './PropsType';
+import { CardBodyProps as BasePropsType } from './PropsType';
+
+export interface CardBodyProps extends BasePropsType {
+  prefixCls?: string;
+  className?: string;
+}
 
 export default class CardBody extends React.Component<CardBodyProps, any> {
   static defaultProps = {

diff --git a/components/card/CardFooter.native.tsx b/components/card/CardFooter.native.tsx
@@ -1,6 +1,10 @@
 import React from 'react';
 import { View, Text } from 'react-native';
-import { CardFooterProps } from './PropsType';
+import { CardFooterProps as BasePropsType } from './PropsType';
+
+export interface CardFooterProps extends BasePropsType {
+  styles?: any;
+}
 
 export default class CardFooter extends React.Component<CardFooterProps, any> {
   static defaultProps = {
@@ -13,14 +17,14 @@ export default class CardFooter extends React.Component<CardFooterProps, any> {
     const contentDom = React.isValidElement(content) ? (
       <View style={{ flex: 1 }}>{content}</View>
     ) : (
-      <Text style={styles.footerContent}>{content}</Text>
-    );
+        <Text style={styles.footerContent}>{content}</Text>
+      );
 
     const extraDom = React.isValidElement(extra) ? (
       <View style={{ flex: 1 }}>{extra}</View>
     ) : (
-      <Text style={[styles.footerExtra]}>{extra}</Text>
-    );
+        <Text style={[styles.footerExtra]}>{extra}</Text>
+      );
 
     return (
       <View style={[styles.footerWrap, style]} {...restProps}>

diff --git a/components/card/CardFooter.tsx b/components/card/CardFooter.tsx
@@ -1,8 +1,12 @@
 import React from 'react';
 import classnames from 'classnames';
-import { CardFooterProps } from './PropsType';
+import { CardFooterProps as BasePropsType } from './PropsType';
 
-export default class CardFooter extends React.Component <CardFooterProps, any> {
+export interface CardFooterProps extends BasePropsType {
+  prefixCls?: string;
+}
+
+export default class CardFooter extends React.Component<CardFooterProps, any> {
   static defaultProps = {
     prefixCls: 'am-card',
   };

diff --git a/components/card/CardHeader.native.tsx b/components/card/CardHeader.native.tsx
@@ -1,7 +1,11 @@
 /* tslint:disable:jsx-no-multiline-js */
 import React from 'react';
 import { View, Text, Image } from 'react-native';
-import { CardHeaderProps } from './PropsType';
+import { CardHeaderProps as BasePropsType } from './PropsType';
+
+export interface CardHeaderProps extends BasePropsType {
+  styles?: any;
+}
 
 export default class CardHeader extends React.Component<CardHeaderProps, any> {
   static defaultProps = {
@@ -15,14 +19,14 @@ export default class CardHeader extends React.Component<CardHeaderProps, any> {
     const titleDom = React.isValidElement(title) ? (
       <View style={{ flex: 1 }}>{title}</View>
     ) : (
-      <Text style={styles.headerContent}>{title}</Text>
-    );
+        <Text style={styles.headerContent}>{title}</Text>
+      );
 
     const extraDom = React.isValidElement(extra) ? (
       <View style={{ flex: 1 }}>{extra}</View>
     ) : (
-      <Text style={[styles.headerExtra]}>{extra}</Text>
-    );
+        <Text style={[styles.headerExtra]}>{extra}</Text>
+      );
 
     return (
       <View style={[styles.headerWrap, style]} {...restProps}>

diff --git a/components/card/CardHeader.tsx b/components/card/CardHeader.tsx
@@ -1,8 +1,13 @@
 import React from 'react';
 import classnames from 'classnames';
-import { CardHeaderProps } from './PropsType';
+import { CardHeaderProps as BasePropsType } from './PropsType';
 
-export default class CardHeader extends React.Component <CardHeaderProps, any> {
+export interface CardHeaderProps extends BasePropsType {
+  prefixCls?: string;
+  className?: string;
+}
+
+export default class CardHeader extends React.Component<CardHeaderProps, any> {
   static defaultProps = {
     prefixCls: 'am-card',
     thumbStyle: {},

diff --git a/components/card/PropsType.tsx b/components/card/PropsType.tsx
@@ -1,43 +1,24 @@
 export interface CardProps {
   full?: boolean;
-  className?: string;
   style?: {};
-  /** web only */
-  prefixCls?: string;
-  /** rn only */
-  styles?: any;
 }
 
 export interface CardHeaderProps {
   title?: any;
   thumb?: string;
   extra?: any;
   thumbStyle?: {};
-  className?: string;
   style?: any;
-  /** web only */
-  prefixCls?: string;
-  /** rn only */
-  styles?: any;
 }
 
 export interface CardBodyProps {
   children?: any;
-  className?: string;
   style?: {};
-  /** web only */
-  prefixCls?: string;
-  /** rn only */
-  styles?: any;
 }
 
 export interface CardFooterProps {
   content?: any;
   extra?: any;
   className?: string;
   style?: {};
-  /** web only */
-  prefixCls?: string;
-  /** rn only */
-  styles?: any;
 }
diff --git a/components/card/index.tsx b/components/card/index.tsx
@@ -3,9 +3,14 @@ import classnames from 'classnames';
 import CardHeader from './CardHeader';
 import CardBody from './CardBody';
 import CardFooter from './CardFooter';
-import { CardProps } from './PropsType';
+import { CardProps as BasePropsType } from './PropsType';
 
-export default class Card extends React.Component <CardProps, any> {
+export interface CardProps extends BasePropsType {
+  prefixCls?: string;
+  className?: string;
+}
+
+export default class Card extends React.Component<CardProps, any> {
   static defaultProps = {
     prefixCls: 'am-card',
     full: false,