fix(module:modal): fix multiple nzOnCancel calls (#1590)

close #958
NG-ZORRO · Jun 5, 2018 · bc07be2 · bc07be2
1 parent b8e4432
commit bc07be2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/components/modal/nz-modal.component.ts b/components/modal/nz-modal.component.ts
@@ -217,7 +217,12 @@ export class NzModalComponent<T = any, R = any> extends NzModalRef<T, R> impleme
   }
 
   onClickMask($event: MouseEvent): void {
-    if (this.nzMask && this.nzMaskClosable && ($event.target as HTMLElement).classList.contains('ant-modal-wrap')) {
+    if (
+      this.nzMask &&
+      this.nzMaskClosable &&
+      ($event.target as HTMLElement).classList.contains('ant-modal-wrap') &&
+      this.nzVisible
+    ) {
       this.onClickOkCancel('cancel');
     }
   }
@@ -227,7 +232,9 @@ export class NzModalComponent<T = any, R = any> extends NzModalRef<T, R> impleme
   }
 
   private onClickCloseBtn(): void {
-    this.onClickOkCancel('cancel');
+    if (this.nzVisible) {
+      this.onClickOkCancel('cancel');
+    }
   }
 
   private onClickOkCancel(type: 'ok' | 'cancel'): void {

diff --git a/components/modal/nz-modal.spec.ts b/components/modal/nz-modal.spec.ts
@@ -172,6 +172,10 @@ describe('modal testing (legacy)', () => {
       modalInstance.nzMaskClosable = true;
       (modalElement.querySelector('.ant-modal-wrap') as HTMLElement).click();
       expect(console.log).toHaveBeenCalledWith('click cancel');
+      // second click on mask should not trigger nzOnCancel
+      (console.log as jasmine.Spy).calls.reset();
+      (modalElement.querySelector('.ant-modal-wrap') as HTMLElement).click();
+      expect(console.log).not.toHaveBeenCalledWith('click cancel');
       flush();
       expectModalDestroyed(tempModalId, true); // should be destroyed
     })); // /basic props