@reltio/components 1.4.2006 → 1.4.2007

package/ReltioMap/components/EntityMarker/EntityMarker.d.ts

@@ -1,9 +1,10 @@
-import React from 'react';
-import { MarkerProps } from '@react-google-maps/api';
-import { EntityMarker as EntityMarkerType } from '../../types';
+import React, { ComponentProps } from 'react';
+import { AdvancedMarker } from '@vis.gl/react-google-maps';
+import { GeoPoint } from '@reltio/mdm-sdk';
 type Props = {
-    marker: EntityMarkerType;
-    onClick: (marker: EntityMarkerType) => void;
-} & Omit<MarkerProps, 'onClick' | 'icon' | 'position' | 'visible' | 'onMouseOver' | 'onMouseOut'>;
-declare const _default: React.MemoExoticComponent<({ marker, onClick, ...otherProps }: Props) => React.JSX.Element>;
+    marker: GeoPoint;
+    onClick: (marker: GeoPoint) => void;
+    clusterer?: (advancedMarker: google.maps.marker.AdvancedMarkerElement | null, id: string) => void;
+} & Omit<ComponentProps<typeof AdvancedMarker>, 'onClick' | 'position' | 'onMouseEnter' | 'onMouseLeave'>;
+declare const _default: React.MemoExoticComponent<({ marker, onClick, clusterer, ...otherProps }: Props) => React.JSX.Element>;
 export default _default;

package/ReltioMap/components/EntityMarker/EntityMarker.js

@@ -20,9 +20,9 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React, { memo, useCallback, useContext, useRef, useState } from 'react';
+import React, { memo, useCallback, useContext, useState, useRef, useMemo } from 'react';
 import { pathEq } from 'ramda';
-import { Marker, InfoBox } from '@react-google-maps/api';
+import { AdvancedMarker } from '@vis.gl/react-google-maps';
 import { ProfileCard } from '../../../ProfileCard';
 import { Popper } from '../../../Popper';
 import { debounce, svg2Url } from '@reltio/mdm-sdk';
@@ -31,39 +31,39 @@ import { MARKER } from './icons/marker.inline.svg';
 import { HOVERED_MARKER } from './icons/marker-hover.inline.svg';
 import { useStyles } from './styles';
 var HIDE_DEBOUNCE_INTERVAL = 50;
