motion 14.1.0 → 14.2.0

package/dist/motion.dev.js

@@ -180,48 +180,50 @@
       This has been modified from Gaëtan Renaudeau's BezierEasing
       https://github.com/gre/bezier-easing/blob/master/src/index.js
       https://github.com/gre/bezier-easing/blob/master/LICENSE
-      
-      I've removed the newtonRaphsonIterate algo because in benchmarking it
-      wasn't noticeably faster than binarySubdivision, indeed removing it
-      usually improved times, depending on the curve.
-      I also removed the lookup table, as for the added bundle size and loop we're
-      only cutting ~4 or so subdivision iterations. I bumped the max iterations up
-      to 12 to compensate and this still tended to be faster for no perceivable
-      loss in accuracy.
+
+      t is found for a given x with Newton-Raphson, safeguarded by a bisection
+      bracket: whenever a Newton step would leave the bracket (near flat parts
+      of the curve), it bisects instead. This converges to full precision in
+      ~5 iterations on typical curves, so output is smooth rather than snapped
+      to a fixed bisection grid. The slope is estimated with a forward
+      difference, and the lookup table is omitted, to save bytes.
+
+      x = 0 and x = 1 return exactly 0 and 1. x outside [0, 1] starts outside
+      the bracket, so it bisects towards the nearer end and saturates to within
+      ~1e-12 of 0 or 1.
       Usage
         const easeOut = cubicBezier(.17,.67,.83,.67);
         const x = easeOut(0.5); // returns 0.627...
     */
     // Returns x(t) given t, x1, and x2, or y(t) given t, y1, and y2.
-    const calcBezier = (t, a1, a2) => (((1.0 - 3.0 * a2 + 3.0 * a1) * t + (3.0 * a2 - 6.0 * a1)) * t + 3.0 * a1) *
-        t;
-    const subdivisionPrecision = 0.0000001;
-    const subdivisionMaxIterations = 12;
-    function binarySubdivide(x, lowerBound, upperBound, mX1, mX2) {
-        let currentX;
-        let currentT;
-        let i = 0;
-        do {
-            currentT = lowerBound + (upperBound - lowerBound) / 2.0;
-            currentX = calcBezier(currentT, mX1, mX2) - x;
-            if (currentX > 0.0) {
-                upperBound = currentT;
-            }
-            else {
-                lowerBound = currentT;
-            }
-        } while (Math.abs(currentX) > subdivisionPrecision &&
-            ++i < subdivisionMaxIterations);
-        return currentT;
-    }
+    // Bernstein form, so it is exactly 0 at t = 0 and exactly 1 at t = 1.
+    const calcBezier = (t, a1, a2) => t * (3 * (1 - t) * ((1 - t) * a1 + t * a2) + t * t);
     /*#__NO_SIDE_EFFECTS__*/
     function cubicBezier(mX1, mY1, mX2, mY2) {
         // If this is a linear gradient, return linear easing
         if (mX1 === mY1 && mX2 === mY2)
             return noop;
-        const getTForX = (aX) => binarySubdivide(aX, 0, 1, mX1, mX2);
-        // If animation is at start/end, return t without easing
-        return (t) => t === 0 || t === 1 ? t : calcBezier(getTForX(t), mY1, mY2);
+        return (x) => {
+            let lowerBound = 0;
+            let upperBound = 1;
+            let t = x;
+            for (let i = 0;; i++) {
+                // If t is outside the bracket, because x is out of range or a
+                // Newton step overshot where the slope is ~0, bisect instead.
+                if (!(t >= lowerBound && t <= upperBound)) {
+                    t = (lowerBound + upperBound) / 2;
+                }
+                const currentX = calcBezier(t, mX1, mX2) - x;
+                if (currentX * currentX < 1e-28 || i === 40)
+                    break;
+                currentX > 0 ? (upperBound = t) : (lowerBound = t);
+                // Newton-Raphson step, with dx/dt from a forward difference
+                t -=
+                    (currentX * 1e-7) /
+                        (calcBezier(t + 1e-7, mX1, mX2) - x - currentX);
+            }
+            return calcBezier(t, mY1, mY2);
+        };
     }
 
     // Accepts an easing function and returns a new one that outputs mirrored values for
