Skip to content
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

Jump to bottom

Fix styles that should not be made dynamic #30928

Merged
merged 1 commit into from
Nov 4, 2021
Merged

Fix styles that should not be made dynamic #30928

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 25 additions & 7 deletions packages/next/build/swc/src/styled_jsx/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ struct StyledJSXTransformer {
has_styled_jsx: bool,
bindings: AHashSet<Id>,
nearest_scope_bindings: AHashSet<Id>,
func_scope_level: u8,
style_import_name: Option<String>,
external_bindings: Vec<Id>,
file_has_css_resolve: bool,
Expand Down Expand Up @@ -185,7 +186,7 @@ impl Fold for StyledJSXTransformer {
Expr::TaggedTpl(tagged_tpl) => match &*tagged_tpl.tag {
Expr::Ident(identifier) => {
if self.external_bindings.contains(&identifier.to_id()) {
match self.process_tagged_template_expr(&tagged_tpl) {
match self.process_tagged_template_expr(&tagged_tpl, &identifier.sym) {
Ok(expr) => expr,
Err(_) => Expr::TaggedTpl(tagged_tpl),
}
Expand All @@ -199,7 +200,7 @@ impl Fold for StyledJSXTransformer {
}) => {
if let Expr::Ident(identifier) = &**boxed_ident {
if self.external_bindings.contains(&identifier.to_id()) {
match self.process_tagged_template_expr(&tagged_tpl) {
match self.process_tagged_template_expr(&tagged_tpl, &identifier.sym) {
Ok(expr) => expr,
Err(_) => Expr::TaggedTpl(tagged_tpl),
}
Expand Down Expand Up @@ -320,6 +321,7 @@ impl Fold for StyledJSXTransformer {
}

fn fold_function(&mut self, mut func: Function) -> Function {
self.func_scope_level = self.func_scope_level + 1;
let surrounding_scope_bindings = take(&mut self.nearest_scope_bindings);
self.in_function_params = true;
let mut new_params = vec![];
Expand All @@ -331,10 +333,12 @@ impl Fold for StyledJSXTransformer {
self.nearest_scope_bindings.extend(collect_decls(&func));
func.body = func.body.fold_with(self);
self.nearest_scope_bindings = surrounding_scope_bindings;
self.func_scope_level = self.func_scope_level - 1;
func
}

fn fold_arrow_expr(&mut self, mut func: ArrowExpr) -> ArrowExpr {
self.func_scope_level = self.func_scope_level + 1;
let surrounding_scope_bindings = take(&mut self.nearest_scope_bindings);
self.in_function_params = true;
let mut new_params = vec![];
Expand All @@ -346,6 +350,7 @@ impl Fold for StyledJSXTransformer {
self.nearest_scope_bindings.extend(collect_decls(&func));
func.body = func.body.fold_with(self);
self.nearest_scope_bindings = surrounding_scope_bindings;
self.func_scope_level = self.func_scope_level - 1;
func
}

Expand Down Expand Up @@ -425,11 +430,15 @@ impl StyledJSXTransformer {
}
css = String::from(s);
css_span = *span;
let res = self.evaluator.as_mut().unwrap().eval(&expr);
is_dynamic = if let Some(EvalResult::Lit(_)) = res {
false
is_dynamic = if self.func_scope_level > 0 {
let res = self.evaluator.as_mut().unwrap().eval(&expr);
if let Some(EvalResult::Lit(_)) = res {
false
} else {
true
}
} else {
true
false
};
expressions = exprs.clone();
}
Expand Down Expand Up @@ -495,7 +504,16 @@ impl StyledJSXTransformer {
}
}

fn process_tagged_template_expr(&mut self, tagged_tpl: &TaggedTpl) -> Result<Expr, Error> {
fn process_tagged_template_expr(
&mut self,
tagged_tpl: &TaggedTpl,
tag: &str,
) -> Result<Expr, Error> {
if tag != "resolve" {
// Check whether there are undefined references or
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will work on this in a follow up

// references to this.something (e.g. props or state).
// We allow dynamic styles only when resolving styles.
}
let style = self.get_jsx_style(&Expr::Tpl(tagged_tpl.tpl.clone()), false);
let styles = vec![style];
let (static_class_name, class_name) =
Expand Down
1 change: 0 additions & 1 deletion packages/next/build/swc/tests/fixture/styled-jsx/styles/input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ export const uh = bar

export const foo = css`div { color: ${color}}`

// TODO: the next 3 should not transformed as dynamic
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was actually only the next 2 that didn't need to be dynamic.

css.resolve`
div {
color: ${colors.green.light};
Expand Down
30 changes: 6 additions & 24 deletions packages/next/build/swc/tests/fixture/styled-jsx/styles/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,14 @@ export const uh = bar;
export const foo = new String(`div.jsx-a0d126276b085021 {color:${color}}`);
foo.__hash = "a0d126276b085021";
({
styles: <_JSXStyle id={"47e08c293b53f262"} dynamic={[
colors1.green.light
]}>{`div.__jsx-style-dynamic-selector {color:${colors1.green.light}}
a.__jsx-style-dynamic-selector {color:red}`}</_JSXStyle>,
className: _JSXStyle.dynamic([
[
"47e08c293b53f262",
[
colors1.green.light
]
]
])
styles: <_JSXStyle id={"47e08c293b53f262"}>{`div.jsx-47e08c293b53f262 {color:${colors1.green.light}}
a.jsx-47e08c293b53f262 {color:red}`}</_JSXStyle>,
className: "jsx-47e08c293b53f262"
});
const b = {
styles: <_JSXStyle id={"47e08c293b53f262"} dynamic={[
colors1.green.light
]}>{`div.__jsx-style-dynamic-selector {color:${colors1.green.light}}
a.__jsx-style-dynamic-selector {color:red}`}</_JSXStyle>,
className: _JSXStyle.dynamic([
[
"47e08c293b53f262",
[
colors1.green.light
]
]
])
styles: <_JSXStyle id={"47e08c293b53f262"}>{`div.jsx-47e08c293b53f262 {color:${colors1.green.light}}
a.jsx-47e08c293b53f262 {color:red}`}</_JSXStyle>,
className: "jsx-47e08c293b53f262"
};
const dynamic = (colors)=>{
const b = {
Expand Down