Skip to content

Commit 7b1d0ba

Browse files
committed
Merge remote-tracking branch 'origin/10.2.x' into sstoychev/mac-keys-102
2 parents d61993a + 0509e80 commit 7b1d0ba

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

projects/igniteui-angular/src/lib/core/utils.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,9 @@ export const ROW_EXPAND_KEYS = new Set('right down arrowright arrowdown'.split('
330330
export const ROW_COLLAPSE_KEYS = new Set('left up arrowleft arrowup'.split(' '));
331331
export const ROW_ADD_KEYS = new Set(['+', 'add', '≠', '±', '=']);
332332
export const SUPPORTED_KEYS = new Set([...Array.from(NAVIGATION_KEYS), ...Array.from(ROW_ADD_KEYS), 'enter', 'f2', 'escape', 'esc', 'pagedown', 'pageup']);
333-
export const HEADER_KEYS = new Set([...Array.from(NAVIGATION_KEYS), 'escape', 'esc', 'l']);
333+
export const HEADER_KEYS = new Set([...Array.from(NAVIGATION_KEYS), 'escape', 'esc' , 'l',
334+
/** This symbol corresponds to the Alt + L combination under MAC. */
335+
'¬']);
334336

335337
/**
336338
* @hidden

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ export class IgxExcelStyleSearchComponent implements AfterViewInit, OnDestroy {
127127
* @hidden @internal
128128
*/
129129
public get valuesLoadingTemplate() {
130-
if (this.esf.grid.excelStyleLoadingValuesTemplateDirective) {
130+
if (this.esf.grid?.excelStyleLoadingValuesTemplateDirective) {
131131
return this.esf.grid.excelStyleLoadingValuesTemplateDirective.template;
132132
} else {
133133
return this.defaultExcelStyleLoadingValuesTemplate;
@@ -136,6 +136,7 @@ export class IgxExcelStyleSearchComponent implements AfterViewInit, OnDestroy {
136136

137137
constructor(public cdr: ChangeDetectorRef, public esf: IgxGridExcelStyleFilteringComponent) {
138138
esf.loadingStart.pipe(takeUntil(this.destroy$)).subscribe(() => {
139+
this.displayedListData = [];
139140
this.isLoading = true;
140141
});
141142
esf.loadingEnd.pipe(takeUntil(this.destroy$)).subscribe(() => {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ export class IgxGridNavigationService {
544544
if ([' ', 'spacebar', 'space'].indexOf(key) !== -1) {
545545
this.handleColumnSelection(column, event);
546546
}
547-
if (alt && key === 'l' && this.grid.allowAdvancedFiltering) {
547+
if (alt && (key === 'l' || key === '¬') && this.grid.allowAdvancedFiltering) {
548548
this.grid.openAdvancedFilteringDialog();
549549
}
550550
if (ctrl && shift && key === 'l' && this.grid.allowFiltering && !column.columnGroup && column.filterable) {

0 commit comments

Comments
 (0)