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

package/button/_fab-theme.scss

@@ -1,5 +1,3 @@
-@use '../core/style/sass-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use './m2-fab';
 @use './m3-fab';
@@ -11,23 +9,12 @@
 /// for the mat-fab.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: m2-fab.get-unthemable-tokens();
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-fab.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-fab.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-fab.get-tokens($theme), base);
   }
-}
 
-@mixin _fab-variant($theme, $palette) {
-  $mat-tokens: if(
-    $palette,
-    m2-fab.private-get-color-palette-color-tokens($theme, $palette),
-    m2-fab.get-color-tokens($theme)
-  );
-
-  @include token-utils.create-token-values-mixed($mat-tokens);
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-fab.
@@ -35,25 +22,28 @@
 /// @param {ArgList} $color-variant: The color variant to use for the fab: primary, secondary,
 //          or tertiary. (If not specified, default primary color will be used).
 @mixin color($theme, $color-variant: null) {
+  $tokens: m2-fab.get-color-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-fab.get-tokens($theme, $color-variant), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include _fab-variant($theme, null);
+    $tokens: map.get(m3-fab.get-tokens($theme, $color-variant), color);
+  }
+
+  @include token-utils.values($tokens);
 
-      .mat-mdc-fab, .mat-mdc-mini-fab {
-        &.mat-primary {
-          @include _fab-variant($theme, primary);
-        }
+  @if inspection.get-theme-version($theme) != 1 {
+    .mat-mdc-fab, .mat-mdc-mini-fab {
+      &.mat-primary {
+        $tokens: m2-fab.private-get-color-palette-color-tokens($theme, primary);
+        @include token-utils.values($tokens);
+      }
 
-        &.mat-accent {
-          @include _fab-variant($theme, secondary);
-        }
+      &.mat-accent {
+        $tokens: m2-fab.private-get-color-palette-color-tokens($theme, secondary);
+        @include token-utils.values($tokens);
+      }
 
-        &.mat-warn {
-          @include _fab-variant($theme, error);
-        }
+      &.mat-warn {
+        $tokens: m2-fab.private-get-color-palette-color-tokens($theme, error);
+        @include token-utils.values($tokens);
       }
     }
   }
@@ -62,25 +52,23 @@
 /// Outputs typography theme styles for the mat-fab.
 /// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: m2-fab.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-fab.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-fab.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-fab.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs density theme styles for the mat-fab.
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: m2-fab.get-density-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-fab.get-tokens($theme), density));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-fab.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-fab.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -103,23 +91,21 @@
 /// @param {Map} $theme The theme to generate styles for.
 /// @param {String} $color-variant: The color variant to use for the fab
 @mixin theme($theme, $color-variant: null) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-fab') {
-    @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/button/_icon-button-theme.scss

@@ -2,30 +2,16 @@
 @use 'sass:math';
 @use './m2-icon-button';
 @use './m3-icon-button';
-@use '../core/style/sass-utils';
 @use '../core/tokens/token-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 
 @mixin base($theme) {
+  $tokens: m2-icon-button.get-unthemable-tokens();
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-icon-button.get-tokens($theme), base));
-  } @else {
-    // Add default values for tokens not related to color, typography, or density.
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-icon-button.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-icon-button.get-tokens($theme), base);
   }
