@angular/material 17.0.0 → 17.0.2

package/select/_select-theme.scss

@@ -1,3 +1,4 @@
+@use 'sass:map';
 @use '@material/density' as mdc-density;
 @use '@material/textfield' as mdc-textfield;
 @use '../core/tokens/m2/mat/select' as tokens-mat-select;
@@ -8,67 +9,99 @@
 @use '../core/theming/inspection';
 @use '../core/typography/typography';
 
-@mixin base($theme) {}
+@mixin base($theme) {
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
+  }
+  @else {}
+}
 
 @mixin color($theme) {
-  @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values(tokens-mat-select.$prefix,
-      tokens-mat-select.get-color-tokens($theme));
-
-    .mat-mdc-form-field.mat-accent {
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
+  }
+  @else {
+    @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values(tokens-mat-select.$prefix,
-        tokens-mat-select.get-color-tokens($theme, accent));
-    }
+        tokens-mat-select.get-color-tokens($theme));
 
-    .mat-mdc-form-field.mat-warn {
-      @include token-utils.create-token-values(tokens-mat-select.$prefix,
-        tokens-mat-select.get-color-tokens($theme, warn));
+      .mat-mdc-form-field.mat-accent {
+        @include token-utils.create-token-values(tokens-mat-select.$prefix,
+          tokens-mat-select.get-color-tokens($theme, accent));
+      }
+
+      .mat-mdc-form-field.mat-warn {
+        @include token-utils.create-token-values(tokens-mat-select.$prefix,
+          tokens-mat-select.get-color-tokens($theme, warn));
+      }
     }
   }
 }
 
 @mixin typography($theme) {
-  @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values(tokens-mat-select.$prefix,
-      tokens-mat-select.get-typography-tokens($theme));
+  @if inspection.get-theme-version($theme) == 1 {
+    @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-mat-select.$prefix,
+        tokens-mat-select.get-typography-tokens($theme));
+    }
   }
 }
 
 @mixin density($theme) {
-  $density-scale: inspection.get-theme-density($theme);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
+  }
+  @else {
+    $density-scale: inspection.get-theme-density($theme);
 
-  // Density is clamped at -5 here, because MDC's form field throws an error for anything lower.
-  $form-field-height: mdc-density.prop-value(
-    $density-config: mdc-textfield.$density-config,
-    $density-scale: theming.clamp-density($density-scale, -5),
-    $property-name: height,
-  );
+    // Density is clamped at -5 here, because MDC's form field throws an error for anything lower.
+    $form-field-height: mdc-density.prop-value(
+      $density-config: mdc-textfield.$density-config,
+      $density-scale: theming.clamp-density($density-scale, -5),
+      $property-name: height,
+    );
 
-  // On lower densities the filled form field hides its label which causes the label to
-  // be misaligned. Remove the additional offset that was added because of the label.
-  @if ($form-field-height < mdc-textfield.$minimum-height-for-filled-label) {
-    .mat-form-field-appearance-fill .mat-mdc-select-arrow-wrapper {
-      transform: none;
+    // On lower densities the filled form field hides its label which causes the label to
+    // be misaligned. Remove the additional offset that was added because of the label.
+    @if ($form-field-height < mdc-textfield.$minimum-height-for-filled-label) {
+      .mat-form-field-appearance-fill .mat-mdc-select-arrow-wrapper {
+        transform: none;
+      }
     }
-  }
 
-  @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values(tokens-mat-select.$prefix,
-      tokens-mat-select.get-density-tokens($theme));
+    @include sass-utils.current-selector-or-root() {
+      @include token-utils.create-token-values(tokens-mat-select.$prefix,
+        tokens-mat-select.get-density-tokens($theme));
+    }
   }
 }
 
 @mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-select') {
-    @include base($theme);
-    @if inspection.theme-has($theme, color) {
-      @include color($theme);
+    @if inspection.get-theme-version($theme) == 1 {
+      @include _theme-from-tokens(inspection.get-theme-tokens($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);
+      }
     }
   }
 }
+
+@mixin _theme-from-tokens($tokens) {
+  @if ($tokens != ()) {
+    @include token-utils.create-token-values(
+        tokens-mat-select.$prefix, map.get($tokens, tokens-mat-select.$prefix));
+  }
+}

package/sidenav/_sidenav-theme.scss

