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

package/schematics/tsconfig.json

@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "lib": ["es2022"],
+    "target": "es2022",
+    "module": "CommonJS",
+    "moduleResolution": "node10",
+    "strict": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "declaration": true,
+    "types": ["jasmine", "node"],
+    "paths": {
+      "@angular/cdk/schematics": ["../../cdk/schematics"],
+      "@angular/cdk/schematics/*": ["../../cdk/schematics/*"]
+    }
+  },
+  "exclude": [
+    "**/*.spec.ts",
+    // Exclude the test-setup utility files. Those should not be part of the output.
+    "test-setup/**/*.ts",
+    // Exclude template files that will be copied by the schematics. Those are not valid TS.
+    "ng-generate/*/files/**/*.ts",
+    // Exclude all test-case files because those should not be included in the schematics output.
+    "ng-update/test-cases/**/*.ts"
+  ]
+}

package/{core/tokens/m2/mat/_select.scss → select/_m2-select.scss}

@@ -1,9 +1,9 @@
 @use 'sass:map';
-@use '../../token-definition';
-@use '../../../theming/inspection';
-@use '../../../theming/theming';
-@use '../../../style/elevation';
-@use '../../../style/sass-utils';
+@use '../core/tokens/m2-utils';
+@use '../core/theming/inspection';
+@use '../core/theming/theming';
+@use '../core/style/elevation';
+@use '../core/style/sass-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, select);
@@ -23,11 +23,11 @@ $prefix: (mat, select);
   // Ideally we would derive all values directly from the theme, but it causes a lot of regressions
   // internally. For now we fall back to the old hardcoded behavior only for internal apps.
   $on-surface: if($is-dark, #fff, #000);
-  $text-color-base: if(token-definition.$private-is-internal-build, $on-surface,
+  $text-color-base: if(m2-utils.$private-is-internal-build, $on-surface,
     inspection.get-theme-color($theme, foreground, text, 1));
-  $disabled-text-color-base: if(token-definition.$private-is-internal-build, $on-surface,
+  $disabled-text-color-base: if(m2-utils.$private-is-internal-build, $on-surface,
     inspection.get-theme-color($theme, foreground, disabled-text, 1));
-  $icon-color-base: if(token-definition.$private-is-internal-build, $on-surface,
+  $icon-color-base: if(m2-utils.$private-is-internal-build, $on-surface,
     inspection.get-theme-color($theme, foreground, divider, 1));
 
   @return (
@@ -74,8 +74,8 @@ $prefix: (mat, select);
 @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-color-tokens(m2-utils.$placeholder-color-config),
+      get-typography-tokens(m2-utils.$placeholder-typography-config),
+      get-density-tokens(m2-utils.$placeholder-density-config)
   );
 }

package/{core/tokens/m3/mat/_select.scss → select/_m3-select.scss}

@@ -1,7 +1,10 @@
 @use 'sass:map';
-@use '../../../style/sass-utils';
-@use '../../../style/elevation';
-@use '../../token-definition';
+@use 'sass:list';
+@use '../core/style/sass-utils';
+@use '../core/style/elevation';
+@use '../core/tokens/m3-utils';
+@use '../core/theming/theming';
+@use '../core/theming/inspection';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, select);
@@ -13,7 +16,7 @@ $prefix: (mat, select);
 /// @return {Map} A set of custom tokens for the mat-select
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
   $tokens: sass-utils.merge-all(
-    token-definition.generate-typography-tokens($systems, trigger-text, body-large),
+    m3-utils.generate-typography-tokens($systems, trigger-text, body-large),
     (
       panel-background-color: map.get($systems, md-sys-color, surface-container),
       enabled-trigger-text-color: map.get($systems, md-sys-color, on-surface),
@@ -26,9 +29,11 @@ $prefix: (mat, select);
       focused-arrow-color: map.get($systems, md-sys-color, primary),
       invalid-arrow-color: map.get($systems, md-sys-color, error),
       container-elevation-shadow:
-        token-definition.hardcode(elevation.get-box-shadow(2), $exclude-hardcoded),
+        m3-utils.hardcode(elevation.get-box-shadow(2), $exclude-hardcoded),
     )
-  ), (
+  );
+
+  $variant-tokens: (
     // Color variants:
     primary: (), // Default, no overrides needed
     secondary: (
@@ -42,5 +47,15 @@ $prefix: (mat, select);
     )
   );
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, ($tokens, $variant-tokens), $token-slots);
+}
+
+// Tokens that can be configured through Angular Material's density theming API.
+@function get-density-tokens($theme) {
+  $scale: theming.clamp-density(inspection.get-theme-density($theme), -2);
+  $index: ($scale * -1) + 1;
+
+  @return (
+    arrow-transform: list.nth((translateY(-8px), translateY(-8px), none), $index),
+  );
 }

