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

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

@@ -1,6 +1,4 @@
-@use '../core/style/sass-utils';
 @use '../core/theming/inspection';
-@use '../core/theming/theming';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
 @use './m2-button-toggle';
@@ -11,14 +9,12 @@
 /// for the mat-button-toggle.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: map.get(m2-button-toggle.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-button-toggle.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-          m2-button-toggle.get-unthemable-tokens($theme));
-    }
+    $tokens: map.get(m3-button-toggle.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-button-toggle.
@@ -26,43 +22,34 @@
 /// @param {String} $color-variant: The color variant to use for the button toggle: primary,
 ///        secondary, tertiary, or error (If not specified, default secondary color will be used).
 @mixin color($theme, $color-variant: null) {
+  $tokens: map.get(m2-button-toggle.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-button-toggle.get-tokens($theme, $color-variant), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-button-toggle.get-color-tokens($theme)
-      );
-    }
+    $tokens: map.get(m3-button-toggle.get-tokens($theme, $color-variant), color);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs typography theme styles for the mat-button-toggle.
 /// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: map.get(m2-button-toggle.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-button-toggle.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-          m2-button-toggle.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-button-toggle.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs density theme styles for the mat-button-toggle.
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: map.get(m2-button-toggle.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-button-toggle.get-tokens($theme), density));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-button-toggle.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-button-toggle.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -86,23 +73,21 @@
 /// @param {String} $color-variant: The color variant to use for the button toggle: primary,
 ///   secondary, tertiary, or error (If not specified, default secondary color will be used).
 @mixin theme($theme, $color-variant: null) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-button-toggle') {
-    @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/button-toggle/_m2-button-toggle.scss

@@ -1,91 +1,68 @@
 @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.
-@function get-unthemable-tokens($theme) {
+@function get-tokens($theme) {
   $system: m2-utils.get-system($theme);
-  @return (
-    button-toggle-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
-    button-toggle-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
-    button-toggle-legacy-focus-state-layer-opacity: 1,
-    button-toggle-legacy-height: 36px,
-    button-toggle-legacy-shape: 2px,
-    button-toggle-shape: 4px,
-  );
-}
-
-// Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme) {
-  $system: m2-utils.get-system($theme);
-
-  @return (
-    button-toggle-background-color: map.get($system, surface),
-    button-toggle-disabled-selected-state-background-color:
-        m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
-    button-toggle-disabled-selected-state-text-color:
-        m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
-    button-toggle-disabled-state-background-color: map.get($system, surface),
-    button-toggle-disabled-state-text-color:
-        m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
-    button-toggle-divider-color: map.get($system, outline),
-    button-toggle-legacy-disabled-selected-state-background-color:
-        m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
-    button-toggle-legacy-disabled-state-background-color: map.get($system, surface),
-    button-toggle-legacy-disabled-state-text-color:
-        m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
-    button-toggle-legacy-selected-state-background-color:
-        m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
-    button-toggle-legacy-selected-state-text-color: map.get($system, on-surface),
-    button-toggle-legacy-state-layer-color:
-        m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
-    button-toggle-legacy-text-color: map.get($system, on-surface),
-    button-toggle-selected-state-background-color:
-        m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
-    button-toggle-selected-state-text-color: map.get($system, on-surface),
-    button-toggle-state-layer-color: map.get($system, on-surface),
-    button-toggle-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 (
-    button-toggle-label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
-    button-toggle-label-text-line-height:
-        inspection.get-theme-typography($theme, body-1, line-height),
-    button-toggle-label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
-    button-toggle-label-text-tracking:
-        inspection.get-theme-typography($theme, body-1, letter-spacing),
-    button-toggle-label-text-weight: inspection.get-theme-typography($theme, body-1, font-weight),
-    button-toggle-legacy-label-text-font:
-        inspection.get-theme-typography($theme, body-1, font-family),
-    button-toggle-legacy-label-text-line-height:
-        inspection.get-theme-typography($theme, body-1, line-height),
-    button-toggle-legacy-label-text-size:
-        inspection.get-theme-typography($theme, body-1, font-size),
-    button-toggle-legacy-label-text-tracking:
-        inspection.get-theme-typography($theme, body-1, letter-spacing),
-    button-toggle-legacy-label-text-weight:
-        inspection.get-theme-typography($theme, body-1, 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), -4);
-  $size-scale: (
-    0: 48px,
-    -1: 44px,
-    -2: 40px,
-    -3: 36px,
-    -4: 24px,
-  );
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -4);
 
   @return (
-    button-toggle-height: map.get($size-scale, $density-scale)
+    base: (
+      button-toggle-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
+      button-toggle-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      button-toggle-legacy-focus-state-layer-opacity: 1,
+      button-toggle-legacy-height: 36px,
+      button-toggle-legacy-shape: 2px,
+      button-toggle-shape: 4px,
+    ),
+    color: (
+      button-toggle-background-color: map.get($system, surface),
+      button-toggle-disabled-selected-state-background-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
+      button-toggle-disabled-selected-state-text-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      button-toggle-disabled-state-background-color: map.get($system, surface),
+      button-toggle-disabled-state-text-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      button-toggle-divider-color: map.get($system, outline),
+      button-toggle-legacy-disabled-selected-state-background-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
+      button-toggle-legacy-disabled-state-background-color: map.get($system, surface),
+      button-toggle-legacy-disabled-state-text-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      button-toggle-legacy-selected-state-background-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
+      button-toggle-legacy-selected-state-text-color: map.get($system, on-surface),
+      button-toggle-legacy-state-layer-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
+      button-toggle-legacy-text-color: map.get($system, on-surface),
+      button-toggle-selected-state-background-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
+      button-toggle-selected-state-text-color: map.get($system, on-surface),
+      button-toggle-state-layer-color: map.get($system, on-surface),
+      button-toggle-text-color: map.get($system, on-surface),
+    ),
+    typography: (
+      button-toggle-label-text-font: map.get($system, body-large-font),
+      button-toggle-label-text-line-height: map.get($system, body-large-line-height),
+      button-toggle-label-text-size: map.get($system, body-large-size),
+      button-toggle-label-text-tracking: map.get($system, body-large-tracking),
+      button-toggle-label-text-weight: map.get($system, body-large-weight),
+      button-toggle-legacy-label-text-font: map.get($system, body-large-font),
+      button-toggle-legacy-label-text-line-height: map.get($system, body-large-line-height),
+      button-toggle-legacy-label-text-size: map.get($system, body-large-size),
+      button-toggle-legacy-label-text-tracking: map.get($system, body-large-tracking),
+      button-toggle-legacy-label-text-weight: map.get($system, body-large-weight),
+    ),
+    density: (
+      button-toggle-height: map.get((
+        0: 48px,
+        -1: 44px,
+        -2: 40px,
+        -3: 36px,
+        -4: 24px,
+      ), $density-scale)
+    ),
   );
 }

