@angular/material 20.1.0-next.1 → 20.1.0-rc.0

package/tabs/_m2-tabs.scss

@@ -1,32 +1,44 @@
 @use 'sass:map';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m2-utils';
 @use '../core/tokens/m3-utils';
 
-// Tokens that can't be configured through Angular Material's current theming API,
-// but may be in a future version of the theming API.
-//
-// Tokens that are available in MDC, but not used in Angular Material should be mapped to `null`.
-// `null` indicates that we are intentionally choosing not to emit a slot or value for the token in
-// our CSS.
-@function get-unthemable-tokens() {
+@function get-tokens($theme) {
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -4);
+
   @return (
-    // This is specified both here and in the density tokens, because it determines the size of the
-    // tab itself and there are internal tests who don't configure the theme correctly.
-    tab-container-height: 48px,
-    // For some period of time, the MDC tabs removed the divider. This has been added back in
-    // and will be present in M3.
-    tab-divider-color: transparent,
-    tab-divider-height: 0,
-    tab-active-indicator-height: 2px,
-    // Currently set to zero, but used by the gmat styles to make the indicator rounded.
-    tab-active-indicator-shape: 0,
+    base: (
+      // This is specified both here and in the density tokens, because it determines the size of
+      // the tab itself and there are internal tests who don't configure the theme correctly.
+      tab-container-height: 48px,
+      tab-divider-color: transparent,
+      tab-divider-height: 0,
+      tab-active-indicator-height: 2px,
+      tab-active-indicator-shape: 0,
+    ),
+    color: private-get-color-palette-color-tokens($theme, primary),
+    typography: (
+      tab-label-text-font: map.get($system, label-small-font),
+      tab-label-text-size: map.get($system, label-small-size),
+      tab-label-text-tracking: map.get($system, label-small-tracking),
+      tab-label-text-line-height: map.get($system, label-small-line-height),
+      tab-label-text-weight: map.get($system, label-small-weight),
+    ),
+    density: (
+      tab-container-height: map.get((
+        0: 48px,
+        -1: 44px,
+        -2: 40px,
+        -3: 36px,
+        -4: 32px,
+      ), $density-scale),
+    ),
   );
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme, $color-variant, $exclude: ()) {
+@function private-get-color-palette-color-tokens($theme, $color-variant, $exclude: ()) {
   $system: m2-utils.get-system($theme);
   $system: m3-utils.replace-colors-with-variant($system, primary, $color-variant);
 
@@ -54,30 +66,3 @@
 
   @return $tokens;
 }
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return (
-    // Note: MDC has equivalents of these tokens, but they lead to much higher selector specificity.
-    tab-label-text-font: inspection.get-theme-typography($theme, button, font-family),
-    tab-label-text-size: inspection.get-theme-typography($theme, button, font-size),
-    tab-label-text-tracking: inspection.get-theme-typography($theme, button, letter-spacing),
-    tab-label-text-line-height: inspection.get-theme-typography($theme, button, line-height),
-    tab-label-text-weight: inspection.get-theme-typography($theme, button, font-weight),
-  );
-}
-
-// 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), -4);
-
-  @return (
-    tab-container-height: map.get((
-      0: 48px,
-      -1: 44px,
-      -2: 40px,
-      -3: 36px,
-      -4: 32px,
-    ), $scale),
-  );
-}

package/tabs/_m3-tabs.scss

@@ -2,7 +2,6 @@
 @use 'sass:map';
 @use 'sass:list';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 /// Generates the tokens for MDC tab
@@ -44,7 +43,7 @@
       tab-label-text-tracking: map.get($system, title-small-tracking),
       tab-label-text-weight: map.get($system, title-small-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 

package/tabs/_tabs-theme.scss

@@ -1,23 +1,17 @@
-@use '../core/style/sass-utils';
 @use './m2-tabs';
 @use './m3-tabs';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/typography/typography';
 @use '../core/tokens/token-utils';
 @use 'sass:map';
 
-/// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
-/// for the mat-tab.
-/// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: map.get(m2-tabs.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-tabs.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-tabs.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-tabs.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-tab.
@@ -25,48 +19,48 @@
 /// @param {String} $color-variant The color variant to use for the component (M3 only)
 @mixin color($theme, $color-variant: null) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-tabs.get-tokens($theme, $color-variant), color));
