Update connect types to reflect context and store props

Author: markerikson

src/components/connect.tsx

@@ -192,11 +192,16 @@ function subscribeUpdates(
 const initStateUpdates = () => EMPTY_ARRAY
 
 export interface ConnectProps {
-  reactReduxForwardedRef?: React.ForwardedRef<unknown>
+  /** A custom Context instance that the component can use to access the store from an alternate Provider using that same Context instance */
   context?: ReactReduxContextInstance
+  /** A Redux store instance to be used for subscriptions instead of the store from a Provider */
   store?: Store
 }
 
+interface InternalConnectProps extends ConnectProps {
+  reactReduxForwardedRef?: React.ForwardedRef<unknown>
+}
+
 function match<T>(
   arg: unknown,
   factories: ((value: unknown) => T)[],
@@ -538,7 +543,9 @@ function connect<
     // that just executes the given callback immediately.
     const usePureOnlyMemo = pure ? useMemo : (callback: () => any) => callback()
 
-    function ConnectFunction<TOwnProps>(props: ConnectProps & TOwnProps) {
+    function ConnectFunction<TOwnProps>(
+      props: InternalConnectProps & TOwnProps
+    ) {
       const [propsContext, reactReduxForwardedRef, wrapperProps] =
         useMemo(() => {
           // Distinguish between actual "data" props that were passed to the wrapper component,

src/exports.ts

@@ -2,6 +2,7 @@ import Provider from './components/Provider'
 import type { ProviderProps } from './components/Provider'
 import connect, {
   Connect,
+  ConnectProps,
   ConnectedProps,
 } from './components/connect'
 import type {

src/types.ts

@@ -8,6 +8,8 @@ import { Action, AnyAction, Dispatch } from 'redux'
 // import hoistNonReactStatics = require('hoist-non-react-statics');
 import type { NonReactStatics } from 'hoist-non-react-statics'
 
+import type { ConnectProps } from './components/connect'
+
 export type FixTypeLater = any
 
 export type EqualityFn<T> = (a: T, b: T) => boolean
@@ -116,7 +118,8 @@ export type InferableComponentEnhancerWithProps<TInjectedProps, TNeedsProps> = <
     GetLibraryManagedProps<C>,
     keyof Shared<TInjectedProps, GetLibraryManagedProps<C>>
   > &
-    TNeedsProps
+    TNeedsProps &
+    ConnectProps
 >
 
 // Injects props and removes them from the prop requirements.