66 type PointerEvent as ReactPointerEvent ,
77 type ReactNode ,
88 useEffect ,
9+ useEffectEvent ,
910 useRef ,
1011 useState ,
1112} from "react" ;
@@ -59,28 +60,19 @@ import { previewBridge } from "./previewBridge";
5960import { PreviewUnreachable } from "./PreviewUnreachable" ;
6061import { showPreviewPopup } from "./showPreviewPopup" ;
6162import {
62- clampPreviewMiniPlayerPosition ,
63+ type PreviewMiniPlayerGesture ,
64+ settlePreviewMiniPlayerResize ,
65+ stepPreviewMiniPlayerGesture ,
66+ } from "./previewMiniPlayerGesture" ;
67+ import {
6368 PREVIEW_MINI_PLAYER_CORNER_RADIUS ,
6469 PREVIEW_MINI_PLAYER_WEBVIEW_Z_INDEX ,
6570 type PreviewMiniPlayerFrame ,
66- resizePreviewMiniPlayer ,
6771 resolveDeviceMiniPlayerCornerRadius ,
6872 resolveDeviceMiniPlayerSourceSize ,
6973 resolvePreviewMiniPlayerSourceSize ,
7074} from "./previewMiniPlayerLayout" ;
7175
72- interface PointerGesture {
73- readonly pointerId : number ;
74- readonly pointerType : string ;
75- readonly pointerX : number ;
76- readonly pointerY : number ;
77- readonly frame : PreviewMiniPlayerFrame ;
78- readonly direction : BrowserViewportResizeDirection | null ;
79- moved : boolean ;
80- }
81-
82- const HANDLE_TAP_SLOP_PX = 6 ;
83-
8476interface Props {
8577 readonly threadRef : ScopedThreadRef ;
8678 readonly miniPlayer : PreviewMiniPlayerState ;
@@ -111,6 +103,13 @@ const useStreamedSourceSize = create<{
111103 readonly viewport : PreviewStreamViewport ;
112104} | null > ( ( ) => null ) ;
113105
106+ // The source size a resize in progress lays the frame out from, so a source that changes shape
107+ // under a held handle cannot resize the player by itself. Same single slot as above.
108+ const useHeldSourceSize = create < {
109+ readonly key : string ;
110+ readonly source : PreviewMiniPlayerSize ;
111+ } | null > ( ( ) => null ) ;
112+
114113const NO_DEVICE_SCREEN_ATOM = Atom . make < DeviceScreenSize | null > ( null ) . pipe (
115114 Atom . withLabel ( "device-stream-screen:none" ) ,
116115) ;
@@ -178,6 +177,11 @@ export function useThreadPreviewCanvasSource(
178177 ? deviceStreamScreenAtom ( miniPlayerDeviceViewId ( threadRef , source ) )
179178 : NO_DEVICE_SCREEN_ATOM ,
180179 ) ;
180+ const heldSource = useHeldSourceSize ( ( state ) =>
181+ threadRef && sourceKey !== null && state ?. key === streamedSourceKey ( threadRef , sourceKey )
182+ ? state . source
183+ : null ,
184+ ) ;
181185 if ( ! miniPlayer || ! source || sourceKey === null ) return null ;
182186 if ( source . kind === "browser" && ! browser . snapshot ) return null ;
183187 return {
@@ -186,9 +190,10 @@ export function useThreadPreviewCanvasSource(
186190 position : miniPlayer . position ,
187191 lastInteraction : miniPlayer . lastInteraction ,
188192 source :
189- source . kind === "browser"
193+ heldSource ??
194+ ( source . kind === "browser"
190195 ? browser . sourceSize
191- : resolveDeviceMiniPlayerSourceSize ( source . platform , screen ) ,
196+ : resolveDeviceMiniPlayerSourceSize ( source . platform , screen ) ) ,
192197 } ;
193198}
194199
@@ -446,7 +451,8 @@ function MiniPlayerShell({
446451 readonly children : ( frame : PreviewMiniPlayerFrame ) => ReactNode ;
447452} ) {
448453 const canvas = useChatCanvas ( ) ;
449- const gestureRef = useRef < PointerGesture | null > ( null ) ;
454+ const gestureRef = useRef < PreviewMiniPlayerGesture | null > ( null ) ;
455+ const captureRef = useRef < HTMLElement | null > ( null ) ;
450456 // Touch toggles the pill after the tap's click so that click cannot land on the newly opened pill.
451457 const [ pillOpen , setPillOpen ] = useState ( false ) ;
452458 const handleTappedRef = useRef ( false ) ;
@@ -463,6 +469,7 @@ function MiniPlayerShell({
463469 } , [ pillOpen ] ) ;
464470 const container = canvas ?. container ?? null ;
465471 const sourceKey = previewMiniPlayerSourceKey ( miniPlayer . source ) ;
472+ const heldSourceKey = streamedSourceKey ( threadRef , sourceKey ) ;
466473 const frame = canvas ?. previewKey === sourceKey ? canvas . layout . frame : null ;
467474
468475 const radius = frame ? cornerRadius ( frame ) : PREVIEW_MINI_PLAYER_CORNER_RADIUS ;
@@ -472,65 +479,108 @@ function MiniPlayerShell({
472479 usePreviewMiniPlayerStore . getState ( ) . close ( threadRef ) ;
473480 } ;
474481
482+ /** Every way a gesture stops comes through here; returns the gesture it ended. */
483+ const finishGesture = ( ) => {
484+ const gesture = gestureRef . current ;
485+ if ( ! gesture ) return null ;
486+ gestureRef . current = null ;
487+ handleTappedRef . current = false ;
488+ const handle = captureRef . current ;
489+ captureRef . current = null ;
490+ if ( handle ?. hasPointerCapture ( gesture . pointerId ) ) {
491+ handle . releasePointerCapture ( gesture . pointerId ) ;
492+ }
493+ if ( gesture . direction === null ) return gesture ;
494+ useHeldSourceSize . setState ( ( state ) => ( state ?. key === heldSourceKey ? null : state ) , true ) ;
495+ const settled =
496+ frame && container
497+ ? settlePreviewMiniPlayerResize ( {
498+ frame,
499+ direction : gesture . direction ,
500+ held : gesture . source ,
501+ source : sourceSize ,
502+ container,
503+ } )
504+ : null ;
505+ if ( settled ) {
506+ usePreviewMiniPlayerStore
507+ . getState ( )
508+ . resize ( threadRef , sourceKey , settled . width , { x : settled . x , y : settled . y } ) ;
509+ }
510+ return gesture ;
511+ } ;
512+ const endInterruptedGesture = useEffectEvent ( ( ) => {
513+ finishGesture ( ) ;
514+ } ) ;
515+ // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- window blur ends a gesture whose release went to another window, and unmount ends one in progress
516+ useEffect ( ( ) => {
517+ window . addEventListener ( "blur" , endInterruptedGesture ) ;
518+ return ( ) => {
519+ window . removeEventListener ( "blur" , endInterruptedGesture ) ;
520+ useHeldSourceSize . setState ( ( state ) => ( state ?. key === heldSourceKey ? null : state ) , true ) ;
521+ } ;
522+ } , [ heldSourceKey ] ) ;
523+
475524 const beginGesture = (
476525 event : ReactPointerEvent < HTMLElement > ,
477526 direction : BrowserViewportResizeDirection | null ,
478527 ) => {
479528 if ( event . button !== 0 || ! frame ) return ;
529+ finishGesture ( ) ;
480530 gestureRef . current = {
481531 pointerId : event . pointerId ,
482532 pointerType : event . pointerType ,
483533 pointerX : event . clientX ,
484534 pointerY : event . clientY ,
485535 frame,
486536 direction,
537+ source : sourceSize ,
487538 moved : false ,
488539 } ;
540+ captureRef . current = event . currentTarget ;
541+ if ( direction !== null ) {
542+ useHeldSourceSize . setState ( { key : heldSourceKey , source : sourceSize } , true ) ;
543+ }
489544 event . currentTarget . setPointerCapture ( event . pointerId ) ;
490545 event . preventDefault ( ) ;
491546 event . stopPropagation ( ) ;
492547 } ;
493548
494549 const handlePointerMove = ( event : ReactPointerEvent < HTMLElement > ) => {
495550 const gesture = gestureRef . current ;
496- if ( ! gesture || gesture . pointerId !== event . pointerId || ! container ) return ;
497- const delta = { x : event . clientX - gesture . pointerX , y : event . clientY - gesture . pointerY } ;
498- if ( ! gesture . moved && Math . hypot ( delta . x , delta . y ) < HANDLE_TAP_SLOP_PX ) return ;
499- gesture . moved = true ;
551+ if ( ! gesture || ! container ) return ;
552+ const step = stepPreviewMiniPlayerGesture ( gesture , event , container ) ;
553+ if ( step . kind === "ignore" ) return ;
554+ if ( step . kind === "end" ) {
555+ finishGesture ( ) ;
556+ return ;
557+ }
558+ if ( ! gesture . moved ) gestureRef . current = { ...gesture , moved : true } ;
500559 const store = usePreviewMiniPlayerStore . getState ( ) ;
501- if ( gesture . direction === null ) {
502- store . move (
503- threadRef ,
504- sourceKey ,
505- clampPreviewMiniPlayerPosition (
506- { x : gesture . frame . x + delta . x , y : gesture . frame . y + delta . y } ,
507- container ,
508- gesture . frame ,
509- ) ,
510- ) ;
560+ if ( step . kind === "move" ) {
561+ store . move ( threadRef , sourceKey , step . position ) ;
511562 return ;
512563 }
513- const next = resizePreviewMiniPlayer ( {
514- start : gesture . frame ,
515- direction : gesture . direction ,
516- delta,
517- source : sourceSize ,
518- container,
519- } ) ;
520- store . resize ( threadRef , sourceKey , next . width , { x : next . x , y : next . y } ) ;
564+ store . resize ( threadRef , sourceKey , step . frame . width , { x : step . frame . x , y : step . frame . y } ) ;
521565 } ;
522566
523567 const endGesture = ( event : ReactPointerEvent < HTMLElement > ) => {
524- const gesture = gestureRef . current ;
525- if ( gesture ?. pointerId !== event . pointerId ) return ;
526- gestureRef . current = null ;
568+ if ( gestureRef . current ?. pointerId !== event . pointerId ) return ;
569+ const gesture = finishGesture ( ) ;
527570 handleTappedRef . current =
528571 event . type === "pointerup" &&
529- gesture . direction === null &&
572+ gesture ? .direction === null &&
530573 gesture . pointerType === "touch" &&
531574 ! gesture . moved ;
532- if ( event . currentTarget . hasPointerCapture ( event . pointerId ) ) {
533- event . currentTarget . releasePointerCapture ( event . pointerId ) ;
575+ } ;
576+
577+ // Capture can go without a release or cancel: the handle is replaced, or the platform takes it.
578+ const handleLostCapture = ( event : ReactPointerEvent < HTMLElement > ) => {
579+ if (
580+ gestureRef . current ?. pointerId === event . pointerId &&
581+ captureRef . current === event . currentTarget
582+ ) {
583+ finishGesture ( ) ;
534584 }
535585 } ;
536586
@@ -558,6 +608,7 @@ function MiniPlayerShell({
558608 onPointerMove = { handlePointerMove }
559609 onPointerUp = { endGesture }
560610 onPointerCancel = { endGesture }
611+ onLostPointerCapture = { handleLostCapture }
561612 onClick = { ( ) => {
562613 if ( ! handleTappedRef . current ) return ;
563614 handleTappedRef . current = false ;
@@ -634,6 +685,7 @@ function MiniPlayerShell({
634685 onPointerMove = { handlePointerMove }
635686 onPointerUp = { endGesture }
636687 onPointerCancel = { endGesture }
688+ onLostPointerCapture = { handleLostCapture }
637689 />
638690 ) ) }
639691 </ section >
0 commit comments