@angular/material 20.1.0-next.1 → 20.1.0-next.2

package/card/_m2-card.scss

@@ -1,4 +1,3 @@
-@use '../core/theming/inspection';
 @use '../core/style/elevation';
 @use '../core/tokens/m2-utils';
 @use 'sass:map';
@@ -32,19 +31,18 @@
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
+  $system: m2-utils.get-system($theme);
   @return (
-    card-title-text-font: inspection.get-theme-typography($theme, headline-6, font-family),
-    card-title-text-line-height: inspection.get-theme-typography($theme, headline-6, line-height),
-    card-title-text-size: inspection.get-theme-typography($theme, headline-6, font-size),
-    card-title-text-tracking: inspection.get-theme-typography($theme, headline-6, letter-spacing),
-    card-title-text-weight: inspection.get-theme-typography($theme, headline-6, font-weight),
-    card-subtitle-text-font: inspection.get-theme-typography($theme, subtitle-2, font-family),
-    card-subtitle-text-line-height:
-        inspection.get-theme-typography($theme, subtitle-2, line-height),
-    card-subtitle-text-size: inspection.get-theme-typography($theme, subtitle-2, font-size),
-    card-subtitle-text-tracking:
-        inspection.get-theme-typography($theme, subtitle-2, letter-spacing),
-    card-subtitle-text-weight: inspection.get-theme-typography($theme, subtitle-2, font-weight),
+    card-title-text-font: map.get($system, title-small-font),
+    card-title-text-line-height: map.get($system, title-small-line-height),
+    card-title-text-size: map.get($system, title-small-size),
+    card-title-text-tracking: map.get($system, title-small-tracking),
+    card-title-text-weight: map.get($system, title-small-weight),
+    card-subtitle-text-font: map.get($system, label-medium-font),
+    card-subtitle-text-line-height: map.get($system, label-medium-line-height),
+    card-subtitle-text-size: map.get($system, label-medium-size),
+    card-subtitle-text-tracking: map.get($system, label-medium-tracking),
+    card-subtitle-text-weight: map.get($system, label-medium-weight),
   );
 }
 

package/checkbox/_checkbox-theme.scss

@@ -1,5 +1,3 @@
-@use '../core/style/sass-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
@@ -11,69 +9,58 @@
 /// for the mat-checkbox.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: m2-checkbox.get-unthemable-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-checkbox.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-checkbox.get-unthemable-tokens($theme));
-    }
+    $tokens: map.get(m3-checkbox.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-checkbox.
 /// @param {Map} $theme The theme to generate color styles for.
 /// @param {String} $color-variant The color variant to use for the component
 @mixin color($theme, $color-variant: null) {
+  $tokens: m2-checkbox.get-color-tokens($theme, secondary);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-checkbox.get-tokens($theme, $color-variant), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-          m2-checkbox.get-color-tokens($theme, secondary));
-    }
+    $tokens: map.get(m3-checkbox.get-tokens($theme, $color-variant), color);
+  }
+
+  @include token-utils.values($tokens);
 