package/button-toggle/_m3-button-toggle.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-button-toggle.
@@ -56,7 +55,7 @@
       button-toggle-legacy-state-layer-color: null,
       button-toggle-legacy-text-color: null,
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 
   @return $tokens;

package/card/_card-theme.scss

@@ -1,6 +1,4 @@
 @use 'sass:map';
-@use '../core/style/sass-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/typography/typography';
 @use '../core/tokens/token-utils';
@@ -8,43 +6,39 @@
 @use './m3-card';
 
 @mixin base($theme) {
+  $tokens: map.get(m2-card.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-card.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-card.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-card.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin color($theme) {
+  $tokens: map.get(m2-card.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-card.get-tokens($theme), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-card.get-color-tokens($theme));
-    }
+    $tokens: map.get(m3-card.get-tokens($theme), color);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin typography($theme) {
+  $tokens: map.get(m2-card.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-card.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-card.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-card.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin density($theme) {
+  $tokens: map.get(m2-card.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-card.get-tokens($theme), density));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-card.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-card.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -62,23 +56,21 @@
 }
 
 @mixin theme($theme) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-card') {
-    @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/card/_m2-card.scss

@@ -1,54 +1,39 @@
-@use '../core/theming/inspection';
 @use '../core/style/elevation';
 @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 (
-    card-elevated-container-shape: 4px,
-    card-outlined-container-shape: 4px,
-    card-filled-container-shape: 4px,
-    card-outlined-outline-width: 1px,
-  );
-}
-
-// 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 (
-    card-elevated-container-color: map.get($system, surface),
-    card-elevated-container-elevation: elevation.get-box-shadow(1),
-    card-outlined-container-color: map.get($system, surface),
-    card-outlined-container-elevation: elevation.get-box-shadow(0),
-    card-outlined-outline-color: map.get($system, outline),
-    card-subtitle-text-color: map.get($system, on-surface-variant),
-    card-filled-container-color: map.get($system, surface),
-    card-filled-container-elevation: elevation.get-box-shadow(0)
-  );
-}
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return (
-    card-title-text-font: inspection.get-theme-typography($theme, headline-6, font-family),
-    card-title-text-line-height: inspection.get-theme-typography($theme, headline-6, line-height),
-    card-title-text-size: inspection.get-theme-typography($theme, headline-6, font-size),
-    card-title-text-tracking: inspection.get-theme-typography($theme, headline-6, letter-spacing),
-    card-title-text-weight: inspection.get-theme-typography($theme, headline-6, font-weight),
-    card-subtitle-text-font: inspection.get-theme-typography($theme, subtitle-2, font-family),
-    card-subtitle-text-line-height:
-        inspection.get-theme-typography($theme, subtitle-2, line-height),
-    card-subtitle-text-size: inspection.get-theme-typography($theme, subtitle-2, font-size),
-    card-subtitle-text-tracking:
-        inspection.get-theme-typography($theme, subtitle-2, letter-spacing),
-    card-subtitle-text-weight: inspection.get-theme-typography($theme, subtitle-2, font-weight),
+    base: (
+      card-elevated-container-shape: 4px,
+      card-outlined-container-shape: 4px,
+      card-filled-container-shape: 4px,
+      card-outlined-outline-width: 1px,
+    ),
+    color: (
+      card-elevated-container-color: map.get($system, surface),
+      card-elevated-container-elevation: elevation.get-box-shadow(1),
+      card-outlined-container-color: map.get($system, surface),
+      card-outlined-container-elevation: elevation.get-box-shadow(0),
+      card-outlined-outline-color: map.get($system, outline),
+      card-subtitle-text-color: map.get($system, on-surface-variant),
+      card-filled-container-color: map.get($system, surface),
+      card-filled-container-elevation: elevation.get-box-shadow(0)
+    ),
+    typography: (
+      card-title-text-font: map.get($system, title-small-font),
+      card-title-text-line-height: map.get($system, title-small-line-height),
+      card-title-text-size: map.get($system, title-small-size),
+      card-title-text-tracking: map.get($system, title-small-tracking),
+      card-title-text-weight: map.get($system, title-small-weight),
+      card-subtitle-text-font: map.get($system, label-medium-font),
+      card-subtitle-text-line-height: map.get($system, label-medium-line-height),
+      card-subtitle-text-size: map.get($system, label-medium-size),
+      card-subtitle-text-tracking: map.get($system, label-medium-tracking),
+      card-subtitle-text-weight: map.get($system, label-medium-weight),
+    ),
+    density: (),
   );
 }
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  @return ();
-}

package/checkbox/_checkbox-theme.scss

@@ -1,5 +1,3 @@
-@use '../core/style/sass-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
@@ -11,69 +9,60 @@
 /// for the mat-checkbox.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: map.get(m2-checkbox.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-checkbox.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-checkbox.get-unthemable-tokens($theme));
-    }
+    $tokens: map.get(m3-checkbox.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-checkbox.
 /// @param {Map} $theme The theme to generate color styles for.
 /// @param {String} $color-variant The color variant to use for the component
 @mixin color($theme, $color-variant: null) {
+  $tokens: map.get(m2-checkbox.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-checkbox.get-tokens($theme, $color-variant), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-          m2-checkbox.get-color-tokens($theme, secondary));
-    }
+    $tokens: map.get(m3-checkbox.get-tokens($theme, $color-variant), color);
+  }
+
+  @include token-utils.values($tokens);
 
+  @if inspection.get-theme-version($theme) != 1 {
     .mat-mdc-checkbox {
       &.mat-primary {
-        @include token-utils.create-token-values-mixed(
-            m2-checkbox.get-color-tokens($theme, primary,
-                $exclude: (checkbox-disabled-label-color, checkbox-label-text-color))
+        @include token-utils.values(m2-checkbox.private-get-color-palette-color-tokens(
+            $theme, primary,
+            $exclude: (checkbox-disabled-label-color, checkbox-label-text-color))
         );
       }
 
       &.mat-warn {
-        @include token-utils.create-token-values-mixed(
-          m2-checkbox.get-color-tokens($theme, error,
-              $exclude: (checkbox-disabled-label-color, checkbox-label-text-color))
+        @include token-utils.values(m2-checkbox.private-get-color-palette-color-tokens(
+            $theme, error,
+            $exclude: (checkbox-disabled-label-color, checkbox-label-text-color))
         );
       }
     }
   }
 }
 
-/// Outputs typography theme styles for the mat-checkbox.
-/// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: map.get(m2-checkbox.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-checkbox.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-checkbox.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-checkbox.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
-/// Outputs density theme styles for the mat-checkbox.
-/// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: map.get(m2-checkbox.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-checkbox.get-tokens($theme), density));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-checkbox.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-checkbox.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -96,23 +85,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-checkbox') {
-    @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);
-      }
     }
   }
 }