-var MARKER_WIDTH = 22;
 var MARKER_HEIGHT = 32;
 var MARKER_CARD_MARGIN = 8;
 var hoveredMarkerIcon = svg2Url(HOVERED_MARKER);
 var markerIcon = svg2Url(MARKER);
 var EntityMarker = function (_a) {
-    var marker = _a.marker, onClick = _a.onClick, otherProps = __rest(_a, ["marker", "onClick"]);
+    var _b;
+    var marker = _a.marker, onClick = _a.onClick, clusterer = _a.clusterer, otherProps = __rest(_a, ["marker", "onClick", "clusterer"]);
     var styles = useStyles();
-    var popperAnchor = useRef();
-    var _b = useState(false), hovered = _b[0], setHovered = _b[1];
+    var _c = useState(false), hovered = _c[0], setHovered = _c[1];
     var activeEntityUri = useContext(EntityMarkerContext).activeEntityUri;
     var isActive = pathEq(['entity', 'uri'], activeEntityUri, marker);
-    var position = { lat: marker.point.lat, lng: marker.point.lng };
+    var position = useMemo(function () { return ({ lat: marker.point.lat, lng: marker.point.lng }); }, [marker.point]);
     var setHoveredDebounced = useCallback(debounce(setHovered, HIDE_DEBOUNCE_INTERVAL), []);
     var onMouseOver = useCallback(function () { return setHoveredDebounced(true); }, [setHoveredDebounced]);
     var onMouseOut = useCallback(function () { return setHoveredDebounced(false); }, [setHoveredDebounced]);
     var handleClick = useCallback(function () { return onClick(marker); }, [onClick, marker]);
+    var advancedMarkerRef = useRef(null);
+    var ref = useCallback(function (advancedMarker) {
+        clusterer === null || clusterer === void 0 ? void 0 : clusterer(advancedMarker, marker.id);
+        advancedMarkerRef.current = advancedMarker;
+    }, [clusterer, marker.id]);
+    var anchorEl = (_b = advancedMarkerRef.current) === null || _b === void 0 ? void 0 : _b.element;
     return (React.createElement(React.Fragment, null,
-        React.createElement(Popper, { anchorEl: popperAnchor.current, open: hovered, className: styles.popper, modal: false, placement: "top" },
-            React.createElement(ProfileCard, { entity: marker.entity, onMouseOver: onMouseOver, onMouseOut: onMouseOut })),
-        React.createElement(Marker, __assign({ icon: {
-                url: hovered || isActive ? hoveredMarkerIcon : markerIcon,
-                // needed for IE:
-                scaledSize: new google.maps.Size(MARKER_WIDTH, MARKER_HEIGHT) //eslint-disable-line
-            }, position: position, onClick: handleClick, visible: marker.visible !== false, onMouseOver: onMouseOver, onMouseOut: onMouseOut }, otherProps)),
-        React.createElement(InfoBox, { options: {
-                alignBottom: true,
-                pane: 'mapPane',
-                pixelOffset: new google.maps.Size(0, -(MARKER_HEIGHT + MARKER_CARD_MARGIN)), //eslint-disable-line
-                closeBoxURL: '',
-                enableEventPropagation: true,
-                disableAutoPan: true
-            }, position: position },
-            React.createElement("span", { ref: popperAnchor }))));
+        anchorEl && (React.createElement(Popper, { anchorEl: anchorEl, open: hovered, className: styles.popper, modal: false, placement: "top", modifiers: [
+                {
+                    name: 'offset',
+                    options: {
+                        offset: [0, MARKER_HEIGHT + MARKER_CARD_MARGIN]
+                    }
+                }
+            ] },
+            React.createElement(ProfileCard, { entity: marker.entity, onMouseOver: onMouseOver, onMouseOut: onMouseOut }))),
+        React.createElement(AdvancedMarker, __assign({ ref: ref, position: position, onClick: handleClick, onMouseEnter: onMouseOver, onMouseLeave: onMouseOut }, otherProps),
+            React.createElement("img", { "data-reltio-id": "marker-icon", src: hovered || isActive ? hoveredMarkerIcon : markerIcon }))));
 };
 export default memo(EntityMarker);

package/ReltioMap/components/EntityMarker/EntityMarker.spec.js

@@ -9,78 +9,163 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 import React from 'react';
-import { shallow, mount } from 'enzyme';
-import { Marker, InfoBox } from '@react-google-maps/api';
-import { ProfileCard } from '../../../ProfileCard';
-import { Popper } from '../../../Popper';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { svg2Url } from '@reltio/mdm-sdk';
 import EntityMarker from './EntityMarker';
-import { MARKER } from './icons/marker.inline.svg';
-import { HOVERED_MARKER } from './icons/marker-hover.inline.svg';
-import { setupGoogleMock } from '../../googleMock.test-data';
 import { EntityMarkerContext } from '../../../contexts/EntityMarkerContext';
