Use a Mapped type to simplify the final displayed types for components

reduxjs · Sep 23, 2022 · b9ec3a7 · b9ec3a7
1 parent 16c829b
commit b9ec3a7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/types.ts b/src/types.ts
@@ -93,6 +93,9 @@ export type ConnectPropsMaybeWithoutContext<TActualOwnProps> =
     ? Omit<ConnectProps, 'context'>
     : ConnectProps
 
+type Identity<T> = T
+export type Mapped<T> = Identity<{ [k in keyof T]: T[k] }>
+
 // Injects props and removes them from the prop requirements.
 // Will not pass through the injected props if they are passed in during
 // render. Also adds new prop requirements from TNeedsProps.
@@ -109,8 +112,9 @@ export type InferableComponentEnhancerWithProps<TInjectedProps, TNeedsProps> = <
     GetLibraryManagedProps<C>,
     keyof Shared<TInjectedProps, GetLibraryManagedProps<C>>
   > &
-    TNeedsProps &
-    ConnectPropsMaybeWithoutContext<TNeedsProps & GetProps<C>>
+    Mapped<
+      TNeedsProps & ConnectPropsMaybeWithoutContext<TNeedsProps & GetProps<C>>
+    >
 >
 
 // Injects props and removes them from the prop requirements.

diff --git a/test/typetests/connect-options-and-issues.tsx b/test/typetests/connect-options-and-issues.tsx
@@ -465,7 +465,7 @@ function TestOptionalPropsMergedCorrectly() {
     }
   }
 
-  connect(mapStateToProps, mapDispatchToProps)(Component)
+  const Connected = connect(mapStateToProps, mapDispatchToProps)(Component)
 }
 
 function TestMoreGeneralDecorationProps() {