@mapcomponents/react-maplibre 0.1.36 → 0.1.39

package/src/hooks/useMap.ts

@@ -1,30 +1,21 @@
-import {
-  useContext,
-  useState,
-  useEffect,
-  useRef,
-  MutableRefObject,
-} from "react";
+import { useContext, useState, useEffect, useRef, MutableRefObject } from "react";
 import { v4 as uuidv4 } from "uuid";
-// @ts-ignore
-import { MapContext } from "@mapcomponents/react-core";
+import MapContext from "../contexts/MapContext";
 import useMapState from "./useMapState";
-import MapLibreGlWrapper, {
-  LayerState,
-} from "../components/MapLibreMap/lib/MapLibreGlWrapper";
+import MapLibreGlWrapper, { LayerState } from "../components/MapLibreMap/lib/MapLibreGlWrapper";
 
 type useMapType = {
   map: MapLibreGlWrapper | undefined;
   mapIsReady: boolean;
   componentId: string;
   layers: (LayerState | undefined)[];
-  cleanup: Function
+  cleanup: Function;
 };
 
 function useMap(props: { mapId?: string; waitForLayer?: string }): useMapType {
   // Use a useRef hook to reference the layer object to be able to access it later inside useEffect hooks
   const mapContext: MapContextType = useContext(MapContext);
-  const [map, setMap] = useState();
+  const [map, setMap] = useState<MapLibreGlWrapper>();
 
   const mapState = useMapState({
     mapId: props.mapId,
@@ -39,8 +30,7 @@ function useMap(props: { mapId?: string; waitForLayer?: string }): useMapType {
   });
 
   const initializedRef = useRef(false);
-  const mapRef: MutableRefObject<MapLibreGlWrapper | undefined> =
-    useRef(undefined);
+  const mapRef: MutableRefObject<MapLibreGlWrapper | undefined> = useRef(undefined);
 
   const componentId = useRef(uuidv4());
 
@@ -80,26 +70,19 @@ function useMap(props: { mapId?: string; waitForLayer?: string }): useMapType {
     // 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);
-    // @ts-ignore
     setMap(mapRef.current);
     setMapIsReady(true);
-  }, [
-    mapContext.mapIds,
-    mapState.layers,
-    mapContext,
-    props.waitForLayer,
-    props.mapId,
-  ]);
+  }, [mapContext.mapIds, mapState.layers, mapContext, props.waitForLayer, props.mapId]);
 
   return {
     map: map,
     mapIsReady,
     componentId: componentId.current,
     layers: mapState.layers,
-    cleanup
+    cleanup,
   };
 }
 
 export default useMap;
 
-export type {useMapType};
+export type { useMapType };

package/src/hooks/useMapState.ts

@@ -1,8 +1,7 @@
 import { useContext, useCallback, useState, useEffect, useRef } from "react";
 import PropTypes from "prop-types";
 import { v4 as uuidv4 } from "uuid";
-// @ts-ignore
-import { MapContext } from "@mapcomponents/react-core";
+import MapContext from "../contexts/MapContext";
 import MapLibreGlWrapper, {
   LayerState,
   ViewportState,
@@ -19,6 +18,7 @@ type MapContext = {
   getMap: Function;
   setMap: Function;
 };
+
 /**
  * React hook that allows subscribing to map state changes
  *
@@ -38,7 +38,7 @@ function useMapState(props: {
   };
 }): useMapStateType {
   // Use a useRef hook to reference the layer object to be able to access it later inside useEffect hooks
-  const mapContext: MapContext = useContext(MapContext);
+  const mapContext = useContext<MapContextType>(MapContext);
 
   const initializedRef = useRef(false);
   const mapRef = useRef<MapLibreGlWrapper>();

package/src/index.ts

@@ -31,4 +31,8 @@ export { default as useLayer } from "./hooks/useLayer";
 export { default as useMapState } from "./hooks/useMapState";
 export { default as useMap } from "./hooks/useMap";
 export { default as useWms } from "./hooks/useWms.js";
-//
+
+export { MapComponentsProvider } from './contexts/MapContext';
+export { default as MapContext } from './contexts/MapContext';
+export { default as SimpleDataProvider } from './contexts/SimpleDataProvider';
+export { default as SimpleDataContext } from './contexts/SimpleDataContext';

package/src/ui_components/LoadingOverlayContext.js

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useContext, useRef } from "react";
 import PropTypes from "prop-types";
-import { MapContext } from "@mapcomponents/react-core";
+import { MapContext } from "../index";
 
 const LoadingOverlayContext = React.createContext({});
 const LoadingOverlayContextProvider = LoadingOverlayContext.Provider;

package/src/util/layerRemovalTest.js

@@ -1,6 +1,6 @@
 import React, { useContext, useState } from "react";
 import { mount } from "enzyme";
-import { MapContext, MapComponentsProvider } from "@mapcomponents/react-core";
+import { MapContext, MapComponentsProvider } from "../index";
 import MapLibreMap from "./../components/MapLibreMap/MapLibreMap";
 
 const layerRemovalTest = (

package/src/util/sourceRemovalTest.js

@@ -1,6 +1,6 @@
 import React, { useContext, useState } from "react";
 import { mount, configure } from "enzyme";
-import { MapContext, MapComponentsProvider } from "@mapcomponents/react-core";
+import { MapContext, MapComponentsProvider } from "../index";
 import MapLibreMap from "./../components/MapLibreMap/MapLibreMap";
 
 const sourceRemovalTest = (

package/docs-build/0.d0c23b79.iframe.bundle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"0.d0c23b79.iframe.bundle.js","sources":["webpack:///0.d0c23b79.iframe.bundle.js"],"mappings":"AAAA","sourceRoot":""}

package/docs-build/1.34075652.iframe.bundle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"1.34075652.iframe.bundle.js","sources":["webpack:///1.34075652.iframe.bundle.js"],"mappings":"AAAA;;;;;;;;AAixHA","sourceRoot":""}

package/docs-build/16.ca488dae.iframe.bundle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"16.ca488dae.iframe.bundle.js","sources":["webpack:///16.ca488dae.iframe.bundle.js"],"mappings":"AAAA","sourceRoot":""}

package/docs-build/17.e40eac7f.iframe.bundle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"17.e40eac7f.iframe.bundle.js","sources":["webpack:///17.e40eac7f.iframe.bundle.js"],"mappings":"AAAA;;;;;;;;;;;;;;;AA6pOA","sourceRoot":""}

package/docs-build/18.62af0912.iframe.bundle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"18.62af0912.iframe.bundle.js","sources":["webpack:///18.62af0912.iframe.bundle.js"],"mappings":"AAAA;;;;;;;;;;;;AA6JA","sourceRoot":""}

package/docs-build/19.0a217189.iframe.bundle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"19.0a217189.iframe.bundle.js","sources":["webpack:///19.0a217189.iframe.bundle.js"],"mappings":"AAAA","sourceRoot":""}

package/docs-build/2.f15ae19a.iframe.bundle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"2.f15ae19a.iframe.bundle.js","sources":["webpack:///2.f15ae19a.iframe.bundle.js"],"mappings":"AAAA","sourceRoot":""}