-import { svg2Url, debounce } from '@reltio/mdm-sdk';
-import { rerenderWrapper } from '../../../test-utils';
-jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { debounce: jest.fn() })); });
-jest.mock('@react-google-maps/api', function () { return (__assign(__assign({}, jest.requireActual('@react-google-maps/api')), { Marker: jest.fn().mockImplementation(function () { return React.createElement("div", null); }), InfoBox: jest.fn().mockImplementation(function () { return React.createElement("div", null); }) })); });
-var markerUrl = svg2Url(MARKER);
-var hoveredMarkerUrl = svg2Url(HOVERED_MARKER);
-describe('EntityMarker tests', function () {
-    beforeEach(function () { return setupGoogleMock(); });
-    var markerProp = {
-        entity: { uri: '1' },
-        point: { lat: 1, lng: 2 }
+import { HOVERED_MARKER } from './icons/marker-hover.inline.svg';
+import { MARKER } from './icons/marker.inline.svg';
+import { MdmModuleProvider } from '../../../contexts/MdmModuleContext';
+jest.mock('@reltio/mdm-sdk', function () { return (__assign(__assign({}, jest.requireActual('@reltio/mdm-sdk')), { debounce: jest.fn(function (fn, _delay) { return jest.requireActual('@reltio/mdm-sdk').debounce(fn, 0); }) })); });
+jest.mock('@vis.gl/react-google-maps', function () {
+    // The only reason why all the mock stuff inlcuding 'requre' inside the jest.mock is that
+    // mocks with forwardRef doesn't work outside (in beforeEach/beforeAll)
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    var React = require('react');
+    var forwardRef = React.forwardRef, useRef = React.useRef, useImperativeHandle = React.useImperativeHandle;
+    // eslint-disable-next-line react/prop-types
+    var AdvancedMarker = forwardRef(function (_a, ref) {
+        var children = _a.children, onClick = _a.onClick, onMouseEnter = _a.onMouseEnter, onMouseLeave = _a.onMouseLeave;
+        var divRef = useRef(null);
+        useImperativeHandle(ref, function () { return ({
+            element: divRef.current
+        }); });
+        return (React.createElement("div", { ref: divRef, onClick: onClick, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave }, children));
+    });
+    AdvancedMarker.displayName = 'AdvancedMarker';
+    return __assign(__assign({}, jest.requireActual('@vis.gl/react-google-maps')), { AdvancedMarker: AdvancedMarker });
+});
+var hoveredMarkerIcon = svg2Url(HOVERED_MARKER);
+var markerIcon = svg2Url(MARKER);
+describe('EntityMarker', function () {
+    var mockMarker = {
+        id: 'someId',
+        label: 'Entity 123',
+        point: { lat: 10, lng: 20 },
+        entity: { uri: 'entities/123', label: 'Entity label 123', type: 'hcp' }
     };
-    it('should render main parts', function () {
-        var component = shallow(React.createElement(EntityMarker, { marker: markerProp }));
-        var popper = component.find(Popper);
-        expect(popper.length).toBe(1);
-        expect(popper.prop('open')).toBe(false);
-        var profileCard = popper.find(ProfileCard);
-        expect(profileCard.length).toBe(1);
-        expect(profileCard.prop('entity')).toBe(markerProp.entity);
-        var marker = component.find(Marker);
-        expect(marker.length).toBe(1);
-        expect(marker.prop('position')).toEqual(markerProp.point);
-        expect(marker.prop('icon')).toMatchObject({
-            url: markerUrl
-        });
-        var infoBox = component.find(InfoBox);
-        expect(infoBox.length).toBe(1);
-        expect(infoBox.prop('options').disableAutoPan).toBe(true);
-        expect(infoBox.prop('position')).toEqual(markerProp.point);
+    var mockOnClick = jest.fn();
+    var metadata = { entityTypes: [], relationTypes: [] };
+    var defaultProps = { marker: mockMarker, onClick: mockOnClick };
+    var setUp = function (props, contextValue) {
+        if (props === void 0) { props = defaultProps; }
+        if (contextValue === void 0) { contextValue = {}; }
+        var Providers = function (_a) {
+            var children = _a.children;
+            return (React.createElement(MdmModuleProvider, { values: { metadata: metadata } }, children));
+        };
+        return render(React.createElement(EntityMarkerContext.Provider, { value: contextValue },
+            React.createElement(EntityMarker, __assign({}, props))), { wrapper: Providers });
+    };
+    afterEach(function () {
+        jest.clearAllMocks();
     });
-    it('should show opened popper on marker mouse over and close it on mouse out', function () {
-        debounce.mockImplementation(function (cb) { return cb; });
-        var component = shallow(React.createElement(EntityMarker, { marker: markerProp }));
-        expect(component.find(Popper).prop('open')).toBe(false);
-        component.find(Marker).prop('onMouseOver')();
-        rerenderWrapper(component);
-        expect(component.find(Popper).prop('open')).toBe(true);
-        expect(component.find(Marker).prop('icon')).toMatchObject({
-            url: hoveredMarkerUrl
+    it('should render correctly', function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            setUp();
+            expect(screen.getByTestId('marker-icon')).toHaveAttribute('src', markerIcon);
+            return [2 /*return*/];
         });
-        component.find(Marker).prop('onMouseOut')();
-        rerenderWrapper(component);
-        expect(component.find(Popper).prop('open')).toBe(false);
-        expect(component.find(Marker).prop('icon')).toMatchObject({
-            url: markerUrl
+    }); });
+    it('should call onClick when marker is clicked', function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    setUp();
+                    return [4 /*yield*/, userEvent.click(screen.getByTestId('marker-icon'))];
+                case 1:
+                    _a.sent();
+                    expect(mockOnClick).toHaveBeenCalledWith(mockMarker);
+                    return [2 /*return*/];
+            }
         });
-        expect(debounce).toHaveBeenCalled();
-    });
-    it('should call "onClick" prop with marker on marker click', function () {
-        var onClick = jest.fn();
-        var component = shallow(React.createElement(EntityMarker, { marker: markerProp, onClick: onClick }));
-        expect(onClick).not.toHaveBeenCalled();
-        component.find(Marker).prop('onClick')();
-        expect(onClick).toHaveBeenCalledWith(markerProp);
-    });
-    it('should render hovered icon for marker if marker is active', function () {
-        var contextValue = { activeEntityUri: markerProp.entity.uri };
-        var component = mount(React.createElement(EntityMarkerContext.Provider, { value: contextValue },
-            React.createElement(EntityMarker, { marker: markerProp })));
-        expect(component.find(Marker).prop('icon')).toMatchObject({
-            url: hoveredMarkerUrl
+    }); });
+    it('should show ProfileCard on mouse enter and hide on mouse leave', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    setUp();
+                    return [4 /*yield*/, userEvent.hover(screen.getByTestId('marker-icon'))];
+                case 1:
+                    _b.sent();
+                    _a = expect;
+                    return [4 /*yield*/, screen.findByText(mockMarker.entity.label)];
+                case 2:
+                    _a.apply(void 0, [_b.sent()]).toBeInTheDocument();
+                    return [4 /*yield*/, userEvent.unhover(screen.getByTestId('marker-icon'))];
+                case 3:
+                    _b.sent();
+                    expect(screen.queryByText(mockMarker.entity.label)).not.toBeInTheDocument();
+                    return [2 /*return*/];
+            }
         });
-    });
+    }); });
+    it('should use hovered marker icon when hovered', function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    setUp();
+                    return [4 /*yield*/, userEvent.hover(screen.getByTestId('marker-icon'))];
+                case 1:
+                    _a.sent();
+                    expect(screen.getByTestId('marker-icon')).toHaveAttribute('src', hoveredMarkerIcon);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should use active marker icon when marker is active', function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            setUp(undefined, { activeEntityUri: mockMarker.entity.uri });
+            expect(screen.getByTestId('marker-icon')).toHaveAttribute('src', hoveredMarkerIcon);
+            return [2 /*return*/];
+        });
+    }); });
+    it('should call clusterer with advancedMarker and marker id', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var clusterer;
+        return __generator(this, function (_a) {
+            clusterer = jest.fn();
+            setUp(__assign(__assign({}, defaultProps), { clusterer: clusterer }));
+            expect(clusterer).toHaveBeenCalledWith(expect.objectContaining({ element: expect.any(HTMLElement) }), mockMarker.id);
+            return [2 /*return*/];
+        });
+    }); });
 });

