From 85bde30b8678d3d050c7b3b79d95ea0e8de7bf61 Mon Sep 17 00:00:00 2001
From: Gordon <gburgett@watermark.org>
Date: Tue, 19 Feb 2019 11:55:49 -0600
Subject: [PATCH] Fix type inference for connectStateResults

---
 types/react-instantsearch-core/index.d.ts     |  8 ++--
 .../react-instantsearch-core-tests.tsx        | 38 ++++++++++++++-----
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/types/react-instantsearch-core/index.d.ts b/types/react-instantsearch-core/index.d.ts
index b48c2a9689..0f2ec9ce61 100644
--- a/types/react-instantsearch-core/index.d.ts
+++ b/types/react-instantsearch-core/index.d.ts
@@ -511,10 +511,10 @@ export interface StateResultsProvided<TDoc = BasicDoc> {
  *
  * https://community.algolia.com/react-instantsearch/connectors/connectStateResults.html
  */
-export function connectStateResults<TDoc = BasicDoc>(
-  stateless: React.StatelessComponent<StateResultsProvided<TDoc>>): React.ComponentClass;
-export function connectStateResults<TProps extends Partial<StateResultsProvided<TDoc>>, TDoc = BasicDoc>(
-  ctor: React.ComponentType<TProps>): ConnectedComponentClass<TProps, StateResultsProvided<TDoc>>;
+export function connectStateResults(
+  stateless: React.StatelessComponent<StateResultsProvided>): React.ComponentClass;
+export function connectStateResults<TProps extends Partial<StateResultsProvided<any>>>(
+  ctor: React.ComponentType<TProps>): ConnectedComponentClass<TProps, StateResultsProvided>;
 
 interface StatsProvided {
   nbHits: number;
diff --git a/types/react-instantsearch-core/react-instantsearch-core-tests.tsx b/types/react-instantsearch-core/react-instantsearch-core-tests.tsx
index 09bab5af15..c115873470 100644
--- a/types/react-instantsearch-core/react-instantsearch-core-tests.tsx
+++ b/types/react-instantsearch-core/react-instantsearch-core-tests.tsx
@@ -21,7 +21,8 @@ import {
   Hit,
   TranslatableProvided,
   translatable,
-  ConnectorProvided
+  ConnectorProvided,
+  StateResultsProvided
 } from 'react-instantsearch-core';
 
 () => {
@@ -209,18 +210,35 @@ import {
 };
 
 () => {
+  interface MyDoc {
+    field1: string;
+    field2: number;
+    field3: { compound: string };
+  }
+
   interface StateResultsProps {
-    searchResults: SearchResults<{
-      field1: string
-      field2: number
-      field3: { compound: string }
-     }>;
+    searchResults: SearchResults<MyDoc>;
     // partial of StateResultsProvided
 
     additionalProp: string;
   }
 
-  const Stateless = ({ additionalProp, searchResults }: StateResultsProps) =>
+  const Stateless = connectStateResults(
+    ({
+      searchResults,
+      additionalProp, // $ExpectError
+    }) => (<div>
+      <h1>{additionalProp}</h1>
+      {searchResults.hits.map((h) => {
+        return <span>{h._highlightResult.field1!.value}</span>;
+      })}
+    </div>)
+  );
+
+  <Stateless />;
+  <Stateless additionalProp='test' />; // $ExpectError
+
+  const StatelessWithType = ({ additionalProp, searchResults }: StateResultsProps) =>
     <div>
       <h1>{additionalProp}</h1>
       {searchResults.hits.map((h) => {
@@ -229,11 +247,11 @@ import {
         return <span>{compound}</span>;
       })}
     </div>;
-  const ComposedStateless = connectStateResults(Stateless);
+  const ComposedStatelessWithType = connectStateResults(StatelessWithType);
 
-  <ComposedStateless />; // $ExpectError
+  <ComposedStatelessWithType />; // $ExpectError
 
-  <ComposedStateless additionalProp='test' />;
+  <ComposedStatelessWithType additionalProp='test' />;
 
   class MyComponent extends React.Component<StateResultsProps> {
     render() {