react-bkoi-gl 1.0.7 → 2.0.1

package/src/components/use-map.tsx

@@ -1,69 +0,0 @@
-import * as React from 'react';
-import {useState, useCallback, useMemo, useContext} from 'react';
-
-import {MapRef} from '../mapbox/create-ref';
-import {MapContext} from './map';
-import {MapInstance} from '../types';
-
-type MountedMapsContextValue = {
-  maps: {[id: string]: MapRef<MapInstance>};
-  onMapMount: (map: MapRef<MapInstance>, id: string) => void;
-  onMapUnmount: (id: string) => void;
-};
-
-export const MountedMapsContext = React.createContext<MountedMapsContextValue>(null);
-
-export const MapProvider: React.FC<{children?: React.ReactNode}> = props => {
-  const [maps, setMaps] = useState<{[id: string]: MapRef<MapInstance>}>({});
-
-  const onMapMount = useCallback((map: MapRef<MapInstance>, id: string = 'default') => {
-    setMaps(currMaps => {
-      if (id === 'current') {
-        throw new Error("'current' cannot be used as map id");
-      }
-      if (currMaps[id]) {
-        throw new Error(`Multiple maps with the same id: ${id}`);
-      }
-      return {...currMaps, [id]: map};
-    });
-  }, []);
-
-  const onMapUnmount = useCallback((id: string = 'default') => {
-    setMaps(currMaps => {
-      if (currMaps[id]) {
-        const nextMaps = {...currMaps};
-        delete nextMaps[id];
-        return nextMaps;
-      }
-      return currMaps;
-    });
-  }, []);
-
-  return (
-    <MountedMapsContext.Provider
-      value={{
-        maps,
-        onMapMount,
-        onMapUnmount
-      }}
-    >
-      {props.children}
-    </MountedMapsContext.Provider>
-  );
-};
-
-export type MapCollection<MapT extends MapInstance> = {
-  [id: string]: MapRef<MapT> | undefined;
-  current?: MapRef<MapT>;
-};
-
-export function useMap<MapT extends MapInstance>(): MapCollection<MapT> {
-  const maps = useContext(MountedMapsContext)?.maps;
-  const currentMap = useContext(MapContext);
-
-  const mapsWithCurrent = useMemo(() => {
-    return {...maps, current: currentMap?.map};
-  }, [maps, currentMap]);
-
-  return mapsWithCurrent as MapCollection<MapT>;
-}

package/src/exports-bkoi-gl.ts

