Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/neat-emus-visit.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@devup-ui/wasm": patch
---

Fix walk issue, add flex props
1 change: 1 addition & 0 deletions libs/extractor/src/extract_style/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ pub struct ExtractStaticStyle {
static MAINTAIN_VALUE_PROPERTIES: Lazy<HashSet<String>> = Lazy::new(|| {
let mut set = HashSet::<String>::new();
set.insert("opacity".to_string());
set.insert("flex".to_string());
set.insert("zIndex".to_string());
set.insert("fontWeight".to_string());
set.insert("scale".to_string());
Expand Down
24 changes: 23 additions & 1 deletion libs/extractor/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@ export {
assert_debug_snapshot!(extract(
"test.js",
r#"import {Flex} from '@devup-ui/core'
<Flex opacity={1} zIndex={2} fontWeight={900} scale={2} />
<Flex opacity={1} zIndex={2} fontWeight={900} scale={2} flex={1} />
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
Expand Down Expand Up @@ -1116,4 +1116,26 @@ export {
)
.unwrap());
}

#[test]
#[serial]
fn test_component_in_func() {
reset_class_map();
assert_debug_snapshot!(extract(
"test.js",
r#"import {Flex} from '@devup-ui/core'
PROCESS_DATA.map(({ id, title, content }, idx) => (
<MotionDiv key={idx}>
<Flex alignItems="center" gap={[3, null, 5, null, 10]}>
</Flex>
</MotionDiv>
))
"#,
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
---
source: libs/extractor/src/lib.rs
expression: "extract(\"test.js\",\nr#\"import {Flex} from '@devup-ui/core'\nPROCESS_DATA.map(({ id, title, content }, idx) => (\n <MotionDiv key={idx}>\n <Flex alignItems=\"center\" gap={[3, null, 5, null, 10]}>\n </Flex>\n </MotionDiv>\n ))\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap()"
---
ExtractOutput {
styles: [
Static(
ExtractStaticStyle {
property: "display",
value: "flex",
level: 0,
selector: None,
basic: true,
},
),
Static(
ExtractStaticStyle {
property: "alignItems",
value: "center",
level: 0,
selector: None,
basic: false,
},
),
Static(
ExtractStaticStyle {
property: "gap",
value: "12px",
level: 0,
selector: None,
basic: false,
},
),
Static(
ExtractStaticStyle {
property: "gap",
value: "20px",
level: 2,
selector: None,
basic: false,
},
),
Static(
ExtractStaticStyle {
property: "gap",
value: "40px",
level: 4,
selector: None,
basic: false,
},
),
],
code: "import \"@devup-ui/core/devup-ui.css\";\nPROCESS_DATA.map(({ id, title, content }, idx) => <MotionDiv key={idx}>\n <div className=\"d0 d1 d2 d3 d4\">\n </div>\n </MotionDiv>);\n",
}
13 changes: 11 additions & 2 deletions libs/extractor/src/snapshots/extractor__tests__maintain_value.snap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
source: libs/extractor/src/lib.rs
expression: "extract(\"test.js\",\nr#\"import {Flex} from '@devup-ui/core'\n <Flex opacity={1} zIndex={2} fontWeight={900} scale={2} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap()"
expression: "extract(\"test.js\",\nr#\"import {Flex} from '@devup-ui/core'\n <Flex opacity={1} zIndex={2} fontWeight={900} scale={2} flex={1} />\n \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap()"
---
ExtractOutput {
styles: [
Expand Down Expand Up @@ -49,6 +49,15 @@ ExtractOutput {
basic: false,
},
),
Static(
ExtractStaticStyle {
property: "flex",
value: "1",
level: 0,
selector: None,
basic: false,
},
),
],
code: "import \"@devup-ui/core/devup-ui.css\";\n<div className=\"d0 d1 d2 d3 d4\" />;\n",
code: "import \"@devup-ui/core/devup-ui.css\";\n<div className=\"d0 d1 d2 d3 d4 d5\" />;\n",
}
3 changes: 1 addition & 2 deletions libs/extractor/src/visit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,8 @@ impl<'a> VisitMut<'a> for DevupVisitor<'a> {
}
}
}

walk_call_expression(self, it);
}
walk_call_expression(self, it);
}
fn visit_tagged_template_expression(&mut self, it: &mut TaggedTemplateExpression<'a>) {
if let Expression::Identifier(ident) = &it.tag {
Expand Down
Loading