Merge branch 'master' into feature/react-18-initial-compat

# Conflicts:
#	src/components/Provider.tsx

Author: markerikson

README.md

@@ -3,7 +3,7 @@
 Official React bindings for [Redux](https://github.com/reduxjs/redux).  
 Performant and flexible.
 
-![GitHub Workflow Status](https://img.shields.io/github/workflow/status/reduxjs/react-redux/CI?style=flat-square) [![npm version](https://img.shields.io/npm/v/react-redux.svg?style=flat-square)](https://www.npmjs.com/package/react-redux)
+![GitHub Workflow Status](https://img.shields.io/github/workflow/status/reduxjs/react-redux/Tests?style=flat-square) [![npm version](https://img.shields.io/npm/v/react-redux.svg?style=flat-square)](https://www.npmjs.com/package/react-redux)
 [![npm downloads](https://img.shields.io/npm/dm/react-redux.svg?style=flat-square)](https://www.npmjs.com/package/react-redux)
 [![redux channel on discord](https://img.shields.io/badge/[email protected]?style=flat-square)](http://www.reactiflux.com)
 

docs/api/hooks.md

@@ -481,4 +481,3 @@ export function useShallowEqualSelector(selector) {
 ### Additional considerations when using hooks
 
 There are some architectural trade offs to take into consideration when deciding whether to use hooks or not. Mark Erikson summarizes these nicely in his two blog posts [Thoughts on React Hooks, Redux, and Separation of Concerns](https://blog.isquaredsoftware.com/2019/07/blogged-answers-thoughts-on-hooks/) and [Hooks, HOCs, and Tradeoffs](https://blog.isquaredsoftware.com/2019/09/presentation-hooks-hocs-tradeoffs/).
-````

src/components/Provider.tsx

@@ -32,7 +32,6 @@ function Provider({ store, context, children }: ProviderProps) {
 
   useIsomorphicLayoutEffect(() => {
     const { subscription } = contextValue
-
     subscription.onStateChange = subscription.notifyNestedSubs
     subscription.trySubscribe()
 

src/components/connect.tsx

@@ -264,19 +264,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<
@@ -287,7 +293,10 @@ function connect<
 >(
   mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
   mapDispatchToProps: MapDispatchToPropsNonObject<TDispatchProps, TOwnProps>
-): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps, TOwnProps>
+): InferableComponentEnhancerWithProps<
+  TStateProps & TDispatchProps,
+  TOwnProps & ConnectProps
+>
 
 /* @public */
 function connect<
@@ -300,7 +309,7 @@ function connect<
   mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
 ): InferableComponentEnhancerWithProps<
   TStateProps & ResolveThunks<TDispatchProps>,
-  TOwnProps
+  TOwnProps & ConnectProps
 >
 
 /* @public */
@@ -313,7 +322,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<
@@ -326,7 +335,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<
@@ -338,7 +347,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
@@ -352,23 +361,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<
@@ -381,7 +396,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<
@@ -396,7 +414,7 @@ function connect<
   options: ConnectOptions<State, TStateProps, TOwnProps>
 ): InferableComponentEnhancerWithProps<
   TStateProps & ResolveThunks<TDispatchProps>,
-  TOwnProps
+  TOwnProps & ConnectProps
 >
 
 /* @public */
@@ -411,7 +429,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.

test/components/connect.spec.tsx

@@ -2217,10 +2217,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>
@@ -2249,13 +2245,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>
         )
@@ -2297,6 +2289,7 @@ describe('React', () => {
 
         const rendered = rtl.render(
           <ProviderMock store={store}>
+            {/*@ts-expect-error*/}
             <Decorated store={notActuallyAStore} />
           </ProviderMock>
         )
@@ -2345,7 +2338,6 @@ describe('React', () => {
             </div>
           )
         }
-        const ConnectedComp2 = connect((state) => state)(Comp2)
 
         type Comp1TStatePropsType = Store1State1Type
         type Comp1NoDispatchType = NoDispatchType
@@ -2392,17 +2384,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>