refactor: remove safe-color-change mixin

Author: Andrew Seguin

src/material/button-toggle/_m2-button-toggle.scss

@@ -1,7 +1,6 @@
 @use 'sass:map';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
-@use '../core/style/sass-utils';
 @use '../core/tokens/m2-utils';
 
 // Tokens that can't be configured through Angular Material's current theming API,
@@ -47,8 +46,7 @@
     button-toggle-selected-state-background-color:
         inspection.get-theme-color($theme, background, selected-button),
     button-toggle-selected-state-text-color: inspection.get-theme-color($theme, system, on-surface),
-    button-toggle-state-layer-color: sass-utils.safe-color-change(
-        inspection.get-theme-color($theme, background, focused-button), $alpha: 1),
+    button-toggle-state-layer-color: inspection.get-theme-color($theme, background, base),
     button-toggle-text-color: inspection.get-theme-color($theme, system, on-surface),
   );
 }

src/material/button/_m2-button.scss

@@ -54,7 +54,7 @@
     button-filled-disabled-state-layer-color: inspection.get-theme-color($theme, foreground, base),
     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, text, 1),
+    button-filled-label-text-color: inspection.get-theme-color($theme, foreground, base),
     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),
@@ -65,7 +65,7 @@
         inspection.get-theme-color($theme, foreground, base),
     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, text, 1),
+    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),
@@ -80,7 +80,7 @@
         inspection.get-theme-color($theme, foreground, base),
     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, text, 1),
+    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),
@@ -90,7 +90,7 @@
     button-text-disabled-state-layer-color: inspection.get-theme-color($theme, foreground, base),
     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, text, 1),
+    button-text-label-text-color: inspection.get-theme-color($theme, foreground, base),
     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),
@@ -102,7 +102,7 @@
     button-tonal-disabled-state-layer-color: inspection.get-theme-color($theme, foreground, base),
     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, text, 1),
+    button-tonal-label-text-color: inspection.get-theme-color($theme, foreground, base),
     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),
@@ -112,11 +112,11 @@
 // Generates the mapping for the properties that change based on the button palette color.
 @function private-get-color-palette-color-tokens($theme, $palette-name) {
   $color: inspection.get-theme-color($theme, $palette-name);
-  $state-layer-color: inspection.get-theme-color($theme, $palette-name, default-contrast, 1);
+  $state-layer-color: inspection.get-theme-color($theme, $palette-name, default-contrast);
   $ripple-color: inspection.get-theme-color($theme, $palette-name, default-contrast, 0.1);
   $contrast-color: inspection.get-theme-color($theme, $palette-name, default-contrast);
   $container-color: inspection.get-theme-color($theme, $palette-name, default);
-  $label-text-color: inspection.get-theme-color($theme, $palette-name, default-contrast, 1);
+  $label-text-color: inspection.get-theme-color($theme, $palette-name, default-contrast);
   $ripple-opacity: 0.1;
 
   // outlined-outline-color:
@@ -148,11 +148,11 @@
     button-text-state-layer-color: inspection.get-theme-color($theme, $palette-name),
     button-tonal-container-color: inspection.get-theme-color($theme, $palette-name, default),
     button-tonal-label-text-color:
-        inspection.get-theme-color($theme, $palette-name, default-contrast, 1),
+        inspection.get-theme-color($theme, $palette-name, default-contrast),
     button-tonal-ripple-color:
         inspection.get-theme-color($theme, $palette-name, default-contrast, 0.1),
     button-tonal-state-layer-color:
-        inspection.get-theme-color($theme, $palette-name, default-contrast, 1),
+        inspection.get-theme-color($theme, $palette-name, default-contrast),
   );
 }
 

src/material/button/_m2-fab.scss

