[Fix] jsx-indent: do not report on non-jsx-returning ternaries that…

… contain null Fixes #3222
jsx-eslint · Feb 25, 2022 · a8fca2a · a8fca2a
1 parent fe708e1
commit a8fca2a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,9 @@ This change log adheres to standards from [Keep a CHANGELOG](https://keepachange
 
 ### Fixed
 * [`jsx-curly-brace-presence`]: avoid warning on curlies containing quote characters ([#3214][] @ljharb)
+* [`jsx-indent`]: do not report on non-jsx-returning ternaries that contain null ([#3222][] @ljharb)
 
+[#3222]: https://github.com/yannickcr/eslint-plugin-react/issues/3222
 [#3214]: https://github.com/yannickcr/eslint-plugin-react/issues/3214
 
 ## [7.29.1] - 2022.02.25

diff --git a/lib/rules/jsx-indent.js b/lib/rules/jsx-indent.js
@@ -425,7 +425,7 @@ module.exports = {
         }
         if (
           !fn
-          || !jsxUtil.isReturningJSX((n) => isCreateElement(n, context), node, context)
+          || !jsxUtil.isReturningJSX((n) => isCreateElement(n, context), node, context, true)
         ) {
           return;
         }

diff --git a/tests/lib/rules/jsx-indent.js b/tests/lib/rules/jsx-indent.js
@@ -1209,6 +1209,16 @@ const Component = () => (
       features: ['class fields'],
       options: [2],
     },
+    {
+      code: `
+        function test (foo) {
+          return foo != null
+            ? Math.max(0, Math.min(1, 10))
+            : 0
+        }
+      `,
+      options: [99],
+    },
   ]),
 
   invalid: parsers.all([].concat(