react-map4d-map 1.3.4 → 1.3.6

package/dist/index.modern.js

@@ -23,7 +23,7 @@ var MFBuilding = function MFBuilding(props) {
       coordinates = props.coordinates,
       visible = props.visible,
       draggable = props.draggable,
-      clickable = props.clickable,
+      userInteractionEnabled = props.userInteractionEnabled,
       selected = props.selected,
       growUp = props.growUp,
       map = props.map,
@@ -50,7 +50,7 @@ var MFBuilding = function MFBuilding(props) {
         coordinates: coordinates,
         visible: visible,
         draggable: draggable,
-        clickable: clickable,
+        userInteractionEnabled: userInteractionEnabled,
         selected: selected,
         growUp: growUp
       };
@@ -144,8 +144,8 @@ var MFBuilding = function MFBuilding(props) {
   useEffect(function () {
     var _buildingRef$current16;
 
-    clickable != undefined && ((_buildingRef$current16 = buildingRef.current) === null || _buildingRef$current16 === void 0 ? void 0 : _buildingRef$current16.setClickable(clickable));
-  }, [clickable]);
+    userInteractionEnabled != undefined && ((_buildingRef$current16 = buildingRef.current) === null || _buildingRef$current16 === void 0 ? void 0 : _buildingRef$current16.setUserInteraction(userInteractionEnabled));
+  }, [userInteractionEnabled]);
   useEffect(function () {
     var _buildingRef$current17;
 
@@ -247,9 +247,10 @@ var MFCircle = function MFCircle(props) {
       draggable = props.draggable,
       zIndex = props.zIndex,
       elevation = props.elevation,
-      clickable = props.clickable,
+      userInteractionEnabled = props.userInteractionEnabled,
       map = props.map,
-      onCreated = props.onCreated;
+      onCreated = props.onCreated,
+      onClick = props.onClick;
   var map4dContext = useContext(Map4dContext);
   var theMap = map || map4dContext.map;
   var circleRef = useRef();
@@ -271,7 +272,7 @@ var MFCircle = function MFCircle(props) {
         draggable: draggable,
         zIndex: zIndex,
         elevation: elevation,
-        clickable: clickable
+        userInteractionEnabled: userInteractionEnabled
       };
       Object.keys(option).forEach(function (key) {
         if (option[key] == undefined || option[key] == null) {
@@ -281,8 +282,14 @@ var MFCircle = function MFCircle(props) {
       circleRef.current = new map4d.Circle(option);
       (_circleRef$current = circleRef.current) === null || _circleRef$current === void 0 ? void 0 : _circleRef$current.setMap(theMap);
       onCreated && onCreated(circleRef.current);
+      circleRef.current.onClick = onClick;
     }
   }, [theMap]);
+  useEffect(function () {
+    if (circleRef.current) {
+      circleRef.current.onClick = onClick;
+    }
+  }, [onClick]);
   useEffect(function () {
     if (theMap) {
       var _circleRef$current2;
@@ -374,12 +381,12 @@ var MFCircle = function MFCircle(props) {
     }
   }, [elevation]);
   useEffect(function () {
-    if (VariableTool.hasValue(clickable)) {
+    if (VariableTool.hasValue(userInteractionEnabled)) {
       var _circleRef$current15;
 
-      (_circleRef$current15 = circleRef.current) === null || _circleRef$current15 === void 0 ? void 0 : _circleRef$current15.setClickable(clickable);
+      (_circleRef$current15 = circleRef.current) === null || _circleRef$current15 === void 0 ? void 0 : _circleRef$current15.setUserInteraction(userInteractionEnabled);
     }
-  }, [clickable]);
+  }, [userInteractionEnabled]);
   return null;
 };
 
@@ -483,12 +490,6 @@ var MFDirectionsRenderer = function MFDirectionsRenderer(props) {
       directionRef.current.onMouseMove = onMouseMove;
       onCreated && onCreated(directionRef.current);
     }
-
-    return function () {
-      var _directionRef$current2;
-
-      (_directionRef$current2 = directionRef.current) === null || _directionRef$current2 === void 0 ? void 0 : _directionRef$current2.setMap(null);
-    };
   }, [theMap]);
   useEffect(function () {
     if (directionRef.current) {
@@ -512,46 +513,46 @@ var MFDirectionsRenderer = function MFDirectionsRenderer(props) {
   }, [onMouseMove]);
   useEffect(function () {
     if (theMap) {
-      var _directionRef$current3;
+      var _directionRef$current2;
 
-      (_directionRef$current3 = directionRef.current) === null || _directionRef$current3 === void 0 ? void 0 : _directionRef$current3.setMap(theMap);
+      (_directionRef$current2 = directionRef.current) === null || _directionRef$current2 === void 0 ? void 0 : _directionRef$current2.setMap(theMap);
     }
 
     return function () {
-      var _directionRef$current4;
+      var _directionRef$current3;
 
-      (_directionRef$current4 = directionRef.current) === null || _directionRef$current4 === void 0 ? void 0 : _directionRef$current4.setMap(null);
+      (_directionRef$current3 = directionRef.current) === null || _directionRef$current3 === void 0 ? void 0 : _directionRef$current3.setMap(null);
     };
   }, [theMap]);
   useEffect(function () {
     return function () {
-      var _directionRef$current5;
+      var _directionRef$current4;
 
-      (_directionRef$current5 = directionRef.current) === null || _directionRef$current5 === void 0 ? void 0 : _directionRef$current5.setMap(null);
+      (_directionRef$current4 = directionRef.current) === null || _directionRef$current4 === void 0 ? void 0 : _directionRef$current4.setMap(null);
     };
   }, []);
   useEffect(function () {
-    var _directionRef$current6;
+    var _directionRef$current5;
 
-    routes != undefined && ((_directionRef$current6 = directionRef.current) === null || _directionRef$current6 === void 0 ? void 0 : _directionRef$current6.setRoutes(routes));
+    routes != undefined && ((_directionRef$current5 = directionRef.current) === null || _directionRef$current5 === void 0 ? void 0 : _directionRef$current5.setRoutes(routes));
   }, [routes]);
   useEffect(function () {
-    var _directionRef$current7;
+    var _directionRef$current6;
 
-    activedIndex != undefined && ((_directionRef$current7 = directionRef.current) === null || _directionRef$current7 === void 0 ? void 0 : _directionRef$current7.setActivedIndex(activedIndex));
+    activedIndex != undefined && ((_directionRef$current6 = directionRef.current) === null || _directionRef$current6 === void 0 ? void 0 : _directionRef$current6.setActivedIndex(activedIndex));
   }, [activedIndex]);
   useEffect(function () {
-    var _directionRef$current8;
+    var _directionRef$current7;
 
-    activeStrokePattern != undefined && ((_directionRef$current8 = directionRef.current) === null || _directionRef$current8 === void 0 ? void 0 : _directionRef$current8.setActiveStrokePattern(activeStrokePattern));
+    activeStrokePattern != undefined && ((_directionRef$current7 = directionRef.current) === null || _directionRef$current7 === void 0 ? void 0 : _directionRef$current7.setActiveStrokePattern(activeStrokePattern));
   }, [activeStrokePattern]);
   useEffect(function () {
-    var _directionRef$current9;
+    var _directionRef$current8;
 
-    inactiveStrokePattern != undefined && ((_directionRef$current9 = directionRef.current) === null || _directionRef$current9 === void 0 ? void 0 : _directionRef$current9.setInactiveStrokePattern(inactiveStrokePattern));
+    inactiveStrokePattern != undefined && ((_directionRef$current8 = directionRef.current) === null || _directionRef$current8 === void 0 ? void 0 : _directionRef$current8.setInactiveStrokePattern(inactiveStrokePattern));
   }, [inactiveStrokePattern]);
   useEffect(function () {
-    var _directionRef$current10;
+    var _directionRef$current9;
 
     var option = {
       routes: routes,
@@ -576,7 +577,7 @@ var MFDirectionsRenderer = function MFDirectionsRenderer(props) {
         delete option[key];
       }
     });
-    (_directionRef$current10 = directionRef.current) === null || _directionRef$current10 === void 0 ? void 0 : _directionRef$current10.setOptions(option);
+    (_directionRef$current9 = directionRef.current) === null || _directionRef$current9 === void 0 ? void 0 : _directionRef$current9.setOptions(option);
   }, [activeStrokeWidth, activeStrokeColor, activeOutlineWidth, activeOutlineColor, inactiveStrokeColor, inactiveOutlineWidth, inactiveOutlineColor, originMarkerOptions, destinationMarkerOptions, waypointMarkerOptions, onMarkerDragEnd]);
   return null;
 };
@@ -767,7 +768,14 @@ var createId = function createId() {
 };
 
 var MFMap = function MFMap(props) {
-  var _props$options3, _props$options8;
+  var _options = useRef({
+    options: props.options,
+    mapId: props.mapid,
+    version: props.version,
+    environment: props.environment,
+    accessKey: props.accessKey,
+    sdkDomain: props.sdkDomain
+  });
 
   var callback = useRef("callback");
   var mapDomRef = useRef();
@@ -775,19 +783,45 @@ var MFMap = function MFMap(props) {
   var scriptElement = useRef();
   var url = useRef();
   var events = useRef([]);
+  var zoom = props.zoom,
+      bearing = props.bearing,
+      center = props.center,
+      tilt = props.tilt;
 
   var _useState = useState(),
       map = _useState[0],
       setMap = _useState[1];
 
+  useEffect(function () {
+    if (map) {
+      var camera = map.getCamera();
+
+      if (zoom != undefined && zoom != null) {
+        camera.setZoom(zoom);
+      }
+
+      if (bearing != undefined && bearing != null) {
+        camera.setBearing(bearing);
+      }
+
+      if (center != undefined && center != null) {
+        camera.setTarget(center);
+      }
+
+      if (tilt != undefined && tilt != null) {
+        camera.setTilt(center);
+      }
+
+      map.moveCamera(camera);
+    }
+  }, [zoom, bearing, center, map]);
   useEffect(function () {
     var id = createId();
     callback.current = "callback_" + id;
 
     var createCallback = function createCallback() {
       window[callback.current] = function () {
-        var options = props.options;
-        mapRef.current = new window.map4d.Map(mapDomRef.current, options);
+        mapRef.current = new window.map4d.Map(mapDomRef.current, _options.current.options);
 
         if (props.onMapReady) {
           props.onMapReady(mapRef.current, id);
@@ -798,16 +832,16 @@ var MFMap = function MFMap(props) {
       };
     };
 
-    var domain = "https://api" + (props.environment ? "-" + props.environment : "") + ".map4d.vn";
+    var domain = "https://api" + (props.environment ? "-" + _options.current.environment : "") + ".map4d.vn";
 
-    if (props.sdkDomain) {
-      domain = props.sdkDomain;
+    if (_options.current.sdkDomain) {
+      domain = _options.current.sdkDomain;
     }
 
-    var urlNew = domain + "/sdk/map/js?version=" + props.version + "&key=" + props.accessKey + "&callback=" + callback.current;
+    var urlNew = domain + "/sdk/map/js?version=" + _options.current.version + "&key=" + _options.current.accessKey + "&callback=" + callback.current;
 
-    if (props.mapid) {
-      urlNew += "&mapId=" + props.mapid;
+    if (_options.current.mapId) {
+      urlNew += "&mapId=" + _options.current.mapId;
     }
 
     createCallback();
@@ -837,168 +871,156 @@ var MFMap = function MFMap(props) {
 
       destroy();
     };
-  }, [props.environment, props.version, props.accessKey]);
-  useEffect(function () {
-    var _props$options, _mapRef$current2, _props$options2;
-
-    ((_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.mapType) != undefined && ((_mapRef$current2 = mapRef.current) === null || _mapRef$current2 === void 0 ? void 0 : _mapRef$current2.setMapType((_props$options2 = props.options) === null || _props$options2 === void 0 ? void 0 : _props$options2.mapType));
-  }, [(_props$options3 = props.options) === null || _props$options3 === void 0 ? void 0 : _props$options3.mapType]);
-  useEffect(function () {
-    var _props$options4, _props$options6, _mapRef$current5, _props$options7;
-
-    if (((_props$options4 = props.options) === null || _props$options4 === void 0 ? void 0 : _props$options4.center) != undefined) {
-      var _mapRef$current3, _props$options5, _mapRef$current4;
-
-      var camera = (_mapRef$current3 = mapRef.current) === null || _mapRef$current3 === void 0 ? void 0 : _mapRef$current3.getCamera();
-      camera === null || camera === void 0 ? void 0 : camera.setTarget((_props$options5 = props.options) === null || _props$options5 === void 0 ? void 0 : _props$options5.center);
-      (_mapRef$current4 = mapRef.current) === null || _mapRef$current4 === void 0 ? void 0 : _mapRef$current4.moveCamera(camera);
-    }
-
-    ((_props$options6 = props.options) === null || _props$options6 === void 0 ? void 0 : _props$options6.mapType) != undefined && ((_mapRef$current5 = mapRef.current) === null || _mapRef$current5 === void 0 ? void 0 : _mapRef$current5.setMapType((_props$options7 = props.options) === null || _props$options7 === void 0 ? void 0 : _props$options7.mapType));
-  }, [(_props$options8 = props.options) === null || _props$options8 === void 0 ? void 0 : _props$options8.center]);
+  }, []);
 
   var registerEvent = function registerEvent() {
-    var _mapRef$current6, _mapRef$current7, _mapRef$current8, _mapRef$current9, _mapRef$current10, _mapRef$current11, _mapRef$current12, _mapRef$current13, _mapRef$current14, _mapRef$current15, _mapRef$current16, _mapRef$current17, _mapRef$current18, _mapRef$current19, _mapRef$current20, _mapRef$current21, _mapRef$current22, _mapRef$current23, _mapRef$current24;
+    var _mapRef$current2, _mapRef$current3, _mapRef$current4, _mapRef$current5, _mapRef$current6, _mapRef$current7, _mapRef$current8, _mapRef$current9, _mapRef$current10, _mapRef$current11, _mapRef$current12, _mapRef$current13, _mapRef$current14, _mapRef$current15, _mapRef$current16, _mapRef$current17, _mapRef$current18, _mapRef$current19, _mapRef$current20, _mapRef$current21;
 
-    var eventClickMarker = (_mapRef$current6 = mapRef.current) === null || _mapRef$current6 === void 0 ? void 0 : _mapRef$current6.addListener("click", function (args) {
+    var eventClickMarker = (_mapRef$current2 = mapRef.current) === null || _mapRef$current2 === void 0 ? void 0 : _mapRef$current2.addListener("click", function (args) {
       var _args$marker, _args$marker2;
 
       ((_args$marker = args.marker) === null || _args$marker === void 0 ? void 0 : _args$marker.onClick) && ((_args$marker2 = args.marker) === null || _args$marker2 === void 0 ? void 0 : _args$marker2.onClick(args));
     }, {
       marker: true
     });
-    var eventRightClickMarker = (_mapRef$current7 = mapRef.current) === null || _mapRef$current7 === void 0 ? void 0 : _mapRef$current7.addListener("rightClick", function (args) {
+    var eventRightClickMarker = (_mapRef$current3 = mapRef.current) === null || _mapRef$current3 === void 0 ? void 0 : _mapRef$current3.addListener("rightClick", function (args) {
       var _args$marker3, _args$marker4;
 
       ((_args$marker3 = args.marker) === null || _args$marker3 === void 0 ? void 0 : _args$marker3.onRightClick) && ((_args$marker4 = args.marker) === null || _args$marker4 === void 0 ? void 0 : _args$marker4.onRightClick(args));
     }, {
       marker: true
     });
-    var eventDragEndMarker = (_mapRef$current8 = mapRef.current) === null || _mapRef$current8 === void 0 ? void 0 : _mapRef$current8.addListener("dragEnd", function (args) {
+    var eventDragEndMarker = (_mapRef$current4 = mapRef.current) === null || _mapRef$current4 === void 0 ? void 0 : _mapRef$current4.addListener("dragEnd", function (args) {
       var _args$marker5, _args$marker6;
 
       ((_args$marker5 = args.marker) === null || _args$marker5 === void 0 ? void 0 : _args$marker5.onDragEnd) && ((_args$marker6 = args.marker) === null || _args$marker6 === void 0 ? void 0 : _args$marker6.onDragEnd(args));
     }, {
       marker: true
     });
-    var eventHoverMarker = (_mapRef$current9 = mapRef.current) === null || _mapRef$current9 === void 0 ? void 0 : _mapRef$current9.addListener("hover", function (args) {
+    var eventHoverMarker = (_mapRef$current5 = mapRef.current) === null || _mapRef$current5 === void 0 ? void 0 : _mapRef$current5.addListener("hover", function (args) {
       var _args$marker7, _args$marker8;
 
       ((_args$marker7 = args.marker) === null || _args$marker7 === void 0 ? void 0 : _args$marker7.onHover) && ((_args$marker8 = args.marker) === null || _args$marker8 === void 0 ? void 0 : _args$marker8.onHover(args));
     }, {
       marker: true
     });
-    var eventHoverPolygon = (_mapRef$current10 = mapRef.current) === null || _mapRef$current10 === void 0 ? void 0 : _mapRef$current10.addListener("hover", function (args) {
+    var eventHoverPolygon = (_mapRef$current6 = mapRef.current) === null || _mapRef$current6 === void 0 ? void 0 : _mapRef$current6.addListener("hover", function (args) {
       var _args$polygon, _args$polygon2;
 
       ((_args$polygon = args.polygon) === null || _args$polygon === void 0 ? void 0 : _args$polygon.onHover) && ((_args$polygon2 = args.polygon) === null || _args$polygon2 === void 0 ? void 0 : _args$polygon2.onHover(args));
     }, {
       polygon: true
     });
-    var eventHoverPolyline = (_mapRef$current11 = mapRef.current) === null || _mapRef$current11 === void 0 ? void 0 : _mapRef$current11.addListener("hover", function (args) {
+    var eventHoverPolyline = (_mapRef$current7 = mapRef.current) === null || _mapRef$current7 === void 0 ? void 0 : _mapRef$current7.addListener("hover", function (args) {
       var _args$polyline, _args$polyline2;
 
       ((_args$polyline = args.polyline) === null || _args$polyline === void 0 ? void 0 : _args$polyline.onHover) && ((_args$polyline2 = args.polyline) === null || _args$polyline2 === void 0 ? void 0 : _args$polyline2.onHover(args));
     }, {
       polyline: true
     });
-    var eventHoverDirection = (_mapRef$current12 = mapRef.current) === null || _mapRef$current12 === void 0 ? void 0 : _mapRef$current12.addListener("hover", function (args) {
+    var eventHoverDirection = (_mapRef$current8 = mapRef.current) === null || _mapRef$current8 === void 0 ? void 0 : _mapRef$current8.addListener("hover", function (args) {
       var _args$renderer, _args$renderer2;
 
       ((_args$renderer = args.renderer) === null || _args$renderer === void 0 ? void 0 : _args$renderer.onHover) && ((_args$renderer2 = args.renderer) === null || _args$renderer2 === void 0 ? void 0 : _args$renderer2.onHover(args));
     }, {
       directions: true
     });
-    var eventClickPolyline = (_mapRef$current13 = mapRef.current) === null || _mapRef$current13 === void 0 ? void 0 : _mapRef$current13.addListener("click", function (args) {
+    var eventClickPolyline = (_mapRef$current9 = mapRef.current) === null || _mapRef$current9 === void 0 ? void 0 : _mapRef$current9.addListener("click", function (args) {
       var _args$polyline3, _args$polyline4;
 
       ((_args$polyline3 = args.polyline) === null || _args$polyline3 === void 0 ? void 0 : _args$polyline3.onClick) && ((_args$polyline4 = args.polyline) === null || _args$polyline4 === void 0 ? void 0 : _args$polyline4.onClick(args));
     }, {
       polyline: true
     });
-    var eventMouseOutDirection = (_mapRef$current14 = mapRef.current) === null || _mapRef$current14 === void 0 ? void 0 : _mapRef$current14.addListener("mouseOut", function (args) {
+    var eventMouseOutDirection = (_mapRef$current10 = mapRef.current) === null || _mapRef$current10 === void 0 ? void 0 : _mapRef$current10.addListener("mouseOut", function (args) {
       var _args$renderer3, _args$renderer4;
 
       ((_args$renderer3 = args.renderer) === null || _args$renderer3 === void 0 ? void 0 : _args$renderer3.onMouseOut) && ((_args$renderer4 = args.renderer) === null || _args$renderer4 === void 0 ? void 0 : _args$renderer4.onMouseOut(args));
     }, {
       directions: true
     });
-    var eventMouseOverDirection = (_mapRef$current15 = mapRef.current) === null || _mapRef$current15 === void 0 ? void 0 : _mapRef$current15.addListener("mouseOver", function (args) {
+    var eventMouseOverDirection = (_mapRef$current11 = mapRef.current) === null || _mapRef$current11 === void 0 ? void 0 : _mapRef$current11.addListener("mouseOver", function (args) {
       var _args$renderer5, _args$renderer6;
 
       ((_args$renderer5 = args.renderer) === null || _args$renderer5 === void 0 ? void 0 : _args$renderer5.onMouseOver) && ((_args$renderer6 = args.renderer) === null || _args$renderer6 === void 0 ? void 0 : _args$renderer6.onMouseOver(args));
     }, {
       directions: true
     });
-    var eventMouseMoveDirection = (_mapRef$current16 = mapRef.current) === null || _mapRef$current16 === void 0 ? void 0 : _mapRef$current16.addListener("mouseMove", function (args) {
+    var eventMouseMoveDirection = (_mapRef$current12 = mapRef.current) === null || _mapRef$current12 === void 0 ? void 0 : _mapRef$current12.addListener("mouseMove", function (args) {
       var _args$renderer7, _args$renderer8;
 
       ((_args$renderer7 = args.renderer) === null || _args$renderer7 === void 0 ? void 0 : _args$renderer7.onMouseMove) && ((_args$renderer8 = args.renderer) === null || _args$renderer8 === void 0 ? void 0 : _args$renderer8.onMouseMove(args));
     }, {
       directions: true
     });
-    var eventMouseOutPolyline = (_mapRef$current17 = mapRef.current) === null || _mapRef$current17 === void 0 ? void 0 : _mapRef$current17.addListener("mouseOut", function (args) {
+    var eventMouseOutPolyline = (_mapRef$current13 = mapRef.current) === null || _mapRef$current13 === void 0 ? void 0 : _mapRef$current13.addListener("mouseOut", function (args) {
       var _args$polyline5, _args$polyline6;
 
       ((_args$polyline5 = args.polyline) === null || _args$polyline5 === void 0 ? void 0 : _args$polyline5.onMouseOut) && ((_args$polyline6 = args.polyline) === null || _args$polyline6 === void 0 ? void 0 : _args$polyline6.onMouseOut(args));
     }, {
       polyline: true
     });
-    var eventMouseOverPolyline = (_mapRef$current18 = mapRef.current) === null || _mapRef$current18 === void 0 ? void 0 : _mapRef$current18.addListener("mouseOver", function (args) {
+    var eventMouseOverPolyline = (_mapRef$current14 = mapRef.current) === null || _mapRef$current14 === void 0 ? void 0 : _mapRef$current14.addListener("mouseOver", function (args) {
       var _args$polyline7, _args$polyline8;
 
       ((_args$polyline7 = args.polyline) === null || _args$polyline7 === void 0 ? void 0 : _args$polyline7.onMouseOver) && ((_args$polyline8 = args.polyline) === null || _args$polyline8 === void 0 ? void 0 : _args$polyline8.onMouseOver(args));
     }, {
       polyline: true
     });
-    var eventMouseMovePolyline = (_mapRef$current19 = mapRef.current) === null || _mapRef$current19 === void 0 ? void 0 : _mapRef$current19.addListener("mouseMove", function (args) {
+    var eventMouseMovePolyline = (_mapRef$current15 = mapRef.current) === null || _mapRef$current15 === void 0 ? void 0 : _mapRef$current15.addListener("mouseMove", function (args) {
       var _args$polyline9, _args$polyline10;
 
       ((_args$polyline9 = args.polyline) === null || _args$polyline9 === void 0 ? void 0 : _args$polyline9.onMouseMove) && ((_args$polyline10 = args.polyline) === null || _args$polyline10 === void 0 ? void 0 : _args$polyline10.onMouseMove(args));
     }, {
       polyline: true
     });
-    var eventMouseOutMarker = (_mapRef$current20 = mapRef.current) === null || _mapRef$current20 === void 0 ? void 0 : _mapRef$current20.addListener("mouseOut", function (args) {
+    var eventMouseOutMarker = (_mapRef$current16 = mapRef.current) === null || _mapRef$current16 === void 0 ? void 0 : _mapRef$current16.addListener("mouseOut", function (args) {
       var _args$marker9, _args$marker10;
 
       ((_args$marker9 = args.marker) === null || _args$marker9 === void 0 ? void 0 : _args$marker9.onMouseOut) && ((_args$marker10 = args.marker) === null || _args$marker10 === void 0 ? void 0 : _args$marker10.onMouseOut(args));
     }, {
       marker: true
     });
-    var eventMouseOverMarker = (_mapRef$current21 = mapRef.current) === null || _mapRef$current21 === void 0 ? void 0 : _mapRef$current21.addListener("mouseOver", function (args) {
+    var eventMouseOverMarker = (_mapRef$current17 = mapRef.current) === null || _mapRef$current17 === void 0 ? void 0 : _mapRef$current17.addListener("mouseOver", function (args) {
       var _args$marker11, _args$marker12;
 
       ((_args$marker11 = args.marker) === null || _args$marker11 === void 0 ? void 0 : _args$marker11.onMouseOver) && ((_args$marker12 = args.marker) === null || _args$marker12 === void 0 ? void 0 : _args$marker12.onMouseOver(args));
     }, {
       marker: true
     });
-    var eventMouseMoveMarker = (_mapRef$current22 = mapRef.current) === null || _mapRef$current22 === void 0 ? void 0 : _mapRef$current22.addListener("mouseMove", function (args) {
+    var eventMouseMoveMarker = (_mapRef$current18 = mapRef.current) === null || _mapRef$current18 === void 0 ? void 0 : _mapRef$current18.addListener("mouseMove", function (args) {
       var _args$marker13, _args$marker14;
 
       ((_args$marker13 = args.marker) === null || _args$marker13 === void 0 ? void 0 : _args$marker13.onMouseMove) && ((_args$marker14 = args.marker) === null || _args$marker14 === void 0 ? void 0 : _args$marker14.onMouseMove(args));
     }, {
       marker: true
     });
-    var eventClickPoi = (_mapRef$current23 = mapRef.current) === null || _mapRef$current23 === void 0 ? void 0 : _mapRef$current23.addListener("click", function (args) {
+    var eventClickPoi = (_mapRef$current19 = mapRef.current) === null || _mapRef$current19 === void 0 ? void 0 : _mapRef$current19.addListener("click", function (args) {
       var _args$poi, _args$poi2;
 
       ((_args$poi = args.poi) === null || _args$poi === void 0 ? void 0 : _args$poi.onClick) && ((_args$poi2 = args.poi) === null || _args$poi2 === void 0 ? void 0 : _args$poi2.onClick(args));
     }, {
       poi: true
     });
-    var eventHoverPoi = (_mapRef$current24 = mapRef.current) === null || _mapRef$current24 === void 0 ? void 0 : _mapRef$current24.addListener("hover", function (args) {
+    var eventHoverPoi = (_mapRef$current20 = mapRef.current) === null || _mapRef$current20 === void 0 ? void 0 : _mapRef$current20.addListener("hover", function (args) {
       var _args$poi3, _args$poi4;
 
       ((_args$poi3 = args.poi) === null || _args$poi3 === void 0 ? void 0 : _args$poi3.onHover) && ((_args$poi4 = args.poi) === null || _args$poi4 === void 0 ? void 0 : _args$poi4.onHover(args));
     }, {
       poi: true
     });
-    events.current = events.current.concat([eventClickMarker, eventRightClickMarker, eventDragEndMarker, eventHoverMarker, eventHoverPolygon, eventHoverPolyline, eventHoverDirection, eventClickPolyline, eventMouseOutDirection, eventMouseOverDirection, eventMouseMoveDirection, eventMouseOutPolyline, eventMouseOverPolyline, eventMouseMovePolyline, eventMouseOutMarker, eventMouseOverMarker, eventMouseMoveMarker, eventClickPoi, eventHoverPoi]);
+    events.current = events.current.concat([eventClickMarker, eventRightClickMarker, eventDragEndMarker, eventHoverMarker, eventHoverPolygon, eventHoverPolyline, eventHoverDirection, eventClickPolyline, eventMouseOutDirection, eventMouseOverDirection, eventMouseMoveDirection, eventMouseOutPolyline, eventMouseOverPolyline, eventMouseMovePolyline, eventMouseOutMarker, eventMouseOverMarker, eventMouseMoveMarker, eventClickPoi, eventHoverPoi, (_mapRef$current21 = mapRef.current) === null || _mapRef$current21 === void 0 ? void 0 : _mapRef$current21.addListener("click", function (args) {
+      var _args$circle, _args$circle2;
+
+      ((_args$circle = args.circle) === null || _args$circle === void 0 ? void 0 : _args$circle.onClick) && ((_args$circle2 = args.circle) === null || _args$circle2 === void 0 ? void 0 : _args$circle2.onClick(args));
+    }, {
+      circle: true
+    })]);
 
     if (props.onClickLocation) {
-      var _mapRef$current25;
+      var _mapRef$current22;
 
-      var onClickLocation = (_mapRef$current25 = mapRef.current) === null || _mapRef$current25 === void 0 ? void 0 : _mapRef$current25.addListener("click", function (args) {
+      var onClickLocation = (_mapRef$current22 = mapRef.current) === null || _mapRef$current22 === void 0 ? void 0 : _mapRef$current22.addListener("click", function (args) {
         props.onClickLocation && props.onClickLocation(args);
       }, {
         location: true
@@ -1007,9 +1029,9 @@ var MFMap = function MFMap(props) {
     }
 
     if (props.onRightClickLocation) {
-      var _mapRef$current26;
+      var _mapRef$current23;
 
-      var onRightClickLocation = (_mapRef$current26 = mapRef.current) === null || _mapRef$current26 === void 0 ? void 0 : _mapRef$current26.addListener("rightClick", function (args) {
+      var onRightClickLocation = (_mapRef$current23 = mapRef.current) === null || _mapRef$current23 === void 0 ? void 0 : _mapRef$current23.addListener("rightClick", function (args) {
         props.onRightClickLocation && props.onRightClickLocation(args);
       }, {
         location: true
@@ -1018,9 +1040,9 @@ var MFMap = function MFMap(props) {
     }
 
     if (props.onTilesLoaded) {
-      var _mapRef$current27;
+      var _mapRef$current24;
 
-      var onTilesLoaded = (_mapRef$current27 = mapRef.current) === null || _mapRef$current27 === void 0 ? void 0 : _mapRef$current27.addListener("tilesLoaded", function (args) {
+      var onTilesLoaded = (_mapRef$current24 = mapRef.current) === null || _mapRef$current24 === void 0 ? void 0 : _mapRef$current24.addListener("tilesLoaded", function (args) {
         props.onTilesLoaded && props.onTilesLoaded(args);
       }, {
         location: true
@@ -1029,9 +1051,9 @@ var MFMap = function MFMap(props) {
     }
 
     if (props.onCameraChanging) {
-      var _mapRef$current28;
+      var _mapRef$current25;
 
-      var onCameraChanging = (_mapRef$current28 = mapRef.current) === null || _mapRef$current28 === void 0 ? void 0 : _mapRef$current28.addListener("cameraChanging", function (args) {
+      var onCameraChanging = (_mapRef$current25 = mapRef.current) === null || _mapRef$current25 === void 0 ? void 0 : _mapRef$current25.addListener("cameraChanging", function (args) {
         props.onCameraChanging && props.onCameraChanging(args);
       }, {
         location: true
@@ -1071,7 +1093,7 @@ var MFMarker = function MFMarker(props) {
       label = props.label,
       draggable = props.draggable,
       iconView = props.iconView,
-      clickable = props.clickable,
+      userInteractionEnabled = props.userInteractionEnabled,
       map = props.map,
       onCreated = props.onCreated,
       onClick = props.onClick,
@@ -1104,7 +1126,7 @@ var MFMarker = function MFMarker(props) {
         label: label,
         draggable: draggable,
         iconView: iconView,
-        clickable: clickable
+        userInteractionEnabled: userInteractionEnabled
       };
       Object.keys(option).forEach(function (key) {
         if (option[key] == undefined || option[key] == null) {
@@ -1284,8 +1306,8 @@ var MFMarker = function MFMarker(props) {
   useEffect(function () {
     var _markerRef$current20;
 
-    clickable != undefined && ((_markerRef$current20 = markerRef.current) === null || _markerRef$current20 === void 0 ? void 0 : _markerRef$current20.setClickable(clickable));
-  }, [clickable]);
+    userInteractionEnabled != undefined && ((_markerRef$current20 = markerRef.current) === null || _markerRef$current20 === void 0 ? void 0 : _markerRef$current20.setUserInteraction(userInteractionEnabled));
+  }, [userInteractionEnabled]);
   useEffect(function () {
     var _markerRef$current21;
 
@@ -1415,7 +1437,7 @@ var MFPOI = function MFPOI(props) {
       zIndex = props.zIndex,
       visible = props.visible,
       draggable = props.draggable,
-      clickable = props.clickable,
+      userInteractionEnabled = props.userInteractionEnabled,
       map = props.map,
       onCreated = props.onCreated,
       onClick = props.onClick,
@@ -1441,7 +1463,7 @@ var MFPOI = function MFPOI(props) {
         zIndex: zIndex,
         visible: visible,
         draggable: draggable,
-        clickable: clickable
+        userInteractionEnabled: userInteractionEnabled
       };
       Object.keys(option).forEach(function (key) {
         if (option[key] == undefined || option[key] == null) {
@@ -1528,8 +1550,8 @@ var MFPOI = function MFPOI(props) {
   useEffect(function () {
     var _poiRef$current15;
 
-    clickable != undefined && ((_poiRef$current15 = poiRef.current) === null || _poiRef$current15 === void 0 ? void 0 : _poiRef$current15.setClickable(clickable));
-  }, [clickable]);
+    userInteractionEnabled != undefined && ((_poiRef$current15 = poiRef.current) === null || _poiRef$current15 === void 0 ? void 0 : _poiRef$current15.setUserInteraction(userInteractionEnabled));
+  }, [userInteractionEnabled]);
   useEffect(function () {
     if (poiRef.current) {
       poiRef.current.onClick = onClick;
@@ -1622,14 +1644,13 @@ var MFPolygon = function MFPolygon(props) {
       draggable = props.draggable,
       elevation = props.elevation,
       zIndex = props.zIndex,
-      clickable = props.clickable,
+      userInteractionEnabled = props.userInteractionEnabled,
       map = props.map,
       onHover = props.onHover,
       onCreated = props.onCreated;
   var map4dContext = useContext(Map4dContext);
   var theMap = map || map4dContext.map;
   var polygonRef = useRef();
-  var a = useRef();
   useEffect(function () {
     if (theMap && !polygonRef.current) {
       var _polygonRef$current;
@@ -1644,7 +1665,7 @@ var MFPolygon = function MFPolygon(props) {
         draggable: draggable,
         elevation: elevation,
         zIndex: zIndex,
-        clickable: clickable
+        userInteractionEnabled: userInteractionEnabled
       };
       Object.keys(option).forEach(function (key) {
         if (option[key] == undefined || option[key] == null) {
@@ -1652,8 +1673,6 @@ var MFPolygon = function MFPolygon(props) {
         }
       });
       polygonRef.current = new map4d.Polygon(option);
-      a.current = theMap;
-      console.log(a.current);
       (_polygonRef$current = polygonRef.current) === null || _polygonRef$current === void 0 ? void 0 : _polygonRef$current.setMap(theMap);
       polygonRef.current.onHover = props.onHover;
       onCreated && onCreated(polygonRef.current);
@@ -1685,62 +1704,55 @@ var MFPolygon = function MFPolygon(props) {
     }
   }, [onHover]);
   useEffect(function () {
-    var _polygonRef$current6;
-
-    if (polygonRef.current) {
-      var _polygonRef$current5;
-
-      var c = (_polygonRef$current5 = polygonRef.current) === null || _polygonRef$current5 === void 0 ? void 0 : _polygonRef$current5.getMap();
-      console.log(c == a.current);
-    }
+    var _polygonRef$current5;
 
-    (_polygonRef$current6 = polygonRef.current) === null || _polygonRef$current6 === void 0 ? void 0 : _polygonRef$current6.setPaths(paths);
+    (_polygonRef$current5 = polygonRef.current) === null || _polygonRef$current5 === void 0 ? void 0 : _polygonRef$current5.setPaths(paths);
   }, [paths]);
   useEffect(function () {
-    var _polygonRef$current7;
+    var _polygonRef$current6;
 
-    fillColor != undefined && ((_polygonRef$current7 = polygonRef.current) === null || _polygonRef$current7 === void 0 ? void 0 : _polygonRef$current7.setFillColor(fillColor));
+    fillColor != undefined && ((_polygonRef$current6 = polygonRef.current) === null || _polygonRef$current6 === void 0 ? void 0 : _polygonRef$current6.setFillColor(fillColor));
   }, [fillColor]);
   useEffect(function () {
-    var _polygonRef$current8;
+    var _polygonRef$current7;
 
-    fillOpacity != undefined && ((_polygonRef$current8 = polygonRef.current) === null || _polygonRef$current8 === void 0 ? void 0 : _polygonRef$current8.setFillOpacity(fillOpacity));
+    fillOpacity != undefined && ((_polygonRef$current7 = polygonRef.current) === null || _polygonRef$current7 === void 0 ? void 0 : _polygonRef$current7.setFillOpacity(fillOpacity));
   }, [fillOpacity]);
   useEffect(function () {
-    var _polygonRef$current9;
+    var _polygonRef$current8;
 
-    (_polygonRef$current9 = polygonRef.current) === null || _polygonRef$current9 === void 0 ? void 0 : _polygonRef$current9.setVisible(visible);
+    (_polygonRef$current8 = polygonRef.current) === null || _polygonRef$current8 === void 0 ? void 0 : _polygonRef$current8.setVisible(visible);
   }, [visible]);
   useEffect(function () {
-    var _polygonRef$current10;
+    var _polygonRef$current9;
 
-    strokeColor != undefined && ((_polygonRef$current10 = polygonRef.current) === null || _polygonRef$current10 === void 0 ? void 0 : _polygonRef$current10.setStrokeColor(strokeColor));
+    strokeColor != undefined && ((_polygonRef$current9 = polygonRef.current) === null || _polygonRef$current9 === void 0 ? void 0 : _polygonRef$current9.setStrokeColor(strokeColor));
   }, [strokeColor]);
   useEffect(function () {
-    var _polygonRef$current11;
+    var _polygonRef$current10;
 
-    strokeWidth != undefined && ((_polygonRef$current11 = polygonRef.current) === null || _polygonRef$current11 === void 0 ? void 0 : _polygonRef$current11.setStrokeWidth(strokeWidth));
+    strokeWidth != undefined && ((_polygonRef$current10 = polygonRef.current) === null || _polygonRef$current10 === void 0 ? void 0 : _polygonRef$current10.setStrokeWidth(strokeWidth));
   }, [strokeWidth]);
   useEffect(function () {
-    var _polygonRef$current12;
+    var _polygonRef$current11;
 
-    draggable != undefined && ((_polygonRef$current12 = polygonRef.current) === null || _polygonRef$current12 === void 0 ? void 0 : _polygonRef$current12.setDraggable(draggable));
+    draggable != undefined && ((_polygonRef$current11 = polygonRef.current) === null || _polygonRef$current11 === void 0 ? void 0 : _polygonRef$current11.setDraggable(draggable));
   }, [draggable]);
   useEffect(function () {
-    var _polygonRef$current13;
+    var _polygonRef$current12;
 
-    elevation != undefined && ((_polygonRef$current13 = polygonRef.current) === null || _polygonRef$current13 === void 0 ? void 0 : _polygonRef$current13.setElevation(elevation));
+    elevation != undefined && ((_polygonRef$current12 = polygonRef.current) === null || _polygonRef$current12 === void 0 ? void 0 : _polygonRef$current12.setElevation(elevation));
   }, [elevation]);
   useEffect(function () {
-    var _polygonRef$current14;
+    var _polygonRef$current13;
 
-    zIndex != undefined && ((_polygonRef$current14 = polygonRef.current) === null || _polygonRef$current14 === void 0 ? void 0 : _polygonRef$current14.setZIndex(zIndex));
+    zIndex != undefined && ((_polygonRef$current13 = polygonRef.current) === null || _polygonRef$current13 === void 0 ? void 0 : _polygonRef$current13.setZIndex(zIndex));
   }, [zIndex]);
   useEffect(function () {
-    var _polygonRef$current15;
+    var _polygonRef$current14;
 
-    clickable != undefined && ((_polygonRef$current15 = polygonRef.current) === null || _polygonRef$current15 === void 0 ? void 0 : _polygonRef$current15.setClickable(clickable));
-  }, [clickable]);
+    userInteractionEnabled != undefined && ((_polygonRef$current14 = polygonRef.current) === null || _polygonRef$current14 === void 0 ? void 0 : _polygonRef$current14.setUserInteraction(userInteractionEnabled));
+  }, [userInteractionEnabled]);
   return null;
 };
 
@@ -1756,7 +1768,7 @@ var MFPolyline = function MFPolyline(props) {
       zIndex = props.zIndex,
       elevation = props.elevation,
       strokePattern = props.strokePattern,
-      clickable = props.clickable,
+      userInteractionEnabled = props.userInteractionEnabled,
       map = props.map,
       onClick = props.onClick,
       onHover = props.onHover,
@@ -1785,7 +1797,7 @@ var MFPolyline = function MFPolyline(props) {
         zIndex: zIndex,
         elevation: elevation,
         strokePattern: strokePattern,
-        clickable: clickable
+        userInteractionEnabled: userInteractionEnabled
       };
       Object.keys(option).forEach(function (key) {
         if (option[key] == undefined || option[key] == null) {
@@ -1900,8 +1912,8 @@ var MFPolyline = function MFPolyline(props) {
   useEffect(function () {
     var _polylineRef$current15;
 
-    clickable != undefined && ((_polylineRef$current15 = polylineRef.current) === null || _polylineRef$current15 === void 0 ? void 0 : _polylineRef$current15.setClickable(clickable));
-  }, [clickable]);
+    userInteractionEnabled != undefined && ((_polylineRef$current15 = polylineRef.current) === null || _polylineRef$current15 === void 0 ? void 0 : _polylineRef$current15.setUserInteraction(userInteractionEnabled));
+  }, [userInteractionEnabled]);
   return null;
 };