Merge pull request #1928 from marconi1992/fix/1927

Author: markerikson

Diff for: src/components/connect.tsx

@@ -305,6 +305,12 @@ export interface Connect<DefaultState = unknown> {
     TOwnProps
   >
 
+  /** mapState and mapDispatch (nullish) */
+  <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, State = DefaultState>(
+    mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
+    mapDispatchToProps: null | undefined
+  ): InferableComponentEnhancerWithProps<TStateProps, TOwnProps>
+
   /** mapState and mapDispatch (as an object) */
   <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, State = DefaultState>(
     mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,

Diff for: test/typetests/connect-mapstate-mapdispatch.tsx

@@ -269,6 +269,40 @@ function MapStateAndDispatchObject() {
   const verify = <Test foo="bar" />
 }
 
+function MapStateAndNullishDispatch() {
+  interface ClickPayload {
+    count: number
+  }
+  const onClick: ActionCreator<ClickPayload> = () => ({ count: 1 })
+  const dispatchToProps = {
+    onClick,
+  }
+
+  interface OwnProps {
+    foo: string
+  }
+  interface StateProps {
+    bar: number
+  }
+
+  const mapStateToProps = (_: any, __: OwnProps): StateProps => ({
+    bar: 1,
+  })
+
+  class TestComponent extends React.Component<OwnProps & StateProps> {}
+
+  const TestDispatchPropsNull = connect(mapStateToProps, null)(TestComponent)
+
+  const verifyNull = <TestDispatchPropsNull foo="bar" />
+
+  const TestDispatchPropsUndefined = connect(
+    mapStateToProps,
+    undefined
+  )(TestComponent)
+
+  const verifyNonUn = <TestDispatchPropsUndefined foo="bar" />
+}
+
 function MapDispatchFactory() {
   interface OwnProps {
     foo: string
@@ -422,6 +456,33 @@ function MapStateAndDispatchAndMerge() {
   const verify = <Test foo="bar" />
 }
 
+function MapStateAndMerge() {
+  interface OwnProps {
+    foo: string
+  }
+  interface StateProps {
+    bar: number
+  }
+  interface DispatchProps {
+    onClick: () => void
+  }
+
+  class TestComponent extends React.Component<OwnProps & StateProps> {}
+
+  const mapStateToProps = () => ({
+    bar: 1,
+  })
+
+  const mergeProps = (stateProps: StateProps, _: null, ownProps: OwnProps) => ({
+    ...stateProps,
+    ...ownProps,
+  })
+
+  const Test = connect(mapStateToProps, null, mergeProps)(TestComponent)
+
+  const verify = <Test foo="bar" />
+}
+
 function MapStateAndOptions() {
   interface State {
     state: string