@angular/material 17.0.0 → 17.0.2

package/form-field/_form-field-theme.scss

@@ -1,6 +1,6 @@
+@use 'sass:map';
 @use '@material/textfield/filled-text-field-theme' as mdc-filled-text-field-theme;
 @use '@material/textfield/outlined-text-field-theme' as mdc-outlined-text-field-theme;
-
 @use '../core/tokens/m2/mdc/filled-text-field' as tokens-mdc-filled-text-field;
 @use '../core/tokens/m2/mdc/outlined-text-field' as tokens-mdc-outlined-text-field;
 @use '../core/tokens/m2/mat/form-field' as tokens-mat-form-field;
@@ -12,74 +12,110 @@
 @use './form-field-density';
 
 @mixin base($theme) {
-  @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values(
-        tokens-mdc-filled-text-field.$prefix,
-        tokens-mdc-filled-text-field.get-unthemable-tokens());
-    @include token-utils.create-token-values(
-        tokens-mdc-outlined-text-field.$prefix,
-        tokens-mdc-outlined-text-field.get-unthemable-tokens());
-    @include token-utils.create-token-values(
-        tokens-mat-form-field.$prefix,
-        tokens-mat-form-field.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-mdc-filled-text-field.$prefix,
+          tokens-mdc-filled-text-field.get-unthemable-tokens());
+      @include token-utils.create-token-values(
+          tokens-mdc-outlined-text-field.$prefix,
+          tokens-mdc-outlined-text-field.get-unthemable-tokens());
+      @include token-utils.create-token-values(
+          tokens-mat-form-field.$prefix,
+          tokens-mat-form-field.get-unthemable-tokens());
+    }
   }
 }
 
 @mixin color($theme) {
-  @include sass-utils.current-selector-or-root() {
-    @include mdc-filled-text-field-theme.theme(
-      tokens-mdc-filled-text-field.get-color-tokens($theme));
-    @include mdc-outlined-text-field-theme.theme(
-      tokens-mdc-outlined-text-field.get-color-tokens($theme));
-    @include token-utils.create-token-values(tokens-mat-form-field.$prefix,
-      tokens-mat-form-field.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 mdc-filled-text-field-theme.theme(
+          tokens-mdc-filled-text-field.get-color-tokens($theme));
+      @include mdc-outlined-text-field-theme.theme(
+          tokens-mdc-outlined-text-field.get-color-tokens($theme));
+      @include token-utils.create-token-values(tokens-mat-form-field.$prefix,
+        tokens-mat-form-field.get-color-tokens($theme));
+    }
 
-  .mat-mdc-form-field.mat-accent {
-    @include mdc-filled-text-field-theme.theme(
-      tokens-mdc-filled-text-field.private-get-color-palette-color-tokens($theme, accent));
-    @include mdc-outlined-text-field-theme.theme(
-      tokens-mdc-outlined-text-field.private-get-color-palette-color-tokens($theme, accent));
-    @include token-utils.create-token-values(tokens-mat-form-field.$prefix,
-      tokens-mat-form-field.private-get-color-palette-color-tokens($theme, accent));
-  }
+    .mat-mdc-form-field.mat-accent {
+      @include mdc-filled-text-field-theme.theme(
+          tokens-mdc-filled-text-field.private-get-color-palette-color-tokens($theme, accent));
+      @include mdc-outlined-text-field-theme.theme(
+          tokens-mdc-outlined-text-field.private-get-color-palette-color-tokens($theme, accent));
+      @include token-utils.create-token-values(tokens-mat-form-field.$prefix,
+        tokens-mat-form-field.private-get-color-palette-color-tokens($theme, accent));
+    }
 
-  .mat-mdc-form-field.mat-warn {
-    @include mdc-filled-text-field-theme.theme(
-      tokens-mdc-filled-text-field.private-get-color-palette-color-tokens($theme, warn));
-    @include mdc-outlined-text-field-theme.theme(
-      tokens-mdc-outlined-text-field.private-get-color-palette-color-tokens($theme, warn));
-    @include token-utils.create-token-values(tokens-mat-form-field.$prefix,
-      tokens-mat-form-field.private-get-color-palette-color-tokens($theme, warn));
+    .mat-mdc-form-field.mat-warn {
+      @include mdc-filled-text-field-theme.theme(
+          tokens-mdc-filled-text-field.private-get-color-palette-color-tokens($theme, warn));
+      @include mdc-outlined-text-field-theme.theme(
+          tokens-mdc-outlined-text-field.private-get-color-palette-color-tokens($theme, warn));
+      @include token-utils.create-token-values(tokens-mat-form-field.$prefix,
+        tokens-mat-form-field.private-get-color-palette-color-tokens($theme, warn));
+    }
   }
 }
 
 @mixin typography($theme) {
-  @include sass-utils.current-selector-or-root() {
-    @include mdc-filled-text-field-theme.theme(
-      tokens-mdc-filled-text-field.get-typography-tokens($theme));
-    @include mdc-outlined-text-field-theme.theme(
-      tokens-mdc-outlined-text-field.get-typography-tokens($theme));
-    @include token-utils.create-token-values(tokens-mat-form-field.$prefix,
-      tokens-mat-form-field.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 mdc-filled-text-field-theme.theme(
+          tokens-mdc-filled-text-field.get-typography-tokens($theme));
+      @include mdc-outlined-text-field-theme.theme(
+          tokens-mdc-outlined-text-field.get-typography-tokens($theme));
+      @include token-utils.create-token-values(tokens-mat-form-field.$prefix,
+        tokens-mat-form-field.get-typography-tokens($theme));
+    }
   }
 }
 
 @mixin density($theme) {
-  @include form-field-density.private-form-field-density($theme);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
+  }
+  @else {
+    @include form-field-density.private-form-field-density($theme);
+  }
 }
 
 @mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-form-field') {
