feat: optimize actionButton interface

DTStack · Dec 12, 2020 · aca2fbb · aca2fbb
1 parent d6200a9
commit aca2fbb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/components/dialog/ConfirmDialog.tsx b/src/components/dialog/ConfirmDialog.tsx
@@ -59,7 +59,7 @@ const ConfirmDialog = (props: ConfirmDialogProps) => {
         <ActionButton
             actionFn={onCancel}
             closeModal={close}
-            buttonProps={cancelButtonProps}
+           {...cancelButtonProps}
         >
             {cancelText}
         </ActionButton>
@@ -119,7 +119,7 @@ const ConfirmDialog = (props: ConfirmDialogProps) => {
                                 <ActionButton
                                     actionFn={onOk}
                                     closeModal={close}
-                                    buttonProps={okButtonProps}
+                                    {...okButtonProps}
                                 >
                                     {okText}
                                 </ActionButton>

diff --git a/src/components/dialog/actionButton.tsx b/src/components/dialog/actionButton.tsx
@@ -1,9 +1,8 @@
 import * as React from 'react';
 import { Button, IButton } from 'mo/components/button';
-export interface ActionButtonProps {
+export interface ActionButtonProps extends IButton{
     actionFn?: (...args: any[]) => any | PromiseLike<any>;
     closeModal: Function;
-    buttonProps?: IButton;
 }
 
 const ActionButton: React.FC<ActionButtonProps> = (props) => {
@@ -50,9 +49,9 @@ const ActionButton: React.FC<ActionButtonProps> = (props) => {
         handlePromiseOnOk(returnValueOfOnOk);
     };
 
-    const { children, buttonProps } = props;
+    const { children, ...resetProps } = props;
     return (
-        <Button onClick={onClick} {...buttonProps}>
+        <Button onClick={onClick} {...resetProps}>
             {children}
         </Button>
     );

diff --git a/src/components/dialog/style.scss b/src/components/dialog/style.scss
@@ -46,7 +46,6 @@
     &-content {
         font-size: 18px;
         padding: 0 15px;
-        pointer-events: auto;
         position: relative;
     }
 

diff --git a/stories/components/17-Dialog.stories.tsx b/stories/components/17-Dialog.stories.tsx
@@ -28,6 +28,7 @@ stories.add('Basic Usage', () => {
         confirm({
             title: 'Are you sure you want to permanently delete ?',
             content: 'This action is irreversible!',
+            cancelButtonProps: { disabled: true },
             onOk() {
                 console.log('OK');
             },