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

package/platforms/ios/src/JoltCircleWorld.m

@@ -9,7 +9,7 @@
     double initialX[16],initialY[16],initialVX[16],initialVY[16],originalX[16],originalY[16];
 }
 @property(nonatomic) UIView *container;
-@property(nonatomic) NSMutableArray *views,*pans,*guides;
+@property(nonatomic) NSMutableArray *views,*pans,*guides,*pointerGuides;
 @property(nonatomic) CADisplayLink *link;
 @property(nonatomic) BOOL enabled,disposed,background,fits;
 @property(nonatomic) double previous,accumulator,processingMs,droppedMs,offsetX,offsetY;
@@ -18,6 +18,7 @@
 - (void)refresh;
 - (void)apply;
 - (void)cancelDrag;
+- (id)makeGuide:(id)line;
 - (void)configureAttachment:(id)value index:(int)index;
 @end
 
@@ -30,7 +31,7 @@ static NSMutableSet<JoltCircleWorld *> *worlds;
     NSDictionary *config=[NSJSONSerialization JSONObjectWithData:[options dataUsingEncoding:NSUTF8StringEncoding] options:0 error:nil];
     NSArray *bodies=config[@"bodies"];
     if(bodies.count<1||bodies.count>16)[NSException raise:NSInvalidArgumentException format:@"Physics needs 1–16 circles"];
-    JoltCircleWorld *w=[self new];w.container=container;w.views=[NSMutableArray new];w.pans=[NSMutableArray new];w.guides=[NSMutableArray new];w.dragging=-1;
+    JoltCircleWorld *w=[self new];w.container=container;w.views=[NSMutableArray new];w.pans=[NSMutableArray new];w.guides=[NSMutableArray new];w.pointerGuides=[NSMutableArray new];w.dragging=-1;
     w->state.count=(int)bodies.count;w->state.width=[config[@"width"] doubleValue];w->state.height=[config[@"height"] doubleValue];
     w->state.gx=[config[@"gravity"][@"x"] doubleValue];w->state.gy=[config[@"gravity"][@"y"] doubleValue];
     w->state.restitution=[config[@"restitution"] doubleValue];w->state.damping=[config[@"damping"] doubleValue];
@@ -39,8 +40,13 @@ static NSMutableSet<JoltCircleWorld *> *worlds;
         b->x=[v[@"x"] doubleValue];b->y=[v[@"y"] doubleValue];b->r=[v[@"radius"] doubleValue];b->m=[v[@"mass"] doubleValue];
         b->vx=[v[@"vx"] doubleValue];b->vy=[v[@"vy"] doubleValue];
         w->initialX[i]=b->x/w->state.width;w->initialY[i]=b->y/w->state.height;w->initialVX[i]=b->vx;w->initialVY[i]=b->vy;
-        [w.views addObject:NSNull.null];[w.pans addObject:NSNull.null];[w.guides addObject:NSNull.null];
+        [w.views addObject:NSNull.null];[w.pans addObject:NSNull.null];[w.guides addObject:NSNull.null];[w.pointerGuides addObject:NSNull.null];
         [w configureAttachment:v[@"attachment"] index:i];
+        id drag=v[@"drag"];
+        if([drag isKindOfClass:NSDictionary.class]){
+            b->drag.enabled=true;b->drag.length=[drag[@"length"] doubleValue];b->drag.stiffness=[drag[@"stiffness"] doubleValue];b->drag.damping=[drag[@"damping"] doubleValue];
+            w.pointerGuides[i]=[w makeGuide:drag[@"line"]];
+        }
         id snap=v[@"snap"];
         if([snap isKindOfClass:NSDictionary.class]){
             NSArray *points=snap[@"points"];if(points.count>JOLT_CIRCLE_SNAP_LIMIT)[NSException raise:NSInvalidArgumentException format:@"Too many snap points"];
@@ -60,13 +66,17 @@ static NSMutableSet<JoltCircleWorld *> *worlds;
     else JoltCircleAttach(&state,index,false,0,0,0,180,24);
     if(self.guides[index]!=NSNull.null){[(CALayer *)self.guides[index] removeFromSuperlayer];self.guides[index]=NSNull.null;}
     id line=active?value[@"line"]:nil;
-    if([line isKindOfClass:NSDictionary.class]){
-        CAShapeLayer *guide=[CAShapeLayer layer];unsigned int color=[line[@"color"] unsignedIntValue];
-        guide.strokeColor=[UIColor colorWithRed:((color>>16)&255)/255.0 green:((color>>8)&255)/255.0 blue:(color&255)/255.0 alpha:1].CGColor;
-        guide.fillColor=nil;guide.contentsScale=UIScreen.mainScreen.scale;guide.lineWidth=[line[@"width"] doubleValue];guide.lineCap=kCALineCapRound;
-        [self.container.layer addSublayer:guide];self.guides[index]=guide;
-    }
+    self.guides[index]=[self makeGuide:line];
 }
