Merge 7d24b9c into 57d0df7

lib/util/Components.js

@@ -707,7 +707,10 @@ function componentRule(rule, context) {
           return undefined;
         }
         if (utils.isInAllowedPositionForComponent(node) && utils.isReturningJSXOrNull(node)) {
-          return node;
+          if (!node.id || isFirstLetterCapitalized(node.id.name)) {
+            return node;
+          }
+          return undefined;
         }
 
         // Case like `React.memo(() => <></>)` or `React.forwardRef(...)`

lib/util/propTypes.js

@@ -891,7 +891,8 @@ module.exports = function propTypesInstructions(context, components, utils) {
       return;
     }
 
-    if (isInsideClassBody(node)) {
+    // https://github.com/yannickcr/eslint-plugin-react/issues/2784
+    if (isInsideClassBody(node) && !astUtil.isFunction(node)) {
       return;
     }
 

tests/lib/rules/prop-types.js

@@ -3143,6 +3143,37 @@ ruleTester.run('prop-types', rule, {
         }
         export default InputField`,
         parser: parsers['@TYPESCRIPT_ESLINT']
+      },
+      {
+        code: `
+          import React from 'react'
+
+          class Factory {
+            getRenderFunction() {
+              return function renderFunction({ name }) {
+                return <div>Hello {name}</div>
+              }
+            }
+          }
+        `
+      },
+      {
+        code: `
+          import React from 'react'
+
+          type ComponentProps = {
+            name: string
+          }
+
+          class Factory {
+            getComponent() {
+              return function Component({ name }: ComponentProps) {
+                return <div>Hello {name}</div>
+              }
+            }
+          }
+        `,
+        parser: parsers['@TYPESCRIPT_ESLINT']
       }
     ])
   ),