Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 37 additions & 1 deletion components/MapScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ const LAYER_TO_LAYERS: Record<keyof LayerToggles, string[]> = {
repairs: [LAYER_IDS.repairsLines],
};

// The CDN timestamp is ISO UTC; the user reads it as a local date.
function formatGeneratedAt(iso: string): string {
return new Intl.DateTimeFormat("ru-RU", {
day: "numeric",
month: "long",
}).format(new Date(iso));
}

export default function MapScreen() {
const containerRef = useRef<HTMLDivElement | null>(null);
const mapRef = useRef<maplibregl.Map | null>(null);
Expand Down Expand Up @@ -144,6 +152,32 @@ export default function MapScreen() {
}
}, [toggles, status]);

// The filters popover closes on outside interaction and Escape (the popover
// pattern); pointerdown so the map under it still gets the full click.
useEffect(() => {
if (!filtersOpen) {
return;
}
const onPointerDown = (event: PointerEvent) => {
const target = event.target as HTMLElement | null;
if (target?.closest(".panel") || target?.closest(".filter-button")) {
return;
}
setFiltersOpen(false);
};
const onKeyDown = (event: KeyboardEvent) => {
if (event.key === "Escape") {
setFiltersOpen(false);
}
};
document.addEventListener("pointerdown", onPointerDown);
document.addEventListener("keydown", onKeyDown);
return () => {
document.removeEventListener("pointerdown", onPointerDown);
document.removeEventListener("keydown", onKeyDown);
};
}, [filtersOpen]);

const retry = useCallback(() => {
const map = mapRef.current;
if (!map) {
Expand Down Expand Up @@ -226,7 +260,9 @@ export default function MapScreen() {
</button>
</span>
)}
{status === "ready" && generatedAt && <span>Данные от {generatedAt}</span>}
{status === "ready" && generatedAt && (
<span>Данные от {formatGeneratedAt(generatedAt)}</span>
)}
</div>
</div>
)}
Expand Down
Loading