@mapcomponents/react-maplibre 0.1.57 → 0.1.58

package/src/components/MlShareMapState/MlShareMapState.js

@@ -6,10 +6,10 @@ import { v4 as uuidv4 } from "uuid";
 import useMapState from "../../hooks/useMapState";
 
 const getCurrentUrlParameters = () => {
-  let currentParams = Object.fromEntries(new URLSearchParams(window.location.search));
-  currentParams.layers = JSON.parse(currentParams?.layers ? currentParams.layers : "[]");
+	let currentParams = Object.fromEntries(new URLSearchParams(window.location.search));
+	currentParams.layers = JSON.parse(currentParams?.layers ? currentParams.layers : "[]");
 
-  return currentParams;
+	return currentParams;
 };
 
 const initialUrlParams = getCurrentUrlParameters();
@@ -23,211 +23,211 @@ const initialUrlParams = getCurrentUrlParameters();
  * @component
  */
 const MlShareMapState = (props) => {
-  // Use a useRef hook to reference the layer object to be able to access it later inside useEffect hooks
-  const mapContext = useContext(MapContext);
-  const initializedRef = useRef(false);
-  const mapRef = useRef(undefined);
-  const [map, setMap] = useState(undefined);
-  const layersFromUrlParamsRef = useRef({});
-  const componentId = useRef((props.idPrefix ? props.idPrefix : "MlShareMapState-") + uuidv4());
-  const mapState = useMapState({
-    watch: {
-      viewport: false,
-      layers: true,
-      sources: false,
-    },
-    filter: {
-      includeBaseLayers: false,
-    },
-  });
-
-  const allStatesRestoredRef = useRef(false);
-  const layerStatesRestored = useRef(undefined);
-  const restoredStatesRef = useRef({
-    viewport: {
-      center: false,
-      bearing: false,
-      pitch: false,
-      zoom: false,
-    },
-    layers: {
-      ...layersFromUrlParamsRef,
-    },
-  });
-
-  // initial URL-Params
-  const mapStateRef = useRef({});
-
-  const refreshUrlParameters = useCallback(() => {
-    if (!props.active) return;
-
-    let mapLayers = [];
-    for (let x in mapState.layers) {
-      mapLayers.push({
-        id: mapState.layers[x].id,
-        type: mapState.layers[x].type,
-        visible: mapState.layers[x].visible,
-      });
-    }
-    refreshMapState();
-    let urlParams = new URLSearchParams({
-      ...getCurrentUrlParameters(),
-      ...mapStateRef.current,
-      layers: JSON.stringify(mapLayers),
-    });
-    JSON.parse(Object.fromEntries(urlParams).layers).forEach((el) => {
-      layersFromUrlParamsRef.current[el.id] = false;
-    });
-
-    let currentParams = new URLSearchParams(window.location.search);
-    checkRestorationStates(mapState.layers);
-    if (urlParams.toString() !== currentParams.toString()) {
-      window.history.pushState(
-        { ...mapStateRef.current },
-        document.title,
-        "?" + urlParams.toString()
-      );
-    }
-  }, [mapState.layers, props.active]);
-
-  useEffect(() => {
-    let _componentId = componentId.current;
-
-    mapStateRef.current = getCurrentUrlParameters();
-
-    return () => {
-      // This is the cleanup function, it is called when this react component is removed from react-dom
-      // try to remove anything this component has added to the MapLibre-gl instance
-      // e.g.: remove the layer
-      // mapContext.getMap(props.mapId).removeLayer(layerRef.current);
-      // check for the existence of map.style before calling getLayer or getSource
-
-      if (mapRef.current) {
-        mapRef.current.cleanup(_componentId);
-        mapRef.current = undefined;
-      }
-      initializedRef.current = false;
-    };
-  }, []);
-
-  useEffect(() => {
-    if (!mapRef.current) return;
-
-    refreshUrlParameters();
-  }, [refreshUrlParameters]);
-
-  useEffect(() => {
-    if (!mapRef.current) return;
-
-    let _refreshUrlParameters = refreshUrlParameters;
-
-    mapRef.current.on("moveend", _refreshUrlParameters, componentId.current);
-
-    return () => {
-      mapRef.current?.off("moveend", _refreshUrlParameters);
-    };
-  }, [refreshUrlParameters, map]);
-
-  useEffect(() => {
-    if (!mapContext.mapExists(props.mapId) || initializedRef.current) return;
-    // the MapLibre-gl instance (mapContext.getMap(props.mapId)) is accessible here
-    // initialize the layer and add it to the MapLibre-gl instance or do something else with it
-    initializedRef.current = true;
-    mapRef.current = mapContext.getMap(props.mapId);
-    setMap(mapRef.current);
-    if (mapStateRef.current.lat && mapStateRef.current.lng) {
-      restoreViewportState();
-    }
-  }, [mapContext.mapIds, mapContext, props.mapId, props.active]);
-
-  useEffect(() => {
-    if (!mapState?.layers?.length) return;
-
-    if (typeof layerStatesRestored.current === "undefined") {
-      layerStatesRestored.current = {};
-      initialUrlParams?.layers.forEach((layer) => {
-        layerStatesRestored.current[layer.id] = false;
-      });
-    }
-
-    for (let key in layerStatesRestored.current) {
-      let _allDone = true;
-      if (layerStatesRestored.current[key] === false) {
-        _allDone = false;
-      }
-      if (_allDone) {
-        return;
-      }
-    }
-
-    if (initialUrlParams.layers) {
-      initialUrlParams.layers.forEach((layer) => {
-        if (mapRef.current?.getLayer(layer.id) && layerStatesRestored.current[layer.id] === false) {
-          layerStatesRestored.current[layer.id] = true;
-          mapRef.current
-            ?.getLayer(layer.id)
-            ?.setLayoutProperty("visibility", layer.visible ? "visible" : "none");
-        }
-      });
-    }
-  }, [mapState.layers, props.mapId, props.active]);
-
-  useEffect(() => {
-    if (!map) return;
-    if (!mapState.layers) return;
-
-    if (!props.active) {
-      map.cleanup(componentId.current);
-    }
-  }, [props.active, map, mapState.layers]);
-
-  const refreshMapState = () => {
-    mapStateRef.current.lat = mapRef.current.getCenter().lat;
-    mapStateRef.current.lng = mapRef.current.getCenter().lng;
-    mapStateRef.current.zoom = mapRef.current.getZoom();
-    mapStateRef.current.bearing = mapRef.current.getBearing();
-    mapStateRef.current.pitch = mapRef.current.getPitch();
-  };
-
-  const checkRestorationStates = (stateArray) => {
-    let tempArray = {};
-    stateArray.forEach((el, i, arr) => {
-      if (!arr[el.key]) tempArray[el.key] = true;
-    });
-  };
-
-  const restoreViewportState = () => {
-    if (!restoredStatesRef.current.viewport.center) {
-      restoredStatesRef.current.viewport.center = true;
-      mapRef.current.setCenter([mapStateRef.current.lng, mapStateRef.current.lat]);
-      mapRef.current.setZoom(mapStateRef.current.zoom);
-      mapRef.current.setBearing(mapStateRef.current.bearing);
-      mapRef.current.setPitch(mapStateRef.current.pitch);
-    }
-
-    allStatesRestoredRef.current = true;
-  };
-
-  window.onpopstate = (event) => {
-    if (event.state && event.state.lng && event.state.lat && event.state.zoom) {
-      mapRef.current.easeTo({
-        zoom: event.state.zoom,
-        center: [event.state.lng, event.state.lat],
-      });
-    }
-  };
-
-  return <></>;
+	// Use a useRef hook to reference the layer object to be able to access it later inside useEffect hooks
+	const mapContext = useContext(MapContext);
+	const initializedRef = useRef(false);
+	const mapRef = useRef(undefined);
+	const [map, setMap] = useState(undefined);
+	const layersFromUrlParamsRef = useRef({});
+	const componentId = useRef((props.idPrefix ? props.idPrefix : "MlShareMapState-") + uuidv4());
+	const mapState = useMapState({
+		watch: {
+			viewport: false,
+			layers: true,
+			sources: false,
+		},
+		filter: {
+			includeBaseLayers: false,
+		},
+	});
+
+	const allStatesRestoredRef = useRef(false);
+	const layerStatesRestored = useRef(undefined);
+	const restoredStatesRef = useRef({
+		viewport: {
+			center: false,
+			bearing: false,
+			pitch: false,
+			zoom: false,
+		},
+		layers: {
+			...layersFromUrlParamsRef,
+		},
+	});
+
+	// initial URL-Params
+	const mapStateRef = useRef({});
+
+	const refreshUrlParameters = useCallback(() => {
+		if (!props.active) return;
+
+		let mapLayers = [];
+		for (let x in mapState.layers) {
+			mapLayers.push({
+				id: mapState.layers[x].id,
+				type: mapState.layers[x].type,
+				visible: mapState.layers[x].visible,
+			});
+		}
+		refreshMapState();
+		let urlParams = new URLSearchParams({
+			...getCurrentUrlParameters(),
+			...mapStateRef.current,
+			layers: JSON.stringify(mapLayers),
+		});
+		JSON.parse(Object.fromEntries(urlParams).layers).forEach((el) => {
+			layersFromUrlParamsRef.current[el.id] = false;
+		});
+
+		let currentParams = new URLSearchParams(window.location.search);
+		checkRestorationStates(mapState.layers);
+		if (urlParams.toString() !== currentParams.toString()) {
+			window.history.pushState(
+				{ ...mapStateRef.current },
+				document.title,
+				"?" + urlParams.toString()
+			);
+		}
+	}, [mapState.layers, props.active]);
+
+	useEffect(() => {
+		let _componentId = componentId.current;
+
+		mapStateRef.current = getCurrentUrlParameters();
+
+		return () => {
+			// This is the cleanup function, it is called when this react component is removed from react-dom
+			// try to remove anything this component has added to the MapLibre-gl instance
+			// e.g.: remove the layer
+			// mapContext.getMap(props.mapId).removeLayer(layerRef.current);
+			// check for the existence of map.style before calling getLayer or getSource
+
+			if (mapRef.current) {
+				mapRef.current.cleanup(_componentId);
+				mapRef.current = undefined;
+			}
+			initializedRef.current = false;
+		};
+	}, []);
+
+	useEffect(() => {
+		if (!mapRef.current) return;
+
+		refreshUrlParameters();
+	}, [refreshUrlParameters]);
+
+	useEffect(() => {
+		if (!mapRef.current) return;
+
+		let _refreshUrlParameters = refreshUrlParameters;
+
+		mapRef.current.on("moveend", _refreshUrlParameters, componentId.current);
+
+		return () => {
+			mapRef.current?.off("moveend", _refreshUrlParameters);
+		};
+	}, [refreshUrlParameters, map]);
+
+	useEffect(() => {
+		if (!mapContext?.mapExists?.(props.mapId) || initializedRef.current) return;
+		// the MapLibre-gl instance (mapContext.getMap(props.mapId)) is accessible here
+		// initialize the layer and add it to the MapLibre-gl instance or do something else with it
+		initializedRef.current = true;
+		mapRef.current = mapContext.getMap(props.mapId);
+		setMap(mapRef.current);
+		if (mapStateRef.current.lat && mapStateRef.current.lng) {
+			restoreViewportState();
+		}
+	}, [mapContext.mapIds, mapContext, props.mapId, props.active]);
+
+	useEffect(() => {
+		if (!mapState?.layers?.length) return;
+
+		if (typeof layerStatesRestored.current === "undefined") {
+			layerStatesRestored.current = {};
+			initialUrlParams?.layers.forEach((layer) => {
+				layerStatesRestored.current[layer.id] = false;
+			});
+		}
+
+		for (let key in layerStatesRestored.current) {
+			let _allDone = true;
+			if (layerStatesRestored.current[key] === false) {
+				_allDone = false;
+			}
+			if (_allDone) {
+				return;
+			}
+		}
+
+		if (initialUrlParams.layers) {
+			initialUrlParams.layers.forEach((layer) => {
+				if (mapRef.current?.getLayer(layer.id) && layerStatesRestored.current[layer.id] === false) {
+					layerStatesRestored.current[layer.id] = true;
+					mapRef.current
+						?.getLayer(layer.id)
+						?.setLayoutProperty("visibility", layer.visible ? "visible" : "none");
+				}
+			});
+		}
+	}, [mapState.layers, props.mapId, props.active]);
+
+	useEffect(() => {
+		if (!map) return;
+		if (!mapState.layers) return;
+
+		if (!props.active) {
+			map.cleanup(componentId.current);
+		}
+	}, [props.active, map, mapState.layers]);
+
+	const refreshMapState = () => {
+		mapStateRef.current.lat = mapRef.current.getCenter().lat;
+		mapStateRef.current.lng = mapRef.current.getCenter().lng;
+		mapStateRef.current.zoom = mapRef.current.getZoom();
+		mapStateRef.current.bearing = mapRef.current.getBearing();
+		mapStateRef.current.pitch = mapRef.current.getPitch();
+	};
+
+	const checkRestorationStates = (stateArray) => {
+		let tempArray = {};
+		stateArray.forEach((el, i, arr) => {
+			if (!arr[el.key]) tempArray[el.key] = true;
+		});
+	};
+
+	const restoreViewportState = () => {
+		if (!restoredStatesRef.current.viewport.center) {
+			restoredStatesRef.current.viewport.center = true;
+			mapRef.current.setCenter([mapStateRef.current.lng, mapStateRef.current.lat]);
+			mapRef.current.setZoom(mapStateRef.current.zoom);
+			mapRef.current.setBearing(mapStateRef.current.bearing);
+			mapRef.current.setPitch(mapStateRef.current.pitch);
+		}
+
+		allStatesRestoredRef.current = true;
+	};
+
+	window.onpopstate = (event) => {
+		if (event.state && event.state.lng && event.state.lat && event.state.zoom) {
+			mapRef.current.easeTo({
+				zoom: event.state.zoom,
+				center: [event.state.lng, event.state.lat],
+			});
+		}
+	};
+
+	return <></>;
 };
 
 MlShareMapState.defaultProps = {
-  mapId: undefined,
+	mapId: undefined,
 };
 
 MlShareMapState.propTypes = {
-  /**
-   * Id of the target MapLibre instance in mapContext
-   */
-  mapId: PropTypes.string,
+	/**
+	 * Id of the target MapLibre instance in mapContext
+	 */
+	mapId: PropTypes.string,
 };
 export default MlShareMapState;

