diff --git a/src/material/select/_m2-select.scss b/src/material/select/_m2-select.scss index 9bf5de548e55..50228e000f5a 100644 --- a/src/material/select/_m2-select.scss +++ b/src/material/select/_m2-select.scss @@ -14,8 +14,9 @@ } // Tokens that can be configured through Angular Material's color theming API. -@function get-color-tokens($theme, $palette-name: primary) { +@function get-color-tokens($theme, $color-variant) { $system: m2-utils.get-system($theme); + $system: m3-utils.replace-colors-with-variant($system, primary, $color-variant); $disabled: m3-utils.color-with-opacity(map.get($system, on-surface), 38%); @return ( @@ -25,8 +26,8 @@ select-placeholder-text-color: map.get($system, on-surface-variant), select-enabled-arrow-color: map.get($system, on-surface-variant), select-disabled-arrow-color: $disabled, - select-focused-arrow-color: inspection.get-theme-color($theme, $palette-name, default, 0.87), - select-invalid-arrow-color: inspection.get-theme-color($theme, warn, default, 0.87), + select-focused-arrow-color: map.get($system, primary), + select-invalid-arrow-color: map.get($system, error), ); } diff --git a/src/material/select/_select-theme.scss b/src/material/select/_select-theme.scss index 77272eb4fae0..2dbbf86ee529 100644 --- a/src/material/select/_select-theme.scss +++ b/src/material/select/_select-theme.scss @@ -30,14 +30,17 @@ map.get(m3-select.get-tokens($theme, $color-variant), color)); } @else { @include sass-utils.current-selector-or-root() { - @include token-utils.create-token-values-mixed(m2-select.get-color-tokens($theme)); + @include token-utils.create-token-values-mixed( + m2-select.get-color-tokens($theme, primary)); .mat-mdc-form-field.mat-accent { - @include token-utils.create-token-values-mixed(m2-select.get-color-tokens($theme, accent)); + @include token-utils.create-token-values-mixed( + m2-select.get-color-tokens($theme, secondary)); } .mat-mdc-form-field.mat-warn { - @include token-utils.create-token-values-mixed(m2-select.get-color-tokens($theme, warn)); + @include token-utils.create-token-values-mixed( + m2-select.get-color-tokens($theme, error)); } } }