@angular/material 20.1.0-next.1 → 20.1.0-next.2

package/button/_fab-theme.scss

@@ -1,5 +1,3 @@
-@use '../core/style/sass-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use './m2-fab';
 @use './m3-fab';
@@ -11,23 +9,12 @@
 /// for the mat-fab.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: m2-fab.get-unthemable-tokens();
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-fab.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-fab.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-fab.get-tokens($theme), base);
   }
-}
 
-@mixin _fab-variant($theme, $palette) {
-  $mat-tokens: if(
-    $palette,
-    m2-fab.private-get-color-palette-color-tokens($theme, $palette),
-    m2-fab.get-color-tokens($theme)
-  );
-
-  @include token-utils.create-token-values-mixed($mat-tokens);
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-fab.
@@ -35,25 +22,28 @@
 /// @param {ArgList} $color-variant: The color variant to use for the fab: primary, secondary,
 //          or tertiary. (If not specified, default primary color will be used).
 @mixin color($theme, $color-variant: null) {
+  $tokens: m2-fab.get-color-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-fab.get-tokens($theme, $color-variant), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include _fab-variant($theme, null);
+    $tokens: map.get(m3-fab.get-tokens($theme, $color-variant), color);
+  }
+
+  @include token-utils.values($tokens);
 
-      .mat-mdc-fab, .mat-mdc-mini-fab {
-        &.mat-primary {
-          @include _fab-variant($theme, primary);
-        }
+  @if inspection.get-theme-version($theme) != 1 {
+    .mat-mdc-fab, .mat-mdc-mini-fab {
+      &.mat-primary {
+        $tokens: m2-fab.private-get-color-palette-color-tokens($theme, primary);
+        @include token-utils.values($tokens);
+      }
 
-        &.mat-accent {
-          @include _fab-variant($theme, secondary);
-        }
+      &.mat-accent {
+        $tokens: m2-fab.private-get-color-palette-color-tokens($theme, secondary);
+        @include token-utils.values($tokens);
+      }
 
-        &.mat-warn {
-          @include _fab-variant($theme, error);
-        }
+      &.mat-warn {
+        $tokens: m2-fab.private-get-color-palette-color-tokens($theme, error);
+        @include token-utils.values($tokens);
       }
     }
   }
@@ -62,25 +52,23 @@
 /// Outputs typography theme styles for the mat-fab.
 /// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: m2-fab.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-fab.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-fab.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-fab.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs density theme styles for the mat-fab.
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: m2-fab.get-density-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-fab.get-tokens($theme), density));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-fab.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-fab.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -103,23 +91,21 @@
 /// @param {Map} $theme The theme to generate styles for.
 /// @param {String} $color-variant: The color variant to use for the fab
 @mixin theme($theme, $color-variant: null) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-fab') {
-    @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/_icon-button-theme.scss

@@ -2,30 +2,16 @@
 @use 'sass:math';
 @use './m2-icon-button';
 @use './m3-icon-button';
-@use '../core/style/sass-utils';
 @use '../core/tokens/token-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 
 @mixin base($theme) {
+  $tokens: m2-icon-button.get-unthemable-tokens();
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-icon-button.get-tokens($theme), base));
-  } @else {
-    // 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(m2-icon-button.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-icon-button.get-tokens($theme), base);
   }
