Merge branch 'master' into skrastev/pivot-row-header

Author: dkamburov

projects/igniteui-angular/src/lib/navigation-drawer/navigation-drawer.component.spec.ts

@@ -7,6 +7,9 @@ import { IgxNavigationService } from '../core/navigation/nav.service';
 import { PlatformUtil } from '../core/utils';
 import { IgxNavDrawerMiniTemplateDirective, IgxNavDrawerTemplateDirective } from './navigation-drawer.directives';
 import { NgIf } from '@angular/common';
+import { IgxLayoutModule } from '../directives/layout/layout.module';
+import { IgxNavbarModule } from '../navbar/navbar.module';
+import { IgxNavbarComponent } from '../navbar/navbar.component';
 
 // HammerJS simulator from https://github.com/hammerjs/simulator, manual typings TODO
 declare let Simulator: any;
@@ -567,6 +570,37 @@ describe('Navigation Drawer', () => {
         expect(fix.componentInstance.navDrawer.element.classList.contains('igx-nav-drawer')).toBeTruthy();
     });
 
+    it('should maintain size when mini pinned has `fixed` position', async () => {
+            const fix = TestBed.createComponent(TestFixedMiniComponent);
+            fix.detectChanges();
+
+            fix.componentInstance.navDrawer.pin = true;
+            fix.detectChanges();
+
+            // Account for transition duration
+            await wait(350);
+
+            const drawerEl = fix.debugElement.query(By.directive(IgxNavigationDrawerComponent)).nativeElement;
+            const navbarEl = fix.debugElement.query(By.directive(IgxNavbarComponent)).nativeElement;
+
+            let flexBasis = getComputedStyle(drawerEl).getPropertyValue('flex-basis');
+
+            // Mini variant pinned by default
+            expect(flexBasis).toEqual('68px');;
+            expect(navbarEl.offsetLeft).toEqual(parseInt(flexBasis));
+
+            fix.componentInstance.navDrawer.toggle();
+            fix.detectChanges();
+
+            // Account for transition duration
+            await wait(350);
+
+            flexBasis = getComputedStyle(drawerEl).getPropertyValue('flex-basis');
+
+            expect(flexBasis).toEqual('240px');;
+            expect(navbarEl.offsetLeft).toEqual(parseInt(flexBasis));
+    });
+
     const swipe = (element, posX, posY, duration, deltaX, deltaY) => {
         const swipeOptions = {
             deltaX,
@@ -650,3 +684,45 @@ class TestComponentPinComponent extends TestComponentDIComponent {
 class TestComponentMiniComponent extends TestComponentDIComponent {
     public miniView = true;
 }
+
+@Component({
+    selector: 'igx--test-fixed-mini',
+    providers: [IgxNavigationService],
+    standalone: true,
+    imports: [
+        IgxLayoutModule,
+        IgxNavbarModule,
+        IgxNavigationDrawerComponent,
+        IgxNavDrawerTemplateDirective,
+        IgxNavDrawerMiniTemplateDirective,
+        NgIf,
+    ],
+    styles: `
+        .igx-nav-drawer__aside--pinned {
+            position: fixed;
+        }
+    `,
+    template: `
+    <div igxLayout>
+      <igx-nav-drawer #nav>
+        <ng-template igxDrawer>
+          <span igxDrawerItem>Item</span>
+        </ng-template>
+
+        <ng-template igxDrawerMini *ngIf="nav.pin">
+          <nav>
+            <span igxDrawerItem>Item</span>
+          </nav>
+        </ng-template>
+      </igx-nav-drawer>
+
+      <div igxFlex igxLayout igxLayoutDir="columns">
+        <igx-navbar title="Navbar" actionButtonIcon="menu" (action)="nav.toggle()">
+        </igx-navbar>
+        <div class="main"></div>
+      </div>
+    </div>
+    `,
+})
+class TestFixedMiniComponent extends TestComponentDIComponent {
+}

projects/igniteui-angular/src/lib/navigation-drawer/navigation-drawer.component.ts

@@ -320,17 +320,17 @@ export class IgxNavigationDrawerComponent implements
      */
     @HostBinding('style.flexBasis')
     public get flexWidth() {
-        if (!this.pin) {
+        if (!this.pin || (!this.isOpen && !this.miniTemplate)) {
             return '0px';
         }
+
         if (this.isOpen) {
             return this.width;
         }
+
         if (this.miniTemplate && this.miniWidth) {
             return this.miniWidth;
         }
-
-        return '0px';
     }
 
     /** @hidden */