@@ -1110,7 +1112,20 @@
      * Create a progress => progress easing function from a generator.
      */
     function createGeneratorEasing(options, scale = 100, createGenerator) {
-        const generator = createGenerator({ ...options, keyframes: [0, scale] });
+        /**
+         * The easing is generated over 0 - scale, but velocity is in the
+         * value's own units, so scale it to match. Otherwise an interrupted
+         * spring hands off the wrong speed, or direction. Keyframes with
+         * units (colours, filters, mixed units) give NaN, which is falsy,
+         * so their velocity passes through unscaled.
+         */
+        const { keyframes: k, velocity: v } = options;
+        const delta = k && k[k.length - 1] - k[0];
+        const generator = createGenerator({
+            ...options,
+            velocity: v && delta ? (v * scale) / delta : v,
+            keyframes: [0, scale],
+        });
         const duration = Math.min(calcGeneratorDuration(generator), maxGeneratorDuration);
         return {
             type: "keyframes",
@@ -1891,6 +1906,7 @@
     }
 
     const percentToProgress = (percent) => percent / 100;
+    const round = (value) => Math.round(value * 10000) / 10000;
     class JSAnimation extends WithPromise {
         constructor(options) {
             super();
@@ -1998,10 +2014,10 @@
             }
         }
         tick(timestamp, sample = false) {
-            const { generator, totalDuration, mixKeyframes, mirroredGenerator, resolvedDuration, calculatedDuration, } = this;
+            const { generator, totalDuration, calculatedDuration } = this;
             if (this.startTime === null)
                 return generator.next(0);
-            const { delay = 0, keyframes, repeat, repeatType, repeatDelay, type, onUpdate, finalKeyframe, } = this.options;
+            const { delay = 0, keyframes, type, onUpdate, finalKeyframe, } = this.options;
             if (this.startTime === this.pendingStartTime) {
                 this.startTime = resolveStartTime(this.startTime, timestamp);
             }
@@ -2034,7 +2050,55 @@
             if (this.state === "finished" && this.holdTime === null) {
                 this.currentTime = totalDuration;
             }
-            let elapsed = this.currentTime;
+            const state = this.generate(this.currentTime, isInDelayPhase);
+            let { done } = state;
+            if (!isInDelayPhase && calculatedDuration !== null) {
+                done =
+                    this.playbackSpeed >= 0
+                        ? this.currentTime >= totalDuration
+                        : this.currentTime <= 0;
+            }
+            const isAnimationFinished = this.holdTime === null &&
+                (this.state === "finished" || (this.state === "running" && done));
+            // TODO: The exception for inertia could be cleaner here
+            if (isAnimationFinished && type !== inertia) {
+                state.value = getFinalKeyframe(keyframes, this.options, finalKeyframe, this.speed);
+            }
+            if (onUpdate) {
+                onUpdate(state.value);
+            }
+            if (isAnimationFinished) {
+                this.finish();
+            }
+            return state;
+        }
+        /**
+         * This animation's time, including delay, at a timestamp.
+         */
+        at(timestamp) {
+            return (this.holdTime ??
+                round((timestamp - this.startTime) * this.playbackSpeed));
+        }
+        /**
+         * The value at a timestamp, without changing this animation's state.
+         * If resolved, it ends at the last resolved keyframe, which is in the
+         * same unit as the others, rather than at finalKeyframe.
+         */
+        sampleAt(timestamp, resolved) {
+            const { options, totalDuration } = this;
+            const t = this.at(timestamp) - (options.delay || 0);
+            return t >= totalDuration && options.type !== inertia
+                ? getFinalKeyframe(options.keyframes, options, resolved ? undefined : options.finalKeyframe)
+                : this.generate(Math.max(t, 0), t < 0).value;
+        }
+        /**
+         * The generator's state `currentTime` ms after the delay, without
+         * changing the animation's own state.
+         */
+        generate(currentTime, isInDelayPhase) {
+            const { generator, totalDuration, mixKeyframes, mirroredGenerator, resolvedDuration, } = this;
+            const { keyframes, repeat, repeatType, repeatDelay } = this.options;
+            let elapsed = currentTime;
             let frameGenerator = generator;
             if (repeat) {
                 /**
@@ -2042,7 +2106,7 @@
                  * than duration we'll get values like 2.5 (midway through the
                  * third iteration)
                  */
-                const progress = Math.min(this.currentTime, totalDuration) / resolvedDuration;
+                const progress = Math.min(currentTime, totalDuration) / resolvedDuration;
                 /**
                  * Get the current iteration (0 indexed). For instance the floor of
                  * 2.5 is 2.
@@ -2095,25 +2159,6 @@
             if (mixKeyframes && !isInDelayPhase) {
                 state.value = mixKeyframes(state.value);
             }
-            let { done } = state;
-            if (!isInDelayPhase && calculatedDuration !== null) {
-                done =
-                    this.playbackSpeed >= 0
-                        ? this.currentTime >= totalDuration
-                        : this.currentTime <= 0;
-            }
-            const isAnimationFinished = this.holdTime === null &&
-                (this.state === "finished" || (this.state === "running" && done));
-            // TODO: The exception for inertia could be cleaner here
-            if (isAnimationFinished && type !== inertia) {
-                state.value = getFinalKeyframe(keyframes, this.options, finalKeyframe, this.speed);
-            }
-            if (onUpdate) {
-                onUpdate(state.value);
-            }
-            if (isAnimationFinished) {
-                this.finish();
-            }
             return state;
         }
         /**
@@ -3122,44 +3167,71 @@
             }
             this.options = options;
         }
+        /**
+         * The animation's time now, in ms. Wall-clock rather than WAAPI's
+         * currentTime while running, as under CPU load currentTime may not
+         * reflect the actual elapsed time, causing incorrect sampling and
+         * visual jumps.
+         */
+        elapsed() {
+            return this.state === "running"
+                ? (time.now() - this.startTime) * this.speed
+                : this.time * 1000;
+        }
+        /**
+         * The value at a time, from a renderless JS animation.
+         */
+        sample(sampleTime) {
+            if (!this.sampler) {
+                const { motionValue, onUpdate, onComplete, onPlay, onStop, element, ...options } = this.options;
+                /**
+                 * Stop it straight away so its driver doesn't run every frame.
+                 * It can still be sampled.
+                 */
+                this.sampler = new JSAnimation({ ...options, autoplay: false });
+                this.sampler.stop();
+            }
+            return this.sampler.sample(Math.max(0, sampleTime)).value;
+        }
+        /**
+         * The value now, as WAAPI doesn't set the motion value while it runs.
+         */
+        liveValue() {
+            const { state } = this;
+            if (state === "running" || state === "paused") {
+                return this.sample(this.elapsed());
+            }
+        }
         /**
          * WAAPI doesn't natively have any interruption capabilities.
          *
          * Rather than read committed styles back out of the DOM, we can
-         * create a renderless JS animation and sample it twice to calculate
-         * its current value, "previous" value, and therefore allow
-         * Motion to calculate velocity for any subsequent animation.
+         * sample a renderless JS animation twice to calculate its current
+         * value, "previous" value, and therefore allow Motion to calculate
+         * velocity for any subsequent animation.
          */
         updateMotionValue(value) {
-            const { motionValue, onUpdate, onComplete, element, ...options } = this.options;
+            const { motionValue, element, name } = this.options;
             if (!motionValue)
                 return;
             if (value !== undefined) {
                 motionValue.set(value);
                 return;
             }
-            const sampleAnimation = new JSAnimation({
-                ...options,
-                autoplay: false,
-            });
-            /**
-             * Use wall-clock elapsed time for sampling.
-             * Under CPU load, WAAPI's currentTime may not reflect actual
-             * elapsed time, causing incorrect sampling and visual jumps.
-             */
-            const sampleTime = Math.max(sampleDelta, time.now() - this.startTime);
-            const delta = clamp(0, sampleDelta, sampleTime - sampleDelta);
-            const current = sampleAnimation.sample(sampleTime).value;
+            const { speed } = this;
+            const sampleTime = this.elapsed();
+            const delta = this.state === "running" && speed
+                ? clamp(0, sampleDelta, sampleTime)
+                : 0;
+            const current = this.sample(sampleTime);
             /**
              * Write the estimated value to inline style so it persists
              * after cancel(), covering the async gap before the next
              * animation starts.
              */
-            const { name } = this.options;
             if (element && name)
                 setStyle(element, name, current);
-            motionValue.setWithVelocity(sampleAnimation.sample(Math.max(0, sampleTime - delta)).value, current, delta);
-            sampleAnimation.stop();
+            motionValue.setWithVelocity(this.sample(sampleTime - delta * Math.sign(speed)), current, delta / Math.abs(speed || 1));
         }
     }
 
@@ -3253,64 +3325,973 @@
                 browserColorFunctions.test(keyframes[i])) {
                 return true;
             }
-        }
-        return false;
-    }
-
-    const colorProperties = new Set([
-        "color",
-        "backgroundColor",
-        "outlineColor",
-        "fill",
-        "stroke",
-        "borderColor",
-        "borderTopColor",
-        "borderRightColor",
-        "borderBottomColor",
-        "borderLeftColor",
-    ]);
-    const supportsWaapi = /*@__PURE__*/ memo(() => Object.hasOwnProperty.call(Element.prototype, "animate"));
-    function supportsBrowserAnimation(options) {
-        const { motionValue, name, repeatDelay, repeatType, damping, type, keyframes, } = options;
+        }
+        return false;
+    }
+
+    const colorProperties = new Set([
+        "color",
+        "backgroundColor",
+        "outlineColor",
+        "fill",
+        "stroke",
+        "borderColor",
+        "borderTopColor",
+        "borderRightColor",
+        "borderBottomColor",
+        "borderLeftColor",
+    ]);
+    const supportsWaapi = /*@__PURE__*/ memo(() => Object.hasOwnProperty.call(Element.prototype, "animate"));
+    function supportsBrowserAnimation(options) {
+        const { motionValue, name, repeatDelay, repeatType, damping, type, keyframes, } = options;
+        /**
+         * Most values can't be accelerated at all, so check the name before
+         * looking at the element or its props.
+         */
+        if (!name ||
+            !(acceleratedValues.has(name) || colorProperties.has(name))) {
+            return false;
+        }
+        const subject = motionValue?.owner?.current;
+        /**
+         * We use instanceof checks instead of isHTMLElement()/isSVGElement()
+         * because we explicitly **don't** want elements in different timing
+         * contexts (i.e. popups) to be accelerated, as it's not possible to sync
+         * these animations properly with those driven from the main window
+         * frameloop.
+         */
+        if (!(subject instanceof HTMLElement) &&
+            !(subject instanceof SVGElement)) {
+            return false;
+        }
+        const { onUpdate, transformTemplate } = motionValue.owner.getProps();
+        return (supportsWaapi() &&
+            /**
+             * Force WAAPI for color properties with browser-only color formats
+             * (oklch, oklab, lab, lch, etc.) that the JS animation path can't parse.
+             */
+            (acceleratedValues.has(name) ||
+                (colorProperties.has(name) &&
+                    hasBrowserOnlyColors(keyframes))) &&
+            (name !== "transform" || !transformTemplate) &&
+            /**
+             * 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.
+             */
+            !onUpdate &&
+            !repeatDelay &&
+            repeatType !== "mirror" &&
+            damping !== 0 &&
+            type !== "inertia");
+    }
+
+    /**
+     * Provided a value and a ValueType, returns the value as that value type.
+     */
+    const getValueAsType = (value, type) => {
+        return type && typeof value === "number"
+            ? type.transform(value)
+            : value;
+    };
+
+    const translateAlias = {
+        x: "translateX",
+        y: "translateY",
+        z: "translateZ",
+        transformPerspective: "perspective",
+    };
+    const numTransforms = transformPropOrder.length;
+    /**
+     * Build a CSS transform style from individual x/y/scale etc properties.
+     *
+     * This outputs with a default order of transforms/scales/rotations, this can be customised by
+     * providing a transformTemplate function.
+     */
+    function buildTransform$1(latestValues, transform, transformTemplate) {
+        // The transform string we're going to build into.
+        let transformString = "";
+        let transformIsDefault = true;
+        /**
+         * Loop over all possible transforms in order, adding the ones that
+         * are present to the transform string.
+         */
+        for (let i = 0; i < numTransforms; i++) {
+            const key = transformPropOrder[i];
+            const value = latestValues[key];
+            if (value === undefined)
+                continue;
+            let valueIsDefault = true;
+            if (typeof value === "number") {
+                valueIsDefault = value === (key.startsWith("scale") ? 1 : 0);
+            }
+            else {
+                const parsed = parseFloat(value);
+                valueIsDefault = key.startsWith("scale") ? parsed === 1 : parsed === 0;
+            }
+            if (!valueIsDefault || transformTemplate) {
+                const valueAsType = getValueAsType(value, numberValueTypes[key]);
+                if (!valueIsDefault) {
+                    transformIsDefault = false;
+                    const transformName = translateAlias[key] || key;
+                    transformString += `${transformName}(${valueAsType}) `;
+                }
+                if (transformTemplate) {
+                    transform[key] = valueAsType;
+                }
+            }
+        }
+        // `pathRotation` composes onto `rotate` as a separate additive term so
+        // the user's `rotate` is never clobbered. Deliberately not a slot in
+        // `transformPropOrder`.
+        const pathRotation = latestValues.pathRotation;
+        if (pathRotation) {
+            transformIsDefault = false;
+            transformString += `rotate(${getValueAsType(pathRotation, numberValueTypes.pathRotation)}) `;
+        }
+        transformString = transformString.trim();
+        // If we have a custom `transform` template, pass our transform values and
+        // generated transformString to that before returning
+        if (transformTemplate) {
+            transformString = transformTemplate(transform, transformIsDefault ? "" : transformString);
+        }
+        else if (transformIsDefault) {
+            transformString = "none";
+        }
+        return transformString;
+    }
+
+    const transformGroups = new WeakMap();
+
+    /**
+     * Sample at the interruption sampling rate, up to a cap for long
+     * animations.
+     */
+    const maxSamples = 200;
+    /**
+     * How far values may stray from the WAAPI animation: as a fraction of
+     * each value's change when they share an easing, otherwise in px or deg,
+     * or for scale.
+     */
+    const easingTolerance = 0.001;
+    const sampleTolerance = 0.1;
+    const scaleTolerance = 0.001;
+    /**
+     * If an outside write, or a seek the WAAPI animation can't follow,
+     * happens again within this window, the group is being driven every
+     * frame (scrubbing, drag), which is cheaper on the main thread than
+     * rebuilding the WAAPI animation every frame.
+     */
+    const churnWindow = 100;
+    /**
+     * Named easings that are the same cubic-bezier in JS and CSS.
+     */
+    const isNativeEasing = (ease) => /^(linear|ease(In|Out|InOut))$/.test(ease);
+    const byTime = (a, b) => a - b;
+    /**
+     * n + 1 evenly spaced timestamps, from one timestamp to another.
+     */
+    const spread = (from, to, n) => {
+        const result = [];
+        for (let i = 0; i <= n; i++)
+            result.push(mixNumber$1(from, to, i / n));
+        return result;
+    };
+    const getOwner = (options) => options.motionValue.owner;
+    const getGroup = (element) => transformGroups.get(element);
+    const read = (owner, key) => owner.latestValues ? owner.latestValues[key] : owner.getValue(key)?.get();
+    /**
+     * Whether this animation should join its element's transform group.
+     * Animations that can't be accelerated still join, so the group knows
+     * to stay on the main thread while they run. Browsers without linear()
+     * easing stay on the main thread.
+     */
+    const canGroupTransform = ({ name, motionValue, }) => name &&
+        transformPropOrder.includes(name) &&
+        motionValue?.owner?.current instanceof HTMLElement &&
+        supportsWaapi() &&
+        supportsLinearEasing();
+    function canAccelerateTransform(options) {
+        const owner = getOwner(options);
+        const { onUpdate, transformTemplate } = owner.getProps();
+        return (
+        /**
+         * A handoff from an optimised appear animation is already running
+         * on its own WAAPI animation. onUpdate needs every value, every
+         * frame.
+         */
+        !options.isHandoff &&
+            !onUpdate &&
+            !options.hasOnUpdate &&
+            /**
+             * transformTemplate could output anything.
+             */
+            !transformTemplate &&
+            options.type !== "inertia" &&
+            /**
+             * A literal transform, or pathRotation, replaces or adds to the
+             * transform we'd build. styleEffect builds its own as "none".
+             */
+            (read(owner, "transform") || "none") === "none" &&
+            !read(owner, "pathRotation") &&
+            /**
+             * Layout animations write transform every frame.
+             */
+            !owner.projection?.isProjecting());
+    }
+    class TransformAnimation extends JSAnimation {
+        constructor(options) {
+            const element = getOwner(options).current;
+            const { driver = frameloopDriver } = options;
+            /**
+             * Before JSAnimation replaces the type with its generator.
+             */
+            const canAccelerate = canAccelerateTransform(options);
+            /**
+             * The driver ticks on the main thread only once the group has
+             * moved there. Until then, starting or stopping tells the group to
+             * update its WAAPI animation.
+             */
+            options.driver = (update) => {
+                const js = driver(update);
+                return {
+                    js,
+                    now: js.now,
+                    start: (keepAlive = true) => {
+                        const group = getGroup(element);
+                        const isJS = !group || group.isJS;
+                        /**
+                         * keepAlive is false when seeking. Seeking the WAAPI
+                         * animation is free, but if a seek needs a rebuild and
+                         * keeps happening, the group moves to the main thread.
+                         */
+                        isJS
+                            ? js.start(keepAlive)
+                            : group.schedule(false, !keepAlive);
+                    },
+                    stop: () => {
+                        js.stop();
+                        const group = getGroup(element);
+                        group?.schedule(!group.isFinishing);
+                    },
+                };
+            };
+            super(options);
+            this.canAccelerate = canAccelerate;
+            /**
+             * stop is bound in JSAnimation, so wrap it rather than override.
+             * Before stopping, set the motion value to where the WAAPI
+             * animation is now, with velocity, for the next animation to
+             * start from.
+             */
+            const { stop } = this;
+            this.stop = () => {
+                this.isAccelerated() && this.sync();
+                stop();
+            };
+        }
+        get group() {
+            return getGroup(getOwner(this.options).current);
+        }
+        get js() {
+            return this.driver?.js;
+        }
+        get name() {
+            return this.options.name;
+        }
+        /**
+         * When this stops moving, or, if it repeats forever, when it starts
+         * repeating, and how long each repeat takes. Held (paused, or at
+         * speed 0) animations never stop moving.
+         */
+        timing() {
+            const { startTime, speed, totalDuration } = this;
+            const { delay = 0, repeatType } = this.options;
+            return this.holdTime !== null
+                ? [Infinity, 0]
+                : totalDuration === Infinity
+                    ? [
+                        startTime + delay / speed,
+                        (this.resolvedDuration * (repeatType === "loop" ? 1 : 2)) /
+                            speed || 1,
+                    ]
+                    : [startTime + (delay + totalDuration) / speed, 0];
+        }
+        /**
+         * Whether this is running, or paused, on the compositor.
+         */
+        isAccelerated() {
+            const { group, state } = this;
+            return (group?.tracks.has(this) &&
+                !group.isJS &&
+                this.canAccelerate &&
+                (state === "running" || state === "paused"));
+        }
+        /**
+         * The value now, while this runs on the compositor and so doesn't
+         * set its motion value every frame.
+         */
+        liveValue() {
+            return this.isAccelerated() ? this.sampleAt(time.now()) : undefined;
+        }
+        /**
+         * If this is a two-keyframe tween whose easing WAAPI runs exactly,
+         * when it starts and stops moving, and that easing.
+         */
+        tween() {
+            const { keyframes: keyframes$1, type, ease, times, repeat, delay = 0 } = this.options;
+            const easing = isBezierDefinition(ease)
+                ? cubicBezierAsString(ease)
+                : isNativeEasing(ease) && supportedWaapiEasing[ease];
+            if (easing &&
+                !repeat &&
+                !times &&
+                keyframes$1.length === 2 &&
+                type === keyframes &&
+                this.holdTime === null) {
+                const start = this.startTime + delay / this.speed;
+                return [start, start + this.resolvedDuration / this.speed, easing];
+            }
+        }
+        /**
+         * The timestamps between two timestamps where this reaches a
+         * keyframe or starts a repeat, where it can turn or jump.
+         */
+        boundaries(from, to) {
+            const { startTime, speed, resolvedDuration, options } = this;
+            const { delay = 0, repeat = 0, repeatDelay = 0, repeatType, times, keyframes: keyframes$1, type, } = options;
+            const offsets = (type || keyframes) === keyframes
+                ? times || defaultOffset$1(keyframes$1)
+                : [0, 1];
+            const start = startTime + delay / speed;
+            const result = [];
+            if (this.holdTime !== null || !(resolvedDuration > 0))
+                return result;
+            for (let i = Math.max(0, Math.floor(((from - start) * speed) / resolvedDuration)); i <= repeat; i++) {
+                const iterationStart = start + (i * resolvedDuration) / speed;
+                if (iterationStart > to)
+                    break;
+                for (const offset of offsets) {
+                    const t = iterationStart +
+                        ((i % 2 && repeatType && repeatType !== "loop"
+                            ? 1 - offset
+                            : offset) *
+                            (resolvedDuration - repeatDelay)) /
+                            speed;
+                    t > from && t < to && result.push(t);
+                }
+            }
+            return result;
+        }
+        /**
+         * The value at a timestamp, as a number.
+         */
+        numberAt(timestamp) {
+            return parseFloat(this.sampleAt(timestamp, true));
+        }
+        /**
+         * Write the current value, and velocity, to the motion value.
+         */
+        sync() {
+            const now = time.now();
+            this.options.motionValue.setWithVelocity(this.sampleAt(now - sampleDelta, true), this.sampleAt(now, true), sampleDelta);
+        }
+        play() {
+            /**
+             * A stopped animation (one that was interrupted) can't play again,
+             * so it mustn't join the group.
+             */
+            if (this.isStopped)
+                return;
+            (this.group || createGroup(getOwner(this.options))).tracks.add(this);
+            super.play();
+        }
+        pause() {
+            super.pause();
+            if (this.isAccelerated()) {
+                this.sync();
+                this.group.schedule(false);
+            }
+        }
+        /**
+         * JSAnimation finishes on its next tick, which only happens on the
+         * main thread, so finish now.
+         */
+        complete() {
+            super.complete();
+            const { group } = this;
+            group && !group.isJS && this.canAccelerate && this.tick(time.now());
+        }
+        /**
+         * Without a tick to rebase it, a held time still includes the delay,
+         * so take it off here, as a JS animation does on its next tick.
+         */
+        get time() {
+            if (this.isAccelerated()) {
+                return millisecondsToSeconds(clamp(0, this.totalDuration, this.at(time.now()) - (this.options.delay || 0)));
+            }
+            return super.time;
+        }
+        set time(newTime) {
+            super.time = newTime;
+        }
+        /**
+         * Scroll timelines set time every frame, so run these on the main
+         * thread.
+         */
+        attachTimeline(timeline) {
+            this.canAccelerate = false;
+            this.group?.demote(true);
+            return super.attachTimeline(timeline);
+        }
+    }
+    function createGroup(owner) {
+        const element = owner.current;
+        const tracks = new Set();
+        const byKey = new Map();
+        /**
+         * Transforms that aren't animating, as built into the WAAPI animation.
+         */
+        let statics = {};
+        /**
+         * The transforms in the WAAPI animation, in order.
+         */
+        let keys = [];
+        let built = new Map();
+        let segments = [];
+        let needsBuild = false;
+        let isScheduled = false;
+        let hasChurned = false;
+        let lastChurn = -Infinity;
+        const has = (key) => {
+            for (const track of tracks)
+                if (track.name === key)
+                    return true;
+        };
+        /**
+         * The transform values at a timestamp or, without one, from the
+         * motion values. Animations that don't repeat forever are sampled no
+         * earlier than settled, so a loop that starts from an earlier cycle
+         * boundary holds them at their end.
+         */
+        const valuesAt = (timestamp, settled) => {
+            const values = {};
+            for (const key of timestamp === undefined ? transformPropOrder : keys) {
+                const track = byKey.get(key);
+                const value = timestamp === undefined
+                    ? read(owner, key)
+                    : track
+                        ? track.sampleAt(settled > timestamp && !track.timing()[1]
+                            ? settled
+                            : timestamp)
+                        : statics[key];
+                if (value !== undefined)
+                    values[key] = value;
+            }
+            return values;
+        };
+        /**
+         * Build the transform at a timestamp. Unlike buildTransform, every key
+         * is written, even at its default, so each keyframe has the same list
+         * of functions and the browser interpolates them one by one.
+         */
+        const compose = (timestamp, settled) => {
+            let transform = "";
+            const values = valuesAt(timestamp, settled);
+            for (const key in values) {
+                transform +=
+                    (translateAlias[key] || key) +
+                        "(" +
+                        getValueAsType(values[key], numberValueTypes[key]) +
+                        ") ";
+            }
+            return transform || "none";
+        };
+        /**
+         * Write the transform as an inline style, as the renderer would.
+         */
+        const commit = (values = valuesAt()) => {
+            element.style.transform = buildTransform$1(values, {});
+        };
+        /**
+         * Cancel the WAAPI animations, by default first committing the
+         * transform. The renderer writes its own version on its next render.
+         */
+        const stop = (shouldCommit = true) => {
+            shouldCommit && commit();
+            segments.forEach(({ animation }) => animation.cancel());
+            segments = [];
+        };
+        const add = (animation, offset, end = Infinity) => {
+            const segment = { animation, offset, end };
+            animation.startTime = time.now() + offset;
+            /**
+             * Animations finish when the WAAPI animation reaches their end.
+             * Once a loop has taken over, the finished animation isn't needed.
+             */
+            if (end < Infinity) {
+                animation.onfinish = () => {
+                    segment.isDone = true;
+                    if (segments.some((s) => s.end === Infinity)) {
+                        animation.cancel();
+                        segments = segments.filter((s) => s !== segment);
+                    }
+                    group.schedule(false);
+                };
+            }
+            /**
+             * Something else cancelled it, so carry on on the main thread.
+             */
+            animation.oncancel = () => segments.includes(segment) && group.demote();
+            segments.push(segment);
+        };
+        /**
+         * Where a value jumps between two timestamps, as when a repeat starts
+         * again: the timestamps either side of the jump, or none if it moves
+         * there continuously.
+         */
+        const jumpAt = (value, a, b) => {
+            const change = (x, y) => Math.abs(value(y) - value(x));
+            const size = change(a, b);
+            while (b - a > 0.01) {
+                const mid = (a + b) / 2;
+                change(a, mid) > change(mid, b) ? (b = mid) : (a = mid);
+            }
+            return change(a, b) > size / 2 ? [a, b] : [];
+        };
+        /**
+         * If every moving animation follows the same eased progress between
+         * two timestamps, the easing that describes it.
+         */
+        const getEasing = (moving, from, to, bounds) => {
+            const samples = Math.min(maxSamples, Math.max(2, Math.ceil((to - from) / sampleDelta)));
+            /**
+             * Too many keyframes or repeats to follow with this many samples.
+             */
+            if (bounds.length * 4 > samples)
+                return;
+            const at = spread(from, to, samples).concat(bounds).sort(byTime);
+            const position = (t) => progress(from, to, t);
+            let shared;
+            let progressAt;
+            for (const track of moving) {
+                const values = at.map((t) => track.numberAt(t));
+                const [first] = values;
+                const range = values[values.length - 1] - first;
+                const progress = values.map((value) => range ? (value - first) / range : value - first);
+                /**
+                 * A value that doesn't change, like one still in its delay,
+                 * fits any easing. One that changes but ends where it started
+                 * fits none.
+                 */
+                if (!range) {
+                    if (progress.some((p) => !(Math.abs(p) <= easingTolerance))) {
+                        return;
+                    }
+                }
+                else if (!shared) {
+                    shared = progress;
+                    progressAt = (t) => (track.numberAt(t) - first) / range;
+                }
+                else if (progress.some((p, i) => !(Math.abs(p - shared[i]) <= easingTolerance))) {
+                    return;
+                }
+            }
+            if (!shared ||
+                shared.every((p, i) => Math.abs(p - position(at[i])) <= easingTolerance)) {
+                return "linear";
+            }
+            /**
+             * A repeat that starts again jumps back, which takes two points at
+             * the same position.
+             */
+            const points = [];
+            const point = (t, p = progressAt(t)) => points.push(round(p) + " " + round(position(t) * 100) + "%");
+            shared.forEach((p, i) => {
+                i &&
+                    Math.abs(p - shared[i - 1]) > 0.2 &&
+                    jumpAt(progressAt, at[i - 1], at[i]).forEach((t) => point(t));
+                point(at[i], p);
+            });
+            return "linear(" + points + ")";
+        };
+        /**
+         * Sample timestamps between two timestamps, closer together where the
+         * moving animations curve.
+         */
+        const sample = (moving, from, to, bounds) => {
+            const times = [from];
+            /**
+             * Values that aren't numbers, like calc(), are left to the
+             * browser to interpolate.
+             */
+            const isStraight = (a, b) => moving.every((track) => !(Math.abs(track.numberAt((a + b) / 2) -
+                (track.numberAt(a) + track.numberAt(b)) / 2) >
+                (track.name.startsWith("scale")
+                    ? scaleTolerance
+                    : sampleTolerance)));
+            const split = (a, b, depth) => {
+                if (b - a < 1 || isStraight(a, b)) {
+                    times.push(b);
+                }
+                else if (depth < 4) {
+                    split(a, (a + b) / 2, depth + 1);
+                    split((a + b) / 2, b, depth + 1);
+                }
+                else {
+                    /**
+                     * Keyframes either side of a jump, like a repeat starting
+                     * again, so it doesn't play as a quick sweep.
+                     */
+                    for (const track of moving) {
+                        times.push(...jumpAt((t) => track.numberAt(t), a, b));
+                    }
+                    times.push(b);
+                }
+            };
+            /**
+             * Split at least every 100ms, and at every keyframe and repeat,
+             * either side of where a value can jump.
+             */
+            const ends = spread(from, to, Math.ceil((to - from) / 100));
+            for (const t of bounds)
+                ends.push(t, Math.min(t + 0.01, to));
+            let start = from;
+            for (const end of ends.sort(byTime)) {
+                end > start && split(start, end, 0);
+                start = end;
+            }
+            return times.sort(byTime);
+        };
+        /**
+         * If every moving animation is the same tween, started together, as
+         * happens for the values of one animate() call or transition, when
+         * they move and their native easing.
+         */
+        const getTween = (moving) => {
+            let shared;
+            for (const track of moving) {
+                const tween = track.tween();
+                if (!tween ||
+                    shared?.some((v, i) => i < 2
+                        ? Math.abs(tween[i] - v) > 1
+                        : tween[i] !== v)) {
+                    return;
+                }
+                shared = tween;
+            }
+            return shared;
+        };
+        /**
+         * A WAAPI animation of the composed transform between two timestamps.
+         */
+        const run = (moving, from, to, options = { fill: "both" }, settled, nativeEasing) => {
+            const bounds = moving.flatMap((track) => track.boundaries(from, to));
+            const easing = nativeEasing || getEasing(moving, from, to, bounds);
+            const times = easing ? [from, to] : sample(moving, from, to, bounds);
+            const transform = times.map((t) => compose(t, settled));
+            let keyframes = { transform };
+            if (!easing) {
+                keyframes.offset = times.map((t) => progress(from, to, t));
+            }
+            /**
+             * If nothing moves, don't hold a transform, which, even at its
+             * default, would make the element a containing block. The empty
+             * animation still finishes the animations.
+             */
+            if (transform.every((t) => t === transform[0])) {
+                commit(valuesAt(from, settled));
+                keyframes = null;
+            }
+            return element.animate(keyframes, {
+                ...options,
+                duration: to - from,
+                easing: easing || "linear",
+            });
+        };
         /**
-         * Most values can't be accelerated at all, so check the name before
-         * looking at the element or its props.
+         * Replace the WAAPI animations with ones built from now. Returns
+         * undefined if the animations can't be composed.
          */
-        if (!name ||
-            !(acceleratedValues.has(name) || colorProperties.has(name))) {
-            return false;
-        }
-        const subject = motionValue?.owner?.current;
+        const animate = (now) => {
+            /**
+             * The finite part runs until the last finite animation (or the
+             * last delay) ends. Infinitely repeating animations then continue
+             * as one looping WAAPI animation, which needs them to share a
+             * cycle.
+             */
+            let end = now;
+            let cycle = 0;
+            let cycleStart = 0;
+            const moving = [];
+            const looping = [];
+            const ends = new Set();
+            byKey.clear();
+            built = new Map();
+            for (const track of tracks) {
+                byKey.set(track.name, track);
+                const [trackEnd, trackCycle] = track.timing();
+                const isHeld = trackEnd === Infinity;
+                built.set(track, [track.at(now), track.speed, isHeld]);
+                /**
+                 * Held animations don't move, so keep their motion values up
+                 * to date, as a JSAnimation would on a seek.
+                 */
+                if (isHeld) {
+                    track.sync();
+                    continue;
+                }
+                if (track.speed < 0)
+                    return;
+                if (trackCycle) {
+                    if (cycle) {
+                        const phase = (trackEnd - cycleStart) / trackCycle;
+                        if (Math.abs(trackCycle - cycle) > 1 ||
+                            Math.abs(phase - Math.round(phase)) * cycle > 1) {
+                            return;
+                        }
+                    }
+                    else {
+                        cycle = trackCycle;
+                        cycleStart = trackEnd;
+                    }
+                    looping.push(track);
+                }
+                else {
+                    ends.add(trackEnd);
+                }
+                moving.push(track);
+                end = Math.max(end, trackEnd);
+            }
+            statics = {};
+            /**
+             * Transforms that aren't animating are left out at their default.
+             */
+            keys = transformPropOrder.filter((key) => {
+                if (byKey.has(key))
+                    return true;
+                const value = (statics[key] = read(owner, key));
+                return (value !== undefined &&
+                    parseFloat(value) !==
+                        (key.startsWith("scale") ? 1 : 0));
+            });
+            stop(false);
+            /**
+             * Values that share one tween are one WAAPI animation of it, with
+             * two keyframes and its own easing, from when they started.
+             */
+            const tween = !cycle && getTween(moving);
+            try {
+                if (tween && tween[1] > now) {
+                    const [from, to, easing] = tween;
+                    add(run(moving, from, to, undefined, undefined, easing), from - now, to - from);
+                }
+                else if (end > now) {
+                    add(run(moving, now, end), 0, end - now);
+                    /**
+                     * Animations that end sooner finish on the events of
+                     * empty animations that end with them.
+                     */
+                    ends.forEach((trackEnd) => trackEnd < end - 1 &&
+                        add(element.animate(null, {
+                            duration: trackEnd - now,
+                        }), 0, trackEnd - now));
+                }
+                if (cycle) {
+                    /**
+                     * Build one cycle from a cycle boundary, so it repeats
+                     * seamlessly, and start it part way through.
+                     */
+                    const from = cycleStart + Math.floor((end - cycleStart) / cycle) * cycle;
+                    add(run(looping, from, from + cycle, {
+                        iterations: Infinity,
+                        iterationStart: (end - from) / cycle,
+                        /**
+                         * It must not fill backwards over the finite part
+                         * that runs before it.
+                         */
+                        fill: "forwards",
+                    }, end), end - now);
+                }
+            }
+            catch {
+                return;
+            }
+            /**
+             * Everything is held, so hold it with an inline style instead.
+             */
+            segments.length || stop();
+            return true;
+        };
         /**
-         * We use instanceof checks instead of isHTMLElement()/isSVGElement()
-         * because we explicitly **don't** want elements in different timing
-         * contexts (i.e. popups) to be accelerated, as it's not possible to sync
-         * these animations properly with those driven from the main window
-         * frameloop.
+         * If every animation has been paused, played, seeked or sped up
+         * together since the WAAPI animation was built, do the same to it.
+         * Returns false if it needs rebuilding instead.
          */
-        if (!(subject instanceof HTMLElement) &&
-            !(subject instanceof SVGElement)) {
-            return false;
-        }
-        const { onUpdate, transformTemplate } = motionValue.owner.getProps();
-        return (supportsWaapi() &&
+        const retime = (now) => {
+            let elapsed;
+            let rate = 0;
+            for (const track of tracks) {
+                const state = built.get(track);
+                if (!state)
+                    return false;
+                const [builtTime, builtSpeed, wasHeld] = state;
+                const trackTime = track.at(now);
+                const isHeld = track.timing()[0] === Infinity;
+                if (wasHeld) {
+                    if (isHeld && trackTime === builtTime)
+                        continue;
+                    return false;
+                }
+                const trackElapsed = (trackTime - builtTime) / builtSpeed;
+                const trackRate = isHeld ? 0 : track.speed / builtSpeed;
+                if (elapsed === undefined) {
+                    elapsed = trackElapsed;
+                    rate = trackRate;
+                }
+                else if (Math.abs(trackElapsed - elapsed) > 1 ||
+                    trackRate !== rate) {
+                    return false;
+                }
+            }
+            if (elapsed === undefined)
+                return true;
+            if (!segments.length)
+                return false;
+            for (const { offset, end, isDone } of segments) {
+                const local = elapsed - offset;
+                if (end < Infinity &&
+                    (isDone ? local < end - 1 : local < 0 || local >= end)) {
+                    return false;
+                }
+            }
+            for (const { animation, offset, isDone } of segments) {
+                if (isDone)
+                    continue;
+                const local = elapsed - offset;
+                if (rate) {
+                    animation.playbackRate = rate;
+                    animation.startTime = now - local / rate;
+                }
+                else {
+                    animation.pause();
+                    animation.currentTime = local;
+                }
+            }
+            return true;
+        };
+        const build = () => {
+            const now = time.now();
             /**
-             * Force WAAPI for color properties with browser-only color formats
-             * (oklch, oklab, lab, lch, etc.) that the JS animation path can't parse.
+             * Finish the animations that have reached their end, which the
+             * WAAPI animation has already rendered.
              */
-            (acceleratedValues.has(name) ||
-                (colorProperties.has(name) &&
-                    hasBrowserOnlyColors(keyframes))) &&
-            (name !== "transform" || !transformTemplate) &&
+            if (!group.isJS) {
+                group.isFinishing = true;
+                tracks.forEach((track) => {
+                    const [trackEnd, trackCycle] = track.timing();
+                    if (track.state === "running" &&
+                        track.speed > 0 &&
+                        !trackCycle &&
+                        trackEnd <= now + 1) {
+                        track.complete();
+                        /**
+                         * From now it's checked for outside writes like any
+                         * other static transform. If the WAAPI animation never
+                         * rendered it (it was instant), rebuild with its value.
+                         */
+                        statics[track.name] = read(owner, track.name);
+                        built.has(track) || (needsBuild = true);
+                    }
+                });
+                group.isFinishing = false;
+            }
+            isScheduled = false;
+            tracks.forEach(({ state }, track) => {
+                if (state === "idle" || state === "finished")
+                    tracks.delete(track);
+            });
+            if (!tracks.size) {
+                transformGroups.delete(element);
+                group.isJS || stop();
+                return;
+            }
+            for (const track of tracks) {
+                if (!track.canAccelerate)
+                    return group.demote(true);
+            }
             /**
-             * 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.
+             * Everything that kept the group on the main thread has finished,
+             * so move the remaining animations back to the compositor.
              */
-            !onUpdate &&
-            !repeatDelay &&
-            repeatType !== "mirror" &&
-            damping !== 0 &&
-            type !== "inertia");
+            if (group.isJS) {
+                group.isJS = false;
+                needsBuild = true;
+                tracks.forEach((track) => track.js?.stop());
+            }
+            const shouldBuild = needsBuild;
+            const churned = hasChurned;
+            needsBuild = hasChurned = false;
+            if (shouldBuild || !retime(now)) {
+                if (churned) {
+                    if (now - lastChurn < churnWindow)
+                        return group.demote();
+                    lastChurn = now;
+                }
+                if (!animate(now))
+                    return group.demote();
+            }
+        };
+        const group = {
+            tracks,
+            isJS: false,
+            isFinishing: false,
+            schedule(build_, isChurn) {
+                needsBuild || (needsBuild = build_);
+                hasChurned || (hasChurned = !!isChurn);
+                /**
+                 * Build in this frame's render step, so it's in place before
+                 * anything reads the DOM in postRender, or straight after the
+                 * current task outside of a frame.
+                 */
+                if (!isScheduled) {
+                    isScheduled = true;
+                    frameData.isProcessing
+                        ? frame.render(build, false, true)
+                        : queueMicrotask(build);
+                }
+            },
+            /**
+             * An outside write. Rebuild once, but if it keeps happening, move
+             * to the main thread.
+             */
+            check() {
+                if (group.isJS)
+                    return;
+                for (const key in statics) {
+                    if (read(owner, key) !== statics[key] && !has(key)) {
+                        return group.schedule(true, true);
+                    }
+                }
+            },
+            demote(canReturn) {
+                if (group.isJS)
+                    return;
+                /**
+                 * Unless only another animation is holding the group on the
+                 * main thread, these animations stay there until they end.
+                 */
+                tracks.forEach((track) => {
+                    track.isAccelerated() && track.sync();
+                    canReturn || (track.canAccelerate = false);
+                });
+                group.isJS = true;
+                built = new Map();
+                stop();
+                tracks.forEach((track) => track.state === "running" && track.js?.start());
+            },
+        };
+        transformGroups.set(element, group);
+        return group;
     }
 
     class AsyncMotionValueAnimation extends WithPromise {
@@ -3382,6 +4363,11 @@
              * values may not be valid CSS and would trigger browser warnings.
              */
             const useWaapi = canAnimateValue && !isHandoff && supportsBrowserAnimation(options);
+            /**
+             * Independent transforms (x, scale etc) on an HTML element are
+             * composed into one WAAPI transform animation per element.
+             */
+            const isGroupedTransform = !useWaapi && canGroupTransform(options);
             /**
              * Resolve startTime for the animation. A startTime passed in options
              * (an optimised appear handoff syncing to its WAAPI animation) takes
@@ -3397,7 +4383,10 @@
              * animation started in that moment stays in sync. WAAPI has no frame
              * of ours to do that on.
              */
-            if (sync && (useWaapi || this.resolvedAt !== this.createdAt)) {
+            if (sync &&
+                (useWaapi ||
+                    isGroupedTransform ||
+                    this.resolvedAt !== this.createdAt)) {
                 options.startTime ?? (options.startTime = resolveStartTime(this.createdAt, this.resolvedAt));
             }
             let animation;
@@ -3415,6 +4404,9 @@
                     animation = new JSAnimation(options);
                 }
             }
