Skip to content

Fix className issue #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
owjs3901 merged 1 commit into from
Jul 3, 2025
Merged

Fix className issue #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/tall-hats-sell.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@devup-ui/wasm": patch
---

Fix className issue (multiple selectors)
34 changes: 34 additions & 0 deletions libs/extractor/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,6 +1351,40 @@ import clsx from 'clsx'
)
.unwrap()
));

reset_class_map();
assert_debug_snapshot!(ToBTreeSet::from(
extract(
"test.tsx",
r"import {Center} from '@devup-ui/core'
<Center
_active={
variant !== 'disabled' && {
boxShadow: 'none',
transform: 'scale(0.95)',
}
}
_hover={
variant !== 'disabled' && {
boxShadow: [
'0px 1px 3px 0px rgba(0, 0, 0, 0.25)',
null,
'0px 0px 15px 0px rgba(0, 0, 0, 0.25)',
],
}
}
{...props}
>
{children}
</Center>
",
ExtractOption {
package: "@devup-ui/core".to_string(),
css_file: None
}
)
.unwrap()
));
}

#[test]
Expand Down
2 changes: 1 addition & 1 deletion libs/extractor/src/prop_modify_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ fn merge_string_expressions<'a>(
}
} else {
let prefix = if idx == 0 { "" } else { " " };
let suffix = if string_literals.len() == other_expressions.len() {
let suffix = if string_literals.len() <= other_expressions.len() {
" "
} else {
""
Expand Down
94 changes: 94 additions & 0 deletions libs/extractor/src/snapshots/extractor__tests__extract_selector-2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
---
source: libs/extractor/src/lib.rs
expression: "ToBTreeSet::from(extract(\"test.tsx\",\nr\"import {Center} from '@devup-ui/core'\n <Center\n _active={\n variant !== 'disabled' && {\n boxShadow: 'none',\n transform: 'scale(0.95)',\n }\n }\n _hover={\n variant !== 'disabled' && {\n boxShadow: [\n '0px 1px 3px 0px rgba(0, 0, 0, 0.25)',\n null,\n '0px 0px 15px 0px rgba(0, 0, 0, 0.25)',\n ],\n }\n }\n {...props}\n >\n {children}\n </Center>\n \",\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
---
ToBTreeSet {
styles: {
Static(
ExtractStaticStyle {
property: "alignItems",
value: "center",
level: 0,
selector: None,
style_order: Some(
0,
),
},
),
Static(
ExtractStaticStyle {
property: "boxShadow",
value: "0 0 15px 0 rgba(0,0,0,0.25)",
level: 2,
selector: Some(
Selector(
"&:hover",
),
),
style_order: None,
},
),
Static(
ExtractStaticStyle {
property: "boxShadow",
value: "0 1px 3px 0 rgba(0,0,0,0.25)",
level: 0,
selector: Some(
Selector(
"&:hover",
),
),
style_order: None,
},
),
Static(
ExtractStaticStyle {
property: "boxShadow",
value: "none",
level: 0,
selector: Some(
Selector(
"&:active",
),
),
style_order: None,
},
),
Static(
ExtractStaticStyle {
property: "display",
value: "flex",
level: 0,
selector: None,
style_order: Some(
0,
),
},
),
Static(
ExtractStaticStyle {
property: "justifyContent",
value: "center",
level: 0,
selector: None,
style_order: Some(
0,
),
},
),
Static(
ExtractStaticStyle {
property: "transform",
value: "scale(0.95)",
level: 0,
selector: Some(
Selector(
"&:active",
),
),
style_order: None,
},
),
},
code: "import \"@devup-ui/core/devup-ui.css\";\n<div {...props} className={`d0 d1 d2 ${variant !== \"disabled\" ? \"d3 d4\" : \"\"} ${variant !== \"disabled\" ? \"d5 d6\" : \"\"}`} style={props?.style}>\n {children}\n </div>;\n",
}