react-map4d-map 1.2.4 → 1.2.5

package/dist/components/MFDirectionsRenderer.d.ts

@@ -22,10 +22,10 @@ interface DirectionsRendererProps {
     onMarkerDragEnd?: Function;
     map?: map4d.Map;
     onCreated?: (directionsRenderer?: map4d.DirectionsRenderer) => void;
-    onHover?: (directions: any) => void;
-    onMouseOut?: (marker: any) => void;
-    onMouseOver?: (marker: any) => void;
-    onMouseMove?: (marker: any) => void;
+    onHover?: (args: any) => void;
+    onMouseOut?: (args: any) => void;
+    onMouseOver?: (args: any) => void;
+    onMouseMove?: (args: any) => void;
 }
 declare const MFDirectionsRenderer: (props: DirectionsRendererProps) => null;
 export default MFDirectionsRenderer;

package/dist/components/MFMarker.d.ts

@@ -23,14 +23,14 @@ interface MarkerProps {
     infoWindow?: string | Node;
     infoContents?: string | Node;
     showInfoWindow?: boolean;
-    onClick?: (marker: any) => void;
+    onClick?: (args: any) => void;
     onCreated?: (marker: any) => void;
-    onRightClick?: (marker: any) => void;
-    onDragEnd?: (marker: any) => void;
-    onHover?: (marker: any) => void;
-    onMouseOut?: (marker: any) => void;
-    onMouseOver?: (marker: any) => void;
-    onMouseMove?: (marker: any) => void;
+    onRightClick?: (args: any) => void;
+    onDragEnd?: (args: any) => void;
+    onHover?: (args: any) => void;
+    onMouseOut?: (args: any) => void;
+    onMouseOver?: (args: any) => void;
+    onMouseMove?: (args: any) => void;
 }
 declare const MFMarker: (props: MarkerProps) => null;
 export default MFMarker;

package/dist/components/MFPOI.d.ts

@@ -1,6 +1,19 @@
 interface POIProps extends map4d.POIOptions {
+    position: any;
+    title?: string;
+    subtitle?: string;
+    color?: string;
+    type?: string;
+    icon?: string;
+    elevation?: number;
+    zIndex?: number;
+    visible?: boolean;
+    draggable?: boolean;
+    userInteractionEnabled?: boolean;
     map?: map4d.Map;
     onCreated?: (poi: map4d.POI) => void;
+    onClick?: (args: any) => void;
+    onHover?: (args: any) => void;
 }
 declare const MFPOI: (props: POIProps) => null;
 export default MFPOI;

package/dist/components/MFPolygon.d.ts

@@ -11,7 +11,7 @@ interface PolygonProps {
     userInteractionEnabled?: boolean;
     map?: map4d.Map;
     onCreated?: (polygon: map4d.Polygon) => void;
-    onHover?: (polygon: any) => void;
+    onHover?: (args: any) => void;
 }
 declare const MFPolygon: (props: PolygonProps) => null;
 export default MFPolygon;

package/dist/components/MFPolyline.d.ts

@@ -12,11 +12,11 @@ interface PolylineProps {
     userInteractionEnabled?: boolean;
     map?: map4d.Map;
     onCreated?: (polyline: map4d.Polyline) => void;
-    onHover?: (polyline: any) => void;
-    onClick?: (polyline: any) => void;
-    onMouseOut?: (marker: any) => void;
-    onMouseOver?: (marker: any) => void;
-    onMouseMove?: (marker: any) => void;
+    onHover?: (args: any) => void;
+    onClick?: (args: any) => void;
+    onMouseOut?: (args: any) => void;
+    onMouseOver?: (args: any) => void;
+    onMouseMove?: (args: any) => void;
 }
 declare const MFPolyline: (props: PolylineProps) => null;
 export default MFPolyline;

package/dist/index.js

@@ -839,133 +839,147 @@ var MFMap = function MFMap(props) {
   }, [props.environment, props.version, props.accessKey]);
 
   var registerEvent = function registerEvent() {
-    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;
+    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;
 
     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 = 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$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$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$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$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$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$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$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 = 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$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 = 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$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$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$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$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$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$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$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$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$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$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$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$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$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$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$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$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$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$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$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$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$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$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
     });
