@@ -2,7 +2,7 @@ import { useCallback, useEffect, useLayoutEffect, useRef, useState } from "react
22
33const MAX_ZOOM = 8 ;
44
5- /** Keeps zoomed pixels in a native scroll area so wheels and touch can explore the whole image . */
5+ /** Zooms around the pointer and keeps the whole image accessible by dragging or scrolling . */
66export function ZoomableImage ( {
77 src,
88 name,
@@ -21,7 +21,13 @@ export function ZoomableImage({
2121 const [ zoom , setZoom ] = useState ( 1 ) ;
2222 const zoomRef = useRef ( 1 ) ;
2323 const anchorRef = useRef < { x : number ; y : number ; clientX : number ; clientY : number } | null > ( null ) ;
24- const dragRef = useRef < { x : number ; y : number ; left : number ; top : number } | null > ( null ) ;
24+ const dragRef = useRef < {
25+ pointerId : number ;
26+ x : number ;
27+ y : number ;
28+ left : number ;
29+ top : number ;
30+ } | null > ( null ) ;
2531 const suppressClickRef = useRef ( false ) ;
2632 const [ dragging , setDragging ] = useState ( false ) ;
2733 const maxHeight = Math . max ( 1 , Math . min ( windowSize . height * 0.86 , windowSize . height - 80 ) ) ;
@@ -128,6 +134,7 @@ export function ZoomableImage({
128134 }
129135 } }
130136 onPointerDown = { ( event ) => {
137+ if ( dragRef . current ) return ;
131138 suppressClickRef . current = false ;
132139 if ( event . pointerType !== "mouse" || event . button !== 0 || zoomRef . current <= 1 ) return ;
133140 const viewport = event . currentTarget ;
@@ -138,6 +145,7 @@ export function ZoomableImage({
138145 )
139146 return ;
140147 dragRef . current = {
148+ pointerId : event . pointerId ,
141149 x : event . clientX ,
142150 y : event . clientY ,
143151 left : viewport . scrollLeft ,
@@ -148,21 +156,23 @@ export function ZoomableImage({
148156 } }
149157 onPointerMove = { ( event ) => {
150158 const drag = dragRef . current ;
151- if ( ! drag ) return ;
159+ if ( ! drag || drag . pointerId !== event . pointerId ) return ;
152160 if ( Math . hypot ( event . clientX - drag . x , event . clientY - drag . y ) > 4 ) {
153161 suppressClickRef . current = true ;
154162 }
155163 event . currentTarget . scrollLeft = drag . left - ( event . clientX - drag . x ) ;
156164 event . currentTarget . scrollTop = drag . top - ( event . clientY - drag . y ) ;
157165 } }
158166 onPointerUp = { ( event ) => {
167+ if ( dragRef . current ?. pointerId !== event . pointerId ) return ;
159168 if ( event . currentTarget . hasPointerCapture ( event . pointerId ) ) {
160169 event . currentTarget . releasePointerCapture ( event . pointerId ) ;
161170 }
162171 dragRef . current = null ;
163172 setDragging ( false ) ;
164173 } }
165- onLostPointerCapture = { ( ) => {
174+ onLostPointerCapture = { ( event ) => {
175+ if ( dragRef . current ?. pointerId !== event . pointerId ) return ;
166176 dragRef . current = null ;
167177 setDragging ( false ) ;
168178 } }
0 commit comments