@angular/material 18.2.0-next.1 → 18.2.0-next.3

package/_index.scss

@@ -18,7 +18,9 @@
 @forward './core/typography/typography' show typography-hierarchy;
 @forward './core/typography/typography-utils' show font-shorthand;
 @forward './core/tokens/m2' show m2-tokens-from-theme;
-@forward './core/tokens/m3-tokens' show system-level-colors, system-level-typography;
+@forward './core/tokens/m3-tokens' show system-level-colors,
+    system-level-typography, system-level-elevation, system-level-shape,
+    system-level-motion, system-level-state;
 
 // Private/Internal
 @forward './core/density/private/all-density' show all-component-densities;

package/button/_button-base.scss

@@ -112,16 +112,10 @@
 // Adds an elevation shadow to a button.
 @mixin mat-private-button-elevation($token-name) {
   // MDC outputs a variable that is the same as the token name, but suffixed with `-shadow`.
-  box-shadow: var(#{token-utils.get-token-variable($token-name) + '-shadow'});
+  box-shadow: token-utils.get-token-variable($token-name + '-shadow');
 }
 
 @mixin mat-private-button-touch-target($is-square, $prefix, $slots) {
-  // Element used to ensure that the button has a touch target that meets the required minimum.
-  // Note that we use this, instead of MDC's built-in `mdc-button--touch` class, because the MDC
-  // class is implemented as `margin-top: 6px; margin-bottom: 6px` on the host element which
-  // goes against our rule of not having margins on the host node. Furthermore, having the margin on
-  // the button itself would require us to wrap it in another div. See:
-  // https://github.com/material-components/material-components-web/tree/master/packages/mdc-button#making-buttons-accessible
   .mat-mdc-button-touch-target {
     position: absolute;
     top: 50%;
@@ -145,14 +139,14 @@
 
 @mixin mat-private-button-horizontal-layout($prefix, $slots, $has-with-icon-padding) {
   @include token-utils.use-tokens($prefix, $slots) {
-    $icon-spacing: token-utils.get-token-variable-reference(icon-spacing, true);
-    $icon-offset: token-utils.get-token-variable-reference(icon-offset, true);
-    $horizontal-padding: token-utils.get-token-variable-reference(horizontal-padding, true);
+    $icon-spacing: token-utils.get-token-variable(icon-spacing, true);
+    $icon-offset: token-utils.get-token-variable(icon-offset, true);
+    $horizontal-padding: token-utils.get-token-variable(horizontal-padding, true);
     padding: 0 $horizontal-padding;
 
     @if ($has-with-icon-padding) {
       $with-icon-horizontal-padding:
-        token-utils.get-token-variable-reference(with-icon-horizontal-padding, true);
+        token-utils.get-token-variable(with-icon-horizontal-padding, true);
 
       // stylelint-disable-next-line selector-class-pattern
       &:has(.material-icons, mat-icon, [matButtonIcon]) {

package/checkbox/_checkbox-common.scss

@@ -31,10 +31,9 @@ $_fallback-size: 40px;
     vertical-align: bottom;
 
     @include token-utils.use-tokens($prefix, $slots) {
-      $layer-size: token-utils.get-token-variable(state-layer-size);
-      padding: calc((var(#{$layer-size}, #{$_fallback-size}) - #{$_icon-size}) / 2);
-      margin: calc((var(#{$layer-size}, #{$_fallback-size}) -
-        var(#{$layer-size}, #{$_fallback-size})) / 2);
+      $layer-size: token-utils.get-token-variable(state-layer-size, $fallback: $_fallback-size);
+      padding: calc((#{$layer-size} - #{$_icon-size}) / 2);
+      margin: calc((#{$layer-size} - #{$layer-size}) / 2);
 
       @if ($include-state-layer-styles) {
         @include _state-layer-styles;
@@ -51,11 +50,10 @@ $_fallback-size: 40px;
       cursor: inherit;
 
       @include token-utils.use-tokens($prefix, $slots) {
-        $layer-size: token-utils.get-token-variable(state-layer-size);
-        $offset: calc((var(#{$layer-size}, #{$_fallback-size}) -
-          var(#{$layer-size}, #{$_fallback-size})) / 2);
-        width: var(#{$layer-size}, #{$_fallback-size});
-        height: var(#{$layer-size}, #{$_fallback-size});
+        $layer-size: token-utils.get-token-variable(state-layer-size, $fallback: $_fallback-size);
+        $offset: calc((#{$layer-size} - #{$layer-size}) / 2);
+        width: $layer-size;
+        height: $layer-size;
         top: $offset;
         right: $offset;
         left: $offset;
@@ -85,8 +83,8 @@ $_fallback-size: 40px;
                 border-color $_transition-duration $_exit-curve;
 
     @include token-utils.use-tokens($prefix, $slots) {
-      $layer-size: token-utils.get-token-variable(state-layer-size);
-      $offset: calc((var(#{$layer-size}, $_fallback-size) - #{$_icon-size}) / 2);
+      $layer-size: token-utils.get-token-variable(state-layer-size, $fallback: $_fallback-size);
+      $offset: calc((#{$layer-size} - #{$_icon-size}) / 2);
 
       @include token-utils.create-token-slot(border-color, unselected-icon-color);
       top: $offset;
@@ -138,6 +136,21 @@ $_fallback-size: 40px;
       @include token-utils.create-token-slot(border-color, selected-focus-icon-color);
       @include token-utils.create-token-slot(background-color, selected-focus-icon-color);
     }
+
+    // Needs extra specificity to override the focus, hover, active states.
+    .mdc-checkbox--disabled.mat-mdc-checkbox-disabled-interactive {
+      .mdc-checkbox:hover .mdc-checkbox__native-control ~ .mdc-checkbox__background,
+      .mdc-checkbox .mdc-checkbox__native-control:focus ~ .mdc-checkbox__background,
+      .mdc-checkbox__background {
+        @include token-utils.create-token-slot(border-color, disabled-unselected-icon-color);
+      }
+
+      .mdc-checkbox__native-control:checked ~ .mdc-checkbox__background,
+      .mdc-checkbox__native-control:indeterminate ~ .mdc-checkbox__background {
+        @include token-utils.create-token-slot(background-color, disabled-selected-icon-color);
+        border-color: transparent;
+      }
+    }
   }
 
   .mdc-checkbox__checkmark {
@@ -158,8 +171,12 @@ $_fallback-size: 40px;
   }
 
   @include token-utils.use-tokens($prefix, $slots) {
-    .mdc-checkbox--disabled .mdc-checkbox__checkmark {
-      @include token-utils.create-token-slot(color, disabled-selected-checkmark-color);
+    .mdc-checkbox--disabled {
+      &, &.mat-mdc-checkbox-disabled-interactive {
+        .mdc-checkbox__checkmark {
+          @include token-utils.create-token-slot(color, disabled-selected-checkmark-color);
+        }
+      }
     }
   }
 
@@ -193,8 +210,12 @@ $_fallback-size: 40px;
   }
 
   @include token-utils.use-tokens($prefix, $slots) {
-    .mdc-checkbox--disabled .mdc-checkbox__mixedmark {
-      @include token-utils.create-token-slot(border-color, disabled-selected-checkmark-color);
+    .mdc-checkbox--disabled {
+      &, &.mat-mdc-checkbox-disabled-interactive {
+        .mdc-checkbox__mixedmark {
+          @include token-utils.create-token-slot(border-color, disabled-selected-checkmark-color);
+        }
+      }
     }
   }
 
@@ -520,4 +541,15 @@ $_fallback-size: 40px;
       );
     }
   }
+
+  // Needs extra specificity to override the focus, hover, active states.
+  .mdc-checkbox--disabled.mat-mdc-checkbox-disabled-interactive & {
+    .mdc-checkbox__native-control ~ .mat-mdc-checkbox-ripple .mat-ripple-element,
+    .mdc-checkbox__native-control ~ .mdc-checkbox__ripple {
+      @include token-utils.create-token-slot(
+        background-color,
+        unselected-hover-state-layer-color
+      );
+    }
+  }
 }

package/checkbox/index.d.ts

@@ -117,6 +117,8 @@ export declare class MatCheckbox implements AfterViewInit, OnChanges, ControlVal
      * https://material.angular.io/guide/theming#using-component-color-variants.
      */
     color: string | undefined;
+    /** Whether the checkbox should remain interactive when it is disabled. */
+    disabledInteractive: boolean;
     /**
      * Reference to the MatRipple instance of the checkbox.
      * @deprecated Considered an implementation detail. To be removed.
@@ -189,10 +191,11 @@ export declare class MatCheckbox implements AfterViewInit, OnChanges, ControlVal
      */
     _preventBubblingFromLabel(event: MouseEvent): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<MatCheckbox, [null, null, null, { attribute: "tabindex"; }, { optional: true; }, { optional: true; }]>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatCheckbox, "mat-checkbox", ["matCheckbox"], { "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "ariaDescribedby": { "alias": "aria-describedby"; "required": false; }; "id": { "alias": "id"; "required": false; }; "required": { "alias": "required"; "required": false; }; "labelPosition": { "alias": "labelPosition"; "required": false; }; "name": { "alias": "name"; "required": false; }; "value": { "alias": "value"; "required": false; }; "disableRipple": { "alias": "disableRipple"; "required": false; }; "tabIndex": { "alias": "tabIndex"; "required": false; }; "color": { "alias": "color"; "required": false; }; "checked": { "alias": "checked"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "indeterminate": { "alias": "indeterminate"; "required": false; }; }, { "change": "change"; "indeterminateChange": "indeterminateChange"; }, never, ["*"], true, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatCheckbox, "mat-checkbox", ["matCheckbox"], { "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "ariaDescribedby": { "alias": "aria-describedby"; "required": false; }; "id": { "alias": "id"; "required": false; }; "required": { "alias": "required"; "required": false; }; "labelPosition": { "alias": "labelPosition"; "required": false; }; "name": { "alias": "name"; "required": false; }; "value": { "alias": "value"; "required": false; }; "disableRipple": { "alias": "disableRipple"; "required": false; }; "tabIndex": { "alias": "tabIndex"; "required": false; }; "color": { "alias": "color"; "required": false; }; "disabledInteractive": { "alias": "disabledInteractive"; "required": false; }; "checked": { "alias": "checked"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "indeterminate": { "alias": "indeterminate"; "required": false; }; }, { "change": "change"; "indeterminateChange": "indeterminateChange"; }, never, ["*"], true, never>;
     static ngAcceptInputType_required: unknown;
     static ngAcceptInputType_disableRipple: unknown;
     static ngAcceptInputType_tabIndex: unknown;
+    static ngAcceptInputType_disabledInteractive: unknown;
     static ngAcceptInputType_checked: unknown;
     static ngAcceptInputType_disabled: unknown;
     static ngAcceptInputType_indeterminate: unknown;
@@ -227,6 +230,8 @@ export declare interface MatCheckboxDefaultOptions {
     color?: ThemePalette;
     /** Default checkbox click action for checkboxes. */
     clickAction?: MatCheckboxClickAction;
+    /** Whether disabled checkboxes should be interactive. */
+    disabledInteractive?: boolean;
 }
 
 export declare class MatCheckboxModule {

package/chips/index.d.ts

@@ -205,8 +205,6 @@ export declare class MatChip implements OnInit, AfterViewInit, AfterContentInit,
     disableRipple: boolean;
     /** Whether the chip is disabled. */
     disabled: boolean;
-    /** Tab index of the chip. */
-    tabIndex: number;
     /** Emitted when a chip is to be removed. */
     readonly removed: EventEmitter<MatChipEvent>;
     /** Emitted when the chip is destroyed. */
@@ -234,7 +232,7 @@ export declare class MatChip implements OnInit, AfterViewInit, AfterContentInit,
      */
     _rippleLoader: MatRippleLoader;
     protected _injector: Injector;
-    constructor(_changeDetectorRef: ChangeDetectorRef, _elementRef: ElementRef<HTMLElement>, _ngZone: NgZone, _focusMonitor: FocusMonitor, _document: any, animationMode?: string, _globalRippleOptions?: RippleGlobalOptions | undefined, tabIndex?: string);
+    constructor(_changeDetectorRef: ChangeDetectorRef, _elementRef: ElementRef<HTMLElement>, _ngZone: NgZone, _focusMonitor: FocusMonitor, _document: any, animationMode?: string, _globalRippleOptions?: RippleGlobalOptions | undefined);
     ngOnInit(): void;
     ngAfterViewInit(): void;
     ngAfterContentInit(): void;
@@ -260,17 +258,14 @@ export declare class MatChip implements OnInit, AfterViewInit, AfterContentInit,
     _getActions(): MatChipAction[];
     /** Handles interactions with the primary action of the chip. */
     _handlePrimaryActionInteraction(): void;
-    /** Gets the tabindex of the chip. */
-    _getTabIndex(): number | null;
     /** Starts the focus monitoring process on the chip. */
     private _monitorFocus;
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatChip, [null, null, null, null, null, { optional: true; }, { optional: true; }, { attribute: "tabindex"; }]>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatChip, "mat-basic-chip, [mat-basic-chip], mat-chip, [mat-chip]", ["matChip"], { "role": { "alias": "role"; "required": false; }; "id": { "alias": "id"; "required": false; }; "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaDescription": { "alias": "aria-description"; "required": false; }; "value": { "alias": "value"; "required": false; }; "color": { "alias": "color"; "required": false; }; "removable": { "alias": "removable"; "required": false; }; "highlighted": { "alias": "highlighted"; "required": false; }; "disableRipple": { "alias": "disableRipple"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "tabIndex": { "alias": "tabIndex"; "required": false; }; }, { "removed": "removed"; "destroyed": "destroyed"; }, ["leadingIcon", "trailingIcon", "removeIcon", "_allLeadingIcons", "_allTrailingIcons", "_allRemoveIcons"], ["mat-chip-avatar, [matChipAvatar]", "*", "mat-chip-trailing-icon,[matChipRemove],[matChipTrailingIcon]"], true, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatChip, [null, null, null, null, null, { optional: true; }, { optional: true; }]>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatChip, "mat-basic-chip, [mat-basic-chip], mat-chip, [mat-chip]", ["matChip"], { "role": { "alias": "role"; "required": false; }; "id": { "alias": "id"; "required": false; }; "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaDescription": { "alias": "aria-description"; "required": false; }; "value": { "alias": "value"; "required": false; }; "color": { "alias": "color"; "required": false; }; "removable": { "alias": "removable"; "required": false; }; "highlighted": { "alias": "highlighted"; "required": false; }; "disableRipple": { "alias": "disableRipple"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; }, { "removed": "removed"; "destroyed": "destroyed"; }, ["leadingIcon", "trailingIcon", "removeIcon", "_allLeadingIcons", "_allTrailingIcons", "_allRemoveIcons"], ["mat-chip-avatar, [matChipAvatar]", "*", "mat-chip-trailing-icon,[matChipRemove],[matChipTrailingIcon]"], true, never>;
     static ngAcceptInputType_removable: unknown;
     static ngAcceptInputType_highlighted: unknown;
     static ngAcceptInputType_disableRipple: unknown;
     static ngAcceptInputType_disabled: unknown;
-    static ngAcceptInputType_tabIndex: unknown;
 }
 
 /**

package/core/_core.scss

@@ -4,7 +4,6 @@
 @use './ripple/ripple';
 @use './style/elevation';
 @use './focus-indicators/private';
-@use './mdc-helpers/mdc-helpers';
 
 // Mixin that renders all of the core styles that are not theme-dependent.
 @mixin core() {
@@ -20,24 +19,22 @@
   // user's content isn't inside of a `mat-sidenav-container`.
   @at-root {
     // Note: we need to emit fallback values here to avoid errors in internal builds.
-    @include mdc-helpers.disable-mdc-fallback-declarations {
-      @include token-utils.use-tokens(tokens-mat-app.$prefix, tokens-mat-app.get-token-slots()) {
-        .mat-app-background {
-          @include token-utils.create-token-slot(background-color, background-color, transparent);
-          @include token-utils.create-token-slot(color, text-color, inherit);
-        }
+    @include token-utils.use-tokens(tokens-mat-app.$prefix, tokens-mat-app.get-token-slots()) {
+      .mat-app-background {
+        @include token-utils.create-token-slot(background-color, background-color, transparent);
+        @include token-utils.create-token-slot(color, text-color, inherit);
+      }
 
-        // Provides external CSS classes for each elevation value. Each CSS class is formatted as
-        // `mat-elevation-z$zValue` where `$zValue` corresponds to the z-space to which the element
-        // is elevated.
-        @for $zValue from 0 through 24 {
-          $selector: elevation.$prefix + $zValue;
-          // We need the `mat-mdc-elevation-specific`, because some MDC mixins
-          // come with elevation baked in and we don't have a way of removing it.
-          .#{$selector}, .mat-mdc-elevation-specific.#{$selector} {
-            @include token-utils.create-token-slot(box-shadow, 'elevation-shadow-level-#{$zValue}',
-              none);
-          }
+      // Provides external CSS classes for each elevation value. Each CSS class is formatted as
+      // `mat-elevation-z$z-value` where `$z-value` corresponds to the z-space to which the element
+      // is elevated.
+      @for $z-value from 0 through 24 {
+        $selector: elevation.$prefix + $z-value;
+        // We need the `mat-mdc-elevation-specific`, because some MDC mixins
+        // come with elevation baked in and we don't have a way of removing it.
+        .#{$selector}, .mat-mdc-elevation-specific.#{$selector} {
+          @include token-utils.create-token-slot(box-shadow, 'elevation-shadow-level-#{$z-value}',
+            none);
         }
       }
     }

package/core/m2/_typography.scss

@@ -2,10 +2,137 @@
 @use 'sass:math';
 @use 'sass:meta';
 @use 'sass:string';
-@use '@material/typography' as mdc-typography;
 
 $_default-font-family: string.unquote('Roboto, sans-serif');
 
+@function _px-to-rem($px) {
+  @return math.div($px, 16px) * 1rem;
+}
+
+@function _get-letter-spacing($tracking, $font-size) {
+  @return math.div($tracking, $font-size * 16) * 1em;
+}
+
+$_mdc-levels: (
+  headline1: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(96px),
+    line-height: _px-to-rem(96px),
+    font-weight: 300,
+    letter-spacing: _get-letter-spacing(-1.5, 6),
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  headline2: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(60px),
+    line-height: _px-to-rem(60px),
+    font-weight: 300,
+    letter-spacing: _get-letter-spacing(-0.5, 3.75),
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  headline3: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(48px),
+    line-height: _px-to-rem(50px),
+    font-weight: 400,
+    letter-spacing: normal,
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  headline4: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(34px),
+    line-height: _px-to-rem(40px),
+    font-weight: 400,
+    letter-spacing: _get-letter-spacing(0.25, 2.125),
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  headline5: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(24px),
+    line-height: _px-to-rem(32px),
+    font-weight: 400,
+    letter-spacing: normal,
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  headline6: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(20px),
+    line-height: _px-to-rem(32px),
+    font-weight: 500,
+    letter-spacing: _get-letter-spacing(0.25, 1.25),
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  subtitle1: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(16px),
+    line-height: _px-to-rem(28px),
+    font-weight: 400,
+    letter-spacing: _get-letter-spacing(0.15, 1),
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  subtitle2: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(14px),
+    line-height: _px-to-rem(22px),
+    font-weight: 500,
+    letter-spacing: _get-letter-spacing(0.1, 0.875),
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  body1: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(16px),
+    line-height: _px-to-rem(24px),
+    font-weight: 400,
+    letter-spacing: _get-letter-spacing(0.5, 1),
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  body2: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(14px),
+    line-height: _px-to-rem(20px),
+    font-weight: 400,
+    letter-spacing: _get-letter-spacing(0.25, 0.875),
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  caption: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(12px),
+    line-height: _px-to-rem(20px),
+    font-weight: 400,
+    letter-spacing: _get-letter-spacing(0.4, 0.75),
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  button: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(14px),
+    line-height: _px-to-rem(36px),
+    font-weight: 500,
+    letter-spacing: _get-letter-spacing(1.25, 0.875),
+    text-decoration: none,
+    text-transform: uppercase,
+  ),
+  overline: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(12px),
+    line-height: _px-to-rem(32px),
+    font-weight: 500,
+    letter-spacing: _get-letter-spacing(2, 0.75),
+    text-decoration: none,
+    text-transform: uppercase,
+  ),
+);
+
 /// Defines a typography level from the Material Design spec.
 /// @param {String} $font-size The font-size for this level.
 /// @param {String | Number} $line-height The line-height for this level.
@@ -217,7 +344,7 @@ $_default-font-family: string.unquote('Roboto, sans-serif');
 
 // Converts an MDC typography level config to an Angular Material one.
 @function typography-config-level-from-mdc($mdc-level, $font-family: null) {
-  $mdc-level-config: map.get(mdc-typography.$styles, $mdc-level);
+  $mdc-level-config: map.get($_mdc-levels, $mdc-level);
 
   // Explicitly default the font family to null since we'll apply it globally
   // through the `define-typgraphy-config`/`define-legacy-typography-config`.

package/core/ripple/_ripple.scss

@@ -40,7 +40,7 @@
     @include token-utils.use-tokens(
       tokens-mat-ripple.$prefix, tokens-mat-ripple.get-token-slots()) {
       // We have to emit a fallback value here, because some internal builds depend on it.
-      background-color: var(#{token-utils.get-token-variable(color)}, rgba(#000, 0.1));
+      background-color: token-utils.get-token-variable(color, $fallback: rgba(#000, 0.1));
     }
 
     // In high contrast mode the ripple is opaque, causing it to obstruct the content.

package/core/style/_elevation.scss

@@ -1,7 +1,97 @@
 @use 'sass:map';
+@use 'sass:math';
 @use 'sass:meta';
-@use 'variables';
-@use '@material/elevation/elevation-theme' as mdc-elevation;
+@use 'sass:string';
+@use './variables';
+@use './sass-utils';
+
+$_umbra-opacity: 0.2;
+$_penumbra-opacity: 0.14;
+$_ambient-opacity: 0.12;
+
+$_umbra-map: (
+  0: '0px 0px 0px 0px',
+  1: '0px 2px 1px -1px',
+  2: '0px 3px 1px -2px',
+  3: '0px 3px 3px -2px',
+  4: '0px 2px 4px -1px',
+  5: '0px 3px 5px -1px',
+  6: '0px 3px 5px -1px',
+  7: '0px 4px 5px -2px',
+  8: '0px 5px 5px -3px',
+  9: '0px 5px 6px -3px',
+  10: '0px 6px 6px -3px',
+  11: '0px 6px 7px -4px',
+  12: '0px 7px 8px -4px',
+  13: '0px 7px 8px -4px',
+  14: '0px 7px 9px -4px',
+  15: '0px 8px 9px -5px',
+  16: '0px 8px 10px -5px',
+  17: '0px 8px 11px -5px',
+  18: '0px 9px 11px -5px',
+  19: '0px 9px 12px -6px',
+  20: '0px 10px 13px -6px',
+  21: '0px 10px 13px -6px',
+  22: '0px 10px 14px -6px',
+  23: '0px 11px 14px -7px',
+  24: '0px 11px 15px -7px',
+);
+
+$_penumbra-map: (
+  0: '0px 0px 0px 0px',
+  1: '0px 1px 1px 0px',
+  2: '0px 2px 2px 0px',
+  3: '0px 3px 4px 0px',
+  4: '0px 4px 5px 0px',
+  5: '0px 5px 8px 0px',
+  6: '0px 6px 10px 0px',
+  7: '0px 7px 10px 1px',
+  8: '0px 8px 10px 1px',
+  9: '0px 9px 12px 1px',
+  10: '0px 10px 14px 1px',
+  11: '0px 11px 15px 1px',
+  12: '0px 12px 17px 2px',
+  13: '0px 13px 19px 2px',
+  14: '0px 14px 21px 2px',
+  15: '0px 15px 22px 2px',
+  16: '0px 16px 24px 2px',
+  17: '0px 17px 26px 2px',
+  18: '0px 18px 28px 2px',
+  19: '0px 19px 29px 2px',
+  20: '0px 20px 31px 3px',
+  21: '0px 21px 33px 3px',
+  22: '0px 22px 35px 3px',
+  23: '0px 23px 36px 3px',
+  24: '0px 24px 38px 3px',
+);
+
+$_ambient-map: (
+  0: '0px 0px 0px 0px',
+  1: '0px 1px 3px 0px',
+  2: '0px 1px 5px 0px',
+  3: '0px 1px 8px 0px',
+  4: '0px 1px 10px 0px',
+  5: '0px 1px 14px 0px',
+  6: '0px 1px 18px 0px',
+  7: '0px 2px 16px 1px',
+  8: '0px 3px 14px 2px',
+  9: '0px 3px 16px 2px',
+  10: '0px 4px 18px 3px',
+  11: '0px 4px 20px 3px',
+  12: '0px 5px 22px 4px',
+  13: '0px 5px 24px 4px',
+  14: '0px 5px 26px 4px',
+  15: '0px 6px 28px 5px',
+  16: '0px 6px 30px 5px',
+  17: '0px 6px 32px 5px',
+  18: '0px 7px 34px 6px',
+  19: '0px 7px 36px 6px',
+  20: '0px 8px 38px 7px',
+  21: '0px 8px 40px 7px',
+  22: '0px 8px 42px 7px',
+  23: '0px 9px 44px 8px',
+  24: '0px 9px 46px 8px',
+);
 
 // A collection of mixins and CSS classes that can be used to apply elevation to a material
 // element.
@@ -37,29 +127,7 @@ $prefix: 'mat-elevation-z';
 // Applies the correct css rules to an element to give it the elevation specified by $zValue.
 // The $zValue must be between 0 and 24.
 @mixin elevation($zValue, $color: $color, $opacity: null) {
-  @if meta.type-of($color) == color and $opacity == null {
-    @include mdc-elevation.elevation($zValue, $color);
-  }
-  @else {
-    // Copied from @material/elevation/_elevation-theme.scss#_box-shadow
-    // TODO(mmalerba): Add support for graceful handling of CSS var color to MDC.
-    $umbra-z-value: map.get(mdc-elevation.$umbra-map, $zValue);
-    $penumbra-z-value: map.get(mdc-elevation.$penumbra-map, $zValue);
-    $ambient-z-value: map.get(mdc-elevation.$ambient-map, $zValue);
-
-    $color-opacity: if($opacity != null, $opacity, 1);
-    $umbra-color: _compute-color-opacity($color, mdc-elevation.$umbra-opacity * $color-opacity);
-    $penumbra-color:
-      _compute-color-opacity($color, mdc-elevation.$penumbra-opacity * $color-opacity);
-    $ambient-color: _compute-color-opacity($color, mdc-elevation.$ambient-opacity * $color-opacity);
-
-    $box-shadow: (
-      #{'#{$umbra-z-value} #{$umbra-color}'},
-      #{'#{$penumbra-z-value} #{$penumbra-color}'},
-      #{$ambient-z-value} $ambient-color
-    );
-    @include mdc-elevation.shadow($box-shadow);
-  }
+  box-shadow: get-box-shadow($zValue, $color, $opacity);
 }
 
 // Applies the elevation to an element in a manner that allows
@@ -71,8 +139,34 @@ $prefix: 'mat-elevation-z';
 }
 
 // Gets the box shadow value for a specific elevation.
-@function get-box-shadow($z-value, $shadow-color: black) {
-  @return mdc-elevation.elevation-box-shadow($z-value, $shadow-color);
+@function get-box-shadow($zValue, $shadow-color: black, $opacity: null) {
+  @if $zValue == null {
+    @return null;
+  }
+
+  @if (sass-utils.is-css-var-name($zValue)) {
+    @return $zValue;
+  }
+
+  @if meta.type-of($zValue) != number or not math.is-unitless($zValue) {
+    @error '$zValue must be a unitless number, but received `#{$zValue}`';
+  }
+
+  @if $zValue < 0 or $zValue > 24 {
+    @error '$zValue must be between 0 and 24, but received `#{$zValue}`';
+  }
+
+  $umbra-z-value: map.get($_umbra-map, $zValue);
+  $penumbra-z-value: map.get($_penumbra-map, $zValue);
+  $ambient-z-value: map.get($_ambient-map, $zValue);
+
+  $color-opacity: if($opacity != null, $opacity, 1);
+  $umbra-color: _compute-color-opacity($shadow-color, $_umbra-opacity * $color-opacity);
+  $penumbra-color: _compute-color-opacity($shadow-color, $_penumbra-opacity * $color-opacity);
+  $ambient-color: _compute-color-opacity($shadow-color, $_ambient-opacity * $color-opacity);
+
+  @return string.unquote('#{$umbra-z-value} #{$umbra-color}, #{$penumbra-z-value} ' +
+          '#{$penumbra-color}, #{$ambient-z-value} #{$ambient-color}');
 }
 
 // Returns a string that can be used as the value for a transition property for elevation.

package/core/style/_sass-utils.scss

@@ -1,4 +1,5 @@
 @use 'sass:color';
+@use 'sass:string';
 @use 'sass:list';
 @use 'sass:map';
 @use 'sass:meta';
@@ -64,12 +65,23 @@ $use-system-typography-variables: false;
 /// A version of the Sass `color.change` function that is safe ot use with CSS variables.
 @function safe-color-change($color, $args...) {
   $args: meta.keywords($args);
+  $use-color-mix: $use-system-color-variables or
+      (is-css-var-name($color) and string.index($color, '--mat') == 1);
   @if (meta.type-of($color) == 'color') {
     @return color.change($color, $args...);
   }
-  @else if ($color != null and map.get($args, alpha) != null and $use-system-color-variables) {
+  @else if ($color != null and
+      map.get($args, alpha) != null and $use-color-mix) {
     $opacity: map.get($args, alpha);
-    @return #{color-mix(in srgb, #{$color} #{($opacity * 100) + '%'}, transparent)};
+    @if meta.type-of($opacity) == number {
+      $opacity: ($opacity * 100) + '%';
+    }
+
+    @if (is-css-var-name($color)) {
+      $color: var($color);
+    }
+
+    @return #{color-mix(in srgb, #{$color} #{$opacity}, transparent)};
   }
   @return $color;
 }
@@ -91,3 +103,9 @@ $use-system-typography-variables: false;
   }
   @return $kwargs;
 }
+
+// Returns whether the $value is a CSS variable name based on whether it's a string prefixed
+// by "--".
+@function is-css-var-name($value) {
+  @return meta.type-of($value) == string and string.index($value, '--') == 1;
+}

package/core/theming/_definition.scss

@@ -55,6 +55,7 @@ $theme-version: 1;
         neutral-variant: map.get($primary, neutral-variant),
         error: map.get($primary, error),
       ),
+      color-system-variables-prefix: $system-variables-prefix,
       color-tokens: m3-tokens.generate-color-tokens(
           $type, $primary, $tertiary, map.get($primary, error), $system-variables-prefix)
     )
@@ -88,6 +89,7 @@ $theme-version: 1;
         medium: $medium,
         regular: $regular,
       ),
+      typography-system-variables-prefix: $system-variables-prefix,
       typography-tokens: m3-tokens.generate-typography-tokens(
           $brand, $plain, $bold, $medium, $regular, $system-variables-prefix)
     )