Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into rkaraivanov/grids-spa-and-wellbeing

Author: rkaraivanov

projects/igniteui-angular/package.json

@@ -84,7 +84,7 @@
         "web-animations-js": "^2.3.2"
     },
     "igxDevDependencies": {
-        "@igniteui/angular-schematics": "~12.0.800-rc.0"
+        "@igniteui/angular-schematics": "~12.0.800"
     },
     "ng-update": {
         "migrations": "./migrations/migration-collection.json"

projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-action-button.component.html

@@ -1,17 +1,16 @@
 <ng-container *ngIf="!asMenuItem">
+    <button igxButton="icon" igxRipple (click)="handleClick($event)" (mousedown)="preventEvent($event)">
+        <igx-icon *ngIf="iconSet" [family]="iconSet" [name]="iconName">{{iconName}}</igx-icon>
+        <igx-icon *ngIf="!iconSet" >{{iconName}}</igx-icon>
+    </button>
+</ng-container>
 
-    <ng-container *ngIf="!asMenuItem">
-        <button igxButton="icon" igxRipple (click)="handleClick($event)" (mousedown)="preventEvent($event)">
-            <igx-icon *ngIf="iconSet" [family]="iconSet" [name]="iconName">{{iconName}}</igx-icon>
-            <igx-icon *ngIf="!iconSet" >{{iconName}}</igx-icon>
-        </button>
-    </ng-container>
-
+<ng-template #menuItemTemplate>
     <ng-container *ngIf="asMenuItem">
         <div #container [className]='containerClass'>
             <igx-icon *ngIf="iconSet" [family]="iconSet" [name]="iconName">{{iconName}}</igx-icon>
             <igx-icon *ngIf="!iconSet" >{{iconName}}</igx-icon>
-            <label *ngIf='asMenuItem' igxLabel>{{labelText}}</label>
+            <label igxLabel>{{labelText}}</label>
         </div>
     </ng-container>
-</ng-container>
+</ng-template>

projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-action-button.component.ts

@@ -26,7 +26,7 @@ export class IgxGridActionButtonComponent {
      * @hidden
      * @internal
      */
-    @ViewChild(TemplateRef)
+    @ViewChild('menuItemTemplate')
     public templateRef: TemplateRef<any>;
 
     /**

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

@@ -661,8 +661,8 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy
      * @param index
      */
     public getRowByKey(key: any): RowType {
-        const rec = this.primaryKey ? this.filteredSortedData.find(r => r[this.primaryKey] === key) :
-            this.filteredSortedData.find(r => r === key);
+        const rec = this.filteredSortedData ? this.primaryKey ? this.filteredSortedData.find(r => r[this.primaryKey] === key) :
+            this.filteredSortedData.find(r => r === key) : undefined;
         const index = this.dataView.findIndex(r => r.data && r.data === rec);
         if (index < 0 || index >= this.filteredSortedData.length) {
             return undefined;