Merge branch 'master' into SIvanova/change-filtering-icon

Author: simeonoff

CHANGELOG.md

@@ -15,6 +15,8 @@ All notable changes for each version of this project will be documented in this
     - Added `closeOnEscape` - with it, the dialog can be allowed or prevented from closing when `Esc` is pressed.
 - `IgxNavbar`:
     - **Breaking Changes** - The `igx-action-icon` has been renamed to `igx-navbar-action`. It should get renamed in your components via `ng update`;
+- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
+    - **Breaking Change** - The `selectedRows` method is now an `@Input` property. Setting it to an array of Row IDs will update the grid's selection state, any previous selection will be cleared. Setting it to an empty array will clear the selection entirely.
 - `igxGrid`
     - Added `onScroll` event, which is emitted when the grid is scrolled vertically or horizontally.
     - Each grid now expose a default handling for boolean column types. The column will display `check` or `close` icon, instead of true/false by default. 
@@ -46,6 +48,7 @@ The following example shows how you can use the Indigo theme:
 }
 ```
 
+
 ### New Features
 - `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
     - Introduced `showSummaryOnCollapse` grid property which allows you to control whether the summary row stays visible when the groupBy / parent row is collapsed.

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

@@ -41,7 +41,7 @@
             aria-autocomplete="both" [attr.aria-owns]="dropdown.id" [attr.aria-labelledby]="ariaLabelledBy" />
         <igx-suffix *ngIf="showSearchCaseIcon">
             <igx-icon fontSet="case-sensitive" name="case-sensitive" [isActive]="filteringOptions.caseSensitive"
-                (click)="filteringOptions.caseSensitive=!filteringOptions.caseSensitive">
+                (click)="toggleCaseSensitive()">
             </igx-icon>
         </igx-suffix>
     </igx-input-group>

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

