Skip to content

Commit c9adc26

Browse files
committed
Fix media test code
1 parent 5193f2c commit c9adc26

File tree

3 files changed

+33
-16
lines changed

3 files changed

+33
-16
lines changed

libs/extractor/src/extractor/extract_style_from_expression.rs

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -568,22 +568,20 @@ pub fn extract_style_from_expression<'a>(
568568
&& selector.is_some()
569569
&& let Expression::ArrayExpression(array) = &o.value
570570
{
571+
let arr = array.elements.iter();
571572
Some(
572-
array
573-
.elements
574-
.iter()
575-
.filter_map(|e| {
576-
if let Some(e) = e.as_expression()
577-
&& let Some(s) = get_string_by_literal_expression(e)
578-
&& !s.is_empty()
579-
{
580-
Some(s)
581-
} else {
582-
None
583-
}
584-
})
585-
.collect::<Vec<String>>()
586-
.join(","),
573+
arr.filter_map(|e| {
574+
if let Some(e) = e.as_expression()
575+
&& let Some(s) = get_string_by_literal_expression(e)
576+
&& !s.is_empty()
577+
{
578+
Some(s)
579+
} else {
580+
None
581+
}
582+
})
583+
.collect::<Vec<String>>()
584+
.join(","),
587585
)
588586
} else {
589587
None

libs/extractor/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7409,6 +7409,9 @@ keyframes({
74097409
_hover: {
74107410
bg: "blue"
74117411
},
7412+
_print: {
7413+
bg: "green",
7414+
},
74127415
bg: "red"
74137416
}
74147417
})

libs/extractor/src/snapshots/extractor__tests__extract_advenced_selector-7.snap

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
source: libs/extractor/src/lib.rs
3-
expression: "ToBTreeSet::from(extract(\"test.tsx\",\nr#\"import {globalCss} from '@devup-ui/core'\n globalCss({\n \"_is\": {\n params: [\"test\", variable],\n _hover: {\n bg: \"blue\"\n },\n bg: \"red\"\n }\n })\n \"#,\nExtractOption\n{\n package: \"@devup-ui/core\".to_string(), css_dir:\n \"@devup-ui/core\".to_string(), single_css: false, import_main_css: false\n}).unwrap())"
3+
expression: "ToBTreeSet::from(extract(\"test.tsx\",\nr#\"import {globalCss} from '@devup-ui/core'\n globalCss({\n \"_is\": {\n params: [\"test\", variable],\n _hover: {\n bg: \"blue\"\n },\n _print: {\n bg: \"green\",\n },\n bg: \"red\"\n }\n })\n \"#,\nExtractOption\n{\n package: \"@devup-ui/core\".to_string(), css_dir:\n \"@devup-ui/core\".to_string(), single_css: false, import_main_css: false\n}).unwrap())"
44
---
55
ToBTreeSet {
66
styles: {
@@ -20,6 +20,22 @@ ToBTreeSet {
2020
),
2121
},
2222
),
23+
Static(
24+
ExtractStaticStyle {
25+
property: "background",
26+
value: "green",
27+
level: 0,
28+
selector: Some(
29+
Global(
30+
"*:is(test):print",
31+
"test.tsx",
32+
),
33+
),
34+
style_order: Some(
35+
0,
36+
),
37+
},
38+
),
2339
Static(
2440
ExtractStaticStyle {
2541
property: "background",

0 commit comments

Comments
 (0)