package/ReltioMap/components/Polygon/Polygon.d.ts

@@ -0,0 +1,7 @@
+export declare const Polygon: import("react").ForwardRefExoticComponent<{
+    options: google.maps.PolygonOptions;
+} & {
+    onInit?: (polygon: google.maps.Polygon) => void;
+    onDragEnd?: (e: google.maps.MapMouseEvent) => void;
+    onMouseUp?: (e: google.maps.MapMouseEvent) => void;
+} & import("react").RefAttributes<google.maps.Polygon>>;

package/ReltioMap/components/Polygon/Polygon.js

@@ -0,0 +1,8 @@
+import { forwardRef, useImperativeHandle } from 'react';
+import { usePolygon } from './usePolygon';
+export var Polygon = forwardRef(function (props, ref) {
+    var polygon = usePolygon(props);
+    useImperativeHandle(ref, function () { return polygon; }, []);
+    return null;
+});
+Polygon.displayName = 'Polygon';

package/ReltioMap/components/Polygon/index.d.ts

@@ -0,0 +1 @@
+export { Polygon } from './Polygon';

package/ReltioMap/components/Polygon/index.js

@@ -0,0 +1 @@
+export { Polygon } from './Polygon';

package/ReltioMap/components/Polygon/usePolygon.d.ts

