Skip to content

Commit b0f077c

Browse files
committed
fix(grid): add requested changes
1 parent 2b61703 commit b0f077c

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

projects/igniteui-angular/src/lib/data-operations/filtering-condition.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export class IgxFilteringOperand {
2424
isUnary: false,
2525
iconName: 'is-in',
2626
hidden: true,
27-
logic: (target: any, searchVal: Set<any>, ignoreCase: boolean) => this.findValueInSet(target, searchVal, ignoreCase)
27+
logic: (target: any, searchVal: Set<any>) => this.findValueInSet(target, searchVal)
2828
}];
2929
}
3030

@@ -60,9 +60,8 @@ export class IgxFilteringOperand {
6060
/**
6161
* @hidden
6262
*/
63-
protected findValueInSet(target: any, searchVal: Set<any>, ignoreCase?: boolean) {
64-
searchVal = new Set(Array.from(searchVal).map((item) => IgxStringFilteringOperand.applyIgnoreCase(item, ignoreCase)));
65-
return searchVal.has(IgxStringFilteringOperand.applyIgnoreCase(target, ignoreCase));
63+
protected findValueInSet(target: any, searchVal: Set<any>) {
64+
return searchVal.has(target);
6665
}
6766
}
6867

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ export class IgxGridExcelStyleFilteringComponent extends BaseFilteringComponent
556556
this.filterValues = this.generateFilterValues();
557557
this.generateListData();
558558
this.expressionsList.forEach(expr => {
559-
if (expr.expression.condition.name === 'in' && this.column.dataType === GridColumnDataType.String) {
559+
if (this.column.dataType === GridColumnDataType.String && this.column.filteringIgnoreCase && expr.expression.searchVal) {
560560
this.modifyExpression(expr);
561561
}
562562
});

0 commit comments

Comments
 (0)