@angular/material 17.0.0-next.1 → 17.0.0-next.3

package/select/_select-theme.scss

@@ -1,4 +1,3 @@
-@use 'sass:map';
 @use '@material/density' as mdc-density;
 @use '@material/textfield' as mdc-textfield;
 @use '../core/tokens/m2/mat/select' as tokens-mat-select;
@@ -6,43 +5,35 @@
 @use '../core/style/sass-utils';
 
 @use '../core/theming/theming';
+@use '../core/theming/inspection';
 @use '../core/typography/typography';
 
-@mixin color($config-or-theme) {
-  $config: theming.get-color-config($config-or-theme);
-
+@mixin color($theme) {
   @include sass-utils.current-selector-or-root() {
     @include token-utils.create-token-values(tokens-mat-select.$prefix,
-      tokens-mat-select.get-color-tokens($config));
+      tokens-mat-select.get-color-tokens($theme));
 
     .mat-mdc-form-field.mat-accent {
-      $accent: map.get($config, accent);
-      $accent-config: map.merge($config, (primary: $accent));
       @include token-utils.create-token-values(tokens-mat-select.$prefix,
-        tokens-mat-select.get-color-tokens($accent-config));
+        tokens-mat-select.get-color-tokens($theme, accent));
     }
 
     .mat-mdc-form-field.mat-warn {
-      $warn: map.get($config, warn);
-      $warn-config: map.merge($config, (primary: $warn));
       @include token-utils.create-token-values(tokens-mat-select.$prefix,
-        tokens-mat-select.get-color-tokens($warn-config));
+        tokens-mat-select.get-color-tokens($theme, warn));
     }
   }
 }
 
-@mixin typography($config-or-theme) {
-  $config: typography.private-typography-to-2018-config(
-      theming.get-typography-config($config-or-theme));
-
+@mixin typography($theme) {
   @include sass-utils.current-selector-or-root() {
     @include token-utils.create-token-values(tokens-mat-select.$prefix,
-      tokens-mat-select.get-typography-tokens($config));
+      tokens-mat-select.get-typography-tokens($theme));
   }
 }
 
