From 7ad64b8087ec880b8b154431fdf2faa7aa5bf7e9 Mon Sep 17 00:00:00 2001
From: rorry121 <ieloul@foxmail.com>
Date: Mon, 25 May 2020 16:23:55 +0800
Subject: [PATCH] fix(module:modal): nzAutofocus doesn't work correctly (#5313)

Co-authored-by: rorry <luolei@haizhi.com>
---
 components/modal/modal-confirm-container.component.ts | 4 ++--
 components/modal/modal-footer.component.ts            | 4 ++--
 components/modal/modal.component.ts                   | 1 +
 components/modal/utils.ts                             | 6 ++++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/components/modal/modal-confirm-container.component.ts b/components/modal/modal-confirm-container.component.ts
index 2b71a4f3b39..dc4b1cb1bb8 100644
--- a/components/modal/modal-confirm-container.component.ts
+++ b/components/modal/modal-confirm-container.component.ts
@@ -66,7 +66,7 @@ import { ModalOptions } from './modal-types';
             <div class="ant-modal-confirm-btns">
               <button
                 *ngIf="config.nzCancelText !== null"
-                [attr.cdkFocusInitial]="config.nzAutofocus === 'cancel'"
+                [attr.cdkFocusInitial]="config.nzAutofocus === 'cancel' || null"
                 nz-button
                 (click)="onCancel()"
                 [nzLoading]="!!config.nzCancelLoading"
@@ -76,7 +76,7 @@ import { ModalOptions } from './modal-types';
               </button>
               <button
                 *ngIf="config.nzOkText !== null"
-                [attr.cdkFocusInitial]="config.nzAutofocus === 'ok'"
+                [attr.cdkFocusInitial]="config.nzAutofocus === 'ok' || null"
                 nz-button
                 [nzType]="config.nzOkType!"
                 (click)="onOk()"
diff --git a/components/modal/modal-footer.component.ts b/components/modal/modal-footer.component.ts
index bb3805c873f..dc6fe9491e5 100644
--- a/components/modal/modal-footer.component.ts
+++ b/components/modal/modal-footer.component.ts
@@ -44,7 +44,7 @@ import { ModalButtonOptions, ModalOptions } from './modal-types';
     <ng-template #defaultFooterButtons>
       <button
         *ngIf="config.nzCancelText !== null"
-        [attr.cdkFocusInitial]="config.nzAutofocus === 'cancel'"
+        [attr.cdkFocusInitial]="config.nzAutofocus === 'cancel' || null"
         nz-button
         (click)="onCancel()"
         [nzLoading]="!!config.nzCancelLoading"
@@ -54,7 +54,7 @@ import { ModalButtonOptions, ModalOptions } from './modal-types';
       </button>
       <button
         *ngIf="config.nzOkText !== null"
-        [attr.cdkFocusInitial]="config.nzAutofocus === 'ok'"
+        [attr.cdkFocusInitial]="config.nzAutofocus === 'ok' || null"
         nz-button
         [nzType]="config.nzOkType!"
         (click)="onOk()"
diff --git a/components/modal/modal.component.ts b/components/modal/modal.component.ts
index 806ab544851..e9e2a1c6edf 100644
--- a/components/modal/modal.component.ts
+++ b/components/modal/modal.component.ts
@@ -83,6 +83,7 @@ export class NzModalComponent<T = NzSafeAny, R = NzSafeAny> implements OnChanges
   @Input() nzOkType: NzButtonType = 'primary';
   @Input() nzIconType: string = 'question-circle'; // Confirm Modal ONLY
   @Input() nzModalType: ModalTypes = 'default';
+  @Input() nzAutofocus: 'ok' | 'cancel' | 'auto' | null = 'auto';
 
   // TODO(@hsuanxyz) Input will not be supported
   @Input()
diff --git a/components/modal/utils.ts b/components/modal/utils.ts
index d8865bdafc9..6ce998bc48e 100644
--- a/components/modal/utils.ts
+++ b/components/modal/utils.ts
@@ -59,7 +59,8 @@ export function getConfigFromComponent(component: NzModalComponent): ModalOption
     nzOnCancel,
     nzAfterOpen,
     nzAfterClose,
-    nzCloseOnNavigation
+    nzCloseOnNavigation,
+    nzAutofocus
   } = component;
   return {
     nzMask,
@@ -93,6 +94,7 @@ export function getConfigFromComponent(component: NzModalComponent): ModalOption
     nzOnCancel,
     nzAfterOpen,
     nzAfterClose,
-    nzCloseOnNavigation
+    nzCloseOnNavigation,
+    nzAutofocus
   };
 }