@rafaelaugusto/jolt 0.1.0-rc.2 → 0.1.0-rc.4

package/dist/value-track.js

@@ -2,25 +2,13 @@ import { instantTrack } from './track.js';
 /** Compile scalar addition before any binding's mapping. The snapshot is independent of later edits. */
 export function valueTrack(parts, rest) {
     const value = (time) => parts.reduce((sum, part) => sum + part.base + part.span * part.track.valueAt(part.elapsed + time), rest);
-    let finite = 0;
-    const periods = [];
-    for (const { track, elapsed } of parts) {
-        if (Number.isFinite(track.end))
-            finite = Math.max(finite, track.end - elapsed);
-        else if (elapsed < track.delay)
-            finite = Math.max(finite, track.delay - elapsed);
-        else
-            periods.push(Math.max(1, track.duration * (track.reverse ? 2 : 1)));
-    }
-    if (finite <= 0 && !periods.length)
+    const span = compositionSpan(parts);
+    if (!span)
         return { track: instantTrack('x', value(0)), windowed: false };
-    const loop = finite <= 0 && periods.length ? commonPeriod(periods) : undefined;
-    // Bound finite compositions too: a minutes-long base must not undersample a short pulse.
-    const duration = finite > 0 ? Math.min(finite, 4000) : (loop ?? 4000);
+    const { duration, endless, windowed } = span;
     const steps = Math.max(1, Math.min(6000, Math.ceil((duration * 60) / 1000)));
     const times = Array.from({ length: steps + 1 }, (_, i) => i / steps);
     const values = times.map((time) => value(time * duration));
-    const endless = loop !== undefined;
     const at = (time) => value(endless
         ? ((time % duration) + duration) % duration
         : Math.min(duration, Math.max(0, time)));
@@ -38,8 +26,32 @@ export function valueTrack(parts, rest) {
         valueAt: at,
         velocityAt: (time) => (at(time + 0.5) - at(time - 0.5)) * 1000,
     };
+    return { track, windowed };
+}
+/**
+ * How long one sampled composition can play before it needs rebuilding. A rolling
+ * window repeats every four seconds; native composition avoids it entirely.
+ */
+export function compositionSpan(parts) {
+    let finite = 0;
+    const periods = [];
+    for (const { track, elapsed } of parts) {
+        if (Number.isFinite(track.end))
+            finite = Math.max(finite, track.end - elapsed);
+        else if (elapsed < track.delay)
+            finite = Math.max(finite, track.delay - elapsed);
+        else
+            periods.push(Math.max(1, track.duration * (track.reverse ? 2 : 1)));
+    }
+    if (finite <= 0 && !periods.length)
+        return undefined;
+    const loop = finite <= 0 && periods.length ? commonPeriod(periods) : undefined;
+    // Bound finite compositions too: a minutes-long base must not undersample a short pulse.
+    const duration = finite > 0 ? Math.min(finite, 4000) : (loop ?? 4000);
+    const endless = loop !== undefined;
     return {
-        track,
+        duration,
+        endless,
         windowed: finite > duration ||
             (!endless && parts.some(({ track }) => !Number.isFinite(track.end))),
     };

package/dist/value-track.js.map

@@ -1 +1 @@
-{"version":3,"file":"value-track.js","sourceRoot":"","sources":["../src/value-track.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"value-track.js","sourceRoot":"","sources":["../src/value-track.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rafaelaugusto/jolt",
-  "version": "0.1.0-rc.2",
+  "version": "0.1.0-rc.4",
   "description": "Native animations for NativeScript: presets, springs, keyframes and stagger in one call.",
   "keywords": [
     "nativescript",

package/platforms/android/java/org/rafaelaugusto/jolt/BlurEffect.java

@@ -50,12 +50,19 @@ public final class BlurEffect {
         }catch(JSONException e){throw new IllegalArgumentException("Invalid blur program",e);}
         if(!supported){apply(values[values.length-1]);return;}
         advance(0);
+        active++;clock(0);
+    }
+    private void clock(long at){
+        ValueAnimator old=animator;
+        if(old!=null){old.removeAllUpdateListeners();old.removeAllListeners();old.cancel();}
         final ValueAnimator a=ValueAnimator.ofFloat(0f,1f);
         a.setDuration(repeats<0?60000:Math.max(1,(long)Math.ceil(delay+duration*(repeats+1))));
         a.setRepeatCount(repeats<0?ValueAnimator.INFINITE:0);a.setInterpolator(new LinearInterpolator());
         a.addUpdateListener(v->advance(v.getCurrentPlayTime()));
         a.addListener(new AnimatorListenerAdapter(){@Override public void onAnimationEnd(Animator ended){if(animator==a){animator=null;active--;}}});
-        animator=a;active++;a.start();
+        animator=a;
+        if(at>0)a.setCurrentPlayTime(at);
+        a.start();
     }
     private void advance(double elapsed){
         double t=Math.max(0,elapsed-delay),fraction;
@@ -67,9 +74,14 @@ public final class BlurEffect {
         double span=times[high]-times[low],mix=span>0?Math.max(0,Math.min(1,(fraction-times[low])/span)):1;
         apply(values[low]+(values[high]-values[low])*mix);
     }
+    /** A resume rebuilds the clock: Android moves a seeked start time by the paused duration on the frame after resume(). */
     public void control(double time,boolean paused){
         if(animator==null)return;
-        animator.setCurrentPlayTime(Math.max(0,(long)time));if(paused)animator.pause();else animator.resume();advance(time);
+        long at=Math.max(0,(long)time);
+        if(paused){animator.setCurrentPlayTime(at);animator.pause();}
+        else if(animator.isPaused())clock(at);
+        else animator.setCurrentPlayTime(at);
+        advance(time);
     }
     public void resize(){} // RenderEffect automatically follows the view's render node bounds.
     public String snapshot(){

package/platforms/android/java/org/rafaelaugusto/jolt/GradientLayer.java

@@ -32,6 +32,9 @@ public final class GradientLayer extends android.graphics.drawable.Drawable {
     // angle, x, y, radius
     private final float[] geometry = new float[4];
     private float corner;
+    private long duration, delay;
+    private int repeat;
+    private boolean reverse;
     private ValueAnimator animator;
     private Listener listener;
 
@@ -67,14 +70,39 @@ public final class GradientLayer extends android.graphics.drawable.Drawable {
         frameColors = colors;
         frameStops = stops;
         frameGeometry = geometry;
+        this.duration = duration;
+        this.delay = delay;
+        this.repeat = repeat;
+        this.reverse = reverse;
         this.listener = listener;
         int count = colors.length / times.length;
         this.colors = new int[count];
         this.stops = new float[count];
         apply(0);
+        clock(0);
+    }
+
+    /** Rejoin the source position. Binding windows include delays in their frames. */
+    public void control(long elapsed, boolean paused) {
+        if (animator == null) return;
+        if (paused) {
+            animator.setCurrentPlayTime(Math.max(0, elapsed - delay));
+            animator.pause();
+        } else if (animator.isPaused()) clock(Math.max(0, elapsed));
+        else animator.setCurrentPlayTime(Math.max(0, elapsed - delay));
+    }
+
+    /** A resume rebuilds the animator: Android moves a seeked start time by the paused duration on the frame after resume(). */
+    private void clock(long elapsed) {
+        ValueAnimator old = animator;
+        if (old != null) {
+            old.removeAllUpdateListeners();
+            old.removeAllListeners();
+            old.cancel();
+        }
         final ValueAnimator animation = ValueAnimator.ofFloat(0f, 1f);
         animation.setDuration(Math.max(duration, 1));
-        animation.setStartDelay(delay);
+        animation.setStartDelay(Math.max(0, delay - elapsed));
         animation.setInterpolator(new LinearInterpolator());
         if (repeat != 0) {
             animation.setRepeatCount(repeat < 0 ? ValueAnimator.INFINITE : repeat);
@@ -105,16 +133,10 @@ public final class GradientLayer extends android.graphics.drawable.Drawable {
             }
         });
         animator = animation;
+        if (elapsed > delay) animation.setCurrentPlayTime(elapsed - delay);
         animation.start();
     }
 
-    /** Rejoin the source position. Binding windows include delays in their frames. */
-    public void control(long elapsed, boolean paused) {
-        if (animator == null) return;
-        animator.setCurrentPlayTime(Math.max(0, elapsed - animator.getStartDelay()));
-        if (paused) animator.pause(); else animator.resume();
-    }
-
     public boolean isPlaying() { return animator != null; }
     public float getCorner() { return corner; }
     public float[] getGeometry() { return geometry.clone(); }

package/platforms/android/java/org/rafaelaugusto/jolt/KeyframeFactory.java

@@ -0,0 +1,26 @@
+package org.rafaelaugusto.jolt;
+
+import android.animation.Keyframe;
+import android.animation.ObjectAnimator;
+import android.animation.PropertyValuesHolder;
+import android.util.Property;
+import android.view.View;
+
+/** Builds a numeric track without creating a JavaScript proxy for every keyframe. */
+public final class KeyframeFactory {
+    private KeyframeFactory() {}
+
+    public static ObjectAnimator create(View view, Property<View, Float> property,
+            double[] times, double[] values, double unit) {
+        if (times.length != values.length || values.length < 2) {
+            throw new IllegalArgumentException("A track needs matching times and at least two values");
+        }
+        Keyframe[] frames = new Keyframe[values.length];
+        for (int i = 0; i < values.length; i++) {
+            // Scale in double precision before the same float conversion as Keyframe.ofFloat.
+            frames[i] = Keyframe.ofFloat((float) times[i], (float) (values[i] * unit));
+        }
+        return ObjectAnimator.ofPropertyValuesHolder(view,
+            PropertyValuesHolder.ofKeyframe(property, frames));
+    }
+}

package/platforms/android/java/org/rafaelaugusto/jolt/LiveSpring.java

@@ -24,7 +24,11 @@ public final class LiveSpring {
             while (remaining > 1e-9) {
                 double dt = Math.min(remaining, 1.0 / 240);
                 remaining -= dt;
-                for (int i = 0; i < nodes.size(); i++) nodes.get(i).step(now - remaining * 1000, dt);
+                // An instant node only needs the frame's final time; springs integrate every substep.
+                for (int i = 0; i < nodes.size(); i++) {
+                    LiveSpring node = nodes.get(i);
+                    if (!node.reduced || remaining <= 1e-9) node.step(now - remaining * 1000, dt);
+                }
             }
             boolean active = false;
             for (int i = 0; i < nodes.size(); i++) {
@@ -46,7 +50,9 @@ public final class LiveSpring {
     private final ArrayList<Binding> bindings = new ArrayList<>();
     private LiveSpring source;
     private Mapping[] sourceMaps = new Mapping[0];
-    private SampledInput input;
+    private static final SampledInput[] NONE = new SampledInput[0];
+    private SampledInput[] inputs = NONE;
+    private double inputRest;
     private boolean direct = true;
     private double targetValue;
     private boolean moving, reduced, disposed, paused, inputHeld, sensorInput;
@@ -74,25 +80,46 @@ public final class LiveSpring {
     }
     public void updateInput(String snapshot) {
         if (disposed) return;
-        try { input = new SampledInput(new JSONObject(snapshot)); }
+        try { inputs = new SampledInput[]{ new SampledInput(new JSONObject(snapshot)) }; }
         catch (JSONException error) { throw new IllegalArgumentException(error); }
-        sensorInput = false; direct = false;
+        inputRest = 0; sensorInput = false; direct = false;
         wake();
     }
+    /** The target is a rest value plus sampled inputs that each keep their own clock. */
+    public void setInputs(double rest, String snapshots) {
+        if (disposed) return;
+        try {
+            JSONArray array = new JSONArray(snapshots);
+            SampledInput[] next = new SampledInput[array.length()];
+            for (int i = 0; i < next.length; i++) next[i] = new SampledInput(array.getJSONObject(i));
+            inputs = next;
+        } catch (JSONException error) { throw new IllegalArgumentException(error); }
+        inputRest = rest; sensorInput = false; direct = false;
+        wake();
+    }
+    private double inputValue(double now) {
+        double value = inputRest;
+        for (SampledInput input : inputs) value += input.value(now);
+        return value;
+    }
+    private boolean inputMoving(double now) {
+        for (SampledInput input : inputs) if (input.running(now)) return true;
+        return false;
+    }
     public void setSensorInput(double value) {
         if (disposed || !Double.isFinite(value) || (sensorInput && inputHeld && state.position == value)) return;
-        sensorInput = true; inputHeld = true; direct = true; targetValue = value; input = null;
+        sensorInput = true; inputHeld = true; direct = true; targetValue = value; inputs = NONE;
         state.position = value; state.velocity = 0; moving = false;
         schedule();
     }
     public void setTarget(double value) {
         if (disposed) return;
-        sensorInput = false; direct = true; targetValue = value; input = null;
+        sensorInput = false; direct = true; targetValue = value; inputs = NONE;
         wake();
     }
     public void holdInput(double value, double velocity) {
         if (disposed) return;
-        sensorInput = false; inputHeld = true; direct = true; targetValue = value; input = null;
+        sensorInput = false; inputHeld = true; direct = true; targetValue = value; inputs = NONE;
         state.position = value; state.velocity = velocity; moving = true;
         apply(); schedule();
     }
@@ -114,8 +141,8 @@ public final class LiveSpring {
     }
     private void step(double now, double dt) {
         if (disposed || paused || inputHeld) return;
-        double target = source == null ? (direct ? targetValue : input.value(now)) : map(source.state.position, sourceMaps);
-        boolean inputMoving = source == null ? !direct && input.running(now) : source.moving;
+        double target = source == null ? (direct ? targetValue : inputValue(now)) : map(source.state.position, sourceMaps);
+        boolean inputMoving = source == null ? !direct && inputMoving(now) : source.moving;
         if (reduced) { state.position = target; state.velocity = 0; }
         else state.advance(target, stiffness, damping, mass, dt);
         boolean rest = Math.abs(state.position - target) <= restDelta && Math.abs(state.velocity) <= restSpeed;

package/platforms/android/java/org/rafaelaugusto/jolt/ScrollHeader.java

@@ -68,12 +68,13 @@ public final class ScrollHeader implements ViewTreeObserver.OnScrollChangedListe
     public void scroll(double target,boolean animated) {
         if(disposed || !Double.isFinite(target))return;
         target=Math.max(0,target);
-        if(animated){list.smoothScrollBy((int)Math.round((target-current())*density),300);return;}
         double divider=list.getDividerHeight()/density, stride=rowHeight+divider;
         int index=target<spacer+divider?0:1+(int)Math.floor((target-spacer-divider)/stride);
         index=Math.max(0,Math.min(list.getCount()-1,index));
         double start=index==0?0:spacer+divider+(index-1)*stride;
-        list.setSelectionFromTop(index,(int)Math.round((start-target)*density));
+        int top=(int)Math.round((start-target)*density);
+        if(animated){list.smoothScrollToPositionFromTop(index,top,300);return;}
+        list.setSelectionFromTop(index,top);
         list.post(new Runnable(){public void run(){if(!disposed)update(true);}});
     }
     public void dispose() {

package/platforms/android/java/org/rafaelaugusto/jolt/ShapeLayer.java

@@ -56,18 +56,28 @@ public final class ShapeLayer extends Drawable {
         this.commands=commands;this.from=from;this.to=to;this.times=times;this.samples=samples;
         this.duration=duration;this.delay=delay;this.repeats=repeats;this.reverse=reverse;
         current=from.clone();rebuild();apply(0);
+        active++;clock(0);
+    }
+    /** A resume rebuilds the clock: Android moves a seeked start time by the paused duration on the frame after resume(). */
+    public void control(double time,boolean paused){
+        if(animator==null)return;
+        long at=Math.max(0,(long)time);
+        if(paused){animator.setCurrentPlayTime(at);animator.pause();}
+        else if(animator.isPaused())clock(at);
+        else animator.setCurrentPlayTime(at);
+        apply(time);
+    }
+    private void clock(long at){
+        ValueAnimator old=animator;
+        if(old!=null){old.removeAllUpdateListeners();old.removeAllListeners();old.cancel();}
         final ValueAnimator a=ValueAnimator.ofFloat(0f,1f);
         a.setDuration(repeats<0?60000:Math.max(1,(long)Math.ceil(delay+duration*(repeats+1))));
         a.setRepeatCount(repeats<0?ValueAnimator.INFINITE:0);a.setInterpolator(new LinearInterpolator());
         a.addUpdateListener(v->apply(v.getCurrentPlayTime()));
         a.addListener(new AnimatorListenerAdapter(){@Override public void onAnimationEnd(Animator ended){if(animator==a){animator=null;active--;}}});
-        animator=a;active++;a.start();
-    }
-    public void control(double time,boolean paused){
-        if(animator==null)return;
-        animator.setCurrentPlayTime(Math.max(0,(long)time));
-        if(paused)animator.pause();else animator.resume();
-        apply(time);
+        animator=a;
+        if(at>0)a.setCurrentPlayTime(at);
+        a.start();
     }
     private void apply(double elapsed){
         double t=Math.max(0,elapsed-delay), fraction;

package/platforms/android/proguard-rules.pro

@@ -1,4 +1,5 @@
 -keep class org.rafaelaugusto.jolt.ColorTarget { *; }
+-keep class org.rafaelaugusto.jolt.KeyframeFactory { *; }
 -keep class org.rafaelaugusto.jolt.CircleWorld { *; }
 -keep class org.rafaelaugusto.jolt.CircleWorld$* { *; }
 -keep class org.rafaelaugusto.jolt.MotionProbe { *; }

package/platforms/ios/src/JoltInteractiveModal.h

@@ -0,0 +1,16 @@
+#import <UIKit/UIKit.h>
+NS_ASSUME_NONNULL_BEGIN
+
+/** Animator supplied through Core's modal transition delegate. No delegate replacement. */
+@interface JoltInteractiveModal : NSObject <UIViewControllerAnimatedTransitioning, UIViewControllerInteractiveTransitioning, UIGestureRecognizerDelegate>
++ (instancetype)attach:(UIViewController *)controller stiffness:(double)stiffness damping:(double)damping mass:(double)mass shouldBegin:(BOOL (^)(void))shouldBegin onEvent:(void (^)(NSInteger))onEvent;
++ (NSUInteger)activeCount;
++ (NSUInteger)recognizerCount;
+@property(nonatomic, readonly) BOOL interactive;
+@property(nonatomic, readonly) double progress;
+@property(nonatomic, readonly) double velocity;
+- (void)preparePresenting:(BOOL)presenting reduced:(BOOL)reduced timeScale:(double)timeScale;
+- (void)cancel;
+- (void)dispose;
+@end
+NS_ASSUME_NONNULL_END

package/platforms/ios/src/JoltInteractiveModal.m

@@ -0,0 +1,178 @@
+#import "JoltInteractiveModal.h"
+#import "JoltSpringState.h"
+
+@interface JoltInteractiveModal () {
+    JoltSpringState _spring;
+}
+@property(nonatomic, weak) UIViewController *controller;
+@property(nonatomic) UIPanGestureRecognizer *pan;
+@property(nonatomic, copy) BOOL (^shouldBegin)(void);
+@property(nonatomic, copy) void (^onEvent)(NSInteger);
+@property(nonatomic) id<UIViewControllerContextTransitioning> context;
+@property(nonatomic) UIView *moving;
+@property(nonatomic) CGAffineTransform originalTransform;
+@property(nonatomic) CGRect bounds;
+@property(nonatomic) CADisplayLink *link;
+@property(nonatomic) double stiffness, damping, mass, previous, started, target, timeScale;
+@property(nonatomic) NSNumber *pendingEnd;
+@property(nonatomic, readwrite) BOOL interactive;
+@property(nonatomic) BOOL presenting, reduced, settling, committed, disposed;
+@end
+
+@implementation JoltInteractiveModal
+static NSUInteger active = 0, recognizers = 0;
++ (NSUInteger)activeCount { return active; }
++ (NSUInteger)recognizerCount { return recognizers; }
++ (instancetype)attach:(UIViewController *)controller stiffness:(double)stiffness damping:(double)damping mass:(double)mass shouldBegin:(BOOL (^)(void))shouldBegin onEvent:(void (^)(NSInteger))onEvent {
+    JoltInteractiveModal *owner = [self new];
+    owner.controller = controller;
+    owner.stiffness = stiffness; owner.damping = damping; owner.mass = mass;
+    owner.timeScale = 1;
+    owner.shouldBegin = shouldBegin; owner.onEvent = onEvent;
+    owner.pan = [[UIPanGestureRecognizer alloc] initWithTarget:owner action:@selector(pan:)];
+    owner.pan.maximumNumberOfTouches = 1;
+    owner.pan.delegate = owner;
+    [controller.view addGestureRecognizer:owner.pan]; recognizers++;
+    [[NSNotificationCenter defaultCenter] addObserver:owner selector:@selector(cancel) name:UIApplicationWillResignActiveNotification object:nil];
+    return owner;
+}
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)recognizer shouldReceiveTouch:(UITouch *)touch {
+    // Scrolling content and native controls keep their own interaction. A modal
+    // can expose an ordinary, non-scrolling header as its dismissal surface.
+    for (UIView *view = touch.view; view; view = view.superview) {
+        if ([view isKindOfClass:UIControl.class] || [view isKindOfClass:UIScrollView.class]) return NO;
+        if (view == self.controller.view) break;
+    }
+    return YES;
+}
+- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)recognizer {
+    UIViewController *controller = self.controller;
+    CGPoint velocity = [self.pan velocityInView:controller.view];
+    return !self.disposed && !self.context && controller.presentingViewController &&
+        !controller.presentedViewController && !controller.transitionCoordinator && !controller.modalInPresentation &&
+        velocity.y > fabs(velocity.x) && self.shouldBegin && self.shouldBegin();
+}
+- (void)preparePresenting:(BOOL)presenting reduced:(BOOL)reduced timeScale:(double)timeScale {
+    self.presenting = presenting; self.reduced = reduced; self.timeScale = timeScale;
+}
+- (void)pan:(UIPanGestureRecognizer *)pan {
+    if (pan.state == UIGestureRecognizerStateBegan) {
+        self.pendingEnd = nil; self.interactive = YES;
+        _spring = (JoltSpringState){0, 0};
+        if (self.onEvent) self.onEvent(2);
+    }
+    if (!self.interactive || self.settling) return;
+    double height = MAX(1, self.context ? self.bounds.size.height : self.controller.view.bounds.size.height);
+    double progress = MAX(0, MIN(1, [pan translationInView:self.controller.view].y / height));
+    double velocity = [pan velocityInView:self.controller.view].y / height;
+    _spring = (JoltSpringState){progress, velocity};
+    if (self.context) { [self render:progress]; [self.context updateInteractiveTransition:progress]; }
+    if (pan.state == UIGestureRecognizerStateEnded || pan.state == UIGestureRecognizerStateCancelled || pan.state == UIGestureRecognizerStateFailed) {
+        BOOL finish = pan.state == UIGestureRecognizerStateEnded && progress + velocity * .16 > .5;
+        if (self.context) [self settle:finish velocity:velocity];
+        else self.pendingEnd = @(finish);
+    }
+}
+- (NSTimeInterval)transitionDuration:(id<UIViewControllerContextTransitioning>)context { return self.reduced ? 0 : .55; }
+- (BOOL)wantsInteractiveStart { return self.interactive; }
+- (CGFloat)completionSpeed { return 1; }
+- (UIViewAnimationCurve)completionCurve { return UIViewAnimationCurveLinear; }
+- (double)progress { return _spring.position; }
+- (double)velocity { return _spring.velocity; }
+- (void)prepare:(id<UIViewControllerContextTransitioning>)context {
+    self.context = context; active++;
+    UIViewController *controller = [context viewControllerForKey:self.presenting ? UITransitionContextToViewControllerKey : UITransitionContextFromViewControllerKey];
+    self.moving = [context viewForKey:self.presenting ? UITransitionContextToViewKey : UITransitionContextFromViewKey] ?: controller.view;
+    self.originalTransform = self.moving.transform;
+    if (self.presenting) {
+        self.moving.frame = [context finalFrameForViewController:controller];
+        [context.containerView addSubview:self.moving];
+    }
+    [self.moving setNeedsLayout]; [self.moving layoutIfNeeded];
+    self.bounds = context.containerView.bounds;
+    _spring = (JoltSpringState){0, 0};
+    [self render:0];
+}
+- (void)startInteractiveTransition:(id<UIViewControllerContextTransitioning>)context {
+    JoltSpringState held = _spring;
+    [self prepare:context]; _spring = held;
+    [self render:_spring.position]; [context updateInteractiveTransition:_spring.position];
+    [self startLink];
+    if (self.pendingEnd || self.disposed) {
+        [self settle:!self.disposed && self.pendingEnd.boolValue velocity:_spring.velocity];
+        self.pendingEnd = nil;
+    }
+}
+- (void)animateTransition:(id<UIViewControllerContextTransitioning>)context {
+    [self prepare:context];
+    if (self.onEvent) self.onEvent(0);
+    [self settle:YES velocity:0];
+}
+- (void)render:(double)progress {
+    double p = MAX(0, MIN(1, progress));
+    double translation = self.bounds.size.height * (self.presenting ? 1 - p : p);
+    [CATransaction begin]; [CATransaction setDisableActions:YES];
+    self.moving.transform = CGAffineTransformConcat(self.originalTransform, CGAffineTransformMakeTranslation(0, translation));
+    [CATransaction commit];
+}
+- (void)startLink {
+    if (self.link || !self.context) return;
+    self.previous = CACurrentMediaTime();
+    self.link = [CADisplayLink displayLinkWithTarget:self selector:@selector(tick:)];
+    if (@available(iOS 15.0, *)) {
+        float maximum = MIN(120, UIScreen.mainScreen.maximumFramesPerSecond);
+        self.link.preferredFrameRateRange = CAFrameRateRangeMake(MIN(80, maximum), maximum, maximum);
+    }
+    [self.link addToRunLoop:NSRunLoop.mainRunLoop forMode:NSRunLoopCommonModes];
+}
+- (void)settle:(BOOL)finish velocity:(double)velocity {
+    if (!self.context || self.settling) return;
+    self.committed = finish; self.settling = YES; self.target = finish ? 1 : 0;
+    _spring.velocity = velocity;
+    if (self.interactive) {
+        // Core must know cancellation BEFORE UIKit executes dismissal completion.
+        if (self.onEvent) self.onEvent(finish ? 3 : 4);
+        if (!self.context) return;
+        if (finish) [self.context finishInteractiveTransition]; else [self.context cancelInteractiveTransition];
+    }
+    self.started = CACurrentMediaTime(); self.previous = self.started;
+    if (self.reduced || self.disposed) { [self finish]; return; }
+    [self startLink];
+}
+- (void)tick:(CADisplayLink *)link {
+    if (!CGRectEqualToRect(self.bounds, self.context.containerView.bounds) || !self.context.containerView.window) { [self cancel]; return; }
+    if (!self.settling) return;
+    double now = CACurrentMediaTime(), seconds = MAX(0, now - self.previous); self.previous = now;
+    _spring = JoltSpringAdvance(_spring, self.target, self.stiffness*self.timeScale*self.timeScale, self.damping*self.timeScale, self.mass, seconds);
+    if (!isfinite(_spring.position) || !isfinite(_spring.velocity)) { [self finish]; return; }
+    [self render:_spring.position];
+    if ((fabs(_spring.position-self.target)<.0005 && fabs(_spring.velocity)<.005) || now-self.started>=3) [self finish];
+}
+- (void)finish {
+    if (!self.context) return;
+    [self.link invalidate]; self.link = nil;
+    BOOL completed = self.committed, presenting = self.presenting;
+    _spring = (JoltSpringState){completed ? 1 : 0, 0}; [self render:_spring.position];
+    self.moving.transform = self.originalTransform;
+    id<UIViewControllerContextTransitioning> context = self.context;
+    self.context = nil; self.moving = nil; self.settling = NO; self.interactive = NO; active--;
+    [context completeTransition:completed];
+    if (self.onEvent) self.onEvent(presenting ? 1 : completed ? 5 : 6);
+}
+- (void)cancel {
+    if (!self.context) { if (self.interactive) self.pendingEnd = @NO; return; }
+    if (!self.settling) [self settle:!self.interactive velocity:0];
+    [self finish];
+}
+- (void)dispose {
+    if (self.disposed) return;
+    self.disposed = YES;
+    [self cancel];
+    [self.pan.view removeGestureRecognizer:self.pan];
+    self.pan.delegate = nil;
+    if (self.pan) recognizers--;
+    self.pan = nil;
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    self.shouldBegin = nil; self.onEvent = nil;
+}
+@end

package/platforms/ios/src/JoltLiveSpring.h

@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)sync:(UIView *)view;
 - (void)follow:(JoltLiveSpring *)source mappings:(NSString *)mappings;
 - (void)updateInput:(NSString *)snapshot;
+- (void)setInputs:(NSString *)snapshots rest:(double)rest;
 - (void)setSensorInput:(double)value;
 - (void)setTarget:(double)value;
 - (void)holdInput:(double)value velocity:(double)velocity;