@@ -1,3 +1,4 @@
+@use 'sass:map';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/tokens/m2/mat/sidenav' as tokens-mat-sidenav;
@@ -5,34 +6,66 @@
 @use '../core/style/sass-utils';
 
 @mixin base($theme) {
-  @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values(
-        tokens-mat-sidenav.$prefix, tokens-mat-sidenav.get-unthemable-tokens());
+  @if inspection.get-theme-version($theme) == 1 {
+    @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-mat-sidenav.$prefix, tokens-mat-sidenav.get-unthemable-tokens());
+    }
   }
 }
 
 @mixin color($theme) {
-  @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values(tokens-mat-sidenav.$prefix,
-      tokens-mat-sidenav.get-color-tokens($theme));
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
+  }
+  @else {
+    @include sass-utils.current-selector-or-root() {
+      @include token-utils.create-token-values(tokens-mat-sidenav.$prefix,
+        tokens-mat-sidenav.get-color-tokens($theme));
+    }
   }
 }
 
-@mixin typography($theme) {}
+@mixin typography($theme) {
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
+  }
+  @else {}
+}
 
-@mixin density($theme) {}
+@mixin density($theme) {
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
+  }
+  @else {}
+}
 
 @mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-sidenav') {
-    @include base($theme);
-    @if inspection.theme-has($theme, color) {
-      @include color($theme);
+    @if inspection.get-theme-version($theme) == 1 {
+      @include _theme-from-tokens(inspection.get-theme-tokens($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);
+      }
     }
   }
 }
+
+@mixin _theme-from-tokens($tokens) {
+  @if ($tokens != ()) {
+    @include token-utils.create-token-values(
+        tokens-mat-sidenav.$prefix, map.get($tokens, tokens-mat-sidenav.$prefix));
+  }
+}

package/slide-toggle/_slide-toggle-theme.scss

@@ -1,82 +1,116 @@
+@use 'sass:map';
 @use '@material/switch/switch-theme' as mdc-switch-theme;
 @use '@material/form-field' as mdc-form-field;
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/mdc-helpers/mdc-helpers';
 @use '../core/typography/typography';
