Merge branch 'vnext' into simeonoff/chat-sample

Author: ChronosSF

src/app/grid/grid-external-excel-style-filtering/grid-external-excel-style-filtering.component.html

@@ -7,7 +7,7 @@
             </igx-select-item>
         </igx-select>
 
-        <igx-grid-excel-style-filtering [column]="grid1.getColumnByName(gridColums.value)">
+        <igx-grid-excel-style-filtering [column]="grid1.getColumnByName(gridColums.value)" [maxHeight]="'590px'">
         </igx-grid-excel-style-filtering>
     </div>
 

src/app/grid/grid-external-excel-style-filtering/grid-external-excel-style-filtering.component.scss

@@ -2,6 +2,7 @@
     display: flex;
     flex-flow: row;
     margin: 15px;
+    column-gap: 5px;
 }
 
 .flex-column {
@@ -12,4 +13,4 @@
 
 .igSelect {
     margin-left: 1px;
-}
+}

src/app/grid/grid-row-editing-style/grid-row-editing-style.component.html

@@ -7,7 +7,7 @@
             <!--The following template can be omitted (grid handles this internally) but it is here as an example of custom cell editor.-->
             <ng-template igxCellEditor let-cell="cell">
                 <igx-input-group>
-                    <input igxInput [igxFocus]='true' name="units" [(ngModel)]="cell.editValue" style="color: black" />
+                    <input igxInput type="number" [igxFocus]='true' name="units" [(ngModel)]="cell.editValue" style="color: black" />
                 </igx-input-group>
             </ng-template>
         </igx-column>

src/app/hierarchical-grid/hierarchical-grid-external-excel-style-filtering/hierarchical-grid-external-excel-style-filtering.component.html

@@ -7,7 +7,7 @@
             </igx-select-item>
         </igx-select>
 
-        <igx-grid-excel-style-filtering [column]="hierarchicalGrid.getColumnByName(gridColums.value)">
+        <igx-grid-excel-style-filtering [column]="hierarchicalGrid.getColumnByName(gridColums.value)" [maxHeight]="'590px'">
         </igx-grid-excel-style-filtering>
     </div>
 

src/app/hierarchical-grid/hierarchical-grid-external-excel-style-filtering/hierarchical-grid-external-excel-style-filtering.component.scss

@@ -2,6 +2,7 @@
     margin: 15px;
     display: flex;
     flex-flow: row;
+    column-gap: 5px;
 }
 
 .photo {
@@ -21,4 +22,4 @@
 
 .igSelect {
     margin-left: 1px;
-}
+}

src/app/pagination/paginator/pagination-sample.component.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
+import { AfterViewInit, ChangeDetectorRef, Component, ViewChild } from '@angular/core';
 import { IgxPaginatorComponent } from 'igniteui-angular';
 import { DATA } from '../../data/product';
 
@@ -7,17 +7,14 @@ import { DATA } from '../../data/product';
     styleUrls: ['./pagination-sample.component.scss'],
     templateUrl: './pagination-sample.component.html'
 })
-export class PaginationSampleComponent {
-
+export class PaginationSampleComponent implements AfterViewInit {
     @ViewChild('paginator', { static: true }) public paginator!: IgxPaginatorComponent;
     public productData = DATA;
     public itemsPerPage = [3, 4, 5];
 
-    constructor(public cdr: ChangeDetectorRef) {
-    }
+    constructor(public cdr: ChangeDetectorRef) { }
 
-    // eslint-disable-next-line @angular-eslint/use-lifecycle-interface
-    ngAfterViewInit() {
+    public ngAfterViewInit() {
         this.cdr.detectChanges();
     }
 
@@ -32,5 +29,4 @@ export class PaginationSampleComponent {
     public navigateToFirstPage() {
         this.paginator.page = 0;
     }
-
 }

src/app/pivot-grid/pivot-grids.module.ts

@@ -4,7 +4,7 @@ import { CommonModule } from '@angular/common';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { IgxCheckboxModule, IgxIconModule, IgxPivotGridModule, IgxSwitchModule } from 'igniteui-angular';
+import { IgxButtonModule, IgxCheckboxModule, IgxIconModule, IgxPivotGridModule, IgxSwitchModule } from 'igniteui-angular';
 import { PivotExportComponent } from './pivot-export/pivot-export.component';
 import { PivotFeaturesComponent } from './pivot-features/pivot-features.component';
 import { PivotGridBasicSampleComponent } from './pivot-basic-sample/pivot-grid-basic-sample.component';
@@ -29,6 +29,7 @@ import { PivotGridLayoutComponent } from './pivot-layout/pivot-layout.component'
     ], imports: [CommonModule,
         FormsModule,
         PivotGridsRoutingModule,
+        IgxButtonModule,
         IgxPivotGridModule,
         IgxCheckboxModule,
         IgxSwitchModule,

src/app/tree-grid/tree-grid-external-excel-style-filtering/tree-grid-external-excel-style-filtering.component.html

@@ -7,7 +7,7 @@
             </igx-select-item>
         </igx-select>
 
-        <igx-grid-excel-style-filtering [column]="tGrid.getColumnByName(gridColumns.value)">
+        <igx-grid-excel-style-filtering [column]="tGrid.getColumnByName(gridColumns.value)" [maxHeight]="'590px'">
         </igx-grid-excel-style-filtering>
     </div>
 

src/app/tree-grid/tree-grid-external-excel-style-filtering/tree-grid-external-excel-style-filtering.component.scss

@@ -4,6 +4,7 @@
     height: 650px;
     margin: 15px;
     justify-content: center;
+    column-gap: 5px;
 }
 
 .flex-column {
@@ -15,4 +16,4 @@
 
 .igSelect {
     margin-left: 1px;
-}
+}

src/app/tree-grid/tree-grid-save-state/about.component.html

@@ -3,5 +3,5 @@
     <span>Navigating to the previous page, components will reinitialize as per their initial configuration, therefore the igxTreeGrid will lose its state.</span>
     <br />
     <span>What our GridSaveStateComponent does is reading the state from the window.localStorage object and applying the corresponding state in the AfterViewInit lifecycle.</span><br />
-    <span igxButton="contained" [routerLink]="['../grid-state']">Go Back</span>
+    <span igxButton="contained" [routerLink]="['../tree-grid-state']">Go Back</span>
 </div>