@angular/material 20.0.0-next.0 → 20.0.0-next.10

package/{core/tokens/m2/mdc/_slider.scss → slider/_m2-slider.scss}

@@ -1,128 +1,89 @@
 @use 'sass:map';
-@use '../../../theming/inspection';
-@use '../../token-definition';
-@use '../../../style/elevation';
-@use '../../../style/sass-utils';
+@use '../core/tokens/m2-utils';
+@use '../core/style/sass-utils';
+@use '../core/theming/inspection';
+@use '../core/style/elevation';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mdc, slider);
+$prefix: (mat, slider);
 
 // 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 (
-    // Height of active track.
     active-track-height: 6px,
-    // Border radius of active track.
     active-track-shape: 9999px,
-    // Height of handle.
+    handle-elevation: elevation.get-box-shadow(1),
     handle-height: 20px,
-    // Border radius of handle.
     handle-shape: 50%,
-    // Width of handle.
     handle-width: 20px,
-    // Height of inactive track.
     inactive-track-height: 4px,
-    // Border radius of inactive track.
     inactive-track-shape: 9999px,
-    // Width of handle when overlapping with another handle below it.
+    value-indicator-border-radius: 4px,
+    value-indicator-caret-display: block,
+    value-indicator-container-transform: translateX(-50%),
+    value-indicator-height: 32px,
+    value-indicator-padding: 0 12px,
+    value-indicator-text-transform: none,
+    value-indicator-width: auto,
     with-overlap-handle-outline-width: 1px,
-    // Opacity of active container with tick marks.
     with-tick-marks-active-container-opacity: 0.6,
-    // Border radius of container with tick marks.
     with-tick-marks-container-shape: 50%,
-    // Size of container with tick marks.
     with-tick-marks-container-size: 2px,
-    // Opacity of inactive container with tick marks.
     with-tick-marks-inactive-container-opacity: 0.6,
