@xyflow/vue 2.0.0-next.2 → 2.0.0-next.3

package/dist/index.js

@@ -645,39 +645,6 @@ function createExtendedEventHook(defaultHandler) {
 	};
 }
 //#endregion
-//#region src/utils/drag.ts
-function getParentExtent(parent) {
-	if (parent && typeof parent.internals.positionAbsolute.x !== "undefined" && typeof parent.internals.positionAbsolute.y !== "undefined" && typeof parent.measured.width !== "undefined" && typeof parent.measured.height !== "undefined") return [[parent.internals.positionAbsolute.x, parent.internals.positionAbsolute.y], [parent.internals.positionAbsolute.x + parent.measured.width, parent.internals.positionAbsolute.y + parent.measured.height]];
-	return false;
-}
-function getExtent(item, triggerError, extent, parent) {
-	let currentExtent = item.extent || extent;
-	if (currentExtent === "parent" && !item.expandParent) if (item.parentId && parent && item.measured.width && item.measured.height) {
-		const parentExtent = getParentExtent(parent);
-		if (parentExtent) currentExtent = parentExtent;
-	} else {
-		triggerError(new VueFlowError("NODE_EXTENT_INVALID", item.id));
-		currentExtent = extent;
-	}
-	else if (Array.isArray(currentExtent)) {
-		const parentX = parent?.internals.positionAbsolute.x || 0;
-		const parentY = parent?.internals.positionAbsolute.y || 0;
-		currentExtent = [[currentExtent[0][0] + parentX, currentExtent[0][1] + parentY], [currentExtent[1][0] + parentX, currentExtent[1][1] + parentY]];
-	}
-	return currentExtent === "parent" ? [[Number.NEGATIVE_INFINITY, Number.NEGATIVE_INFINITY], [Number.POSITIVE_INFINITY, Number.POSITIVE_INFINITY]] : currentExtent;
-}
-function calcNextPosition(node, nextPosition, triggerError, nodeExtent, parentNode) {
-	const measured = (0, _xyflow_system.getNodeDimensions)(node);
-	const clampedPos = (0, _xyflow_system.clampPosition)(nextPosition, getExtent(node, triggerError, nodeExtent, parentNode), measured);
-	return {
-		position: {
-			x: clampedPos.x - (parentNode?.internals.positionAbsolute.x || 0),
-			y: clampedPos.y - (parentNode?.internals.positionAbsolute.y || 0)
-		},
-		computedPosition: clampedPos
-	};
-}
-//#endregion
 //#region src/utils/edge.ts
 function getEdgeHandle(bounds, handleId) {
 	if (!bounds) return null;
@@ -1414,7 +1381,7 @@ function useNode(id) {
 * @internal
 */
 function useUpdateNodePositions() {
-	const { getSelectedNodes, updateNodePositions, getInternalNode, emits } = useVueFlow();
+	const { getSelectedNodes, updateNodePositions, getInternalNode } = useVueFlow();
 	const store = useStore();
 	return (positionDiff, isShiftPressed = false) => {
 		const xVelo = store.snapToGrid ? store.snapGrid[0] : 5;
@@ -1426,10 +1393,18 @@ function useUpdateNodePositions() {
 		for (const node of getSelectedNodes.value) if (node.draggable || store.nodesDraggable && typeof node.draggable === "undefined") {
 			const internalNode = getInternalNode(node.id);
 			if (!internalNode) continue;
-			const { position } = calcNextPosition(internalNode, {
+			let nextPosition = {
 				x: internalNode.internals.positionAbsolute.x + positionDiffX,
 				y: internalNode.internals.positionAbsolute.y + positionDiffY
-			}, emits.error, store.nodeExtent, node.parentId ? getInternalNode(node.parentId) : void 0);
+			};
+			if (store.snapToGrid) nextPosition = (0, _xyflow_system.snapPosition)(nextPosition, store.snapGrid);
+			const { position, positionAbsolute } = (0, _xyflow_system.calculateNodePosition)({
+				nodeId: node.id,
+				nextPosition,
+				nodeLookup: store.nodeLookup,
+				nodeExtent: store.nodeExtent,
+				nodeOrigin: store.nodeOrigin
+			});
 			nodeUpdates.push({
 				id: node.id,
 				position,
@@ -1438,10 +1413,7 @@ function useUpdateNodePositions() {
 					y: positionDiff.y
 				},
 				measured: (0, _xyflow_system.getNodeDimensions)(internalNode),
-				internals: { positionAbsolute: {
-					x: internalNode.internals.positionAbsolute.x,
-					y: internalNode.internals.positionAbsolute.y
-				} }
+				internals: { positionAbsolute }
 			});
 		}
 		updateNodePositions(nodeUpdates, true, false);
@@ -4315,7 +4287,7 @@ function useActions(state, nodeLookup, parentLookup, edgeLookup) {
 			for (const id of rawEdgeLookup.keys()) if (!nextIds.has(id)) edgeLookup.delete(id);
 		}
 		state.edges = next;
-		updateConnectionLookup(state.connectionLookup, state.edges);
+		updateConnectionLookup(state.connectionLookup, next);
 	}
 	/**
 	* Recompute parent-aware `internals.positionAbsolute` on the system lookup, then mirror into the