+            else if (isGroupedTransform) {
+                animation = new TransformAnimation(options);
+            }
             else {
                 animation = new JSAnimation(options);
             }
@@ -3430,6 +4422,12 @@
         then(onResolve, _onReject) {
             return this.finished.finally(onResolve).then(() => { });
         }
+        /**
+         * The value now, if the animation runs on the compositor.
+         */
+        liveValue() {
+            return this._animation?.liveValue?.();
+        }
         get animation() {
             if (!this._animation) {
                 this.keyframeResolver?.resume();
@@ -3867,6 +4865,18 @@
             if (collectMotionValues.current) {
                 collectMotionValues.current.push(this);
             }
+            /**
+             * A value animating on the compositor isn't updated every frame,
+             * so read it from its animation.
+             */
+            const sampled = this.animation?.liveValue?.();
+            return sampled === undefined ? this.current : sampled;
+        }
+        /**
+         * The value as last set. Unlike get(), this doesn't read an animation
+         * running on the compositor, which renders the value itself.
+         */
+        getCurrent() {
             return this.current;
         }
         /**
@@ -4093,6 +5103,7 @@
             name,
             motionValue: value,
             element: isHandoff ? undefined : element,
+            hasOnUpdate: !!valueTransition.onUpdate,
         };
         /**
          * If there's no transition defined for this value, we can generate
@@ -4692,6 +5703,30 @@
         constructor(unresolvedKeyframes, onComplete, name, motionValue, element) {
             super(unresolvedKeyframes, onComplete, name, motionValue, element, true);
         }
+        /**
+         * Keyframes that don't need reading from the DOM, or measuring,
+         * resolve straight away rather than in the frame loop's batched read.
+         */
+        scheduleResolve() {
+            if (this.canReadNow()) {
+                this.readKeyframes();
+                if (!this.needsMeasurement)
+                    return this.complete();
+            }
+            super.scheduleResolve();
+        }
+        canReadNow() {
+            const { unresolvedKeyframes, element, motionValue } = this;
+            const origin = unresolvedKeyframes[0] ?? motionValue?.get();
+            if (!element?.current || origin === undefined)
+                return false;
+            for (let i = 0; i < unresolvedKeyframes.length; i++) {
+                if (containsCSSVariable(i ? unresolvedKeyframes[i] : origin)) {
+                    return false;
+                }
+            }
+            return true;
+        }
         readKeyframes() {
             const { unresolvedKeyframes, element, name } = this;
             if (!element || !element.current)
@@ -5035,15 +6070,6 @@
         return isObject(element) && "ownerSVGElement" in element;
     }
 
-    /**
-     * Provided a value and a ValueType, returns the value as that value type.
-     */
-    const getValueAsType = (value, type) => {
-        return type && typeof value === "number"
-            ? type.transform(value)
-            : value;
-    };
-
     function resolveElements(elementOrSelector, scope, selectorCache) {
         if (elementOrSelector == null) {
             return [];
@@ -5217,18 +6243,12 @@
         });
     }
 
