Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Enhance map and analytics components with improved tooltips and data handling

Bill Yang790800cf3419
diff --git a/client/src/app/[site]/components/shared/Map/MapComponent.tsx b/client/src/app/[site]/components/shared/Map/MapComponent.tsx
index 5c2ab532c..ad0ba630d 100644
--- a/client/src/app/[site]/components/shared/Map/MapComponent.tsx
+++ b/client/src/app/[site]/components/shared/Map/MapComponent.tsx
@@ -5,6 +5,7 @@ import "ol/ol.css";
import { useEffect, useState } from "react";
import { useMetric } from "../../../../../api/analytics/useGetMetric";
import { useCountries, useSubdivisions } from "../../../../../lib/geo";
+import { ChartTooltip } from "../../../../../components/charts/ChartTooltip";
import { CountryFlag } from "../icons/CountryFlag";
import { useMapInstance } from "./hooks/useMapInstance";
import { useMapLayers } from "./hooks/useMapLayers";
@@ -107,21 +108,25 @@ export function MapComponent({ height, mapView: controlledMapView }: MapComponen
/>
{tooltipContent && (
<div
- className="fixed z-50 bg-neutral-1000 text-white rounded-md p-2 shadow-lg text-sm pointer-events-none"
+ className="fixed z-50 pointer-events-none"
style={{
left: tooltipPosition.x,
top: tooltipPosition.y - 10,
transform: "translate(-50%, -100%)",
}}
>
- <div className="font-sm flex items-center gap-1">
- {tooltipContent.code && <CountryFlag country={tooltipContent.code.slice(0, 2)} />}
- {tooltipContent.name}
- </div>
- <div>
- <span className="font-bold text-accent-400">{tooltipContent.count.toLocaleString()}</span>{" "}
- <span className="text-neutral-300">({tooltipContent.percentage.toFixed(1)}%) sessions</span>
- </div>
+ <ChartTooltip>
+ <div className="p-2">
+ <div className="font-sm flex items-center gap-1">
+ {tooltipContent.code && <CountryFlag country={tooltipContent.code.slice(0, 2)} />}
+ {tooltipContent.name}
+ </div>
+ <div>
+ <span className="font-bold text-accent-400">{tooltipContent.count.toLocaleString()}</span>{" "}
+ <span className="text-neutral-500 dark:text-neutral-300">({tooltipContent.percentage.toFixed(1)}%) sessions</span>
+ </div>
+ </div>
+ </ChartTooltip>
</div>
)}
</div>
diff --git a/client/src/app/[site]/components/shared/Map/hooks/useMapInstance.ts b/client/src/app/[site]/components/shared/Map/hooks/useMapInstance.ts
index 8700bb967..231f4aad8 100644
--- a/client/src/app/[site]/components/shared/Map/hooks/useMapInstance.ts
+++ b/client/src/app/[site]/components/shared/Map/hooks/useMapInstance.ts
@@ -30,12 +30,22 @@ export function useMapInstance({
const mapRef = useRef<HTMLDivElement>(null);
const mapInstanceRef = useRef<Map | null>(null);
const mapViewRef = useRef<"countries" | "subdivisions">(mapView);
+ const countryDataRef = useRef<ProcessedData[] | null>(countryData);
+ const subdivisionDataRef = useRef<ProcessedData[] | null>(subdivisionData);
- // Update mapView ref when it changes
+ // Update refs when values change
useEffect(() => {
mapViewRef.current = mapView;
}, [mapView]);
+ useEffect(() => {
+ countryDataRef.current = countryData;
+ }, [countryData]);
+
+ useEffect(() => {
+ subdivisionDataRef.current = subdivisionData;
+ }, [subdivisionData]);
+
// Initialize map
useEffect(() => {
if (!mapRef.current) return;
@@ -77,7 +87,7 @@ export function useMapInstance({
setHoveredId(code);
- const dataToUse = isCountryView ? countryData : subdivisionData;
+ const dataToUse = isCountryView ? countryDataRef.current : subdivisionDataRef.current;
const foundData = dataToUse?.find(({ value }) => value === code);
const count = foundData?.count || 0;
const percentage = foundData?.percentage || 0;
diff --git a/client/src/app/[site]/main/components/sections/Pages.tsx b/client/src/app/[site]/main/components/sections/Pages.tsx
index 06ef85ea4..ad244f9c7 100644
--- a/client/src/app/[site]/main/components/sections/Pages.tsx
+++ b/client/src/app/[site]/main/components/sections/Pages.tsx
@@ -8,6 +8,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from "../../../../../compone
import { Button } from "../../../../../components/ui/button";
import { Card, CardContent } from "../../../../../components/ui/card";
import { StandardSection } from "../../../components/shared/StandardSection/StandardSection";
+import { truncateString } from "../../../../../lib/utils";
type Tab = "pages" | "page_title" | "entry_pages" | "exit_pages" | "hostname";
@@ -45,7 +46,7 @@ export function Pages() {
title="Pages"
getValue={e => e.value}
getKey={e => e.value}
- getLabel={e => e.value || "Other"}
+ getLabel={e => truncateString(e.value, 50) || "Other"}
getLink={e => `https://${siteMetadata?.domain}${e.value}`}
expanded={expanded}
close={close}
@@ -57,7 +58,7 @@ export function Pages() {
title="Page Title"
getValue={e => e.value}
getKey={e => e.value}
- getLabel={e => e.value || "Other"}
+ getLabel={e => truncateString(e.value, 50) || "Other"}
// getLink={(e) =>
// e.pathname
// ? `https://${siteMetadata?.domain}${e.pathname}`
diff --git a/client/src/app/[site]/main/components/sections/Weekdays.tsx b/client/src/app/[site]/main/components/sections/Weekdays.tsx
index 7f67d4ef4..aa64b4077 100644
--- a/client/src/app/[site]/main/components/sections/Weekdays.tsx
+++ b/client/src/app/[site]/main/components/sections/Weekdays.tsx
@@ -1,6 +1,7 @@
import { DateTime } from "luxon";
import { useMemo, useState } from "react";
import { useGetOverviewBucketed } from "../../../../../api/analytics/useGetOverviewBucketed";
+import { ChartTooltip } from "../../../../../components/charts/ChartTooltip";
import { Tabs, TabsList, TabsTrigger } from "../../../../../components/ui/basic-tabs";
import { Card, CardContent, CardLoader } from "../../../../../components/ui/card";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "../../../../../components/ui/select";
@@ -214,14 +215,18 @@ export function Weekdays() {
)}
/>
</TooltipTrigger>
- <TooltipContent className="flex flex-col gap-1 p-2">
- <div className="font-medium text-sm">
- {longDayNames[day]} {formatLocalTime(hour, 0)} - {formatLocalTime(hour, 59)}
- </div>
- <div className="flex items-center gap-2">
- <span className="font-semibold">{formatMetricValue(value)}</span>
- <span className="text-neutral-400 text-xs">{getMetricDisplayName(metric)}</span>
- </div>
+ <TooltipContent className="p-0 border-0 bg-transparent">
+ <ChartTooltip>
+ <div className="flex flex-col gap-1 p-2">
+ <div className="font-medium text-sm">
+ {longDayNames[day]} {formatLocalTime(hour, 0)} - {formatLocalTime(hour, 59)}
+ </div>
+ <div className="flex items-center gap-2">
+ <span className="font-semibold">{formatMetricValue(value)}</span>
+ <span className="text-neutral-500 dark:text-neutral-400 text-xs">{getMetricDisplayName(metric)}</span>
+ </div>
+ </div>
+ </ChartTooltip>
</TooltipContent>
</Tooltip>
);
diff --git a/client/src/app/[site]/retention/RetentionChart.tsx b/client/src/app/[site]/retention/RetentionChart.tsx
index 313804fef..e206bda40 100644
--- a/client/src/app/[site]/retention/RetentionChart.tsx
+++ b/client/src/app/[site]/retention/RetentionChart.tsx
@@ -3,10 +3,11 @@
import { useNivoTheme } from "@/lib/nivo";
import { ResponsiveLine } from "@nivo/line";
import { DateTime } from "luxon";
+import { useTheme } from "next-themes";
import { useMemo } from "react";
import { ProcessedRetentionData, RetentionMode } from "../../../api/analytics/useGetRetention";
+import { ChartTooltip } from "../../../components/charts/ChartTooltip";
import { Skeleton } from "../../../components/ui/skeleton";
-import { useTheme } from "next-themes";
interface RetentionChartProps {
data: ProcessedRetentionData | undefined;
@@ -125,7 +126,7 @@ export function RetentionChart({ data, isLoading, mode }: RetentionChartProps) {
);
return (
- <div className="h-[400px]">
+ <div className="h-[400px] overflow-visible">
<ResponsiveLine
data={chartData}
theme={nivoTheme}
@@ -216,17 +217,19 @@ export function RetentionChart({ data, isLoading, mode }: RetentionChartProps) {
}
return (
- <div className="text-sm bg-neutral-150 dark:bg-neutral-850 p-2 rounded-md border border-neutral-300 dark:border-neutral-800 shadow-md">
- <div className="font-medium mb-1" style={{ color: point.seriesColor }}>
- Cohort: {cohortDateDisplay}
- </div>
- <div className="flex justify-between w-48 text-neutral-700 dark:text-neutral-200">
- <span>
- {mode === "day" ? "Day" : "Week"} {xValue}
- </span>
- <span className="font-medium">{value !== null ? `${value.toFixed(1)}%` : "-"}</span>
+ <ChartTooltip>
+ <div className="p-2 text-sm">
+ <div className="font-medium mb-1" style={{ color: point.seriesColor }}>
+ Cohort: {cohortDateDisplay}
+ </div>
+ <div className="flex justify-between w-48 text-neutral-700 dark:text-neutral-200">
+ <span>
+ {mode === "day" ? "Day" : "Week"} {xValue}
+ </span>
+ <span className="font-medium">{value !== null ? `${value.toFixed(1)}%` : "-"}</span>
+ </div>
</div>
- </div>
+ </ChartTooltip>
);
}}
/>
diff --git a/client/src/app/[site]/retention/page.tsx b/client/src/app/[site]/retention/page.tsx
index 20ce81ad9..2f1ff1086 100644
--- a/client/src/app/[site]/retention/page.tsx
+++ b/client/src/app/[site]/retention/page.tsx
@@ -201,11 +201,11 @@ export default function RetentionPage() {
<div className="p-2 md:p-4 max-w-[1300px] mx-auto flex flex-col gap-3">
{/* Single Card containing both chart and grid */}
<FilterControls />
- <Card>
+ <Card className="overflow-visible">
<CardHeader className="flex flex-row items-center justify-between pb-2">
<CardTitle>Retention</CardTitle>
</CardHeader>
- <CardContent className="space-y-6">
+ <CardContent className="space-y-6 overflow-visible">
{isLoading ? (
<ThreeDotLoader />
) : data ? (