From 3f667fac602e52a7129135614c589ae1131082e9 Mon Sep 17 00:00:00 2001
From: Cody Coljee-Gray <codr@google.com>
Date: Wed, 9 Nov 2022 13:59:30 -0800
Subject: [PATCH] refactor(select): resolve elevation earlier in sass mixin.

PiperOrigin-RevId: 487339963
---
 packages/mdc-select/_select-theme.scss | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/packages/mdc-select/_select-theme.scss b/packages/mdc-select/_select-theme.scss
index 5a512676e59..49027f61d79 100644
--- a/packages/mdc-select/_select-theme.scss
+++ b/packages/mdc-select/_select-theme.scss
@@ -323,6 +323,7 @@ $_custom-property-prefix: 'select';
 
 @mixin theme-styles($theme, $resolvers: resolvers.$material) {
   @include theme.validate-theme-styles($_light-theme, $theme);
+  $theme: select-shared-theme.resolve-theme($theme, $resolvers);
   $theme: keys.create-theme-properties(
     $theme,
     $prefix: $_custom-property-prefix
@@ -356,11 +357,7 @@ $_custom-property-prefix: 'select';
     )
   );
   @include _menu-container-color(map.get($theme, menu-container-color));
-  @include _menu-container-elevation(
-    map.get($resolvers, elevation),
-    $shadow-color: map.get($theme, menu-container-shadow-color),
-    $elevation: map.get($theme, menu-container-elevation)
-  );
+  @include _menu-container-elevation(map.get($theme, menu-container-elevation));
   @include _menu-container-shape(map.get($theme, menu-container-shape));
   @include _menu-divider-color(map.get($theme, menu-divider-color));
   @include _menu-divider-height(map.get($theme, menu-divider-height));
@@ -684,12 +681,11 @@ $_custom-property-prefix: 'select';
   }
 }
 
-@mixin _menu-container-elevation($resolver, $shadow-color, $elevation) {
+@mixin _menu-container-elevation($elevation) {
   .mdc-select__menu {
-    @include elevation-theme.with-resolver(
-      $resolver,
-      $elevation: $elevation,
-      $shadow-color: $shadow-color
+    @include elevation-theme.shadow(map.get($elevation, shadow));
+    @include elevation-theme.overlay-opacity(
+      map.get($elevation, overlay-opacity)
     );
   }
 }