-}
-
-@mixin _m2-icon-button-variant($theme, $palette) {
-  $mat-tokens: if(
-    $palette,
-    m2-icon-button.private-get-color-palette-color-tokens($theme, $palette),
-    m2-icon-button.get-color-tokens($theme)
-  );
 
-  @include token-utils.create-token-values-mixed($mat-tokens);
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-icon-button.
@@ -33,45 +19,45 @@
 /// @param {String} $color-variant: The color variant to use for the
 //         button: primary, secondary, tertiary, or error.
 @mixin color($theme, $color-variant: null) {
+  $tokens: m2-icon-button.get-color-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-icon-button.get-tokens($theme, $color-variant), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include _m2-icon-button-variant($theme, null);
+    $tokens: map.get(m3-icon-button.get-tokens($theme, $color-variant), color);
+  }
+
+  @include token-utils.values($tokens);
 
-      .mat-mdc-icon-button {
-        &.mat-primary {
-          @include _m2-icon-button-variant($theme, primary);
-        }
+  @if inspection.get-theme-version($theme) != 1 {
+    .mat-mdc-icon-button {
+      &.mat-primary {
+        $tokens: m2-icon-button.private-get-color-palette-color-tokens($theme, primary);
+        @include token-utils.values($tokens);
+      }
 
-        &.mat-accent {
-          @include _m2-icon-button-variant($theme, secondary);
-        }
+      &.mat-accent {
+        $tokens: m2-icon-button.private-get-color-palette-color-tokens($theme, secondary);
+        @include token-utils.values($tokens);
+      }
 
-        &.mat-warn {
-          @include _m2-icon-button-variant($theme, error);
-        }
+      &.mat-warn {
+        $tokens: m2-icon-button.private-get-color-palette-color-tokens($theme, error);
+        @include token-utils.values($tokens);
       }
     }
   }
 }
 
 @mixin typography($theme) {
+  $tokens: m2-icon-button.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-icon-button.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-icon-button.get-typography-tokens($theme)
-      );
-    }
+    $tokens: map.get(m3-icon-button.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-icon-button.get-tokens($theme), density));
+    @include token-utils.values(map.get(m3-icon-button.get-tokens($theme), density));
   } @else {
     $icon-size: 24px;
     $density-scale: inspection.get-theme-density($theme);
@@ -85,12 +71,10 @@
     );
     $calculated-size: map.get($size-map, $density-scale);
 
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-          m2-icon-button.get-density-tokens(
-              $theme, $exclude: (icon-button-state-layer-size))
-      );
-    }
+    @include token-utils.values(
+        m2-icon-button.get-density-tokens(
+            $theme, $exclude: (icon-button-state-layer-size))
+    );
 
     // Use `mat-mdc-button-base` to increase the specificity over the button's structural styles.
     .mat-mdc-icon-button.mat-mdc-button-base {
@@ -130,7 +114,6 @@
 /// @param {String} $color-variant: The color variant to use for the button: primary,
 //         secondary, tertiary, or error.
 @mixin theme($theme, $color-variant: null) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-icon-button') {
     @if inspection.get-theme-version($theme) == 1 {
       @include base($theme);
       @include color($theme, $color-variant);
@@ -146,7 +129,6 @@
       }
       @if inspection.theme-has($theme, typography) {
         @include typography($theme);
-      }
     }
   }
 }

package/button/_m2-button.scss

