Merge pull request #2394 from esbena/js/support-getDerivedFromError

Approved by max-schaefer

Author: semmle-qlci

change-notes/1.24/analysis-javascript.md

@@ -2,6 +2,8 @@
 
 ## General improvements
 
+* Support for the following frameworks and libraries has been improved:
+  - [react](https://www.npmjs.com/package/react)
 
 ## New queries
 

javascript/ql/src/semmle/javascript/frameworks/React.qll

@@ -136,7 +136,12 @@ abstract class ReactComponent extends ASTNode {
         result = arg0
     )
     or
-    result.flowsToExpr(getStaticMethod("getDerivedStateFromProps").getAReturnedExpr())
+    exists(string staticMember |
+      staticMember = "getDerivedStateFromProps" or
+      staticMember = "getDerivedStateFromError"
+    |
+      result.flowsToExpr(getStaticMethod(staticMember).getAReturnedExpr())
+    )
     or
     // shouldComponentUpdate: (nextProps, nextState)
     result = DataFlow::parameterNode(getInstanceMethod("shouldComponentUpdate").getParameter(1))

javascript/ql/test/query-tests/React/UnusedOrUndefinedStateProperty/issue-2389.reduced.js

@@ -0,0 +1,12 @@
+import React from "react"
+
+class C extends React.Component {
+	static getDerivedStateFromError(error) {
+		return { error }
+	}
+
+	render() {
+		this.state.error;
+	}
+}
+