Skip to content

Commit 3dfd61f

Browse files
authored
Merge branch '10.1.x' into bpenkov/date-picker-focusing-10.1
2 parents 87a09b0 + f1e8a80 commit 3dfd61f

File tree

6 files changed

+22
-12
lines changed

6 files changed

+22
-12
lines changed

projects/igniteui-angular/src/lib/grids/column-actions/column-actions-base.directive.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ export abstract class IgxColumnActionsBaseDirective {
1616
/**
1717
* @hidden @internal
1818
*/
19-
public checkAllLabel: string;
19+
public abstract get checkAllLabel(): string;
2020

2121
/**
2222
* @hidden @internal
2323
*/
24-
public uncheckAllLabel: string;
24+
public abstract get uncheckAllLabel(): string;
2525

2626
/**
2727
* @hidden @internal

projects/igniteui-angular/src/lib/grids/column-actions/column-hiding.directive.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,16 @@ export class IgxColumnHidingDirective extends IgxColumnActionsBaseDirective {
1818
/**
1919
* @hidden @internal
2020
*/
21-
public checkAllLabel = this.columnActions.grid?.resourceStrings.igx_grid_hiding_check_all_label ?? 'Hide All';
21+
public get checkAllLabel(): string {
22+
return this.columnActions.grid?.resourceStrings.igx_grid_hiding_check_all_label ?? 'Hide All';
23+
}
2224

2325
/**
2426
* @hidden @internal
2527
*/
26-
public uncheckAllLabel = this.columnActions.grid?.resourceStrings.igx_grid_hiding_uncheck_all_label ?? 'Show All';
27-
28+
public get uncheckAllLabel(): string {
29+
return this.columnActions.grid?.resourceStrings.igx_grid_hiding_uncheck_all_label ?? 'Show All';
30+
}
2831
/**
2932
* @hidden @internal
3033
*/

projects/igniteui-angular/src/lib/grids/column-actions/column-pinning.directive.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,16 @@ export class IgxColumnPinningDirective extends IgxColumnActionsBaseDirective {
1818
/**
1919
* @hidden @internal
2020
*/
21-
public checkAllLabel = this.columnActions.grid?.resourceStrings.igx_grid_pinning_check_all_label ?? 'Pin All';
21+
public get checkAllLabel(): string {
22+
return this.columnActions.grid?.resourceStrings.igx_grid_pinning_check_all_label ?? 'Pin All';
23+
}
2224

2325
/**
2426
* @hidden @internal
2527
*/
26-
public uncheckAllLabel = this.columnActions.grid?.resourceStrings.igx_grid_pinning_uncheck_all_label ?? 'Unpin All';
27-
28+
public get uncheckAllLabel(): string {
29+
return this.columnActions.grid?.resourceStrings.igx_grid_pinning_uncheck_all_label ?? 'Unpin All';
30+
}
2831
/**
2932
* @hidden @internal
3033
*/

projects/igniteui-angular/src/lib/grids/filtering/excel-style/grid.excel-style-filtering.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy {
494494

495495
private generateUniqueValues(columnValues: any[]) {
496496
if (this.column.dataType === DataType.String && this.column.filteringIgnoreCase) {
497-
const filteredUniqueValues = columnValues.map(s => s?.toLowerCase())
497+
const filteredUniqueValues = columnValues.map(s => s?.toString().toLowerCase())
498498
.reduce((map, val, i) => map.get(val) ? map : map.set(val, columnValues[i]),
499499
new Map);
500500

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ export class IgxGridNavigationService {
213213
}
214214

215215
focusFirstCell(header = true) {
216-
if (this.grid.dataView.length && this.activeNode &&
216+
if ((header || this.grid.dataView.length) && this.activeNode &&
217217
(this.activeNode.row === -1 || this.activeNode.row === this.grid.dataView.length ||
218218
(!header && !this.grid.hasSummarizedColumns))) { return; }
219219

src/app/grid-column-actions/custom-action-directive.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,16 @@ export class IgxColumnGroupingDirective extends IgxColumnActionsBaseDirective {
1818
/**
1919
* @hidden @internal
2020
*/
21-
public checkAllLabel = 'Group By All';
21+
public get checkAllLabel(): string {
22+
return 'Group By All';
23+
}
2224

2325
/**
2426
* @hidden @internal
2527
*/
26-
public uncheckAllLabel = 'Ungroup All';
28+
public get uncheckAllLabel(): string {
29+
return 'Ungroup All';
30+
}
2731

2832
/**
2933
* @hidden @internal

0 commit comments

Comments
 (0)