🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor chart components to use `useNivoTheme` for theme management
Bill Yang4934b008e7e5
diff --git a/client/src/app/[site]/pages/components/PageSparklineChart.tsx b/client/src/app/[site]/pages/components/PageSparklineChart.tsxindex b631bd2c1..e6b9438f7 100644--- a/client/src/app/[site]/pages/components/PageSparklineChart.tsx+++ b/client/src/app/[site]/pages/components/PageSparklineChart.tsx@@ -2,11 +2,11 @@import { GetOverviewBucketedResponse } from "@/api/analytics/useGetOverviewBucketed";import { APIResponse } from "@/api/types";+import { ChartTooltip } from "@/components/charts/ChartTooltip";import { hour12, userLocale } from "@/lib/dateTimeUtils";-import { nivoTheme } from "@/lib/nivo";+import { useNivoTheme } from "@/lib/nivo";import { ResponsiveLine } from "@nivo/line";import { DateTime } from "luxon";-import { ChartTooltip } from "@/components/charts/ChartTooltip";interface PageSparklineChartProps {data: APIResponse<GetOverviewBucketedResponse> | undefined;@@ -16,6 +16,7 @@ interface PageSparklineChartProps {}export function PageSparklineChart({ data, isHovering, pageTitle, isLoading }: PageSparklineChartProps) {+ const nivoTheme = useNivoTheme();if (isLoading) {return (<div className="h-full w-full flex items-center justify-center animate-pulse">diff --git a/client/src/app/admin/components/shared/GrowthChart.tsx b/client/src/app/admin/components/shared/GrowthChart.tsxindex b568cd9b2..565514ebd 100644--- a/client/src/app/admin/components/shared/GrowthChart.tsx+++ b/client/src/app/admin/components/shared/GrowthChart.tsx@@ -3,7 +3,7 @@import { useMemo } from "react";import { ResponsiveLine } from "@nivo/line";import { parseUtcTimestamp, userLocale } from "@/lib/dateTimeUtils";-import { nivoTheme } from "@/lib/nivo";+import { useNivoTheme } from "@/lib/nivo";import { formatter } from "@/lib/utils";import { DateTime } from "luxon";import { useWindowSize } from "@uidotdev/usehooks";@@ -18,7 +18,7 @@ interface GrowthChartProps {export function GrowthChart({ data, color = "#3b82f6", title }: GrowthChartProps) {const { width } = useWindowSize();const maxTicks = Math.round((width ?? Infinity) / 200);-+ const nivoTheme = useNivoTheme();const chartData = useMemo(() => {if (!data || data.length === 0) return [];@@ -48,11 +48,19 @@ export function GrowthChart({ data, color = "#3b82f6", title }: GrowthChartProps}, [data]);if (data === undefined) {- return <div className="h-64 flex items-center justify-center text-neutral-500 dark:text-neutral-400 text-sm">Loading...</div>;+ return (+ <div className="h-64 flex items-center justify-center text-neutral-500 dark:text-neutral-400 text-sm">+ Loading...+ </div>+ );}if (!data || data.length === 0) {- return <div className="h-64 flex items-center justify-center text-neutral-500 dark:text-neutral-400 text-sm">No data available</div>;+ return (+ <div className="h-64 flex items-center justify-center text-neutral-500 dark:text-neutral-400 text-sm">+ No data available+ </div>+ );}return (@@ -73,7 +81,7 @@ export function GrowthChart({ data, color = "#3b82f6", title }: GrowthChartPropsstacked: false,reverse: false,}}- enableGridX={false}+ enableGridX={true}enableGridY={true}gridYValues={5}yFormat=" >-.0f"diff --git a/client/src/app/admin/components/shared/ServiceUsageChart.tsx b/client/src/app/admin/components/shared/ServiceUsageChart.tsxindex 3631b0918..9642a4fdf 100644--- a/client/src/app/admin/components/shared/ServiceUsageChart.tsx+++ b/client/src/app/admin/components/shared/ServiceUsageChart.tsx@@ -2,7 +2,7 @@import { useGetAdminServiceEventCount } from "@/api/admin/useGetAdminServiceEventCount";import { timeZone, userLocale } from "@/lib/dateTimeUtils";-import { nivoTheme } from "@/lib/nivo";+import { useNivoTheme } from "@/lib/nivo";import { formatter } from "@/lib/utils";import { ResponsiveLine } from "@nivo/line";import { useWindowSize } from "@uidotdev/usehooks";@@ -17,6 +17,7 @@ interface ServiceUsageChartProps {export function ServiceUsageChart({ startDate, endDate, title }: ServiceUsageChartProps) {const { width } = useWindowSize();+ const nivoTheme = useNivoTheme();// Fetch the data inside the componentconst { data, isLoading, error } = useGetAdminServiceEventCount({diff --git a/client/src/app/uptime/monitors/components/MonitorResponseTimeChart.tsx b/client/src/app/uptime/monitors/components/MonitorResponseTimeChart.tsxindex 4b8fd5e52..52d29c759 100644--- a/client/src/app/uptime/monitors/components/MonitorResponseTimeChart.tsx+++ b/client/src/app/uptime/monitors/components/MonitorResponseTimeChart.tsx@@ -1,18 +1,18 @@"use client";import { UptimeMonitor, useMonitorStats } from "@/api/uptime/monitors";+import { ChartTooltip } from "@/components/charts/ChartTooltip";import { Card, CardContent } from "@/components/ui/card";import { Skeleton } from "@/components/ui/skeleton";import { formatChartDateTime, hour12, userLocale } from "@/lib/dateTimeUtils";-import { nivoTheme } from "@/lib/nivo";import { cn } from "@/lib/utils";import { ResponsiveLine } from "@nivo/line";import { DateTime } from "luxon";import { useEffect, useState } from "react";+import { useNivoTheme } from "../../../../lib/nivo";import { UptimeBucketSelection } from "./UptimeBucketSelection";import { useUptimeStore } from "./uptimeStore";import { getHoursFromTimeRange } from "./utils";-import { ChartTooltip } from "@/components/charts/ChartTooltip";const MONITOR_COLORS = {dns: "hsl(160, 70%, 50%)",@@ -208,6 +208,7 @@ export function MonitorResponseTimeChart({return dt.toFormat(hour12 ? "MMM d" : "dd MMM");}};+ const nivoTheme = useNivoTheme();return (<Card className="overflow-visible">@@ -266,7 +267,7 @@ export function MonitorResponseTimeChart({<div className="h-[400px] w-full relative" style={{ overflow: "visible", zIndex: 10 }}><ResponsiveLinedata={data}- theme={{ ...nivoTheme }}+ theme={nivoTheme}margin={{ top: 10, right: 20, bottom: 25, left: 50 }}defs={defs}fill={fill}diff --git a/client/src/components/SiteSessionChart.tsx b/client/src/components/SiteSessionChart.tsxindex bdb10046d..c82610645 100644--- a/client/src/components/SiteSessionChart.tsx+++ b/client/src/components/SiteSessionChart.tsx@@ -1,10 +1,10 @@-import { nivoTheme } from "@/lib/nivo";+import { useNivoTheme } from "@/lib/nivo";import { ResponsiveLine } from "@nivo/line";import { DateTime } from "luxon";import { useMemo } from "react";import { GetOverviewBucketedResponse } from "../api/analytics/useGetOverviewBucketed";-import { formatter } from "../lib/utils";import { hour12 } from "../lib/dateTimeUtils";+import { formatter } from "../lib/utils";import { ChartTooltip } from "./charts/ChartTooltip";interface SiteSessionChartProps {@@ -31,6 +31,7 @@ export function SiteSessionChart({ data, height = 100 }: SiteSessionChartProps)},];}, [data]);+ const nivoTheme = useNivoTheme();return (<div style={{ height }}>diff --git a/client/src/lib/nivo.ts b/client/src/lib/nivo.tsindex a00fb3feb..b4db29df0 100644--- a/client/src/lib/nivo.ts+++ b/client/src/lib/nivo.ts@@ -54,6 +54,3 @@ export const useNivoTheme = (): PartialTheme => {const { resolvedTheme } = useTheme();return getNivoTheme(resolvedTheme === "dark");};--// Export default dark theme for backwards compatibility-export const nivoTheme: PartialTheme = getNivoTheme(true);