@ng-matero/extensions 19.4.0 → 20.0.0

package/progress/progress.scss

@@ -1,23 +1,22 @@
 @use '../core/tokens/token-utils';
-@use '../core/tokens/m2/mtx/progress' as tokens-mtx-progress;
+@use './m3-progress';
+
+$fallbacks: m3-progress.get-tokens();
 
 $progress-height: 16px !default;
 $progress-fill-animation-timing: 1s linear infinite !default;
 
-$_tokens: tokens-mtx-progress.$prefix, tokens-mtx-progress.get-token-slots();
-
-@mixin gradient-striped($color: rgba(white, .15), $angle: 45deg) {
-  background-image:
-    linear-gradient(
-      $angle,
-      $color 25%,
-      transparent 25%,
-      transparent 50%,
-      $color 50%,
-      $color 75%,
-      transparent 75%,
-      transparent
-    );
+@mixin gradient-striped($color: rgba(white, 0.15), $angle: 45deg) {
+  background-image: linear-gradient(
+    $angle,
+    $color 25%,
+    transparent 25%,
+    transparent 50%,
+    $color 50%,
+    $color 75%,
+    transparent 75%,
+    transparent
+  );
 }
 
 .mtx-progress {
@@ -25,12 +24,9 @@ $_tokens: tokens-mtx-progress.$prefix, tokens-mtx-progress.get-token-slots();
   height: $progress-height;
   margin: 8px 0;
   overflow: hidden;
-
-  @include token-utils.use-tokens($_tokens...) {
-    @include token-utils.create-token-slot(font-size, text-size);
-    @include token-utils.create-token-slot(border-radius, container-shape);
-    @include token-utils.create-token-slot(background-color, track-color);
-  }
+  font-size: token-utils.slot(progress-text-size, $fallbacks);
+  border-radius: token-utils.slot(progress-container-shape, $fallbacks);
+  background-color: token-utils.slot(progress-track-color, $fallbacks);
 }
 
 .mtx-progress-fill {
@@ -38,40 +34,29 @@ $_tokens: tokens-mtx-progress.$prefix, tokens-mtx-progress.get-token-slots();
   flex-direction: column;
   justify-content: center;
   text-align: center;
-  transition: width .6s ease;
-
-  @include token-utils.use-tokens($_tokens...) {
-    @include token-utils.create-token-slot(background-color, indicator-color);
-    @include token-utils.create-token-slot(color, text-color);
-  }
+  transition: width 0.6s ease;
+  background-color: token-utils.slot(progress-indicator-color, $fallbacks);
+  color: token-utils.slot(progress-text-color, $fallbacks);
 }
 
 .mtx-progress-fill-info {
-  @include token-utils.use-tokens($_tokens...) {
-    @include token-utils.create-token-slot(background-color, info-indicator-color);
-    @include token-utils.create-token-slot(color, info-text-color);
-  }
+  background-color: token-utils.slot(progress-info-indicator-color, $fallbacks);
+  color: token-utils.slot(progress-info-text-color, $fallbacks);
 }
 
 .mtx-progress-fill-success {
-  @include token-utils.use-tokens($_tokens...) {
-    @include token-utils.create-token-slot(background-color, success-indicator-color);
-    @include token-utils.create-token-slot(color, success-text-color);
-  }
+  background-color: token-utils.slot(progress-success-indicator-color, $fallbacks);
+  color: token-utils.slot(progress-success-text-color, $fallbacks);
 }
 
 .mtx-progress-fill-warning {
-  @include token-utils.use-tokens($_tokens...) {
-    @include token-utils.create-token-slot(background-color, warning-indicator-color);
-    @include token-utils.create-token-slot(color, warning-text-color);
-  }
+  background-color: token-utils.slot(progress-warning-indicator-color, $fallbacks);
+  color: token-utils.slot(progress-warning-text-color, $fallbacks);
 }
 
 .mtx-progress-fill-danger {
-  @include token-utils.use-tokens($_tokens...) {
-    @include token-utils.create-token-slot(background-color, danger-indicator-color);
-    @include token-utils.create-token-slot(color, danger-text-color);
-  }
+  background-color: token-utils.slot(progress-danger-indicator-color, $fallbacks);
+  color: token-utils.slot(progress-danger-text-color, $fallbacks);
 }
 
 .mtx-progress-fill-striped {

package/select/_m2-select.scss

@@ -0,0 +1,79 @@
+@use 'sass:map';
+@use 'sass:math';
+@use '@angular/material' as mat;
+@use '../core/tokens/m2-utils';
+@use '../core/style/elevation';
+
+// Generates the tokens used to theme the option based on a palette.
+@function private-get-color-palette-color-tokens($theme, $palette-name) {
+  @return (
+    select-option-selected-state-text-color: mat.get-theme-color($theme, $palette-name),
+  );
+}
+
+// Tokens that can't be configured through Angular Material's current theming API,
+// but may be in a future version of the theming API.
+@function get-unthemable-tokens() {
+  @return (
+    select-container-shape: 4px,
+    select-container-elevation-shadow: elevation.get-box-shadow(8),
+  );
+}
+
+// Tokens that can be configured through Angular Material's color theming API.
+@function get-color-tokens($theme) {
+  $text-color: mat.get-theme-color($theme, foreground, text);
+  $hint-text-color: mat.get-theme-color($theme, foreground, hint-text);
+  $secondary-text-color: mat.get-theme-color($theme, foreground, secondary-text);
+  $disabled-text-color: mat.get-theme-color($theme, foreground, disabled-text);
+  $divider-color: mat.get-theme-color($theme, foreground, divider);
+  $hover-color: mat.get-theme-color($theme, background, hover);
+  $palette-tokens: private-get-color-palette-color-tokens($theme, primary);
+
+  @return map.merge($palette-tokens, (
+    select-container-text-color: $text-color,
+    select-placeholder-text-color: $hint-text-color,
+    select-disabled-text-color: $hint-text-color,
+
+    select-multiple-value-background-color: mat.get-theme-color($theme, background, unselected-chip),
+    select-multiple-value-outline-color: $divider-color,
+    select-multiple-value-disabled-outline-color: mat.get-theme-color($theme, foreground, divider, 0.06),
+    select-multiple-value-icon-hover-background-color: $divider-color,
+
+    select-clear-icon-color: $secondary-text-color,
+    select-clear-icon-hover-color: mat.get-theme-color($theme, warn),
+
+    select-enabled-arrow-color: $secondary-text-color,
+    select-disabled-arrow-color: $disabled-text-color,
+    select-invalid-arrow-color: mat.get-theme-color($theme, warn),
+
+    select-panel-background-color: mat.get-theme-color($theme, background, card),
+    select-panel-divider-color: $divider-color,
+    select-optgroup-label-text-color: $secondary-text-color,
+    select-option-label-text-color: $text-color,
+    select-option-selected-state-background-color: $hover-color,
+    select-option-hover-state-background-color: $hover-color,
+    select-option-disabled-state-text-color: $hint-text-color,
+  ));
+}
+
+// Tokens that can be configured through Angular Material's typography theming API.
+@function get-typography-tokens($theme) {
+  @return ();
+}
+
+// Tokens that can be configured through Angular Material's density theming API.
+@function get-density-tokens($theme) {
+  @return ();
+}
+
+// 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 mat.private-deep-merge-all(
+    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/select/_m3-select.scss

@@ -0,0 +1,46 @@
+@use 'sass:map';
+@use '@angular/material' as mat;
+@use '../core/tokens/m3-utils';
+@use '../core/tokens/m3';
+@use '../core/style/elevation';
+
+/// Generates custom tokens for the mtx-select.
+@function get-tokens($theme: m3.$sys-theme, $color-variant: null) {
+  $system: m3-utils.get-system($theme);
+  @if $color-variant {
+    $system: m3-utils.replace-colors-with-variant($system, secondary, $color-variant);
+  }
+
+  $tokens: (
+    base: (
+      select-container-shape: map.get($system, corner-extra-small),
+      select-container-elevation-shadow: elevation.get-box-shadow(2),
+    ),
+    color: (
+      select-container-text-color: map.get($system, on-surface),
+      select-placeholder-text-color: m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      select-disabled-text-color: m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      select-multiple-value-background-color: transparent,
+      select-multiple-value-outline-color: map.get($system, outline),
+      select-multiple-value-disabled-outline-color: m3-utils.color-with-opacity(map.get($system, outline), 38%),
+      select-multiple-value-icon-hover-background-color: map.get($system, outline-variant),
+      select-clear-icon-color: map.get($system, on-surface),
+      select-clear-icon-hover-color: map.get($system, error),
+      select-enabled-arrow-color: map.get($system, on-surface),
+      select-disabled-arrow-color: m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      select-invalid-arrow-color: map.get($system, error),
+      select-panel-background-color: map.get($system, surface-container),
+      select-panel-divider-color: map.get($system, outline),
+      select-optgroup-label-text-color: map.get($system, on-surface),
+      select-option-label-text-color: map.get($system, on-surface),
+      select-option-selected-state-background-color: map.get($system, secondary-container),
+      select-option-selected-state-text-color: map.get($system, on-surface),
+      select-option-hover-state-background-color: m3-utils.color-with-opacity(map.get($system, on-surface), map.get($system,hover-state-layer-opacity)),
+      select-option-disabled-state-text-color: m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+    ),
+    typography: (),
+    density: (),
+  );
+
+  @return $tokens;
+}

package/select/_select-theme.scss

@@ -1,45 +1,38 @@
 @use 'sass:map';
 @use '@angular/material' as mat;
-@use '../core/theming/inspection';
-@use '../core/theming/validation';
 @use '../core/tokens/token-utils';
-@use '../core/tokens/m2/mtx/select' as tokens-mtx-select;
+@use './m2-select';
+@use './m3-select';
 
 @mixin base($theme) {
   @if mat.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
+    @include token-utils.create-token-values(map.get(m3-select.get-tokens($theme), base));
   }
   @else {
     @include mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mtx-select.$prefix,
-        tokens-mtx-select.get-unthemable-tokens()
-      );
+      @include token-utils.create-token-values-mixed(m2-select.get-unthemable-tokens());
     }
   }
 }
 
