@angular/material 17.0.0-next.0 → 17.0.0-next.1

package/schematics/ng-add/index.js

@@ -18,7 +18,7 @@ const package_config_1 = require("./package-config");
  * Note that the fallback version range does not use caret, but tilde because that is
  * the default for Angular framework dependencies in CLI projects.
  */
-const fallbackMaterialVersionRange = `~17.0.0-next.0`;
+const fallbackMaterialVersionRange = `~17.0.0-next.1`;
 /**
  * Schematic factory entry-point for the `ng-add` schematic. The ng-add schematic will be
  * automatically executed if developers run `ng add @angular/material`.

package/schematics/ng-add/index.mjs

@@ -18,7 +18,7 @@ const package_config_1 = require("./package-config");
  * Note that the fallback version range does not use caret, but tilde because that is
  * the default for Angular framework dependencies in CLI projects.
  */
-const fallbackMaterialVersionRange = `~17.0.0-next.0`;
+const fallbackMaterialVersionRange = `~17.0.0-next.1`;
 /**
  * Schematic factory entry-point for the `ng-add` schematic. The ng-add schematic will be
  * automatically executed if developers run `ng add @angular/material`.

package/slide-toggle/_slide-toggle-theme.scss

@@ -1,24 +1,18 @@
-@use 'sass:map';
 @use '@material/switch/switch-theme' as mdc-switch-theme;
 @use '@material/form-field' as mdc-form-field;
 @use '../core/theming/theming';
+@use '../core/theming/inspection';
 @use '../core/mdc-helpers/mdc-helpers';
 @use '../core/typography/typography';
 @use '../core/tokens/m2/mdc/switch' as m2-mdc-switch;
 @use '../core/tokens/m2/mat/slide-toggle' as m2-mat-slide-toggle;
 @use '../core/tokens/token-utils';
 
-@mixin color($config-or-theme) {
-  $config: theming.get-color-config($config-or-theme);
-  $primary: map.get($config, primary);
-  $accent: map.get($config, accent);
-  $warn: map.get($config, warn);
-  $is-dark: map.get($config, is-dark);
-  $foreground: map.get($config, foreground);
+@mixin color($theme) {
+  $is-dark: inspection.get-theme-type($theme) == dark;
+  $mdc-switch-color-tokens: m2-mdc-switch.get-color-tokens($theme);
 
-  $mdc-switch-color-tokens: m2-mdc-switch.get-color-tokens($config);
-
-  @include mdc-helpers.using-mdc-theme($config) {
+  @include mdc-helpers.using-mdc-theme($theme) {
     // Add values for MDC slide toggles tokens
     .mat-mdc-slide-toggle {
       @include mdc-form-field.core-styles($query: mdc-helpers.$mdc-theme-styles-query);
@@ -26,32 +20,26 @@
 
       // MDC should set the disabled color on the label, but doesn't, so we do it here instead.
       .mdc-switch--disabled + label {
-        color: theming.get-color-from-palette($foreground, disabled-text);
+        color: inspection.get-theme-color($theme, foreground, disabled-text);
       }
 
       // Change the color palette related tokens to accent or warn if applicable
       &.mat-accent {
-        @include mdc-switch-theme.theme(m2-mdc-switch.private-get-color-palette-color-tokens(
-          map.get($config, accent),
-          map.get($config, is-dark)
-        ));
+        @include mdc-switch-theme.theme(
+            m2-mdc-switch.private-get-color-palette-color-tokens($theme, accent));
       }
 
       &.mat-warn {
-        @include mdc-switch-theme.theme(m2-mdc-switch.private-get-color-palette-color-tokens(
-          map.get($config, warn),
-          map.get($config, is-dark)
-        ));
+        @include mdc-switch-theme.theme(
+            m2-mdc-switch.private-get-color-palette-color-tokens($theme, warn));
       }
     }
   }
 }
 
-@mixin typography($config-or-theme) {
-  $config: typography.private-typography-to-2018-config(
-      theming.get-typography-config($config-or-theme));
-  $mdc-switch-typography-tokens: m2-mdc-switch.get-typography-tokens($config);
-  $mat-slide-toggle-typography-tokens: m2-mat-slide-toggle.get-typography-tokens($config);
+@mixin typography($theme) {
+  $mdc-switch-typography-tokens: m2-mdc-switch.get-typography-tokens($theme);
+  $mat-slide-toggle-typography-tokens: m2-mat-slide-toggle.get-typography-tokens($theme);
 
   //Add values for MDC slide toggle tokens
   .mat-mdc-slide-toggle {
@@ -64,29 +52,24 @@
   }
 }
 
-@mixin density($config-or-theme) {
-  $density-scale: theming.get-density-config($config-or-theme);
+@mixin density($theme) {
+  $density-scale: inspection.get-theme-density($theme);
+
   .mat-mdc-slide-toggle {
     @include mdc-switch-theme.theme(mdc-switch-theme.density($density-scale));
   }
 }
 
-@mixin theme($theme-or-color-config) {
-  $theme: theming.private-legacy-get-theme($theme-or-color-config);
-
+@mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-slide-toggle') {
-    $color: theming.get-color-config($theme);
-    $density: theming.get-density-config($theme);
-    $typography: theming.get-typography-config($theme);
-
-    @if $color != null {
-      @include color($color);
+    @if inspection.theme-has($theme, color) {
+      @include color($theme);
     }
-    @if $density != null {
-      @include density($density);
+    @if inspection.theme-has($theme, density) {
+      @include density($theme);
     }
-    @if $typography != null {
-      @include typography($typography);
+    @if inspection.theme-has($theme, typography) {
+      @include typography($theme);
     }
   }
 }

package/slider/_slider-theme.scss

@@ -1,103 +1,86 @@
-@use 'sass:map';
-
 @use '@material/slider/slider-theme' as mdc-slider-theme;
 @use '../core/theming/theming';
+@use '../core/theming/inspection';
 @use '../core/typography/typography';
 @use '../core/style/sass-utils';
 @use '../core/tokens/token-utils';
 @use '../core/tokens/m2/mat/slider' as m2-mat-slider;
 @use '../core/tokens/m2/mdc/slider' as m2-mdc-slider;
 
-@mixin base($config-or-theme) {
+@mixin base($theme) {
   // Add default values for tokens not related to color, typography, or density.
   @include sass-utils.current-selector-or-root() {
     @include mdc-slider-theme.theme(m2-mdc-slider.get-unthemable-tokens());
   }
 }
 
-@mixin color($config-or-theme) {
-  $config: theming.get-color-config($config-or-theme);
-  $is-dark: map.get($config, is-dark);
+@mixin color($theme) {
+  $is-dark: inspection.get-theme-type($theme) == dark;
 
   $mdc-color-tokens: token-utils.resolve-elevation(
-    m2-mdc-slider.get-color-tokens($config),
+    m2-mdc-slider.get-color-tokens($theme),
     handle-elevation,
     handle-shadow-color
   );
 
-  $mat-slider-color-tokens: m2-mat-slider.get-color-tokens($config);
+  $mat-slider-color-tokens: m2-mat-slider.get-color-tokens($theme);
 
   // Add values for MDC slider tokens.
   .mat-mdc-slider {
     @include mdc-slider-theme.theme($mdc-color-tokens);
-    @include _slider-ripple-color(map.get($config, primary));
+    @include _slider-ripple-color($theme, primary);
     @include token-utils.create-token-values(
       m2-mat-slider.$prefix,
       $mat-slider-color-tokens
     );
 
     &.mat-accent {
-      $accent: map.get($config, accent);
       @include mdc-slider-theme.theme(
-        m2-mdc-slider.private-get-color-palette-color-tokens($accent)
-      );
-      @include _slider-ripple-color($accent);
+          m2-mdc-slider.private-get-color-palette-color-tokens($theme, accent));
+      @include _slider-ripple-color($theme, accent);
     }
 
     &.mat-warn {
-      $warn: map.get($config, warn);
       @include mdc-slider-theme.theme(
-        m2-mdc-slider.private-get-color-palette-color-tokens($warn)
-      );
-      @include _slider-ripple-color($warn);
+          m2-mdc-slider.private-get-color-palette-color-tokens($theme, warn));
+      @include _slider-ripple-color($theme, warn);
     }
   }
 }
 
-@mixin typography($config-or-theme) {
-  $config: typography.private-typography-to-2018-config(
-      theming.get-typography-config($config-or-theme));
-  $mdc-typography-tokens: m2-mdc-slider.get-typography-tokens($config);
-
+@mixin typography($theme) {
   // Add values for MDC slider tokens.
   .mat-mdc-slider {
-    @include mdc-slider-theme.theme($mdc-typography-tokens);
+    @include mdc-slider-theme.theme(m2-mdc-slider.get-typography-tokens($theme));
   }
 }
 
-@mixin density($config-or-theme) {
-  $density-scale: theming.get-density-config($config-or-theme);
-  $mdc-density-tokens: m2-mdc-slider.get-density-tokens($density-scale);
-
+@mixin density($theme) {
   // Add values for MDC slider tokens.
   .mat-mdc-slider {
-    @include mdc-slider-theme.theme($mdc-density-tokens);
+    @include mdc-slider-theme.theme(m2-mdc-slider.get-density-tokens($theme));
   }
 }
 
-@mixin theme($theme-or-color-config) {
-  $theme: theming.private-legacy-get-theme($theme-or-color-config);
+@mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-slider') {
-    $color: theming.get-color-config($theme);
-    $density: theming.get-density-config($theme);
-    $typography: theming.get-typography-config($theme);
-
     @include base($theme);
-    @if $color != null {
-      @include color($color);
+    @if inspection.theme-has($theme, color) {
+      @include color($theme);
     }
-    @if $density != null {
-      @include density($density);
+    @if inspection.theme-has($theme, density) {
+      @include density($theme);
     }
-    @if $typography != null {
-      @include typography($typography);
+    @if inspection.theme-has($theme, typography) {
+      @include typography($theme);
     }
   }
 }
 
 // Generated MDC ripple color tokens are not being calculated so needs to be set
-@mixin _slider-ripple-color($color-palette) {
-  $color: theming.get-color-from-palette($color-palette);
+@mixin _slider-ripple-color($theme, $palette-name) {
+  $color: inspection.get-theme-color($theme, $palette-name);
+
   --mat-mdc-slider-ripple-color: #{$color};
   --mat-mdc-slider-hover-ripple-color: #{rgba($color, 0.05)};
   --mat-mdc-slider-focus-ripple-color: #{rgba($color, 0.2)};

package/snack-bar/_snack-bar-theme.scss

@@ -16,7 +16,7 @@
 @mixin color($config-or-theme) {
   $config: theming.get-color-config($config-or-theme);
 
-  .mat-mdc-snack-bar-container {
+  @include sass-utils.current-selector-or-root() {
     @include mdc-snackbar-theme.theme(tokens-mdc-snack-bar.get-color-tokens($config));
     @include token-utils.create-token-values(
       tokens-mat-snack-bar.$prefix,
@@ -29,7 +29,7 @@
   $config: typography.private-typography-to-2018-config(
       theming.get-typography-config($config-or-theme));
 
-  .mat-mdc-snack-bar-container {
+  @include sass-utils.current-selector-or-root() {
     @include mdc-snackbar-theme.theme(tokens-mdc-snack-bar.get-typography-tokens($config));
   }
 }

package/button-toggle/_button-toggle-variables.scss

@@ -1,16 +0,0 @@
-// TODO(crisbeto): this file isn't used anymore and should be removed.
-
-$standard-height: 48px !default;
-// Minimum height for highest density can vary based on the content that developers
-// project into button-toggle's. We use a minimum of `24px` though because commonly
-// icons or text are displayed. Icons by default have a size of `24px`.
-$standard-minimum-height: 24px !default;
-$standard-maximum-height: $standard-height !default;
-
-$standard-density-config: (
-  height: (
-    default: $standard-height,
-    maximum: $standard-maximum-height,
-    minimum: $standard-minimum-height,
-  )
-) !default;

package/paginator/_paginator-variables.scss

@@ -1,15 +0,0 @@
-// TODO: this file isn't used, but is kept for backwards compatibility. It should be deleted in v17.
-
-$height: 56px !default;
-// Minimum height for paginator's in the highest density is determined based on how
-// much the paginator can shrink until the content exceeds (i.e. navigation buttons).
-$minimum-height: 40px !default;
-$maximum-height: $height !default;
-
-$density-config: (
-  height: (
-    default: $height,
-    maximum: $maximum-height,
-    minimum: $minimum-height,
-  )
-) !default;