@angular/material 20.0.0-next.4 → 20.0.0-next.6

package/tooltip/_m3-tooltip.scss

@@ -0,0 +1,25 @@
+@use '../core/tokens/m3-utils';
+@use 'sass:map';
+
+// The prefix used to generate the fully qualified name for tokens in this file.
+$prefix: (mat, tooltip);
+
+/// Generates the tokens for MDC plain-tooltip
+/// @param {Map} $systems The MDC system tokens
+/// @param {Boolean} $exclude-hardcoded Whether to exclude hardcoded token values
+/// @param {Map} $token-slots Possible token slots
+/// @return {Map} A set of tokens for the MDC plain-tooltip
+@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
+  $tokens: (
+    container-color: map.get($systems, md-sys-color, inverse-surface),
+    container-shape: map.get($systems, md-sys-shape, corner-extra-small),
+    supporting-text-color: map.get($systems, md-sys-color, inverse-on-surface),
+    supporting-text-font: map.get($systems, md-sys-typescale, body-small-font),
+    supporting-text-line-height: map.get($systems, md-sys-typescale, body-small-line-height),
+    supporting-text-size: map.get($systems, md-sys-typescale, body-small-size),
+    supporting-text-tracking: map.get($systems, md-sys-typescale, body-small-tracking),
+    supporting-text-weight: map.get($systems, md-sys-typescale, body-small-weight)
+  );
+
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
+}

package/tooltip/_tooltip-theme.scss

@@ -4,7 +4,7 @@
 @use '../core/theming/validation';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
-@use '../core/tokens/m2/mdc/plain-tooltip' as tokens-mdc-plain-tooltip;
+@use './m2-tooltip';
 
 @mixin base($theme) {
   @if inspection.get-theme-version($theme) == 1 {
@@ -13,8 +13,8 @@
     // Add default values for tokens not related to color, typography, or density.
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mdc-plain-tooltip.$prefix,
-        tokens-mdc-plain-tooltip.get-unthemable-tokens()
+        m2-tooltip.$prefix,
+        m2-tooltip.get-unthemable-tokens()
       );
     }
   }
@@ -26,8 +26,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mdc-plain-tooltip.$prefix,
-        tokens-mdc-plain-tooltip.get-color-tokens($theme)
+        m2-tooltip.$prefix,
+        m2-tooltip.get-color-tokens($theme)
       );
     }
   }
@@ -39,8 +39,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mdc-plain-tooltip.$prefix,
-        tokens-mdc-plain-tooltip.get-typography-tokens($theme)
+        m2-tooltip.$prefix,
+        m2-tooltip.get-typography-tokens($theme)
       );
     }
   }
@@ -52,8 +52,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mdc-plain-tooltip.$prefix,
-        tokens-mdc-plain-tooltip.get-density-tokens($theme)
+        m2-tooltip.$prefix,
+        m2-tooltip.get-density-tokens($theme)
       );
     }
   }
@@ -63,8 +63,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mdc-plain-tooltip.$prefix,
-      tokens: tokens-mdc-plain-tooltip.get-token-slots(),
+      namespace: m2-tooltip.$prefix,
+      tokens: m2-tooltip.get-token-slots(),
     ),
   );
 }
@@ -97,7 +97,7 @@
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
   @if $tokens != () {
-    $tokens: token-utils.get-tokens-for($tokens, tokens-mdc-plain-tooltip.$prefix);
-    @include token-utils.create-token-values(tokens-mdc-plain-tooltip.$prefix, $tokens);
+    $tokens: token-utils.get-tokens-for($tokens, m2-tooltip.$prefix);
+    @include token-utils.create-token-values(m2-tooltip.$prefix, $tokens);
   }
 }

package/tooltip/index.d.ts

