Skip to content

Commit 37d2574

Browse files
committed
Merge branch 'aria-grid-errors' of https://github.com/IgniteUI/igniteui-angular into aria-grid-errors
2 parents 329dc1c + 0247a08 commit 37d2574

File tree

3 files changed

+5
-15
lines changed

3 files changed

+5
-15
lines changed

projects/igniteui-angular/src/lib/grids/filtering/base/grid-filtering-row.component.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { IBaseChipEventArgs, IgxChipsAreaComponent, IgxChipComponent } from '../
2424
import { ExpressionUI } from '../grid-filtering.service';
2525
import { IgxDropDownItemComponent } from '../../../drop-down/drop-down-item.component';
2626
import { IgxFilteringService } from '../grid-filtering.service';
27-
import { KEYS, isEdge, isIE } from '../../../core/utils';
27+
import { KEYS, isEdge } from '../../../core/utils';
2828
import { AbsoluteScrollStrategy } from '../../../services/overlay/scroll';
2929

3030
/**
@@ -262,11 +262,8 @@ export class IgxGridFilteringRowComponent implements AfterViewInit {
262262
public onInput(eventArgs) {
263263
// The 'iskeyPressed' flag is needed for a case in IE, because the input event is fired on focus and for some reason,
264264
// when you have a japanese character as a placeholder, on init the value here is empty string .
265-
// There is no need to reset the value on every invalid number input.
266-
// The invalid value is converted to empty string input type="number"
267-
const target = eventArgs.target;
268-
if (isEdge() && target.type !== 'number' || this.isKeyPressed && isIE() || target.value) {
269-
this.value = target.value;
265+
if (isEdge() || this.isKeyPressed || eventArgs.target.value) {
266+
this.value = eventArgs.target.value;
270267
}
271268
}
272269

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy {
350350
}
351351
}
352352

353-
constructor(private cdr: ChangeDetectorRef) {}
353+
constructor(private cdr: ChangeDetectorRef, private element: ElementRef) {}
354354

355355
/**
356356
* @hidden @internal
@@ -519,7 +519,7 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy {
519519
this.customDialog.selectedOperator = eventArgs.newSelection.value;
520520
eventArgs.cancel = true;
521521
if (this.overlayComponentId) {
522-
this.mainDropdown.nativeElement.style.display = 'none';
522+
this.element.nativeElement.style.display = 'none';
523523
}
524524
this.subMenu.close();
525525
this.customDialog.open(this.mainDropdown.nativeElement);

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -229,13 +229,6 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
229229

230230
expect(grid.rowList.length).toEqual(3);
231231
verifyFilterRowUI(input, close, reset, false);
232-
233-
// greater than or equal to with invalid value should not reset filter
234-
GridFunctions.openFilterDDAndSelectCondition(fix, 4);
235-
GridFunctions.typeValueInFilterRowInput('254..', fix, input);
236-
237-
expect(grid.rowList.length).toEqual(3);
238-
verifyFilterRowUI(input, close, reset, false);
239232
}));
240233

241234
// UI tests boolean column

0 commit comments

Comments
 (0)