Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 14 additions & 1 deletion lib/rules/jsx-key.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,20 @@ module.exports = {
getReturnStatements(node.body)
.filter((returnStatement) => returnStatement && returnStatement.argument)
.forEach((returnStatement) => {
checkIteratorElement(returnStatement.argument);
const argument = returnStatement.argument;

if (argument.type === 'ConditionalExpression') {
const shouldCheckNode = (n) => n && (n.type === 'JSXElement' || n.type === 'JSXFragment');

if (shouldCheckNode(argument.consequent)) {
checkIteratorElement(argument.consequent);
}
if (shouldCheckNode(argument.alternate)) {
checkIteratorElement(argument.alternate);
}
} else {
checkIteratorElement(argument);
}
});
}
}
Expand Down
57 changes: 57 additions & 0 deletions tests/lib/rules/jsx-key.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ const settings = {
const ruleTester = new RuleTester({ parserOptions });
ruleTester.run('jsx-key', rule, {
valid: parsers.all([
{
code: `
[1, 2, 3].map((item) => {
return item === 'bar' ? <div key={item}>{item}</div> : <span key={item}>{item}</span>;
})`,
},
{ code: 'fn()' },
{ code: '[1, 2, 3].map(function () {})' },
{ code: '<App />;' },
Expand Down Expand Up @@ -207,6 +213,57 @@ ruleTester.run('jsx-key', rule, {
},
]),
invalid: parsers.all([
{
code: `
[1, 2, 3].map((item) => {
return item === 'bar' ? <div>{item}</div> : <span>{item}</span>;
})`,
errors: [
{ messageId: 'missingIterKey' },
{ messageId: 'missingIterKey' },
],
},
{
code: `
[1, 2, 3].map(function(item) {
return item === 'bar' ? <div>{item}</div> : <span>{item}</span>;
})`,
errors: [
{ messageId: 'missingIterKey' },
{ messageId: 'missingIterKey' },
],
},
{
code: `
Array.from([1, 2, 3], (item) => {
return item === 'bar' ? <div>{item}</div> : <span>{item}</span>;
})`,
errors: [
{ messageId: 'missingIterKey' },
{ messageId: 'missingIterKey' },
],
},
{
code: `
import { Fragment } from 'react';

const ITEMS = ['bar', 'foo'];

export default function BugIssue() {
return (
<Fragment>
{ITEMS.map((item) => {
return item === 'bar' ? <div>{item}</div> : <span>{item}</span>;
})}
</Fragment>
);
}
`,
errors: [
{ messageId: 'missingIterKey' },
{ messageId: 'missingIterKey' },
],
},
{
code: '[<App />];',
errors: [{ messageId: 'missingArrayKey' }],
Expand Down