-    @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 mdc-filled-text-field-theme.theme(
+        map.get($tokens, tokens-mdc-filled-text-field.$prefix));
+    @include mdc-outlined-text-field-theme.theme(
+        map.get($tokens, tokens-mdc-outlined-text-field.$prefix));
+    @include token-utils.create-token-values(
+        tokens-mat-form-field.$prefix, map.get($tokens, tokens-mat-form-field.$prefix));
+  }
+}

package/grid-list/_grid-list-theme.scss

@@ -1,3 +1,4 @@
+@use 'sass:map';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/typography/typography';
@@ -5,31 +6,63 @@
 @use '../core/style/sass-utils';
 @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 {}
+}
 
 // Include this empty mixin for consistency with the other components.
-@mixin color($theme) {}
+@mixin color($theme) {
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
+  }
+  @else {}
+}
 
 @mixin typography($theme) {
-  @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values(tokens-mat-grid-list.$prefix,
-      tokens-mat-grid-list.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-grid-list.$prefix,
+        tokens-mat-grid-list.get-typography-tokens($theme));
+    }
   }
 }
 
-@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-grid-list') {
-    @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-grid-list.$prefix, map.get($tokens, tokens-mat-grid-list.$prefix));
+  }
+}

package/icon/_icon-theme.scss

@@ -1,3 +1,4 @@
+@use 'sass:map';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/tokens/m2/mat/icon' as tokens-mat-icon;
@@ -10,45 +11,76 @@
   @include token-utils.create-token-values(tokens-mat-icon.$prefix, $tokens);
 }
 
-@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-icon.$prefix,
-      tokens-mat-icon.get-color-tokens($theme));
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
   }
-
-  .mat-icon {
-    &.mat-primary {
-      @include _palette-colors($theme, primary);
+  @else {
+    @include sass-utils.current-selector-or-root() {
+      @include token-utils.create-token-values(tokens-mat-icon.$prefix,
+        tokens-mat-icon.get-color-tokens($theme));
     }
 
-    &.mat-accent {
-      @include _palette-colors($theme, accent);
-    }
+    .mat-icon {
+      &.mat-primary {
+        @include _palette-colors($theme, primary);
+      }
+
+      &.mat-accent {
+        @include _palette-colors($theme, accent);
+      }
 
-    &.mat-warn {
-      @include _palette-colors($theme, warn);
+      &.mat-warn {
+        @include _palette-colors($theme, warn);
+      }
     }
   }
 }
 
-@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-icon') {
-    @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-icon.$prefix, map.get($tokens, tokens-mat-icon.$prefix));
+  }
+}

package/input/_input-theme.scss

@@ -2,25 +2,52 @@
 @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) {}
+@mixin color($theme) {
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
+  }
+  @else {}
+}
 
-@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-input') {
-    @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) {}