Skip to content

Commit a95782d

Browse files
authored
Merge branch 'master' into nalipiev/update-schematics-packages
2 parents 1ee755b + e4cb414 commit a95782d

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-theme.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,6 @@
409409
}
410410

411411
%form-group-display--disabled {
412-
pointer-events: none;
413412
user-select: none;
414413
color: --var($theme, 'disabled-text-color');
415414
}

projects/igniteui-angular/src/lib/grids/headers/grid-header.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ export class IgxGridHeaderComponent implements DoCheck, OnInit, OnDestroy {
183183

184184

185185
public onFilteringIconClick(event) {
186+
event.stopPropagation();
186187
this.grid.filteringService.toggleFilterDropdown(this.elementRef.nativeElement, this.column, IgxGridExcelStyleFilteringComponent);
187188
}
188189

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,8 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
214214

215215
const childGridNav = childGrid.navigation;
216216
this.clearActivation();
217-
const visibleColsLength = childGrid.visibleColumns.length - 1;
218-
const columnIndex = visibleColIndex <= visibleColsLength ? visibleColIndex : visibleColsLength;
217+
const lastVisibleIndex = childGridNav.lastColumnIndex;
218+
const columnIndex = visibleColIndex <= lastVisibleIndex ? visibleColIndex : lastVisibleIndex;
219219
childGridNav.activeNode = { row: targetIndex, column: columnIndex};
220220
childGrid.tbody.nativeElement.focus({preventScroll: true});
221221
this._pendingNavigation = false;
@@ -236,8 +236,8 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
236236
}
237237
this.clearActivation();
238238
const targetRowIndex = isNext ? indexInParent + 1 : indexInParent - 1;
239-
const visibleColsLength = this.grid.parent.visibleColumns.length - 1;
240-
const nextColumnIndex = columnIndex <= visibleColsLength ? columnIndex : visibleColsLength;
239+
const lastVisibleIndex = this.grid.parent.navigation.lastColumnIndex;
240+
const nextColumnIndex = columnIndex <= lastVisibleIndex ? columnIndex : lastVisibleIndex;
241241
this._pendingNavigation = true;
242242
const cbFunc = (args) => {
243243
args.target.grid.tbody.nativeElement.focus();

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,9 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti
619619
}
620620

621621
public getDefaultExpandState(record: any) {
622+
if (this.hasChildrenKey && !record[this.hasChildrenKey]) {
623+
return false;
624+
}
622625
return this.expandChildren;
623626

624627
}

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.spec.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,8 @@ describe('Basic IgxHierarchicalGrid #hGrid', () => {
433433
hierarchicalGrid.expandRow(row2.rowData);
434434
expect(row1.expanded).toBe(false);
435435
expect(row2.expanded).toBe(true);
436+
hierarchicalGrid.expandAll();
437+
expect(row1.expanded).toBe(false);
436438
});
437439

438440
it('should not expand children when hasChildrenKey is false for the row and there is primaryKey', () => {

0 commit comments

Comments
 (0)