-@use '../core/tokens/m2/mdc/switch' as m2-mdc-switch;
-@use '../core/tokens/m2/mat/slide-toggle' as m2-mat-slide-toggle;
+@use '../core/tokens/m2/mdc/switch' as tokens-mdc-switch;
+@use '../core/tokens/m2/mat/slide-toggle' as tokens-mat-slide-toggle;
 @use '../core/tokens/token-utils';
 
 @mixin base($theme) {
-  .mdc-switch {
-    @include mdc-switch-theme.theme(m2-mdc-switch.get-unthemable-tokens());
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
+  }
+  @else {
+    .mdc-switch {
+      @include mdc-switch-theme.theme(tokens-mdc-switch.get-unthemable-tokens());
+    }
   }
 }
 
 @mixin color($theme) {
-  $is-dark: inspection.get-theme-type($theme) == dark;
-  $mdc-switch-color-tokens: m2-mdc-switch.get-color-tokens($theme);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
+  }
+  @else {
+    $is-dark: inspection.get-theme-type($theme) == dark;
+    $mdc-switch-color-tokens: tokens-mdc-switch.get-color-tokens($theme);
 
-  @include mdc-helpers.using-mdc-theme($theme) {
-    // Add values for MDC slide toggles tokens
-    .mat-mdc-slide-toggle {
-      @include mdc-form-field.core-styles($query: mdc-helpers.$mdc-theme-styles-query);
-      @include mdc-switch-theme.theme($mdc-switch-color-tokens);
+    @include mdc-helpers.using-mdc-theme($theme) {
+      // Add values for MDC slide toggles tokens
+      .mat-mdc-slide-toggle {
+        @include mdc-form-field.core-styles($query: mdc-helpers.$mdc-theme-styles-query);
+        @include mdc-switch-theme.theme($mdc-switch-color-tokens);
 
-      // MDC should set the disabled color on the label, but doesn't, so we do it here instead.
-      .mdc-switch--disabled + label {
-        color: inspection.get-theme-color($theme, foreground, disabled-text);
-      }
+        // MDC should set the disabled color on the label, but doesn't, so we do it here instead.
+        .mdc-switch--disabled + label {
+          color: inspection.get-theme-color($theme, foreground, disabled-text);
+        }
 
-      // Change the color palette related tokens to accent or warn if applicable
-      &.mat-accent {
-        @include mdc-switch-theme.theme(
-            m2-mdc-switch.private-get-color-palette-color-tokens($theme, accent));
-      }
+        // Change the color palette related tokens to accent or warn if applicable
+        &.mat-accent {
+          @include mdc-switch-theme.theme(
+              tokens-mdc-switch.private-get-color-palette-color-tokens($theme, accent));
+        }
 
-      &.mat-warn {
-        @include mdc-switch-theme.theme(
-            m2-mdc-switch.private-get-color-palette-color-tokens($theme, warn));
+        &.mat-warn {
+          @include mdc-switch-theme.theme(
+              tokens-mdc-switch.private-get-color-palette-color-tokens($theme, warn));
+        }
       }
     }
   }
 }
 
 @mixin typography($theme) {
-  $mdc-switch-typography-tokens: m2-mdc-switch.get-typography-tokens($theme);
-  $mat-slide-toggle-typography-tokens: m2-mat-slide-toggle.get-typography-tokens($theme);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
+  }
+  @else {
+    $mdc-switch-typography-tokens: tokens-mdc-switch.get-typography-tokens($theme);
+    $mat-slide-toggle-typography-tokens: tokens-mat-slide-toggle.get-typography-tokens($theme);
 
-  //Add values for MDC slide toggle tokens
-  .mat-mdc-slide-toggle {
-    @include mdc-form-field.core-styles($query: mdc-helpers.$mdc-typography-styles-query);
-    @include mdc-switch-theme.theme($mdc-switch-typography-tokens);
-    @include token-utils.create-token-values(
-      m2-mat-slide-toggle.$prefix,
-      $mat-slide-toggle-typography-tokens
-    );
+    //Add values for MDC slide toggle tokens
+    .mat-mdc-slide-toggle {
+      @include mdc-form-field.core-styles($query: mdc-helpers.$mdc-typography-styles-query);
+      @include mdc-switch-theme.theme($mdc-switch-typography-tokens);
+      @include token-utils.create-token-values(
+          tokens-mat-slide-toggle.$prefix,
+          $mat-slide-toggle-typography-tokens
+      );
+    }
   }
 }
 
 @mixin density($theme) {
-  $density-scale: inspection.get-theme-density($theme);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
+  }
+  @else {
+    $density-scale: inspection.get-theme-density($theme);
 
-  .mat-mdc-slide-toggle {
-    @include mdc-switch-theme.theme(mdc-switch-theme.density($density-scale));
+    .mat-mdc-slide-toggle {
+      @include mdc-switch-theme.theme(mdc-switch-theme.density($density-scale));
+    }
   }
 }
 
 @mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-slide-toggle') {
-    @include base($theme);
-    @if inspection.theme-has($theme, color) {
-      @include color($theme);
-    }
-    @if inspection.theme-has($theme, density) {
-      @include density($theme);
+    @if inspection.get-theme-version($theme) == 1 {
+      @include _theme-from-tokens(inspection.get-theme-tokens($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);
+      }
     }
   }
 }
+
+@mixin _theme-from-tokens($tokens) {
+  @if ($tokens != ()) {
+    @include mdc-switch-theme.theme(map.get($tokens, tokens-mdc-switch.$prefix));
+    @include token-utils.create-token-values(
+        tokens-mat-slide-toggle.$prefix, map.get($tokens, tokens-mat-slide-toggle.$prefix));
+  }
+}

package/sort/_sort-theme.scss

@@ -1,3 +1,4 @@
+@use 'sass:map';
 @use '../core/tokens/m2/mat/sort' as tokens-mat-sort;
 @use '../core/style/sass-utils';
 @use '../core/typography/typography';
@@ -5,42 +6,72 @@
 @use '../core/theming/inspection';
 @use '../core/tokens/token-utils';
 
-@mixin base($theme) {}
+@mixin base($theme) {
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
+  }
+  @else {}
+}
 
 @mixin color($theme) {
-  @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values(tokens-mat-sort.$prefix,
-      tokens-mat-sort.get-color-tokens($theme));
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
+  }
+  @else {
+    @include sass-utils.current-selector-or-root() {
+      @include token-utils.create-token-values(tokens-mat-sort.$prefix,
+        tokens-mat-sort.get-color-tokens($theme));
+    }
   }
 }
 
 @mixin typography($theme) {
-  @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values(tokens-mat-sort.$prefix,
-      tokens-mat-sort.get-typography-tokens($theme));
+  @if inspection.get-theme-version($theme) == 1 {
+    @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-mat-sort.$prefix,
+        tokens-mat-sort.get-typography-tokens($theme));
+    }
   }
 }
 
 @mixin density($theme) {
-  $density-scale: inspection.get-theme-density($theme);
-
-  @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values(tokens-mat-sort.$prefix,
-      tokens-mat-sort.get-density-tokens($theme));
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
+  }
+  @else {
+    @include sass-utils.current-selector-or-root() {
+      @include token-utils.create-token-values(tokens-mat-sort.$prefix,
+        tokens-mat-sort.get-density-tokens($theme));
+    }
   }
 }
 
 @mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-sort') {
