@cashub/ui 0.25.0 → 0.25.2

package/map/GoogleMap.js

@@ -159,32 +159,39 @@ const Map = _ref2 => {
     if (map) {
       map.setOptions(options);
       window.google.maps.event.addListenerOnce(map, 'idle', () => {
-        if (bounds.length === 1) {
-          // there is only one location, locate it
-          map.setCenter(bounds[0]);
-        } else if (locations.length > 0) {
-          // locate to the center of all coordinates on first load
-          const latLngBounds = new window.google.maps.LatLngBounds();
-          bounds.forEach(bound => {
-            latLngBounds.extend(bound);
+        if (geoFence) {
+          map.setCenter({
+            lat: geoFenceOptions.latitude,
+            lng: geoFenceOptions.longitude
           });
-          map.fitBounds(latLngBounds);
-          const found = locations.find(location => {
-            return latLngBounds.contains({
-              lat: location.latitude,
-              lng: location.longitude
+        } else {
+          if (bounds.length === 1) {
+            // there is only one location, locate it
+            map.setCenter(bounds[0]);
+          } else if (locations.length > 0) {
+            // locate to the center of all coordinates on first load
+            const latLngBounds = new window.google.maps.LatLngBounds();
+            bounds.forEach(bound => {
+              latLngBounds.extend(bound);
+            });
+            map.fitBounds(latLngBounds);
+            const found = locations.find(location => {
+              return latLngBounds.contains({
+                lat: location.latitude,
+                lng: location.longitude
+              });
             });
-          });
 
-          // if center no contain any marker then locate to first location
-          if (!found) {
-            map.setCenter(bounds[0]);
+            // if center no contain any marker then locate to first location
+            if (!found) {
+              map.setCenter(bounds[0]);
+            }
+          } else {
+            map.setCenter({
+              lat: position && position.latitude || defaultPosition.latitude,
+              lng: position && position.longitude || defaultPosition.longitude
+            });
           }
-        } else {
-          map.setCenter({
-            lat: position && position.latitude || defaultPosition.latitude,
-            lng: position && position.longitude || defaultPosition.longitude
-          });
         }
       });
       return () => {
@@ -341,8 +348,9 @@ const Map = _ref2 => {
           });
         }
       }
+      let repositionButton;
       if (geoFenceOptions.enabledReposition) {
-        const repositionButton = document.createElement('button');
+        repositionButton = document.createElement('button');
         repositionButton.style.margin = 'var(--spacing-s)';
         repositionButton.style.padding = 'var(--spacing-xs)';
         repositionButton.style.boxShadow = 'rgba(0, 0, 0, 0.3) 0px 1px 4px -1px';
@@ -360,13 +368,21 @@ const Map = _ref2 => {
             lng: geoFenceOptions.longitude
           });
         });
-        map.controls[google.maps.ControlPosition.RIGHT_BOTTOM].push(repositionButton);
+        const controlDiv = document.createElement('div');
+        controlDiv.appendChild(repositionButton);
+        map.controls[google.maps.ControlPosition.RIGHT_BOTTOM].push(controlDiv);
       }
       return () => {
         circle.setMap(null);
         window.google.maps.event.clearListeners(circle, 'click');
         window.google.maps.event.clearListeners(circle, 'radius_changed');
         window.google.maps.event.clearListeners(circle, 'center_changed');
+
+        // remove reposition button if exist
+        const rightBottonControls = map.controls[google.maps.ControlPosition.RIGHT_BOTTOM];
+        if (rightBottonControls.getAt(0)) {
+          rightBottonControls.removeAt(0);
+        }
       };
     }
   }, [map, geoFence, geoFenceOptions.latitude, geoFenceOptions.longitude, geoFenceOptions.radius, geoFenceOptions.minRadius, geoFenceOptions.editable, geoFenceOptions.eventHandlers]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cashub/ui",
-  "version": "0.25.0",
+  "version": "0.25.2",
   "private": false,
   "author": "CasHUB Team",
   "description": "CasHUB UI components library",