Skip to content

Commit

Permalink
feat(combo): change filter pipe params to accept filteringOptions #7282
Browse files Browse the repository at this point in the history
  • Loading branch information
PlamenaMiteva committed Jul 21, 2020
1 parent 4f7ab05 commit fbb7c8a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
[style.maxHeight.px]="itemsMaxHeight" [igxDropDownItemNavigation]="dropdown" (focus)="dropdown.onFocus()"
[tabindex]="dropdown.collapsed ? -1 : 0" role="listbox" [attr.id]="dropdown.id">
<igx-combo-item role="option" [itemHeight]='itemHeight' *igxFor="let item of data
| comboFiltering:searchValue:displayKey:filterable:filteringOptions.caseSensitive
| comboFiltering:searchValue:displayKey:filterable:filteringOptions
| comboGrouping:groupKey:valueKey;
index as rowIndex; containerSize: itemsMaxHeight; scrollOrientation: 'vertical'; itemSize: itemHeight"
[value]="item" [isHeader]="item.isHeader" [index]="rowIndex">
Expand Down
11 changes: 7 additions & 4 deletions projects/igniteui-angular/src/lib/combo/combo.pipes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { DataUtil } from '../data-operations/data-util';
import { SortingDirection } from '../data-operations/sorting-expression.interface';
import { IGX_COMBO_COMPONENT, IgxComboBase } from './combo.common';
import { DefaultSortingStrategy } from '../data-operations/sorting-strategy';
import { IComboFilteringOptions } from './combo.component';


/**
Expand All @@ -13,19 +14,21 @@ import { DefaultSortingStrategy } from '../data-operations/sorting-strategy';
name: 'comboFiltering'
})
export class IgxComboFilteringPipe implements PipeTransform {
public transform(collection: any[], searchValue: any, displayKey: any, shouldFilter: boolean, caseSensitive: boolean) {
public transform(collection: any[], searchValue: any, displayKey: any,
shouldFilter: boolean, filteringOptions: IComboFilteringOptions) {
if (!collection) {
return [];
}
if (!searchValue || !shouldFilter) {
return collection;
} else {
const searchTerm = caseSensitive ? searchValue.trim() : searchValue.toLowerCase().trim();
const searchTerm = filteringOptions.caseSensitive ? searchValue.trim() : searchValue.toLowerCase().trim();
if (displayKey != null) {
return collection.filter(e => caseSensitive ? e[displayKey].includes(searchTerm) :
return collection.filter(e => filteringOptions.caseSensitive ? e[displayKey].includes(searchTerm) :
e[displayKey].toLowerCase().includes(searchTerm));
} else {
return collection.filter(e => caseSensitive ? e.includes(searchTerm) : e.toLowerCase().includes(searchTerm));
return collection.filter(e => filteringOptions.caseSensitive ? e.includes(searchTerm) :
e.toLowerCase().includes(searchTerm));
}
}
}
Expand Down

0 comments on commit fbb7c8a

Please sign in to comment.