fix: delete legacy type problems

reduxjs · Sep 4, 2021 · 216cf76 · 216cf76
1 parent f278933
commit 216cf76
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 28 deletions.
diff --git a/src/components/connect.tsx b/src/components/connect.tsx
@@ -280,19 +280,25 @@ function connect<
   State = DefaultRootState
 >(
   mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>
-): InferableComponentEnhancerWithProps<TStateProps & DispatchProp, TOwnProps>
+): InferableComponentEnhancerWithProps<
+  TStateProps & DispatchProp,
+  TOwnProps & ConnectProps
+>
 
 /* @public */
 function connect<no_state = {}, TDispatchProps = {}, TOwnProps = {}>(
   mapStateToProps: null | undefined,
   mapDispatchToProps: MapDispatchToPropsNonObject<TDispatchProps, TOwnProps>
-): InferableComponentEnhancerWithProps<TDispatchProps, TOwnProps>
+): InferableComponentEnhancerWithProps<TDispatchProps, TOwnProps & ConnectProps>
 
 /* @public */
 function connect<no_state = {}, TDispatchProps = {}, TOwnProps = {}>(
   mapStateToProps: null | undefined,
   mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
-): InferableComponentEnhancerWithProps<ResolveThunks<TDispatchProps>, TOwnProps>
+): InferableComponentEnhancerWithProps<
+  ResolveThunks<TDispatchProps>,
+  TOwnProps & ConnectProps
+>
 
 /* @public */
 function connect<
@@ -303,7 +309,10 @@ function connect<
 >(
   mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
   mapDispatchToProps: MapDispatchToPropsNonObject<TDispatchProps, TOwnProps>
-): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps, TOwnProps>
+): InferableComponentEnhancerWithProps<
+  TStateProps & TDispatchProps,
+  TOwnProps & ConnectProps
+>
 
 /* @public */
 function connect<
@@ -316,7 +325,7 @@ function connect<
   mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
 ): InferableComponentEnhancerWithProps<
   TStateProps & ResolveThunks<TDispatchProps>,
-  TOwnProps
+  TOwnProps & ConnectProps
 >
 
 /* @public */
@@ -329,7 +338,7 @@ function connect<
   mapStateToProps: null | undefined,
   mapDispatchToProps: null | undefined,
   mergeProps: MergeProps<undefined, undefined, TOwnProps, TMergedProps>
-): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>
+): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps & ConnectProps>
 
 /* @public */
 function connect<
@@ -342,7 +351,7 @@ function connect<
   mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
   mapDispatchToProps: null | undefined,
   mergeProps: MergeProps<TStateProps, undefined, TOwnProps, TMergedProps>
-): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>
+): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps & ConnectProps>
 
 /* @public */
 function connect<
@@ -354,7 +363,7 @@ function connect<
   mapStateToProps: null | undefined,
   mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
   mergeProps: MergeProps<undefined, TDispatchProps, TOwnProps, TMergedProps>
-): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>
+): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps & ConnectProps>
 
 /* @public */
 // @ts-ignore
@@ -368,23 +377,29 @@ function connect<
   mapDispatchToProps: null | undefined,
   mergeProps: null | undefined,
   options: ConnectOptions<State, TStateProps, TOwnProps>
-): InferableComponentEnhancerWithProps<DispatchProp & TStateProps, TOwnProps>
+): InferableComponentEnhancerWithProps<
+  DispatchProp & TStateProps,
+  TOwnProps & ConnectProps
+>
 
 /* @public */
 function connect<TStateProps = {}, TDispatchProps = {}, TOwnProps = {}>(
   mapStateToProps: null | undefined,
   mapDispatchToProps: MapDispatchToPropsNonObject<TDispatchProps, TOwnProps>,
   mergeProps: null | undefined,
   options: ConnectOptions<{}, TStateProps, TOwnProps>
-): InferableComponentEnhancerWithProps<TDispatchProps, TOwnProps>
+): InferableComponentEnhancerWithProps<TDispatchProps, TOwnProps & ConnectProps>
 
 /* @public */
 function connect<TStateProps = {}, TDispatchProps = {}, TOwnProps = {}>(
   mapStateToProps: null | undefined,
   mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
   mergeProps: null | undefined,
   options: ConnectOptions<{}, TStateProps, TOwnProps>
-): InferableComponentEnhancerWithProps<ResolveThunks<TDispatchProps>, TOwnProps>
+): InferableComponentEnhancerWithProps<
+  ResolveThunks<TDispatchProps>,
+  TOwnProps & ConnectProps
+>
 
 /* @public */
 function connect<