-    events.current = events.current.concat([eventClickMarker, eventRightClickMarker, eventDragEndMarker, eventHoverMarker, eventHoverPolygon, eventHoverPolyline, eventHoverDirection, eventClickPolyline, eventMouseOutDirection, eventMouseOverDirection, eventMouseMoveDirection, eventMouseOutPolyline, eventMouseOverPolyline, eventMouseMovePolyline, eventMouseOutMarker, eventMouseOverMarker, eventMouseMoveMarker]);
+    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$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]);
 
     if (props.onClickLocation) {
-      var _mapRef$current19;
+      var _mapRef$current21;
 
-      var onClickLocation = (_mapRef$current19 = mapRef.current) === null || _mapRef$current19 === void 0 ? void 0 : _mapRef$current19.addListener("click", function (args) {
+      var onClickLocation = (_mapRef$current21 = mapRef.current) === null || _mapRef$current21 === void 0 ? void 0 : _mapRef$current21.addListener("click", function (args) {
         props.onClickLocation && props.onClickLocation(args);
       }, {
         location: true
@@ -974,9 +988,9 @@ var MFMap = function MFMap(props) {
     }
 
     if (props.onRightClickLocation) {
-      var _mapRef$current20;
+      var _mapRef$current22;
 
-      var onRightClickLocation = (_mapRef$current20 = mapRef.current) === null || _mapRef$current20 === void 0 ? void 0 : _mapRef$current20.addListener("rightClick", function (args) {
+      var onRightClickLocation = (_mapRef$current22 = mapRef.current) === null || _mapRef$current22 === void 0 ? void 0 : _mapRef$current22.addListener("rightClick", function (args) {
         props.onRightClickLocation && props.onRightClickLocation(args);
       }, {
         location: true
@@ -985,9 +999,9 @@ var MFMap = function MFMap(props) {
     }
 
     if (props.onTilesLoaded) {
-      var _mapRef$current21;
+      var _mapRef$current23;
 
-      var onTilesLoaded = (_mapRef$current21 = mapRef.current) === null || _mapRef$current21 === void 0 ? void 0 : _mapRef$current21.addListener("tilesLoaded", function (args) {
+      var onTilesLoaded = (_mapRef$current23 = mapRef.current) === null || _mapRef$current23 === void 0 ? void 0 : _mapRef$current23.addListener("tilesLoaded", function (args) {
         props.onTilesLoaded && props.onTilesLoaded(args);
       }, {
         location: true
@@ -996,9 +1010,9 @@ var MFMap = function MFMap(props) {
     }
 
     if (props.onCameraChanging) {
-      var _mapRef$current22;
+      var _mapRef$current24;
 
-      var onCameraChanging = (_mapRef$current22 = mapRef.current) === null || _mapRef$current22 === void 0 ? void 0 : _mapRef$current22.addListener("cameraChanging", function (args) {
+      var onCameraChanging = (_mapRef$current24 = mapRef.current) === null || _mapRef$current24 === void 0 ? void 0 : _mapRef$current24.addListener("cameraChanging", function (args) {
         props.onCameraChanging && props.onCameraChanging(args);
       }, {
         location: true
@@ -1389,7 +1403,9 @@ var MFPOI = function MFPOI(props) {
       draggable = props.draggable,
       userInteractionEnabled = props.userInteractionEnabled,
       map = props.map,
-      onCreated = props.onCreated;
+      onCreated = props.onCreated,
+      onClick = props.onClick,
+      onHover = props.onHover;
   var map4dContext = React.useContext(Map4dContext);
   var theMap = map || map4dContext.map;
   var poiRef = React.useRef();
@@ -1419,6 +1435,8 @@ var MFPOI = function MFPOI(props) {
         }
       });
       poiRef.current = new map4d.POI(option);
+      poiRef.current.onClick = onClick;
+      poiRef.current.onHover = onHover;
       (_poiRef$current = poiRef.current) === null || _poiRef$current === void 0 ? void 0 : _poiRef$current.setMap(theMap);
       onCreated && onCreated(poiRef.current);
     }
@@ -1498,6 +1516,16 @@ var MFPOI = function MFPOI(props) {
 
     userInteractionEnabled != undefined && ((_poiRef$current15 = poiRef.current) === null || _poiRef$current15 === void 0 ? void 0 : _poiRef$current15.setUserInteraction(userInteractionEnabled));
   }, [userInteractionEnabled]);
+  React.useEffect(function () {
+    if (poiRef.current) {
+      poiRef.current.onClick = onClick;
+    }
+  }, [onClick]);
+  React.useEffect(function () {
+    if (poiRef.current) {
+      poiRef.current.onHover = onHover;
+    }
+  }, [onHover]);
   return null;
 };