-
-
Notifications
You must be signed in to change notification settings - Fork 885
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
Optimised appear animations V2 #2440
Merged
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
e198dbd
Updating handoff
mattgperry 9047cfb
v10.16.16-alpha.0
mattgperry 831a28f
Updating lockfile
mattgperry c36e751
Removung unused vars
mattgperry 94fbbc4
Moving everything to handoff script
mattgperry 10dd21a
v10.16.16-alpha.1
mattgperry 0ee522e
Updating lockfile
mattgperry 50a5bf0
Removing unused vars
mattgperry 395a6e4
Updating
mattgperry 03e7094
Updating
mattgperry 2dc4474
Fixing needless cancel
mattgperry 5219671
Removing cancelAnimation type
mattgperry 827d3e0
Removing unused var
mattgperry 2947edf
Making script backwards compatible
mattgperry 84ae182
v10.16.16-alpha.2
mattgperry 717273d
Updating comments
mattgperry e29abca
Updating yarn
mattgperry File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,135 @@ | ||
<html> | ||
<head> | ||
<style> | ||
body { | ||
padding: 100px; | ||
margin: 0; | ||
} | ||
|
||
#box { | ||
width: 100px; | ||
height: 100px; | ||
background-color: #0077ff; | ||
} | ||
|
||
[data-layout-correct="false"] { | ||
background: #dd1144 !important; | ||
opacity: 1 !important; | ||
} | ||
</style> | ||
</head> | ||
<body> | ||
<div id="root"></div> | ||
<script src="../../node_modules/react/umd/react.development.js"></script> | ||
<script src="../../node_modules/react-dom/umd/react-dom.development.js"></script> | ||
<script src="../../node_modules/react-dom/umd/react-dom-server-legacy.browser.development.js"></script> | ||
<script src="../../packages/framer-motion/dist/framer-motion.dev.js"></script> | ||
<script src="../projection/script-assert.js"></script> | ||
|
||
<script> | ||
const { | ||
motion, | ||
animateStyle, | ||
animate, | ||
startOptimizedAppearAnimation, | ||
optimizedAppearDataAttribute, | ||
motionValue, | ||
frame, | ||
} = window.Motion | ||
const { matchViewportBox } = window.Assert | ||
const root = document.getElementById("root") | ||
|
||
const duration = 2 | ||
const x = motionValue(0) | ||
|
||
let isFirstFrame = true | ||
|
||
// This is the tree to be rendered "server" and client-side. | ||
const Component = React.createElement(motion.div, { | ||
id: "box", | ||
initial: { x: 0, opacity: 0 }, | ||
animate: { x: 100, opacity: 1 }, | ||
transition: { duration, ease: "linear" }, | ||
style: { x }, | ||
/** | ||
* On animation start, check the values we expect to see here | ||
*/ | ||
onAnimationStart: () => { | ||
const box = document.getElementById("box") | ||
|
||
box.style.backgroundColor = "green" | ||
|
||
setTimeout(() => { | ||
/** | ||
* This animation interrupts the optimised animation. Notably, we are animating | ||
* x in the optimised transform animation and only scale here. This ensures | ||
* that any transform can force the cancellation of the optimised animation on transform, | ||
* not just those involved in the original animation. | ||
*/ | ||
animate( | ||
box, | ||
{ scale: 2, opacity: 0.1 }, | ||
{ duration: 0.3, ease: "linear" } | ||
).then(() => { | ||
if (getComputedStyle(box).opacity !== "0.1") { | ||
showError( | ||
document.getElementById("box"), | ||
`opacity animation didn't interrupt optimised animation. Opacity was ${ | ||
getComputedStyle(box).opacity | ||
} instead of 0.1.` | ||
) | ||
} | ||
|
||
const { width, left } = box.getBoundingClientRect() | ||
if (width !== 200) { | ||
showError( | ||
document.getElementById("box"), | ||
`scale animation didn't interrupt optimised animation. Width was ${width}px instead of 200px.` | ||
) | ||
} | ||
|
||
if (left <= 100) { | ||
showError( | ||
document.getElementById("box"), | ||
`scale animation incorrectly interrupted optimised animation. Left was ${left}px instead of 100px.` | ||
) | ||
} | ||
}) | ||
}, 100) | ||
}, | ||
[optimizedAppearDataAttribute]: "a", | ||
children: "Content", | ||
}) | ||
|
||
// Emulate server rendering of element | ||
root.innerHTML = ReactDOMServer.renderToString(Component) | ||
|
||
// Start optimised opacity animation | ||
startOptimizedAppearAnimation( | ||
document.getElementById("box"), | ||
"opacity", | ||
[0, 1], | ||
{ | ||
duration: duration * 1000, | ||
ease: "linear", | ||
} | ||
) | ||
|
||
// Start WAAPI animation | ||
const animation = startOptimizedAppearAnimation( | ||
document.getElementById("box"), | ||
"transform", | ||
["translateX(0px)", "translateX(100px)"], | ||
{ | ||
duration: duration * 1000, | ||
ease: "linear", | ||
}, | ||
(animation) => { | ||
setTimeout(() => { | ||
ReactDOM.hydrateRoot(root, Component) | ||
}, (duration * 1000) / 2) | ||
} | ||
) | ||
</script> | ||
</body> | ||
</html> |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
<html> | ||
<head> | ||
<style> | ||
body { | ||
padding: 100px; | ||
margin: 0; | ||
} | ||
|
||
#box { | ||
width: 100px; | ||
height: 100px; | ||
background-color: #0077ff; | ||
} | ||
|
||
[data-layout-correct="false"] { | ||
background: #dd1144 !important; | ||
opacity: 1 !important; | ||
} | ||
</style> | ||
</head> | ||
<body> | ||
<div id="root"></div> | ||
<script src="../../node_modules/react/umd/react.development.js"></script> | ||
<script src="../../node_modules/react-dom/umd/react-dom.development.js"></script> | ||
<script src="../../node_modules/react-dom/umd/react-dom-server-legacy.browser.development.js"></script> | ||
<script src="../../packages/framer-motion/dist/framer-motion.dev.js"></script> | ||
<script src="../projection/script-assert.js"></script> | ||
|
||
<script> | ||
const { | ||
motion, | ||
animateStyle, | ||
animate, | ||
startOptimizedAppearAnimation, | ||
optimizedAppearDataAttribute, | ||
motionValue, | ||
frame, | ||
} = window.Motion | ||
const { matchViewportBox } = window.Assert | ||
const root = document.getElementById("root") | ||
|
||
const duration = 2 | ||
const x = motionValue(0) | ||
|
||
let isFirstFrame = true | ||
|
||
// This is the tree to be rendered "server" and client-side. | ||
const Component = React.createElement(motion.div, { | ||
id: "box", | ||
initial: { x: 0, opacity: 0 }, | ||
animate: { x: 100, opacity: 1 }, | ||
transition: { duration, ease: "linear" }, | ||
style: { x }, | ||
/** | ||
* On animation start, check the values we expect to see here | ||
*/ | ||
onAnimationStart: () => { | ||
const box = document.getElementById("box") | ||
|
||
box.style.backgroundColor = "green" | ||
|
||
setTimeout(() => { | ||
box.style.transform = "scale(2)" | ||
|
||
const { width } = box.getBoundingClientRect() | ||
if (width !== 100) { | ||
showError( | ||
document.getElementById("box"), | ||
`Setting transform became visible, which means optimised animation has been prematurely cancelled. Width was ${width}px instead of 200px.` | ||
) | ||
} | ||
}, 100) | ||
}, | ||
[optimizedAppearDataAttribute]: "a", | ||
children: "Content", | ||
}) | ||
|
||
// Emulate server rendering of element | ||
root.innerHTML = ReactDOMServer.renderToString(Component) | ||
|
||
// Start optimised opacity animation | ||
startOptimizedAppearAnimation( | ||
document.getElementById("box"), | ||
"opacity", | ||
[0, 1], | ||
{ | ||
duration: duration * 1000, | ||
ease: "linear", | ||
} | ||
) | ||
|
||
// Start WAAPI animation | ||
const animation = startOptimizedAppearAnimation( | ||
document.getElementById("box"), | ||
"transform", | ||
["translateX(0px)", "translateX(100px)"], | ||
{ | ||
duration: duration * 1000, | ||
ease: "linear", | ||
}, | ||
(animation) => { | ||
setTimeout(() => { | ||
ReactDOM.hydrateRoot(root, Component) | ||
}, (duration * 1000) / 2) | ||
} | ||
) | ||
</script> | ||
</body> | ||
</html> |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
{ | ||
"version": "10.16.15", | ||
"version": "10.16.16-alpha.2", | ||
"packages": [ | ||
"packages/*" | ||
], | ||
|
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
["interrupt-delay-after.html","interrupt-delay-before-accelerated.html","interrupt-delay-before.html","interrupt-spring.html","interrupt-tween-opacity-waapi.html","interrupt-tween-opacity.html","interrupt-tween-transforms.html","interrupt-tween-x.html","persist.html","portal.html","resync-delay.html","resync.html","start-after-hydration.html"] | ||
["defer-handoff.html","interrupt-delay-after.html","interrupt-delay-before-accelerated.html","interrupt-delay-before.html","interrupt-spring.html","interrupt-tween-opacity-waapi.html","interrupt-tween-opacity.html","interrupt-tween-transforms.html","interrupt-tween-x.html","persist-optimised-animation.html","persist.html","portal.html","resync-delay.html","resync.html","start-after-hydration.html"] |
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,7 +16,7 @@ export const animateMotionValue = ( | |
valueName: string, | ||
value: MotionValue, | ||
target: ResolvedValueTarget, | ||
transition: Transition & { elapsed?: number } = {} | ||
transition: Transition & { elapsed?: number; isHandoff?: boolean } = {} | ||
): StartAnimation => { | ||
return (onComplete: VoidFunction): AnimationPlaybackControls => { | ||
const valueTransition = getValueTransition(transition, valueName) || {} | ||
|
@@ -118,8 +118,18 @@ export const animateMotionValue = ( | |
* Animate via WAAPI if possible. | ||
*/ | ||
if ( | ||
/** | ||
* If this is a handoff animation, the optimised animation will be running via | ||
* WAAPI. Therefore, this animation must be JS to ensure it runs "under" the | ||
* optimised animation. | ||
*/ | ||
!transition.isHandoff && | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's add a comment here to explain why we want to animate individual transforms when it's a handoff one. |
||
value.owner && | ||
value.owner.current instanceof HTMLElement && | ||
/** | ||
* If we're outputting values to onUpdate then we can't use WAAPI as there's | ||
* no way to read the value from WAAPI every frame. | ||
*/ | ||
!value.owner.getProps().onUpdate | ||
) { | ||
const acceleratedAnimation = createAcceleratedAnimation( | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
great that we can get rid of this! 🎉