@@ -1,156 +0,0 @@
-import * as React from 'react';
-import {
-  Map as BkoiMap,
-  MapOptions,
-  Marker as BkoiMarker,
-  MarkerOptions,
-  Popup as BkoiPopup,
-  PopupOptions,
-  AttributionControl as BkoiAttributionControl,
-  FullscreenControl as BkoiFullscreenControl,
-  GeolocateControl as BkoiGeolocateControl,
-  NavigationControl as BkoiNavigationControl,
-  ScaleControl as BkoiScaleControl
-  // @ts-ignore
-// eslint-disable-next-line import/no-unresolved
-} from 'bkoi-gl';
-import { MapStyle, AnyLayer, AnySource } from './types/style-spec-bkoi-gl';
-
-import { default as _Map, MapProps as _MapProps } from './components/map';
-import { default as _Marker, MarkerProps as _MarkerProps } from './components/marker';
-import { default as _Popup, PopupProps as _PopupProps } from './components/popup';
-import {
-  default as _AttributionControl,
-  AttributionControlProps as _AttributionControlProps
-} from './components/attribution-control';
-import {
-  default as _FullscreenControl,
-  FullscreenControlProps as _FullscreenControlProps
-} from './components/fullscreen-control';
-import {
-  default as _GeolocateControl,
-  GeolocateControlProps as _GeolocateControlProps
-} from './components/geolocate-control';
-import {
-  default as _NavigationControl,
-  NavigationControlProps as _NavigationControlProps
-} from './components/navigation-control';
-import {
-  default as _ScaleControl,
-  ScaleControlProps as _ScaleControlProps
-} from './components/scale-control';
-import { default as _Layer, LayerProps as _LayerProps } from './components/layer';
-import { default as _Source, SourceProps as _SourceProps } from './components/source';
-import { useMap as _useMap } from './components/use-map';
-import type { MapRef as _MapRef } from './mapbox/create-ref';
-import type * as events from './types/events';
-import type { MapCallbacks } from './types/events-bkoi-gl';
-
-export function useMap() {
-  return _useMap<BkoiMap>();
-}
-
-export type MapProps = _MapProps<MapOptions, MapStyle, MapCallbacks, BkoiMap>;
-export type MapRef = _MapRef<BkoiMap>;
-// @ts-ignore
-// eslint-disable-next-line import/no-unresolved
-const mapLib = import('bkoi-gl');
-export const Map = (() => {
-  return React.forwardRef(function Map(props: MapProps, ref: React.Ref<MapRef>) {
-    return _Map<MapOptions, MapStyle, MapCallbacks, BkoiMap>(props, ref, mapLib);
-  });
-})();
-
-export type MarkerProps = _MarkerProps<MarkerOptions, BkoiMarker>;
-export const Marker = _Marker as (
-  props: MarkerProps & React.RefAttributes<BkoiMarker>
-) => React.ReactElement | null;
-
-export type PopupProps = _PopupProps<PopupOptions, BkoiPopup>;
-export const Popup = _Popup as (
-  props: PopupProps & React.RefAttributes<BkoiPopup>
-) => React.ReactElement | null;
-
-type AttributionControlOptions = ConstructorParameters<typeof BkoiAttributionControl>[0];
-export type AttributionControlProps = _AttributionControlProps<AttributionControlOptions>;
-export const AttributionControl = _AttributionControl as (
-  props: AttributionControlProps
-) => React.ReactElement | null;
-
-type FullscreenControlOptions = ConstructorParameters<typeof BkoiFullscreenControl>[0];
-export type FullscreenControlProps = _FullscreenControlProps<FullscreenControlOptions>;
-export const FullscreenControl = _FullscreenControl as (
-  props: FullscreenControlProps
-) => React.ReactElement | null;
-
-type NavigationControlOptions = ConstructorParameters<typeof BkoiNavigationControl>[0];
-export type NavigationControlProps = _NavigationControlProps<NavigationControlOptions>;
-export const NavigationControl = _NavigationControl as (
-  props: NavigationControlProps
-) => React.ReactElement | null;
-
-type GeolocateControlOptions = ConstructorParameters<typeof BkoiGeolocateControl>[0];
-export type GeolocateControlProps = _GeolocateControlProps<
-  GeolocateControlOptions,
-  BkoiGeolocateControl
->;
-export const GeolocateControl = _GeolocateControl as (
-  props: GeolocateControlProps & React.RefAttributes<BkoiGeolocateControl>
-) => React.ReactElement | null;
-
-type ScaleControlOptions = ConstructorParameters<typeof BkoiScaleControl>[0];
-export type ScaleControlProps = _ScaleControlProps<ScaleControlOptions>;
-export const ScaleControl = _ScaleControl as (
-  props: ScaleControlProps
-) => React.ReactElement | null;
-
-export type LayerProps = _LayerProps<AnyLayer>;
-export const Layer = _Layer as (props: LayerProps) => React.ReactElement | null;
-
-export type SourceProps = _SourceProps<AnySource>;
-export const Source = _Source as (props: SourceProps) => React.ReactElement | null;
-
-export { default as useControl } from './components/use-control';
-export { MapProvider } from './components/use-map';
-
-export default Map;
-
-// Types
-export * from './types/public';
-export type { default as Point } from '@mapbox/point-geometry';
-// export type {
-//   PointLike,
-//   LngLat,
-//   LngLatLike,
-//   LngLatBounds,
-//   LngLatBoundsLike,
-//   PaddingOptions,
-//   MapGeoJSONFeature,
-//   GeoJSONSource,
-//   VideoSource,
-//   ImageSource,
-//   CanvasSource,
-//   VectorTileSource
-// } from 'maplibre-gl';
-export * from './types/style-spec-bkoi-gl';
-
-// Events
-export type {
-  MapEvent,
-  MapMouseEvent,
-  MapLayerMouseEvent,
-  MapTouchEvent,
-  MapLayerTouchEvent,
-  MapStyleDataEvent,
-  MapSourceDataEvent,
-  MapWheelEvent,
-  MapBoxZoomEvent,
-  ErrorEvent,
-  ViewStateChangeEvent
-} from './types/events-bkoi-gl';
-export type PopupEvent = events.PopupEvent<BkoiPopup>;
-export type MarkerEvent = events.MarkerEvent<BkoiMarker>;
-export type MarkerDragEvent = events.MarkerDragEvent<BkoiMarker>;
-export type GeolocateEvent = events.GeolocateEvent<BkoiGeolocateControl>;
-export type GeolocateResultEvent = events.GeolocateResultEvent<BkoiGeolocateControl>;
-export type GeolocateErrorEvent = events.GeolocateErrorEvent<BkoiGeolocateControl>;

