Merge pull request #5593 from xyflow/fix/selection-pointerup

Fix/selection pointerup

.changeset/red-cycles-wonder.md

@@ -0,0 +1,5 @@
+---
+'@xyflow/react': patch
+---
+
+Reset selection box when user selects a node

examples/svelte/src/routes/examples/figma/+page.svelte

@@ -39,6 +39,7 @@
 	bind:edges
 	fitView
 	selectionMode={SelectionMode.Partial}
+	multiSelectionKey={['Meta', 'Shift']}
 	selectionOnDrag
 	panOnScroll
 	paneClickDistance={100}

packages/react/src/container/Pane/index.tsx

@@ -121,7 +121,7 @@ export function Pane({
   // We are using capture here in order to prevent other pointer events
   // to be able to create a selection above a node or an edge
   const onPointerDownCapture = (event: ReactPointerEvent): void => {
-    const { resetSelectedElements, domNode } = store.getState();
+    const { domNode } = store.getState();
     containerBounds.current = domNode?.getBoundingClientRect();
     if (!containerBounds.current) return;
 
@@ -155,13 +155,6 @@ export function Pane({
       event.stopPropagation();
       event.preventDefault();
     }
-
-    if (paneClickDistance === 0 || selectionKeyPressed) {
-      resetSelectedElements();
-
-      onSelectionStart?.(event);
-      selectionInProgress.current = true;
-    }
   };
 
   const onPointerMove = (event: ReactPointerEvent): void => {
@@ -184,14 +177,10 @@ export function Pane({
     const { x: mouseX, y: mouseY } = getEventPosition(event.nativeEvent, containerBounds.current);
     const { startX, startY } = userSelectionRect;
 
-    if (
+    if (!selectionInProgress.current) {
-      !selectionInProgress.current &&
+      const requiredDistance = selectionKeyPressed ? 0 : paneClickDistance;
-      event.target === container.current &&
-      !selectionKeyPressed &&
-      paneClickDistance > 0
-    ) {
       const distance = Math.hypot(mouseX - startX, mouseY - startY);
-      if (distance <= paneClickDistance) {
+      if (distance <= requiredDistance) {
         return;
       }
       resetSelectedElements();
@@ -268,11 +257,14 @@ export function Pane({
     store.setState({
       userSelectionActive: false,
       userSelectionRect: null,
-      nodesSelectionActive: selectedNodeIds.current.size > 0,
     });
 
     if (selectionInProgress.current) {
       onSelectionEnd?.(event);
+
+      store.setState({
+        nodesSelectionActive: selectedNodeIds.current.size > 0,
+      });
     }
   };
 

packages/svelte/src/lib/container/Pane/Pane.svelte

@@ -120,13 +120,6 @@
       event.stopPropagation();
       event.preventDefault();
     }
-
-    if (paneClickDistance === 0 || store.selectionKeyPressed) {
-      store.unselectNodesAndEdges();
-
-      onselectionstart?.(event);
-      selectionInProgress = true;
-    }
   }
 
   function onPointerMove(event: PointerEvent) {
@@ -137,14 +130,10 @@
     const mousePos = getEventPosition(event, containerBounds);
     const { startX = 0, startY = 0 } = store.selectionRect;
 
-    if (
+    if (!selectionInProgress) {
-      !selectionInProgress &&
+      const requiredDistance = store.selectionKeyPressed ? 0 : paneClickDistance;
-      event.target === container &&
-      !store.selectionKeyPressed &&
-      paneClickDistance > 0
-    ) {
       const distance = Math.hypot(mousePos.x - startX, mousePos.y - startY);
-      if (distance <= paneClickDistance) {
+      if (distance <= requiredDistance) {
         return;
       }
       store.unselectNodesAndEdges();