Unverified Commit 2cd52aed authored by Donny/강동윤's avatar Donny/강동윤 Committed by GitHub

Fix bugs of `styled-jsx` and `swc` (#29774)

Co-authored-by: 's avatarkdy1 <kdy1@users.noreply.github.com>
parent 2c2a4005
......@@ -1778,9 +1778,9 @@ dependencies = [
[[package]]
name = "swc_ecma_codegen"
version = "0.74.0"
version = "0.74.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86671dca4eed5c2cd694d32da60c3defe88837adbdf9a579efdb412e74995c76"
checksum = "aadc6decd1f613bce7d9a36333e760ebffc9dbb7de453760d3de501847d21214"
dependencies = [
"bitflags",
"memchr",
......@@ -2074,9 +2074,9 @@ dependencies = [
[[package]]
name = "swc_ecma_transforms_react"
version = "0.48.0"
version = "0.48.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3453379987ba78596f9465ec3f3281ac76468c60e8f6751c6d813d846980018"
checksum = "4c30996f62170b3cad11ac85dc058c59655d66a6de134d3182e99324c903da58"
dependencies = [
"ahash",
"base64 0.13.0",
......
......@@ -75,9 +75,9 @@ pub fn transform_css(
let mut parts: Vec<&str> = s.split("__styled-jsx-placeholder__").collect();
let mut final_expressions = vec![];
for i in 1..parts.len() {
let expression_index = parts[i].chars().nth(0).unwrap().to_digit(10).unwrap() as usize;
let (num_len, expression_index) = read_number(&parts[i]);
final_expressions.push(style_info.expressions[expression_index].clone());
let substr = &parts[i][1..];
let substr = &parts[i][num_len..];
parts[i] = substr;
}
......@@ -101,6 +101,22 @@ pub fn transform_css(
}))
}
/// Returns `(length, value)`
fn read_number(s: &str) -> (usize, usize) {
for (idx, c) in s.char_indices() {
if c.is_digit(10) {
continue;
}
// For 10, we reach here after `0`.
let value = s[0..idx].parse().expect("failed to parse");
return (idx, value);
}
unreachable!("read_number(`{}`) is invalid because it is empty", s)
}
struct Namespacer {
class_name: String,
is_global: bool,
......
export const Red = ({
Component = 'button',
}) => {
return (
<Component
>
{/* Dynamic Styles */}
<style jsx>{`
.button {
--button-1: ${e1};
--button-2: ${e2};
--button-3: ${e3};
--button-4: ${e4};
--button-5: ${e5};
--button-6: ${e6};
--button-7: ${e7};
--button-8: ${e8};
--button-9: ${e9};
--button-10: ${e10};
--button-11: ${e11};
--button-12: ${e12};
--button-13: ${e13};
--button-14: ${e14};
--button-15: ${e15};
}
`}</style>
</Component>
);
};
import _JSXStyle from "styled-jsx/style";
export const Red = ({ Component ="button" })=>{
return <Component className={_JSXStyle.dynamic([
[
"ff8ee675a24f28ee",
[
e1,
e2,
e3,
e4,
e5,
e6,
e7,
e8,
e9,
e10,
e11,
e12,
e13,
e14,
e15
]
]
])}>
{}
<_JSXStyle id={"ff8ee675a24f28ee"} dynamic={[
e1,
e2,
e3,
e4,
e5,
e6,
e7,
e8,
e9,
e10,
e11,
e12,
e13,
e14,
e15
]}>{`.button.__jsx-style-dynamic-selector {--button-1:${e1};
--button-2:${e2};
--button-3:${e3};
--button-4:${e4};
--button-5:${e5};
--button-6:${e6};
--button-7:${e7};
--button-8:${e8};
--button-9:${e9};
--button-10:${e10};
--button-11:${e11};
--button-12:${e12};
--button-13:${e13};
--button-14:${e14};
--button-15:${e15}}`}</_JSXStyle>
</Component>;
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment