Skip to content

Commit d3f6f90

Browse files
authored
Merge pull request #230 from dev-five-git/fix-or-issue
Fix or issue
2 parents 26cbab6 + 2ec5918 commit d3f6f90

10 files changed

+14
-9
lines changed

.changeset/tasty-seas-obey.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@devup-ui/wasm": patch
3+
---
4+
5+
Fix or issue

libs/extractor/src/prop_modify_utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ pub fn convert_class_name<'a>(
404404
class_name.clone_in(ast_builder.allocator),
405405
),
406406
),
407-
LogicalOperator::Coalesce,
407+
LogicalOperator::Or,
408408
Expression::StringLiteral(ast_builder.alloc_string_literal(SPAN, "", None)),
409409
),
410410
)

libs/extractor/src/snapshots/extractor__tests__extract_class_name_from_component.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ ToBTreeSet {
4545
},
4646
),
4747
},
48-
code: "import \"@devup-ui/core/devup-ui.css\";\n<div className={`${\"a\" + \"b\" ?? \"\"} d0 d1 d2 d3`} />;\n",
48+
code: "import \"@devup-ui/core/devup-ui.css\";\n<div className={`${\"a\" + \"b\" || \"\"} d0 d1 d2 d3`} />;\n",
4949
}

libs/extractor/src/snapshots/extractor__tests__extract_style_props_with_class_name-5.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ ToBTreeSet {
2323
},
2424
),
2525
},
26-
code: "import \"@devup-ui/core/devup-ui.css\";\n<div className={`${\"a\" + \"b\" ?? \"\"} d0 d1`} />;\n",
26+
code: "import \"@devup-ui/core/devup-ui.css\";\n<div className={`${\"a\" + \"b\" || \"\"} d0 d1`} />;\n",
2727
}

libs/extractor/src/snapshots/extractor__tests__extract_style_props_with_class_name-6.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ ToBTreeSet {
2323
},
2424
),
2525
},
26-
code: "import \"@devup-ui/core/devup-ui.css\";\n<img src=\"/next.svg\" alt=\"Next.js logo\" className={`${styles.logo ?? \"\"} d0 d1`} />;\n",
26+
code: "import \"@devup-ui/core/devup-ui.css\";\n<img src=\"/next.svg\" alt=\"Next.js logo\" className={`${styles.logo || \"\"} d0 d1`} />;\n",
2727
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ ToBTreeSet {
2323
},
2424
),
2525
},
26-
code: "import \"@devup-ui/core/devup-ui.css\";\n<div className={`${variable ?? \"\"} d0 d1`} />;\n",
26+
code: "import \"@devup-ui/core/devup-ui.css\";\n<div className={`${variable || \"\"} d0 d1`} />;\n",
2727
}

libs/extractor/src/snapshots/extractor__tests__extract_style_props_with_class_name-8.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ ToBTreeSet {
4040
},
4141
),
4242
},
43-
code: "import \"@devup-ui/core/devup-ui.css\";\n<div className={`${variable ?? \"\"} d0 ${true ? \"d1\" : \"d2\"}`} />;\n",
43+
code: "import \"@devup-ui/core/devup-ui.css\";\n<div className={`${variable || \"\"} d0 ${true ? \"d1\" : \"d2\"}`} />;\n",
4444
}

libs/extractor/src/snapshots/extractor__tests__extract_style_props_with_class_name-9.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ ToBTreeSet {
2020
"buttonS",
2121
),
2222
},
23-
code: "import \"@devup-ui/core/devup-ui.css\";\nimport clsx from \"clsx\";\n<button {...props} className={`${clsx(variants[variant], isError && variant === \"default\" && errorClassNames, className) ?? \"\"} d0 ${isPrimary ? {\n\t\"md\": \"typo-buttonM\",\n\t\"sm\": \"typo-buttonS\"\n}[size] : \"\"} ${props?.className ?? \"\"}`} style={props?.style} />;\n",
23+
code: "import \"@devup-ui/core/devup-ui.css\";\nimport clsx from \"clsx\";\n<button {...props} className={`${clsx(variants[variant], isError && variant === \"default\" && errorClassNames, className) || \"\"} d0 ${isPrimary ? {\n\t\"md\": \"typo-buttonM\",\n\t\"sm\": \"typo-buttonS\"\n}[size] : \"\"} ${props?.className || \"\"}`} style={props?.style} />;\n",
2424
}

libs/extractor/src/snapshots/extractor__tests__rest_props.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ ToBTreeSet {
2525
},
2626
),
2727
},
28-
code: "import \"@devup-ui/core/devup-ui.css\";\n<div {...props} className={`d0 d1 ${props?.className ?? \"\"}`} style={props?.style} />;\n",
28+
code: "import \"@devup-ui/core/devup-ui.css\";\n<div {...props} className={`d0 d1 ${props?.className || \"\"}`} style={props?.style} />;\n",
2929
}

libs/extractor/src/snapshots/extractor__tests__support_transpile_mjs-5.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ ToBTreeSet {
1414
},
1515
),
1616
},
17-
code: "import \"@devup-ui/core/devup-ui.css\";\nimport { jsx as e } from \"react/jsx-runtime\";\ne(\"div\", {\n\t...props,\n\tclassName: `a d0 ${props?.className ?? \"\"}`,\n\tstyle: {\n\t\t...{ \"--d1\": variable },\n\t\t...{ color: \"blue\" },\n\t\t...props?.style\n\t}\n});\n",
17+
code: "import \"@devup-ui/core/devup-ui.css\";\nimport { jsx as e } from \"react/jsx-runtime\";\ne(\"div\", {\n\t...props,\n\tclassName: `a d0 ${props?.className || \"\"}`,\n\tstyle: {\n\t\t...{ \"--d1\": variable },\n\t\t...{ color: \"blue\" },\n\t\t...props?.style\n\t}\n});\n",
1818
}

0 commit comments

Comments
 (0)