From 33e730d7b4a6030bbdd8bb6a72054e017f77714b Mon Sep 17 00:00:00 2001
From: Jack Fishwick <jack@poly-ai.com>
Date: Fri, 23 Sep 2022 14:55:49 +0100
Subject: [PATCH] bug fix: make sure we actually update event handlers when
 selection begins.

---
 packages/core/src/container/ZoomPane/index.tsx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/core/src/container/ZoomPane/index.tsx b/packages/core/src/container/ZoomPane/index.tsx
index fce3a35f..c3ec9198 100644
--- a/packages/core/src/container/ZoomPane/index.tsx
+++ b/packages/core/src/container/ZoomPane/index.tsx
@@ -39,6 +39,7 @@ const selector = (s: ReactFlowState) => ({
   d3Zoom: s.d3Zoom,
   d3Selection: s.d3Selection,
   d3ZoomHandler: s.d3ZoomHandler,
+  userSelectionActive: s.userSelectionActive,
 });
 
 const ZoomPane = ({
@@ -68,7 +69,7 @@ const ZoomPane = ({
   const isZoomingOrPanning = useRef(false);
   const zoomPane = useRef<HTMLDivElement>(null);
   const prevTransform = useRef<Viewport>({ x: 0, y: 0, zoom: 0 });
-  const { d3Zoom, d3Selection, d3ZoomHandler } = useStore(selector, shallow);
+  const { d3Zoom, d3Selection, d3ZoomHandler, userSelectionActive } = useStore(selector, shallow);
   const zoomActivationKeyPressed = useKeyPress(zoomActivationKeyCode);
 
   useResizeHandler(zoomPane);
@@ -155,9 +156,9 @@ const ZoomPane = ({
 
   useEffect(() => {
     if (d3Zoom) {
-      if (store.getState().userSelectionActive && !isZoomingOrPanning.current) {
+      if (userSelectionActive && !isZoomingOrPanning.current) {
         d3Zoom.on('zoom', null);
-      } else if (!store.getState().userSelectionActive) {
+      } else if (!userSelectionActive) {
         d3Zoom.on('zoom', (event: D3ZoomEvent<HTMLDivElement, any>) => {
           const { onViewportChange } = store.getState();
 
@@ -172,7 +173,7 @@ const ZoomPane = ({
         });
       }
     }
-  }, [store, d3Zoom, onMove]);
+  }, [userSelectionActive, d3Zoom, onMove]);
 
   useEffect(() => {
     if (d3Zoom) {
@@ -242,7 +243,7 @@ const ZoomPane = ({
         }
 
         // during a selection we prevent all other interactions
-        if (store.getState().userSelectionActive) {
+        if (userSelectionActive) {
           return false;
         }
 
@@ -280,7 +281,7 @@ const ZoomPane = ({
       });
     }
   }, [
-    store,
+    userSelectionActive,
     d3Zoom,
     zoomOnScroll,
     zoomOnPinch,