@@ -14,6 +14,7 @@ interface MarqueeState {
1414 currentY : number ;
1515 pointerId : number ;
1616 pastThreshold : boolean ;
17+ target : Element ;
1718}
1819
1920const MARQUEE_THRESHOLD_PX = 4 ;
@@ -80,14 +81,13 @@ function hitsWithin(rect: Rect, candidates: MarqueeHit[]): MarqueeHit[] {
8081 return candidates . filter ( ( candidate ) => rectsOverlap ( rect , candidate . rect ) ) ;
8182}
8283
83- async function runMarqueeIntersection (
84- rect : Rect ,
85- candidates : MarqueeHit [ ] ,
84+ async function resolveDomEditSelections (
85+ elements : HTMLElement [ ] ,
8686 activeCompositionPath : string ,
8787) : Promise < DomEditSelection [ ] > {
8888 const isMasterView = ! activeCompositionPath || activeCompositionPath === "index.html" ;
8989 const hits : DomEditSelection [ ] = [ ] ;
90- for ( const { element } of hitsWithin ( rect , candidates ) ) {
90+ for ( const element of elements ) {
9191 const sel = await resolveDomEditSelection ( element , {
9292 activeCompositionPath,
9393 isMasterView,
@@ -98,23 +98,48 @@ async function runMarqueeIntersection(
9898 return hits ;
9999}
100100
101- interface MarqueeGesturesDeps {
101+ export interface MarqueeGesturesDeps < T = DomEditSelection > {
102102 iframeRef : React . RefObject < HTMLIFrameElement | null > ;
103103 overlayRef : React . RefObject < HTMLDivElement | null > ;
104104 activeCompositionPathRef : React . RefObject < string | null > ;
105- onMarqueeSelectRef : React . RefObject <
106- ( ( selections : DomEditSelection [ ] , additive : boolean ) => void ) | undefined
107- > ;
108- selectionRef : React . RefObject < DomEditSelection | null > ;
109- gestures : {
105+ onMarqueeSelectRef : React . RefObject < ( ( selections : T [ ] , additive : boolean ) => void ) | undefined > ;
106+ /** Turns the elements a drag touched into picks; without it, Studio's edit selections. */
107+ resolveHits ?: ( elements : HTMLElement [ ] ) => T [ ] | Promise < T [ ] > ;
108+ selectionRef ?: React . RefObject < DomEditSelection | null > ;
109+ /** Studio's pointer handling, for the events that are not part of a marquee. */
110+ gestures ?: {
110111 onPointerMove : ( event : React . PointerEvent < HTMLDivElement > ) => void ;
111112 onPointerUp : ( event : React . PointerEvent < HTMLDivElement > ) => void ;
112113 clearPointerState : ( ref : React . RefObject < DomEditSelection | null > ) => void ;
113114 } ;
114115}
115116
117+ export interface MarqueeGestures {
118+ marqueeRect : Rect | null ;
119+ candidateRects : Rect [ ] ;
120+ /** Starts a marquee at this press; the host has decided it landed on empty canvas. */
121+ begin : ( event : React . PointerEvent < HTMLElement > ) => void ;
122+ /** Drops an active marquee without selecting anything. */
123+ cancel : ( ) => void ;
124+ onPointerMove : ( event : React . PointerEvent < HTMLDivElement > ) => void ;
125+ onPointerUp : ( event : React . PointerEvent < HTMLDivElement > ) => void ;
126+ onPointerCancel : ( ) => void ;
127+ }
128+
129+ function releaseCapture ( m : MarqueeState ) : void {
130+ try {
131+ m . target . releasePointerCapture ( m . pointerId ) ;
132+ } catch {
133+ /* already released */
134+ }
135+ }
136+
137+ export function useMarqueeGestures ( deps : MarqueeGesturesDeps ) : MarqueeGestures ;
138+ export function useMarqueeGestures < T > (
139+ deps : MarqueeGesturesDeps < T > & Required < Pick < MarqueeGesturesDeps < T > , "resolveHits" > > ,
140+ ) : MarqueeGestures ;
116141// fallow-ignore-next-line complexity
117- export function useMarqueeGestures ( deps : MarqueeGesturesDeps ) {
142+ export function useMarqueeGestures < T > ( deps : MarqueeGesturesDeps < T > ) : MarqueeGestures {
118143 const marqueeRef = useRef < MarqueeState | null > ( null ) ;
119144 const [ marqueeRect , setMarqueeRect ] = useState < Rect | null > ( null ) ;
120145 // Live "candidate" highlight: the elements the marquee currently touches,
@@ -135,12 +160,55 @@ export function useMarqueeGestures(deps: MarqueeGesturesDeps) {
135160 if ( ! iframe || ! overlay || ! deps . onMarqueeSelectRef . current ) return ;
136161 const acp = deps . activeCompositionPathRef . current ?? "index.html" ;
137162 const candidates = candidatesRef . current ?? collectMarqueeCandidates ( iframe , overlay , acp ) ;
138- const hits = await runMarqueeIntersection ( rect , candidates , acp ) ;
139- deps . onMarqueeSelectRef . current ( hits , additive ) ;
163+ const elements = hitsWithin ( rect , candidates ) . map ( ( hit ) => hit . element ) ;
164+ const resolveHits = deps . resolveHits ;
165+ const picks = resolveHits
166+ ? await resolveHits ( elements )
167+ : ( ( await resolveDomEditSelections ( elements , acp ) ) as T [ ] ) ;
168+ deps . onMarqueeSelectRef . current ?.( picks , additive ) ;
140169 } ,
141- [ deps . iframeRef , deps . overlayRef , deps . onMarqueeSelectRef , deps . activeCompositionPathRef ] ,
170+ [
171+ deps . iframeRef ,
172+ deps . overlayRef ,
173+ deps . onMarqueeSelectRef ,
174+ deps . activeCompositionPathRef ,
175+ deps . resolveHits ,
176+ ] ,
142177 ) ;
143178
179+ const reset = useCallback ( ( ) => {
180+ marqueeRef . current = null ;
181+ setMarqueeRect ( null ) ;
182+ setCandidateRects ( [ ] ) ;
183+ candidatesRef . current = null ;
184+ } , [ ] ) ;
185+
186+ const begin = useCallback (
187+ ( event : React . PointerEvent < HTMLElement > ) => {
188+ const oRect = deps . overlayRef . current ?. getBoundingClientRect ( ) ;
189+ if ( ! oRect ) return ;
190+ event . currentTarget . setPointerCapture ( event . pointerId ) ;
191+ const x = event . clientX - oRect . left ;
192+ const y = event . clientY - oRect . top ;
193+ marqueeRef . current = {
194+ startX : x ,
195+ startY : y ,
196+ currentX : x ,
197+ currentY : y ,
198+ pointerId : event . pointerId ,
199+ pastThreshold : false ,
200+ target : event . currentTarget ,
201+ } ;
202+ } ,
203+ [ deps . overlayRef ] ,
204+ ) ;
205+
206+ const cancel = useCallback ( ( ) => {
207+ if ( ! marqueeRef . current ) return ;
208+ releaseCapture ( marqueeRef . current ) ;
209+ reset ( ) ;
210+ } , [ reset ] ) ;
211+
144212 const onPointerMove = useCallback (
145213 ( event : React . PointerEvent < HTMLDivElement > ) => {
146214 const m = marqueeRef . current ;
@@ -172,7 +240,7 @@ export function useMarqueeGestures(deps: MarqueeGesturesDeps) {
172240 }
173241 return ;
174242 }
175- deps . gestures . onPointerMove ( event ) ;
243+ deps . gestures ? .onPointerMove ( event ) ;
176244 } ,
177245 [ deps . gestures , deps . overlayRef , deps . iframeRef , deps . activeCompositionPathRef ] ,
178246 ) ;
@@ -181,12 +249,7 @@ export function useMarqueeGestures(deps: MarqueeGesturesDeps) {
181249 ( event : React . PointerEvent < HTMLDivElement > ) => {
182250 const m = marqueeRef . current ;
183251 if ( m ) {
184- marqueeRef . current = null ;
185- try {
186- ( event . currentTarget as HTMLElement ) . releasePointerCapture ( m . pointerId ) ;
187- } catch {
188- /* already released */
189- }
252+ releaseCapture ( m ) ;
190253 if ( m . pastThreshold ) {
191254 commitMarquee (
192255 {
@@ -200,26 +263,26 @@ export function useMarqueeGestures(deps: MarqueeGesturesDeps) {
200263 } else {
201264 deps . onMarqueeSelectRef . current ?.( [ ] , false ) ;
202265 }
203- setMarqueeRect ( null ) ;
204- setCandidateRects ( [ ] ) ;
205- candidatesRef . current = null ;
266+ reset ( ) ;
206267 return ;
207268 }
208- deps . gestures . onPointerUp ( event ) ;
269+ deps . gestures ? .onPointerUp ( event ) ;
209270 } ,
210- [ deps . gestures , commitMarquee , deps . onMarqueeSelectRef ] ,
271+ [ deps . gestures , commitMarquee , deps . onMarqueeSelectRef , reset ] ,
211272 ) ;
212273
213274 const onPointerCancel = useCallback ( ( ) => {
214- if ( marqueeRef . current ) {
215- marqueeRef . current = null ;
216- setMarqueeRect ( null ) ;
217- setCandidateRects ( [ ] ) ;
218- candidatesRef . current = null ;
219- return ;
220- }
221- deps . gestures . clearPointerState ( deps . selectionRef ) ;
222- } , [ deps . gestures , deps . selectionRef ] ) ;
223-
224- return { marqueeRef, marqueeRect, candidateRects, onPointerMove, onPointerUp, onPointerCancel } ;
275+ if ( marqueeRef . current ) return cancel ( ) ;
276+ if ( deps . selectionRef ) deps . gestures ?. clearPointerState ( deps . selectionRef ) ;
277+ } , [ deps . gestures , deps . selectionRef , cancel ] ) ;
278+
279+ return {
280+ marqueeRect,
281+ candidateRects,
282+ begin,
283+ cancel,
284+ onPointerMove,
285+ onPointerUp,
286+ onPointerCancel,
287+ } ;
225288}
0 commit comments