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

package/core/tokens/m2/mat/_radio.scss

@@ -1,6 +1,7 @@
 @use 'sass:map';
 @use '../../token-utils';
 @use '../../../theming/theming';
+@use '../../../style/sass-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, radio);
@@ -37,10 +38,10 @@ $prefix: (mat, radio);
 // Combines the tokens generated by the above functions into a single map with placeholder values.
 // This is used to create token slots.
 @function get-token-slots() {
-  @return token-utils.merge-all(
-          get-unthemable-tokens(),
-          get-color-tokens(token-utils.$placeholder-color-config),
-          get-typography-tokens(token-utils.$placeholder-typography-config),
-          get-density-tokens(token-utils.$placeholder-density-config)
+  @return sass-utils.deep-merge-all(
+      get-unthemable-tokens(),
+      get-color-tokens(token-utils.$placeholder-color-config),
+      get-typography-tokens(token-utils.$placeholder-typography-config),
+      get-density-tokens(token-utils.$placeholder-density-config)
   );
 }

package/core/tokens/m2/mat/_snack-bar.scss

@@ -1,6 +1,7 @@
 @use 'sass:map';
 @use '../../token-utils';
 @use '../../../theming/theming';
+@use '../../../style/sass-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, snack-bar);
@@ -34,10 +35,10 @@ $prefix: (mat, snack-bar);
 // Combines the tokens generated by the above functions into a single map with placeholder values.
 // This is used to create token slots.
 @function get-token-slots() {
-  @return token-utils.merge-all(
-          get-unthemable-tokens(),
-          get-color-tokens(token-utils.$placeholder-color-config),
-          get-typography-tokens(token-utils.$placeholder-typography-config),
-          get-density-tokens(token-utils.$placeholder-density-config)
+  @return sass-utils.deep-merge-all(
+      get-unthemable-tokens(),
+      get-color-tokens(token-utils.$placeholder-color-config),
+      get-typography-tokens(token-utils.$placeholder-typography-config),
+      get-density-tokens(token-utils.$placeholder-density-config)
   );
 }

package/core/tokens/m2/mat/_tab-header-with-background.scss

@@ -1,6 +1,7 @@
 @use 'sass:map';
 @use '../../token-utils';
 @use '../../../theming/theming';
+@use '../../../style/sass-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, tab-header-with-background);
@@ -34,10 +35,10 @@ $prefix: (mat, tab-header-with-background);
 // Combines the tokens generated by the above functions into a single map with placeholder values.
 // This is used to create token slots.
 @function get-token-slots() {
-  @return token-utils.merge-all(
-          get-unthemable-tokens(),
-          get-color-tokens(token-utils.$placeholder-color-config),
-          get-typography-tokens(token-utils.$placeholder-typography-config),
-          get-density-tokens(token-utils.$placeholder-density-config)
+  @return sass-utils.deep-merge-all(
+      get-unthemable-tokens(),
+      get-color-tokens(token-utils.$placeholder-color-config),
+      get-typography-tokens(token-utils.$placeholder-typography-config),
+      get-density-tokens(token-utils.$placeholder-density-config)
   );
 }

package/core/tokens/m2/mat/_tab-header.scss

@@ -2,6 +2,7 @@
 @use '../../token-utils';
 @use '../../../theming/theming';
 @use '../../../typography/typography-utils';
+@use '../../../style/sass-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, tab-header);
@@ -62,7 +63,7 @@ $prefix: (mat, tab-header);
 // Combines the tokens generated by the above functions into a single map with placeholder values.
 // This is used to create token slots.
 @function get-token-slots() {
-  @return token-utils.merge-all(
+  @return sass-utils.deep-merge-all(
           get-unthemable-tokens(),
           get-color-tokens(token-utils.$placeholder-color-config),
           get-typography-tokens(token-utils.$placeholder-typography-config),

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

@@ -1,6 +1,7 @@
 @use 'sass:map';
 @use '../../../theming/palette';
 @use '../../../theming/theming';
+@use '../../../style/sass-utils';
 @use '../../token-utils';
 @use '@material/theme/theme-color' as mdc-theme-color;
 
@@ -26,25 +27,25 @@ $prefix: (mdc, checkbox);
 @function get-unthemable-tokens() {
   @return (
     // The color of the checkmark when the checkbox is selected and disabled.
-      disabled-selected-checkmark-color: #fff,
+    disabled-selected-checkmark-color: #fff,
     // The opacity of the ripple when the checkbox is selected and focused.
-      selected-focus-state-layer-opacity: 0.16,
+    selected-focus-state-layer-opacity: 0.16,
     // The opacity of the ripple when the checkbox is selected and hovered.
-      selected-hover-state-layer-opacity: 0.04,
+    selected-hover-state-layer-opacity: 0.04,
     // The opacity of the ripple when the checkbox is selected and pressed.
-      selected-pressed-state-layer-opacity: 0.16,
+    selected-pressed-state-layer-opacity: 0.16,
     // The opacity of the ripple when the checkbox is unselected and focused.
-      unselected-focus-state-layer-opacity: 0.16,
+    unselected-focus-state-layer-opacity: 0.16,
     // The opacity of the ripple when the checkbox is unselected and hovered.
-      unselected-hover-state-layer-opacity: 0.04,
+    unselected-hover-state-layer-opacity: 0.04,
     // The opacity of the ripple when the checkbox is unselected and pressed.
-      unselected-pressed-state-layer-opacity: 0.16,
+    unselected-pressed-state-layer-opacity: 0.16,
     // =============================================================================================
     // = TOKENS NOT USED IN ANGULAR MATERIAL                                                       =
     // =============================================================================================
     // MDC currently doesn't output a slot for these tokens.
-      disabled-selected-icon-opacity: null,
-      disabled-unselected-icon-opacity: null,
+    disabled-selected-icon-opacity: null,
+    disabled-unselected-icon-opacity: null,
   );
 }
 
@@ -59,43 +60,43 @@ $prefix: (mdc, checkbox);
   $selected-color: theming.get-color-from-palette($accent);
   $border-color: theming.get-color-from-palette($foreground, base, 0.54);
   $active-border-color:
-      theming.get-color-from-palette(palette.$gray-palette, if($is-dark, 200, 900));
+    theming.get-color-from-palette(palette.$gray-palette, if($is-dark, 200, 900));
 
   @return (
     // The color of the checkbox fill when the checkbox is selected and disabled.
-      disabled-selected-icon-color: $disabled-color,
+    disabled-selected-icon-color: $disabled-color,
     // The color of the checkbox border when the checkbox is unselected and disabled.
-      disabled-unselected-icon-color: $disabled-color,
+    disabled-unselected-icon-color: $disabled-color,
     // The color of the checkmark when the checkbox is selected.
-      selected-checkmark-color: _contrast-tone($selected-color, $is-dark),
+    selected-checkmark-color: _contrast-tone($selected-color, $is-dark),
     // The color of the checkbox fill when the checkbox is selected and focused.
-      selected-focus-icon-color: $selected-color,
+    selected-focus-icon-color: $selected-color,
     // The color of the checkbox fill when the checkbox is selected and hovered.
-      selected-hover-icon-color: $selected-color,
+    selected-hover-icon-color: $selected-color,
     // The color of the checkbox fill when the checkbox is selected.
-      selected-icon-color: $selected-color,
+    selected-icon-color: $selected-color,
     // The color of the checkbox fill when the checkbox is selected an pressed.
-      selected-pressed-icon-color: $selected-color,
+    selected-pressed-icon-color: $selected-color,
     // The color of the checkbox border when the checkbox is unselected and focused.
-      unselected-focus-icon-color: $active-border-color,
+    unselected-focus-icon-color: $active-border-color,
     // The color of the checkbox border when the checkbox is unselected and hovered.
-      unselected-hover-icon-color: $active-border-color,
+    unselected-hover-icon-color: $active-border-color,
     // The color of the checkbox border when the checkbox is unselected.
-      unselected-icon-color: $border-color,
+    unselected-icon-color: $border-color,
     // The color of the checkbox border when the checkbox is unselected and pressed.
-      unselected-pressed-icon-color: $border-color,
+    unselected-pressed-icon-color: $border-color,
     // The color of the ripple when the checkbox is selected and focused.
-      selected-focus-state-layer-color: $accent-default,
+    selected-focus-state-layer-color: $accent-default,
     // The color of the ripple when the checkbox is selected and hovered.
-      selected-hover-state-layer-color: $accent-default,
+    selected-hover-state-layer-color: $accent-default,
     // The color of the ripple when the checkbox is selected and pressed.
-      selected-pressed-state-layer-color: $accent-default,
+    selected-pressed-state-layer-color: $accent-default,
     // The color of the ripple when the checkbox is unselected and focused.
-      unselected-focus-state-layer-color: $foreground-base,
+    unselected-focus-state-layer-color: $foreground-base,
     // The color of the ripple when the checkbox is unselected and hovered.
-      unselected-hover-state-layer-color: $foreground-base,
+    unselected-hover-state-layer-color: $foreground-base,
     // The color of the ripple when the checkbox is unselected and pressed.
-      unselected-pressed-state-layer-color: $foreground-base,
+    unselected-pressed-state-layer-color: $foreground-base,
   );
 }
 
@@ -110,22 +111,22 @@ $prefix: (mdc, checkbox);
 
   @return (
     // The diameter of the checkbox's ripple.
-      state-layer-size: map.get((
-          0: 40px,
-          -1: 36px,
-          -2: 32px,
-          -3: 28px,
-      ), $scale)
+    state-layer-size: map.get((
+      0: 40px,
+      -1: 36px,
+      -2: 32px,
+      -3: 28px,
+    ), $scale)
   );
 }
 
 // Combines the tokens generated by the above functions into a single map with placeholder values.
 // This is used to create token slots.
 @function get-token-slots() {
-  @return token-utils.merge-all(
-          get-unthemable-tokens(),
-          get-color-tokens(token-utils.$placeholder-color-config),
-          get-typography-tokens(token-utils.$placeholder-typography-config),
-          get-density-tokens(token-utils.$placeholder-density-config)
+  @return sass-utils.deep-merge-all(
+      get-unthemable-tokens(),
+      get-color-tokens(token-utils.$placeholder-color-config),
+      get-typography-tokens(token-utils.$placeholder-typography-config),
+      get-density-tokens(token-utils.$placeholder-density-config)
   );
 }

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

@@ -0,0 +1,313 @@
+@use 'sass:map';
+@use '../../token-utils';
+@use '../../../mdc-helpers/mdc-helpers';
+@use '../../../style/sass-utils';
+@use '../../../theming/theming';
+@use '../../../typography/typography-utils';
+
+// The prefix used to generate the fully qualified name for tokens in this file.
+$prefix: (mdc, chip);
+
+// Tokens that can't be configured through Angular Material's current theming API,
+// but may be in a future version of the theming API.
+//
+// Tokens that are available in MDC, but not used in Angular Material should be mapped to `null`.
+// `null` indicates that we are intentionally choosing not to emit a slot or value for the token in
+// our CSS.
+@function get-unthemable-tokens() {
+  @return (
+    // The shape & radius of the chip.
+    container-shape:
+      (
+        family: 'rounded',
+        radius: (
+          16px 16px 16px 16px,
+        )
+      ),
+    // The shape & radius of the avatar.
+    with-avatar-avatar-shape:
+      (
+        family: 'rounded',
+        radius: (
+          14px 14px 14px 14px,
+        )
+      ),
+    // The width & height of the chip avatar.
+    with-avatar-avatar-size: 28px,
+    // The width & height of the chip icon.
+    with-icon-icon-size: 18px,
+    // Not used by MDC.
+    disabled-label-text-opacity: null,
+    // Not used by MDC.
+    disabled-outline-opacity: null,
+    // Not used by MDC.
+    elevated-disabled-container-opacity: null,
+    // Not used by MDC.
+    flat-disabled-outline-opacity: null,
+    // Not used by MDC.
+    flat-disabled-unselected-outline-opacity: null,
+    // Our chips do not have a border.
+    flat-outline-width: null,
+    // Our chips do not have a border.
+    flat-selected-outline-width: null,
+    // Our chips do not have a border.
+    flat-unselected-outline-width: null,
+    // Our chips do not have a border.
+    outline-width: null,
+    // Not used by MDC.
+    with-avatar-disabled-avatar-opacity: null,
+    // Not used by MDC.
+    with-icon-disabled-icon-opacity: null,
+    // Not used by MDC.
+    with-leading-icon-disabled-leading-icon-opacity: null,
+    // Not used by MDC.
+    with-leading-icon-leading-icon-size: null,
+    // Not used by MDC.
+    with-trailing-icon-disabled-trailing-icon-opacity: null,
+    // Not used by MDC.
+    with-trailing-icon-trailing-icon-size: null,
+    // Elevated chips not implemented.
+    container-elevation: null,
+    // Elevated chips not implemented.
+    container-shadow-color: null,
+    // Our chips do not have a border.
+    disabled-outline-color: null,
+    // Elevated chips not implemented.
+    elevated-container-elevation: null,
+    // Elevated chips not implemented.
+    elevated-container-shadow-color: null,
+    // Elevated chips not implemented.
+    container-surface-tint-layer-color: null,
+    // Elevated chips not implemented.
+    elevated-disabled-container-elevation: null,
+    // Elevated chips not implemented.
+    elevated-focus-container-elevation: null,
+    // Elevated chips not implemented.
+    elevated-hover-container-elevation: null,
+    // Elevated chips not implemented.
+    elevated-pressed-container-elevation: null,
+    // Elevated chips not implemented.
+    elevated-selected-container-color: null,
+    // Elevated chips not implemented.
+    elevated-selected-container-elevation: null,
+    // Elevated chips not implemented.
+    elevated-unselected-container-color: null,
+    // Elevated chips not implemented.
+    flat-container-elevation: null,
+    // Our chips do not have a border.
+    flat-disabled-outline-color: null,
+    // Not providing this uses
+    flat-disabled-selected-container-color: null,
+    // Not used by MDC.
+    flat-disabled-selected-container-opacity: null,
+    // Unused.
+    flat-disabled-selected-outline-color: null,
+    // Unused.
+    flat-disabled-selected-outline-opacity: null,
+    // Unused.
+    flat-disabled-unselected-outline-color: null,
+    // Unused.
+    flat-focus-outline-color: null,
+    // Unused.
+    flat-outline-color: null,
+    // Unused.
+    flat-selected-container-color: null,
+    // Unused.
+    flat-selected-focus-container-elevation: null,
+    // Unused.
+    flat-selected-hover-container-elevation: null,
+    // Unused.
+    flat-selected-outline-color: null,
+    // Unused.
+    flat-selected-pressed-container-elevation: null,
+    // Unused.
+    flat-unselected-focus-container-elevation: null,
+    // Unused.
+    flat-unselected-focus-outline-color: null,
+    // Unused.
+    flat-unselected-hover-container-elevation: null,
+    // Unused.
+    flat-unselected-outline-color: null,
+    // Unused.
+    flat-unselected-pressed-container-elevation: null,
+    // Unused.
+    focus-label-text-color: null,
+    // Unused.
+    focus-outline-color: null,
+    // Unused.
+    focus-state-layer-color: null,
+    // Unused.
+    focus-state-layer-opacity: null,
+    // Unused.
+    hover-label-text-color: null,
+    // Unused.
+    hover-state-layer-color: null,
+    // Unused.
+    hover-state-layer-opacity: null,
+    // Unused.
+    outline-color: null,
+    // Unused.
+    pressed-label-text-color: null,
+    // Unused.
+    pressed-state-layer-color: null,
+    // Unused.
+    pressed-state-layer-opacity: null,
+    // Unused.
+    selected-focus-label-text-color: null,
+    // Unused.
+    selected-focus-state-layer-color: null,
+    // Unused.
+    selected-focus-state-layer-opacity: null,
+    // Unused.
+    selected-hover-label-text-color: null,
+    // Unused.
+    selected-hover-state-layer-color: null,
+    // Unused.
+    selected-hover-state-layer-opacity: null,
+    // Unused.
+    selected-label-text-color: null,
+    // Unused.
+    selected-pressed-label-text-color: null,
+    // Unused.
+    selected-pressed-state-layer-color: null,
+    // Unused.
+    selected-pressed-state-layer-opacity: null,
+    // Unused.
+    unselected-focus-label-text-color: null,
+    // Unused.
+    unselected-focus-state-layer-color: null,
+    // Unused.
+    unselected-focus-state-layer-opacity: null,
+    // Unused.
+    unselected-hover-label-text-color: null,
+    // Unused.
+    unselected-hover-state-layer-color: null,
+    // Unused.
+    unselected-hover-state-layer-opacity: null,
+    // Unused.
+    unselected-label-text-color: null,
+    // Unused.
+    unselected-pressed-label-text-color: null,
+    // Unused.
+    unselected-pressed-state-layer-color: null,
+    // Unused.
+    unselected-pressed-state-layer-opacity: null,
+    // Unused.
+    with-icon-focus-icon-color: null,
+    // Unused.
+    with-icon-hover-icon-color: null,
+    // Unused.
+    with-icon-pressed-icon-color: null,
+    // Unused.
+    with-icon-selected-focus-icon-color: null,
+    // Unused.
+    with-icon-selected-hover-icon-color: null,
+    // Unused.
+    with-icon-selected-pressed-icon-color: null,
+    // Unused.
+    with-icon-unselected-focus-icon-color: null,
+    // Unused.
+    with-icon-unselected-hover-icon-color: null,
+    // Unused.
+    with-icon-unselected-icon-color: null,
+    // Unused.
+    with-icon-unselected-pressed-icon-color: null,
+    // Unused.
+    with-leading-icon-disabled-leading-icon-color: null,
+    // Unused.
+    with-leading-icon-focus-leading-icon-color: null,
+    // Unused.
+    with-leading-icon-hover-leading-icon-color: null,
+    // Unused.
+    with-leading-icon-leading-icon-color: null,
+    // Unused.
+    with-leading-icon-pressed-leading-icon-color: null,
+    // Unused.
+    with-trailing-icon-focus-trailing-icon-color: null,
+    // Unused.
+    with-trailing-icon-hover-trailing-icon-color: null,
+    // Unused.
+    with-trailing-icon-pressed-trailing-icon-color: null
+  );
+}
+
+// Tokens that can be configured through Angular Material's color theming API.
+@function get-color-tokens($config) {
+  $palette: map.get($config, primary);
+  $background: theming.get-color-from-palette($palette);
+  $foreground: theming.get-color-from-palette($palette, default-contrast);
+
+  @return (
+    // The text color of a disabled chip.
+    disabled-label-text-color: $foreground,
+    // The background-color of the chip.
+    elevated-container-color: $background,
+    // The background-color of a disabled chip.
+    elevated-disabled-container-color: $background,
+    // The chip text color.
+    label-text-color: $foreground,
+    // The icon color of a chip.
+    with-icon-icon-color: $foreground,
+    // The color of the icon of a disabled chip.
+    with-icon-disabled-icon-color: $foreground,
+    // The color of the icon of a selected chip.
+    with-icon-selected-icon-color: $foreground,
+    // The color of the icon at the end of a disabled chip.
+    with-trailing-icon-disabled-trailing-icon-color: $foreground,
+    // The color of the icon at the end of the chip.
+    with-trailing-icon-trailing-icon-color: $foreground
+  );
+}
+
+// Tokens that can be configured through Angular Material's typography theming API.
+@function get-typography-tokens($config) {
+  // TODO(wagnermaciel): The earlier implementation of the chip used MDC's APIs to create the
+  // typography tokens. As a result, we unintentionally allowed `null` typography configs to be
+  // passed in. Since there a lot of apps that now depend on this pattern, we need this temporary
+  // fallback.
+  @if ($config == null) {
+    $config: mdc-helpers.private-fallback-typography-from-mdc();
+  }
+
+  @return (
+    // The font family of the chip text.
+    label-text-font: typography-utils.font-family($config, body-2) or
+      typography-utils.font-family($config),
+    // The line height of the chip text.
+    label-text-line-height: typography-utils.line-height($config, body-2),
+    // The font size of the chip text.
+    label-text-size: typography-utils.font-size($config, body-2),
+    // The letter spacing of the chip label.
+    label-text-tracking: typography-utils.letter-spacing($config, body-2),
+    // The font weight of the chip text.
+    label-text-weight: typography-utils.font-weight($config, body-2)
+  );
+}
+
+// Tokens that can be configured through Angular Material's density theming API.
+@function get-density-tokens($config) {
+  $scale: theming.clamp-density($config, -2);
+  @return (
+    // The height of the chip.
+    container-height:
+      map.get(
+        (
+          0: 32px,
+          -1: 28px,
+          -2: 24px,
+        ),
+        $scale
+      )
+  );
+}
+
+// Combines the tokens generated by the above functions into a single map with placeholder values.
+// This is used to create token slots.
+@function get-token-slots() {
+  @return sass-utils.deep-merge-all(
+    get-unthemable-tokens(),
+    get-color-tokens(token-utils.$placeholder-color-config),
+    get-typography-tokens(token-utils.$placeholder-typography-config),
+    get-density-tokens(token-utils.$placeholder-density-config)
+  );
+}

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

@@ -1,5 +1,6 @@
 @use 'sass:map';
 @use '../../../theming/theming';
+@use '../../../style/sass-utils';
 @use '../../token-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
@@ -52,14 +53,10 @@ $prefix: (mdc, circular-progress);
 // Combines the tokens generated by the above functions into a single map with placeholder values.
 // This is used to create token slots.
 @function get-token-slots() {
-  @return map.merge(
-    get-unthemable-tokens(),
-    map.merge(
+  @return sass-utils.deep-merge-all(
+      get-unthemable-tokens(),
       get-color-tokens(token-utils.$placeholder-color-config),
-      map.merge(
-        get-typography-tokens(token-utils.$placeholder-typography-config),
-        get-density-tokens(token-utils.$placeholder-density-config)
-      )
-    )
+      get-typography-tokens(token-utils.$placeholder-typography-config),
+      get-density-tokens(token-utils.$placeholder-density-config)
   );
 }

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

@@ -2,6 +2,7 @@
 @use '../../../theming/theming';
 @use '../../../typography/typography-utils';
 @use '../../../mdc-helpers/mdc-helpers';
+@use '../../../style/sass-utils';
 @use '../../token-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
@@ -21,7 +22,6 @@ $prefix: (mdc, dialog);
     container-shadow-color: #000,
     // Border radius of the container.
     container-shape: 4px,
-
     // =============================================================================================
     // = TOKENS NOT USED IN ANGULAR MATERIAL                                                       =
     // =============================================================================================
@@ -87,7 +87,6 @@ $prefix: (mdc, dialog);
     subhead-size: typography-utils.font-size($config, headline-6),
     subhead-weight: typography-utils.font-weight($config, headline-6),
     subhead-tracking: typography-utils.letter-spacing($config, headline-6),
-
     // Typography of the dialog body text.
     supporting-text-font: typography-utils.font-family($config, body-1)
       or typography-utils.font-family($config),
@@ -106,10 +105,10 @@ $prefix: (mdc, dialog);
 // Combines the tokens generated by the above functions into a single map with placeholder values.
 // This is used to create token slots.
 @function get-token-slots() {
-  @return token-utils.merge-all(
-          get-unthemable-tokens(),
-          get-color-tokens(token-utils.$placeholder-color-config),
-          get-typography-tokens(token-utils.$placeholder-typography-config),
-          get-density-tokens(token-utils.$placeholder-density-config)
+  @return sass-utils.deep-merge-all(
+      get-unthemable-tokens(),
+      get-color-tokens(token-utils.$placeholder-color-config),
+      get-typography-tokens(token-utils.$placeholder-typography-config),
+      get-density-tokens(token-utils.$placeholder-density-config)
   );
 }

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

@@ -1,6 +1,7 @@
 @use 'sass:map';
 @use '../../../style/elevation';
 @use '../../../theming/theming';
+@use '../../../style/sass-utils';
 @use '../../token-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
@@ -74,7 +75,7 @@ $prefix: (mdc, elevated-card);
 // Combines the tokens generated by the above functions into a single map with placeholder values.
 // This is used to create token slots.
 @function get-token-slots() {
-  @return token-utils.merge-all(
+  @return sass-utils.deep-merge-all(
       get-unthemable-tokens(),
       get-color-tokens(token-utils.$placeholder-color-config),
       get-typography-tokens(token-utils.$placeholder-typography-config),

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

@@ -1,4 +1,4 @@
-@use 'sass:map';
+@use '../../../style/sass-utils';
 @use '../../token-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
@@ -18,18 +18,14 @@ $prefix: (mdc, icon-button);
     // Determines the size of the icon. Name is inaccurate - applies to the whole component,
     // not just the state layer.
     state-layer-size: 48px,
-
     // MDC's icon size applied to svg and img elements inside the component
     icon-size: 24px,
-
     // Only applies to :disabled icons, but Angular Components uses [disabled] since :disabled
     // wouldn't work on <a> tags.
     disabled-icon-color: black,
-
     // Angular version applies an opacity 1 with a color change, and this only applies with
     // :disabled anyways.
     disabled-icon-opacity: 0.38,
-
     // =============================================================================================
     // = TOKENS NOT USED IN ANGULAR MATERIAL                                                       =
     // =============================================================================================
@@ -66,14 +62,10 @@ $prefix: (mdc, icon-button);
 // Combines the tokens generated by the above functions into a single map with placeholder values.
 // This is used to create token slots.
 @function get-token-slots() {
-  @return map.merge(
+  @return sass-utils.deep-merge-all(
       get-unthemable-tokens(),
-      map.merge(
-          get-color-tokens(token-utils.$placeholder-color-config),
-          map.merge(
-              get-typography-tokens(token-utils.$placeholder-typography-config),
-              get-density-tokens(token-utils.$placeholder-density-config)
-          )
-      )
+      get-color-tokens(token-utils.$placeholder-color-config),
+      get-typography-tokens(token-utils.$placeholder-typography-config),
+      get-density-tokens(token-utils.$placeholder-density-config)
   );
 }