Fix isReactComponent in react-lifecycle-order rule for generic compon…

…ents
jwbay · Mar 15, 2018 · 66c63ca · 66c63ca
1 parent db7c619
commit 66c63ca
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/rules/reactLifecycleOrderRule.ts b/rules/reactLifecycleOrderRule.ts
@@ -90,7 +90,7 @@ class ReactLifecyleOrderRule extends Lint.RuleWalker {
 				'React.PureComponent',
 				'Component',
 				'PureComponent',
-			].indexOf(ancestor.getText(this.getSourceFile())) > -1
+			].indexOf(ancestor.getText(this.getSourceFile()).replace(/<.+?>$/, '')) > -1
 		)
 	}
 }
diff --git a/test/reactLifecycleOrderRule/reactLifecycleOrderRule.tsx.lint b/test/reactLifecycleOrderRule/reactLifecycleOrderRule.tsx.lint
@@ -19,6 +19,18 @@ class PassesToo extends React.Component {
     baz() {}
 }
 
+class PassesGeneric extends React.Component<any, any> {
+    property: any;
+    componentWillMount() {}
+    componentWillReceiveProps() {}
+    componentDidMount() {}
+    shouldComponentUpdate() {}
+    componentWillUpdate() {}
+    componentDidUpdate() {}
+    render() {}
+    componentWillUnmount() {}
+}
+
 class PassesNotComponent extends NotComponent {
     constructor() {}
     foo() {}
@@ -88,3 +100,14 @@ class FailsPureComponent extends PureComponent {
     ~~~~~~~~~~~~~~~~~~ [expected React lifecyle method 'render']
     baz() {}
 }
+
+class FailsReactComponentGeneric extends React.Component<any, any> {
+    constructor() {}
+    foo() {}
+    render() {}
+    ~~~~~~ [expected React lifecyle method 'componentWillMount']
+    bar() {}
+    componentWillMount() {}
+    ~~~~~~~~~~~~~~~~~~ [expected React lifecyle method 'render']
+    baz() {}
+}