+- (id)makeGuide:(id)line {
+    if(![line isKindOfClass:NSDictionary.class])return NSNull.null;
+    CAShapeLayer *guide=[CAShapeLayer layer];unsigned int color=[line[@"color"] unsignedIntValue];
+    guide.strokeColor=[UIColor colorWithRed:((color>>16)&255)/255.0 green:((color>>8)&255)/255.0 blue:(color&255)/255.0 alpha:1].CGColor;
+    guide.fillColor=nil;guide.contentsScale=UIScreen.mainScreen.scale;guide.lineWidth=[line[@"width"] doubleValue];guide.lineCap=kCALineCapRound;
+    [self.container.layer addSublayer:guide];return guide;
+}
+- (BOOL)supportsPointerSpring {return YES;}
+
 - (void)attach:(NSInteger)index options:(NSString *)options {
     if(self.disposed||index<0||index>=state.count)return;
     id value=[NSJSONSerialization JSONObjectWithData:[options dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingFragmentsAllowed error:nil];
@@ -110,13 +120,17 @@ static NSMutableSet<JoltCircleWorld *> *worlds;
         [v.layer setValue:@(state.bodies[i].x-v.layer.position.x) forKeyPath:@"transform.translation.x"];
         [v.layer setValue:@(state.bodies[i].y-v.layer.position.y) forKeyPath:@"transform.translation.y"];
     }
-    for(int i=0;i<state.count;i++)if(self.guides[i]!=NSNull.null){
-        JoltCircle *b=&state.bodies[i];CAShapeLayer *guide=self.guides[i];
-        double x=b->snap.active?JoltCircleSnapX(&state,b,b->snap.index):b->attachment.u*state.width;
-        double y=b->snap.active?JoltCircleSnapY(&state,b,b->snap.index):b->attachment.v*state.height;
+    for(int i=0;i<state.count;i++)for(int kind=0;kind<2;kind++){
+        id candidate=(kind?self.pointerGuides:self.guides)[i];if(candidate==NSNull.null)continue;
+        JoltCircle *b=&state.bodies[i];CAShapeLayer *guide=candidate;
+        BOOL pointer=b->held&&b->drag.enabled;
+        guide.hidden=pointer!=(kind==1);if(guide.hidden)continue;
+        double x=pointer?b->tx:b->snap.active?JoltCircleSnapX(&state,b,b->snap.index):b->attachment.u*state.width;
+        double y=pointer?b->ty:b->snap.active?JoltCircleSnapY(&state,b,b->snap.index):b->attachment.v*state.height;
         double dx=b->x-x,dy=b->y-y,d=hypot(dx,dy);
         UIBezierPath *path=[UIBezierPath bezierPath];
-        if(d>b->r){[path moveToPoint:CGPointMake(x,y)];[path addLineToPoint:CGPointMake(b->x-dx/d*b->r,b->y-dy/d*b->r)];[path appendPath:[UIBezierPath bezierPathWithOvalInRect:CGRectMake(x-2.5,y-2.5,5,5)]];}
+        if(d>b->r){[path moveToPoint:CGPointMake(x,y)];[path addLineToPoint:CGPointMake(b->x-dx/d*b->r,b->y-dy/d*b->r)];}
+        if(pointer||d>b->r)[path appendPath:[UIBezierPath bezierPathWithOvalInRect:CGRectMake(x-2.5,y-2.5,5,5)]];
         guide.path=path.CGPath;
     }
     [CATransaction commit];
@@ -176,14 +190,15 @@ static NSMutableSet<JoltCircleWorld *> *worlds;
 - (NSString *)snapshot {
     NSMutableArray *bodies=[NSMutableArray new];
     NSUInteger guideCount=0;
-    for(id guide in self.guides)if(guide!=NSNull.null)guideCount++;
+    for(NSArray *list in @[self.guides,self.pointerGuides])for(id guide in list)if(guide!=NSNull.null)guideCount++;
     for(int i=0;i<state.count;i++){
         JoltCircle *b=&state.bodies[i];
         id attachment=b->attachment.enabled?@{@"anchor":@{@"x":@(b->attachment.u*state.width),@"y":@(b->attachment.v*state.height)},@"length":@(b->attachment.length),@"stiffness":@(b->attachment.stiffness),@"damping":@(b->attachment.damping)}:NSNull.null;
         id snap=NSNull.null;
         if(b->snap.active){double x=JoltCircleSnapX(&state,b,b->snap.index),y=JoltCircleSnapY(&state,b,b->snap.index);snap=@{@"index":@(b->snap.index),@"point":@{@"x":@(x),@"y":@(y)},@"settled":[NSNumber numberWithBool:hypot(b->x-x,b->y-y)<=.25&&hypot(b->vx,b->vy)<=4&&!b->held]};}
+        id pointer=b->held&&b->drag.enabled?@{@"anchor":@{@"x":@(b->tx),@"y":@(b->ty)},@"length":@(b->drag.length),@"stiffness":@(b->drag.stiffness),@"damping":@(b->drag.damping)}:NSNull.null;
         id release=b->released?@{@"x":@(b->releaseX),@"y":@(b->releaseY),@"vx":@(b->releaseVX),@"vy":@(b->releaseVY)}:NSNull.null;
-        [bodies addObject:@{@"x":@(b->x),@"y":@(b->y),@"vx":@(b->vx),@"vy":@(b->vy),@"radius":@(b->r),@"held":@(b->held),@"attachment":attachment,@"snap":snap,@"release":release}];
+        [bodies addObject:@{@"x":@(b->x),@"y":@(b->y),@"vx":@(b->vx),@"vy":@(b->vy),@"radius":@(b->r),@"held":@(b->held),@"attachment":attachment,@"pointer":pointer,@"snap":snap,@"release":release}];
     }
     NSString *status=self.disposed?@"disposed":!self.enabled?@"paused":self.background||!self.container.window?@"detached":!self.fits?@"invalid-bounds":state.sleeping?@"sleeping":@"running";
     NSDictionary *data=@{@"status":status,@"guides":@(guideCount),@"bodies":bodies,@"frames":@(self.frames),@"steps":@(state.steps),@"contacts":@(state.contacts),@"dragStarts":@(self.dragStarts),@"dragMoves":@(self.dragMoves),@"dragEnds":@(self.dragEnds),@"dragCancels":@(self.dragCancels),@"processingMs":@(self.processingMs),@"droppedMs":@(self.droppedMs),@"clock":[NSNumber numberWithBool:self.link!=nil]};
@@ -197,7 +212,7 @@ static NSMutableSet<JoltCircleWorld *> *worlds;
         UIView *v=self.views[i];v.userInteractionEnabled=originalInteraction[i];if(self.pans[i]!=NSNull.null)[v removeGestureRecognizer:self.pans[i]];
         [v.layer setValue:@(originalX[i]) forKeyPath:@"transform.translation.x"];[v.layer setValue:@(originalY[i]) forKeyPath:@"transform.translation.y"];
     }
-    for(id guide in self.guides)if(guide!=NSNull.null)[guide removeFromSuperlayer];[self.guides removeAllObjects];
+    for(NSMutableArray *list in @[self.guides,self.pointerGuides]){for(id guide in list)if(guide!=NSNull.null)[guide removeFromSuperlayer];[list removeAllObjects];}
     [CATransaction commit];[self.views removeAllObjects];[self.pans removeAllObjects];self.container=nil;[worlds removeObject:self];
 }
 @end

package/platforms/ios/src/JoltScrollHeader.m

@@ -21,6 +21,7 @@
 @property(nonatomic,copy) void (^onState)(void);
 @property(nonatomic) BOOL observing, disposed, titleHidden, toolbarTitleHidden, toolbarTouch;
 @property(nonatomic) double handoff, minimumOffset, maximumOffset, range, spacer, rowHeight, offset;
+@property(nonatomic) CGFloat estimatedSectionHeaderHeight, estimatedSectionFooterHeight;
 @property(nonatomic) NSInteger phase, updates, callbacks;
 @end
 static NSInteger JoltScrollHeaderActive = 0;
@@ -32,6 +33,11 @@ static void *JoltScrollHeaderContext = &JoltScrollHeaderContext;
     JoltScrollHeader *owner=[self new];owner.list=list;owner.node=node;owner.title=title;owner.toolbarTitle=toolbarTitle;owner.toolbar=toolbar;owner.diagnostic=diagnostic;owner.onState=onState;
     owner.titleHidden=title.accessibilityElementsHidden;owner.toolbarTitleHidden=toolbarTitle.accessibilityElementsHidden;owner.toolbarTouch=toolbar.userInteractionEnabled;owner.phase=-1;owner.offset=NAN;
     owner.proxy=[JoltScrollHeaderDelegate new];owner.proxy.forwarded=list.delegate;
+    // Flat lists have no section headers/footers. UIKit's automatic estimates
+    // otherwise adjust the scroll anchor during width/safe-area changes.
+    owner.estimatedSectionHeaderHeight=list.estimatedSectionHeaderHeight;
+    owner.estimatedSectionFooterHeight=list.estimatedSectionFooterHeight;
+    list.estimatedSectionHeaderHeight=0;list.estimatedSectionFooterHeight=0;
     [owner configure:options];list.delegate=owner.proxy;[list reloadData];[list layoutIfNeeded];[owner setEnabled:YES];return owner;
 }
 - (void)configure:(NSString *)options {
@@ -88,6 +94,8 @@ static void *JoltScrollHeaderContext = &JoltScrollHeaderContext;
     if(self.disposed)return;[self setEnabled:NO];self.disposed=YES;
     self.title.accessibilityElementsHidden=self.titleHidden;self.toolbarTitle.accessibilityElementsHidden=self.toolbarTitleHidden;self.toolbar.userInteractionEnabled=self.toolbarTouch;
     if(self.list.delegate==self.proxy)self.list.delegate=self.proxy.forwarded;
+    if(self.list.estimatedSectionHeaderHeight==0)self.list.estimatedSectionHeaderHeight=self.estimatedSectionHeaderHeight;
+    if(self.list.estimatedSectionFooterHeight==0)self.list.estimatedSectionFooterHeight=self.estimatedSectionFooterHeight;
     self.proxy=nil;self.node=nil;self.onState=nil;
 }
 @end