+    $tokens: map.get(m3-tabs.get-tokens($theme, $color-variant), color);
+    @include token-utils.values($tokens);
   } @else {
     .mat-mdc-tab-group,
     .mat-mdc-tab-nav-bar {
-      @include token-utils.create-token-values-mixed(
-          m2-tabs.get-color-tokens($theme, primary,
+      @include token-utils.values(
+          m2-tabs.private-get-color-palette-color-tokens($theme, primary,
             $exclude: (tab-background-color, tab-foreground-color)));
 
       &.mat-accent {
-        @include token-utils.create-token-values-mixed(
-          m2-tabs.get-color-tokens($theme, secondary,
+        @include token-utils.values(
+          m2-tabs.private-get-color-palette-color-tokens($theme, secondary,
             $exclude: (tab-background-color, tab-foreground-color)));
       }
 
       &.mat-warn {
-        @include token-utils.create-token-values-mixed(
-          m2-tabs.get-color-tokens($theme, error,
+        @include token-utils.values(
+          m2-tabs.private-get-color-palette-color-tokens($theme, error,
             $exclude: (tab-background-color, tab-foreground-color)));
       }
 
       &.mat-background-primary {
-        $tokens: m2-tabs.get-color-tokens($theme, primary);
-        @include token-utils.create-token-values-mixed((
-          tab-background-color: map.get($tokens, background-color),
-          tab-foreground-color: map.get($tokens, foreground-color)
+        $tokens: m2-tabs.private-get-color-palette-color-tokens($theme, primary);
+        @include token-utils.values((
+          tab-background-color: map.get($tokens, tab-background-color),
+          tab-foreground-color: map.get($tokens, tab-foreground-color)
         ));
       }
 
       &.mat-background-accent {
-        $tokens: m2-tabs.get-color-tokens($theme, secondary);
-        @include token-utils.create-token-values-mixed((
-          tab-background-color: map.get($tokens, background-color),
-          tab-foreground-color: map.get($tokens, foreground-color),
+        $tokens: m2-tabs.private-get-color-palette-color-tokens($theme, secondary);
+        @include token-utils.values((
+          tab-background-color: map.get($tokens, tab-background-color),
+          tab-foreground-color: map.get($tokens, tab-foreground-color),
         ));
       }
 
       &.mat-background-warn {
-        $tokens: m2-tabs.get-color-tokens($theme, error);
-        @include token-utils.create-token-values-mixed((
-          tab-background-color: map.get($tokens, background-color),
-          tab-foreground-color: map.get($tokens, foreground-color),
+        $tokens: m2-tabs.private-get-color-palette-color-tokens($theme, error);
+        @include token-utils.values((
+          tab-background-color: map.get($tokens, tab-background-color),
+          tab-foreground-color: map.get($tokens, tab-foreground-color),
         ));
       }
     }
@@ -77,10 +71,10 @@
 /// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-tabs.get-tokens($theme), typography));
+    @include token-utils.values(map.get(m3-tabs.get-tokens($theme), typography));
   } @else {
     .mat-mdc-tab-header {
-      @include token-utils.create-token-values-mixed(m2-tabs.get-typography-tokens($theme));
+      @include token-utils.values(map.get(m2-tabs.get-tokens($theme), typography));
     }
   }
 }
@@ -89,10 +83,10 @@
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-tabs.get-tokens($theme), density));
+    @include token-utils.values(map.get(m3-tabs.get-tokens($theme), density));
   } @else {
     .mat-mdc-tab-header {
-      @include token-utils.create-token-values-mixed(m2-tabs.get-density-tokens($theme));
+      @include token-utils.values(map.get(m2-tabs.get-tokens($theme), density));
     }
   }
 }
@@ -117,23 +111,21 @@
 /// @param {Map} $theme The theme to generate styles for.
 /// @param {String} $color-variant The color variant to use for the component (M3 only)
 @mixin theme($theme, $color-variant: null) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-tabs') {
-    @if inspection.get-theme-version($theme) == 1 {
-      @include base($theme);
-      @include color($theme, $color-variant);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include base($theme);
+    @include color($theme, $color-variant);
+    @include density($theme);
+    @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);
-    } @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);
-      }
     }
   }
 }

package/timepicker/_m2-timepicker.scss

@@ -2,30 +2,18 @@
 @use '../core/tokens/m2-utils';
 @use 'sass:map';
 
-// Tokens that can't be configured through Angular Material's current theming API,
-// but may be in a future version of the theming API.
-@function get-unthemable-tokens() {
-  @return (
-    timepicker-container-shape: 4px,
-    timepicker-container-elevation-shadow: elevation.get-box-shadow(8),
-  );
-}
-
-// Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme) {
+@function get-tokens($theme) {
   $system: m2-utils.get-system($theme);
 
   @return (
-    timepicker-container-background-color: map.get($system, surface)
+    base: (
+      timepicker-container-shape: 4px,
+      timepicker-container-elevation-shadow: elevation.get-box-shadow(8),
+    ),
+    color: (
+      timepicker-container-background-color: map.get($system, surface)
+    ),
+    typography: (),
+    density: (),
   );
 }
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return ();
-}
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  @return ();
-}

