Fix ChartContainer CSS to work without ShadCN theme, match ShadCN bar chart exactly

- ChartContainer: replace stroke-border/fill-muted (ShadCN tokens we
  don't have) with var(--chart-grid) so recharts CSS overrides actually work
- Dashboard chart: remove YAxis (ShadCN interactive bar has none)
- Remove unused formatAxisValue, formatAxisDuration, tick calculations
- Exact ShadCN structure: CartesianGrid vertical={false}, XAxis with
  tickMargin/minTickGap, single Bar with fill var(--color-{metric})

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Usman Baig
2026-03-09 13:45:13 +01:00
parent 56225bb1ad
commit 0dfd0ccb3c
2 changed files with 12 additions and 58 deletions

View File

@@ -61,12 +61,10 @@ const ChartContainer = React.forwardRef<
data-chart={chartId} data-chart={chartId}
ref={ref} ref={ref}
className={cn( className={cn(
'[&_.recharts-cartesian-grid_line[stroke=\'#ccc\']]:stroke-border/50', "[&_.recharts-cartesian-grid_line[stroke='#ccc']]:stroke-[var(--chart-grid)]",
'[&_.recharts-curve.recharts-tooltip-cursor]:stroke-border', "[&_.recharts-curve.recharts-tooltip-cursor]:stroke-[var(--chart-grid)]",
'[&_.recharts-polar-grid_[stroke=\'#ccc\']]:stroke-border', "[&_.recharts-rectangle.recharts-tooltip-cursor]:fill-[var(--chart-grid)]",
'[&_.recharts-rectangle.recharts-tooltip-cursor]:fill-muted', "[&_.recharts-reference-line_[stroke='#ccc']]:stroke-[var(--chart-grid)]",
'[&_.recharts-reference-line_[stroke=\'#ccc\']]:stroke-border',
'[&_.recharts-sector[stroke=\'#fff\']]:stroke-transparent',
'[&_.recharts-sector]:outline-none', '[&_.recharts-sector]:outline-none',
'[&_.recharts-surface]:outline-none', '[&_.recharts-surface]:outline-none',
className, className,

View File

@@ -6,7 +6,6 @@ import {
BarChart, BarChart,
Bar, Bar,
XAxis, XAxis,
YAxis,
CartesianGrid, CartesianGrid,
ReferenceLine, ReferenceLine,
} from 'recharts' } from 'recharts'
@@ -105,20 +104,6 @@ function formatEU(dateStr: string): string {
return `${d}/${m}/${y}` return `${d}/${m}/${y}`
} }
function formatAxisValue(value: number): string {
if (value >= 1e6) return `${+(value / 1e6).toFixed(1)}M`
if (value >= 1000) return `${+(value / 1000).toFixed(1)}k`
if (!Number.isInteger(value)) return value.toFixed(1)
return String(value)
}
function formatAxisDuration(seconds: number): string {
if (!seconds) return '0s'
const m = Math.floor(seconds / 60)
const s = Math.floor(seconds % 60)
if (m > 0) return s > 0 ? `${m}m${s}s` : `${m}m`
return `${s}s`
}
function getPrevDateRangeLabel(dateRange: { start: string; end: string }): string { function getPrevDateRangeLabel(dateRange: { start: string; end: string }): string {
const startDate = new Date(dateRange.start) const startDate = new Date(dateRange.start)
@@ -408,21 +393,6 @@ export default function Chart({
const hasData = data.length > 0 const hasData = data.length > 0
const hasAnyNonZero = hasData && chartData.some((d) => (d[metric] as number) > 0) const hasAnyNonZero = hasData && chartData.some((d) => (d[metric] as number) > 0)
const isCountMetric = metric === 'visitors' || metric === 'pageviews'
// ─── X-Axis Ticks ─────────────────────────────────────────────────
const midnightTicks = interval === 'hour'
? (() => {
const t = chartData
.filter((_, i) => { const d = new Date(data[i].date); return d.getHours() === 0 && d.getMinutes() === 0 })
.map((c) => c.date)
return t.length > 0 ? t : undefined
})()
: undefined
const dayTicks = interval === 'day' && chartData.length > 0 ? chartData.map((c) => c.date) : undefined
// ─── Trend Badge ────────────────────────────────────────────────── // ─── Trend Badge ──────────────────────────────────────────────────
function TrendBadge({ trend, invert }: { trend: number | null; invert: boolean }) { function TrendBadge({ trend, invert }: { trend: number | null; invert: boolean }) {
@@ -565,9 +535,13 @@ export default function Chart({
<p className="text-sm text-neutral-400 dark:text-neutral-500">No {metricLabel.toLowerCase()} recorded</p> <p className="text-sm text-neutral-400 dark:text-neutral-500">No {metricLabel.toLowerCase()} recorded</p>
</div> </div>
) : ( ) : (
<div className="h-[250px] w-full" onContextMenu={handleChartContextMenu}> <div className="w-full" onContextMenu={handleChartContextMenu}>
<ChartContainer config={dashboardChartConfig} className="aspect-auto h-full w-full"> <ChartContainer config={dashboardChartConfig} className="aspect-auto h-[250px] w-full">
<BarChart accessibilityLayer data={chartData} margin={{ left: 12, right: 12 }}> <BarChart
accessibilityLayer
data={chartData}
margin={{ left: 12, right: 12 }}
>
<CartesianGrid vertical={false} /> <CartesianGrid vertical={false} />
<XAxis <XAxis
dataKey="date" dataKey="date"
@@ -576,18 +550,6 @@ export default function Chart({
tickMargin={8} tickMargin={8}
minTickGap={32} minTickGap={32}
/> />
<YAxis
tickLine={false}
axisLine={false}
tickMargin={8}
width={40}
allowDecimals={!isCountMetric}
tickFormatter={(val) => {
if (metric === 'bounce_rate') return `${val}%`
if (metric === 'avg_duration') return formatAxisDuration(val)
return formatAxisValue(val)
}}
/>
<ChartTooltip <ChartTooltip
content={ content={
<DashboardTooltipContent <DashboardTooltipContent
@@ -599,7 +561,6 @@ export default function Chart({
/> />
} }
/> />
{hasPrev && ( {hasPrev && (
<Bar <Bar
dataKey={metric === 'visitors' ? 'prevVisitors' : metric === 'pageviews' ? 'prevPageviews' : metric === 'bounce_rate' ? 'prevBounceRate' : 'prevAvgDuration'} dataKey={metric === 'visitors' ? 'prevVisitors' : metric === 'pageviews' ? 'prevPageviews' : metric === 'bounce_rate' ? 'prevBounceRate' : 'prevAvgDuration'}
@@ -607,12 +568,7 @@ export default function Chart({
fillOpacity={0.15} fillOpacity={0.15}
/> />
)} )}
<Bar dataKey={metric} fill={`var(--color-${metric})`} />
<Bar
dataKey={metric}
fill={`var(--color-${metric})`}
/>
{annotationMarkers.map((marker) => { {annotationMarkers.map((marker) => {
const primaryCategory = marker.annotations[0].category const primaryCategory = marker.annotations[0].category
const color = ANNOTATION_COLORS[primaryCategory] || ANNOTATION_COLORS.other const color = ANNOTATION_COLORS[primaryCategory] || ANNOTATION_COLORS.other