add delayPressIn/Out for button

ant-design · Jun 8, 2017 · b6ec8e2 · b6ec8e2
1 parent a245c9a
commit b6ec8e2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/components/button/PropsType.tsx b/components/button/PropsType.tsx
@@ -7,6 +7,8 @@ export interface ButtonProps {
   disabled?: boolean;
   onClick?: (x?: any) => void;
   loading?: boolean;
+  delayPressIn?: number;
+  delayPressOut?: number;
 }
 
 export interface ButtonWebProps extends WebProps, ButtonProps {

diff --git a/components/button/index.tsx b/components/button/index.tsx
@@ -65,7 +65,7 @@ export default class Button extends React.Component<ButtonNativeProps, any> {
     } = this.props;
     const buttonStyles = styles!;
 
-    ['activeOpacity', 'delayPressOut', 'underlayColor', 'onPress', 'onPressIn',
+    ['activeOpacity', 'underlayColor', 'onPress', 'onPressIn',
      'onPressOut', 'onShowUnderlay', 'onHideUnderlay'].forEach((prop) => {
        if (restProps.hasOwnProperty(prop)) {
          delete restProps[prop];
@@ -100,7 +100,6 @@ export default class Button extends React.Component<ButtonNativeProps, any> {
     return (
       <TouchableHighlight
         activeOpacity={1}
-        delayPressOut={1}
         underlayColor={underlayColor}
         style={wrapperStyle}
         onPress={(e?: any) => onClick && onClick(e)}

diff --git a/components/button/index.web.tsx b/components/button/index.web.tsx
@@ -37,8 +37,11 @@ class Button extends React.Component<ButtonWebProps, any> {
   };
 
   render() {
-    const { children, className, prefixCls, type, size, inline, across,
-      disabled, icon, loading, activeStyle, onClick, ...restProps } = this.props;
+    const {
+      children, className, prefixCls, type, size, inline, across,
+      disabled, icon, loading, activeStyle, onClick, delayPressIn,
+      delayPressOut, ...restProps,
+    } = this.props;
 
     const wrapCls = {
       [className as string]: className,
@@ -60,12 +63,20 @@ class Button extends React.Component<ButtonWebProps, any> {
       wrapCls[`${prefixCls}-icon`] = true;
     }
 
+    const delayProps: any = {};
+    if (delayPressIn) {
+      delayProps.delayPressIn = delayPressIn;
+    }
+    if (delayPressOut) {
+      delayProps.delayPressOut = delayPressOut;
+    }
     // use div, button native is buggy @yiminghe
     return (
       <Touchable
         activeClassName={activeStyle ? `${prefixCls}-active` : undefined}
         disabled={disabled}
         activeStyle={activeStyle}
+        {...delayProps}
       >
         <a
           role="button"