From 59d69152dc2b8068051eb4898e2f6e76ab525599 Mon Sep 17 00:00:00 2001
From: trafficlunar <hello@trafficlunar.net>
Date: Fri, 31 Jan 2025 14:05:44 +0000
Subject: [PATCH] fix: air blocks not working with magic wand tool

---
 src/components/canvas/Canvas.tsx | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/components/canvas/Canvas.tsx b/src/components/canvas/Canvas.tsx
index 6c5f737..4f397d5 100644
--- a/src/components/canvas/Canvas.tsx
+++ b/src/components/canvas/Canvas.tsx
@@ -341,15 +341,17 @@ function Canvas() {
 				const visited = new Set<string>();
 				const result: CoordinateArray = [];
 				const startBlock = blocks.find((block) => block.x === mouseCoords.x && block.y === mouseCoords.y);
+				const startName = startBlock ? startBlock.name : "air";
 
-				// Return if the block is not found
-				if (!startBlock) return result;
-
-				function depthFirstSearch(block: Block) {
-					const key = `${block.x},${block.y}`;
+				function depthFirstSearch(x: number, y: number) {
+					const key = `${x},${y}`;
 					if (visited.has(key)) return;
 					visited.add(key);
-					result.push([block.x, block.y]);
+
+					const withinCanvas = x >= canvasSize.minX && x < canvasSize.maxX && y >= canvasSize.minY && y < canvasSize.maxY;
+					if (!withinCanvas) return;
+
+					result.push([x, y]);
 
 					// Directions for adjacent blocks (up, down, left, right)
 					const directions = [
@@ -360,17 +362,18 @@ function Canvas() {
 					];
 
 					for (const { dx, dy } of directions) {
-						const newX = block.x + dx;
-						const newY = block.y + dy;
-						const adjacentBlock = blocks.find((b) => b.x === newX && b.y === newY && b.name === block.name);
+						const newX = x + dx;
+						const newY = y + dy;
+						const adjacentBlock = blocks.find((b) => b.x === newX && b.y === newY);
+						const adjacentName = adjacentBlock ? adjacentBlock.name : "air";
 
-						if (adjacentBlock) {
-							depthFirstSearch({ ...block, x: newX, y: newY });
+						if (adjacentName === startName) {
+							depthFirstSearch(newX, newY);
 						}
 					}
 				}
 
-				depthFirstSearch({ name: startBlock.name, x: mouseCoords.x, y: mouseCoords.y });
+				depthFirstSearch(mouseCoords.x, mouseCoords.y);
 				setSelectionCoords((prev) => {
 					if (holdingAltRef.current) {
 						// If holding alt, remove new magic wand selection
@@ -402,7 +405,7 @@ function Canvas() {
 			default:
 				break;
 		}
-	}, [tool, holdingAltRef, scale, mouseCoords, blocks, setSelectionCoords, setSelectedBlock, zoom]);
+	}, [tool, holdingAltRef, scale, mouseCoords, blocks, canvasSize, setSelectionCoords, setSelectedBlock, zoom]);
 
 	const onKeyDown = useCallback(
 		async (e: KeyboardEvent) => {