Merge branch '10.2.x' into dTsvetkov/fix-issue-8320-master

Author: Hristo Popov

angular.json

@@ -90,6 +90,8 @@
               "browserTarget": "igniteui-dev-demos:build:hmr"
             },
             "es5": {
+              "hmr": true,
+              "hmrWarning": false,
               "browserTarget": "igniteui-dev-demos:build:es5"
             }
           }

package.json

@@ -4,7 +4,7 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve --open --configuration hmr",
-    "start-es5": "ng serve --configuration es5 -o",
+    "start:es5": "ng serve --open --configuration es5",
     "build": "ng build",
     "test": "ng test",
     "lint": "ng lint",

projects/igniteui-angular/src/lib/grids/row.directive.ts

@@ -113,7 +113,7 @@ export class IgxRowDirective<T extends IgxGridBaseDirective & GridType> implemen
     }
 
     get cellHeight() {
-        return this.addRow ? null : this.grid.rowHeight || 32;
+        return this.addRow && !this.inEditMode ? null : this.grid.rowHeight || 32;
     }
 
     /**

src/polyfills.ts

@@ -21,6 +21,8 @@
 /** IE10 and IE11 requires the following for NgClass support on SVG elements */
 import 'classlist.js';  // Run `npm install --save classlist.js`.
 
+import 'core-js/es7/array'; // for Array.includes()
+
 /**
  * Web Animations `@angular/platform-browser/animations`
  * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.

src/styles/igniteui-theme.scss

@@ -18,7 +18,7 @@ body {
 }
 
 @include igx-core($direction: ltr);
-@include igx-theme($palette: $palette, $schema: $schema);
+@include igx-theme($palette: $palette, $schema: $schema, $legacy-support: true);
 @include igx-typography($type-scale: $typography);
 
 @include igx-palette-vars($palette, $contrast: true);