@@ -1,8 +1,8 @@
-export { h as MAT_TOOLTIP_DEFAULT_OPTIONS, f as MAT_TOOLTIP_DEFAULT_OPTIONS_FACTORY, c as MAT_TOOLTIP_SCROLL_STRATEGY, d as MAT_TOOLTIP_SCROLL_STRATEGY_FACTORY, e as MAT_TOOLTIP_SCROLL_STRATEGY_FACTORY_PROVIDER, k as MatTooltip, i as MatTooltipDefaultOptions, M as MatTooltipModule, S as SCROLL_THROTTLE_MS, j as TOOLTIP_PANEL_CLASS, l as TooltipComponent, T as TooltipPosition, a as TooltipTouchGestures, b as TooltipVisibility, g as getMatTooltipInvalidPositionError } from '../module.d-9a0cb968.js';
+export { h as MAT_TOOLTIP_DEFAULT_OPTIONS, f as MAT_TOOLTIP_DEFAULT_OPTIONS_FACTORY, c as MAT_TOOLTIP_SCROLL_STRATEGY, d as MAT_TOOLTIP_SCROLL_STRATEGY_FACTORY, e as MAT_TOOLTIP_SCROLL_STRATEGY_FACTORY_PROVIDER, k as MatTooltip, i as MatTooltipDefaultOptions, M as MatTooltipModule, S as SCROLL_THROTTLE_MS, j as TOOLTIP_PANEL_CLASS, l as TooltipComponent, T as TooltipPosition, a as TooltipTouchGestures, b as TooltipVisibility, g as getMatTooltipInvalidPositionError } from '../module.d-f55544a0.js';
 import '@angular/core';
 import '@angular/cdk/a11y';
 import '@angular/cdk/overlay';
-import '../common-module.d-0e6515ae.js';
+import '../common-module.d-421e3498.js';
 import '@angular/cdk/bidi';
 import '@angular/cdk/coercion';
 import 'rxjs';

package/tooltip/testing/index.d.ts

@@ -31,4 +31,5 @@ declare class MatTooltipHarness extends ComponentHarness {
     getTooltipText(): Promise<string>;
 }
 
-export { MatTooltipHarness, type TooltipHarnessFilters };
+export { MatTooltipHarness };
+export type { TooltipHarnessFilters };

package/{core/tokens/m2/mat/_tree.scss → tree/_m2-tree.scss}

@@ -1,8 +1,8 @@
 @use 'sass:map';
-@use '../../token-definition';
-@use '../../../theming/theming';
-@use '../../../theming/inspection';
-@use '../../../style/sass-utils';
+@use '../core/tokens/m2-utils';
+@use '../core/theming/theming';
+@use '../core/theming/inspection';
+@use '../core/style/sass-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, tree);
@@ -55,8 +55,8 @@ $prefix: (mat, tree);
 @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/_tree.scss → tree/_m3-tree.scss}

@@ -1,5 +1,5 @@
 @use 'sass:map';
-@use '../../token-definition';
+@use '../core/tokens/m3-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, tree);
@@ -18,5 +18,5 @@ $prefix: (mat, tree);
     node-text-weight: map.get($systems, md-sys-typescale, body-large-weight),
   );
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }

package/tree/_tree-theme.scss

@@ -5,7 +5,7 @@
 @use '../core/typography/typography';
 @use '../core/style/sass-utils';
 @use '../core/tokens/token-utils';
-@use '../core/tokens/m2/mat/tree' as tokens-mat-tree;
+@use './m2-tree';
 
 @mixin base($theme) {
   @if inspection.get-theme-version($theme) == 1 {
@@ -20,8 +20,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-tree.$prefix,
-        tokens-mat-tree.get-color-tokens($theme)
+        m2-tree.$prefix,
+        m2-tree.get-color-tokens($theme)
       );
     }
   }
@@ -36,8 +36,8 @@
 
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-tree.$prefix,
-        tokens-mat-tree.get-typography-tokens($theme)
+        m2-tree.$prefix,
+        m2-tree.get-typography-tokens($theme)
       );
     }
   }
@@ -51,8 +51,8 @@
 
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-tree.$prefix,
-        tokens-mat-tree.get-density-tokens($theme)
+        m2-tree.$prefix,
+        m2-tree.get-density-tokens($theme)
       );
     }
   }
@@ -62,8 +62,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-tree.$prefix,
-      tokens: tokens-mat-tree.get-token-slots(),
+      namespace: m2-tree.$prefix,
+      tokens: m2-tree.get-token-slots(),
     ),
   );
 }
