Skip to content

Commit 2fad161

Browse files
joshuaellisjoshuaellis
authored
fix: remove infer S extends L (#1988)
1 parent 9cf3bfe commit 2fad161

File tree

7 files changed

+83
-28
lines changed

7 files changed

+83
-28
lines changed

‎.changeset/config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"access": "public",
77
"baseBranch": "master",
88
"updateInternalDependencies": "patch",
9-
"ignore": []
9+
"ignore": ["@react-spring/demo", "@react-spring/docs"]
1010
}

‎.changeset/cuddly-dolls-sit.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
'@react-spring/core': patch
3+
'@react-spring/animated': patch
4+
'@react-spring/parallax': patch
5+
'@react-spring/rafz': patch
6+
'react-spring': patch
7+
'@react-spring/shared': patch
8+
'@react-spring/types': patch
9+
'@react-spring/konva': patch
10+
'@react-spring/native': patch
11+
'@react-spring/three': patch
12+
'@react-spring/web': patch
13+
'@react-spring/zdog': patch
14+
---
15+
16+
fix: allow transpile from TS < 4.7

‎.changeset/pre.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"mode": "pre",
3+
"tag": "beta",
4+
"initialVersions": {
5+
"@react-spring/demo": "0.0.1",
6+
"@react-spring/docs": "1.0.7",
7+
"@react-spring/animated": "9.5.4",
8+
"@react-spring/core": "9.5.4",
9+
"@react-spring/parallax": "9.5.4",
10+
"@react-spring/rafz": "9.5.4",
11+
"react-spring": "9.5.4",
12+
"@react-spring/shared": "9.5.4",
13+
"@react-spring/types": "9.5.4",
14+
"@react-spring/konva": "9.5.4",
15+
"@react-spring/native": "9.5.4",
16+
"@react-spring/three": "9.5.4",
17+
"@react-spring/web": "9.5.4",
18+
"@react-spring/zdog": "9.5.4"
19+
},
20+
"changesets": []
21+
}

‎packages/core/src/hooks/useSpring.ts‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,19 @@ import { useSprings } from './useSprings'
1010
* The props that `useSpring` recognizes.
1111
*/
1212
export type UseSpringProps<Props extends object = any> = unknown &
13-
PickAnimated<Props> extends infer State extends Lookup<any>
14-
? Remap<
15-
ControllerUpdate<State> & {
16-
/**
17-
* Used to access the imperative API.
18-
*
19-
* When defined, the render animation won't auto-start.
20-
*/
21-
ref?: SpringRef<State>
22-
}
23-
>
13+
PickAnimated<Props> extends infer State
14+
? State extends Lookup
15+
? Remap<
16+
ControllerUpdate<State> & {
17+
/**
18+
* Used to access the imperative API.
19+
*
20+
* When defined, the render animation won't auto-start.
21+
*/
22+
ref?: SpringRef<State>
23+
}
24+
>
25+
: never
2426
: never
2527

2628
/**
@@ -32,8 +34,10 @@ export function useSpring<Props extends object>(
3234
| Function
3335
| (() => (Props & Valid<Props, UseSpringProps<Props>>) | UseSpringProps),
3436
deps?: readonly any[] | undefined
35-
): PickAnimated<Props> extends infer State extends Lookup<any>
36-
? [SpringValues<State>, SpringRef<State>]
37+
): PickAnimated<Props> extends infer State
38+
? State extends Lookup
39+
? [SpringValues<State>, SpringRef<State>]
40+
: never
3741
: never
3842

3943
/**
@@ -49,8 +53,10 @@ export function useSpring<Props extends object>(
4953
export function useSpring<Props extends object>(
5054
props: (Props & Valid<Props, UseSpringProps<Props>>) | UseSpringProps,
5155
deps: readonly any[] | undefined
52-
): PickAnimated<Props> extends infer State extends Lookup<any>
53-
? [SpringValues<State>, SpringRef<State>]
56+
): PickAnimated<Props> extends infer State
57+
? State extends Lookup
58+
? [SpringValues<State>, SpringRef<State>]
59+
: never
5460
: never
5561

5662
/** @internal */

