react-bkoi-gl 1.0.5 → 1.0.7

package/dist/components/geolocate-control.js

@@ -17,24 +17,19 @@ function GeolocateControl(props, ref) {
       }
     };
     gc.on('geolocate', e => {
-      var _thisRef$current$prop, _thisRef$current$prop2;
-      (_thisRef$current$prop = (_thisRef$current$prop2 = thisRef.current.props).onGeolocate) === null || _thisRef$current$prop === void 0 || _thisRef$current$prop.call(_thisRef$current$prop2, e);
+      thisRef.current.props.onGeolocate?.(e);
     });
     gc.on('error', e => {
-      var _thisRef$current$prop3, _thisRef$current$prop4;
-      (_thisRef$current$prop3 = (_thisRef$current$prop4 = thisRef.current.props).onError) === null || _thisRef$current$prop3 === void 0 || _thisRef$current$prop3.call(_thisRef$current$prop4, e);
+      thisRef.current.props.onError?.(e);
     });
     gc.on('outofmaxbounds', e => {
-      var _thisRef$current$prop5, _thisRef$current$prop6;
-      (_thisRef$current$prop5 = (_thisRef$current$prop6 = thisRef.current.props).onOutOfMaxBounds) === null || _thisRef$current$prop5 === void 0 || _thisRef$current$prop5.call(_thisRef$current$prop6, e);
+      thisRef.current.props.onOutOfMaxBounds?.(e);
     });
     gc.on('trackuserlocationstart', e => {
-      var _thisRef$current$prop7, _thisRef$current$prop8;
-      (_thisRef$current$prop7 = (_thisRef$current$prop8 = thisRef.current.props).onTrackUserLocationStart) === null || _thisRef$current$prop7 === void 0 || _thisRef$current$prop7.call(_thisRef$current$prop8, e);
+      thisRef.current.props.onTrackUserLocationStart?.(e);
     });
     gc.on('trackuserlocationend', e => {
-      var _thisRef$current$prop9, _thisRef$current$prop10;
-      (_thisRef$current$prop9 = (_thisRef$current$prop10 = thisRef.current.props).onTrackUserLocationEnd) === null || _thisRef$current$prop9 === void 0 || _thisRef$current$prop9.call(_thisRef$current$prop10, e);
+      thisRef.current.props.onTrackUserLocationEnd?.(e);
     });
     return gc;
   }, {

package/dist/components/geolocate-control.js.map

@@ -1 +1 @@
-{"version":3,"file":"geolocate-control.js","names":["useImperativeHandle","useRef","useEffect","forwardRef","memo","applyReactStyle","useControl","GeolocateControl","props","ref","thisRef","ctrl","_ref","mapLib","gc","setupUI","_setupUI","args","_container","hasChildNodes","on","e","_thisRef$current$prop","_thisRef$current$prop2","current","onGeolocate","call","_thisRef$current$prop3","_thisRef$current$prop4","onError","_thisRef$current$prop5","_thisRef$current$prop6","onOutOfMaxBounds","_thisRef$current$prop7","_thisRef$current$prop8","onTrackUserLocationStart","_thisRef$current$prop9","_thisRef$current$prop10","onTrackUserLocationEnd","position","style"],"sources":["../../src/components/geolocate-control.ts"],"sourcesContent":["import * as React from 'react';\nimport {useImperativeHandle, useRef, useEffect, forwardRef, memo} from 'react';\nimport {applyReactStyle} from '../utils/apply-react-style';\nimport useControl from './use-control';\n\nimport type {\n  ControlPosition,\n  GeolocateControlInstance,\n  GeolocateEvent,\n  GeolocateResultEvent,\n  GeolocateErrorEvent\n} from '../types';\n\nexport type GeolocateControlProps<\n  OptionsT,\n  ControlT extends GeolocateControlInstance\n> = OptionsT & {\n  /** Placement of the control relative to the map. */\n  position?: ControlPosition;\n  /** CSS style override, applied to the control's container */\n  style?: React.CSSProperties;\n\n  /** Called on each Geolocation API position update that returned as success. */\n  onGeolocate?: (e: GeolocateResultEvent<ControlT>) => void;\n  /** Called on each Geolocation API position update that returned as an error. */\n  onError?: (e: GeolocateErrorEvent<ControlT>) => void;\n  /** Called on each Geolocation API position update that returned as success but user position\n   * is out of map `maxBounds`. */\n  onOutOfMaxBounds?: (e: GeolocateResultEvent<ControlT>) => void;\n  /** Called when the GeolocateControl changes to the active lock state. */\n  onTrackUserLocationStart?: (e: GeolocateEvent<ControlT>) => void;\n  /** Called when the GeolocateControl changes to the background state. */\n  onTrackUserLocationEnd?: (e: GeolocateEvent<ControlT>) => void;\n};\n\nfunction GeolocateControl<GeolocateControlOptions, ControlT extends GeolocateControlInstance>(\n  props: GeolocateControlProps<GeolocateControlOptions, ControlT>,\n  ref: React.Ref<ControlT>\n) {\n  const thisRef = useRef({props});\n\n  const ctrl = useControl<ControlT>(\n    ({mapLib}) => {\n      const gc = new mapLib.GeolocateControl(props) as ControlT;\n\n      // Hack: fix GeolocateControl reuse\n      // When using React strict mode, the component is mounted twice.\n      // GeolocateControl's UI creation is asynchronous. Removing and adding it back causes the UI to be initialized twice.\n      // @ts-expect-error private method\n      const setupUI = gc._setupUI;\n      // @ts-expect-error private method\n      gc._setupUI = args => {\n        if (!gc._container.hasChildNodes()) {\n          setupUI(args);\n        }\n      };\n\n      gc.on('geolocate', e => {\n        thisRef.current.props.onGeolocate?.(e as GeolocateResultEvent<ControlT>);\n      });\n      gc.on('error', e => {\n        thisRef.current.props.onError?.(e as GeolocateErrorEvent<ControlT>);\n      });\n      gc.on('outofmaxbounds', e => {\n        thisRef.current.props.onOutOfMaxBounds?.(e as GeolocateResultEvent<ControlT>);\n      });\n      gc.on('trackuserlocationstart', e => {\n        thisRef.current.props.onTrackUserLocationStart?.(e as GeolocateEvent<ControlT>);\n      });\n      gc.on('trackuserlocationend', e => {\n        thisRef.current.props.onTrackUserLocationEnd?.(e as GeolocateEvent<ControlT>);\n      });\n\n      return gc;\n    },\n    {position: props.position}\n  );\n\n  thisRef.current.props = props;\n\n  useImperativeHandle(ref, () => ctrl, []);\n\n  useEffect(() => {\n    applyReactStyle(ctrl._container, props.style);\n  }, [props.style]);\n\n  return null;\n}\n\nexport default memo(forwardRef(GeolocateControl));\n"],"mappings":"AACA,SAAQA,mBAAmB,EAAEC,MAAM,EAAEC,SAAS,EAAEC,UAAU,EAAEC,IAAI,QAAO,OAAO;AAAC,SACvEC,eAAe;AAAA,OAChBC,UAAU;AAgCjB,SAASC,gBAAgBA,CACvBC,KAA+D,EAC/DC,GAAwB,EACxB;EACA,MAAMC,OAAO,GAAGT,MAAM,CAAC;IAACO;EAAK,CAAC,CAAC;EAE/B,MAAMG,IAAI,GAAGL,UAAU,CACrBM,IAAA,IAAc;IAAA,IAAb;MAACC;IAAM,CAAC,GAAAD,IAAA;IACP,MAAME,EAAE,GAAG,IAAID,MAAM,CAACN,gBAAgB,CAACC,KAAK,CAAa;IAMzD,MAAMO,OAAO,GAAGD,EAAE,CAACE,QAAQ;IAE3BF,EAAE,CAACE,QAAQ,GAAGC,IAAI,IAAI;MACpB,IAAI,CAACH,EAAE,CAACI,UAAU,CAACC,aAAa,CAAC,CAAC,EAAE;QAClCJ,OAAO,CAACE,IAAI,CAAC;MACf;IACF,CAAC;IAEDH,EAAE,CAACM,EAAE,CAAC,WAAW,EAAEC,CAAC,IAAI;MAAA,IAAAC,qBAAA,EAAAC,sBAAA;MACtB,CAAAD,qBAAA,IAAAC,sBAAA,GAAAb,OAAO,CAACc,OAAO,CAAChB,KAAK,EAACiB,WAAW,cAAAH,qBAAA,eAAjCA,qBAAA,CAAAI,IAAA,CAAAH,sBAAA,EAAoCF,CAAmC,CAAC;IAC1E,CAAC,CAAC;IACFP,EAAE,CAACM,EAAE,CAAC,OAAO,EAAEC,CAAC,IAAI;MAAA,IAAAM,sBAAA,EAAAC,sBAAA;MAClB,CAAAD,sBAAA,IAAAC,sBAAA,GAAAlB,OAAO,CAACc,OAAO,CAAChB,KAAK,EAACqB,OAAO,cAAAF,sBAAA,eAA7BA,sBAAA,CAAAD,IAAA,CAAAE,sBAAA,EAAgCP,CAAkC,CAAC;IACrE,CAAC,CAAC;IACFP,EAAE,CAACM,EAAE,CAAC,gBAAgB,EAAEC,CAAC,IAAI;MAAA,IAAAS,sBAAA,EAAAC,sBAAA;MAC3B,CAAAD,sBAAA,IAAAC,sBAAA,GAAArB,OAAO,CAACc,OAAO,CAAChB,KAAK,EAACwB,gBAAgB,cAAAF,sBAAA,eAAtCA,sBAAA,CAAAJ,IAAA,CAAAK,sBAAA,EAAyCV,CAAmC,CAAC;IAC/E,CAAC,CAAC;IACFP,EAAE,CAACM,EAAE,CAAC,wBAAwB,EAAEC,CAAC,IAAI;MAAA,IAAAY,sBAAA,EAAAC,sBAAA;MACnC,CAAAD,sBAAA,IAAAC,sBAAA,GAAAxB,OAAO,CAACc,OAAO,CAAChB,KAAK,EAAC2B,wBAAwB,cAAAF,sBAAA,eAA9CA,sBAAA,CAAAP,IAAA,CAAAQ,sBAAA,EAAiDb,CAA6B,CAAC;IACjF,CAAC,CAAC;IACFP,EAAE,CAACM,EAAE,CAAC,sBAAsB,EAAEC,CAAC,IAAI;MAAA,IAAAe,sBAAA,EAAAC,uBAAA;MACjC,CAAAD,sBAAA,IAAAC,uBAAA,GAAA3B,OAAO,CAACc,OAAO,CAAChB,KAAK,EAAC8B,sBAAsB,cAAAF,sBAAA,eAA5CA,sBAAA,CAAAV,IAAA,CAAAW,uBAAA,EAA+ChB,CAA6B,CAAC;IAC/E,CAAC,CAAC;IAEF,OAAOP,EAAE;EACX,CAAC,EACD;IAACyB,QAAQ,EAAE/B,KAAK,CAAC+B;EAAQ,CAC3B,CAAC;EAED7B,OAAO,CAACc,OAAO,CAAChB,KAAK,GAAGA,KAAK;EAE7BR,mBAAmB,CAACS,GAAG,EAAE,MAAME,IAAI,EAAE,EAAE,CAAC;EAExCT,SAAS,CAAC,MAAM;IACdG,eAAe,CAACM,IAAI,CAACO,UAAU,EAAEV,KAAK,CAACgC,KAAK,CAAC;EAC/C,CAAC,EAAE,CAAChC,KAAK,CAACgC,KAAK,CAAC,CAAC;EAEjB,OAAO,IAAI;AACb;AAEA,eAAepC,IAAI,CAACD,UAAU,CAACI,gBAAgB,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"geolocate-control.js","names":["useImperativeHandle","useRef","useEffect","forwardRef","memo","applyReactStyle","useControl","GeolocateControl","props","ref","thisRef","ctrl","_ref","mapLib","gc","setupUI","_setupUI","args","_container","hasChildNodes","on","e","current","onGeolocate","onError","onOutOfMaxBounds","onTrackUserLocationStart","onTrackUserLocationEnd","position","style"],"sources":["../../src/components/geolocate-control.ts"],"sourcesContent":["import * as React from 'react';\nimport {useImperativeHandle, useRef, useEffect, forwardRef, memo} from 'react';\nimport {applyReactStyle} from '../utils/apply-react-style';\nimport useControl from './use-control';\n\nimport type {\n  ControlPosition,\n  GeolocateControlInstance,\n  GeolocateEvent,\n  GeolocateResultEvent,\n  GeolocateErrorEvent\n} from '../types';\n\nexport type GeolocateControlProps<\n  OptionsT,\n  ControlT extends GeolocateControlInstance\n> = OptionsT & {\n  /** Placement of the control relative to the map. */\n  position?: ControlPosition;\n  /** CSS style override, applied to the control's container */\n  style?: React.CSSProperties;\n\n  /** Called on each Geolocation API position update that returned as success. */\n  onGeolocate?: (e: GeolocateResultEvent<ControlT>) => void;\n  /** Called on each Geolocation API position update that returned as an error. */\n  onError?: (e: GeolocateErrorEvent<ControlT>) => void;\n  /** Called on each Geolocation API position update that returned as success but user position\n   * is out of map `maxBounds`. */\n  onOutOfMaxBounds?: (e: GeolocateResultEvent<ControlT>) => void;\n  /** Called when the GeolocateControl changes to the active lock state. */\n  onTrackUserLocationStart?: (e: GeolocateEvent<ControlT>) => void;\n  /** Called when the GeolocateControl changes to the background state. */\n  onTrackUserLocationEnd?: (e: GeolocateEvent<ControlT>) => void;\n};\n\nfunction GeolocateControl<GeolocateControlOptions, ControlT extends GeolocateControlInstance>(\n  props: GeolocateControlProps<GeolocateControlOptions, ControlT>,\n  ref: React.Ref<ControlT>\n) {\n  const thisRef = useRef({props});\n\n  const ctrl = useControl<ControlT>(\n    ({mapLib}) => {\n      const gc = new mapLib.GeolocateControl(props) as ControlT;\n\n      // Hack: fix GeolocateControl reuse\n      // When using React strict mode, the component is mounted twice.\n      // GeolocateControl's UI creation is asynchronous. Removing and adding it back causes the UI to be initialized twice.\n      // @ts-expect-error private method\n      const setupUI = gc._setupUI;\n      // @ts-expect-error private method\n      gc._setupUI = args => {\n        if (!gc._container.hasChildNodes()) {\n          setupUI(args);\n        }\n      };\n\n      gc.on('geolocate', e => {\n        thisRef.current.props.onGeolocate?.(e as GeolocateResultEvent<ControlT>);\n      });\n      gc.on('error', e => {\n        thisRef.current.props.onError?.(e as GeolocateErrorEvent<ControlT>);\n      });\n      gc.on('outofmaxbounds', e => {\n        thisRef.current.props.onOutOfMaxBounds?.(e as GeolocateResultEvent<ControlT>);\n      });\n      gc.on('trackuserlocationstart', e => {\n        thisRef.current.props.onTrackUserLocationStart?.(e as GeolocateEvent<ControlT>);\n      });\n      gc.on('trackuserlocationend', e => {\n        thisRef.current.props.onTrackUserLocationEnd?.(e as GeolocateEvent<ControlT>);\n      });\n\n      return gc;\n    },\n    {position: props.position}\n  );\n\n  thisRef.current.props = props;\n\n  useImperativeHandle(ref, () => ctrl, []);\n\n  useEffect(() => {\n    applyReactStyle(ctrl._container, props.style);\n  }, [props.style]);\n\n  return null;\n}\n\nexport default memo(forwardRef(GeolocateControl));\n"],"mappings":"AACA,SAAQA,mBAAmB,EAAEC,MAAM,EAAEC,SAAS,EAAEC,UAAU,EAAEC,IAAI,QAAO,OAAO;AAAC,SACvEC,eAAe;AAAA,OAChBC,UAAU;AAgCjB,SAASC,gBAAgBA,CACvBC,KAA+D,EAC/DC,GAAwB,EACxB;EACA,MAAMC,OAAO,GAAGT,MAAM,CAAC;IAACO;EAAK,CAAC,CAAC;EAE/B,MAAMG,IAAI,GAAGL,UAAU,CACrBM,IAAA,IAAc;IAAA,IAAb;MAACC;IAAM,CAAC,GAAAD,IAAA;IACP,MAAME,EAAE,GAAG,IAAID,MAAM,CAACN,gBAAgB,CAACC,KAAK,CAAa;IAMzD,MAAMO,OAAO,GAAGD,EAAE,CAACE,QAAQ;IAE3BF,EAAE,CAACE,QAAQ,GAAGC,IAAI,IAAI;MACpB,IAAI,CAACH,EAAE,CAACI,UAAU,CAACC,aAAa,CAAC,CAAC,EAAE;QAClCJ,OAAO,CAACE,IAAI,CAAC;MACf;IACF,CAAC;IAEDH,EAAE,CAACM,EAAE,CAAC,WAAW,EAAEC,CAAC,IAAI;MACtBX,OAAO,CAACY,OAAO,CAACd,KAAK,CAACe,WAAW,GAAGF,CAAmC,CAAC;IAC1E,CAAC,CAAC;IACFP,EAAE,CAACM,EAAE,CAAC,OAAO,EAAEC,CAAC,IAAI;MAClBX,OAAO,CAACY,OAAO,CAACd,KAAK,CAACgB,OAAO,GAAGH,CAAkC,CAAC;IACrE,CAAC,CAAC;IACFP,EAAE,CAACM,EAAE,CAAC,gBAAgB,EAAEC,CAAC,IAAI;MAC3BX,OAAO,CAACY,OAAO,CAACd,KAAK,CAACiB,gBAAgB,GAAGJ,CAAmC,CAAC;IAC/E,CAAC,CAAC;IACFP,EAAE,CAACM,EAAE,CAAC,wBAAwB,EAAEC,CAAC,IAAI;MACnCX,OAAO,CAACY,OAAO,CAACd,KAAK,CAACkB,wBAAwB,GAAGL,CAA6B,CAAC;IACjF,CAAC,CAAC;IACFP,EAAE,CAACM,EAAE,CAAC,sBAAsB,EAAEC,CAAC,IAAI;MACjCX,OAAO,CAACY,OAAO,CAACd,KAAK,CAACmB,sBAAsB,GAAGN,CAA6B,CAAC;IAC/E,CAAC,CAAC;IAEF,OAAOP,EAAE;EACX,CAAC,EACD;IAACc,QAAQ,EAAEpB,KAAK,CAACoB;EAAQ,CAC3B,CAAC;EAEDlB,OAAO,CAACY,OAAO,CAACd,KAAK,GAAGA,KAAK;EAE7BR,mBAAmB,CAACS,GAAG,EAAE,MAAME,IAAI,EAAE,EAAE,CAAC;EAExCT,SAAS,CAAC,MAAM;IACdG,eAAe,CAACM,IAAI,CAACO,UAAU,EAAEV,KAAK,CAACqB,KAAK,CAAC;EAC/C,CAAC,EAAE,CAACrB,KAAK,CAACqB,KAAK,CAAC,CAAC;EAEjB,OAAO,IAAI;AACb;AAEA,eAAezB,IAAI,CAACD,UAAU,CAACI,gBAAgB,CAAC,CAAC","ignoreList":[]}

package/dist/components/layer.js

@@ -1,6 +1,3 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { useContext, useEffect, useMemo, useState, useRef } from 'react';
 import { MapContext } from "./map.js";
 import assert from "../utils/assert.js";
@@ -57,9 +54,10 @@ function updateLayer(map, id, props, prevProps) {
 }
 function createLayer(map, id, props) {
   if (map.style && map.style._loaded && (!('source' in props) || map.getSource(props.source))) {
-    const options = _objectSpread(_objectSpread({}, props), {}, {
+    const options = {
+      ...props,
       id
-    });
+    };
     delete options.beforeId;
     map.addLayer(options, props.beforeId);
   }

package/dist/components/layer.js.map

@@ -1 +1 @@
-{"version":3,"file":"layer.js","names":["useContext","useEffect","useMemo","useState","useRef","MapContext","assert","deepEqual","updateLayer","map","id","props","prevProps","type","layout","paint","filter","minzoom","maxzoom","beforeId","moveLayer","prevLayout","key","setLayoutProperty","hasOwnProperty","undefined","prevPaint","setPaintProperty","setFilter","setLayerZoomRange","createLayer","style","_loaded","getSource","source","options","_objectSpread","addLayer","layerCounter","Layer","getMap","propsRef","setStyleLoaded","forceUpdate","version","on","off","getLayer","removeLayer","layer","current","error","console","warn"],"sources":["../../src/components/layer.ts"],"sourcesContent":["import {useContext, useEffect, useMemo, useState, useRef} from 'react';\nimport {MapContext} from './map';\nimport assert from '../utils/assert';\nimport {deepEqual} from '../utils/deep-equal';\n\nimport type {MapInstance, CustomLayerInterface, ILayer} from '../types';\n\n// Omiting property from a union type, see\n// https://github.com/microsoft/TypeScript/issues/39556#issuecomment-656925230\ntype OptionalId<T> = T extends {id: string} ? Omit<T, 'id'> & {id?: string} : T;\ntype OptionalSource<T> = T extends {source: string} ? Omit<T, 'source'> & {source?: string} : T;\n\nexport type LayerProps<LayerT> = OptionalSource<OptionalId<LayerT>> & {\n  /** If set, the layer will be inserted before the specified layer */\n  beforeId?: string;\n};\n\n/* eslint-disable complexity, max-statements */\nfunction updateLayer<LayerT extends ILayer>(\n  map: MapInstance,\n  id: string,\n  props: LayerProps<LayerT>,\n  prevProps: LayerProps<LayerT>\n) {\n  assert(props.id === prevProps.id, 'layer id changed');\n  assert(props.type === prevProps.type, 'layer type changed');\n\n  if (props.type === 'custom' || prevProps.type === 'custom') {\n    return;\n  }\n\n  const {layout = {}, paint = {}, filter, minzoom, maxzoom, beforeId} = props;\n\n  if (beforeId !== prevProps.beforeId) {\n    map.moveLayer(id, beforeId);\n  }\n  if (layout !== prevProps.layout) {\n    const prevLayout = prevProps.layout || {};\n    for (const key in layout) {\n      if (!deepEqual(layout[key], prevLayout[key])) {\n        map.setLayoutProperty(id, key, layout[key]);\n      }\n    }\n    for (const key in prevLayout) {\n      if (!layout.hasOwnProperty(key)) {\n        map.setLayoutProperty(id, key, undefined);\n      }\n    }\n  }\n  if (paint !== prevProps.paint) {\n    const prevPaint = prevProps.paint || {};\n    for (const key in paint) {\n      if (!deepEqual(paint[key], prevPaint[key])) {\n        map.setPaintProperty(id, key, paint[key]);\n      }\n    }\n    for (const key in prevPaint) {\n      if (!paint.hasOwnProperty(key)) {\n        map.setPaintProperty(id, key, undefined);\n      }\n    }\n  }\n\n  if (!deepEqual(filter, prevProps.filter)) {\n    map.setFilter(id, filter);\n  }\n  if (minzoom !== prevProps.minzoom || maxzoom !== prevProps.maxzoom) {\n    map.setLayerZoomRange(id, minzoom, maxzoom);\n  }\n}\n\nfunction createLayer<LayerT extends ILayer>(\n  map: MapInstance,\n  id: string,\n  props: LayerProps<LayerT>\n) {\n  // @ts-ignore\n  if (map.style && map.style._loaded && (!('source' in props) || map.getSource(props.source))) {\n    const options: LayerProps<LayerT> = {...props, id};\n    delete options.beforeId;\n\n    // @ts-ignore\n    map.addLayer(options, props.beforeId);\n  }\n}\n\n/* eslint-enable complexity, max-statements */\n\nlet layerCounter = 0;\n\nfunction Layer<LayerT extends ILayer>(props: LayerProps<LayerT | CustomLayerInterface>) {\n  const map = useContext(MapContext).map.getMap();\n  const propsRef = useRef(props);\n  const [, setStyleLoaded] = useState(0);\n\n  const id = useMemo(() => props.id || `jsx-layer-${layerCounter++}`, []);\n\n  useEffect(() => {\n    if (map) {\n      const forceUpdate = () => setStyleLoaded(version => version + 1);\n      map.on('styledata', forceUpdate);\n      forceUpdate();\n\n      return () => {\n        map.off('styledata', forceUpdate);\n        // @ts-ignore\n        if (map.style && map.style._loaded && map.getLayer(id)) {\n          map.removeLayer(id);\n        }\n      };\n    }\n    return undefined;\n  }, [map]);\n\n  // @ts-ignore\n  const layer = map && map.style && map.getLayer(id);\n  if (layer) {\n    try {\n      updateLayer(map, id, props, propsRef.current);\n    } catch (error) {\n      console.warn(error); // eslint-disable-line\n    }\n  } else {\n    createLayer(map, id, props);\n  }\n\n  // Store last rendered props\n  propsRef.current = props;\n\n  return null;\n}\n\nexport default Layer;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"layer.js","names":["useContext","useEffect","useMemo","useState","useRef","MapContext","assert","deepEqual","updateLayer","map","id","props","prevProps","type","layout","paint","filter","minzoom","maxzoom","beforeId","moveLayer","prevLayout","key","setLayoutProperty","hasOwnProperty","undefined","prevPaint","setPaintProperty","setFilter","setLayerZoomRange","createLayer","style","_loaded","getSource","source","options","addLayer","layerCounter","Layer","getMap","propsRef","setStyleLoaded","forceUpdate","version","on","off","getLayer","removeLayer","layer","current","error","console","warn"],"sources":["../../src/components/layer.ts"],"sourcesContent":["import {useContext, useEffect, useMemo, useState, useRef} from 'react';\nimport {MapContext} from './map';\nimport assert from '../utils/assert';\nimport {deepEqual} from '../utils/deep-equal';\n\nimport type {MapInstance, CustomLayerInterface, ILayer} from '../types';\n\n// Omiting property from a union type, see\n// https://github.com/microsoft/TypeScript/issues/39556#issuecomment-656925230\ntype OptionalId<T> = T extends {id: string} ? Omit<T, 'id'> & {id?: string} : T;\ntype OptionalSource<T> = T extends {source: string} ? Omit<T, 'source'> & {source?: string} : T;\n\nexport type LayerProps<LayerT> = OptionalSource<OptionalId<LayerT>> & {\n  /** If set, the layer will be inserted before the specified layer */\n  beforeId?: string;\n};\n\n/* eslint-disable complexity, max-statements */\nfunction updateLayer<LayerT extends ILayer>(\n  map: MapInstance,\n  id: string,\n  props: LayerProps<LayerT>,\n  prevProps: LayerProps<LayerT>\n) {\n  assert(props.id === prevProps.id, 'layer id changed');\n  assert(props.type === prevProps.type, 'layer type changed');\n\n  if (props.type === 'custom' || prevProps.type === 'custom') {\n    return;\n  }\n\n  const {layout = {}, paint = {}, filter, minzoom, maxzoom, beforeId} = props;\n\n  if (beforeId !== prevProps.beforeId) {\n    map.moveLayer(id, beforeId);\n  }\n  if (layout !== prevProps.layout) {\n    const prevLayout = prevProps.layout || {};\n    for (const key in layout) {\n      if (!deepEqual(layout[key], prevLayout[key])) {\n        map.setLayoutProperty(id, key, layout[key]);\n      }\n    }\n    for (const key in prevLayout) {\n      if (!layout.hasOwnProperty(key)) {\n        map.setLayoutProperty(id, key, undefined);\n      }\n    }\n  }\n  if (paint !== prevProps.paint) {\n    const prevPaint = prevProps.paint || {};\n    for (const key in paint) {\n      if (!deepEqual(paint[key], prevPaint[key])) {\n        map.setPaintProperty(id, key, paint[key]);\n      }\n    }\n    for (const key in prevPaint) {\n      if (!paint.hasOwnProperty(key)) {\n        map.setPaintProperty(id, key, undefined);\n      }\n    }\n  }\n\n  if (!deepEqual(filter, prevProps.filter)) {\n    map.setFilter(id, filter);\n  }\n  if (minzoom !== prevProps.minzoom || maxzoom !== prevProps.maxzoom) {\n    map.setLayerZoomRange(id, minzoom, maxzoom);\n  }\n}\n\nfunction createLayer<LayerT extends ILayer>(\n  map: MapInstance,\n  id: string,\n  props: LayerProps<LayerT>\n) {\n  // @ts-ignore\n  if (map.style && map.style._loaded && (!('source' in props) || map.getSource(props.source))) {\n    const options: LayerProps<LayerT> = {...props, id};\n    delete options.beforeId;\n\n    // @ts-ignore\n    map.addLayer(options, props.beforeId);\n  }\n}\n\n/* eslint-enable complexity, max-statements */\n\nlet layerCounter = 0;\n\nfunction Layer<LayerT extends ILayer>(props: LayerProps<LayerT | CustomLayerInterface>) {\n  const map = useContext(MapContext).map.getMap();\n  const propsRef = useRef(props);\n  const [, setStyleLoaded] = useState(0);\n\n  const id = useMemo(() => props.id || `jsx-layer-${layerCounter++}`, []);\n\n  useEffect(() => {\n    if (map) {\n      const forceUpdate = () => setStyleLoaded(version => version + 1);\n      map.on('styledata', forceUpdate);\n      forceUpdate();\n\n      return () => {\n        map.off('styledata', forceUpdate);\n        // @ts-ignore\n        if (map.style && map.style._loaded && map.getLayer(id)) {\n          map.removeLayer(id);\n        }\n      };\n    }\n    return undefined;\n  }, [map]);\n\n  // @ts-ignore\n  const layer = map && map.style && map.getLayer(id);\n  if (layer) {\n    try {\n      updateLayer(map, id, props, propsRef.current);\n    } catch (error) {\n      console.warn(error); // eslint-disable-line\n    }\n  } else {\n    createLayer(map, id, props);\n  }\n\n  // Store last rendered props\n  propsRef.current = props;\n\n  return null;\n}\n\nexport default Layer;\n"],"mappings":"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","ignoreList":[]}

package/dist/components/map.js

@@ -1,6 +1,3 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import * as React from 'react';
 import { useState, useRef, useEffect, useContext, useMemo, useImperativeHandle } from 'react';
 import { MountedMapsContext } from "./use-map.js";
@@ -45,7 +42,7 @@ export default function Map(props, ref, defaultLib) {
         contextValue.map = createRef(mapbox);
         contextValue.mapLib = mapboxgl;
         setMapInstance(mapbox);
-        mountedMapsContext === null || mountedMapsContext === void 0 || mountedMapsContext.onMapMount(contextValue.map, props.id);
+        mountedMapsContext?.onMapMount(contextValue.map, props.id);
       } else {
         throw new Error('Map is not supported by this browser');
       }
@@ -67,7 +64,7 @@ export default function Map(props, ref, defaultLib) {
     return () => {
       isMounted = false;
       if (mapbox) {
-        mountedMapsContext === null || mountedMapsContext === void 0 || mountedMapsContext.onMapUnmount(props.id);
+        mountedMapsContext?.onMapUnmount(props.id);
         if (props.reuseMaps) {
           mapbox.recycle();
         } else {
@@ -82,11 +79,12 @@ export default function Map(props, ref, defaultLib) {
     }
   });
   useImperativeHandle(ref, () => contextValue.map, [mapInstance]);
-  const style = useMemo(() => _objectSpread({
+  const style = useMemo(() => ({
     position: 'relative',
     width: '100%',
-    height: '100%'
-  }, props.style), [props.style]);
+    height: '100%',
+    ...props.style
+  }), [props.style]);
   const CHILD_CONTAINER_STYLE = {
     height: '100%'
   };

package/dist/components/map.js.map

@@ -1 +1 @@
-{"version":3,"file":"map.js","names":["React","useState","useRef","useEffect","useContext","useMemo","useImperativeHandle","MountedMapsContext","Mapbox","createRef","useIsomorphicLayoutEffect","setGlobals","MapContext","createContext","Map","props","ref","defaultLib","mountedMapsContext","mapInstance","setMapInstance","containerRef","current","contextValue","mapLib","map","isMounted","mapbox","Promise","resolve","then","module","Error","mapboxgl","default","supported","reuseMaps","reuse","onMapMount","id","catch","error","onError","type","target","originalEvent","console","onMapUnmount","recycle","destroy","setProps","style","_objectSpread","position","width","height","CHILD_CONTAINER_STYLE","createElement","Provider","value","children"],"sources":["../../src/components/map.tsx"],"sourcesContent":["import * as React from 'react';\nimport {useState, useRef, useEffect, useContext, useMemo, useImperativeHandle} from 'react';\n\nimport {MountedMapsContext} from './use-map';\nimport Mapbox, {MapboxProps} from '../mapbox/mapbox';\nimport createRef, {MapRef} from '../mapbox/create-ref';\n\nimport type {CSSProperties} from 'react';\nimport useIsomorphicLayoutEffect from '../utils/use-isomorphic-layout-effect';\nimport setGlobals, {GlobalSettings} from '../utils/set-globals';\nimport type {MapLib, MapInstance, MapStyle, Callbacks} from '../types';\n\nexport type MapContextValue<MapT extends MapInstance = MapInstance> = {\n  mapLib: MapLib<MapT>;\n  map: MapRef<MapT>;\n};\n\nexport const MapContext = React.createContext<MapContextValue>(null);\n\ntype MapInitOptions<MapOptions> = Omit<\n  MapOptions,\n  'style' | 'container' | 'bounds' | 'fitBoundsOptions' | 'center'\n>;\n\nexport type MapProps<\n  MapOptions,\n  StyleT extends MapStyle,\n  CallbacksT extends Callbacks,\n  MapT extends MapInstance\n> = MapInitOptions<MapOptions> &\n  MapboxProps<StyleT, CallbacksT> &\n  GlobalSettings & {\n    mapLib?: MapLib<MapT> | Promise<MapLib<MapT>>;\n    reuseMaps?: boolean;\n    /** Map container id */\n    id?: string;\n    /** Map container CSS style */\n    style?: CSSProperties;\n    children?: any;\n  };\n\nexport default function Map<\n  MapOptions,\n  StyleT extends MapStyle,\n  CallbacksT extends Callbacks,\n  MapT extends MapInstance\n>(\n  props: MapProps<MapOptions, StyleT, CallbacksT, MapT>,\n  ref: React.Ref<MapRef<MapT>>,\n  defaultLib: MapLib<MapT> | Promise<MapLib<MapT>>\n) {\n  const mountedMapsContext = useContext(MountedMapsContext);\n  const [mapInstance, setMapInstance] = useState<Mapbox<StyleT, CallbacksT, MapT>>(null);\n  const containerRef = useRef();\n\n  const {current: contextValue} = useRef<MapContextValue<MapT>>({mapLib: null, map: null});\n\n  useEffect(() => {\n    const mapLib = props.mapLib;\n    let isMounted = true;\n    let mapbox: Mapbox<StyleT, CallbacksT, MapT>;\n\n    Promise.resolve(mapLib || defaultLib)\n      .then((module: MapLib<MapT> | {default: MapLib<MapT>}) => {\n        if (!isMounted) {\n          return;\n        }\n        if (!module) {\n          throw new Error('Invalid mapLib');\n        }\n        const mapboxgl = 'Map' in module ? module : module.default;\n        if (!mapboxgl.Map) {\n          throw new Error('Invalid mapLib');\n        }\n\n        // workerUrl & workerClass may change the result of supported()\n        // https://github.com/visgl/react-map-gl/discussions/2027\n        setGlobals(mapboxgl, props);\n        if (!mapboxgl.supported || mapboxgl.supported(props)) {\n          if (props.reuseMaps) {\n            mapbox = Mapbox.reuse(props, containerRef.current);\n          }\n          if (!mapbox) {\n            mapbox = new Mapbox(mapboxgl.Map, props, containerRef.current);\n          }\n          contextValue.map = createRef(mapbox);\n          contextValue.mapLib = mapboxgl;\n\n          setMapInstance(mapbox);\n          mountedMapsContext?.onMapMount(contextValue.map, props.id);\n        } else {\n          throw new Error('Map is not supported by this browser');\n        }\n      })\n      .catch(error => {\n        const {onError} = props;\n        if (onError) {\n          onError({\n            type: 'error',\n            target: null,\n            originalEvent: null,\n            error\n          });\n        } else {\n          console.error(error); // eslint-disable-line\n        }\n      });\n\n    return () => {\n      isMounted = false;\n      if (mapbox) {\n        mountedMapsContext?.onMapUnmount(props.id);\n        if (props.reuseMaps) {\n          mapbox.recycle();\n        } else {\n          mapbox.destroy();\n        }\n      }\n    };\n  }, []);\n\n  useIsomorphicLayoutEffect(() => {\n    if (mapInstance) {\n      mapInstance.setProps(props);\n    }\n  });\n\n  useImperativeHandle(ref, () => contextValue.map, [mapInstance]);\n\n  const style: CSSProperties = useMemo(\n    () => ({\n      position: 'relative',\n      width: '100%',\n      height: '100%',\n      ...props.style\n    }),\n    [props.style]\n  );\n\n  const CHILD_CONTAINER_STYLE = {\n    height: '100%'\n  };\n\n  return (\n    <div id={props.id} ref={containerRef} style={style}>\n      {mapInstance && (\n        <MapContext.Provider value={contextValue}>\n          <div mapboxgl-children=\"\" style={CHILD_CONTAINER_STYLE}>\n            {props.children}\n          </div>\n        </MapContext.Provider>\n      )}\n    </div>\n  );\n}\n"],"mappings":";;;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAAQC,QAAQ,EAAEC,MAAM,EAAEC,SAAS,EAAEC,UAAU,EAAEC,OAAO,EAAEC,mBAAmB,QAAO,OAAO;AAAC,SAEpFC,kBAAkB;AAAA,OACnBC,MAAM;AAAA,OACNC,SAAS;AAAA,OAGTC,yBAAyB;AAAA,OACzBC,UAAU;AAQjB,OAAO,MAAMC,UAAU,GAAGZ,KAAK,CAACa,aAAa,CAAkB,IAAI,CAAC;AAwBpE,eAAe,SAASC,GAAGA,CAMzBC,KAAqD,EACrDC,GAA4B,EAC5BC,UAAgD,EAChD;EACA,MAAMC,kBAAkB,GAAGd,UAAU,CAACG,kBAAkB,CAAC;EACzD,MAAM,CAACY,WAAW,EAAEC,cAAc,CAAC,GAAGnB,QAAQ,CAAmC,IAAI,CAAC;EACtF,MAAMoB,YAAY,GAAGnB,MAAM,CAAC,CAAC;EAE7B,MAAM;IAACoB,OAAO,EAAEC;EAAY,CAAC,GAAGrB,MAAM,CAAwB;IAACsB,MAAM,EAAE,IAAI;IAAEC,GAAG,EAAE;EAAI,CAAC,CAAC;EAExFtB,SAAS,CAAC,MAAM;IACd,MAAMqB,MAAM,GAAGT,KAAK,CAACS,MAAM;IAC3B,IAAIE,SAAS,GAAG,IAAI;IACpB,IAAIC,MAAwC;IAE5CC,OAAO,CAACC,OAAO,CAACL,MAAM,IAAIP,UAAU,CAAC,CAClCa,IAAI,CAAEC,MAA8C,IAAK;MACxD,IAAI,CAACL,SAAS,EAAE;QACd;MACF;MACA,IAAI,CAACK,MAAM,EAAE;QACX,MAAM,IAAIC,KAAK,CAAC,gBAAgB,CAAC;MACnC;MACA,MAAMC,QAAQ,GAAG,KAAK,IAAIF,MAAM,GAAGA,MAAM,GAAGA,MAAM,CAACG,OAAO;MAC1D,IAAI,CAACD,QAAQ,CAACnB,GAAG,EAAE;QACjB,MAAM,IAAIkB,KAAK,CAAC,gBAAgB,CAAC;MACnC;MAIArB,UAAU,CAACsB,QAAQ,EAAElB,KAAK,CAAC;MAC3B,IAAI,CAACkB,QAAQ,CAACE,SAAS,IAAIF,QAAQ,CAACE,SAAS,CAACpB,KAAK,CAAC,EAAE;QACpD,IAAIA,KAAK,CAACqB,SAAS,EAAE;UACnBT,MAAM,GAAGnB,MAAM,CAAC6B,KAAK,CAACtB,KAAK,EAAEM,YAAY,CAACC,OAAO,CAAC;QACpD;QACA,IAAI,CAACK,MAAM,EAAE;UACXA,MAAM,GAAG,IAAInB,MAAM,CAACyB,QAAQ,CAACnB,GAAG,EAAEC,KAAK,EAAEM,YAAY,CAACC,OAAO,CAAC;QAChE;QACAC,YAAY,CAACE,GAAG,GAAGhB,SAAS,CAACkB,MAAM,CAAC;QACpCJ,YAAY,CAACC,MAAM,GAAGS,QAAQ;QAE9Bb,cAAc,CAACO,MAAM,CAAC;QACtBT,kBAAkB,aAAlBA,kBAAkB,eAAlBA,kBAAkB,CAAEoB,UAAU,CAACf,YAAY,CAACE,GAAG,EAAEV,KAAK,CAACwB,EAAE,CAAC;MAC5D,CAAC,MAAM;QACL,MAAM,IAAIP,KAAK,CAAC,sCAAsC,CAAC;MACzD;IACF,CAAC,CAAC,CACDQ,KAAK,CAACC,KAAK,IAAI;MACd,MAAM;QAACC;MAAO,CAAC,GAAG3B,KAAK;MACvB,IAAI2B,OAAO,EAAE;QACXA,OAAO,CAAC;UACNC,IAAI,EAAE,OAAO;UACbC,MAAM,EAAE,IAAI;UACZC,aAAa,EAAE,IAAI;UACnBJ;QACF,CAAC,CAAC;MACJ,CAAC,MAAM;QACLK,OAAO,CAACL,KAAK,CAACA,KAAK,CAAC;MACtB;IACF,CAAC,CAAC;IAEJ,OAAO,MAAM;MACXf,SAAS,GAAG,KAAK;MACjB,IAAIC,MAAM,EAAE;QACVT,kBAAkB,aAAlBA,kBAAkB,eAAlBA,kBAAkB,CAAE6B,YAAY,CAAChC,KAAK,CAACwB,EAAE,CAAC;QAC1C,IAAIxB,KAAK,CAACqB,SAAS,EAAE;UACnBT,MAAM,CAACqB,OAAO,CAAC,CAAC;QAClB,CAAC,MAAM;UACLrB,MAAM,CAACsB,OAAO,CAAC,CAAC;QAClB;MACF;IACF,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;EAENvC,yBAAyB,CAAC,MAAM;IAC9B,IAAIS,WAAW,EAAE;MACfA,WAAW,CAAC+B,QAAQ,CAACnC,KAAK,CAAC;IAC7B;EACF,CAAC,CAAC;EAEFT,mBAAmB,CAACU,GAAG,EAAE,MAAMO,YAAY,CAACE,GAAG,EAAE,CAACN,WAAW,CAAC,CAAC;EAE/D,MAAMgC,KAAoB,GAAG9C,OAAO,CAClC,MAAA+C,aAAA;IACEC,QAAQ,EAAE,UAAU;IACpBC,KAAK,EAAE,MAAM;IACbC,MAAM,EAAE;EAAM,GACXxC,KAAK,CAACoC,KAAK,CACd,EACF,CAACpC,KAAK,CAACoC,KAAK,CACd,CAAC;EAED,MAAMK,qBAAqB,GAAG;IAC5BD,MAAM,EAAE;EACV,CAAC;EAED,OACEvD,KAAA,CAAAyD,aAAA;IAAKlB,EAAE,EAAExB,KAAK,CAACwB,EAAG;IAACvB,GAAG,EAAEK,YAAa;IAAC8B,KAAK,EAAEA;EAAM,GAChDhC,WAAW,IACVnB,KAAA,CAAAyD,aAAA,CAAC7C,UAAU,CAAC8C,QAAQ;IAACC,KAAK,EAAEpC;EAAa,GACvCvB,KAAA,CAAAyD,aAAA;IAAK,qBAAkB,EAAE;IAACN,KAAK,EAAEK;EAAsB,GACpDzC,KAAK,CAAC6C,QACJ,CACc,CAEpB,CAAC;AAEV","ignoreList":[]}
+{"version":3,"file":"map.js","names":["React","useState","useRef","useEffect","useContext","useMemo","useImperativeHandle","MountedMapsContext","Mapbox","createRef","useIsomorphicLayoutEffect","setGlobals","MapContext","createContext","Map","props","ref","defaultLib","mountedMapsContext","mapInstance","setMapInstance","containerRef","current","contextValue","mapLib","map","isMounted","mapbox","Promise","resolve","then","module","Error","mapboxgl","default","supported","reuseMaps","reuse","onMapMount","id","catch","error","onError","type","target","originalEvent","console","onMapUnmount","recycle","destroy","setProps","style","position","width","height","CHILD_CONTAINER_STYLE","createElement","Provider","value","children"],"sources":["../../src/components/map.tsx"],"sourcesContent":["import * as React from 'react';\nimport {useState, useRef, useEffect, useContext, useMemo, useImperativeHandle} from 'react';\n\nimport {MountedMapsContext} from './use-map';\nimport Mapbox, {MapboxProps} from '../mapbox/mapbox';\nimport createRef, {MapRef} from '../mapbox/create-ref';\n\nimport type {CSSProperties} from 'react';\nimport useIsomorphicLayoutEffect from '../utils/use-isomorphic-layout-effect';\nimport setGlobals, {GlobalSettings} from '../utils/set-globals';\nimport type {MapLib, MapInstance, MapStyle, Callbacks} from '../types';\n\nexport type MapContextValue<MapT extends MapInstance = MapInstance> = {\n  mapLib: MapLib<MapT>;\n  map: MapRef<MapT>;\n};\n\nexport const MapContext = React.createContext<MapContextValue>(null);\n\ntype MapInitOptions<MapOptions> = Omit<\n  MapOptions,\n  'style' | 'container' | 'bounds' | 'fitBoundsOptions' | 'center'\n>;\n\nexport type MapProps<\n  MapOptions,\n  StyleT extends MapStyle,\n  CallbacksT extends Callbacks,\n  MapT extends MapInstance\n> = MapInitOptions<MapOptions> &\n  MapboxProps<StyleT, CallbacksT> &\n  GlobalSettings & {\n    mapLib?: MapLib<MapT> | Promise<MapLib<MapT>>;\n    reuseMaps?: boolean;\n    /** Map container id */\n    id?: string;\n    /** Map container CSS style */\n    style?: CSSProperties;\n    children?: any;\n  };\n\nexport default function Map<\n  MapOptions,\n  StyleT extends MapStyle,\n  CallbacksT extends Callbacks,\n  MapT extends MapInstance\n>(\n  props: MapProps<MapOptions, StyleT, CallbacksT, MapT>,\n  ref: React.Ref<MapRef<MapT>>,\n  defaultLib: MapLib<MapT> | Promise<MapLib<MapT>>\n) {\n  const mountedMapsContext = useContext(MountedMapsContext);\n  const [mapInstance, setMapInstance] = useState<Mapbox<StyleT, CallbacksT, MapT>>(null);\n  const containerRef = useRef();\n\n  const {current: contextValue} = useRef<MapContextValue<MapT>>({mapLib: null, map: null});\n\n  useEffect(() => {\n    const mapLib = props.mapLib;\n    let isMounted = true;\n    let mapbox: Mapbox<StyleT, CallbacksT, MapT>;\n\n    Promise.resolve(mapLib || defaultLib)\n      .then((module: MapLib<MapT> | {default: MapLib<MapT>}) => {\n        if (!isMounted) {\n          return;\n        }\n        if (!module) {\n          throw new Error('Invalid mapLib');\n        }\n        const mapboxgl = 'Map' in module ? module : module.default;\n        if (!mapboxgl.Map) {\n          throw new Error('Invalid mapLib');\n        }\n\n        // workerUrl & workerClass may change the result of supported()\n        // https://github.com/visgl/react-map-gl/discussions/2027\n        setGlobals(mapboxgl, props);\n        if (!mapboxgl.supported || mapboxgl.supported(props)) {\n          if (props.reuseMaps) {\n            mapbox = Mapbox.reuse(props, containerRef.current);\n          }\n          if (!mapbox) {\n            mapbox = new Mapbox(mapboxgl.Map, props, containerRef.current);\n          }\n          contextValue.map = createRef(mapbox);\n          contextValue.mapLib = mapboxgl;\n\n          setMapInstance(mapbox);\n          mountedMapsContext?.onMapMount(contextValue.map, props.id);\n        } else {\n          throw new Error('Map is not supported by this browser');\n        }\n      })\n      .catch(error => {\n        const {onError} = props;\n        if (onError) {\n          onError({\n            type: 'error',\n            target: null,\n            originalEvent: null,\n            error\n          });\n        } else {\n          console.error(error); // eslint-disable-line\n        }\n      });\n\n    return () => {\n      isMounted = false;\n      if (mapbox) {\n        mountedMapsContext?.onMapUnmount(props.id);\n        if (props.reuseMaps) {\n          mapbox.recycle();\n        } else {\n          mapbox.destroy();\n        }\n      }\n    };\n  }, []);\n\n  useIsomorphicLayoutEffect(() => {\n    if (mapInstance) {\n      mapInstance.setProps(props);\n    }\n  });\n\n  useImperativeHandle(ref, () => contextValue.map, [mapInstance]);\n\n  const style: CSSProperties = useMemo(\n    () => ({\n      position: 'relative',\n      width: '100%',\n      height: '100%',\n      ...props.style\n    }),\n    [props.style]\n  );\n\n  const CHILD_CONTAINER_STYLE = {\n    height: '100%'\n  };\n\n  return (\n    <div id={props.id} ref={containerRef} style={style}>\n      {mapInstance && (\n        <MapContext.Provider value={contextValue}>\n          <div mapboxgl-children=\"\" style={CHILD_CONTAINER_STYLE}>\n            {props.children}\n          </div>\n        </MapContext.Provider>\n      )}\n    </div>\n  );\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/components/marker.js

@@ -1,6 +1,3 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import * as React from 'react';
 import { createPortal } from 'react-dom';
 import { useImperativeHandle, useEffect, useMemo, useRef, useContext, forwardRef, memo } from 'react';
@@ -23,36 +20,33 @@ function Marker(props, ref) {
         hasChildren = true;
       }
     });
-    const options = _objectSpread(_objectSpread({}, props), {}, {
+    const options = {
+      ...props,
       element: hasChildren ? document.createElement('div') : null
-    });
+    };
     const mk = new mapLib.Marker(options);
     mk.setLngLat([props.longitude, props.latitude]);
     mk.getElement().addEventListener('click', e => {
-      var _thisRef$current$prop, _thisRef$current$prop2;
-      (_thisRef$current$prop = (_thisRef$current$prop2 = thisRef.current.props).onClick) === null || _thisRef$current$prop === void 0 || _thisRef$current$prop.call(_thisRef$current$prop2, {
+      thisRef.current.props.onClick?.({
         type: 'click',
         target: mk,
         originalEvent: e
       });
     });
     mk.on('dragstart', e => {
-      var _thisRef$current$prop3, _thisRef$current$prop4;
       const evt = e;
       evt.lngLat = marker.getLngLat();
-      (_thisRef$current$prop3 = (_thisRef$current$prop4 = thisRef.current.props).onDragStart) === null || _thisRef$current$prop3 === void 0 || _thisRef$current$prop3.call(_thisRef$current$prop4, evt);
+      thisRef.current.props.onDragStart?.(evt);
     });
     mk.on('drag', e => {
-      var _thisRef$current$prop5, _thisRef$current$prop6;
       const evt = e;
       evt.lngLat = marker.getLngLat();
-      (_thisRef$current$prop5 = (_thisRef$current$prop6 = thisRef.current.props).onDrag) === null || _thisRef$current$prop5 === void 0 || _thisRef$current$prop5.call(_thisRef$current$prop6, evt);
+      thisRef.current.props.onDrag?.(evt);
     });
     mk.on('dragend', e => {
-      var _thisRef$current$prop7, _thisRef$current$prop8;
       const evt = e;
       evt.lngLat = marker.getLngLat();
-      (_thisRef$current$prop7 = (_thisRef$current$prop8 = thisRef.current.props).onDragEnd) === null || _thisRef$current$prop7 === void 0 || _thisRef$current$prop7.call(_thisRef$current$prop8, evt);
+      thisRef.current.props.onDragEnd?.(evt);
     });
     return mk;
   }, []);

package/dist/components/marker.js.map

@@ -1 +1 @@
-{"version":3,"file":"marker.js","names":["React","createPortal","useImperativeHandle","useEffect","useMemo","useRef","useContext","forwardRef","memo","applyReactStyle","MapContext","arePointsEqual","Marker","props","ref","map","mapLib","thisRef","current","marker","hasChildren","Children","forEach","children","el","options","_objectSpread","element","document","createElement","mk","setLngLat","longitude","latitude","getElement","addEventListener","e","_thisRef$current$prop","_thisRef$current$prop2","onClick","call","type","target","originalEvent","on","_thisRef$current$prop3","_thisRef$current$prop4","evt","lngLat","getLngLat","onDragStart","_thisRef$current$prop5","_thisRef$current$prop6","onDrag","_thisRef$current$prop7","_thisRef$current$prop8","onDragEnd","addTo","getMap","remove","offset","style","draggable","popup","rotation","rotationAlignment","pitchAlignment","lng","lat","getOffset","setOffset","isDraggable","setDraggable","getRotation","setRotation","getRotationAlignment","setRotationAlignment","getPitchAlignment","setPitchAlignment","getPopup","setPopup"],"sources":["../../src/components/marker.ts"],"sourcesContent":["/* global document */\nimport * as React from 'react';\nimport {createPortal} from 'react-dom';\nimport {useImperativeHandle, useEffect, useMemo, useRef, useContext, forwardRef, memo} from 'react';\nimport {applyReactStyle} from '../utils/apply-react-style';\n\nimport type {MarkerEvent, MarkerDragEvent, PointLike, MarkerInstance} from '../types';\n\nimport {MapContext} from './map';\nimport {arePointsEqual} from '../utils/deep-equal';\n\nexport type MarkerProps<OptionsT, MarkerT extends MarkerInstance> = OptionsT & {\n  /** Longitude of the anchor location */\n  longitude: number;\n  /** Latitude of the anchor location */\n  latitude: number;\n\n  // These types will be further constraint by OptionsT\n  draggable?: boolean;\n  offset?: PointLike;\n  pitchAlignment?: string;\n  rotation?: number;\n  rotationAlignment?: string;\n  popup?: any;\n\n  /** CSS style override, applied to the control's container */\n  style?: React.CSSProperties;\n  onClick?: (e: MarkerEvent<MarkerT, MouseEvent>) => void;\n  onDragStart?: (e: MarkerDragEvent<MarkerT>) => void;\n  onDrag?: (e: MarkerDragEvent<MarkerT>) => void;\n  onDragEnd?: (e: MarkerDragEvent<MarkerT>) => void;\n  children?: React.ReactNode;\n};\n\n/* eslint-disable complexity,max-statements */\nfunction Marker<MarkerOptions, MarkerT extends MarkerInstance>(\n  props: MarkerProps<MarkerOptions, MarkerT>,\n  ref: React.Ref<MarkerT>\n) {\n  const {map, mapLib} = useContext(MapContext);\n  const thisRef = useRef({props});\n  thisRef.current.props = props;\n\n  const marker: MarkerT = useMemo(() => {\n    let hasChildren = false;\n    React.Children.forEach(props.children, el => {\n      if (el) {\n        hasChildren = true;\n      }\n    });\n    const options = {\n      ...props,\n      element: hasChildren ? document.createElement('div') : null\n    };\n\n    const mk = new mapLib.Marker(options) as MarkerT;\n    mk.setLngLat([props.longitude, props.latitude]);\n\n    mk.getElement().addEventListener('click', (e: MouseEvent) => {\n      thisRef.current.props.onClick?.({\n        type: 'click',\n        target: mk,\n        originalEvent: e\n      });\n    });\n\n    mk.on('dragstart', e => {\n      const evt = e as MarkerDragEvent<MarkerT>;\n      evt.lngLat = marker.getLngLat();\n      thisRef.current.props.onDragStart?.(evt);\n    });\n    mk.on('drag', e => {\n      const evt = e as MarkerDragEvent<MarkerT>;\n      evt.lngLat = marker.getLngLat();\n      thisRef.current.props.onDrag?.(evt);\n    });\n    mk.on('dragend', e => {\n      const evt = e as MarkerDragEvent<MarkerT>;\n      evt.lngLat = marker.getLngLat();\n      thisRef.current.props.onDragEnd?.(evt);\n    });\n\n    return mk;\n  }, []);\n\n  useEffect(() => {\n    marker.addTo(map.getMap());\n\n    return () => {\n      marker.remove();\n    };\n  }, []);\n\n  const {\n    longitude,\n    latitude,\n    offset,\n    style,\n    draggable = false,\n    popup = null,\n    rotation = 0,\n    rotationAlignment = 'auto',\n    pitchAlignment = 'auto'\n  } = props;\n\n  useEffect(() => {\n    applyReactStyle(marker.getElement(), style);\n  }, [style]);\n\n  useImperativeHandle(ref, () => marker, []);\n\n  if (marker.getLngLat().lng !== longitude || marker.getLngLat().lat !== latitude) {\n    marker.setLngLat([longitude, latitude]);\n  }\n  if (offset && !arePointsEqual(marker.getOffset(), offset)) {\n    marker.setOffset(offset);\n  }\n  if (marker.isDraggable() !== draggable) {\n    marker.setDraggable(draggable);\n  }\n  if (marker.getRotation() !== rotation) {\n    marker.setRotation(rotation);\n  }\n  if (marker.getRotationAlignment() !== rotationAlignment) {\n    marker.setRotationAlignment(rotationAlignment);\n  }\n  if (marker.getPitchAlignment() !== pitchAlignment) {\n    marker.setPitchAlignment(pitchAlignment);\n  }\n  if (marker.getPopup() !== popup) {\n    marker.setPopup(popup);\n  }\n\n  return createPortal(props.children, marker.getElement());\n}\n\nexport default memo(forwardRef(Marker));\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"marker.js","names":["React","createPortal","useImperativeHandle","useEffect","useMemo","useRef","useContext","forwardRef","memo","applyReactStyle","MapContext","arePointsEqual","Marker","props","ref","map","mapLib","thisRef","current","marker","hasChildren","Children","forEach","children","el","options","element","document","createElement","mk","setLngLat","longitude","latitude","getElement","addEventListener","e","onClick","type","target","originalEvent","on","evt","lngLat","getLngLat","onDragStart","onDrag","onDragEnd","addTo","getMap","remove","offset","style","draggable","popup","rotation","rotationAlignment","pitchAlignment","lng","lat","getOffset","setOffset","isDraggable","setDraggable","getRotation","setRotation","getRotationAlignment","setRotationAlignment","getPitchAlignment","setPitchAlignment","getPopup","setPopup"],"sources":["../../src/components/marker.ts"],"sourcesContent":["/* global document */\nimport * as React from 'react';\nimport {createPortal} from 'react-dom';\nimport {useImperativeHandle, useEffect, useMemo, useRef, useContext, forwardRef, memo} from 'react';\nimport {applyReactStyle} from '../utils/apply-react-style';\n\nimport type {MarkerEvent, MarkerDragEvent, PointLike, MarkerInstance} from '../types';\n\nimport {MapContext} from './map';\nimport {arePointsEqual} from '../utils/deep-equal';\n\nexport type MarkerProps<OptionsT, MarkerT extends MarkerInstance> = OptionsT & {\n  /** Longitude of the anchor location */\n  longitude: number;\n  /** Latitude of the anchor location */\n  latitude: number;\n\n  // These types will be further constraint by OptionsT\n  draggable?: boolean;\n  offset?: PointLike;\n  pitchAlignment?: string;\n  rotation?: number;\n  rotationAlignment?: string;\n  popup?: any;\n\n  /** CSS style override, applied to the control's container */\n  style?: React.CSSProperties;\n  onClick?: (e: MarkerEvent<MarkerT, MouseEvent>) => void;\n  onDragStart?: (e: MarkerDragEvent<MarkerT>) => void;\n  onDrag?: (e: MarkerDragEvent<MarkerT>) => void;\n  onDragEnd?: (e: MarkerDragEvent<MarkerT>) => void;\n  children?: React.ReactNode;\n};\n\n/* eslint-disable complexity,max-statements */\nfunction Marker<MarkerOptions, MarkerT extends MarkerInstance>(\n  props: MarkerProps<MarkerOptions, MarkerT>,\n  ref: React.Ref<MarkerT>\n) {\n  const {map, mapLib} = useContext(MapContext);\n  const thisRef = useRef({props});\n  thisRef.current.props = props;\n\n  const marker: MarkerT = useMemo(() => {\n    let hasChildren = false;\n    React.Children.forEach(props.children, el => {\n      if (el) {\n        hasChildren = true;\n      }\n    });\n    const options = {\n      ...props,\n      element: hasChildren ? document.createElement('div') : null\n    };\n\n    const mk = new mapLib.Marker(options) as MarkerT;\n    mk.setLngLat([props.longitude, props.latitude]);\n\n    mk.getElement().addEventListener('click', (e: MouseEvent) => {\n      thisRef.current.props.onClick?.({\n        type: 'click',\n        target: mk,\n        originalEvent: e\n      });\n    });\n\n    mk.on('dragstart', e => {\n      const evt = e as MarkerDragEvent<MarkerT>;\n      evt.lngLat = marker.getLngLat();\n      thisRef.current.props.onDragStart?.(evt);\n    });\n    mk.on('drag', e => {\n      const evt = e as MarkerDragEvent<MarkerT>;\n      evt.lngLat = marker.getLngLat();\n      thisRef.current.props.onDrag?.(evt);\n    });\n    mk.on('dragend', e => {\n      const evt = e as MarkerDragEvent<MarkerT>;\n      evt.lngLat = marker.getLngLat();\n      thisRef.current.props.onDragEnd?.(evt);\n    });\n\n    return mk;\n  }, []);\n\n  useEffect(() => {\n    marker.addTo(map.getMap());\n\n    return () => {\n      marker.remove();\n    };\n  }, []);\n\n  const {\n    longitude,\n    latitude,\n    offset,\n    style,\n    draggable = false,\n    popup = null,\n    rotation = 0,\n    rotationAlignment = 'auto',\n    pitchAlignment = 'auto'\n  } = props;\n\n  useEffect(() => {\n    applyReactStyle(marker.getElement(), style);\n  }, [style]);\n\n  useImperativeHandle(ref, () => marker, []);\n\n  if (marker.getLngLat().lng !== longitude || marker.getLngLat().lat !== latitude) {\n    marker.setLngLat([longitude, latitude]);\n  }\n  if (offset && !arePointsEqual(marker.getOffset(), offset)) {\n    marker.setOffset(offset);\n  }\n  if (marker.isDraggable() !== draggable) {\n    marker.setDraggable(draggable);\n  }\n  if (marker.getRotation() !== rotation) {\n    marker.setRotation(rotation);\n  }\n  if (marker.getRotationAlignment() !== rotationAlignment) {\n    marker.setRotationAlignment(rotationAlignment);\n  }\n  if (marker.getPitchAlignment() !== pitchAlignment) {\n    marker.setPitchAlignment(pitchAlignment);\n  }\n  if (marker.getPopup() !== popup) {\n    marker.setPopup(popup);\n  }\n\n  return createPortal(props.children, marker.getElement());\n}\n\nexport default memo(forwardRef(Marker));\n"],"mappings":"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","ignoreList":[]}

package/dist/components/popup.js

@@ -1,6 +1,3 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { createPortal } from 'react-dom';
 import { useImperativeHandle, useEffect, useMemo, useRef, useContext, forwardRef, memo } from 'react';
 import { applyReactStyle } from "../utils/apply-react-style.js";
@@ -22,19 +19,19 @@ function Popup(props, ref) {
   });
   thisRef.current.props = props;
   const popup = useMemo(() => {
-    const options = _objectSpread({}, props);
+    const options = {
+      ...props
+    };
     const pp = new mapLib.Popup(options);
     pp.setLngLat([props.longitude, props.latitude]);
     pp.once('open', e => {
-      var _thisRef$current$prop, _thisRef$current$prop2;
-      (_thisRef$current$prop = (_thisRef$current$prop2 = thisRef.current.props).onOpen) === null || _thisRef$current$prop === void 0 || _thisRef$current$prop.call(_thisRef$current$prop2, e);
+      thisRef.current.props.onOpen?.(e);
     });
     return pp;
   }, []);
   useEffect(() => {
     const onClose = e => {
-      var _thisRef$current$prop3, _thisRef$current$prop4;
-      (_thisRef$current$prop3 = (_thisRef$current$prop4 = thisRef.current.props).onClose) === null || _thisRef$current$prop3 === void 0 || _thisRef$current$prop3.call(_thisRef$current$prop4, e);
+      thisRef.current.props.onClose?.(e);
     };
     popup.on('close', onClose);
     popup.setDOMContent(container).addTo(map.getMap());

package/dist/components/popup.js.map

@@ -1 +1 @@
-{"version":3,"file":"popup.js","names":["createPortal","useImperativeHandle","useEffect","useMemo","useRef","useContext","forwardRef","memo","applyReactStyle","MapContext","deepEqual","getClassList","className","Set","trim","split","Popup","props","ref","map","mapLib","container","document","createElement","thisRef","current","popup","options","_objectSpread","pp","setLngLat","longitude","latitude","once","e","_thisRef$current$prop","_thisRef$current$prop2","onOpen","call","onClose","_thisRef$current$prop3","_thisRef$current$prop4","on","setDOMContent","addTo","getMap","off","isOpen","remove","getElement","style","getLngLat","lng","lat","offset","setOffset","anchor","maxWidth","setMaxWidth","prevClassList","nextClassList","c","has","removeClassName","addClassName","children"],"sources":["../../src/components/popup.ts"],"sourcesContent":["/* global document */\nimport * as React from 'react';\nimport {createPortal} from 'react-dom';\nimport {useImperativeHandle, useEffect, useMemo, useRef, useContext, forwardRef, memo} from 'react';\nimport {applyReactStyle} from '../utils/apply-react-style';\n\nimport type {PopupEvent, PopupInstance} from '../types';\n\nimport {MapContext} from './map';\nimport {deepEqual} from '../utils/deep-equal';\n\nexport type PopupProps<OptionsT, PopupT extends PopupInstance> = OptionsT & {\n  /** Longitude of the anchor location */\n  longitude: number;\n  /** Latitude of the anchor location */\n  latitude: number;\n\n  // These types will be further constraint by OptionsT\n  anchor?: string;\n  offset?: any;\n  className?: string;\n  maxWidth?: string;\n\n  /** CSS style override, applied to the control's container */\n  style?: React.CSSProperties;\n\n  onOpen?: (e: PopupEvent<PopupT>) => void;\n  onClose?: (e: PopupEvent<PopupT>) => void;\n  children?: React.ReactNode;\n};\n\n// Adapted from https://github.com/mapbox/mapbox-gl-js/blob/v1.13.0/src/ui/popup.js\nfunction getClassList(className: string) {\n  return new Set(className ? className.trim().split(/\\s+/) : []);\n}\n\n/* eslint-disable complexity,max-statements */\nfunction Popup<PopupOptions, PopupT extends PopupInstance>(\n  props: PopupProps<PopupOptions, PopupT>,\n  ref: React.Ref<PopupT>\n) {\n  const {map, mapLib} = useContext(MapContext);\n  const container = useMemo(() => {\n    return document.createElement('div');\n  }, []);\n  const thisRef = useRef({props});\n  thisRef.current.props = props;\n\n  const popup: PopupT = useMemo(() => {\n    const options = {...props};\n    const pp = new mapLib.Popup(options) as PopupT;\n    pp.setLngLat([props.longitude, props.latitude]);\n    pp.once('open', e => {\n      thisRef.current.props.onOpen?.(e as PopupEvent<PopupT>);\n    });\n    return pp;\n  }, []);\n\n  useEffect(() => {\n    const onClose = e => {\n      thisRef.current.props.onClose?.(e as PopupEvent<PopupT>);\n    };\n    popup.on('close', onClose);\n    popup.setDOMContent(container).addTo(map.getMap());\n\n    return () => {\n      // https://github.com/visgl/react-map-gl/issues/1825\n      // onClose should not be fired if the popup is removed by unmounting\n      // When using React strict mode, the component is mounted twice.\n      // Firing the onClose callback here would be a false signal to remove the component.\n      popup.off('close', onClose);\n      if (popup.isOpen()) {\n        popup.remove();\n      }\n    };\n  }, []);\n\n  useEffect(() => {\n    applyReactStyle(popup.getElement(), props.style);\n  }, [props.style]);\n\n  useImperativeHandle(ref, () => popup, []);\n\n  if (popup.isOpen()) {\n    if (popup.getLngLat().lng !== props.longitude || popup.getLngLat().lat !== props.latitude) {\n      popup.setLngLat([props.longitude, props.latitude]);\n    }\n    if (props.offset && !deepEqual(popup.options.offset, props.offset)) {\n      popup.setOffset(props.offset);\n    }\n    if (popup.options.anchor !== props.anchor || popup.options.maxWidth !== props.maxWidth) {\n      popup.options.anchor = props.anchor;\n      popup.setMaxWidth(props.maxWidth);\n    }\n    if (popup.options.className !== props.className) {\n      const prevClassList = getClassList(popup.options.className);\n      const nextClassList = getClassList(props.className);\n\n      for (const c of prevClassList) {\n        if (!nextClassList.has(c)) {\n          popup.removeClassName(c);\n        }\n      }\n      for (const c of nextClassList) {\n        if (!prevClassList.has(c)) {\n          popup.addClassName(c);\n        }\n      }\n      popup.options.className = props.className;\n    }\n  }\n\n  return createPortal(props.children, container);\n}\n\nexport default memo(forwardRef(Popup));\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"popup.js","names":["createPortal","useImperativeHandle","useEffect","useMemo","useRef","useContext","forwardRef","memo","applyReactStyle","MapContext","deepEqual","getClassList","className","Set","trim","split","Popup","props","ref","map","mapLib","container","document","createElement","thisRef","current","popup","options","pp","setLngLat","longitude","latitude","once","e","onOpen","onClose","on","setDOMContent","addTo","getMap","off","isOpen","remove","getElement","style","getLngLat","lng","lat","offset","setOffset","anchor","maxWidth","setMaxWidth","prevClassList","nextClassList","c","has","removeClassName","addClassName","children"],"sources":["../../src/components/popup.ts"],"sourcesContent":["/* global document */\nimport * as React from 'react';\nimport {createPortal} from 'react-dom';\nimport {useImperativeHandle, useEffect, useMemo, useRef, useContext, forwardRef, memo} from 'react';\nimport {applyReactStyle} from '../utils/apply-react-style';\n\nimport type {PopupEvent, PopupInstance} from '../types';\n\nimport {MapContext} from './map';\nimport {deepEqual} from '../utils/deep-equal';\n\nexport type PopupProps<OptionsT, PopupT extends PopupInstance> = OptionsT & {\n  /** Longitude of the anchor location */\n  longitude: number;\n  /** Latitude of the anchor location */\n  latitude: number;\n\n  // These types will be further constraint by OptionsT\n  anchor?: string;\n  offset?: any;\n  className?: string;\n  maxWidth?: string;\n\n  /** CSS style override, applied to the control's container */\n  style?: React.CSSProperties;\n\n  onOpen?: (e: PopupEvent<PopupT>) => void;\n  onClose?: (e: PopupEvent<PopupT>) => void;\n  children?: React.ReactNode;\n};\n\n// Adapted from https://github.com/mapbox/mapbox-gl-js/blob/v1.13.0/src/ui/popup.js\nfunction getClassList(className: string) {\n  return new Set(className ? className.trim().split(/\\s+/) : []);\n}\n\n/* eslint-disable complexity,max-statements */\nfunction Popup<PopupOptions, PopupT extends PopupInstance>(\n  props: PopupProps<PopupOptions, PopupT>,\n  ref: React.Ref<PopupT>\n) {\n  const {map, mapLib} = useContext(MapContext);\n  const container = useMemo(() => {\n    return document.createElement('div');\n  }, []);\n  const thisRef = useRef({props});\n  thisRef.current.props = props;\n\n  const popup: PopupT = useMemo(() => {\n    const options = {...props};\n    const pp = new mapLib.Popup(options) as PopupT;\n    pp.setLngLat([props.longitude, props.latitude]);\n    pp.once('open', e => {\n      thisRef.current.props.onOpen?.(e as PopupEvent<PopupT>);\n    });\n    return pp;\n  }, []);\n\n  useEffect(() => {\n    const onClose = e => {\n      thisRef.current.props.onClose?.(e as PopupEvent<PopupT>);\n    };\n    popup.on('close', onClose);\n    popup.setDOMContent(container).addTo(map.getMap());\n\n    return () => {\n      // https://github.com/visgl/react-map-gl/issues/1825\n      // onClose should not be fired if the popup is removed by unmounting\n      // When using React strict mode, the component is mounted twice.\n      // Firing the onClose callback here would be a false signal to remove the component.\n      popup.off('close', onClose);\n      if (popup.isOpen()) {\n        popup.remove();\n      }\n    };\n  }, []);\n\n  useEffect(() => {\n    applyReactStyle(popup.getElement(), props.style);\n  }, [props.style]);\n\n  useImperativeHandle(ref, () => popup, []);\n\n  if (popup.isOpen()) {\n    if (popup.getLngLat().lng !== props.longitude || popup.getLngLat().lat !== props.latitude) {\n      popup.setLngLat([props.longitude, props.latitude]);\n    }\n    if (props.offset && !deepEqual(popup.options.offset, props.offset)) {\n      popup.setOffset(props.offset);\n    }\n    if (popup.options.anchor !== props.anchor || popup.options.maxWidth !== props.maxWidth) {\n      popup.options.anchor = props.anchor;\n      popup.setMaxWidth(props.maxWidth);\n    }\n    if (popup.options.className !== props.className) {\n      const prevClassList = getClassList(popup.options.className);\n      const nextClassList = getClassList(props.className);\n\n      for (const c of prevClassList) {\n        if (!nextClassList.has(c)) {\n          popup.removeClassName(c);\n        }\n      }\n      for (const c of nextClassList) {\n        if (!prevClassList.has(c)) {\n          popup.addClassName(c);\n        }\n      }\n      popup.options.className = props.className;\n    }\n  }\n\n  return createPortal(props.children, container);\n}\n\nexport default memo(forwardRef(Popup));\n"],"mappings":"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","ignoreList":[]}

package/dist/components/source.js

@@ -1,6 +1,3 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import * as React from 'react';
 import { useContext, useEffect, useMemo, useState, useRef } from 'react';
 import { cloneElement } from 'react';
@@ -10,7 +7,9 @@ import { deepEqual } from "../utils/deep-equal.js";
 let sourceCounter = 0;
 function createSource(map, id, props) {
   if (map.style && map.style._loaded) {
-    const options = _objectSpread({}, props);
+    const options = {
+      ...props
+    };
     delete options.id;
     delete options.children;
     map.addSource(id, options);
@@ -69,8 +68,7 @@ function Source(props) {
       return () => {
         map.off('styledata', forceUpdate);
         if (map.style && map.style._loaded && map.getSource(id)) {
-          var _map$getStyle;
-          const allLayers = (_map$getStyle = map.getStyle()) === null || _map$getStyle === void 0 ? void 0 : _map$getStyle.layers;
+          const allLayers = map.getStyle()?.layers;
           if (allLayers) {
             for (const layer of allLayers) {
               if (layer.source === id) {

package/dist/components/source.js.map

@@ -1 +1 @@
-{"version":3,"file":"source.js","names":["React","useContext","useEffect","useMemo","useState","useRef","cloneElement","MapContext","assert","deepEqual","sourceCounter","createSource","map","id","props","style","_loaded","options","_objectSpread","children","addSource","getSource","updateSource","source","prevProps","type","changedKey","changedKeyCount","key","setData","data","updateImage","url","coordinates","setCoordinates","setUrl","setTiles","tiles","console","warn","Source","getMap","propsRef","setStyleLoaded","forceUpdate","setTimeout","version","on","off","_map$getStyle","allLayers","getStyle","layers","layer","removeLayer","removeSource","undefined","current","Children","child"],"sources":["../../src/components/source.ts"],"sourcesContent":["import * as React from 'react';\nimport {useContext, useEffect, useMemo, useState, useRef} from 'react';\nimport {cloneElement} from 'react';\nimport {MapContext} from './map';\nimport assert from '../utils/assert';\nimport {deepEqual} from '../utils/deep-equal';\n\nimport type {\n  MapInstance,\n  ISource,\n  CustomSource,\n  GeoJSONSourceImplementation,\n  ImageSourceImplemtation,\n  AnySourceImplementation\n} from '../types';\nimport type {GeoJSONSourceRaw, ImageSourceRaw, VectorSourceRaw} from '../types/style-spec-bkoi-gl';\n\nexport type SourceProps<SourceT> = (SourceT | CustomSource) & {\n  id?: string;\n  children?: any;\n};\n\nlet sourceCounter = 0;\n\nfunction createSource<SourceT extends ISource>(\n  map: MapInstance,\n  id: string,\n  props: SourceProps<SourceT>\n) {\n  // @ts-ignore\n  if (map.style && map.style._loaded) {\n    const options = {...props};\n    delete options.id;\n    delete options.children;\n    // @ts-ignore\n    map.addSource(id, options);\n    return map.getSource(id);\n  }\n  return null;\n}\n\n/* eslint-disable complexity */\nfunction updateSource<SourceT extends ISource>(\n  source: AnySourceImplementation,\n  props: SourceProps<SourceT>,\n  prevProps: SourceProps<SourceT>\n) {\n  assert(props.id === prevProps.id, 'source id changed');\n  assert(props.type === prevProps.type, 'source type changed');\n\n  let changedKey = '';\n  let changedKeyCount = 0;\n\n  for (const key in props) {\n    if (key !== 'children' && key !== 'id' && !deepEqual(prevProps[key], props[key])) {\n      changedKey = key;\n      changedKeyCount++;\n    }\n  }\n\n  if (!changedKeyCount) {\n    return;\n  }\n\n  const type = props.type;\n\n  if (type === 'geojson') {\n    (source as GeoJSONSourceImplementation).setData(\n      (props as unknown as GeoJSONSourceRaw).data as any\n    );\n  } else if (type === 'image') {\n    (source as ImageSourceImplemtation).updateImage({\n      url: (props as unknown as ImageSourceRaw).url,\n      coordinates: (props as unknown as ImageSourceRaw).coordinates\n    });\n  } else if ('setCoordinates' in source && changedKeyCount === 1 && changedKey === 'coordinates') {\n    source.setCoordinates((props as ImageSourceRaw).coordinates);\n  } else if ('setUrl' in source) {\n    // Added in 1.12.0:\n    // vectorTileSource.setTiles\n    // vectorTileSource.setUrl\n    switch (changedKey) {\n      case 'url':\n        source.setUrl((props as VectorSourceRaw).url);\n        break;\n      case 'tiles':\n        source.setTiles((props as VectorSourceRaw).tiles);\n        break;\n      default:\n    }\n  } else {\n    // eslint-disable-next-line\n    console.warn(`Unable to update <Source> prop: ${changedKey}`);\n  }\n}\n/* eslint-enable complexity */\n\nfunction Source<SourceT extends ISource>(props: SourceProps<SourceT>) {\n  const map = useContext(MapContext).map.getMap();\n  const propsRef = useRef(props);\n  const [, setStyleLoaded] = useState(0);\n\n  const id = useMemo(() => props.id || `jsx-source-${sourceCounter++}`, []);\n\n  useEffect(() => {\n    if (map) {\n      /* global setTimeout */\n      const forceUpdate = () => setTimeout(() => setStyleLoaded(version => version + 1), 0);\n      map.on('styledata', forceUpdate);\n      forceUpdate();\n\n      return () => {\n        map.off('styledata', forceUpdate);\n        // @ts-ignore\n        if (map.style && map.style._loaded && map.getSource(id)) {\n          // Parent effects are destroyed before child ones, see\n          // https://github.com/facebook/react/issues/16728\n          // Source can only be removed after all child layers are removed\n          const allLayers = map.getStyle()?.layers;\n          if (allLayers) {\n            for (const layer of allLayers) {\n              // @ts-ignore (2339) source does not exist on all layer types\n              if (layer.source === id) {\n                map.removeLayer(layer.id);\n              }\n            }\n          }\n          map.removeSource(id);\n        }\n      };\n    }\n    return undefined;\n  }, [map]);\n\n  // @ts-ignore\n  let source = map && map.style && map.getSource(id);\n  if (source) {\n    updateSource(source, props, propsRef.current);\n  } else {\n    source = createSource(map, id, props);\n  }\n  propsRef.current = props;\n\n  return (\n    (source &&\n      React.Children.map(\n        props.children,\n        child =>\n          child &&\n          cloneElement(child, {\n            source: id\n          })\n      )) ||\n    null\n  );\n}\n\nexport default Source;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"source.js","names":["React","useContext","useEffect","useMemo","useState","useRef","cloneElement","MapContext","assert","deepEqual","sourceCounter","createSource","map","id","props","style","_loaded","options","children","addSource","getSource","updateSource","source","prevProps","type","changedKey","changedKeyCount","key","setData","data","updateImage","url","coordinates","setCoordinates","setUrl","setTiles","tiles","console","warn","Source","getMap","propsRef","setStyleLoaded","forceUpdate","setTimeout","version","on","off","allLayers","getStyle","layers","layer","removeLayer","removeSource","undefined","current","Children","child"],"sources":["../../src/components/source.ts"],"sourcesContent":["import * as React from 'react';\nimport {useContext, useEffect, useMemo, useState, useRef} from 'react';\nimport {cloneElement} from 'react';\nimport {MapContext} from './map';\nimport assert from '../utils/assert';\nimport {deepEqual} from '../utils/deep-equal';\n\nimport type {\n  MapInstance,\n  ISource,\n  CustomSource,\n  GeoJSONSourceImplementation,\n  ImageSourceImplemtation,\n  AnySourceImplementation\n} from '../types';\nimport type {GeoJSONSourceRaw, ImageSourceRaw, VectorSourceRaw} from '../types/style-spec-bkoi-gl';\n\nexport type SourceProps<SourceT> = (SourceT | CustomSource) & {\n  id?: string;\n  children?: any;\n};\n\nlet sourceCounter = 0;\n\nfunction createSource<SourceT extends ISource>(\n  map: MapInstance,\n  id: string,\n  props: SourceProps<SourceT>\n) {\n  // @ts-ignore\n  if (map.style && map.style._loaded) {\n    const options = {...props};\n    delete options.id;\n    delete options.children;\n    // @ts-ignore\n    map.addSource(id, options);\n    return map.getSource(id);\n  }\n  return null;\n}\n\n/* eslint-disable complexity */\nfunction updateSource<SourceT extends ISource>(\n  source: AnySourceImplementation,\n  props: SourceProps<SourceT>,\n  prevProps: SourceProps<SourceT>\n) {\n  assert(props.id === prevProps.id, 'source id changed');\n  assert(props.type === prevProps.type, 'source type changed');\n\n  let changedKey = '';\n  let changedKeyCount = 0;\n\n  for (const key in props) {\n    if (key !== 'children' && key !== 'id' && !deepEqual(prevProps[key], props[key])) {\n      changedKey = key;\n      changedKeyCount++;\n    }\n  }\n\n  if (!changedKeyCount) {\n    return;\n  }\n\n  const type = props.type;\n\n  if (type === 'geojson') {\n    (source as GeoJSONSourceImplementation).setData(\n      (props as unknown as GeoJSONSourceRaw).data as any\n    );\n  } else if (type === 'image') {\n    (source as ImageSourceImplemtation).updateImage({\n      url: (props as unknown as ImageSourceRaw).url,\n      coordinates: (props as unknown as ImageSourceRaw).coordinates\n    });\n  } else if ('setCoordinates' in source && changedKeyCount === 1 && changedKey === 'coordinates') {\n    source.setCoordinates((props as ImageSourceRaw).coordinates);\n  } else if ('setUrl' in source) {\n    // Added in 1.12.0:\n    // vectorTileSource.setTiles\n    // vectorTileSource.setUrl\n    switch (changedKey) {\n      case 'url':\n        source.setUrl((props as VectorSourceRaw).url);\n        break;\n      case 'tiles':\n        source.setTiles((props as VectorSourceRaw).tiles);\n        break;\n      default:\n    }\n  } else {\n    // eslint-disable-next-line\n    console.warn(`Unable to update <Source> prop: ${changedKey}`);\n  }\n}\n/* eslint-enable complexity */\n\nfunction Source<SourceT extends ISource>(props: SourceProps<SourceT>) {\n  const map = useContext(MapContext).map.getMap();\n  const propsRef = useRef(props);\n  const [, setStyleLoaded] = useState(0);\n\n  const id = useMemo(() => props.id || `jsx-source-${sourceCounter++}`, []);\n\n  useEffect(() => {\n    if (map) {\n      /* global setTimeout */\n      const forceUpdate = () => setTimeout(() => setStyleLoaded(version => version + 1), 0);\n      map.on('styledata', forceUpdate);\n      forceUpdate();\n\n      return () => {\n        map.off('styledata', forceUpdate);\n        // @ts-ignore\n        if (map.style && map.style._loaded && map.getSource(id)) {\n          // Parent effects are destroyed before child ones, see\n          // https://github.com/facebook/react/issues/16728\n          // Source can only be removed after all child layers are removed\n          const allLayers = map.getStyle()?.layers;\n          if (allLayers) {\n            for (const layer of allLayers) {\n              // @ts-ignore (2339) source does not exist on all layer types\n              if (layer.source === id) {\n                map.removeLayer(layer.id);\n              }\n            }\n          }\n          map.removeSource(id);\n        }\n      };\n    }\n    return undefined;\n  }, [map]);\n\n  // @ts-ignore\n  let source = map && map.style && map.getSource(id);\n  if (source) {\n    updateSource(source, props, propsRef.current);\n  } else {\n    source = createSource(map, id, props);\n  }\n  propsRef.current = props;\n\n  return (\n    (source &&\n      React.Children.map(\n        props.children,\n        child =>\n          child &&\n          cloneElement(child, {\n            source: id\n          })\n      )) ||\n    null\n  );\n}\n\nexport default Source;\n"],"mappings":"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","ignoreList":[]}

package/dist/components/use-control.js

@@ -11,7 +11,7 @@ function useControl(onCreate, arg1, arg2, arg3) {
       map
     } = context;
     if (!map.hasControl(ctrl)) {
-      map.addControl(ctrl, opts === null || opts === void 0 ? void 0 : opts.position);
+      map.addControl(ctrl, opts?.position);
       if (onAdd) {
         onAdd(context);
       }

package/dist/components/use-control.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-control.js","names":["useContext","useMemo","useEffect","MapContext","useControl","onCreate","arg1","arg2","arg3","context","ctrl","opts","onAdd","onRemove","map","hasControl","addControl","position","removeControl"],"sources":["../../src/components/use-control.ts"],"sourcesContent":["import {useContext, useMemo, useEffect} from 'react';\nimport type {IControl, ControlPosition} from '../types';\nimport {MapContext} from './map';\nimport type {MapContextValue} from './map';\n\ntype ControlOptions = {\n  position?: ControlPosition;\n};\n\nfunction useControl<T extends IControl>(\n  onCreate: (context: MapContextValue) => T,\n  opts?: ControlOptions\n): T;\n\nfunction useControl<T extends IControl>(\n  onCreate: (context: MapContextValue) => T,\n  onRemove: (context: MapContextValue) => void,\n  opts?: ControlOptions\n): T;\n\nfunction useControl<T extends IControl>(\n  onCreate: (context: MapContextValue) => T,\n  onAdd: (context: MapContextValue) => void,\n  onRemove: (context: MapContextValue) => void,\n  opts?: ControlOptions\n): T;\n\nfunction useControl<T extends IControl>(\n  onCreate: (context: MapContextValue) => T,\n  arg1?: ((context: MapContextValue) => void) | ControlOptions,\n  arg2?: ((context: MapContextValue) => void) | ControlOptions,\n  arg3?: ControlOptions\n): T {\n  const context = useContext(MapContext);\n  const ctrl = useMemo(() => onCreate(context), []);\n\n  useEffect(() => {\n    const opts = (arg3 || arg2 || arg1) as ControlOptions;\n    const onAdd = typeof arg1 === 'function' && typeof arg2 === 'function' ? arg1 : null;\n    const onRemove = typeof arg2 === 'function' ? arg2 : typeof arg1 === 'function' ? arg1 : null;\n\n    const {map} = context;\n    if (!map.hasControl(ctrl)) {\n      map.addControl(ctrl, opts?.position);\n      if (onAdd) {\n        onAdd(context);\n      }\n    }\n\n    return () => {\n      if (onRemove) {\n        onRemove(context);\n      }\n      // Map might have been removed (parent effects are destroyed before child ones)\n      if (map.hasControl(ctrl)) {\n        map.removeControl(ctrl);\n      }\n    };\n  }, []);\n\n  return ctrl;\n}\n\nexport default useControl;\n"],"mappings":"AAAA,SAAQA,UAAU,EAAEC,OAAO,EAAEC,SAAS,QAAO,OAAO;AAAC,SAE7CC,UAAU;AAyBlB,SAASC,UAAUA,CACjBC,QAAyC,EACzCC,IAA4D,EAC5DC,IAA4D,EAC5DC,IAAqB,EAClB;EACH,MAAMC,OAAO,GAAGT,UAAU,CAACG,UAAU,CAAC;EACtC,MAAMO,IAAI,GAAGT,OAAO,CAAC,MAAMI,QAAQ,CAACI,OAAO,CAAC,EAAE,EAAE,CAAC;EAEjDP,SAAS,CAAC,MAAM;IACd,MAAMS,IAAI,GAAIH,IAAI,IAAID,IAAI,IAAID,IAAuB;IACrD,MAAMM,KAAK,GAAG,OAAON,IAAI,KAAK,UAAU,IAAI,OAAOC,IAAI,KAAK,UAAU,GAAGD,IAAI,GAAG,IAAI;IACpF,MAAMO,QAAQ,GAAG,OAAON,IAAI,KAAK,UAAU,GAAGA,IAAI,GAAG,OAAOD,IAAI,KAAK,UAAU,GAAGA,IAAI,GAAG,IAAI;IAE7F,MAAM;MAACQ;IAAG,CAAC,GAAGL,OAAO;IACrB,IAAI,CAACK,GAAG,CAACC,UAAU,CAACL,IAAI,CAAC,EAAE;MACzBI,GAAG,CAACE,UAAU,CAACN,IAAI,EAAEC,IAAI,aAAJA,IAAI,uBAAJA,IAAI,CAAEM,QAAQ,CAAC;MACpC,IAAIL,KAAK,EAAE;QACTA,KAAK,CAACH,OAAO,CAAC;MAChB;IACF;IAEA,OAAO,MAAM;MACX,IAAII,QAAQ,EAAE;QACZA,QAAQ,CAACJ,OAAO,CAAC;MACnB;MAEA,IAAIK,GAAG,CAACC,UAAU,CAACL,IAAI,CAAC,EAAE;QACxBI,GAAG,CAACI,aAAa,CAACR,IAAI,CAAC;MACzB;IACF,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;EAEN,OAAOA,IAAI;AACb;AAEA,eAAeN,UAAU","ignoreList":[]}
+{"version":3,"file":"use-control.js","names":["useContext","useMemo","useEffect","MapContext","useControl","onCreate","arg1","arg2","arg3","context","ctrl","opts","onAdd","onRemove","map","hasControl","addControl","position","removeControl"],"sources":["../../src/components/use-control.ts"],"sourcesContent":["import {useContext, useMemo, useEffect} from 'react';\nimport type {IControl, ControlPosition} from '../types';\nimport {MapContext} from './map';\nimport type {MapContextValue} from './map';\n\ntype ControlOptions = {\n  position?: ControlPosition;\n};\n\nfunction useControl<T extends IControl>(\n  onCreate: (context: MapContextValue) => T,\n  opts?: ControlOptions\n): T;\n\nfunction useControl<T extends IControl>(\n  onCreate: (context: MapContextValue) => T,\n  onRemove: (context: MapContextValue) => void,\n  opts?: ControlOptions\n): T;\n\nfunction useControl<T extends IControl>(\n  onCreate: (context: MapContextValue) => T,\n  onAdd: (context: MapContextValue) => void,\n  onRemove: (context: MapContextValue) => void,\n  opts?: ControlOptions\n): T;\n\nfunction useControl<T extends IControl>(\n  onCreate: (context: MapContextValue) => T,\n  arg1?: ((context: MapContextValue) => void) | ControlOptions,\n  arg2?: ((context: MapContextValue) => void) | ControlOptions,\n  arg3?: ControlOptions\n): T {\n  const context = useContext(MapContext);\n  const ctrl = useMemo(() => onCreate(context), []);\n\n  useEffect(() => {\n    const opts = (arg3 || arg2 || arg1) as ControlOptions;\n    const onAdd = typeof arg1 === 'function' && typeof arg2 === 'function' ? arg1 : null;\n    const onRemove = typeof arg2 === 'function' ? arg2 : typeof arg1 === 'function' ? arg1 : null;\n\n    const {map} = context;\n    if (!map.hasControl(ctrl)) {\n      map.addControl(ctrl, opts?.position);\n      if (onAdd) {\n        onAdd(context);\n      }\n    }\n\n    return () => {\n      if (onRemove) {\n        onRemove(context);\n      }\n      // Map might have been removed (parent effects are destroyed before child ones)\n      if (map.hasControl(ctrl)) {\n        map.removeControl(ctrl);\n      }\n    };\n  }, []);\n\n  return ctrl;\n}\n\nexport default useControl;\n"],"mappings":"AAAA,SAAQA,UAAU,EAAEC,OAAO,EAAEC,SAAS,QAAO,OAAO;AAAC,SAE7CC,UAAU;AAyBlB,SAASC,UAAUA,CACjBC,QAAyC,EACzCC,IAA4D,EAC5DC,IAA4D,EAC5DC,IAAqB,EAClB;EACH,MAAMC,OAAO,GAAGT,UAAU,CAACG,UAAU,CAAC;EACtC,MAAMO,IAAI,GAAGT,OAAO,CAAC,MAAMI,QAAQ,CAACI,OAAO,CAAC,EAAE,EAAE,CAAC;EAEjDP,SAAS,CAAC,MAAM;IACd,MAAMS,IAAI,GAAIH,IAAI,IAAID,IAAI,IAAID,IAAuB;IACrD,MAAMM,KAAK,GAAG,OAAON,IAAI,KAAK,UAAU,IAAI,OAAOC,IAAI,KAAK,UAAU,GAAGD,IAAI,GAAG,IAAI;IACpF,MAAMO,QAAQ,GAAG,OAAON,IAAI,KAAK,UAAU,GAAGA,IAAI,GAAG,OAAOD,IAAI,KAAK,UAAU,GAAGA,IAAI,GAAG,IAAI;IAE7F,MAAM;MAACQ;IAAG,CAAC,GAAGL,OAAO;IACrB,IAAI,CAACK,GAAG,CAACC,UAAU,CAACL,IAAI,CAAC,EAAE;MACzBI,GAAG,CAACE,UAAU,CAACN,IAAI,EAAEC,IAAI,EAAEM,QAAQ,CAAC;MACpC,IAAIL,KAAK,EAAE;QACTA,KAAK,CAACH,OAAO,CAAC;MAChB;IACF;IAEA,OAAO,MAAM;MACX,IAAII,QAAQ,EAAE;QACZA,QAAQ,CAACJ,OAAO,CAAC;MACnB;MAEA,IAAIK,GAAG,CAACC,UAAU,CAACL,IAAI,CAAC,EAAE;QACxBI,GAAG,CAACI,aAAa,CAACR,IAAI,CAAC;MACzB;IACF,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;EAEN,OAAOA,IAAI;AACb;AAEA,eAAeN,UAAU","ignoreList":[]}

package/dist/components/use-map.js

@@ -1,6 +1,3 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import * as React from 'react';
 import { useState, useCallback, useMemo, useContext } from 'react';
 import { MapContext } from "./map.js";
@@ -16,16 +13,19 @@ export const MapProvider = props => {
       if (currMaps[id]) {
         throw new Error(`Multiple maps with the same id: ${id}`);
       }
-      return _objectSpread(_objectSpread({}, currMaps), {}, {
+      return {
+        ...currMaps,
         [id]: map
-      });
+      };
     });
   }, []);
   const onMapUnmount = useCallback(function () {
     let id = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'default';
     setMaps(currMaps => {
       if (currMaps[id]) {
-        const nextMaps = _objectSpread({}, currMaps);
+        const nextMaps = {
+          ...currMaps
+        };
         delete nextMaps[id];
         return nextMaps;
       }
@@ -41,13 +41,13 @@ export const MapProvider = props => {
   }, props.children);
 };
 export function useMap() {
-  var _useContext;
-  const maps = (_useContext = useContext(MountedMapsContext)) === null || _useContext === void 0 ? void 0 : _useContext.maps;
+  const maps = useContext(MountedMapsContext)?.maps;
   const currentMap = useContext(MapContext);
   const mapsWithCurrent = useMemo(() => {
-    return _objectSpread(_objectSpread({}, maps), {}, {
-      current: currentMap === null || currentMap === void 0 ? void 0 : currentMap.map
-    });
+    return {
+      ...maps,
+      current: currentMap?.map
+    };
   }, [maps, currentMap]);
   return mapsWithCurrent;
 }

package/dist/components/use-map.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-map.js","names":["React","useState","useCallback","useMemo","useContext","MapContext","MountedMapsContext","createContext","MapProvider","props","maps","setMaps","onMapMount","map","id","arguments","length","undefined","currMaps","Error","_objectSpread","onMapUnmount","nextMaps","createElement","Provider","value","children","useMap","_useContext","currentMap","mapsWithCurrent","current"],"sources":["../../src/components/use-map.tsx"],"sourcesContent":["import * as React from 'react';\nimport {useState, useCallback, useMemo, useContext} from 'react';\n\nimport {MapRef} from '../mapbox/create-ref';\nimport {MapContext} from './map';\nimport {MapInstance} from '../types';\n\ntype MountedMapsContextValue = {\n  maps: {[id: string]: MapRef<MapInstance>};\n  onMapMount: (map: MapRef<MapInstance>, id: string) => void;\n  onMapUnmount: (id: string) => void;\n};\n\nexport const MountedMapsContext = React.createContext<MountedMapsContextValue>(null);\n\nexport const MapProvider: React.FC<{children?: React.ReactNode}> = props => {\n  const [maps, setMaps] = useState<{[id: string]: MapRef<MapInstance>}>({});\n\n  const onMapMount = useCallback((map: MapRef<MapInstance>, id: string = 'default') => {\n    setMaps(currMaps => {\n      if (id === 'current') {\n        throw new Error(\"'current' cannot be used as map id\");\n      }\n      if (currMaps[id]) {\n        throw new Error(`Multiple maps with the same id: ${id}`);\n      }\n      return {...currMaps, [id]: map};\n    });\n  }, []);\n\n  const onMapUnmount = useCallback((id: string = 'default') => {\n    setMaps(currMaps => {\n      if (currMaps[id]) {\n        const nextMaps = {...currMaps};\n        delete nextMaps[id];\n        return nextMaps;\n      }\n      return currMaps;\n    });\n  }, []);\n\n  return (\n    <MountedMapsContext.Provider\n      value={{\n        maps,\n        onMapMount,\n        onMapUnmount\n      }}\n    >\n      {props.children}\n    </MountedMapsContext.Provider>\n  );\n};\n\nexport type MapCollection<MapT extends MapInstance> = {\n  [id: string]: MapRef<MapT> | undefined;\n  current?: MapRef<MapT>;\n};\n\nexport function useMap<MapT extends MapInstance>(): MapCollection<MapT> {\n  const maps = useContext(MountedMapsContext)?.maps;\n  const currentMap = useContext(MapContext);\n\n  const mapsWithCurrent = useMemo(() => {\n    return {...maps, current: currentMap?.map};\n  }, [maps, currentMap]);\n\n  return mapsWithCurrent as MapCollection<MapT>;\n}\n"],"mappings":";;;AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAAQC,QAAQ,EAAEC,WAAW,EAAEC,OAAO,EAAEC,UAAU,QAAO,OAAO;AAAC,SAGzDC,UAAU;AASlB,OAAO,MAAMC,kBAAkB,GAAGN,KAAK,CAACO,aAAa,CAA0B,IAAI,CAAC;AAEpF,OAAO,MAAMC,WAAmD,GAAGC,KAAK,IAAI;EAC1E,MAAM,CAACC,IAAI,EAAEC,OAAO,CAAC,GAAGV,QAAQ,CAAsC,CAAC,CAAC,CAAC;EAEzE,MAAMW,UAAU,GAAGV,WAAW,CAAC,UAACW,GAAwB,EAA6B;IAAA,IAA3BC,EAAU,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,SAAS;IAC9EJ,OAAO,CAACO,QAAQ,IAAI;MAClB,IAAIJ,EAAE,KAAK,SAAS,EAAE;QACpB,MAAM,IAAIK,KAAK,CAAC,oCAAoC,CAAC;MACvD;MACA,IAAID,QAAQ,CAACJ,EAAE,CAAC,EAAE;QAChB,MAAM,IAAIK,KAAK,CAAC,mCAAmCL,EAAE,EAAE,CAAC;MAC1D;MACA,OAAAM,aAAA,CAAAA,aAAA,KAAWF,QAAQ;QAAE,CAACJ,EAAE,GAAGD;MAAG;IAChC,CAAC,CAAC;EACJ,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMQ,YAAY,GAAGnB,WAAW,CAAC,YAA4B;IAAA,IAA3BY,EAAU,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,SAAS;IACtDJ,OAAO,CAACO,QAAQ,IAAI;MAClB,IAAIA,QAAQ,CAACJ,EAAE,CAAC,EAAE;QAChB,MAAMQ,QAAQ,GAAAF,aAAA,KAAOF,QAAQ,CAAC;QAC9B,OAAOI,QAAQ,CAACR,EAAE,CAAC;QACnB,OAAOQ,QAAQ;MACjB;MACA,OAAOJ,QAAQ;IACjB,CAAC,CAAC;EACJ,CAAC,EAAE,EAAE,CAAC;EAEN,OACElB,KAAA,CAAAuB,aAAA,CAACjB,kBAAkB,CAACkB,QAAQ;IAC1BC,KAAK,EAAE;MACLf,IAAI;MACJE,UAAU;MACVS;IACF;EAAE,GAEDZ,KAAK,CAACiB,QACoB,CAAC;AAElC,CAAC;AAOD,OAAO,SAASC,MAAMA,CAAA,EAAkD;EAAA,IAAAC,WAAA;EACtE,MAAMlB,IAAI,IAAAkB,WAAA,GAAGxB,UAAU,CAACE,kBAAkB,CAAC,cAAAsB,WAAA,uBAA9BA,WAAA,CAAgClB,IAAI;EACjD,MAAMmB,UAAU,GAAGzB,UAAU,CAACC,UAAU,CAAC;EAEzC,MAAMyB,eAAe,GAAG3B,OAAO,CAAC,MAAM;IACpC,OAAAiB,aAAA,CAAAA,aAAA,KAAWV,IAAI;MAAEqB,OAAO,EAAEF,UAAU,aAAVA,UAAU,uBAAVA,UAAU,CAAEhB;IAAG;EAC3C,CAAC,EAAE,CAACH,IAAI,EAAEmB,UAAU,CAAC,CAAC;EAEtB,OAAOC,eAAe;AACxB","ignoreList":[]}
+{"version":3,"file":"use-map.js","names":["React","useState","useCallback","useMemo","useContext","MapContext","MountedMapsContext","createContext","MapProvider","props","maps","setMaps","onMapMount","map","id","arguments","length","undefined","currMaps","Error","onMapUnmount","nextMaps","createElement","Provider","value","children","useMap","currentMap","mapsWithCurrent","current"],"sources":["../../src/components/use-map.tsx"],"sourcesContent":["import * as React from 'react';\nimport {useState, useCallback, useMemo, useContext} from 'react';\n\nimport {MapRef} from '../mapbox/create-ref';\nimport {MapContext} from './map';\nimport {MapInstance} from '../types';\n\ntype MountedMapsContextValue = {\n  maps: {[id: string]: MapRef<MapInstance>};\n  onMapMount: (map: MapRef<MapInstance>, id: string) => void;\n  onMapUnmount: (id: string) => void;\n};\n\nexport const MountedMapsContext = React.createContext<MountedMapsContextValue>(null);\n\nexport const MapProvider: React.FC<{children?: React.ReactNode}> = props => {\n  const [maps, setMaps] = useState<{[id: string]: MapRef<MapInstance>}>({});\n\n  const onMapMount = useCallback((map: MapRef<MapInstance>, id: string = 'default') => {\n    setMaps(currMaps => {\n      if (id === 'current') {\n        throw new Error(\"'current' cannot be used as map id\");\n      }\n      if (currMaps[id]) {\n        throw new Error(`Multiple maps with the same id: ${id}`);\n      }\n      return {...currMaps, [id]: map};\n    });\n  }, []);\n\n  const onMapUnmount = useCallback((id: string = 'default') => {\n    setMaps(currMaps => {\n      if (currMaps[id]) {\n        const nextMaps = {...currMaps};\n        delete nextMaps[id];\n        return nextMaps;\n      }\n      return currMaps;\n    });\n  }, []);\n\n  return (\n    <MountedMapsContext.Provider\n      value={{\n        maps,\n        onMapMount,\n        onMapUnmount\n      }}\n    >\n      {props.children}\n    </MountedMapsContext.Provider>\n  );\n};\n\nexport type MapCollection<MapT extends MapInstance> = {\n  [id: string]: MapRef<MapT> | undefined;\n  current?: MapRef<MapT>;\n};\n\nexport function useMap<MapT extends MapInstance>(): MapCollection<MapT> {\n  const maps = useContext(MountedMapsContext)?.maps;\n  const currentMap = useContext(MapContext);\n\n  const mapsWithCurrent = useMemo(() => {\n    return {...maps, current: currentMap?.map};\n  }, [maps, currentMap]);\n\n  return mapsWithCurrent as MapCollection<MapT>;\n}\n"],"mappings":"AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAAQC,QAAQ,EAAEC,WAAW,EAAEC,OAAO,EAAEC,UAAU,QAAO,OAAO;AAAC,SAGzDC,UAAU;AASlB,OAAO,MAAMC,kBAAkB,GAAGN,KAAK,CAACO,aAAa,CAA0B,IAAI,CAAC;AAEpF,OAAO,MAAMC,WAAmD,GAAGC,KAAK,IAAI;EAC1E,MAAM,CAACC,IAAI,EAAEC,OAAO,CAAC,GAAGV,QAAQ,CAAsC,CAAC,CAAC,CAAC;EAEzE,MAAMW,UAAU,GAAGV,WAAW,CAAC,UAACW,GAAwB,EAA6B;IAAA,IAA3BC,EAAU,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,SAAS;IAC9EJ,OAAO,CAACO,QAAQ,IAAI;MAClB,IAAIJ,EAAE,KAAK,SAAS,EAAE;QACpB,MAAM,IAAIK,KAAK,CAAC,oCAAoC,CAAC;MACvD;MACA,IAAID,QAAQ,CAACJ,EAAE,CAAC,EAAE;QAChB,MAAM,IAAIK,KAAK,CAAC,mCAAmCL,EAAE,EAAE,CAAC;MAC1D;MACA,OAAO;QAAC,GAAGI,QAAQ;QAAE,CAACJ,EAAE,GAAGD;MAAG,CAAC;IACjC,CAAC,CAAC;EACJ,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMO,YAAY,GAAGlB,WAAW,CAAC,YAA4B;IAAA,IAA3BY,EAAU,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,SAAS;IACtDJ,OAAO,CAACO,QAAQ,IAAI;MAClB,IAAIA,QAAQ,CAACJ,EAAE,CAAC,EAAE;QAChB,MAAMO,QAAQ,GAAG;UAAC,GAAGH;QAAQ,CAAC;QAC9B,OAAOG,QAAQ,CAACP,EAAE,CAAC;QACnB,OAAOO,QAAQ;MACjB;MACA,OAAOH,QAAQ;IACjB,CAAC,CAAC;EACJ,CAAC,EAAE,EAAE,CAAC;EAEN,OACElB,KAAA,CAAAsB,aAAA,CAAChB,kBAAkB,CAACiB,QAAQ;IAC1BC,KAAK,EAAE;MACLd,IAAI;MACJE,UAAU;MACVQ;IACF;EAAE,GAEDX,KAAK,CAACgB,QACoB,CAAC;AAElC,CAAC;AAOD,OAAO,SAASC,MAAMA,CAAA,EAAkD;EACtE,MAAMhB,IAAI,GAAGN,UAAU,CAACE,kBAAkB,CAAC,EAAEI,IAAI;EACjD,MAAMiB,UAAU,GAAGvB,UAAU,CAACC,UAAU,CAAC;EAEzC,MAAMuB,eAAe,GAAGzB,OAAO,CAAC,MAAM;IACpC,OAAO;MAAC,GAAGO,IAAI;MAAEmB,OAAO,EAAEF,UAAU,EAAEd;IAAG,CAAC;EAC5C,CAAC,EAAE,CAACH,IAAI,EAAEiB,UAAU,CAAC,CAAC;EAEtB,OAAOC,eAAe;AACxB","ignoreList":[]}