-}
-
-@mixin _m2-icon-button-variant($theme, $palette) {
-  $mat-tokens: if(
-    $palette,
-    m2-icon-button.private-get-color-palette-color-tokens($theme, $palette),
-    m2-icon-button.get-color-tokens($theme)
-  );
 
-  @include token-utils.create-token-values-mixed($mat-tokens);
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-icon-button.
@@ -33,45 +19,45 @@
 /// @param {String} $color-variant: The color variant to use for the
 //         button: primary, secondary, tertiary, or error.
 @mixin color($theme, $color-variant: null) {
+  $tokens: m2-icon-button.get-color-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-icon-button.get-tokens($theme, $color-variant), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include _m2-icon-button-variant($theme, null);
+    $tokens: map.get(m3-icon-button.get-tokens($theme, $color-variant), color);
+  }
+
+  @include token-utils.values($tokens);
 
-      .mat-mdc-icon-button {
-        &.mat-primary {
-          @include _m2-icon-button-variant($theme, primary);
-        }
+  @if inspection.get-theme-version($theme) != 1 {
+    .mat-mdc-icon-button {
+      &.mat-primary {
+        $tokens: m2-icon-button.private-get-color-palette-color-tokens($theme, primary);
+        @include token-utils.values($tokens);
+      }
 
-        &.mat-accent {
-          @include _m2-icon-button-variant($theme, secondary);
-        }
+      &.mat-accent {
+        $tokens: m2-icon-button.private-get-color-palette-color-tokens($theme, secondary);
+        @include token-utils.values($tokens);
+      }
 
-        &.mat-warn {
-          @include _m2-icon-button-variant($theme, error);
-        }
+      &.mat-warn {
+        $tokens: m2-icon-button.private-get-color-palette-color-tokens($theme, error);
+        @include token-utils.values($tokens);
       }
     }
   }
 }
 
 @mixin typography($theme) {
+  $tokens: m2-icon-button.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-icon-button.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-icon-button.get-typography-tokens($theme)
-      );
-    }
+    $tokens: map.get(m3-icon-button.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-icon-button.get-tokens($theme), density));
+    @include token-utils.values(map.get(m3-icon-button.get-tokens($theme), density));
   } @else {
     $icon-size: 24px;
     $density-scale: inspection.get-theme-density($theme);
@@ -85,12 +71,10 @@
     );
     $calculated-size: map.get($size-map, $density-scale);
 
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-          m2-icon-button.get-density-tokens(
-              $theme, $exclude: (icon-button-state-layer-size))
-      );
-    }
+    @include token-utils.values(
+        m2-icon-button.get-density-tokens(
+            $theme, $exclude: (icon-button-state-layer-size))
+    );
 
     // Use `mat-mdc-button-base` to increase the specificity over the button's structural styles.
     .mat-mdc-icon-button.mat-mdc-button-base {
@@ -130,7 +114,6 @@
 /// @param {String} $color-variant: The color variant to use for the button: primary,
 //         secondary, tertiary, or error.
 @mixin theme($theme, $color-variant: null) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-icon-button') {
     @if inspection.get-theme-version($theme) == 1 {
       @include base($theme);
       @include color($theme, $color-variant);
@@ -146,7 +129,6 @@
       }
       @if inspection.theme-has($theme, typography) {
         @include typography($theme);
-      }
     }
   }
 }

package/button/_m2-button.scss