+  @if inspection.get-theme-version($theme) != 1 {
     .mat-mdc-checkbox {
       &.mat-primary {
-        @include token-utils.create-token-values-mixed(
-            m2-checkbox.get-color-tokens($theme, primary,
-                $exclude: (checkbox-disabled-label-color, checkbox-label-text-color))
+        @include token-utils.values(m2-checkbox.get-color-tokens($theme, primary,
+          $exclude: (checkbox-disabled-label-color, checkbox-label-text-color))
         );
       }
 
       &.mat-warn {
-        @include token-utils.create-token-values-mixed(
-          m2-checkbox.get-color-tokens($theme, error,
-              $exclude: (checkbox-disabled-label-color, checkbox-label-text-color))
+        @include token-utils.values(m2-checkbox.get-color-tokens($theme, error,
+          $exclude: (checkbox-disabled-label-color, checkbox-label-text-color))
         );
       }
     }
   }
 }
 
-/// Outputs typography theme styles for the mat-checkbox.
-/// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: m2-checkbox.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-checkbox.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-checkbox.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-checkbox.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
-/// Outputs density theme styles for the mat-checkbox.
-/// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: m2-checkbox.get-density-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-checkbox.get-tokens($theme), density));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-checkbox.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-checkbox.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -96,23 +83,21 @@
 /// @param {Map} $theme The theme to generate styles for.
 /// @param {String} $color-variant The color variant to use for the component (M3 only)
 @mixin theme($theme, $color-variant: null) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-checkbox') {
-    @if inspection.get-theme-version($theme) == 1 {
-      @include base($theme);
-      @include color($theme, $color-variant);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include base($theme);
+    @include color($theme, $color-variant);
+    @include density($theme);
+    @include typography($theme);
+  } @else {
+    @include base($theme);
+    @if inspection.theme-has($theme, color) {
+      @include color($theme);
+    }
+    @if inspection.theme-has($theme, density) {
       @include density($theme);
+    }
+    @if inspection.theme-has($theme, typography) {
       @include typography($theme);
-    } @else {
-      @include base($theme);
-      @if inspection.theme-has($theme, color) {
-        @include color($theme);
-      }
-      @if inspection.theme-has($theme, density) {
-        @include density($theme);
-      }
-      @if inspection.theme-has($theme, typography) {
-        @include typography($theme);
-      }
     }
   }
 }

package/checkbox/_m2-checkbox.scss

@@ -57,12 +57,13 @@
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
+  $system: m2-utils.get-system($theme);
   @return (
-    checkbox-label-text-font: inspection.get-theme-typography($theme, body-2, font-family),
-    checkbox-label-text-line-height: inspection.get-theme-typography($theme, body-2, line-height),
-    checkbox-label-text-size: inspection.get-theme-typography($theme, body-2, font-size),
-    checkbox-label-text-tracking: inspection.get-theme-typography($theme, body-2, letter-spacing),
-    checkbox-label-text-weight: inspection.get-theme-typography($theme, body-2, font-weight)
+    checkbox-label-text-font: map.get($system, body-medium-font),
+    checkbox-label-text-line-height: map.get($system, body-medium-line-height),
+    checkbox-label-text-size: map.get($system, body-medium-size),
+    checkbox-label-text-tracking: map.get($system, body-medium-tracking),
+    checkbox-label-text-weight: map.get($system, body-medium-weight)
   );
 }
 

package/chips/_chips-theme.scss

@@ -2,7 +2,6 @@
 @use './m2-chip';
 @use './m3-chip';
 @use '../core/tokens/token-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/typography/typography';
 @use 'sass:map';
@@ -12,10 +11,10 @@
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-chip.get-tokens($theme), base));
+    @include token-utils.values(map.get(m3-chip.get-tokens($theme), base));
   } @else {
     .mat-mdc-standard-chip {
-      @include token-utils.create-token-values-mixed(m2-chip.get-unthemable-tokens($theme));
+      @include token-utils.values(m2-chip.get-unthemable-tokens($theme));
     }
   }
 }
@@ -25,27 +24,24 @@
 /// @param {String} $color-variant The color variant to use for the component (M3 only)
 @mixin color($theme, $color-variant: null) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
