Merge branch 'master' into pbozhinov/fixes-chips-not-being-reordered-ivy

Author: ChronosSF

CHANGELOG.md

@@ -18,9 +18,9 @@ All notable changes for each version of this project will be documented in this
 
 ### New Features
 - `IgxOverlayService`:
-    - `setOffset` method added. It repositions the content in the horizontal and vertical directions.
+    - `setOffset` method added. It offsets the content along the corresponding axis by the provided amount.
 - `IgxToggleDirective`:
-    - `setOffset` method added. It repositions the content in the horizontal and vertical directions.
+    - `setOffset` method added. It offsets the content along the corresponding axis by the provided amount.
 
 ## 8.2.6
 

projects/igniteui-angular/migrations/migration-collection.json

@@ -57,6 +57,11 @@
             "factory": "./update-8_2_3"
         },
         "migration-12": {
+            "version": "8.2.6",
+            "description": "Updates Ignite UI for Angular from v8.2.3 to v8.2.6",
+            "factory": "./update-8_2_6"
+        },
+        "migration-13": {
             "version": "9.0.0",
             "description": "Updates Ignite UI for Angular from v8.2.x to v9.2.0",
             "factory": "./update-9_0_0"

projects/igniteui-angular/migrations/update-8_2_6/changes/theme-props.json

@@ -0,0 +1,35 @@
+{
+    "$schema": "../../common/schema/theme-props.schema.json",
+    "changes": [
+        {
+            "name": "$button-background",
+            "remove": true,
+            "owner": "igx-grid-toolbar-theme"
+        },
+        {
+            "name": "$button-text-color",
+            "remove": true,
+            "owner": "igx-grid-toolbar-theme"
+        },
+        {
+            "name": "$button-hover-background",
+            "remove": true,
+            "owner": "igx-grid-toolbar-theme"
+        },
+        {
+            "name": "$button-hover-text-color",
+            "remove": true,
+            "owner": "igx-grid-toolbar-theme"
+        },
+        {
+            "name": "$button-focus-background",
+            "remove": true,
+            "owner": "igx-grid-toolbar-theme"
+        },
+        {
+            "name": "$button-focus-text-color",
+            "remove": true,
+            "owner": "igx-grid-toolbar-theme"
+        }
+    ]
+}

projects/igniteui-angular/migrations/update-8_2_6/index.spec.ts

@@ -0,0 +1,67 @@
+import * as path from 'path';
+
+// tslint:disable:no-implicit-dependencies
+import { virtualFs } from '@angular-devkit/core';
+import { EmptyTree } from '@angular-devkit/schematics';
+// tslint:disable-next-line:no-submodule-imports
+import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+
+describe('Update 8.2.6', () => {
+    let appTree: UnitTestTree;
+    const schematicRunner = new SchematicTestRunner('ig-migrate', path.join(__dirname, '../migration-collection.json'));
+    const configJson = {
+        defaultProject: 'testProj',
+        projects: {
+            testProj: {
+                sourceRoot: '/testSrc'
+            }
+        },
+        schematics: {
+            '@schematics/angular:component': {
+                prefix: 'appPrefix'
+            }
+        }
+      };
+
+    beforeEach(() => {
+        appTree = new UnitTestTree(new EmptyTree());
+        appTree.create('/angular.json', JSON.stringify(configJson));
+    });
+
+    it('should update igx-carousel-theme prop', done => {
+        appTree.create(
+            '/testSrc/appPrefix/component/test.component.scss',
+            `$my-toolbar-theme: igx-grid-toolbar-theme(
+                $background-color: null,
+                $button-background: null,
+                $title-text-color: null,
+                $button-text-color: null,
+                $button-hover-background: null,
+                $button-hover-text-color: null,
+                $button-focus-background: null,
+                $button-focus-text-color: null,
+                $dropdown-background: null,
+                $item-text-color: null,
+                $item-hover-background: null,
+                $item-hover-text-color: null,
+                $item-focus-background: null,
+                $item-focus-text-color: null
+              );`
+        );
+        const tree = schematicRunner.runSchematic('migration-12', {}, appTree);
+        expect(tree.readContent('/testSrc/appPrefix/component/test.component.scss'))
+            .toEqual(
+                `$my-toolbar-theme: igx-grid-toolbar-theme(
+                $background-color: null,
+                $title-text-color: null,
+                $dropdown-background: null,
+                $item-text-color: null,
+                $item-hover-background: null,
+                $item-hover-text-color: null,
+                $item-focus-background: null,
+                $item-focus-text-color: null
+              );`
+            );
+        done();
+    });
+});

projects/igniteui-angular/migrations/update-8_2_6/index.ts

@@ -0,0 +1,17 @@
+import {
+    Rule,
+    SchematicContext,
+    Tree
+} from '@angular-devkit/schematics';
+import { UpdateChanges } from '../common/UpdateChanges';
+
+const version = '8.2.6';
+
+export default function(): Rule {
+    return (host: Tree, context: SchematicContext) => {
+        context.logger.info(`Applying migration for Ignite UI for Angular to version ${version}`);
+
+        const update = new UpdateChanges(__dirname, host, context);
+        update.applyChanges();
+    };
+}

projects/igniteui-angular/migrations/update-9_0_0/changes/theme-props.json

@@ -0,0 +1,35 @@
+{
+    "$schema": "../../common/schema/theme-props.schema.json",
+    "changes": [
+        {
+            "name": "$button-background",
+            "remove": true,
+            "owner": "igx-grid-toolbar-theme"
+        },
+        {
+            "name": "$button-text-color",
+            "remove": true,
+            "owner": "igx-grid-toolbar-theme"
+        },
+        {
+            "name": "$button-hover-background",
+            "remove": true,
+            "owner": "igx-grid-toolbar-theme"
+        },
+        {
+            "name": "$button-hover-text-color",
+            "remove": true,
+            "owner": "igx-grid-toolbar-theme"
+        },
+        {
+            "name": "$button-focus-background",
+            "remove": true,
+            "owner": "igx-grid-toolbar-theme"
+        },
+        {
+            "name": "$button-focus-text-color",
+            "remove": true,
+            "owner": "igx-grid-toolbar-theme"
+        }
+    ]
+}

projects/igniteui-angular/migrations/update-9_0_0/index.spec.ts

@@ -35,7 +35,7 @@ describe('Update 9.0.0', () => {
                 IgxRowComponent, IgxHierarchicalGridBaseComponent } from 'igniteui-angular';
             `);
 
-        const tree = schematicRunner.runSchematic('migration-12', {}, appTree);
+        const tree = schematicRunner.runSchematic('migration-13', {}, appTree);
         expect(tree.readContent('/testSrc/appPrefix/component/test.component.ts'))
             .toEqual(
             `import { IgxDropDownBaseDirective, IgxDropDownItemBaseDirective, IgxGridBaseDirective,

projects/igniteui-angular/src/lib/core/styles/components/avatar/_avatar-theme.scss

@@ -34,7 +34,13 @@
     $image-background: null
 ) {
     $name: 'igx-avatar';
-    $theme: apply-palette(map-get($schema, $name), $palette);
+    $theme: ();
+
+    @if map-has-key($schema, $name) {
+        $theme: apply-palette(map-get($schema, $name), $palette);
+    } @else {
+        $theme: apply-palette($schema, $palette);
+    }
 
     @if not($icon-color) and $icon-background {
         $icon-color: text-contrast($icon-background);

projects/igniteui-angular/src/lib/core/styles/components/badge/_badge-theme.scss

@@ -54,10 +54,16 @@
     $disable-border: true
 ) {
     $name: 'igx-badge';
-    $badge-schema: map-get($schema, $name);
-    $border-width: if($disable-border == true, 0, rem(1px));
-    $theme: apply-palette($badge-schema, $palette);
+    $badge-schema: ();
+
+    @if map-has-key($schema, $name) {
+        $badge-schema: map-get($schema, $name);
+    } @else {
+        $badge-schema: $schema;
+    }
 
+    $theme: apply-palette($badge-schema, $palette);
+    $border-width: if($disable-border == true, 0, rem(1px));
     $border-radius: round-borders(
         if($border-radius, $border-radius, map-get($badge-schema, 'border-radius')), 0, 11px
     );

projects/igniteui-angular/src/lib/core/styles/components/banner/_banner-theme.scss

@@ -34,7 +34,15 @@
     $banner-illustration-color: null
 ) {
     $name: 'igx-banner';
-    $theme: apply-palette(map-get($schema, $name), $palette);
+    $banner-schema: ();
+
+    @if map-has-key($schema, $name) {
+        $banner-schema: map-get($schema, $name);
+    } @else {
+        $banner-schema: $schema;
+    }
+
+    $theme: apply-palette($banner-schema, $palette);
 
     @if not($banner-message-color) and $banner-background {
         $banner-message-color: text-contrast($banner-background);