‎packages/core/src/hooks/useSprings.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ export function useSprings<Props extends UseSpringProps>(
4343
length: number,
4444
props: (i: number, ctrl: Controller) => Props,
4545
deps?: readonly any[]
46-
): PickAnimated<Props> extends infer State extends Lookup<any>
47-
? [SpringValues<State>[], SpringRefType<State>]
46+
): PickAnimated<Props> extends infer State
47+
? State extends Lookup<any>
48+
? [SpringValues<State>[], SpringRefType<State>]
49+
: never
4850
: never
4951

5052
/**
@@ -62,8 +64,10 @@ export function useSprings<Props extends UseSpringsProps>(
6264
length: number,
6365
props: Props[] & UseSpringsProps<PickAnimated<Props>>[],
6466
deps: readonly any[] | undefined
65-
): PickAnimated<Props> extends infer State extends Lookup<any>
66-
? [SpringValues<State>[], SpringRefType<State>]
67+
): PickAnimated<Props> extends infer State
68+
? State extends Lookup<any>
69+
? [SpringValues<State>[], SpringRefType<State>]
70+
: never
6771
: never
6872

6973
/** @internal */

‎packages/core/src/hooks/useTrail.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ export function useTrail<Props extends object>(
1919
ctrl: Controller
2020
) => UseTrailProps | (Props & Valid<Props, UseTrailProps<Props>>),
2121
deps?: readonly any[]
22-
): PickAnimated<Props> extends infer State extends Lookup<any>
23-
? [SpringValues<State>[], SpringRef<State>]
22+
): PickAnimated<Props> extends infer State
23+
? State extends Lookup<any>
24+
? [SpringValues<State>[], SpringRef<State>]
25+
: never
2426
: never
2527

2628
export function useTrail<Props extends object>(
@@ -32,8 +34,10 @@ export function useTrail<Props extends object>(
3234
length: number,
3335
props: UseTrailProps | (Props & Valid<Props, UseTrailProps<Props>>),
3436
deps: readonly any[]
35-
): PickAnimated<Props> extends infer State extends Lookup<any>
36-
? [SpringValues<State>[], SpringRef<State>]
37+
): PickAnimated<Props> extends infer State
38+
? State extends Lookup<any>
39+
? [SpringValues<State>[], SpringRef<State>]
40+
: never
3741
: never
3842

3943
export function useTrail(

‎packages/core/src/hooks/useTransition.tsx‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ export function useTransition<Item, Props extends object>(
4545
| UseTransitionProps<Item>
4646
| (Props & Valid<Props, UseTransitionProps<Item>>),
4747
deps?: any[]
48-
): PickAnimated<Props> extends infer State extends Lookup
49-
? [TransitionFn<Item, PickAnimated<Props>>, SpringRefType<State>]
48+
): PickAnimated<Props> extends infer State
49+
? State extends Lookup
50+
? [TransitionFn<Item, PickAnimated<Props>>, SpringRefType<State>]
51+
: never
5052
: never
5153

5254
export function useTransition<Item, Props extends object>(
@@ -62,8 +64,10 @@ export function useTransition<Item, Props extends object>(
6264
| UseTransitionProps<Item>
6365
| (Props & Valid<Props, UseTransitionProps<Item>>),
6466
deps: any[] | undefined
65-
): PickAnimated<Props> extends infer State extends Lookup
66-
? [TransitionFn<Item, State>, SpringRefType<State>]
67+
): PickAnimated<Props> extends infer State
68+
? State extends Lookup
69+
? [TransitionFn<Item, State>, SpringRefType<State>]
70+
: never
6771
: never
6872

6973
export function useTransition(

0 commit comments

Comments
 (0)