Skip to content

Commit 7916ed1

Browse files
committed
chore(*): Attempts to correctly activate a highlighted search res
1 parent 1a5acab commit 7916ed1

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -5930,6 +5930,9 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
59305930
const numberPipe = new IgxDecimalPipeComponent(this.locale);
59315931
const datePipe = new IgxDatePipeComponent(this.locale);
59325932
data.forEach((dataRow) => {
5933+
const ghostRec = dataRow.ghostRec !== undefined;
5934+
const data = { ...dataRow };
5935+
dataRow = ghostRec ? dataRow.recordData : dataRow;
59335936
columnItems.forEach((c) => {
59345937
const value = c.formatter ? c.formatter(dataRow[c.field]) :
59355938
c.dataType === 'number' ? numberPipe.transform(dataRow[c.field], this.locale) :
@@ -5941,7 +5944,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
59415944
if (exactMatch) {
59425945
if (searchValue === searchText) {
59435946
this.lastSearchInfo.matchInfoCache.push({
5944-
row: dataRow,
5947+
row: data,
59455948
column: c.field,
59465949
index: 0,
59475950
});
@@ -5952,7 +5955,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
59525955

59535956
while (searchIndex !== -1) {
59545957
this.lastSearchInfo.matchInfoCache.push({
5955-
row: dataRow,
5958+
row: data,
59565959
column: c.field,
59575960
index: occurenceIndex++,
59585961
});

projects/igniteui-angular/src/lib/grids/tree-grid/tree-cell.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ng-template #defaultCell>
22
<div igxTextHighlight style="pointer-events: none" [cssClass]="highlightClass" [activeCssClass]="activeHighlightClass" [groupName]="gridID"
33
[value]="formatter ? formatter(value) : column.dataType === 'number' ? (value | igxdecimal: grid.locale) : column.dataType === 'date' ? (value | igxdate: grid.locale) : value"
4-
[row]="rowData" [column]="this.column.field" [containerClass]="'igx-grid__td-text'"
4+
[row]="row.treeRow.data" [column]="this.column.field" [containerClass]="'igx-grid__td-text'"
55
class="igx-grid__td-text">{{ formatter ? formatter(value) : column.dataType === 'number' ? (value | igxdecimal:
66
grid.locale) : column.dataType === 'date' ? (value | igxdate: grid.locale) : value }}</div>
77
</ng-template>

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html

+11-11
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,18 @@
8181
| treeGridRowPinning:id:pipeTrigger
8282
| treeGridFiltering:filteringExpressionsTree:filterStrategy:advancedFilteringExpressionsTree:id:pipeTrigger:filteringPipeTrigger:true
8383
| treeGridSorting:sortingExpressions:sortStrategy:id:pipeTrigger:true as pinnedData'>
84-
<div #pinContainer *ngIf='pinnedData.length > 0'
85-
[ngClass]="{
86-
'igx-grid__tr--pinned-bottom': !isRowPinningToTop,
87-
'igx-grid__tr--pinned-top': isRowPinningToTop
88-
}"
89-
class='igx-grid__tr--pinned' [style.bottom.px]=' !isRowPinningToTop ? pinnedBottom : null'>
90-
<ng-container *ngFor="let rowData of pinnedData;let rowIndex = index;">
91-
<ng-container *ngTemplateOutlet="record_template; context: getContext(rowData, rowIndex, true)">
84+
<div #pinContainer *ngIf='pinnedData.length > 0'
85+
[ngClass]="{
86+
'igx-grid__tr--pinned-bottom': !isRowPinningToTop,
87+
'igx-grid__tr--pinned-top': isRowPinningToTop
88+
}"
89+
class='igx-grid__tr--pinned' [style.bottom.px]=' !isRowPinningToTop ? pinnedBottom : null'>
90+
<ng-container *ngFor="let rowData of pinnedData;let rowIndex = index;">
91+
<ng-container *ngTemplateOutlet="record_template; context: getContext(rowData, rowIndex, true)">
92+
</ng-container>
9293
</ng-container>
93-
</ng-container>
94-
</div>
95-
</ng-container>
94+
</div>
95+
</ng-container>
9696
</ng-template>
9797
<ng-container *ngTemplateOutlet="hasPinnedRecords && isRowPinningToTop ? pinnedRecordsTemplate : null"></ng-container>
9898
<ng-template igxGridFor let-rowData [igxGridForOf]="data

0 commit comments

Comments
 (0)