@@ -0,0 +1,10 @@
+type PolygonEventProps = {
+    onInit?: (polygon: google.maps.Polygon) => void;
+    onDragEnd?: (e: google.maps.MapMouseEvent) => void;
+    onMouseUp?: (e: google.maps.MapMouseEvent) => void;
+};
+export type PolygonProps = {
+    options: google.maps.PolygonOptions;
+} & PolygonEventProps;
+export declare const usePolygon: (props: PolygonProps) => google.maps.Polygon;
+export {};

package/ReltioMap/components/Polygon/usePolygon.js

@@ -0,0 +1,35 @@
+import { useEffect, useMemo } from 'react';
+import { useMap } from '@vis.gl/react-google-maps';
+export var usePolygon = function (props) {
+    var onInit = props.onInit, onDragEnd = props.onDragEnd, onMouseUp = props.onMouseUp, options = props.options;
+    var polygon = useMemo(function () { return new google.maps.Polygon(); }, []);
+    useEffect(function () {
+        polygon.setOptions(options);
+    }, [polygon, options]);
+    var map = useMap();
+    useEffect(function () {
+        if (!map)
+            return;
+        polygon.setMap(map);
+        if (onInit) {
+            onInit(polygon);
+        }
+        return function () {
+            polygon.setMap(null);
+        };
+    }, [map]);
+    useEffect(function () {
+        if (!polygon)
+            return;
+        if (onDragEnd) {
+            google.maps.event.addListener(polygon, 'dragend', onDragEnd);
+        }
+        if (onMouseUp) {
+            google.maps.event.addListener(polygon, 'mouseup', onMouseUp);
+        }
+        return function () {
+            google.maps.event.clearInstanceListeners(polygon);
+        };
+    }, [polygon, onDragEnd, onMouseUp]);
+    return polygon;
+};

package/ReltioMap/components/TopCenterMapControls/TopCenterMapControls.d.ts

@@ -1,7 +1,8 @@
 import React from 'react';
 type Props = {
+    className?: string;
     isSearchOnMapMove: boolean;
     onChangeIsSearchOnMapMove: (value: boolean) => void;
 };
-export declare const TopCenterMapControls: ({ isSearchOnMapMove, onChangeIsSearchOnMapMove }: Props) => React.JSX.Element;
+export declare const TopCenterMapControls: ({ className, isSearchOnMapMove, onChangeIsSearchOnMapMove }: Props) => React.JSX.Element;
 export {};