-@mixin color($theme, $options...) {
+@mixin color($theme, $color-variant: null) {
   @if mat.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color), $options...);
+    @include token-utils.create-token-values(map.get(m3-select.get-tokens($theme, $color-variant), color));
   }
   @else {
     @include mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mtx-select.$prefix,
-        tokens-mtx-select.get-color-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-select.get-color-tokens($theme));
     }
 
     .ng-dropdown-panel {
       &.mat-accent {
-        $accent-tokens: tokens-mtx-select.private-get-color-palette-color-tokens($theme, accent);
-        @include token-utils.create-token-values(tokens-mtx-select.$prefix, $accent-tokens);
+        $accent-tokens: m2-select.private-get-color-palette-color-tokens($theme, accent);
+        @include token-utils.create-token-values-mixed($accent-tokens);
       }
 
       &.mat-warn {
-        $warn-tokens: tokens-mtx-select.private-get-color-palette-color-tokens($theme, warn);
-        @include token-utils.create-token-values(tokens-mtx-select.$prefix, $warn-tokens);
+        $warn-tokens: m2-select.private-get-color-palette-color-tokens($theme, warn);
+        @include token-utils.create-token-values-mixed($warn-tokens);
       }
     }
   }
@@ -47,21 +40,22 @@
 
 @mixin typography($theme) {
   @if mat.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
+    @include token-utils.create-token-values(map.get(m3-select.get-tokens($theme), typography));
+  }
+  @else {
+    @include mat.private-current-selector-or-root() {
+      @include token-utils.create-token-values-mixed(m2-select.get-typography-tokens($theme));
+    }
   }
