Skip to content

Commit da38763

Browse files
committed
Use pragma settings to recognize fragment
1 parent 45c895b commit da38763

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

lib/rules/jsx-no-useless-fragment.js

+11-5
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,35 @@
33
*/
44

55
'use strict';
6+
const pragmaUtil = require('../util/pragma');
67
const docsUrl = require('../util/docsUrl');
78

89
/**
910
* Test whether a JSXElement is a fragment
1011
* @param {JSXElement} node
12+
* @param {object} context
1113
* @returns {boolean}
1214
*/
13-
function isFragment(node) {
15+
function isFragment(node, context) {
1416
const name = node.openingElement.name;
17+
const reactPragma = pragmaUtil.getFromContext(context);
18+
const fragmentPragma = pragmaUtil.getFragmentFromContext(context);
1519

1620
// <Fragment>
1721
if (
1822
name.type === 'JSXIdentifier'
19-
&& name.name === 'Fragment'
23+
&& name.name === fragmentPragma
2024
) {
2125
return true;
2226
}
2327

24-
// <*.Fragment>
28+
// <React.Fragment>
2529
if (
2630
name.type === 'JSXMemberExpression'
31+
&& name.object.type === 'JSXIdentifier'
32+
&& name.object.name === reactPragma
2733
&& name.property.type === 'JSXIdentifier'
28-
&& name.property.name === 'Fragment'
34+
&& name.property.name === fragmentPragma
2935
) {
3036
return true;
3137
}
@@ -84,7 +90,7 @@ module.exports = {
8490

8591
return {
8692
JSXElement(node) {
87-
if (isFragment(node)) {
93+
if (isFragment(node, context)) {
8894
checkChildrenLength(node);
8995
}
9096
},

tests/lib/rules/jsx-no-useless-fragment.js

+10-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ ruleTester.run('jsx-no-uselses-fragment', rule, {
4646
parser: parsers.BABEL_ESLINT
4747
},
4848
'<NotFragment />',
49-
'<React.NotFragment />'
49+
'<React.NotFragment />',
50+
'<NotReact.Fragment />'
5051
],
5152
invalid: [
5253
{
@@ -78,10 +79,16 @@ ruleTester.run('jsx-no-uselses-fragment', rule, {
7879
},
7980
{
8081
code: `
81-
<Any.Fragment>
82+
<SomeReact.SomeFragment>
8283
{foo}
83-
</Any.Fragment>
84+
</SomeReact.SomeFragment>
8485
`,
86+
settings: {
87+
react: {
88+
pragma: 'SomeReact',
89+
fragment: 'SomeFragment'
90+
}
91+
},
8592
errors: [{messageId: 'NeedsMoreChidren'}]
8693
},
8794
{

0 commit comments

Comments
 (0)