Merge branch 'master' into dkamburov/docs-calendar

Author: ChronosSF

projects/igniteui-angular/src/lib/grids/cell.component.ts

@@ -28,7 +28,7 @@ import { ColumnType } from './common/column.interface';
 import { RowType } from './common/row.interface';
 import { GridSelectionMode } from './common/enums';
 import { GridType } from './common/grid.interface';
-import { IgxGridComponent } from './grid';
+import { IgxGridComponent, ISearchInfo } from './grid';
 
 /**
  * Providing reference to `IgxGridCellComponent`:
@@ -51,6 +51,7 @@ import { IgxGridComponent } from './grid';
 })
 export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
     private _vIndex = -1;
+    protected _lastSearchInfo: ISearchInfo;
 
     /**
      * Gets the column of the cell.
@@ -302,6 +303,16 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
         return this._cellSelection;
     }
 
+    /**
+     * @hidden
+     * @internal
+     */
+    @Input()
+    set lastSearchInfo(value: ISearchInfo) {
+        this._lastSearchInfo = value;
+        this.highlightText(this._lastSearchInfo.searchText, this._lastSearchInfo.caseSensitive, this._lastSearchInfo.exactMatch);
+    }
+
     set cellSelectionMode(value) {
         if (this._cellSelection === value) { return; }
          this.zone.runOutsideAngular(() => {

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

@@ -6070,18 +6070,6 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
      * @hidden
      */
     public cachedViewLoaded(args: ICachedViewLoadedEventArgs) {
-        if (args.context['templateID'] === 'dataRow' && args.context['$implicit'] === args.oldContext['$implicit']) {
-            args.view.detectChanges();
-            const row = this.getRowByIndex(args.context.index);
-            if (row && row.cells) {
-                row.cells.forEach((c) => {
-                    c.highlightText(
-                        this.lastSearchInfo.searchText,
-                        this.lastSearchInfo.caseSensitive,
-                        this.lastSearchInfo.exactMatch);
-                });
-            }
-        }
         if (this.hasHorizontalScroll()) {
             const tmplId = args.context.templateID;
             const index = args.context.index;

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

@@ -90,6 +90,7 @@
         [visibleColumnIndex]="col.visibleIndex"
         [value]="rowData[col.field]"
         [cellTemplate]="col.bodyTemplate"
+        [lastSearchInfo]="grid.lastSearchInfo"
         [cellSelectionMode]="grid.cellSelection" #cell>
     </igx-grid-cell>
 </ng-template>
@@ -116,6 +117,7 @@
         [visibleColumnIndex]="col.visibleIndex"
         [value]="rowData[col.field]"
         [cellTemplate]="col.bodyTemplate"
+        [lastSearchInfo]="grid.lastSearchInfo"
         [cellSelectionMode]="grid.cellSelection" #cell>
     </igx-expandable-grid-cell>
 </ng-template>
@@ -145,6 +147,7 @@
         [visibleColumnIndex]="col.visibleIndex"
         [value]="rowData[col.field]"
         [cellTemplate]="col.bodyTemplate"
+        [lastSearchInfo]="grid.lastSearchInfo"
         [cellSelectionMode]="grid.cellSelection" #cell>
     </igx-grid-cell>
 </ng-template>
@@ -175,6 +178,7 @@
         [visibleColumnIndex]="col.visibleIndex"
         [value]="rowData[col.field]"
         [cellTemplate]="col.bodyTemplate"
+        [lastSearchInfo]="grid.lastSearchInfo"
         [cellSelectionMode]="grid.cellSelection" #cell>
     </igx-expandable-grid-cell>
 </ng-template>

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

@@ -53,6 +53,7 @@
         [visibleColumnIndex]="col.visibleIndex"
         [value]="rowData[col.field]"
         [cellTemplate]="col.bodyTemplate"
+        [lastSearchInfo]="grid.lastSearchInfo"
         [cellSelectionMode]="grid.cellSelection">
     </igx-hierarchical-grid-cell>
 </ng-container>
@@ -76,6 +77,7 @@
         [visibleColumnIndex]="col.visibleIndex"
         [value]="rowData[col.field]"
         [cellTemplate]="col.bodyTemplate"
+        [lastSearchInfo]="grid.lastSearchInfo"
         [cellSelectionMode]="grid.cellSelection">
     </igx-hierarchical-grid-cell>
 </ng-template>

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

@@ -33,6 +33,7 @@
                 [visibleColumnIndex]="col.visibleIndex"
                 [value]="rowData[col.field]"
                 [cellTemplate]="col.bodyTemplate"
+                [lastSearchInfo]="grid.lastSearchInfo"
                 [cellSelectionMode]="grid.cellSelection" #treeCell>
             </igx-grid-cell>
             </ng-template>
@@ -60,6 +61,7 @@
                 [value]="rowData[col.field]"
                 [isLoading]="isLoading"
                 [cellTemplate]="col.bodyTemplate"
+                [lastSearchInfo]="grid.lastSearchInfo"
                 [cellSelectionMode]="grid.cellSelection"  #treeCell>
             </igx-tree-grid-cell>
         </ng-template>
@@ -86,6 +88,7 @@
             [visibleColumnIndex]="col.visibleIndex"
             [value]="rowData[col.field]"
             [cellTemplate]="col.bodyTemplate"
+            [lastSearchInfo]="grid.lastSearchInfo"
             [cellSelectionMode]="grid.cellSelection"  #treeCell>
         </igx-grid-cell>
     </ng-template>
@@ -112,6 +115,7 @@
             [value]="rowData[col.field]"
             [isLoading]="isLoading"
             [cellTemplate]="col.bodyTemplate"
+            [lastSearchInfo]="grid.lastSearchInfo"
             [cellSelectionMode]="grid.cellSelection"  #treeCell>
         </igx-tree-grid-cell>
     </ng-template>