@types/react 16.8.12 → 16.8.13

react/README.md

@@ -8,7 +8,7 @@ This package contains type definitions for React ( http://facebook.github.io/rea
 Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/react
 
 Additional Details
- * Last updated: Wed, 03 Apr 2019 22:06:33 GMT
+ * Last updated: Mon, 08 Apr 2019 04:24:39 GMT
  * Dependencies: @types/csstype, @types/prop-types
  * Global values: React
 

react/index.d.ts

@@ -2764,16 +2764,21 @@ declare namespace React {
 // so boolean is only resolved for T = any
 type IsExactlyAny<T> = boolean extends (T extends never ? true : false) ? true : false;
 
+type ExactlyAnyPropertyKeys<T> = { [K in keyof T]: IsExactlyAny<T[K]> extends true ? K : never }[keyof T];
+type NotExactlyAnyPropertyKeys<T> = Exclude<keyof T, ExactlyAnyPropertyKeys<T>>;
+
 // Try to resolve ill-defined props like for JS users: props can be any, or sometimes objects with properties of type any
-// If props is type any, use propTypes definitions, otherwise for each `any` property of props, use the propTypes type
-// If declared props have indexed properties, ignore inferred props entirely as keyof gets widened
-type MergePropTypes<P, T> = IsExactlyAny<P> extends true ? T : ({
-    [K in keyof P]: IsExactlyAny<P[K]> extends true
-        ? K extends keyof T
-        ? T[K]
-        : P[K]
-        : P[K]
-} & Pick<T, Exclude<keyof T, keyof P>>);
+type MergePropTypes<P, T> =
+    // If props is type any, use propTypes definitions
+    IsExactlyAny<P> extends true ? T :
+        // If declared props have indexed properties, ignore inferred props entirely as keyof gets widened
+        string extends keyof P ? P :
+            // Prefer declared types which are not exactly any
+            & Pick<P, NotExactlyAnyPropertyKeys<P>>
+            // For props which are exactly any, use the type inferred from propTypes if present
+            & Pick<T, Exclude<keyof T, NotExactlyAnyPropertyKeys<P>>>
+            // Keep leftover props not specified in propTypes
+            & Pick<P, Exclude<keyof P, keyof T>>;
 
 // Any prop that has a default prop becomes optional, but its type is unchanged
 // Undeclared default props are augmented into the resulting allowable attributes

react/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@types/react",
-    "version": "16.8.12",
+    "version": "16.8.13",
     "description": "TypeScript definitions for React",
     "license": "MIT",
     "contributors": [
@@ -129,6 +129,6 @@
         "@types/prop-types": "*",
         "csstype": "^2.2.0"
     },
-    "typesPublisherContentHash": "af8adbb3e739192b8b5edd70644fd5fdfcb52ed08365e7da394bda9556f4c574",
+    "typesPublisherContentHash": "53d31798b997bfdad69e11ba927c3df23f4f9df1aa3888dfb9b4d665e7a2e946",
     "typeScriptVersion": "2.8"
 }