fix mat-list

Author: mmalerba

src/material/list/_list-option-theme.import.scss

@@ -1,44 +1,42 @@
 @use 'sass:map';
 @use '@material/list/evolution-mixins';
+@use '@material/checkbox/checkbox-theme' as mdc-checkbox-theme;
 @use '@material/list/list-theme' as mdc-list-theme;
 
 @use '../core/theming/theming';
-@use '../core/tokens/m2/mdc/list' as m2-mdc-list;
+@use '../core/tokens/m2/mdc/checkbox' as tokens-mdc-checkbox;
+@use '../core/tokens/m2/mdc/list' as tokens-mdc-list;
 @use '../core/typography/typography';
 @use '../core/typography/typography-utils';
-@use '../core/mdc-helpers/mdc-helpers';
-@use './list-option-theme';
 
 @mixin color($config-or-theme) {
   $config: theming.get-color-config($config-or-theme);
-  $primary: theming.get-color-from-palette(map.get($config, primary));
-  $accent: theming.get-color-from-palette(map.get($config, accent));
-  $warn: theming.get-color-from-palette(map.get($config, warn));
-  $mdc-list-color-tokens: m2-mdc-list.get-color-tokens($config);
+  $primary: map.get($config, primary);
+  $warn: map.get($config, warn);
+  $mdc-list-color-tokens: tokens-mdc-list.get-color-tokens($config);
 
 
   // Add values for MDC list tokens.
   .mat-mdc-list-base {
     @include mdc-list-theme.theme($mdc-list-color-tokens);
   }
 
-  // TODO(mmalerba): This should use MDC checkbox's token API instead.
-  @include mdc-helpers.using-mdc-theme($config) {
-    .mat-mdc-list-option {
-      @include list-option-theme.private-list-option-color-override($config, $primary, primary);
-    }
-    .mat-mdc-list-option.mat-accent {
-      @include list-option-theme.private-list-option-color-override($config, $accent, secondary);
-    }
-    .mat-mdc-list-option.mat-warn {
-      @include list-option-theme.private-list-option-color-override($config, $warn, error);
-    }
+  .mat-mdc-list-option {
+    $primary-config: map.merge($config, (accent: $primary));
+    @include mdc-checkbox-theme.theme(tokens-mdc-checkbox.get-color-tokens($primary-config));
+  }
+  .mat-mdc-list-option.mat-accent {
+    @include mdc-checkbox-theme.theme(tokens-mdc-checkbox.get-color-tokens($config));
+  }
+  .mat-mdc-list-option.mat-warn {
+    $warn-config: map.merge($config, (accent: $warn));
+    @include mdc-checkbox-theme.theme(tokens-mdc-checkbox.get-color-tokens($warn-config));
   }
 
   // There is no token for activated color on nav list.
   // TODO(mmalerba): Add a token to MDC or make a custom one.
   .mat-mdc-list-base.mat-mdc-list-base {
-    @include evolution-mixins.list-selected-ink-color($primary);
+    @include evolution-mixins.list-selected-ink-color(theming.get-color-from-palette($primary));
   }
 
   // TODO(mmalerba): Leaking styles from the old MDC list mixins used in other components can cause
@@ -55,7 +53,7 @@
 
 @mixin density($config-or-theme) {
   $density-scale: theming.get-density-config($config-or-theme);
-  $mdc-list-density-tokens: m2-mdc-list.get-density-tokens($density-scale);
+  $mdc-list-density-tokens: tokens-mdc-list.get-density-tokens($density-scale);
 
   // Add values for MDC list tokens.
   .mat-mdc-list-base {
@@ -98,7 +96,7 @@
 @mixin typography($config-or-theme) {
   $config: typography.private-typography-to-2018-config(
       theming.get-typography-config($config-or-theme));
-  $mdc-list-typography-tokens: m2-mdc-list.get-typography-tokens($config);
+  $mdc-list-typography-tokens: tokens-mdc-list.get-typography-tokens($config);
 
   // Add values for MDC list tokens.
   .mat-mdc-list-base {

src/material/list/_list-option-theme.scss

@@ -5,7 +5,7 @@
 @use '@material/radio/radio-theme' as mdc-radio-theme;
 
 @use '../core/mdc-helpers/mdc-helpers';
-@use '../checkbox/checkbox-private';
+@use '../core/tokens/m2/mdc/checkbox' as tokens-mdc-checkbox;
 @use '../radio/radio-private';
 @use './list-option-trailing-avatar-compat';
 @use './list-item-hcm-indicator';
@@ -42,11 +42,9 @@
   // We can't use the MDC checkbox here directly, because this checkbox is purely
   // decorative and including the MDC one will bring in unnecessary JS.
   .mdc-checkbox {
-    $config: map.merge(checkbox-private.$private-checkbox-theme-config, $without-ripple-config);
-
     // MDC theme styles also include structural styles so we have to include the theme at least
     // once here. The values will be overwritten by our own theme file afterwards.
-    @include mdc-checkbox-theme.theme-styles($config);
+    @include mdc-checkbox-theme.theme-styles(tokens-mdc-checkbox.get-token-slots());
   }
 
   // We can't use the MDC radio here directly, because this radio is purely