@dschz/solid-flow 0.3.0-next.5 → 1.0.0-next.7

package/dist/index/index.jsx

@@ -65,7 +65,7 @@ function propDefaults(props, defaults) {
 const getEdgeId = (connection) => {
 	let { source, sourceHandle, target, targetHandle } = connection;
 	return `xy-edge__${source}${sourceHandle || ""}-${target}${targetHandle || ""}`;
-}, EdgeLabelRenderer = (props) => {
+}, isEdgeSelectable = (edge, store) => edge.selectable ?? store.defaultEdgeOptions.selectable ?? store.elementsSelectable, EdgeLabelRenderer = (props) => {
 	let { store } = useInternalSolidFlow(), labelNode = () => store.domNode?.querySelector(".solid-flow__edge-labels");
 	return <Show when={labelNode()}>{(root) => <Portal mount={root()}>{props.children}</Portal>}</Show>;
 }, EdgeLabel = (props) => {
@@ -145,6 +145,181 @@ const getEdgeId = (connection) => {
 		};
 	};
 	return <BaseEdge path={pathData().path} labelX={pathData().labelX} labelY={pathData().labelY} label={props.label} labelStyle={props.labelStyle} markerStart={props.markerStart} markerEnd={props.markerEnd} interactionWidth={props.interactionWidth} style={props.style} />;
+};
+//#endregion
+//#region src/core/spatial/grid.ts
+/**
+* A uniform spatial hash over axis-aligned rects — the plain, NON-reactive
+* building block behind the flow's spatial queries (RFC-4239 dossier:
+* gesture-scoped snapshots and epoch-rebuilt indexes; deliberately never a
+* live-maintained reactive structure, which would re-create the round-6
+* central-collection anti-pattern).
+*
+* Every operation is O(cells touched); with cellSize on the order of the
+* query radius or median node size, inserts and queries touch O(1) cells.
+* No balancing, no extent-known-up-front requirement, no dependency —
+* upstream's own bake-off (quadtree vs BVH vs rbush) is why: fixed-radius
+* neighborhood and rect-vs-box queries are the textbook grid case.
+*/
+var SpatialGrid = class {
+	cellSize;
+	cells = /* @__PURE__ */ new Map();
+	rects = /* @__PURE__ */ new Map();
+	constructor(cellSize) {
+		this.cellSize = cellSize;
+	}
+	cellRange(rect) {
+		let size = this.cellSize;
+		return {
+			minX: Math.floor(rect.x / size),
+			maxX: Math.floor((rect.x + rect.width) / size),
+			minY: Math.floor(rect.y / size),
+			maxY: Math.floor((rect.y + rect.height) / size)
+		};
+	}
+	insert(id, rect) {
+		this.rects.set(id, rect);
+		let { minX, maxX, minY, maxY } = this.cellRange(rect);
+		for (let cx = minX; cx <= maxX; cx++) for (let cy = minY; cy <= maxY; cy++) {
+			let key = `${cx}:${cy}`, bucket = this.cells.get(key);
+			bucket ? bucket.push(id) : this.cells.set(key, [id]);
+		}
+	}
+	/** Ids of entries whose rect overlaps the query rect (touching counts). */
+	queryRect(query) {
+		let { minX, maxX, minY, maxY } = this.cellRange(query), seen = /* @__PURE__ */ new Set(), result = [];
+		for (let cx = minX; cx <= maxX; cx++) for (let cy = minY; cy <= maxY; cy++) {
+			let bucket = this.cells.get(`${cx}:${cy}`);
+			if (bucket) for (let id of bucket) {
+				if (seen.has(id)) continue;
+				seen.add(id);
+				let rect = this.rects.get(id);
+				rect.x <= query.x + query.width && rect.x + rect.width >= query.x && rect.y <= query.y + query.height && rect.y + rect.height >= query.y && result.push(id);
+			}
+		}
+		return result;
+	}
+	get size() {
+		return this.rects.size;
+	}
+}, GestureSpatialLookup = class {
+	#real;
+	#cellSize;
+	#grid = null;
+	#queryRect = null;
+	constructor(real, cellSize) {
+		this.#real = real, this.#cellSize = cellSize;
+	}
+	/** Snapshot the current geometry into the grid (gesture start). */
+	arm(rectOf) {
+		let grid = new SpatialGrid(this.#cellSize);
+		for (let [id, value] of this.#real.entries()) grid.insert(id, rectOf(value));
+		this.#grid = grid, this.#queryRect = null;
+	}
+	/** Focus iteration on the neighborhood of the pointer (per move). */
+	setQueryCenter(center, radius) {
+		this.#queryRect = {
+			x: center.x - radius,
+			y: center.y - radius,
+			width: radius * 2,
+			height: radius * 2
+		};
+	}
+	/** Focus iteration on an explicit rect (box-selection gestures). */
+	setQueryRect(rect) {
+		this.#queryRect = rect;
+	}
+	/** Back to plain pass-through (gesture end). */
+	disarm() {
+		this.#grid = null, this.#queryRect = null;
+	}
+	#candidateIds() {
+		return !this.#grid || !this.#queryRect ? null : this.#grid.queryRect(this.#queryRect);
+	}
+	get(key) {
+		return this.#real.get(key);
+	}
+	has(key) {
+		return this.#real.has(key);
+	}
+	get size() {
+		return this.#real.size;
+	}
+	*keys() {
+		let candidates = this.#candidateIds();
+		if (!candidates) {
+			yield* this.#real.keys();
+			return;
+		}
+		for (let id of candidates) this.#real.has(id) && (yield id);
+	}
+	*values() {
+		let candidates = this.#candidateIds();
+		if (!candidates) {
+			yield* this.#real.values();
+			return;
+		}
+		for (let id of candidates) {
+			let value = this.#real.get(id);
+			value !== void 0 && (yield value);
+		}
+	}
+	*entries() {
+		let candidates = this.#candidateIds();
+		if (!candidates) {
+			yield* this.#real.entries();
+			return;
+		}
+		for (let id of candidates) {
+			let value = this.#real.get(id);
+			value !== void 0 && (yield [id, value]);
+		}
+	}
+	[Symbol.iterator]() {
+		return this.entries();
+	}
+	forEach(callback, thisArg) {
+		for (let [key, value] of this.entries()) callback.call(thisArg, value, key, this);
+	}
+	[Symbol.toStringTag] = "GestureSpatialLookup";
+	set() {
+		throw Error("GestureSpatialLookup is read-only");
+	}
+	getOrInsert() {
+		throw Error("GestureSpatialLookup is read-only");
+	}
+	getOrInsertComputed() {
+		throw Error("GestureSpatialLookup is read-only");
+	}
+	delete() {
+		throw Error("GestureSpatialLookup is read-only");
+	}
+	clear() {
+		throw Error("GestureSpatialLookup is read-only");
+	}
+};
+//#endregion
+//#region src/components/handle/connectionGestureLookup.ts
+/**
+* Upstream `getClosestHandle` prefilters nodes within
+* `connectionRadius + ADDITIONAL_DISTANCE` of the pointer; ADDITIONAL_DISTANCE
+* is hardcoded to 250 in @xyflow/system (xyhandle/utils.ts). Tracked here with
+* a safety pad: a superset of candidates is always correct (their exact
+* distance filter runs after), so the pad only costs a few extra candidates.
+*/
+const armConnectionGestureLookup = (options) => {
+	let { event, real, domNode, getTransform, connectionRadius } = options, containerBounds = domNode?.getBoundingClientRect();
+	if (!containerBounds) return real;
+	let radius = connectionRadius + 250 + 50, lookup = new GestureSpatialLookup(real, radius);
+	lookup.arm((node) => nodeToRect(node));
+	let update = (moveEvent) => {
+		lookup.setQueryCenter(pointToRendererPoint(getEventPosition(moveEvent, containerBounds), getTransform(), !1, [1, 1]), radius);
+	};
+	update(event);
+	let doc = getHostForElement(event.target), dispose = () => {
+		doc.removeEventListener("mousemove", update, !0), doc.removeEventListener("touchmove", update, !0), doc.removeEventListener("mouseup", dispose, !0), doc.removeEventListener("touchend", dispose, !0), lookup.disarm();
+	};
+	return doc.addEventListener("mousemove", update, !0), doc.addEventListener("touchmove", update, !0), doc.addEventListener("mouseup", dispose, !0), doc.addEventListener("touchend", dispose, !0), lookup;
 }, EdgeReconnectAnchor = (props) => {
 	let _props = propDefaults(props, {
 		size: 25,
@@ -165,7 +340,13 @@ const getEdgeId = (connection) => {
 			nodeId: edge().target,
 			handleId: edge().targetHandle ?? null,
 			type: "target"
-		};
+		}, gestureLookup = armConnectionGestureLookup({
+			event,
+			real: nodeLookup,
+			domNode: store.domNode,
+			getTransform: () => store.transform,
+			connectionRadius: store.connectionRadius
+		});
 		XYHandle.onPointerDown(event, {
 			lib: store.lib,
 			flowId: store.id,
@@ -175,7 +356,7 @@ const getEdgeId = (connection) => {
 			autoPanOnConnect: store.autoPanOnConnect,
 			connectionMode: store.connectionMode,
 			connectionRadius: store.connectionRadius,
-			nodeLookup,
+			nodeLookup: gestureLookup,
 			isTarget: opposite.type === "target",
 			edgeUpdaterType: opposite.type,
 			cancelConnection: actions.cancelConnection,
@@ -236,9 +417,73 @@ const getEdgeId = (connection) => {
         </div>
       </Show>
     </>;
-}, createEdgeStore = (edges) => {
-	let [store, setStore] = createStore(edges);
-	return [store, setStore];
+}, createSelectionCommands = ({ store, setNodesStore, setEdgesStore, setSelectionRect, setSelectionRectMode, nodeLookup, edgeLookup, updateNodePositions }) => {
+	let unselectNodesAndEdges = ({ nodes: _nodes, edges } = {}) => {
+		let nodesToUnselect = new Set((_nodes || store.nodes).map(({ id }) => id));
+		nodesToUnselect.size && setNodesStore((nodes) => {
+			for (let node of nodes) nodesToUnselect.has(node.id) && (node.selected = !1);
+		});
+		let edgesToUnselect = new Set((edges ?? store.edges).map(({ id }) => id));
+		edgesToUnselect.size && setEdgesStore((edges) => {
+			for (let edge of edges) edgesToUnselect.has(edge.id) && (edge.selected = !1);
+		}), flush();
+	}, addSelectedNodes = (ids) => {
+		let isMultiSelection = store.multiselectionKeyPressed, idSet = new Set(ids);
+		setNodesStore((nodes) => {
+			for (let node of nodes) {
+				let nodeWillBeSelected = idSet.has(node.id), selected = isMultiSelection && node.selected || nodeWillBeSelected;
+				node.selected !== selected && (node.selected = selected);
+			}
+		}), isMultiSelection || unselectNodesAndEdges({ nodes: [] }), flush();
+	}, addSelectedEdges = (ids) => {
+		let isMultiSelection = store.multiselectionKeyPressed, idSet = new Set(ids);
+		setEdgesStore((edges) => {
+			for (let edge of edges) {
+				let edgeWillBeSelected = idSet.has(edge.id), selected = isMultiSelection && edge.selected || edgeWillBeSelected;
+				edge.selected !== selected && (edge.selected = selected);
+			}
+		}), isMultiSelection || unselectNodesAndEdges({ edges: [] }), flush();
+	};
+	return {
+		unselectNodesAndEdges,
+		addSelectedNodes,
+		addSelectedEdges,
+		handleNodeSelection: (id, unselect, nodeRef) => {
+			let node = store.nodes.find((n) => n.id === id);
+			node && (setSelectionRect(void 0), setSelectionRectMode(void 0), node.selected ? (unselect || node.selected && store.multiselectionKeyPressed) && (unselectNodesAndEdges({
+				nodes: [node],
+				edges: []
+			}), requestAnimationFrame(() => nodeRef?.blur())) : addSelectedNodes([id]));
+		},
+		handleEdgeSelection: (id) => {
+			let edge = edgeLookup[id];
+			edge && isEdgeSelectable(edge, store) && (setSelectionRect(void 0), setSelectionRectMode(void 0), edge.selected ? edge.selected && store.multiselectionKeyPressed && unselectNodesAndEdges({
+				nodes: [],
+				edges: [edge]
+			}) : addSelectedEdges([id]));
+		},
+		moveSelectedNodes: (direction, factor) => {
+			let nodeUpdates = /* @__PURE__ */ new Map(), xVelo = store.snapGrid?.[0] ?? 5, yVelo = store.snapGrid?.[1] ?? 5, xDiff = direction.x * xVelo * factor, yDiff = direction.y * yVelo * factor;
+			for (let node of nodeLookup.values()) {
+				if (!(node.selected && (node.draggable || store.nodesDraggable && node.draggable === void 0))) continue;
+				let nextPosition = {
+					x: node.internals.positionAbsolute.x + xDiff,
+					y: node.internals.positionAbsolute.y + yDiff
+				};
+				store.snapGrid && (nextPosition = snapPosition(nextPosition, store.snapGrid));
+				let { position } = calculateNodePosition({
+					nodeId: node.id,
+					nextPosition,
+					nodeLookup,
+					nodeExtent: store.nodeExtent,
+					nodeOrigin: store.nodeOrigin,
+					onError: store.onError
+				});
+				nodeUpdates.set(node.id, { position });
+			}
+			updateNodePositions(nodeUpdates);
+		}
+	};
 }, STEP = .5 / 2, rectsEqual = (a, b) => a === b || !!a && !!b && a.x === b.x && a.y === b.y && a.width === b.width && a.height === b.height, rectsOverlap = (a, b) => a.x <= b.x + b.width && a.x + a.width >= b.x && a.y <= b.y + b.height && a.y + a.height >= b.y, createCullingViewport = (source) => createMemo(() => {
 	let { width, height } = source;
 	if (!width || !height) return null;
@@ -271,8 +516,6 @@ const getEdgeId = (connection) => {
 	}, cullingViewport);
 }, getDefaultFlowStateProps = () => ({
 	id: "1",
-	nodes: [],
-	edges: [],
 	nodeOrigin: [0, 0],
 	nodeExtent: infiniteExtent,
 	defaultEdgeOptions: {},
@@ -371,14 +614,48 @@ var RecordMapFacade = class {
 	}
 };
 //#endregion
-//#region src/core/projections/connections.ts
+//#region src/core/measurementIngest.ts
 /**
-* Lookup keys for the connection index. Each edge is registered under six
-* keys — for both of its endpoints: the node, the node+handle-type, and (when
-* a handle id is present) the node+type+handle:
-*   `${nodeId}` · `${nodeId}-${type}` · `${nodeId}-${type}-${handleId}`
+* The measurement ingest lifecycle (WP3): everything that flows FROM the DOM
+* measuring pass INTO the data graph, plus the garbage collection that keeps
+* the measurements root aligned with graph membership. The DOM side (resize
+* observers, the idle-scheduled measuring pass) lives in createSolidFlow;
+* headless usage never calls these.
 */
-const connectionKey = (nodeId, type, handleId) => `${nodeId}${type ? handleId ? `-${type}-${handleId}` : `-${type}` : ""}`, pairKey = (aNode, aHandle, bNode, bHandle) => `${aNode}-${aHandle}--${bNode}-${bHandle}`, createConnections = (source) => createProjection(() => {
+const createMeasurementIngest = ({ setMeasurementsStore, setNodesStore, nodes }) => (createEffect(() => new Set(nodes().map((n) => n.id)), (currentIds) => {
+	setMeasurementsStore((draft) => {
+		for (let id of Object.keys(draft)) currentIds.has(id) || delete draft[id];
+	});
+}), {
+	applyMeasurementWrites: (writes) => {
+		setMeasurementsStore((draft) => {
+			for (let write of writes) if (write.hidden) {
+				let entry = draft[write.id];
+				entry && (entry.handleBounds = void 0);
+			} else draft[write.id] = {
+				measured: write.measured,
+				handleBounds: write.handleBounds
+			};
+		});
+	},
+	applyNodeChanges: (changes) => {
+		changes.length !== 0 && setNodesStore((nodes) => {
+			let nodeById = new Map(nodes.map((node) => [node.id, node]));
+			for (let change of changes) {
+				let node = nodeById.get(change.id);
+				if (node) switch (change.type) {
+					case "dimensions":
+						change.setAttributes && (node.width = change.dimensions?.width ?? node.width, node.height = change.dimensions?.height ?? node.height), node.measured = {
+							...node.measured,
+							...change.dimensions
+						};
+						break;
+					case "position": node.position = change.position ?? node.position;
+				}
+			}
+		});
+	}
+}), connectionKey = (nodeId, type, handleId) => `${nodeId}${type ? handleId ? `-${type}-${handleId}` : `-${type}` : ""}`, pairKey = (aNode, aHandle, bNode, bHandle) => `${aNode}-${aHandle}--${bNode}-${bHandle}`, createConnections = (source) => createProjection(() => {
 	let out = {}, add = (key, entry, connection) => {
 		(out[key] ??= {})[entry] = connection;
 	};
@@ -443,10 +720,6 @@ const EMPTY_AUTO_INDEX = /* @__PURE__ */ new Map(), createInternalNodes = (sourc
 					}, row.internals.z = z;
 				} else source.nodes.length;
 			}
-			if (userNode.parentId) {
-				let parent = entryById.get(userNode.parentId);
-				parent?.store.row.internals.positionAbsolute.x, parent?.store.row.internals.z;
-			}
 			return { row };
 		}, {}, { key: "id" }), entry = {
 			store,
@@ -515,8 +788,8 @@ const createLayoutedEdges = (source) => {
 	let rowStores = mapArray(() => source.edges, (edgeAccessor) => ({
 		id: edgeAccessor().id,
 		store: createProjection(() => {
-			let edge = edgeAccessor(), row = buildRow(source, edge);
-			return source.nodeLookup.get(edge.source)?.internals.handleBounds, source.nodeLookup.get(edge.target)?.internals.handleBounds, { row };
+			let edge = edgeAccessor();
+			return { row: buildRow(source, edge) };
 		}, { row: null }, { key: "id" })
 	}), { keyed: (edge) => edge.id }), assigned = /* @__PURE__ */ new Map();
 	return createProjection((draft) => {
@@ -532,7 +805,7 @@ const createLayoutedEdges = (source) => {
 	});
 }, buildRow = (source, edge) => {
 	let sourceNode = source.nodeLookup.get(edge.source), targetNode = source.nodeLookup.get(edge.target);
-	if (!sourceNode || !targetNode) return source.nodeLookup.size, null;
+	if (!sourceNode || !targetNode) return null;
 	let edgePosition = getEdgePosition({
 		id: edge.id,
 		sourceNode,
@@ -562,7 +835,33 @@ const createLayoutedEdges = (source) => {
 	let out = {};
 	for (let node of source.nodes) node.parentId && (out[node.parentId] = !0);
 	return out;
-}, {}, { key: "id" }), getInitialViewport = (fitView, initialViewport, width, height, nodeLookup) => {
+}, {}, { key: "id" }), createSeededGraphStores = (props, config) => {
+	props.nodes !== void 0 && props.defaultNodes, props.edges !== void 0 && props.defaultEdges;
+	let [nodesStore, setNodesStore] = createStore(props.nodes ?? [...props.defaultNodes ?? []]), [edgesStore, setEdgesStore] = createStore(props.edges ?? [...props.defaultEdges ?? []]), nodeSeedAdopted = props.nodes !== void 0 || props.defaultNodes !== void 0, edgeSeedAdopted = props.edges !== void 0 || props.defaultEdges !== void 0;
+	return createEffect(() => {
+		let next = config().nodes;
+		if (next) for (let node of next);
+		return { next };
+	}, ({ next }) => {
+		next && (nodeSeedAdopted = !0, setNodesStore(() => next));
+	}, { defer: !0 }), createEffect(() => {
+		let next = config().edges;
+		if (next) for (let edge of next);
+		return { next };
+	}, ({ next }) => {
+		next && (edgeSeedAdopted = !0, setEdgesStore(() => next));
+	}, { defer: !0 }), createEffect(() => ({
+		nodes: config().defaultNodes,
+		edges: config().defaultEdges
+	}), ({ nodes: defaultNodes, edges: defaultEdges }) => {
+		defaultNodes && !nodeSeedAdopted && config().nodes === void 0 && (nodeSeedAdopted = !0, setNodesStore(() => [...defaultNodes])), defaultEdges && !edgeSeedAdopted && config().edges === void 0 && (edgeSeedAdopted = !0, setEdgesStore(() => [...defaultEdges]));
+	}, { defer: !0 }), {
+		nodesStore,
+		setNodesStore,
+		edgesStore,
+		setEdgesStore
+	};
+}, getInitialViewport = (fitView, initialViewport, width, height, nodeLookup) => {
 	if (fitView && !initialViewport && width && height) {
 		let bounds = getInternalNodesBounds(nodeLookup, { filter: (node) => !!((node.width || node.initialWidth) && (node.height || node.initialHeight)) });
 		return getViewportForBounds$1(bounds, width, height, .5, 2, .1);
@@ -573,7 +872,7 @@ const createLayoutedEdges = (source) => {
 		zoom: 1
 	};
 }, createFlowState = (props, injections = {}) => {
-	let _props = merge(getDefaultFlowStateProps(), props), initialNodeTypes = injections.initialNodeTypes ?? {}, initialEdgeTypes = injections.initialEdgeTypes ?? {}, prefersDark = injections.prefersDark ?? (() => _props.colorModeSSR === "dark"), [config, setConfig] = createSignal(_props), [ariaLabelConfig, setAriaLabelConfig] = createSignal(() => mergeAriaLabelConfig(config().ariaLabelConfig)), [ariaLiveMessage, setAriaLiveMessage] = createSignal(() => config().ariaLiveMessage), [clickConnectStartHandle, setClickConnectStartHandle] = createSignal(void 0), [connection, setConnection] = createSignal(initialConnection), [domNode, setDomNode] = createSignal(null), [dragging, setDragging] = createSignal(!1), [elementsSelectable, setElementsSelectable] = createSignal(() => config().elementsSelectable), [height, setHeight] = createSignal(() => config().height), [minZoom, _setMinZoom] = createSignal(() => config().minZoom), [maxZoom, _setMaxZoom] = createSignal(() => config().maxZoom), [nodesConnectable, setNodesConnectable] = createSignal(() => config().nodesDraggable), [nodesDraggable, setNodesDraggable] = createSignal(() => config().nodesDraggable), [panZoom, setPanZoom] = createSignal(null), [selectionRect, setSelectionRect] = createSignal(), [selectionRectMode, setSelectionRectMode] = createSignal(), [snapGrid, setSnapGrid] = createSignal(() => config().snapGrid), [translateExtent, _setTranslateExtent] = createSignal(() => config().translateExtent ?? infiniteExtent), [width, setWidth] = createSignal(() => config().width), [selectionKeyPressed, setSelectionKeyPressed] = createSignal(!1), [multiselectionKeyPressed, setMultiselectionKeyPressed] = createSignal(!1), [deleteKeyPressed, setDeleteKeyPressed] = createSignal(!1), [panActivationKeyPressed, setPanActivationKeyPressed] = createSignal(!1), [zoomActivationKeyPressed, setZoomActivationKeyPressed] = createSignal(!1), [nodesStore, setNodesStore] = createStore(_props.nodes), [edgesStore, setEdgesStore] = createStore(_props.edges), [measurementsStore, setMeasurementsStore] = createStore({}), internalNodes = createInternalNodes({
+	let _props = merge(getDefaultFlowStateProps(), props), initialNodeTypes = injections.initialNodeTypes ?? {}, initialEdgeTypes = injections.initialEdgeTypes ?? {}, prefersDark = injections.prefersDark ?? (() => _props.colorModeSSR === "dark"), [config, setConfig] = createSignal(_props), ariaLabelConfig = createMemo(() => mergeAriaLabelConfig(config().ariaLabelConfig)), [ariaLiveMessage, setAriaLiveMessage] = createSignal(() => config().ariaLiveMessage), [clickConnectStartHandle, setClickConnectStartHandle] = createSignal(void 0), [connection, setConnection] = createSignal(initialConnection), [domNode, setDomNode] = createSignal(null), [dragging, setDragging] = createSignal(!1), [elementsSelectable, setElementsSelectable] = createSignal(() => config().elementsSelectable), [height, setHeight] = createSignal(() => config().height), minZoom = createMemo(() => config().minZoom), maxZoom = createMemo(() => config().maxZoom), [nodesConnectable, setNodesConnectable] = createSignal(() => config().nodesConnectable), [nodesDraggable, setNodesDraggable] = createSignal(() => config().nodesDraggable), [panZoom, setPanZoom] = createSignal(null), [selectionRect, setSelectionRect] = createSignal(), [selectionRectMode, setSelectionRectMode] = createSignal(), [snapGrid, setSnapGrid] = createSignal(() => config().snapGrid), translateExtent = createMemo(() => config().translateExtent ?? infiniteExtent), [width, setWidth] = createSignal(() => config().width), [selectionKeyPressed, setSelectionKeyPressed] = createSignal(!1), [multiselectionKeyPressed, setMultiselectionKeyPressed] = createSignal(!1), [deleteKeyPressed, setDeleteKeyPressed] = createSignal(!1), [panActivationKeyPressed, setPanActivationKeyPressed] = createSignal(!1), [zoomActivationKeyPressed, setZoomActivationKeyPressed] = createSignal(!1), { nodesStore, setNodesStore, edgesStore, setEdgesStore } = createSeededGraphStores(props, config), [measurementsStore, setMeasurementsStore] = createStore({}), internalNodes = createInternalNodes({
 		get nodes() {
 			return nodesStore;
 		},
@@ -593,19 +892,7 @@ const createLayoutedEdges = (source) => {
 			return config().zIndexMode;
 		}
 	}), nodeLookup = new RecordMapFacade(internalNodes), initialViewport = getInitialViewport(_props.fitView, _props.initialViewport, _props.width ?? 0, _props.height ?? 0, nodeLookup), [viewportStore, setViewportStore] = createStore(_props.viewport ?? initialViewport);
-	createEffect(() => {
-		let next = config().nodes;
-		for (let node of next);
-		return { next };
-	}, ({ next }) => {
-		setNodesStore(() => next);
-	}, { defer: !0 }), createEffect(() => {
-		let next = config().edges;
-		for (let edge of next);
-		return { next };
-	}, ({ next }) => {
-		setEdgesStore(() => next);
-	}, { defer: !0 }), createEffect(() => config().viewport, (next) => {
+	createEffect(() => config().viewport, (next) => {
 		next && setViewportStore(() => next);
 	}, { defer: !0 });
 	let transform = createMemo(() => [
@@ -617,25 +904,29 @@ const createLayoutedEdges = (source) => {
 		if (nodes.length === 0) return !1;
 		for (let node of nodes) if (!node.hidden && (node.measured?.width === void 0 || node.measured?.height === void 0)) return !1;
 		return !0;
-	}), store = merge({
+	}), resolvedColorMode = createMemo(() => {
+		let mode = config().colorMode;
+		return mode === "system" ? prefersDark() ? "dark" : "light" : mode;
+	}), projectedConnection = createMemo(() => {
+		let state = connection();
+		return state.inProgress ? {
+			...state,
+			to: pointToRendererPoint(state.to, transform())
+		} : state;
+	}), connectionFromHandle = createMemo(() => connection().fromHandle ?? null, { equals: (a, b) => a === b || !!a && !!b && a.nodeId === b.nodeId && a.type === b.type && a.id === b.id }), connectionTargetByHandle = createProjection((draft) => {
+		let state = connection(), toHandle = state.inProgress ? state.toHandle : null, key = toHandle ? connectionKey(toHandle.nodeId, toHandle.type, toHandle.id ?? null) : null;
+		for (let existing of Object.keys(draft)) existing !== key && delete draft[existing];
+		key && (draft[key] = state.isValid ? "valid" : "invalid");
+	}, {}, { key: null }), mergedNodeTypes = createMemo(() => ({
+		...initialNodeTypes,
+		...config().nodeTypes
+	})), mergedEdgeTypes = createMemo(() => ({
+		...initialEdgeTypes,
+		...config().edgeTypes
+	})), selectedNodesView = createMemo(() => nodesStore.filter((node) => node.selected)), selectedEdgesView = createMemo(() => edgesStore.filter((edge) => edge.selected)), store = merge({
 		width: 0,
 		height: 0
 	}, config, {
-		get _colorMode() {
-			return config().colorMode;
-		},
-		get _colorModeSSR() {
-			return config().colorModeSSR;
-		},
-		get _connection() {
-			return connection();
-		},
-		get _nodeTypes() {
-			return config().nodeTypes;
-		},
-		get _edgeTypes() {
-			return config().edgeTypes;
-		},
 		get ariaLabelConfig() {
 			return ariaLabelConfig();
 		},
@@ -646,14 +937,16 @@ const createLayoutedEdges = (source) => {
 			return clickConnectStartHandle();
 		},
 		get colorMode() {
-			return this._colorMode === "system" ? prefersDark() ? "dark" : "light" : this._colorMode;
+			return resolvedColorMode();
 		},
 		get connection() {
-			let state = connection();
-			return {
-				...state,
-				to: state.inProgress ? pointToRendererPoint(state.to, this.transform) : state.to
-			};
+			return projectedConnection();
+		},
+		get connectionFromHandle() {
+			return connectionFromHandle();
+		},
+		get connectionTargetByHandle() {
+			return connectionTargetByHandle;
 		},
 		get domNode() {
 			return domNode();
@@ -662,10 +955,7 @@ const createLayoutedEdges = (source) => {
 			return dragging();
 		},
 		get edgeTypes() {
-			return {
-				...initialEdgeTypes,
-				...this._edgeTypes
-			};
+			return mergedEdgeTypes();
 		},
 		get elementsSelectable() {
 			return elementsSelectable();
@@ -698,19 +988,16 @@ const createLayoutedEdges = (source) => {
 			return nodesDraggable();
 		},
 		get nodeTypes() {
-			return {
-				...initialNodeTypes,
-				...this._nodeTypes
-			};
+			return mergedNodeTypes();
 		},
 		get panZoom() {
 			return panZoom();
 		},
 		get selectedNodes() {
-			return nodesStore.filter((node) => node.selected);
+			return selectedNodesView();
 		},
 		get selectedEdges() {
-			return edgesStore.filter((edge) => edge.selected);
+			return selectedEdgesView();
 		},
 		get selectionRect() {
 			return selectionRect();
@@ -825,33 +1112,11 @@ const createLayoutedEdges = (source) => {
 		setNodesStore((nodes) => {
 			for (let node of nodes) nodeDragItems.has(node.id) && (node.dragging = dragging, node.position = nodeDragItems.get(node.id).position);
 		});
-	}, applyMeasurementWrites = (writes) => {
-		setMeasurementsStore((draft) => {
-			for (let write of writes) if (write.hidden) {
-				let entry = draft[write.id];
-				entry && (entry.handleBounds = void 0);
-			} else draft[write.id] = {
-				measured: write.measured,
-				handleBounds: write.handleBounds
-			};
-		});
-	}, applyNodeChanges = (changes) => {
-		changes.length !== 0 && setNodesStore((nodes) => {
-			let nodeById = new Map(nodes.map((node) => [node.id, node]));
-			for (let change of changes) {
-				let node = nodeById.get(change.id);
-				if (node) switch (change.type) {
-					case "dimensions":
-						change.setAttributes && (node.width = change.dimensions?.width ?? node.width, node.height = change.dimensions?.height ?? node.height), node.measured = {
-							...node.measured,
-							...change.dimensions
-						};
-						break;
-					case "position": node.position = change.position ?? node.position;
-				}
-			}
-		});
-	}, markInitialNodesMeasured = () => {
+	}, { applyMeasurementWrites, applyNodeChanges } = createMeasurementIngest({
+		setMeasurementsStore,
+		setNodesStore,
+		nodes: () => nodesStore
+	}), markInitialNodesMeasured = () => {
 		initialNodesMeasured = !0, tryInitialFitView();
 	}, requestMeasure = () => {}, setMeasureRequester = (fn) => {
 		requestMeasure = fn;
@@ -866,66 +1131,16 @@ const createLayoutedEdges = (source) => {
 			ease: options?.ease,
 			interpolate: options?.interpolate
 		}), Promise.resolve(!0)) : Promise.resolve(!1);
-	}, setPaneClickDistance = (distance) => {
-		store.panZoom?.setClickDistance(distance);
-	}, unselectNodesAndEdges = ({ nodes: _nodes, edges } = {}) => {
-		let nodesToUnselect = new Set((_nodes || store.nodes).map(({ id }) => id));
-		nodesToUnselect.size && setNodesStore((nodes) => {
-			for (let node of nodes) nodesToUnselect.has(node.id) && (node.selected = !1);
-		});
-		let edgesToUnselect = new Set((edges ?? store.edges).map(({ id }) => id));
-		edgesToUnselect.size && setEdgesStore((edges) => {
-			for (let edge of edges) edgesToUnselect.has(edge.id) && (edge.selected = !1);
-		}), flush();
-	}, addSelectedNodes = (ids) => {
-		let isMultiSelection = store.multiselectionKeyPressed;
-		setNodesStore((nodes) => {
-			for (let node of nodes) {
-				let nodeWillBeSelected = ids.includes(node.id), selected = isMultiSelection && node.selected || nodeWillBeSelected;
-				node.selected !== selected && (node.selected = selected);
-			}
-		}), isMultiSelection || unselectNodesAndEdges({ nodes: [] }), flush();
-	}, addSelectedEdges = (ids) => {
-		let isMultiSelection = store.multiselectionKeyPressed;
-		setEdgesStore((edges) => {
-			for (let edge of edges) {
-				let edgeWillBeSelected = ids.includes(edge.id), selected = isMultiSelection && edge.selected || edgeWillBeSelected;
-				edge.selected !== selected && (edge.selected = selected);
-			}
-		}), isMultiSelection || unselectNodesAndEdges({ edges: [] }), flush();
-	}, handleNodeSelection = (id, unselect, nodeRef) => {
-		let node = store.nodes.find((n) => n.id === id);
-		node && (setSelectionRect(void 0), setSelectionRectMode(void 0), node.selected ? (unselect || node.selected && store.multiselectionKeyPressed) && (unselectNodesAndEdges({
-			nodes: [node],
-			edges: []
-		}), requestAnimationFrame(() => nodeRef?.blur())) : addSelectedNodes([id]));
-	}, handleEdgeSelection = (id) => {
-		let edge = edgeLookup[id];
-		edge && (edge.selectable || store.elementsSelectable && edge.selectable === void 0) && (setSelectionRect(void 0), setSelectionRectMode(void 0), edge.selected ? edge.selected && store.multiselectionKeyPressed && unselectNodesAndEdges({
-			nodes: [],
-			edges: [edge]
-		}) : addSelectedEdges([id]));
-	}, moveSelectedNodes = (direction, factor) => {
-		let nodeUpdates = /* @__PURE__ */ new Map(), xVelo = store.snapGrid?.[0] ?? 5, yVelo = store.snapGrid?.[1] ?? 5, xDiff = direction.x * xVelo * factor, yDiff = direction.y * yVelo * factor;
-		for (let node of nodeLookup.values()) {
-			if (!(node.selected && (node.draggable || store.nodesDraggable && node.draggable === void 0))) continue;
-			let nextPosition = {
-				x: node.internals.positionAbsolute.x + xDiff,
-				y: node.internals.positionAbsolute.y + yDiff
-			};
-			store.snapGrid && (nextPosition = snapPosition(nextPosition, store.snapGrid));
-			let { position } = calculateNodePosition({
-				nodeId: node.id,
-				nextPosition,
-				nodeLookup,
-				nodeExtent: store.nodeExtent,
-				nodeOrigin: store.nodeOrigin,
-				onError: store.onError
-			});
-			nodeUpdates.set(node.id, { position });
-		}
-		updateNodePositions(nodeUpdates);
-	}, panBy$1 = (delta) => panBy({
+	}, stableSetViewport = (viewport) => setViewportStore(() => viewport), { unselectNodesAndEdges, addSelectedNodes, addSelectedEdges, handleNodeSelection, handleEdgeSelection, moveSelectedNodes } = createSelectionCommands({
+		store,
+		setNodesStore,
+		setEdgesStore,
+		setSelectionRect,
+		setSelectionRectMode,
+		nodeLookup,
+		edgeLookup,
+		updateNodePositions
+	}), panBy$1 = (delta) => panBy({
 		delta,
 		panZoom: store.panZoom,
 		transform: store.transform,
@@ -1002,8 +1217,27 @@ const createLayoutedEdges = (source) => {
 		get snapGrid() {
 			return store.snapGrid;
 		}
-	}, getNodeRect = (node) => {
-		let nodeToUse = isNode(node) ? node : nodeLookup.get(node.id), position = nodeToUse.parentId ? evaluateAbsolutePosition(nodeToUse.position, nodeToUse.measured, nodeToUse.parentId, nodeLookup, store.nodeOrigin) : nodeToUse.position, nodeWithPosition = {
+	}, intersectionGrid = null, intersectionRows = null, queryIntersectionCandidates = (rect) => untrack(() => {
+		if (!intersectionGrid) {
+			let grid = new SpatialGrid(300), rows = /* @__PURE__ */ new Map();
+			for (let node of store.nodes) {
+				let internalNode = nodeLookup.get(node.id);
+				internalNode && (grid.insert(node.id, nodeToRect(internalNode)), rows.set(node.id, node));
+			}
+			intersectionGrid = grid, intersectionRows = rows, queueMicrotask(() => {
+				intersectionGrid = null, intersectionRows = null;
+			});
+		}
+		let rows = intersectionRows, result = [];
+		for (let id of intersectionGrid.queryRect(rect)) {
+			let row = rows.get(id);
+			row && result.push(row);
+		}
+		return result;
+	}), getNodeRect = (node) => {
+		let nodeToUse = isNode(node) ? node : nodeLookup.get(node.id);
+		if (!nodeToUse) return null;
+		let position = nodeToUse.parentId ? evaluateAbsolutePosition(nodeToUse.position, nodeToUse.measured, nodeToUse.parentId, nodeLookup, store.nodeOrigin) : nodeToUse.position, nodeWithPosition = {
 			...nodeToUse,
 			position,
 			width: nodeToUse.measured?.width ?? nodeToUse.width,
@@ -1057,7 +1291,7 @@ const createLayoutedEdges = (source) => {
 				x,
 				y,
 				zoom
-			], _snapGrid !== null, _snapGrid || [1, 1]);
+			], !!_snapGrid, _snapGrid || [1, 1]);
 		},
 		flowToScreenPosition: (position) => {
 			if (!store.domNode) return position;
@@ -1121,14 +1355,18 @@ const createLayoutedEdges = (source) => {
 				let remainingNodes = store.nodes.filter((node) => !matchingNodes.some(({ id }) => id === node.id));
 				store.onNodesDelete?.(matchingNodes), setNodesStore(() => remainingNodes);
 			}
-			return {
+			let deletedNodes = matchingNodes ?? [], deletedEdges = matchingEdges ?? [];
+			return (deletedNodes.length > 0 || deletedEdges.length > 0) && store.onDelete?.({
+				nodes: deletedNodes,
+				edges: deletedEdges
+			}), {
 				deletedNodes: matchingNodes,
 				deletedEdges: matchingEdges
 			};
 		},
 		getIntersectingNodes: (nodeOrRect, partially = !0, nodesToIntersect) => {
 			let isRect = isRectObject(nodeOrRect), nodeRect = isRect ? nodeOrRect : getNodeRect(nodeOrRect);
-			return nodeRect ? (nodesToIntersect || store.nodes).filter((n) => {
+			return nodeRect ? (nodesToIntersect ?? queryIntersectionCandidates(nodeRect)).filter((n) => {
 				let internalNode = nodeLookup.get(n.id);
 				if (!internalNode || !isRect && n.id === nodeOrRect.id) return !1;
 				let currNodeRect = nodeToRect(internalNode), overlappingArea = getOverlappingArea(currNodeRect, nodeRect);
@@ -1184,10 +1422,6 @@ const createLayoutedEdges = (source) => {
 		extent: store.translateExtent
 	}), ({ panZoom, extent }) => {
 		panZoom?.setTranslateExtent(extent);
-	}), createEffect(() => new Set(store.nodes.map((n) => n.id)), (currentIds) => {
-		setMeasurementsStore((draft) => {
-			for (let id of Object.keys(draft)) currentIds.has(id) || delete draft[id];
-		});
 	}), {
 		store,
 		flow,
@@ -1205,8 +1439,6 @@ const createLayoutedEdges = (source) => {
 			applyNodeChanges,
 			markInitialNodesMeasured,
 			setMeasureRequester,
-			resetStoreValues,
-			setAriaLabelConfig,
 			setAriaLiveMessage,
 			setClickConnectStartHandle,
 			setConfig,
@@ -1214,15 +1446,11 @@ const createLayoutedEdges = (source) => {
 			setDeleteKeyPressed,
 			setDomNode,
 			setDragging,
-			get setEdges() {
-				return setEdgesStore;
-			},
+			setEdges: setEdgesStore,
 			setElementsSelectable,
 			setHeight,
 			setMultiselectionKeyPressed,
-			get setNodes() {
-				return setNodesStore;
-			},
+			setNodes: setNodesStore,
 			setNodesConnectable,
 			setNodesDraggable,
 			setPanActivationKeyPressed,
@@ -1230,9 +1458,7 @@ const createLayoutedEdges = (source) => {
 			setSelectionKeyPressed,
 			setSelectionRect,
 			setSelectionRectMode,
-			get setViewport() {
-				return (viewport) => setViewportStore(() => viewport);
-			},
+			setViewport: stableSetViewport,
 			setWidth,
 			setZoomActivationKeyPressed,
 			addEdge,
@@ -1241,7 +1467,6 @@ const createLayoutedEdges = (source) => {
 			zoomOut,
 			fitView,
 			setCenter,
-			setPaneClickDistance,
 			unselectNodesAndEdges,
 			addSelectedNodes,
 			addSelectedEdges,
@@ -1253,25 +1478,28 @@ const createLayoutedEdges = (source) => {
 			reset
 		}
 	};
+}, createEdgeStore = (edges) => {
+	let [store, setStore] = typeof edges == "function" ? createStore(edges, []) : createStore(edges);
+	return [store, setStore];
 }, createNodeStore = (nodes) => {
-	let [store, setStore] = createStore(nodes);
+	let [store, setStore] = typeof nodes == "function" ? createStore(nodes, []) : createStore(nodes);
 	return [store, setStore];
 }, EdgeWrapper = (props) => {
-	let edgeRef, { store, actions } = useInternalSolidFlow(), edgeId = () => props.edgeId, edge = () => actions.getEdge(edgeId()), edgeType = () => edge().type ?? "default", selectable = () => edge().selectable ?? store.elementsSelectable, focusable = () => edge().focusable ?? store.edgesFocusable, edgeComponent = () => store.edgeTypes[edgeType()], markerStartUrl = () => edge().markerStart ? `url('#${getMarkerId(edge().markerStart, store.id)}')` : void 0, markerEndUrl = () => edge().markerEnd ? `url('#${getMarkerId(edge().markerEnd, store.id)}')` : void 0, onClick = (event) => {
+	let edgeRef, { store, actions } = useInternalSolidFlow(), edgeId = () => props.edgeId, edge = () => actions.getEdge(edgeId()), edgeType = () => edge().type ?? "default", selectable = () => isEdgeSelectable(edge(), store), focusable = () => edge().focusable ?? store.edgesFocusable, edgeComponent = () => store.edgeTypes[edgeType()], markerStartUrl = () => edge().markerStart ? `url('#${getMarkerId(edge().markerStart, store.id)}')` : void 0, markerEndUrl = () => edge().markerEnd ? `url('#${getMarkerId(edge().markerEnd, store.id)}')` : void 0, onClick = (event) => {
 		selectable() && actions.handleEdgeSelection(edgeId()), props.onEdgeClick?.({
 			edge: edge(),
 			event
 		});
-	}, onPointerEvent = (event, type) => {
-		({
-			contextmenu: props.onEdgeContextMenu,
-			pointerenter: props.onEdgePointerEnter,
-			pointerleave: props.onEdgePointerLeave
-		})[type]?.({
-			edge: edge(),
-			event
-		});
-	}, onKeyDown = (event) => {
+	}, onContextMenu = (event) => props.onEdgeContextMenu?.({
+		edge: edge(),
+		event
+	}), onPointerEnter = (event) => props.onEdgePointerEnter?.({
+		edge: edge(),
+		event
+	}), onPointerLeave = (event) => props.onEdgePointerLeave?.({
+		edge: edge(),
+		event
+	}), onKeyDown = (event) => {
 		store.disableKeyboardA11y || !elementSelectionKeys.includes(event.key) || !selectable() || (event.key === "Escape" ? actions.unselectNodesAndEdges({ edges: [edge()] }) : actions.addSelectedEdges([edge().id]));
 	}, ariaLabel = () => edge().ariaLabel ?? `Edge from ${edge().source} to ${edge().target}`, culled = createMemo(() => isEdgeCulled(edge(), store.cullingViewport));
 	return <EdgeIdContext value={edgeId}>
@@ -1290,7 +1518,7 @@ const createLayoutedEdges = (source) => {
 			selectable: !!selectable()
 		},
 		edge().class
-	]} onClick={onClick} onKeyDown={(e) => focusable() && onKeyDown(e)} onContextMenu={(e) => onPointerEvent(e, "contextmenu")} onPointerEnter={(e) => onPointerEvent(e, "pointerenter")} onPointerLeave={(e) => onPointerEvent(e, "pointerleave")} {...edge().domAttributes}>
+	]} onClick={onClick} onKeyDown={(e) => focusable() && onKeyDown(e)} onContextMenu={onContextMenu} onPointerEnter={onPointerEnter} onPointerLeave={onPointerLeave} {...edge().domAttributes}>
             <Dynamic component={edgeComponent()} id={edge().id} source={edge().source} target={edge().target} sourceX={edge().sourceX} sourceY={edge().sourceY} targetX={edge().targetX} targetY={edge().targetY} sourcePosition={edge().sourcePosition} targetPosition={edge().targetPosition} animated={edge().animated} selected={edge().selected} label={edge().label} labelStyle={edge().labelStyle} data={edge().data} style={edge().style} interactionWidth={edge().interactionWidth} selectable={selectable()} deletable={edge().deletable ?? !0} type={edgeType()} sourceHandleId={edge().sourceHandle} targetHandleId={edge().targetHandle} markerStart={markerStartUrl()} markerEnd={markerEndUrl()} />
           </g>
         </svg>
@@ -1414,7 +1642,10 @@ const Handle = (props) => {
 		position: "top",
 		isConnectableStart: !0,
 		isConnectableEnd: !0
-	}), { store, nodeLookup, connections, actions } = useInternalSolidFlow(), rest = omit(_props, "id", "type", "position", "isConnectable", "isConnectableStart", "isConnectableEnd", "isValidConnection", "onConnect", "onDisconnect", "children", "class", "style"), nodeId = useNodeId(), nodeConnectable = useNodeConnectable(), connectable = () => _props.isConnectable ?? nodeConnectable(), isTarget = () => _props.type === "target", handleId = () => _props.id ?? null, connectionInProcess = () => !!store.connection.fromHandle, connectingFrom = () => store.connection.fromHandle && store.connection.fromHandle.nodeId === nodeId() && store.connection.fromHandle.type === _props.type && store.connection.fromHandle.id === handleId(), connectingTo = () => store.connection.toHandle && store.connection.toHandle.nodeId === nodeId() && store.connection.toHandle.type === _props.type && store.connection.toHandle.id === handleId(), isPossibleTargetHandle = () => store.connectionMode === "strict" ? store.connection.fromHandle?.type !== _props.type : nodeId() !== store.connection.fromHandle?.nodeId || handleId() !== store.connection.fromHandle?.id, valid = () => !!(connectingTo() && store.connection.isValid), prevConnections = null;
+	}), { store, nodeLookup, connections, actions } = useInternalSolidFlow(), rest = omit(_props, "id", "type", "position", "isConnectable", "isConnectableStart", "isConnectableEnd", "isValidConnection", "onConnect", "onDisconnect", "children", "class", "style"), nodeId = useNodeId(), nodeConnectable = useNodeConnectable(), connectable = () => _props.isConnectable ?? nodeConnectable(), isTarget = () => _props.type === "target", handleId = () => _props.id ?? null, connectionInProcess = () => !!store.connectionFromHandle, connectingFrom = () => {
+		let fromHandle = store.connectionFromHandle;
+		return fromHandle && fromHandle.nodeId === nodeId() && fromHandle.type === _props.type && fromHandle.id === handleId();
+	}, targetState = () => store.connectionTargetByHandle[connectionKey(nodeId(), _props.type, handleId())], connectingTo = () => targetState() !== void 0, isPossibleTargetHandle = () => store.connectionMode === "strict" ? store.connectionFromHandle?.type !== _props.type : nodeId() !== store.connectionFromHandle?.nodeId || handleId() !== store.connectionFromHandle?.id, valid = () => targetState() === "valid", prevConnections = null;
 	createEffect(() => {
 		if (!_props.onConnect && !_props.onDisconnect) return null;
 		let rec = connections[connectionKey(nodeId(), _props.type, _props.id)], map = /* @__PURE__ */ new Map();
@@ -1432,13 +1663,20 @@ const Handle = (props) => {
 		}, edge = store.onBeforeConnect?.(handleConnection) ?? handleConnection;
 		actions.addEdge(edge), store.onConnect?.(handleConnection);
 	}, onPointerDown = (event) => {
+		let gestureLookup = armConnectionGestureLookup({
+			event,
+			real: nodeLookup,
+			domNode: store.domNode,
+			getTransform: () => store.transform,
+			connectionRadius: store.connectionRadius
+		});
 		XYHandle.onPointerDown(event, {
 			handleId: handleId(),
 			nodeId: nodeId(),
 			isTarget: isTarget(),
 			connectionRadius: store.connectionRadius,
 			domNode: store.domNode,
-			nodeLookup,
+			nodeLookup: gestureLookup,
 			connectionMode: store.connectionMode,
 			lib: store.lib,
 			autoPanOnConnect: store.autoPanOnConnect,
@@ -1623,12 +1861,11 @@ const NodeWrapper = (props) => {
 			...h ? { height: toPxString(h) } : {}
 		};
 	}, culled = createMemo(() => isNodeCulled(node(), store.cullingViewport)), style = () => ({
+		...sizeStyle(),
 		"z-index": node().internals.z,
 		transform: transform(),
 		visibility: culled() || !nodeHasDimensions(node()) ? "hidden" : "visible",
-		"pointer-events": culled() ? "none" : void 0,
-		...sizeStyle(),
-		...node().style ?? {}
+		"pointer-events": culled() ? "none" : void 0
 	});
 	createEffect(() => ({
 		valid: nodeTypeValid(),
@@ -1888,7 +2125,7 @@ const InitialNodeTypesMap = {
 		pendingEntries = updateEntries, scheduleIdleCallback(() => {
 			let updates = new Map(pendingEntries);
 			pendingEntries = void 0;
-			let { updatedInternals, measurementWrites, changes, parentExpandChildren } = measureNodeInternals(updates, nodeLookup, store.domNode);
+			let { updatedInternals, measurementWrites, changes, parentExpandChildren } = measureNodeInternals(updates, nodeLookup, store.domNode, store.nodeExtent);
 			updatedInternals && (actions.applyMeasurementWrites(measurementWrites), flush(), parentExpandChildren.length > 0 && changes.push(...handleExpandParent(parentExpandChildren, nodeLookup, (parentId) => store.nodes.filter((node) => node.parentId === parentId), store.nodeOrigin)), actions.applyNodeChanges(changes), flush(), actions.markInitialNodesMeasured());
 		});
 	};
@@ -2038,7 +2275,7 @@ const ConnectionLine = (props) => {
 	for (let item of a) if (!b.has(item)) return !1;
 	return !0;
 }, Pane = (props) => {
-	let { store, nodeLookup, edgeLookup, connections, actions } = useInternalSolidFlow(), [containerRef, setContainerRef] = createSignal(), container, containerBounds = null, connectionEndedOnPane = !1, selectionInProgress = !1, selectedNodeIds = /* @__PURE__ */ new Set(), selectedEdgeIds = /* @__PURE__ */ new Set(), autoPanId = 0, position = {
+	let { store, nodeLookup, edgeLookup, connections, actions } = useInternalSolidFlow(), [containerRef, setContainerRef] = createSignal(), container, containerBounds = null, connectionEndedOnPane = !1, selectionInProgress = !1, selectionSpatialLookup = new GestureSpatialLookup(nodeLookup, 400), selectedNodeIds = /* @__PURE__ */ new Set(), selectedEdgeIds = /* @__PURE__ */ new Set(), autoPanId = 0, position = {
 		x: 0,
 		y: 0
 	}, autoPanStarted = !1, autoPanOnSelection = () => props.autoPanOnSelection ?? !0, paneClickDistance = () => props.paneClickDistance ?? 1, _panOnDrag = () => store.panActivationKeyPressed || props.panOnDrag, isSelecting = () => store.selectionKeyPressed || !!store.selectionRect || props.selectionOnDrag && _panOnDrag() !== !0, isSelectionEnabled = () => store.elementsSelectable && (isSelecting() || store.selectionRectMode === "user"), onClick = (event) => {
@@ -2053,7 +2290,7 @@ const ConnectionLine = (props) => {
 		if (event.pointerType === "touch" && _panOnDrag() !== !1 && !store.selectionKeyPressed || (containerBounds = container?.getBoundingClientRect() ?? null, !containerBounds)) return;
 		let eventTargetIsContainer = event.target === container, isNoKeyEvent = !eventTargetIsContainer && !!event.target.closest(".nokey"), isSelectionActive = props.selectionOnDrag && eventTargetIsContainer || store.selectionKeyPressed;
 		if (isNoKeyEvent || !isSelecting() || !isSelectionActive || event.button !== 0 || !event.isPrimary) return;
-		event.target?.setPointerCapture?.(event.pointerId), selectionInProgress = !1, autoPanStarted = !1;
+		event.target?.setPointerCapture?.(event.pointerId), selectionSpatialLookup.arm((node) => nodeToRect(node)), selectionInProgress = !1, autoPanStarted = !1;
 		let { x, y } = getEventPosition(event, containerBounds), userSelectionFlowOrigin = pointToRendererPoint({
 			x,
 			y
@@ -2080,14 +2317,21 @@ const ConnectionLine = (props) => {
 			width: Math.abs(mouseX - screenStart.x),
 			height: Math.abs(mouseY - screenStart.y)
 		}, prevSelectedNodeIds = selectedNodeIds, prevSelectedEdgeIds = selectedEdgeIds;
-		selectedNodeIds = new Set(getNodesInside(nodeLookup, nextUserSelectRect, store.transform, store.selectionMode === SelectionMode$1.Partial, !0).map((n) => n.id));
-		let edgesSelectable = store.defaultEdgeOptions.selectable ?? !0;
-		selectedEdgeIds = /* @__PURE__ */ new Set();
+		{
+			let [tx, ty, zoom] = store.transform;
+			selectionSpatialLookup.setQueryRect({
+				x: (nextUserSelectRect.x - tx) / zoom,
+				y: (nextUserSelectRect.y - ty) / zoom,
+				width: nextUserSelectRect.width / zoom,
+				height: nextUserSelectRect.height / zoom
+			});
+		}
+		selectedNodeIds = new Set(getNodesInside(selectionSpatialLookup, nextUserSelectRect, store.transform, store.selectionMode === SelectionMode$1.Partial, !0).map((n) => n.id)), selectedEdgeIds = /* @__PURE__ */ new Set();
 		for (let nodeId of selectedNodeIds) {
 			let nodeConnections = connections[nodeId];
 			if (nodeConnections) for (let { edgeId } of Object.values(nodeConnections)) {
 				let edge = edgeLookup[edgeId];
-				edge && (edge.selectable ?? edgesSelectable) && selectedEdgeIds.add(edgeId);
+				edge && isEdgeSelectable(edge, store) && selectedEdgeIds.add(edgeId);
 			}
 		}
 		isSetEqual(prevSelectedNodeIds, selectedNodeIds) || actions.setNodes((nodes) => {
@@ -2268,7 +2512,7 @@ const ConnectionLine = (props) => {
       <div class="solid-flow__selection" style={styles()} />
     </Show>;
 }, NodeSelection = (props) => {
-	let { store, nodeLookup, actions } = useInternalSolidFlow(), [ref, setRef] = createSignal(), bounds = () => store.selectionRectMode === "nodes" ? getInternalNodesBounds(nodeLookup, { filter: (node) => !!node.selected }) : null;
+	let { store, nodeLookup, actions } = useInternalSolidFlow(), [ref, setRef] = createSignal(), bounds = createMemo(() => store.selectionRectMode === "nodes" ? getInternalNodesBounds(nodeLookup, { filter: (node) => !!node.selected }) : null);
 	createEffect(() => ({
 		el: ref(),
 		focusable: !store.disableKeyboardA11y
@@ -2276,13 +2520,13 @@ const ConnectionLine = (props) => {
 		focusable && el?.focus({ preventScroll: !0 });
 	});
 	let onContextMenu = (event) => {
-		let selectedNodes = store.nodes.filter((n) => n.selected);
+		let selectedNodes = store.selectedNodes;
 		props.onSelectionContextMenu?.({
 			nodes: selectedNodes,
 			event
 		});
 	}, onClick = (event) => {
-		let selectedNodes = store.nodes.filter((n) => n.selected);
+		let selectedNodes = store.selectedNodes;
 		props.onSelectionClick?.({
 			nodes: selectedNodes,
 			event
@@ -2447,14 +2691,11 @@ const KeyHandler = (props) => {
 	}, handleWindowBlur = () => {
 		resetKeysAndSelection(), cancelPointerGestures();
 	}, handleDelete = async () => {
-		let selectedNodes = store.nodes.filter((node) => node.selected), selectedEdges = store.edges.filter((edge) => edge.selected), { deletedNodes, deletedEdges } = await deleteElements({
+		let selectedNodes = store.selectedNodes, selectedEdges = store.selectedEdges;
+		await deleteElements({
 			nodes: selectedNodes,
 			edges: selectedEdges
 		});
-		(deletedNodes.length > 0 || deletedEdges.length > 0) && store.onDelete?.({
-			nodes: deletedNodes,
-			edges: deletedEdges
-		});
 	};
 	return isServer || (createEventListenerMap(window, {
 		keydown: (event) => {
@@ -2472,34 +2713,23 @@ const KeyHandler = (props) => {
 		capture: !0,
 		passive: !0
 	})), null;
-}, SolidFlow = (props) => {
+}, FLOW_PROP_KEYS = /* @__PURE__ */ "ariaLabelConfig.ariaLiveMessage.attributionPosition.autoPanOnConnect.autoPanOnNodeDrag.autoPanOnNodeFocus.autoPanOnSelection.autoPanSpeed.class.clickConnect.colorMode.colorModeSSR.connectionDragThreshold.connectionLineComponent.connectionLineContainerStyle.connectionLineStyle.connectionLineType.connectionMode.connectionRadius.defaultEdgeOptions.defaultEdges.defaultMarkerColor.defaultNodes.deleteKey.disableKeyboardA11y.edgeTypes.edges.edgesFocusable.elementsSelectable.elevateEdgesOnSelect.elevateNodesOnSelect.fitView.fitViewOptions.height.id.initialViewport.isValidConnection.maxZoom.minZoom.multiSelectionKey.noDragClass.noPanClass.noWheelClass.nodeClickDistance.nodeDragThreshold.nodeExtent.nodeOrigin.nodeTypes.nodes.nodesConnectable.nodesDraggable.nodesFocusable.onBeforeConnect.onBeforeDelete.onBeforeReconnect.onClickConnectEnd.onClickConnectStart.onConnect.onConnectEnd.onConnectStart.onDelete.onEdgeClick.onEdgeContextMenu.onEdgePointerEnter.onEdgePointerLeave.onEdgesDelete.onFlowError.onInit.onMove.onMoveEnd.onMoveStart.onNodeClick.onNodeContextMenu.onNodeDrag.onNodeDragStart.onNodeDragStop.onNodePointerEnter.onNodePointerLeave.onNodePointerMove.onNodesDelete.onPaneClick.onPaneContextMenu.onReconnect.onReconnectEnd.onReconnectStart.onSelectionChange.onSelectionClick.onSelectionContextMenu.onSelectionDrag.onSelectionDragStart.onSelectionDragStop.onSelectionEnd.onSelectionStart.onlyRenderVisibleElements.panActivationKey.panOnDrag.panOnScroll.panOnScrollMode.panOnScrollSpeed.paneClickDistance.preventScrolling.proOptions.selectNodesOnDrag.selectionKey.selectionMode.selectionOnDrag.snapGrid.style.translateExtent.viewport.width.zIndexMode.zoomActivationKey.zoomOnDoubleClick.zoomOnPinch.zoomOnScroll".split("."), SolidFlow = (props) => {
 	let [domNodeRef, setDomNodeRef] = createSignal(), domNode, _props = merge({
 		...getDefaultFlowStateProps(),
 		colorMode: "light",
-		deleteKeyCode: "Backspace",
-		defaultViewport: {
-			x: 0,
-			y: 0,
-			zoom: 1
-		},
-		multiSelectionKeyCode: isMacOs() ? "Meta" : "Control",
 		nodeClickDistance: 0,
 		panOnScroll: !1,
-		panActivationKeyCode: "Space",
 		preventScrolling: !0,
 		panOnDrag: !0,
 		panOnScrollSpeed: .5,
 		panOnScrollMode: "free",
 		paneClickDistance: 0,
-		reconnectRadius: 10,
-		selectionKeyCode: "Shift",
 		selectionOnDrag: !1,
 		translateExtent: infiniteExtent,
-		zoomActivationKeyCode: isMacOs() ? "Meta" : "Control",
 		zoomOnPinch: !0,
 		zoomOnDoubleClick: !0,
 		zoomOnScroll: !0
-	}, props), htmlProps = omit(_props, "nodes", "edges", "nodeTypes", "edgeTypes", "width", "height", "fitView", "fitViewOptions", "nodeOrigin", "nodeDragThreshold", "paneClickDistance", "nodeClickDistance", "minZoom", "maxZoom", "zIndexMode", "initialViewport", "viewport", "translateExtent", "nodeExtent", "selectionKey", "panActivationKey", "deleteKey", "multiSelectionKey", "zoomActivationKey", "panOnDrag", "panOnScroll", "panOnScrollMode", "panOnScrollSpeed", "selectionOnDrag", "selectNodesOnDrag", "preventScrolling", "zoomOnScroll", "zoomOnDoubleClick", "zoomOnPinch", "onlyRenderVisibleElements", "autoPanOnConnect", "autoPanOnNodeDrag", "autoPanOnNodeFocus", "autoPanOnSelection", "autoPanSpeed", "connectionRadius", "connectionMode", "connectionLineType", "connectionLineComponent", "connectionLineStyle", "connectionLineContainerStyle", "connectionDragThreshold", "isValidConnection", "clickConnect", "reconnectRadius", "selectionMode", "elementsSelectable", "nodesDraggable", "nodesConnectable", "nodesFocusable", "edgesFocusable", "disableKeyboardA11y", "ariaLabelConfig", "ariaLiveMessage", "colorMode", "colorModeSSR", "class", "style", "snapGrid", "defaultMarkerColor", "defaultEdgeOptions", "elevateNodesOnSelect", "elevateEdgesOnSelect", "noDragClass", "noPanClass", "noWheelClass", "attributionPosition", "proOptions", "onInit", "onMoveStart", "onMove", "onMoveEnd", "onFlowError", "onNodeClick", "onNodeContextMenu", "onNodeDrag", "onNodeDragStart", "onNodeDragStop", "onNodePointerEnter", "onNodePointerMove", "onNodePointerLeave", "onEdgeClick", "onEdgeContextMenu", "onEdgePointerEnter", "onEdgePointerLeave", "onPaneClick", "onPaneContextMenu", "onSelectionChange", "onSelectionClick", "onSelectionContextMenu", "onSelectionDrag", "onSelectionDragStart", "onSelectionDragStop", "onSelectionStart", "onSelectionEnd", "onConnect", "onConnectStart", "onConnectEnd", "onReconnect", "onReconnectStart", "onReconnectEnd", "onClickConnectStart", "onClickConnectEnd", "onBeforeConnect", "onBeforeReconnect", "onDelete", "onBeforeDelete", "deleteKeyCode", "selectionKeyCode", "panActivationKeyCode", "multiSelectionKeyCode", "zoomActivationKeyCode", "children"), TypedSolidFlowContext = SolidFlowContext, solidFlow = useContext(TypedSolidFlowContext) ?? createSolidFlow(_props), { store, actions } = solidFlow;
+	}, props), htmlProps = omit(_props, ...FLOW_PROP_KEYS, "children"), TypedSolidFlowContext = SolidFlowContext, solidFlow = useContext(TypedSolidFlowContext) ?? createSolidFlow(_props), { store, actions } = solidFlow;
 	onSettled(() => (actions.applyInitialFitView(_props.fitView), actions.setConfig(_props), actions.setDomNode(domNode), () => {
 		actions.reset();
 	})), createEffect(() => domNodeRef(), (el) => {
@@ -2508,11 +2738,6 @@ const KeyHandler = (props) => {
 			actions.setWidth(el.clientWidth), actions.setHeight(el.clientHeight);
 		});
 		return observer.observe(el), () => observer.disconnect();
-	}), createEffect(() => ({
-		panZoom: store.panZoom,
-		distance: _props.paneClickDistance
-	}), ({ panZoom, distance }) => {
-		panZoom?.setClickDistance(distance);
 	});
 	let selectedElements = createMemo(() => ({
 		nodes: store.selectedNodes,
@@ -2521,7 +2746,7 @@ const KeyHandler = (props) => {
 	createEffect(() => selectedElements(), (params) => {
 		untrack(() => _props.onSelectionChange)?.(params);
 	});
-	let rootStyle = () => ({
+	let asyncSeedGuard = () => (_props.nodes?.length, _props.edges?.length, null), rootStyle = () => ({
 		width: toPxString(_props.width),
 		height: toPxString(_props.height),
 		..._props.style
@@ -2541,12 +2766,13 @@ const KeyHandler = (props) => {
 		});
 	}} {...htmlProps}>
       <TypedSolidFlowContext value={solidFlow}>
+        {asyncSeedGuard()}
         <KeyHandler selectionKey={_props.selectionKey} deleteKey={_props.deleteKey} panActivationKey={_props.panActivationKey} multiSelectionKey={_props.multiSelectionKey} zoomActivationKey={_props.zoomActivationKey} />
         <Zoom panOnScrollMode={_props.panOnScrollMode} preventScrolling={_props.preventScrolling} zoomOnScroll={_props.zoomOnScroll} zoomOnDoubleClick={_props.zoomOnDoubleClick} zoomOnPinch={_props.zoomOnPinch} panOnScroll={_props.panOnScroll} panOnScrollSpeed={_props.panOnScrollSpeed} panOnDrag={_props.panOnDrag} paneClickDistance={_props.paneClickDistance} selectionOnDrag={_props.selectionOnDrag} onMoveStart={_props.onMoveStart} onMove={_props.onMove} onMoveEnd={_props.onMoveEnd} onViewportInitialized={_props.onInit} initialViewport={_props.viewport || _props.initialViewport}>
           <Pane onPaneClick={_props.onPaneClick} onPaneContextMenu={_props.onPaneContextMenu} onSelectionStart={_props.onSelectionStart} onSelectionEnd={_props.onSelectionEnd} panOnDrag={_props.panOnDrag} selectionOnDrag={_props.selectionOnDrag} paneClickDistance={_props.paneClickDistance} autoPanOnSelection={_props.autoPanOnSelection}>
             <Viewport>
               <div class="solid-flow__container solid-flow__viewport-back" />
-              <EdgeRenderer reconnectRadius={_props.reconnectRadius} onEdgeClick={_props.onEdgeClick} onEdgeContextMenu={_props.onEdgeContextMenu} onEdgePointerEnter={_props.onEdgePointerEnter} onEdgePointerLeave={_props.onEdgePointerLeave} defaultEdgeOptions={_props.defaultEdgeOptions} />
+              <EdgeRenderer onEdgeClick={_props.onEdgeClick} onEdgeContextMenu={_props.onEdgeContextMenu} onEdgePointerEnter={_props.onEdgePointerEnter} onEdgePointerLeave={_props.onEdgePointerLeave} />
               <div class="solid-flow__container solid-flow__edge-labels" />
               <ConnectionLine type={_props.connectionLineType} component={_props.connectionLineComponent} containerStyle={_props.connectionLineContainerStyle} style={_props.connectionLineStyle} />
               <NodeRenderer nodeClickDistance={_props.nodeClickDistance} onNodeClick={_props.onNodeClick} onNodeContextMenu={_props.onNodeContextMenu} onNodePointerEnter={_props.onNodePointerEnter} onNodePointerMove={_props.onNodePointerMove} onNodePointerLeave={_props.onNodePointerLeave} onNodeDrag={_props.onNodeDrag} onNodeDragStart={_props.onNodeDragStart} onNodeDragStop={_props.onNodeDragStop} />
@@ -2870,24 +3096,23 @@ const DotPattern = (props) => {
 		nodeBorderRadius: 5,
 		nodeStrokeWidth: 2,
 		style: {}
-	}), paneProps = omit(_props, "class", "style", "position", "nodeClass", "nodeStrokeColor", "nodeColor", "pannable", "zoomable", "inversePan", "zoomStep", "bgColor", "width", "height", "maskColor", "maskStrokeColor", "maskStrokeWidth", "nodeBorderRadius", "nodeStrokeWidth", "nodeComponent", "onClick", "onNodeClick"), nodeColorFunc = () => _props.nodeColor === void 0 ? void 0 : getAttrFunction(_props.nodeColor), nodeStrokeColorFunc = () => getAttrFunction(_props.nodeStrokeColor), nodeClassFunc = () => getAttrFunction(_props.nodeClass), shapeRendering = () => typeof window > "u" || window.chrome ? "crispEdges" : "geometricPrecision", labelledBy = createMemo(() => `solid-flow__minimap-desc-${store.id}`), getViewBB = () => ({
+	}), paneProps = omit(_props, "class", "style", "position", "nodeClass", "nodeStrokeColor", "nodeColor", "pannable", "zoomable", "inversePan", "zoomStep", "bgColor", "width", "height", "maskColor", "maskStrokeColor", "maskStrokeWidth", "nodeBorderRadius", "nodeStrokeWidth", "nodeComponent", "onClick", "onNodeClick"), nodeColorFunc = () => _props.nodeColor === void 0 ? void 0 : getAttrFunction(_props.nodeColor), nodeStrokeColorFunc = () => getAttrFunction(_props.nodeStrokeColor), nodeClassFunc = () => getAttrFunction(_props.nodeClass), shapeRendering = typeof window > "u" || window.chrome ? "crispEdges" : "geometricPrecision", labelledBy = createMemo(() => `solid-flow__minimap-desc-${store.id}`), viewBB = createMemo(() => ({
 		x: -store.viewport.x / store.viewport.zoom,
 		y: -store.viewport.y / store.viewport.zoom,
 		width: store.width / store.viewport.zoom,
 		height: store.height / store.viewport.zoom
-	}), getBoundingRect = () => {
-		let viewBB = getViewBB();
-		return nodeLookup.size > 0 ? getBoundsOfRects(getInternalNodesBounds(nodeLookup), viewBB) : viewBB;
-	}, getScaledWidth = () => getBoundingRect().width / _props.width, getScaledHeight = () => getBoundingRect().height / _props.height, getViewScale = () => Math.max(getScaledWidth(), getScaledHeight()), getViewWidth = () => getViewScale() * _props.width, getViewHeight = () => getViewScale() * _props.height, getOffset = () => 5 * getViewScale(), getX = () => {
-		let boundingRect = getBoundingRect();
-		return boundingRect.x - (getViewWidth() - boundingRect.width) / 2 - getOffset();
+	})), boundingRect = createMemo(() => {
+		let view = viewBB();
+		if (nodeLookup.size === 0) return view;
+		let bounds = getInternalNodesBounds(nodeLookup);
+		return !Number.isFinite(bounds.x) || !Number.isFinite(bounds.width) ? view : getBoundsOfRects(bounds, view);
+	}), viewScale = createMemo(() => Math.max(boundingRect().width / _props.width, boundingRect().height / _props.height)), getViewWidth = () => viewScale() * _props.width, getViewHeight = () => viewScale() * _props.height, getOffset = () => 5 * viewScale(), getX = () => {
+		let rect = boundingRect();
+		return rect.x - (getViewWidth() - rect.width) / 2 - getOffset();
 	}, getY = () => {
-		let boundingRect = getBoundingRect();
-		return boundingRect.y - (getViewHeight() - boundingRect.height) / 2 - getOffset();
-	}, getViewboxWidth = () => getViewWidth() + getOffset() * 2, getViewboxHeight = () => getViewHeight() + getOffset() * 2, strokeWidth = () => _props.maskStrokeWidth ? _props.maskStrokeWidth * getViewScale() : void 0, prevNodeIds = [], nodeIds = () => {
-		let currentNodeIds = store.nodes.map((node) => node.id), currentSet = new Set(currentNodeIds);
-		return (prevNodeIds.length !== currentNodeIds.length || !prevNodeIds.every((id) => currentSet.has(id))) && (prevNodeIds = currentNodeIds), prevNodeIds;
-	};
+		let rect = boundingRect();
+		return rect.y - (getViewHeight() - rect.height) / 2 - getOffset();
+	}, getViewboxWidth = () => getViewWidth() + getOffset() * 2, getViewboxHeight = () => getViewHeight() + getOffset() * 2, strokeWidth = () => _props.maskStrokeWidth ? _props.maskStrokeWidth * viewScale() : void 0, nodeIds = createMemo(() => store.nodes.map((node) => node.id), { equals: (a, b) => a.length === b.length && a.every((id, i) => id === b[i]) });
 	return <Panel position={_props.position} data-testid="solid-flow__minimap" class={["solid-flow__minimap", _props.class]} style={{
 		"--xy-minimap-background-color-props": _props.bgColor,
 		..._props.style
@@ -2904,7 +3129,7 @@ const DotPattern = (props) => {
 				domNode: el,
 				panZoom,
 				getTransform: () => store.transform,
-				getViewScale
+				getViewScale: viewScale
 			});
 			return setMinimap(instance), () => {
 				instance.destroy();
@@ -2944,12 +3169,12 @@ const DotPattern = (props) => {
                 {(nodeId) => {
 			let node = createMemo(() => nodeLookup.get(nodeId())), nodeVisible = () => !!(node() && nodeHasDimensions(node()) && !node().hidden);
 			return <Show when={nodeVisible() && getNodeDimensions(node())}>
-                      {(nodeDimensions) => <Dynamic component={_props.nodeComponent ?? MiniMapNode} id={nodeId()} x={node().internals.positionAbsolute.x} y={node().internals.positionAbsolute.y} borderRadius={_props.nodeBorderRadius} strokeWidth={_props.nodeStrokeWidth} shapeRendering={shapeRendering()} width={nodeDimensions().width} height={nodeDimensions().height} selected={node().selected} color={nodeColorFunc()?.call(null, node())} strokeColor={nodeStrokeColorFunc().call(null, node())} class={nodeClassFunc().call(null, node())} style={node().style} onClick={_props.onNodeClick ? onSvgNodeClick : void 0} />}
+                      {(nodeDimensions) => <Dynamic component={_props.nodeComponent ?? MiniMapNode} id={nodeId()} x={node().internals.positionAbsolute.x} y={node().internals.positionAbsolute.y} borderRadius={_props.nodeBorderRadius} strokeWidth={_props.nodeStrokeWidth} shapeRendering={shapeRendering} width={nodeDimensions().width} height={nodeDimensions().height} selected={node().selected} color={nodeColorFunc()?.call(null, node())} strokeColor={nodeStrokeColorFunc().call(null, node())} class={nodeClassFunc().call(null, node())} style={node().style} onClick={_props.onNodeClick ? onSvgNodeClick : void 0} />}
                     </Show>;
 		}}
               </For>
               <path class="solid-flow__minimap-mask" d={`M${getX() - getOffset()},${getY() - getOffset()}h${getViewboxWidth() + getOffset() * 2}v${getViewboxHeight() + getOffset() * 2}h${-getViewboxWidth() - getOffset() * 2}z
-            M${getViewBB().x},${getViewBB().y}h${getViewBB().width}v${getViewBB().height}h${-getViewBB().width}z`} fill-rule="evenodd" pointer-events="none" />
+            M${viewBB().x},${viewBB().y}h${viewBB().width}v${viewBB().height}h${-viewBB().width}z`} fill-rule="evenodd" pointer-events="none" />
             </svg>;
 	}}
       </Show>