-    const translateAlias$1 = {
-        x: "translateX",
-        y: "translateY",
-        z: "translateZ",
-        transformPerspective: "perspective",
-    };
     /**
      * Cache of `translateX(`-style openers so each render is a few string
      * concatenations rather than a template per transform.
      */
     const openers = {};
-    function buildTransform$1(state) {
+    function buildTransform(state) {
         let transform = "";
         const { transformKeys: keys = [], transformValues: values = {} } = state;
         /**
@@ -5237,7 +6257,7 @@
          */
         for (let i = 0; i < keys.length; i++) {
             const key = keys[i];
-            const value = values[key].get();
+            const value = values[key].getCurrent();
             if (value === undefined)
                 continue;
             const parsed = typeof value === "number" ? value : parseFloat(value);
@@ -5245,7 +6265,7 @@
                 transform +=
                     (transform && " ") +
                         (openers[key] ||
-                            (openers[key] = (translateAlias$1[key] || key) + "(")) +
+                            (openers[key] = (translateAlias[key] || key) + "(")) +
                         getValueAsType(value, transformValueTypes[key]) +
                         ")";
             }
@@ -5288,7 +6308,8 @@
                     addStyleValue(element, state, "transformBox", new MotionValue("fill-box"));
                 }
                 state.set("transform", new MotionValue("none"), () => {
-                    element.style.transform = buildTransform$1(state);
+                    transformGroups.get(element)?.check();
+                    element.style.transform = buildTransform(state);
                 });
             }
             computed = state.get("transform");
