fix: infer SpringValue types only from the from prop when it exists

pmndrs · Apr 2, 2021 · eaf473f · eaf473f
1 parent 140038b
commit eaf473f
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/packages/core/src/types/props.ts b/packages/core/src/types/props.ts
@@ -314,10 +314,11 @@ export type PickAnimated<Props extends object, Fwd = true> = unknown &
     : [object] extends [Props]
     ? Lookup
     : ObjectFromUnion<
-        | FromValues<Props>
-        | (TransitionKey & keyof Props extends never
-            ? ToValues<Props, Fwd>
-            : TransitionValues<Props>)
+        Props extends { from: infer From } // extract prop from the `from` prop if it exists
+          ? ObjectType<From>
+          : TransitionKey & keyof Props extends never
+          ? ToValues<Props, Fwd>
+          : TransitionValues<Props>
       >)
 
 /**
@@ -330,10 +331,3 @@ type ToValues<Props extends object, AndForward = true> = unknown &
       ? ForwardProps<[To] extends [object] ? To : Partial<Extract<To, object>>>
       : never
     : unknown)
-
-/**
- * Pick the values of the `from` prop.
- */
-type FromValues<Props extends object> = ForwardProps<
-  Props extends { from?: infer From } ? ObjectType<From> : object
->