+    @include token-utils.values(
         map.get(m3-chip.get-tokens($theme, $color-variant), color));
   } @else {
     .mat-mdc-standard-chip {
-      @include token-utils.create-token-values-mixed(m2-chip.get-color-tokens($theme));
+      @include token-utils.values(m2-chip.get-color-tokens($theme));
 
       &.mat-mdc-chip-selected,
       &.mat-mdc-chip-highlighted {
         &.mat-primary {
-          @include token-utils.create-token-values-mixed(
-              m2-chip.get-color-tokens($theme, primary));
+          @include token-utils.values(m2-chip.get-color-tokens($theme, primary));
         }
 
         &.mat-accent {
-          @include token-utils.create-token-values-mixed(
-              m2-chip.get-color-tokens($theme, secondary));
+          @include token-utils.values(m2-chip.get-color-tokens($theme, secondary));
         }
 
         &.mat-warn {
-          @include token-utils.create-token-values-mixed(
-              m2-chip.get-color-tokens($theme, error));
+          @include token-utils.values(m2-chip.get-color-tokens($theme, error));
         }
       }
     }
@@ -56,10 +52,10 @@
 /// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-chip.get-tokens($theme), typography));
+    @include token-utils.values(map.get(m3-chip.get-tokens($theme), typography));
   } @else {
     .mat-mdc-standard-chip {
-      @include token-utils.create-token-values-mixed(m2-chip.get-typography-tokens($theme));
+      @include token-utils.values(m2-chip.get-typography-tokens($theme));
     }
   }
 }
@@ -68,10 +64,10 @@
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-chip.get-tokens($theme), density));
+    @include token-utils.values(map.get(m3-chip.get-tokens($theme), density));
   } @else {
     .mat-mdc-chip.mat-mdc-standard-chip {
-      @include token-utils.create-token-values-mixed(m2-chip.get-density-tokens($theme));
+      @include token-utils.values(m2-chip.get-density-tokens($theme));
     }
   }
 }
@@ -96,23 +92,21 @@
 /// @param {Map} $theme The theme to generate styles for.
 /// @param {String} $color-variant The color variant to use for the component (M3 only)
 @mixin theme($theme, $color-variant: null) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-chips') {
-    @if inspection.get-theme-version($theme) == 1 {
-      @include base($theme);
-      @include color($theme, $color-variant);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include base($theme);
+    @include color($theme, $color-variant);
+    @include density($theme);
+    @include typography($theme);
+  } @else {
+    @include base($theme);
+    @if inspection.theme-has($theme, color) {
+      @include color($theme);
+    }
+    @if inspection.theme-has($theme, density) {
       @include density($theme);
+    }
+    @if inspection.theme-has($theme, typography) {
       @include typography($theme);
-    } @else {
-      @include base($theme);
-      @if inspection.theme-has($theme, color) {
-        @include color($theme);
-      }
-      @if inspection.theme-has($theme, density) {
-        @include density($theme);
-      }
-      @if inspection.theme-has($theme, typography) {
-        @include typography($theme);
-      }
     }
   }
 }

package/chips/_m2-chip.scss

@@ -72,12 +72,13 @@
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
+  $system: m2-utils.get-system($theme);
   @return (
-    chip-label-text-font: inspection.get-theme-typography($theme, body-2, font-family),
-    chip-label-text-line-height: inspection.get-theme-typography($theme, body-2, line-height),
-    chip-label-text-size: inspection.get-theme-typography($theme, body-2, font-size),
-    chip-label-text-tracking: inspection.get-theme-typography($theme, body-2, letter-spacing),
-    chip-label-text-weight: inspection.get-theme-typography($theme, body-2, font-weight)
+    chip-label-text-font: map.get($system, body-medium-font),
+    chip-label-text-line-height: map.get($system, body-medium-line-height),
+    chip-label-text-size: map.get($system, body-medium-size),
+    chip-label-text-tracking: map.get($system, body-medium-tracking),
+    chip-label-text-weight: map.get($system, body-medium-weight)
   );
 }
 

package/core/_core-theme.scss

@@ -1,10 +1,8 @@
-@use './theming/theming';
 @use './theming/inspection';
 @use './ripple/ripple-theme';
 @use './option/option-theme';
 @use './option/optgroup-theme';
 @use './selection/pseudo-checkbox/pseudo-checkbox-theme';
-@use './style/sass-utils';
 @use './typography/typography';
 @use './tokens/token-utils';
 @use './m2-app';