@@ -44,7 +44,6 @@
 @function get-color-tokens($theme) {
   $system: m2-utils.get-system($theme);
   $is-dark: inspection.get-theme-type($theme) == dark;
-  $outline: inspection.get-theme-color($theme, system, outline);
   $disabled: m3-utils.color-with-opacity(map.get($system, on-surface), 38%);
   $disabled-container : m3-utils.color-with-opacity(map.get($system, on-surface), 12%);
 
@@ -52,55 +51,56 @@
     button-filled-container-color: map.get($system, surface),
     button-filled-disabled-container-color: $disabled-container,
     button-filled-disabled-label-text-color: $disabled,
-    button-filled-disabled-state-layer-color: inspection.get-theme-color($theme, foreground, base),
+    button-filled-disabled-state-layer-color: map.get($system, on-surface-variant),
     button-filled-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
     button-filled-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
-    button-filled-label-text-color: inspection.get-theme-color($theme, foreground, base),
+    button-filled-label-text-color: map.get($system, on-surface),
     button-filled-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
-    button-filled-ripple-color: inspection.get-theme-color($theme, foreground, base, 0.1),
-    button-filled-state-layer-color: inspection.get-theme-color($theme, foreground, base),
+    button-filled-ripple-color: m3-utils.color-with-opacity(
+        map.get($system, on-surface), map.get($system, pressed-state-layer-opacity)),
+    button-filled-state-layer-color: map.get($system, on-surface),
     button-outlined-disabled-label-text-color: $disabled,
-    button-outlined-disabled-outline-color: $outline,
-    button-outlined-disabled-state-layer-color:
-        inspection.get-theme-color($theme, foreground, base),
+    button-outlined-disabled-outline-color: map.get($system, outline),
+    button-outlined-disabled-state-layer-color: map.get($system, on-surface-variant),
     button-outlined-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
     button-outlined-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
-    button-outlined-label-text-color: inspection.get-theme-color($theme, foreground, base),
-    button-outlined-outline-color: $outline,
-    button-outlined-pressed-state-layer-opacity:
-        map.get($system, pressed-state-layer-opacity),
-    button-outlined-ripple-color: inspection.get-theme-color($theme, foreground, base, 0.1),
-    button-outlined-state-layer-color: inspection.get-theme-color($theme, foreground, base),
+    button-outlined-label-text-color: map.get($system, on-surface),
+    button-outlined-outline-color: map.get($system, outline),
+    button-outlined-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
+    button-outlined-ripple-color: m3-utils.color-with-opacity(
+        map.get($system, on-surface), map.get($system, pressed-state-layer-opacity)),
+    button-outlined-state-layer-color: map.get($system, on-surface),
     button-protected-container-color: map.get($system, surface),
     button-protected-disabled-container-color: $disabled-container,
     button-protected-disabled-label-text-color: $disabled,
-    button-protected-disabled-state-layer-color:
-        inspection.get-theme-color($theme, foreground, base),
+    button-protected-disabled-state-layer-color: map.get($system, on-surface-variant),
     button-protected-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
     button-protected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
-    button-protected-label-text-color: inspection.get-theme-color($theme, foreground, base),
-    button-protected-pressed-state-layer-opacity:
-        map.get($system, pressed-state-layer-opacity),
-    button-protected-ripple-color: inspection.get-theme-color($theme, foreground, base, 0.1),
-    button-protected-state-layer-color: inspection.get-theme-color($theme, foreground, base),
+    button-protected-label-text-color: map.get($system, on-surface),
+    button-protected-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
+    button-protected-ripple-color: m3-utils.color-with-opacity(
+        map.get($system, on-surface), map.get($system, pressed-state-layer-opacity)),
+    button-protected-state-layer-color: map.get($system, on-surface),
     button-text-disabled-label-text-color: $disabled,
-    button-text-disabled-state-layer-color: inspection.get-theme-color($theme, foreground, base),
+    button-text-disabled-state-layer-color: map.get($system, on-surface-variant),
     button-text-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
     button-text-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
-    button-text-label-text-color: inspection.get-theme-color($theme, foreground, base),
+    button-text-label-text-color: map.get($system, on-surface),
     button-text-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
-    button-text-ripple-color: inspection.get-theme-color($theme, foreground, base, 0.1),
-    button-text-state-layer-color: inspection.get-theme-color($theme, foreground, base),
+    button-text-ripple-color: m3-utils.color-with-opacity(
+        map.get($system, on-surface), map.get($system, pressed-state-layer-opacity)),
+    button-text-state-layer-color: map.get($system, on-surface),
     button-tonal-container-color: map.get($system, surface),
     button-tonal-disabled-container-color: $disabled-container,
     button-tonal-disabled-label-text-color: $disabled,
-    button-tonal-disabled-state-layer-color: inspection.get-theme-color($theme, foreground, base),
+    button-tonal-disabled-state-layer-color: map.get($system, on-surface-variant),
     button-tonal-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
     button-tonal-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
-    button-tonal-label-text-color: inspection.get-theme-color($theme, foreground, base),
+    button-tonal-label-text-color: map.get($system, on-surface),
     button-tonal-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
-    button-tonal-ripple-color: inspection.get-theme-color($theme, foreground, base, 0.1),
-    button-tonal-state-layer-color: inspection.get-theme-color($theme, foreground, base),
+    button-tonal-ripple-color: m3-utils.color-with-opacity(
+        map.get($system, on-surface), map.get($system, pressed-state-layer-opacity)),
+    button-tonal-state-layer-color: map.get($system, on-surface),
   );
 }
 
