revert changes to SingleImageViewer

zooniverse · Dec 6, 2024 · 0e7a945 · 0e7a945
1 parent 1cb33e9
commit 0e7a945
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...nts/Classifier/components/SubjectViewer/components/SingleImageViewer/SingleImageViewer.js b/...nts/Classifier/components/SubjectViewer/components/SingleImageViewer/SingleImageViewer.js
@@ -34,10 +34,12 @@ function SingleImageViewer({
   zoomControlFn = null,
   zooming = false
 }) {
+  const canvasLayer = useRef()
+  const canvas = canvasLayer.current
   const transform = `rotate(${rotate} ${width / 2} ${height / 2})`
 
   return (
-    <SVGContext.Provider value={{ viewBox, rotate, width, height }}>
+    <SVGContext.Provider value={{ canvas, viewBox, rotate, width, height }}>
       {zoomControlFn && (
         <ZoomControlButton
           onClick={zoomControlFn}
@@ -66,6 +68,7 @@ function SingleImageViewer({
             transform={transform}
           >
             <SVGImageCanvas
+              ref={canvasLayer}
               viewBox={viewBox}
             >
               {children}

diff --git a/packages/lib-classifier/src/plugins/drawingTools/components/draggable/draggable.js b/packages/lib-classifier/src/plugins/drawingTools/components/draggable/draggable.js
@@ -16,8 +16,9 @@ function createPoint(event) {
 
 function getEventOffset(event, canvas) {
   const svgPoint = createPoint(event)
-  const svgEventOffset = svgPoint.matrixTransform
-    ? svgPoint.matrixTransform(canvas.getScreenCTM().inverse())
+  const ctm = canvas?.getScreenCTM()
+  const svgEventOffset = ctm && svgPoint.matrixTransform
+    ? svgPoint.matrixTransform(ctm.inverse())
     : svgPoint
   return svgEventOffset
 }