@@ -16,71 +14,59 @@
 @use 'sass:map';
 
 @mixin base($theme) {
+  $tokens: m2-app.get-unthemable-tokens();
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-app.get-tokens($theme), base));
-    @include token-utils.create-token-values(map.get(m3-ripple.get-tokens($theme), base));
-    @include token-utils.create-token-values(map.get(m3-option.get-tokens($theme), base));
-    @include token-utils.create-token-values(map.get(m3-optgroup.get-tokens($theme), base));
-    @include token-utils.create-token-values(map.get(m3-pseudo-checkbox.get-tokens($theme), base));
-  } @else {
-    @include ripple-theme.base($theme);
-    @include option-theme.base($theme);
-    @include optgroup-theme.base($theme);
-    @include pseudo-checkbox-theme.base($theme);
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-app.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-app.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
+
+  @include ripple-theme.base($theme);
+  @include option-theme.base($theme);
+  @include optgroup-theme.base($theme);
+  @include pseudo-checkbox-theme.base($theme);
 }
 
 @mixin color($theme) {
+  $tokens: m2-app.get-color-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-app.get-tokens($theme), color));
-    @include token-utils.create-token-values(map.get(m3-ripple.get-tokens($theme), color));
-    @include token-utils.create-token-values(map.get(m3-option.get-tokens($theme), color));
-    @include token-utils.create-token-values(map.get(m3-optgroup.get-tokens($theme), color));
-    @include token-utils.create-token-values(map.get(m3-pseudo-checkbox.get-tokens($theme), color));
-  } @else {
-    @include ripple-theme.color($theme);
-    @include option-theme.color($theme);
-    @include optgroup-theme.color($theme);
-    @include pseudo-checkbox-theme.color($theme);
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-app.get-color-tokens($theme));
-    }
+    $tokens: map.get(m3-app.get-tokens($theme), color);
   }