-@mixin density($config-or-theme) {
-  $density-scale: theming.get-density-config($config-or-theme);
+@mixin density($theme) {
+  $density-scale: inspection.get-theme-density($theme);
 
   // Density is clamped at -5 here, because MDC's form field throws an error for anything lower.
   $form-field-height: mdc-density.prop-value(
@@ -61,25 +52,20 @@
 
   @include sass-utils.current-selector-or-root() {
     @include token-utils.create-token-values(tokens-mat-select.$prefix,
-      tokens-mat-select.get-density-tokens($density-scale));
+      tokens-mat-select.get-density-tokens($theme));
   }
 }
 
-@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-select') {
-    $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/sidenav/_sidenav-theme.scss

@@ -1,36 +1,30 @@
 @use '../core/theming/theming';
+@use '../core/theming/inspection';
 @use '../core/tokens/m2/mat/sidenav' as tokens-mat-sidenav;
 @use '../core/tokens/token-utils';
 @use '../core/style/sass-utils';
 
-@mixin color($config-or-theme) {
-  $config: theming.get-color-config($config-or-theme);
-
+@mixin color($theme) {
   @include sass-utils.current-selector-or-root() {
     @include token-utils.create-token-values(tokens-mat-sidenav.$prefix,
-      tokens-mat-sidenav.get-color-tokens($config));
+      tokens-mat-sidenav.get-color-tokens($theme));
   }
 }
 
-@mixin typography($config-or-theme) {}
+@mixin typography($theme) {}
 
-@mixin density($config-or-theme) {}
+@mixin density($theme) {}
 
-@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-sidenav') {
-    $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/slide-toggle/index.d.ts

@@ -1,17 +1,10 @@
-import { _AbstractConstructor } from '@angular/material/core';
 import { AfterContentInit } from '@angular/core';
-import { BooleanInput } from '@angular/cdk/coercion';
-import { CanColor } from '@angular/material/core';
-import { CanDisable } from '@angular/material/core';
-import { CanDisableRipple } from '@angular/material/core';
 import { ChangeDetectorRef } from '@angular/core';
 import { CheckboxRequiredValidator } from '@angular/forms';
-import { _Constructor } from '@angular/material/core';
 import { ControlValueAccessor } from '@angular/forms';
 import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import { FocusMonitor } from '@angular/cdk/a11y';
-import { HasTabIndex } from '@angular/material/core';
 import * as i0 from '@angular/core';
 import * as i3 from '@angular/material/core';
 import * as i4 from '@angular/common';
@@ -48,14 +41,14 @@ export declare const MAT_SLIDE_TOGGLE_VALUE_ACCESSOR: {
     multi: boolean;
 };
 
-export declare class MatSlideToggle extends _MatSlideToggleMixinBase implements OnDestroy, AfterContentInit, ControlValueAccessor, CanDisable, CanColor, HasTabIndex, CanDisableRipple {
+export declare class MatSlideToggle implements OnDestroy, AfterContentInit, ControlValueAccessor {
+    private _elementRef;
     protected _focusMonitor: FocusMonitor;
     protected _changeDetectorRef: ChangeDetectorRef;
     defaults: MatSlideToggleDefaultOptions;
     private _onChange;
     private _onTouched;
     private _uniqueId;
-    private _required;
     private _checked;
     private _createChangeEvent;
     /** Unique ID for the label element. */
@@ -83,15 +76,20 @@ export declare class MatSlideToggle extends _MatSlideToggleMixinBase implements
     /** Used to set the aria-describedby attribute on the underlying input element. */
     ariaDescribedby: string;
     /** Whether the slide-toggle is required. */
-    get required(): boolean;
-    set required(value: BooleanInput);
+    required: boolean;
+    /** Palette color of slide toggle. */
+    color: string | undefined;
+    /** Whether the slide toggle is disabled. */
+    disabled: boolean;
+    /** Whether the slide toggle has a ripple. */
+    disableRipple: boolean;
+    /** Tabindex of slide toggle. */
+    tabIndex: number;
     /** Whether the slide-toggle element is checked or not. */
     get checked(): boolean;
-    set checked(value: BooleanInput);
+    set checked(value: boolean);
     /** Whether to hide the icon inside of the slide toggle. */
-    get hideIcon(): boolean;
-    set hideIcon(value: BooleanInput);
-    private _hideIcon;
+    hideIcon: boolean;
     /** An event will be dispatched each time the slide-toggle changes its value. */
     readonly change: EventEmitter<MatSlideToggleChange>;
     /**
@@ -102,7 +100,7 @@ export declare class MatSlideToggle extends _MatSlideToggleMixinBase implements
     readonly toggleChange: EventEmitter<void>;
     /** Returns the unique id for the visual hidden input. */
     get inputId(): string;
-    constructor(elementRef: ElementRef, _focusMonitor: FocusMonitor, _changeDetectorRef: ChangeDetectorRef, tabIndex: string, defaults: MatSlideToggleDefaultOptions, animationMode?: string);
+    constructor(_elementRef: ElementRef, _focusMonitor: FocusMonitor, _changeDetectorRef: ChangeDetectorRef, tabIndex: string, defaults: MatSlideToggleDefaultOptions, animationMode?: string);
     ngAfterContentInit(): void;
     ngOnDestroy(): void;
     /** Implemented as part of ControlValueAccessor. */
@@ -124,6 +122,12 @@ export declare class MatSlideToggle extends _MatSlideToggleMixinBase implements
     _getAriaLabelledBy(): string | null;
     static ɵfac: i0.ɵɵFactoryDeclaration<MatSlideToggle, [null, null, null, { attribute: "tabindex"; }, null, { optional: true; }]>;
     static ɵcmp: i0.ɵɵComponentDeclaration<MatSlideToggle, "mat-slide-toggle", ["matSlideToggle"], { "disabled": { "alias": "disabled"; "required": false; }; "disableRipple": { "alias": "disableRipple"; "required": false; }; "color": { "alias": "color"; "required": false; }; "tabIndex": { "alias": "tabIndex"; "required": false; }; "name": { "alias": "name"; "required": false; }; "id": { "alias": "id"; "required": false; }; "labelPosition": { "alias": "labelPosition"; "required": false; }; "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "ariaDescribedby": { "alias": "aria-describedby"; "required": false; }; "required": { "alias": "required"; "required": false; }; "checked": { "alias": "checked"; "required": false; }; "hideIcon": { "alias": "hideIcon"; "required": false; }; }, { "change": "change"; "toggleChange": "toggleChange"; }, never, ["*"], false, never>;
+    static ngAcceptInputType_disabled: unknown;
+    static ngAcceptInputType_disableRipple: unknown;
+    static ngAcceptInputType_tabIndex: unknown;
+    static ngAcceptInputType_required: unknown;
+    static ngAcceptInputType_checked: unknown;
+    static ngAcceptInputType_hideIcon: unknown;
 }
 
 /** Change event object emitted by a slide toggle. */
@@ -149,13 +153,6 @@ export declare interface MatSlideToggleDefaultOptions {
     hideIcon?: boolean;
 }
 
-/** @docs-private */
-declare const _MatSlideToggleMixinBase: _Constructor<HasTabIndex> & _AbstractConstructor<HasTabIndex> & _Constructor<CanColor> & _AbstractConstructor<CanColor> & _Constructor<CanDisableRipple> & _AbstractConstructor<CanDisableRipple> & _Constructor<CanDisable> & _AbstractConstructor<CanDisable> & {
-    new (_elementRef: ElementRef): {
-        _elementRef: ElementRef;
-    };
-};
-
 export declare class MatSlideToggleModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatSlideToggleModule, never>;
     static ɵmod: i0.ɵɵNgModuleDeclaration<MatSlideToggleModule, [typeof i2.MatSlideToggle], [typeof _MatSlideToggleRequiredValidatorModule, typeof i3.MatCommonModule, typeof i3.MatRippleModule, typeof i4.CommonModule], [typeof _MatSlideToggleRequiredValidatorModule, typeof i2.MatSlideToggle, typeof i3.MatCommonModule]>;

package/snack-bar/_snack-bar-theme.scss

@@ -1,57 +1,48 @@
 @use '@material/snackbar/snackbar-theme' as mdc-snackbar-theme;
 @use '../core/theming/theming';
+@use '../core/theming/inspection';
 @use '../core/style/sass-utils';
 @use '../core/typography/typography';
 @use '../core/tokens/token-utils';
 @use '../core/tokens/m2/mdc/snack-bar' as tokens-mdc-snack-bar;
 @use '../core/tokens/m2/mat/snack-bar' as tokens-mat-snack-bar;
 
-@mixin base($config-or-theme) {
+@mixin base($theme) {
     // Add default values for tokens not related to color, typography, or density.
   @include sass-utils.current-selector-or-root() {
     @include mdc-snackbar-theme.theme(tokens-mdc-snack-bar.get-unthemable-tokens());
   }
 }
 
-@mixin color($config-or-theme) {
-  $config: theming.get-color-config($config-or-theme);
-
+@mixin color($theme) {
   @include sass-utils.current-selector-or-root() {
-    @include mdc-snackbar-theme.theme(tokens-mdc-snack-bar.get-color-tokens($config));
+    @include mdc-snackbar-theme.theme(tokens-mdc-snack-bar.get-color-tokens($theme));
     @include token-utils.create-token-values(
       tokens-mat-snack-bar.$prefix,
-      tokens-mat-snack-bar.get-color-tokens($config)
+      tokens-mat-snack-bar.get-color-tokens($theme)
     );
   }
 }
 
-@mixin typography($config-or-theme) {
-  $config: typography.private-typography-to-2018-config(
-      theming.get-typography-config($config-or-theme));
-
+@mixin typography($theme) {
   @include sass-utils.current-selector-or-root() {
-    @include mdc-snackbar-theme.theme(tokens-mdc-snack-bar.get-typography-tokens($config));
+    @include mdc-snackbar-theme.theme(tokens-mdc-snack-bar.get-typography-tokens($theme));
   }
 }
 
-@mixin density($config-or-theme) {}
+@mixin density($theme) {}
 
-@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-snack-bar') {
-    $color: theming.get-color-config($theme);
-    $density: theming.get-density-config($theme);
-    $typography: theming.get-typography-config($theme);
-
     @include base($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/sort/_sort-theme.scss

@@ -1,16 +1,12 @@
 @use 'sass:color';
-@use 'sass:map';
 @use 'sass:meta';
 @use '../core/theming/theming';
+@use '../core/theming/inspection';
 
-@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-sort-header-arrow {
-    $table-background: theming.get-color-from-palette($background, 'card');
-    $text-color: theming.get-color-from-palette($foreground, secondary-text);
+    $table-background: inspection.get-theme-color($theme, background, card);
+    $text-color: inspection.get-theme-color($theme, foreground, secondary-text);
 
     // Because the arrow is made up of multiple elements that are stacked on top of each other,
     // we can't use the semi-transparent color from the theme directly. If the value is a color
@@ -28,25 +24,20 @@
   }
 }
 
-@mixin typography($config-or-theme) {}
+@mixin typography($theme) {}
 
-@mixin density($config-or-theme) {}
+@mixin density($theme) {}
 
-@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-sort') {
-    $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/stepper/_stepper-theme.scss

@@ -1,69 +1,51 @@
-@use 'sass:map';
-@use 'sass:math';
 @use '../core/theming/theming';
+@use '../core/theming/inspection';
 @use '../core/typography/typography';
-@use '../core/density/private/compatibility';
 @use '../core/style/sass-utils';
 @use '../core/tokens/token-utils';
 @use '../core/tokens/m2/mat/stepper' as tokens-mat-stepper;
-@use './stepper-variables';
-
-@mixin color($config-or-theme) {
-  $config: theming.get-color-config($config-or-theme);
 
+@mixin color($theme) {
   @include sass-utils.current-selector-or-root() {
     @include token-utils.create-token-values(tokens-mat-stepper.$prefix,
-      tokens-mat-stepper.get-color-tokens($config));
+      tokens-mat-stepper.get-color-tokens($theme));
 
     .mat-step-header.mat-accent {
       @include token-utils.create-token-values(tokens-mat-stepper.$prefix,
-        tokens-mat-stepper.private-get-color-palette-color-tokens(map.get($config, accent)));
+        tokens-mat-stepper.private-get-color-palette-color-tokens($theme, accent));
     }
 
     .mat-step-header.mat-warn {
       @include token-utils.create-token-values(tokens-mat-stepper.$prefix,
-        tokens-mat-stepper.private-get-color-palette-color-tokens(map.get($config, warn)));
+        tokens-mat-stepper.private-get-color-palette-color-tokens($theme, warn));
     }
   }
 }
 
-@mixin typography($config-or-theme) {
-  $config: typography.private-typography-to-2014-config(
-      theming.get-typography-config($config-or-theme));
-
+@mixin typography($theme) {
   @include sass-utils.current-selector-or-root() {
     @include token-utils.create-token-values(tokens-mat-stepper.$prefix,
-      tokens-mat-stepper.get-typography-tokens($config));
+      tokens-mat-stepper.get-typography-tokens($theme));
   }
 }
 
-@mixin density($config-or-theme) {
-  $density-scale: theming.get-density-config($config-or-theme);
-  $height: compatibility.private-density-prop-value(stepper-variables.$density-config,
-    $density-scale, height);
-  $vertical-padding: math.div($height - stepper-variables.$label-header-height, 2);
-
+@mixin density($theme) {
   @include sass-utils.current-selector-or-root() {
     @include token-utils.create-token-values(tokens-mat-stepper.$prefix,
-      tokens-mat-stepper.get-density-tokens($density-scale));
+      tokens-mat-stepper.get-density-tokens($theme));
   }
 }
 
-@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-stepper') {
-    $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/table/_table-theme.scss

@@ -1,5 +1,6 @@
 @use '../core/tokens/m2/mat/table' as tokens-mat-table;
 @use '../core/theming/theming';
+@use '../core/theming/inspection';
 @use '../core/typography/typography';
 @use '../core/tokens/token-utils';
 
@@ -14,49 +15,37 @@
   }
 }
 
-@mixin color($config-or-theme) {
-  $config: theming.get-color-config($config-or-theme);
-
+@mixin color($theme) {
   @include _output-tokens {
     @include token-utils.create-token-values(tokens-mat-table.$prefix,
-      tokens-mat-table.get-color-tokens($config));
+      tokens-mat-table.get-color-tokens($theme));
   }
 }
 
-@mixin typography($config-or-theme) {
-  $config: typography.private-typography-to-2018-config(
-      theming.get-typography-config($config-or-theme));
-
+@mixin typography($theme) {
   @include _output-tokens {
     @include token-utils.create-token-values(tokens-mat-table.$prefix,
-      tokens-mat-table.get-typography-tokens($config));
+      tokens-mat-table.get-typography-tokens($theme));
   }
 }
 
-@mixin density($config-or-theme) {
-  $density-scale: theming.get-density-config($config-or-theme);
-
+@mixin density($theme) {
   @include _output-tokens {
     @include token-utils.create-token-values(tokens-mat-table.$prefix,
-      tokens-mat-table.get-density-tokens($density-scale));
+      tokens-mat-table.get-density-tokens($theme));
   }
 }
 
-@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-table') {
-    $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/tabs/_tabs-theme.scss

@@ -1,4 +1,3 @@
-@use 'sass:map';
 @use '@material/tab-indicator/tab-indicator-theme' as mdc-tab-indicator-theme;
 @use '@material/tab/tab-theme' as mdc-tab-theme;
 @use '../core/tokens/m2/mdc/tab' as tokens-mdc-tab;
@@ -6,99 +5,86 @@
 @use '../core/tokens/m2/mat/tab-header' as tokens-mat-tab-header;
 @use '../core/tokens/m2/mat/tab-header-with-background' as tokens-mat-tab-header-with-background;
 @use '../core/theming/theming';
+@use '../core/theming/inspection';
 @use '../core/typography/typography';
 @use '../core/tokens/token-utils';
 
-
-@mixin color($config-or-theme) {
-  $config: theming.get-color-config($config-or-theme);
-
+@mixin color($theme) {
   .mat-mdc-tab-group, .mat-mdc-tab-nav-bar {
-    @include _palette-styles($config, primary);
+    @include _palette-styles($theme, primary);
 
     &.mat-accent {
-      @include _palette-styles($config, accent);
+      @include _palette-styles($theme, accent);
     }
 
     &.mat-warn {
-      @include _palette-styles($config, warn);
+      @include _palette-styles($theme, warn);
     }
 
     &.mat-background-primary {
-      @include _background-styles($config, primary);
+      @include _background-styles($theme, primary);
     }
 
     &.mat-background-accent {
-      @include _background-styles($config, accent);
+      @include _background-styles($theme, accent);
     }
 
     &.mat-background-warn {
-      @include _background-styles($config, warn);
+      @include _background-styles($theme, warn);
     }
   }
 }
 
-@mixin _background-styles($initial-config, $palette) {
-  $config: map.merge($initial-config, (primary: map.get($initial-config, $palette)));
+@mixin _background-styles($theme, $palette-name) {
   @include token-utils.create-token-values(tokens-mat-tab-header-with-background.$prefix,
-    tokens-mat-tab-header-with-background.get-color-tokens($config));
+    tokens-mat-tab-header-with-background.get-color-tokens($theme, $palette-name));
 }
 
-@mixin _palette-styles($initial-config, $palette) {
-  $config: map.merge($initial-config, (primary: map.get($initial-config, $palette)));
+@mixin _palette-styles($theme, $palette-name) {
   @include mdc-tab-theme.secondary-navigation-tab-theme(
-    tokens-mdc-tab.get-color-tokens($config));
+    tokens-mdc-tab.get-color-tokens($theme, $palette-name));
   @include mdc-tab-indicator-theme.theme(
-    tokens-mdc-tab-indicator.get-color-tokens($config));
+    tokens-mdc-tab-indicator.get-color-tokens($theme, $palette-name));
   @include token-utils.create-token-values(tokens-mat-tab-header.$prefix,
-   tokens-mat-tab-header.get-color-tokens($config));
+   tokens-mat-tab-header.get-color-tokens($theme, $palette-name));
 }
 
-@mixin typography($config-or-theme) {
-  $config: typography.private-typography-to-2018-config(
-      theming.get-typography-config($config-or-theme));
-
+@mixin typography($theme) {
   .mat-mdc-tab-header {
     @include mdc-tab-theme.secondary-navigation-tab-theme(
-      tokens-mdc-tab.get-typography-tokens($config));
+      tokens-mdc-tab.get-typography-tokens($theme));
     @include mdc-tab-indicator-theme.theme(
-      tokens-mdc-tab-indicator.get-typography-tokens($config));
+      tokens-mdc-tab-indicator.get-typography-tokens($theme));
     @include token-utils.create-token-values(tokens-mat-tab-header.$prefix,
-      tokens-mat-tab-header.get-typography-tokens($config));
+      tokens-mat-tab-header.get-typography-tokens($theme));
     @include token-utils.create-token-values(tokens-mat-tab-header-with-background.$prefix,
-      tokens-mat-tab-header-with-background.get-typography-tokens($config));
+      tokens-mat-tab-header-with-background.get-typography-tokens($theme));
   }
 }
 
-@mixin density($config-or-theme) {
-  $density-scale: theming.get-density-config($config-or-theme);
+@mixin density($theme) {
   .mat-mdc-tab-header {
     @include mdc-tab-theme.secondary-navigation-tab-theme(
-      tokens-mdc-tab.get-density-tokens($density-scale));
+      tokens-mdc-tab.get-density-tokens($theme));
     @include mdc-tab-indicator-theme.theme(
-      tokens-mdc-tab-indicator.get-density-tokens($density-scale));
+      tokens-mdc-tab-indicator.get-density-tokens($theme));
     @include token-utils.create-token-values(tokens-mat-tab-header.$prefix,
-      tokens-mat-tab-header.get-density-tokens($density-scale));
+      tokens-mat-tab-header.get-density-tokens($theme));
     @include token-utils.create-token-values(tokens-mat-tab-header-with-background.$prefix,
-      tokens-mat-tab-header-with-background.get-density-tokens($density-scale));
+      tokens-mat-tab-header-with-background.get-density-tokens($theme));
   }
 }
 
-@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-tabs') {
-    $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);
     }
   }
 }