Merge pull request #1897 from reduxjs/bugfix/v8-merge-dispatchprop

reduxjs · Apr 13, 2022 · 1da5216 · 1da5216
2 parents 80fc518 + 7765805
commit 1da5216
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/components/connect.tsx b/src/components/connect.tsx
@@ -312,7 +312,7 @@ export interface Connect<DefaultState = unknown> {
   <no_state = {}, no_dispatch = {}, TOwnProps = {}, TMergedProps = {}>(
     mapStateToProps: null | undefined,
     mapDispatchToProps: null | undefined,
-    mergeProps: MergeProps<undefined, undefined, TOwnProps, TMergedProps>
+    mergeProps: MergeProps<undefined, DispatchProp, TOwnProps, TMergedProps>
   ): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>
 
   /** mapState and mergeProps */
@@ -325,7 +325,7 @@ export interface Connect<DefaultState = unknown> {
   >(
     mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
     mapDispatchToProps: null | undefined,
-    mergeProps: MergeProps<TStateProps, undefined, TOwnProps, TMergedProps>
+    mergeProps: MergeProps<TStateProps, DispatchProp, TOwnProps, TMergedProps>
   ): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>
 
   /** mapDispatch (as a object) and mergeProps */

diff --git a/test/typetests/connect-options-and-issues.tsx b/test/typetests/connect-options-and-issues.tsx
@@ -103,6 +103,14 @@ function TestMergedPropsInference() {
       merged: 'merged',
     })
   )(MergedPropsComponent)
+
+  const ConnectedWithInferredDispatch = connect(
+    mapStateToProps,
+    undefined,
+    (stateProps, dispatchProps, ownProps) => {
+      expectType<DispatchProp<AnyAction>>(dispatchProps)
+    }
+  )(MergedPropsComponent)
 }
 
 function Issue16652() {