+
+  @include token-utils.values($tokens);
+
+  @include ripple-theme.color($theme);
+  @include option-theme.color($theme);
+  @include optgroup-theme.color($theme);
+  @include pseudo-checkbox-theme.color($theme);
 }
 
 @mixin typography($theme) {
+  $tokens: m2-app.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-app.get-tokens($theme), typography));
-    @include token-utils.create-token-values(map.get(m3-ripple.get-tokens($theme), typography));
-    @include token-utils.create-token-values(map.get(m3-option.get-tokens($theme), typography));
-    @include token-utils.create-token-values(map.get(m3-optgroup.get-tokens($theme), typography));
-    @include token-utils.create-token-values(
-        map.get(m3-pseudo-checkbox.get-tokens($theme), typography));
-  } @else {
-    @include option-theme.typography($theme);
-    @include optgroup-theme.typography($theme);
-    @include pseudo-checkbox-theme.typography($theme);
-    @include ripple-theme.typography($theme);
+    $tokens: map.get(m3-app.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
+
+  @include ripple-theme.typography($theme);
+  @include option-theme.typography($theme);
+  @include optgroup-theme.typography($theme);
+  @include pseudo-checkbox-theme.typography($theme);
 }
 
 @mixin density($theme) {
+  $tokens: m2-app.get-density-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-app.get-tokens($theme), density));
-    @include token-utils.create-token-values(map.get(m3-ripple.get-tokens($theme), density));
-    @include token-utils.create-token-values(map.get(m3-option.get-tokens($theme), density));
-    @include token-utils.create-token-values(map.get(m3-optgroup.get-tokens($theme), density));
-    @include token-utils.create-token-values(
-        map.get(m3-pseudo-checkbox.get-tokens($theme), density));
-  } @else {
-    @include option-theme.density($theme);
-    @include optgroup-theme.density($theme);
-    @include pseudo-checkbox-theme.density($theme);
-    @include ripple-theme.density($theme);
+    $tokens: map.get(m3-app.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
+
+  @include ripple-theme.density($theme);
+  @include option-theme.density($theme);
+  @include optgroup-theme.density($theme);
+  @include pseudo-checkbox-theme.density($theme);
 }
 
 @function _define-overrides() {
@@ -119,26 +105,21 @@
 
 // Mixin that renders all of the core styles that depend on the theme.
 @mixin theme($theme) {
-  // Wrap the sub-theme includes in the duplicate theme styles mixin. This ensures that
-  // there won't be multiple warnings. e.g. if `mat-core-theme` reports a warning, then
-  // the imported themes (such as `mat-ripple-theme`) should not report again.
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-core') {
-    @if inspection.get-theme-version($theme) == 1 {
-      @include base($theme);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include base($theme);
+    @include color($theme);
+    @include density($theme);
+    @include typography($theme);
+  } @else {
+    @include base($theme);
+    @if inspection.theme-has($theme, color) {
       @include color($theme);
+    }
+    @if inspection.theme-has($theme, density) {
       @include density($theme);
+    }
+    @if inspection.theme-has($theme, typography) {
       @include typography($theme);
-    } @else {
-      @include base($theme);
-      @if inspection.theme-has($theme, color) {
-        @include color($theme);
-      }
-      @if inspection.theme-has($theme, density) {
-        @include density($theme);
-      }
-      @if inspection.theme-has($theme, typography) {
-        @include typography($theme);
-      }
     }
   }
 }

package/core/focus-indicators/_private.scss

@@ -2,7 +2,6 @@
 @use 'sass:meta';
 @use '@angular/cdk';
 @use '../style/layout-common';
-@use '../theming/theming';
 @use '../theming/inspection';
 
 // Private sass variables that will be used as reference throughout component stylesheets.
@@ -104,10 +103,8 @@ $default-border-radius: 4px;
     @include _customize-focus-indicators((border-color: $theme-or-color));
   }
   @else {
-    @include theming.private-check-duplicate-theme-styles($theme-or-color, 'mat-focus-indicators') {
-      @if inspection.theme-has($theme-or-color, color) {
-        @include strong-focus-indicators-color($theme-or-color);
-      }
+    @if inspection.theme-has($theme-or-color, color) {
+      @include strong-focus-indicators-color($theme-or-color);
     }
   }
 }

package/core/m2/_theming.scss

@@ -3,6 +3,7 @@
 @use 'sass:meta';
 @use 'sass:color';
 @use '../theming/theming';
+@use '../tokens/m2';
 @use './palette';
 
 /// Extracts a color from a palette or throws an error if it doesn't exist.
@@ -113,45 +114,26 @@
   @return $theme;
 }
 
