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 emotion shouldForwardProp options breaks component selectors #39390

Merged
merged 1 commit into from Aug 8, 2022
Merged

Fix emotion shouldForwardProp options breaks component selectors #39390

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
4 changes: 3 additions & 1 deletion examples/with-emotion-swc/shared/styles.tsx
View file
Open in desktop
Expand Up @@ -62,7 +62,9 @@ export const Pink = styled(Basic)({
color: 'hotpink',
})

export const BasicExtended = styled(Basic)``
export const BasicExtended = styled(Basic, {
shouldForwardProp: (propertyName: string) => !propertyName.startsWith('$'),
})``

export const ComponentSelectorsExtended = styled.div`
${BasicExtended} {
Expand Down
58 changes: 43 additions & 15 deletions packages/next-swc/crates/emotion/src/lib.rs
View file
Open in desktop
Expand Up @@ -480,13 +480,28 @@ impl<C: Comments> Fold for EmotionTransformer<C> {
if let Some(cm) = self.create_sourcemap(expr.span.lo()) {
expr.args.push(cm.as_arg());
}
c.args.push(
Expr::Object(ObjectLit {
span: DUMMY_SP,
props: args_props,
})
.as_arg(),
);
if let Some(ExprOrSpread { expr, .. }) = c.args.get_mut(1) {
if let Expr::Object(ObjectLit { props, .. }) = expr.as_mut()
{
props.extend(args_props);
} else {
c.args.push(
Expr::Object(ObjectLit {
span: DUMMY_SP,
props: args_props,
})
.as_arg(),
);
}
} else {
c.args.push(
Expr::Object(ObjectLit {
span: DUMMY_SP,
props: args_props,
})
.as_arg(),
);
}
}
}
}
Expand Down Expand Up @@ -592,14 +607,27 @@ impl<C: Comments> Fold for EmotionTransformer<C> {
}),
)));
}

callee.args.push(
Expr::Object(ObjectLit {
span: DUMMY_SP,
props: object_props,
})
.as_arg(),
);
if let Some(ExprOrSpread { expr, .. }) = callee.args.get_mut(1) {
if let Expr::Object(ObjectLit { props, .. }) = expr.as_mut() {
props.extend(object_props);
} else {
callee.args.push(
Expr::Object(ObjectLit {
span: DUMMY_SP,
props: object_props,
})
.as_arg(),
);
}
} else {
callee.args.push(
Expr::Object(ObjectLit {
span: DUMMY_SP,
props: object_props,
})
.as_arg(),
);
}
return Expr::Call(CallExpr {
span: DUMMY_SP,
callee: callee.as_callee(),
Expand Down
6 changes: 6 additions & 0 deletions packages/next-swc/crates/emotion/tests/fixture/css-in-callback/input.tsx
View file
Open in desktop
Expand Up @@ -28,6 +28,12 @@ const DivContainer2 = styled.div`
background: red;
`

const ContainerWithOptions = styled('div', {
shouldForwardProp: (propertyName: string) => !propertyName.startsWith('$'),
})`
color: hotpink;
`

const SpanContainer = styled('span')({
background: 'yellow',
})
Expand Down