Skip to content

Fix line wrapping in JSX mapped from object references that include optional chaining #109

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

Merged
ony3000 merged 2 commits into from
Jul 4, 2025
Merged

Fix line wrapping in JSX mapped from object references that include optional chaining #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be0f5f8
test: add mapped jsx tests
ony3000 Jul 4, 2025
0ece5e1
fix: add property needed to recursively traverse optional chaining
ony3000 Jul 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/core-parts/finder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,20 +158,22 @@ export function findTargetClassNameNodes(ast: AST, options: ResolvedOptions): Cl
recursiveProps = ['left', 'right'];
break;
}
case 'CallExpression': {
case 'CallExpression':
case 'OptionalCallExpression': {
recursiveProps = ['arguments'];
break;
}
case 'ConditionalExpression':
case 'IfStatement': {
recursiveProps = ['consequent', 'alternate'];
break;
}
case 'ChainExpression':
case 'ExpressionStatement':
case 'JSXExpressionContainer': {
recursiveProps = ['expression'];
break;
}
case 'ConditionalExpression':
case 'IfStatement': {
recursiveProps = ['consequent', 'alternate'];
break;
}
case 'ExportDefaultDeclaration':
case 'ExportNamedDeclaration': {
recursiveProps = ['declaration'];
Expand Down
36 changes: 36 additions & 0 deletions tests/babel/others/absolute.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,42 @@ function Foo() {
}
return elem;
}
`,
options: {
printWidth: 80,
},
},
{
name: 'JSX mapped from object references including optional chaining',
input: `
function Foo() {
return (
<div>
{foo?.data.map((_, index) => (
<div key={index} className="lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit eu posuere eu volutpat id neque pellentesque">
content
</div>
))}
</div>
);
}
`,
output: `function Foo() {
return (
<div>
{foo?.data.map((_, index) => (
<div
key={index}
className="lorem ipsum dolor sit amet consectetur adipiscing elit
proin ex massa hendrerit eu posuere eu volutpat id neque
pellentesque"
>
content
</div>
))}
</div>
);
}
`,
options: {
printWidth: 80,
Expand Down
35 changes: 35 additions & 0 deletions tests/babel/others/relative.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,41 @@ function Foo() {
}
return elem;
}
`,
options: {
printWidth: 80,
},
},
{
name: 'JSX mapped from object references including optional chaining',
input: `
function Foo() {
return (
<div>
{foo?.data.map((_, index) => (
<div key={index} className="lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit eu posuere eu volutpat id neque pellentesque">
content
</div>
))}
</div>
);
}
`,
output: `function Foo() {
return (
<div>
{foo?.data.map((_, index) => (
<div
key={index}
className="lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit
eu posuere eu volutpat id neque pellentesque"
>
content
</div>
))}
</div>
);
}
`,
options: {
printWidth: 80,
Expand Down
36 changes: 36 additions & 0 deletions tests/typescript/others/absolute.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,42 @@ function Foo() {
}
return elem;
}
`,
options: {
printWidth: 80,
},
},
{
name: 'JSX mapped from object references including optional chaining',
input: `
function Foo() {
return (
<div>
{foo?.data.map((_, index) => (
<div key={index} className="lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit eu posuere eu volutpat id neque pellentesque">
content
</div>
))}
</div>
);
}
`,
output: `function Foo() {
return (
<div>
{foo?.data.map((_, index) => (
<div
key={index}
className="lorem ipsum dolor sit amet consectetur adipiscing elit
proin ex massa hendrerit eu posuere eu volutpat id neque
pellentesque"
>
content
</div>
))}
</div>
);
}
`,
options: {
printWidth: 80,
Expand Down
35 changes: 35 additions & 0 deletions tests/typescript/others/relative.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,41 @@ function Foo() {
}
return elem;
}
`,
options: {
printWidth: 80,
},
},
{
name: 'JSX mapped from object references including optional chaining',
input: `
function Foo() {
return (
<div>
{foo?.data.map((_, index) => (
<div key={index} className="lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit eu posuere eu volutpat id neque pellentesque">
content
</div>
))}
</div>
);
}
`,
output: `function Foo() {
return (
<div>
{foo?.data.map((_, index) => (
<div
key={index}
className="lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit
eu posuere eu volutpat id neque pellentesque"
>
content
</div>
))}
</div>
);
}
`,
options: {
printWidth: 80,
Expand Down