merge MDC changes

Author: json-derulo

package-lock.json

@@ -27,48 +27,49 @@
     "minor-release": "npm run minor-release_",
     "major-release_": "run-s lib demo major pub",
     "major-release": "npm run major-release_",
-    "dryBuild": "run-s lib demo"
+    "dryBuild": "run-s lib demo",
+    "update": "npx npm-check-updates -u"
   },
   "dependencies": {
-    "@angular/animations": "^15.0.0",
-    "@angular/cdk": "^15.0.0",
-    "@angular/common": "^15.0.0",
-    "@angular/compiler": "^15.0.0",
-    "@angular/core": "^15.0.0",
-    "@angular/forms": "^15.0.0",
-    "@angular/material": "^15.0.0",
-    "@angular/platform-browser": "^15.0.0",
-    "@angular/platform-browser-dynamic": "^15.0.0",
-    "@angular/router": "^15.0.0",
-    "@ctrl/tinycolor": "^3.4.0",
+    "@angular/animations": "^15.1.2",
+    "@angular/cdk": "^15.1.2",
+    "@angular/common": "^15.1.2",
+    "@angular/compiler": "^15.1.2",
+    "@angular/core": "^15.1.2",
+    "@angular/forms": "^15.1.2",
+    "@angular/material": "^15.1.2",
+    "@angular/platform-browser": "^15.1.2",
+    "@angular/platform-browser-dynamic": "^15.1.2",
+    "@angular/router": "^15.1.2",
+    "@ctrl/tinycolor": "^3.5.0",
     "ngx-color-picker": "^13.0.0",
-    "rxjs": "~7.5.7",
-    "tslib": "^2.3.0",
+    "rxjs": "~7.8.0",
+    "tslib": "^2.5.0",
     "zone.js": "~0.12.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^15.0.0",
-    "@angular/cli": "^15.0.0",
-    "@angular/compiler-cli": "^15.0.0",
-    "@angular/language-service": "^15.0.0",
-    "@types/jasmine": "^4.3.0",
+    "@angular-devkit/build-angular": "^15.1.3",
+    "@angular/cli": "^15.1.3",
+    "@angular/compiler-cli": "^15.1.2",
+    "@angular/language-service": "^15.1.2",
+    "@types/jasmine": "^4.3.1",
     "@types/jasminewd2": "^2.0.10",
-    "@types/node": "^18.11.9",
-    "codelyzer": "^6.0.0",
-    "copyfiles": "^2.1.1",
-    "gh-pages": "^4.0.0",
+    "@types/node": "^18.11.18",
+    "codelyzer": "^6.0.2",
+    "copyfiles": "^2.4.1",
+    "gh-pages": "^5.0.0",
     "jasmine-core": "^4.5.0",
     "jasmine-spec-reporter": "^7.0.0",
-    "karma": "^6.3.16",
-    "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma": "^6.4.1",
+    "karma-chrome-launcher": "~3.1.1",
+    "karma-coverage-istanbul-reporter": "~3.0.3",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "^2.0.0",
-    "ng-packagr": "^15.0.0",
+    "ng-packagr": "^15.1.1",
     "npm-run-all": "^4.1.5",
     "protractor": "~7.0.0",
-    "ts-node": "^10.1.0",
-    "tslint": "~6.1.0",
-    "typescript": "~4.8.0"
+    "ts-node": "^10.9.1",
+    "tslint": "~6.1.3",
+    "typescript": "~4.9.4"
   }
 }

package.json

@@ -34,6 +34,26 @@
   @return $string;
 }
 
+@function _mat-css-hex-to-rgb($color, $rgb-wrap: true) {
+  @if ($color == null) {
+    @return null;
+  }
+  @if ($rgb-wrap) {
+    @return rgb(red($color), green($color), blue($color));
+  }
+  @return red($color), green($color), blue($color);
+}
+
+@function _mat-css-hex-to-rgba($color, $rgb-wrap: true) {
+  @if ($color == null) {
+    @return null;
+  }
+  @if ($rgb-wrap) {
+    @return rgba(red($color), green($color), blue($color), alpha($color));
+  }
+  @return red($color), green($color), blue($color), alpha($color);
+}
+
 @mixin root($varMap: null) {
   @at-root :root {
     @each $varName, $varValue in $varMap {

projects/material-css-vars/src/lib/_internal-helper.scss

@@ -1,10 +1,10 @@
-@use '@angular/material'as mat;
+@use '@angular/material' as mat;
 @use 'internal-helper' as helper;
-@use '@angular/material/theming' as theming;
 @use 'variables' as variables;
+@use 'internal-helper';
 @use 'public-util';
 // contains main overwrite of `mat-color` to make it all work
-// needs to come after '~@angular/material/theming'
+// needs to come after '@angular/material'
 @use 'mat-lib-overwrites' as overwrites;
 
 @mixin init-css-vars($default-theme, $text, $default-foreground, $default-background) {
@@ -27,25 +27,31 @@
   $accent: mat.define-palette(variables.$palette-accent);
   $warn: mat.define-palette(variables.$palette-warn);
 
-  $theme: mat.define-light-theme((
+  $theme: (
     color: (
       primary: $primary,
       accent: $accent,
-      warn: $warn
+      warn: $warn,
+      is-dark: false,
+      foreground: variables.$palette-foreground,
+      background: variables.$palette-background,
     ),
     typography: $typography-config,
-    density: 0
-  ));
+    density: 0,
+  );
 
-  $dark-theme: mat.define-dark-theme((
+  $dark-theme: (
     color: (
       primary: $primary,
       accent: $accent,
-      warn: $warn
+      warn: $warn,
+      is-dark: true,
+      foreground: variables.$palette-foreground-dark,
+      background: variables.$palette-background-dark,
     ),
     typography: $typography-config,
-    density: 0
-  ));
+    density: 0,
+  );
 
   // set global variable so passed-in content can use the theme
   $mat-css-theme: $theme !global; // stays for backwards-compatibility