vjrj
bc778bfd97
Ground-up hooks rewrite of the app's core map. Removes the final batch of
React-19-blocking warnings (legacy context on Map/LayersControl/TileLayer/
Marker/CircleMarker/Circle/Tooltip + ReactDOM.render from the old controls).
Core: <Map> -> <MapContainer>; .leafletElement refs (6 files) -> the map/
layer instances directly, via a <MapReady> child (useMap) + plain refs on
Marker/Circle/GeoJSON; controlled viewport (onViewportChanged + state.center/
zoom) -> <MapEvents> (useMapEvents moveend/zoomend) + imperative setView;
onClick -> eventHandlers={{click}}; Path styling -> pathOptions/style;
subsUnion takes the L.Map directly.
The 4 v1-only plugins reimplemented (new in-repo helpers under Maps/):
- react-leaflet-control -> MapControl (L.Control + createPortal)
- react-leaflet-google -> GoogleMutantLayer (createLayerComponent +
leaflet.gridlayer.googlemutant; Google Maps API already loaded by Gkeys)
- react-leaflet-fullscreen -> createControlComponent + leaflet.fullscreen
- leaflet-sleep / leaflet-graphicscale kept as vanilla (work on leaflet 1.9)
Browser-verified: /fires (tiles, OSM+Google layer switch, custom control,
fullscreen, graphic scale, pan/zoom -> re-fetch, no NaN), fire detail
(GeoJSON rect + fitBounds), home (3 maps coexist; SelectionMap draggable
marker -> updatePosition + distance circle). Console now shows 0 React
warnings on home/fires. REST smoke byte-identical.
22 lines
811 B
JavaScript
22 lines
811 B
JavaScript
import { useEffect } from 'react';
|
|
import { useMap, useMapEvents } from 'react-leaflet';
|
|
|
|
// v4 replaces the v1 `ref`/`.leafletElement` + handleLeafletLoad pattern: this
|
|
// child runs inside <MapContainer> and hands the ready Leaflet map to a class
|
|
// parent once, so the parent can drive it imperatively (setView, fitBounds,
|
|
// graphicScale, subsUnion, …).
|
|
export const MapReady = ({ onReady }) => {
|
|
const map = useMap();
|
|
useEffect(() => {
|
|
if (onReady) onReady(map);
|
|
// run once per map instance
|
|
}, [map]); // eslint-disable-line react-hooks/exhaustive-deps
|
|
return null;
|
|
};
|
|
|
|
// Bridges Leaflet map events to callbacks (replaces the v1 onMoveend /
|
|
// onViewportChanged / onZoomend props on <Map>).
|
|
export const MapEvents = ({ handlers }) => {
|
|
useMapEvents(handlers || {});
|
|
return null;
|
|
};
|