fix(module:drawer): content overflow when placement is top or bottom (#…

…4423) close #4354
NG-ZORRO · Nov 18, 2019 · 9451de5 · 9451de5
1 parent 5283a32
commit 9451de5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/components/drawer/nz-drawer.component.html b/components/drawer/nz-drawer.component.html
@@ -15,9 +15,7 @@
          [style.height]="height"
          [style.transform]="transform">
       <div class="ant-drawer-content">
-        <div class="ant-drawer-wrapper-body"
-          [style.overflow]="isLeftOrRight ? 'auto' : null"
-          [style.height]="isLeftOrRight ? '100%' : null">
+        <div class="ant-drawer-wrapper-body" [style.height]="isLeftOrRight ? '100%' : null">
           <div *ngIf="nzTitle || nzClosable"
             [class.ant-drawer-header]="!!nzTitle"
             [class.ant-drawer-header-no-title]="!!nzTitle">

diff --git a/components/drawer/nz-drawer.spec.ts b/components/drawer/nz-drawer.spec.ts
@@ -390,9 +390,6 @@ describe('NzDrawerComponent', () => {
     component.placement = 'right';
     component.open();
     fixture.detectChanges();
-    expect(
-      (overlayContainerElement.querySelector('.ant-drawer .ant-drawer-wrapper-body') as HTMLElement).style.overflow
-    ).toBe('auto');
     expect(
       (overlayContainerElement.querySelector('.ant-drawer .ant-drawer-wrapper-body') as HTMLElement).style.height
     ).toBe('100%');

diff --git a/components/drawer/style/drawer.less b/components/drawer/style/drawer.less
@@ -140,6 +140,7 @@
   &-content {
     position: relative;
     z-index: 1;
+    overflow: auto;
     background-color: @component-background;
     background-clip: padding-box;
     border: 0;