Topology: do not drag on MB2, MB3, or control clicks.

openshift · Nov 22, 2019 · 5eacf0a · 5eacf0a
1 parent 4200273
commit 5eacf0a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/frontend/packages/topology/src/behavior/useDndDrag.tsx b/frontend/packages/topology/src/behavior/useDndDrag.tsx
@@ -229,7 +229,10 @@ export const useDndDrag = <
                   }
                 }),
               )
-              .filter(() => dndManager.canDragSource(idRef.current)),
+              .filter(
+                () =>
+                  !d3.event.ctrlKey && !d3.event.button && dndManager.canDragSource(idRef.current),
+              ),
           );
         }
         return () => {

diff --git a/frontend/packages/topology/src/behavior/usePanZoom.tsx b/frontend/packages/topology/src/behavior/usePanZoom.tsx
@@ -45,7 +45,8 @@ export const usePanZoom = (zoomExtent: [number, number] = ZOOM_EXTENT): PanZoomR
                 );
                 elementRef.current.setScale(d3.event.transform.k);
               }),
-            );
+            )
+            .filter(d3.drag().filter());
           zoom($svg);
 
           // Update the d3 transform whenever the scale or bounds change.