Merge branch 'master' into mkirova/fix-5478-8.2.x

Author: ChronosSF

projects/igniteui-angular/src/lib/core/styles/components/navdrawer/_navdrawer-theme.scss

@@ -209,6 +209,10 @@
     %aside--mini {
         width: rem(60px);
         transition-duration: .2s, .2s;
+
+        %item {
+            justify-content: center;
+        }
     }
 
     %aside--normal {
@@ -251,17 +255,18 @@
     %item {
         position: relative;
         display: flex;
+        align-items: center;
         flex-flow: row nowrap;
         color: --var($theme, 'item-text-color');
         max-height: rem(48px);
-        padding: rem(12px) rem(16px);
+        min-width: rem(32px);
+        padding: rem(12px) rem(8px);
         cursor: pointer;
-        align-items: center;
         user-select: none;
         outline: transparent;
         white-space: nowrap;
         border-radius: --var($theme, 'item-border-radius');
-        margin: 8px;
+        margin: rem(8px) rem(8px);
 
         > igx-icon + span {
             margin-left: rem(32px);

projects/igniteui-angular/src/lib/grids/column.component.ts

@@ -2003,8 +2003,6 @@ export class IgxColumnLayoutComponent extends IgxColumnGroupComponent implements
         }
 
         this.children.forEach(child => {
-            child.disableHiding = true;
-            child.disablePinning = true;
             child.movable = false;
         });
     }

projects/igniteui-angular/src/lib/grids/grid/grid.multi-row-layout.integration.spec.ts

@@ -801,6 +801,21 @@ describe('IgxGrid - multi-row-layout Integration - ', () => {
 
             verifyDOMMatchesLayoutSettings(gridFirstRow, fixture.componentInstance.colGroups);
         });
+
+        it('should render unpin and hide column buttons into the excel style filter', () => {
+            const filterIcons = fixture.debugElement.queryAll(By.css('.igx-excel-filter__icon'));
+            expect(filterIcons.length).not.toBe(0);
+
+            filterIcons[0].nativeElement.click();
+            fixture.detectChanges();
+
+            const excelMenu = grid.nativeElement.querySelector('.igx-excel-filter__menu');
+            const unpinComponent = excelMenu.querySelector('.igx-excel-filter__actions-unpin');
+            const hideComponent = excelMenu.querySelector('.igx-excel-filter__actions-hide');
+
+            expect(unpinComponent).toBeDefined();
+            expect(hideComponent).toBeDefined();
+        });
     });
 
     describe('GroupBy ', () => {

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

@@ -240,7 +240,7 @@ describe('Navigation Drawer', () => {
             fixture.detectChanges();
             asideElem = fixture.debugElement.query(By.css('.igx-nav-drawer__aside'));
 
-            expect(asideElem.styles['width']).toEqual('60px');
+            expect(asideElem.styles['width']).toEqual('68px');
 
             fixture.componentInstance.miniView = false;
             fixture.detectChanges();
@@ -441,9 +441,10 @@ describe('Navigation Drawer', () => {
             fixture = TestBed.createComponent(TestComponentDIComponent);
             fixture.detectChanges();
 
-            fixture.componentInstance.drawerMiniWidth = 60;
+            fixture.componentInstance.drawerMiniWidth = 68;
             fixture.detectChanges();
-            expect(fixture.componentInstance.viewChild.maxEdgeZone).toBe(66);
+            expect(fixture.componentInstance.viewChild.maxEdgeZone)
+                .toBe(fixture.componentInstance.drawerMiniWidth * 1.1);
 
             fixture.componentInstance.drawerMiniWidth = 80;
             fixture.detectChanges();

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

@@ -183,7 +183,7 @@ export class IgxNavigationDrawerComponent implements
     @Input() public width = '280px';
 
     /**
-     * Width of the drawer in its mini state. Defaults to 60px.
+     * Width of the drawer in its mini state. Defaults to 68px.
      *
      * ```typescript
      * // get
@@ -195,7 +195,7 @@ export class IgxNavigationDrawerComponent implements
      * <igx-nav-drawer [miniWidth]="'34px'"></igx-nav-drawer>
      * ```
      */
-    @Input() public miniWidth = '60px';
+    @Input() public miniWidth = '68px';
 
     /**
      * Pinned state change output for two-way binding.