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

package/bottom-sheet/index.d.ts

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { OnDestroy, EventEmitter, InjectionToken, ViewContainerRef, ComponentRef, TemplateRef } from '@angular/core';
 import * as i1 from '@angular/cdk/dialog';
 import { CdkDialogContainer, DialogRef } from '@angular/cdk/dialog';
-import { M as MatCommonModule } from '../common-module.d-0e6515ae.js';
+import { M as MatCommonModule } from '../common-module.d-C8xzHJDr.js';
 import * as i3 from '@angular/cdk/portal';
 import { ComponentType } from '@angular/cdk/portal';
 import { Direction } from '@angular/cdk/bidi';
@@ -32,6 +32,7 @@ declare class MatBottomSheetContainer extends CdkDialogContainer implements OnDe
     exit(): void;
     ngOnDestroy(): void;
     private _simulateAnimation;
+    protected _trapFocus(): void;
     protected _handleAnimationEvent(isStart: boolean, animationName: string): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<MatBottomSheetContainer, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<MatBottomSheetContainer, "mat-bottom-sheet-container", never, {}, {}, never, never, true, never>;
@@ -151,8 +152,9 @@ declare const MAT_BOTTOM_SHEET_DEFAULT_OPTIONS: InjectionToken<MatBottomSheetCon
  * Service to trigger Material Design bottom sheets.
  */
 declare class MatBottomSheet implements OnDestroy {
-    private _overlay;
+    private _injector;
     private _parentBottomSheet;
+    private _animationsDisabled;
     private _defaultOptions;
     private _bottomSheetRefAtThisLevel;
     private _dialog;
@@ -193,4 +195,5 @@ declare const matBottomSheetAnimations: {
     readonly bottomSheetState: any;
 };
 
-export { type AutoFocusTarget, MAT_BOTTOM_SHEET_DATA, MAT_BOTTOM_SHEET_DEFAULT_OPTIONS, MatBottomSheet, MatBottomSheetConfig, MatBottomSheetContainer, MatBottomSheetModule, MatBottomSheetRef, matBottomSheetAnimations };
+export { MAT_BOTTOM_SHEET_DATA, MAT_BOTTOM_SHEET_DEFAULT_OPTIONS, MatBottomSheet, MatBottomSheetConfig, MatBottomSheetContainer, MatBottomSheetModule, MatBottomSheetRef, matBottomSheetAnimations };
+export type { AutoFocusTarget };

package/bottom-sheet/testing/index.d.ts

@@ -22,4 +22,5 @@ declare class MatBottomSheetHarness extends ContentContainerComponentHarness<str
     dismiss(): Promise<void>;
 }
 
-export { type BottomSheetHarnessFilters, MatBottomSheetHarness };
+export { MatBottomSheetHarness };
+export type { BottomSheetHarnessFilters };

package/button/_button-theme.scss

@@ -1,157 +1,29 @@
-@use '../core/theming/theming';
+@use '../core/style/sass-utils';
 @use '../core/theming/inspection';
+@use '../core/theming/theming';
 @use '../core/theming/validation';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