package/src/exports-mapbox.ts

@@ -1,159 +0,0 @@
-import * as React from 'react';
-import type {
-  Map as MapboxMap,
-  MapboxOptions,
-  Marker as MapboxMarker,
-  MarkerOptions,
-  Popup as MapboxPopup,
-  PopupOptions,
-  AttributionControl as MapboxAttributionControl,
-  FullscreenControl as MapboxFullscreenControl,
-  GeolocateControl as MapboxGeolocateControl,
-  NavigationControl as MapboxNavigationControl,
-  ScaleControl as MapboxScaleControl
-} from 'mapbox-gl';
-import {MapStyle, AnyLayer, AnySource} from './types/style-spec-mapbox';
-
-import {default as _Map, MapProps as _MapProps} from './components/map';
-import {default as _Marker, MarkerProps as _MarkerProps} from './components/marker';
-import {default as _Popup, PopupProps as _PopupProps} from './components/popup';
-import {
-  default as _AttributionControl,
-  AttributionControlProps as _AttributionControlProps
-} from './components/attribution-control';
-import {
-  default as _FullscreenControl,
-  FullscreenControlProps as _FullscreenControlProps
-} from './components/fullscreen-control';
-import {
-  default as _GeolocateControl,
-  GeolocateControlProps as _GeolocateControlProps
-} from './components/geolocate-control';
-import {
-  default as _NavigationControl,
-  NavigationControlProps as _NavigationControlProps
-} from './components/navigation-control';
-import {
-  default as _ScaleControl,
-  ScaleControlProps as _ScaleControlProps
-} from './components/scale-control';
-import {default as _Layer, LayerProps as _LayerProps} from './components/layer';
-import {default as _Source, SourceProps as _SourceProps} from './components/source';
-import {useMap as _useMap} from './components/use-map';
-import type {MapRef as _MapRef} from './mapbox/create-ref';
-import type * as events from './types/events';
-import type {MapCallbacks} from './types/events-mapbox';
-
-export function useMap() {
-  return _useMap<MapboxMap>();
-}
-
-export type MapProps = _MapProps<MapboxOptions, MapStyle, MapCallbacks, MapboxMap>;
-export type MapRef = _MapRef<MapboxMap>;
-const mapLib = import('mapbox-gl');
-export const Map = (() => {
-  return React.forwardRef(function Map(props: MapProps, ref: React.Ref<MapRef>) {
-    return _Map<MapboxOptions, MapStyle, MapCallbacks, MapboxMap>(props, ref, mapLib);
-  });
-})();
-
-export type MarkerProps = _MarkerProps<MarkerOptions, MapboxMarker>;
-export const Marker = _Marker as (
-  props: MarkerProps & React.RefAttributes<MapboxMarker>
-) => React.ReactElement | null;
-
-export type PopupProps = _PopupProps<PopupOptions, MapboxPopup>;
-export const Popup = _Popup as (
-  props: PopupProps & React.RefAttributes<MapboxPopup>
-) => React.ReactElement | null;
-
-type AttributionControlOptions = ConstructorParameters<typeof MapboxAttributionControl>[0];
-export type AttributionControlProps = _AttributionControlProps<AttributionControlOptions>;
-export const AttributionControl = _AttributionControl as (
-  props: AttributionControlProps
-) => React.ReactElement | null;
-
-type FullscreenControlOptions = ConstructorParameters<typeof MapboxFullscreenControl>[0];
-export type FullscreenControlProps = _FullscreenControlProps<FullscreenControlOptions>;
-export const FullscreenControl = _FullscreenControl as (
-  props: FullscreenControlProps
-) => React.ReactElement | null;
-
-type NavigationControlOptions = ConstructorParameters<typeof MapboxNavigationControl>[0];
-export type NavigationControlProps = _NavigationControlProps<NavigationControlOptions>;
-export const NavigationControl = _NavigationControl as (
-  props: NavigationControlProps
-) => React.ReactElement | null;
-
-type GeolocateControlOptions = ConstructorParameters<typeof MapboxGeolocateControl>[0];
-export type GeolocateControlProps = _GeolocateControlProps<
-  GeolocateControlOptions,
-  MapboxGeolocateControl
->;
-export const GeolocateControl = _GeolocateControl as (
-  props: GeolocateControlProps & React.RefAttributes<MapboxGeolocateControl>
-) => React.ReactElement | null;
-
-type ScaleControlOptions = ConstructorParameters<typeof MapboxScaleControl>[0];
-export type ScaleControlProps = _ScaleControlProps<ScaleControlOptions>;
-export const ScaleControl = _ScaleControl as (
-  props: ScaleControlProps
-) => React.ReactElement | null;
-
-export type LayerProps = _LayerProps<AnyLayer>;
-export const Layer = _Layer as (props: LayerProps) => React.ReactElement | null;
-
-export type SourceProps = _SourceProps<AnySource>;
-export const Source = _Source as (props: SourceProps) => React.ReactElement | null;
-
-export {default as useControl} from './components/use-control';
-export {MapProvider} from './components/use-map';
-
-export default Map;
-
-// Types
-export * from './types/public';
-export type {
-  Point,
-  PointLike,
-  LngLat,
-  LngLatLike,
-  LngLatBounds,
-  LngLatBoundsLike,
-  PaddingOptions,
-  MapboxGeoJSONFeature as MapGeoJSONFeature,
-  GeoJSONSource,
-  VideoSource,
-  ImageSource,
-  CanvasSource,
-  VectorSourceImpl as VectorTileSource
-} from 'mapbox-gl';
-export * from './types/style-spec-mapbox';
-
-// Events
-export type {
-  MapEvent,
-  MapMouseEvent,
-  MapLayerMouseEvent,
-  MapTouchEvent,
-  MapLayerTouchEvent,
-  MapStyleDataEvent,
-  MapSourceDataEvent,
-  MapWheelEvent,
-  MapBoxZoomEvent,
-  ErrorEvent,
-  ViewStateChangeEvent
-} from './types/events-mapbox';
-export type PopupEvent = events.PopupEvent<MapboxPopup>;
-export type MarkerEvent = events.MarkerEvent<MapboxMarker>;
-export type MarkerDragEvent = events.MarkerDragEvent<MapboxMarker>;
-export type GeolocateEvent = events.GeolocateEvent<MapboxGeolocateControl>;
-export type GeolocateResultEvent = events.GeolocateResultEvent<MapboxGeolocateControl>;
-export type GeolocateErrorEvent = events.GeolocateErrorEvent<MapboxGeolocateControl>;
-
-// v7.0 backward compatibility
-
-/** @deprecated use `MapStyle` */
-export type MapboxStyle = MapStyle;
-
-export type {Map as MapboxMap, MapboxEvent, MapboxGeoJSONFeature} from 'mapbox-gl';