@@ -116,60 +116,61 @@
   @return (
     button-filled-container-color: map.get($system, primary),
     button-filled-label-text-color: map.get($system, on-primary),
-    button-filled-ripple-color: m3-utils.color-with-opacity(map.get($system, on-primary), 10%),
+    button-filled-ripple-color: m3-utils.color-with-opacity(
+        map.get($system, on-primary), map.get($system, pressed-state-layer-opacity)),
     button-filled-state-layer-color: map.get($system, on-primary),
     button-outlined-label-text-color: map.get($system, primary),
     button-outlined-outline-color: map.get(get-color-tokens($theme), button-outlined-outline-color),
-    button-outlined-ripple-color: m3-utils.color-with-opacity(map.get($system, primary), 10%),
+    button-outlined-ripple-color: m3-utils.color-with-opacity(
+        map.get($system, primary), map.get($system, pressed-state-layer-opacity)),
     button-outlined-state-layer-color: map.get($system, primary),
     button-protected-container-color: map.get($system, primary),
     button-protected-label-text-color: map.get($system, on-primary),
-    button-protected-ripple-color: m3-utils.color-with-opacity(map.get($system, on-primary), 10%),
+    button-protected-ripple-color: m3-utils.color-with-opacity(
+        map.get($system, on-primary), map.get($system, pressed-state-layer-opacity)),
     button-protected-state-layer-color: map.get($system, on-primary),
     button-text-label-text-color: map.get($system, primary),
-    button-text-ripple-color: m3-utils.color-with-opacity(map.get($system, primary), 10%),
+    button-text-ripple-color: m3-utils.color-with-opacity(
+        map.get($system, primary), map.get($system, pressed-state-layer-opacity)),
     button-text-state-layer-color: map.get($system, primary),
     button-tonal-container-color: map.get($system, primary),
     button-tonal-label-text-color: map.get($system, on-primary),
-    button-tonal-ripple-color: m3-utils.color-with-opacity(map.get($system, on-primary), 10%),
+    button-tonal-ripple-color: m3-utils.color-with-opacity(
+        map.get($system, on-primary), map.get($system, pressed-state-layer-opacity)),
     button-tonal-state-layer-color: map.get($system, on-primary),
   );
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
-  $font-family: inspection.get-theme-typography($theme, button, font-family);
-  $font-size: inspection.get-theme-typography($theme, button, font-size);
-  $font-weight: inspection.get-theme-typography($theme, button, font-weight);
-  $letter-spacing: inspection.get-theme-typography($theme, button, letter-spacing);
-  $text-transform: none;
+  $system: m2-utils.get-system($theme);
 
   @return (
-    button-filled-label-text-font: $font-family,
-    button-filled-label-text-size: $font-size,
-    button-filled-label-text-tracking: $letter-spacing,
+    button-filled-label-text-font: map.get($system, label-small-font),
+    button-filled-label-text-size: map.get($system, label-small-size),
+    button-filled-label-text-tracking: map.get($system, label-small-tracking),
     button-filled-label-text-transform: none,
-    button-filled-label-text-weight: $font-weight,
-    button-outlined-label-text-font: $font-family,
-    button-outlined-label-text-size: $font-size,
-    button-outlined-label-text-tracking: $letter-spacing,
+    button-filled-label-text-weight: map.get($system, label-small-weight),
+    button-outlined-label-text-font: map.get($system, label-small-font),
+    button-outlined-label-text-size: map.get($system, label-small-size),
+    button-outlined-label-text-tracking: map.get($system, label-small-tracking),
     button-outlined-label-text-transform: none,
-    button-outlined-label-text-weight: $font-weight,
-    button-protected-label-text-font: $font-family,
-    button-protected-label-text-size: $font-size,
-    button-protected-label-text-tracking: $letter-spacing,
+    button-outlined-label-text-weight: map.get($system, label-small-weight),
+    button-protected-label-text-font: map.get($system, label-small-font),
+    button-protected-label-text-size: map.get($system, label-small-size),
+    button-protected-label-text-tracking: map.get($system, label-small-tracking),
     button-protected-label-text-transform: none,
-    button-protected-label-text-weight: $font-weight,
-    button-text-label-text-font: $font-family,
-    button-text-label-text-size: $font-size,
-    button-text-label-text-tracking: $letter-spacing,
+    button-protected-label-text-weight: map.get($system, label-small-weight),
+    button-text-label-text-font: map.get($system, label-small-font),
+    button-text-label-text-size: map.get($system, label-small-size),
+    button-text-label-text-tracking: map.get($system, label-small-tracking),
     button-text-label-text-transform: none,
-    button-text-label-text-weight: $font-weight,
-    button-tonal-label-text-font: $font-family,
-    button-tonal-label-text-size: $font-size,
-    button-tonal-label-text-tracking: $letter-spacing,
+    button-text-label-text-weight: map.get($system, label-small-weight),
+    button-tonal-label-text-font: map.get($system, label-small-font),
+    button-tonal-label-text-size: map.get($system, label-small-size),
+    button-tonal-label-text-tracking: map.get($system, label-small-tracking),
     button-tonal-label-text-transform: none,
-    button-tonal-label-text-weight: $font-weight,
+    button-tonal-label-text-weight: map.get($system, label-small-weight),
   );
 }
 

package/button/_m2-fab.scss

@@ -39,23 +39,25 @@
     fab-container-color: map.get($system, surface),
     fab-disabled-state-container-color: $disabled-container,
     fab-disabled-state-foreground-color: $disabled,
-    fab-disabled-state-layer-color: inspection.get-theme-color($theme, foreground, base),
+    fab-disabled-state-layer-color: map.get($system, on-surface-variant),
     fab-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
-    fab-foreground-color: inspection.get-theme-color($theme, foreground, base),
+    fab-foreground-color: map.get($system, on-surface),
     fab-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
     fab-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
-    fab-ripple-color: inspection.get-theme-color($theme, foreground, base, 0.1),
+    fab-ripple-color: m3-utils.color-with-opacity(
+        map.get($system, on-surface), map.get($system, pressed-state-layer-opacity)),
     fab-small-container-color: map.get($system, surface),
     fab-small-disabled-state-container-color: $disabled-container,
     fab-small-disabled-state-foreground-color: $disabled,