-  @else {}
 }
 
 @mixin density($theme) {
   @if mat.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
+    @include token-utils.create-token-values(map.get(m3-select.get-tokens($theme), density));
   }
   @else {
     @include mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mtx-select.$prefix,
-        tokens-mtx-select.get-density-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-select.get-density-tokens($theme));
     }
   }
 }
@@ -70,20 +64,23 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mtx-select.$prefix,
-      tokens: tokens-mtx-select.get-token-slots(),
+      namespace: select,
+      tokens: token-utils.get-overrides(m3-select.get-tokens(), select),
     ),
   );
 }
 
 @mixin overrides($tokens: ()) {
-  @include token-utils.batch-create-token-values($tokens, _define-overrides()...);
+  @include token-utils.batch-create-token-values($tokens, _define-overrides());
 }
 
-@mixin theme($theme, $options...) {
+@mixin theme($theme, $color-variant: null) {
   @include mat.private-check-duplicate-theme-styles($theme, 'mtx-select') {
     @if mat.get-theme-version($theme) == 1 {
-      @include _theme-from-tokens(inspection.get-theme-tokens($theme), $options...);
+      @include base($theme);
+      @include color($theme, $color-variant);
+      @include density($theme);
+      @include typography($theme);
     }
     @else {
       @include base($theme);
@@ -99,10 +96,3 @@
     }
   }
 }
-
-@mixin _theme-from-tokens($tokens, $options...) {
-  @include validation.selector-defined(
-    'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector');
-  $mtx-select-tokens: token-utils.get-tokens-for($tokens, tokens-mtx-select.$prefix, $options...);
-  @include token-utils.create-token-values(tokens-mtx-select.$prefix, $mtx-select-tokens);
-}