-    // Elevation for the handle.
-    handle-elevation: elevation.get-box-shadow(1),
-    // =============================================================================================
-    // = TOKENS NOT USED IN ANGULAR MATERIAL                                                       =
-    // =============================================================================================
-    disabled-handle-elevation: null,
-    label-container-elevation: null,
-    label-container-height: null,
-    track-elevation: null,
-    focus-state-layer-opacity: null,
-    hover-state-layer-opacity: null,
-    pressed-state-layer-opacity: null,
-    handle-shadow-color: null,
-    // MDC does not seem to use these tokens.
-    hover-state-layer-color: null,
-    pressed-handle-color: null,
   );
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
 @function get-color-tokens($theme) {
-  $elevation: inspection.get-theme-color($theme, foreground, elevation);
+  $theme-color-tokens: private-get-color-palette-color-tokens($theme, primary);
   $is-dark: inspection.get-theme-type($theme) == dark;
+  $elevation: inspection.get-theme-color($theme, foreground, elevation);
   $on-surface: if($is-dark, #fff, #000);
 
-  // The default for tokens that rely on the theme will use the primary palette
-  $theme-color-tokens: private-get-color-palette-color-tokens($theme, primary);
-
   @return map.merge(
     $theme-color-tokens,
     (
-      // Color of active track when disabled.
       disabled-active-track-color: $on-surface,
-      // Color of handle when disabled.
       disabled-handle-color: $on-surface,
-      // Color of inactive track when disabled.
       disabled-inactive-track-color: $on-surface,
-      // Color of container label.
       label-container-color: $on-surface,
-      // Color of label text.
       label-label-text-color: if($is-dark, #000, #fff),
-      // Color of handle outline when overlapping with another handle below it.
+      value-indicator-opacity: if($is-dark, 0.9, 0.6),
       with-overlap-handle-outline-color: #fff,
-      // Color of container with tick marks when disabled.
       with-tick-marks-disabled-container-color: $on-surface,
-    )
+    ),
   );
 }
 
 // Generates tokens for the slider properties that change based on the theme.
 @function private-get-color-palette-color-tokens($theme, $palette-name) {
   $color: inspection.get-theme-color($theme, $palette-name);
+  $hover-ripple-color: if($color == null, null, #{rgba($color, 0.05)});
+  $focus-ripple-color: if($color == null, null, #{rgba($color, 0.2)});
   $on-color: inspection.get-theme-color($theme, $palette-name, default-contrast);
 
   @return (
-    // Color of handle.
-    handle-color: $color,
-    // Color of handle when focused.
+    active-track-color: $color,
     focus-handle-color: $color,
-    // Color of handle on hover.
+    focus-state-layer-color: $focus-ripple-color,
+    handle-color: $color,
     hover-handle-color: $color,
-    // Color of handle when active.
-    active-track-color: $color,
-    // Color of inactive track.
+    hover-state-layer-color: $hover-ripple-color,
     inactive-track-color: $color,
-    // Color of inactive container with tick marks.
-    with-tick-marks-inactive-container-color: $color,
-    // Color of active container with tick marks.
+    ripple-color: $color,
     with-tick-marks-active-container-color: $on-color,
+    with-tick-marks-inactive-container-color: $color,
   );
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
   @return (
-    // Font for label text.
     label-label-text-font: inspection.get-theme-typography($theme, subtitle-2, font-family),
-    // Font size of label text.
     label-label-text-size: inspection.get-theme-typography($theme, subtitle-2, font-size),
-    // Line height of label text.
     label-label-text-line-height: inspection.get-theme-typography($theme, subtitle-2, line-height),
-    // Letter spacing of label text.
     label-label-text-tracking: inspection.get-theme-typography($theme, subtitle-2, letter-spacing),
-    // Font weight of label text.
     label-label-text-weight: inspection.get-theme-typography($theme, subtitle-2, font-weight),
   );
 }
@@ -136,9 +97,9 @@ $prefix: (mdc, slider);
 // This is used to create token slots.
 @function get-token-slots() {
   @return sass-utils.deep-merge-all(
-          get-unthemable-tokens(),
-          get-color-tokens(token-definition.$placeholder-color-config),
-          get-typography-tokens(token-definition.$placeholder-typography-config),
-          get-density-tokens(token-definition.$placeholder-density-config)
+    get-unthemable-tokens(),
+    get-color-tokens(m2-utils.$placeholder-color-config),
+    get-typography-tokens(m2-utils.$placeholder-typography-config),
+    get-density-tokens(m2-utils.$placeholder-density-config)
   );
 }

package/slider/_m3-slider.scss

@@ -0,0 +1,121 @@
+@use 'sass:map';
+@use '../core/style/sass-utils';
+@use '../core/tokens/m3-utils';
+@use '../core/style/elevation';
+
+// The prefix used to generate the fully qualified name for tokens in this file.
+$prefix: (mat, slider);
+
+/// Generates custom tokens for the mat-slider.
+/// @param {Map} $systems The MDC system tokens
+/// @param {Boolean} $exclude-hardcoded Whether to exclude hardcoded token values
+/// @param {Map} $token-slots Possible token slots
+/// @return {Map} A set of custom tokens for the mat-slider
+@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
+  $tokens: (
+    ripple-color: map.get($systems, md-sys-color, primary),
+    hover-state-layer-color: sass-utils.safe-color-change(
+        map.get($systems, md-sys-color, primary), $alpha: 0.05),
+    focus-state-layer-color: sass-utils.safe-color-change(
+        map.get($systems, md-sys-color, primary), $alpha: 0.2),
+    value-indicator-opacity: m3-utils.hardcode(1, $exclude-hardcoded),
+    value-indicator-padding: m3-utils.hardcode(0, $exclude-hardcoded),
+    value-indicator-width: m3-utils.hardcode(28px, $exclude-hardcoded),
+    value-indicator-height: m3-utils.hardcode(28px, $exclude-hardcoded),
+    value-indicator-caret-display: m3-utils.hardcode(none, $exclude-hardcoded),
+    value-indicator-border-radius:
+    m3-utils.hardcode(50% 50% 50% 0, $exclude-hardcoded),
+    value-indicator-text-transform:
+    m3-utils.hardcode(rotate(45deg), $exclude-hardcoded),
+    value-indicator-container-transform:
+    m3-utils.hardcode(translateX(-50%) rotate(-45deg), $exclude-hardcoded),
+    active-track-color: map.get($systems, md-sys-color, primary),
+    active-track-height: if($exclude-hardcoded, null, 4px),
+    active-track-shape: map.get($systems, md-sys-shape, corner-full),
+    disabled-active-track-color: map.get($systems, md-sys-color, on-surface),
+    disabled-handle-color: map.get($systems, md-sys-color, on-surface),
+    disabled-inactive-track-color: map.get($systems, md-sys-color, on-surface),
+    focus-handle-color: map.get($systems, md-sys-color, primary),
+    handle-color: map.get($systems, md-sys-color, primary),
+    handle-elevation: map.get($systems, md-sys-elevation, level1),
+    handle-height: if($exclude-hardcoded, null, 20px),
+    handle-shape: map.get($systems, md-sys-shape, corner-full),
+    handle-width: if($exclude-hardcoded, null, 20px),
+    hover-handle-color: map.get($systems, md-sys-color, primary),
+    inactive-track-color: map.get($systems, md-sys-color, surface-variant),
+    inactive-track-height: if($exclude-hardcoded, null, 4px),
+    inactive-track-shape: map.get($systems, md-sys-shape, corner-full),
+    label-container-color: map.get($systems, md-sys-color, primary),
+    label-label-text-color: map.get($systems, md-sys-color, on-primary),
+    label-label-text-font: map.get($systems, md-sys-typescale, label-medium-font),
+    label-label-text-line-height: map.get($systems, md-sys-typescale, label-medium-line-height),
+    label-label-text-size: map.get($systems, md-sys-typescale, label-medium-size),
+    label-label-text-tracking: map.get($systems, md-sys-typescale, label-medium-tracking),
+    label-label-text-weight: map.get($systems, md-sys-typescale, label-medium-weight),
+    with-overlap-handle-outline-color: map.get($systems, md-sys-color, on-primary),
+    with-overlap-handle-outline-width: if($exclude-hardcoded, null, 1px),
+    with-tick-marks-active-container-color: map.get($systems, md-sys-color, on-primary),
+    with-tick-marks-active-container-opacity: if($exclude-hardcoded, null, 0.38),
+    with-tick-marks-container-shape: map.get($systems, md-sys-shape, corner-full),
+    with-tick-marks-container-size: if($exclude-hardcoded, null, 2px),
+    with-tick-marks-disabled-container-color: map.get($systems, md-sys-color, on-surface),
+    with-tick-marks-inactive-container-color: map.get($systems, md-sys-color, on-surface-variant),
+    with-tick-marks-inactive-container-opacity: if($exclude-hardcoded, null, 0.38)
+  );
+  $handle-elevation: map.get($tokens, handle-elevation);
+
+  @if ($handle-elevation != null) {
+    $tokens: map.set($tokens, handle-elevation, elevation.get-box-shadow($handle-elevation));
+  }
+
+  $variant-tokens: (
+    primary: (), // Default, no overrides needed
+    secondary: (
+      ripple-color: map.get($systems, md-sys-color, secondary),
+      hover-state-layer-color: sass-utils.safe-color-change(
+          map.get($systems, md-sys-color, secondary), $alpha: 0.05),
+      focus-state-layer-color: sass-utils.safe-color-change(
+          map.get($systems, md-sys-color, secondary), $alpha: 0.2),
+      active-track-color: map.get($systems, md-sys-color, secondary),
+      focus-handle-color: map.get($systems, md-sys-color, secondary),
+      handle-color: map.get($systems, md-sys-color, secondary),
+      hover-handle-color: map.get($systems, md-sys-color, secondary),
+      label-container-color: map.get($systems, md-sys-color, secondary),
+      label-label-text-color: map.get($systems, md-sys-color, on-secondary),
+      with-overlap-handle-outline-color: map.get($systems, md-sys-color, on-secondary),
+      with-tick-marks-active-container-color: map.get($systems, md-sys-color, on-secondary),
+    ),
+    tertiary: (
+      ripple-color: map.get($systems, md-sys-color, tertiary),
+      hover-state-layer-color: sass-utils.safe-color-change(
+          map.get($systems, md-sys-color, tertiary), $alpha: 0.05),
+      focus-state-layer-color: sass-utils.safe-color-change(
+          map.get($systems, md-sys-color, tertiary), $alpha: 0.2),
+      active-track-color: map.get($systems, md-sys-color, tertiary),
+      focus-handle-color: map.get($systems, md-sys-color, tertiary),
+      handle-color: map.get($systems, md-sys-color, tertiary),
+      hover-handle-color: map.get($systems, md-sys-color, tertiary),
+      label-container-color: map.get($systems, md-sys-color, tertiary),
+      label-label-text-color: map.get($systems, md-sys-color, on-tertiary),
+      with-overlap-handle-outline-color: map.get($systems, md-sys-color, on-tertiary),
+      with-tick-marks-active-container-color: map.get($systems, md-sys-color, on-tertiary),
+    ),
+    error: (
+      ripple-color: map.get($systems, md-sys-color, error),
+      hover-state-layer-color: sass-utils.safe-color-change(
+          map.get($systems, md-sys-color, error), $alpha: 0.05),
+      focus-state-layer-color: sass-utils.safe-color-change(
+          map.get($systems, md-sys-color, error), $alpha: 0.2),
+      active-track-color: map.get($systems, md-sys-color, error),
+      focus-handle-color: map.get($systems, md-sys-color, error),
+      handle-color: map.get($systems, md-sys-color, error),
+      hover-handle-color: map.get($systems, md-sys-color, error),
+      label-container-color: map.get($systems, md-sys-color, error),
+      label-label-text-color: map.get($systems, md-sys-color, on-error),
+      with-overlap-handle-outline-color: map.get($systems, md-sys-color, on-error),
+      with-tick-marks-active-container-color: map.get($systems, md-sys-color, on-error),
+    ),
+  );
+
+  @return m3-utils.namespace($prefix, ($tokens, $variant-tokens), $token-slots);
+}

package/slider/_slider-theme.scss

@@ -4,8 +4,7 @@
 @use '../core/typography/typography';
 @use '../core/style/sass-utils';
 @use '../core/tokens/token-utils';
-@use '../core/tokens/m2/mat/slider' as tokens-mat-slider;
-@use '../core/tokens/m2/mdc/slider' as tokens-mdc-slider;
+@use './m2-slider';
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
 /// for the mat-slider.
@@ -15,14 +14,8 @@
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mdc-slider.$prefix,
-        tokens-mdc-slider.get-unthemable-tokens()
-      );
-      @include token-utils.create-token-values(
-        tokens-mat-slider.$prefix,
-        tokens-mat-slider.get-unthemable-tokens()
-      );
+      @include token-utils.create-token-values-mixed(
+        m2-slider.$prefix, m2-slider.get-unthemable-tokens());
     }
   }
 }
