From 5c11a426ddb2b4a15405b879a3dcc44a875e6435 Mon Sep 17 00:00:00 2001
From: ParsaArvanehPA <parsa.arvaneh@gmail.com>
Date: Thu, 1 Feb 2024 22:52:18 +0330
Subject: [PATCH 1/3] fix(module:tabs): wrong cursor

---
 components/tabs/style/patch.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/tabs/style/patch.less b/components/tabs/style/patch.less
index 4b2cdd47488..a3e00fdba0f 100644
--- a/components/tabs/style/patch.less
+++ b/components/tabs/style/patch.less
@@ -7,6 +7,7 @@
 .ant-tabs-tab-btn {
   border: none;
   background-color: unset;
+  cursor: pointer;
 }
 
 .ant-tabs-tab a[nz-tab-link] {

From e3ac1b82d6c086c57ed6e0cc61b0370bba60fc7e Mon Sep 17 00:00:00 2001
From: Parsa Arvaneh <Parsa.Arvaneh@gmail.com>
Date: Sat, 28 Sep 2024 14:19:44 +0330
Subject: [PATCH 2/3] fix(module:modal,drawer): secondary overlays not
 scrolling inside

---
 components/modal/modal-confirm-container.component.ts | 2 ++
 components/modal/modal-container.component.ts         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/components/modal/modal-confirm-container.component.ts b/components/modal/modal-confirm-container.component.ts
index 0165b462d22..11171235d41 100644
--- a/components/modal/modal-confirm-container.component.ts
+++ b/components/modal/modal-confirm-container.component.ts
@@ -3,6 +3,7 @@
  * found in the LICENSE file at https://github.com/NG-ZORRO/ng-zorro-antd/blob/master/LICENSE
  */
 
+import { CdkScrollable } from '@angular/cdk/overlay';
 import { CdkPortalOutlet, PortalModule } from '@angular/cdk/portal';
 import { NgClass, NgStyle } from '@angular/common';
 import {
@@ -91,6 +92,7 @@ import { BaseModalContainerComponent } from './modal-container.directive';
       </div>
     </div>
   `,
+  hostDirectives: [CdkScrollable],
   animations: [nzModalAnimations.modalContainer],
   // Using OnPush for modal caused footer can not to detect changes. we can fix it when 8.x.
   changeDetection: ChangeDetectionStrategy.Default,
diff --git a/components/modal/modal-container.component.ts b/components/modal/modal-container.component.ts
index 8cb7c82bc3f..509bef743f4 100644
--- a/components/modal/modal-container.component.ts
+++ b/components/modal/modal-container.component.ts
@@ -4,6 +4,7 @@
  */
 
 import { CdkDrag, CdkDragHandle } from '@angular/cdk/drag-drop';
+import { CdkScrollable } from '@angular/cdk/overlay';
 import { CdkPortalOutlet, PortalModule } from '@angular/cdk/portal';
 import { NgClass, NgStyle } from '@angular/common';
 import { ChangeDetectionStrategy, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
@@ -19,6 +20,7 @@ import { NzModalTitleComponent } from './modal-title.component';
 @Component({
   selector: 'nz-modal-container',
   exportAs: 'nzModalContainer',
+  hostDirectives: [CdkScrollable],
   template: `
     <div
       #modalElement

From 7a8e100b1c87fbf797e513f35642c459e295025f Mon Sep 17 00:00:00 2001
From: Parsa Arvaneh <Parsa.Arvaneh@gmail.com>
Date: Sat, 28 Sep 2024 14:20:00 +0330
Subject: [PATCH 3/3] fix(module:modal,drawer): secondary overlays not
 scrolling inside

---
 components/drawer/drawer.component.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/components/drawer/drawer.component.ts b/components/drawer/drawer.component.ts
index b986d21af94..95816cfb406 100644
--- a/components/drawer/drawer.component.ts
+++ b/components/drawer/drawer.component.ts
@@ -6,7 +6,7 @@
 import { FocusTrap, FocusTrapFactory } from '@angular/cdk/a11y';
 import { Direction, Directionality } from '@angular/cdk/bidi';
 import { ESCAPE } from '@angular/cdk/keycodes';
-import { Overlay, OverlayConfig, OverlayKeyboardDispatcher, OverlayRef } from '@angular/cdk/overlay';
+import { CdkScrollable, Overlay, OverlayConfig, OverlayKeyboardDispatcher, OverlayRef } from '@angular/cdk/overlay';
 import { CdkPortalOutlet, ComponentPortal, PortalModule, TemplatePortal } from '@angular/cdk/portal';
 import { DOCUMENT, NgStyle, NgTemplateOutlet } from '@angular/common';
 import {
@@ -118,7 +118,7 @@ const NZ_CONFIG_MODULE_NAME: NzConfigKey = 'drawer';
                   }
                 </div>
               }
-              <div class="ant-drawer-body" [ngStyle]="nzBodyStyle">
+              <div class="ant-drawer-body" [ngStyle]="nzBodyStyle" cdkScrollable>
                 <ng-template cdkPortalOutlet />
                 @if (nzContent) {
                   @if (isNzContentTemplateRef) {
@@ -146,7 +146,15 @@ const NZ_CONFIG_MODULE_NAME: NzConfigKey = 'drawer';
   preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [drawerMaskMotion],
-  imports: [NzNoAnimationDirective, NgStyle, NzOutletModule, NzIconModule, PortalModule, NgTemplateOutlet],
+  imports: [
+    NzNoAnimationDirective,
+    NgStyle,
+    NzOutletModule,
+    NzIconModule,
+    PortalModule,
+    NgTemplateOutlet,
+    CdkScrollable
+  ],
   standalone: true
 })
 export class NzDrawerComponent<T extends {} = NzSafeAny, R = NzSafeAny, D extends Partial<T> = NzSafeAny>