@@ -397,7 +412,10 @@ function connect<
   mapDispatchToProps: MapDispatchToPropsNonObject<TDispatchProps, TOwnProps>,
   mergeProps: null | undefined,
   options: ConnectOptions<State, TStateProps, TOwnProps>
-): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps, TOwnProps>
+): InferableComponentEnhancerWithProps<
+  TStateProps & TDispatchProps,
+  TOwnProps & ConnectProps
+>
 
 /* @public */
 function connect<
@@ -412,7 +430,7 @@ function connect<
   options: ConnectOptions<State, TStateProps, TOwnProps>
 ): InferableComponentEnhancerWithProps<
   TStateProps & ResolveThunks<TDispatchProps>,
-  TOwnProps
+  TOwnProps & ConnectProps
 >
 
 /* @public */
@@ -427,7 +445,7 @@ function connect<
   mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
   mergeProps: MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
   options?: ConnectOptions<State, TStateProps, TOwnProps, TMergedProps>
-): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>
+): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps & ConnectProps>
 
 /**
  * Connects a React component to a Redux store.

diff --git a/test/components/connect.spec.tsx b/test/components/connect.spec.tsx
@@ -2179,10 +2179,6 @@ describe('React', () => {
         rtl.render(
           <ProviderMock context={context} store={store1}>
             <ProviderMock store={store2}>
-              {/*TODO: Since the connect type does not support this advanced usage, 
-                we will ignore it for the time being and resolve it after merging connect and connectAdvanced 
-                https://github.com/reduxjs/react-redux/pull/1781 */}
-              {/*// @ts-ignore */}
               <Decorated context={context} />
             </ProviderMock>
           </ProviderMock>
@@ -2211,13 +2207,9 @@ describe('React', () => {
         const Decorated = decorator(Container)
 
         const store = createStore(() => expectedState)
-
         rtl.render(
           <ProviderMock store={store}>
-            {/*TODO: Since the connect type does not support this advanced usage, 
-              we will ignore it for the time being and resolve it after merging connect and connectAdvanced 
-              https://github.com/reduxjs/react-redux/pull/1781 */}
-            {/*// @ts-ignore */}
+            {/*@ts-expect-error*/}
             <Decorated context={nonContext} />
           </ProviderMock>
         )
@@ -2259,6 +2251,7 @@ describe('React', () => {
 
         const rendered = rtl.render(
           <ProviderMock store={store}>
+            {/*@ts-expect-error*/}
             <Decorated store={notActuallyAStore} />
           </ProviderMock>
         )
@@ -2307,7 +2300,6 @@ describe('React', () => {
             </div>
           )
         }
-        const ConnectedComp2 = connect((state) => state)(Comp2)
 
         type Comp1TStatePropsType = Store1State1Type
         type Comp1NoDispatchType = NoDispatchType
@@ -2354,17 +2346,19 @@ describe('React', () => {
               return state
           }
         }
+        const ConnectedComp2 = connect<
+          Store2State1Type,
+          unknown,
+          unknown,
+          Store2State1Type
+        >((state) => state)(Comp2)
 
         const store1 = createStore(reducer1)
         const store2 = createStore(reducer2)
 
         const tester = rtl.render(
           <ProviderMock store={store1}>
             <ConnectedComp1>
-              {/*TODO: Since the connect type does not support this advanced usage, 
-                we will ignore it for the time being and resolve it after merging connect and connectAdvanced 
-                https://github.com/reduxjs/react-redux/pull/1781 */}
-              {/*// @ts-ignore */}
               <ConnectedComp2 store={store2} />
             </ConnectedComp1>
           </ProviderMock>