package/ReltioMap/components/TopCenterMapControls/TopCenterMapControls.js

@@ -4,13 +4,14 @@ import FormControlLabel from '@mui/material/FormControlLabel';
 import Checkbox from '@mui/material/Checkbox';
 import { useStyles } from './styles';
 export var TopCenterMapControls = function (_a) {
-    var isSearchOnMapMove = _a.isSearchOnMapMove, onChangeIsSearchOnMapMove = _a.onChangeIsSearchOnMapMove;
+    var className = _a.className, isSearchOnMapMove = _a.isSearchOnMapMove, onChangeIsSearchOnMapMove = _a.onChangeIsSearchOnMapMove;
     var styles = useStyles();
     var onChange = function (event) {
         onChangeIsSearchOnMapMove(event.target.checked);
     };
-    return (React.createElement(FormControlLabel, { classes: {
-            root: styles.container,
-            label: styles.label
-        }, control: React.createElement(Checkbox, { checked: isSearchOnMapMove, onChange: onChange, className: styles.checkbox }), label: i18n.text('Search as I move the map') }));
+    return (React.createElement("div", { className: className },
+        React.createElement(FormControlLabel, { classes: {
+                root: styles.container,
+                label: styles.label
+            }, control: React.createElement(Checkbox, { checked: isSearchOnMapMove, onChange: onChange, className: styles.checkbox }), label: i18n.text('Search as I move the map') })));
 };

package/ReltioMap/components/TopRightMapControls/TopRightMapControls.d.ts

@@ -38,11 +38,12 @@ export declare const ButtonWithTooltip: React.ForwardRefExoticComponent<Omit<{
     ref?: React.Ref<HTMLButtonElement>;
 }, "color" | "size" | "disabled" | "tabIndex" | "children" | "sx" | "action" | keyof import("@mui/material/OverridableComponent").CommonProps | "centerRipple" | "disableRipple" | "disableTouchRipple" | "focusRipple" | "focusVisibleClassName" | "LinkComponent" | "onFocusVisible" | "TouchRippleProps" | "touchRippleRef" | "disableFocusRipple" | "href" | "startIcon" | "disableElevation" | "endIcon" | "fullWidth" | "variant">, "ref"> & React.RefAttributes<HTMLElement>>;
 type Props = {
+    className?: string;
     onDrawingModeChanged: (value: DrawingMode | null) => void;
     drawingMode: DrawingMode | null;
     drawingModes: DrawingModes;
     hasActiveOverlay: boolean;
     onClearOverlay: () => void;
 };
-export declare const TopRightMapControls: ({ drawingMode, drawingModes, hasActiveOverlay, onDrawingModeChanged, onClearOverlay }: Props) => React.JSX.Element;
+export declare const TopRightMapControls: ({ className, drawingMode, drawingModes, hasActiveOverlay, onDrawingModeChanged, onClearOverlay }: Props) => React.JSX.Element;
 export {};

package/ReltioMap/components/TopRightMapControls/TopRightMapControls.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import classnames from 'classnames';
 import i18n from 'ui-i18n';
 import Button from '@mui/material/Button';
 import { withTooltip } from '../../../HOCs/withTooltip';
