Skip to content

Fixes padding bug on chart #2650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benjaminleonard merged 2 commits into from
Jan 13, 2025
+55 −54
Merged

Fixes padding bug on chart #2650

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
314661b
Fixes padding bug on chart
benjaminleonard Jan 13, 2025
cddb9a0
Use TW classes
benjaminleonard Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 55 additions & 54 deletions app/components/TimeSeriesChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,59 +154,60 @@ export default function TimeSeriesChart({
const data = useMemo(() => rawData || [], [rawData])

return (
<ResponsiveContainer width="100%" height={300}>
<AreaChart
width={width}
height={height}
data={data}
margin={{ top: 0, right: 8, bottom: 16, left: 0 }}
className={cn(className, 'rounded-lg border border-default')}
>
<CartesianGrid stroke={GRID_GRAY} vertical={false} />
<XAxis
axisLine={{ stroke: GRID_GRAY }}
tickLine={{ stroke: GRID_GRAY }}
// TODO: show full given date range in the chart even if the data doesn't fill the range
domain={['auto', 'auto']}
dataKey="timestamp"
interval="preserveStart"
scale="time"
// TODO: use Date directly as x-axis values
type="number"
name="Time"
ticks={getTicks(data, 5)}
tickFormatter={isSameDay(startTime, endTime) ? shortTime : shortDateTime}
tick={textMonoMd}
tickMargin={8}
/>
<YAxis
axisLine={{ stroke: GRID_GRAY }}
tickLine={{ stroke: GRID_GRAY }}
orientation="right"
tick={textMonoMd}
tickMargin={8}
tickFormatter={yAxisTickFormatter}
padding={{ top: 32 }}
{...yTicks}
/>
{/* TODO: stop tooltip being focused by default on pageload if nothing else has been clicked */}
<Tooltip
isAnimationActive={false}
content={(props: TooltipProps<number, string>) => renderTooltip(props, unit)}
cursor={{ stroke: CURSOR_GRAY, strokeDasharray: '3,3' }}
wrapperStyle={{ outline: 'none' }}
/>
<Area
dataKey="value"
name={title}
type={interpolation}
stroke={GREEN_600}
fill={GREEN_400}
isAnimationActive={false}
dot={false}
activeDot={{ fill: GREEN_800, r: 3, strokeWidth: 0 }}
/>
</AreaChart>
</ResponsiveContainer>
<div className="h-[300px] w-full">
<ResponsiveContainer className={cn(className, 'rounded-lg border border-default')}>
<AreaChart
width={width}
height={height}
data={data}
margin={{ top: 0, right: 8, bottom: 16, left: 0 }}
>
<CartesianGrid stroke={GRID_GRAY} vertical={false} />
<XAxis
axisLine={{ stroke: GRID_GRAY }}
tickLine={{ stroke: GRID_GRAY }}
// TODO: show full given date range in the chart even if the data doesn't fill the range
domain={['auto', 'auto']}
dataKey="timestamp"
interval="preserveStart"
scale="time"
// TODO: use Date directly as x-axis values
type="number"
name="Time"
ticks={getTicks(data, 5)}
tickFormatter={isSameDay(startTime, endTime) ? shortTime : shortDateTime}
tick={textMonoMd}
tickMargin={8}
/>
<YAxis
axisLine={{ stroke: GRID_GRAY }}
tickLine={{ stroke: GRID_GRAY }}
orientation="right"
tick={textMonoMd}
tickMargin={8}
tickFormatter={yAxisTickFormatter}
padding={{ top: 32 }}
{...yTicks}
/>
{/* TODO: stop tooltip being focused by default on pageload if nothing else has been clicked */}
<Tooltip
isAnimationActive={false}
content={(props: TooltipProps<number, string>) => renderTooltip(props, unit)}
cursor={{ stroke: CURSOR_GRAY, strokeDasharray: '3,3' }}
wrapperStyle={{ outline: 'none' }}
/>
<Area
dataKey="value"
name={title}
type={interpolation}
stroke={GREEN_600}
fill={GREEN_400}
isAnimationActive={false}
dot={false}
activeDot={{ fill: GREEN_800, r: 3, strokeWidth: 0 }}
/>
</AreaChart>
</ResponsiveContainer>
</div>
)
}
Loading