@@ -97,8 +97,8 @@
   );
   @if ($tokens != ()) {
     @include token-utils.create-token-values(
-      tokens-mat-tree.$prefix,
-      map.get($tokens, tokens-mat-tree.$prefix)
+      m2-tree.$prefix,
+      map.get($tokens, m2-tree.$prefix)
     );
   }
 }

package/tree/index.d.ts

@@ -2,7 +2,7 @@ import * as i1 from '@angular/cdk/tree';
 import { CdkTreeNode, CdkTreeNodeDef, CdkNestedTreeNode, CdkTreeNodePadding, CdkTreeNodeOutlet, CdkTree, CdkTreeNodeToggle, TreeControl, FlatTreeControl } from '@angular/cdk/tree';
 import * as i0 from '@angular/core';
 import { OnInit, OnDestroy, AfterContentInit, ViewContainerRef } from '@angular/core';
-import { M as MatCommonModule } from '../common-module.d-0e6515ae.js';
+import { M as MatCommonModule } from '../common-module.d-421e3498.js';
 import { DataSource, CollectionViewer } from '@angular/cdk/collections';
 import { Observable } from 'rxjs';
 import '@angular/cdk/bidi';

package/tree/testing/index.d.ts

@@ -115,4 +115,5 @@ declare class MatTreeHarness extends ComponentHarness {
     private _addChildToNode;
 }
 
-export { MatTreeHarness, MatTreeNodeHarness, type TextTree, type TreeHarnessFilters, type TreeNodeHarnessFilters };
+export { MatTreeHarness, MatTreeNodeHarness };
+export type { TextTree, TreeHarnessFilters, TreeNodeHarnessFilters };

package/button/_button-base.scss

