Skip to content

Commit 5b188de

Browse files
committed
feat: add chart watermark for PNG and SVG prints
1 parent 50f253f commit 5b188de

1 file changed

Lines changed: 156 additions & 10 deletions

File tree

app/components/Package/DownloadAnalytics.vue

Lines changed: 156 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,16 @@ onMounted(async () => {
5555
})
5656
5757
const { colors } = useCssVariables(
58-
['--bg', '--fg', '--bg-subtle', '--bg-elevated', '--fg-subtle', '--border', '--border-subtle'],
58+
[
59+
'--bg',
60+
'--fg',
61+
'--bg-subtle',
62+
'--bg-elevated',
63+
'--fg-subtle',
64+
'--fg-muted',
65+
'--border',
66+
'--border-subtle',
67+
],
5968
{
6069
element: rootEl,
6170
watchHtmlAttributes: true,
@@ -784,6 +793,10 @@ const chartData = computed<{ dataset: VueUiXyDatasetItem[] | null; dates: number
784793
return { dataset, dates }
785794
})
786795
796+
const maxDatapoints = computed(() =>
797+
Math.max(0, ...(chartData.value.dataset ?? []).map(d => d.series.length)),
798+
)
799+
787800
/**
788801
* Maximum estimated value across all series when the chart is
789802
* displaying a partially completed time bucket (monthly or yearly).
@@ -1310,14 +1323,112 @@ function drawLastDatapointLabel(svg: Record<string, any>) {
13101323
return dataLabels.join('\n')
13111324
}
13121325
1326+
/**
1327+
* Build and return a legend to be injected during the SVG export only, since the custom legend is
1328+
* displayed as an independant div, content has to be injected within the chart's viewBox.
1329+
*
1330+
* Legend items are displayed in a column, on the top left of the chart.
1331+
*/
1332+
function drawSvgPrintLegend(svg: Record<string, any>) {
1333+
const data = Array.isArray(svg?.data) ? svg.data : []
1334+
if (!data.length) return ''
1335+
1336+
const seriesNames: string[] = []
1337+
1338+
data.forEach((serie, index) => {
1339+
seriesNames.push(`
1340+
<rect
1341+
x="${svg.drawingArea.left + 12}"
1342+
y="${svg.drawingArea.top + 24 * index - 7}"
1343+
width="12"
1344+
height="12"
1345+
fill="${serie.color}"
1346+
rx="3"
1347+
/>
1348+
<text
1349+
text-anchor="start"
1350+
dominant-baseline="middle"
1351+
x="${svg.drawingArea.left + 32}"
1352+
y="${svg.drawingArea.top + 24 * index}"
1353+
font-size="16"
1354+
fill="${colors.value.fg}"
1355+
stroke="${colors.value.bg}"
1356+
stroke-width="1"
1357+
paint-order="stroke fill"
1358+
>
1359+
${serie.name}
1360+
</text>
1361+
`)
1362+
})
1363+
1364+
// Inject the estimation legend item when necessary
1365+
if (
1366+
['monthly', 'yearly'].includes(displayedGranularity.value) &&
1367+
!isEndDateOnPeriodEnd.value &&
1368+
!isZoomed.value
1369+
) {
1370+
seriesNames.push(`
1371+
<line
1372+
x1="${svg.drawingArea.left + 12}"
1373+
y1="${svg.drawingArea.top + 24 * data.length}"
1374+
x2="${svg.drawingArea.left + 24}"
1375+
y2="${svg.drawingArea.top + 24 * data.length}"
1376+
stroke="${colors.value.fg}"
1377+
stroke-dasharray="4"
1378+
stroke-linecap="round"
1379+
/>
1380+
<text
1381+
text-anchor="start"
1382+
dominant-baseline="middle"
1383+
x="${svg.drawingArea.left + 32}"
1384+
y="${svg.drawingArea.top + 24 * data.length}"
1385+
font-size="16"
1386+
fill="${colors.value.fg}"
1387+
stroke="${colors.value.bg}"
1388+
stroke-width="1"
1389+
paint-order="stroke fill"
1390+
>
1391+
${$t('package.trends.legend_estimation')}
1392+
</text>
1393+
`)
1394+
}
1395+
1396+
return seriesNames.join('\n')
1397+
}
1398+
1399+
/**
1400+
* Build and return npmx svg logo and tagline, to be injected during PNG & SVG exports
1401+
*/
1402+
function drawNpmxLogoAndTaglineWatermark(svg: Record<string, any>) {
1403+
if (!svg?.drawingArea) return ''
1404+
const npmxLogoWidthToHeight = 2.64
1405+
const npmxLogoWidth = 100
1406+
const npmxLogoHeight = npmxLogoWidth / npmxLogoWidthToHeight
1407+
1408+
return `
1409+
<svg x="${svg.drawingArea.left + svg.drawingArea.width / 2 - npmxLogoWidth / 2 - 3}" y="${svg.height - npmxLogoHeight}" width="${npmxLogoWidth}" height="${npmxLogoHeight}" viewBox="0 0 330 125" fill="none" xmlns="http://www.w3.org/2000/svg">
1410+
<path d="M22.848 97V85.288H34.752V97H22.848ZM56.4105 107.56L85.5945 25H93.2745L64.0905 107.56H56.4105ZM121.269 97V46.12H128.661L128.949 59.08L127.989 58.216C128.629 55.208 129.781 52.744 131.445 50.824C133.173 48.84 135.221 47.368 137.589 46.408C139.957 45.448 142.453 44.968 145.077 44.968C148.981 44.968 152.213 45.832 154.773 47.56C157.397 49.288 159.381 51.624 160.725 54.568C162.069 57.448 162.741 60.68 162.741 64.264V97H154.677V66.568C154.677 61.832 153.749 58.248 151.893 55.816C150.037 53.32 147.189 52.072 143.349 52.072C140.725 52.072 138.357 52.648 136.245 53.8C134.133 54.888 132.437 56.52 131.157 58.696C129.941 60.808 129.333 63.432 129.333 66.568V97H121.269ZM173.647 111.4V46.12H181.135L181.327 57.64L180.175 57.064C181.455 53.096 183.568 50.088 186.512 48.04C189.519 45.992 192.976 44.968 196.88 44.968C201.936 44.968 206.064 46.216 209.264 48.712C212.528 51.208 214.928 54.472 216.464 58.504C218 62.536 218.767 66.888 218.767 71.56C218.767 76.232 218 80.584 216.464 84.616C214.928 88.648 212.528 91.912 209.264 94.408C206.064 96.904 201.936 98.152 196.88 98.152C194.256 98.152 191.792 97.704 189.487 96.808C187.247 95.912 185.327 94.664 183.727 93.064C182.191 91.464 181.135 89.576 180.559 87.4L181.711 86.056V111.4H173.647ZM196.111 90.472C200.528 90.472 203.984 88.808 206.48 85.48C209.04 82.152 210.319 77.512 210.319 71.56C210.319 65.608 209.04 60.968 206.48 57.64C203.984 54.312 200.528 52.648 196.111 52.648C193.167 52.648 190.607 53.352 188.431 54.76C186.319 56.168 184.655 58.28 183.439 61.096C182.287 63.912 181.711 67.4 181.711 71.56C181.711 75.72 182.287 79.208 183.439 82.024C184.591 84.84 186.255 86.952 188.431 88.36C190.607 89.768 193.167 90.472 196.111 90.472ZM222.57 97V46.12H229.962L230.25 57.448L229.29 57.256C229.866 53.48 231.082 50.504 232.938 48.328C234.858 46.088 237.29 44.968 240.234 44.968C243.242 44.968 245.546 46.056 247.146 48.232C248.81 50.408 249.834 53.608 250.218 57.832H249.258C249.834 53.864 251.114 50.728 253.098 48.424C255.146 46.12 257.706 44.968 260.778 44.968C264.874 44.968 267.85 46.376 269.706 49.192C271.562 52.008 272.49 56.68 272.49 63.208V97H264.426V64.36C264.426 59.816 263.946 56.648 262.986 54.856C262.026 53 260.522 52.072 258.474 52.072C257.13 52.072 255.946 52.52 254.922 53.416C253.898 54.248 253.066 55.592 252.426 57.448C251.85 59.304 251.562 61.672 251.562 64.552V97H243.498V64.36C243.498 60.008 243.018 56.872 242.058 54.952C241.162 53.032 239.658 52.072 237.546 52.072C236.202 52.072 235.018 52.52 233.994 53.416C232.97 54.248 232.138 55.592 231.498 57.448C230.922 59.304 230.634 61.672 230.634 64.552V97H222.57ZM276.676 97L295.396 70.888L277.636 46.12H287.044L300.388 65.32L313.444 46.12H323.044L305.38 71.08L323.908 97H314.5L300.388 76.456L286.276 97H276.676Z" fill="${colors.value.fg}"/>
1411+
</svg>
1412+
<text
1413+
fill="${colors.value.fgMuted}"
1414+
x="${svg.drawingArea.left + svg.drawingArea.width / 2}"
1415+
y="${svg.height - npmxLogoHeight - 6}"
1416+
font-size="12"
1417+
text-anchor="middle"
1418+
>
1419+
${$t('tagline')}
1420+
</text>
1421+
`
1422+
}
1423+
13131424
// VueUiXy chart component configuration
13141425
const chartConfig = computed(() => {
13151426
return {
13161427
theme: isDarkMode.value ? 'dark' : 'default',
13171428
chart: {
13181429
height: isMobile.value ? 950 : 600,
13191430
backgroundColor: colors.value.bg,
1320-
padding: { bottom: 36, right: 100 }, // padding right is set to leave space of last datapoint label(s)
1431+
padding: { bottom: displayedGranularity.value === 'yearly' ? 84 : 64, right: 100 }, // padding right is set to leave space of last datapoint label(s)
13211432
userOptions: {
13221433
buttons: { pdf: false, labels: false, fullscreen: false, table: false, tooltip: false },
13231434
buttonTitles: {
@@ -1356,6 +1467,7 @@ const chartConfig = computed(() => {
13561467
},
13571468
grid: {
13581469
stroke: colors.value.border,
1470+
showHorizontalLines: true,
13591471
labels: {
13601472
fontSize: isMobile.value ? 24 : 16,
13611473
color: pending.value ? colors.value.border : colors.value.fgSubtle,
@@ -1364,12 +1476,13 @@ const chartConfig = computed(() => {
13641476
granularity: getGranularityLabel(selectedGranularity.value),
13651477
facet: $t('package.trends.items.downloads'),
13661478
}),
1367-
xLabel: isMultiPackageMode.value ? '' : xAxisLabel.value, // for multiple series, names are displayed in the chart's legend
13681479
yLabelOffsetX: 12,
13691480
fontSize: isMobile.value ? 32 : 24,
13701481
},
13711482
xAxisLabels: {
1372-
show: false,
1483+
show: true,
1484+
showOnlyAtModulo: true,
1485+
modulo: 12,
13731486
values: chartData.value?.dates,
13741487
datetimeFormatter: {
13751488
enable: true,
@@ -1570,7 +1683,7 @@ const chartConfig = computed(() => {
15701683

15711684
<div role="region" aria-labelledby="download-analytics-title">
15721685
<ClientOnly v-if="chartData.dataset">
1573-
<div :data-pending="pending">
1686+
<div :data-pending="pending" :data-minimap-visible="maxDatapoints > 6">
15741687
<VueUiXy
15751688
:dataset="chartData.dataset"
15761689
:config="chartConfig"
@@ -1603,13 +1716,22 @@ const chartConfig = computed(() => {
16031716
v-html="drawLastDatapointLabel(svg)"
16041717
/>
16051718

1719+
<!-- Inject legend during SVG print only -->
1720+
<g v-if="svg.isPrintingSvg" v-html="drawSvgPrintLegend(svg)" />
1721+
1722+
<!-- Inject npmx logo & tagline during SVG and PNG print -->
1723+
<g
1724+
v-if="svg.isPrintingSvg || svg.isPrintingImg"
1725+
v-html="drawNpmxLogoAndTaglineWatermark(svg)"
1726+
/>
1727+
16061728
<!-- Overlay covering the chart area to hide line resizing when switching granularities recalculates VueUiXy scaleMax when estimation lines are necessary -->
16071729
<rect
16081730
v-if="pending"
16091731
:x="svg.drawingArea.left"
16101732
:y="svg.drawingArea.top - 12"
16111733
:width="svg.drawingArea.width + 12"
1612-
:height="svg.drawingArea.height + 24"
1734+
:height="svg.drawingArea.height + 48"
16131735
:fill="colors.bg"
16141736
/>
16151737
</template>
@@ -1623,10 +1745,7 @@ const chartConfig = computed(() => {
16231745
</template>
16241746

16251747
<!-- Custom legend for multiple series -->
1626-
<template
1627-
v-if="isMultiPackageMode || ['monthly', 'yearly'].includes(displayedGranularity)"
1628-
#legend="{ legend }"
1629-
>
1748+
<template #legend="{ legend }">
16301749
<div class="flex gap-4 flex-wrap justify-center">
16311750
<template v-if="isMultiPackageMode">
16321751
<button
@@ -1653,6 +1772,20 @@ const chartConfig = computed(() => {
16531772
</button>
16541773
</template>
16551774

1775+
<!-- Single series legend (no user interaction) -->
1776+
<template v-else>
1777+
<div class="flex gap-1 place-items-center">
1778+
<div class="h-3 w-3">
1779+
<svg viewBox="0 0 2 2" class="w-full">
1780+
<rect x="0" y="0" width="2" height="2" rx="0.3" :fill="legend[0].color" />
1781+
</svg>
1782+
</div>
1783+
<span>
1784+
{{ legend[0].name }}
1785+
</span>
1786+
</div>
1787+
</template>
1788+
16561789
<!-- Estimation extra legend item -->
16571790
<div
16581791
class="flex gap-1 place-items-center"
@@ -1802,4 +1935,17 @@ const chartConfig = computed(() => {
18021935
[data-pending='true'] .vue-data-ui-zoom {
18031936
opacity: 0.1;
18041937
}
1938+
1939+
[data-pending='true'] .vue-data-ui-time-label {
1940+
opacity: 0;
1941+
}
1942+
1943+
/** Override print watermark position to have it below the chart */
1944+
.vue-data-ui-watermark {
1945+
top: unset !important;
1946+
}
1947+
1948+
[data-minimap-visible='false'] .vue-data-ui-watermark {
1949+
top: calc(100% - 2rem) !important;
1950+
}
18051951
</style>

0 commit comments

Comments
 (0)