@@ -37,35 +30,17 @@
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, color), $options...);
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mdc-slider.$prefix,
-        tokens-mdc-slider.get-color-tokens($theme)
-      );
-      @include token-utils.create-token-values(
-        tokens-mat-slider.$prefix,
-        tokens-mat-slider.get-color-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(
+        m2-slider.$prefix, m2-slider.get-color-tokens($theme));
 
       .mat-accent {
-        @include token-utils.create-token-values(
-          tokens-mdc-slider.$prefix,
-          tokens-mdc-slider.private-get-color-palette-color-tokens($theme, accent)
-        );
-        @include token-utils.create-token-values(
-          tokens-mat-slider.$prefix,
-          tokens-mat-slider.private-get-color-palette-color-tokens($theme, accent)
-        );
+        @include token-utils.create-token-values-mixed(
+          m2-slider.$prefix, m2-slider.private-get-color-palette-color-tokens($theme, accent));
       }
 
       .mat-warn {
-        @include token-utils.create-token-values(
-          tokens-mdc-slider.$prefix,
-          tokens-mdc-slider.private-get-color-palette-color-tokens($theme, warn)
-        );
-        @include token-utils.create-token-values(
-          tokens-mat-slider.$prefix,
-          tokens-mat-slider.private-get-color-palette-color-tokens($theme, warn)
-        );
+        @include token-utils.create-token-values-mixed(
+          m2-slider.$prefix, m2-slider.private-get-color-palette-color-tokens($theme, warn));
       }
     }
   }
