@@ -28,8 +28,8 @@ interface BasePosition {
2828}
2929
3030interface GsapRuntime {
31- seek : ( t : number ) => void ;
32- set : ( target : string , vars : Record < string , number | string > ) => void ;
31+ timeline : { seek : ( t : number ) => void } ;
32+ gsap : { set : ( target : string , vars : Record < string , number | string > ) => void } ;
3333 selector : string ;
3434 element : HTMLElement ;
3535 startTime : number ;
@@ -100,8 +100,8 @@ function connectGsapRuntime(
100100 if ( win ?. gsap ?. set && tl ?. seek && selector ) {
101101 const tlDuration = tl . duration ( ) ;
102102 return {
103- seek : tl . seek . bind ( tl ) ,
104- set : win . gsap . set . bind ( win . gsap ) ,
103+ timeline : tl ,
104+ gsap : win . gsap ,
105105 selector,
106106 element,
107107 startTime : win . __player ?. getTime ( ) ?? 0 ,
@@ -123,9 +123,9 @@ function applyRuntimePreview(
123123 properties : Record < string , number > ,
124124) : void {
125125 const seekTime = Math . min ( runtime . startTime + time , runtime . maxSeekTime ) ;
126- runtime . seek ( seekTime ) ;
126+ runtime . timeline . seek ( seekTime ) ;
127127 runtime . element . style . setProperty ( "translate" , "none" ) ;
128- runtime . set ( runtime . selector , { ...properties } ) ;
128+ runtime . gsap . set ( runtime . selector , { ...properties } ) ;
129129 runtime . element . style . visibility = "visible" ;
130130 liveTime . notify ( seekTime ) ;
131131 usePlayerStore . getState ( ) . setCurrentTime ( seekTime ) ;
@@ -237,6 +237,26 @@ function createRecordingRefs(): RecordingRefs {
237237 } ;
238238}
239239
240+ function releaseRuntimePreview ( r : RecordingRefs ) : void {
241+ const runtime = r . runtime ;
242+ if ( ! runtime ) return ;
243+ const { element, savedVisibility, savedTranslate } = runtime ;
244+ element . style . visibility = savedVisibility ;
245+ element . style . setProperty ( "translate" , savedTranslate || "" ) ;
246+ try {
247+ runtime . gsap . set ( runtime . selector , {
248+ clearProps : "x,y,scale,scaleX,scaleY,rotation,rotationX,rotationY,opacity,z" ,
249+ } ) ;
250+ } catch {
251+ /* runtime gone */
252+ }
253+ if ( r . cssVarOffset . x || r . cssVarOffset . y ) {
254+ element . style . setProperty ( "--hf-studio-offset-x" , `${ r . cssVarOffset . x } px` ) ;
255+ element . style . setProperty ( "--hf-studio-offset-y" , `${ r . cssVarOffset . y } px` ) ;
256+ }
257+ r . runtime = null ;
258+ }
259+
240260// ---------------------------------------------------------------------------
241261// Hook
242262// ---------------------------------------------------------------------------
@@ -259,9 +279,10 @@ export function useGestureRecording() {
259279 useEffect ( ( ) => {
260280 const r = refs . current ;
261281 return ( ) => {
282+ isRecordingRef . current = false ;
283+ releaseRuntimePreview ( r ) ;
262284 r . cleanup ?.( ) ;
263285 r . cleanup = null ;
264- isRecordingRef . current = false ;
265286 } ;
266287 } , [ ] ) ;
267288
@@ -290,15 +311,15 @@ export function useGestureRecording() {
290311 // this scale to convert them to the iframe's composition pixels.
291312 r . scale = computeIframeScale ( iframeEl ) ;
292313
293- // Now clear the optimistic path offset (already folded into baseX/baseY).
294- if ( base . cssOffX || base . cssOffY ) {
295- element . style . setProperty ( "--hf-studio-offset-x" , "0px" ) ;
296- element . style . setProperty ( "--hf-studio-offset-y" , "0px" ) ;
297- }
298-
299314 // --- Phase 3: Connect to the iframe GSAP runtime ---
300315 const selector = element . id ? `#${ element . id } ` : null ;
301316 r . runtime = connectGsapRuntime ( element , iframeEl , selector , elementEndTime ) ;
317+ // Clear the optimistic path offset only while a live runtime owns the
318+ // preview. releaseRuntimePreview restores it on every exit path.
319+ if ( r . runtime && ( base . cssOffX || base . cssOffY ) ) {
320+ element . style . setProperty ( "--hf-studio-offset-x" , "0px" ) ;
321+ element . style . setProperty ( "--hf-studio-offset-y" , "0px" ) ;
322+ }
302323
303324 // --- Phase 5: Attach event listeners ---
304325 const handlePointerMove = ( e : PointerEvent ) => {
@@ -378,7 +399,7 @@ export function useGestureRecording() {
378399 } catch {
379400 // Preview failed — disable it for the rest of the gesture (recording
380401 // continues). `r.runtime` is nulled so we don't retry on every frame.
381- r . runtime = null ;
402+ releaseRuntimePreview ( r ) ;
382403 }
383404 }
384405
@@ -407,31 +428,7 @@ export function useGestureRecording() {
407428 if ( ! isRecordingRef . current ) return [ ] ;
408429 isRecordingRef . current = false ;
409430 const r = refs . current ;
410- if ( r . runtime ) {
411- const { element : el , savedVisibility, savedTranslate } = r . runtime ;
412- el . style . visibility = savedVisibility ;
413- el . style . setProperty ( "translate" , savedTranslate || "" ) ;
414- // Drop the gesture's inline gsap transform before re-applying the path
415- // offset below, so the two don't briefly stack (the recorded keyframes
416- // already encode the full position, offset included). On commit the
417- // re-seek lands on the gesture's first keyframe; on cancel this leaves the
418- // element at its pre-recording position.
419- try {
420- r . runtime . set ( r . runtime . selector , {
421- clearProps : "x,y,scale,scaleX,scaleY,rotation,rotationX,rotationY,opacity,z" ,
422- } ) ;
423- } catch {
424- /* runtime gone */
425- }
426- }
427- if ( r . cssVarOffset . x || r . cssVarOffset . y ) {
428- const el = r . runtime ?. element ;
429- if ( el ) {
430- el . style . setProperty ( "--hf-studio-offset-x" , `${ r . cssVarOffset . x } px` ) ;
431- el . style . setProperty ( "--hf-studio-offset-y" , `${ r . cssVarOffset . y } px` ) ;
432- }
433- }
434- r . runtime = null ;
431+ releaseRuntimePreview ( r ) ;
435432 r . cleanup ?.( ) ;
436433 r . cleanup = null ;
437434 const frozen = r . samples . slice ( ) ;
0 commit comments