Merge branch 'vnext' into mkirkova/fix-linear-progress-dynamic-3306

teodosiah · web-flow · commit 00060453e656 · 2023-05-15T09:54:57.000+03:00
diff --git a/live-editing/configs/ComboConfigGenerator.ts b/live-editing/configs/ComboConfigGenerator.ts
@@ -138,6 +138,18 @@ export class ComboConfigGenerator implements IConfigGenerator {
             component: 'SimpleComboCascadingComponent'
         }));
 
+        configs.push(new Config({
+            additionalFiles: ['/src/app/services/remoteNwind.service.ts'],
+            appModuleConfig: new AppModuleConfig({
+                imports: ['IgxComboModule', 'IgxSimpleComboModule', 'IgxToastModule',
+                    'HttpClientModule', 'RemoteNWindService', 'SimpleComboRemoteComponent'],
+                ngDeclarations: ['SimpleComboRemoteComponent'],
+                ngImports: ['IgxComboModule', 'IgxSimpleComboModule', 'IgxToastModule', 'HttpClientModule'],
+                ngProviders: ['RemoteNWindService']
+            }),
+            component: 'SimpleComboRemoteComponent'
+        }));
+
         configs.push(new Config({
             additionalFiles: ['/src/app/data/cities15000-regions-countries.ts'],
             appModuleConfig: new AppModuleConfig({
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
     "bootstrap": "^5.2.3",
     "file-saver": "^2.0.2",
     "hammerjs": "^2.0.8",
-    "igniteui-angular": "^16.0.0-beta.4",
+    "igniteui-angular": "^16.0.0-rc.0",
     "igniteui-angular-charts": "^15.0.1",
     "igniteui-angular-core": "^15.0.1",
     "igniteui-angular-extras": "^16.0.2",
@@ -112,4 +112,4 @@
     "typescript": "4.9.5",
     "webpack-bundle-analyzer": "^4.5.0"
   }
-}
+}
diff --git a/projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.ts b/projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.ts
@@ -222,7 +222,6 @@ export class DataAnalysisDockManagerComponent implements OnInit, AfterViewInit,
         this.gridEventEmitters = merge(this.grid.filteringDone,
             this.grid.sortingDone,
             this.grid.columnMoving,
-            this.grid.pagingDone,
             this.grid.columnPin,
             this.grid.columnResized,
             this.grid.columnMovingEnd,
diff --git a/src/app/grid/custom-grid-paging-style/custom-grid-paging-style.component.html b/src/app/grid/custom-grid-paging-style/custom-grid-paging-style.component.html
@@ -1,6 +1,6 @@
 <div class="grid__wrapper">
-    <igx-grid [igxPreventDocumentScroll]="true" #grid1 [data]="data" [perPage]="10" height="520px" width="100%" displayDensity="cosy">
-        <igx-paginator></igx-paginator>
+    <igx-grid [igxPreventDocumentScroll]="true" #grid1 [data]="data" height="520px" width="100%" displayDensity="cosy">
+        <igx-paginator [perPage]="10"></igx-paginator>
         <igx-column header="Rank" headerClasses="myClass" field="Id" [sortable]="true"></igx-column>
         <igx-column field="Name" header="Athlete"></igx-column>
         <igx-column field="BeatsPerMinute" header="Beats per minute" dataType="number">
diff --git a/src/app/grid/grid-keyboardnav-guide-sample/grid-keyboardnav-sample.component.ts b/src/app/grid/grid-keyboardnav-guide-sample/grid-keyboardnav-sample.component.ts
@@ -301,15 +301,16 @@ export class GridKeyboardnavGuide implements OnInit, OnDestroy {
 
             if ((key === 'arrowup' || key === 'arrowdown') && evt.ctrlKey) {
                 if (col && !col.columnGroup && col.sortable) {
-                    this._keyboardHandler.selectItem(1);
+                    this._keyboardHandler.selectItem(1);IgxColumnGroupComponent
                 }
             }
         }
 
         if (this._keyboardHandler.gridSection === GridSection.TBODY) {
             if (key === 'enter') {
-                const cell = this.grid.getCellByColumnVisibleIndex(activeNode.row, activeNode.column);
-                const isCellSelected = cell.selected;
+                const columnName = this.grid.getColumnByVisibleIndex(activeNode.column).field;
+                const cell = this.grid.getCellByColumn(activeNode.row, columnName);
+
                 if (cell && cell.column.editable && cell.editMode) {
                     this._keyboardHandler.selectItem(0);
                 }
diff --git a/src/app/hierarchical-grid/hgrid-keybarod-nav-guide-sample/hgrid-keyboard-guide.component.ts b/src/app/hierarchical-grid/hgrid-keybarod-nav-guide-sample/hgrid-keyboard-guide.component.ts
@@ -319,7 +319,8 @@ export class HGridKeyboardnavGuide implements OnInit, OnDestroy {
 
         if (this.keyboardHandler.gridSection === GridSection.TBODY) {
             if (key === 'enter') {
-                const cell = this.gridTarget.hGrid.getCellByColumnVisibleIndex(activeNode.row, activeNode.column);
+                const columnName = this.gridTarget.hGrid.getColumnByVisibleIndex(activeNode.column).field;
+                const cell = this.gridTarget.hGrid.getCellByColumn(activeNode.row, columnName);
                 if (cell && cell.column.editable && cell.editMode) {
                     this.keyboardHandler.selectItem(0);
                 }
diff --git a/src/app/hierarchical-grid/hierarchical-grid-pager-sample/hierarchical-grid-pager-sample.component.html b/src/app/hierarchical-grid/hierarchical-grid-pager-sample/hierarchical-grid-pager-sample.component.html
@@ -1,7 +1,7 @@
 <div class="grid__wrapper">
-    <igx-hierarchical-grid [igxPreventDocumentScroll]="true" #hGrid [data]="data" [perPage]="10" height="500px" width="100%"
+    <igx-hierarchical-grid [igxPreventDocumentScroll]="true" #hGrid [data]="data" height="500px" width="100%"
         displayDensity="cosy" primaryKey="ID">
-        <igx-paginator #paginator [(page)]="hGrid.page" [totalRecords]="hGrid.totalRecords" [(perPage)]="hGrid.perPage" [selectOptions]="selectOptions" [displayDensity]="hGrid.displayDensity">
+        <igx-paginator #paginator [(page)]="hGrid.page" [totalRecords]="hGrid.totalRecords" [perPage]="10" [selectOptions]="selectOptions" [displayDensity]="hGrid.displayDensity">
             <igx-paginator-content>
                 <igx-page-size *ngIf="!isDropdownHidden"></igx-page-size>
                 <igx-page-nav *ngIf="!isPagerHidden"></igx-page-nav>
diff --git a/src/app/hierarchical-grid/hierarchical-grid-paging/hierarchical-grid-paging.component.html b/src/app/hierarchical-grid/hierarchical-grid-paging/hierarchical-grid-paging.component.html
@@ -1,5 +1,5 @@
 <div class="grid__wrapper">
-    <igx-hierarchical-grid [igxPreventDocumentScroll]="true"  class="hgrid" [data]="localdata" [autoGenerate]="false" [perPage]="10"
+    <igx-hierarchical-grid [igxPreventDocumentScroll]="true"  class="hgrid" [data]="localdata" [autoGenerate]="false"
         [height]="'550px'" [width]="'100%'" #hierarchicalGrid>
         <igx-column field="Artist"></igx-column>
         <igx-column field="Photo">
@@ -33,6 +33,6 @@
             <igx-column field="Location"></igx-column>
             <igx-column field="Headliner"></igx-column>
         </igx-row-island>
-        <igx-paginator></igx-paginator>
+        <igx-paginator [perPage]="10"></igx-paginator>
     </igx-hierarchical-grid>
 </div>
diff --git a/src/app/tree-grid/tgrid-keyboard-guide/tgrid-keyboardnav-guide.component.ts b/src/app/tree-grid/tgrid-keyboard-guide/tgrid-keyboardnav-guide.component.ts
@@ -317,7 +317,9 @@ export class TGridKeyboardnavGuide implements OnInit, OnDestroy {
 
         if (this._keyboardHandler.gridSection === GridSection.TBODY) {
             if (key === 'enter') {
-                const cell = this.tgrid.getCellByColumnVisibleIndex(activeNode.row, activeNode.column);
+                const columnName = this.tgrid.getColumnByVisibleIndex(activeNode.column).field;
+                const cell = this.tgrid.getCellByColumn(activeNode.row, columnName);
+
                 if (cell && cell.column.editable && cell.editMode) {
                     this._keyboardHandler.selectItem(0);
                 }
diff --git a/src/app/tree-grid/tree-grid-column-moving-sample/tree-grid-column-moving-sample.component.html b/src/app/tree-grid/tree-grid-column-moving-sample/tree-grid-column-moving-sample.component.html
@@ -7,8 +7,8 @@
 </ng-template>
 <div class="grid__wrapper">
     <igx-tree-grid [igxPreventDocumentScroll]="true"  #treeGrid [data]="data" [moving]="true" primaryKey="ID" foreignKey="ParentID" [autoGenerate]="false" height="620px"
-        width="100%" [perPage]="10">
-        <igx-paginator></igx-paginator>
+        width="100%">
+        <igx-paginator [perPage]="10"></igx-paginator>
         <igx-column [field]="'Name'" dataType="string" [headerTemplate]="pinTemplate" width="250px"></igx-column>
         <igx-column [field]="'Title'" dataType="string" [headerTemplate]="pinTemplate" width="250px"></igx-column>
         <igx-column [field]="'ID'" dataType="number" [headerTemplate]="pinTemplate" width="200px"></igx-column>
diff --git a/src/app/tree-grid/tree-grid-pager-sample/tree-grid-pager-sample.component.html b/src/app/tree-grid/tree-grid-pager-sample/tree-grid-pager-sample.component.html
@@ -1,8 +1,8 @@
 <div class="grid__wrapper">
-    <igx-tree-grid [igxPreventDocumentScroll]="true" #treegrid1 [data]="data" [perPage]="10" height="500px" width="100%"
+    <igx-tree-grid [igxPreventDocumentScroll]="true" #treegrid1 [data]="data" height="500px" width="100%"
         displayDensity="cosy" primaryKey="ID" foreignKey="ParentID">
         <igx-paginator #paginator [(page)]="treegrid1.page" [totalRecords]="treegrid1.totalRecords"
-            [(perPage)]="treegrid1.perPage" [selectOptions]="selectOptions" [displayDensity]="treegrid1.displayDensity">
+            [perPage]="10" [selectOptions]="selectOptions" [displayDensity]="treegrid1.displayDensity">
             <igx-paginator-content>
                 <igx-page-size *ngIf="!isDropdownHidden"></igx-page-size>
                 <igx-page-nav *ngIf="!isPagerHidden"></igx-page-nav>

Original file line number	Diff line number	Diff line change
`@@ -301,15 +301,16 @@ export class GridKeyboardnavGuide implements OnInit, OnDestroy {`
`301`	`301`
`302`	`302`	`if ((key === 'arrowup' \|\| key === 'arrowdown') && evt.ctrlKey) {`
`303`	`303`	`if (col && !col.columnGroup && col.sortable) {`
`304`		`- this._keyboardHandler.selectItem(1);`
	`304`	`+ this._keyboardHandler.selectItem(1);IgxColumnGroupComponent`
`305`	`305`	`}`
`306`	`306`	`}`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`if (this._keyboardHandler.gridSection === GridSection.TBODY) {`
`310`	`310`	`if (key === 'enter') {`
`311`		`- const cell = this.grid.getCellByColumnVisibleIndex(activeNode.row, activeNode.column);`
`312`		`- const isCellSelected = cell.selected;`
	`311`	`+ const columnName = this.grid.getColumnByVisibleIndex(activeNode.column).field;`
	`312`	`+ const cell = this.grid.getCellByColumn(activeNode.row, columnName);`
	`313`	`+`
`313`	`314`	`if (cell && cell.column.editable && cell.editMode) {`
`314`	`315`	`this._keyboardHandler.selectItem(0);`
`315`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,8 @@ export class HGridKeyboardnavGuide implements OnInit, OnDestroy {`
`319`	`319`
`320`	`320`	`if (this.keyboardHandler.gridSection === GridSection.TBODY) {`
`321`	`321`	`if (key === 'enter') {`
`322`		`- const cell = this.gridTarget.hGrid.getCellByColumnVisibleIndex(activeNode.row, activeNode.column);`
	`322`	`+ const columnName = this.gridTarget.hGrid.getColumnByVisibleIndex(activeNode.column).field;`
	`323`	`+ const cell = this.gridTarget.hGrid.getCellByColumn(activeNode.row, columnName);`
`323`	`324`	`if (cell && cell.column.editable && cell.editMode) {`
`324`	`325`	`this.keyboardHandler.selectItem(0);`
`325`	`326`	`}`