@@ -1,181 +0,0 @@
-@use '../core/tokens/token-utils';
-@use '../core/style/layout-common';
-
-// Adds styles necessary to provide stateful interactions with the button. This includes providing
-// content for the state container's ::before and ::after so that they can be given a background
-// color and opacity for states like hover, active, and focus. Additionally, adds styles to the
-// ripple and state container so that they fill the button, match the border radius, and avoid
-// pointer events.
-@mixin mat-private-button-interactive() {
-  -webkit-tap-highlight-color: transparent;
-
-  // The ripple container should match the bounds of the entire button.
-  .mat-mdc-button-ripple,
-  .mat-mdc-button-persistent-ripple,
-  .mat-mdc-button-persistent-ripple::before {
-    @include layout-common.fill;
-
-    // Disable pointer events for the ripple container and state overlay because the container
-    // will overlay the user content and we don't want to disable mouse events on the user content.
-    // Pointer events can be safely disabled because the ripple trigger element is the host element.
-    pointer-events: none;
-
-    // Inherit the border radius from the parent so that state overlay and ripples don't exceed the
-    // parent button boundaries. Note that an inherited border radius does not work properly if
-    // the actual button element does have a border because it causes the inner content to be
-    // smaller. We have special logic for stroked buttons to handle this scenario.
-    border-radius: inherit;
-  }
-
-  // This style used to be applied by the MatRipple
-  // directive, which is no longer attached to this element.
-  .mat-mdc-button-ripple {
-    overflow: hidden;
-  }
-
-  // We use ::before so that we can reuse some of MDC's theming.
-  .mat-mdc-button-persistent-ripple::before {
-    content: '';
-    opacity: 0;
-  }
-
-  // The content should appear over the state and ripple layers, otherwise they may adversely affect
-  // the accessibility of the text content.
-  .mdc-button__label,
-  .mat-icon {
-    z-index: 1;
-    position: relative;
-  }
-
-  // The focus indicator should match the bounds of the entire button.
-  .mat-focus-indicator {
-    @include layout-common.fill();
-  }
-
-  &:focus > .mat-focus-indicator::before {
-    content: '';
-  }
-}
-
-@mixin mat-private-button-ripple($prefix, $slots) {
-  @include token-utils.use-tokens($prefix, $slots) {
-    .mat-ripple-element {
-      @include token-utils.create-token-slot(background-color, ripple-color);
-    }
-
-    .mat-mdc-button-persistent-ripple::before {
-      @include token-utils.create-token-slot(background-color, state-layer-color);
-    }
-
-    &.mat-mdc-button-disabled .mat-mdc-button-persistent-ripple::before {
-      @include token-utils.create-token-slot(background-color, disabled-state-layer-color);
-    }
-
-    &:hover > .mat-mdc-button-persistent-ripple::before {
-      @include token-utils.create-token-slot(opacity, hover-state-layer-opacity);
-    }
-
-    &.cdk-program-focused,
-    &.cdk-keyboard-focused,
-    &.mat-mdc-button-disabled-interactive:focus {
-      > .mat-mdc-button-persistent-ripple::before {
-        @include token-utils.create-token-slot(opacity, focus-state-layer-opacity);
-      }
-    }
-
-    &:active > .mat-mdc-button-persistent-ripple::before {
-      @include token-utils.create-token-slot(opacity, pressed-state-layer-opacity);
-    }
-  }
-}
-
-// MDC's disabled buttons define a default cursor with pointer-events none. However, they select
-// :disabled for this, which does not affect anchor tags.
-// TODO(andrewseguin): Discuss with the MDC team about a mixin we can call for applying this style,
-// and note that having pointer-events may have unintended side-effects, e.g. allowing the user
-// to click the target underneath the button.
-@mixin mat-private-button-disabled() {
-  // `[disabled]` shouldn't be necessary, but we keep it to maintain
-  // compatibility with apps setting it through host bindings.
-  &[disabled],
-  &.mat-mdc-button-disabled {
-    cursor: default;
-    pointer-events: none;
-    @content;
-  }
-
-  &.mat-mdc-button-disabled-interactive {
-    pointer-events: auto;
-  }
-}
-
-// Adds an elevation shadow to a button.
-@mixin mat-private-button-elevation($token-name) {
-  // MDC outputs a variable that is the same as the token name, but suffixed with `-shadow`.
-  box-shadow: token-utils.get-token-variable($token-name + '-shadow');
-}
-
-@mixin mat-private-button-touch-target($is-square, $prefix, $slots) {
-  .mat-mdc-button-touch-target {
-    position: absolute;
-    top: 50%;
-    height: 48px;
-
-    @if $is-square {
-      left: 50%;
-      width: 48px;
-      transform: translate(-50%, -50%);
-    } @else {
-      left: 0;
-      right: 0;
-      transform: translateY(-50%);
-    }
-
-    @include token-utils.use-tokens($prefix, $slots) {
-      @include token-utils.create-token-slot(display, touch-target-display);
-    }
-  }
-}
-
-@mixin mat-private-button-horizontal-layout($prefix, $slots, $has-with-icon-padding) {
-  @include token-utils.use-tokens($prefix, $slots) {
-    $icon-spacing: token-utils.get-token-variable(icon-spacing, true);
-    $icon-offset: token-utils.get-token-variable(icon-offset, true);
-
-    @if ($has-with-icon-padding) {
-      $with-icon-horizontal-padding:
-        token-utils.get-token-variable(with-icon-horizontal-padding, true);
-
-      // stylelint-disable-next-line selector-class-pattern
-      &:has(.material-icons, mat-icon, [matButtonIcon]) {
-        padding: 0 $with-icon-horizontal-padding;
-      }
-    }
-
-    // MDC expects button icons to contain this HTML content:
-    // ```html
-    //   <span class="mdc-button__icon material-icons">favorite</span>
-    // ```
-    // However, Angular Material expects a `mat-icon` instead. The following
-    // styles will lay out the icons appropriately.
-    & > .mat-icon {
-      margin-right: $icon-spacing;
-      margin-left: $icon-offset;
-
-      [dir='rtl'] & {
-        margin-right: $icon-offset;
-        margin-left: $icon-spacing;
-      }
-    }
-
-    .mdc-button__label + .mat-icon {
-      margin-right: $icon-offset;
-      margin-left: $icon-spacing;
-
-      [dir='rtl'] & {
-        margin-right: $icon-spacing;
-        margin-left: $icon-offset;
-      }
-    }
-  }
-}