Ensures CSS variables are trimmed before animating (#2688)

* Fixing animation of CSS vars * Removing trims from parseCSSVariable * Updating test
framer · May 29, 2024 · 4b5bb92 · 4b5bb92
1 parent 016c3dd
commit 4b5bb92
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/dev/tests/css-vars.tsx b/dev/tests/css-vars.tsx
@@ -26,7 +26,7 @@ export const App = () => {
                     originX: 0,
                     originY: 0,
                     opacity: "var(--d)",
-                    backgroundColor: "var(--a)",
+                    backgroundColor: " var(--a)", // Should work even with space at start
                     scale: "var(--c)",
                     x: "var(--b)",
                 }}

diff --git a/packages/framer-motion/src/render/dom/DOMKeyframesResolver.ts b/packages/framer-motion/src/render/dom/DOMKeyframesResolver.ts
@@ -52,16 +52,21 @@ export class DOMKeyframesResolver<
          * If any keyframe is a CSS variable, we need to find its value by sampling the element
          */
         for (let i = 0; i < unresolvedKeyframes.length; i++) {
-            const keyframe = unresolvedKeyframes[i]
-            if (typeof keyframe === "string" && isCSSVariableToken(keyframe)) {
-                const resolved = getVariableValue(keyframe, element.current)
+            let keyframe = unresolvedKeyframes[i]
 
-                if (resolved !== undefined) {
-                    unresolvedKeyframes[i] = resolved as T
-                }
+            if (typeof keyframe === "string") {
+                keyframe = keyframe.trim()
+
+                if (isCSSVariableToken(keyframe)) {
+                    const resolved = getVariableValue(keyframe, element.current)
+
+                    if (resolved !== undefined) {
+                        unresolvedKeyframes[i] = resolved as T
+                    }
 
-                if (i === unresolvedKeyframes.length - 1) {
-                    this.finalKeyframe = keyframe as T
+                    if (i === unresolvedKeyframes.length - 1) {
+                        this.finalKeyframe = keyframe as T
+                    }
                 }
             }
         }