package/timepicker/_timepicker-theme.scss

@@ -1,60 +1,44 @@
 @use 'sass:map';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/typography/typography';
-@use '../core/style/sass-utils';
 @use './m2-timepicker';
 @use './m3-timepicker';
 @use '../core/tokens/token-utils';
 
-/// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
-/// for the mat-timepicker.
-/// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: map.get(m2-timepicker.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-timepicker.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-timepicker.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-timepicker.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
-/// Outputs color theme styles for the mat-timepicker.
-/// @param {Map} $theme The theme to generate color styles for.
 @mixin color($theme) {
+  $tokens: map.get(m2-timepicker.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-timepicker.get-tokens($theme), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-timepicker.get-color-tokens($theme));
-    }
+    $tokens: map.get(m3-timepicker.get-tokens($theme), color);
   }
+
+  @include token-utils.values($tokens);
 }
 
-/// Outputs typography theme styles for the mat-timepicker.
-/// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: map.get(m2-timepicker.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-timepicker.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-timepicker.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-timepicker.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
-/// Outputs density theme styles for the mat-timepicker.
-/// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: map.get(m2-timepicker.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-timepicker.get-tokens($theme), density));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-timepicker.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-timepicker.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -77,23 +61,21 @@
 /// @param {Map} $theme The theme to generate styles for.
 /// @param {String} $color-variant The color variant to use for the component
 @mixin theme($theme, $color-variant: null) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-timepicker') {
-    @if inspection.get-theme-version($theme) == 1 {
-      @include base($theme);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include base($theme);
+    @include color($theme);
+    @include density($theme);
+    @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);
-    } @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);
-      }
     }
   }
 }

package/toolbar/_m2-toolbar.scss

@@ -1,56 +1,36 @@
 @use 'sass:map';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m2-utils';
 
-// Tokens that can't be configured through Angular Material's current theming API,
-// but may be in a future version of the theming API.
-@function get-unthemable-tokens() {
-  @return ();
-}
-
-// Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme) {
+@function get-tokens($theme) {
   $system: m2-utils.get-system($theme);
-  @return private-get-color-palette-color-tokens(
-    $background-color: map.get($system, surface),
-    $text-color: map.get($system, on-surface),
-  );
-}
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return (
-    toolbar-title-text-font: inspection.get-theme-typography($theme, headline-6, font-family),
-    toolbar-title-text-line-height:
-        inspection.get-theme-typography($theme, headline-6, line-height),
-    toolbar-title-text-size: inspection.get-theme-typography($theme, headline-6, font-size),
-    toolbar-title-text-tracking:
-        inspection.get-theme-typography($theme, headline-6, letter-spacing),
-    toolbar-title-text-weight: inspection.get-theme-typography($theme, headline-6, font-weight),
-  );
-}
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  $density-scale: theming.clamp-density(inspection.get-theme-density($theme), -3);
-  $standard-scale: (
-    0: 64px,
-    -1: 60px,
-    -2: 56px,
-    -3: 52px,
-  );
-
-  $mobile-scale: (
-    0: 56px,
-    -1: 52px,
-    -2: 48px,
-    -3: 44px,
-  );
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -3);
 
   @return (
-    toolbar-standard-height: map.get($standard-scale, $density-scale),
-    toolbar-mobile-height: map.get($mobile-scale, $density-scale),
+    base: (),
+    color: private-get-color-palette-color-tokens(
+        map.get($system, surface), map.get($system, on-surface)),
+    typography: (
+      toolbar-title-text-font: map.get($system, title-small-font),
+      toolbar-title-text-line-height: map.get($system, title-small-line-height),
+      toolbar-title-text-size: map.get($system, title-small-size),
+      toolbar-title-text-tracking: map.get($system, title-small-tracking),
+      toolbar-title-text-weight: map.get($system, title-small-weight),
+    ),
+    density: (
+      toolbar-standard-height: map.get((
+        0: 64px,
+        -1: 60px,
+        -2: 56px,
+        -3: 52px,
+      ), $density-scale),
+      toolbar-mobile-height: map.get((
+        0: 56px,
+        -1: 52px,
+        -2: 48px,
+        -3: 44px,
+      ), $density-scale),
+    ),
   );
 }
 

