From 662fdbb6c5314255d212322c554653530bffc4ec Mon Sep 17 00:00:00 2001
From: Nico <Nico>
Date: Tue, 16 Jun 2026 00:03:49 -0700
Subject: [PATCH] fix: close selected map area with escape

---
 frontend/src/pages/LocationMapManager.jsx   | 26 +++++++++++++++++++++
 frontend/tests/location-map-manager.spec.ts | 11 +++++++++
 2 files changed, 37 insertions(+)

diff --git a/frontend/src/pages/LocationMapManager.jsx b/frontend/src/pages/LocationMapManager.jsx
index f968988..72c2d75 100644
--- a/frontend/src/pages/LocationMapManager.jsx
+++ b/frontend/src/pages/LocationMapManager.jsx
@@ -24,6 +24,10 @@ import useUnsavedMapLeaveGuard from "../hooks/useUnsavedMapLeaveGuard";
 import { getMapStatus } from "../lib/locationMapUtils";
 import "../styles/pages/LocationMapManager.css";
 
+function isTextEditingTarget(target) {
+  return Boolean(target?.closest?.("input, textarea, select, [contenteditable]"));
+}
+
 export default function LocationMapManager() {
   const { storeId, locationId } = useParams();
   const navigate = useNavigate();
@@ -228,6 +232,28 @@ export default function LocationMapManager() {
     performBackNavigation,
   });
 
+  useEffect(() => {
+    const hasOpenModal = Boolean(buyModalItem || pendingDeleteObject || pendingLeaveTarget);
+    if (!selectedObjectKey || layersOpen || hasOpenModal || typeof window === "undefined") {
+      return undefined;
+    }
+
+    const handleKeyDown = (event) => {
+      if (
+        event.defaultPrevented ||
+        event.key !== "Escape" ||
+        isTextEditingTarget(event.target)
+      ) {
+        return;
+      }
+
+      setSelectedObjectKey(null);
+    };
+
+    window.addEventListener("keydown", handleKeyDown);
+    return () => window.removeEventListener("keydown", handleKeyDown);
+  }, [buyModalItem, layersOpen, pendingDeleteObject, pendingLeaveTarget, selectedObjectKey, setSelectedObjectKey]);
+
   if (!hasLoaded || householdLoading || loading) {
     return (
       <LocationMapMessageState
diff --git a/frontend/tests/location-map-manager.spec.ts b/frontend/tests/location-map-manager.spec.ts
index e9ec1ff..cb5f04b 100644
--- a/frontend/tests/location-map-manager.spec.ts
+++ b/frontend/tests/location-map-manager.spec.ts
@@ -2437,6 +2437,17 @@ test("admin selected map area uses compact editable fields", async ({ page }) =>
   await expect(page.getByRole("spinbutton", { name: "Y" })).toHaveCount(0);
   await expect(page.getByRole("spinbutton", { name: "W" })).toHaveCount(0);
   await expect(page.getByRole("spinbutton", { name: "H" })).toHaveCount(0);
+
+  await page.getByRole("textbox", { name: "Label" }).focus();
+  await page.keyboard.press("Escape");
+  await expect(page.getByRole("textbox", { name: "Label" })).toBeVisible();
+  await expect(page.locator(".location-map-object.is-selected")).toHaveCount(1);
+
+  await page.getByRole("button", { name: "Visible" }).focus();
+  await page.keyboard.press("Escape");
+  await expect(page.getByRole("textbox", { name: "Label" })).toHaveCount(0);
+  await expect(page.locator(".location-map-object.is-selected")).toHaveCount(0);
+  await expect(page.locator(".location-map-sheet-header strong")).toHaveText("Edit Areas");
 });
 
 test("admin save progress locks draft controls", async ({ page }) => {