@@ -5306,12 +6327,12 @@
         }
         else if (isCSSVar(key)) {
             render = () => {
-                element.style.setProperty(key, value.get());
+                element.style.setProperty(key, value.getCurrent());
             };
         }
         else {
             render = () => {
-                element.style[key] = getValueAsType(value.get(), numberValueTypes[key]);
+                element.style[key] = getValueAsType(value.getCurrent(), numberValueTypes[key]);
             };
         }
         return state.set(key, value, render, computed);
@@ -5343,73 +6364,8 @@
         test: isStyleSubject,
         read: readStyleValue,
     });
-    const styleEffect = /*@__PURE__*/ createSelectorEffect(styleSubjectEffect);
-
-    const translateAlias = {
-        x: "translateX",
-        y: "translateY",
-        z: "translateZ",
-        transformPerspective: "perspective",
-    };
-    const numTransforms = transformPropOrder.length;
-    /**
-     * Build a CSS transform style from individual x/y/scale etc properties.
-     *
-     * This outputs with a default order of transforms/scales/rotations, this can be customised by
-     * providing a transformTemplate function.
-     */
-    function buildTransform(latestValues, transform, transformTemplate) {
-        // The transform string we're going to build into.
-        let transformString = "";
-        let transformIsDefault = true;
-        /**
-         * Loop over all possible transforms in order, adding the ones that
-         * are present to the transform string.
-         */
-        for (let i = 0; i < numTransforms; i++) {
-            const key = transformPropOrder[i];
-            const value = latestValues[key];
-            if (value === undefined)
-                continue;
-            let valueIsDefault = true;
-            if (typeof value === "number") {
-                valueIsDefault = value === (key.startsWith("scale") ? 1 : 0);
-            }
-            else {
-                const parsed = parseFloat(value);
-                valueIsDefault = key.startsWith("scale") ? parsed === 1 : parsed === 0;
-            }
-            if (!valueIsDefault || transformTemplate) {
-                const valueAsType = getValueAsType(value, numberValueTypes[key]);
-                if (!valueIsDefault) {
-                    transformIsDefault = false;
-                    const transformName = translateAlias[key] || key;
-                    transformString += `${transformName}(${valueAsType}) `;
-                }
-                if (transformTemplate) {
-                    transform[key] = valueAsType;
-                }
-            }
-        }
-        // `pathRotation` composes onto `rotate` as a separate additive term so
-        // the user's `rotate` is never clobbered. Deliberately not a slot in
-        // `transformPropOrder`.
-        const pathRotation = latestValues.pathRotation;
-        if (pathRotation) {
-            transformIsDefault = false;
-            transformString += `rotate(${getValueAsType(pathRotation, numberValueTypes.pathRotation)}) `;
-        }
-        transformString = transformString.trim();
-        // If we have a custom `transform` template, pass our transform values and
-        // generated transformString to that before returning
-        if (transformTemplate) {
-            transformString = transformTemplate(transform, transformIsDefault ? "" : transformString);
-        }
-        else if (transformIsDefault) {
-            transformString = "none";
-        }
-        return transformString;
-    }
+    const styleEffect = 
+    /*@__PURE__*/ createSelectorEffect(styleSubjectEffect);
 
     function buildHTMLStyles(state, latestValues, transformTemplate) {
         const { style, vars, transformOrigin } = state;
@@ -5449,7 +6405,7 @@
         }
         if (!latestValues.transform) {
             if (hasTransform || transformTemplate) {
-                style.transform = buildTransform(latestValues, state.transform, transformTemplate);
+                style.transform = buildTransform$1(latestValues, state.transform, transformTemplate);
             }
             else if (style.transform) {
                 /**
@@ -8353,8 +9309,11 @@
             const removeOnChange = value.on("change", (latestValue) => {
                 this.latestValues[key] = latestValue;
                 this.props.onUpdate && frame.preRender(this.notifyUpdate);
-                if (valueIsTransform && this.projection) {
-                    this.projection.isTransformDirty = true;
+                if (valueIsTransform) {
+                    if (this.projection) {
+                        this.projection.isTransformDirty = true;
+                    }
+                    transformGroups.get(this.current)?.check();
                 }
                 this.scheduleRender();
             });
@@ -8438,9 +9397,18 @@
          * added to our map, old ones removed, and listeners updated.
          */
         update(props, presenceContext) {
-            if (props.transformTemplate || this.props.transformTemplate) {
+            const { transformTemplate, onUpdate } = this.props;
+            if (props.transformTemplate || transformTemplate) {
                 this.scheduleRender();
             }
+            /**
+             * Transforms on the compositor can't use a new transformTemplate
+             * or onUpdate, so move them to the main thread.
+             */
+            if ((props.transformTemplate && !transformTemplate) ||
+                (props.onUpdate && !onUpdate)) {
+                transformGroups.get(this.current)?.demote();
+            }
             this.prevProps = this.props;
             this.props = props;
             this.prevPresenceContext = this.presenceContext;
@@ -9735,6 +10703,7 @@
             }
         }
     }
+    const demoteTransforms = ({ instance }) => instance && transformGroups.get(instance)?.demote();
     function cancelTreeOptimisedTransformAnimations(projectionNode) {
         projectionNode.hasCheckedOptimisedAppear = true;
         if (projectionNode.root === projectionNode)
@@ -10096,10 +11065,17 @@
                 !this.root.isUpdating && this.root.startUpdate();
                 if (this.isLayoutDirty)
                     return;
+                /**
+                 * Accelerated transforms aren't reflected in latestValues or
+                 * removed by resetTransform, so move them back to the main
+                 * thread before this node, or its ancestors, are measured.
+                 */
+                demoteTransforms(this);
                 this.isLayoutDirty = true;
                 for (let i = 0; i < this.path.length; i++) {
                     const node = this.path[i];
                     node.shouldResetTransform = true;
+                    demoteTransforms(node);
                     /**
                      * Percentage translates resolve against layoutBox dimensions,
                      * so ancestors with them must be re-measured after transform reset.
@@ -10302,6 +11278,7 @@
                 const isResetRequested = this.isLayoutDirty ||
                     this.shouldResetTransform ||
                     this.options.alwaysMeasureLayout;
+                isResetRequested && demoteTransforms(this);
                 const hasProjection = this.projectionDelta && !isDeltaZero(this.projectionDelta);
                 const transformTemplate = this.getTransformTemplate();
                 const transformTemplateValue = transformTemplate
@@ -13227,7 +14204,7 @@
     exports.buildProjectionTransform = buildProjectionTransform;
     exports.buildSVGAttrs = buildSVGAttrs;
     exports.buildSVGPath = buildSVGPath;
-    exports.buildTransform = buildTransform;
+    exports.buildTransform = buildTransform$1;
     exports.calcAxisDelta = calcAxisDelta;
     exports.calcBoxDelta = calcBoxDelta;
     exports.calcChildStagger = calcChildStagger;
@@ -13429,6 +14406,8 @@
     exports.rgbUnit = rgbUnit;
     exports.rgba = rgba;
     exports.rootProjectionNode = rootProjectionNode;
+    exports.round = round;
+    exports.sampleDelta = sampleDelta;
     exports.scale = scale;
     exports.scaleCorrectors = scaleCorrectors;
     exports.scalePoint = scalePoint;
@@ -13456,6 +14435,7 @@
     exports.supportsPartialKeyframes = supportsPartialKeyframes;
     exports.supportsScrollTimeline = supportsScrollTimeline;
     exports.supportsViewTimeline = supportsViewTimeline;
+    exports.supportsWaapi = supportsWaapi;
     exports.svgEffect = svgEffect;
     exports.svgSubjectEffect = svgSubjectEffect;
     exports.sync = sync;