Ensure optimised appear animations are cancelled when styles differ (#…

…2772) * Ensure values cancelled on scroll * Fixing * Latest * Updating * Updating appear tests json * Remove logging * Cleaning PR * Adding tesst
motiondivision · Aug 29, 2024 · d2484a8 · d2484a8
1 parent 4c92d2f
commit d2484a8
Show file tree

Hide file tree

Showing 10 changed files with 243 additions and 33 deletions.
diff --git a/dev/html/public/optimized-appear/defer-handoff-external-values.html b/dev/html/public/optimized-appear/defer-handoff-external-values.html
@@ -0,0 +1,132 @@
+<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 type="module" src="/src/imports/optimized-appear.js"></script>
+        <script type="module" src="/src/imports/script-assert.js"></script>
+
+        <script type="module">
+            const {
+                motion,
+                animateStyle,
+                animate,
+                startOptimizedAppearAnimation,
+                optimizedAppearDataAttribute,
+                motionValue,
+                frame,
+            } = window.Motion
+            const { matchViewportBox } = window.Assert
+            const root = document.getElementById("root")
+
+            const duration = 0.5
+            const x = motionValue(0)
+            const opacity = motionValue(0)
+            const animateX = motionValue(0)
+            const animateOpacity = motionValue(0)
+
+            let isFirstFrame = true
+
+            function Component() {
+                React.useEffect(() => {
+                    setTimeout(() => {
+                        x.set(200)
+                        opacity.set(0.5)
+                    }, 200)
+                }, [])
+
+                return React.createElement(motion.div, {
+                    id: "box",
+                    initial: { x: 0, opacity: 0 },
+                    animate: { x: 100, opacity: 1 },
+                    transition: {
+                        duration,
+                        ease: "linear",
+                        layout: { ease: () => 0, duration: 10 },
+                    },
+                    style: {
+                        x,
+                        opacity,
+                        position: "relative",
+                        background: "blue",
+                    },
+                    values: { x: animateX, opacity: animateOpacity },
+                    onAnimationComplete: () => {
+                        const box = document.getElementById("box")
+                        const { left } = box.getBoundingClientRect()
+                        const { opacity } = box.style
+                        const { opacity: computedOpacity } =
+                            window.getComputedStyle(box)
+                        if (Math.round(left) !== 300) {
+                            showError(
+                                box,
+                                `transform optimised animation not cancelled by external value mismatch with rendered style`
+                            )
+                        }
+
+                        if (opacity !== computedOpacity) {
+                            showError(
+                                box,
+                                `opacity optimised animation not cancelled by external value mismatch with rendered style`
+                            )
+                        }
+                    },
+                    [optimizedAppearDataAttribute]: "a",
+                    children: "Content",
+                })
+            }
+
+            // Emulate server rendering of element
+            root.innerHTML = ReactDOMServer.renderToString(
+                React.createElement(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,
+                            React.createElement(Component)
+                        )
+                    }, (duration * 1000) / 4)
+                }
+            )
+        </script>
+    </body>
+</html>
diff --git a/packages/framer-motion/cypress/fixtures/appear-tests.json b/packages/framer-motion/cypress/fixtures/appear-tests.json
@@ -1 +1 @@
-["defer-handoff-block.html","defer-handoff-layout-ancestor-suspend.html","defer-handoff-layout-ancestor.html","defer-handoff-layout-child.html","defer-handoff-layout-opacity.html","defer-handoff-layout-sibling-transform.html","defer-handoff-layout-sibling.html","defer-handoff-layout-useeffect.html","defer-handoff-layout-uselayouteffect.html","defer-handoff-layout.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"]
+["defer-handoff-block.html","defer-handoff-external-values.html","defer-handoff-layout-ancestor-suspend.html","defer-handoff-layout-ancestor.html","defer-handoff-layout-child.html","defer-handoff-layout-opacity.html","defer-handoff-layout-sibling-transform.html","defer-handoff-layout-sibling.html","defer-handoff-layout-useeffect.html","defer-handoff-layout-uselayouteffect.html","defer-handoff-layout.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"]
diff --git a/packages/framer-motion/package.json b/packages/framer-motion/package.json
@@ -85,7 +85,7 @@
     "bundlesize": [
         {
             "path": "./dist/size-rollup-motion.js",
-            "maxSize": "33.92 kB"
+            "maxSize": "34.05 kB"
         },
         {
             "path": "./dist/size-rollup-m.js",
@@ -97,7 +97,7 @@
         },
         {
             "path": "./dist/size-rollup-dom-max.js",
-            "maxSize": "28.87 kB"
+            "maxSize": "29 kB"
         },
         {
             "path": "./dist/size-rollup-animate.js",

diff --git a/packages/framer-motion/src/animation/optimized-appear/get-appear-id.ts b/packages/framer-motion/src/animation/optimized-appear/get-appear-id.ts
@@ -1,8 +1,8 @@
-import { VisualElement } from "../../render/VisualElement"
 import { optimizedAppearDataAttribute } from "./data-id"
+import { WithAppearProps } from "./types"
 
 export function getOptimisedAppearId(
-    visualElement: VisualElement
+    visualElement: WithAppearProps
 ): string | undefined {
-    return visualElement.getProps()[optimizedAppearDataAttribute]
+    return visualElement.props[optimizedAppearDataAttribute]
 }
diff --git a/packages/framer-motion/src/animation/optimized-appear/handoff.ts b/packages/framer-motion/src/animation/optimized-appear/handoff.ts
@@ -1,5 +1,4 @@
 import type { Batcher } from "../../frameloop/types"
-import { transformProps } from "../../render/html/utils/transform"
 import { appearAnimationStore } from "./store"
 import { appearStoreId } from "./store-id"
 
@@ -8,10 +7,7 @@ export function handoffOptimizedAppearAnimation(
     valueName: string,
     frame: Batcher
 ): number | null {
-    const optimisedValueName = transformProps.has(valueName)
-        ? "transform"
-        : valueName
-    const storeId = appearStoreId(elementId, optimisedValueName)
+    const storeId = appearStoreId(elementId, valueName)
     const optimisedAnimation = appearAnimationStore.get(storeId)
 
     if (!optimisedAnimation) {

diff --git a/packages/framer-motion/src/animation/optimized-appear/start.ts b/packages/framer-motion/src/animation/optimized-appear/start.ts
@@ -6,6 +6,9 @@ import { handoffOptimizedAppearAnimation } from "./handoff"
 import { appearAnimationStore, elementsWithAppearAnimations } from "./store"
 import { noop } from "../../utils/noop"
 import "./types"
+import { getOptimisedAppearId } from "./get-appear-id"
+import { MotionValue } from "../../value"
+import type { WithAppearProps } from "./types"
 
 /**
  * A single time to use across all animations to manually set startTime
@@ -65,10 +68,26 @@ export function startOptimizedAppearAnimation(
          */
         window.MotionHandoffAnimation = handoffOptimizedAppearAnimation
 
-        window.MotionHasOptimisedTransformAnimation = (elementId?: string) => {
+        window.MotionHasOptimisedAnimation = (
+            elementId?: string,
+            valueName?: string
+        ) => {
             if (!elementId) return false
 
-            const animationId = appearStoreId(elementId, "transform")
+            /**
+             * Keep a map of elementIds that have started animating. We check
+             * via ID instead of Element because of hydration errors and
+             * pre-hydration checks. We also actively record IDs as they start
+             * animating rather than simply checking for data-appear-id as
+             * this attrbute might be present but not lead to an animation, for
+             * instance if the element's appear animation is on a different
+             * breakpoint.
+             */
+            if (!valueName) {
+                return elementsWithAppearAnimations.has(elementId)
+            }
+
+            const animationId = appearStoreId(elementId, valueName)
             return Boolean(appearAnimationStore.get(animationId))
         }
 
@@ -77,8 +96,11 @@ export function startOptimizedAppearAnimation(
          * they're the ones that will interfere with the
          * layout animation measurements.
          */
-        window.MotionCancelOptimisedTransform = (elementId: string) => {
-            const animationId = appearStoreId(elementId, "transform")
+        window.MotionCancelOptimisedAnimation = (
+            elementId: string,
+            valueName: string
+        ) => {
+            const animationId = appearStoreId(elementId, valueName)
             const data = appearAnimationStore.get(animationId)
 
             if (data) {
@@ -87,17 +109,39 @@ export function startOptimizedAppearAnimation(
             }
         }
 
-        /**
-         * Keep a map of elementIds that have started animating. We check
-         * via ID instead of Element because of hydration errors and
-         * pre-hydration checks. We also actively record IDs as they start
-         * animating rather than simply checking for data-appear-id as
-         * this attrbute might be present but not lead to an animation, for
-         * instance if the element's appear animation is on a different
-         * breakpoint.
-         */
-        window.MotionHasOptimisedAnimation = (elementId?: string) =>
-            Boolean(elementId && elementsWithAppearAnimations.has(elementId))
+        window.MotionCheckAppearSync = (
+            visualElement: WithAppearProps,
+            valueName: string,
+            value: MotionValue
+        ) => {
+            const appearId = getOptimisedAppearId(visualElement)
+
+            if (!appearId) return
+
+            const valueIsOptimised = window.MotionHasOptimisedAnimation?.(
+                appearId,
+                valueName
+            )
+            const externalAnimationValue =
+                visualElement.props.values?.[valueName]
+
+            if (!valueIsOptimised || !externalAnimationValue) return
+
+            const removeSyncCheck = value.on(
+                "change",
+                (latestValue: string | number) => {
+                    if (externalAnimationValue.get() !== latestValue) {
+                        window.MotionCancelOptimisedAnimation?.(
+                            appearId,
+                            valueName
+                        )
+                        removeSyncCheck()
+                    }
+                }
+            )
+
+            return removeSyncCheck
+        }
     }
 
     const startAnimation = () => {

diff --git a/packages/framer-motion/src/animation/optimized-appear/store-id.ts b/packages/framer-motion/src/animation/optimized-appear/store-id.ts
@@ -1 +1,7 @@
-export const appearStoreId = (id: string, value: string) => `${id}: ${value}`
+import { transformProps } from "../../render/html/utils/transform"
+
+export const appearStoreId = (elementId: string, valueName: string) => {
+    const key = transformProps.has(valueName) ? "transform" : valueName
+
+    return `${elementId}: ${key}`
+}
diff --git a/packages/framer-motion/src/animation/optimized-appear/types.ts b/packages/framer-motion/src/animation/optimized-appear/types.ts
@@ -1,4 +1,19 @@
 import type { Batcher } from "../../frameloop/types"
+import { MotionValue } from "../../value"
+import { optimizedAppearDataAttribute } from "./data-id"
+
+/**
+ * Expose only the needed part of the VisualElement interface to
+ * ensure React types don't end up in the generic DOM bundle.
+ */
+export interface WithAppearProps {
+    props: {
+        [optimizedAppearDataAttribute]?: string
+        values?: {
+            [key: string]: MotionValue<number> | MotionValue<string>
+        }
+    }
+}
 
 export type HandoffFunction = (
     storeId: string,
@@ -14,8 +29,18 @@ declare global {
     interface Window {
         MotionHandoffAnimation?: HandoffFunction
         MotionHandoffIsComplete?: boolean
-        MotionCancelOptimisedTransform?: (id?: string) => void
-        MotionHasOptimisedTransformAnimation?: (id?: string) => boolean
-        MotionHasOptimisedAnimation?: (id?: string) => boolean
+        MotionHasOptimisedAnimation?: (
+            elementId?: string,
+            valueName?: string
+        ) => boolean
+        MotionCancelOptimisedAnimation?: (
+            elementId?: string,
+            valueName?: string
+        ) => void
+        MotionCheckAppearSync?: (
+            visualElement: WithAppearProps,
+            valueName: string,
+            value: MotionValue
+        ) => VoidFunction | void
     }
 }
diff --git a/packages/framer-motion/src/projection/node/create-projection-node.ts b/packages/framer-motion/src/projection/node/create-projection-node.ts
@@ -120,8 +120,8 @@ function cancelTreeOptimisedTransformAnimations(
 
     const appearId = getOptimisedAppearId(visualElement)
 
-    if (window.MotionHasOptimisedTransformAnimation!(appearId)) {
-        window.MotionCancelOptimisedTransform!(appearId)
+    if (window.MotionHasOptimisedAnimation!(appearId, "transform")) {
+        window.MotionCancelOptimisedAnimation!(appearId, "transform")
     }
 
     const { parent } = projectionNode
@@ -640,7 +640,7 @@ export function createProjectionNode<I>({
              * if a layout animation measurement is actually going to be affected by them.
              */
             if (
-                window.MotionCancelOptimisedTransform &&
+                window.MotionCancelOptimisedAnimation &&
                 !this.hasCheckedOptimisedAppear
             ) {
                 cancelTreeOptimisedTransformAnimations(this)

diff --git a/packages/framer-motion/src/render/VisualElement.ts b/packages/framer-motion/src/render/VisualElement.ts
@@ -427,6 +427,7 @@ export abstract class VisualElement<
         cancelFrame(this.notifyUpdate)
         cancelFrame(this.render)
         this.valueSubscriptions.forEach((remove) => remove())
+        this.valueSubscriptions.clear()
         this.removeFromVariantTree && this.removeFromVariantTree()
         this.parent && this.parent.children.delete(this)
 
@@ -469,9 +470,15 @@ export abstract class VisualElement<
             this.scheduleRender
         )
 
+        let removeSyncCheck: VoidFunction | void
+        if (window.MotionCheckAppearSync) {
+            removeSyncCheck = window.MotionCheckAppearSync(this, key, value)
+        }
+
         this.valueSubscriptions.set(key, () => {
             removeOnChange()
             removeOnRenderRequest()
+            if (removeSyncCheck) removeSyncCheck()
             if (value.owner) value.stop()
         })
     }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		["defer-handoff-block.html","defer-handoff-layout-ancestor-suspend.html","defer-handoff-layout-ancestor.html","defer-handoff-layout-child.html","defer-handoff-layout-opacity.html","defer-handoff-layout-sibling-transform.html","defer-handoff-layout-sibling.html","defer-handoff-layout-useeffect.html","defer-handoff-layout-uselayouteffect.html","defer-handoff-layout.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"]
		["defer-handoff-block.html","defer-handoff-external-values.html","defer-handoff-layout-ancestor-suspend.html","defer-handoff-layout-ancestor.html","defer-handoff-layout-child.html","defer-handoff-layout-opacity.html","defer-handoff-layout-sibling-transform.html","defer-handoff-layout-sibling.html","defer-handoff-layout-useeffect.html","defer-handoff-layout-uselayouteffect.html","defer-handoff-layout.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"]