-@use '../core/tokens/m2/mdc/filled-button' as tokens-mdc-filled-button;
-@use '../core/tokens/m2/mat/filled-button' as tokens-mat-filled-button;
-@use '../core/tokens/m2/mdc/outlined-button' as tokens-mdc-outlined-button;
-@use '../core/tokens/m2/mat/outlined-button' as tokens-mat-outlined-button;
-@use '../core/tokens/m2/mdc/protected-button' as tokens-mdc-protected-button;
-@use '../core/tokens/m2/mat/protected-button' as tokens-mat-protected-button;
-@use '../core/tokens/m2/mdc/text-button' as tokens-mdc-text-button;
-@use '../core/tokens/m2/mat/text-button' as tokens-mat-text-button;
-@use '../core/style/sass-utils';
-
-@mixin _text-button-variant($theme, $palette) {
-  $mdc-tokens: if(
-    $palette,
-    tokens-mdc-text-button.private-get-color-palette-color-tokens($theme, $palette),
-    tokens-mdc-text-button.get-color-tokens($theme)
-  );
-
-  $mat-tokens: if(
-    $palette,
-    tokens-mat-text-button.private-get-color-palette-color-tokens($theme, $palette),
-    tokens-mat-text-button.get-color-tokens($theme)
-  );
-
-  @include token-utils.create-token-values(tokens-mdc-text-button.$prefix, $mdc-tokens);
-  @include token-utils.create-token-values(tokens-mat-text-button.$prefix, $mat-tokens);
-}
-
-@mixin _filled-button-variant($theme, $palette) {
-  $mdc-tokens: if(
-    $palette,
-    tokens-mdc-filled-button.private-get-color-palette-color-tokens($theme, $palette),
-    tokens-mdc-filled-button.get-color-tokens($theme)
-  );
+@use './m2-button';
+@use './m3-button';
 
+@mixin _button-variant($theme, $palette) {
   $mat-tokens: if(
     $palette,
-    tokens-mat-filled-button.private-get-color-palette-color-tokens($theme, $palette),
-    tokens-mat-filled-button.get-color-tokens($theme)
+    m2-button.private-get-color-palette-color-tokens($theme, $palette),
+    m2-button.get-color-tokens($theme)
   );
 
-  @include token-utils.create-token-values(tokens-mdc-filled-button.$prefix, $mdc-tokens);
-  @include token-utils.create-token-values(tokens-mat-filled-button.$prefix, $mat-tokens);
-}
-
-@mixin _protected-button-variant($theme, $palette) {
-  $mdc-tokens: if(
-    $palette,
-    tokens-mdc-protected-button.private-get-color-palette-color-tokens($theme, $palette),
-    tokens-mdc-protected-button.get-color-tokens($theme)
-  );
-
-  $mat-tokens: if(
-    $palette,
-    tokens-mat-protected-button.private-get-color-palette-color-tokens($theme, $palette),
-    tokens-mat-protected-button.get-color-tokens($theme)
-  );
-
-  @include token-utils.create-token-values(tokens-mdc-protected-button.$prefix, $mdc-tokens);
-  @include token-utils.create-token-values(tokens-mat-protected-button.$prefix, $mat-tokens);
-}
-
-@mixin _outlined-button-variant($theme, $palette) {
-  $mdc-tokens: if(
-    $palette,
-    tokens-mdc-outlined-button.private-get-color-palette-color-tokens($theme, $palette),
-    tokens-mdc-outlined-button.get-color-tokens($theme)
-  );
-
-  $mat-tokens: if(
-    $palette,
-    tokens-mat-outlined-button.private-get-color-palette-color-tokens($theme, $palette),
-    tokens-mat-outlined-button.get-color-tokens($theme)
-  );
-
-  @include token-utils.create-token-values(tokens-mdc-outlined-button.$prefix, $mdc-tokens);
-  @include token-utils.create-token-values(tokens-mat-outlined-button.$prefix, $mat-tokens);
+  @include token-utils.create-token-values-mixed(m2-button.$prefix, $mat-tokens);
 }
 
 @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'
   );
-  $mdc-text-button-tokens: token-utils.get-tokens-for(
-    $tokens,
-    tokens-mdc-text-button.$prefix,
-    $options...
-  );
-  $mdc-protected-button-tokens: token-utils.get-tokens-for(
-    $tokens,
-    tokens-mdc-protected-button.$prefix,
-    $options...
-  );
-  $mdc-filled-button-tokens: token-utils.get-tokens-for(
-    $tokens,
-    tokens-mdc-filled-button.$prefix,
-    $options...
-  );
-  $mdc-outlined-button-tokens: token-utils.get-tokens-for(
-    $tokens,
-    tokens-mdc-outlined-button.$prefix,
-    $options...
-  );
   $mat-text-button-tokens: token-utils.get-tokens-for(
-    $tokens,
-    tokens-mat-text-button.$prefix,
-    $options...
-  );
-  $mat-protected-button-tokens: token-utils.get-tokens-for(
-    $tokens,
-    tokens-mat-protected-button.$prefix,
-    $options...
-  );
-  $mat-filled-button-tokens: token-utils.get-tokens-for(
-    $tokens,
-    tokens-mat-filled-button.$prefix,
-    $options...
-  );
-  $mat-outlined-button-tokens: token-utils.get-tokens-for(
-    $tokens,
-    tokens-mat-outlined-button.$prefix,
-    $options...
-  );
-
-  @include token-utils.create-token-values(tokens-mdc-text-button.$prefix, $mdc-text-button-tokens);
-  @include token-utils.create-token-values(
-    tokens-mdc-protected-button.$prefix,
-    $mdc-protected-button-tokens
-  );
-  @include token-utils.create-token-values(
-    tokens-mdc-filled-button.$prefix,
-    $mdc-filled-button-tokens
-  );
-  @include token-utils.create-token-values(
-    tokens-mdc-outlined-button.$prefix,
-    $mdc-outlined-button-tokens
-  );
-  @include token-utils.create-token-values(tokens-mat-text-button.$prefix, $mat-text-button-tokens);
-  @include token-utils.create-token-values(
-    tokens-mat-protected-button.$prefix,
-    $mat-protected-button-tokens
-  );
-  @include token-utils.create-token-values(
-    tokens-mat-filled-button.$prefix,
-    $mat-filled-button-tokens
-  );
-  @include token-utils.create-token-values(
-    tokens-mat-outlined-button.$prefix,
-    $mat-outlined-button-tokens
-  );
+    $tokens, m2-button.$prefix, $options...);
+  @include token-utils.create-token-values(m2-button.$prefix, $mat-text-button-tokens);
 }
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
@@ -162,39 +34,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-text-button.$prefix,
-        tokens-mdc-text-button.get-unthemable-tokens()
-      );
-      @include token-utils.create-token-values(
-        tokens-mdc-filled-button.$prefix,
-        tokens-mdc-filled-button.get-unthemable-tokens()
-      );
-      @include token-utils.create-token-values(
-        tokens-mdc-protected-button.$prefix,
-        tokens-mdc-protected-button.get-unthemable-tokens()
-      );
-      @include token-utils.create-token-values(
-        tokens-mdc-outlined-button.$prefix,
-        tokens-mdc-outlined-button.get-unthemable-tokens()
-      );
-
-      @include token-utils.create-token-values(
-        tokens-mat-text-button.$prefix,
-        tokens-mat-text-button.get-unthemable-tokens()
-      );
-      @include token-utils.create-token-values(
-        tokens-mat-filled-button.$prefix,
-        tokens-mat-filled-button.get-unthemable-tokens()
-      );
-      @include token-utils.create-token-values(
-        tokens-mat-protected-button.$prefix,
-        tokens-mat-protected-button.get-unthemable-tokens()
-      );
-      @include token-utils.create-token-values(
-        tokens-mat-outlined-button.$prefix,
-        tokens-mat-outlined-button.get-unthemable-tokens()
-      );
+      @include token-utils.create-token-values-mixed(
+        m2-button.$prefix, m2-button.get-unthemable-tokens());
     }
   }
 }
