Skip to content

Commit c4fdcb1

Browse files
authored
Merge pull request #6097 from xyflow/fix/internal-selection
fix(react): cleanup internal selection handling
2 parents 57c7317 + d150c38 commit c4fdcb1

6 files changed

Lines changed: 24 additions & 29 deletions

File tree

‎.changeset/green-brooms-thank.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@xyflow/system": patch
3+
"@xyflow/react": patch
4+
---
5+
6+
Don't mutate the internal selection state
7+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ export function Pane({
254254
}
255255

256256
if (!areSetsEqual(prevSelectedNodeIds, selectedNodeIds.current)) {
257-
const changes = getSelectionChanges(nodeLookup, selectedNodeIds.current, true);
257+
const changes = getSelectionChanges(nodeLookup, selectedNodeIds.current);
258258
triggerNodeChanges(changes);
259259
}
260260

‎packages/react/src/store/index.ts‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
fitViewport,
1717
getHandlePosition,
1818
Position,
19-
ZIndexMode
19+
ZIndexMode,
2020
} from '@xyflow/system';
2121

2222
import { applyEdgeChanges, applyNodeChanges, createSelectionChange, getSelectionChanges } from '../utils/changes';
@@ -134,7 +134,7 @@ const createStore = ({
134134
nodesInitialized,
135135
fitViewQueued: false,
136136
fitViewOptions: undefined,
137-
nodesSelectionActive: nextNodesSelectionActive
137+
nodesSelectionActive: nextNodesSelectionActive,
138138
});
139139
} else {
140140
set({ nodes, nodesInitialized, nodesSelectionActive: nextNodesSelectionActive });
@@ -303,7 +303,7 @@ const createStore = ({
303303
return;
304304
}
305305

306-
triggerNodeChanges(getSelectionChanges(nodeLookup, new Set([...selectedNodeIds]), true));
306+
triggerNodeChanges(getSelectionChanges(nodeLookup, new Set([...selectedNodeIds])));
307307
triggerEdgeChanges(getSelectionChanges(edgeLookup));
308308
},
309309
addSelectedEdges: (selectedEdgeIds) => {
@@ -316,7 +316,7 @@ const createStore = ({
316316
}
317317

318318
triggerEdgeChanges(getSelectionChanges(edgeLookup, new Set([...selectedEdgeIds])));
319-
triggerNodeChanges(getSelectionChanges(nodeLookup, new Set(), true));
319+
triggerNodeChanges(getSelectionChanges(nodeLookup, new Set()));
320320
},
321321
unselectNodesAndEdges: ({ nodes, edges }: UnselectNodesAndEdgesParams = {}) => {
322322
const { edges: storeEdges, nodes: storeNodes, nodeLookup, triggerNodeChanges, triggerEdgeChanges } = get();
@@ -330,16 +330,6 @@ const createStore = ({
330330
continue; // skip changing nodes that are not selected
331331
}
332332

333-
const internalNode = nodeLookup.get(node.id);
334-
335-
if (internalNode) {
336-
/*
337-
* we need to unselect the internal node that was selected previously before we
338-
* send the change to the user to prevent it to be selected while dragging the new node
339-
*/
340-
internalNode.selected = false;
341-
}
342-
343333
nodeChanges.push(createSelectionChange(node.id, false));
344334
}
345335

‎packages/react/src/utils/changes.ts‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,7 @@ export function createSelectionChange(id: string, selected: boolean): NodeSelect
234234

235235
export function getSelectionChanges(
236236
items: Map<string, any>,
237-
selectedIds: Set<string> = new Set(),
238-
mutateItem = false
237+
selectedIds: Set<string> = new Set()
239238
): NodeSelectionChange[] | EdgeSelectionChange[] {
240239
const changes: NodeSelectionChange[] | EdgeSelectionChange[] = [];
241240

@@ -244,14 +243,6 @@ export function getSelectionChanges(
244243

245244
// we don't want to set all items to selected=false on the first selection
246245
if (!(item.selected === undefined && !willBeSelected) && item.selected !== willBeSelected) {
247-
if (mutateItem) {
248-
/*
249-
* this hack is needed for nodes. When the user dragged a node, it's selected.
250-
* When another node gets dragged, we need to deselect the previous one,
251-
* in order to have only one selected node at a time - the onNodesChange callback comes too late here :/
252-
*/
253-
item.selected = willBeSelected;
254-
}
255246
changes.push(createSelectionChange(item.id, willBeSelected));
256247
}
257248
}

‎packages/system/src/xydrag/XYDrag.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,9 @@ export function XYDrag<NodeType extends NodeBase = NodeBase, EdgeType extends Ed
272272

273273
dragStarted = true;
274274

275+
// if a node is being dragged that is not currently selected, we only want to drag that node and not the rest of the selection
276+
const isUnselectedNodeDrag = !!nodeId && !multiSelectionActive && !nodeLookup.get(nodeId)?.selected;
277+
275278
if ((!selectNodesOnDrag || !isSelectable) && !multiSelectionActive && nodeId) {
276279
if (!nodeLookup.get(nodeId)?.selected) {
277280
// we need to reset selected nodes when selectNodesOnDrag=false
@@ -285,7 +288,7 @@ export function XYDrag<NodeType extends NodeBase = NodeBase, EdgeType extends Ed
285288

286289
const pointerPos = getPointerPosition(event.sourceEvent, { transform, snapGrid, snapToGrid, containerBounds });
287290
lastPos = pointerPos;
288-
dragItems = getDragItems(nodeLookup, nodesDraggable, pointerPos, nodeId);
291+
dragItems = getDragItems(nodeLookup, nodesDraggable, pointerPos, nodeId, isUnselectedNodeDrag);
289292

290293
if (dragItems.size > 0 && (onDragStart || onNodeDragStart || (!nodeId && onSelectionDragStart))) {
291294
const [currentNode, currentNodes] = getEventHandlerParams({

‎packages/system/src/xydrag/utils.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,18 @@ export function getDragItems<NodeType extends NodeBase>(
3636
nodeLookup: Map<string, InternalNodeBase<NodeType>>,
3737
nodesDraggable: boolean,
3838
mousePos: XYPosition,
39-
nodeId?: string
39+
nodeId?: string,
40+
onlyDragNode?: boolean
4041
): Map<string, NodeDragItem> {
4142
const dragItems = new Map<string, NodeDragItem>();
4243

4344
for (const [id, node] of nodeLookup) {
45+
// if onlyDragNode is true, only the grabbed node gets dragged, otherwise all selected nodes are dragged with it
46+
const isDragged = onlyDragNode ? node.id === nodeId : node.selected || node.id === nodeId;
47+
4448
if (
45-
(node.selected || node.id === nodeId) &&
46-
(!node.parentId || !isParentSelected(node, nodeLookup)) &&
49+
isDragged &&
50+
(onlyDragNode || !node.parentId || !isParentSelected(node, nodeLookup)) &&
4751
(node.draggable || (nodesDraggable && typeof node.draggable === 'undefined'))
4852
) {
4953
const internalNode = nodeLookup.get(id);

0 commit comments

Comments
 (0)