@@ -2005,22 +2005,22 @@ describe('igxCombo', () => {
             combo.searchValue = 'New ';
             combo.handleInputChange();
             fixture.detectChanges();
-            expect(filterSpy).toHaveBeenCalledTimes(2);
+            expect(filterSpy).toHaveBeenCalledTimes(1);
             expect(combo.filteredData.length).toBeLessThan(initialData.length);
 
             firstFilter = [...combo.filteredData];
             combo.searchValue += '  ';
             combo.handleInputChange();
             fixture.detectChanges();
             expect(combo.filteredData.length).toBeLessThan(initialData.length);
-            expect(filterSpy).toHaveBeenCalledTimes(4);
+            expect(filterSpy).toHaveBeenCalledTimes(2);
 
             combo.searchValue = '';
             combo.handleInputChange();
             fixture.detectChanges();
             expect(combo.filteredData.length).toEqual(initialData.length);
             expect(combo.filteredData.length).toBeGreaterThan(firstFilter.length);
-            expect(filterSpy).toHaveBeenCalledTimes(6);
+            expect(filterSpy).toHaveBeenCalledTimes(3);
             expect(combo.filteredData.length).toEqual(initialData.length);
         });
         it('should properly select/deselect filteredData', () => {
@@ -2033,7 +2033,7 @@ describe('igxCombo', () => {
             combo.searchValue = 'New ';
             combo.handleInputChange();
             fixture.detectChanges();
-            expect(filterSpy).toHaveBeenCalledTimes(2);
+            expect(filterSpy).toHaveBeenCalledTimes(1);
             expect(combo.filteredData.length).toBeLessThan(initialData.length);
             expect(combo.filteredData.length).toEqual(4);
 

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

@@ -1578,6 +1578,13 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
     public handleClosed() {
         this.onClosed.emit();
     }
+
+    /**
+     * @hidden @internal
+     */
+    public toggleCaseSensitive() {
+        this.filteringOptions = { caseSensitive: !this.filteringOptions.caseSensitive };
+    }
 }
 
 /**

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

@@ -11,8 +11,7 @@ import { IComboFilteringOptions } from './combo.component';
  * @hidden
  */
 @Pipe({
-    name: 'comboFiltering',
-    pure: false
+    name: 'comboFiltering'
 })
 export class IgxComboFilteringPipe implements PipeTransform {
     public transform(collection: any[], searchValue: any, displayKey: any,

projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss

@@ -187,6 +187,13 @@
         box-shadow: --var($theme, 'shadow');
         transition: $transition;
         border-radius: --var($theme, 'border-radius');
+
+        button {
+            // The margin here is required to fix a bug in Safari #7858
+            margin-top: 0;
+            margin-#{$right}: 0;
+            margin-bottom: 0;
+        }
     }
 
     %igx-group-item {

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

@@ -25,7 +25,9 @@ import {
     InjectionToken,
     Optional,
     DoCheck,
-    Directive
+    Directive,
+    OnChanges,
+    SimpleChanges
 } from '@angular/core';
 import ResizeObserver from 'resize-observer-polyfill';
 import 'igniteui-trial-watermark';
@@ -1093,6 +1095,26 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
         filteringExpressionsTree: IFilteringExpressionsTree,
         done: (values: any[]) => void) => void;
 
+    /**
+     * Gets/Sets the current selection state.
+     * @remarks
+     * Represents the selected rows' IDs (primary key or rowData)
+     * @example
+     * ```html
+     * <igx-grid [data]="localData" primaryKey="ID" rowSelection="multiple" [selectedRows]="[0, 1, 2]"><igx-grid>
+     * ```
+     */
+    @Input()
+    public set selectedRows(rowIDs: any[]) {
+        rowIDs.length > 0
+            ? this.selectRows(rowIDs, true)
+            : this.deselectAllRows();
+    }
+
+    public get selectedRows(): any[] {
+        return this.selectionService.getSelectedRows();
+    }
+
     /**
      * Emitted when `IgxGridCellComponent` is clicked.
      * @remarks
@@ -5291,18 +5313,6 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
             [...this.unpinnedDataView, ...this.pinnedDataView];
     }
 
-    /**
-     * Get current selection state.
-     * @example
-     * Returns an array with selected rows' IDs (primaryKey or rowData)
-     * ```typescript
-     * const selectedRows = this.grid.selectedRows();
-     * ```
-     */
-    public selectedRows(): any[] {
-        return this.selectionService.getSelectedRows();
-    }
-
     /**
      * Select specified rows by ID.
      * @example
@@ -5487,6 +5497,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
         }
 
         for (let [row, set] of selectionMap) {
+            row = this.paging ? row + (this.perPage * this.page) : row;
             row = isRemote ? row - this.virtualizationState.startIndex : row;
             if (!source[row] || source[row].detailsData !== undefined) {
                 continue;

projects/igniteui-angular/src/lib/grids/grid/grid-clipboard.spec.ts

@@ -90,6 +90,22 @@ describe('IgxGrid - Clipboard #grid', () => {
         expect(eventData).toEqual('Downloads\tReleased\r\n127\ttrue\r\n20\t\r\n');
     });
 
+    it('Copy data when paging is enabled', () => {
+        grid.paging = true;
+        grid.perPage = 5;
+        fix.detectChanges();
+        grid.page = 1;
+        fix.detectChanges();
+        const copySpy = spyOn<any>(grid.onGridCopy, 'emit').and.callThrough();
+        grid.clipboardOptions.copyHeaders = false;
+        grid.selectRange({ rowStart: 1, rowEnd: 2, columnStart: 2, columnEnd: 3 });
+        fix.detectChanges();
+
+        const eventData = dispatchCopyEventOnGridBody(fix);
+        expect(copySpy).toHaveBeenCalledTimes(1);
+        expect(eventData).toEqual('0\ttrue\r\n1000\t\r\n');
+    });
+
     it('Disable clipboardOptions', () => {
         const copySpy = spyOn<any>(grid.onGridCopy, 'emit').and.callThrough();
         grid.clipboardOptions.enabled = false;