-    fab-small-disabled-state-layer-color: inspection.get-theme-color($theme, foreground, base),
+    fab-small-disabled-state-layer-color: map.get($system, on-surface-variant),
     fab-small-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
-    fab-small-foreground-color: inspection.get-theme-color($theme, foreground, base),
+    fab-small-foreground-color: map.get($system, on-surface),
     fab-small-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
     fab-small-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
-    fab-small-ripple-color: inspection.get-theme-color($theme, foreground, base, 0.1),
-    fab-small-state-layer-color: inspection.get-theme-color($theme, foreground, base),
-    fab-state-layer-color: inspection.get-theme-color($theme, foreground, base),
+    fab-small-ripple-color: m3-utils.color-with-opacity(
+        map.get($system, on-surface), map.get($system, pressed-state-layer-opacity)),
+    fab-small-state-layer-color: map.get($system, on-surface),
+    fab-state-layer-color: map.get($system, on-surface),
   );
 }
 
@@ -67,10 +69,12 @@
   @return (
     fab-container-color: map.get($system, primary),
     fab-foreground-color: map.get($system, on-primary),
-    fab-ripple-color: m3-utils.color-with-opacity(map.get($system, on-primary), 10%),
+    fab-ripple-color: m3-utils.color-with-opacity(
+        map.get($system, primary), map.get($system, pressed-state-layer-opacity)),
     fab-small-container-color: map.get($system, primary),
     fab-small-foreground-color: map.get($system, on-primary),
-    fab-small-ripple-color: m3-utils.color-with-opacity(map.get($system, on-primary), 10%),
+    fab-small-ripple-color: m3-utils.color-with-opacity(
+        map.get($system, on-primary), map.get($system, pressed-state-layer-opacity)),
     fab-small-state-layer-color: map.get($system, on-primary),
     fab-state-layer-color: map.get($system, on-primary),
   );
@@ -78,12 +82,12 @@
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
+  $system: m2-utils.get-system($theme);
   @return (
-    fab-extended-label-text-font: inspection.get-theme-typography($theme, button, font-family),
-    fab-extended-label-text-size: inspection.get-theme-typography($theme, button, font-size),
-    fab-extended-label-text-tracking:
-        inspection.get-theme-typography($theme, button, letter-spacing),
-    fab-extended-label-text-weight: inspection.get-theme-typography($theme, button, font-weight)
+    fab-extended-label-text-font: map.get($system, label-small-font),
+    fab-extended-label-text-size: map.get($system, label-small-size),
+    fab-extended-label-text-tracking: map.get($system, label-small-tracking),
+    fab-extended-label-text-weight: map.get($system, label-small-weight)
   );
 }
 

package/button/_m2-icon-button.scss

@@ -19,14 +19,15 @@
   $is-dark: inspection.get-theme-type($theme) == dark;
 
   @return (
-    icon-button-disabled-icon-color: if($is-dark, rgba(#fff, 0.5), rgba(#000, 0.38)),
-    icon-button-disabled-state-layer-color: inspection.get-theme-color($theme, foreground, base),
+    icon-button-disabled-icon-color: m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+    icon-button-disabled-state-layer-color: map.get($system, on-surface-variant),
     icon-button-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
     icon-button-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
     icon-button-icon-color: inherit,
     icon-button-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
-    icon-button-ripple-color: inspection.get-theme-color($theme, foreground, base, 0.1),
-    icon-button-state-layer-color: inspection.get-theme-color($theme, foreground, base),
+    icon-button-ripple-color: m3-utils.color-with-opacity(
+        map.get($system, on-surface), map.get($system, pressed-state-layer-opacity)),
+    icon-button-state-layer-color: map.get($system, on-surface),
   );
 }
 
@@ -38,7 +39,8 @@
   @return (
     icon-button-icon-color: map.get($system, primary),
     icon-button-state-layer-color: map.get($system, primary),
-    icon-button-ripple-color: m3-utils.color-with-opacity(map.get($system, primary), 10%),
+    icon-button-ripple-color: m3-utils.color-with-opacity(
+        map.get($system, primary), map.get($system, pressed-state-layer-opacity)),
   );
 }
 

package/button/testing/index.d.ts

@@ -18,6 +18,7 @@ interface ButtonHarnessFilters extends BaseHarnessFilters {
 
 /** Harness for interacting with a mat-button in tests. */
 declare class MatButtonHarness extends ContentContainerComponentHarness {
+    /** Selector for the harness. */
     static hostSelector: string;
     /**
      * Gets a `HarnessPredicate` that can be used to search for a button with specific attributes.