react-map-gl-geocoder - npm Package Compare versions

Comparing version 1.5.7 to 1.5.8

dist/index.js

@@ -7,6 +7,6 @@ 'use strict';
 
+var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
+
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
-
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -62,4 +62,4 @@
 
-var Geocoder = function (_Component) {
-  _inherits(Geocoder, _Component);
+var Geocoder = function (_PureComponent) {
+  _inherits(Geocoder, _PureComponent);
 
@@ -77,3 +77,59 @@ function Geocoder() {
 
-    return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_ref = Geocoder.__proto__ || Object.getPrototypeOf(Geocoder)).call.apply(_ref, [this].concat(args))), _this), _this.handleClear = function () {
+    return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_ref = Geocoder.__proto__ || Object.getPrototypeOf(Geocoder)).call.apply(_ref, [this].concat(args))), _this), _this.initializeGeocoder = function () {
+      var mapboxMap = _this.getMapboxMap();
+      var _this$props = _this.props,
+          mapboxApiAccessToken = _this$props.mapboxApiAccessToken,
+          zoom = _this$props.zoom,
+          flyTo = _this$props.flyTo,
+          placeholder = _this$props.placeholder,
+          proximity = _this$props.proximity,
+          trackProximity = _this$props.trackProximity,
+          bbox = _this$props.bbox,
+          types = _this$props.types,
+          country = _this$props.country,
+          minLength = _this$props.minLength,
+          limit = _this$props.limit,
+          language = _this$props.language,
+          filter = _this$props.filter,
+          localGeocoder = _this$props.localGeocoder,
+          options = _this$props.options,
+          onInit = _this$props.onInit,
+          position = _this$props.position;
+
+
+      _this.geocoder = new _mapboxGlGeocoder2.default(_extends({
+        accessToken: mapboxApiAccessToken,
+        zoom: zoom,
+        flyTo: flyTo,
+        placeholder: placeholder,
+        proximity: proximity,
+        trackProximity: trackProximity,
+        bbox: bbox,
+        types: types,
+        country: country,
+        minLength: minLength,
+        limit: limit,
+        language: language,
+        filter: filter,
+        localGeocoder: localGeocoder
+      }, options));
+      _this.geocoder.on('clear', _this.handleClear);
+      _this.geocoder.on('loading', _this.handleLoading);
+      _this.geocoder.on('results', _this.handleResults);
+      _this.geocoder.on('result', _this.handleResult);
+      _this.geocoder.on('error', _this.handleError);
+
+      if (mapboxMap) {
+        mapboxMap.addControl(_this.geocoder, VALID_POSITIONS.find(function (_position) {
+          return position === _position;
+        }));
+      }
+
+      onInit(_this.geocoder);
+    }, _this.getMapboxMap = function () {
+      var mapRef = _this.props.mapRef;
+
+
+      return mapRef && mapRef.current && mapRef.current.getMap() || null;
+    }, _this.handleClear = function () {
       _this.props.onClear();
@@ -86,6 +142,6 @@ }, _this.handleLoading = function (event) {
       var result = event.result;
-      var _this$props = _this.props,
-          mapRef = _this$props.mapRef,
-          onViewportChange = _this$props.onViewportChange,
-          onResult = _this$props.onResult;
+      var _this$props2 = _this.props,
+          mapRef = _this$props2.mapRef,
+          onViewportChange = _this$props2.onViewportChange,
+          onResult = _this$props2.onResult;
       var id = result.id,
@@ -148,4 +204,3 @@ bbox = result.bbox,
     value: function componentDidMount() {
-      // mapRef is undefined on initial page load, so force an update to initialize geocoder
-      this.forceUpdate();
+      this.initializeGeocoder();
     }
@@ -155,7 +210,6 @@ }, {
     value: function componentWillUnmount() {
-      var mapRef = this.props.mapRef;
+      var mapboxMap = this.getMapboxMap();
 
-
-      if (mapRef && mapRef.current && mapRef.current.getMap()) {
-        mapRef.current.getMap().removeControl(this.geocoder);
+      if (mapboxMap) {
+        mapboxMap.removeControl(this.geocoder);
       }
@@ -170,56 +224,8 @@
     value: function componentDidUpdate() {
-      if (this.geocoder !== undefined) {
-        return;
-      }
+      var mapboxMap = this.getMapboxMap();
 
-      var _props = this.props,
-          mapRef = _props.mapRef,
-          mapboxApiAccessToken = _props.mapboxApiAccessToken,
-          zoom = _props.zoom,
-          flyTo = _props.flyTo,
-          placeholder = _props.placeholder,
-          proximity = _props.proximity,
-          trackProximity = _props.trackProximity,
-          bbox = _props.bbox,
-          types = _props.types,
-          country = _props.country,
-          minLength = _props.minLength,
-          limit = _props.limit,
-          language = _props.language,
-          filter = _props.filter,
-          localGeocoder = _props.localGeocoder,
-          options = _props.options,
-          onInit = _props.onInit,
-          position = _props.position;
-
-
-      this.geocoder = new _mapboxGlGeocoder2.default(_extends({
-        accessToken: mapboxApiAccessToken,
-        zoom: zoom,
-        flyTo: flyTo,
-        placeholder: placeholder,
-        proximity: proximity,
-        trackProximity: trackProximity,
-        bbox: bbox,
-        types: types,
-        country: country,
-        minLength: minLength,
-        limit: limit,
-        language: language,
-        filter: filter,
-        localGeocoder: localGeocoder
-      }, options));
-      this.geocoder.on('clear', this.handleClear);
-      this.geocoder.on('loading', this.handleLoading);
-      this.geocoder.on('results', this.handleResults);
-      this.geocoder.on('result', this.handleResult);
-      this.geocoder.on('error', this.handleError);
-
-      if (mapRef && mapRef.current && mapRef.current.getMap()) {
-        mapRef.current.getMap().addControl(this.geocoder, VALID_POSITIONS.find(function (_position) {
-          return position === _position;
-        }));
+      if (this.geocoder) {
+        mapboxMap.removeControl(this.geocoder);
+        this.initializeGeocoder();
       }
-
-      onInit(this.geocoder);
     }
@@ -239,3 +245,3 @@ }, {
   return Geocoder;
-}(_react.Component);
+}(_react.PureComponent);
 
@@ -285,2 +291,2 @@ Geocoder.propTypes = {
 exports.default = Geocoder;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../src/index.js"],"names":["VALID_POSITIONS","fitBounds","bounds","viewport","WebMercatorViewport","getAccessToken","accessToken","window","location","match","search","process","env","MapboxAccessToken","Geocoder","handleClear","props","onClear","handleLoading","event","onLoading","handleResults","onResults","handleResult","result","mapRef","onViewportChange","onResult","id","bbox","center","longitude","latitude","bboxExceptions","name","width","current","height","zoom","geocoder","options","flyTo","transitionInterpolator","FlyToInterpolator","transitionDuration","handleError","onError","forceUpdate","getMap","removeControl","undefined","mapboxApiAccessToken","placeholder","proximity","trackProximity","types","country","minLength","limit","language","filter","localGeocoder","onInit","position","MapboxGeocoder","on","addControl","find","_position","Component","propTypes","PropTypes","object","isRequired","func","string","number","bool","array","oneOf","defaultProps"],"mappings":"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","file":"index.js","sourcesContent":["import '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.css'\nimport { Component } from 'react'\nimport PropTypes from 'prop-types'\nimport MapboxGeocoder from '@mapbox/mapbox-gl-geocoder'\nimport { FlyToInterpolator } from 'react-map-gl'\nimport WebMercatorViewport from 'viewport-mercator-project'\n\nconst VALID_POSITIONS = ['top-left', 'top-right', 'bottom-left', 'bottom-right']\n\nfunction fitBounds(bounds, viewport) {\n  return new WebMercatorViewport(viewport).fitBounds(bounds)\n}\n\nfunction getAccessToken() {\n  let accessToken = null\n\n  if (typeof window !== 'undefined' && window.location) {\n    const match = window.location.search.match(/access_token=([^&/]*)/)\n    accessToken = match && match[1]\n  }\n\n  if (!accessToken && typeof process !== 'undefined') {\n    // Note: This depends on bundler plugins (e.g. webpack) inmporting environment correctly\n    accessToken = accessToken || process.env.MapboxAccessToken // eslint-disable-line\n  }\n\n  return accessToken || null\n}\n\nclass Geocoder extends Component {\n  componentDidMount() {\n    // mapRef is undefined on initial page load, so force an update to initialize geocoder\n    this.forceUpdate()\n  }\n\n  componentWillUnmount() {\n    const { mapRef } = this.props\n\n    if (mapRef && mapRef.current && mapRef.current.getMap()) {\n      mapRef.current.getMap().removeControl(this.geocoder)\n    }\n\n    if (this.geocoder) {\n      this.geocoder = null\n    }\n  }\n\n  componentDidUpdate() {\n    if (this.geocoder !== undefined) {\n      return\n    }\n\n    const {\n      mapRef,\n      mapboxApiAccessToken,\n      zoom,\n      flyTo,\n      placeholder,\n      proximity,\n      trackProximity,\n      bbox,\n      types,\n      country,\n      minLength,\n      limit,\n      language,\n      filter,\n      localGeocoder,\n      options,\n      onInit,\n      position\n    } = this.props\n\n    this.geocoder = new MapboxGeocoder({\n      accessToken: mapboxApiAccessToken,\n      zoom,\n      flyTo,\n      placeholder,\n      proximity,\n      trackProximity,\n      bbox,\n      types,\n      country,\n      minLength,\n      limit,\n      language,\n      filter,\n      localGeocoder,\n      ...options\n    })\n    this.geocoder.on('clear', this.handleClear)\n    this.geocoder.on('loading', this.handleLoading)\n    this.geocoder.on('results', this.handleResults)\n    this.geocoder.on('result', this.handleResult)\n    this.geocoder.on('error', this.handleError)\n\n    if (mapRef && mapRef.current && mapRef.current.getMap()) {\n      mapRef.current.getMap().addControl(this.geocoder, VALID_POSITIONS.find((_position) => position === _position))\n    }\n\n    onInit(this.geocoder)\n  }\n\n  handleClear = () => {\n    this.props.onClear()\n  }\n\n  handleLoading = (event) => {\n    this.props.onLoading(event)\n  }\n\n  handleResults = (event) => {\n    this.props.onResults(event)\n  }\n\n  handleResult = (event) => {\n    const { result } = event\n    const { mapRef, onViewportChange, onResult } = this.props\n    const { id, bbox, center } = result\n    const [longitude, latitude] = center\n    const bboxExceptions = {\n      'country.3148': {\n        name: 'France',\n        bbox: [[-4.59235, 41.380007], [9.560016, 51.148506]]\n      },\n      'country.3145': {\n        name: 'United States',\n        bbox: [[-171.791111, 18.91619], [-66.96466, 71.357764]]\n      },\n      'country.330': {\n        name: 'Russia',\n        bbox: [[19.66064, 41.151416], [190.10042, 81.2504]]\n      },\n      'country.3179': {\n        name: 'Canada',\n        bbox: [[-140.99778, 41.675105], [-52.648099, 83.23324]]\n      }\n    }\n    const width = mapRef.current.props.width\n    const height = mapRef.current.props.height\n    let zoom = this.geocoder.options.zoom\n\n    if (!bboxExceptions[id] && bbox) {\n      zoom = fitBounds([[bbox[0], bbox[1]], [bbox[2], bbox[3]]], { width, height }).zoom\n    } else if (bboxExceptions[id]) {\n      zoom = fitBounds(bboxExceptions[id].bbox, { width, height }).zoom\n    }\n\n    if (this.geocoder.options.flyTo) {\n      onViewportChange({\n        longitude,\n        latitude,\n        zoom,\n        transitionInterpolator: new FlyToInterpolator(),\n        transitionDuration: 3000\n      })\n    } else {\n      onViewportChange({ longitude, latitude, zoom })\n    }\n\n    onResult(event)\n  }\n\n  handleError = (event) => {\n    this.props.onError(event)\n  }\n\n  getGeocoder() {\n    return this.geocoder\n  }\n\n  render() {\n    return null\n  }\n\n  static propTypes = {\n    mapRef: PropTypes.object.isRequired,\n    onViewportChange: PropTypes.func.isRequired,\n    mapboxApiAccessToken: PropTypes.string,\n    zoom: PropTypes.number,\n    flyTo: PropTypes.bool,\n    placeholder: PropTypes.string,\n    proximity: PropTypes.object,\n    trackProximity: PropTypes.bool,\n    bbox: PropTypes.array,\n    types: PropTypes.string,\n    country: PropTypes.string,\n    minLength: PropTypes.number,\n    limit: PropTypes.number,\n    language: PropTypes.string,\n    filter: PropTypes.func,\n    localGeocoder: PropTypes.func,\n    position: PropTypes.oneOf(VALID_POSITIONS),\n    onInit: PropTypes.func,\n    onClear: PropTypes.func,\n    onLoading: PropTypes.func,\n    onResults: PropTypes.func,\n    onResult: PropTypes.func,\n    onError: PropTypes.func,\n    options: PropTypes.object // deprecated and will be removed in v2\n  }\n\n  static defaultProps = {\n    mapboxApiAccessToken: getAccessToken(),\n    zoom: 16,\n    flyTo: true,\n    placeholder: 'Search',\n    trackProximity: false,\n    minLength: 2,\n    limit: 5,\n    position: 'top-right',\n    onInit: () => {},\n    onClear: () => {},\n    onLoading: () => {},\n    onResults: () => {},\n    onResult: () => {},\n    onError: () => {}\n  }\n}\n\nexport default Geocoder\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../src/index.js"],"names":["VALID_POSITIONS","fitBounds","bounds","viewport","WebMercatorViewport","getAccessToken","accessToken","window","location","match","search","process","env","MapboxAccessToken","Geocoder","initializeGeocoder","mapboxMap","getMapboxMap","props","mapboxApiAccessToken","zoom","flyTo","placeholder","proximity","trackProximity","bbox","types","country","minLength","limit","language","filter","localGeocoder","options","onInit","position","geocoder","MapboxGeocoder","on","handleClear","handleLoading","handleResults","handleResult","handleError","addControl","find","_position","mapRef","current","getMap","onClear","event","onLoading","onResults","result","onViewportChange","onResult","id","center","longitude","latitude","bboxExceptions","name","width","height","transitionInterpolator","FlyToInterpolator","transitionDuration","onError","removeControl","PureComponent","propTypes","PropTypes","object","isRequired","func","string","number","bool","array","oneOf","defaultProps"],"mappings":"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","file":"index.js","sourcesContent":["import '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.css'\nimport { PureComponent } from 'react'\nimport PropTypes from 'prop-types'\nimport MapboxGeocoder from '@mapbox/mapbox-gl-geocoder'\nimport { FlyToInterpolator } from 'react-map-gl'\nimport WebMercatorViewport from 'viewport-mercator-project'\n\nconst VALID_POSITIONS = ['top-left', 'top-right', 'bottom-left', 'bottom-right']\n\nfunction fitBounds(bounds, viewport) {\n  return new WebMercatorViewport(viewport).fitBounds(bounds)\n}\n\nfunction getAccessToken() {\n  let accessToken = null\n\n  if (typeof window !== 'undefined' && window.location) {\n    const match = window.location.search.match(/access_token=([^&/]*)/)\n    accessToken = match && match[1]\n  }\n\n  if (!accessToken && typeof process !== 'undefined') {\n    // Note: This depends on bundler plugins (e.g. webpack) inmporting environment correctly\n    accessToken = accessToken || process.env.MapboxAccessToken // eslint-disable-line\n  }\n\n  return accessToken || null\n}\n\nclass Geocoder extends PureComponent {\n  componentDidMount() {\n    this.initializeGeocoder()\n  }\n\n  componentWillUnmount() {\n    const mapboxMap = this.getMapboxMap()\n\n    if (mapboxMap) {\n      mapboxMap.removeControl(this.geocoder)\n    }\n\n    if (this.geocoder) {\n      this.geocoder = null\n    }\n  }\n\n  componentDidUpdate() {\n    const mapboxMap = this.getMapboxMap()\n\n    if (this.geocoder) {\n      mapboxMap.removeControl(this.geocoder)\n      this.initializeGeocoder()\n    }\n  }\n\n  initializeGeocoder = () => {\n    const mapboxMap = this.getMapboxMap()\n    const {\n      mapboxApiAccessToken,\n      zoom,\n      flyTo,\n      placeholder,\n      proximity,\n      trackProximity,\n      bbox,\n      types,\n      country,\n      minLength,\n      limit,\n      language,\n      filter,\n      localGeocoder,\n      options,\n      onInit,\n      position\n    } = this.props\n\n    this.geocoder = new MapboxGeocoder({\n      accessToken: mapboxApiAccessToken,\n      zoom,\n      flyTo,\n      placeholder,\n      proximity,\n      trackProximity,\n      bbox,\n      types,\n      country,\n      minLength,\n      limit,\n      language,\n      filter,\n      localGeocoder,\n      ...options\n    })\n    this.geocoder.on('clear', this.handleClear)\n    this.geocoder.on('loading', this.handleLoading)\n    this.geocoder.on('results', this.handleResults)\n    this.geocoder.on('result', this.handleResult)\n    this.geocoder.on('error', this.handleError)\n\n    if (mapboxMap) {\n      mapboxMap.addControl(this.geocoder, VALID_POSITIONS.find((_position) => position === _position))\n    }\n\n    onInit(this.geocoder)\n  }\n\n  getMapboxMap = () => {\n    const { mapRef } = this.props\n\n    return (mapRef && mapRef.current && mapRef.current.getMap()) || null\n  }\n\n  handleClear = () => {\n    this.props.onClear()\n  }\n\n  handleLoading = (event) => {\n    this.props.onLoading(event)\n  }\n\n  handleResults = (event) => {\n    this.props.onResults(event)\n  }\n\n  handleResult = (event) => {\n    const { result } = event\n    const { mapRef, onViewportChange, onResult } = this.props\n    const { id, bbox, center } = result\n    const [longitude, latitude] = center\n    const bboxExceptions = {\n      'country.3148': {\n        name: 'France',\n        bbox: [[-4.59235, 41.380007], [9.560016, 51.148506]]\n      },\n      'country.3145': {\n        name: 'United States',\n        bbox: [[-171.791111, 18.91619], [-66.96466, 71.357764]]\n      },\n      'country.330': {\n        name: 'Russia',\n        bbox: [[19.66064, 41.151416], [190.10042, 81.2504]]\n      },\n      'country.3179': {\n        name: 'Canada',\n        bbox: [[-140.99778, 41.675105], [-52.648099, 83.23324]]\n      }\n    }\n    const width = mapRef.current.props.width\n    const height = mapRef.current.props.height\n    let zoom = this.geocoder.options.zoom\n\n    if (!bboxExceptions[id] && bbox) {\n      zoom = fitBounds([[bbox[0], bbox[1]], [bbox[2], bbox[3]]], { width, height }).zoom\n    } else if (bboxExceptions[id]) {\n      zoom = fitBounds(bboxExceptions[id].bbox, { width, height }).zoom\n    }\n\n    if (this.geocoder.options.flyTo) {\n      onViewportChange({\n        longitude,\n        latitude,\n        zoom,\n        transitionInterpolator: new FlyToInterpolator(),\n        transitionDuration: 3000\n      })\n    } else {\n      onViewportChange({ longitude, latitude, zoom })\n    }\n\n    onResult(event)\n  }\n\n  handleError = (event) => {\n    this.props.onError(event)\n  }\n\n  getGeocoder() {\n    return this.geocoder\n  }\n\n  render() {\n    return null\n  }\n\n  static propTypes = {\n    mapRef: PropTypes.object.isRequired,\n    onViewportChange: PropTypes.func.isRequired,\n    mapboxApiAccessToken: PropTypes.string,\n    zoom: PropTypes.number,\n    flyTo: PropTypes.bool,\n    placeholder: PropTypes.string,\n    proximity: PropTypes.object,\n    trackProximity: PropTypes.bool,\n    bbox: PropTypes.array,\n    types: PropTypes.string,\n    country: PropTypes.string,\n    minLength: PropTypes.number,\n    limit: PropTypes.number,\n    language: PropTypes.string,\n    filter: PropTypes.func,\n    localGeocoder: PropTypes.func,\n    position: PropTypes.oneOf(VALID_POSITIONS),\n    onInit: PropTypes.func,\n    onClear: PropTypes.func,\n    onLoading: PropTypes.func,\n    onResults: PropTypes.func,\n    onResult: PropTypes.func,\n    onError: PropTypes.func,\n    options: PropTypes.object // deprecated and will be removed in v2\n  }\n\n  static defaultProps = {\n    mapboxApiAccessToken: getAccessToken(),\n    zoom: 16,\n    flyTo: true,\n    placeholder: 'Search',\n    trackProximity: false,\n    minLength: 2,\n    limit: 5,\n    position: 'top-right',\n    onInit: () => {},\n    onClear: () => {},\n    onLoading: () => {},\n    onResults: () => {},\n    onResult: () => {},\n    onError: () => {}\n  }\n}\n\nexport default Geocoder\n"]}

package.json

 {
   "name": "react-map-gl-geocoder",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "description": "React wrapper for mapbox-gl-geocoder for use with react-map-gl",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

src/index.js

 import '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.css'
-import { Component } from 'react'
+import { PureComponent } from 'react'
 import PropTypes from 'prop-types'
@@ -30,13 +30,12 @@ import MapboxGeocoder from '@mapbox/mapbox-gl-geocoder'
 
-class Geocoder extends Component {
+class Geocoder extends PureComponent {
   componentDidMount() {
-    // mapRef is undefined on initial page load, so force an update to initialize geocoder
-    this.forceUpdate()
+    this.initializeGeocoder()
   }
 
   componentWillUnmount() {
-    const { mapRef } = this.props
+    const mapboxMap = this.getMapboxMap()
 
-    if (mapRef && mapRef.current && mapRef.current.getMap()) {
-      mapRef.current.getMap().removeControl(this.geocoder)
+    if (mapboxMap) {
+      mapboxMap.removeControl(this.geocoder)
     }
@@ -50,8 +49,13 @@
   componentDidUpdate() {
-    if (this.geocoder !== undefined) {
-      return
+    const mapboxMap = this.getMapboxMap()
+
+    if (this.geocoder) {
+      mapboxMap.removeControl(this.geocoder)
+      this.initializeGeocoder()
     }
+  }
 
+  initializeGeocoder = () => {
+    const mapboxMap = this.getMapboxMap()
     const {
-      mapRef,
       mapboxApiAccessToken,
@@ -99,4 +103,4 @@ zoom,
 
-    if (mapRef && mapRef.current && mapRef.current.getMap()) {
-      mapRef.current.getMap().addControl(this.geocoder, VALID_POSITIONS.find((_position) => position === _position))
+    if (mapboxMap) {
+      mapboxMap.addControl(this.geocoder, VALID_POSITIONS.find((_position) => position === _position))
     }
@@ -107,2 +111,8 @@
 
+  getMapboxMap = () => {
+    const { mapRef } = this.props
+
+    return (mapRef && mapRef.current && mapRef.current.getMap()) || null
+  }
+
   handleClear = () => {
@@ -109,0 +119,0 @@ this.props.onClear()

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1532354

increased by0.04%

Lines of code

440

increased by2.8%

No dependency changes