Skip to content

Commit 42e8dbe

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Minor navigation related fixes.
1 parent e9d6c51 commit 42e8dbe

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid-navigation.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,15 @@ export class IgxPivotGridNavigationService extends IgxGridNavigationService {
3838
if ((key.includes('right') || key === 'end') && this.activeNode.column < this.lastRowDimensionsIndex) {
3939
newActiveNode.column = ctrl || key === 'end' ? this.lastRowDimensionsIndex : this.activeNode.column + 1;
4040
}
41+
const verticalContainer = this.grid.verticalRowDimScrollContainers.toArray()[newActiveNode.column];
4142
if ((key.includes('up')) && this.activeNode.row > 0) {
4243
newActiveNode.row = ctrl ? 0 : this.activeNode.row - 1;
4344
}
4445
if ((key.includes('down')) && this.activeNode.row < this.findLastDataRowIndex()) {
4546
newActiveNode.row = ctrl ? this.findLastDataRowIndex() : this.activeNode.row + 1;
4647
}
4748
this.setActiveNode(newActiveNode);
48-
this.grid.navigateTo(newActiveNode.row);
49+
verticalContainer.scrollTo(newActiveNode.row);
4950
} else {
5051
super.handleNavigation(event);
5152
}

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</igx-pivot-header-row>
2020

2121
<div igxGridBody (keydown.control.c)="copyHandler($event)" (copy)="copyHandler($event)" class="igx-grid__tbody" role="rowgroup">
22-
<div *ngFor='let dim of rowDimensions' #rowDimensionContainer role="rowgroup" class='igx-grid__tbody-pivot-dimension'>
22+
<div tabindex="0" *ngFor='let dim of rowDimensions' #rowDimensionContainer role="rowgroup" class='igx-grid__tbody-pivot-dimension' (focus)="navigation.focusTbody($event)" (keydown)="navigation.handleNavigation($event)">
2323
<ng-template igxGridFor let-rowData [igxGridForOf]="dataView
2424
| pivotGridCellMerging:pivotConfiguration:dim:pivotKeys:pipeTrigger"
2525
let-rowIndex="index" [igxForScrollOrientation]="'vertical'" [igxForScrollContainer]='verticalScroll'

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-row-dimension-content.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
<ng-template #headerTemplate let-column>
1515
<div class='igx-grid__tr--header igx-grid__row-indentation--level-{{getLevel(column)}}'
16-
(pointerdown)="selectPivotRow(column, $event)">
17-
<igx-icon [attr.draggable]=" false" (pointerdown)="grid.toggleRow(getRowDimensionKey(column))">
16+
(click)="selectPivotRow(column, $event)">
17+
<igx-icon [attr.draggable]=" false" (click)="grid.toggleRow(getRowDimensionKey(column))">
1818
{{ getExpandState(column) ? 'expand_more' : 'chevron_right'}}</igx-icon>
1919
{{column.header}}
2020
</div>
@@ -23,7 +23,7 @@
2323
<ng-template #headerDefaultTemplate let-column>
2424

2525
<div class='igx-grid__tr--header igx-grid__row-indentation--level-{{getLevel(column)}}'
26-
(pointerdown)="selectPivotRow(column, $event)">
26+
(click)="selectPivotRow(column, $event)">
2727
<igx-icon style='flex-shrink: 0;' [attr.draggable]=" false">
2828
</igx-icon>
2929
{{column.header}}

0 commit comments

Comments
 (0)