Skip to content

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

Enhance Chart tooltip and MainSection user toggle functionality

Bill Yang1bfb190679b1
diff --git a/client/src/app/[site]/main/components/MainSection/Chart.tsx b/client/src/app/[site]/main/components/MainSection/Chart.tsx
index 3fe0b4d20..e2d3256ff 100644
--- a/client/src/app/[site]/main/components/MainSection/Chart.tsx
+++ b/client/src/app/[site]/main/components/MainSection/Chart.tsx
@@ -461,7 +461,7 @@ export function Chart({
return (
<ChartTooltip>
- {rows.map((row: any, idx: number) => (
+ {rows.toReversed().map((row: any, idx: number) => (
<div key={row.id} className={idx < rows.length - 1 ? "pb-0.5 mb-1.5" : ""}>
<div className={`px-2 text-xs font-semibold text-muted-foreground ${idx === 0 ? "pt-2" : ""}`}>
{row.label}
diff --git a/client/src/app/[site]/main/components/MainSection/MainSection.tsx b/client/src/app/[site]/main/components/MainSection/MainSection.tsx
index ae8c17ee6..c03dde38f 100644
--- a/client/src/app/[site]/main/components/MainSection/MainSection.tsx
+++ b/client/src/app/[site]/main/components/MainSection/MainSection.tsx
@@ -1,6 +1,6 @@
"use client";
import { Card, CardContent, CardLoader } from "@/components/ui/card";
-import { Filter } from "lucide-react";
+import { User, Users } from "lucide-react";
import { Tilt_Warp } from "next/font/google";
import Link from "next/link";
import { useGetOverview } from "../../../../../api/analytics/useGetOverview";
@@ -8,6 +8,7 @@ import { useGetOverviewBucketed } from "../../../../../api/analytics/useGetOverv
import { BucketSelection } from "../../../../../components/BucketSelection";
import { RybbitLogo } from "../../../../../components/RybbitLogo";
import { Button } from "../../../../../components/ui/button";
+import { Tooltip, TooltipContent, TooltipTrigger } from "../../../../../components/ui/tooltip";
import { authClient } from "../../../../../lib/auth";
import { useStore } from "../../../../../lib/store";
import { cn } from "../../../../../lib/utils";
@@ -99,9 +100,16 @@ export function MainSection() {
<div className="flex items-center gap-2 md:justify-end">
{selectedStat === "users" && (
<div className="flex items-center gap-2 text-xs text-muted-foreground">
- <Button variant="default" size="smIcon" onClick={() => setShowUsersSplit(!showUsersSplit)}>
- <Filter />
- </Button>
+ <Tooltip>
+ <TooltipTrigger>
+ <Button variant="default" size="smIcon" onClick={() => setShowUsersSplit(!showUsersSplit)}>
+ {showUsersSplit ? <Users /> : <User />}
+ </Button>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>{showUsersSplit ? "Hide new vs returning users" : "Show new vs returning users"}</p>
+ </TooltipContent>
+ </Tooltip>
</div>
)}
<BucketSelection />