Merge branch 'master' into SKrastev/fix-1639-master

Author: mpavlinov

CHANGELOG.md

@@ -8,6 +8,12 @@ All notable changes for each version of this project will be documented in this
 - `IgxOverlayOutlet` directive introducedto mark an element as an `igxOverlay` outlet container. [ReadMe](https://github.com/IgniteUI/igniteui-angular/blob/master/projects/igniteui-angular/src/lib/directives/toggle/README.md)
 - `igxButtonGroup`
     - Added the ability to define buttons directly in the template
+- `IgxTextHighlightDirective`: The `highlight` method now has a new optional parameter called `exactMatch` (defaults to false).
+    - If its value is false, all occurrences of the search text will be highlighted in the group's value.
+    - If its value is true, the entire group's value should equals the search text in order to be highlighted (caseSensitive argument is respected as well).
+- `IgxGrid`: The `findNext` and `findPrev` methods now have a new optional parameter called `exactMatch` (defaults to false).
+    - If its value is false, all occurrences of the search text will be highlighted in the grid's cells.
+    - If its value is true, the entire value of each cell should equals the search text in order to be highlighted (caseSensitive argument is respected as well).
 
 ## 6.1.3
 - **General**

projects/igniteui-angular/src/lib/combo/combo.component.spec.ts

@@ -1481,6 +1481,27 @@ describe('igxCombo', () => {
             expectedOutput += ', ' + combo.data[9];
             expect(inputElement.value).toEqual(expectedOutput);
         }));
+
+        it('Should properly handle selection manipulation through onSelectionChange emit', fakeAsync(() => {
+            const fixture = TestBed.createComponent(IgxComboSampleComponent);
+            fixture.detectChanges();
+            const combo = fixture.componentInstance.combo;
+            // override selection
+            fixture.componentInstance.onSelectionChange = (event) => {
+                event.newSelection = [];
+            };
+            combo.toggle();
+            tick();
+            // No items are initially selected
+            expect(combo.selectedItems()).toEqual([]);
+            // Select the first 5 items
+            combo.selectItems(fixture.componentInstance.initData.splice(0, 5));
+            tick();
+            fixture.detectChanges();
+            tick();
+            // onSelectionChange fires and overrides the selection to be [];
+            expect(combo.selectedItems()).toEqual([]);
+        }));
     });
 
     describe('Rendering tests: ', () => {
@@ -3057,7 +3078,8 @@ class IgxComboScrollTestComponent {
 @Component({
     template: `
 <igx-combo #combo [placeholder]="'Location'" [data]='items'
-[filterable]='true' [valueKey]="'field'" [groupKey]="'region'" [width]="'400px'" [allowCustomValues]="true">
+[filterable]='true' [valueKey]="'field'" [groupKey]="'region'" [width]="'400px'"
+(onSelectionChange)="onSelectionChange($event)" [allowCustomValues]="true">
 <ng-template #itemTemplate let-display let-key="valueKey">
 <div class="state-card--simple">
 <span class="small-red-circle"></span>

projects/igniteui-angular/src/lib/combo/combo.component.ts

@@ -1065,8 +1065,8 @@ export class IgxComboComponent implements AfterViewInit, ControlValueAccessor, O
             const args: IComboSelectionChangeEventArgs = { oldSelection, newSelection };
             this.onSelectionChange.emit(args);
             newSelectionAsSet = new Set();
-            for (let i = 0; i < newSelection.length; i++) {
-                newSelectionAsSet.add(newSelection[i]);
+            for (let i = 0; i < args.newSelection.length; i++) {
+                newSelectionAsSet.add(args.newSelection[i]);
             }
             this.selectionAPI.set_selection(this.id, newSelectionAsSet);
             this.value = this.dataType !== DataTypes.PRIMITIVE ?

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-component.scss

@@ -240,6 +240,10 @@
         @extend %igx-grid__group-expand-btn !optional;
     }
 
+    @include e(filtering-outlet) {
+        @extend %igx-grid__filtering-outlet !optional;
+    }
+
     @for $i from 1 through 10 {
         @include e(row-indentation, $m: level-#{$i}) {
             @extend %igx-grid__row-indentation--level-#{$i} !optional;

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

@@ -1295,4 +1295,8 @@
             padding-left: #{$i*map-get($grid-grouping-indicator-padding, 'compact')};
         }
     }
+
+    %igx-grid__filtering-outlet {
+        z-index: 99999;
+    }
 }

projects/igniteui-angular/src/lib/core/styles/components/list/_list-theme.scss

@@ -98,11 +98,13 @@
     $list-empty-padding: em(16px, 16px);
 
     %igx-list {
+        position: relative;
         display: flex;
         flex-flow: column nowrap;
         background-color: --var($theme, 'background');
         height: 100%;
         overflow: hidden;
+        z-index: 0;
     }
 
     %igx-list-empty {

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

@@ -1,9 +1,8 @@
 import { Component, DebugElement } from '@angular/core';
-import { async, discardPeriodicTasks, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { async, TestBed } from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { IgxAvatarComponent, IgxAvatarModule } from '../../avatar/avatar.component';
-import { IgxDragDropModule, RestrictDrag } from './dragdrop.directive';
+import { IgxDragDropModule } from './dragdrop.directive';
 
 describe('IgxDrag', () => {
 
@@ -13,7 +12,6 @@ describe('IgxDrag', () => {
             ],
             imports: [
                 FormsModule,
-                IgxAvatarModule,
                 IgxDragDropModule
             ]
         })