From 58da7330ea25ead450a8ee3ec3e83b742f2d0a9e Mon Sep 17 00:00:00 2001
From: Jessica <jessicamfranco3@gmail.com>
Date: Wed, 6 Feb 2019 18:30:44 +0900
Subject: [PATCH] Update react-dom, react-test-renderer to 16.8.0

---
 types/react-dom/index.d.ts                      |  3 ++-
 types/react-dom/react-dom-tests.tsx             | 14 ++++++++++++++
 types/react-dom/test-utils/index.d.ts           | 14 ++++++++++++++
 types/react-dom/tsconfig.json                   |  2 +-
 types/react-test-renderer/index.d.ts            | 17 ++++++++++++++++-
 .../react-test-renderer-tests.ts                | 11 +++++++++--
 6 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/types/react-dom/index.d.ts b/types/react-dom/index.d.ts
index 518c0c617c..a6ac5c9d11 100644
--- a/types/react-dom/index.d.ts
+++ b/types/react-dom/index.d.ts
@@ -1,10 +1,11 @@
-// Type definitions for React (react-dom) 16.0
+// Type definitions for React (react-dom) 16.8
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>
 //                 AssureSign <http://www.assuresign.com>
 //                 Microsoft <https://microsoft.com>
 //                 MartynasZilinskas <https://github.com/MartynasZilinskas>
 //                 Josh Rutherford <https://github.com/theruther4d>
+//                 Jessica Franco <https://github.com/Jessidhia>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
diff --git a/types/react-dom/react-dom-tests.tsx b/types/react-dom/react-dom-tests.tsx
index c7ccb0052d..e81c500f9c 100644
--- a/types/react-dom/react-dom-tests.tsx
+++ b/types/react-dom/react-dom-tests.tsx
@@ -178,4 +178,18 @@ describe('React dom test utils', () => {
             shallowRenderer.getRenderOutput();
         });
     });
+
+    describe('act', () => {
+        it('accepts a sync callback that is void', () => {
+            ReactTestUtils.act(() => {});
+        });
+        it('rejects an async callback even if void', () => {
+            // $ExpectError
+            ReactTestUtils.act(async () => {});
+        });
+        it('rejects a callback that returns null', () => {
+            // $ExpectError
+            ReactTestUtils.act(() => null);
+        });
+    });
 });
diff --git a/types/react-dom/test-utils/index.d.ts b/types/react-dom/test-utils/index.d.ts
index f60d088515..f1eae65df6 100644
--- a/types/react-dom/test-utils/index.d.ts
+++ b/types/react-dom/test-utils/index.d.ts
@@ -278,3 +278,17 @@ export function findRenderedComponentWithType<T extends Component<any>, C extend
  * Call this in your tests to create a shallow renderer.
  */
 export function createRenderer(): ShallowRenderer;
+
+/**
+ * Wrap any code rendering and triggering updates to your components into `act()` calls.
+ *
+ * Ensures that the behavior in your tests matches what happens in the browser
+ * more closely by executing pending `useEffect`s before returning. This also
+ * reduces the amount of re-renders done.
+ *
+ * @param callback A synchronous, void callback that will execute as a single, complete React commit.
+ *
+ * @see https://reactjs.org/blog/2019/02/06/react-v16.8.0.html#testing-hooks
+ */
+// the "void | undefined" is here to forbid any sneaky "Promise" returns.
+export function act(callback: () => void | undefined): void;
diff --git a/types/react-dom/tsconfig.json b/types/react-dom/tsconfig.json
index f63325026f..6d7d943c8b 100644
--- a/types/react-dom/tsconfig.json
+++ b/types/react-dom/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/react-test-renderer/index.d.ts b/types/react-test-renderer/index.d.ts
index c147d5c190..040ec3a513 100644
--- a/types/react-test-renderer/index.d.ts
+++ b/types/react-test-renderer/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for react-test-renderer 16.0
+// Type definitions for react-test-renderer 16.8
 // Project: https://facebook.github.io/react/
 // Definitions by: Arvitaly <https://github.com/arvitaly>
 //                 Lochbrunner <https://github.com/lochbrunner>
 //                 John Reilly <https://github.com/johnnyreilly>
 //                 John Gozde <https://github.com/jgoz>
+//                 Jessica Franco <https://github.com/Jessidhia>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -50,3 +51,17 @@ export interface TestRendererOptions {
     createNodeMock(element: ReactElement<any>): any;
 }
 export function create(nextElement: ReactElement<any>, options?: TestRendererOptions): ReactTestRenderer;
+
+/**
+ * Wrap any code rendering and triggering updates to your components into `act()` calls.
+ *
+ * Ensures that the behavior in your tests matches what happens in the browser
+ * more closely by executing pending `useEffect`s before returning. This also
+ * reduces the amount of re-renders done.
+ *
+ * @param callback A synchronous, void callback that will execute as a single, complete React commit.
+ *
+ * @see https://reactjs.org/blog/2019/02/06/react-v16.8.0.html#testing-hooks
+ */
+// the "void | undefined" is here to forbid any sneaky "Promise" returns.
+export function act(callback: () => void | undefined): void;
diff --git a/types/react-test-renderer/react-test-renderer-tests.ts b/types/react-test-renderer/react-test-renderer-tests.ts
index 83dc510e2b..b7e23caf25 100644
--- a/types/react-test-renderer/react-test-renderer-tests.ts
+++ b/types/react-test-renderer/react-test-renderer-tests.ts
@@ -1,5 +1,5 @@
-import * as React from "react";
-import { create, ReactTestInstance } from "react-test-renderer";
+import React = require("react");
+import { act, create, ReactTestInstance } from "react-test-renderer";
 import { createRenderer } from 'react-test-renderer/shallow';
 
 class TestComponent extends React.Component { }
@@ -66,3 +66,10 @@ const shallowRenderer = createRenderer();
 shallowRenderer.render(component);
 shallowRenderer.getRenderOutput();
 shallowRenderer.getMountedInstance();
+
+// Only synchronous, void callbacks are acceptable for act()
+act(() => {});
+// $ExpectError
+act(async () => {});
+// $ExpectError
+act(() => null);