@@ -78,10 +53,8 @@
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mdc-slider.$prefix,
-        tokens-mdc-slider.get-typography-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(
+        m2-slider.$prefix, m2-slider.get-typography-tokens($theme));
     }
   }
 }
@@ -90,13 +63,11 @@
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
+    // There are no M3 density tokens for this component
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mdc-slider.$prefix,
-        tokens-mdc-slider.get-density-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(
+        m2-slider.$prefix, m2-slider.get-density-tokens($theme));
     }
   }
 }
@@ -105,12 +76,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-slider.$prefix,
-      tokens: tokens-mat-slider.get-token-slots(),
-    ),
-    (
-      namespace: tokens-mdc-slider.$prefix,
-      tokens: tokens-mdc-slider.get-token-slots(),
+      namespace: m2-slider.$prefix,
+      tokens: m2-slider.get-token-slots(),
     ),
   );
 }
@@ -149,8 +116,6 @@
   @include validation.selector-defined(
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
-  $mdc-slider-tokens: token-utils.get-tokens-for($tokens, tokens-mdc-slider.$prefix, $options...);
-  $mat-slider-tokens: token-utils.get-tokens-for($tokens, tokens-mat-slider.$prefix, $options...);
-  @include token-utils.create-token-values(tokens-mdc-slider.$prefix, $mdc-slider-tokens);
-  @include token-utils.create-token-values(tokens-mat-slider.$prefix, $mat-slider-tokens);
+  $mat-slider-tokens: token-utils.get-tokens-for($tokens, m2-slider.$prefix, $options...);
+  @include token-utils.create-token-values(m2-slider.$prefix, $mat-slider-tokens);
 }