package/toolbar/_m3-toolbar.scss

@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-toolbar.
@@ -26,7 +25,7 @@
       toolbar-title-text-tracking: map.get($system, title-large-tracking),
       toolbar-title-text-weight: map.get($system, title-large-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 

package/toolbar/_toolbar-theme.scss

@@ -1,70 +1,81 @@
 @use 'sass:map';
-@use '../core/style/sass-utils';
 @use '../core/theming/inspection';
-@use '../core/theming/theming';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
 @use './m2-toolbar';
 @use './m3-toolbar';
 
 @mixin _palette-styles($theme, $palette-name) {
-  @include token-utils.create-token-values-mixed(
-    m2-toolbar.private-get-color-palette-color-tokens(
-      $background-color: inspection.get-theme-color($theme, $palette-name),
-      $text-color: inspection.get-theme-color($theme, $palette-name, default-contrast)
-    )
+  $tokens: m2-toolbar.private-get-color-palette-color-tokens(
+    $background-color: inspection.get-theme-color($theme, $palette-name),
+    $text-color: inspection.get-theme-color($theme, $palette-name, default-contrast)
   );
+  @include token-utils.values($tokens);
 }
 
 @mixin base($theme) {
+  $tokens: map.get(m2-toolbar.get-tokens($theme), base);
+  @if inspection.get-theme-version($theme) == 1 {
+    $tokens: map.get(m3-toolbar.get-tokens($theme), base);
+  }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin color($theme) {
+  $tokens: map.get(m2-toolbar.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-toolbar.get-tokens($theme), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-toolbar.get-color-tokens($theme));
-    }
+    $tokens: map.get(m3-toolbar.get-tokens($theme), color);
+  }
+
+  @include token-utils.values($tokens);
 
+  @if inspection.get-theme-version($theme) != 1 {
     .mat-toolbar {
       &.mat-primary {
-        @include _palette-styles($theme, primary);
+        $tokens: m2-toolbar.private-get-color-palette-color-tokens(
+          $background-color: inspection.get-theme-color($theme, primary),
+          $text-color: inspection.get-theme-color($theme, primary, default-contrast)
+        );
+        @include token-utils.values($tokens);
       }
 
       &.mat-accent {
-        @include _palette-styles($theme, accent);
+        $tokens: m2-toolbar.private-get-color-palette-color-tokens(
+          $background-color: inspection.get-theme-color($theme, accent),
+          $text-color: inspection.get-theme-color($theme, accent, default-contrast)
+        );
+        @include token-utils.values($tokens);
       }
 
       &.mat-warn {
-        @include _palette-styles($theme, warn);
+        $tokens: m2-toolbar.private-get-color-palette-color-tokens(
+          $background-color: inspection.get-theme-color($theme, warn),
+          $text-color: inspection.get-theme-color($theme, warn, default-contrast)
+        );
+        @include token-utils.values($tokens);
       }
     }
   }
 }
 
-@mixin typography($theme) {
-  @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-toolbar.get-tokens($theme), typography));
-  } @else {
-    // TODO(mmalerba): Stop calling this and resolve resulting screen diffs.
-    $theme: inspection.private-get-typography-back-compat-theme($theme);
-
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-toolbar.get-typography-tokens($theme));
+  @mixin typography($theme) {
+    $tokens: map.get(m2-toolbar.get-tokens($theme), typography);
+    @if inspection.get-theme-version($theme) == 1 {
+      $tokens: map.get(m3-toolbar.get-tokens($theme), typography);
     }
+
+    @include token-utils.values($tokens);
   }
-}
 
-@mixin density($theme) {
-  @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-toolbar.get-tokens($theme), density));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-toolbar.get-density-tokens($theme));
+  @mixin density($theme) {
+    $tokens: map.get(m2-toolbar.get-tokens($theme), density);
+    @if inspection.get-theme-version($theme) == 1 {
+      $tokens: map.get(m3-toolbar.get-tokens($theme), density);
     }
+
+    @include token-utils.values($tokens);
   }
-}
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
 @function _define-overrides() {
@@ -83,23 +94,21 @@
 }
 
 @mixin theme($theme) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-toolbar') {
-    @if inspection.get-theme-version($theme) == 1 {
-      @include base($theme);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include base($theme);
+    @include color($theme);
+    @include density($theme);
+    @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);
-    } @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);
-      }
     }
   }
 }