improve y axis annoyances on charts

This commit is contained in:
Henry Dollman
2024-08-06 20:23:59 -04:00
parent f4332d69d5
commit 2eb691661c
7 changed files with 28 additions and 33 deletions

View File

@@ -1,13 +1,7 @@
import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from 'recharts'
import { ChartContainer, ChartTooltip, ChartTooltipContent } from '@/components/ui/chart'
import {
chartTimeData,
cn,
formatShortDate,
toFixedWithoutTrailingZeros,
useYaxisWidth,
} from '@/lib/utils'
import { chartTimeData, cn, formatShortDate, toFixedFloat, useYaxisWidth } from '@/lib/utils'
import { useMemo, useRef } from 'react'
// import Spinner from '../spinner'
import { useStore } from '@nanostores/react'
@@ -21,20 +15,15 @@ export default function MemChart({
ticks: number[]
systemData: SystemStatsRecord[]
}) {
const chartTime = useStore($chartTime)
const chartRef = useRef<HTMLDivElement>(null)
const yAxisWidth = useYaxisWidth(chartRef)
const chartTime = useStore($chartTime)
const yAxisSet = useMemo(() => yAxisWidth !== 180, [yAxisWidth])
// const totalMem = useMemo(() => {
// const maxMem = Math.ceil(systemData[0]?.stats.m)
// return maxMem > 2 && maxMem % 2 !== 0 ? maxMem + 1 : maxMem
// }, [systemData])
// if (!systemData.length || !ticks.length) {
// return <Spinner />
// }
const totalMem = useMemo(() => {
return toFixedFloat(systemData.at(-1)?.stats.m ?? 0, 1)
}, [systemData])
return (
<div ref={chartRef}>
@@ -53,14 +42,17 @@ export default function MemChart({
}}
>
<CartesianGrid vertical={false} />
<YAxis
// use "ticks" instead of domain / tickcount if need more control
domain={[0, () => toFixedWithoutTrailingZeros(systemData.at(-1)?.stats.m ?? 0.04, 1)]}
width={yAxisWidth}
tickLine={false}
axisLine={false}
unit={' GB'}
/>
{totalMem && (
<YAxis
// use "ticks" instead of domain / tickcount if need more control
domain={[0, totalMem]}
className="tracking-tighter"
width={yAxisWidth}
tickLine={false}
axisLine={false}
unit={' GB'}
/>
)}
<XAxis
dataKey="created"
domain={[ticks[0], ticks.at(-1)!]}
@@ -93,8 +85,7 @@ export default function MemChart({
fill="hsl(var(--chart-2))"
fillOpacity={0.4}
stroke="hsl(var(--chart-2))"
stackId="a"
// animationDuration={1200}
stackId="1"
isAnimationActive={false}
/>
<Area
@@ -105,8 +96,7 @@ export default function MemChart({
fillOpacity={0.2}
strokeOpacity={0.3}
stroke="hsl(var(--chart-2))"
stackId="a"
// animationDuration={1200}
stackId="1"
isAnimationActive={false}
/>
</AreaChart>