Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into rkaraivanov/grid-header-styles-input

Author: rkaraivanov

projects/igniteui-angular/src/lib/directives/text-highlight/text-highlight.directive.spec.ts

@@ -286,6 +286,19 @@ describe('IgxHighlight', () => {
         expect(spans.length).toBe(4);
         expect(activeSpans.length).toBe(1);
     });
+
+    it('Should not throw error when active highlight is not set', () => {
+        const fix = TestBed.createComponent(HighlightLoremIpsumComponent);
+        fix.detectChanges();
+
+        const component: HighlightLoremIpsumComponent = fix.debugElement.componentInstance;
+        component.highlight.row = undefined;
+        component.highlight.column = undefined;
+        component.highlightText('a');
+
+        expect(() => component.highlight.activateIfNecessary()).not.toThrowError();
+    });
+
 });
 
 @Component({

projects/igniteui-angular/src/lib/directives/text-highlight/text-highlight.directive.ts

@@ -340,7 +340,7 @@ export class IgxTextHighlightDirective implements AfterViewInit, AfterViewChecke
     public activateIfNecessary(): void {
         const group = IgxTextHighlightDirective.highlightGroupsMap.get(this.groupName);
 
-        if (group.column === this.column && group.row === this.row && compareMaps(this.metadata, group.metadata)) {
+        if (group.index >= 0 && group.column === this.column && group.row === this.row && compareMaps(this.metadata, group.metadata)) {
             this.activate(group.index);
         }
     }