Skip to content

Commit 572fb82

Browse files
authored
Merge pull request #3313 from IgniteUI/dpetev/16-rc-bump
16 rc bump
2 parents f592b75 + efacc65 commit 572fb82

11 files changed

Lines changed: 123 additions & 94 deletions

File tree

package-lock.json

Lines changed: 102 additions & 76 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"bootstrap": "^5.2.3",
6666
"file-saver": "^2.0.2",
6767
"hammerjs": "^2.0.8",
68-
"igniteui-angular": "^16.0.0-beta.4",
68+
"igniteui-angular": "^16.0.0-rc.0",
6969
"igniteui-angular-charts": "^15.0.1",
7070
"igniteui-angular-core": "^15.0.1",
7171
"igniteui-angular-extras": "^16.0.2",
@@ -112,4 +112,4 @@
112112
"typescript": "4.9.5",
113113
"webpack-bundle-analyzer": "^4.5.0"
114114
}
115-
}
115+
}

projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ export class DataAnalysisDockManagerComponent implements OnInit, AfterViewInit,
222222
this.gridEventEmitters = merge(this.grid.filteringDone,
223223
this.grid.sortingDone,
224224
this.grid.columnMoving,
225-
this.grid.pagingDone,
226225
this.grid.columnPin,
227226
this.grid.columnResized,
228227
this.grid.columnMovingEnd,

src/app/grid/custom-grid-paging-style/custom-grid-paging-style.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="grid__wrapper">
2-
<igx-grid [igxPreventDocumentScroll]="true" #grid1 [data]="data" [perPage]="10" height="520px" width="100%" displayDensity="cosy">
3-
<igx-paginator></igx-paginator>
2+
<igx-grid [igxPreventDocumentScroll]="true" #grid1 [data]="data" height="520px" width="100%" displayDensity="cosy">
3+
<igx-paginator [perPage]="10"></igx-paginator>
44
<igx-column header="Rank" headerClasses="myClass" field="Id" [sortable]="true"></igx-column>
55
<igx-column field="Name" header="Athlete"></igx-column>
66
<igx-column field="BeatsPerMinute" header="Beats per minute" dataType="number">

src/app/grid/grid-keyboardnav-guide-sample/grid-keyboardnav-sample.component.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,15 +301,16 @@ export class GridKeyboardnavGuide implements OnInit, OnDestroy {
301301

302302
if ((key === 'arrowup' || key === 'arrowdown') && evt.ctrlKey) {
303303
if (col && !col.columnGroup && col.sortable) {
304-
this._keyboardHandler.selectItem(1);
304+
this._keyboardHandler.selectItem(1);IgxColumnGroupComponent
305305
}
306306
}
307307
}
308308

309309
if (this._keyboardHandler.gridSection === GridSection.TBODY) {
310310
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+
313314
if (cell && cell.column.editable && cell.editMode) {
314315
this._keyboardHandler.selectItem(0);
315316
}

src/app/hierarchical-grid/hgrid-keybarod-nav-guide-sample/hgrid-keyboard-guide.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,8 @@ export class HGridKeyboardnavGuide implements OnInit, OnDestroy {
319319

320320
if (this.keyboardHandler.gridSection === GridSection.TBODY) {
321321
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);
323324
if (cell && cell.column.editable && cell.editMode) {
324325
this.keyboardHandler.selectItem(0);
325326
}

src/app/hierarchical-grid/hierarchical-grid-pager-sample/hierarchical-grid-pager-sample.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="grid__wrapper">
2-
<igx-hierarchical-grid [igxPreventDocumentScroll]="true" #hGrid [data]="data" [perPage]="10" height="500px" width="100%"
2+
<igx-hierarchical-grid [igxPreventDocumentScroll]="true" #hGrid [data]="data" height="500px" width="100%"
33
displayDensity="cosy" primaryKey="ID">
4-
<igx-paginator #paginator [(page)]="hGrid.page" [totalRecords]="hGrid.totalRecords" [(perPage)]="hGrid.perPage" [selectOptions]="selectOptions" [displayDensity]="hGrid.displayDensity">
4+
<igx-paginator #paginator [(page)]="hGrid.page" [totalRecords]="hGrid.totalRecords" [perPage]="10" [selectOptions]="selectOptions" [displayDensity]="hGrid.displayDensity">
55
<igx-paginator-content>
66
<igx-page-size *ngIf="!isDropdownHidden"></igx-page-size>
77
<igx-page-nav *ngIf="!isPagerHidden"></igx-page-nav>

src/app/hierarchical-grid/hierarchical-grid-paging/hierarchical-grid-paging.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="grid__wrapper">
2-
<igx-hierarchical-grid [igxPreventDocumentScroll]="true" class="hgrid" [data]="localdata" [autoGenerate]="false" [perPage]="10"
2+
<igx-hierarchical-grid [igxPreventDocumentScroll]="true" class="hgrid" [data]="localdata" [autoGenerate]="false"
33
[height]="'550px'" [width]="'100%'" #hierarchicalGrid>
44
<igx-column field="Artist"></igx-column>
55
<igx-column field="Photo">
@@ -33,6 +33,6 @@
3333
<igx-column field="Location"></igx-column>
3434
<igx-column field="Headliner"></igx-column>
3535
</igx-row-island>
36-
<igx-paginator></igx-paginator>
36+
<igx-paginator [perPage]="10"></igx-paginator>
3737
</igx-hierarchical-grid>
3838
</div>

src/app/tree-grid/tgrid-keyboard-guide/tgrid-keyboardnav-guide.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,9 @@ export class TGridKeyboardnavGuide implements OnInit, OnDestroy {
317317

318318
if (this._keyboardHandler.gridSection === GridSection.TBODY) {
319319
if (key === 'enter') {
320-
const cell = this.tgrid.getCellByColumnVisibleIndex(activeNode.row, activeNode.column);
320+
const columnName = this.tgrid.getColumnByVisibleIndex(activeNode.column).field;
321+
const cell = this.tgrid.getCellByColumn(activeNode.row, columnName);
322+
321323
if (cell && cell.column.editable && cell.editMode) {
322324
this._keyboardHandler.selectItem(0);
323325
}

src/app/tree-grid/tree-grid-column-moving-sample/tree-grid-column-moving-sample.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</ng-template>
88
<div class="grid__wrapper">
99
<igx-tree-grid [igxPreventDocumentScroll]="true" #treeGrid [data]="data" [moving]="true" primaryKey="ID" foreignKey="ParentID" [autoGenerate]="false" height="620px"
10-
width="100%" [perPage]="10">
11-
<igx-paginator></igx-paginator>
10+
width="100%">
11+
<igx-paginator [perPage]="10"></igx-paginator>
1212
<igx-column [field]="'Name'" dataType="string" [headerTemplate]="pinTemplate" width="250px"></igx-column>
1313
<igx-column [field]="'Title'" dataType="string" [headerTemplate]="pinTemplate" width="250px"></igx-column>
1414
<igx-column [field]="'ID'" dataType="number" [headerTemplate]="pinTemplate" width="200px"></igx-column>

0 commit comments

Comments
 (0)