-    @include base($theme);
-    @if inspection.theme-has($theme, color) {
-      @include color($theme);
-    }
-    @if inspection.theme-has($theme, density) {
-      @include density($theme);
+    @if inspection.get-theme-version($theme) == 1 {
+      @include _theme-from-tokens(inspection.get-theme-tokens($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);
+      }
     }
   }
 }
+
+@mixin _theme-from-tokens($tokens) {
+  @if ($tokens != ()) {
+    @include token-utils.create-token-values(
+        tokens-mat-sort.$prefix, map.get($tokens, tokens-mat-sort.$prefix));
+  }
+}

package/stepper/_stepper-theme.scss

@@ -1,3 +1,4 @@
+@use 'sass:map';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/typography/typography';
@@ -5,50 +6,82 @@
 @use '../core/tokens/token-utils';
 @use '../core/tokens/m2/mat/stepper' as tokens-mat-stepper;
 
-@mixin base($theme) {}
+@mixin base($theme) {
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
+  }
+  @else {}
+}
 
 @mixin color($theme) {
-  @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values(tokens-mat-stepper.$prefix,
-      tokens-mat-stepper.get-color-tokens($theme));
-
-    .mat-step-header.mat-accent {
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
+  }
+  @else {
+    @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values(tokens-mat-stepper.$prefix,
-        tokens-mat-stepper.private-get-color-palette-color-tokens($theme, accent));
-    }
+        tokens-mat-stepper.get-color-tokens($theme));
 
-    .mat-step-header.mat-warn {
-      @include token-utils.create-token-values(tokens-mat-stepper.$prefix,
-        tokens-mat-stepper.private-get-color-palette-color-tokens($theme, warn));
+      .mat-step-header.mat-accent {
+        @include token-utils.create-token-values(tokens-mat-stepper.$prefix,
+          tokens-mat-stepper.private-get-color-palette-color-tokens($theme, accent));
+      }
+
+      .mat-step-header.mat-warn {
+        @include token-utils.create-token-values(tokens-mat-stepper.$prefix,
+          tokens-mat-stepper.private-get-color-palette-color-tokens($theme, warn));
+      }
     }
   }
 }
 
 @mixin typography($theme) {
-  @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values(tokens-mat-stepper.$prefix,
-      tokens-mat-stepper.get-typography-tokens($theme));
+  @if inspection.get-theme-version($theme) == 1 {
+    @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-mat-stepper.$prefix,
+        tokens-mat-stepper.get-typography-tokens($theme));
+    }
   }
 }
 
 @mixin density($theme) {
-  @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values(tokens-mat-stepper.$prefix,
-      tokens-mat-stepper.get-density-tokens($theme));
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
+  }
+  @else {
+    @include sass-utils.current-selector-or-root() {
+      @include token-utils.create-token-values(tokens-mat-stepper.$prefix,
+        tokens-mat-stepper.get-density-tokens($theme));
+    }
   }
 }
 
 @mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-stepper') {
-    @include base($theme);
-    @if inspection.theme-has($theme, color) {
-      @include color($theme);
+    @if inspection.get-theme-version($theme) == 1 {
+      @include _theme-from-tokens(inspection.get-theme-tokens($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);
+      }
     }
   }
 }
+
+@mixin _theme-from-tokens($tokens) {
+  @if ($tokens != ()) {
+    @include token-utils.create-token-values(
+        tokens-mat-stepper.$prefix, map.get($tokens, tokens-mat-stepper.$prefix));
+  }
+}