@reltio/components 1.4.2006 → 1.4.2008

package/cjs/ReltioMap/ReltioMap.d.ts

@@ -1,12 +1,13 @@
 import React from 'react';
-import { GoogleMapProps, MarkerClustererProps } from '@react-google-maps/api';
-import { DrawingModes, EntityMarker as Marker, MapBounds, Overlay, OverlayPath } from './types';
-type MarkerClustererOptions = MarkerClustererProps['options'];
+import { GeoPoint } from '@reltio/mdm-sdk';
+import { DrawingModes, MapBounds, Overlay, ClusteredMarkersOptions, DrawingMode } from './types';
 type Props = {
-    markers?: Marker[];
+    markers?: GeoPoint[];
     mapKey: string;
-    defaultZoom?: GoogleMapProps['zoom'];
-    defaultCenter?: GoogleMapProps['center'];
+    /** A map ID is required to use Advanced Markers. https://developers.google.com/maps/documentation/javascript/advanced-markers/overview */
+    mapId?: string;
+    defaultZoom?: number;
+    defaultCenter?: google.maps.LatLngLiteral;
     loadingElement: React.ReactElement;
     isSearchOnMapMove?: boolean;
     isSearchEnabled?: boolean;
@@ -14,15 +15,18 @@ type Props = {
     overlayOptions?: google.maps.PolygonOptions | google.maps.CircleOptions;
     drawingModes?: DrawingModes;
     markerClusterer?: boolean;
-    markerClustererOptions?: MarkerClustererOptions;
+    markerClustererOptions?: ClusteredMarkersOptions;
     mapOptions?: google.maps.MapOptions;
     mapContainerClassName?: string;
     onMapBoundsChanged?: (value: MapBounds | null) => void;
     onOverlayUpdated?: (value: {
-        data: OverlayPath;
-        type: string;
+        data: number[][] | {
+            radius: number;
+            center: google.maps.LatLng;
+        };
+        type: DrawingMode;
     }) => void;
-    onMarkerClicked?: (value: Marker) => void;
+    onMarkerClicked?: (value: GeoPoint) => void;
 };
-export declare const ReltioMap: ({ markers, mapKey, defaultZoom, defaultCenter, loadingElement, isSearchOnMapMove, isSearchEnabled, activeOverlay, overlayOptions, drawingModes, markerClusterer, markerClustererOptions, mapOptions, mapContainerClassName, onMapBoundsChanged, onOverlayUpdated, onMarkerClicked }: Props) => React.JSX.Element;
+export declare const ReltioMap: ({ mapKey, ...restProps }: Props) => React.JSX.Element;
 export {};

package/cjs/ReltioMap/ReltioMap.js

@@ -33,35 +33,57 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReltioMap = void 0;
 var react_1 = __importStar(require("react"));
 var ramda_1 = require("ramda");
-var api_1 = require("@react-google-maps/api");
-var EntityMarker_1 = require("./components/EntityMarker");
-var MapControlContainer_1 = require("./components/MapControlContainer");
+var react_google_maps_1 = require("@vis.gl/react-google-maps");
 var TopRightMapControls_1 = require("./components/TopRightMapControls");
 var TopCenterMapControls_1 = require("./components/TopCenterMapControls");
 var helpers_1 = require("./helpers");
 var constants_1 = require("../constants");
 var useFitMapBounds_1 = require("./useFitMapBounds");
 var styles_1 = require("./styles");
+var ClusteredMarkers_1 = require("./components/ClusteredMarkers");
+var Polygon_1 = require("./components/Polygon");
+var DrawingManager_1 = require("./components/DrawingManager");
 var ON_MAP_MOVE_DEBOUNCE_INTERVAL = 1000;
 var libraries = ['drawing'];
 var ReltioMap = function (_a) {
-    var _b = _a.markers, markers = _b === void 0 ? [] : _b, mapKey = _a.mapKey, defaultZoom = _a.defaultZoom, defaultCenter = _a.defaultCenter, loadingElement = _a.loadingElement, isSearchOnMapMove = _a.isSearchOnMapMove, isSearchEnabled = _a.isSearchEnabled, activeOverlay = _a.activeOverlay, _c = _a.overlayOptions, overlayOptions = _c === void 0 ? {} : _c, _d = _a.drawingModes, drawingModes = _d === void 0 ? [] : _d, markerClusterer = _a.markerClusterer, markerClustererOptions = _a.markerClustererOptions, _e = _a.mapOptions, mapOptions = _e === void 0 ? {} : _e, mapContainerClassName = _a.mapContainerClassName, _f = _a.onMapBoundsChanged, onMapBoundsChanged = _f === void 0 ? ramda_1.identity : _f, _g = _a.onOverlayUpdated, onOverlayUpdated = _g === void 0 ? ramda_1.identity : _g, _h = _a.onMarkerClicked, onMarkerClicked = _h === void 0 ? ramda_1.identity : _h;
+    var mapKey = _a.mapKey, restProps = __rest(_a, ["mapKey"]);
+    return (react_1.default.createElement(react_google_maps_1.APIProvider, { apiKey: mapKey, libraries: libraries },
+        react_1.default.createElement(InternalReltioMap, __assign({}, restProps))));
+};
+exports.ReltioMap = ReltioMap;
+var emptyObject = {};
+var emptyArray = [];
+var InternalReltioMap = (0, react_1.memo)(function (_a) {
+    var mapId = _a.mapId, _b = _a.markers, markers = _b === void 0 ? emptyArray : _b, defaultZoom = _a.defaultZoom, defaultCenter = _a.defaultCenter, loadingElement = _a.loadingElement, isSearchOnMapMove = _a.isSearchOnMapMove, isSearchEnabled = _a.isSearchEnabled, activeOverlay = _a.activeOverlay, _c = _a.overlayOptions, overlayOptions = _c === void 0 ? emptyObject : _c, _d = _a.drawingModes, drawingModes = _d === void 0 ? emptyArray : _d, markerClusterer = _a.markerClusterer, markerClustererOptions = _a.markerClustererOptions, _f = _a.mapOptions, mapOptions = _f === void 0 ? emptyObject : _f, mapContainerClassName = _a.mapContainerClassName, _g = _a.onMapBoundsChanged, onMapBoundsChanged = _g === void 0 ? ramda_1.identity : _g, _h = _a.onOverlayUpdated, onOverlayUpdated = _h === void 0 ? ramda_1.identity : _h, _j = _a.onMarkerClicked, onMarkerClicked = _j === void 0 ? ramda_1.identity : _j;
     var styles = (0, styles_1.useStyles)();
-    var _j = (0, api_1.useJsApiLoader)({
-        googleMapsApiKey: mapKey,
-        libraries: libraries
-    }), isLoaded = _j.isLoaded, loadError = _j.loadError;
     var mapMoveEndTimer = (0, react_1.useRef)(null);
-    var _k = (0, react_1.useState)(null), map = _k[0], setMap = _k[1];
-    var _l = (0, react_1.useState)(null), polygon = _l[0], setPolygon = _l[1];
-    var _m = (0, react_1.useState)(null), drawingMode = _m[0], setDrawingMode = _m[1];
+    var isLoaded = (0, react_google_maps_1.useApiIsLoaded)();
+    var map = (0, react_google_maps_1.useMap)();
+    var _k = (0, react_1.useState)(null), polygon = _k[0], setPolygon = _k[1];
+    var _l = (0, react_1.useState)(null), drawingMode = _l[0], setDrawingMode = _l[1];
     (0, useFitMapBounds_1.useFitMapBounds)({ markers: markers, activeOverlay: activeOverlay, map: map, isSearchOnMapMove: isSearchOnMapMove });
     var allOverlayOptions = (0, react_1.useMemo)(function () { return (__assign(__assign({}, constants_1.DEFAULT_OVERLAY_OPTIONS), overlayOptions)); }, [overlayOptions]);
     var googleMapOptions = (0, react_1.useMemo)(function () { return (__assign(__assign({}, constants_1.DEFAULT_GOOGLE_MAP_OPTIONS), mapOptions)); }, [mapOptions]);
+    var drawingManagerOptions = (0, react_1.useMemo)(function () { return ({
+        drawingControl: false,
+        polygonOptions: allOverlayOptions
+    }); }, [allOverlayOptions]);
+    var polygonOptions = (0, react_1.useMemo)(function () { return (__assign({ paths: activeOverlay === null || activeOverlay === void 0 ? void 0 : activeOverlay.path, editable: true }, allOverlayOptions)); }, [activeOverlay, allOverlayOptions]);
     var handleChangeIsSearchOnMapMove = (0, react_1.useCallback)(function (isSearchOnMapMove) {
         onMapBoundsChanged(isSearchOnMapMove ? (0, helpers_1.getMapBoundsPolygon)(map) : null);
         setDrawingMode(null);
@@ -81,7 +103,7 @@ var ReltioMap = function (_a) {
         clearTimeout(mapMoveEndTimer.current);
         mapMoveEndTimer.current = setTimeout(handleMapMoveEnd, ON_MAP_MOVE_DEBOUNCE_INTERVAL);
     }, [handleMapMoveEnd, isSearchOnMapMove]);
-    var handleOverlayChange = (0, react_1.useCallback)(function (e, propOverlay) {
+    var handleOverlayChange = (0, react_1.useCallback)(function (_e, propOverlay) {
         var _a;
         var _b;
         var polygonStateOverlay = polygon && { type: constants_1.MAP_DRAWING_MODES.POLYGON, overlay: polygon };
@@ -95,7 +117,10 @@ var ReltioMap = function (_a) {
                 .getArray()
                 .map(function (latlng) { return [latlng.lat(), latlng.lng()]; });
         };
-        var getCircleParameters = function () { return ({ radius: overlay.getRadius() / 1000, center: overlay.getCenter() }); };
+        var getCircleParameters = function () { return ({
+            radius: overlay.getRadius() / 1000,
+            center: overlay.getCenter()
+        }); };
         var typeActions = (_a = {},
             _a[constants_1.MAP_DRAWING_MODES.POLYGON] = getPolygonLatLngCoordinates,
             _a[constants_1.MAP_DRAWING_MODES.CIRCLE] = getCircleParameters,
@@ -113,17 +138,6 @@ var ReltioMap = function (_a) {
     var handleClearOverlay = (0, react_1.useCallback)(function () {
         onOverlayUpdated(null);
     }, [onOverlayUpdated]);
-    var renderMarkers = function (clusterer) {
-        return markers
-            .filter((0, ramda_1.prop)('point'))
-            .map(function (marker) { return (react_1.default.createElement(EntityMarker_1.EntityMarker, { key: marker.id, marker: marker, clusterer: clusterer, onClick: onMarkerClicked })); });
-    };
-    var renderMarkerClusterer = function (options) {
-        return react_1.default.createElement(api_1.MarkerClusterer, { options: options }, renderMarkers);
-    };
-    if (loadError) {
-        return null;
-    }
     if (!isLoaded) {
         return loadingElement;
     }
@@ -131,17 +145,13 @@ var ReltioMap = function (_a) {
     var shouldRenderRightMapControls = map && isSearchEnabled && Boolean(drawingModes.length);
     var shouldRenderCenterMapControls = map && isSearchEnabled;
     var shouldRenderPolygon = !(0, helpers_1.getDrawingMode)(drawingMode) && activeOverlay && (0, ramda_1.propEq)('type', constants_1.MAP_DRAWING_MODES.POLYGON, activeOverlay);
-    return (react_1.default.createElement(api_1.GoogleMap, { mapTypeId: window.google.maps.MapTypeId.ROADMAP, options: googleMapOptions, onLoad: setMap, zoom: defaultZoom, center: defaultCenter, onZoomChanged: handleMapMoveStart, onDragStart: handleMapMoveStart, onIdle: handleMapIdle, mapContainerClassName: mapContainerClassName },
-        shouldRenderRightMapControls && (react_1.default.createElement(MapControlContainer_1.MapControlContainer, { className: styles.mapControlContainer, position: window.google.maps.ControlPosition.TOP_RIGHT, map: map },
-            react_1.default.createElement(TopRightMapControls_1.TopRightMapControls, { hasActiveOverlay: !!activeOverlay, drawingModes: drawingModes, drawingMode: drawingMode, onDrawingModeChanged: setDrawingMode, onClearOverlay: handleClearOverlay }))),
-        shouldRenderCenterMapControls && (react_1.default.createElement(MapControlContainer_1.MapControlContainer, { className: styles.mapControlContainer, position: window.google.maps.ControlPosition.TOP_CENTER, map: map },
-            react_1.default.createElement(TopCenterMapControls_1.TopCenterMapControls, { onChangeIsSearchOnMapMove: handleChangeIsSearchOnMapMove, isSearchOnMapMove: isSearchOnMapMove }))),
-        markerClusterer ? renderMarkerClusterer(markerClustererOptions) : renderMarkers(),
-        shouldRenderPolygon && (react_1.default.createElement(api_1.Polygon, { onLoad: setPolygon, path: activeOverlay.path, editable: true, options: allOverlayOptions, onMouseUp: handleOverlayChange, onDragEnd: handleOverlayChange })),
-        shouldRenderDrawingManager && (react_1.default.createElement(api_1.DrawingManager, { onPolygonComplete: handleOverlayComplete(constants_1.MAP_DRAWING_MODES.POLYGON), onCircleComplete: handleOverlayComplete(constants_1.MAP_DRAWING_MODES.CIRCLE), drawingMode: (0, helpers_1.getDrawingMode)(drawingMode), options: {
-                drawingControl: false,
-                circleOptions: allOverlayOptions,
-                polygonOptions: allOverlayOptions
-            } }))));
-};
-exports.ReltioMap = ReltioMap;
+    return (react_1.default.createElement(react_google_maps_1.Map, __assign({ mapId: mapId || 'mapId' }, googleMapOptions, { defaultZoom: defaultZoom, defaultCenter: defaultCenter, onZoomChanged: handleMapMoveStart, onDragstart: handleMapMoveStart, onIdle: handleMapIdle, className: mapContainerClassName }),
+        shouldRenderRightMapControls && (react_1.default.createElement(react_google_maps_1.MapControl, { position: react_google_maps_1.ControlPosition.TOP_RIGHT },
+            react_1.default.createElement(TopRightMapControls_1.TopRightMapControls, { className: styles.mapControlContainer, hasActiveOverlay: !!activeOverlay, drawingModes: drawingModes, drawingMode: drawingMode, onDrawingModeChanged: setDrawingMode, onClearOverlay: handleClearOverlay }))),
+        shouldRenderCenterMapControls && (react_1.default.createElement(react_google_maps_1.MapControl, { position: react_google_maps_1.ControlPosition.TOP_CENTER },
+            react_1.default.createElement(TopCenterMapControls_1.TopCenterMapControls, { className: styles.mapControlContainer, onChangeIsSearchOnMapMove: handleChangeIsSearchOnMapMove, isSearchOnMapMove: isSearchOnMapMove }))),
+        react_1.default.createElement(ClusteredMarkers_1.ClusteredMarkers, { entityMarkers: markers, enabledClustering: markerClusterer, options: markerClustererOptions, onMarkerClick: onMarkerClicked }),
+        shouldRenderPolygon && (react_1.default.createElement(Polygon_1.Polygon, { onInit: setPolygon, options: polygonOptions, onMouseUp: handleOverlayChange, onDragEnd: handleOverlayChange })),
+        shouldRenderDrawingManager && (react_1.default.createElement(DrawingManager_1.DrawingManager, { onPolygonComplete: handleOverlayComplete(constants_1.MAP_DRAWING_MODES.POLYGON), onCircleComplete: handleOverlayComplete(constants_1.MAP_DRAWING_MODES.CIRCLE), drawingMode: (0, helpers_1.getDrawingMode)(drawingMode), options: drawingManagerOptions }))));
+});
+InternalReltioMap.displayName = 'InternalReltioMap';