package/src/components/MlShareMapState/MlShareMapState.stories.js

@@ -19,80 +19,80 @@ import CheckCircleOutlineIcon from "@mui/icons-material/CheckCircleOutline";
 import ErrorOutlineIcon from "@mui/icons-material/ErrorOutline";
 
 const storyoptions = {
-  title: "MapComponents/MlShareMapState",
-  component: MlShareMapState,
-  argTypes: {},
-  decorators: mapContextDecorator,
+	title: "MapComponents/MlShareMapState",
+	component: MlShareMapState,
+	argTypes: {},
+	decorators: mapContextDecorator,
 };
 export default storyoptions;
 
 const Template = () => {
-  const geoJsonArray = [sample_geojson_1, sample_geojson_2];
-  const [watchState, setWatchState] = useState(true);
-  const mapHook = useMap({ mapId: "map_1" });
-  const mapState = useMapState({
-    mapId: "map_1",
-    watch: {
-      viewport: false,
-      layers: true,
-      sources: false,
-    },
-    filter: {
-      includeBaseLayers: false,
-    },
-  });
+	const geoJsonArray = [sample_geojson_1, sample_geojson_2];
+	const [watchState, setWatchState] = useState(true);
+	const mapHook = useMap({ mapId: "map_1" });
+	const mapState = useMapState({
+		mapId: "map_1",
+		watch: {
+			viewport: false,
+			layers: true,
+			sources: false,
+		},
+		filter: {
+			includeBaseLayers: false,
+		},
+	});
 
-  return (
-    <>
-      <MlShareMapState active={watchState} />
-      {geoJsonArray.map((el, i) => (
-        <MlGeoJsonLayer layerId={"GeoJson_" + i} type="line" geojson={el} key={"GeoJson_" + i} />
-      ))}
-      <Sidebar sx={{ wordBreak: "break-word" }}>
-        <ToggleButton
-          size="small"
-          selected={watchState}
-          value={watchState}
-          onChange={() => {
-            setWatchState(!watchState);
-          }}
-        >
-          {watchState ? <CheckCircleOutlineIcon /> : <ErrorOutlineIcon />}
+	return (
+		<>
+			<MlShareMapState active={watchState} />
+			{geoJsonArray.map((el, i) => (
+				<MlGeoJsonLayer layerId={"GeoJson_" + i} type="line" geojson={el} key={"GeoJson_" + i} />
+			))}
+			<Sidebar sx={{ wordBreak: "break-word" }}>
+				<ToggleButton
+					size="small"
+					selected={watchState}
+					value={watchState}
+					onChange={() => {
+						setWatchState(!watchState);
+					}}
+				>
+					{watchState ? <CheckCircleOutlineIcon /> : <ErrorOutlineIcon />}
 
-          {watchState ? "active" : "inactive"}
-        </ToggleButton>
-        <List dense key="layers">
-          {mapState.layers?.map((el) => (
-            <ListItem
-              key={el.id}
-              secondaryAction={
-                <IconButton
-                  edge="end"
-                  aria-label="toggle visibility"
-                  onClick={() => {
-                    let currentVisibility = mapHook.map
-                      ?.getLayer?.(el.id)
-                      ?.getLayoutProperty("visibility");
-                    mapHook.map
-                      ?.getLayer?.(el.id)
-                      ?.setLayoutProperty(
-                        "visibility",
-                        currentVisibility === "none" ? "visible" : "none"
-                      );
-                    mapHook.map.map.fire("zoom");
-                  }}
-                >
-                  {el.visible ? <VisibilityIcon /> : <VisibilityOffIcon />}
-                </IconButton>
-              }
-            >
-              <ListItemText primary={el.id} secondary={""} />
-            </ListItem>
-          ))}
-        </List>
-      </Sidebar>
-    </>
-  );
+					{watchState ? "active" : "inactive"}
+				</ToggleButton>
+				<List dense key="layers">
+					{mapState.layers?.map((el) => (
+						<ListItem
+							key={el.id}
+							secondaryAction={
+								<IconButton
+									edge="end"
+									aria-label="toggle visibility"
+									onClick={() => {
+										let currentVisibility = mapHook.map
+											?.getLayer?.(el.id)
+											?.getLayoutProperty("visibility");
+										mapHook.map
+											?.getLayer?.(el.id)
+											?.setLayoutProperty(
+												"visibility",
+												currentVisibility === "none" ? "visible" : "none"
+											);
+										mapHook.map.map.fire("zoom");
+									}}
+								>
+									{el.visible ? <VisibilityIcon /> : <VisibilityOffIcon />}
+								</IconButton>
+							}
+						>
+							<ListItemText primary={el.id} secondary={""} />
+						</ListItem>
+					))}
+				</List>
+			</Sidebar>
+		</>
+	);
 };
 
 export const ExampleConfig = Template.bind({});