Skip to content

x-axis labels include years and are at the starts of months #79

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
NickGerleman merged 1 commit into from
May 21, 2025
Merged

x-axis labels include years and are at the starts of months #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/components/PackageCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ function maxDays(versionFilter: VersionFilter) {
}
}

function tickInterval(versionFilter: VersionFilter) {
function tickInterval(versionFilter: VersionFilter): "month" | number {
switch (versionFilter) {
case "major":
return 60;
return "month";
case "patch":
return 7;
case "prerelease":
Expand Down
50 changes: 36 additions & 14 deletions src/components/VersionDownloadChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ export type VersionDownloadChartProps = {
maxDaysShown?: number;

/**
* The number of days between ticks
* The number of days between ticks. Or "month" for ticks at the start of each month.
*/
tickInterval?: number;
tickInterval?: number | "month";

/**
* The maximum number of "popular" versions show (see below).
Expand Down Expand Up @@ -102,7 +102,7 @@ const VersionDownloadChart: React.FC<VersionDownloadChartProps> = ({
showTooltip,
unit,
versionLabeler,
tickInterval,
tickInterval = 7,
theme,
tooltipTheme,
}) => {
Expand Down Expand Up @@ -164,14 +164,28 @@ const VersionDownloadChart: React.FC<VersionDownloadChartProps> = ({
const firstDate = filteredHistory?.points[0]?.date;
const lastDate = filteredHistory?.points[lastDateIndex]?.date;

const msInDay = 1000 * 60 * 60 * 24;
const ticks: number[] = [];
for (
let date = firstDate ?? 0;
date <= (lastDate ?? 0);
date += msInDay * (tickInterval ?? 7)
) {
ticks.push(date);
if (tickInterval === "month") {
if (firstDate && lastDate) {
const currentDate = new Date(firstDate);
currentDate.setMonth(currentDate.getMonth() + 1);
currentDate.setDate(1);
currentDate.setHours(0, 0, 0, 0);

while (+currentDate <= lastDate) {
ticks.push(currentDate.getTime());
currentDate.setMonth(currentDate.getMonth() + 1);
}
}
} else {
const msInDay = 1000 * 60 * 60 * 24;
for (
let date = firstDate ?? 0;
date <= (lastDate ?? 0);
date += msInDay * tickInterval
) {
ticks.push(date);
}
}

return (
Expand All @@ -191,10 +205,18 @@ const VersionDownloadChart: React.FC<VersionDownloadChartProps> = ({
scale="time"
domain={["dataMin", "dataMax"]}
tickFormatter={(unixTime) =>
new Date(unixTime).toLocaleDateString("en-US", {
month: "short",
day: "numeric",
})
new Date(unixTime).toLocaleDateString(
"en-US",
tickInterval === "month"
? {
month: "short",
year: "numeric",
}
: {
month: "short",
day: "numeric",
}
)
}
/>
<YAxis
Expand Down
Loading