From ec4b986bc8641599b223a79efaebafe196aeb2e8 Mon Sep 17 00:00:00 2001
From: Alexey Svetliakov <asvetliakov@teledini.com>
Date: Tue, 14 Feb 2017 01:49:54 +0100
Subject: [PATCH 1/2] enzyme: return any as state for shallow() and mount()

---
 enzyme/enzyme-tests.tsx | 14 ++++++++++++++
 enzyme/index.d.ts       |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/enzyme/enzyme-tests.tsx b/enzyme/enzyme-tests.tsx
index 82a8dc9822..c7323766f7 100644
--- a/enzyme/enzyme-tests.tsx
+++ b/enzyme/enzyme-tests.tsx
@@ -37,6 +37,13 @@ namespace ShallowWrapperTest {
         elementWrapper: ShallowWrapper<HTMLAttributes<{}>, {}>,
         statelessWrapper: ShallowWrapper<StatelessProps, never>;
 
+    function test_props_state_inferring() {
+        let wrapper: ShallowWrapper<MyComponentProps, MyComponentState>;
+        wrapper = shallow(<MyComponent stringProp="value" />);
+        wrapper.state().stateProperty;
+        wrapper.props().stringProp.toUpperCase();
+    }
+
     function test_shallow_options() {
         shallow(<MyComponent stringProp="1"/>, {
             context: {
@@ -337,6 +344,13 @@ namespace ReactWrapperTest {
         elementWrapper: ReactWrapper<HTMLAttributes<{}>, {}>,
         statelessWrapper: ReactWrapper<StatelessProps, never>;
 
+    function test_prop_state_inferring() {
+        let wrapper: ReactWrapper<MyComponentProps, MyComponentState>;
+        wrapper = mount(<MyComponent stringProp="value" />);
+        wrapper.state().stateProperty;
+        wrapper.props().stringProp.toUpperCase();
+    }
+
     function test_unmount() {
         reactWrapper = reactWrapper.unmount();
     }
diff --git a/enzyme/index.d.ts b/enzyme/index.d.ts
index 66c86d1166..184b20ec57 100644
--- a/enzyme/index.d.ts
+++ b/enzyme/index.d.ts
@@ -541,14 +541,14 @@ export interface MountRendererProps {
  * @param node
  * @param [options]
  */
-export function shallow<P, S>(node: ReactElement<P>, options?: ShallowRendererProps): ShallowWrapper<P, S>;
+export function shallow<P, S>(node: ReactElement<P>, options?: ShallowRendererProps): ShallowWrapper<P, any>;
 
 /**
  * Mounts and renders a react component into the document and provides a testing wrapper around it.
  * @param node
  * @param [options]
  */
-export function mount<P, S>(node: ReactElement<P>, options?: MountRendererProps): ReactWrapper<P, S>;
+export function mount<P, S>(node: ReactElement<P>, options?: MountRendererProps): ReactWrapper<P, any>;
 
 /**
  * Render react components to static HTML and analyze the resulting HTML structure.

From dadb3b32f771533dcad0412bdf6f2907dde56a89 Mon Sep 17 00:00:00 2001
From: Alexey Svetliakov <asvetliakov@teledini.com>
Date: Mon, 20 Mar 2017 05:01:19 +0100
Subject: [PATCH 2/2] Added overload

---
 enzyme/index.d.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/enzyme/index.d.ts b/enzyme/index.d.ts
index 184b20ec57..86c481ceb4 100644
--- a/enzyme/index.d.ts
+++ b/enzyme/index.d.ts
@@ -541,14 +541,16 @@ export interface MountRendererProps {
  * @param node
  * @param [options]
  */
-export function shallow<P, S>(node: ReactElement<P>, options?: ShallowRendererProps): ShallowWrapper<P, any>;
+export function shallow<P>(node: ReactElement<P>, options?: ShallowRendererProps): ShallowWrapper<P, any>;
+export function shallow<P, S>(node: ReactElement<P>, options?: ShallowRendererProps): ShallowWrapper<P, S>;
 
 /**
  * Mounts and renders a react component into the document and provides a testing wrapper around it.
  * @param node
  * @param [options]
  */
-export function mount<P, S>(node: ReactElement<P>, options?: MountRendererProps): ReactWrapper<P, any>;
+export function mount<P>(node: ReactElement<P>, options?: MountRendererProps): ReactWrapper<P, any>;
+export function mount<P, S>(node: ReactElement<P>, options?: MountRendererProps): ReactWrapper<P, S>;
 
 /**
  * Render react components to static HTML and analyze the resulting HTML structure.