The mobile nav drawer's backdrop (z-40) was being painted over by the Leaflet map: `.leaflet-container` doesn't establish its own stacking context, so its internal high z-indexes (panes ~200–700, zoom controls ~1000) competed with the page and bled over the drawer overlay — the map stayed bright while the rest of the page dimmed. Add `isolation: isolate` (Tailwind `isolate`) to the map container so those z-indexes stay contained and the map sits below page overlays (menus, modals, dialogs) like any other content. Verified in the browser with the drawer open over an activity-detail map. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
164 lines
5.6 KiB
TypeScript
164 lines
5.6 KiB
TypeScript
import { useEffect, useRef } from "react";
|
||
import { MapContainer, TileLayer, GeoJSON, useMap } from "react-leaflet";
|
||
import L from "leaflet";
|
||
import type { GeoJsonObject } from "geojson";
|
||
import "leaflet/dist/leaflet.css";
|
||
|
||
function FitBounds({ data }: { data: GeoJsonObject }) {
|
||
const map = useMap();
|
||
const fitted = useRef(false);
|
||
useEffect(() => {
|
||
if (fitted.current) return;
|
||
const layer = L.geoJSON(data);
|
||
const bounds = layer.getBounds();
|
||
if (bounds.isValid()) {
|
||
map.fitBounds(bounds, { padding: [20, 20] });
|
||
fitted.current = true;
|
||
}
|
||
}, [data, map]);
|
||
return null;
|
||
}
|
||
|
||
function FlyToSegment({ segments, highlightedDay, fullData }: {
|
||
segments: Array<{ coords: number[][] }>;
|
||
highlightedDay: number | null | undefined;
|
||
fullData: GeoJsonObject;
|
||
}) {
|
||
const map = useMap();
|
||
const fullBoundsRef = useRef<L.LatLngBounds | null>(null);
|
||
|
||
useEffect(() => {
|
||
// Cache full route bounds on first render
|
||
if (!fullBoundsRef.current) {
|
||
const layer = L.geoJSON(fullData);
|
||
fullBoundsRef.current = layer.getBounds();
|
||
}
|
||
|
||
if (highlightedDay != null && highlightedDay >= 1 && highlightedDay <= segments.length) {
|
||
const seg = segments[highlightedDay - 1]!;
|
||
// coords are [lon, lat] GeoJSON format
|
||
const latlngs = seg.coords.map((c) => L.latLng(c[1]!, c[0]!));
|
||
const bounds = L.latLngBounds(latlngs);
|
||
if (bounds.isValid()) {
|
||
map.flyToBounds(bounds, { padding: [40, 40], duration: 0.2 });
|
||
}
|
||
} else if (fullBoundsRef.current?.isValid()) {
|
||
map.flyToBounds(fullBoundsRef.current, { padding: [20, 20], duration: 0.2 });
|
||
}
|
||
}, [highlightedDay, segments, fullData, map]);
|
||
|
||
return null;
|
||
}
|
||
|
||
const DAY_COLORS = ["#2563eb", "#8B6D3A", "#059669", "#9333ea", "#dc2626", "#0891b2"];
|
||
|
||
function extractGeometry(data: GeoJsonObject): number[][] | null {
|
||
const coords = (data as { type: string; coordinates?: number[][] }).coordinates
|
||
?? ((data as { features?: Array<{ geometry: { coordinates: number[][] } }> }).features?.[0]?.geometry?.coordinates);
|
||
return coords && coords.length >= 2 ? coords : null;
|
||
}
|
||
|
||
function splitGeometry(data: GeoJsonObject, numDays: number): Array<{ coords: number[][] }> {
|
||
const geometry = extractGeometry(data);
|
||
if (!geometry) return [];
|
||
const totalPoints = geometry.length;
|
||
const pointsPerDay = Math.ceil(totalPoints / numDays);
|
||
const segments: Array<{ coords: number[][] }> = [];
|
||
for (let d = 0; d < numDays; d++) {
|
||
const start = d * pointsPerDay;
|
||
const end = Math.min((d + 1) * pointsPerDay + 1, totalPoints);
|
||
if (start >= totalPoints) break;
|
||
segments.push({ coords: geometry.slice(start, end) });
|
||
}
|
||
return segments;
|
||
}
|
||
|
||
interface RouteMapProps {
|
||
geojson: string;
|
||
interactive?: boolean;
|
||
className?: string;
|
||
dayBreaks?: number[];
|
||
/** 1-based day number to highlight, or null for no highlight */
|
||
highlightedDay?: number | null;
|
||
}
|
||
|
||
export function RouteMapThumbnail({ geojson, interactive, className, dayBreaks, highlightedDay }: RouteMapProps) {
|
||
const data: GeoJsonObject = JSON.parse(geojson);
|
||
|
||
return (
|
||
<MapContainer
|
||
center={[50, 10]}
|
||
zoom={6}
|
||
// `isolate` gives the Leaflet container its own stacking context so its
|
||
// internal high z-indexes (panes ~200–700, zoom controls ~1000) stay
|
||
// contained and can't paint over page overlays like the mobile nav
|
||
// drawer's backdrop.
|
||
className={`${className ?? "h-36 w-full rounded"} isolate`}
|
||
zoomControl={interactive ?? false}
|
||
attributionControl={interactive ?? false}
|
||
dragging={interactive ?? false}
|
||
scrollWheelZoom={interactive ?? false}
|
||
doubleClickZoom={interactive ?? false}
|
||
touchZoom={interactive ?? false}
|
||
>
|
||
<TileLayer
|
||
url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
|
||
attribution={interactive ? '© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>' : undefined}
|
||
/>
|
||
{dayBreaks && dayBreaks.length > 0 ? (
|
||
<DayColoredRoute data={data} dayBreaks={dayBreaks} highlightedDay={highlightedDay} />
|
||
) : (
|
||
<GeoJSON data={data} style={{ color: "#2563eb", weight: 3, opacity: 0.8 }} />
|
||
)}
|
||
<FitBounds data={data} />
|
||
{dayBreaks && dayBreaks.length > 0 && (
|
||
<FlyToSegment
|
||
segments={splitGeometry(data, dayBreaks.length + 1)}
|
||
highlightedDay={highlightedDay}
|
||
fullData={data}
|
||
/>
|
||
)}
|
||
</MapContainer>
|
||
);
|
||
}
|
||
|
||
function DayColoredRoute({ data, dayBreaks, highlightedDay }: { data: GeoJsonObject; dayBreaks: number[]; highlightedDay?: number | null }) {
|
||
const geometry = extractGeometry(data);
|
||
if (!geometry) {
|
||
return <GeoJSON data={data} style={{ color: "#2563eb", weight: 3, opacity: 0.8 }} />;
|
||
}
|
||
|
||
const numDays = dayBreaks.length + 1;
|
||
const rawSegments = splitGeometry(data, numDays);
|
||
const segments = rawSegments.map((seg, i) => ({
|
||
...seg,
|
||
color: DAY_COLORS[i % DAY_COLORS.length]!,
|
||
}));
|
||
|
||
const isHighlighting = highlightedDay != null;
|
||
|
||
return (
|
||
<>
|
||
{segments.map((seg, i) => {
|
||
const dayNum = i + 1;
|
||
const isActive = highlightedDay === dayNum;
|
||
const segData: GeoJsonObject = {
|
||
type: "Feature",
|
||
geometry: { type: "LineString", coordinates: seg.coords },
|
||
properties: {},
|
||
} as GeoJsonObject;
|
||
return (
|
||
<GeoJSON
|
||
key={`${i}-${highlightedDay}`}
|
||
data={segData}
|
||
style={{
|
||
color: seg.color,
|
||
weight: isHighlighting ? (isActive ? 5 : 2) : 3,
|
||
opacity: isHighlighting ? (isActive ? 1 : 0.3) : 0.8,
|
||
}}
|
||
/>
|
||
);
|
||
})}
|
||
</>
|
||
);
|
||
}
|