fix: support keyboard map area selection
This commit is contained in:
parent
381a21015c
commit
aaf0876b63
@ -89,15 +89,28 @@ export default function LocationMapCanvas({
|
|||||||
setDragState(null);
|
setDragState(null);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const selectObject = (object) => {
|
||||||
|
if (mode === "view" || canEditObjects) {
|
||||||
|
setSelectedObjectKey(getObjectKey(object));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const handleObjectClick = (event, object) => {
|
const handleObjectClick = (event, object) => {
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
if (suppressPanClickRef.current) {
|
if (suppressPanClickRef.current) {
|
||||||
suppressPanClickRef.current = false;
|
suppressPanClickRef.current = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (mode === "view" || canEditObjects) {
|
selectObject(object);
|
||||||
setSelectedObjectKey(getObjectKey(object));
|
};
|
||||||
|
|
||||||
|
const handleObjectKeyDown = (event, object) => {
|
||||||
|
if (!["Enter", " ", "Spacebar"].includes(event.key)) {
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
event.stopPropagation();
|
||||||
|
event.preventDefault();
|
||||||
|
selectObject(object);
|
||||||
};
|
};
|
||||||
|
|
||||||
const clearSelection = () => {
|
const clearSelection = () => {
|
||||||
@ -242,8 +255,11 @@ export default function LocationMapCanvas({
|
|||||||
rx="12"
|
rx="12"
|
||||||
role="button"
|
role="button"
|
||||||
aria-label={`Map area ${object.label || index + 1}`}
|
aria-label={`Map area ${object.label || index + 1}`}
|
||||||
|
aria-pressed={isSelected}
|
||||||
|
tabIndex={mode === "view" || canEditObjects ? 0 : -1}
|
||||||
onPointerDown={(event) => startDrag(event, object, "move")}
|
onPointerDown={(event) => startDrag(event, object, "move")}
|
||||||
onClick={(event) => handleObjectClick(event, object)}
|
onClick={(event) => handleObjectClick(event, object)}
|
||||||
|
onKeyDown={(event) => handleObjectKeyDown(event, object)}
|
||||||
/>
|
/>
|
||||||
{filters.showLabels ? (
|
{filters.showLabels ? (
|
||||||
<text x={object.x + 16} y={object.y + 28} className="location-map-label">
|
<text x={object.x + 16} y={object.y + 28} className="location-map-label">
|
||||||
|
|||||||
@ -264,12 +264,22 @@
|
|||||||
cursor: grabbing;
|
cursor: grabbing;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.location-map-object rect:first-child:focus-visible {
|
||||||
|
outline: none;
|
||||||
|
stroke: #bfdbfe;
|
||||||
|
stroke-width: 4;
|
||||||
|
}
|
||||||
|
|
||||||
.location-map-object.is-selected rect:first-child {
|
.location-map-object.is-selected rect:first-child {
|
||||||
fill: rgba(20, 184, 166, 0.34);
|
fill: rgba(20, 184, 166, 0.34);
|
||||||
stroke: rgb(45, 212, 191);
|
stroke: rgb(45, 212, 191);
|
||||||
stroke-width: 4;
|
stroke-width: 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.location-map-object.is-selected rect:first-child:focus-visible {
|
||||||
|
stroke: rgb(45, 212, 191);
|
||||||
|
}
|
||||||
|
|
||||||
.location-map-label {
|
.location-map-label {
|
||||||
fill: #f8fafc;
|
fill: #f8fafc;
|
||||||
font-size: 24px;
|
font-size: 24px;
|
||||||
|
|||||||
@ -1082,6 +1082,75 @@ test("viewer handles empty and many-item zone panels without default pins", asyn
|
|||||||
await expect(page.locator(".location-map-pin")).toHaveCount(0);
|
await expect(page.locator(".location-map-pin")).toHaveCount(0);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("viewer map areas are keyboard selectable", async ({ page }) => {
|
||||||
|
await mockMapShell(page);
|
||||||
|
|
||||||
|
const mapState = publishedMapState([
|
||||||
|
{
|
||||||
|
id: 1571,
|
||||||
|
location_map_id: 901,
|
||||||
|
zone_id: 501,
|
||||||
|
zone_name: "Bakery",
|
||||||
|
type: "zone",
|
||||||
|
label: "Bakery",
|
||||||
|
x: 40,
|
||||||
|
y: 40,
|
||||||
|
width: 260,
|
||||||
|
height: 160,
|
||||||
|
rotation: 0,
|
||||||
|
locked: false,
|
||||||
|
visible: true,
|
||||||
|
sort_order: 1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 1572,
|
||||||
|
location_map_id: 901,
|
||||||
|
zone_id: 502,
|
||||||
|
zone_name: "Frozen Foods",
|
||||||
|
type: "zone",
|
||||||
|
label: "Frozen Foods",
|
||||||
|
x: 340,
|
||||||
|
y: 40,
|
||||||
|
width: 260,
|
||||||
|
height: 160,
|
||||||
|
rotation: 0,
|
||||||
|
locked: false,
|
||||||
|
visible: true,
|
||||||
|
sort_order: 2,
|
||||||
|
},
|
||||||
|
], true);
|
||||||
|
|
||||||
|
await page.route("**/households/1/locations/10/map", async (route) => {
|
||||||
|
await route.fulfill({
|
||||||
|
status: 200,
|
||||||
|
contentType: "application/json",
|
||||||
|
body: JSON.stringify(mapState),
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
await page.goto("/stores/100/locations/10/map");
|
||||||
|
|
||||||
|
const bakeryArea = page.getByRole("button", { name: "Map area Bakery" });
|
||||||
|
const frozenArea = page.getByRole("button", { name: "Map area Frozen Foods" });
|
||||||
|
await expect(bakeryArea).toHaveAttribute("aria-pressed", "false");
|
||||||
|
|
||||||
|
await bakeryArea.focus();
|
||||||
|
await expect(bakeryArea).toBeFocused();
|
||||||
|
await page.keyboard.press("Enter");
|
||||||
|
await expect(bakeryArea).toHaveAttribute("aria-pressed", "true");
|
||||||
|
await expect(page.locator(".location-map-sheet-header strong")).toHaveText("Bakery");
|
||||||
|
await expect(page.locator(".location-map-sheet-count")).toHaveText("2 items");
|
||||||
|
await expect(page.getByText("french bread")).toBeVisible();
|
||||||
|
|
||||||
|
await frozenArea.focus();
|
||||||
|
await expect(frozenArea).toBeFocused();
|
||||||
|
await page.keyboard.press("Space");
|
||||||
|
await expect(frozenArea).toHaveAttribute("aria-pressed", "true");
|
||||||
|
await expect(bakeryArea).toHaveAttribute("aria-pressed", "false");
|
||||||
|
await expect(page.locator(".location-map-sheet-header strong")).toHaveText("Frozen Foods");
|
||||||
|
await expect(page.locator(".location-map-sheet-count")).toHaveText("0 shown");
|
||||||
|
});
|
||||||
|
|
||||||
test("mobile fit zoom fits the map into the visible canvas", async ({ page }) => {
|
test("mobile fit zoom fits the map into the visible canvas", async ({ page }) => {
|
||||||
await page.setViewportSize({ width: 390, height: 844 });
|
await page.setViewportSize({ width: 390, height: 844 });
|
||||||
await mockMapShell(page);
|
await mockMapShell(page);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user