@@ -143,38 +143,34 @@
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
-  $font-family: inspection.get-theme-typography($theme, button, font-family);
-  $font-size: inspection.get-theme-typography($theme, button, font-size);
-  $font-weight: inspection.get-theme-typography($theme, button, font-weight);
-  $letter-spacing: inspection.get-theme-typography($theme, button, letter-spacing);
-  $text-transform: none;
+  $system: m2-utils.get-system($theme);
 
   @return (
-    button-filled-label-text-font: $font-family,
-    button-filled-label-text-size: $font-size,
-    button-filled-label-text-tracking: $letter-spacing,
+    button-filled-label-text-font: map.get($system, label-small-font),
+    button-filled-label-text-size: map.get($system, label-small-size),
+    button-filled-label-text-tracking: map.get($system, label-small-tracking),
     button-filled-label-text-transform: none,
-    button-filled-label-text-weight: $font-weight,
-    button-outlined-label-text-font: $font-family,
-    button-outlined-label-text-size: $font-size,
-    button-outlined-label-text-tracking: $letter-spacing,
+    button-filled-label-text-weight: map.get($system, label-small-weight),
+    button-outlined-label-text-font: map.get($system, label-small-font),
+    button-outlined-label-text-size: map.get($system, label-small-size),
+    button-outlined-label-text-tracking: map.get($system, label-small-tracking),
     button-outlined-label-text-transform: none,
-    button-outlined-label-text-weight: $font-weight,
-    button-protected-label-text-font: $font-family,
-    button-protected-label-text-size: $font-size,
-    button-protected-label-text-tracking: $letter-spacing,
+    button-outlined-label-text-weight: map.get($system, label-small-weight),
+    button-protected-label-text-font: map.get($system, label-small-font),
+    button-protected-label-text-size: map.get($system, label-small-size),
+    button-protected-label-text-tracking: map.get($system, label-small-tracking),
     button-protected-label-text-transform: none,
-    button-protected-label-text-weight: $font-weight,
-    button-text-label-text-font: $font-family,
-    button-text-label-text-size: $font-size,
-    button-text-label-text-tracking: $letter-spacing,
+    button-protected-label-text-weight: map.get($system, label-small-weight),
+    button-text-label-text-font: map.get($system, label-small-font),
+    button-text-label-text-size: map.get($system, label-small-size),
+    button-text-label-text-tracking: map.get($system, label-small-tracking),
     button-text-label-text-transform: none,
-    button-text-label-text-weight: $font-weight,
-    button-tonal-label-text-font: $font-family,
-    button-tonal-label-text-size: $font-size,
-    button-tonal-label-text-tracking: $letter-spacing,
+    button-text-label-text-weight: map.get($system, label-small-weight),
+    button-tonal-label-text-font: map.get($system, label-small-font),
+    button-tonal-label-text-size: map.get($system, label-small-size),
+    button-tonal-label-text-tracking: map.get($system, label-small-tracking),
     button-tonal-label-text-transform: none,
-    button-tonal-label-text-weight: $font-weight,
+    button-tonal-label-text-weight: map.get($system, label-small-weight),
   );
 }
 

package/button/_m2-fab.scss

@@ -82,12 +82,12 @@
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
+  $system: m2-utils.get-system($theme);
   @return (
-    fab-extended-label-text-font: inspection.get-theme-typography($theme, button, font-family),
-    fab-extended-label-text-size: inspection.get-theme-typography($theme, button, font-size),
-    fab-extended-label-text-tracking:
-        inspection.get-theme-typography($theme, button, letter-spacing),
-    fab-extended-label-text-weight: inspection.get-theme-typography($theme, button, font-weight)
+    fab-extended-label-text-font: map.get($system, label-small-font),
+    fab-extended-label-text-size: map.get($system, label-small-size),
+    fab-extended-label-text-tracking: map.get($system, label-small-tracking),
+    fab-extended-label-text-weight: map.get($system, label-small-weight)
   );
 }
 

package/button/testing/index.d.ts

@@ -18,6 +18,7 @@ interface ButtonHarnessFilters extends BaseHarnessFilters {
 
 /** Harness for interacting with a mat-button in tests. */
 declare class MatButtonHarness extends ContentContainerComponentHarness {
+    /** Selector for the harness. */
     static hostSelector: string;
     /**
      * Gets a `HarnessPredicate` that can be used to search for a button with specific attributes.

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: m2-button-toggle.get-unthemable-tokens($theme);
   @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: m2-button-toggle.get-color-tokens($theme);
   @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: m2-button-toggle.get-typography-tokens($theme);
   @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: m2-button-toggle.get-density-tokens($theme);
   @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

@@ -53,24 +53,18 @@
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
+  $system: m2-utils.get-system($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),
+    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),
   );
 }
 

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: m2-card.get-unthemable-tokens();
   @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: m2-card.get-color-tokens($theme);
   @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: m2-card.get-typography-tokens($theme);
   @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: m2-card.get-density-tokens($theme);
   @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);
-      }
     }
   }
 }