Skip to content

Commit 527b273

Browse files
asynclizcopybara-github
authored andcommitted
fix(list): use new elevation component
PiperOrigin-RevId: 499297946
1 parent 2f1a8df commit 527b273

File tree

6 files changed

+30
-29
lines changed

6 files changed

+30
-29
lines changed

autocomplete/lib/_filled-autocomplete.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
// Selector '.md3-*' should only be used in this project.
88

99
@use 'sass:map';
10-
@use '../../elevationold/lib/elevation-theme';
1110
@use '../../field/filled-field';
1211
@use '../../list/list';
1312
@use '../../list/list-item';
@@ -188,6 +187,7 @@ $dark-theme: tokens.md-comp-filled-autocomplete-values(
188187
(
189188
container-elevation: var(--_menu-container-elevation),
190189
container-shape: var(--_menu-container-shape),
190+
container-shadow-color: var(--_menu-container-shadow-color),
191191
)
192192
);
193193

@@ -196,8 +196,7 @@ $dark-theme: tokens.md-comp-filled-autocomplete-values(
196196
container-color: var(--_menu-container-color),
197197
container-surface-tint-layer-color:
198198
var(--_menu-container-surface-tint-layer-color),
199-
container-elevation-overlay-opacity:
200-
var(--_menu-container-elevation-overlay-opacity),
199+
container-elevation: var(--_menu-container-elevation),
201200
)
202201
);
203202

autocomplete/lib/_outlined-autocomplete.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ $dark-theme: tokens.md-comp-outlined-autocomplete-values(
176176
(
177177
container-elevation: var(--_menu-container-elevation),
178178
container-shape: var(--_menu-container-shape),
179+
container-shadow-color: var(--_menu-container-shadow-color),
179180
)
180181
);
181182

@@ -184,8 +185,7 @@ $dark-theme: tokens.md-comp-outlined-autocomplete-values(
184185
container-color: var(--_menu-container-color),
185186
container-surface-tint-layer-color:
186187
var(--_menu-container-surface-tint-layer-color),
187-
container-elevation-overlay-opacity:
188-
var(--_menu-container-elevation-overlay-opacity),
188+
container-elevation: var(--_menu-container-elevation),
189189
)
190190
);
191191

autocomplete/lib/_shared.scss

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// Selector '.md3-*' should only be used in this project.
88

99
@use 'sass:map';
10-
@use '../../elevationold/lib/elevation-theme';
10+
@use '../../elevation/lib/elevation';
1111
@use '../../sass/resolvers';
1212
@use '../../sass/shape';
1313

@@ -19,12 +19,7 @@
1919
}
2020

2121
@function resolve-tokens($tokens) {
22-
$tokens: elevation-theme.resolve-theme(
23-
$tokens,
24-
map.get(resolvers.$material, 'elevation'),
25-
$shadow-color-token: 'menu-container-shadow-color',
26-
$elevation-tokens: (menu-container-elevation)
27-
);
22+
$tokens: elevation.resolve-tokens($tokens, 'menu-container-elevation');
2823
$tokens: shape.resolve-theme(
2924
$tokens,
3025
map.get(resolvers.$material, shape),

list/lib/_list.scss

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
// Selector '.md3-*' should only be used in this project.
88

99
@use 'sass:map';
10-
@use '../../elevationold/lib/elevation-overlay';
11-
@use '../../elevationold/lib/elevation-theme';
10+
@use '../../elevation/lib/elevation';
1211
@use '../../sass/theme';
1312
@use '../../tokens' as m3-tokens;
1413
@use './tokens';
@@ -23,25 +22,33 @@ $_reference: (
2322
map.get(tokens.md-comp-list-values(), 'list-divider-height'),
2423
container-surface-tint-layer-color:
2524
map.get(m3-tokens.md-sys-color-values-light(), 'surface-tint'),
26-
container-elevation-overlay-opacity: 0,
25+
container-elevation: 0,
2726
);
2827

2928
@mixin theme($tokens) {
3029
$tokens: theme.validate-theme($_reference, $tokens);
30+
$tokens: _resolve-tokens($tokens);
3131
$tokens: theme.create-theme-vars($tokens, list);
3232

3333
@include theme.emit-theme-vars($tokens);
3434
}
3535

3636
@mixin styles() {
37-
$tokens: $_reference;
37+
$tokens: _resolve-tokens($_reference);
3838
$tokens: theme.create-theme-vars($tokens, list);
3939

4040
:host {
4141
@each $token, $value in $tokens {
4242
--_#{$token}: #{$value};
4343
}
4444

45+
@include elevation.theme(
46+
(
47+
level: var(--_container-elevation),
48+
surface-tint-color: var(--_container-surface-tint-layer-color),
49+
)
50+
);
51+
4552
color: unset;
4653
}
4754

@@ -57,22 +64,21 @@ $_reference: (
5764
// can be positioned relative to the list root.
5865
position: relative;
5966

60-
@include elevation-overlay.static-styles;
6167
@include list-divider.theme(
6268
(
6369
list-divider-color: var(--_list-divider-color),
6470
list-divider-height: var(--_list-divider-height),
6571
)
6672
);
67-
@include elevation-theme.theme-styles(
68-
(
69-
surface-tint-layer-color: var(--_container-surface-tint-layer-color),
70-
overlay-opacity: var(--_container-elevation-overlay-opacity),
71-
)
72-
);
73+
}
7374

74-
.md3-elevation-overlay {
75-
z-index: 0;
76-
}
75+
md-elevation {
76+
inset: 0;
77+
position: absolute;
78+
z-index: 0;
7779
}
7880
}
81+
82+
@function _resolve-tokens($tokens) {
83+
@return elevation.resolve-tokens($tokens, 'container-elevation');
84+
}

list/lib/list.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7+
import '../../elevation/elevation.js';
8+
79
import {html, LitElement, PropertyValues, TemplateResult} from 'lit';
810
import {property, query, queryAssignedElements} from 'lit/decorators.js';
911
import {ClassInfo, classMap} from 'lit/directives/class-map.js';
@@ -71,7 +73,7 @@ export class List extends LitElement {
7173
@keydown=${this.handleKeydown}
7274
>
7375
<span><slot></slot></span>
74-
<div class="md3-elevation-overlay"></div>
76+
<md-elevation surface></md-elevation>
7577
</ul>
7678
`;
7779
}

menu/lib/_menu.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ $_custom-property-prefix: 'menu';
5353
container-color: var(--_container-color),
5454
container-surface-tint-layer-color:
5555
var(--_container-surface-tint-layer-color),
56-
container-elevation-overlay-opacity:
57-
var(--_container-elevation-overlay-opacity),
56+
container-elevation: var(--_container-elevation),
5857
)
5958
);
6059
@include list-item.theme(

0 commit comments

Comments
 (0)