Commit 4a47f35

AlbertLuciantogajus

authored and

committed

fix: spread should not traverse children elements (#245)

1 parent 05c2683 commit 4a47f35Copy full SHA for 4a47f35

File tree

3 files changed

+42

-33

lines changed

src
- createSpreadMapper.js
test/fixtures/react-css-modules/handle spread attributes
- input.js
- output.js

3 files changed

+42

-33

lines changed

`‎src/createSpreadMapper.js`

Lines changed: 35 additions & 33 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@ import {`
`6`	`6`	`binaryExpression,`
`7`	`7`	`stringLiteral,`
`8`	`8`	`logicalExpression,`
`9`		`- identifier`
	`9`	`+ identifier,`
	`10`	`+ isJSXSpreadAttribute`
`10`	`11`	`} from '@babel/types';`
`11`	`12`	`import optionsDefaults from './schemas/optionsDefaults';`
`12`	`13`
`@@ -29,43 +30,44 @@ const createSpreadMapper = (path: , stats: ): { [destinationName: string]: Exp`
`29`	`30`	`return pair[0];`
`30`	`31`	`});`
`31`	`32`
`32`		`- path.traverse({`
`33`		`- JSXSpreadAttribute (spreadPath: *) {`
`34`		`- const spread = spreadPath.node;`
	`33`	`+ const spreadAttributes = path.node.openingElement.attributes`
	`34`	`+ .filter((attr) => {`
	`35`	`+ return isJSXSpreadAttribute(attr);`
	`36`	`+ });`
`35`	`37`
`36`		`- for (const attributeKey of attributeKeys) {`
`37`		`- const destinationName = attributeNames[attributeKey];`
	`38`	`+ for (const spread of spreadAttributes) {`
	`39`	`+ for (const attributeKey of attributeKeys) {`
	`40`	`+ const destinationName = attributeNames[attributeKey];`
`38`	`41`
`39`		`- if (result[destinationName]) {`
`40`		`- result[destinationName] = binaryExpression(`
	`42`	`+ if (result[destinationName]) {`
	`43`	`+ result[destinationName] = binaryExpression(`
	`44`	`+ '+',`
	`45`	`+ result[destinationName],`
	`46`	`+ binaryExpression(`
`41`	`47`	`'+',`
`42`		`- result[destinationName],`
`43`		`- binaryExpression(`
`44`		`- '+',`
`45`		`- stringLiteral(' '),`
`46`		`- logicalExpression(`
`47`		`- '\|\|',`
`48`		`- memberExpression(`
`49`		`- spread.argument,`
`50`		`- identifier(destinationName),`
`51`		`- ),`
`52`		`- stringLiteral('')`
`53`		`- )`
`54`		`- ),`
`55`		`- );`
`56`		`- } else {`
`57`		`- result[destinationName] = logicalExpression(`
`58`		`- '\|\|',`
`59`		`- memberExpression(`
`60`		`- spread.argument,`
`61`		`- identifier(destinationName),`
`62`		`- ),`
`63`		`- stringLiteral('')`
`64`		`- );`
`65`		`- }`
	`48`	`+ stringLiteral(' '),`
	`49`	`+ logicalExpression(`
	`50`	`+ '\|\|',`
	`51`	`+ memberExpression(`
	`52`	`+ spread.argument,`
	`53`	`+ identifier(destinationName),`
	`54`	`+ ),`
	`55`	`+ stringLiteral('')`
	`56`	`+ )`
	`57`	`+ ),`
	`58`	`+ );`
	`59`	`+ } else {`
	`60`	`+ result[destinationName] = logicalExpression(`
	`61`	`+ '\|\|',`
	`62`	`+ memberExpression(`
	`63`	`+ spread.argument,`
	`64`	`+ identifier(destinationName),`
	`65`	`+ ),`
	`66`	`+ stringLiteral('')`
	`67`	`+ );`
`66`	`68`	`}`
`67`	`69`	`}`
`68`		`- });`
	`70`	`+ }`
`69`	`71`
`70`	`72`	`return result;`
`71`	`73`	`};`

`‎test/fixtures/react-css-modules/handle spread attributes/input.js`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,3 +20,7 @@ const rest2 = {};`
`20`	`20`	`// Should not do anything`
`21`	`21`	`<div {...rest} {...rest2}></div>;`
`22`	`22`	`<div {...rest} {...rest2} className="b"></div>;`
	`23`	`+`
	`24`	`+<div styleName="a">`
	`25`	`+ <div {...rest} activeStyleName="a"></div>`
	`26`	`+</div>`

`‎test/fixtures/react-css-modules/handle spread attributes/output.js`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,6 @@ const rest2 = {};`
`14`	`14`
`15`	`15`	`<div {...rest} {...rest2}></div>;`
`16`	`16`	`<div {...rest} {...rest2} className="b"></div>;`
	`17`	`+<div className="foo__a">`
	`18`	`+ <div {...rest} activeClassName={"foo__a" + (" " + (rest.activeClassName \|\| ""))}></div>`
	`19`	`+</div>;`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 4a47f35

File tree

3 files changed

3 files changed

`‎src/createSpreadMapper.js`

`‎test/fixtures/react-css-modules/handle spread attributes/input.js`

`‎test/fixtures/react-css-modules/handle spread attributes/output.js`

0 commit comments