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

package/core/tokens/m2/mdc/_checkbox.scss

@@ -1,6 +1,7 @@
 @use 'sass:map';
 @use '../../../theming/palette';
 @use '../../../theming/theming';
+@use '../../../theming/inspection';
 @use '../../../style/sass-utils';
 @use '../../token-utils';
 @use '@material/theme/theme-color' as mdc-theme-color;
@@ -50,15 +51,15 @@ $prefix: (mdc, checkbox);
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($config) {
-  $foreground: map.get($config, foreground);
-  $accent: map.get($config, accent);
-  $is-dark: map.get($config, is-dark);
-  $foreground-base: theming.get-color-from-palette($foreground, base);
-  $accent-default: theming.get-color-from-palette($accent, default);
-  $disabled-color: theming.get-color-from-palette($foreground, base, 0.38);
-  $selected-color: theming.get-color-from-palette($accent);
-  $border-color: theming.get-color-from-palette($foreground, base, 0.54);
+@function get-color-tokens($theme, $palette-name: accent) {
+  $is-dark: inspection.get-theme-type($theme) == dark;
+  $foreground-base: inspection.get-theme-color($theme, foreground, base);
+  $palette-default: inspection.get-theme-color($theme, $palette-name, default);
+  $disabled-color: sass-utils.safe-color-change(
+      inspection.get-theme-color($theme, foreground, base), $alpha: 0.38);
+  $palette-selected: inspection.get-theme-color($theme, $palette-name);
+  $border-color: sass-utils.safe-color-change(
+      inspection.get-theme-color($theme, foreground, base), $alpha: 0.54);
   $active-border-color:
     theming.get-color-from-palette(palette.$gray-palette, if($is-dark, 200, 900));
 
@@ -68,15 +69,15 @@ $prefix: (mdc, checkbox);
     // The color of the checkbox border when the checkbox is unselected and disabled.
     disabled-unselected-icon-color: $disabled-color,
     // The color of the checkmark when the checkbox is selected.
-    selected-checkmark-color: _contrast-tone($selected-color, $is-dark),
+    selected-checkmark-color: _contrast-tone($palette-selected, $is-dark),
     // The color of the checkbox fill when the checkbox is selected and focused.
-    selected-focus-icon-color: $selected-color,
+    selected-focus-icon-color: $palette-selected,
     // The color of the checkbox fill when the checkbox is selected and hovered.
-    selected-hover-icon-color: $selected-color,
+    selected-hover-icon-color: $palette-selected,
     // The color of the checkbox fill when the checkbox is selected.
-    selected-icon-color: $selected-color,
+    selected-icon-color: $palette-selected,
     // The color of the checkbox fill when the checkbox is selected an pressed.
-    selected-pressed-icon-color: $selected-color,
+    selected-pressed-icon-color: $palette-selected,
     // The color of the checkbox border when the checkbox is unselected and focused.
     unselected-focus-icon-color: $active-border-color,
     // The color of the checkbox border when the checkbox is unselected and hovered.
@@ -86,11 +87,11 @@ $prefix: (mdc, checkbox);
     // The color of the checkbox border when the checkbox is unselected and pressed.
     unselected-pressed-icon-color: $border-color,
     // The color of the ripple when the checkbox is selected and focused.
-    selected-focus-state-layer-color: $accent-default,
+    selected-focus-state-layer-color: $palette-default,
     // The color of the ripple when the checkbox is selected and hovered.
-    selected-hover-state-layer-color: $accent-default,
+    selected-hover-state-layer-color: $palette-default,
     // The color of the ripple when the checkbox is selected and pressed.
-    selected-pressed-state-layer-color: $accent-default,
+    selected-pressed-state-layer-color: $palette-default,
     // The color of the ripple when the checkbox is unselected and focused.
     unselected-focus-state-layer-color: $foreground-base,
     // The color of the ripple when the checkbox is unselected and hovered.
@@ -101,13 +102,13 @@ $prefix: (mdc, checkbox);
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($config) {
+@function get-typography-tokens($theme) {
   @return ();
 }
 
 // Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($config) {
-  $scale: theming.clamp-density($config, -3);
+@function get-density-tokens($theme) {
+  $scale: theming.clamp-density(inspection.get-theme-density($theme), -3);
 
   @return (
     // The diameter of the checkbox's ripple.

package/core/tokens/m2/mdc/_chip.scss

@@ -1,9 +1,12 @@
+@use 'sass:color';
 @use 'sass:map';
+@use 'sass:meta';
 @use '../../token-utils';
 @use '../../../mdc-helpers/mdc-helpers';
 @use '../../../style/sass-utils';
 @use '../../../theming/theming';
-@use '../../../typography/typography-utils';
+@use '../../../theming/inspection';
+@use '../../../theming/palette';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mdc, chip);
@@ -228,14 +231,34 @@ $prefix: (mdc, chip);
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($config) {
-  $palette: map.get($config, primary);
+@function get-color-tokens($theme, $palette-name: null) {
+  $foreground: null;
+  $background: null;
+  $state-layer-color: inspection.get-theme-color($theme, foreground, base);
+  $state-layer-opacity: 0.12; // 0.12 is a common value in Material Design for opacity.
 
-  $background: theming.get-color-from-palette($palette);
-  $foreground: theming.get-color-from-palette($palette, default-contrast);
+  @if $palette-name == null {
+    $is-dark: inspection.get-theme-type($theme) == dark;
+    $grey-50: map.get(palette.$grey-palette, 50);
+    $grey-900: map.get(palette.$grey-palette, 900);
+    $foreground: if($is-dark, $grey-50, $grey-900);
 
-  $state-layer-color: theming.get-color-from-palette(map.get($config, foreground), base);
-  $state-layer-opacity: 0.12; // 0.12 is a common value in Material Design for opacity.
+    $surface: inspection.get-theme-color($theme, background, card);
+    $on-surface: if(
+        mdc-helpers.variable-safe-contrast-tone($surface, $is-dark) == 'dark',
+        #000,
+        #fff
+    );
+    $background: if(
+        meta.type-of($on-surface) == color and meta.type-of($surface) == color,
+        color.mix($on-surface, $surface, 12%),
+        $on-surface
+    );
+  }
+  @else {
+    $background: inspection.get-theme-color($theme, $palette-name);
+    $foreground: inspection.get-theme-color($theme, $palette-name, default-contrast);
+  }
 
   @return (
     // The text color of a disabled chip.
@@ -264,33 +287,24 @@ $prefix: (mdc, chip);
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($config) {
-  // TODO(wagnermaciel): The earlier implementation of the chip used MDC's APIs to create the
-  // typography tokens. As a result, we unintentionally allowed `null` typography configs to be
-  // passed in. Since there a lot of apps that now depend on this pattern, we need this temporary
-  // fallback.
-  @if ($config == null) {
-    $config: mdc-helpers.private-fallback-typography-from-mdc();
-  }
-
+@function get-typography-tokens($theme) {
   @return (
     // The font family of the chip text.
-    label-text-font: typography-utils.font-family($config, body-2) or
-      typography-utils.font-family($config),
+    label-text-font: inspection.get-theme-typography($theme, body-2, font-family),
     // The line height of the chip text.
-    label-text-line-height: typography-utils.line-height($config, body-2),
+    label-text-line-height: inspection.get-theme-typography($theme, body-2, line-height),
     // The font size of the chip text.
-    label-text-size: typography-utils.font-size($config, body-2),
+    label-text-size: inspection.get-theme-typography($theme, body-2, font-size),
     // The letter spacing of the chip label.
-    label-text-tracking: typography-utils.letter-spacing($config, body-2),
+    label-text-tracking: inspection.get-theme-typography($theme, body-2, letter-spacing),
     // The font weight of the chip text.
-    label-text-weight: typography-utils.font-weight($config, body-2)
+    label-text-weight: inspection.get-theme-typography($theme, body-2, font-weight)
   );
 }
 
 // Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($config) {
-  $scale: theming.clamp-density($config, -2);
+@function get-density-tokens($theme) {
+  $scale: theming.clamp-density(inspection.get-theme-density($theme), -2);
   @return (
     // The height of the chip.
     container-height:

package/core/tokens/m2/mdc/_circular-progress.scss

@@ -1,5 +1,4 @@
-@use 'sass:map';
-@use '../../../theming/theming';
+@use '../../../theming/inspection';
 @use '../../../style/sass-utils';
 @use '../../token-utils';
 
@@ -33,20 +32,20 @@ $prefix: (mdc, circular-progress);
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($config) {
+@function get-color-tokens($theme) {
   @return (
     // The color of the progress spinner's active indicator.
-    active-indicator-color: theming.get-color-from-palette(map.get($config, primary))
+    active-indicator-color: inspection.get-theme-color($theme, primary)
   );
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($config) {
+@function get-typography-tokens($theme) {
   @return ();
 }
 
 // Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($config) {
+@function get-density-tokens($theme) {
   @return ();
 }
 

package/core/tokens/m2/mdc/_dialog.scss

@@ -1,7 +1,4 @@
-@use 'sass:map';
-@use '../../../theming/theming';
-@use '../../../typography/typography-utils';
-@use '../../../mdc-helpers/mdc-helpers';
+@use '../../../theming/inspection';
 @use '../../../style/sass-utils';
 @use '../../token-utils';
 
@@ -56,14 +53,13 @@ $prefix: (mdc, dialog);
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($config) {
-  $is-dark: map.get($config, 'is-dark');
-  $background: map.get($config, background);
+@function get-color-tokens($theme) {
+  $is-dark: inspection.get-theme-type($theme) == dark;
   $on-surface: if($is-dark, #fff, #000);
 
   @return (
     // Background color of the container.
-    container-color: theming.get-color-from-palette($background, dialog),
+    container-color: inspection.get-theme-color($theme, background, dialog),
     // Color of the dialog header.
     subhead-color: rgba($on-surface, 0.87),
     // Color of the dialog body text.
@@ -72,35 +68,25 @@ $prefix: (mdc, dialog);
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($config) {
-  // TODO(crisbeto): The earlier implementation of the dialog used MDC's APIs to create the
-  // typography tokens. As a result, we unintentionally allowed `null` typography configs to be
-  // passed in. Since there a lot of apps that now depend on this pattern, we need this temporary
-  // fallback.
-  @if ($config == null) {
-    $config: mdc-helpers.private-fallback-typography-from-mdc();
-  }
-
+@function get-typography-tokens($theme) {
   @return (
     // Typography of the dialog header.
-    subhead-font: typography-utils.font-family($config, headline-6)
-      or typography-utils.font-family($config),
-    subhead-line-height: typography-utils.line-height($config, headline-6),
-    subhead-size: typography-utils.font-size($config, headline-6),
-    subhead-weight: typography-utils.font-weight($config, headline-6),
-    subhead-tracking: typography-utils.letter-spacing($config, headline-6),
+    subhead-font: inspection.get-theme-typography($theme, headline-6, font-family),
+    subhead-line-height: inspection.get-theme-typography($theme, headline-6, line-height),
+    subhead-size: inspection.get-theme-typography($theme, headline-6, font-size),
+    subhead-weight: inspection.get-theme-typography($theme, headline-6, font-weight),
+    subhead-tracking: inspection.get-theme-typography($theme, headline-6, letter-spacing),
     // Typography of the dialog body text.
-    supporting-text-font: typography-utils.font-family($config, body-1)
-      or typography-utils.font-family($config),
-    supporting-text-line-height: typography-utils.line-height($config, body-1),
-    supporting-text-size: typography-utils.font-size($config, body-1),
-    supporting-text-weight: typography-utils.font-weight($config, body-1),
-    supporting-text-tracking: typography-utils.letter-spacing($config, body-1),
+    supporting-text-font: inspection.get-theme-typography($theme, body-1, font-family),
+    supporting-text-line-height: inspection.get-theme-typography($theme, body-1, line-height),
+    supporting-text-size: inspection.get-theme-typography($theme, body-1, font-size),
+    supporting-text-weight: inspection.get-theme-typography($theme, body-1, font-weight),
+    supporting-text-tracking: inspection.get-theme-typography($theme, body-1, letter-spacing),
   );
 }
 
 // Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($config) {
+@function get-density-tokens($theme) {
   @return ();
 }
 

package/core/tokens/m2/mdc/_elevated-card.scss

@@ -1,6 +1,5 @@
-@use 'sass:map';
 @use '../../../style/elevation';
-@use '../../../theming/theming';
+@use '../../../theming/inspection';
 @use '../../../style/sass-utils';
 @use '../../token-utils';
 
@@ -45,14 +44,12 @@ $prefix: (mdc, elevated-card);
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($config) {
-  $background: map.get($config, background);
-  $foreground: map.get($config, foreground);
-  $elevation: theming.get-color-from-palette($foreground, elevation);
+@function get-color-tokens($theme) {
+  $elevation: inspection.get-theme-color($theme, foreground, elevation);
 
   @return (
     // The background color of the card.
-    container-color: theming.get-color-from-palette($background, card),
+    container-color: inspection.get-theme-color($theme, background, card),
     // The elevation level of the card.
     // (Part of the color tokens because it needs to be combined with the shadow color to generate
     // the final box-shadow).
@@ -63,12 +60,12 @@ $prefix: (mdc, elevated-card);
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($config) {
+@function get-typography-tokens($theme) {
   @return ();
 }
 
 // Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($config) {
+@function get-density-tokens($theme) {
   @return ();
 }
 

package/core/tokens/m2/mdc/_extended-fab.scss

@@ -1,6 +1,5 @@
-@use '../../../mdc-helpers/mdc-helpers';
 @use '../../token-utils';
-@use '../../../typography/typography-utils';
+@use '../../../theming/inspection';
 
 @use 'sass:map';
 
@@ -45,30 +44,22 @@ $prefix: (mdc, extended-fab);
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($config) {
+@function get-color-tokens($theme) {
   @return ();
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($config) {
-  // TODO(wagnermaciel): The earlier implementation of the snack bar used MDC's APIs to create the
-  // typography tokens. As a result, we unintentionally allowed `null` typography configs to be
-  // passed in. Since there a lot of apps that now depend on this pattern, we need this temporary
-  // fallback.
-  @if ($config == null) {
-    $config: mdc-helpers.private-fallback-typography-from-mdc();
-  }
+@function get-typography-tokens($theme) {
   @return (
-    label-text-font: typography-utils.font-family($config, button) or
-      typography-utils.font-family($config),
-    label-text-size: typography-utils.font-size($config, button),
-    label-text-tracking: typography-utils.letter-spacing($config, button),
-    label-text-weight: typography-utils.font-weight($config, button)
+    label-text-font: inspection.get-theme-typography($theme, button, font-family),
+    label-text-size: inspection.get-theme-typography($theme, button, font-size),
+    label-text-tracking: inspection.get-theme-typography($theme, button, letter-spacing),
+    label-text-weight: inspection.get-theme-typography($theme, button, font-weight)
   );
 }
 
 // Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($config) {
+@function get-density-tokens($theme) {
   @return ();
 }
 

package/core/tokens/m2/mdc/_fab.scss

@@ -1,4 +1,4 @@
-@use '../../../theming/theming';
+@use '../../../theming/inspection';
 @use '../../token-utils';
 
 @use 'sass:map';
@@ -55,21 +55,20 @@ $ripple-target: '.mdc-fab__ripple';
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($config) {
-  $primary: map.get($config, primary);
-  $surface: theming.get-color-from-palette($primary, default);
-  $on-surface: theming.get-color-from-palette($primary, default-contrast);
+@function get-color-tokens($theme) {
+  $surface: inspection.get-theme-color($theme, primary, default);
+  $on-surface: inspection.get-theme-color($theme, primary, default-contrast);
 
   @return (container-color: $surface, icon-color: $on-surface);
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($config) {
+@function get-typography-tokens($theme) {
   @return ();
 }
 
 // Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($config) {
+@function get-density-tokens($theme) {
   @return ();
 }
 

package/core/tokens/m2/mdc/_filled-text-field.scss

@@ -1,9 +1,8 @@
 @use 'sass:color';
 @use 'sass:map';
 @use 'sass:meta';
-@use '../../../theming/theming';
+@use '../../../theming/inspection';
 @use '../../../style/sass-utils';
-@use '../../../typography/typography-utils';
 @use '../../token-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
@@ -93,15 +92,12 @@ $prefix: (mdc, filled-text-field);
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($config) {
-  $foreground: map.get($config, foreground);
-  $background: map.get($config, background);
-  $warn: map.get($config, warn);
-  $is-dark: map.get($config, is-dark);
-  $surface: theming.get-color-from-palette($background, card);
+@function get-color-tokens($theme) {
+  $is-dark: inspection.get-theme-type($theme) == dark;
+  $surface: inspection.get-theme-color($theme, background, card);
   $on-surface: if($is-dark, #fff, #000);
-  $warn-color: theming.get-color-from-palette($warn);
-  $color-tokens: private-get-color-palette-color-tokens($config, primary);
+  $warn-color: inspection.get-theme-color($theme, warn);
+  $color-tokens: private-get-color-palette-color-tokens($theme, primary);
 
   @return map.merge($color-tokens, (
     container-color: _variable-safe-mix($on-surface, $surface, 4%),
@@ -135,31 +131,29 @@ $prefix: (mdc, filled-text-field);
 }
 
 // Generates the mapping for the properties that change based on the text field color.
-@function private-get-color-palette-color-tokens($config, $palette-name) {
-  $palette: map.get($config, $palette-name);
-  $palette-color: theming.get-color-from-palette($palette);
+@function private-get-color-palette-color-tokens($theme, $palette-name) {
+  $palette: map.get($theme, $palette-name);
+  $palette-color: inspection.get-theme-color($theme, $palette-name);
 
   @return (
     caret-color: $palette-color,
     focus-active-indicator-color: $palette-color,
-    focus-label-text-color: theming.get-color-from-palette($palette, default, 0.87),
+    focus-label-text-color: sass-utils.safe-color-change($palette-color, $alpha: 0.87),
   );
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($config) {
-  $fallback-font-family: typography-utils.font-family($config);
-
+@function get-typography-tokens($theme) {
   @return (
-    label-text-font: typography-utils.font-family($config, body-1) or $fallback-font-family,
-    label-text-size: typography-utils.font-size($config, body-1),
-    label-text-tracking: typography-utils.letter-spacing($config, body-1),
-    label-text-weight: typography-utils.font-weight($config, body-1),
+    label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
+    label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
+    label-text-tracking: inspection.get-theme-typography($theme, body-1, letter-spacing),
+    label-text-weight: inspection.get-theme-typography($theme, body-1, font-weight),
   );
 }
 
 // Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($config) {
+@function get-density-tokens($theme) {
   @return ();
 }
 

package/core/tokens/m2/mdc/_icon-button.scss

@@ -43,19 +43,19 @@ $prefix: (mdc, icon-button);
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($config) {
+@function get-color-tokens($theme) {
   @return (
     icon-color: inherit,
   );
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($config) {
+@function get-typography-tokens($theme) {
   @return ();
 }
 
 // Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($config) {
+@function get-density-tokens($theme) {
   @return ();
 }
 

package/core/tokens/m2/mdc/_linear-progress.scss

@@ -1,8 +1,7 @@
-@use '../../../theming/theming';
+@use '../../../theming/inspection';
 @use '../../../style/sass-utils';
 @use '../../token-utils';
 @use 'sass:color';
-@use 'sass:map';
 @use 'sass:meta';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
@@ -27,26 +26,26 @@ $prefix: (mdc, linear-progress);
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($config) {
-  $primary: theming.get-color-from-palette(map.get($config, primary));
+@function get-color-tokens($theme, $palette-name: primary) {
+  $palette-color: inspection.get-theme-color($theme, $palette-name);
   @return (
     // The color of the progress bar's active section.
-    active-indicator-color: $primary,
+    active-indicator-color: $palette-color,
     track-color: if(
-        meta.type-of($primary) == color,
-        color.adjust($primary, $alpha: -0.75),
-        $primary
+        meta.type-of($palette-color) == color,
+        color.adjust($palette-color, $alpha: -0.75),
+        $palette-color
     )
   );
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($config) {
+@function get-typography-tokens($theme) {
   @return ();
 }
 
 // Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($config) {
+@function get-density-tokens($theme) {
   @return ();
 }