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: Don't break when spreading falsy value #249

Merged
merged 1 commit into from Mar 29, 2019
Merged

fix: Don't break when spreading falsy value #249

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
43 changes: 26 additions & 17 deletions src/createSpreadMapper.js
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@ import {
Expression,
memberExpression,
binaryExpression,
conditionalExpression,
stringLiteral,
logicalExpression,
identifier,
Expand Down Expand Up @@ -43,25 +44,33 @@ const createSpreadMapper = (path: *, stats: *): { [destinationName: string]: Exp
result[destinationName] = binaryExpression(
'+',
result[destinationName],
binaryExpression(
'+',
stringLiteral(' '),
logicalExpression(
'||',
memberExpression(
spread.argument,
identifier(destinationName),
),
stringLiteral('')
)
),
conditionalExpression(
spread.argument,
binaryExpression(
'+',
stringLiteral(' '),
logicalExpression(
'||',
memberExpression(
spread.argument,
identifier(destinationName),
),
stringLiteral('')
)
),
stringLiteral('')
)
);
} else {
result[destinationName] = logicalExpression(
'||',
memberExpression(
spread.argument,
identifier(destinationName),
result[destinationName] = conditionalExpression(
spread.argument,
logicalExpression(
'||',
memberExpression(
spread.argument,
identifier(destinationName),
),
stringLiteral('')
),
stringLiteral('')
);
Expand Down
2 changes: 1 addition & 1 deletion ...xtures/react-css-modules/does not throw error if attribute has no name property/output.js
View file
Open in desktop
Expand Up @@ -5,4 +5,4 @@ require("./bar.css");
const props = {
foo: 'bar'
};
<div className={"bar__a" + (" " + (props.className || ""))} {...props}></div>;
<div className={"bar__a" + (" " + (props ? props.className || "" : ""))} {...props}></div>;
14 changes: 7 additions & 7 deletions test/fixtures/react-css-modules/handle spread attributes/output.js
View file
Open in desktop
Expand Up @@ -3,17 +3,17 @@
require("./foo.css");

const rest = {};
<div {...rest} className={"b foo__a" + (" " + (rest.className || ""))}></div>;
<div {...rest} className={"foo__a" + (" " + (rest.className || ""))}></div>;
<div {...rest} activeClassName={((void 0).props.activeClassName ? (void 0).props.activeClassName + " " : "") + "foo__a" + (" " + (rest.activeClassName || ""))} className={"foo__a" + (" " + (rest.className || ""))}></div>;
<div {...rest} activeClassName={"b foo__a" + (" " + (rest.activeClassName || ""))}></div>; // Should be okay if rest is put on last
<div {...rest} className={"b foo__a" + (" " + (rest ? rest.className || "" : ""))}></div>;
<div {...rest} className={"foo__a" + (" " + (rest ? rest.className || "" : ""))}></div>;
<div {...rest} activeClassName={((void 0).props.activeClassName ? (void 0).props.activeClassName + " " : "") + "foo__a" + (" " + (rest ? rest.activeClassName || "" : ""))} className={"foo__a" + (" " + (rest ? rest.className || "" : ""))}></div>;
<div {...rest} activeClassName={"b foo__a" + (" " + (rest ? rest.activeClassName || "" : ""))}></div>; // Should be okay if rest is put on last

<div className={"foo__a" + (" " + (rest.className || ""))} {...rest}></div>;
<div className={"foo__a" + (" " + (rest ? rest.className || "" : ""))} {...rest}></div>;
const rest2 = {};
<div {...rest} {...rest2} className={"foo__a" + (" " + ((rest.className || "") + (" " + (rest2.className || ""))))}></div>; // Should not do anything
<div {...rest} {...rest2} className={"foo__a" + (" " + ((rest ? rest.className || "" : "") + (rest2 ? " " + (rest2.className || "") : "")))}></div>; // Should not do anything

<div {...rest} {...rest2}></div>;
<div {...rest} {...rest2} className="b"></div>;
<div className="foo__a">
<div {...rest} activeClassName={"foo__a" + (" " + (rest.activeClassName || ""))}></div>
<div {...rest} activeClassName={"foo__a" + (" " + (rest ? rest.activeClassName || "" : ""))}></div>
</div>;