🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor tooltip components for improved consistency and readability
Bill Yangcb639868d656
diff --git a/client/src/app/[site]/funnels/components/FunnelRow.tsx b/client/src/app/[site]/funnels/components/FunnelRow.tsxindex b85884295..c2b8e12a4 100644--- a/client/src/app/[site]/funnels/components/FunnelRow.tsx+++ b/client/src/app/[site]/funnels/components/FunnelRow.tsx@@ -117,50 +117,48 @@ export function FunnelRow({ funnel }: FunnelRowProps) {{index > 0 && (<ArrowRight className="h-3 w-3 mx-1 text-neutral-400" />)}- <TooltipProvider>- <Tooltip>- <TooltipTrigger asChild>- <span className="rounded bg-neutral-100 dark:bg-neutral-800 px-1.5 py-0.5 whitespace-nowrap overflow-hidden text-ellipsis flex items-center cursor-default">- {step.type === "page" ? (- <FileText className="h-3 w-3 mr-1 text-blue-400" />- ) : (- <MousePointerClick className="h-3 w-3 mr-1 text-amber-400" />+ <Tooltip>+ <TooltipTrigger asChild>+ <span className="rounded bg-neutral-100 dark:bg-neutral-800 px-1.5 py-0.5 whitespace-nowrap overflow-hidden text-ellipsis flex items-center cursor-default">+ {step.type === "page" ? (+ <FileText className="h-3 w-3 mr-1 text-blue-400" />+ ) : (+ <MousePointerClick className="h-3 w-3 mr-1 text-amber-400" />+ )}+ <span className="max-w-[120px] overflow-hidden text-ellipsis inline-block">+ {step.name || step.value}+ {step.type === "event" && step.eventPropertyKey && (+ <span className="text-xs text-yellow-400 ml-1">+ *+ </span>)}- <span className="max-w-[120px] overflow-hidden text-ellipsis inline-block">- {step.name || step.value}- {step.type === "event" && step.eventPropertyKey && (- <span className="text-xs text-yellow-400 ml-1">- *- </span>- )}- </span></span>- </TooltipTrigger>- <TooltipContent side="bottom" className="text-xs">+ </span>+ </TooltipTrigger>+ <TooltipContent side="bottom" className="text-xs">+ <div>+ <span className="font-semibold">+ {step.type === "page" ? "Page" : "Event"}:+ </span>{" "}+ {step.value}+ </div>+ {step.name && (<div>- <span className="font-semibold">- {step.type === "page" ? "Page" : "Event"}:- </span>{" "}- {step.value}+ <span className="font-semibold">Label:</span>{" "}+ {step.name}</div>- {step.name && (+ )}+ {step.type === "event" &&+ step.eventPropertyKey &&+ step.eventPropertyValue !== undefined && (<div>- <span className="font-semibold">Label:</span>{" "}- {step.name}+ <span className="font-semibold">Property:</span>{" "}+ {step.eventPropertyKey} ={" "}+ {String(step.eventPropertyValue)}</div>)}- {step.type === "event" &&- step.eventPropertyKey &&- step.eventPropertyValue !== undefined && (- <div>- <span className="font-semibold">Property:</span>{" "}- {step.eventPropertyKey} ={" "}- {String(step.eventPropertyValue)}- </div>- )}- </TooltipContent>- </Tooltip>- </TooltipProvider>+ </TooltipContent>+ </Tooltip></div>))}</div>diff --git a/client/src/app/[site]/main/components/sections/Weekdays.tsx b/client/src/app/[site]/main/components/sections/Weekdays.tsxindex 0b1f1dc11..387e8c90b 100644--- a/client/src/app/[site]/main/components/sections/Weekdays.tsx+++ b/client/src/app/[site]/main/components/sections/Weekdays.tsx@@ -21,17 +21,16 @@ import {import {Tooltip,TooltipContent,- TooltipProvider,TooltipTrigger,} from "../../../../../components/ui/tooltip";import { StatType, useStore } from "../../../../../lib/store";import { cn } from "../../../../../lib/utils";import {- shortDayNames,- longDayNames,- hourLabels,formatLocalTime,+ hourLabels,+ longDayNames,+ shortDayNames,} from "../../../../../lib/dateTimeUtils";export function Weekdays() {@@ -216,89 +215,85 @@ export function Weekdays() {</SelectContent></Select></div>- <TooltipProvider delayDuration={0}>- <div className="flex mt-1 p-2">- <div className="w-12">- {/* Empty top-left cell */}- <div className="h-5"></div>+ <div className="flex mt-1 p-2">+ <div className="w-12">+ {/* Empty top-left cell */}+ <div className="h-5"></div>- {/* Time labels - only display every other hour */}- {Array(24)- .fill(0)- .map((_, hour) => (- <div- key={hour}- className="h-4 text-xs flex items-center justify-end pr-2 text-neutral-400"- >- {hour % 2 === 1 ? hourLabels[hour] : ""}- </div>- ))}- </div>-- <div className="flex-1">- {/* Day labels */}- <div className="flex h-5">- {shortDayNames.map((day, i) => (- <div- key={i}- className="flex-1 text-center text-xs text-neutral-400"- >- {day}- </div>- ))}- </div>+ {/* Time labels - only display every other hour */}+ {Array(24)+ .fill(0)+ .map((_, hour) => (+ <div+ key={hour}+ className="h-4 text-xs flex items-center justify-end pr-2 text-neutral-400"+ >+ {hour % 2 === 1 ? hourLabels[hour] : ""}+ </div>+ ))}+ </div>- {/* Heatmap grid */}- {Array(24)- .fill(0)- .map((_, hour) => (- <div key={hour} className="flex h-4">- {Array(7)- .fill(0)- .map((_, day) => {- const value =- heatmapData &&- heatmapData.length > day &&- Array.isArray(heatmapData[day]) &&- heatmapData[day].length > hour- ? heatmapData[day][hour]- : 0;- const colorClass =- value > 0- ? getColorIntensity(value)- : "bg-neutral-800";- return (- <Tooltip key={day}>- <TooltipTrigger asChild>- <div- className={cn(- "flex-1 mx-0.5 hover:ring-1 hover:ring-emerald-300 transition-all rounded-sm my-0.5",- colorClass- )}- />- </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>- </Tooltip>- );- })}- </div>- ))}+ <div className="flex-1">+ {/* Day labels */}+ <div className="flex h-5">+ {shortDayNames.map((day, i) => (+ <div+ key={i}+ className="flex-1 text-center text-xs text-neutral-400"+ >+ {day}+ </div>+ ))}</div>++ {/* Heatmap grid */}+ {Array(24)+ .fill(0)+ .map((_, hour) => (+ <div key={hour} className="flex h-4">+ {Array(7)+ .fill(0)+ .map((_, day) => {+ const value =+ heatmapData &&+ heatmapData.length > day &&+ Array.isArray(heatmapData[day]) &&+ heatmapData[day].length > hour+ ? heatmapData[day][hour]+ : 0;+ const colorClass =+ value > 0 ? getColorIntensity(value) : "bg-neutral-800";+ return (+ <Tooltip key={day}>+ <TooltipTrigger asChild>+ <div+ className={cn(+ "flex-1 mx-0.5 hover:ring-1 hover:ring-emerald-300 transition-all rounded-sm my-0.5",+ colorClass+ )}+ />+ </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>+ </Tooltip>+ );+ })}+ </div>+ ))}</div>- </TooltipProvider>+ </div></CardContent></Card>);diff --git a/client/src/app/[site]/performance/components/shared/MetricTooltip.tsx b/client/src/app/[site]/performance/components/shared/MetricTooltip.tsxindex abd2e9882..5fc60be86 100644--- a/client/src/app/[site]/performance/components/shared/MetricTooltip.tsx+++ b/client/src/app/[site]/performance/components/shared/MetricTooltip.tsx@@ -1,7 +1,6 @@import {Tooltip,TooltipContent,- TooltipProvider,TooltipTrigger,} from "@/components/ui/tooltip";import { HelpCircle } from "lucide-react";@@ -69,34 +68,32 @@ export function MetricTooltip({ metric, children }: MetricTooltipProps) {const metricInfo = getMetricInfo(metric);return (- <TooltipProvider>- <Tooltip>- <TooltipTrigger asChild>- {children || (- <HelpCircle className="h-3 w-3 text-neutral-300 hover:text-neutral-100 cursor-help" />- )}- </TooltipTrigger>- <TooltipContent side="top" className="max-w-xs p-3">- <div className="space-y-2">- <div className="flex items-center justify-between">- <span className="text-xs font-medium text-neutral-400 uppercase tracking-wide">- {metricInfo.importance}- </span>- {metricInfo.importance === "Core Web Vital" && (- <div className="w-2 h-2 bg-blue-400 rounded-full"></div>- )}- </div>- <p className="text-sm text-neutral-200 leading-relaxed">- {metricInfo.description}+ <Tooltip>+ <TooltipTrigger asChild>+ {children || (+ <HelpCircle className="h-3 w-3 text-neutral-300 hover:text-neutral-100 cursor-help" />+ )}+ </TooltipTrigger>+ <TooltipContent side="top" className="max-w-xs p-3">+ <div className="space-y-2">+ <div className="flex items-center justify-between">+ <span className="text-xs font-medium text-neutral-400 uppercase tracking-wide">+ {metricInfo.importance}+ </span>+ {metricInfo.importance === "Core Web Vital" && (+ <div className="w-2 h-2 bg-blue-400 rounded-full"></div>+ )}+ </div>+ <p className="text-sm text-neutral-200 leading-relaxed">+ {metricInfo.description}+ </p>+ <div className="pt-1 border-t border-neutral-700">+ <p className="text-xs text-neutral-400 italic">+ {metricInfo.threshold}</p>- <div className="pt-1 border-t border-neutral-700">- <p className="text-xs text-neutral-400 italic">- {metricInfo.threshold}- </p>- </div></div>- </TooltipContent>- </Tooltip>- </TooltipProvider>+ </div>+ </TooltipContent>+ </Tooltip>);}diff --git a/client/src/app/[site]/users/page.tsx b/client/src/app/[site]/users/page.tsxindex 18152863f..7f8ad55f2 100644--- a/client/src/app/[site]/users/page.tsx+++ b/client/src/app/[site]/users/page.tsx@@ -113,25 +113,42 @@ export default function UsersPage() {columnHelper.accessor("user_id", {header: "User ID",cell: (info) => (- <div className="] truncate flex items-center gap-2 text-neutral-250">- <Avatar- size={20}- name={info.getValue() as string}- variant="marble"- colors={["#92A1C6", "#146A7C", "#F0AB3D", "#C271B4", "#C20D90"]}- />- {info.getValue().slice(0, 6)}- </div>+ <Link href={`/${site}/user/${info.getValue()}`}>+ <div className=" truncate flex items-center gap-2 text-neutral-250 hover:text-neutral-100 hover:underline">+ <Avatar+ size={20}+ name={info.getValue() as string}+ variant="marble"+ colors={["#92A1C6", "#146A7C", "#F0AB3D", "#C271B4", "#C20D90"]}+ />+ {info.getValue().slice(0, 6)}+ </div>+ </Link>),}),columnHelper.accessor("country", {header: "Country",- cell: (info) => (- <div className="flex items-center gap-2 whitespace-nowrap">- <CountryFlag country={info.getValue() || ""} />- {info.getValue() ? getCountryName(info.getValue()) : "Unknown"}- </div>- ),+ cell: (info) => {+ return (+ <div className="flex items-center gap-2 whitespace-nowrap">+ <Tooltip>+ <TooltipTrigger asChild>+ <CountryFlag country={info.getValue() || ""} />+ </TooltipTrigger>+ <TooltipContent>+ <p>+ {info.getValue()+ ? getCountryName(info.getValue())+ : "Unknown"}+ </p>+ </TooltipContent>+ </Tooltip>+ {info.row.original.city ||+ info.row.original.region ||+ getCountryName(info.getValue())}+ </div>+ );+ },}),columnHelper.accessor("browser", {header: "Browser",@@ -143,7 +160,7 @@ export default function UsersPage() {),}),columnHelper.accessor("operating_system", {- header: "Operating System",+ header: "OS",cell: (info) => (<div className="flex items-center gap-2 whitespace-nowrap"><OperatingSystem os={info.getValue() || ""} />@@ -152,7 +169,7 @@ export default function UsersPage() {),}),columnHelper.accessor("device_type", {- header: "Device Type",+ header: "Device",cell: (info) => {const deviceType = info.getValue();return (@@ -160,7 +177,6 @@ export default function UsersPage() {{deviceType === "Desktop" && <Monitor className="w-4 h-4" />}{deviceType === "Mobile" && <Smartphone className="w-4 h-4" />}{deviceType === "Tablet" && <Tablet className="w-4 h-4" />}- {deviceType || "Unknown"}</div>);},@@ -204,16 +220,14 @@ export default function UsersPage() {return (<div className="whitespace-nowrap">- <TooltipProvider>- <Tooltip>- <TooltipTrigger asChild>- <span>{relativeTime}</span>- </TooltipTrigger>- <TooltipContent>- <p>{formattedDate}</p>- </TooltipContent>- </Tooltip>- </TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <span>{relativeTime}</span>+ </TooltipTrigger>+ <TooltipContent>+ <p>{formattedDate}</p>+ </TooltipContent>+ </Tooltip></div>);},@@ -231,16 +245,14 @@ export default function UsersPage() {return (<div className="whitespace-nowrap">- <TooltipProvider>- <Tooltip>- <TooltipTrigger asChild>- <span>{relativeTime}</span>- </TooltipTrigger>- <TooltipContent>- <p>{formattedDate}</p>- </TooltipContent>- </Tooltip>- </TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <span>{relativeTime}</span>+ </TooltipTrigger>+ <TooltipContent>+ <p>{formattedDate}</p>+ </TooltipContent>+ </Tooltip></div>);},@@ -339,17 +351,17 @@ export default function UsersPage() {return (<trkey={row.id}- className="border-b border-neutral-800 hover:bg-neutral-800 cursor-pointer group"+ className="border-b border-neutral-800 group">{row.getVisibleCells().map((cell) => (<td key={cell.id} className="px-3 py-3 relative">- <Link+ {/* <Linkhref={href}className="absolute inset-0 z-10"aria-label={`View user ${userId}`}><span className="sr-only">View user details</span>- </Link>+ </Link> */}<span className="relative z-0">{flexRender(cell.column.columnDef.cell,diff --git a/client/src/components/CopyText.tsx b/client/src/components/CopyText.tsxindex e96876bcf..3c03c7977 100644--- a/client/src/components/CopyText.tsx+++ b/client/src/components/CopyText.tsx@@ -1,7 +1,6 @@import {Tooltip,TooltipContent,- TooltipProvider,TooltipTrigger,} from "@/components/ui/tooltip";import { cn } from "@/lib/utils";@@ -63,26 +62,27 @@ export function CopyText({</span>{showCopyButton && (- <TooltipProvider>- <Tooltip>- <TooltipTrigger asChild>- <button- onClick={handleCopy}- className={cn("p-1 rounded-md transition-colors text-gray-400 hover:text-gray-200 hover:bg-neutral-800 focus:outline-none", copyButtonClassName)}- aria-label="Copy to clipboard"- >- {copied ? (- <Check className="h-3.5 w-3.5 text-green-500" />- ) : (- <Copy className="h-3.5 w-3.5" />- )}- </button>- </TooltipTrigger>- <TooltipContent>- <p>{copied ? "Copied!" : tooltipText}</p>- </TooltipContent>- </Tooltip>- </TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <button+ onClick={handleCopy}+ className={cn(+ "p-1 rounded-md transition-colors text-gray-400 hover:text-gray-200 hover:bg-neutral-800 focus:outline-none",+ copyButtonClassName+ )}+ aria-label="Copy to clipboard"+ >+ {copied ? (+ <Check className="h-3.5 w-3.5 text-green-500" />+ ) : (+ <Copy className="h-3.5 w-3.5" />+ )}+ </button>+ </TooltipTrigger>+ <TooltipContent>+ <p>{copied ? "Copied!" : tooltipText}</p>+ </TooltipContent>+ </Tooltip>)}</div>);