@@ -209,65 +50,24 @@
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, color), $options...);
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include _text-button-variant($theme, null);
-      @include _filled-button-variant($theme, null);
-      @include _protected-button-variant($theme, null);
-      @include _outlined-button-variant($theme, null);
-    }
-
-    .mat-mdc-button {
-      &.mat-primary {
-        @include _text-button-variant($theme, primary);
-      }
-
-      &.mat-accent {
-        @include _text-button-variant($theme, accent);
-      }
-
-      &.mat-warn {
-        @include _text-button-variant($theme, warn);
-      }
+      @include _button-variant($theme, null);
     }
 
-    .mat-mdc-unelevated-button {
+    .mat-mdc-button,
+    .mat-mdc-unelevated-button,
+    .mat-mdc-raised-button,
+    .mat-mdc-outlined-button,
+    .mat-tonal-button {
       &.mat-primary {
-        @include _filled-button-variant($theme, primary);
+        @include _button-variant($theme, primary);
       }
 
       &.mat-accent {
-        @include _filled-button-variant($theme, accent);
+        @include _button-variant($theme, accent);
       }
 
       &.mat-warn {
-        @include _filled-button-variant($theme, warn);
-      }
-    }
-
-    .mat-mdc-raised-button {
-      &.mat-primary {
-        @include _protected-button-variant($theme, primary);
-      }
-
-      &.mat-accent {
-        @include _protected-button-variant($theme, accent);
-      }
-
-      &.mat-warn {
-        @include _protected-button-variant($theme, warn);
-      }
-    }
-
-    .mat-mdc-outlined-button {
-      &.mat-primary {
-        @include _outlined-button-variant($theme, primary);
-      }
-
-      &.mat-accent {
-        @include _outlined-button-variant($theme, accent);
-      }
-
-      &.mat-warn {
-        @include _outlined-button-variant($theme, warn);
+        @include _button-variant($theme, warn);
       }
     }
   }
