@angular/material 17.0.0-next.0 → 17.0.0-next.2

package/tree/_tree-theme.scss

@@ -1,41 +1,37 @@
-@use 'sass:map';
 @use '../core/density/private/compatibility';
 @use '../core/theming/theming';
+@use '../core/theming/inspection';
 @use '../core/typography/typography';
-@use '../core/typography/typography-utils';
 @use './tree-variables';
 
-@mixin color($config-or-theme) {
-  $config: theming.get-color-config($config-or-theme);
-  $background: map.get($config, background);
-  $foreground: map.get($config, foreground);
-
+@mixin color($theme) {
   .mat-tree {
-    background: theming.get-color-from-palette($background, 'card');
+    background: inspection.get-theme-color($theme, background, card);
   }
 
   .mat-tree-node,
   .mat-nested-tree-node {
-    color: theming.get-color-from-palette($foreground, text);
+    color: inspection.get-theme-color($theme, foreground, text);
   }
 }
 
-@mixin typography($config-or-theme) {
-  $config: typography.private-typography-to-2014-config(
-      theming.get-typography-config($config-or-theme));
+@mixin typography($theme) {
+  // TODO(mmalerba): Stop calling this and resolve resulting screen diffs.
+  $theme: inspection.private-get-typography-back-compat-theme($theme);
+
   .mat-tree {
-    font-family: typography-utils.font-family($config);
+    font-family: inspection.get-theme-typography($theme, body-2, font-family);
   }
 
   .mat-tree-node,
   .mat-nested-tree-node {
-    font-weight: typography-utils.font-weight($config, body-1);
-    font-size: typography-utils.font-size($config, body-1);
+    font-weight: inspection.get-theme-typography($theme, body-2, font-weight);
+    font-size: inspection.get-theme-typography($theme, body-2, font-size);
   }
 }
 
-@mixin density($config-or-theme) {
-  $density-scale: theming.get-density-config($config-or-theme);
+@mixin density($theme) {
+  $density-scale: inspection.get-theme-density($theme);
   $height: compatibility.private-density-prop-value(tree-variables.$density-config,
     $density-scale, height);
 
@@ -46,21 +42,16 @@
   }
 }
 
-@mixin theme($theme-or-color-config) {
-  $theme: theming.private-legacy-get-theme($theme-or-color-config);
+@mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-tree') {
-    $color: theming.get-color-config($theme);
-    $density: theming.get-density-config($theme);
-    $typography: theming.get-typography-config($theme);
-
-    @if $color != null {
-      @include color($color);
+    @if inspection.theme-has($theme, color) {
+      @include color($theme);
     }
-    @if $density != null {
-      @include density($density);
+    @if inspection.theme-has($theme, density) {
+      @include density($theme);
     }
-    @if $typography != null {
-      @include typography($typography);
+    @if inspection.theme-has($theme, typography) {
+      @include typography($theme);
     }
   }
 }

package/button-toggle/_button-toggle-variables.scss

@@ -1,16 +0,0 @@
-// TODO(crisbeto): this file isn't used anymore and should be removed.
-
-$standard-height: 48px !default;
-// Minimum height for highest density can vary based on the content that developers
-// project into button-toggle's. We use a minimum of `24px` though because commonly
-// icons or text are displayed. Icons by default have a size of `24px`.
-$standard-minimum-height: 24px !default;
-$standard-maximum-height: $standard-height !default;
-
-$standard-density-config: (
-  height: (
-    default: $standard-height,
-    maximum: $standard-maximum-height,
-    minimum: $standard-minimum-height,
-  )
-) !default;

package/core/typography/_typography-deprecated.scss

@@ -1,39 +0,0 @@
-@use 'typography';
-
-// @deprecated Use `define-typography-level`.
-@function level(
-  $font-size,
-  $line-height: $font-size,
-  $font-weight: 400,
-  $font-family: null,
-  $letter-spacing: normal) {
-  @return typography.define-typography-level($font-size, $line-height, $font-weight, $font-family,
-    $letter-spacing);
-}
-
-// @deprecated Use `typography-hierarchy`.
-@mixin base-typography($config-or-theme, $selector: '.mat-typography') {
-  @include typography.legacy-typography-hierarchy($config-or-theme, $selector);
-}
-
-// @deprecated Use `define-typography-config`.
-@function config(
-  $font-family:   'Roboto, "Helvetica Neue", sans-serif',
-  $display-4:     typography.define-typography-level(112px, 112px, 300, $letter-spacing: -0.05em),
-  $display-3:     typography.define-typography-level(56px, 56px, 400, $letter-spacing: -0.02em),
-  $display-2:     typography.define-typography-level(45px, 48px, 400, $letter-spacing: -0.005em),
-  $display-1:     typography.define-typography-level(34px, 40px, 400),
-  $headline:      typography.define-typography-level(24px, 32px, 400),
-  $title:         typography.define-typography-level(20px, 32px, 500),
-  $subheading-2:  typography.define-typography-level(16px, 28px, 400),
-  $subheading-1:  typography.define-typography-level(15px, 24px, 400),
-  $body-2:        typography.define-typography-level(14px, 24px, 500),
-  $body-1:        typography.define-typography-level(14px, 20px, 400),
-  $caption:       typography.define-typography-level(12px, 20px, 400),
-  $button:        typography.define-typography-level(14px, 14px, 500),
-  $input:         typography.define-typography-level(inherit, 1.125, 400)
-) {
-  @return typography.define-legacy-typography-config($font-family, $display-4, $display-3,
-    $display-2, $display-1, $headline, $title, $subheading-2, $subheading-1, $body-2,
-    $body-1, $caption, $button, $input);
-}

package/paginator/_paginator-variables.scss

@@ -1,15 +0,0 @@
-// TODO: this file isn't used, but is kept for backwards compatibility. It should be deleted in v17.
-
-$height: 56px !default;
-// Minimum height for paginator's in the highest density is determined based on how
-// much the paginator can shrink until the content exceeds (i.e. navigation buttons).
-$minimum-height: 40px !default;
-$maximum-height: $height !default;
-
-$density-config: (
-  height: (
-    default: $height,
-    maximum: $maximum-height,
-    minimum: $minimum-height,
-  )
-) !default;