-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add new higher order animation - withClamp #5239
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Latropos
commented
Oct 16, 2023
dc35e59
to
39bd9a5
Compare
tomekzaw
reviewed
Oct 16, 2023
Latropos
commented
Oct 16, 2023
piaskowyk
requested changes
Oct 17, 2023
Could you confirm that it works for different type of animation value?
What will happen if someone use this syntax:
|
@piaskowyk I've just realised that our spring doesn't work with
Screen.Recording.2023-10-18.at.15.51.18.mov
|
@piaskowyk I've just tested and:
With clamp doesn't work, if inner animation returns something other than number. I've explained why I think we shouldn't implement such a feature for other types.
|
piaskowyk
requested changes
Oct 31, 2023
Co-authored-by: Krzysztof Piaskowy <krzysztof.piaskowy@swmansion.com>
Latropos
commented
Nov 3, 2023
Latropos
commented
Nov 3, 2023
Latropos
commented
Nov 7, 2023
tomekzaw
reviewed
Nov 7, 2023
piaskowyk
requested changes
Nov 10, 2023
piaskowyk
approved these changes
Nov 15, 2023
Latropos
added a commit
that referenced
this pull request
Nov 24, 2023
<!-- Thanks for submitting a pull request! We appreciate you spending the time to work on these changes. Please follow the template so that the reviewers can easily understand what the code changes affect. --> ## Summary <!-- Explain the motivation for this PR. Include "Fixes #<number>" if applicable. --> Add new higher order function withClamp that allows to limit range of movement. Usable especially with `spring` animation. Allows to pass number or string for both of the clamps. https://github.com/software-mansion/react-native-reanimated/assets/56199675/26641e51-7bb2-468d-adf9-a1f686e67824 ## Test plan <!-- Provide a minimal but complete code snippet that can be used to test out this change along with instructions how to run it and a description of the expected behavior. --> <details><summary>Testing code </summary> ```javascript 'use strict'; import { defineAnimation, getReduceMotionForAnimation } from './util'; import type { Animation, AnimationCallback, AnimatableValue, Timestamp, } from '../commonTypes'; import type { SpringConfig, SpringAnimation, InnerSpringAnimation, SpringConfigInner, DefaultSpringConfig, } from './springUtils'; import { initialCalculations, calculateNewMassToMatchDuration, underDampedSpringCalculations, criticallyDampedSpringCalculations, isAnimationTerminatingCalculation, scaleZetaToMatchClamps, isConfigValid, } from './springUtils'; // TODO TYPESCRIPT This is a temporary type to get rid of .d.ts file. type withSpringType = <T extends AnimatableValue>( toValue: T, userConfig?: SpringConfig, callback?: AnimationCallback ) => T; export const withSpring = (( toValue: AnimatableValue, userConfig?: SpringConfig, callback?: AnimationCallback ): Animation<SpringAnimation> => { 'worklet'; return defineAnimation<SpringAnimation>(toValue, () => { 'worklet'; const defaultConfig: DefaultSpringConfig = { damping: 10, mass: 1, stiffness: 100, overshootClamping: false, restDisplacementThreshold: 0.01, restSpeedThreshold: 2, velocity: 0, duration: 2000, dampingRatio: 0.5, reduceMotion: undefined, clamp: undefined, } as const; const config: DefaultSpringConfig & SpringConfigInner = { ...defaultConfig, ...userConfig, useDuration: !!(userConfig?.duration || userConfig?.dampingRatio), skipAnimation: false, }; config.skipAnimation = !isConfigValid(config); if (config.duration === 0) { config.skipAnimation = true; } function springOnFrame( animation: InnerSpringAnimation, now: Timestamp ): boolean { const { toValue, startTimestamp, current } = animation; const timeFromStart = now - startTimestamp; if (config.useDuration && timeFromStart >= config.duration) { animation.current = toValue; // clear lastTimestamp to avoid using stale value by the next spring animation that starts after this one animation.lastTimestamp = 0; return true; } if (config.skipAnimation) { // If we use duration we want to wait the provided time before stopping if (config.useDuration) return false; else { animation.current = toValue; animation.lastTimestamp = 0; return true; } } const { lastTimestamp, velocity } = animation; const deltaTime = Math.min(now - lastTimestamp, 64); animation.lastTimestamp = now; const t = deltaTime / 1000; const v0 = -velocity; const x0 = toValue - current; const { zeta, omega0, omega1 } = animation; const { position: newPosition, velocity: newVelocity } = zeta < 1 ? underDampedSpringCalculations(animation, { zeta, v0, x0, omega0, omega1, t, }) : criticallyDampedSpringCalculations(animation, { v0, x0, omega0, t, }); animation.current = newPosition; animation.velocity = newVelocity; const { isOvershooting, isVelocity, isDisplacement } = isAnimationTerminatingCalculation(animation, config); const springIsNotInMove = isOvershooting || (isVelocity && isDisplacement); if (!config.useDuration && springIsNotInMove) { animation.velocity = 0; animation.current = toValue; // clear lastTimestamp to avoid using stale value by the next spring animation that starts after this one animation.lastTimestamp = 0; return true; } return false; } function isTriggeredTwice( previousAnimation: SpringAnimation | undefined, animation: SpringAnimation ) { return ( previousAnimation?.lastTimestamp && previousAnimation?.startTimestamp && previousAnimation?.toValue === animation.toValue && previousAnimation?.duration === animation.duration && previousAnimation?.dampingRatio === animation.dampingRatio ); } function onStart( animation: SpringAnimation, value: number, now: Timestamp, previousAnimation: SpringAnimation | undefined ): void { animation.current = value; animation.startValue = value; let mass = config.mass; const triggeredTwice = isTriggeredTwice(previousAnimation, animation); const duration = config.duration; const x0 = triggeredTwice ? // If animation is triggered twice we want to continue the previous animation // form the previous starting point previousAnimation?.startValue : Number(animation.toValue) - value; if (previousAnimation) { animation.velocity = (triggeredTwice ? previousAnimation?.velocity : previousAnimation?.velocity + config.velocity) || 0; } else { animation.velocity = config.velocity || 0; } if (triggeredTwice) { animation.zeta = previousAnimation?.zeta || 0; animation.omega0 = previousAnimation?.omega0 || 0; animation.omega1 = previousAnimation?.omega1 || 0; } else { if (config.useDuration) { const actualDuration = triggeredTwice ? // If animation is triggered twice we want to continue the previous animation // so we need to include the time that already elapsed duration - ((previousAnimation?.lastTimestamp || 0) - (previousAnimation?.startTimestamp || 0)) : duration; config.duration = actualDuration; mass = calculateNewMassToMatchDuration( x0 as number, config, animation.velocity ); } const { zeta, omega0, omega1 } = initialCalculations(mass, config); animation.zeta = zeta; animation.omega0 = omega0; animation.omega1 = omega1; if (config.useDuration && config.clamp !== undefined) { animation.zeta = scaleZetaToMatchClamps(animation, config.clamp); } } animation.lastTimestamp = previousAnimation?.lastTimestamp || now; animation.startTimestamp = triggeredTwice ? previousAnimation?.startTimestamp || now : now; } return { onFrame: springOnFrame, onStart, toValue, velocity: config.velocity || 0, current: toValue, startValue: 0, callback, lastTimestamp: 0, startTimestamp: 0, zeta: 0, omega0: 0, omega1: 0, reduceMotion: getReduceMotionForAnimation(config.reduceMotion), } as SpringAnimation; }); }) as withSpringType; ``` </summary> --------- Co-authored-by: Aleksandra Cynk <aleksandra.cynk@swmansion.com> Co-authored-by: Aleksandra Cynk <aleksandracynk@Aleksandras-MacBook-Pro-3.local> Co-authored-by: Krzysztof Piaskowy <krzysztof.piaskowy@swmansion.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Add new higher order function withClamp that allows to limit range of movement. Usable especially with
spring
animation.Allows to pass number or string for both of the clamps.
Screen.Recording.2023-11-14.at.17.43.27.mov
Test plan
Testing code