@@ -63,8 +63,8 @@
 // Generates the mapping for the properties that change based on the FAB palette color.
 @function private-get-color-palette-color-tokens($theme, $palette-name) {
   $contrast-color: inspection.get-theme-color($theme, $palette-name, default-contrast);
-  $foreground-color: inspection.get-theme-color($theme, $palette-name, default-contrast, 1);
-  $state-layer-color: inspection.get-theme-color($theme, $palette-name, default-contrast, 1);
+  $foreground-color: inspection.get-theme-color($theme, $palette-name, default-contrast);
+  $state-layer-color: inspection.get-theme-color($theme, $palette-name, default-contrast);
   $ripple-color: inspection.get-theme-color($theme, $palette-name, default-contrast, 0.1);
 
   @return (

src/material/checkbox/_m2-checkbox.scss

@@ -2,7 +2,6 @@
 @use '../core/tokens/m2-utils';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
-@use '../core/style/sass-utils';
 @use '../core/m2/theming' as m2-theming;
 @use '../core/m2/palette' as m2-palette;
 
@@ -29,15 +28,13 @@
   $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);
+  $disabled-color: inspection.get-theme-color($theme, foreground, base, 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);
+  $border-color: inspection.get-theme-color($theme, foreground, base, 0.54);
   $active-border-color:
     m2-theming.get-color-from-palette(m2-palette.$gray-palette, if($is-dark, 200, 900));
   $selected-checkmark-color:
-    inspection.get-theme-color($theme, $palette-name, default-contrast, 1);
+    inspection.get-theme-color($theme, $palette-name, default-contrast);
 
   $tokens: (
     checkbox-disabled-label-color: inspection.get-theme-color($theme, foreground, disabled-text),

src/material/core/m2/_theming.scss

@@ -85,14 +85,16 @@
   // might be inferred as numbers by Sass. Casting them to string fixes the map lookup.
   $color: if(map.has-key($palette, $hue), map.get($palette, $hue), map.get($palette, $hue + ''));
 
-  @if (meta.type-of($color) != color) {
-    // If the $color resolved to something different from a color (e.g. a CSS variable),
-    // we can't apply the opacity anyway so we return the value as is, otherwise Sass can
-    // throw an error or output something invalid.
+  @if ($opacity == null) {
     @return $color;
   }
 
-  @return rgba($color, if($opacity == null, color.opacity($color), $opacity));
+  @if (meta.type-of($color) != color) {
+    $opacity: ($opacity * 100) + '%';
+    @return #{color-mix(in srgb, #{$color} #{$opacity}, transparent)};
+  }
+
+  @return rgba($color, $opacity);
 }
 
 // Validates the specified theme by ensuring that the optional color config defines

src/material/core/style/_form-common.scss

@@ -1,5 +1,4 @@
 @use '../theming/inspection';
-@use './sass-utils';
 
 // Renders a gradient for showing the dashed line when the input is disabled.
 // Unlike using a border, a gradient allows us to adjust the spacing of the dotted line
@@ -15,7 +14,6 @@
 // becoming out of sync since these colors aren't in a palette.
 @function private-control-placeholder-color($theme) {
   $is-dark-theme: inspection.get-theme-type($theme) == dark;
-  @return sass-utils.safe-color-change(
-      inspection.get-theme-color($theme, foreground, secondary-text),
-      $alpha: if($is-dark-theme, 0.5, 0.42));
+  @return
+      inspection.get-theme-color($theme, foreground, base, if($is-dark-theme, 0.5, 0.42));
 }

src/material/core/style/_sass-utils.scss

@@ -1,4 +1,3 @@
-@use 'sass:color';
 @use 'sass:string';
 @use 'sass:map';
 @use 'sass:meta';
@@ -51,34 +50,6 @@ $use-system-typography-variables: false;
   @return $result;
 }
 
-/// 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-color-mix) {
-    $opacity: map.get($args, alpha);
-    @if meta.type-of($opacity) == number {
-      $opacity: ($opacity * 100) + '%';
-    }
-
-    @if (is-css-var-name($opacity)) {
-      $opacity: calc(var($opacity) * 100%);
-    }
-
-    @if (is-css-var-name($color)) {
-      $color: var($color);
-    }
-
-    @return #{color-mix(in srgb, #{$color} #{$opacity}, transparent)};
-  }
-  @return $color;
-}
-
 // Returns whether the $value is a CSS variable name based on whether it's a string prefixed
 // by "--".
 @function is-css-var-name($value) {

src/material/datepicker/_m2-datepicker.scss

@@ -70,7 +70,7 @@ $private-default-overlap-color: #a8dab5;
     datepicker-toggle-icon-color: $inactive-icon-color,
     datepicker-calendar-body-label-text-color: $secondary-text-color,
     datepicker-calendar-period-button-text-color:
-        inspection.get-theme-color($theme, foreground, text, 1),
+        inspection.get-theme-color($theme, foreground, base),
     datepicker-calendar-period-button-icon-color: $inactive-icon-color,
     datepicker-calendar-navigation-button-icon-color: $inactive-icon-color,
     datepicker-calendar-header-divider-color: inspection.get-theme-color($theme, system, outline),
@@ -140,7 +140,7 @@ $private-default-overlap-color: #a8dab5;
 @function private-get-calendar-color-palette-color-tokens($theme, $palette-name) {
   $palette-color: inspection.get-theme-color($theme, $palette-name);
   $default-contrast: inspection.get-theme-color($theme, $palette-name, default-contrast);
-  $active-background-color: sass-utils.safe-color-change($palette-color, $alpha: 0.3);
+  $active-background-color: inspection.get-theme-color($theme, $palette-name, 0.3);
   $active-disabled-color: null;
 
   @if (meta.type-of($palette-color) == color) {

src/material/dialog/_m2-dialog.scss

@@ -1,5 +1,4 @@
 @use '../core/style/elevation';
-@use '../core/style/sass-utils';
 @use '../core/theming/inspection';
 
 // Tokens that can't be configured through Angular Material's current theming API,
@@ -25,12 +24,10 @@
 // Tokens that can be configured through Angular Material's color theming API.
 @function get-color-tokens($theme) {
   $is-dark: inspection.get-theme-type($theme) == dark;
-  $text-base: inspection.get-theme-color($theme, foreground, text, 1);
-
   @return (
     dialog-container-color: inspection.get-theme-color($theme, system, surface),
-    dialog-subhead-color: sass-utils.safe-color-change($text-base, $alpha: 0.87),
-    dialog-supporting-text-color: sass-utils.safe-color-change($text-base, $alpha: 0.6),
+    dialog-subhead-color: inspection.get-theme-color($theme, foreground, text, 0.87),
+    dialog-supporting-text-color: inspection.get-theme-color($theme, foreground, text, 0.6),
   );
 }
 

src/material/form-field/_m2-form-field.scss

@@ -1,5 +1,4 @@
 @use '../core/m2/palette' as m2-palette;
-@use '../core/style/sass-utils';
 @use '../core/theming/inspection';
 @use '../core/theming/theming';
 @use '../core/tokens/m2-utils';
@@ -35,12 +34,14 @@
   // internally. For now we fall back to the old hardcoded behavior only for internal apps.
   $on-surface: if($is-dark, #fff, #000);
   $text-color-base: if(m2-utils.$private-is-internal-build, $on-surface,
-    inspection.get-theme-color($theme, foreground, text, 1));
+    inspection.get-theme-color($theme, foreground, base));
   $disabled-text-color-base: if(m2-utils.$private-is-internal-build, $on-surface,
-    inspection.get-theme-color($theme, foreground, disabled-text, 1));
+    inspection.get-theme-color($theme, foreground, base));
   $divider-base: if(m2-utils.$private-is-internal-build, $on-surface,
     inspection.get-theme-color($theme, foreground, base));
 
+  $disabled: inspection.get-theme-color($theme, foreground, base, 0.38);
+
   @return map.merge($color-tokens, (
     // MDC has a token for the enabled placeholder, but not for the disabled one.
     form-field-disabled-input-text-placeholder-color:
@@ -80,51 +81,51 @@
     form-field-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
     form-field-filled-container-color: _variable-safe-mix($on-surface, $surface, 4%),
     form-field-filled-disabled-container-color: _variable-safe-mix($on-surface, $surface, 2%),
-    form-field-filled-label-text-color: sass-utils.safe-color-change($text-color-base, $alpha: 0.6),
+    form-field-filled-label-text-color: inspection.get-theme-color($theme, foreground, base, 0.6),
     form-field-filled-hover-label-text-color:
-        sass-utils.safe-color-change($text-color-base, $alpha: 0.6),
+        inspection.get-theme-color($theme, foreground, base, 0.6),
     form-field-filled-disabled-label-text-color:
-        sass-utils.safe-color-change($disabled-text-color-base, $alpha: 0.38),
+        inspection.get-theme-color($theme, foreground, base, 0.38),
     form-field-filled-input-text-color:
-        sass-utils.safe-color-change($text-color-base, $alpha: 0.87),
+        inspection.get-theme-color($theme, foreground, base, 0.87),
     form-field-filled-disabled-input-text-color:
-        sass-utils.safe-color-change($disabled-text-color-base, $alpha: 0.38),
+        inspection.get-theme-color($theme, foreground, base, 0.38),
     form-field-filled-input-text-placeholder-color:
-        sass-utils.safe-color-change($text-color-base, $alpha: 0.6),
+        inspection.get-theme-color($theme, foreground, base, 0.6),
     form-field-filled-error-hover-label-text-color: $warn-color,
     form-field-filled-error-focus-label-text-color: $warn-color,
     form-field-filled-error-label-text-color: $warn-color,
     form-field-filled-error-caret-color: $warn-color,
     form-field-filled-active-indicator-color:
-        sass-utils.safe-color-change($divider-base, $alpha: 0.42),
+        inspection.get-theme-color($theme, foreground, base, 0.42),
     form-field-filled-disabled-active-indicator-color:
-        sass-utils.safe-color-change($divider-base, $alpha: 0.06),
+        inspection.get-theme-color($theme, foreground, base, 0.06),
     form-field-filled-hover-active-indicator-color:
-        sass-utils.safe-color-change($divider-base, $alpha: 0.87),
+        inspection.get-theme-color($theme, foreground, base, 0.87),
     form-field-filled-error-active-indicator-color: $warn-color,
     form-field-filled-error-focus-active-indicator-color: $warn-color,
     form-field-filled-error-hover-active-indicator-color: $warn-color,
     form-field-outlined-label-text-color:
-        sass-utils.safe-color-change($text-color-base, $alpha: 0.6),
+        inspection.get-theme-color($theme, foreground, base, 0.6),
     form-field-outlined-hover-label-text-color:
-        sass-utils.safe-color-change($text-color-base, $alpha: 0.6),
+        inspection.get-theme-color($theme, foreground, base, 0.6),
     form-field-outlined-disabled-label-text-color:
-        sass-utils.safe-color-change($disabled-text-color-base, $alpha: 0.38),
+        inspection.get-theme-color($theme, foreground, base, 0.38),
     form-field-outlined-input-text-color:
-        sass-utils.safe-color-change($text-color-base, $alpha: 0.87),
+        inspection.get-theme-color($theme, foreground, base, 0.87),
     form-field-outlined-disabled-input-text-color:
-        sass-utils.safe-color-change($disabled-text-color-base, $alpha: 0.38),
+        inspection.get-theme-color($theme, foreground, base, 0.38),
     form-field-outlined-input-text-placeholder-color:
-        sass-utils.safe-color-change($text-color-base, $alpha: 0.6),
+        inspection.get-theme-color($theme, foreground, base, 0.6),
     form-field-outlined-error-caret-color: $warn-color,
     form-field-outlined-error-focus-label-text-color: $warn-color,
     form-field-outlined-error-label-text-color: $warn-color,
     form-field-outlined-error-hover-label-text-color: $warn-color,
-    form-field-outlined-outline-color: sass-utils.safe-color-change($divider-base, $alpha: 0.38),
+    form-field-outlined-outline-color: inspection.get-theme-color($theme, foreground, base, 0.38),
     form-field-outlined-disabled-outline-color:
-        sass-utils.safe-color-change($divider-base, $alpha: 0.06),
+        inspection.get-theme-color($theme, foreground, base, 0.06),
     form-field-outlined-hover-outline-color:
-        sass-utils.safe-color-change($divider-base, $alpha: 0.87),
+        inspection.get-theme-color($theme, foreground, base, 0.87),
     form-field-outlined-error-focus-outline-color: $warn-color,
     form-field-outlined-error-hover-outline-color: $warn-color,
     form-field-outlined-error-outline-color: $warn-color,
@@ -141,17 +142,16 @@
 // Generates the mapping for the properties that change based on the form field color.
 @function private-get-color-palette-color-tokens($theme, $palette-name) {
   $palette-color: inspection.get-theme-color($theme, $palette-name);
+  $text-color: inspection.get-theme-color($theme, $palette-name, 0.87);
 
   @return (
-    form-field-focus-select-arrow-color: sass-utils.safe-color-change($palette-color, $alpha: 0.87),
+    form-field-focus-select-arrow-color: $text-color,
     form-field-filled-caret-color: $palette-color,
     form-field-filled-focus-active-indicator-color: $palette-color,
-    form-field-filled-focus-label-text-color:
-        sass-utils.safe-color-change($palette-color, $alpha: 0.87),
+    form-field-filled-focus-label-text-color: $text-color,
     form-field-outlined-caret-color: $palette-color,
     form-field-outlined-focus-outline-color: $palette-color,
-    form-field-outlined-focus-label-text-color:
-        sass-utils.safe-color-change($palette-color, $alpha: 0.87),
+    form-field-outlined-focus-label-text-color: $text-color,
   );
 }