package/src/index.ts

@@ -1,2 +0,0 @@
-export * from './exports-mapbox';
-export {default as default} from './exports-mapbox';

package/src/mapbox/create-ref.ts

@@ -1,118 +0,0 @@
-import type {
-  MapInstance,
-  MapInstanceInternal,
-  MapStyle,
-  Callbacks,
-  LngLatLike,
-  PointLike
-} from '../types';
-import type Mapbox from './mapbox';
-
-/** These methods may break the react binding if called directly */
-const skipMethods = [
-  'setMaxBounds',
-  'setMinZoom',
-  'setMaxZoom',
-  'setMinPitch',
-  'setMaxPitch',
-  'setRenderWorldCopies',
-  'setProjection',
-  'setStyle',
-  'addSource',
-  'removeSource',
-  'addLayer',
-  'removeLayer',
-  'setLayerZoomRange',
-  'setFilter',
-  'setPaintProperty',
-  'setLayoutProperty',
-  'setLight',
-  'setTerrain',
-  'setFog',
-  'remove'
-] as const;
-
-export type MapRef<MapT extends MapInstance> = {
-  getMap(): MapT;
-} & Omit<MapT, typeof skipMethods[number]>;
-
-export default function createRef<
-  StyleT extends MapStyle,
-  CallbacksT extends Callbacks,
-  MapT extends MapInstance
->(mapInstance: Mapbox<StyleT, CallbacksT, MapT>): MapRef<MapT> | null {
-  if (!mapInstance) {
-    return null;
-  }
-
-  const map = mapInstance.map as MapInstanceInternal<MapT>;
-  const result: any = {
-    getMap: () => map,
-
-    // Overwrite getters to use our shadow transform
-    getCenter: () => mapInstance.transform.center,
-    getZoom: () => mapInstance.transform.zoom,
-    getBearing: () => mapInstance.transform.bearing,
-    getPitch: () => mapInstance.transform.pitch,
-    getPadding: () => mapInstance.transform.padding,
-    getBounds: () => mapInstance.transform.getBounds(),
-    project: (lnglat: LngLatLike) => {
-      const tr = map.transform;
-      map.transform = mapInstance.transform;
-      const result = map.project(lnglat);
-      map.transform = tr;
-      return result;
-    },
-    unproject: (point: PointLike) => {
-      const tr = map.transform;
-      map.transform = mapInstance.transform;
-      const result = map.unproject(point);
-      map.transform = tr;
-      return result;
-    },
-    // options diverge between mapbox and maplibre
-    queryTerrainElevation: (lnglat: LngLatLike, options?: any) => {
-      const tr = map.transform;
-      map.transform = mapInstance.transform;
-      const result = map.queryTerrainElevation(lnglat, options);
-      map.transform = tr;
-      return result;
-    },
-    queryRenderedFeatures: (geometry?: any, options?: any) => {
-      const tr = map.transform;
-      map.transform = mapInstance.transform;
-      const result = map.queryRenderedFeatures(geometry, options);
-      map.transform = tr;
-      return result;
-    }
-  };
-
-  for (const key of getMethodNames(map)) {
-    // @ts-expect-error
-    if (!(key in result) && !skipMethods.includes(key)) {
-      result[key] = map[key].bind(map);
-    }
-  }
-
-  return result;
-}
-
-function getMethodNames(obj: Object) {
-  const result = new Set<string>();
-
-  let proto = obj;
-  while (proto) {
-    for (const key of Object.getOwnPropertyNames(proto)) {
-      if (
-        key[0] !== '_' &&
-        typeof obj[key] === 'function' &&
-        key !== 'fire' &&
-        key !== 'setEventedParent'
-      ) {
-        result.add(key);
-      }
-    }
-    proto = Object.getPrototypeOf(proto);
-  }
-  return Array.from(result);
-}