-@function _define-system($primary, $accent, $warn, $is-dark) {
-  $system: (
-    primary: map.get($primary, default),
-    on-primary: map.get($primary, default-contrast),
-    secondary: map.get($accent, default),
-    on-secondary: map.get($accent, default-contrast),
-    error: map.get($warn, default),
-    on-error: map.get($warn, default-contrast),
-    shadow: black,
-    hover-state-layer-opacity: 0.04,
-    focus-state-layer-opacity: 0.12,
-    pressed-state-layer-opacity: 0.12,
+@function _define-system($primary, $accent, $warn, $is-dark, $typography) {
+  $palettes: (
+    primary: $primary,
+    accent: $accent,
+    warn: $warn,
   );
 
-  @if $is-dark {
-    @return map.merge($system, (
-      surface: map.get(palette.$grey-palette, 800),
-      surface-variant: #4a4a4a,
-      on-surface: white,
-      on-surface-variant: rgba(white, 0.7),
-      background: #303030,
-      inverse-surface: white,
-      inverse-on-surface: rgba(black, 0.87),
-      outline: rgba(white, 0.12),
-      outline-variant: rgba(white, 0.38),
-    ));
-  } @else {
-    @return map.merge($system, (
-      surface: white,
-      surface-variant: #f6f6f6,
-      on-surface: rgba(black, 0.87),
-      on-surface-variant: rgba(black, 0.54),
-      background: map.get(palette.$grey-palette, 50),
-      inverse-surface: map.get(palette.$grey-palette, 800),
-      inverse-on-surface: white,
-      outline: rgba(black, 0.12),
-      outline-variant: rgba(black, 0.38),
-    ));
+  $sys-color: if(
+      $is-dark,
+      m2.md-sys-color-values-dark($palettes),
+      m2.md-sys-color-values-light($palettes));
+  $sys-state: m2.md-sys-state-values();
+  $sys-typography: m2.md-sys-typescale-values($typography);
+
+  $system: ();
+  @each $map in ($sys-color, $sys-state, $sys-typography) {
+    $system: map.merge($system, $map);
   }
+
+  @return $system;
 }
 
 // Creates a color configuration from the specified
@@ -201,7 +183,13 @@
     );
 
     $theme: _internalize-theme(theming.private-create-backwards-compatibility-theme($theme));
-    $theme: map.set($theme, _mat-system, _define-system($primary, $accent, $warn, $is-dark));
+    $system: _define-system(
+        $primary: $primary,
+        $accent: $accent,
+        $warn: $warn,
+        $is-dark: $is-dark,
+        $typography: ());
+    $theme: map.set($theme, _mat-system, $system);
     @return $theme;
   }
   // If the map pattern is used (1), we just pass-through the configurations for individual
@@ -223,10 +211,13 @@
   $theme: _internalize-theme(
       theming.private-create-backwards-compatibility-theme(_mat-validate-theme($result))
   );
-  $primary: map.get($result, primary) or map.get($result, color, primary) or ();
-  $accent: map.get($result, accent) or map.get($result, color, accent) or ();
-  $warn: map.get($result, warn) or map.get($result, color, warn) or ();
-  $theme: map.set($theme, _mat-system, _define-system($primary, $accent, $warn, $is-dark));
+  $system: _define-system(
+      $primary: map.get($result, primary) or map.get($result, color, primary) or (),
+      $accent: map.get($result, accent) or map.get($result, color, accent) or (),
+      $warn: map.get($result, warn) or map.get($result, color, warn) or (),
+      $is-dark: $is-dark,
+      $typography: map.get($result, typography) or ());
+  $theme: map.set($theme, _mat-system, $system);
   @return $theme;
 }
 

package/core/option/_m2-optgroup.scss

@@ -1,4 +1,3 @@
-@use '../theming/inspection';
 @use '../tokens/m2-utils';
 @use 'sass:map';
 
@@ -18,12 +17,13 @@
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
+  $system: m2-utils.get-system($theme);
   @return (
-    optgroup-label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
-    optgroup-label-text-line-height: inspection.get-theme-typography($theme, body-1, line-height),
-    optgroup-label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
-    optgroup-label-text-tracking: inspection.get-theme-typography($theme, body-1, letter-spacing),
-    optgroup-label-text-weight: inspection.get-theme-typography($theme, body-1, font-weight)
+    optgroup-label-text-font: map.get($system, body-large-font),
+    optgroup-label-text-line-height: map.get($system, body-large-line-height),
+    optgroup-label-text-size: map.get($system, body-large-size),
+    optgroup-label-text-tracking: map.get($system, body-large-tracking),
+    optgroup-label-text-weight: map.get($system, body-large-weight)
   );
 }
 

package/core/option/_m2-option.scss

@@ -29,12 +29,13 @@
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
+  $system: m2-utils.get-system($theme);
   @return (
-    option-label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
-    option-label-text-line-height: inspection.get-theme-typography($theme, body-1, line-height),
-    option-label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
-    option-label-text-tracking: inspection.get-theme-typography($theme, body-1, letter-spacing),
-    option-label-text-weight: inspection.get-theme-typography($theme, body-1, font-weight)
+    option-label-text-font: map.get($system, body-large-font),
+    option-label-text-line-height: map.get($system, body-large-line-height),
+    option-label-text-size: map.get($system, body-large-size),
+    option-label-text-tracking: map.get($system, body-large-tracking),
+    option-label-text-weight: map.get($system, body-large-weight)
   );
 }