diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimePage.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimePage.tsx
index 6220c6957..d9933d0e6 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimePage.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimePage.tsx
@@ -50,7 +50,7 @@ export function RealtimePage({ websiteId }: { websiteId: string }) {
-
+
diff --git a/src/components/metrics/WorldMap.tsx b/src/components/metrics/WorldMap.tsx
index 3c8fadb80..5d843966d 100644
--- a/src/components/metrics/WorldMap.tsx
+++ b/src/components/metrics/WorldMap.tsx
@@ -1,11 +1,12 @@
import { Column, type ColumnProps, FloatingTooltip, useTheme } from '@umami/react-zen';
import { colord } from 'colord';
-import { useMemo, useState } from 'react';
+import { useMemo, useRef, useState } from 'react';
import { ComposableMap, Geographies, Geography, ZoomableGroup } from 'react-simple-maps';
import {
useCountryNames,
useLocale,
useMessages,
+ useNavigation,
useWebsiteMetricsQuery,
} from '@/components/hooks';
import { getThemeColors } from '@/lib/colors';
@@ -16,15 +17,19 @@ import { formatLongNumber } from '@/lib/format';
export interface WorldMapProps extends ColumnProps {
websiteId?: string;
data?: any[];
+ allowFilter?: boolean;
}
-export function WorldMap({ websiteId, data, ...props }: WorldMapProps) {
+export function WorldMap({ websiteId, data, allowFilter = true, ...props }: WorldMapProps) {
const [tooltip, setTooltipPopup] = useState();
const { theme } = useTheme();
const { colors } = getThemeColors(theme);
const { locale } = useLocale();
const { formatMessage, labels } = useMessages();
const { countryNames } = useCountryNames(locale);
+ const { router, updateParams, query } = useNavigation();
+ const pointerRef = useRef<{ x: number; y: number }>(null);
+ const selectedCountry = allowFilter ? query.country?.replace(/^eq\./, '') || null : null;
const visitorsLabel = formatMessage(labels.visitors).toLocaleLowerCase(locale);
const unknownLabel = formatMessage(labels.unknown);
@@ -37,10 +42,18 @@ export function WorldMap({ websiteId, data, ...props }: WorldMapProps) {
[data, mapData],
);
+ const isSelected = (code: string) => {
+ return Boolean(code) && code === selectedCountry;
+ };
+
const getFillColor = (code: string) => {
if (code === 'AQ') return;
const country = metrics?.find(({ x }) => x === code);
+ if (isSelected(code)) {
+ return colors.map.baseColor;
+ }
+
if (!country) {
return colors.map.fillColor;
}
@@ -54,6 +67,10 @@ export function WorldMap({ websiteId, data, ...props }: WorldMapProps) {
return code === 'AQ' ? 0 : 1;
};
+ const isClickable = (code: string) => {
+ return Boolean(allowFilter && code && code !== 'AQ');
+ };
+
const handleHover = (code: string) => {
if (code === 'AQ') return;
const country = metrics?.find(({ x }) => x === code);
@@ -64,6 +81,26 @@ export function WorldMap({ websiteId, data, ...props }: WorldMapProps) {
);
};
+ const handlePointerDown = (e: { clientX: number; clientY: number }) => {
+ pointerRef.current = { x: e.clientX, y: e.clientY };
+ };
+
+ const handleClick = (code: string, e: { clientX: number; clientY: number }) => {
+ if (!isClickable(code)) return;
+
+ // ignore clicks that are the end of a pan/drag on the map
+ const start = pointerRef.current;
+ pointerRef.current = null;
+
+ if (start && Math.abs(e.clientX - start.x) + Math.abs(e.clientY - start.y) > 4) {
+ return;
+ }
+
+ router.replace(updateParams({ country: code === selectedCountry ? undefined : `eq.${code}` }), {
+ scroll: false,
+ });
+ };
+
return (
{
return geographies.map(geo => {
const code = ISO_COUNTRIES[geo.id];
+ const cursor = isClickable(code) ? 'pointer' : 'default';
return (
handleHover(code)}
onMouseOut={() => setTooltipPopup(null)}
+ onMouseDown={handlePointerDown}
+ onClick={(e: any) => handleClick(code, e)}
/>
);
});