@@ -280,38 +80,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-mdc-text-button.$prefix,
-        tokens-mdc-text-button.get-typography-tokens($theme)
-      );
-      @include token-utils.create-token-values(
-        tokens-mdc-filled-button.$prefix,
-        tokens-mdc-filled-button.get-typography-tokens($theme)
-      );
-      @include token-utils.create-token-values(
-        tokens-mdc-protected-button.$prefix,
-        tokens-mdc-protected-button.get-typography-tokens($theme)
-      );
-      @include token-utils.create-token-values(
-        tokens-mdc-outlined-button.$prefix,
-        tokens-mdc-outlined-button.get-typography-tokens($theme)
-      );
-
-      @include token-utils.create-token-values(
-        tokens-mat-text-button.$prefix,
-        tokens-mat-text-button.get-typography-tokens($theme)
-      );
-      @include token-utils.create-token-values(
-        tokens-mat-filled-button.$prefix,
-        tokens-mat-filled-button.get-typography-tokens($theme)
-      );
-      @include token-utils.create-token-values(
-        tokens-mat-protected-button.$prefix,
-        tokens-mat-protected-button.get-typography-tokens($theme)
-      );
-      @include token-utils.create-token-values(
-        tokens-mat-outlined-button.$prefix,
-        tokens-mat-outlined-button.get-typography-tokens($theme)
+      @include token-utils.create-token-values-mixed(
+        m2-button.$prefix,
+        m2-button.get-typography-tokens($theme)
       );
     }
   }
@@ -321,41 +92,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-button.$prefix, m3-button.get-density-tokens($theme));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mdc-text-button.$prefix,
-        tokens-mdc-text-button.get-density-tokens($theme)
-      );
-      @include token-utils.create-token-values(
-        tokens-mdc-filled-button.$prefix,
-        tokens-mdc-filled-button.get-density-tokens($theme)
-      );
-      @include token-utils.create-token-values(
-        tokens-mdc-protected-button.$prefix,
-        tokens-mdc-protected-button.get-density-tokens($theme)
-      );
-      @include token-utils.create-token-values(
-        tokens-mdc-outlined-button.$prefix,
-        tokens-mdc-outlined-button.get-density-tokens($theme)
-      );
-
-      @include token-utils.create-token-values(
-        tokens-mat-text-button.$prefix,
-        tokens-mat-text-button.get-density-tokens($theme)
-      );
-      @include token-utils.create-token-values(
-        tokens-mat-filled-button.$prefix,
-        tokens-mat-filled-button.get-density-tokens($theme)
-      );
-      @include token-utils.create-token-values(
-        tokens-mat-protected-button.$prefix,
-        tokens-mat-protected-button.get-density-tokens($theme)
-      );
-      @include token-utils.create-token-values(
-        tokens-mat-outlined-button.$prefix,
-        tokens-mat-outlined-button.get-density-tokens($theme)
+      @include token-utils.create-token-values-mixed(
+        m2-button.$prefix,
+        m2-button.get-density-tokens($theme)
       );
     }
   }
@@ -363,55 +106,10 @@
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
 @function _define-overrides() {
-  $mdc-filled-button-tokens: tokens-mdc-filled-button.get-token-slots();
-  $mat-filled-button-tokens: tokens-mat-filled-button.get-token-slots();
-  $mdc-outlined-button-tokens: tokens-mdc-outlined-button.get-token-slots();
-  $mat-outlined-button-tokens: tokens-mat-outlined-button.get-token-slots();
-  $mdc-protected-button-tokens: tokens-mdc-protected-button.get-token-slots();
-  $mat-protected-button-tokens: tokens-mat-protected-button.get-token-slots();
-  $mdc-text-button-tokens: tokens-mdc-text-button.get-token-slots();
-  $mat-text-button-tokens: tokens-mat-text-button.get-token-slots();
-
   @return (
     (
-      namespace: tokens-mdc-filled-button.$prefix,
-      tokens: $mdc-filled-button-tokens,
-      prefix: 'filled-',
-    ),
-    (
-      namespace: tokens-mat-filled-button.$prefix,
-      tokens: $mat-filled-button-tokens,
-      prefix: 'filled-',
-    ),
-    (
-      namespace: tokens-mdc-outlined-button.$prefix,
-      tokens: $mdc-outlined-button-tokens,
-      prefix: 'outlined-',
-    ),
-    (
-      namespace: tokens-mat-outlined-button.$prefix,
-      tokens: $mat-outlined-button-tokens,
-      prefix: 'outlined-',
-    ),
-    (
-      namespace: tokens-mdc-protected-button.$prefix,
-      tokens: $mdc-protected-button-tokens,
-      prefix: 'protected-',
-    ),
-    (
-      namespace: tokens-mat-protected-button.$prefix,
-      tokens: $mat-protected-button-tokens,
-      prefix: 'protected-',
-    ),
-    (
-      namespace: tokens-mdc-text-button.$prefix,
-      tokens: $mdc-text-button-tokens,
-      prefix: 'text-',
-    ),
-    (
-      namespace: tokens-mat-text-button.$prefix,
-      tokens: $mat-text-button-tokens,
-      prefix: 'text-',
+      namespace: m2-button.$prefix,
+      tokens: m2-button.get-token-slots(),
     ),
   );
 }
@@ -431,6 +129,9 @@
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-button') {
     @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) {