Merge branch '9.0.x' into mpopov/carousel/6518

Author: kdinev

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes for each version of this project will be documented in this file.
 
+## 9.0.1
+- **Breaking Changes** 
+    - Remove `$base-color` from igx-typography. The igx-typography class now inherits the parent color.
+
 ## 9.0.0
 
 ### General

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

@@ -65,6 +65,11 @@
             "version": "9.0.0",
             "description": "Updates Ignite UI for Angular from v8.2.x to v9.0.0",
             "factory": "./update-9_0_0"
+        },
+        "migration-14": {
+            "version": "9.0.1",
+            "description": "Updates Ignite UI for Angular from v9.0.0 to v9.0.1",
+            "factory": "./update-9_0_1"
         }
     }
 }

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

@@ -0,0 +1,10 @@
+{
+    "$schema": "../../common/schema/theme-props.schema.json",
+    "changes": [
+        {
+            "name": "$base-color",
+            "remove": true,
+            "owner": "igx-typography"
+        }
+    ]
+}

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

@@ -0,0 +1,30 @@
+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 9.0.1', () => {
+    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));
+    });
+});

projects/igniteui-angular/migrations/update-9_0_1/index.ts

@@ -0,0 +1,17 @@
+import {
+    Rule,
+    SchematicContext,
+    Tree
+} from '@angular-devkit/schematics';
+import { UpdateChanges } from '../common/UpdateChanges';
+
+const version = '9.0.1';
+
+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/package.json

@@ -78,8 +78,8 @@
         "@angular/forms": "^9.0.0",
         "web-animations-js": "^2.3.2"
     },
-    "devDependencies": {
-        "@igniteui/angular-schematics": "~9.0.500-rc.3"
+    "igxDevDependencies": {
+        "@igniteui/angular-schematics": "~9.0.500"
     },
     "ng-update": {
         "migrations": "./migrations/migration-collection.json"

projects/igniteui-angular/schematics/ng-add/index.spec.ts

@@ -108,7 +108,8 @@ describe('ng-add schematics', () => {
     runner.runSchematic('ng-add', { normalizeCss: false }, tree);
     const pkgJsonData = JSON.parse(tree.readContent('/package.json'));
 
-    expect(pkgJsonData.devDependencies['@igniteui/angular-schematics']).toBeTruthy();
+    const version = require('../../package.json')['igxDevDependencies']['@igniteui/angular-schematics'];
+    expect(pkgJsonData.devDependencies['@igniteui/angular-schematics']).toBe(version);
     expect(pkgJsonData.dependencies['@igniteui/angular-schematics']).toBeFalsy();
   });
 

projects/igniteui-angular/schematics/utils/dependency-handler.ts

@@ -67,7 +67,7 @@ export function addDependencies(options: Options): Rule {
             }
         });
 
-        addPackageToPkgJson(tree, schematicsPackage, pkgJson.devDependencies[schematicsPackage], devDependencies);
+        addPackageToPkgJson(tree, schematicsPackage, pkgJson.igxDevDependencies[schematicsPackage], devDependencies);
         return tree;
     };
 }

projects/igniteui-angular/src/lib/core/styles/base/utilities/_functions.scss

@@ -297,7 +297,7 @@
 /// @param {Color} $success [#4eb862] - The success color used throughout the application.
 /// @param {Color} $warn [#fbb13c] - The warning color used throughout the application.
 /// @param {Color} $error [#ff134a] - The error color used throughout the application.
-/// @param {Color} $grays [$igx-foreground-color] - The color used for generating the grayscale palette.
+/// @param {Color} $grays [#000 | $igx-foreground-color] - The color used for generating the grayscale palette.
 /// @param {Color} $surface [#fff] - The color used as a background in components, such as cards, sheets, and menus.
 /// @returns {Map} - A map consisting of 74 color variations, including the `primary`, `secondary`, `grays`,
 /// `info`, `success`, `warn`, and `error` colors.
@@ -309,7 +309,7 @@
     $success: #4eb862,
     $warn: #fbb13c,
     $error: #ff134a,
-    $grays: if(global-variable-exists('igx-foreground-color'), $igx-foreground-color, #000),
+    $grays: #000,
     $surface: #fff
 ) {
     $saturations: (50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 'A100', 'A200', 'A400', 'A700');

projects/igniteui-angular/src/lib/core/styles/themes/_core.scss

@@ -80,17 +80,14 @@
 @mixin igx-core(
     $print-layout: true,
     $direction: ltr,
-    $foreground-color: rgba(0, 0, 0, .87)
 ) {
     @if $direction != ltr and $direction != rtl {
         $direction: ltr !global;
     } @else {
         $direction: $direction !global;
     }
 
-    $igx-foreground-color: $foreground-color !global;
-
-    @include igx-typography($base-color: $foreground-color);
+    @include igx-typography();
     @include igx-vhelper();
 
     @if $print-layout == true {