package/select/_select-theme.scss

@@ -1,11 +1,11 @@
-@use '../core/tokens/m2/mat/select' as tokens-mat-select;
-@use '../core/tokens/token-utils';
 @use '../core/style/sass-utils';
-
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
+@use '../core/theming/theming';
 @use '../core/theming/validation';
+@use '../core/tokens/token-utils';
 @use '../core/typography/typography';
+@use './m2-select';
+@use './m3-select';
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
 /// for the mat-select.
@@ -15,8 +15,8 @@
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      $mat-tokens: tokens-mat-select.get-unthemable-tokens();
-      @include token-utils.create-token-values(tokens-mat-select.$prefix, $mat-tokens);
+      $mat-tokens: m2-select.get-unthemable-tokens();
+      @include token-utils.create-token-values-mixed(m2-select.$prefix, $mat-tokens);
     }
   }
 }
@@ -31,22 +31,22 @@
     @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-mat-select.$prefix,
-        tokens-mat-select.get-color-tokens($theme)
+      @include token-utils.create-token-values-mixed(
+        m2-select.$prefix,
+        m2-select.get-color-tokens($theme)
       );
 
       .mat-mdc-form-field.mat-accent {
-        @include token-utils.create-token-values(
-          tokens-mat-select.$prefix,
-          tokens-mat-select.get-color-tokens($theme, accent)
+        @include token-utils.create-token-values-mixed(
+          m2-select.$prefix,
+          m2-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)
+        @include token-utils.create-token-values-mixed(
+          m2-select.$prefix,
+          m2-select.get-color-tokens($theme, warn)
         );
       }
     }
@@ -60,9 +60,9 @@
     @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)
+      @include token-utils.create-token-values-mixed(
+        m2-select.$prefix,
+        m2-select.get-typography-tokens($theme)
       );
     }
   }
@@ -72,12 +72,13 @@
 /// @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));
+    @include token-utils.create-token-values(
+        m3-select.$prefix, m3-select.get-density-tokens($theme));
   } @else {
     @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 token-utils.create-token-values-mixed(
+        m2-select.$prefix,
+        m2-select.get-density-tokens($theme)
       );
     }
   }
@@ -87,8 +88,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-select.$prefix,
-      tokens: tokens-mat-select.get-token-slots(),
+      namespace: m2-select.$prefix,
+      tokens: m2-select.get-token-slots(),
     ),
   );
 }
@@ -108,6 +109,9 @@
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-select') {
     @if inspection.get-theme-version($theme) == 1 {
       @include _theme-from-tokens(inspection.get-theme-tokens($theme), $options...);
+      @if inspection.theme-has($theme, density) {
+        @include density($theme);
+      }
     } @else {
       @include base($theme);
       @if inspection.theme-has($theme, color) {
@@ -127,6 +131,6 @@
   @include validation.selector-defined(
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
-  $mat-select-tokens: token-utils.get-tokens-for($tokens, tokens-mat-select.$prefix, $options...);
-  @include token-utils.create-token-values(tokens-mat-select.$prefix, $mat-select-tokens);
+  $mat-select-tokens: token-utils.get-tokens-for($tokens, m2-select.$prefix, $options...);
+  @include token-utils.create-token-values(m2-select.$prefix, $mat-select-tokens);
 }