@@ -19,12 +20,12 @@ var getIcon = function (mode) {
     }
 };
 export var TopRightMapControls = function (_a) {
-    var drawingMode = _a.drawingMode, _b = _a.drawingModes, drawingModes = _b === void 0 ? [] : _b, hasActiveOverlay = _a.hasActiveOverlay, onDrawingModeChanged = _a.onDrawingModeChanged, onClearOverlay = _a.onClearOverlay;
+    var className = _a.className, drawingMode = _a.drawingMode, _b = _a.drawingModes, drawingModes = _b === void 0 ? [] : _b, hasActiveOverlay = _a.hasActiveOverlay, onDrawingModeChanged = _a.onDrawingModeChanged, onClearOverlay = _a.onClearOverlay;
     var styles = useStyles();
     var changeDrawingModeTo = function (drawingMode) { return function () {
         onDrawingModeChanged(drawingMode);
     }; };
-    return (React.createElement("div", { className: styles.container }, drawingMode || hasActiveOverlay ? (React.createElement(ButtonWithTooltip, { tooltipTitle: i18n.text('Clear area'), className: styles.button, onClick: hasActiveOverlay ? onClearOverlay : changeDrawingModeTo(null) },
+    return (React.createElement("div", { className: classnames(styles.container, className) }, drawingMode || hasActiveOverlay ? (React.createElement(ButtonWithTooltip, { tooltipTitle: i18n.text('Clear area'), className: styles.button, onClick: hasActiveOverlay ? onClearOverlay : changeDrawingModeTo(null) },
         React.createElement(HighlightOffIcon, { className: styles.icon }))) : (drawingModes.map(function (mode) {
         var Icon = getIcon(mode);
         return (React.createElement(ButtonWithTooltip, { tooltipTitle: i18n.text('Draw area'), key: mode, className: styles.button, onClick: changeDrawingModeTo(mode) },

package/ReltioMap/components/TopRightMapControls/styles.js

@@ -1,7 +1,7 @@
 import { makeStyles } from '@mui/styles';
 export var useStyles = makeStyles({
     container: {
-        margin: '2px',
+        padding: '2px',
         display: 'flex',
         alignItems: 'center'
     },

package/ReltioMap/helpers.d.ts

@@ -1,5 +1,6 @@
-import { DrawingMode, EntityMarker, Overlay, MapInstance } from './types';
+import { GeoPoint } from '@reltio/mdm-sdk';
+import { DrawingMode, Overlay, MapInstance } from './types';
 export declare const getMapBoundsPolygon: (map: MapInstance) => any[];
 export declare const getDrawingMode: (drawingMode: DrawingMode) => google.maps.drawing.OverlayType.CIRCLE | google.maps.drawing.OverlayType.POLYGON;
-export declare const fitMapBoundsForMarkers: (markers: EntityMarker[], map: MapInstance, overlay: Overlay) => void;
+export declare const fitMapBoundsForMarkers: (markers: GeoPoint[], map: MapInstance, overlay: Overlay) => void;
 export declare const fitMapBoundsForOverlay: (map: MapInstance, overlay: Overlay, existingBounds?: any) => void;

package/ReltioMap/types.d.ts

@@ -1,8 +1,11 @@
-import { GeoPoint } from '@reltio/mdm-sdk';
+import { Marker } from '@googlemaps/markerclusterer';
 export type DrawingMode = 'circle' | 'polygon';
 export type DrawingModes = DrawingMode[];
-export type EntityMarker = GeoPoint & {
-    visible?: boolean;
+export type ClusteredMarkersOptions = {
+    maxZoom?: number;
+    calculator?: (markers: Marker[]) => {
+        title: string;
+    };
 };
 export type OverlayPath = Array<{
     lat: number;

package/cjs/MapChart/components/Legend/styles.d.ts

@@ -2,5 +2,5 @@ type StylesProps = {
     colors: string[];
     width: number;
 };
-export declare const useStyles: (props: StylesProps) => import("@mui/styles").ClassNameMap<"alignBottom" | "legendContainer" | "alignTop" | "legendBar" | "legendLabel">;
+export declare const useStyles: (props: StylesProps) => import("@mui/styles").ClassNameMap<"legendContainer" | "alignTop" | "alignBottom" | "legendBar" | "legendLabel">;
 export {};

package/cjs/ProfileResizablePanes/styles.d.ts

@@ -1 +1 @@
-export declare const useStyles: (props?: any) => import("@mui/styles").ClassNameMap<"pane" | "resizablePanesWrapper">;
+export declare const useStyles: (props?: any) => import("@mui/styles").ClassNameMap<"resizablePanesWrapper" | "pane">;

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 {};