package/src/android-plugin.d.ts

@@ -585,6 +585,7 @@ declare namespace org.rafaelaugusto.jolt {
     attach(index: number, options: string): void
     snapTo(index: number, target: number): void
     reset(): void
+    supportsPointerSpring(): boolean
     snapshot(): string
     dispose(): void
   }

package/src/interactive-navigation/index.ts

@@ -100,6 +100,8 @@ export function interactiveNavigation(
   let detachTarget: (() => void) | undefined
   let resolvedReturn: import('@nativescript/core').View | undefined
   let returning = false
+  let suspended = false
+  let resumeTimer: ReturnType<typeof setTimeout> | undefined
   const originalPage = frame.currentPage
   function prepareShared() {
     if (!native || !options.shared) return
@@ -210,7 +212,17 @@ export function interactiveNavigation(
     targetScope?.abort()
     native?.cancel()
   }
-  const unload = () => control.dispose()
+  const suspend = () => {
+    suspended = true
+    if (resumeTimer !== undefined) clearTimeout(resumeTimer)
+    resumeTimer = undefined
+    cancel()
+  }
+  const unload = () => {
+    // Core unloads the root view in the background, without removing its routes.
+    if (suspended) cancel()
+    else control.dispose()
+  }
   const shown = () => native?.sync()
   const swipeChanged = () => {
     void Promise.resolve().then(shown)
@@ -226,6 +238,17 @@ export function interactiveNavigation(
       void Promise.resolve().then(() => control.dispose())
     else shown()
   }
+  const resume = () => {
+    suspended = false
+    // Core raises resume before reloading the root. A macrotask lets that load
+    // finish, including when native callbacks drain JS microtasks in between.
+    if (resumeTimer !== undefined) clearTimeout(resumeTimer)
+    resumeTimer = setTimeout(() => {
+      resumeTimer = undefined
+      if (frame.isLoaded) arrived()
+      else control.dispose()
+    }, 0)
+  }
   const entering = (args: EventData) => {
     const event = args as NavigationData
     if (!page && !event.isBack) candidate = event.entry?.resolvedPage
@@ -268,6 +291,8 @@ export function interactiveNavigation(
             try {
               return (
                 state === 'idle' &&
+                !suspended &&
+                frame.isLoaded &&
                 !!start &&
                 !reducedMotion() &&
                 !!page &&
@@ -365,11 +390,14 @@ export function interactiveNavigation(
       native = undefined
       emit('disposed')
       releaseMotion?.()
+      if (resumeTimer !== undefined) clearTimeout(resumeTimer)
+      resumeTimer = undefined
       frame.off('unloaded', unload)
       frame.off('navigatingTo', entering)
       frame.off('navigatedTo', arrived)
       frame.off('viewControllerShown', shown)
-      Application.off(Application.suspendEvent, cancel)
+      Application.off(Application.suspendEvent, suspend)
+      Application.off(Application.resumeEvent, resume)
       if (transition?.instance) SharedTransition.finishState(transition.instance.id)
       page?.off('enableSwipeBackNavigationChange', swipeChanged)
       start = undefined
@@ -389,7 +417,8 @@ export function interactiveNavigation(
     frame.on('navigatedTo', arrived)
     frame.on('viewControllerShown', shown)
     frame.on('unloaded', unload)
-    Application.on(Application.suspendEvent, cancel)
+    Application.on(Application.suspendEvent, suspend)
+    Application.on(Application.resumeEvent, resume)
     releaseMotion = onReducedMotion((value) => {
       if (value) cancel()
     })

package/src/ios-plugin.d.ts

@@ -355,6 +355,7 @@ declare class JoltCircleWorld extends NSObject {
   attachOptions(index: number, options: string): void
   snapToTarget(index: number, target: number): void
   reset(): void
+  supportsPointerSpring(): boolean
   snapshot(): string
   dispose(): void
 }

package/src/mixer.ts

@@ -279,11 +279,17 @@ export class Mix {
       velocityAt: (elapsed) => (at(elapsed + 0.5) - at(elapsed - 0.5)) * 1000,
     }
     writeValue(this.view, this.property, track.to)
-    this.native = driver.play(this.view, track, now, (finished = true) => {
+    const native = driver.play(this.view, track, now, (finished = true) => {
       if (instance !== this.generation || !finished) return
       this.native = undefined
       this.compose()
     })
+    if (instance !== this.generation) return
+    this.native = native
+    // Building native keyframes can take time. Join the current composition
+    // phase after construction, including when a rolling window is replaced.
+    const elapsed = driver.now() - now
+    if (elapsed > 1) driver.control?.(this.view, native, elapsed, false)
   }
 
   private dissolve() {

package/src/physics/index.ts

@@ -29,6 +29,17 @@ export interface PhysicsSnap {
   /** Seconds of release-velocity projection for choosing a point, 0–.3; default .12. */
   projection?: number
 }
+export interface PhysicsSpringDrag {
+  type: 'spring'
+  /** Temporary pointer spring rest length in DIPs, 0–10000; default 0. */
+  length?: number
+  /** Spring force per DIP, 1–1000; default 180. */
+  stiffness?: number
+  /** Viscous damping, 0–120; default 24. */
+  damping?: number
+  /** Optional native tether, visible only during the gesture. */
+  line?: { color: string; width?: number }
+}
 export interface CircleBody {
   id: string
   /** A dedicated, square direct child of the container, sized to radius * 2. */
@@ -42,6 +53,8 @@ export interface CircleBody {
   velocity?: PhysicsVector
   attachment?: PhysicsAttachment
   snap?: PhysicsSnap
+  /** Direct dragging by default. A spring drag keeps the body dynamic during contact. */
+  drag?: 'direct' | PhysicsSpringDrag
 }
 export interface PhysicsOptions {
   /** DIPs/s². Defaults to { x: 0, y: 750 }. */
@@ -63,6 +76,13 @@ export interface PhysicsSnapshot {
     vy: number
     radius: number
     held: boolean
+    /** Temporary center target: pointer plus the initial center-to-contact offset, in local DIPs. */
+    pointer: {
+      anchor: PhysicsVector
+      length: number
+      stiffness: number
+      damping: number
+    } | null
     /** Last native release, before snap selection or subsequent integration. */
     release: { x: number; y: number; vx: number; vy: number } | null
     attachment: {
@@ -183,6 +203,18 @@ function prepareSnap(
     projection: number(value.projection ?? 0.12, 'snap.projection', 0, 0.3),
   }
 }
+function prepareDrag(value: CircleBody['drag'], width: number, height: number) {
+  if (value === undefined || value === 'direct') return null
+  if (!value || typeof value !== 'object' || value.type !== 'spring')
+    throw new TypeError('Expected direct dragging or a spring drag configuration.')
+  // Share the validated spring ranges and line style; the pointer supplies the anchor natively.
+  const {
+    x: _x,
+    y: _y,
+    ...spring
+  } = prepareAttachment({ ...value, anchor: { x: 0, y: 0 } }, width, height)!
+  return spring
+}
 function untransformed(view: View) {
   return (
     (view.translateX ?? 0) === 0 &&
@@ -264,6 +296,7 @@ export function physicsWorld(
       vy: velocity.y,
       attachment: prepareAttachment(body.attachment ?? null, width, height),
       snap: prepareSnap(body.snap, width, height, radius),
+      drag: prepareDrag(body.drag, width, height),
     }
   })
   if (!host.isLoaded || !host.nativeViewProtected)

package/src/physics/native.ts

@@ -34,6 +34,7 @@ interface Configuration {
     vx: number
     vy: number
     attachment: NativeAttachment | null
+    drag: Omit<NativeAttachment, 'x' | 'y'> | null
     snap: {
       points: PhysicsVector[]
       stiffness: number
@@ -64,6 +65,11 @@ export const createCircleDriver: CircleFactory = (container, views, options) =>
     try {
       if (typeof native.attachOptions !== 'function')
         throw new Error('Rebuild the native app to use physics attachments.')
+      if (
+        options.bodies.some((b) => b.drag) &&
+        typeof native.supportsPointerSpring !== 'function'
+      )
+        throw new Error('Rebuild the native app to use spring dragging.')
       views.forEach((v, i) => native.connectIndex(v.nativeViewProtected, i))
     } catch (e) {
       native.dispose()
@@ -92,6 +98,11 @@ export const createCircleDriver: CircleFactory = (container, views, options) =>
   try {
     if (typeof native.attach !== 'function')
       throw new Error('Rebuild the native app to use physics attachments.')
+    if (
+      options.bodies.some((b) => b.drag) &&
+      typeof native.supportsPointerSpring !== 'function'
+    )
+      throw new Error('Rebuild the native app to use spring dragging.')
     views.forEach((v, i) => native.connect(v.nativeViewProtected, i))
   } catch (e) {
     native.dispose()

package/src/press.ts

@@ -1,6 +1,7 @@
 import { Color, type EventData, type TouchGestureEventData } from '@nativescript/core'
 import { isColorProperty } from './color.js'
-import { animate, startingValues, toView } from './animate.js'
+import { animate, startingValues, stop, toView } from './animate.js'
+import { identity } from './mixer.js'
 import type { PlaybackAnimation } from './playback.js'
 import { readValue } from './properties.js'
 import type { SpringName, Transition } from './transition.js'
@@ -25,6 +26,7 @@ export function press(
 ): () => void {
   const view = toView(target)
   const properties = [...startingValues(pressed, options).keys()]
+  const layer = typeof options === 'object' ? options.layer : undefined
   let rest: Keyframes | undefined
   let active: PlaybackAnimation | undefined
 
@@ -34,7 +36,11 @@ export function press(
       rest = Object.fromEntries(
         properties.map((p) => [
           p,
-          isColorProperty(p) ? new Color(readValue(view, p)) : readValue(view, p),
+          layer !== undefined
+            ? identity(p)
+            : isColorProperty(p)
+              ? new Color(readValue(view, p))
+              : readValue(view, p),
         ]),
       )
       active = animate(view, pressed, options ?? pressIn)
@@ -52,6 +58,8 @@ export function press(
 
   const cancel = () => {
     active?.stop()
+    // A completed press still holds its layer contribution until it is removed.
+    if (layer !== undefined) stop(view, properties, { layer })
     active = undefined
     rest = undefined
   }

package/src/scroll-header/index.ts

@@ -152,17 +152,20 @@ export function scrollHeader(list: ListView, options: ScrollHeaderOptions): Scro
     native: ScrollHeaderDriver | undefined,
     value: SpringValue | undefined
   let ended = false,
+    ready = false,
     held = false,
     background = false,
     queued = false,
+    invalidated = false,
     revision = 0
   let measuring: Promise<void> | undefined,
+    restoringOffset: number | undefined,
     operation = false
   let detachBindings: (() => void)[] = [],
     pending = new Set<() => void>(),
     last = initialState()
   const notify = () => {
-    if (ended) return
+    if (ended || !ready) return
     last = native?.snapshot() ?? last
     try {
       options.onState?.(last)
@@ -304,16 +307,18 @@ export function scrollHeader(list: ListView, options: ScrollHeaderOptions): Scro
       options.titleFade,
       options.toolbarFade,
     )
-    if (geometry && JSON.stringify(next) === JSON.stringify(geometry) && native) return
+    if (ready && geometry && JSON.stringify(next) === JSON.stringify(geometry) && native)
+      return
     const before = geometry,
       offset = native?.snapshot().offset ?? (last.updates ? last.offset : undefined)
-    geometry = next
+    ready = false
     native?.enabled(false)
     try {
       native?.configure(next, reducedMotion())
       options.setSpacerHeight(next.spacer)
       await layout(list)
       if (ended || generation !== revision) return
+      geometry = next
       value ??= springValue(motionValue(0), { duration: 0 })
       maps()
       if (!native)
@@ -327,20 +332,32 @@ export function scrollHeader(list: ListView, options: ScrollHeaderOptions): Scro
             void Promise.resolve().then(notify)
           },
         )
-      if (offset !== undefined)
-        native.scroll(before ? resizedOffset(offset, before, next) : offset, false)
+      if (offset !== undefined) {
+        restoringOffset = before ? resizedOffset(offset, before, next) : offset
+        native.scroll(restoringOffset, false)
+        await layout(list)
+        if (ended || generation !== revision) return
+      }
       native.enabled(!held && !background)
+      ready = true
       notify()
     } finally {
+      restoringOffset = undefined
       native?.enabled(!held && !background)
     }
   }
   const queueMeasure = () => {
-    if (ended || queued || measuring || operation) return
+    if (ended) return
+    if (measuring || operation) {
+      invalidated = true
+      return
+    }
+    if (queued) return
     queued = true
     void Promise.resolve()
       .then(() => {
         queued = false
+        invalidated = false
         return control.remeasure()
       })
       .catch((error) => {
@@ -350,8 +367,10 @@ export function scrollHeader(list: ListView, options: ScrollHeaderOptions): Scro
   }
   const detach = () => {
     revision++
+    ready = false
     for (const cancel of [...pending]) cancel()
     last = native?.snapshot() ?? last
+    if (restoringOffset !== undefined) last = { ...last, offset: restoringOffset }
     native?.dispose()
     native = undefined
     detachBindings.splice(0).forEach((off) => off())
@@ -373,7 +392,7 @@ export function scrollHeader(list: ListView, options: ScrollHeaderOptions): Scro
   })
   const control: ScrollHeader = {
     get ready() {
-      return !!native && !ended
+      return ready && !ended
     },
     get disposed() {
       return ended
@@ -385,9 +404,16 @@ export function scrollHeader(list: ListView, options: ScrollHeaderOptions): Scro
       return geometry
     },
     remeasure() {
+      invalidated = true
       if (measuring) return measuring
-      measuring = measure().finally(() => {
+      measuring = (async () => {
+        do {
+          invalidated = false
+          await measure()
+        } while (invalidated && !ended && list.isLoaded && !operation)
+      })().finally(() => {
         measuring = undefined
+        if (invalidated) queueMeasure()
       })
       return measuring
     },