popconfirm onVisibleChange should call with click event

close #8614
ant-design · Sep 7, 2018 · 02af089 · 02af089
1 parent a4bc1f6
commit 02af089
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/components/popconfirm/index.tsx b/components/popconfirm/index.tsx
@@ -9,12 +9,13 @@ import defaultLocale from '../locale-provider/default';
 
 export interface PopconfirmProps extends AbstractTooltipProps {
   title: React.ReactNode;
-  onConfirm?: (e: React.MouseEvent<any>) => void;
-  onCancel?: (e: React.MouseEvent<any>) => void;
+  onConfirm?: (e?: React.MouseEvent<any>) => void;
+  onCancel?: (e?: React.MouseEvent<any>) => void;
   okText?: React.ReactNode;
   okType?: ButtonType;
   cancelText?: React.ReactNode;
   icon?: React.ReactNode;
+  onVisibleChange?: (visible?: boolean, e?: React.MouseEvent<any>) => void;
 }
 
 export interface PopconfirmState {
@@ -58,7 +59,7 @@ class Popconfirm extends React.Component<PopconfirmProps, PopconfirmState> {
   }
 
   onConfirm = (e: React.MouseEvent<HTMLButtonElement>) => {
-    this.setVisible(false);
+    this.setVisible(false, e);
 
     const { onConfirm } = this.props;
     if (onConfirm) {
@@ -67,7 +68,7 @@ class Popconfirm extends React.Component<PopconfirmProps, PopconfirmState> {
   }
 
   onCancel = (e: React.MouseEvent<HTMLButtonElement>) => {
-    this.setVisible(false);
+    this.setVisible(false, e);
 
     const { onCancel } = this.props;
     if (onCancel) {
@@ -79,15 +80,15 @@ class Popconfirm extends React.Component<PopconfirmProps, PopconfirmState> {
     this.setVisible(visible);
   }
 
-  setVisible(visible: boolean) {
+  setVisible(visible: boolean, e?: React.MouseEvent<HTMLButtonElement>) {
     const props = this.props;
     if (!('visible' in props)) {
       this.setState({ visible });
     }
 
     const { onVisibleChange } = props;
     if (onVisibleChange) {
-      onVisibleChange(visible);
+      onVisibleChange(visible, e);
     }
   }