@@ -39,9 +39,7 @@ export function scheduleProps<T extends AnimationTarget>(
39
39
let delay : number
40
40
let timeout : Timeout
41
41
42
- let cancel = mergeDefaultProp ( defaultProps , props , 'cancel' )
43
- cancel = matchProp ( props . cancel ?? cancel , key )
44
-
42
+ let cancel = matchProp ( props . cancel ?? defaultProps ?. cancel , key )
45
43
if ( cancel ) {
46
44
onStart ( )
47
45
} else {
@@ -51,7 +49,7 @@ export function scheduleProps<T extends AnimationTarget>(
51
49
}
52
50
// The default `pause` takes precedence when true,
53
51
// which allows `SpringContext` to work as expected.
54
- let pause = mergeDefaultProp ( defaultProps , props , ' pause' )
52
+ let pause = defaultProps ?. pause
55
53
if ( pause !== true ) {
56
54
pause = state . paused || matchProp ( pause , key )
57
55
}
@@ -101,18 +99,3 @@ export function scheduleProps<T extends AnimationTarget>(
101
99
}
102
100
} )
103
101
}
104
-
105
- /** Update and return the default prop. */
106
- function mergeDefaultProp < T > (
107
- defaultProps : DefaultProps < T > | undefined ,
108
- props : DefaultProps < T > ,
109
- key : keyof DefaultProps < T >
110
- ) {
111
- let value : any
112
- return (
113
- defaultProps &&
114
- ( is . und ( ( value = getDefaultProp ( props , key ) ) )
115
- ? defaultProps [ key ]
116
- : ( defaultProps [ key ] = value ) )
117
- )
118
- }
0 commit comments