diff --git a/apps/frontend/package.json b/apps/frontend/package.json
index de02fd26a3..004db098c8 100644
--- a/apps/frontend/package.json
+++ b/apps/frontend/package.json
@@ -54,6 +54,7 @@
 		"@vueuse/core": "^11.1.0",
 		"ace-builds": "^1.36.2",
 		"ansi-to-html": "^0.7.2",
+		"chart.js": "^4.5.1",
 		"dayjs": "^1.11.7",
 		"dompurify": "^3.1.7",
 		"floating-vue": "^5.2.2",
diff --git a/apps/frontend/src/components/analytics/AnalyticsDashboard.vue b/apps/frontend/src/components/analytics/AnalyticsDashboard.vue
new file mode 100644
index 0000000000..f304a36c78
--- /dev/null
+++ b/apps/frontend/src/components/analytics/AnalyticsDashboard.vue
@@ -0,0 +1,70 @@
+<template>
+	<div class="flex flex-col gap-4 pb-20 lg:pl-4 lg:pt-1.5">
+		<div class="flex flex-col gap-2">
+			<div class="flex items-center justify-between gap-2">
+				<span class="text-xl font-semibold text-contrast md:text-2xl">Analytics</span>
+				<div class="flex flex-wrap items-center justify-end gap-2">
+					<ButtonStyled type="transparent">
+						<button
+							type="button"
+							:disabled="isAnalyticsQueryBuilderDefault"
+							@click="resetAnalyticsQueryBuilder"
+						>
+							Reset
+						</button>
+					</ButtonStyled>
+					<ButtonStyled type="outlined">
+						<button
+							type="button"
+							:disabled="projects.length === 0 || !fetchRequest || isRefetching"
+							@click="refreshAnalyticsQuery"
+						>
+							<RefreshCwIcon :class="isRefetching ? 'animate-spin' : ''" />
+							Refresh
+						</button>
+					</ButtonStyled>
+				</div>
+			</div>
+			<QueryBuilder />
+		</div>
+		<StatCards />
+		<AnalyticsGraph />
+		<AnalyticsTable />
+	</div>
+</template>
+
+<script setup lang="ts">
+import { RefreshCwIcon } from '@modrinth/assets'
+import { ButtonStyled, injectProjectPageContext } from '@modrinth/ui'
+
+import {
+	createAnalyticsDashboardContext,
+	provideAnalyticsDashboardContext,
+} from '~/providers/analytics/analytics'
+import { injectOrganizationContext } from '~/providers/organization-context'
+
+import AnalyticsGraph from './graph/AnalyticsGraph.vue'
+import QueryBuilder from './query-builder/QueryBuilder.vue'
+import StatCards from './stat-cards/StatCards.vue'
+import AnalyticsTable from './table/AnalyticsTable.vue'
+
+const auth = await useAuth()
+const projectPageContext = injectProjectPageContext(null)
+const organizationContext = injectOrganizationContext(null)
+
+const analyticsDashboardContext = createAnalyticsDashboardContext({
+	auth,
+	projectPageContext,
+	organizationContext,
+})
+const {
+	fetchRequest,
+	isAnalyticsQueryBuilderDefault,
+	isRefetching,
+	projects,
+	refreshAnalyticsQuery,
+	resetAnalyticsQueryBuilder,
+} = analyticsDashboardContext
+
+provideAnalyticsDashboardContext(analyticsDashboardContext)
+</script>
diff --git a/apps/frontend/src/components/analytics/AnalyticsLoadingBar.vue b/apps/frontend/src/components/analytics/AnalyticsLoadingBar.vue
new file mode 100644
index 0000000000..addfe43f20
--- /dev/null
+++ b/apps/frontend/src/components/analytics/AnalyticsLoadingBar.vue
@@ -0,0 +1,152 @@
+<template>
+	<div class="analytics-loading-bar" :style="{ opacity: isVisible ? 1 : 0 }" aria-hidden="true">
+		<div
+			class="analytics-loading-bar__track"
+			:style="{
+				width: `${progress}%`,
+				transition: !isTransitioning
+					? 'none'
+					: isFinishing
+						? 'width 0.1s ease-in-out'
+						: isCreeping
+							? 'width 2s linear'
+							: 'width 0.9s ease-in-out',
+			}"
+		/>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { onBeforeUnmount, ref, watch } from 'vue'
+
+const props = defineProps<{
+	loading: boolean
+}>()
+
+const progress = ref(0)
+const isVisible = ref(false)
+const isFinishing = ref(false)
+const isCreeping = ref(false)
+const isTransitioning = ref(false)
+
+let startFrame: number | null = null
+let showFrame: number | null = null
+let creepTimeout: ReturnType<typeof setTimeout> | null = null
+let hideTimeout: ReturnType<typeof setTimeout> | null = null
+let resetTimeout: ReturnType<typeof setTimeout> | null = null
+
+function clearTimers() {
+	if (showFrame !== null && typeof window !== 'undefined') {
+		window.cancelAnimationFrame(showFrame)
+	}
+	if (startFrame !== null && typeof window !== 'undefined') {
+		window.cancelAnimationFrame(startFrame)
+	}
+	if (creepTimeout) clearTimeout(creepTimeout)
+	if (hideTimeout) clearTimeout(hideTimeout)
+	if (resetTimeout) clearTimeout(resetTimeout)
+	showFrame = null
+	startFrame = null
+	creepTimeout = null
+	hideTimeout = null
+	resetTimeout = null
+}
+
+function start() {
+	clearTimers()
+	isVisible.value = false
+	progress.value = 0
+	isFinishing.value = false
+	isCreeping.value = false
+	isTransitioning.value = false
+
+	if (typeof window === 'undefined') {
+		progress.value = 98
+		return
+	}
+
+	showFrame = window.requestAnimationFrame(() => {
+		isVisible.value = true
+		showFrame = null
+		startFrame = window.requestAnimationFrame(() => {
+			isTransitioning.value = true
+			progress.value = 85
+			startFrame = null
+		})
+	})
+	creepTimeout = setTimeout(() => {
+		isCreeping.value = true
+		progress.value = 98
+		creepTimeout = null
+	}, 900)
+}
+
+function finish() {
+	clearTimers()
+	isVisible.value = true
+	isFinishing.value = true
+	isCreeping.value = false
+	isTransitioning.value = true
+	progress.value = 100
+
+	if (typeof window === 'undefined') {
+		isVisible.value = false
+		progress.value = 0
+		isFinishing.value = false
+		isCreeping.value = false
+		isTransitioning.value = false
+		return
+	}
+
+	hideTimeout = setTimeout(() => {
+		isVisible.value = false
+		resetTimeout = setTimeout(() => {
+			isTransitioning.value = false
+			progress.value = 0
+			isFinishing.value = false
+			isCreeping.value = false
+		}, 400)
+	}, 350)
+}
+
+watch(
+	() => props.loading,
+	(loading) => {
+		if (loading) {
+			start()
+		} else if (
+			isVisible.value ||
+			progress.value > 0 ||
+			showFrame !== null ||
+			startFrame !== null ||
+			creepTimeout !== null
+		) {
+			finish()
+		}
+	},
+	{ immediate: true },
+)
+
+onBeforeUnmount(clearTimers)
+</script>
+
+<style scoped>
+.analytics-loading-bar {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	z-index: 20;
+	height: 2px;
+	overflow: hidden;
+	background: color-mix(in srgb, var(--color-brand) 18%, transparent);
+	pointer-events: none;
+	transition: opacity 0.4s;
+}
+
+.analytics-loading-bar__track {
+	height: 100%;
+	border-radius: 999px;
+	background: var(--loading-bar-gradient);
+}
+</style>
diff --git a/apps/frontend/src/components/analytics/breakdown.ts b/apps/frontend/src/components/analytics/breakdown.ts
new file mode 100644
index 0000000000..072a8b6bc4
--- /dev/null
+++ b/apps/frontend/src/components/analytics/breakdown.ts
@@ -0,0 +1,77 @@
+import type { Labrinth } from '@modrinth/api-client'
+
+import type { AnalyticsBreakdownPreset } from '~/providers/analytics/analytics'
+
+export const ALL_BREAKDOWN_VALUE = 'All'
+export const UNKNOWN_BREAKDOWN_VALUE = 'Unknown'
+
+export function getAnalyticsBreakdownValue(
+	point: Labrinth.Analytics.v3.ProjectAnalytics,
+	selectedBreakdown: AnalyticsBreakdownPreset,
+): string {
+	switch (selectedBreakdown) {
+		case 'none':
+			return ALL_BREAKDOWN_VALUE
+		case 'project':
+			return normalizeBreakdownValue('source_project' in point ? point.source_project : undefined)
+		case 'country':
+			return normalizeBreakdownValue('country' in point ? point.country?.toUpperCase() : undefined)
+		case 'monetization': {
+			if ('monetized' in point && typeof point.monetized === 'boolean') {
+				return point.monetized ? 'monetized' : 'unmonetized'
+			}
+			return ALL_BREAKDOWN_VALUE
+		}
+		case 'user_agent':
+			return getDownloadSourceLabel(
+				normalizeBreakdownValue('user_agent' in point ? point.user_agent : undefined),
+			)
+		case 'download_reason':
+			return normalizeBreakdownValue(
+				'reason' in point ? point.reason : undefined,
+				UNKNOWN_BREAKDOWN_VALUE,
+			)
+		case 'version_id':
+			return normalizeBreakdownValue('version_id' in point ? point.version_id : undefined)
+		case 'loader':
+			return normalizeBreakdownValue(
+				'loader' in point ? point.loader : undefined,
+				UNKNOWN_BREAKDOWN_VALUE,
+			)
+		case 'game_version':
+			return normalizeBreakdownValue(
+				'game_version' in point ? point.game_version : undefined,
+				UNKNOWN_BREAKDOWN_VALUE,
+			)
+		default:
+			return ALL_BREAKDOWN_VALUE
+	}
+}
+
+export function getDownloadSourceLabel(value: string): string {
+	const normalized = value.trim()
+	const normalizedLowercase = normalized.toLowerCase()
+	if (normalizedLowercase === 'website') {
+		return 'Modrinth Website'
+	}
+	if (normalizedLowercase === 'modrinth_app') {
+		return 'Modrinth App'
+	}
+	if (!normalized.includes('_')) {
+		return normalized
+	}
+
+	return normalizedLowercase
+		.split('_')
+		.filter((part) => part.length > 0)
+		.map((part) => `${part.charAt(0).toUpperCase()}${part.slice(1)}`)
+		.join(' ')
+}
+
+function normalizeBreakdownValue(
+	value: string | undefined,
+	fallback = ALL_BREAKDOWN_VALUE,
+): string {
+	const normalized = value?.trim()
+	return normalized && normalized.length > 0 ? normalized : fallback
+}
diff --git a/apps/frontend/src/components/analytics/graph/AnalyticsChart.client.vue b/apps/frontend/src/components/analytics/graph/AnalyticsChart.client.vue
new file mode 100644
index 0000000000..52e1d78867
--- /dev/null
+++ b/apps/frontend/src/components/analytics/graph/AnalyticsChart.client.vue
@@ -0,0 +1,908 @@
+<template>
+	<div class="relative h-full">
+		<canvas
+			ref="canvasRef"
+			class="h-full w-full"
+			:style="{ touchAction: props.pinnedSliceIndex === null ? 'pan-y' : 'none' }"
+		/>
+		<div
+			v-if="rangeSelection.visible"
+			aria-hidden="true"
+			class="pointer-events-none absolute z-10 rounded-sm border border-dashed border-brand bg-brand-highlight opacity-20"
+			:style="rangeSelectionStyle"
+		/>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { useCompactNumber } from '@modrinth/ui'
+import {
+	BarController,
+	BarElement,
+	CategoryScale,
+	Chart,
+	type ChartConfiguration,
+	Filler,
+	LinearScale,
+	LineController,
+	LineElement,
+	PointElement,
+	Tooltip,
+} from 'chart.js'
+
+import type { AnalyticsDashboardStat } from '~/providers/analytics/analytics'
+
+import { type ChartDataset, DEFAULT_X_AXIS_TICK_LIMIT, formatAxisValue } from './utils'
+
+Chart.register(
+	LineController,
+	BarController,
+	LineElement,
+	BarElement,
+	PointElement,
+	CategoryScale,
+	LinearScale,
+	Filler,
+	Tooltip,
+)
+
+export type AnalyticsChartHoverPayload = {
+	visible: boolean
+	x: number
+	y: number
+	sliceIndex: number | null
+}
+
+export type AnalyticsChartRangeSelectPayload = {
+	startSliceIndex: number
+	endSliceIndex: number
+}
+
+export type AnalyticsChartGeometryPayload = {
+	left: number
+	right: number
+	top: number
+	bottom: number
+	width: number
+	height: number
+	xPositions: number[]
+}
+
+const props = defineProps<{
+	type: 'line' | 'bar'
+	fill: boolean
+	stacked: boolean
+	ratioMode: boolean
+	datasets: ChartDataset[]
+	labels: string[]
+	xAxisTickLimit?: number
+	activeStat: AnalyticsDashboardStat
+	pinnedSliceIndex: number | null
+	highlightedDatasetId: string | null
+}>()
+
+const emit = defineEmits<{
+	(event: 'hover' | 'pinned-drag', payload: AnalyticsChartHoverPayload): void
+	(event: 'range-select', payload: AnalyticsChartRangeSelectPayload): void
+	(event: 'geometry', payload: AnalyticsChartGeometryPayload): void
+}>()
+
+const canvasRef = ref<HTMLCanvasElement | null>(null)
+let chartInstance: Chart | null = null
+
+const { formatCompactNumber } = useCompactNumber()
+
+type ExternalTooltipHandler = NonNullable<
+	NonNullable<NonNullable<ChartConfiguration['options']>['plugins']>['tooltip']
+>['external']
+type ExternalTooltipContext = Parameters<Exclude<ExternalTooltipHandler, undefined>>[0]
+type ChartEvents = NonNullable<NonNullable<ChartConfiguration['options']>['events']>
+
+const chartInteractionEvents: ChartEvents = [
+	'mousemove',
+	'mouseout',
+	'click',
+	'touchstart',
+	'touchmove',
+]
+const PINNED_DRAG_THRESHOLD_PX = 6
+const RANGE_SELECT_THRESHOLD_PX = 8
+const EMPTY_DATA_Y_AXIS_MAX = 10
+const EMPTY_DATA_Y_AXIS_STEP = 2
+const Y_AXIS_WIDTH = 44
+const SECONDS_PER_HOUR = 60 * 60
+const DIMMED_SERIES_OPACITY = 0.5
+const BAR_BACKGROUND_OPACITY = 0.85
+const AREA_BACKGROUND_OPACITY = 0.3
+const SERIES_OPACITY_TRANSITION_MS = 150
+const CSS_VARIABLE_COLOR_PATTERN = /^var\(\s*(--[a-z0-9-_]+)\s*\)$/i
+const HSL_COLOR_PATTERN = /^hsl\(\s*([0-9.]+)(?:deg)?\s*,\s*([0-9.]+)%\s*,\s*([0-9.]+)%\s*\)$/i
+
+let pinnedDragPointerId: number | null = null
+let pinnedDragStartX = 0
+let pinnedDragStartY = 0
+let isPinnedDragging = false
+let rangeSelectPointerId: number | null = null
+let rangeSelectStartX = 0
+let rangeSelectStartY = 0
+let rangeSelectStartSliceIndex: number | null = null
+let rangeSelectLastSliceIndex: number | null = null
+let isRangeSelecting = false
+let seriesOpacityAnimationFrame: number | null = null
+let chartRefreshAnimationFrame: number | null = null
+let currentDatasetOpacities: number[] = []
+let suppressGeometryEmit = false
+let lastGeometryPayload: AnalyticsChartGeometryPayload | null = null
+
+const geometryPlugin = {
+	id: 'analytics-chart-geometry',
+	afterLayout(chart: Chart) {
+		if (suppressGeometryEmit) return
+		emitChartGeometry(chart)
+	},
+}
+
+const rangeSelection = reactive({
+	visible: false,
+	startX: 0,
+	currentX: 0,
+	top: 0,
+	bottom: 0,
+})
+
+const rangeSelectionStyle = computed(() => {
+	const left = Math.min(rangeSelection.startX, rangeSelection.currentX)
+	const width = Math.max(1, Math.abs(rangeSelection.currentX - rangeSelection.startX))
+
+	return {
+		top: `${rangeSelection.top}px`,
+		bottom: `${rangeSelection.bottom}px`,
+		transform: `translate(${left}px, 0)`,
+		width: `${width}px`,
+	}
+})
+
+function getChartEvents(): ChartEvents {
+	return props.pinnedSliceIndex === null ? [...chartInteractionEvents] : []
+}
+
+function emitChartGeometry(chart: Chart | null = chartInstance) {
+	if (!chart || !canvasRef.value) return
+
+	const chartArea = chart.chartArea
+	const rect = canvasRef.value.getBoundingClientRect()
+	if (
+		!Number.isFinite(chartArea.left) ||
+		!Number.isFinite(chartArea.right) ||
+		!Number.isFinite(chartArea.top) ||
+		!Number.isFinite(chartArea.bottom) ||
+		chartArea.right <= chartArea.left ||
+		chartArea.bottom <= chartArea.top
+	) {
+		return
+	}
+
+	const payload = {
+		left: chartArea.left,
+		right: chartArea.right,
+		top: chartArea.top,
+		bottom: chartArea.bottom,
+		width: rect.width,
+		height: rect.height,
+		xPositions: props.labels
+			.map((_, index) => chart.scales.x.getPixelForValue(index))
+			.filter((x) => Number.isFinite(x)),
+	}
+	if (areChartGeometryPayloadsEqual(lastGeometryPayload, payload)) {
+		return
+	}
+
+	lastGeometryPayload = payload
+	emit('geometry', payload)
+}
+
+function getPinnedActiveElements(sliceIndex: number) {
+	if (!chartInstance) return []
+
+	const activeElements: { datasetIndex: number; index: number }[] = []
+	for (let datasetIndex = 0; datasetIndex < chartInstance.data.datasets.length; datasetIndex++) {
+		const dataset = chartInstance.data.datasets[datasetIndex]
+		if (!dataset) continue
+
+		const dataLength = Array.isArray(dataset.data) ? dataset.data.length : 0
+		if (sliceIndex >= dataLength) continue
+
+		activeElements.push({
+			datasetIndex,
+			index: sliceIndex,
+		})
+	}
+
+	return activeElements
+}
+
+function getNearestSliceIndex(clientX: number) {
+	if (!chartInstance || !canvasRef.value || props.labels.length === 0) return null
+
+	const rect = canvasRef.value.getBoundingClientRect()
+	const x = clientX - rect.left
+	const xScale = chartInstance.scales.x
+	const rawIndex = xScale.getValueForPixel(x)
+	if (typeof rawIndex !== 'number' || !Number.isFinite(rawIndex)) return null
+
+	return Math.min(props.labels.length - 1, Math.max(0, Math.round(rawIndex)))
+}
+
+function getSliceChartPosition(sliceIndex: number) {
+	if (!chartInstance || !canvasRef.value) return null
+
+	const rect = canvasRef.value.getBoundingClientRect()
+	const chartArea = chartInstance.chartArea
+	const xScale = chartInstance.scales.x
+	const x = xScale.getPixelForValue(sliceIndex)
+	if (!Number.isFinite(x)) return null
+
+	return {
+		x: Math.min(chartArea.right, Math.max(chartArea.left, x)),
+		top: chartArea.top,
+		bottom: rect.height - chartArea.bottom,
+	}
+}
+
+function updateRangeSelection(sliceIndex: number) {
+	const chartPosition = getSliceChartPosition(sliceIndex)
+	if (!chartPosition) return
+
+	rangeSelection.visible = true
+	rangeSelection.currentX = chartPosition.x
+	rangeSelection.top = chartPosition.top
+	rangeSelection.bottom = chartPosition.bottom
+}
+
+function clearRangeSelection() {
+	rangeSelection.visible = false
+}
+
+function areChartGeometryPayloadsEqual(
+	left: AnalyticsChartGeometryPayload | null,
+	right: AnalyticsChartGeometryPayload,
+): boolean {
+	if (!left) return false
+	if (
+		left.left !== right.left ||
+		left.right !== right.right ||
+		left.top !== right.top ||
+		left.bottom !== right.bottom ||
+		left.width !== right.width ||
+		left.height !== right.height ||
+		left.xPositions.length !== right.xPositions.length
+	) {
+		return false
+	}
+
+	for (let index = 0; index < left.xPositions.length; index++) {
+		if (left.xPositions[index] !== right.xPositions[index]) {
+			return false
+		}
+	}
+
+	return true
+}
+
+function getPinnedTooltipPosition(sliceIndex: number) {
+	if (!chartInstance) return null
+
+	const activeElements = getPinnedActiveElements(sliceIndex)
+	if (activeElements.length === 0) return null
+
+	const positions = activeElements
+		.map(({ datasetIndex, index }) => {
+			const element = chartInstance?.getDatasetMeta(datasetIndex).data[index]
+			if (!element) return null
+			const point = element.getProps(['x', 'y'], true) as { x: number; y: number }
+			if (!Number.isFinite(point.x) || !Number.isFinite(point.y)) return null
+			return point
+		})
+		.filter((position): position is { x: number; y: number } => Boolean(position))
+
+	if (positions.length === 0) return null
+
+	const x = positions.reduce((sum, position) => sum + position.x, 0) / positions.length
+	const y = positions.reduce((sum, position) => sum + position.y, 0) / positions.length
+
+	return { x, y }
+}
+
+function emitPinnedDragHover(sliceIndex: number) {
+	const position = getPinnedTooltipPosition(sliceIndex)
+	if (!position) return
+
+	emit('pinned-drag', {
+		visible: true,
+		x: position.x,
+		y: position.y,
+		sliceIndex,
+	})
+}
+
+function emitRangeDragHover(sliceIndex: number) {
+	const position = getPinnedTooltipPosition(sliceIndex)
+	const fallbackPosition = getSliceChartPosition(sliceIndex)
+	if (!position && !fallbackPosition) return
+
+	emit('hover', {
+		visible: true,
+		x: position?.x ?? fallbackPosition?.x ?? 0,
+		y: position?.y ?? fallbackPosition?.top ?? 0,
+		sliceIndex,
+	})
+}
+
+function withAlpha(color: string, alpha: number): string {
+	const hexMatch = /^#([0-9a-f]{6})$/i.exec(color)
+	if (hexMatch) {
+		const r = Number.parseInt(hexMatch[1].slice(0, 2), 16)
+		const g = Number.parseInt(hexMatch[1].slice(2, 4), 16)
+		const b = Number.parseInt(hexMatch[1].slice(4, 6), 16)
+		return `rgba(${r}, ${g}, ${b}, ${alpha})`
+	}
+
+	const hslMatch = HSL_COLOR_PATTERN.exec(color)
+	if (!hslMatch) return color
+
+	const hue = Number.parseFloat(hslMatch[1])
+	const saturation = Number.parseFloat(hslMatch[2])
+	const lightness = Number.parseFloat(hslMatch[3])
+	if (![hue, saturation, lightness].every(Number.isFinite)) return color
+
+	return `hsla(${hue}, ${saturation}%, ${lightness}%, ${alpha})`
+}
+
+function resolveCssColor(color: string): string {
+	const match = CSS_VARIABLE_COLOR_PATTERN.exec(color)
+	if (!match || typeof document === 'undefined') {
+		return color
+	}
+
+	const resolvedColor = getComputedStyle(document.documentElement).getPropertyValue(match[1]).trim()
+	return resolvedColor || color
+}
+
+function getTargetDatasetOpacity(index: number) {
+	const dataset = props.datasets[index]
+	return props.highlightedDatasetId !== null && dataset?.projectId !== props.highlightedDatasetId
+		? DIMMED_SERIES_OPACITY
+		: 1
+}
+
+function getDatasetOpacity(index: number) {
+	return currentDatasetOpacities[index] ?? getTargetDatasetOpacity(index)
+}
+
+function getDatasetColors(dataset: ChartDataset, index: number) {
+	const opacity = getDatasetOpacity(index)
+	return {
+		borderColor: withAlpha(resolveCssColor(dataset.borderColor), opacity),
+		backgroundColor: resolveCssColor(dataset.backgroundColor),
+		opacity,
+	}
+}
+
+function buildDatasets() {
+	return props.datasets.map((dataset, index) => {
+		const colors = getDatasetColors(dataset, index)
+		const common = {
+			label: dataset.label,
+			data: dataset.data,
+			borderColor: colors.borderColor,
+			borderDash: dataset.borderDash,
+			borderWidth: 2,
+		}
+
+		if (props.type === 'bar') {
+			return {
+				...common,
+				backgroundColor: withAlpha(colors.backgroundColor, BAR_BACKGROUND_OPACITY * colors.opacity),
+				borderWidth: 0,
+				stack: props.stacked ? 'analytics' : undefined,
+			}
+		}
+
+		const lineFill: 'origin' | '-1' | false = props.fill ? (index === 0 ? 'origin' : '-1') : false
+
+		return {
+			...common,
+			backgroundColor: props.fill
+				? withAlpha(colors.backgroundColor, AREA_BACKGROUND_OPACITY * colors.opacity)
+				: withAlpha(colors.backgroundColor, colors.opacity),
+			fill: lineFill,
+			tension: 0.35,
+			pointRadius: 0,
+			pointBackgroundColor: colors.borderColor,
+			pointBorderWidth: 0,
+			pointHoverRadius: 4,
+			pointHoverBackgroundColor: colors.borderColor,
+			pointHoverBorderWidth: 0,
+			pointHitRadius: 16,
+			stack: props.stacked ? 'analytics' : undefined,
+		}
+	})
+}
+
+function cancelSeriesOpacityAnimation() {
+	if (seriesOpacityAnimationFrame === null) return
+
+	cancelAnimationFrame(seriesOpacityAnimationFrame)
+	seriesOpacityAnimationFrame = null
+}
+
+function cancelScheduledChartRefresh() {
+	if (chartRefreshAnimationFrame === null) return
+
+	cancelAnimationFrame(chartRefreshAnimationFrame)
+	chartRefreshAnimationFrame = null
+}
+
+function getTargetDatasetOpacities() {
+	return props.datasets.map((_, index) => getTargetDatasetOpacity(index))
+}
+
+function syncDatasetOpacitiesToTargets() {
+	cancelSeriesOpacityAnimation()
+	currentDatasetOpacities = getTargetDatasetOpacities()
+}
+
+function updateChartWithoutGeometry() {
+	if (!chartInstance) return
+
+	suppressGeometryEmit = true
+	try {
+		chartInstance.update('none')
+	} finally {
+		suppressGeometryEmit = false
+	}
+}
+
+function applySeriesHoverState() {
+	if (!chartInstance) return
+
+	chartInstance.data.datasets.forEach((chartDataset, index) => {
+		const dataset = props.datasets[index]
+		if (!dataset) return
+
+		const colors = getDatasetColors(dataset, index)
+		chartDataset.borderColor = colors.borderColor
+		chartDataset.backgroundColor =
+			props.type === 'bar'
+				? withAlpha(colors.backgroundColor, BAR_BACKGROUND_OPACITY * colors.opacity)
+				: props.fill
+					? withAlpha(colors.backgroundColor, AREA_BACKGROUND_OPACITY * colors.opacity)
+					: withAlpha(colors.backgroundColor, colors.opacity)
+		Object.assign(chartDataset, {
+			pointBackgroundColor: colors.borderColor,
+			pointHoverBackgroundColor: colors.borderColor,
+		})
+	})
+
+	updateChartWithoutGeometry()
+}
+
+function easeSeriesOpacityTransition(progress: number) {
+	return 1 - Math.pow(1 - progress, 3)
+}
+
+function animateSeriesHoverState() {
+	if (!chartInstance) return
+	if (typeof requestAnimationFrame === 'undefined') {
+		syncDatasetOpacitiesToTargets()
+		applySeriesHoverState()
+		return
+	}
+
+	cancelSeriesOpacityAnimation()
+
+	const from = props.datasets.map((_, index) => getDatasetOpacity(index))
+	const to = getTargetDatasetOpacities()
+	if (from.every((opacity, index) => Math.abs(opacity - (to[index] ?? 1)) < 0.001)) {
+		currentDatasetOpacities = to
+		applySeriesHoverState()
+		return
+	}
+
+	const start = performance.now()
+	const tick = (now: number) => {
+		const progress = Math.min(1, (now - start) / SERIES_OPACITY_TRANSITION_MS)
+		const easedProgress = easeSeriesOpacityTransition(progress)
+		currentDatasetOpacities = to.map(
+			(targetOpacity, index) =>
+				(from[index] ?? targetOpacity) +
+				(targetOpacity - (from[index] ?? targetOpacity)) * easedProgress,
+		)
+		applySeriesHoverState()
+
+		if (progress < 1) {
+			seriesOpacityAnimationFrame = requestAnimationFrame(tick)
+			return
+		}
+
+		seriesOpacityAnimationFrame = null
+		currentDatasetOpacities = to
+		applySeriesHoverState()
+	}
+
+	seriesOpacityAnimationFrame = requestAnimationFrame(tick)
+}
+
+function getVisibleXAxisLabelIndexes(labelCount: number, limit: number): Set<number> {
+	if (limit <= 0 || labelCount <= limit) {
+		return new Set(Array.from({ length: labelCount }, (_, index) => index))
+	}
+
+	const indexes = new Set<number>()
+	for (let i = 0; i < limit; i++) {
+		indexes.add(Math.floor((i * labelCount) / limit))
+	}
+
+	return indexes
+}
+
+function hasMetricData() {
+	return props.datasets.some((dataset) =>
+		dataset.data.some((value) => Number.isFinite(value) && value > 0),
+	)
+}
+
+function getEmptyDataYAxisMax() {
+	return props.activeStat === 'playtime'
+		? EMPTY_DATA_Y_AXIS_MAX * SECONDS_PER_HOUR
+		: EMPTY_DATA_Y_AXIS_MAX
+}
+
+function getEmptyDataYAxisStepSize() {
+	return props.activeStat === 'playtime'
+		? EMPTY_DATA_Y_AXIS_STEP * SECONDS_PER_HOUR
+		: EMPTY_DATA_Y_AXIS_STEP
+}
+
+function buildConfig(): ChartConfiguration {
+	const hasData = hasMetricData()
+	const visibleXAxisLabelIndexes =
+		props.xAxisTickLimit === undefined
+			? null
+			: getVisibleXAxisLabelIndexes(props.labels.length, props.xAxisTickLimit)
+
+	return {
+		type: props.type,
+		plugins: [geometryPlugin],
+		data: {
+			labels: props.labels,
+			datasets: buildDatasets() as ChartConfiguration['data']['datasets'],
+		},
+		options: {
+			responsive: true,
+			maintainAspectRatio: false,
+			animation: false,
+			normalized: true,
+			events: getChartEvents(),
+			interaction: {
+				mode: 'index',
+				intersect: false,
+			},
+			plugins: {
+				legend: { display: false },
+				tooltip: {
+					enabled: false,
+					external: handleExternalTooltip,
+				},
+			},
+			scales: {
+				x: {
+					stacked: props.stacked && props.type === 'bar',
+					offset: props.type === 'bar',
+					grid: { display: false },
+					ticks: {
+						align: 'inner',
+						maxTicksLimit: props.xAxisTickLimit ?? DEFAULT_X_AXIS_TICK_LIMIT,
+						autoSkip: !props.xAxisTickLimit,
+						color: 'rgba(148, 163, 184, 0.9)',
+						callback: (tickValue, index) => {
+							if (visibleXAxisLabelIndexes && !visibleXAxisLabelIndexes.has(index)) {
+								return ''
+							}
+
+							return props.labels[Number(tickValue)] ?? ''
+						},
+					},
+					border: { color: 'rgba(148, 163, 184, 0.35)' },
+				},
+				y: {
+					stacked: props.stacked,
+					beginAtZero: true,
+					afterFit: (scale) => {
+						scale.width = Y_AXIS_WIDTH
+					},
+					...(props.ratioMode
+						? { max: 100, min: 0 }
+						: hasData
+							? {}
+							: { max: getEmptyDataYAxisMax(), min: 0 }),
+					grid: {
+						color: 'rgba(148, 163, 184, 0.15)',
+					},
+					border: { display: false },
+					ticks: {
+						color: 'rgba(148, 163, 184, 0.9)',
+						...(props.ratioMode
+							? { stepSize: 25 }
+							: hasData
+								? {}
+								: { stepSize: getEmptyDataYAxisStepSize() }),
+						callback: (tickValue) => {
+							const numeric =
+								typeof tickValue === 'number' ? tickValue : Number.parseFloat(String(tickValue))
+							if (!Number.isFinite(numeric)) return String(tickValue)
+							if (props.ratioMode) return `${numeric}%`
+							return formatAxisValue(numeric, props.activeStat, formatCompactNumber)
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+function handleExternalTooltip(context: ExternalTooltipContext) {
+	const tooltip = context.tooltip
+	if (!tooltip || tooltip.opacity === 0) {
+		emit('hover', { visible: false, x: 0, y: 0, sliceIndex: null })
+		return
+	}
+	const sliceIndex = tooltip.dataPoints?.[0]?.dataIndex ?? null
+	emit('hover', {
+		visible: true,
+		x: tooltip.caretX,
+		y: tooltip.caretY,
+		sliceIndex,
+	})
+}
+
+function createChart() {
+	if (!canvasRef.value) return
+	syncDatasetOpacitiesToTargets()
+	chartInstance = new Chart(canvasRef.value, buildConfig())
+	emitChartGeometry()
+}
+
+function refreshChart() {
+	if (!chartInstance) return
+	syncDatasetOpacitiesToTargets()
+	const config = buildConfig()
+	chartInstance.data = config.data
+	chartInstance.options = config.options ?? {}
+	clearChartActiveState()
+	chartInstance.update('none')
+	syncPinnedSliceState()
+	if (props.pinnedSliceIndex !== null) {
+		updateChartWithoutGeometry()
+	}
+	emitChartGeometry()
+}
+
+function scheduleChartRefresh() {
+	if (typeof requestAnimationFrame === 'undefined') {
+		refreshChart()
+		return
+	}
+
+	if (chartRefreshAnimationFrame !== null) {
+		return
+	}
+
+	chartRefreshAnimationFrame = requestAnimationFrame(() => {
+		chartRefreshAnimationFrame = null
+		refreshChart()
+	})
+}
+
+function syncPinnedSliceState() {
+	if (!chartInstance) return
+
+	const activeElements =
+		props.pinnedSliceIndex === null ? [] : getPinnedActiveElements(props.pinnedSliceIndex)
+	const tooltipPosition =
+		props.pinnedSliceIndex === null
+			? { x: 0, y: 0 }
+			: (getPinnedTooltipPosition(props.pinnedSliceIndex) ?? { x: 0, y: 0 })
+
+	chartInstance.options.events = getChartEvents()
+	chartInstance.setActiveElements(activeElements)
+	chartInstance.tooltip?.setActiveElements(activeElements, tooltipPosition)
+}
+
+function clearChartActiveState() {
+	if (!chartInstance) return
+
+	chartInstance.setActiveElements([])
+	chartInstance.tooltip?.setActiveElements([], { x: 0, y: 0 })
+}
+
+function applyPinnedSliceState() {
+	if (!chartInstance) return
+
+	syncPinnedSliceState()
+	updateChartWithoutGeometry()
+}
+
+function handleCanvasLeave() {
+	emit('hover', { visible: false, x: 0, y: 0, sliceIndex: null })
+	if (props.pinnedSliceIndex !== null) {
+		requestAnimationFrame(() => applyPinnedSliceState())
+	}
+}
+
+function handlePinnedPointerDown(event: PointerEvent) {
+	if (props.pinnedSliceIndex === null || event.pointerType !== 'touch' || !canvasRef.value) return
+
+	pinnedDragPointerId = event.pointerId
+	pinnedDragStartX = event.clientX
+	pinnedDragStartY = event.clientY
+	isPinnedDragging = false
+	canvasRef.value.setPointerCapture(event.pointerId)
+}
+
+function handlePinnedPointerMove(event: PointerEvent) {
+	if (props.pinnedSliceIndex === null || event.pointerId !== pinnedDragPointerId) return
+
+	const distance = Math.hypot(event.clientX - pinnedDragStartX, event.clientY - pinnedDragStartY)
+	if (!isPinnedDragging && distance < PINNED_DRAG_THRESHOLD_PX) return
+
+	const sliceIndex = getNearestSliceIndex(event.clientX)
+	if (sliceIndex === null) return
+
+	isPinnedDragging = true
+	event.preventDefault()
+	emitPinnedDragHover(sliceIndex)
+}
+
+function handlePinnedPointerEnd(event: PointerEvent) {
+	if (event.pointerId !== pinnedDragPointerId) return
+
+	canvasRef.value?.releasePointerCapture(event.pointerId)
+	pinnedDragPointerId = null
+	isPinnedDragging = false
+}
+
+function handleRangePointerDown(event: PointerEvent) {
+	if (rangeSelectPointerId !== null) return
+	if (!canvasRef.value || props.labels.length === 0) return
+	if (event.pointerType === 'mouse' && event.button !== 0) return
+	if (props.pinnedSliceIndex !== null && event.pointerType === 'touch') return
+
+	const sliceIndex = getNearestSliceIndex(event.clientX)
+	if (sliceIndex === null) return
+
+	const chartPosition = getSliceChartPosition(sliceIndex)
+	if (!chartPosition) return
+
+	rangeSelectPointerId = event.pointerId
+	rangeSelectStartX = event.clientX
+	rangeSelectStartY = event.clientY
+	rangeSelectStartSliceIndex = sliceIndex
+	rangeSelectLastSliceIndex = sliceIndex
+	isRangeSelecting = false
+	rangeSelection.startX = chartPosition.x
+	rangeSelection.currentX = chartPosition.x
+	rangeSelection.top = chartPosition.top
+	rangeSelection.bottom = chartPosition.bottom
+	canvasRef.value.setPointerCapture(event.pointerId)
+}
+
+function handleRangePointerMove(event: PointerEvent) {
+	if (event.pointerId !== rangeSelectPointerId) return
+
+	const distance = Math.hypot(event.clientX - rangeSelectStartX, event.clientY - rangeSelectStartY)
+	if (!isRangeSelecting && distance < RANGE_SELECT_THRESHOLD_PX) return
+
+	const sliceIndex = getNearestSliceIndex(event.clientX)
+	if (sliceIndex === null) return
+
+	isRangeSelecting = true
+	rangeSelectLastSliceIndex = sliceIndex
+	event.preventDefault()
+	updateRangeSelection(sliceIndex)
+	emitRangeDragHover(sliceIndex)
+}
+
+function handleRangePointerEnd(event: PointerEvent) {
+	if (event.pointerId !== rangeSelectPointerId) return
+
+	canvasRef.value?.releasePointerCapture(event.pointerId)
+	const startSliceIndex = rangeSelectStartSliceIndex
+	const endSliceIndex = rangeSelectLastSliceIndex
+
+	if (isRangeSelecting && startSliceIndex !== null && endSliceIndex !== null) {
+		event.preventDefault()
+		emit('range-select', { startSliceIndex, endSliceIndex })
+	}
+
+	rangeSelectPointerId = null
+	rangeSelectStartSliceIndex = null
+	rangeSelectLastSliceIndex = null
+	isRangeSelecting = false
+	clearRangeSelection()
+}
+
+function handleRangePointerCancel(event: PointerEvent) {
+	if (event.pointerId !== rangeSelectPointerId) return
+
+	canvasRef.value?.releasePointerCapture(event.pointerId)
+	rangeSelectPointerId = null
+	rangeSelectStartSliceIndex = null
+	rangeSelectLastSliceIndex = null
+	isRangeSelecting = false
+	clearRangeSelection()
+}
+
+onMounted(() => {
+	createChart()
+	canvasRef.value?.addEventListener('mouseleave', handleCanvasLeave)
+	canvasRef.value?.addEventListener('pointerdown', handleRangePointerDown)
+	canvasRef.value?.addEventListener('pointermove', handleRangePointerMove)
+	canvasRef.value?.addEventListener('pointerup', handleRangePointerEnd)
+	canvasRef.value?.addEventListener('pointercancel', handleRangePointerCancel)
+	canvasRef.value?.addEventListener('pointerdown', handlePinnedPointerDown)
+	canvasRef.value?.addEventListener('pointermove', handlePinnedPointerMove)
+	canvasRef.value?.addEventListener('pointerup', handlePinnedPointerEnd)
+	canvasRef.value?.addEventListener('pointercancel', handlePinnedPointerEnd)
+})
+
+onBeforeUnmount(() => {
+	canvasRef.value?.removeEventListener('mouseleave', handleCanvasLeave)
+	canvasRef.value?.removeEventListener('pointerdown', handleRangePointerDown)
+	canvasRef.value?.removeEventListener('pointermove', handleRangePointerMove)
+	canvasRef.value?.removeEventListener('pointerup', handleRangePointerEnd)
+	canvasRef.value?.removeEventListener('pointercancel', handleRangePointerCancel)
+	canvasRef.value?.removeEventListener('pointerdown', handlePinnedPointerDown)
+	canvasRef.value?.removeEventListener('pointermove', handlePinnedPointerMove)
+	canvasRef.value?.removeEventListener('pointerup', handlePinnedPointerEnd)
+	canvasRef.value?.removeEventListener('pointercancel', handlePinnedPointerEnd)
+	cancelSeriesOpacityAnimation()
+	cancelScheduledChartRefresh()
+	chartInstance?.destroy()
+	chartInstance = null
+})
+
+watch(
+	() => [props.type, props.fill, props.stacked],
+	() => {
+		cancelScheduledChartRefresh()
+		chartInstance?.destroy()
+		chartInstance = null
+		nextTick(() => {
+			createChart()
+			applyPinnedSliceState()
+		})
+	},
+)
+
+watch(
+	() => [props.datasets, props.labels, props.xAxisTickLimit, props.activeStat, props.ratioMode],
+	() => {
+		scheduleChartRefresh()
+	},
+)
+
+watch(
+	() => props.pinnedSliceIndex,
+	() => {
+		applyPinnedSliceState()
+	},
+)
+
+watch(
+	() => props.highlightedDatasetId,
+	() => {
+		animateSeriesHoverState()
+	},
+)
+</script>
diff --git a/apps/frontend/src/components/analytics/graph/AnalyticsChartEvents.vue b/apps/frontend/src/components/analytics/graph/AnalyticsChartEvents.vue
new file mode 100644
index 0000000000..c1f886817c
--- /dev/null
+++ b/apps/frontend/src/components/analytics/graph/AnalyticsChartEvents.vue
@@ -0,0 +1,552 @@
+<template>
+	<div v-if="canRender" ref="chartElement" class="pointer-events-none absolute inset-0">
+		<div
+			v-for="group in eventGroups"
+			:key="`${group.id}:guide`"
+			aria-hidden="true"
+			class="absolute left-0 z-0 border-0 border-l border-dashed border-secondary opacity-40"
+			:style="getGuideStyle(group)"
+		/>
+		<Transition name="analytics-event-range-highlight-fade">
+			<div
+				v-if="rangeHighlight"
+				aria-hidden="true"
+				class="pointer-events-none absolute left-0 z-10 rounded-sm border border-l-0 border-dashed border-secondary bg-highlight-blue opacity-40"
+				:style="rangeHighlight"
+			/>
+		</Transition>
+
+		<button
+			v-for="group in eventGroups"
+			:key="group.id"
+			type="button"
+			class="pointer-events-auto absolute -top-[26px] left-0 z-20 inline-flex h-5 min-w-5 items-center justify-center gap-1 rounded-full bg-surface-3 px-1 text-secondary shadow-lg transition-colors hover:text-contrast focus-visible:border-brand focus-visible:text-contrast"
+			:class="activeGroup?.id === group.id ? 'border-brand text-contrast' : ''"
+			:style="getMarkerStyle(group)"
+			:aria-label="getGroupAriaLabel(group)"
+			@click.stop
+			@mouseenter="showHoveredGroup(group.id)"
+			@mouseleave="scheduleHoverClose"
+			@focus="showHoveredGroup(group.id)"
+			@blur="scheduleHoverClose"
+			@keydown.escape.stop="clearActiveGroup"
+		>
+			<InfoIcon class="size-5" aria-hidden="true" />
+			<span v-if="group.events.length > 1" class="text-xs font-semibold leading-none">
+				{{ group.events.length }}
+			</span>
+		</button>
+	</div>
+	<Teleport to="body">
+		<Transition name="analytics-event-tooltip-fade">
+			<div
+				v-if="activeGroup"
+				ref="tooltipElement"
+				class="analytics-event-tooltip pointer-events-auto fixed left-0 top-0 z-[100] max-h-[360px] w-[min(12rem,calc(100vw-1rem))] overflow-y-auto rounded-xl border border-solid border-surface-5 bg-surface-3 py-2 text-sm shadow-xl"
+				:style="tooltipStyle"
+				@mouseenter="onTooltipMouseEnter"
+				@mouseleave="onTooltipMouseLeave"
+				@focusin="onTooltipMouseEnter"
+				@focusout="onTooltipMouseLeave"
+				@click.stop
+			>
+				<div class="flex flex-col gap-2.5">
+					<div
+						v-for="event in activeGroup.events"
+						:key="getEventKey(event)"
+						class="border-0 border-b border-solid border-surface-5 px-3 pb-2.5 last:border-b-0 last:pb-0"
+					>
+						<div class="font-semibold leading-snug text-contrast">
+							{{ event.title }}
+						</div>
+						<a
+							v-if="event.announcement_url"
+							:href="event.announcement_url"
+							target="_blank"
+							rel="noopener noreferrer"
+							class="mt-1.5 inline-flex items-center gap-1 text-sm font-medium text-primary underline !transition-all hover:text-contrast"
+						>
+							See announcement
+							<ExternalIcon class="size-3.5" aria-hidden="true" />
+						</a>
+						<div class="mt-2.5 text-xs font-semibold text-primary">
+							{{ formatEventRange(event) }}
+						</div>
+					</div>
+				</div>
+			</div>
+		</Transition>
+	</Teleport>
+</template>
+
+<script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
+import { ExternalIcon, InfoIcon } from '@modrinth/assets'
+
+import type {
+	AnalyticsDashboardStat,
+	AnalyticsGroupByPreset,
+} from '~/providers/analytics/analytics'
+
+import type { AnalyticsChartGeometryPayload } from './AnalyticsChart.client.vue'
+import { isTimeRelevantForGroupBy } from './utils'
+
+export type AnalyticsChartEvent = Labrinth.Analytics.v3.AnalyticsEvent
+
+type PositionedEvent = AnalyticsChartEvent & {
+	startMs: number
+	endMs: number
+	x: number
+	endX: number
+}
+
+type EventGroup = {
+	id: string
+	x: number
+	events: PositionedEvent[]
+}
+
+const props = defineProps<{
+	events: AnalyticsChartEvent[]
+	activeStat: AnalyticsDashboardStat
+	groupBy: AnalyticsGroupByPreset
+	chartStart: Date | null
+	chartEnd: Date | null
+	geometry: AnalyticsChartGeometryPayload | null
+	containerWidth: number
+	containerHeight: number
+}>()
+
+const GROUP_DISTANCE_PX = 32
+const MARKER_HEIGHT_PX = 28
+const TOOLTIP_OFFSET_PX = 8
+const EDGE_PADDING_PX = 8
+const CLOSE_DELAY_MS = 120
+const EVENT_RANGE_DATE_TIME_FORMATTER = new Intl.DateTimeFormat(undefined, {
+	month: 'long',
+	day: 'numeric',
+	year: 'numeric',
+	hour: 'numeric',
+	minute: '2-digit',
+})
+const EVENT_RANGE_DATE_FORMATTER = new Intl.DateTimeFormat(undefined, {
+	month: 'long',
+	day: 'numeric',
+	year: 'numeric',
+})
+const EVENT_RANGE_MONTH_DAY_TIME_FORMATTER = new Intl.DateTimeFormat(undefined, {
+	month: 'long',
+	day: 'numeric',
+	hour: 'numeric',
+	minute: '2-digit',
+})
+const EVENT_RANGE_TIME_FORMATTER = new Intl.DateTimeFormat(undefined, {
+	hour: 'numeric',
+	minute: '2-digit',
+})
+
+const hoveredGroupId = ref<string | null>(null)
+const isTooltipHovered = ref(false)
+const chartElement = ref<HTMLDivElement | null>(null)
+const tooltipElement = ref<HTMLDivElement | null>(null)
+const tooltipWidth = ref(0)
+const tooltipHeight = ref(0)
+const chartRect = reactive({
+	left: 0,
+	top: 0,
+})
+let closeTimeout: ReturnType<typeof setTimeout> | null = null
+
+const chartStartMs = computed(() => props.chartStart?.getTime() ?? null)
+const chartEndMs = computed(() => props.chartEnd?.getTime() ?? null)
+const containerWidth = computed(() => props.containerWidth || props.geometry?.width || 0)
+const containerHeight = computed(() => props.containerHeight || props.geometry?.height || 0)
+const canRender = computed(
+	() =>
+		props.geometry !== null &&
+		containerWidth.value > 0 &&
+		containerHeight.value > 0 &&
+		chartStartMs.value !== null &&
+		chartEndMs.value !== null &&
+		chartEndMs.value > chartStartMs.value &&
+		props.geometry.xPositions.length > 0 &&
+		eventGroups.value.length > 0,
+)
+
+const visibleEvents = computed<PositionedEvent[]>(() => {
+	const geometry = props.geometry
+	const startMs = chartStartMs.value
+	const endMs = chartEndMs.value
+	if (!geometry || startMs === null || endMs === null || endMs <= startMs) return []
+
+	return props.events
+		.filter((event) => doesEventMatchActiveStat(event))
+		.map((event) => {
+			const eventStartMs = new Date(event.starts).getTime()
+			const eventEndMs = new Date(event.ends).getTime()
+			if (!Number.isFinite(eventStartMs) || !Number.isFinite(eventEndMs)) return null
+			if (eventEndMs < eventStartMs) return null
+			if (eventEndMs < startMs || eventStartMs > endMs) return null
+
+			const x = getDateBucketX(event.starts, eventStartMs, geometry, startMs, endMs)
+			const endX = getDateBucketX(event.ends, eventEndMs, geometry, startMs, endMs)
+			if (x === null || endX === null) return null
+
+			return {
+				...event,
+				startMs: eventStartMs,
+				endMs: eventEndMs,
+				x,
+				endX,
+			}
+		})
+		.filter((event): event is PositionedEvent => Boolean(event))
+		.sort((a, b) => a.x - b.x || a.startMs - b.startMs || a.title.localeCompare(b.title))
+})
+
+const eventGroups = computed<EventGroup[]>(() => {
+	const groups: EventGroup[] = []
+
+	for (const event of visibleEvents.value) {
+		const previousGroup = groups[groups.length - 1]
+		if (previousGroup && event.x - previousGroup.x <= GROUP_DISTANCE_PX) {
+			previousGroup.events.push(event)
+			previousGroup.x =
+				previousGroup.events.reduce((sum, groupedEvent) => sum + groupedEvent.x, 0) /
+				previousGroup.events.length
+			continue
+		}
+
+		groups.push({
+			id: getEventKey(event),
+			x: event.x,
+			events: [event],
+		})
+	}
+
+	return groups.map((group) => ({
+		...group,
+		id: group.events.map(getEventKey).join('|'),
+	}))
+})
+
+const activeGroup = computed(
+	() => eventGroups.value.find((group) => group.id === hoveredGroupId.value) ?? null,
+)
+
+const activeRange = computed(() => {
+	const group = activeGroup.value
+	const geometry = props.geometry
+	const startMs = chartStartMs.value
+	const endMs = chartEndMs.value
+	if (!group || !geometry || startMs === null || endMs === null || endMs <= startMs) return null
+
+	const rangedEvents = group.events.filter((event) => event.startMs !== event.endMs)
+	if (rangedEvents.length === 0) return null
+
+	const rangeStartMs = Math.max(startMs, Math.min(...rangedEvents.map((event) => event.startMs)))
+	const rangeEndMs = Math.min(endMs, Math.max(...rangedEvents.map((event) => event.endMs)))
+	if (rangeEndMs <= rangeStartMs) return null
+
+	const left = Math.min(...rangedEvents.map((event) => event.x))
+	const right = Math.max(...rangedEvents.map((event) => event.endX))
+
+	return {
+		left: Math.min(left, right),
+		right: Math.max(left, right),
+	}
+})
+
+const rangeHighlight = computed(() => {
+	const range = activeRange.value
+	const geometry = props.geometry
+	if (!range || !geometry) return null
+
+	return {
+		top: `${geometry.top}px`,
+		height: `${geometry.bottom - geometry.top}px`,
+		transform: `translate(${range.left}px, 0)`,
+		width: `${Math.max(1, range.right - range.left)}px`,
+	}
+})
+
+const markerTop = computed(() => {
+	const geometry = props.geometry
+	if (!geometry) return 0
+	const preferredTop = geometry.top
+	return Math.min(containerHeight.value - MARKER_HEIGHT_PX - EDGE_PADDING_PX, preferredTop)
+})
+
+const tooltipStyle = computed(() => {
+	const group = activeGroup.value
+	if (!group) return {}
+
+	const viewportWidth = typeof window === 'undefined' ? containerWidth.value : window.innerWidth
+	const viewportHeight = typeof window === 'undefined' ? containerHeight.value : window.innerHeight
+	const desiredLeft = chartRect.left + group.x - tooltipWidth.value / 2
+	const maxLeft = Math.max(EDGE_PADDING_PX, viewportWidth - tooltipWidth.value - EDGE_PADDING_PX)
+	const left = Math.min(maxLeft, Math.max(EDGE_PADDING_PX, desiredLeft))
+
+	const desiredTop =
+		chartRect.top + markerTop.value - tooltipHeight.value - TOOLTIP_OFFSET_PX - MARKER_HEIGHT_PX
+	const maxTop = Math.max(EDGE_PADDING_PX, viewportHeight - tooltipHeight.value - EDGE_PADDING_PX)
+	const top = Math.min(maxTop, Math.max(EDGE_PADDING_PX, desiredTop))
+
+	return {
+		transform: `translate3d(${left}px, ${top}px, 0)`,
+	}
+})
+
+function updateChartRect() {
+	if (!chartElement.value) return
+	const rect = chartElement.value.getBoundingClientRect()
+	chartRect.left = rect.left
+	chartRect.top = rect.top
+}
+
+function doesEventMatchActiveStat(event: AnalyticsChartEvent) {
+	if (!event.for_metric_kind?.length) return true
+
+	return event.for_metric_kind.some((metricKind) => {
+		return metricKind === props.activeStat
+	})
+}
+
+function getEventKey(event: AnalyticsChartEvent) {
+	return `${event.title}:${event.starts}:${event.ends}:${event.announcement_url ?? ''}:${
+		event.for_metric_kind?.join(',') ?? ''
+	}`
+}
+
+function getDateBucketX(
+	value: string,
+	fallbackMs: number,
+	geometry: AnalyticsChartGeometryPayload,
+	startMs: number,
+	endMs: number,
+) {
+	if (isTimeRelevantForGroupBy(props.groupBy)) {
+		const clampedMs = Math.max(startMs, Math.min(endMs, fallbackMs))
+		return getTimeAxisX(clampedMs, geometry, startMs, endMs)
+	}
+
+	const dateInputValue = getEventDateInputValue(value)
+	const xPositions = geometry.xPositions
+	const bucketMs = xPositions.length > 0 ? (endMs - startMs) / xPositions.length : 0
+	if (!dateInputValue || bucketMs <= 0) {
+		const clampedMs = Math.max(startMs, Math.min(endMs, fallbackMs))
+		return getTimeAxisX(clampedMs, geometry, startMs, endMs)
+	}
+
+	for (let index = 0; index < xPositions.length; index++) {
+		const bucketDate = getBucketDateForEventSnap(index, bucketMs, startMs)
+		if (getDateInputValue(bucketDate) === dateInputValue) {
+			const x = xPositions[index]
+			return Number.isFinite(x) ? x : null
+		}
+	}
+
+	const clampedMs = Math.max(startMs, Math.min(endMs, fallbackMs))
+	return getTimeAxisX(clampedMs, geometry, startMs, endMs)
+}
+
+function getBucketDateForEventSnap(index: number, bucketMs: number, startMs: number): Date {
+	const bucketOffset = isTimeRelevantForGroupBy(props.groupBy) ? index : index + 1
+	return new Date(startMs + bucketOffset * bucketMs)
+}
+
+function getTimeAxisX(
+	targetMs: number,
+	geometry: AnalyticsChartGeometryPayload,
+	startMs: number,
+	endMs: number,
+) {
+	const xPositions = geometry.xPositions
+	const bucketMs = xPositions.length > 0 ? (endMs - startMs) / xPositions.length : 0
+	if (xPositions.length === 0 || bucketMs <= 0) return null
+	if (xPositions.length === 1) return xPositions[0]
+
+	const firstX = xPositions[0]
+	const lastX = xPositions[xPositions.length - 1]
+	if (!Number.isFinite(firstX) || !Number.isFinite(lastX)) return null
+
+	const firstBucketEndMs = startMs + bucketMs
+	const clampedTargetMs = Math.min(endMs, Math.max(firstBucketEndMs, targetMs))
+	const progress = (clampedTargetMs - firstBucketEndMs) / (endMs - firstBucketEndMs)
+
+	return firstX + progress * (lastX - firstX)
+}
+
+function getMarkerStyle(group: EventGroup) {
+	return {
+		transform: `translate(-50%, 0) translate(${group.x}px, ${markerTop.value}px)`,
+	}
+}
+
+function getGuideStyle(group: EventGroup) {
+	const geometry = props.geometry
+	if (!geometry) return {}
+
+	return {
+		top: `${geometry.top}px`,
+		height: `${geometry.bottom - geometry.top}px`,
+		transform: `translate(${group.x}px, 0)`,
+	}
+}
+
+function getGroupAriaLabel(group: EventGroup) {
+	if (group.events.length === 1) {
+		return group.events[0].title
+	}
+
+	return `${group.events.length} analytics events`
+}
+
+function clearCloseTimeout() {
+	if (!closeTimeout) return
+	clearTimeout(closeTimeout)
+	closeTimeout = null
+}
+
+function showHoveredGroup(groupId: string) {
+	clearCloseTimeout()
+	updateChartRect()
+	hoveredGroupId.value = groupId
+}
+
+function scheduleHoverClose() {
+	clearCloseTimeout()
+	closeTimeout = setTimeout(() => {
+		if (!isTooltipHovered.value) {
+			hoveredGroupId.value = null
+		}
+		closeTimeout = null
+	}, CLOSE_DELAY_MS)
+}
+
+function clearActiveGroup() {
+	clearCloseTimeout()
+	hoveredGroupId.value = null
+	isTooltipHovered.value = false
+}
+
+function onTooltipMouseEnter() {
+	clearCloseTimeout()
+	isTooltipHovered.value = true
+}
+
+function onTooltipMouseLeave() {
+	isTooltipHovered.value = false
+	scheduleHoverClose()
+}
+
+function getDateInputValue(date: Date): string {
+	const year = date.getFullYear()
+	const month = String(date.getMonth() + 1).padStart(2, '0')
+	const day = String(date.getDate()).padStart(2, '0')
+	return `${year}-${month}-${day}`
+}
+
+function getEventDateInputValue(value: string): string | null {
+	const parsedDate = new Date(value)
+	if (Number.isNaN(parsedDate.getTime())) return null
+	return getDateInputValue(parsedDate)
+}
+
+function formatEventRange(event: AnalyticsChartEvent) {
+	const startDate = new Date(event.starts)
+	const endDate = new Date(event.ends)
+	if (Number.isNaN(startDate.getTime()) || Number.isNaN(endDate.getTime())) {
+		return `${event.starts} - ${event.ends}`
+	}
+
+	const startDateValue = getDateInputValue(startDate)
+	const endDateValue = getDateInputValue(endDate)
+
+	const sameYear = startDate.getFullYear() === endDate.getFullYear()
+
+	if (startDate.getTime() === endDate.getTime()) {
+		return EVENT_RANGE_DATE_TIME_FORMATTER.format(startDate)
+	}
+
+	if (startDateValue === endDateValue) {
+		return `${EVENT_RANGE_DATE_FORMATTER.format(startDate)}, ${EVENT_RANGE_TIME_FORMATTER.format(
+			startDate,
+		)} - ${EVENT_RANGE_TIME_FORMATTER.format(endDate)}`
+	}
+
+	if (sameYear) {
+		const startLabel = EVENT_RANGE_MONTH_DAY_TIME_FORMATTER.format(startDate)
+		const endLabel = EVENT_RANGE_MONTH_DAY_TIME_FORMATTER.format(endDate)
+		return `${startLabel} - ${endLabel}, ${startDate.getFullYear()}`
+	}
+
+	const startLabel = EVENT_RANGE_DATE_TIME_FORMATTER.format(startDate)
+	const endLabel = EVENT_RANGE_DATE_TIME_FORMATTER.format(endDate)
+	return `${startLabel} - ${endLabel}`
+}
+
+watch(
+	() => [activeGroup.value, props.containerWidth, props.containerHeight],
+	() => {
+		nextTick(() => {
+			updateChartRect()
+			if (!tooltipElement.value) return
+			tooltipWidth.value = tooltipElement.value.offsetWidth
+			tooltipHeight.value = tooltipElement.value.offsetHeight
+		})
+	},
+	{ deep: true, immediate: true },
+)
+
+watch(eventGroups, (groups) => {
+	const groupIds = new Set(groups.map((group) => group.id))
+	if (hoveredGroupId.value && !groupIds.has(hoveredGroupId.value)) {
+		hoveredGroupId.value = null
+	}
+})
+
+onMounted(() => {
+	updateChartRect()
+	window.addEventListener('resize', updateChartRect)
+	window.addEventListener('scroll', updateChartRect, true)
+})
+
+onBeforeUnmount(() => {
+	clearCloseTimeout()
+	window.removeEventListener('resize', updateChartRect)
+	window.removeEventListener('scroll', updateChartRect, true)
+})
+</script>
+
+<style scoped>
+.analytics-event-tooltip {
+	opacity: 1;
+	transition:
+		opacity 140ms ease-out,
+		transform 180ms ease-out;
+	will-change: opacity, transform;
+}
+
+.analytics-event-tooltip-fade-enter-from,
+.analytics-event-tooltip-fade-leave-to {
+	opacity: 0;
+}
+
+.analytics-event-tooltip-fade-enter-active,
+.analytics-event-tooltip-fade-leave-active {
+	transition:
+		opacity 140ms ease-out,
+		transform 180ms ease-out;
+}
+
+.analytics-event-range-highlight-fade-enter-active,
+.analytics-event-range-highlight-fade-leave-active {
+	transition: opacity 140ms ease-out;
+}
+
+.analytics-event-range-highlight-fade-enter-from,
+.analytics-event-range-highlight-fade-leave-to {
+	opacity: 0;
+}
+</style>
diff --git a/apps/frontend/src/components/analytics/graph/AnalyticsChartTooltip.vue b/apps/frontend/src/components/analytics/graph/AnalyticsChartTooltip.vue
new file mode 100644
index 0000000000..7076dda18b
--- /dev/null
+++ b/apps/frontend/src/components/analytics/graph/AnalyticsChartTooltip.vue
@@ -0,0 +1,355 @@
+<template>
+	<div
+		v-show="visible"
+		ref="tooltipElement"
+		class="analytics-chart-tooltip absolute left-0 top-0 z-10 flex max-h-[360px] min-w-[14rem] flex-col overflow-hidden rounded-lg border border-solid border-surface-5 bg-surface-3 py-2 text-sm shadow-lg"
+		:class="pinned ? '' : 'pointer-events-none'"
+		:style="positionStyle"
+		@click.stop
+	>
+		<div
+			class="mb-1.5 flex shrink-0 items-center justify-between gap-2 border-0 border-b border-solid border-surface-5 px-3 pb-1.5 font-medium text-contrast"
+		>
+			<span>
+				{{ rangeLabel }}
+				<span v-if="durationLabel" class="text-xs font-normal text-secondary">
+					({{ durationLabel }})
+				</span>
+			</span>
+			<PinIcon
+				v-if="pinned"
+				v-tooltip="'Chart tooltip pinned'"
+				class="pointer-events-none size-4 shrink-0 font-normal text-contrast"
+				aria-label="Pinned"
+			/>
+		</div>
+		<div
+			ref="entriesElement"
+			class="flex min-h-0 flex-col gap-1 overflow-y-auto overscroll-contain px-3"
+		>
+			<div v-if="!ratioMode" class="flex shrink-0 items-center justify-between gap-4">
+				<span class="font-medium text-primary">Total</span>
+				<span class="font-semibold text-contrast">{{ formattedTotal }}</span>
+			</div>
+			<div
+				v-for="entry in entries"
+				:key="entry.projectId"
+				class="flex w-full items-center justify-between gap-4 text-primary"
+			>
+				<button
+					type="button"
+					class="inline-flex items-center gap-1.5 border-0 bg-transparent p-0 text-left focus-visible:!outline-none"
+					:class="
+						entry.toggleDisabled && !shiftKeyPressed
+							? 'cursor-default'
+							: entry.hidden
+								? 'cursor-pointer text-secondary opacity-70'
+								: 'cursor-pointer text-primary transition-all hover:brightness-125'
+					"
+					:aria-label="`${entry.hidden ? 'Show' : 'Hide'} ${entry.name} in graph`"
+					@mouseenter="emit('entry-hover', entry.projectId)"
+					@mouseleave="emit('entry-hover-clear', entry.projectId)"
+					@focus="emit('entry-hover', entry.projectId)"
+					@blur="emit('entry-hover-clear', entry.projectId)"
+					@click="onEntryClick($event, entry)"
+				>
+					<span
+						:class="
+							entry.isPreviousPeriod
+								? 'h-0 w-2 rounded-none border-0 border-t-2 border-dashed bg-transparent'
+								: 'size-2 rounded-full'
+						"
+						:style="
+							entry.isPreviousPeriod
+								? { borderColor: entry.color }
+								: { backgroundColor: entry.color }
+						"
+					/>
+					<span
+						v-tooltip="entry.projectName ?? ''"
+						:class="{
+							'line-through': entry.hidden,
+							capitalize: capitalizeLabels,
+						}"
+					>
+						{{ entry.name }}
+					</span>
+				</button>
+				<span
+					:class="[
+						entry.isPreviousPeriod ? 'font-medium text-secondary' : 'font-semibold',
+						entry.hidden ? 'text-primary line-through opacity-70' : 'text-contrast',
+					]"
+				>
+					{{ entry.formattedValue }}
+				</span>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { PinIcon } from '@modrinth/assets'
+
+export type AnalyticsChartTooltipEntry = {
+	projectId: string
+	name: string
+	projectName?: string
+	color: string
+	formattedValue: string
+	hidden: boolean
+	toggleDisabled: boolean
+	isPreviousPeriod?: boolean
+}
+
+const props = defineProps<{
+	visible: boolean
+	x: number
+	y: number
+	start: Date | null
+	end: Date | null
+	chartStart: Date | null
+	chartEnd: Date | null
+	formattedTotal: string
+	entries: AnalyticsChartTooltipEntry[]
+	containerWidth: number
+	containerHeight: number
+	pinned: boolean
+	ratioMode: boolean
+	capitalizeLabels: boolean
+	shiftKeyPressed: boolean
+}>()
+
+const emit = defineEmits<{
+	'entry-click': [projectId: string, shiftKey: boolean]
+	'entry-hover': [projectId: string]
+	'entry-hover-clear': [projectId: string]
+}>()
+
+function onEntryClick(event: MouseEvent, entry: AnalyticsChartTooltipEntry) {
+	if (entry.toggleDisabled && !event.shiftKey) return
+	emit('entry-click', entry.projectId, event.shiftKey)
+}
+
+const ONE_DAY_MS = 24 * 60 * 60 * 1000
+const ONE_HOUR_MS = 60 * 60 * 1000
+const ONE_MINUTE_MS = 60 * 1000
+
+function getDayPeriod(date: Date, options: Intl.DateTimeFormatOptions): string | null {
+	return (
+		new Intl.DateTimeFormat(undefined, options)
+			.formatToParts(date)
+			.find((part) => part.type === 'dayPeriod')?.value ?? null
+	)
+}
+
+function formatDateWithoutDayPeriod(date: Date, options: Intl.DateTimeFormatOptions): string {
+	const parts = new Intl.DateTimeFormat(undefined, options).formatToParts(date)
+	const dayPeriodIndex = parts.findIndex((part) => part.type === 'dayPeriod')
+	if (dayPeriodIndex === -1) return parts.map((part) => part.value).join('')
+
+	const previousPart = parts[dayPeriodIndex - 1]
+	const nextPart = parts[dayPeriodIndex + 1]
+
+	parts.splice(dayPeriodIndex, 1)
+
+	if (previousPart?.type === 'literal') {
+		parts[dayPeriodIndex - 1] = {
+			...previousPart,
+			value: previousPart.value.replace(/\s+$/, ''),
+		}
+	} else if (nextPart?.type === 'literal') {
+		parts[dayPeriodIndex] = {
+			...nextPart,
+			value: nextPart.value.replace(/^\s+/, ''),
+		}
+	}
+
+	return parts.map((part) => part.value).join('')
+}
+
+function formatRangeLabel(
+	start: Date,
+	end: Date,
+	chartStart: Date | null,
+	chartEnd: Date | null,
+): string {
+	const includeTime = end.getTime() - start.getTime() < ONE_DAY_MS
+	const yearsDiffer = start.getFullYear() !== end.getFullYear()
+	const chartYearsDiffer =
+		chartStart !== null && chartEnd !== null && chartStart.getFullYear() !== chartEnd.getFullYear()
+	const showTrailingYear = !yearsDiffer && chartYearsDiffer
+	const monthsDiffer = yearsDiffer || start.getMonth() !== end.getMonth()
+	const daysDiffer = monthsDiffer || start.getDate() !== end.getDate()
+
+	const timeOptions: Intl.DateTimeFormatOptions = includeTime
+		? { hour: 'numeric', minute: '2-digit' }
+		: {}
+
+	const startOptions: Intl.DateTimeFormatOptions = {
+		month: 'short',
+		day: 'numeric',
+		...(yearsDiffer ? { year: 'numeric' } : {}),
+		...timeOptions,
+	}
+
+	let endOptions: Intl.DateTimeFormatOptions
+	if (!daysDiffer && includeTime) {
+		endOptions = { ...timeOptions }
+	} else if (yearsDiffer) {
+		endOptions = { month: 'short', day: 'numeric', year: 'numeric', ...timeOptions }
+	} else if (monthsDiffer || includeTime) {
+		endOptions = { month: 'short', day: 'numeric', ...timeOptions }
+	} else {
+		endOptions = { day: 'numeric' }
+	}
+
+	const startDayPeriod = includeTime ? getDayPeriod(start, timeOptions) : null
+	const endDayPeriod = includeTime ? getDayPeriod(end, timeOptions) : null
+	const showEndDayPeriodOnly = startDayPeriod !== null && startDayPeriod === endDayPeriod
+	const startLabel = showEndDayPeriodOnly
+		? formatDateWithoutDayPeriod(start, startOptions)
+		: new Intl.DateTimeFormat(undefined, startOptions).format(start)
+	const endLabel = new Intl.DateTimeFormat(undefined, endOptions).format(end)
+	const range = `${startLabel}–${endLabel}`
+
+	if (!showTrailingYear) return range
+
+	const yearLabel = new Intl.DateTimeFormat(undefined, { year: 'numeric' }).format(end)
+	return `${range}, ${yearLabel}`
+}
+
+function formatDurationLabel(start: Date, end: Date): string {
+	const durationMs = end.getTime() - start.getTime()
+	if (!Number.isFinite(durationMs) || durationMs <= 0) return ''
+
+	if (durationMs >= ONE_DAY_MS) {
+		const days = Math.round(durationMs / ONE_DAY_MS)
+		return `${days} ${days === 1 ? 'day' : 'days'}`
+	}
+	if (durationMs >= ONE_HOUR_MS) {
+		const hours = Math.round(durationMs / ONE_HOUR_MS)
+		return `${hours} ${hours === 1 ? 'hour' : 'hours'}`
+	}
+	const minutes = Math.max(1, Math.round(durationMs / ONE_MINUTE_MS))
+	return `${minutes} ${minutes === 1 ? 'minute' : 'minutes'}`
+}
+
+const rangeLabel = computed(() =>
+	props.start && props.end
+		? formatRangeLabel(props.start, props.end, props.chartStart, props.chartEnd)
+		: '',
+)
+
+const durationLabel = computed(() =>
+	props.start && props.end ? formatDurationLabel(props.start, props.end) : '',
+)
+
+const tooltipElement = ref<HTMLDivElement | null>(null)
+const entriesElement = ref<HTMLDivElement | null>(null)
+const tooltipWidth = ref(0)
+const tooltipHeight = ref(0)
+const tooltipOffsetParentLeft = ref(0)
+const viewportWidth = ref(0)
+
+const CURSOR_OFFSET = 12
+const EDGE_PADDING = 8
+const WHEEL_DELTA_LINE = 1
+const WHEEL_DELTA_PAGE = 2
+const WHEEL_LINE_HEIGHT = 16
+
+function updateTooltipMeasurements() {
+	nextTick(() => {
+		const element = tooltipElement.value
+		if (!element) return
+
+		tooltipWidth.value = element.offsetWidth
+		tooltipHeight.value = element.offsetHeight
+
+		const offsetParent =
+			element.offsetParent instanceof HTMLElement ? element.offsetParent : element.parentElement
+		tooltipOffsetParentLeft.value = offsetParent?.getBoundingClientRect().left ?? 0
+		viewportWidth.value =
+			document.documentElement.clientWidth || window.innerWidth || props.containerWidth
+	})
+}
+
+watch(
+	() => [
+		props.visible,
+		props.entries,
+		rangeLabel.value,
+		durationLabel.value,
+		props.pinned,
+		props.containerWidth,
+		props.containerHeight,
+	],
+	updateTooltipMeasurements,
+	{ deep: true, immediate: true },
+)
+
+onMounted(() => {
+	updateTooltipMeasurements()
+	window.addEventListener('resize', updateTooltipMeasurements)
+})
+
+onBeforeUnmount(() => {
+	window.removeEventListener('resize', updateTooltipMeasurements)
+})
+
+function getNormalizedWheelDeltaY(event: WheelEvent, element: HTMLElement) {
+	if (event.deltaMode === WHEEL_DELTA_PAGE) return event.deltaY * element.clientHeight
+	if (event.deltaMode === WHEEL_DELTA_LINE) return event.deltaY * WHEEL_LINE_HEIGHT
+	return event.deltaY
+}
+
+function consumeWheel(event: WheelEvent): boolean {
+	const element = entriesElement.value
+	if (!props.visible || !element) return false
+
+	const maxScrollTop = element.scrollHeight - element.clientHeight
+	if (maxScrollTop <= 0) return false
+
+	const deltaY = getNormalizedWheelDeltaY(event, element)
+	if (deltaY === 0) return false
+
+	const scrollTop = element.scrollTop
+	element.scrollTop = Math.min(maxScrollTop, Math.max(0, scrollTop + deltaY))
+	event.preventDefault()
+	return true
+}
+
+defineExpose({
+	consumeWheel,
+})
+
+const positionStyle = computed(() => {
+	const desiredLeft = props.x + CURSOR_OFFSET
+	const viewportRight = viewportWidth.value || tooltipOffsetParentLeft.value + props.containerWidth
+	const desiredViewportRight = tooltipOffsetParentLeft.value + desiredLeft + tooltipWidth.value
+	const shouldPlaceLeft =
+		props.x <= props.containerWidth / 4 || desiredViewportRight > viewportRight - EDGE_PADDING
+	const candidateLeft = shouldPlaceLeft ? props.x - tooltipWidth.value - CURSOR_OFFSET : desiredLeft
+	const minLeft = EDGE_PADDING - tooltipOffsetParentLeft.value
+	const maxLeft = Math.max(
+		minLeft,
+		viewportRight - tooltipOffsetParentLeft.value - tooltipWidth.value - EDGE_PADDING,
+	)
+	const clampedLeft = Math.min(maxLeft, Math.max(minLeft, candidateLeft))
+
+	const desiredTop = props.y - tooltipHeight.value / 2
+	const maxTop = Math.max(EDGE_PADDING, props.containerHeight - tooltipHeight.value - EDGE_PADDING)
+	const clampedTop = Math.min(maxTop, Math.max(EDGE_PADDING, desiredTop))
+
+	return {
+		transform: `translate3d(${clampedLeft}px, ${clampedTop}px, 0)`,
+	}
+})
+</script>
+
+<style scoped>
+.analytics-chart-tooltip {
+	transition: transform 750ms cubic-bezier(0.22, 1, 0.36, 1);
+	will-change: transform;
+}
+</style>
diff --git a/apps/frontend/src/components/analytics/graph/AnalyticsGraph.vue b/apps/frontend/src/components/analytics/graph/AnalyticsGraph.vue
new file mode 100644
index 0000000000..8122ec6a30
--- /dev/null
+++ b/apps/frontend/src/components/analytics/graph/AnalyticsGraph.vue
@@ -0,0 +1,1436 @@
+<template>
+	<NewModal
+		ref="showAllSelectedGraphDatasetsModal"
+		:header="`Show all ${tableProjectCount} lines in graph?`"
+		fade="warning"
+		width="500px"
+		max-width="calc(100vw - 2rem)"
+	>
+		<p class="m-0 max-w-[32rem] text-primary">
+			Showing all selected lines from table may degrade page performance.
+		</p>
+
+		<template #actions>
+			<div class="flex justify-end gap-2">
+				<ButtonStyled type="transparent">
+					<button @click="showAllSelectedGraphDatasetsModal?.hide()">Cancel</button>
+				</ButtonStyled>
+				<ButtonStyled color="orange">
+					<button class="!shadow-none" @click="confirmShowAllSelectedGraphDatasets">
+						Show all
+					</button>
+				</ButtonStyled>
+			</div>
+		</template>
+	</NewModal>
+
+	<section
+		class="relative flex flex-col rounded-2xl border border-solid border-surface-5 bg-surface-3"
+	>
+		<div class="flex w-full flex-col gap-4 xl:flex-row xl:items-start xl:justify-between">
+			<div
+				class="flex w-full flex-col items-start gap-3 rounded-t-2xl border-0 border-b border-solid border-surface-5 bg-surface-3 p-4 sm:flex-row sm:flex-wrap sm:items-center sm:justify-between"
+			>
+				<div class="flex min-w-0 flex-col gap-0.5">
+					<div class="text-xl font-semibold text-contrast">
+						{{ graphTitle }}
+					</div>
+					<div
+						v-if="showTableSelectionSubheading"
+						class="m-0 flex flex-wrap items-center gap-2 text-sm text-secondary"
+					>
+						<span>{{ tableSelectionSubheading }}</span>
+
+						<button
+							v-if="showGraphRenderLimitButton"
+							type="button"
+							class="font-base border-0 bg-transparent p-0 text-sm underline transition-all hover:brightness-125"
+							@click="toggleGraphRenderLimit"
+						>
+							{{ graphRenderLimitButtonLabel }}
+						</button>
+						<button
+							v-if="showTopGraphDatasetsButton"
+							type="button"
+							class="font-base border-0 bg-transparent p-0 text-sm underline transition-all hover:brightness-125"
+							@click="showTopGraphDatasets"
+						>
+							Show top 8
+						</button>
+					</div>
+				</div>
+
+				<div class="flex w-full flex-wrap items-center gap-3 sm:w-auto sm:justify-end">
+					<div v-if="canUseRatioMode" class="inline-flex items-center gap-2">
+						<label for="ratio-mode-toggle" class="cursor-pointer text-sm text-secondary"
+							>Ratio</label
+						>
+						<Toggle id="ratio-mode-toggle" v-model="isRatioMode" small />
+					</div>
+					<div v-if="canShowPreviousPeriodToggle" class="inline-flex items-center gap-2">
+						<label for="previous-period-toggle" class="cursor-pointer text-sm text-secondary"
+							>Prev. period</label
+						>
+						<Toggle id="previous-period-toggle" v-model="showPreviousPeriod" small />
+					</div>
+					<div v-if="hasChartEvents" class="inline-flex items-center gap-2">
+						<label for="events-toggle" class="cursor-pointer text-sm text-secondary">Events</label>
+						<Toggle id="events-toggle" v-model="showChartEvents" small />
+					</div>
+					<Tabs
+						:value="activeGraphViewMode"
+						:tabs="viewModeTabs"
+						@update:value="activeGraphViewMode = $event as AnalyticsGraphViewMode"
+					/>
+				</div>
+			</div>
+		</div>
+
+		<div
+			class="flex flex-col gap-6 px-4 pb-6 pt-5"
+			:class="['transition-opacity', isDataLoading ? 'pointer-events-none opacity-75' : '']"
+		>
+			<div class="relative">
+				<Transition
+					enter-active-class="transition-all duration-200 ease-out"
+					enter-from-class="opacity-0 max-h-0"
+					enter-to-class="opacity-100 max-h-5"
+					leave-active-class="transition-all duration-200 ease-in"
+					leave-from-class="opacity-100 max-h-5"
+					leave-to-class="opacity-0 max-h-0"
+				>
+					<div
+						v-if="showLegendTopFade"
+						class="pointer-events-none absolute left-0 right-0 top-0 z-10 h-5 bg-gradient-to-b from-surface-3 to-transparent"
+					/>
+				</Transition>
+
+				<div
+					ref="legendContainer"
+					class="flex max-h-[160px] flex-wrap items-center gap-y-1 overflow-y-auto px-3"
+					@scroll="checkLegendScrollState"
+				>
+					<div
+						v-for="legendEntry in displayedLegendEntries"
+						:key="legendEntry.id"
+						class="inline-flex items-center"
+					>
+						<button
+							v-tooltip="getLegendEntryTooltip(legendEntry)"
+							type="button"
+							class="inline-flex items-center gap-1.5 px-2 py-0.5 text-sm !outline-0 transition-all focus-within:!outline-0 focus:!outline-0 focus-visible:!outline-0"
+							:class="[
+								legendEntry.hidden ? 'text-secondary opacity-70' : 'text-primary',
+								isLegendEntryToggleDisabled(legendEntry) && !isShiftKeyPressed
+									? 'cursor-default'
+									: 'cursor-pointer hover:brightness-125',
+							]"
+							:aria-pressed="!legendEntry.hidden"
+							@mouseenter="setHoveredLegendEntryId(legendEntry.id)"
+							@mouseleave="clearHoveredLegendEntryId(legendEntry.id)"
+							@focus="setHoveredLegendEntryId(legendEntry.id)"
+							@blur="clearHoveredLegendEntryId(legendEntry.id)"
+							@click="onLegendEntryClick($event, legendEntry.id)"
+						>
+							<span
+								:class="
+									legendEntry.isPreviousPeriod
+										? 'h-0 w-2 rounded-none border-0 border-t-2 border-dashed bg-transparent'
+										: 'size-2 rounded-full'
+								"
+								:style="
+									legendEntry.isPreviousPeriod
+										? { borderColor: legendEntry.color }
+										: { backgroundColor: legendEntry.color }
+								"
+							/>
+							<span
+								:class="{
+									'line-through': legendEntry.hidden,
+									capitalize: shouldCapitalizeDatasetLabels,
+								}"
+							>
+								{{ legendEntry.name }}
+							</span>
+						</button>
+						<Dropdown
+							v-if="isUnmonetizedLegendEntry(legendEntry)"
+							theme="analytics-monetization-popover"
+							:triggers="['hover', 'focus']"
+							:popper-triggers="['hover', 'focus']"
+							:delay="{ show: 0, hide: 250 }"
+							placement="top"
+							:aria-id="monetizationPopoverId"
+							no-auto-focus
+						>
+							<button
+								type="button"
+								class="-ml-1 mt-px inline-flex items-center justify-center rounded-full border-0 bg-transparent p-0 text-secondary transition-all hover:text-contrast focus-visible:text-contrast"
+								aria-label="View monetized analytics details"
+							>
+								<InfoIcon class="size-4" />
+							</button>
+							<template #popper>
+								<div
+									role="dialog"
+									aria-label="Monetized analytics details"
+									class="font-base w-[292px] rounded-xl border border-solid border-surface-5 bg-surface-3 p-3 text-sm leading-snug shadow-2xl"
+								>
+									A view or download is monetized when ads can be shown and required consent or
+									region rules allow it.
+									<a
+										href="https://modrinth.com/legal/cmp-info"
+										target="_blank"
+										rel="noopener noreferrer"
+										class="text-link underline"
+									>
+										Learn more
+									</a>
+								</div>
+							</template>
+						</Dropdown>
+					</div>
+					<button
+						v-if="canToggleLegendExpansion"
+						type="button"
+						class="font-base ml-1 text-sm text-secondary underline !transition-all hover:text-contrast"
+						:aria-expanded="isLegendExpanded"
+						@click="toggleLegendExpansion"
+					>
+						{{ isLegendExpanded ? 'Show less' : 'Show more' }}
+					</button>
+				</div>
+
+				<Transition
+					enter-active-class="transition-all duration-200 ease-out"
+					enter-from-class="opacity-0 max-h-0"
+					enter-to-class="opacity-100 max-h-5"
+					leave-active-class="transition-all duration-200 ease-in"
+					leave-from-class="opacity-100 max-h-5"
+					leave-to-class="opacity-0 max-h-0"
+				>
+					<div
+						v-if="showLegendBottomFade"
+						class="pointer-events-none absolute bottom-0 left-0 right-0 z-10 h-5 bg-gradient-to-t from-surface-3 to-transparent"
+					/>
+				</Transition>
+			</div>
+
+			<div
+				ref="chartContainer"
+				class="relative h-[460px]"
+				@click="onChartClick"
+				@wheel.capture="onChartWheel"
+			>
+				<div :class="['h-full']">
+					<div
+						v-if="showEmptyChartState"
+						class="flex h-full items-center justify-center rounded-xl"
+					>
+						<div
+							v-if="!isDataLoading"
+							class="relative bottom-6 text-base font-normal text-secondary"
+						>
+							{{ emptyChartMessage }}
+						</div>
+					</div>
+					<template v-else>
+						<ClientOnly>
+							<AnalyticsChart
+								:type="chartType"
+								:fill="isArea"
+								:stacked="isStacked"
+								:ratio-mode="isRatioMode"
+								:datasets="visibleChartDatasets"
+								:labels="chartLabels"
+								:x-axis-tick-limit="xAxisTickLimit"
+								:active-stat="activeStat"
+								:pinned-slice-index="pinnedSliceIndex"
+								:highlighted-dataset-id="highlightedChartDatasetId"
+								@hover="onChartHover"
+								@geometry="onChartGeometry"
+								@pinned-drag="onPinnedDrag"
+								@range-select="onRangeSelect"
+							/>
+						</ClientOnly>
+						<AnalyticsChartEvents
+							v-if="showChartEvents"
+							:events="localAnalyticsChartEvents"
+							:active-stat="activeStat"
+							:group-by="selectedGroupBy"
+							:chart-start="chartRangeBounds?.start ?? null"
+							:chart-end="chartRangeBounds?.end ?? null"
+							:geometry="chartGeometry"
+							:container-width="containerSize.width"
+							:container-height="containerSize.height"
+						/>
+						<div
+							v-if="showHoverGuide"
+							aria-hidden="true"
+							class="pointer-events-none absolute bottom-0 left-0 top-0 z-10 mb-[1.8rem] mt-2.5 border-0 border-l border-solid border-contrast opacity-25"
+							:style="{ transform: `translate(${hoverState.x}px, 0)` }"
+						/>
+						<div
+							v-if="showPinnedGuide"
+							aria-hidden="true"
+							class="pointer-events-none absolute bottom-0 left-0 top-0 z-10 mb-[1.8rem] mt-2.5 border-0 border-l border-dashed border-green opacity-75"
+							:style="{ transform: `translate(${hoverState.x}px, 0)` }"
+						/>
+						<AnalyticsChartTooltip
+							ref="chartTooltip"
+							:visible="hoverState.visible"
+							:x="hoverState.x"
+							:y="hoverState.y"
+							:start="hoverBucketRange?.start ?? null"
+							:end="hoverBucketRange?.end ?? null"
+							:chart-start="chartRangeBounds?.start ?? null"
+							:chart-end="chartRangeBounds?.end ?? null"
+							:formatted-total="hoverFormattedTotal"
+							:entries="hoverEntries"
+							:container-width="containerSize.width"
+							:container-height="containerSize.height"
+							:pinned="isHoverPinned"
+							:ratio-mode="isRatioMode"
+							:capitalize-labels="shouldCapitalizeDatasetLabels"
+							:shift-key-pressed="isShiftKeyPressed"
+							@entry-click="onTooltipEntryClick"
+							@entry-hover="setHoveredLegendEntryId"
+							@entry-hover-clear="clearHoveredLegendEntryId"
+						/>
+					</template>
+				</div>
+			</div>
+		</div>
+		<div v-if="isDataLoading" class="absolute inset-0 z-[19] overflow-hidden rounded-xl">
+			<AnalyticsLoadingBar :loading="isDataLoading" />
+			<div class="absolute inset-0 bg-surface-3 opacity-50" />
+			<div class="absolute inset-0 backdrop-blur-[3px]" />
+			<div class="absolute inset-0 flex items-center justify-center">
+				<div
+					class="relative bottom-6 inline-flex items-center gap-2 text-lg font-semibold text-primary"
+				>
+					<span>Fetching results...</span>
+				</div>
+			</div>
+		</div>
+	</section>
+</template>
+
+<script setup lang="ts">
+import { ChartAreaIcon, ChartColumnBigIcon, ChartSplineIcon, InfoIcon } from '@modrinth/assets'
+import {
+	ButtonStyled,
+	injectModrinthClient,
+	NewModal,
+	Tabs,
+	type TabsTab,
+	Toggle,
+	useFormatNumber,
+	useScrollIndicator,
+} from '@modrinth/ui'
+import { useQuery } from '@tanstack/vue-query'
+import { Dropdown } from 'floating-vue'
+
+import { isDarkTheme } from '~/plugins/theme/index.ts'
+import type {
+	AnalyticsDashboardStat,
+	AnalyticsGraphViewMode,
+} from '~/providers/analytics/analytics'
+import {
+	doesProjectStatusMatchFilters,
+	injectAnalyticsDashboardContext,
+} from '~/providers/analytics/analytics'
+
+import AnalyticsLoadingBar from '../AnalyticsLoadingBar.vue'
+import {
+	ensureMinimumTimeRange,
+	getDefaultAnalyticsGroupByForDurationMinutes,
+} from '../query-builder/timeframe-picker/timeframe'
+import AnalyticsChart, {
+	type AnalyticsChartGeometryPayload,
+	type AnalyticsChartRangeSelectPayload,
+} from './AnalyticsChart.client.vue'
+import AnalyticsChartEvents from './AnalyticsChartEvents.vue'
+import AnalyticsChartTooltip, { type AnalyticsChartTooltipEntry } from './AnalyticsChartTooltip.vue'
+import {
+	buildChartDatasets,
+	buildTimeAxisLabels,
+	type ChartDataset,
+	formatMetricValue,
+	getShortHourlyAxisTickLimit,
+	getSliceBucketRange,
+	getSliceCount,
+	shouldCapitalizeBreakdownLabel,
+} from './utils'
+
+const {
+	activeStat,
+	activeGraphViewMode,
+	isRatioMode,
+	showChartEvents,
+	showPreviousPeriod,
+	hiddenGraphDatasetIds,
+	hasExplicitGraphDatasetSelection,
+	isGraphDatasetSelectionActive,
+	selectedGraphDatasetIds,
+	hasPreviousPeriodComparison,
+	hasProjectContext,
+	selectedTimeframeMode,
+	selectedCustomTimeframeStartDate,
+	selectedCustomTimeframeEndDate,
+	selectedGroupBy: selectedDashboardGroupBy,
+	displayedSelectedProjectIds: selectedProjectIds,
+	projects,
+	displayedFetchRequest: fetchRequest,
+	displayedTimeSlices: timeSlices,
+	displayedPreviousTimeSlices: previousTimeSlices,
+	displayedSelectedGroupBy: selectedGroupBy,
+	displayedSelectedBreakdown: selectedBreakdown,
+	displayedSelectedFilters: selectedFilters,
+	isLoading,
+	getVersionDisplayName,
+	getVersionProjectName,
+} = injectAnalyticsDashboardContext()
+const client = injectModrinthClient()
+const analyticsEventsQueryKey = ['analytics-events'] as const
+const formatNumber = useFormatNumber()
+const isDataLoading = computed(() => isLoading.value)
+const { data: analyticsEvents } = useQuery({
+	queryKey: analyticsEventsQueryKey,
+	queryFn: () => client.labrinth.analytics_v3.getEvents(),
+	placeholderData: [],
+	refetchOnMount: 'always',
+	retry: false,
+	staleTime: 0,
+})
+
+const viewModeTabs: TabsTab[] = [
+	{ value: 'line', label: 'Line', icon: ChartSplineIcon },
+	{ value: 'area', label: 'Area', icon: ChartAreaIcon },
+	{ value: 'bar', label: 'Bar', icon: ChartColumnBigIcon },
+]
+
+const titleByStat: Record<AnalyticsDashboardStat, string> = {
+	views: 'Views Over Time',
+	downloads: 'Downloads Over Time',
+	revenue: 'Revenue Over Time',
+	playtime: 'Playtime Over Time',
+}
+const dashboardStats: readonly AnalyticsDashboardStat[] = [
+	'views',
+	'downloads',
+	'revenue',
+	'playtime',
+]
+const TOP_GRAPH_DATASET_LIMIT = 8
+const GRAPH_RENDER_DATASET_LIMIT = 250
+const PREVIOUS_PERIOD_DATASET_ID_PREFIX = 'previous-period:'
+const PREVIOUS_PERIOD_BORDER_DASH = [6, 4]
+
+const localAnalyticsChartEvents = computed(() => analyticsEvents.value ?? [])
+const hasChartEvents = computed(() => localAnalyticsChartEvents.value.length > 0)
+const selectedProjectIdSet = computed(() => new Set(selectedProjectIds.value))
+const hasAvailableProjects = computed(() => projects.value.length > 0)
+
+const selectedProjects = computed(() =>
+	projects.value.filter(
+		(project) =>
+			selectedProjectIdSet.value.has(project.id) &&
+			doesProjectStatusMatchFilters(project.status, selectedFilters.value),
+	),
+)
+const showProjectVersionNames = computed(
+	() => selectedBreakdown.value === 'version_id' && selectedProjects.value.length > 1,
+)
+const tableProjectCount = computed(() => selectedGraphDatasetIds.value.length)
+const isTableGraphSelectionEmpty = computed(
+	() =>
+		isGraphDatasetSelectionActive.value &&
+		hasExplicitGraphDatasetSelection.value &&
+		tableProjectCount.value === 0,
+)
+const showEmptyChartState = computed(
+	() => selectedProjects.value.length === 0 || isTableGraphSelectionEmpty.value,
+)
+
+const emptyChartMessage = computed(() => {
+	if (isTableGraphSelectionEmpty.value) {
+		return 'Select items from table below to visualize your data.'
+	}
+
+	if (hasProjectContext.value) {
+		return 'No data available for analytics'
+	}
+
+	return hasAvailableProjects.value
+		? 'Select at least one project to view data'
+		: 'No projects available for analytics'
+})
+
+const lightLegendPalette = [
+	'hsl(152, 100%, 34%)',
+	'hsl(26, 100%, 42%)',
+	'hsl(202, 100%, 35%)',
+	'hsl(327, 45%, 64%)',
+	'hsl(41, 100%, 45%)',
+	'hsl(250, 60%, 33%)',
+	'hsl(170, 43%, 47%)',
+	'hsl(330, 60%, 33%)',
+	'hsl(46, 100%, 36%)',
+	'hsl(167, 100%, 30%)',
+	'hsl(343, 38%, 45%)',
+	'hsl(222, 100%, 28%)',
+	'hsl(270, 62%, 60%)',
+	'hsl(32, 100%, 37%)',
+	'hsl(349, 57%, 51%)',
+	'hsl(191, 43%, 37%)',
+]
+
+const darkLegendPalette = [
+	'hsl(145, 78%, 48%)',
+	'hsl(41, 100%, 50%)',
+	'hsl(202, 77%, 63%)',
+	'hsl(323, 66%, 72%)',
+	'hsl(56, 85%, 60%)',
+	'hsl(255, 92%, 80%)',
+	'hsl(12, 100%, 67%)',
+	'hsl(176, 58%, 56%)',
+	'hsl(60, 100%, 41%)',
+	'hsl(165, 80%, 38%)',
+	'hsl(341, 36%, 56%)',
+	'hsl(226, 60%, 49%)',
+	'hsl(252, 53%, 62%)',
+	'hsl(75, 59%, 50%)',
+	'hsl(195, 56%, 42%)',
+	'hsl(30, 59%, 56%)',
+]
+
+const theme = useTheme()
+const legendPalette = computed(() =>
+	isDarkTheme(theme.active) ? darkLegendPalette : lightLegendPalette,
+)
+
+const graphTitle = computed(() => titleByStat[activeStat.value])
+const showTableSelectionSubheading = computed(
+	() => isGraphDatasetSelectionActive.value && tableProjectCount.value > 0,
+)
+const tableBreakdownItemLabel = computed(() => {
+	const isSingular = tableProjectCount.value === 1
+
+	switch (selectedBreakdown.value) {
+		case 'project':
+			return isSingular ? 'project' : 'projects'
+		case 'country':
+			return isSingular ? 'country' : 'countries'
+		case 'monetization':
+			return isSingular ? 'monetization value' : 'monetization values'
+		case 'user_agent':
+			return isSingular ? 'download source' : 'download sources'
+		case 'download_reason':
+			return isSingular ? 'download reason' : 'download reasons'
+		case 'version_id':
+			return isSingular ? 'project version' : 'project versions'
+		case 'loader':
+			return isSingular ? 'loader' : 'loaders'
+		case 'game_version':
+			return isSingular ? 'game version' : 'game versions'
+		default:
+			return isSingular ? 'item' : 'items'
+	}
+})
+const sortedChartDatasetIds = computed(() =>
+	[...allChartDatasets.value]
+		.sort((a, b) => {
+			const totalDifference = getChartDatasetTotal(b) - getChartDatasetTotal(a)
+			return (
+				totalDifference || a.label.localeCompare(b.label) || a.projectId.localeCompare(b.projectId)
+			)
+		})
+		.map((dataset) => dataset.projectId),
+)
+const topGraphDatasetIds = computed(() =>
+	sortedChartDatasetIds.value.slice(0, TOP_GRAPH_DATASET_LIMIT),
+)
+const isShowingAllTableItems = computed(() => {
+	if (selectedGraphDatasetIds.value.length !== sortedChartDatasetIds.value.length) return false
+	const selectedDatasetIds = new Set(selectedGraphDatasetIds.value)
+	return sortedChartDatasetIds.value.every((datasetId) => selectedDatasetIds.has(datasetId))
+})
+const isShowingTopGraphDatasets = computed(() => {
+	if (selectedGraphDatasetIds.value.length !== topGraphDatasetIds.value.length) return false
+	const selectedDatasetIds = new Set(selectedGraphDatasetIds.value)
+	return topGraphDatasetIds.value.every((datasetId) => selectedDatasetIds.has(datasetId))
+})
+const isShowingTopTableItems = computed(() => {
+	const topDatasetIds = new Set(
+		sortedChartDatasetIds.value.slice(0, selectedGraphDatasetIds.value.length),
+	)
+	return selectedGraphDatasetIds.value.every((datasetId) => topDatasetIds.has(datasetId))
+})
+const tableSelectionSubheading = computed(() => {
+	if (isGraphRenderDatasetLimitActive.value) {
+		return `Showing ${GRAPH_RENDER_DATASET_LIMIT} ${tableBreakdownItemLabel.value} from table`
+	}
+
+	if (isShowingAllTableItems.value) {
+		return `Showing all ${tableBreakdownItemLabel.value} from table`
+	}
+
+	if (isShowingTopTableItems.value) {
+		if (tableProjectCount.value === 1) {
+			return `Showing top ${tableBreakdownItemLabel.value} from table`
+		} else {
+			return `Showing top ${tableProjectCount.value} ${tableBreakdownItemLabel.value} from table`
+		}
+	}
+
+	return `Showing ${tableProjectCount.value} ${tableBreakdownItemLabel.value} from table`
+})
+const shouldCapitalizeDatasetLabels = computed(() =>
+	shouldCapitalizeBreakdownLabel(selectedBreakdown.value),
+)
+
+const chartType = computed<'line' | 'bar'>(() =>
+	activeGraphViewMode.value === 'bar' ? 'bar' : 'line',
+)
+const canShowPreviousPeriodToggle = computed(
+	() => activeGraphViewMode.value === 'line' && hasPreviousPeriodComparison.value,
+)
+const shouldShowPreviousPeriod = computed(
+	() => canShowPreviousPeriodToggle.value && showPreviousPeriod.value,
+)
+const canUseRatioMode = computed(
+	() =>
+		(activeGraphViewMode.value === 'area' || activeGraphViewMode.value === 'bar') &&
+		legendEntries.value.length > 1,
+)
+const isArea = computed(() => activeGraphViewMode.value === 'area')
+const isStacked = computed(
+	() =>
+		isRatioMode.value ||
+		activeGraphViewMode.value === 'area' ||
+		activeGraphViewMode.value === 'bar',
+)
+
+const sliceCount = computed(() => {
+	const nextFetchRequest = fetchRequest.value
+	const fallback = timeSlices.value.length
+	if (!nextFetchRequest) return Math.max(1, fallback)
+	return getSliceCount(nextFetchRequest.time_range, fallback)
+})
+
+const chartLabels = computed(() => {
+	const nextFetchRequest = fetchRequest.value
+	if (!nextFetchRequest) return []
+	return buildTimeAxisLabels(nextFetchRequest.time_range, sliceCount.value, selectedGroupBy.value)
+})
+
+const xAxisTickLimit = computed(() => {
+	const nextFetchRequest = fetchRequest.value
+	return nextFetchRequest
+		? getShortHourlyAxisTickLimit(nextFetchRequest.time_range, selectedGroupBy.value)
+		: undefined
+})
+
+const chartDatasetsByStat = computed<Record<AnalyticsDashboardStat, ChartDataset[]>>(() => {
+	const datasetsByStat = {} as Record<AnalyticsDashboardStat, ChartDataset[]>
+	const nextTimeSlices = timeSlices.value
+	const nextSelectedProjects = selectedProjects.value
+	const nextPalette = legendPalette.value
+	const nextSelectedBreakdown = selectedBreakdown.value
+	const nextSelectedFilters = selectedFilters.value
+	const nextGetVersionProjectName = showProjectVersionNames.value
+		? getVersionProjectName
+		: undefined
+	const nextSliceCount = sliceCount.value
+
+	for (const stat of dashboardStats) {
+		datasetsByStat[stat] = buildChartDatasets(
+			nextTimeSlices,
+			nextSelectedProjects,
+			stat,
+			nextPalette,
+			nextSelectedBreakdown,
+			nextSelectedFilters,
+			getVersionDisplayName,
+			nextGetVersionProjectName,
+			nextSliceCount,
+		)
+	}
+
+	return datasetsByStat
+})
+const previousChartDatasetsByStat = computed<Record<AnalyticsDashboardStat, ChartDataset[]>>(() => {
+	const datasetsByStat = {} as Record<AnalyticsDashboardStat, ChartDataset[]>
+	const nextTimeSlices = previousTimeSlices.value
+	const nextSelectedProjects = selectedProjects.value
+	const nextPalette = legendPalette.value
+	const nextSelectedBreakdown = selectedBreakdown.value
+	const nextSelectedFilters = selectedFilters.value
+	const nextGetVersionProjectName = showProjectVersionNames.value
+		? getVersionProjectName
+		: undefined
+	const nextSliceCount = sliceCount.value
+
+	for (const stat of dashboardStats) {
+		datasetsByStat[stat] = buildChartDatasets(
+			nextTimeSlices,
+			nextSelectedProjects,
+			stat,
+			nextPalette,
+			nextSelectedBreakdown,
+			nextSelectedFilters,
+			getVersionDisplayName,
+			nextGetVersionProjectName,
+			nextSliceCount,
+		)
+	}
+
+	return datasetsByStat
+})
+const allChartDatasets = computed(() => chartDatasetsByStat.value[activeStat.value])
+const previousChartDatasets = computed(() => previousChartDatasetsByStat.value[activeStat.value])
+const showAllSelectedGraphDatasets = ref(false)
+const shouldUseDefaultGraphDatasetSelection = computed(
+	() =>
+		isGraphDatasetSelectionActive.value &&
+		!hasExplicitGraphDatasetSelection.value &&
+		selectedGraphDatasetIds.value.length === 0,
+)
+const selectedGraphDatasetIdSet = computed(() => {
+	if (shouldUseDefaultGraphDatasetSelection.value) {
+		return new Set(topGraphDatasetIds.value)
+	}
+
+	return new Set(selectedGraphDatasetIds.value)
+})
+const selectedChartDatasets = computed(() => {
+	if (!isGraphDatasetSelectionActive.value) {
+		return allChartDatasets.value
+	}
+
+	return allChartDatasets.value.filter((dataset) =>
+		selectedGraphDatasetIdSet.value.has(dataset.projectId),
+	)
+})
+const sortedSelectedChartDatasetIds = computed(() =>
+	[...selectedChartDatasets.value]
+		.sort((a, b) => {
+			const totalDifference = getChartDatasetTotal(b) - getChartDatasetTotal(a)
+			return (
+				totalDifference || a.label.localeCompare(b.label) || a.projectId.localeCompare(b.projectId)
+			)
+		})
+		.map((dataset) => dataset.projectId),
+)
+const isGraphRenderDatasetOverLimit = computed(
+	() =>
+		isGraphDatasetSelectionActive.value &&
+		selectedChartDatasets.value.length > GRAPH_RENDER_DATASET_LIMIT,
+)
+const showGraphRenderLimitButton = computed(() => isGraphRenderDatasetOverLimit.value)
+const graphRenderLimitButtonLabel = computed(() =>
+	showAllSelectedGraphDatasets.value ? 'Show limited' : 'Show all',
+)
+const showTopGraphDatasetsButton = computed(
+	() =>
+		isGraphDatasetSelectionActive.value &&
+		topGraphDatasetIds.value.length > 0 &&
+		!isShowingTopGraphDatasets.value,
+)
+const isGraphRenderDatasetLimitActive = computed(
+	() => isGraphRenderDatasetOverLimit.value && !showAllSelectedGraphDatasets.value,
+)
+const limitedGraphDatasetIds = computed(
+	() => new Set(sortedSelectedChartDatasetIds.value.slice(0, GRAPH_RENDER_DATASET_LIMIT)),
+)
+const selectableChartDatasets = computed(() => {
+	if (!isGraphRenderDatasetLimitActive.value) {
+		return selectedChartDatasets.value
+	}
+
+	return selectedChartDatasets.value.filter((dataset) =>
+		limitedGraphDatasetIds.value.has(dataset.projectId),
+	)
+})
+
+const chartContainer = ref<HTMLElement | null>(null)
+const legendContainer = ref<HTMLElement | null>(null)
+const chartTooltip = ref<InstanceType<typeof AnalyticsChartTooltip> | null>(null)
+const showAllSelectedGraphDatasetsModal = ref<InstanceType<typeof NewModal> | null>(null)
+const chartGeometry = ref<AnalyticsChartGeometryPayload | null>(null)
+const containerSize = reactive({ width: 0, height: 0 })
+const {
+	showTopFade: showLegendTopFade,
+	showBottomFade: showLegendBottomFade,
+	checkScrollState: checkLegendScrollState,
+	forceCheck: forceCheckLegendScrollState,
+} = useScrollIndicator(legendContainer)
+let resizeObserver: ResizeObserver | null = null
+let clearIgnoredChartClickTimeout: ReturnType<typeof setTimeout> | null = null
+
+onMounted(() => {
+	if (chartContainer.value && typeof ResizeObserver !== 'undefined') {
+		resizeObserver = new ResizeObserver((entries) => {
+			const entry = entries[0]
+			if (!entry) return
+			containerSize.width = entry.contentRect.width
+			containerSize.height = entry.contentRect.height
+		})
+		resizeObserver.observe(chartContainer.value)
+	}
+
+	window.addEventListener('keydown', updateShiftKeyState)
+	window.addEventListener('keyup', updateShiftKeyState)
+	window.addEventListener('blur', clearShiftKeyState)
+})
+
+onBeforeUnmount(() => {
+	resizeObserver?.disconnect()
+	resizeObserver = null
+	window.removeEventListener('keydown', updateShiftKeyState)
+	window.removeEventListener('keyup', updateShiftKeyState)
+	window.removeEventListener('blur', clearShiftKeyState)
+	if (clearIgnoredChartClickTimeout) {
+		clearTimeout(clearIgnoredChartClickTimeout)
+		clearIgnoredChartClickTimeout = null
+	}
+})
+
+type HoverState = {
+	visible: boolean
+	x: number
+	y: number
+	sliceIndex: number | null
+}
+
+const hoverState = reactive<HoverState>({
+	visible: false,
+	x: 0,
+	y: 0,
+	sliceIndex: null,
+})
+
+const isHoverPinned = ref(false)
+const ignoreNextChartClick = ref(false)
+const hoveredLegendEntryId = ref<string | null>(null)
+const isLegendExpanded = ref(false)
+const isShiftKeyPressed = ref(false)
+const monetizationPopoverId = useId()
+const promotedCollapsedLegendEntryIds = ref<string[]>([])
+const hiddenDatasetIds = computed(() => new Set(hiddenGraphDatasetIds.value))
+const promotedCollapsedLegendEntryIdSet = computed(
+	() => new Set(promotedCollapsedLegendEntryIds.value),
+)
+const previousChartDatasetByOriginalId = computed(() => {
+	const datasets = new Map<string, ChartDataset>()
+	for (const dataset of previousChartDatasets.value) {
+		datasets.set(dataset.projectId, dataset)
+	}
+	return datasets
+})
+
+const LEGEND_MAX_ITEMS = 8
+
+type LegendEntry = {
+	id: string
+	name: string
+	projectName?: string
+	color: string
+	totalValue: number
+	hidden: boolean
+	isPreviousPeriod?: boolean
+}
+
+function getChartDatasetTotal(dataset: ChartDataset) {
+	return dataset.data.reduce((sum, value) => sum + value, 0)
+}
+
+function getPreviousPeriodDatasetId(datasetId: string) {
+	return `${PREVIOUS_PERIOD_DATASET_ID_PREFIX}${datasetId}`
+}
+
+function setHoverState(payload: HoverState) {
+	hoverState.visible = payload.visible
+	hoverState.x = payload.x
+	hoverState.y = payload.y
+	hoverState.sliceIndex = payload.sliceIndex
+}
+
+function clearHoverState() {
+	hoverState.visible = false
+	hoverState.sliceIndex = null
+}
+
+function updateShiftKeyState(event: KeyboardEvent) {
+	isShiftKeyPressed.value = event.shiftKey
+}
+
+function clearShiftKeyState() {
+	isShiftKeyPressed.value = false
+}
+
+function onChartHover(payload: HoverState) {
+	if (isDataLoading.value) return
+	if (isHoverPinned.value) return
+	setHoverState(payload)
+}
+
+function ignoreUpcomingChartClick() {
+	ignoreNextChartClick.value = true
+	if (clearIgnoredChartClickTimeout) {
+		clearTimeout(clearIgnoredChartClickTimeout)
+	}
+	clearIgnoredChartClickTimeout = setTimeout(() => {
+		ignoreNextChartClick.value = false
+		clearIgnoredChartClickTimeout = null
+	}, 350)
+}
+
+function onPinnedDrag(payload: HoverState) {
+	if (isDataLoading.value || !isHoverPinned.value) return
+	ignoreUpcomingChartClick()
+	setHoverState(payload)
+}
+
+function onChartGeometry(payload: AnalyticsChartGeometryPayload) {
+	chartGeometry.value = payload
+}
+
+function getDefaultGroupByForRange(start: Date, end: Date) {
+	const ensuredRange = ensureMinimumTimeRange(start, end)
+	const durationMinutes = Math.max(
+		1,
+		Math.floor((ensuredRange.end.getTime() - ensuredRange.start.getTime()) / 60000),
+	)
+
+	return getDefaultAnalyticsGroupByForDurationMinutes(durationMinutes)
+}
+
+function onRangeSelect(payload: AnalyticsChartRangeSelectPayload) {
+	if (isDataLoading.value) return
+
+	const nextFetchRequest = fetchRequest.value
+	if (!nextFetchRequest) return
+
+	if (payload.startSliceIndex === payload.endSliceIndex) {
+		ignoreUpcomingChartClick()
+		return
+	}
+
+	const startSliceIndex = Math.min(payload.startSliceIndex, payload.endSliceIndex)
+	const endSliceIndex = Math.max(payload.startSliceIndex, payload.endSliceIndex)
+	const startBucketRange = getSliceBucketRange(
+		nextFetchRequest.time_range,
+		sliceCount.value,
+		startSliceIndex,
+	)
+	const endBucketRange = getSliceBucketRange(
+		nextFetchRequest.time_range,
+		sliceCount.value,
+		endSliceIndex,
+	)
+	const start = startBucketRange.start
+	const end = endBucketRange.end
+
+	if (
+		!Number.isFinite(start.getTime()) ||
+		!Number.isFinite(end.getTime()) ||
+		end.getTime() <= start.getTime()
+	) {
+		return
+	}
+
+	ignoreUpcomingChartClick()
+	isHoverPinned.value = false
+	clearHoverState()
+	selectedTimeframeMode.value = 'custom_datetime_range'
+	selectedCustomTimeframeStartDate.value = start.toISOString()
+	selectedCustomTimeframeEndDate.value = end.toISOString()
+	selectedDashboardGroupBy.value = getDefaultGroupByForRange(start, end)
+}
+
+function onChartClick() {
+	if (isDataLoading.value) return
+	if (ignoreNextChartClick.value) {
+		ignoreNextChartClick.value = false
+		return
+	}
+
+	if (!hoverState.visible || hoverState.sliceIndex === null) {
+		if (isHoverPinned.value) {
+			isHoverPinned.value = false
+			clearHoverState()
+		}
+		return
+	}
+
+	if (isHoverPinned.value) {
+		isHoverPinned.value = false
+		clearHoverState()
+		return
+	}
+
+	isHoverPinned.value = true
+}
+
+function onChartWheel(event: WheelEvent) {
+	if (!hoverState.visible) return
+	chartTooltip.value?.consumeWheel(event)
+}
+
+const pinnedSliceIndex = computed(() => (isHoverPinned.value ? hoverState.sliceIndex : null))
+const showHoverGuide = computed(
+	() =>
+		!isDataLoading.value &&
+		!isHoverPinned.value &&
+		hoverState.visible &&
+		hoverState.sliceIndex !== null,
+)
+const showPinnedGuide = computed(
+	() =>
+		!isDataLoading.value &&
+		isHoverPinned.value &&
+		hoverState.visible &&
+		hoverState.sliceIndex !== null,
+)
+
+const currentLegendEntries = computed<LegendEntry[]>(() =>
+	selectableChartDatasets.value
+		.map((dataset) => {
+			const totalValue = dataset.data.reduce((sum, value) => sum + value, 0)
+
+			return {
+				id: dataset.projectId,
+				name: dataset.label,
+				projectName: dataset.projectName,
+				color: dataset.borderColor,
+				totalValue,
+				hidden: hiddenDatasetIds.value.has(dataset.projectId),
+			}
+		})
+		.sort((a, b) => b.totalValue - a.totalValue || a.name.localeCompare(b.name)),
+)
+
+const legendEntries = computed<LegendEntry[]>(() => {
+	if (!shouldShowPreviousPeriod.value) {
+		return currentLegendEntries.value
+	}
+
+	return currentLegendEntries.value.flatMap((entry) => {
+		const previousDataset = previousChartDatasetByOriginalId.value.get(entry.id)
+		const previousEntry: LegendEntry = {
+			id: getPreviousPeriodDatasetId(entry.id),
+			name: `${entry.name} (Prev.)`,
+			projectName: entry.projectName,
+			color: entry.color,
+			totalValue: previousDataset ? getChartDatasetTotal(previousDataset) : 0,
+			hidden: hiddenDatasetIds.value.has(getPreviousPeriodDatasetId(entry.id)),
+			isPreviousPeriod: true,
+		}
+
+		return [entry, previousEntry]
+	})
+})
+
+const canToggleLegendExpansion = computed(() => legendEntries.value.length > LEGEND_MAX_ITEMS)
+
+const displayedLegendEntries = computed<LegendEntry[]>(() => {
+	if (!isLegendExpanded.value && canToggleLegendExpansion.value) {
+		return legendEntries.value.filter(
+			(entry, index) =>
+				index < LEGEND_MAX_ITEMS || promotedCollapsedLegendEntryIdSet.value.has(entry.id),
+		)
+	}
+	return legendEntries.value
+})
+
+const collapsedLegendEntryIds = computed(() => {
+	if (isLegendExpanded.value || !canToggleLegendExpansion.value) return new Set<string>()
+	return new Set(
+		legendEntries.value
+			.slice(LEGEND_MAX_ITEMS)
+			.filter((entry) => !promotedCollapsedLegendEntryIdSet.value.has(entry.id))
+			.map((entry) => entry.id),
+	)
+})
+
+function toggleLegendExpansion() {
+	isLegendExpanded.value = !isLegendExpanded.value
+}
+
+function promoteCollapsedLegendEntry(datasetId: string) {
+	if (promotedCollapsedLegendEntryIdSet.value.has(datasetId)) return
+	promotedCollapsedLegendEntryIds.value = [...promotedCollapsedLegendEntryIds.value, datasetId]
+}
+
+function openShowAllSelectedGraphDatasetsModal(event: MouseEvent) {
+	showAllSelectedGraphDatasetsModal.value?.show(event)
+}
+
+function toggleGraphRenderLimit(event: MouseEvent) {
+	if (showAllSelectedGraphDatasets.value) {
+		showAllSelectedGraphDatasets.value = false
+		return
+	}
+
+	openShowAllSelectedGraphDatasetsModal(event)
+}
+
+function confirmShowAllSelectedGraphDatasets() {
+	showAllSelectedGraphDatasets.value = true
+	showAllSelectedGraphDatasetsModal.value?.hide()
+}
+
+function showTopGraphDatasets() {
+	selectedGraphDatasetIds.value = []
+	hasExplicitGraphDatasetSelection.value = false
+	showAllSelectedGraphDatasets.value = false
+}
+
+watch(
+	displayedLegendEntries,
+	() => {
+		nextTick(() => {
+			forceCheckLegendScrollState()
+		})
+	},
+	{ immediate: true, flush: 'post' },
+)
+
+watch(canToggleLegendExpansion, (canToggle) => {
+	if (!canToggle) {
+		isLegendExpanded.value = false
+	}
+})
+
+watch(canUseRatioMode, (canUse) => {
+	if (!canUse) {
+		isRatioMode.value = false
+	}
+})
+
+const chartDatasetById = computed(() => {
+	const datasets = new Map<string, ChartDataset>()
+	for (const dataset of selectableChartDatasets.value) {
+		datasets.set(dataset.projectId, dataset)
+
+		if (!shouldShowPreviousPeriod.value) {
+			continue
+		}
+
+		const previousDataset = previousChartDatasetByOriginalId.value.get(dataset.projectId)
+		const previousData = Array.from(
+			{ length: dataset.data.length },
+			(_, index) => previousDataset?.data[index] ?? 0,
+		)
+		datasets.set(getPreviousPeriodDatasetId(dataset.projectId), {
+			projectId: getPreviousPeriodDatasetId(dataset.projectId),
+			label: `${dataset.label} (Prev.)`,
+			projectName: dataset.projectName,
+			data: previousData,
+			borderColor: dataset.borderColor,
+			backgroundColor: dataset.backgroundColor,
+			borderDash: PREVIOUS_PERIOD_BORDER_DASH,
+		})
+	}
+	return datasets
+})
+
+const hoverRatioSliceTotals = computed(() => {
+	const sliceLength = selectableChartDatasets.value.reduce(
+		(maxLength, dataset) => Math.max(maxLength, dataset.data.length),
+		0,
+	)
+	const totals = new Array<number>(sliceLength).fill(0)
+
+	for (const legendEntry of legendEntries.value) {
+		const dataset = chartDatasetById.value.get(legendEntry.id)
+		if (!dataset) continue
+
+		for (let i = 0; i < sliceLength; i++) {
+			totals[i] += dataset.data[i] ?? 0
+		}
+	}
+
+	return totals
+})
+
+const baseVisibleChartDatasets = computed(() =>
+	legendEntries.value
+		.filter((legendEntry) => !legendEntry.hidden)
+		.map((legendEntry) => {
+			const dataset = chartDatasetById.value.get(legendEntry.id)
+			if (!dataset) return null
+
+			return {
+				...dataset,
+				borderColor: legendEntry.color,
+				backgroundColor: legendEntry.color,
+			}
+		})
+		.filter((dataset): dataset is ChartDataset => Boolean(dataset)),
+)
+
+const visibleChartDatasets = computed<ChartDataset[]>(() => {
+	const datasets = baseVisibleChartDatasets.value
+	if (!isRatioMode.value || datasets.length === 0) return datasets
+
+	const sliceLength = datasets.reduce(
+		(maxLength, dataset) => Math.max(maxLength, dataset.data.length),
+		0,
+	)
+	const totals = new Array<number>(sliceLength).fill(0)
+	for (const dataset of datasets) {
+		for (let i = 0; i < sliceLength; i++) {
+			totals[i] += dataset.data[i] ?? 0
+		}
+	}
+
+	return datasets.map((dataset) => ({
+		...dataset,
+		data: dataset.data.map((value, i) => (totals[i] === 0 ? 0 : (value / totals[i]) * 100)),
+	}))
+})
+
+const visibleChartDatasetById = computed(() => {
+	const datasets = new Map<string, ChartDataset>()
+	for (const dataset of visibleChartDatasets.value) {
+		datasets.set(dataset.projectId, dataset)
+	}
+	return datasets
+})
+
+const highlightedChartDatasetId = computed(() => {
+	const datasetId = hoveredLegendEntryId.value
+	if (!datasetId || !visibleChartDatasetById.value.has(datasetId)) return null
+	return datasetId
+})
+
+function isLegendEntryToggleDisabled(legendEntry: LegendEntry) {
+	if (legendEntry.hidden) return false
+	const visibleCount = legendEntries.value.filter((entry) => !entry.hidden).length
+	return visibleCount <= 1
+}
+
+function getLegendEntryTooltip(legendEntry: LegendEntry) {
+	return legendEntry.projectName ?? ''
+}
+
+function isUnmonetizedLegendEntry(legendEntry: LegendEntry) {
+	return selectedBreakdown.value === 'monetization' && legendEntry.id === 'breakdown:unmonetized'
+}
+
+function setHoveredLegendEntryId(datasetId: string) {
+	hoveredLegendEntryId.value = datasetId
+}
+
+function clearHoveredLegendEntryId(datasetId: string) {
+	if (hoveredLegendEntryId.value === datasetId) {
+		hoveredLegendEntryId.value = null
+	}
+}
+
+function clearLegendHoverState() {
+	hoveredLegendEntryId.value = null
+}
+
+function toggleLegendEntryVisibility(datasetId: string) {
+	const nextHiddenDatasetIds = new Set(hiddenDatasetIds.value)
+	if (nextHiddenDatasetIds.has(datasetId)) {
+		nextHiddenDatasetIds.delete(datasetId)
+	} else {
+		const visibleCount = legendEntries.value.filter((entry) => !entry.hidden).length
+		if (visibleCount <= 1) return
+		nextHiddenDatasetIds.add(datasetId)
+	}
+	hiddenGraphDatasetIds.value = Array.from(nextHiddenDatasetIds)
+}
+
+function soloLegendEntry(datasetId: string) {
+	const currentLegendEntryIds = new Set(legendEntries.value.map((entry) => entry.id))
+	const otherIds = legendEntries.value.map((entry) => entry.id).filter((id) => id !== datasetId)
+	const isAlreadySolo =
+		!hiddenDatasetIds.value.has(datasetId) && otherIds.every((id) => hiddenDatasetIds.value.has(id))
+
+	if (isAlreadySolo) {
+		hiddenGraphDatasetIds.value = hiddenGraphDatasetIds.value.filter(
+			(hiddenDatasetId) => !currentLegendEntryIds.has(hiddenDatasetId),
+		)
+		return
+	}
+
+	const nextHiddenDatasetIds = new Set(hiddenDatasetIds.value)
+	for (const legendEntry of legendEntries.value) {
+		if (legendEntry.id === datasetId) {
+			nextHiddenDatasetIds.delete(legendEntry.id)
+		} else {
+			nextHiddenDatasetIds.add(legendEntry.id)
+		}
+	}
+	hiddenGraphDatasetIds.value = Array.from(nextHiddenDatasetIds)
+}
+
+function onLegendEntryClick(event: MouseEvent, datasetId: string) {
+	if (event.shiftKey) {
+		soloLegendEntry(datasetId)
+		clearLegendHoverState()
+		return
+	}
+	toggleLegendEntryVisibility(datasetId)
+	clearLegendHoverState()
+}
+
+function onTooltipEntryClick(datasetId: string, shiftKey: boolean) {
+	if (!chartDatasetById.value.has(datasetId)) return
+
+	if (collapsedLegendEntryIds.value.has(datasetId)) {
+		promoteCollapsedLegendEntry(datasetId)
+	}
+
+	if (shiftKey) {
+		soloLegendEntry(datasetId)
+		clearLegendHoverState()
+		return
+	}
+	toggleLegendEntryVisibility(datasetId)
+	clearLegendHoverState()
+}
+
+function areStringArraysEqual(left: string[], right: string[]) {
+	if (left.length !== right.length) return false
+	for (let index = 0; index < left.length; index += 1) {
+		if (left[index] !== right[index]) return false
+	}
+	return true
+}
+
+watch([chartLabels, allChartDatasets], () => {
+	isHoverPinned.value = false
+	clearHoverState()
+})
+
+watch([() => selectedGraphDatasetIds.value.join('\u0000'), allChartDatasets], () => {
+	showAllSelectedGraphDatasets.value = false
+})
+
+watch(isDataLoading, (loading) => {
+	if (!loading) return
+	isHoverPinned.value = false
+	clearHoverState()
+})
+
+watch(
+	[allChartDatasets, legendEntries],
+	([datasets]) => {
+		if (datasets.length === 0) return
+
+		const availableDatasetIds = new Set(legendEntries.value.map((entry) => entry.id))
+
+		const nextHiddenDatasetIds = hiddenGraphDatasetIds.value.filter((datasetId) =>
+			availableDatasetIds.has(datasetId),
+		)
+		if (
+			legendEntries.value.length > 0 &&
+			legendEntries.value.every((entry) => nextHiddenDatasetIds.includes(entry.id))
+		) {
+			const firstLegendEntry = legendEntries.value[0]
+			if (firstLegendEntry) {
+				const firstLegendEntryIndex = nextHiddenDatasetIds.indexOf(firstLegendEntry.id)
+				if (firstLegendEntryIndex !== -1) {
+					nextHiddenDatasetIds.splice(firstLegendEntryIndex, 1)
+				}
+			}
+		}
+
+		if (!areStringArraysEqual(hiddenGraphDatasetIds.value, nextHiddenDatasetIds)) {
+			hiddenGraphDatasetIds.value = nextHiddenDatasetIds
+		}
+
+		const nextPromotedCollapsedLegendEntryIds = promotedCollapsedLegendEntryIds.value.filter(
+			(datasetId) => availableDatasetIds.has(datasetId),
+		)
+		if (
+			!areStringArraysEqual(
+				promotedCollapsedLegendEntryIds.value,
+				nextPromotedCollapsedLegendEntryIds,
+			)
+		) {
+			promotedCollapsedLegendEntryIds.value = nextPromotedCollapsedLegendEntryIds
+		}
+	},
+	{ immediate: true },
+)
+
+const hoverBucketRange = computed(() => {
+	const nextFetchRequest = fetchRequest.value
+	if (!nextFetchRequest || hoverState.sliceIndex === null) return null
+	return getSliceBucketRange(nextFetchRequest.time_range, sliceCount.value, hoverState.sliceIndex)
+})
+
+const chartRangeBounds = computed(() => {
+	const nextFetchRequest = fetchRequest.value
+	if (!nextFetchRequest) return null
+	return {
+		start: new Date(nextFetchRequest.time_range.start),
+		end: new Date(nextFetchRequest.time_range.end),
+	}
+})
+
+const hoverTotalValue = computed(() => {
+	if (hoverState.sliceIndex === null) return 0
+	const sliceIndex = hoverState.sliceIndex
+	if (isRatioMode.value) return hoverRatioSliceTotals.value[sliceIndex] ?? 0
+
+	return currentLegendEntries.value.reduce((sum, legendEntry) => {
+		if (legendEntry.hidden) return sum
+		const dataset = chartDatasetById.value.get(legendEntry.id)
+		return sum + (dataset?.data[sliceIndex] ?? 0)
+	}, 0)
+})
+
+const hoverFormattedTotal = computed(() => {
+	if (isRatioMode.value) {
+		return hoverTotalValue.value > 0 ? '100%' : '0%'
+	}
+	return formatMetricValue(hoverTotalValue.value, activeStat.value, formatNumber)
+})
+
+const hoverEntries = computed<AnalyticsChartTooltipEntry[]>(() => {
+	if (hoverState.sliceIndex === null) return []
+	const sliceIndex = hoverState.sliceIndex
+	const totalValue = hoverTotalValue.value
+
+	return legendEntries.value.map((legendEntry) => {
+		const dataset = chartDatasetById.value.get(legendEntry.id)
+		const value = dataset?.data[sliceIndex] ?? 0
+		const ratioValue = totalValue === 0 ? 0 : (value / totalValue) * 100
+		return {
+			projectId: legendEntry.id,
+			name: legendEntry.name,
+			projectName: legendEntry.projectName,
+			color: legendEntry.color,
+			formattedValue: isRatioMode.value
+				? `${ratioValue.toFixed(1)}%`
+				: formatMetricValue(value, activeStat.value, formatNumber),
+			hidden: legendEntry.hidden,
+			toggleDisabled: !legendEntry.hidden && isLegendEntryToggleDisabled(legendEntry),
+			isPreviousPeriod: legendEntry.isPreviousPeriod,
+		}
+	})
+})
+</script>
+
+<style>
+.v-popper--theme-analytics-monetization-popover .v-popper__inner {
+	overflow: visible !important;
+	background: transparent !important;
+	padding: 0 !important;
+	border: 0 !important;
+	box-shadow: none !important;
+}
+
+.v-popper--theme-analytics-monetization-popover .v-popper__arrow-container {
+	display: none;
+}
+</style>
diff --git a/apps/frontend/src/components/analytics/graph/utils.ts b/apps/frontend/src/components/analytics/graph/utils.ts
new file mode 100644
index 0000000000..73c423ef75
--- /dev/null
+++ b/apps/frontend/src/components/analytics/graph/utils.ts
@@ -0,0 +1,607 @@
+import type { Labrinth } from '@modrinth/api-client'
+
+import {
+	type AnalyticsBreakdownPreset,
+	type AnalyticsDashboardProject,
+	type AnalyticsDashboardStat,
+	type AnalyticsGroupByPreset,
+	type AnalyticsSelectedFilters,
+	doesAnalyticsPointMatchNormalizedFilters,
+	normalizeAnalyticsSelectedFilters,
+} from '~/providers/analytics/analytics'
+
+import { ALL_BREAKDOWN_VALUE, getAnalyticsBreakdownValue } from '../breakdown'
+
+export type ChartDataset = {
+	projectId: string
+	label: string
+	projectName?: string
+	data: number[]
+	borderColor: string
+	backgroundColor: string
+	borderDash?: number[]
+}
+
+const LOADER_CHART_COLORS: Record<string, string> = {
+	fabric: 'var(--color-platform-fabric)',
+	'legacy-fabric': 'var(--color-platform-fabric)',
+	quilt: 'var(--color-platform-quilt)',
+	forge: 'var(--color-platform-forge)',
+	neoforge: 'var(--color-platform-neoforge)',
+	neo_forge: 'var(--color-platform-neoforge)',
+	liteloader: 'var(--color-platform-liteloader)',
+	bukkit: 'var(--color-platform-bukkit)',
+	bungeecord: 'var(--color-platform-bungeecord)',
+	folia: 'var(--color-platform-folia)',
+	paper: 'var(--color-platform-paper)',
+	purpur: 'var(--color-platform-purpur)',
+	spigot: 'var(--color-platform-spigot)',
+	velocity: 'var(--color-platform-velocity)',
+	waterfall: 'var(--color-platform-waterfall)',
+	sponge: 'var(--color-platform-sponge)',
+	ornithe: 'var(--color-platform-ornithe)',
+	'bta-babric': 'var(--color-platform-bta-babric)',
+	nilloader: 'var(--color-platform-nilloader)',
+}
+
+const REGION_CODE_PATTERN = /^[a-z]{2}$/i
+const OTHER_COUNTRY_CODE = 'XX'
+const UNKNOWN_BREAKDOWN_LABEL = 'Unknown'
+const ALL_PROJECTS_DATASET_ID = 'all'
+const ALL_PROJECTS_DATASET_LABEL = 'All projects'
+const regionDisplayNamesByLocale = new Map<string, Intl.DisplayNames | null>()
+
+function getRegionDisplayNames(locale: string): Intl.DisplayNames | null {
+	if (regionDisplayNamesByLocale.has(locale)) {
+		return regionDisplayNamesByLocale.get(locale) ?? null
+	}
+
+	try {
+		const displayNames = new Intl.DisplayNames(locale, { type: 'region' })
+		regionDisplayNamesByLocale.set(locale, displayNames)
+		return displayNames
+	} catch {
+		regionDisplayNamesByLocale.set(locale, null)
+		return null
+	}
+}
+
+function formatCountryCode(countryCode: string): string {
+	const normalized = countryCode.trim().toUpperCase()
+	if (normalized === OTHER_COUNTRY_CODE) {
+		return UNKNOWN_BREAKDOWN_LABEL
+	}
+
+	if (!REGION_CODE_PATTERN.test(normalized)) {
+		return countryCode
+	}
+
+	const locale = new Intl.DateTimeFormat().resolvedOptions().locale || 'en'
+	const localizedDisplayNames = getRegionDisplayNames(locale)
+	const localizedValue = localizedDisplayNames?.of(normalized)
+	if (localizedValue && localizedValue !== normalized) {
+		return localizedValue
+	}
+
+	const englishDisplayNames = getRegionDisplayNames('en')
+	const englishValue = englishDisplayNames?.of(normalized)
+	if (englishValue && englishValue !== normalized) {
+		return englishValue
+	}
+
+	return countryCode
+}
+
+export function formatBreakdownLabel(
+	breakdownValue: string,
+	selectedBreakdown: AnalyticsBreakdownPreset,
+	getVersionDisplayName: (versionId: string) => string = (versionId) => versionId,
+): string {
+	if (breakdownValue.trim().toLowerCase() === 'other') {
+		return UNKNOWN_BREAKDOWN_LABEL
+	}
+	if (selectedBreakdown === 'country') {
+		return formatCountryCode(breakdownValue)
+	}
+	if (selectedBreakdown === 'version_id') {
+		return getVersionDisplayName(breakdownValue)
+	}
+
+	return breakdownValue
+}
+
+export function shouldCapitalizeBreakdownLabel(
+	selectedBreakdown: AnalyticsBreakdownPreset,
+): boolean {
+	return (
+		selectedBreakdown === 'download_reason' ||
+		selectedBreakdown === 'monetization' ||
+		selectedBreakdown === 'loader' ||
+		selectedBreakdown === 'country'
+	)
+}
+
+function getBreakdownColor(
+	breakdownValue: string,
+	selectedBreakdown: AnalyticsBreakdownPreset,
+	fallbackColor: string,
+): string {
+	if (selectedBreakdown !== 'loader') {
+		return fallbackColor
+	}
+
+	const normalizedLoader = breakdownValue.trim().toLowerCase()
+	return LOADER_CHART_COLORS[normalizedLoader] ?? fallbackColor
+}
+
+type PaletteRankEntry = {
+	key: string
+	label: string
+	total: number
+}
+
+function getPaletteColorForIndex(index: number, palette: string[]): string {
+	if (palette.length === 0) return ''
+
+	return palette[index % palette.length]
+}
+
+function buildPaletteColorsByDownloadRank(
+	entries: PaletteRankEntry[],
+	palette: string[],
+): Map<string, string> {
+	const colorsByKey = new Map<string, string>()
+	if (palette.length === 0) return colorsByKey
+
+	const sortedEntries = [...entries].sort(
+		(a, b) => b.total - a.total || a.label.localeCompare(b.label) || a.key.localeCompare(b.key),
+	)
+	sortedEntries.forEach((entry, index) => {
+		colorsByKey.set(entry.key, getPaletteColorForIndex(index, palette))
+	})
+
+	return colorsByKey
+}
+
+export function getMetricValue(
+	point: Labrinth.Analytics.v3.ProjectAnalytics,
+	activeStat: AnalyticsDashboardStat,
+): number {
+	switch (activeStat) {
+		case 'views':
+			return point.metric_kind === 'views' ? point.views : 0
+		case 'downloads':
+			return point.metric_kind === 'downloads' ? point.downloads : 0
+		case 'playtime':
+			return point.metric_kind === 'playtime' ? point.seconds : 0
+		case 'revenue': {
+			if (point.metric_kind !== 'revenue') return 0
+			const value = Number.parseFloat(point.revenue)
+			return Number.isFinite(value) ? value : 0
+		}
+	}
+}
+
+function isMetricKindForStat(
+	point: Labrinth.Analytics.v3.ProjectAnalytics,
+	activeStat: AnalyticsDashboardStat,
+): boolean {
+	return point.metric_kind === activeStat
+}
+
+function isProjectAnalyticsPointInSelectedProjects(
+	point: Labrinth.Analytics.v3.AnalyticsData,
+	selectedProjectIds: Set<string>,
+): point is Labrinth.Analytics.v3.ProjectAnalytics {
+	return 'source_project' in point && selectedProjectIds.has(point.source_project)
+}
+
+export function buildChartDatasets(
+	timeSlices: Labrinth.Analytics.v3.TimeSlice[],
+	selectedProjects: AnalyticsDashboardProject[],
+	activeStat: AnalyticsDashboardStat,
+	palette: string[],
+	selectedBreakdown: AnalyticsBreakdownPreset,
+	selectedFilters: AnalyticsSelectedFilters,
+	getVersionDisplayName: (versionId: string) => string = (versionId) => versionId,
+	getVersionProjectName?: (versionId: string) => string | undefined,
+	sliceCount: number = timeSlices.length,
+): ChartDataset[] {
+	const selectedProjectIds = new Set(selectedProjects.map((project) => project.id))
+	if (selectedProjectIds.size === 0) {
+		return []
+	}
+
+	const dataLength = Math.max(sliceCount, timeSlices.length)
+	const normalizedFilters = normalizeAnalyticsSelectedFilters(selectedFilters)
+
+	if (selectedBreakdown !== 'none' && selectedBreakdown !== 'project') {
+		const dataByBreakdown = new Map<string, number[]>()
+		const downloadTotalsByBreakdown = new Map<string, number>()
+
+		timeSlices.forEach((slice, sliceIndex) => {
+			for (const point of slice) {
+				if (!isProjectAnalyticsPointInSelectedProjects(point, selectedProjectIds)) continue
+				if (!doesAnalyticsPointMatchNormalizedFilters(point, normalizedFilters)) continue
+
+				const breakdownValue = getAnalyticsBreakdownValue(point, selectedBreakdown)
+				if (breakdownValue === ALL_BREAKDOWN_VALUE) continue
+
+				if (!dataByBreakdown.has(breakdownValue)) {
+					dataByBreakdown.set(breakdownValue, new Array(dataLength).fill(0))
+				}
+
+				if (point.metric_kind === 'downloads') {
+					downloadTotalsByBreakdown.set(
+						breakdownValue,
+						(downloadTotalsByBreakdown.get(breakdownValue) ?? 0) +
+							getMetricValue(point, 'downloads'),
+					)
+				}
+
+				if (!isMetricKindForStat(point, activeStat)) continue
+
+				const breakdownData = dataByBreakdown.get(breakdownValue)
+				if (!breakdownData) continue
+				breakdownData[sliceIndex] += getMetricValue(point, activeStat)
+			}
+		})
+
+		const colorsByBreakdown = buildPaletteColorsByDownloadRank(
+			Array.from(dataByBreakdown.keys()).map((breakdownValue) => ({
+				key: breakdownValue,
+				label: formatBreakdownLabel(breakdownValue, selectedBreakdown, getVersionDisplayName),
+				total: downloadTotalsByBreakdown.get(breakdownValue) ?? 0,
+			})),
+			palette,
+		)
+
+		return Array.from(dataByBreakdown.entries()).map(([breakdownValue, data]) => {
+			const fallbackColor = colorsByBreakdown.get(breakdownValue) ?? ''
+			const color = getBreakdownColor(breakdownValue, selectedBreakdown, fallbackColor)
+			return {
+				projectId: `breakdown:${breakdownValue}`,
+				label: formatBreakdownLabel(breakdownValue, selectedBreakdown, getVersionDisplayName),
+				projectName:
+					selectedBreakdown === 'version_id' ? getVersionProjectName?.(breakdownValue) : undefined,
+				data,
+				borderColor: color,
+				backgroundColor: color,
+			}
+		})
+	}
+
+	if (selectedBreakdown === 'none') {
+		const data = new Array(dataLength).fill(0)
+		let downloadTotal = 0
+
+		timeSlices.forEach((slice, sliceIndex) => {
+			for (const point of slice) {
+				if (!isProjectAnalyticsPointInSelectedProjects(point, selectedProjectIds)) continue
+				if (!doesAnalyticsPointMatchNormalizedFilters(point, normalizedFilters)) continue
+
+				if (point.metric_kind === 'downloads') {
+					downloadTotal += getMetricValue(point, 'downloads')
+				}
+
+				if (!isMetricKindForStat(point, activeStat)) continue
+
+				data[sliceIndex] += getMetricValue(point, activeStat)
+			}
+		})
+
+		const color =
+			buildPaletteColorsByDownloadRank(
+				[
+					{
+						key: ALL_PROJECTS_DATASET_ID,
+						label: ALL_PROJECTS_DATASET_LABEL,
+						total: downloadTotal,
+					},
+				],
+				palette,
+			).get(ALL_PROJECTS_DATASET_ID) ?? ''
+		const selectedProject = selectedProjects.length === 1 ? selectedProjects[0] : undefined
+
+		return [
+			{
+				projectId: ALL_PROJECTS_DATASET_ID,
+				label: selectedProject?.name ?? ALL_PROJECTS_DATASET_LABEL,
+				data,
+				borderColor: color,
+				backgroundColor: color,
+			},
+		]
+	}
+
+	const dataByProjectId = new Map<string, number[]>()
+	const downloadTotalsByProjectId = new Map<string, number>()
+	for (const project of selectedProjects) {
+		dataByProjectId.set(project.id, new Array(dataLength).fill(0))
+		downloadTotalsByProjectId.set(project.id, 0)
+	}
+
+	timeSlices.forEach((slice, sliceIndex) => {
+		for (const point of slice) {
+			if (!isProjectAnalyticsPointInSelectedProjects(point, selectedProjectIds)) continue
+			if (!doesAnalyticsPointMatchNormalizedFilters(point, normalizedFilters)) continue
+
+			if (point.metric_kind === 'downloads') {
+				downloadTotalsByProjectId.set(
+					point.source_project,
+					(downloadTotalsByProjectId.get(point.source_project) ?? 0) +
+						getMetricValue(point, 'downloads'),
+				)
+			}
+
+			if (!isMetricKindForStat(point, activeStat)) continue
+
+			const projectData = dataByProjectId.get(point.source_project)
+			if (!projectData) continue
+
+			projectData[sliceIndex] += getMetricValue(point, activeStat)
+		}
+	})
+
+	const colorsByProjectId = buildPaletteColorsByDownloadRank(
+		selectedProjects.map((project) => ({
+			key: project.id,
+			label: project.name,
+			total: downloadTotalsByProjectId.get(project.id) ?? 0,
+		})),
+		palette,
+	)
+
+	return selectedProjects.map((project) => {
+		const color = colorsByProjectId.get(project.id) ?? ''
+		return {
+			projectId: project.id,
+			label: project.name,
+			data: dataByProjectId.get(project.id) ?? [],
+			borderColor: color,
+			backgroundColor: color,
+		}
+	})
+}
+
+export function getSliceCount(
+	timeRange: Labrinth.Analytics.v3.TimeRange,
+	fallback: number,
+): number {
+	if ('slices' in timeRange.resolution) {
+		return Math.max(1, timeRange.resolution.slices)
+	}
+	if ('minutes' in timeRange.resolution) {
+		const duration = new Date(timeRange.end).getTime() - new Date(timeRange.start).getTime()
+		const bucketMs = timeRange.resolution.minutes * 60 * 1000
+		if (bucketMs > 0 && duration > 0) {
+			return Math.max(1, Math.ceil(duration / bucketMs))
+		}
+	}
+	return Math.max(1, fallback)
+}
+
+export function getSliceBucketRange(
+	timeRange: Labrinth.Analytics.v3.TimeRange,
+	sliceCount: number,
+	index: number,
+): { start: Date; end: Date } {
+	const startMs = new Date(timeRange.start).getTime()
+	const endMs = new Date(timeRange.end).getTime()
+	const bucketMs = sliceCount > 0 ? (endMs - startMs) / sliceCount : 0
+
+	return {
+		start: new Date(startMs + index * bucketMs),
+		end: new Date(startMs + (index + 1) * bucketMs),
+	}
+}
+
+const ONE_DAY_MS = 24 * 60 * 60 * 1000
+const ONE_MINUTE_MS = 60 * 1000
+const YEAR_LABEL_TIME_RANGE_YEARS = 2
+const COMPACT_AXIS_THRESHOLD = 5
+const SHORT_HOURLY_TIME_LABEL_DURATION_MS = 6 * ONE_DAY_MS
+export const DEFAULT_X_AXIS_TICK_LIMIT = 12
+export const SHORT_HOURLY_AXIS_TICK_LIMIT = 8
+
+export function buildTimeAxisLabels(
+	timeRange: Labrinth.Analytics.v3.TimeRange,
+	sliceCount: number,
+	groupBy: AnalyticsGroupByPreset,
+): string[] {
+	const startMs = new Date(timeRange.start).getTime()
+	const endMs = new Date(timeRange.end).getTime()
+	const totalMs = endMs - startMs
+	const bucketMs = sliceCount > 0 ? totalMs / sliceCount : 0
+	const includeTime = shouldShowTimeForHourlyAxis(timeRange, groupBy)
+	const includeYear = isYearRelevantForTimeRange(timeRange) || groupBy === 'year'
+
+	const dates: Date[] = []
+	const dateKeys: string[] = []
+	for (let i = 0; i < sliceCount; i++) {
+		const date = new Date(startMs + (i + 1) * bucketMs)
+		dates.push(date)
+		dateKeys.push(`${date.getFullYear()}-${date.getMonth()}-${date.getDate()}`)
+	}
+
+	const dateFormatter = new Intl.DateTimeFormat(undefined, {
+		month: 'short',
+		day: 'numeric',
+		...(includeYear ? { year: 'numeric' } : {}),
+	})
+
+	if (!includeTime) {
+		return dates.map((date) => dateFormatter.format(date))
+	}
+
+	const timeFormatter = new Intl.DateTimeFormat(undefined, { hour: 'numeric' })
+	const uniqueDateCount = new Set(dateKeys).size
+
+	if (uniqueDateCount <= 1 || isSingleFullDayTimeRange(new Date(startMs), new Date(endMs))) {
+		return dates.map((date) => timeFormatter.format(date))
+	}
+
+	if (includeTime || sliceCount <= COMPACT_AXIS_THRESHOLD) {
+		const dateAndTimeFormatter = new Intl.DateTimeFormat(undefined, {
+			month: 'short',
+			day: 'numeric',
+			hour: 'numeric',
+			...(includeYear ? { year: 'numeric' } : {}),
+		})
+		return dates.map((date) => dateAndTimeFormatter.format(date))
+	}
+
+	return dates.map((date) => dateFormatter.format(date))
+}
+
+export function isTimeRelevantForGroupBy(groupBy: AnalyticsGroupByPreset): boolean {
+	return groupBy === '1h' || groupBy === '6h'
+}
+
+export function shouldUseShortHourlyAxis(
+	timeRange: Labrinth.Analytics.v3.TimeRange,
+	groupBy: AnalyticsGroupByPreset,
+): boolean {
+	if (!isTimeRelevantForGroupBy(groupBy)) {
+		return false
+	}
+
+	const durationMs = getTimeRangeDurationMs(timeRange)
+
+	return (
+		Number.isFinite(durationMs) &&
+		durationMs > 0 &&
+		durationMs <= DEFAULT_X_AXIS_TICK_LIMIT * ONE_DAY_MS
+	)
+}
+
+export function getShortHourlyAxisTickLimit(
+	timeRange: Labrinth.Analytics.v3.TimeRange,
+	groupBy: AnalyticsGroupByPreset,
+): number | undefined {
+	if (!shouldUseShortHourlyAxis(timeRange, groupBy)) {
+		return undefined
+	}
+
+	const durationMs = getTimeRangeDurationMs(timeRange)
+	if (durationMs > SHORT_HOURLY_TIME_LABEL_DURATION_MS) {
+		return Math.min(DEFAULT_X_AXIS_TICK_LIMIT, Math.ceil(durationMs / ONE_DAY_MS))
+	}
+
+	return SHORT_HOURLY_AXIS_TICK_LIMIT
+}
+
+function shouldShowTimeForHourlyAxis(
+	timeRange: Labrinth.Analytics.v3.TimeRange,
+	groupBy: AnalyticsGroupByPreset,
+): boolean {
+	const durationMs = getTimeRangeDurationMs(timeRange)
+	return (
+		isTimeRelevantForGroupBy(groupBy) &&
+		Number.isFinite(durationMs) &&
+		durationMs > 0 &&
+		durationMs <= SHORT_HOURLY_TIME_LABEL_DURATION_MS
+	)
+}
+
+function getTimeRangeDurationMs(timeRange: Labrinth.Analytics.v3.TimeRange): number {
+	return new Date(timeRange.end).getTime() - new Date(timeRange.start).getTime()
+}
+
+export function isYearRelevantForTimeRange(timeRange: Labrinth.Analytics.v3.TimeRange): boolean {
+	const start = new Date(timeRange.start)
+	const end = new Date(timeRange.end)
+	const yearLabelThreshold = new Date(start)
+	yearLabelThreshold.setFullYear(start.getFullYear() + YEAR_LABEL_TIME_RANGE_YEARS)
+
+	return (
+		Number.isFinite(start.getTime()) &&
+		Number.isFinite(end.getTime()) &&
+		end.getTime() > yearLabelThreshold.getTime()
+	)
+}
+
+export function formatBucketEndLabel(end: Date, includeTime: boolean, includeYear = false): string {
+	if (includeTime) {
+		return new Intl.DateTimeFormat(undefined, {
+			month: 'short',
+			day: 'numeric',
+			...(includeYear ? { year: 'numeric' } : {}),
+			hour: 'numeric',
+			minute: '2-digit',
+		}).format(end)
+	}
+
+	return new Intl.DateTimeFormat(undefined, {
+		month: 'short',
+		day: 'numeric',
+		...(includeYear ? { year: 'numeric' } : {}),
+	}).format(end)
+}
+
+function isStartOfDay(date: Date): boolean {
+	return (
+		date.getHours() === 0 &&
+		date.getMinutes() === 0 &&
+		date.getSeconds() === 0 &&
+		date.getMilliseconds() === 0
+	)
+}
+
+function isSingleFullDayTimeRange(start: Date, end: Date): boolean {
+	const durationMs = end.getTime() - start.getTime()
+	return (
+		Math.abs(durationMs - ONE_DAY_MS) < ONE_MINUTE_MS && isStartOfDay(start) && isStartOfDay(end)
+	)
+}
+
+export function formatMetricValue(
+	value: number,
+	activeStat: AnalyticsDashboardStat,
+	formatNumber: (value: number) => string,
+): string {
+	switch (activeStat) {
+		case 'revenue': {
+			const amount = Math.round(value * 100) / 100
+			return `$${formatNumber(amount)}`
+		}
+		case 'playtime': {
+			const hours = value / 3600
+			return `${hours.toFixed(1)} hrs`
+		}
+		case 'views':
+		case 'downloads':
+		default:
+			return formatNumber(Math.round(value))
+	}
+}
+
+function formatSmallAxisNumber(value: number): string {
+	const rounded = Math.round(value)
+	if (Math.abs(value - rounded) < 0.0000001) {
+		return String(rounded)
+	}
+
+	const formattedValue = Math.abs(value) < 1 ? value.toFixed(2) : value.toFixed(1)
+	return formattedValue.replace(/\.?0+$/, '')
+}
+
+export function formatAxisValue(
+	value: number,
+	activeStat: AnalyticsDashboardStat,
+	formatCompact: (value: number) => string,
+): string {
+	switch (activeStat) {
+		case 'revenue':
+			return `$${formatCompact(Math.round(value * 100) / 100)}`
+		case 'playtime':
+			return `${(value / 3600).toFixed(1)}h`
+		case 'views':
+		case 'downloads':
+		default:
+			if (Math.abs(value) < 10) {
+				return formatSmallAxisNumber(value)
+			}
+			return formatCompact(Math.round(value))
+	}
+}
diff --git a/apps/frontend/src/components/analytics/query-builder/DownloadsThresholdInput.vue b/apps/frontend/src/components/analytics/query-builder/DownloadsThresholdInput.vue
new file mode 100644
index 0000000000..18eba7b4f2
--- /dev/null
+++ b/apps/frontend/src/components/analytics/query-builder/DownloadsThresholdInput.vue
@@ -0,0 +1,145 @@
+<template>
+	<div class="flex flex-wrap items-center gap-3">
+		<span class="shrink-0 whitespace-nowrap text-sm font-semibold text-primary">
+			{{ props.label }}
+		</span>
+		<input
+			v-model="inputValue"
+			type="text"
+			inputmode="numeric"
+			placeholder="0"
+			class="h-8 rounded-lg border border-solid border-surface-5 bg-surface-3 px-2 text-center text-sm font-semibold text-primary outline-none transition-[box-shadow,color] focus:text-contrast focus:ring-4 focus:ring-brand-shadow"
+			:class="props.inputWidthClass"
+			:aria-label="props.inputAriaLabel"
+			@blur="formatInput"
+			@keydown.enter.prevent.stop="submitInput"
+		/>
+		<span class="shrink-0 text-sm font-semibold text-primary">{{ props.suffix }}</span>
+	</div>
+</template>
+
+<script setup lang="ts">
+const props = withDefaults(
+	defineProps<{
+		label: string
+		inputAriaLabel: string
+		threshold?: number | null
+		suffix?: string
+		inputWidthClass?: string
+	}>(),
+	{
+		suffix: 'downloads',
+		inputWidthClass: 'w-20',
+	},
+)
+
+const emit = defineEmits<{
+	'update:threshold': [threshold: number | null]
+	submit: [event: KeyboardEvent]
+}>()
+
+const inputValue = ref('')
+let isSyncingThreshold = false
+let hasPendingEmittedThreshold = false
+let pendingEmittedThreshold: number | null = null
+
+function parseDownloadsThreshold(value: string): number | null | undefined {
+	const normalizedValue = value.trim().toLowerCase().replace(/,/g, '')
+	if (!normalizedValue) {
+		return null
+	}
+
+	const match = normalizedValue.match(/^(\d+(?:\.\d+)?)([kmb])?$/)
+	if (!match) {
+		return undefined
+	}
+
+	const amount = Number.parseFloat(match[1])
+	if (!Number.isFinite(amount)) {
+		return undefined
+	}
+
+	const multiplierBySuffix: Record<string, number> = {
+		k: 1_000,
+		m: 1_000_000,
+		b: 1_000_000_000,
+	}
+
+	const multiplier = match[2] ? multiplierBySuffix[match[2]] : 1
+	return Math.max(0, Math.floor(amount * multiplier))
+}
+
+function formatCompactNumber(value: number): string {
+	const formatWithSuffix = (divisor: number, suffix: string) => {
+		const dividedValue = value / divisor
+		const fractionDigits = Number.isInteger(dividedValue) ? 0 : 1
+		return `${dividedValue.toFixed(fractionDigits).replace(/\.0$/, '')}${suffix}`
+	}
+
+	if (value >= 1_000_000_000) return formatWithSuffix(1_000_000_000, 'B')
+	if (value >= 1_000_000) return formatWithSuffix(1_000_000, 'M')
+	if (value >= 1_000) return formatWithSuffix(1_000, 'k')
+	return String(value)
+}
+
+function formatInput() {
+	const threshold = parseDownloadsThreshold(inputValue.value)
+	if (threshold === undefined || threshold === null) {
+		return
+	}
+
+	inputValue.value = formatCompactNumber(threshold)
+}
+
+function submitInput(event: KeyboardEvent) {
+	const threshold = parseDownloadsThreshold(inputValue.value)
+	if (threshold === undefined) {
+		return
+	}
+
+	if (threshold !== null) {
+		inputValue.value = formatCompactNumber(threshold)
+	}
+
+	emit('update:threshold', threshold)
+	emit('submit', event)
+}
+
+watch(inputValue, (value) => {
+	if (isSyncingThreshold) {
+		return
+	}
+
+	const threshold = parseDownloadsThreshold(value)
+	if (threshold === undefined) {
+		return
+	}
+
+	hasPendingEmittedThreshold = true
+	pendingEmittedThreshold = threshold
+	emit('update:threshold', threshold)
+	nextTick(() => {
+		if (hasPendingEmittedThreshold && pendingEmittedThreshold === threshold) {
+			hasPendingEmittedThreshold = false
+		}
+	})
+})
+
+watch(
+	() => props.threshold,
+	(threshold) => {
+		if (hasPendingEmittedThreshold && threshold === pendingEmittedThreshold) {
+			hasPendingEmittedThreshold = false
+			return
+		}
+
+		isSyncingThreshold = true
+		inputValue.value =
+			threshold === null || threshold === undefined ? '' : formatCompactNumber(threshold)
+		nextTick(() => {
+			isSyncingThreshold = false
+		})
+	},
+	{ immediate: true },
+)
+</script>
diff --git a/apps/frontend/src/components/analytics/query-builder/QueryBuilder.vue b/apps/frontend/src/components/analytics/query-builder/QueryBuilder.vue
new file mode 100644
index 0000000000..ae0e48e6d4
--- /dev/null
+++ b/apps/frontend/src/components/analytics/query-builder/QueryBuilder.vue
@@ -0,0 +1,920 @@
+<template>
+	<div class="flex flex-col gap-3 pl-1">
+		<div v-if="showProjectRow" class="flex items-start gap-2">
+			<div class="my-1.5 flex w-32 items-center gap-2 text-primary">
+				<FolderOpenIcon class="size-5" />
+				<span class="text-base font-medium">Project:</span>
+			</div>
+			<div class="w-fit">
+				<MultiSelect
+					v-model="draftSelectedProjectIds"
+					:options="projectSelectOptions"
+					:disabled="!hasProjectOptions"
+					:max-height="QUERY_BUILDER_DROPDOWN_MAX_HEIGHT"
+					dropdown-min-width="360px"
+					placeholder="Select projects"
+					:no-options-message="noProjectsMessage"
+					:searchable="projectOptions.length > 6"
+					:max-tag-rows="1"
+					checkbox-position="right"
+					show-selection-actions
+					@open="handleProjectSelectOpen"
+					@close="handleProjectSelectClose"
+				>
+					<template #input-content="{ isOpen, openDirection }">
+						<div class="flex min-h-8 min-w-0 flex-1 items-center gap-2 pr-1">
+							<div class="flex items-center gap-0.5">
+								<img
+									v-if="selectedProjectIconUrl"
+									:src="selectedProjectIconUrl"
+									:alt="`${selectedProjectLabel} Icon`"
+									class="size-6 shrink-0 rounded object-cover"
+									loading="lazy"
+									decoding="async"
+								/>
+								<BoxIcon v-else class="size-6 shrink-0 text-primary" />
+								<span class="min-w-0 flex-1 truncate px-1.5 py-1 font-semibold text-primary">
+									{{ selectedProjectLabel }}
+								</span>
+							</div>
+							<div class="flex shrink-0 items-center gap-1.5">
+								<template v-if="canClearDraftSelectedProjects">
+									<button
+										type="button"
+										class="flex cursor-pointer items-center justify-center rounded border-none bg-transparent p-0.5 text-secondary transition-colors hover:text-contrast"
+										aria-label="Clear projects"
+										@click.stop="clearDraftSelectedProjects"
+									>
+										<XIcon class="size-4 text-primary" />
+									</button>
+									<div class="h-5 w-[1px] shrink-0 bg-surface-5"></div>
+								</template>
+
+								<ChevronLeftIcon
+									class="size-5 shrink-0 text-primary transition-transform duration-150"
+									:class="
+										isOpen ? (openDirection === 'down' ? 'rotate-90' : '-rotate-90') : '-rotate-90'
+									"
+								/>
+							</div>
+						</div>
+					</template>
+					<template #option="{ item, selected }">
+						<div class="flex min-w-0 flex-1 items-center gap-2">
+							<img
+								v-if="getProjectIconUrl(item.value)"
+								:src="getProjectIconUrl(item.value)"
+								:alt="`${item.label} Icon`"
+								class="h-5 w-5 shrink-0 rounded object-cover"
+								loading="lazy"
+								decoding="async"
+							/>
+							<BoxIcon
+								v-else
+								class="h-5 w-5 shrink-0 text-primary"
+								:class="selected ? 'text-contrast' : 'text-primary'"
+							/>
+							<span
+								v-tooltip="item.label"
+								class="min-w-0 truncate font-semibold leading-tight"
+								:class="selected ? 'text-contrast' : 'text-primary'"
+							>
+								{{ item.label }}
+							</span>
+						</div>
+					</template>
+					<template v-if="hasProjectOptions" #top>
+						<div>
+							<button
+								type="button"
+								class="flex w-full cursor-pointer items-center gap-2 border-0 bg-surface-4 px-4 py-3 text-left shadow-none transition-all duration-150 hover:brightness-[115%] focus:brightness-[115%]"
+								:aria-selected="isAllProjectsOptionSelected"
+								:class="isAllProjectsOptionSelected ? 'text-contrast' : 'text-primary'"
+								role="option"
+								@click="selectAllProjectsMode"
+								@keydown.enter.stop
+								@keydown.space.stop
+							>
+								<LayersIcon
+									class="h-5 w-5 shrink-0 text-primary"
+									:class="isAllProjectsOptionSelected ? 'text-contrast' : 'text-primary'"
+								/>
+								<span class="min-w-0 flex-1 font-semibold leading-tight"> All projects </span>
+								<span class="flex shrink-0 items-center justify-center text-brand">
+									<CheckIcon v-if="isAllProjectsOptionSelected" aria-hidden="true" class="size-5" />
+								</span>
+							</button>
+						</div>
+					</template>
+					<template v-if="hasProjectOptions" #bottom>
+						<DownloadsThresholdInput
+							class="border-0 border-t border-solid border-surface-5 px-6 py-2.5"
+							label="Projects above"
+							input-aria-label="Project downloads threshold"
+							:threshold="projectDownloadsThreshold"
+							input-width-class="w-20"
+							@update:threshold="setProjectDownloadsThreshold"
+							@submit="runProjectDownloadsThresholdQuery"
+						/>
+					</template>
+				</MultiSelect>
+			</div>
+		</div>
+
+		<div class="flex flex-wrap items-center gap-2">
+			<div class="flex items-center gap-2">
+				<div class="flex w-32 items-center gap-2 text-primary">
+					<CalendarIcon class="size-5" />
+					<span class="text-base font-medium">Timeframe:</span>
+				</div>
+				<div>
+					<TimeFramePicker />
+				</div>
+			</div>
+			<div class="flex items-center gap-2">
+				<span class="text-base font-medium text-primary">Grouped by</span>
+				<div>
+					<Combobox
+						v-model="selectedGroupBy"
+						:options="groupByOptions"
+						:max-height="QUERY_BUILDER_DROPDOWN_MAX_HEIGHT"
+						:dropdown-min-width="QUERY_BUILDER_DROPDOWN_MIN_WIDTH"
+					/>
+				</div>
+			</div>
+			<ButtonStyled v-if="!isTimeframeAndGroupByDefault" type="transparent">
+				<button
+					type="button"
+					:disabled="isTimeframeAndGroupByDefault"
+					@click="resetTimeframeAndGroupBy"
+				>
+					Reset
+				</button>
+			</ButtonStyled>
+		</div>
+
+		<div class="flex flex-wrap items-start gap-2">
+			<div class="flex items-center gap-2">
+				<div class="flex w-32 items-center gap-2 text-primary">
+					<BlocksIcon class="size-5" />
+					<span class="text-base font-medium">Breakdown:</span>
+				</div>
+				<div class="flex flex-col gap-2">
+					<div class="flex flex-wrap items-center gap-2">
+						<div>
+							<Combobox
+								v-model="selectedBreakdownValue"
+								:options="breakdownOptions"
+								:max-height="QUERY_BUILDER_DROPDOWN_MAX_HEIGHT"
+								:dropdown-min-width="QUERY_BUILDER_DROPDOWN_MIN_WIDTH"
+							>
+								<template #suffix>
+									<div class="mr-0.5 flex gap-1.5">
+										<button
+											v-if="canClearSelectedBreakdown"
+											type="button"
+											class="inline-flex size-5 shrink-0 items-center justify-center rounded-full border-0 bg-transparent shadow-none transition-colors hover:bg-transparent hover:text-contrast"
+											aria-label="Clear breakdown"
+											@click.stop="clearSelectedBreakdown"
+											@keydown.stop
+										>
+											<XIcon class="size-4 text-primary" />
+										</button>
+										<div
+											v-if="canClearSelectedBreakdown"
+											class="h-5 w-[1px] shrink-0 bg-surface-5"
+										></div>
+									</div>
+								</template>
+							</Combobox>
+						</div>
+					</div>
+				</div>
+			</div>
+			<QueryBuilderFilter />
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
+import {
+	BlocksIcon,
+	BoxIcon,
+	CalendarIcon,
+	CheckIcon,
+	ChevronLeftIcon,
+	FolderOpenIcon,
+	LayersIcon,
+	XIcon,
+} from '@modrinth/assets'
+import {
+	ButtonStyled,
+	Combobox,
+	type ComboboxOption,
+	MultiSelect,
+	type MultiSelectItem,
+	type MultiSelectOption,
+} from '@modrinth/ui'
+
+import {
+	type AnalyticsBreakdownPreset,
+	type AnalyticsDashboardProject,
+	type AnalyticsGroupByPreset,
+	type AnalyticsSelectedFilters,
+	getProjectIdsMatchingStatusFilter,
+	injectAnalyticsDashboardContext,
+} from '~/providers/analytics/analytics'
+import {
+	buildDefaultAnalyticsQueryBuilderState,
+	getAnalyticsBreakdownPresetForProjectSelection,
+	getDefaultAnalyticsBreakdownPreset,
+} from '~/providers/analytics/query-builder-url'
+
+import DownloadsThresholdInput from './DownloadsThresholdInput.vue'
+import {
+	getAnalyticsStatsForBreakdown,
+	getAnalyticsStatsForFilterCategory,
+	getEnabledAnalyticsStatsForState,
+} from './query-filter/queryFilter'
+import QueryBuilderFilter from './query-filter/QueryFilter.vue'
+import {
+	ensureMinimumTimeRange,
+	getAnalyticsGroupByPresetMinutes,
+	MAX_ANALYTICS_TIME_SLICES,
+	useSelectedAnalyticsTimeRange,
+} from './timeframe-picker/timeframe'
+import TimeFramePicker from './timeframe-picker/TimeFramePicker.vue'
+
+const QUERY_BUILDER_DROPDOWN_MAX_HEIGHT = 500
+const QUERY_BUILDER_DROPDOWN_MIN_WIDTH = '12rem'
+const projectOptionCollator = new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' })
+
+const {
+	hasProjectContext,
+	projectGroups,
+	projects,
+	selectedProjectIds,
+	selectedTimeframeMode,
+	selectedTimeframe,
+	selectedLastTimeframeAmount,
+	selectedLastTimeframeUnit,
+	selectedCustomTimeframeStartDate,
+	selectedCustomTimeframeEndDate,
+	selectedGroupBy,
+	selectedBreakdown,
+	selectedFilters,
+	activeStat,
+	projectStatusById,
+	queryResetToken,
+	refreshAnalyticsQuery,
+	setFetchRequest,
+} = injectAnalyticsDashboardContext()
+const route = useRoute()
+const { selectedTimeRange, selectedTimeframeDurationMinutes } = useSelectedAnalyticsTimeRange()
+const defaultQueryState = buildDefaultAnalyticsQueryBuilderState([])
+
+function getProjectOption(
+	project: AnalyticsDashboardProject,
+	groupTitle?: string,
+): MultiSelectOption<string> {
+	return {
+		value: project.id,
+		label: project.name,
+		searchTerms: groupTitle ? [groupTitle] : undefined,
+	}
+}
+
+function compareProjectOptions(
+	left: MultiSelectOption<string>,
+	right: MultiSelectOption<string>,
+): number {
+	return projectOptionCollator.compare(left.label, right.label)
+}
+
+const projectOptions = computed<MultiSelectOption<string>[]>(() =>
+	projects.value.map((project) => getProjectOption(project)),
+)
+const projectIconUrlsById = computed(
+	() =>
+		new Map(
+			projects.value
+				.filter((project) => project.iconUrl)
+				.map((project) => [project.id, project.iconUrl as string]),
+		),
+)
+
+const projectSelectOptions = computed<MultiSelectItem<string>[]>(() => {
+	const options: MultiSelectItem<string>[] = []
+
+	for (const group of projectGroups.value) {
+		if (group.projects.length === 0) {
+			continue
+		}
+
+		if (group.title) {
+			options.push({
+				type: 'section-header',
+				label: group.title,
+				key: group.key ?? `organization-${group.title}`,
+			})
+		}
+
+		options.push(
+			...group.projects
+				.map((project) => getProjectOption(project, group.title))
+				.sort(compareProjectOptions),
+		)
+	}
+
+	return options
+})
+
+const allProjectIds = computed(() => projectOptions.value.map((project) => project.value))
+const hasProjectOptions = computed(() => projectOptions.value.length > 0)
+const noProjectsMessage = computed(() =>
+	hasProjectContext.value ? 'No data available for analytics' : 'No projects available',
+)
+const isProjectSelectOpen = ref(false)
+const draftSelectedProjectIds = ref<string[]>([...selectedProjectIds.value])
+const projectDownloadsThreshold = ref<number | null>(null)
+const projectDownloadsThresholdProjectIds = ref<string[] | null>(null)
+
+function isSameProjectSelection(left: string[], right: string[]) {
+	if (left.length !== right.length) {
+		return false
+	}
+
+	const rightProjectIds = new Set(right)
+	return left.every((projectId) => rightProjectIds.has(projectId))
+}
+
+function normalizeProjectSelection(projectIds: string[]) {
+	return projectIds.length > 0 ? [...projectIds] : [...allProjectIds.value]
+}
+
+watch(selectedProjectIds, (nextSelectedProjectIds) => {
+	if (isProjectSelectOpen.value) {
+		return
+	}
+
+	draftSelectedProjectIds.value = [...nextSelectedProjectIds]
+})
+
+watch(draftSelectedProjectIds, (nextSelectedProjectIds) => {
+	if (projectDownloadsThreshold.value === null) {
+		return
+	}
+
+	const normalizedProjectIds = normalizeProjectSelection(nextSelectedProjectIds)
+	if (
+		projectDownloadsThresholdProjectIds.value &&
+		isSameProjectSelection(normalizedProjectIds, projectDownloadsThresholdProjectIds.value)
+	) {
+		return
+	}
+
+	clearProjectDownloadsThreshold()
+})
+
+watch(queryResetToken, () => {
+	isProjectSelectOpen.value = false
+	selectedBreakdownCommitRequestId++
+	draftSelectedBreakdown.value = selectedBreakdown.value
+	clearProjectDownloadsThreshold()
+	draftSelectedProjectIds.value = isSameProjectSelection(
+		selectedProjectIds.value,
+		allProjectIds.value,
+	)
+		? []
+		: [...selectedProjectIds.value]
+})
+
+const areAllProjectsSelected = computed(() => {
+	return isSameProjectSelection(draftSelectedProjectIds.value, allProjectIds.value)
+})
+const isAllProjectsOptionSelected = computed(() => draftSelectedProjectIds.value.length === 0)
+const canClearDraftSelectedProjects = computed(() => {
+	return !isAllProjectsOptionSelected.value && !areAllProjectsSelected.value
+})
+
+const selectedProjectLabel = computed(() => {
+	if (!hasProjectOptions.value) {
+		return noProjectsMessage.value
+	}
+
+	if (isAllProjectsOptionSelected.value || areAllProjectsSelected.value) {
+		return 'All projects'
+	}
+
+	if (draftSelectedProjectIds.value.length === 1) {
+		const selectedProject = projectOptions.value.find(
+			(project) => project.value === draftSelectedProjectIds.value[0],
+		)
+		return selectedProject?.label ?? '1 project'
+	}
+
+	return `${draftSelectedProjectIds.value.length} projects`
+})
+
+const selectedProjectIconUrl = computed(() => {
+	if (
+		isAllProjectsOptionSelected.value ||
+		areAllProjectsSelected.value ||
+		draftSelectedProjectIds.value.length !== 1
+	) {
+		return undefined
+	}
+
+	return getProjectIconUrl(draftSelectedProjectIds.value[0])
+})
+
+function getProjectIconUrl(projectId: string): string | undefined {
+	return projectIconUrlsById.value.get(projectId)
+}
+
+function handleProjectSelectOpen() {
+	isProjectSelectOpen.value = true
+	draftSelectedProjectIds.value = isSameProjectSelection(
+		selectedProjectIds.value,
+		allProjectIds.value,
+	)
+		? []
+		: [...selectedProjectIds.value]
+}
+
+function handleProjectSelectClose(
+	nextSelectedProjectIds: string[] = draftSelectedProjectIds.value,
+) {
+	isProjectSelectOpen.value = false
+	commitDraftSelectedProjects(nextSelectedProjectIds)
+}
+
+function commitDraftSelectedProjects(
+	nextSelectedProjectIds: string[] = draftSelectedProjectIds.value,
+) {
+	const nextProjectIds = normalizeProjectSelection(nextSelectedProjectIds)
+
+	draftSelectedProjectIds.value = [...nextProjectIds]
+	if (!isSameProjectSelection(selectedProjectIds.value, nextProjectIds)) {
+		selectedProjectIds.value = nextProjectIds
+	}
+}
+
+function clearDraftSelectedProjects() {
+	clearProjectDownloadsThreshold()
+	draftSelectedProjectIds.value = []
+	if (!isProjectSelectOpen.value) {
+		handleProjectSelectClose()
+	}
+}
+
+function selectAllProjectsMode() {
+	clearProjectDownloadsThreshold()
+	draftSelectedProjectIds.value = []
+}
+
+const draftSelectedBreakdown = ref<AnalyticsBreakdownPreset>(selectedBreakdown.value)
+let selectedBreakdownCommitRequestId = 0
+
+const selectedBreakdownValue = computed<AnalyticsBreakdownPreset>({
+	get: () => draftSelectedBreakdown.value,
+	set: (nextBreakdown) => {
+		draftSelectedBreakdown.value = getAnalyticsBreakdownPresetForProjectSelection(
+			nextBreakdown,
+			selectedProjectIds.value,
+		)
+		void scheduleSelectedBreakdownCommit()
+	},
+})
+
+function clearSelectedBreakdown() {
+	draftSelectedBreakdown.value = defaultSelectedBreakdown.value
+	void scheduleSelectedBreakdownCommit()
+}
+
+watch(selectedBreakdown, (nextBreakdown) => {
+	selectedBreakdownCommitRequestId++
+	draftSelectedBreakdown.value = nextBreakdown
+})
+
+async function scheduleSelectedBreakdownCommit() {
+	const requestId = ++selectedBreakdownCommitRequestId
+	const nextBreakdown = draftSelectedBreakdown.value
+
+	await waitForDeferredQueryBuilderCommit()
+
+	if (requestId !== selectedBreakdownCommitRequestId) {
+		return
+	}
+
+	if (selectedBreakdown.value !== nextBreakdown) {
+		selectedBreakdown.value = nextBreakdown
+	}
+}
+
+function waitForDeferredQueryBuilderCommit(): Promise<void> {
+	if (!import.meta.client) {
+		return nextTick()
+	}
+
+	return new Promise((resolve) => {
+		nextTick(() => {
+			requestAnimationFrame(() => {
+				requestAnimationFrame(() => resolve())
+			})
+		})
+	})
+}
+
+const isDashboardAnalyticsRoute = computed(
+	() => route.path.replace(/\/$/, '') === '/dashboard/analytics',
+)
+const showProjectRow = computed(() => isDashboardAnalyticsRoute.value || projects.value.length > 1)
+const isTimeframeAndGroupByDefault = computed(
+	() =>
+		selectedTimeframeMode.value === defaultQueryState.selectedTimeframeMode &&
+		selectedTimeframe.value === defaultQueryState.selectedTimeframe &&
+		selectedGroupBy.value === defaultQueryState.selectedGroupBy,
+)
+
+function resetTimeframeAndGroupBy() {
+	if (isTimeframeAndGroupByDefault.value) {
+		return
+	}
+
+	selectedTimeframeMode.value = defaultQueryState.selectedTimeframeMode
+	selectedTimeframe.value = defaultQueryState.selectedTimeframe
+	selectedLastTimeframeAmount.value = defaultQueryState.selectedLastTimeframeAmount
+	selectedLastTimeframeUnit.value = defaultQueryState.selectedLastTimeframeUnit
+	selectedCustomTimeframeStartDate.value = defaultQueryState.selectedCustomTimeframeStartDate
+	selectedCustomTimeframeEndDate.value = defaultQueryState.selectedCustomTimeframeEndDate
+	selectedGroupBy.value = defaultQueryState.selectedGroupBy
+}
+
+function applyProjectDownloadsThreshold(threshold: number | null) {
+	if (threshold === null) {
+		return
+	}
+
+	const projectIds = projects.value
+		.filter((project) => project.downloads >= threshold)
+		.map((project) => project.id)
+
+	projectDownloadsThresholdProjectIds.value = projectIds
+	draftSelectedProjectIds.value = projectIds
+}
+
+function setProjectDownloadsThreshold(threshold: number | null) {
+	projectDownloadsThreshold.value = threshold
+	if (threshold === null) {
+		projectDownloadsThresholdProjectIds.value = null
+		draftSelectedProjectIds.value = []
+		return
+	}
+
+	applyProjectDownloadsThreshold(threshold)
+}
+
+function clearProjectDownloadsThreshold() {
+	projectDownloadsThreshold.value = null
+	projectDownloadsThresholdProjectIds.value = null
+}
+
+function closeProjectSelectDropdown(event: KeyboardEvent) {
+	const eventTarget = event.target
+	if (!(eventTarget instanceof HTMLElement)) {
+		isProjectSelectOpen.value = false
+		return
+	}
+
+	const dropdown = eventTarget.closest('[role="listbox"][aria-multiselectable="true"]')
+	if (!dropdown) {
+		isProjectSelectOpen.value = false
+		return
+	}
+
+	dropdown.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }))
+}
+
+async function runProjectDownloadsThresholdQuery(event: KeyboardEvent) {
+	commitDraftSelectedProjects()
+	closeProjectSelectDropdown(event)
+	await nextTick()
+	await refreshAnalyticsQuery()
+}
+
+const groupByPresetOptions: Array<{
+	value: AnalyticsGroupByPreset
+	label: string
+}> = [
+	{ value: '1h', label: '1h' },
+	{ value: '6h', label: '6h' },
+	{ value: 'day', label: 'Day' },
+	{ value: 'week', label: 'Week' },
+	{ value: 'month', label: 'Month' },
+	{ value: 'year', label: 'Year' },
+]
+
+const selectedProjectCount = computed(() => selectedProjectIds.value.length)
+const defaultSelectedBreakdown = computed(() =>
+	getDefaultAnalyticsBreakdownPreset(selectedProjectIds.value),
+)
+const canClearSelectedBreakdown = computed(
+	() => selectedBreakdownValue.value !== defaultSelectedBreakdown.value,
+)
+const breakdownOptions = computed<ComboboxOption<AnalyticsBreakdownPreset>[]>(() => [
+	...(selectedProjectCount.value <= 1 ? [{ value: 'none' as const, label: 'None' }] : []),
+	...(selectedProjectCount.value > 1 ? [{ value: 'project' as const, label: 'Project' }] : []),
+	{ value: 'country', label: 'Country' },
+	{ value: 'monetization', label: 'Monetization' },
+	{ value: 'user_agent', label: 'Download source' },
+	{ value: 'download_reason', label: 'Download reason' },
+	{ value: 'version_id', label: 'Project version' },
+	{ value: 'loader', label: 'Loader' },
+	{ value: 'game_version', label: 'Game version' },
+])
+
+function isRevenueHourlyGroupBy(groupBy: AnalyticsGroupByPreset): boolean {
+	return groupBy === '1h' || groupBy === '6h'
+}
+
+function getAllTimeYearGroupStart(end: Date): Date {
+	const start = new Date(end)
+	start.setFullYear(2021)
+	return start
+}
+
+const groupByOptions = computed<ComboboxOption<AnalyticsGroupByPreset>[]>(() => {
+	const timeframeMinutes = selectedTimeframeDurationMinutes.value
+	const options = groupByPresetOptions.map((option) => {
+		const groupByMinutes = getAnalyticsGroupByPresetMinutes(option.value)
+		const isTooCoarse = groupByMinutes >= timeframeMinutes
+		const isTooFine = timeframeMinutes / groupByMinutes > MAX_ANALYTICS_TIME_SLICES
+		const isRevenueHourlyGroupByOption =
+			activeStat.value === 'revenue' && isRevenueHourlyGroupBy(option.value)
+		const isRevenueDailyFallback = activeStat.value === 'revenue' && option.value === 'day'
+		return {
+			value: option.value,
+			label: option.label,
+			disabled:
+				isRevenueHourlyGroupByOption || (!isRevenueDailyFallback && (isTooCoarse || isTooFine)),
+		}
+	})
+
+	if (options.every((option) => option.disabled)) {
+		const fallbackOption =
+			options.find((option) => activeStat.value === 'revenue' && option.value === 'day') ??
+			options[0]
+		if (fallbackOption) {
+			fallbackOption.disabled = false
+		}
+	}
+
+	return options
+})
+
+watch(
+	groupByOptions,
+	(nextOptions) => {
+		const selectedOption = nextOptions.find((option) => option.value === selectedGroupBy.value)
+		if (selectedOption && !selectedOption.disabled) {
+			return
+		}
+
+		const fallbackOption = nextOptions.find((option) => !option.disabled) ?? nextOptions[0]
+		if (fallbackOption && selectedGroupBy.value !== fallbackOption.value) {
+			selectedGroupBy.value = fallbackOption.value
+		}
+	},
+	{ immediate: true },
+)
+
+function unique<T>(values: T[]): T[] {
+	return Array.from(new Set(values))
+}
+
+function sortStrings<T extends string>(values: T[]): T[] {
+	return [...values].sort((left, right) => left.localeCompare(right))
+}
+
+function includesStat(stats: readonly string[], stat: string): boolean {
+	return stats.includes(stat)
+}
+
+function withBreakdownFields(
+	breakdown: AnalyticsBreakdownPreset,
+	filters: AnalyticsSelectedFilters,
+): {
+	views: Labrinth.Analytics.v3.ProjectViewsField[]
+	downloads: Labrinth.Analytics.v3.ProjectDownloadsField[]
+	playtime: Labrinth.Analytics.v3.ProjectPlaytimeField[]
+	revenue: Labrinth.Analytics.v3.ProjectRevenueField[]
+} {
+	const views: Labrinth.Analytics.v3.ProjectViewsField[] = ['project_id']
+	const downloads: Labrinth.Analytics.v3.ProjectDownloadsField[] = ['project_id']
+	const playtime: Labrinth.Analytics.v3.ProjectPlaytimeField[] = ['project_id']
+	const revenue: Labrinth.Analytics.v3.ProjectRevenueField[] = ['project_id']
+	const breakdownStats = getAnalyticsStatsForBreakdown(breakdown)
+	const enabledStats = getEnabledAnalyticsStatsForState(breakdown, filters)
+
+	switch (breakdown) {
+		case 'project':
+			break
+		case 'country':
+			if (includesStat(breakdownStats, 'views') && includesStat(enabledStats, 'views')) {
+				views.push('country')
+			}
+			if (includesStat(breakdownStats, 'downloads') && includesStat(enabledStats, 'downloads')) {
+				downloads.push('country')
+			}
+			if (includesStat(breakdownStats, 'playtime') && includesStat(enabledStats, 'playtime')) {
+				playtime.push('country')
+			}
+			break
+		case 'monetization':
+			if (includesStat(breakdownStats, 'views') && includesStat(enabledStats, 'views')) {
+				views.push('monetized')
+			}
+			if (includesStat(breakdownStats, 'downloads') && includesStat(enabledStats, 'downloads')) {
+				downloads.push('monetized')
+			}
+			break
+		case 'user_agent':
+			if (includesStat(breakdownStats, 'downloads') && includesStat(enabledStats, 'downloads')) {
+				downloads.push('user_agent')
+			}
+			break
+		case 'download_reason':
+			if (includesStat(breakdownStats, 'downloads') && includesStat(enabledStats, 'downloads')) {
+				downloads.push('reason')
+			}
+			break
+		case 'version_id':
+			if (includesStat(breakdownStats, 'downloads') && includesStat(enabledStats, 'downloads')) {
+				downloads.push('version_id')
+			}
+			if (includesStat(breakdownStats, 'playtime') && includesStat(enabledStats, 'playtime')) {
+				playtime.push('version_id')
+			}
+			break
+		case 'loader':
+			if (includesStat(breakdownStats, 'downloads') && includesStat(enabledStats, 'downloads')) {
+				downloads.push('loader')
+			}
+			if (includesStat(breakdownStats, 'playtime') && includesStat(enabledStats, 'playtime')) {
+				playtime.push('loader')
+			}
+			break
+		case 'game_version':
+			if (includesStat(breakdownStats, 'downloads') && includesStat(enabledStats, 'downloads')) {
+				downloads.push('game_version')
+			}
+			if (includesStat(breakdownStats, 'playtime') && includesStat(enabledStats, 'playtime')) {
+				playtime.push('game_version')
+			}
+			break
+		default:
+			break
+	}
+
+	if (filters.country.length > 0) {
+		const filterStats = getAnalyticsStatsForFilterCategory('country')
+		if (includesStat(filterStats, 'views') && includesStat(enabledStats, 'views')) {
+			views.push('country')
+		}
+		if (includesStat(filterStats, 'downloads') && includesStat(enabledStats, 'downloads')) {
+			downloads.push('country')
+		}
+		if (includesStat(filterStats, 'playtime') && includesStat(enabledStats, 'playtime')) {
+			playtime.push('country')
+		}
+	}
+
+	if (filters.monetization.length > 0) {
+		const filterStats = getAnalyticsStatsForFilterCategory('monetization')
+		if (includesStat(filterStats, 'views') && includesStat(enabledStats, 'views')) {
+			views.push('monetized')
+		}
+		if (includesStat(filterStats, 'downloads') && includesStat(enabledStats, 'downloads')) {
+			downloads.push('monetized')
+		}
+	}
+
+	if (filters.user_agent.length > 0) {
+		const filterStats = getAnalyticsStatsForFilterCategory('user_agent')
+		if (includesStat(filterStats, 'downloads') && includesStat(enabledStats, 'downloads')) {
+			downloads.push('user_agent')
+		}
+	}
+
+	if (filters.download_reason.length > 0) {
+		const filterStats = getAnalyticsStatsForFilterCategory('download_reason')
+		if (includesStat(filterStats, 'downloads') && includesStat(enabledStats, 'downloads')) {
+			downloads.push('reason')
+		}
+	}
+
+	if (filters.version_id.length > 0) {
+		const filterStats = getAnalyticsStatsForFilterCategory('version_id')
+		if (includesStat(filterStats, 'downloads') && includesStat(enabledStats, 'downloads')) {
+			downloads.push('version_id')
+		}
+		if (includesStat(filterStats, 'playtime') && includesStat(enabledStats, 'playtime')) {
+			playtime.push('version_id')
+		}
+	}
+
+	if (filters.game_version.length > 0) {
+		const filterStats = getAnalyticsStatsForFilterCategory('game_version')
+		if (includesStat(filterStats, 'downloads') && includesStat(enabledStats, 'downloads')) {
+			downloads.push('game_version')
+		}
+		if (includesStat(filterStats, 'playtime') && includesStat(enabledStats, 'playtime')) {
+			playtime.push('game_version')
+		}
+	}
+
+	if (filters.loader_type.length > 0) {
+		const filterStats = getAnalyticsStatsForFilterCategory('loader_type')
+		if (includesStat(filterStats, 'downloads') && includesStat(enabledStats, 'downloads')) {
+			downloads.push('loader')
+		}
+		if (includesStat(filterStats, 'playtime') && includesStat(enabledStats, 'playtime')) {
+			playtime.push('loader')
+		}
+	}
+
+	return {
+		views: unique(views),
+		downloads: unique(downloads),
+		playtime: unique(playtime),
+		revenue: unique(revenue),
+	}
+}
+
+const fetchRequest = computed<Labrinth.Analytics.v3.FetchRequest>(() => {
+	const rawRange = selectedTimeRange.value
+	const rawStart =
+		selectedTimeframeMode.value === 'preset' &&
+		selectedTimeframe.value === 'all_time' &&
+		selectedGroupBy.value === 'year'
+			? getAllTimeYearGroupStart(rawRange.end)
+			: rawRange.start
+	const { start, end } = ensureMinimumTimeRange(rawStart, rawRange.end)
+
+	const groupByMs = getAnalyticsGroupByPresetMinutes(selectedGroupBy.value) * 60 * 1000
+	const desiredSlices = Math.max(1, Math.floor((end.getTime() - start.getTime()) / groupByMs))
+	const resolutionSlices = Math.min(MAX_ANALYTICS_TIME_SLICES, desiredSlices)
+
+	const bucketBy = withBreakdownFields(selectedBreakdown.value, selectedFilters.value)
+	const filteredProjectIds = getProjectIdsMatchingStatusFilter(
+		selectedProjectIds.value,
+		projectStatusById.value,
+		selectedFilters.value,
+	)
+
+	return {
+		time_range: {
+			start: start.toISOString(),
+			end: end.toISOString(),
+			resolution: {
+				slices: resolutionSlices,
+			},
+		},
+		project_ids: sortStrings(filteredProjectIds),
+		return_metrics: {
+			project_views: {
+				bucket_by: sortStrings(bucketBy.views),
+			},
+			project_downloads: {
+				bucket_by: sortStrings(bucketBy.downloads),
+			},
+			project_playtime: {
+				bucket_by: sortStrings(bucketBy.playtime),
+			},
+			project_revenue: {
+				bucket_by: sortStrings(bucketBy.revenue),
+			},
+		},
+	}
+})
+
+watch(
+	fetchRequest,
+	(nextFetchRequest) => {
+		setFetchRequest(nextFetchRequest)
+	},
+	{ deep: true, immediate: true },
+)
+
+defineExpose({
+	fetchRequest,
+})
+</script>
+
+<style lang="scss" scoped>
+.checkbox-shadow {
+	box-shadow: 1px 1px 2px 0 rgba(0, 0, 0, 0.08);
+}
+</style>
diff --git a/apps/frontend/src/components/analytics/query-builder/query-filter/QueryFilter.vue b/apps/frontend/src/components/analytics/query-builder/query-filter/QueryFilter.vue
new file mode 100644
index 0000000000..8c690307bf
--- /dev/null
+++ b/apps/frontend/src/components/analytics/query-builder/query-filter/QueryFilter.vue
@@ -0,0 +1,849 @@
+<template>
+	<DropdownFilterBar
+		v-model="selectedFilterValue"
+		:categories="filterCategories"
+		:show-clear="canClearSelectedBreakdown"
+		clear-label="Reset"
+		@clear="clearFilterBar"
+	>
+		<template #search-actions="{ category, setSelectedValues }">
+			<div v-if="category.key === 'game_version'" class="mr-2 flex w-[150px] justify-end">
+				<Chips
+					:model-value="gameVersionType"
+					:items="gameVersionTypeOptions"
+					:never-empty="true"
+					aria-label="Game version type"
+					size="small"
+					hide-checkmark-icon
+					@update:model-value="(type) => setGameVersionType(type, setSelectedValues)"
+				/>
+			</div>
+		</template>
+
+		<template #option-right="{ category, option }">
+			<template v-if="category.key === 'version_id'">
+				<span
+					v-for="metadata in projectVersionOptionProjectMetadataById.get(option.value) ?? []"
+					:key="`${option.value}-${metadata.name}`"
+					v-tooltip="metadata.name"
+					class="flex size-6 shrink-0 items-center justify-center overflow-hidden rounded text-primary"
+				>
+					<img
+						v-if="metadata.iconUrl"
+						:src="metadata.iconUrl"
+						:alt="`${metadata.name} Icon`"
+						class="h-6 w-6 rounded object-cover"
+					/>
+					<BoxIcon v-else class="h-full w-full" />
+				</span>
+			</template>
+		</template>
+
+		<template #category-footer="{ category, setSelectedValues, closeMenu }">
+			<DownloadsThresholdInput
+				v-if="category.key === 'country'"
+				class="border-0 border-t border-solid border-surface-5 px-3 py-2.5"
+				label="Countries above"
+				input-aria-label="Country downloads threshold"
+				:threshold="countryDownloadsThreshold"
+				input-width-class="w-16"
+				@update:threshold="
+					(threshold) => setCountryDownloadsThreshold(threshold, setSelectedValues)
+				"
+				@submit="
+					(event) =>
+						runDownloadsThresholdQuery(
+							applyCountryDownloadsThreshold,
+							setSelectedValues,
+							closeMenu,
+							event,
+						)
+				"
+			/>
+			<DownloadsThresholdInput
+				v-else-if="category.key === 'version_id'"
+				class="border-0 border-t border-solid border-surface-5 px-3 py-2.5"
+				label="Project versions above"
+				input-aria-label="Project version downloads threshold"
+				:threshold="projectVersionDownloadsThreshold"
+				input-width-class="w-16"
+				@update:threshold="
+					(threshold) => setProjectVersionDownloadsThreshold(threshold, setSelectedValues)
+				"
+				@submit="
+					(event) =>
+						runDownloadsThresholdQuery(
+							applyProjectVersionDownloadsThreshold,
+							setSelectedValues,
+							closeMenu,
+							event,
+						)
+				"
+			/>
+			<DownloadsThresholdInput
+				v-else-if="category.key === 'game_version'"
+				class="border-0 border-t border-solid border-surface-5 px-3 py-2.5"
+				label="Game Versions above"
+				input-aria-label="Game version downloads threshold"
+				:threshold="gameVersionDownloadsThreshold"
+				input-width-class="w-16"
+				@update:threshold="
+					(threshold) => setGameVersionDownloadsThreshold(threshold, setSelectedValues)
+				"
+				@submit="
+					(event) =>
+						runDownloadsThresholdQuery(
+							applyGameVersionDownloadsThreshold,
+							setSelectedValues,
+							closeMenu,
+							event,
+						)
+				"
+			/>
+		</template>
+
+		<template #preview-footer="{ category, setSelectedValues, closeMenu }">
+			<DownloadsThresholdInput
+				v-if="category.key === 'country'"
+				class="border-0 border-t border-solid border-surface-5 px-3 py-2.5"
+				label="Countries above"
+				input-aria-label="Country downloads threshold"
+				:threshold="countryDownloadsThreshold"
+				input-width-class="w-16"
+				@update:threshold="
+					(threshold) => setCountryDownloadsThreshold(threshold, setSelectedValues)
+				"
+				@submit="
+					(event) =>
+						runDownloadsThresholdQuery(
+							applyCountryDownloadsThreshold,
+							setSelectedValues,
+							closeMenu,
+							event,
+						)
+				"
+			/>
+			<DownloadsThresholdInput
+				v-else-if="category.key === 'version_id'"
+				class="border-0 border-t border-solid border-surface-5 px-3 py-2.5"
+				label="Project versions above"
+				input-aria-label="Project version downloads threshold"
+				:threshold="projectVersionDownloadsThreshold"
+				input-width-class="w-16"
+				@update:threshold="
+					(threshold) => setProjectVersionDownloadsThreshold(threshold, setSelectedValues)
+				"
+				@submit="
+					(event) =>
+						runDownloadsThresholdQuery(
+							applyProjectVersionDownloadsThreshold,
+							setSelectedValues,
+							closeMenu,
+							event,
+						)
+				"
+			/>
+			<DownloadsThresholdInput
+				v-else-if="category.key === 'game_version'"
+				class="border-0 border-t border-solid border-surface-5 px-3 py-2.5"
+				label="Game Versions above"
+				input-aria-label="Game version downloads threshold"
+				:threshold="gameVersionDownloadsThreshold"
+				input-width-class="w-16"
+				@update:threshold="
+					(threshold) => setGameVersionDownloadsThreshold(threshold, setSelectedValues)
+				"
+				@submit="
+					(event) =>
+						runDownloadsThresholdQuery(
+							applyGameVersionDownloadsThreshold,
+							setSelectedValues,
+							closeMenu,
+							event,
+						)
+				"
+			/>
+		</template>
+	</DropdownFilterBar>
+</template>
+
+<script setup lang="ts">
+import { BoxIcon } from '@modrinth/assets'
+import {
+	Chips,
+	DropdownFilterBar,
+	type DropdownFilterBarCategory,
+	type DropdownFilterBarOption,
+} from '@modrinth/ui'
+
+import { useFormattedCountries } from '@/composables/country.ts'
+import { useGeneratedState } from '~/composables/generated'
+import {
+	type AnalyticsQueryFilterCategory,
+	type AnalyticsSelectedFilters,
+	doesProjectStatusMatchFilters,
+	injectAnalyticsDashboardContext,
+} from '~/providers/analytics/analytics'
+import { getDefaultAnalyticsBreakdownPreset } from '~/providers/analytics/query-builder-url'
+
+import { getDownloadSourceLabel } from '../../breakdown'
+import DownloadsThresholdInput from '../DownloadsThresholdInput.vue'
+import {
+	areSelectedFiltersEqual,
+	cloneSelectedFilters,
+	FILTER_VALUE_CATEGORIES,
+	getOptionsWithSelectedValues,
+	getVisibleAnalyticsFilterCategoriesForState,
+	normalizeSelectedValues as normalizeSelectedFilterValues,
+} from './queryFilter'
+
+type AnalyticsFilterValueCategory = Exclude<AnalyticsQueryFilterCategory, 'project'>
+type SetDropdownFilterValues = (values: string[]) => void
+type ApplyDownloadsThreshold = (setSelectedValues: SetDropdownFilterValues) => void
+type CloseDownloadsThresholdMenu = (event?: Event) => void
+type ProjectVersionProjectOptionMetadata = {
+	name: string
+	iconUrl?: string
+}
+
+const {
+	hasProjectContext,
+	projects,
+	selectedProjectIds,
+	availableProjectStatuses,
+	filterOptions,
+	projectVersionDownloadsById,
+	gameVersionDownloadsByVersion,
+	countryDownloadsByCode,
+	isAnalyticsFilterOptionsLoading,
+	selectedBreakdown,
+	selectedFilters,
+	queryResetToken,
+	refreshAnalyticsQuery,
+	getVersionDisplayName,
+	getVersionPublishedDate,
+	getVersionProjectName,
+	getVersionProjectIconUrl,
+} = injectAnalyticsDashboardContext()
+const formattedCountries = useFormattedCountries()
+const generatedState = useGeneratedState()
+
+const gameVersionType = ref<'release' | 'all'>('release')
+const countryDownloadsThreshold = ref<number | null>(null)
+const projectVersionDownloadsThreshold = ref<number | null>(null)
+const gameVersionDownloadsThreshold = ref<number | null>(null)
+const gameVersionTypeOptions: Array<'release' | 'all'> = ['release', 'all']
+const filterValueCategoryKeys = new Set<string>(FILTER_VALUE_CATEGORIES)
+const downloadsThresholdFilterCategories = ['country', 'version_id', 'game_version'] as const
+type DownloadsThresholdFilterCategory = (typeof downloadsThresholdFilterCategories)[number]
+const downloadsThresholdSelections = ref<
+	Partial<Record<DownloadsThresholdFilterCategory, string[]>>
+>({})
+const projectStatusFilterOptions = computed<DropdownFilterBarOption[]>(() =>
+	availableProjectStatuses.value.map((status) => ({
+		value: status,
+		label: getProjectStatusFilterOptionLabel(status),
+	})),
+)
+const selectedProjectIdSet = computed(() => new Set(selectedProjectIds.value))
+const effectiveSelectedProjectCount = computed(
+	() =>
+		projects.value.filter(
+			(project) =>
+				selectedProjectIdSet.value.has(project.id) &&
+				doesProjectStatusMatchFilters(project.status, selectedFilters.value),
+		).length,
+)
+const showProjectVersionProjectIcons = computed(() => effectiveSelectedProjectCount.value > 1)
+const projectVersionOptionProjectMetadataById = computed(() => {
+	const metadataById = new Map<string, ProjectVersionProjectOptionMetadata[]>()
+
+	if (!showProjectVersionProjectIcons.value) {
+		return metadataById
+	}
+
+	const versionIds = new Set([
+		...filterOptions.value.versionIds,
+		...selectedFilters.value.version_id,
+	])
+	for (const versionId of versionIds) {
+		const projectName = getVersionProjectName(versionId)
+		if (!projectName) {
+			continue
+		}
+
+		const metadata: ProjectVersionProjectOptionMetadata = { name: projectName }
+		const iconUrl = getVersionProjectIconUrl(versionId)
+		if (iconUrl) {
+			metadata.iconUrl = iconUrl
+		}
+
+		metadataById.set(versionId, [metadata])
+	}
+
+	return metadataById
+})
+const defaultSelectedBreakdown = computed(() =>
+	getDefaultAnalyticsBreakdownPreset(selectedProjectIds.value),
+)
+const canClearSelectedBreakdown = computed(
+	() => selectedBreakdown.value !== defaultSelectedBreakdown.value,
+)
+const analyticsFilterOptionsEmptyLabel = computed(() =>
+	isAnalyticsFilterOptionsLoading.value ? 'Loading...' : undefined,
+)
+const draftSelectedFilters = ref<AnalyticsSelectedFilters>(
+	cloneSelectedFilters(selectedFilters.value),
+)
+let selectedFiltersCommitRequestId = 0
+
+const selectedFilterValue = computed<Record<string, string[]>>({
+	get: () => getSelectedFilterBarValue(),
+	set: (nextValue) => {
+		const nextFilters = cloneSelectedFilters(draftSelectedFilters.value)
+
+		for (const [categoryKey, values] of Object.entries(nextValue)) {
+			if (!isAnalyticsFilterValueCategory(categoryKey)) {
+				continue
+			}
+
+			nextFilters[categoryKey] = normalizeSelectedFilterValues(categoryKey, values, [])
+		}
+
+		draftSelectedFilters.value = nextFilters
+		void scheduleSelectedFiltersCommit()
+	},
+})
+
+function getSelectedFilterBarValue(): AnalyticsSelectedFilters {
+	return cloneSelectedFilters(draftSelectedFilters.value)
+}
+
+function clearSelectedBreakdown() {
+	selectedBreakdown.value = defaultSelectedBreakdown.value
+}
+
+function clearFilterBar() {
+	clearSelectedBreakdown()
+	clearDownloadsThresholds()
+}
+
+watch(queryResetToken, () => {
+	selectedFiltersCommitRequestId++
+	draftSelectedFilters.value = cloneSelectedFilters(selectedFilters.value)
+	clearDownloadsThresholds()
+})
+
+watch(
+	selectedFilters,
+	(nextFilters, previousFilters) => {
+		selectedFiltersCommitRequestId++
+		draftSelectedFilters.value = cloneSelectedFilters(nextFilters)
+		clearDownloadsThresholdsForChangedFilters(previousFilters, nextFilters)
+	},
+	{ deep: true },
+)
+
+async function scheduleSelectedFiltersCommit() {
+	const requestId = ++selectedFiltersCommitRequestId
+	const nextFilters = cloneSelectedFilters(draftSelectedFilters.value)
+
+	await waitForDeferredQueryFilterCommit()
+
+	if (requestId !== selectedFiltersCommitRequestId) {
+		return
+	}
+
+	if (!areSelectedFiltersEqual(selectedFilters.value, nextFilters)) {
+		selectedFilters.value = nextFilters
+	}
+}
+
+function waitForDeferredQueryFilterCommit(): Promise<void> {
+	if (!import.meta.client) {
+		return nextTick()
+	}
+
+	return new Promise((resolve) => {
+		nextTick(() => {
+			requestAnimationFrame(() => {
+				requestAnimationFrame(() => resolve())
+			})
+		})
+	})
+}
+
+const filterCategories = computed<DropdownFilterBarCategory[]>(() => {
+	const visibleCategoryKeys = new Set(
+		getVisibleAnalyticsFilterCategoriesForState(selectedBreakdown.value, selectedFilters.value),
+	)
+	const categories: DropdownFilterBarCategory[] = []
+
+	if (!hasProjectContext.value) {
+		categories.push({
+			key: 'project_status',
+			label: 'Project status',
+			options: withSelectedOptions('project_status', projectStatusFilterOptions.value),
+		})
+	}
+
+	categories.push(
+		{
+			key: 'country',
+			label: 'Country',
+			searchable: countryFilterOptions.value.length > 6,
+			searchPlaceholder: 'Search countries...',
+			emptyOptionsLabel: analyticsFilterOptionsEmptyLabel.value,
+			emptySearchLabel: analyticsFilterOptionsEmptyLabel.value,
+			options: withSelectedOptions('country', countryFilterOptions.value),
+			submenuClass: 'w-fit',
+		},
+		{
+			key: 'monetization',
+			label: 'Monetization',
+			options: withSelectedOptions('monetization', [
+				{ value: 'monetized', label: 'Monetized' },
+				{ value: 'unmonetized', label: 'Unmonetized' },
+			]),
+		},
+		{
+			key: 'user_agent',
+			label: 'Download Source',
+			searchable: downloadSourceFilterOptions.value.length > 6,
+			searchPlaceholder: 'Search download sources...',
+			emptyOptionsLabel: analyticsFilterOptionsEmptyLabel.value,
+			emptySearchLabel: analyticsFilterOptionsEmptyLabel.value,
+			options: withSelectedOptions('user_agent', downloadSourceFilterOptions.value),
+		},
+		{
+			key: 'download_reason',
+			label: 'Download Type',
+			emptyOptionsLabel: analyticsFilterOptionsEmptyLabel.value,
+			emptySearchLabel: analyticsFilterOptionsEmptyLabel.value,
+			options: withSelectedOptions('download_reason', downloadReasonFilterOptions.value),
+		},
+		{
+			key: 'version_id',
+			label: 'Project version',
+			searchable: versionFilterOptions.value.length > 6,
+			searchPlaceholder: 'Search project versions...',
+			submenuClass: 'w-fit',
+			options: withSelectedOptions('version_id', versionFilterOptions.value),
+		},
+		{
+			key: 'game_version',
+			label: 'Game Version',
+			searchable: true,
+			searchPlaceholder: 'Search versions...',
+			submenuClass: 'w-fit',
+			options: withSelectedOptions('game_version', gameVersionFilterOptions.value),
+		},
+		{
+			key: 'loader_type',
+			label: 'Loader Type',
+			options: withSelectedOptions('loader_type', loaderTypeFilterOptions.value),
+		},
+	)
+
+	return categories.filter((category) =>
+		visibleCategoryKeys.has(category.key as AnalyticsFilterValueCategory),
+	)
+})
+
+const countryLabelsByCode = computed(
+	() =>
+		new Map(
+			formattedCountries.value.map(
+				(country) => [country.value.toUpperCase(), country.label] as const,
+			),
+		),
+)
+
+const countryFilterOptions = computed<DropdownFilterBarOption[]>(() =>
+	filterOptions.value.countries
+		.map((countryCode) => ({
+			value: countryCode,
+			label: getCountryFilterOptionLabel(countryCode),
+			searchTerms: [countryCode],
+		}))
+		.sort((left, right) => left.label.localeCompare(right.label)),
+)
+
+const gameVersionReleaseDatesByVersion = computed(
+	() =>
+		new Map(
+			generatedState.value.gameVersions.map(
+				(gameVersion) => [gameVersion.version, gameVersion.date] as const,
+			),
+		),
+)
+const gameVersionTypesByVersion = computed(
+	() =>
+		new Map(
+			generatedState.value.gameVersions.map(
+				(gameVersion) => [gameVersion.version, gameVersion.version_type] as const,
+			),
+		),
+)
+
+const downloadSourceFilterOptions = computed<DropdownFilterBarOption[]>(() =>
+	filterOptions.value.downloadSources
+		.map((downloadSource) => ({
+			value: downloadSource,
+			label: getDownloadSourceLabel(downloadSource),
+		}))
+		.sort((left, right) => left.label.localeCompare(right.label)),
+)
+
+const downloadReasonFilterOptions = computed<DropdownFilterBarOption[]>(() =>
+	filterOptions.value.downloadReasons.map((downloadReason) => ({
+		value: downloadReason,
+		label: getDownloadReasonFilterOptionLabel(downloadReason),
+	})),
+)
+
+const versionFilterOptions = computed<DropdownFilterBarOption[]>(() =>
+	filterOptions.value.versionIds
+		.map((versionId) => {
+			const projectName = projectVersionOptionProjectMetadataById.value.get(versionId)?.[0]?.name
+
+			return {
+				value: versionId,
+				label: getVersionDisplayName(versionId),
+				searchTerms: projectName ? [versionId, projectName] : [versionId],
+			}
+		})
+		.sort((left, right) =>
+			compareOptionalDateStringsDescending(
+				getVersionPublishedDate(left.value),
+				getVersionPublishedDate(right.value),
+				left.label,
+				right.label,
+			),
+		),
+)
+
+const gameVersionFilterOptions = computed<DropdownFilterBarOption[]>(() =>
+	filterOptions.value.gameVersions
+		.filter((gameVersion) => {
+			const versionType = gameVersionTypesByVersion.value.get(gameVersion)
+			return (
+				gameVersionType.value === 'all' || versionType === undefined || versionType === 'release'
+			)
+		})
+		.map((gameVersion) => ({
+			value: gameVersion,
+			label: gameVersion,
+		}))
+		.sort((left, right) =>
+			compareOptionalDateStringsDescending(
+				gameVersionReleaseDatesByVersion.value.get(left.value),
+				gameVersionReleaseDatesByVersion.value.get(right.value),
+				left.label,
+				right.label,
+			),
+		),
+)
+
+const loaderTypeFilterOptions = computed<DropdownFilterBarOption[]>(() =>
+	filterOptions.value.loaderTypes
+		.map((loaderType) => ({
+			value: loaderType,
+			label: getLoaderTypeFilterOptionLabel(loaderType),
+			searchTerms: [loaderType],
+		}))
+		.sort((left, right) => left.label.localeCompare(right.label)),
+)
+
+function isAnalyticsFilterValueCategory(
+	categoryKey: string,
+): categoryKey is AnalyticsFilterValueCategory {
+	return filterValueCategoryKeys.has(categoryKey)
+}
+
+function withSelectedOptions(
+	categoryKey: AnalyticsFilterValueCategory,
+	options: DropdownFilterBarOption[],
+): DropdownFilterBarOption[] {
+	return getOptionsWithSelectedValues(
+		options,
+		selectedFilters.value[categoryKey],
+		getMissingSelectedOptionLabel(categoryKey),
+	)
+}
+
+function getMissingSelectedOptionLabel(
+	categoryKey: AnalyticsFilterValueCategory,
+): ((value: string) => string) | undefined {
+	if (categoryKey === 'country') {
+		return getCountryFilterOptionLabel
+	}
+	if (categoryKey === 'version_id') {
+		return getVersionDisplayName
+	}
+	if (categoryKey === 'download_reason') {
+		return getDownloadReasonFilterOptionLabel
+	}
+	if (categoryKey === 'user_agent') {
+		return getDownloadSourceLabel
+	}
+	if (categoryKey === 'loader_type') {
+		return getLoaderTypeFilterOptionLabel
+	}
+	return undefined
+}
+
+function getCountryFilterOptionLabel(countryCode: string): string {
+	const normalizedCode = countryCode.trim().toUpperCase()
+	if (normalizedCode === 'XX') {
+		return 'Other'
+	}
+
+	return countryLabelsByCode.value.get(normalizedCode) ?? countryCode
+}
+
+function getProjectStatusFilterOptionLabel(status: string): string {
+	const normalizedStatus = status.trim()
+	if (normalizedStatus.length === 0) {
+		return status
+	}
+
+	return `${normalizedStatus.charAt(0).toUpperCase()}${normalizedStatus.slice(1)}`
+}
+
+function getLoaderTypeFilterOptionLabel(loaderType: string): string {
+	const normalizedLoaderType = loaderType.trim()
+	if (normalizedLoaderType.length === 0) {
+		return loaderType
+	}
+
+	return `${normalizedLoaderType.charAt(0).toUpperCase()}${normalizedLoaderType.slice(1)}`
+}
+
+function getDownloadReasonFilterOptionLabel(reason: string): string {
+	switch (reason) {
+		case 'standalone':
+			return 'Standalone'
+		case 'dependency':
+			return 'Dependency'
+		case 'modpack':
+			return 'Modpack'
+		case 'update':
+			return 'Update'
+		default:
+			return reason
+	}
+}
+
+function getDateTimestamp(date: string | undefined): number | undefined {
+	if (!date) {
+		return undefined
+	}
+
+	const timestamp = new Date(date).getTime()
+	return Number.isFinite(timestamp) ? timestamp : undefined
+}
+
+function compareOptionalDateStringsDescending(
+	leftDate: string | undefined,
+	rightDate: string | undefined,
+	leftFallback: string,
+	rightFallback: string,
+): number {
+	const leftTimestamp = getDateTimestamp(leftDate)
+	const rightTimestamp = getDateTimestamp(rightDate)
+
+	if (leftTimestamp !== undefined && rightTimestamp !== undefined) {
+		return rightTimestamp - leftTimestamp
+	}
+	if (leftTimestamp !== undefined) {
+		return -1
+	}
+	if (rightTimestamp !== undefined) {
+		return 1
+	}
+
+	return leftFallback.localeCompare(rightFallback)
+}
+
+function applyGameVersionDownloadsThreshold(setSelectedValues: SetDropdownFilterValues) {
+	const threshold = gameVersionDownloadsThreshold.value
+	if (threshold === null) {
+		return
+	}
+
+	const selectedValues = gameVersionFilterOptions.value
+		.filter((gameVersion) => {
+			return (gameVersionDownloadsByVersion.value.get(gameVersion.value) ?? 0) >= threshold
+		})
+		.map((gameVersion) => gameVersion.value)
+
+	setDownloadsThresholdSelectedValues('game_version', selectedValues, setSelectedValues)
+}
+
+function applyCountryDownloadsThreshold(setSelectedValues: SetDropdownFilterValues) {
+	const threshold = countryDownloadsThreshold.value
+	if (threshold === null) {
+		return
+	}
+
+	const selectedValues = countryFilterOptions.value
+		.filter((country) => {
+			return (
+				(countryDownloadsByCode.value.get(country.value.trim().toUpperCase()) ?? 0) >= threshold
+			)
+		})
+		.map((country) => country.value)
+
+	setDownloadsThresholdSelectedValues('country', selectedValues, setSelectedValues)
+}
+
+function applyProjectVersionDownloadsThreshold(setSelectedValues: SetDropdownFilterValues) {
+	const threshold = projectVersionDownloadsThreshold.value
+	if (threshold === null) {
+		return
+	}
+
+	const selectedValues = versionFilterOptions.value
+		.filter((version) => {
+			return (projectVersionDownloadsById.value.get(version.value) ?? 0) >= threshold
+		})
+		.map((version) => version.value)
+
+	setDownloadsThresholdSelectedValues('version_id', selectedValues, setSelectedValues)
+}
+
+function setCountryDownloadsThreshold(
+	threshold: number | null,
+	setSelectedValues: SetDropdownFilterValues,
+) {
+	countryDownloadsThreshold.value = threshold
+	if (threshold === null) {
+		clearDownloadsThreshold('country')
+		setSelectedValues([])
+		return
+	}
+
+	applyCountryDownloadsThreshold(setSelectedValues)
+}
+
+function setProjectVersionDownloadsThreshold(
+	threshold: number | null,
+	setSelectedValues: SetDropdownFilterValues,
+) {
+	projectVersionDownloadsThreshold.value = threshold
+	if (threshold === null) {
+		clearDownloadsThreshold('version_id')
+		setSelectedValues([])
+		return
+	}
+
+	applyProjectVersionDownloadsThreshold(setSelectedValues)
+}
+
+function setGameVersionDownloadsThreshold(
+	threshold: number | null,
+	setSelectedValues: SetDropdownFilterValues,
+) {
+	gameVersionDownloadsThreshold.value = threshold
+	if (threshold === null) {
+		clearDownloadsThreshold('game_version')
+		setSelectedValues([])
+		return
+	}
+
+	applyGameVersionDownloadsThreshold(setSelectedValues)
+}
+
+function clearDownloadsThresholdsForChangedFilters(
+	previousFilters: AnalyticsSelectedFilters,
+	nextFilters: AnalyticsSelectedFilters,
+) {
+	for (const categoryKey of downloadsThresholdFilterCategories) {
+		if (areFilterSelectionsEqual(previousFilters[categoryKey], nextFilters[categoryKey])) {
+			continue
+		}
+
+		const thresholdSelection = downloadsThresholdSelections.value[categoryKey]
+		if (
+			thresholdSelection &&
+			areFilterSelectionsEqual(thresholdSelection, nextFilters[categoryKey])
+		) {
+			continue
+		}
+
+		if (previousFilters[categoryKey].length > 0 || nextFilters[categoryKey].length > 0) {
+			clearDownloadsThreshold(categoryKey)
+		}
+	}
+}
+
+function setDownloadsThresholdSelectedValues(
+	categoryKey: DownloadsThresholdFilterCategory,
+	selectedValues: string[],
+	setSelectedValues: SetDropdownFilterValues,
+) {
+	downloadsThresholdSelections.value = {
+		...downloadsThresholdSelections.value,
+		[categoryKey]: normalizeSelectedFilterValues(categoryKey, selectedValues, []),
+	}
+	setSelectedValues(selectedValues)
+}
+
+function clearDownloadsThreshold(categoryKey: DownloadsThresholdFilterCategory) {
+	switch (categoryKey) {
+		case 'country':
+			countryDownloadsThreshold.value = null
+			break
+		case 'version_id':
+			projectVersionDownloadsThreshold.value = null
+			break
+		case 'game_version':
+			gameVersionDownloadsThreshold.value = null
+			break
+	}
+
+	const { [categoryKey]: _removedSelection, ...nextSelections } = downloadsThresholdSelections.value
+	downloadsThresholdSelections.value = nextSelections
+}
+
+function clearDownloadsThresholds() {
+	for (const categoryKey of downloadsThresholdFilterCategories) {
+		clearDownloadsThreshold(categoryKey)
+	}
+}
+
+function areFilterSelectionsEqual(left: string[], right: string[]): boolean {
+	const leftValues = new Set(left)
+	const rightValues = new Set(right)
+	if (leftValues.size !== rightValues.size) {
+		return false
+	}
+
+	return [...leftValues].every((value) => rightValues.has(value))
+}
+
+async function runDownloadsThresholdQuery(
+	applyDownloadsThreshold: ApplyDownloadsThreshold,
+	setSelectedValues: SetDropdownFilterValues,
+	closeMenu: CloseDownloadsThresholdMenu,
+	event?: KeyboardEvent,
+) {
+	applyDownloadsThreshold(setSelectedValues)
+	closeMenu(event)
+	await scheduleSelectedFiltersCommit()
+	await refreshAnalyticsQuery()
+}
+
+function setGameVersionType(
+	type: 'release' | 'all' | null | undefined,
+	setSelectedValues: SetDropdownFilterValues,
+) {
+	if (type === null || type === undefined) {
+		return
+	}
+
+	gameVersionType.value = type
+	applyGameVersionDownloadsThreshold(setSelectedValues)
+}
+</script>
diff --git a/apps/frontend/src/components/analytics/query-builder/query-filter/queryFilter.ts b/apps/frontend/src/components/analytics/query-builder/query-filter/queryFilter.ts
new file mode 100644
index 0000000000..10a42542c9
--- /dev/null
+++ b/apps/frontend/src/components/analytics/query-builder/query-filter/queryFilter.ts
@@ -0,0 +1,333 @@
+import type {
+	AnalyticsBreakdownPreset,
+	AnalyticsDashboardStat,
+	AnalyticsQueryFilterCategory,
+	AnalyticsSelectedFilters,
+} from '~/providers/analytics/analytics'
+
+export type AnalyticsDashboardDimension =
+	| 'project'
+	| 'project_status'
+	| 'version_id'
+	| 'country'
+	| 'monetization'
+	| 'user_agent'
+	| 'download_reason'
+	| 'game_version'
+	| 'loader_type'
+
+export const ALL_FILTER_VALUE = '__all__'
+export const FILTER_VALUE_CATEGORIES: Exclude<AnalyticsQueryFilterCategory, 'project'>[] = [
+	'project_status',
+	'country',
+	'monetization',
+	'user_agent',
+	'download_reason',
+	'version_id',
+	'game_version',
+	'loader_type',
+]
+
+const ANALYTICS_DASHBOARD_STAT_ORDER: AnalyticsDashboardStat[] = [
+	'views',
+	'downloads',
+	'revenue',
+	'playtime',
+]
+
+const ANALYTICS_STATS_BY_DIMENSION: Record<
+	AnalyticsDashboardDimension,
+	readonly AnalyticsDashboardStat[]
+> = {
+	project: ANALYTICS_DASHBOARD_STAT_ORDER,
+	version_id: ['downloads', 'playtime'],
+	country: ['views', 'downloads', 'playtime'],
+	monetization: ['views', 'downloads'],
+	user_agent: ['downloads'],
+	download_reason: ['downloads'],
+	game_version: ['downloads', 'playtime'],
+	loader_type: ['downloads', 'playtime'],
+	project_status: ANALYTICS_DASHBOARD_STAT_ORDER,
+}
+
+const ANALYTICS_DIMENSION_BY_BREAKDOWN: Record<
+	AnalyticsBreakdownPreset,
+	AnalyticsDashboardDimension
+> = {
+	none: 'project',
+	project: 'project',
+	country: 'country',
+	monetization: 'monetization',
+	user_agent: 'user_agent',
+	download_reason: 'download_reason',
+	version_id: 'version_id',
+	loader: 'loader_type',
+	game_version: 'game_version',
+}
+
+const ANALYTICS_DIMENSION_BY_FILTER_CATEGORY: Record<
+	Exclude<AnalyticsQueryFilterCategory, 'project'>,
+	AnalyticsDashboardDimension
+> = {
+	project_status: 'project_status',
+	country: 'country',
+	monetization: 'monetization',
+	user_agent: 'user_agent',
+	download_reason: 'download_reason',
+	version_id: 'version_id',
+	game_version: 'game_version',
+	loader_type: 'loader_type',
+}
+
+const ANALYTICS_FILTER_CATEGORY_BY_BREAKDOWN: Record<
+	AnalyticsBreakdownPreset,
+	Exclude<AnalyticsQueryFilterCategory, 'project'> | null
+> = {
+	none: null,
+	project: null,
+	country: 'country',
+	monetization: 'monetization',
+	user_agent: 'user_agent',
+	download_reason: 'download_reason',
+	version_id: 'version_id',
+	loader: 'loader_type',
+	game_version: 'game_version',
+}
+
+export type FilterOption = {
+	value: string
+	label: string
+	searchTerms?: string[]
+}
+
+function intersectAnalyticsStats(
+	left: readonly AnalyticsDashboardStat[],
+	right: readonly AnalyticsDashboardStat[],
+): AnalyticsDashboardStat[] {
+	const rightStats = new Set(right)
+	return left.filter((stat) => rightStats.has(stat))
+}
+
+function haveAnalyticsStatOverlap(
+	left: readonly AnalyticsDashboardStat[],
+	right: readonly AnalyticsDashboardStat[],
+): boolean {
+	return left.some((stat) => right.includes(stat))
+}
+
+export function getAnalyticsStatsForDimension(
+	dimension: AnalyticsDashboardDimension,
+): readonly AnalyticsDashboardStat[] {
+	return ANALYTICS_STATS_BY_DIMENSION[dimension]
+}
+
+export function getAnalyticsStatsForBreakdown(
+	breakdown: AnalyticsBreakdownPreset,
+): readonly AnalyticsDashboardStat[] {
+	return getAnalyticsStatsForDimension(ANALYTICS_DIMENSION_BY_BREAKDOWN[breakdown])
+}
+
+export function getAnalyticsStatsForFilterCategory(
+	category: AnalyticsQueryFilterCategory,
+): readonly AnalyticsDashboardStat[] {
+	if (category === 'project') {
+		return ANALYTICS_DASHBOARD_STAT_ORDER
+	}
+
+	return getAnalyticsStatsForDimension(ANALYTICS_DIMENSION_BY_FILTER_CATEGORY[category])
+}
+
+export function getAnalyticsFilterCategoryForBreakdown(
+	breakdown: AnalyticsBreakdownPreset,
+): Exclude<AnalyticsQueryFilterCategory, 'project'> | null {
+	return ANALYTICS_FILTER_CATEGORY_BY_BREAKDOWN[breakdown]
+}
+
+function getAnalyticsStatsForFilterScope(
+	breakdown: AnalyticsBreakdownPreset,
+	filters: AnalyticsSelectedFilters,
+	ignoredCategory?: AnalyticsQueryFilterCategory,
+): readonly AnalyticsDashboardStat[] {
+	let stats = [...getAnalyticsStatsForBreakdown(breakdown)]
+
+	for (const category of FILTER_VALUE_CATEGORIES) {
+		if (category === ignoredCategory || filters[category].length === 0) {
+			continue
+		}
+
+		stats = intersectAnalyticsStats(stats, getAnalyticsStatsForFilterCategory(category))
+	}
+
+	return stats
+}
+
+export function getEnabledAnalyticsStatsForState(
+	breakdown: AnalyticsBreakdownPreset,
+	filters: AnalyticsSelectedFilters,
+): readonly AnalyticsDashboardStat[] {
+	return getAnalyticsStatsForFilterScope(breakdown, filters)
+}
+
+export function getVisibleAnalyticsFilterCategoriesForState(
+	breakdown: AnalyticsBreakdownPreset,
+	filters: AnalyticsSelectedFilters,
+): readonly Exclude<AnalyticsQueryFilterCategory, 'project'>[] {
+	return FILTER_VALUE_CATEGORIES.filter((category) =>
+		haveAnalyticsStatOverlap(
+			getAnalyticsStatsForFilterScope(breakdown, filters, category),
+			getAnalyticsStatsForFilterCategory(category),
+		),
+	)
+}
+
+export function sanitizeAnalyticsSelectedFilters(
+	breakdown: AnalyticsBreakdownPreset,
+	filters: AnalyticsSelectedFilters,
+): AnalyticsSelectedFilters {
+	const nextFilters = cloneSelectedFilters(filters)
+	let availableStats = [...getAnalyticsStatsForBreakdown(breakdown)]
+
+	for (const category of FILTER_VALUE_CATEGORIES) {
+		if (filters[category].length === 0) {
+			continue
+		}
+
+		const categoryStats = getAnalyticsStatsForFilterCategory(category)
+		if (!haveAnalyticsStatOverlap(availableStats, categoryStats)) {
+			nextFilters[category] = []
+			continue
+		}
+
+		availableStats = intersectAnalyticsStats(availableStats, categoryStats)
+	}
+
+	return nextFilters
+}
+
+export function cloneSelectedFilters(filters: AnalyticsSelectedFilters): AnalyticsSelectedFilters {
+	return {
+		project: [...filters.project],
+		project_status: [...filters.project_status],
+		country: [...filters.country],
+		monetization: [...filters.monetization],
+		user_agent: [...filters.user_agent],
+		download_reason: [...filters.download_reason],
+		version_id: [...filters.version_id],
+		game_version: [...filters.game_version],
+		loader_type: [...filters.loader_type],
+	}
+}
+
+export function areStringArraysEqual(left: string[], right: string[]): boolean {
+	if (left.length !== right.length) {
+		return false
+	}
+
+	for (let index = 0; index < left.length; index += 1) {
+		if (left[index] !== right[index]) {
+			return false
+		}
+	}
+
+	return true
+}
+
+export function areSelectedFiltersEqual(
+	left: AnalyticsSelectedFilters,
+	right: AnalyticsSelectedFilters,
+): boolean {
+	if (!areStringArraysEqual(left.project, right.project)) {
+		return false
+	}
+
+	for (const categoryKey of FILTER_VALUE_CATEGORIES) {
+		if (!areStringArraysEqual(left[categoryKey], right[categoryKey])) {
+			return false
+		}
+	}
+
+	return true
+}
+
+export function getOptionsWithSelectedValues(
+	options: FilterOption[],
+	selectedValues: string[],
+	getMissingSelectedOptionLabel: (value: string) => string = (value) => value,
+): FilterOption[] {
+	const knownValues = new Set(options.map((option) => option.value))
+	const missingSelectedOptions = selectedValues
+		.filter((value) => !knownValues.has(value))
+		.map((value) => ({
+			value,
+			label: getMissingSelectedOptionLabel(value),
+		}))
+
+	return [...options, ...missingSelectedOptions]
+}
+
+export function normalizeSelectedValues(
+	categoryKey: AnalyticsQueryFilterCategory,
+	values: string[],
+	projectIds: string[],
+): string[] {
+	const uniqueValues = Array.from(new Set(values))
+
+	if (categoryKey === 'project') {
+		if (uniqueValues.includes(ALL_FILTER_VALUE)) {
+			return projectIds
+		}
+
+		const allProjectIds = new Set(projectIds)
+		const selectedProjects = uniqueValues.filter((value) => allProjectIds.has(value))
+
+		return selectedProjects.length > 0 ? selectedProjects : projectIds
+	}
+
+	if (uniqueValues.includes(ALL_FILTER_VALUE) || uniqueValues.length === 0) {
+		return []
+	}
+
+	const selectedValues = uniqueValues.filter((value) => value !== ALL_FILTER_VALUE)
+	if (categoryKey === 'project_status') {
+		return selectedValues
+			.map((value) => value.trim().toLowerCase())
+			.filter(isProjectStatusFilterValue)
+	}
+	if (categoryKey === 'loader_type') {
+		return Array.from(
+			new Set(
+				selectedValues
+					.map((value) => value.trim().toLowerCase())
+					.filter((value) => value.length > 0),
+			),
+		)
+	}
+
+	return selectedValues
+}
+
+export const PROJECT_STATUS_FILTER_VALUES = [
+	'approved',
+	'archived',
+	'rejected',
+	'draft',
+	'unlisted',
+	'withheld',
+	'private',
+	'other',
+] as const
+
+export type ProjectStatusFilterValue = (typeof PROJECT_STATUS_FILTER_VALUES)[number]
+
+const projectStatusFilterValueSet = new Set<string>(PROJECT_STATUS_FILTER_VALUES)
+
+export function isProjectStatusFilterValue(value: string): value is ProjectStatusFilterValue {
+	return projectStatusFilterValueSet.has(value)
+}
+
+export function getProjectStatusFilterValue(
+	status: string | null | undefined,
+): ProjectStatusFilterValue {
+	const normalizedStatus = status?.trim().toLowerCase() ?? ''
+	return isProjectStatusFilterValue(normalizedStatus) ? normalizedStatus : 'other'
+}
diff --git a/apps/frontend/src/components/analytics/query-builder/timeframe-picker/TimeFramePicker.vue b/apps/frontend/src/components/analytics/query-builder/timeframe-picker/TimeFramePicker.vue
new file mode 100644
index 0000000000..dc89474c58
--- /dev/null
+++ b/apps/frontend/src/components/analytics/query-builder/timeframe-picker/TimeFramePicker.vue
@@ -0,0 +1,122 @@
+<template>
+	<BaseTimeFramePicker
+		v-model:mode="selectedTimeframeMode"
+		v-model:preset="selectedTimeframe"
+		v-model:last-amount="selectedLastTimeframeAmount"
+		v-model:last-unit="selectedLastTimeframeUnit"
+		v-model:custom-start-date="selectedCustomTimeframeStartDate"
+		v-model:custom-end-date="selectedCustomTimeframeEndDate"
+		:min-date="ANALYTICS_START_DATE_INPUT_VALUE"
+		:now-timestamp="queryRefreshTimestamp"
+		@open="handleTimeframeOpen"
+		@commit="handleTimeframeCommit"
+		@apply="handleTimeframeApply"
+		@draft-change="handleTimeframeDraftChange"
+		@preset-select="handleTimeframePresetSelect"
+	/>
+</template>
+
+<script setup lang="ts">
+import {
+	type ComboboxOption,
+	TimeFramePicker as BaseTimeFramePicker,
+	type TimeFramePickerSelection,
+	type TimeFramePreset,
+} from '@modrinth/ui'
+
+import {
+	ANALYTICS_START_DATE_INPUT_VALUE,
+	type AnalyticsGroupByPreset,
+	type AnalyticsTimeframePreset,
+	injectAnalyticsDashboardContext,
+} from '~/providers/analytics/analytics'
+
+import {
+	ensureMinimumTimeRange,
+	getAnalyticsTimeRange,
+	getDateInputValue,
+	getDefaultAnalyticsGroupByForDurationMinutes,
+} from './timeframe'
+
+const {
+	selectedTimeframeMode,
+	selectedTimeframe,
+	selectedLastTimeframeAmount,
+	selectedLastTimeframeUnit,
+	selectedCustomTimeframeStartDate,
+	selectedCustomTimeframeEndDate,
+	selectedGroupBy,
+	queryRefreshTimestamp,
+	refreshAnalyticsQuery,
+} = injectAnalyticsDashboardContext()
+
+const draftSelectedGroupBy = ref(selectedGroupBy.value)
+
+const defaultGroupByForPreset: Partial<Record<AnalyticsTimeframePreset, AnalyticsGroupByPreset>> = {
+	today: '1h',
+	yesterday: '1h',
+	last_7_days: '6h',
+	last_14_days: 'day',
+	last_30_days: 'day',
+	last_90_days: 'day',
+	last_180_days: 'week',
+	year_to_date: 'week',
+}
+
+function handleTimeframeOpen() {
+	draftSelectedGroupBy.value = selectedGroupBy.value
+}
+
+function handleTimeframeCommit() {
+	selectedGroupBy.value = draftSelectedGroupBy.value
+}
+
+async function handleTimeframeApply() {
+	await refreshAnalyticsQuery()
+}
+
+function handleTimeframePresetSelect(option: ComboboxOption<TimeFramePreset>) {
+	const defaultGroupBy = defaultGroupByForPreset[option.value as AnalyticsTimeframePreset]
+	if (defaultGroupBy) {
+		draftSelectedGroupBy.value = defaultGroupBy
+	}
+}
+
+function handleTimeframeDraftChange(selection: TimeFramePickerSelection) {
+	if (selection.mode !== 'last' && selection.mode !== 'custom_range') {
+		return
+	}
+	if (selection.mode === 'custom_range' && !hasCompleteCustomDateRange(selection)) {
+		return
+	}
+
+	const range = getAnalyticsTimeRange({
+		mode: selection.mode,
+		preset: selection.preset,
+		lastAmount: selection.lastAmount,
+		lastUnit: selection.lastUnit,
+		customStartDate: selection.customStartDate,
+		customEndDate: selection.customEndDate,
+		nowTimestamp: queryRefreshTimestamp.value,
+	})
+	const { start, end } = ensureMinimumTimeRange(range.start, range.end)
+	const durationMinutes = Math.max(1, Math.floor((end.getTime() - start.getTime()) / 60000))
+	draftSelectedGroupBy.value = getDefaultAnalyticsGroupByForDurationMinutes(durationMinutes)
+}
+
+function hasCompleteCustomDateRange(selection: TimeFramePickerSelection) {
+	return Boolean(
+		getDateFromInputValue(selection.customStartDate) &&
+		getDateFromInputValue(selection.customEndDate),
+	)
+}
+
+function getDateFromInputValue(value: string): Date | undefined {
+	const date = new Date(`${value}T00:00:00`)
+	if (Number.isNaN(date.getTime()) || getDateInputValue(date) !== value) {
+		return undefined
+	}
+
+	return date
+}
+</script>
diff --git a/apps/frontend/src/components/analytics/query-builder/timeframe-picker/timeframe.ts b/apps/frontend/src/components/analytics/query-builder/timeframe-picker/timeframe.ts
new file mode 100644
index 0000000000..68d39012e7
--- /dev/null
+++ b/apps/frontend/src/components/analytics/query-builder/timeframe-picker/timeframe.ts
@@ -0,0 +1,299 @@
+import {
+	type AnalyticsGroupByPreset,
+	type AnalyticsLastTimeframeUnit,
+	type AnalyticsTimeframeMode,
+	type AnalyticsTimeframePreset,
+	injectAnalyticsDashboardContext,
+} from '~/providers/analytics/analytics'
+
+const MIN_RANGE_MS = 60 * 60 * 1000
+const TIME_RANGE_ROUNDING_MS = 60 * 1000
+export const MAX_ANALYTICS_TIME_SLICES = 256
+
+const GROUP_BY_PRESET_MINUTES: Record<AnalyticsGroupByPreset, number> = {
+	'1h': 60,
+	'6h': 360,
+	day: 24 * 60,
+	week: 7 * 24 * 60,
+	month: 30 * 24 * 60,
+	year: 365 * 24 * 60,
+}
+
+export type AnalyticsTimeRange = {
+	start: Date
+	end: Date
+}
+
+export function startOfDay(date: Date): Date {
+	const nextDate = new Date(date)
+	nextDate.setHours(0, 0, 0, 0)
+	return nextDate
+}
+
+export function getRoundedNow(timestamp: number): Date {
+	const roundedTimestamp = Math.floor(timestamp / TIME_RANGE_ROUNDING_MS) * TIME_RANGE_ROUNDING_MS
+	return new Date(roundedTimestamp)
+}
+
+export function getDateInputValue(date: Date): string {
+	const year = date.getFullYear()
+	const month = String(date.getMonth() + 1).padStart(2, '0')
+	const day = String(date.getDate()).padStart(2, '0')
+	return `${year}-${month}-${day}`
+}
+
+export function parseDateInputValue(value: string): Date {
+	const parsedDate = new Date(`${value}T00:00:00`)
+	return Number.isNaN(parsedDate.getTime()) ? startOfDay(new Date()) : parsedDate
+}
+
+export function parseDateTimeInputValue(value: string): Date {
+	const parsedDate = new Date(value)
+	return Number.isNaN(parsedDate.getTime()) ? getRoundedNow(Date.now()) : parsedDate
+}
+
+export function addDays(date: Date, days: number): Date {
+	const nextDate = new Date(date)
+	nextDate.setDate(nextDate.getDate() + days)
+	return nextDate
+}
+
+function isStartOfDay(date: Date): boolean {
+	return (
+		date.getHours() === 0 &&
+		date.getMinutes() === 0 &&
+		date.getSeconds() === 0 &&
+		date.getMilliseconds() === 0
+	)
+}
+
+export function getInclusiveEndDateInputValue(end: Date): string {
+	return getDateInputValue(isStartOfDay(end) ? addDays(end, -1) : end)
+}
+
+function subtractCalendarMonths(date: Date, months: number): Date {
+	const nextDate = new Date(date)
+	const day = nextDate.getDate()
+	nextDate.setDate(1)
+	nextDate.setMonth(nextDate.getMonth() - months)
+	const daysInMonth = new Date(nextDate.getFullYear(), nextDate.getMonth() + 1, 0).getDate()
+	nextDate.setDate(Math.min(day, daysInMonth))
+	return nextDate
+}
+
+export function getTimeRangeForPreset(
+	preset: AnalyticsTimeframePreset,
+	nowTimestamp: number,
+): AnalyticsTimeRange {
+	const now = getRoundedNow(nowTimestamp)
+	const end = new Date(now)
+
+	switch (preset) {
+		case 'today':
+			return { start: startOfDay(now), end }
+		case 'yesterday': {
+			const todayStart = startOfDay(now)
+			return {
+				start: new Date(todayStart.getTime() - 24 * 60 * 60 * 1000),
+				end: todayStart,
+			}
+		}
+		case 'last_7_days':
+			return {
+				start: new Date(end.getTime() - 7 * 24 * 60 * 60 * 1000),
+				end,
+			}
+		case 'last_14_days':
+			return {
+				start: new Date(end.getTime() - 14 * 24 * 60 * 60 * 1000),
+				end,
+			}
+		case 'last_30_days':
+			return {
+				start: new Date(end.getTime() - 30 * 24 * 60 * 60 * 1000),
+				end,
+			}
+		case 'last_90_days':
+			return {
+				start: new Date(end.getTime() - 90 * 24 * 60 * 60 * 1000),
+				end,
+			}
+		case 'last_180_days':
+			return {
+				start: new Date(end.getTime() - 180 * 24 * 60 * 60 * 1000),
+				end,
+			}
+		case 'year_to_date': {
+			const yearStart = new Date(now.getFullYear(), 0, 1)
+			yearStart.setHours(0, 0, 0, 0)
+			return { start: yearStart, end }
+		}
+		case 'all_time':
+			return {
+				start: new Date(Date.UTC(2023, 0, 1, 0, 0, 0, 0)),
+				end,
+			}
+		default:
+			return {
+				start: new Date(end.getTime() - 24 * 60 * 60 * 1000),
+				end,
+			}
+	}
+}
+
+export function getTimeRangeForLastTimeframe(
+	amountValue: number,
+	unit: AnalyticsLastTimeframeUnit,
+	nowTimestamp: number,
+): AnalyticsTimeRange {
+	const end = getRoundedNow(nowTimestamp)
+	const amount = Math.max(1, Math.floor(amountValue))
+
+	switch (unit) {
+		case 'hours':
+			return { start: new Date(end.getTime() - amount * 60 * 60 * 1000), end }
+		case 'days':
+			return { start: new Date(end.getTime() - amount * 24 * 60 * 60 * 1000), end }
+		case 'weeks':
+			return { start: new Date(end.getTime() - amount * 7 * 24 * 60 * 60 * 1000), end }
+		case 'months':
+			return { start: subtractCalendarMonths(end, amount), end }
+		default:
+			return { start: new Date(end.getTime() - 24 * 60 * 60 * 1000), end }
+	}
+}
+
+export function getTimeRangeForCustomDateRange(
+	startDate: string,
+	endDate: string,
+): AnalyticsTimeRange {
+	const start = parseDateInputValue(startDate)
+	const inclusiveEnd = parseDateInputValue(endDate)
+	return {
+		start,
+		end: addDays(inclusiveEnd, 1),
+	}
+}
+
+export function getTimeRangeForCustomDateTimeRange(
+	startDateTime: string,
+	endDateTime: string,
+): AnalyticsTimeRange {
+	return {
+		start: parseDateTimeInputValue(startDateTime),
+		end: parseDateTimeInputValue(endDateTime),
+	}
+}
+
+export function getAnalyticsTimeRange({
+	mode,
+	preset,
+	lastAmount,
+	lastUnit,
+	customStartDate,
+	customEndDate,
+	nowTimestamp,
+}: {
+	mode: AnalyticsTimeframeMode
+	preset: AnalyticsTimeframePreset
+	lastAmount: number
+	lastUnit: AnalyticsLastTimeframeUnit
+	customStartDate: string
+	customEndDate: string
+	nowTimestamp: number
+}): AnalyticsTimeRange {
+	switch (mode) {
+		case 'last':
+			return getTimeRangeForLastTimeframe(lastAmount, lastUnit, nowTimestamp)
+		case 'custom_range':
+			return getTimeRangeForCustomDateRange(customStartDate, customEndDate)
+		case 'custom_datetime_range':
+			return getTimeRangeForCustomDateTimeRange(customStartDate, customEndDate)
+		case 'preset':
+		default:
+			return getTimeRangeForPreset(preset, nowTimestamp)
+	}
+}
+
+export function getDefaultAnalyticsGroupByForDurationMinutes(
+	durationMinutes: number,
+): AnalyticsGroupByPreset {
+	const days = durationMinutes / (24 * 60)
+	if (days <= 2) return '1h'
+	if (days <= 7) return '6h'
+	if (days <= 90) return 'day'
+	if (days <= 365) return 'week'
+	if (days <= 365 * 3) return 'month'
+	return 'year'
+}
+
+export function getAnalyticsGroupByPresetMinutes(preset: AnalyticsGroupByPreset): number {
+	return GROUP_BY_PRESET_MINUTES[preset]
+}
+
+export function isAnalyticsGroupByAvailableForDurationMinutes(
+	preset: AnalyticsGroupByPreset,
+	durationMinutes: number,
+): boolean {
+	const groupByMinutes = getAnalyticsGroupByPresetMinutes(preset)
+	const isTooCoarse = groupByMinutes >= durationMinutes
+	const isTooFine = durationMinutes / groupByMinutes > MAX_ANALYTICS_TIME_SLICES
+
+	return !isTooCoarse && !isTooFine
+}
+
+export function ensureMinimumTimeRange(start: Date, end: Date): AnalyticsTimeRange {
+	if (end.getTime() <= start.getTime()) {
+		return {
+			start: new Date(end.getTime() - MIN_RANGE_MS),
+			end,
+		}
+	}
+
+	if (end.getTime() - start.getTime() < MIN_RANGE_MS) {
+		return {
+			start: new Date(end.getTime() - MIN_RANGE_MS),
+			end,
+		}
+	}
+
+	return { start, end }
+}
+
+export function useSelectedAnalyticsTimeRange() {
+	const {
+		selectedTimeframeMode,
+		selectedTimeframe,
+		selectedLastTimeframeAmount,
+		selectedLastTimeframeUnit,
+		selectedCustomTimeframeStartDate,
+		selectedCustomTimeframeEndDate,
+		queryRefreshTimestamp,
+	} = injectAnalyticsDashboardContext()
+
+	const selectedTimeRange = computed(() =>
+		getAnalyticsTimeRange({
+			mode: selectedTimeframeMode.value,
+			preset: selectedTimeframe.value,
+			lastAmount: selectedLastTimeframeAmount.value,
+			lastUnit: selectedLastTimeframeUnit.value,
+			customStartDate: selectedCustomTimeframeStartDate.value,
+			customEndDate: selectedCustomTimeframeEndDate.value,
+			nowTimestamp: queryRefreshTimestamp.value,
+		}),
+	)
+
+	const selectedTimeframeDurationMinutes = computed(() => {
+		const { start, end } = ensureMinimumTimeRange(
+			selectedTimeRange.value.start,
+			selectedTimeRange.value.end,
+		)
+		const durationMs = end.getTime() - start.getTime()
+		return Math.max(1, Math.floor(durationMs / (60 * 1000)))
+	})
+
+	return {
+		selectedTimeRange,
+		selectedTimeframeDurationMinutes,
+	}
+}
diff --git a/apps/frontend/src/components/analytics/stat-cards/StatCard.vue b/apps/frontend/src/components/analytics/stat-cards/StatCard.vue
new file mode 100644
index 0000000000..11c3143fe5
--- /dev/null
+++ b/apps/frontend/src/components/analytics/stat-cards/StatCard.vue
@@ -0,0 +1,141 @@
+<template>
+	<button
+		v-tooltip="disabled ? 'Stat unavailable for current qeury' : ''"
+		type="button"
+		class="flex h-full appearance-none flex-col gap-4 rounded-2xl border border-solid p-5 px-4 text-left transition-colors"
+		:class="{
+			'cursor-not-allowed border-surface-5 bg-surface-2 opacity-60': disabled,
+			'cursor-default border-brand bg-highlight-green': !disabled && active,
+			'border-surface-5 bg-surface-3 hover:bg-surface-4 active:scale-95': !disabled && !active,
+		}"
+		:disabled="disabled"
+		@click="emit('click')"
+	>
+		<div class="flex items-center justify-between gap-3">
+			<div
+				class="text-base font-medium"
+				:class="{
+					'text-secondary': disabled,
+					'text-primary': !disabled,
+				}"
+			>
+				{{ label }}
+			</div>
+
+			<div class="inline-flex items-center justify-center">
+				<component
+					:is="iconComponent"
+					aria-hidden="true"
+					class="size-6"
+					:class="{
+						'text-secondary': disabled,
+						'text-brand': !disabled && active,
+						'text-primary': !disabled && !active,
+					}"
+				/>
+			</div>
+		</div>
+
+		<div class="flex flex-col gap-2.5">
+			<div
+				class="text-4xl font-semibold leading-none"
+				:class="{
+					'text-primary': disabled,
+					'text-contrast': !disabled,
+				}"
+			>
+				{{ disabled ? '-' : statLabel }}
+			</div>
+
+			<template v-if="disabled">
+				<span class="inline-flex items-center gap-1 text-xs text-secondary">N/A</span>
+			</template>
+			<template v-else>
+				<div v-if="vsPrevPeriodPercent" class="flex items-center gap-1 text-sm">
+					<span
+						class="inline-flex items-center gap-1 font-semibold"
+						:class="{
+							'text-secondary': disabled,
+							'text-green': !disabled && trendValue > 0,
+							'text-red': !disabled && trendValue < 0,
+							'text-primary': !disabled && trendValue === 0,
+						}"
+					>
+						<component
+							:is="trendDirectionIcon"
+							v-if="showTrendDirectionIcon"
+							aria-hidden="true"
+							class="size-3"
+						/>
+						{{ vsPrevPeriodPercent }}
+					</span>
+					<span
+						class="mt-px text-xs"
+						:class="{
+							'text-secondary': disabled,
+							'text-primary': !disabled,
+						}"
+					>
+						vs prev period
+					</span>
+				</div>
+			</template>
+		</div>
+	</button>
+</template>
+
+<script setup lang="ts">
+import {
+	ClockIcon,
+	CurrencyIcon,
+	DownloadIcon,
+	EyeIcon,
+	type IconComponent,
+	PlayIcon,
+	TimerIcon,
+	TrendingDownIcon,
+	TrendingUpIcon,
+} from '@modrinth/assets'
+
+const props = defineProps<{
+	label: string
+	statLabel: string
+	vsPrevPeriodPercent: string | null
+	icon: string
+	active?: boolean
+	disabled?: boolean
+}>()
+
+const emit = defineEmits<{
+	(event: 'click'): void
+}>()
+
+const statCardIconMap: Record<string, IconComponent> = {
+	clock: ClockIcon,
+	timer: TimerIcon,
+	play: PlayIcon,
+	eye: EyeIcon,
+	download: DownloadIcon,
+	currency: CurrencyIcon,
+	dollar: CurrencyIcon,
+}
+
+const iconComponent = computed<IconComponent>(() => {
+	const normalizedIconName = props.icon
+		.toLowerCase()
+		.replace(/icon$/u, '')
+		.replace(/[^a-z]/gu, '')
+	return statCardIconMap[normalizedIconName] ?? ClockIcon
+})
+
+const trendValue = computed(() => {
+	const parsed = Number.parseFloat(props.vsPrevPeriodPercent?.replace(/[^0-9.-]/gu, '') ?? '')
+	return Number.isNaN(parsed) ? 0 : parsed
+})
+
+const showTrendDirectionIcon = computed(() => !props.disabled && trendValue.value !== 0)
+
+const trendDirectionIcon = computed<IconComponent>(() =>
+	trendValue.value >= 0 ? TrendingUpIcon : TrendingDownIcon,
+)
+</script>
diff --git a/apps/frontend/src/components/analytics/stat-cards/StatCards.vue b/apps/frontend/src/components/analytics/stat-cards/StatCards.vue
new file mode 100644
index 0000000000..0e13cc57f0
--- /dev/null
+++ b/apps/frontend/src/components/analytics/stat-cards/StatCards.vue
@@ -0,0 +1,113 @@
+<template>
+	<div class="grid grid-cols-2 gap-3 lg:grid-cols-4">
+		<StatCard
+			v-for="card in statCards"
+			:key="card.key"
+			:label="card.label"
+			:stat-label="card.statLabel"
+			:vs-prev-period-percent="card.vsPrevPeriodPercent"
+			:icon="card.icon"
+			:active="activeStat === card.key"
+			:disabled="card.disabled"
+			@click="setActiveStat(card.key)"
+		/>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { useFormatNumber } from '@modrinth/ui'
+
+import {
+	type AnalyticsDashboardStat,
+	injectAnalyticsDashboardContext,
+} from '~/providers/analytics/analytics'
+
+import StatCard from './StatCard.vue'
+
+const {
+	activeStat,
+	setActiveStat,
+	currentTotals,
+	percentChanges,
+	hasPreviousPeriodComparison,
+	selectedBreakdown,
+	isAnalyticsDashboardStatRelevant,
+} = injectAnalyticsDashboardContext()
+const formatNumber = useFormatNumber()
+
+const compactNumberFormatter = computed(
+	() =>
+		new Intl.NumberFormat(undefined, {
+			notation: 'compact',
+			maximumSignificantDigits: 3,
+		}),
+)
+
+function formatStatNumber(value: number): string {
+	const rounded = Math.round(value)
+
+	if (Math.abs(rounded) >= 1000) {
+		return compactNumberFormatter.value.format(rounded)
+	}
+
+	return formatNumber(rounded)
+}
+
+function formatPercent(value: number): string {
+	const rounded = Math.round(value * 10) / 10
+	const signPrefix = rounded > 0 ? '+' : ''
+	return `${signPrefix}${rounded.toFixed(1)}%`
+}
+
+function formatPreviousPeriodPercent(value: number): string | null {
+	if (!hasPreviousPeriodComparison.value) {
+		return null
+	}
+
+	return formatPercent(value)
+}
+
+const statCards = computed<
+	{
+		key: AnalyticsDashboardStat
+		label: string
+		statLabel: string
+		vsPrevPeriodPercent: string | null
+		icon: string
+		disabled: boolean
+	}[]
+>(() => [
+	{
+		key: 'views',
+		label: 'Views',
+		statLabel: formatStatNumber(currentTotals.value.views),
+		vsPrevPeriodPercent: formatPreviousPeriodPercent(percentChanges.value.views),
+		icon: 'eye',
+		disabled: !isAnalyticsDashboardStatRelevant('views', selectedBreakdown.value),
+	},
+	{
+		key: 'downloads',
+		label: 'Downloads',
+		statLabel: formatStatNumber(currentTotals.value.downloads),
+		vsPrevPeriodPercent: formatPreviousPeriodPercent(percentChanges.value.downloads),
+		icon: 'download',
+		disabled: !isAnalyticsDashboardStatRelevant('downloads', selectedBreakdown.value),
+	},
+	{
+		key: 'revenue',
+		label: 'Revenue',
+		statLabel: `$${formatStatNumber(currentTotals.value.revenue)}`,
+		vsPrevPeriodPercent: formatPreviousPeriodPercent(percentChanges.value.revenue),
+		icon: 'dollar',
+		disabled: !isAnalyticsDashboardStatRelevant('revenue', selectedBreakdown.value),
+	},
+	{
+		key: 'playtime',
+		label: 'Playtime',
+		statLabel: `${formatStatNumber(currentTotals.value.playtime / 3600)} hrs`,
+		vsPrevPeriodPercent: formatPreviousPeriodPercent(percentChanges.value.playtime),
+		icon: 'clock',
+		disabled: !isAnalyticsDashboardStatRelevant('playtime', selectedBreakdown.value),
+	},
+])
+</script>
diff --git a/apps/frontend/src/components/analytics/table/AnalyticsTable.vue b/apps/frontend/src/components/analytics/table/AnalyticsTable.vue
new file mode 100644
index 0000000000..3e85e66ce8
--- /dev/null
+++ b/apps/frontend/src/components/analytics/table/AnalyticsTable.vue
@@ -0,0 +1,1426 @@
+<template>
+	<div class="relative overflow-hidden rounded-2xl">
+		<AnalyticsLoadingBar :loading="isDataLoading" />
+		<Table
+			v-model:selected-ids="tableSelectedGraphDatasetIds"
+			:sort-column="displayedSortColumn"
+			:sort-direction="displayedSortDirection"
+			:columns="columns"
+			:data="paginatedRows"
+			row-key="id"
+			selection-key="graphDatasetId"
+			:selection-ids="filteredSelectableGraphDatasetIds"
+			:show-selection="showGraphDatasetSelection"
+			table-min-width="44rem"
+			virtualized
+			:virtual-row-height="56"
+			@sort="applyRequestedSort"
+		>
+			<template #header>
+				<div class="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
+					<div class="text-xl font-semibold text-contrast">Breakdown</div>
+
+					<div class="flex w-full flex-wrap items-center gap-3 md:w-auto">
+						<StyledInput
+							v-model="searchQuery"
+							:icon="SearchIcon"
+							placeholder="Search..."
+							clearable
+							wrapper-class="w-full sm:w-64"
+							@focusin="selectSearchInputText"
+						/>
+						<ButtonStyled>
+							<OverflowMenu
+								class="!shadow-none"
+								:options="csvExportOptions"
+								:disabled="isDataLoading || filteredRows.length === 0"
+							>
+								<DownloadIcon />
+								Export CSV
+								<DropdownIcon />
+								<template #cumulative-csv> Cumulative </template>
+								<template #grouped-csv> Grouped by {{ groupByLabel.toLowerCase() }} </template>
+							</OverflowMenu>
+						</ButtonStyled>
+					</div>
+				</div>
+			</template>
+
+			<template #cell-date="{ value }">
+				<span class="text-primary">{{ value }}</span>
+			</template>
+			<template #cell-breakdown="{ row }">
+				<span
+					class="text-primary"
+					:class="{
+						capitalize: shouldCapitalizeBreakdownDisplay,
+					}"
+					>{{ row.breakdownDisplay }}</span
+				>
+			</template>
+			<template #cell-project="{ value }">
+				<span class="text-primary">{{ value }}</span>
+			</template>
+			<template #cell-views="{ row }">
+				<span>{{ formatInteger(row.views) }}</span>
+			</template>
+			<template #cell-downloads="{ row }">
+				<span>{{ formatInteger(row.downloads) }}</span>
+			</template>
+			<template #cell-revenue="{ row }">
+				<span>{{ formatRevenue(row.revenue) }}</span>
+			</template>
+			<template #cell-playtime="{ row }">
+				<span v-tooltip="formatFullPlaytime(row.playtime)">
+					{{ formatCompactPlaytime(row.playtime) }}
+				</span>
+			</template>
+			<template #empty-state>
+				<div class="flex h-64 items-center justify-center text-secondary">
+					{{ !isDataLoading ? emptyTableMessage : '' }}
+				</div>
+			</template>
+		</Table>
+		<div
+			v-if="filteredRows.length > PAGE_SIZE"
+			class="mt-3 flex flex-wrap items-center justify-between gap-3 px-1 text-sm text-secondary"
+		>
+			<span>
+				Showing {{ visibleRowStart }} to {{ visibleRowEnd }} of {{ filteredRows.length }}
+			</span>
+			<Pagination :page="currentPage" :count="pageCount" @switch-page="switchPage" />
+		</div>
+		<div v-if="isDataLoading" class="absolute inset-0 z-10 overflow-hidden rounded-xl">
+			<div class="absolute inset-0 bg-surface-3 opacity-50" />
+			<div class="absolute inset-0 backdrop-blur-[4px]" />
+			<div class="absolute inset-0 flex h-full max-h-[500px] items-center justify-center pt-10">
+				<div class="inline-flex items-center gap-2 text-lg font-semibold text-primary opacity-100">
+					<span>Fetching results...</span>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
+import { DownloadIcon, DropdownIcon, SearchIcon } from '@modrinth/assets'
+import {
+	ButtonStyled,
+	OverflowMenu,
+	type OverflowMenuOption,
+	Pagination,
+	StyledInput,
+	Table,
+	type TableColumn,
+	useFormatNumber,
+} from '@modrinth/ui'
+import type { LocationQuery } from 'vue-router'
+
+import {
+	type AnalyticsBreakdownPreset,
+	type AnalyticsDashboardStat,
+	doesAnalyticsPointMatchNormalizedFilters,
+	doesProjectStatusMatchFilters,
+	injectAnalyticsDashboardContext,
+	normalizeAnalyticsSelectedFilters,
+} from '~/providers/analytics/analytics'
+import {
+	type AnalyticsTableSortColumn as TableColumnKey,
+	type AnalyticsTableSortDirection as SortDirection,
+	areStringArraysEqual,
+	buildAnalyticsTableSortRouteQuery,
+	hasAnalyticsTableSortQuery,
+	hasAnalyticsTableSortRouteChange,
+	readAnalyticsTableSortState,
+} from '~/providers/analytics/query-builder-url'
+
+import AnalyticsLoadingBar from '../AnalyticsLoadingBar.vue'
+import { ALL_BREAKDOWN_VALUE, getAnalyticsBreakdownValue } from '../breakdown'
+import {
+	formatBreakdownLabel,
+	formatBucketEndLabel,
+	getSliceBucketRange,
+	getSliceCount,
+	isTimeRelevantForGroupBy,
+	isYearRelevantForTimeRange,
+	shouldCapitalizeBreakdownLabel,
+} from '../graph/utils'
+
+type TableMode = 'date_breakdown' | 'breakdown_only'
+
+type AnalyticsTableRow = {
+	id: string
+	date: string
+	dateMs: number
+	project: string
+	breakdown: string
+	graphDatasetId: string
+	breakdownDisplay: string
+	views: number
+	downloads: number
+	revenue: number
+	playtime: number
+}
+
+type DisplayedRowsCache = {
+	generation: number
+	mode: TableMode
+	sortColumn: TableColumnKey | undefined
+	sortDirection: SortDirection
+	rows: AnalyticsTableRow[]
+}
+
+const {
+	hasProjectContext,
+	projects,
+	displayedSelectedProjectIds: selectedProjectIds,
+	displayedSelectedGroupBy: selectedGroupBy,
+	displayedSelectedBreakdown: selectedBreakdown,
+	displayedSelectedFilters: selectedFilters,
+	displayedFetchRequest: fetchRequest,
+	displayedTimeSlices: timeSlices,
+	activeStat,
+	hasExplicitGraphDatasetSelection,
+	isGraphDatasetSelectionActive,
+	selectedGraphDatasetIds,
+	getRelevantAnalyticsDashboardStats,
+	isLoading,
+	versionNumbersById,
+	versionProjectNamesById,
+	getVersionDisplayName,
+	getVersionProjectName,
+} = injectAnalyticsDashboardContext()
+const formatNumber = useFormatNumber()
+const isDataLoading = computed(() => isLoading.value)
+const route = useRoute()
+const router = useRouter()
+const initialTableSortState = readAnalyticsTableSortState(route.query, {
+	sortColumn: 'date',
+	sortDirection: 'desc',
+})
+
+const tableMode = ref<TableMode>('breakdown_only')
+const sortColumn = ref<TableColumnKey | undefined>(initialTableSortState.sortColumn)
+const sortDirection = ref<SortDirection>(initialTableSortState.sortDirection)
+const displayedSortColumn = ref<TableColumnKey | undefined>(initialTableSortState.sortColumn)
+const displayedSortDirection = ref<SortDirection>(initialTableSortState.sortDirection)
+const PAGE_SIZE = 500
+const GRAPH_DATASET_SELECTION_LIMIT = 8
+const INACTIVE_MODE_WARMUP_POINT_LIMIT = 12000
+const ALL_PROJECTS_DATASET_ID = 'all'
+const ALL_PROJECTS_BREAKDOWN_VALUE = 'all'
+const SECONDS_PER_MINUTE = 60
+const SECONDS_PER_HOUR = 60 * SECONDS_PER_MINUTE
+const SEARCHABLE_COLUMN_KEYS = new Set<TableColumnKey>(['date', 'project', 'breakdown'])
+const currentPage = ref(1)
+const searchQuery = ref('')
+const sortCollator = new Intl.Collator(undefined, { sensitivity: 'base' })
+const modeBuildRequestIds: Record<TableMode, number> = {
+	date_breakdown: 0,
+	breakdown_only: 0,
+}
+const selectDefaultGraphDatasetsWhenSelectionEmpties = ref(false)
+let tableCacheGeneration = 0
+let displayedSortedRowsGeneration = 0
+const displayedTableMode = ref<TableMode>('breakdown_only')
+const displayedSortedRows = shallowRef<AnalyticsTableRow[]>([])
+const displayedRowsCache = shallowRef<DisplayedRowsCache | null>(null)
+
+const selectedProjectIdSet = computed(
+	() =>
+		new Set(
+			projects.value
+				.filter(
+					(project) =>
+						selectedProjectIds.value.includes(project.id) &&
+						doesProjectStatusMatchFilters(project.status, selectedFilters.value),
+				)
+				.map((project) => project.id),
+		),
+)
+const showBreakdownColumn = computed(() => selectedBreakdown.value !== 'none')
+const showGraphDatasetSelection = computed(() =>
+	selectedBreakdown.value === 'project'
+		? selectedProjectIdSet.value.size > 1
+		: selectedBreakdown.value !== 'none',
+)
+const showProjectVersionProjectColumn = computed(
+	() => selectedBreakdown.value === 'version_id' && selectedProjectIdSet.value.size > 1,
+)
+const includeDateColumn = computed(
+	() =>
+		selectedBreakdown.value === 'none' ||
+		(!showGraphDatasetSelection.value && tableMode.value === 'date_breakdown'),
+)
+const activeTableMode = computed<TableMode>(() =>
+	selectedBreakdown.value === 'none'
+		? 'date_breakdown'
+		: showGraphDatasetSelection.value
+			? 'breakdown_only'
+			: tableMode.value,
+)
+const displayedIncludeDateColumn = computed(() =>
+	selectedBreakdown.value === 'none'
+		? true
+		: showGraphDatasetSelection.value
+			? false
+			: displayedTableMode.value === 'date_breakdown',
+)
+const groupByLabel = computed(() => getGroupByLabel(selectedGroupBy.value))
+const csvExportOptions = computed<OverflowMenuOption[]>(() => {
+	if (showGraphDatasetSelection.value) {
+		return [
+			{
+				id: 'cumulative-csv',
+				action: () => downloadCsv('breakdown_only'),
+			},
+			{
+				id: 'grouped-csv',
+				action: () => downloadCsv('date_breakdown'),
+			},
+		]
+	}
+
+	const mode = displayedTableMode.value
+
+	return [
+		{
+			id: mode === 'date_breakdown' ? 'grouped-csv' : 'cumulative-csv',
+			action: () => downloadCsv(mode),
+		},
+	]
+})
+const projectNamesById = computed(
+	() => new Map(projects.value.map((project) => [project.id, project.name])),
+)
+const hasAvailableProjects = computed(() => projects.value.length > 0)
+const analyticsPointCount = computed(() =>
+	timeSlices.value.reduce((sum, slice) => sum + slice.length, 0),
+)
+const emptyTableMessage = computed(() => {
+	if (trimmedSearchQuery.value && sortedRows.value.length > 0) {
+		return 'No matching analytics rows'
+	}
+
+	if (hasProjectContext.value) {
+		return 'No data available for analytics'
+	}
+
+	return hasAvailableProjects.value ? 'No data available' : 'No projects available for analytics'
+})
+
+const breakdownColumnLabel = computed(() => {
+	switch (selectedBreakdown.value) {
+		case 'none':
+			return 'Project'
+		case 'project':
+			return 'Project'
+		case 'country':
+			return 'Country'
+		case 'monetization':
+			return 'Monetization'
+		case 'user_agent':
+			return 'Download source'
+		case 'download_reason':
+			return 'Download reason'
+		case 'version_id':
+			return 'Project version'
+		case 'loader':
+			return 'Loader'
+		case 'game_version':
+			return 'Game version'
+		default:
+			return 'Breakdown'
+	}
+})
+const relevantStats = computed(
+	() => new Set(getRelevantAnalyticsDashboardStats(selectedBreakdown.value, selectedFilters.value)),
+)
+const shouldCapitalizeBreakdownDisplay = computed(() =>
+	shouldCapitalizeBreakdownLabel(selectedBreakdown.value),
+)
+
+const showTimeInBucketLabel = computed(() => isTimeRelevantForGroupBy(selectedGroupBy.value))
+const showYearInBucketLabel = computed(() => {
+	const nextFetchRequest = fetchRequest.value
+	return nextFetchRequest
+		? isYearRelevantForTimeRange(nextFetchRequest.time_range) || selectedGroupBy.value === 'year'
+		: false
+})
+
+function buildTableRows(mode: TableMode): AnalyticsTableRow[] {
+	const nextFetchRequest = fetchRequest.value
+	const nextTimeSlices = timeSlices.value
+	const nextSelectedBreakdown = selectedBreakdown.value
+	const nextSelectedProjectIds = selectedProjectIdSet.value
+	const nextRelevantStats = relevantStats.value
+	const normalizedFilters = normalizeAnalyticsSelectedFilters(selectedFilters.value)
+
+	if (!nextFetchRequest || nextSelectedProjectIds.size === 0) {
+		return []
+	}
+
+	const timeRange = nextFetchRequest.time_range
+	const sliceCount = getSliceCount(timeRange, nextTimeSlices.length)
+	const includeDate = mode === 'date_breakdown'
+	const breakdownDisplayValues = new Map<string, string>()
+	const projectDisplayValues = new Map<string, string>()
+	const nextRows = new Map<string, AnalyticsTableRow>()
+	const bucketLabelsBySliceIndex = new Map<number, { date: string; dateMs: number }>()
+
+	function getBreakdownDisplayValue(breakdown: string) {
+		let displayValue = breakdownDisplayValues.get(breakdown)
+		if (displayValue === undefined) {
+			displayValue = formatBreakdownDisplayValue(breakdown)
+			breakdownDisplayValues.set(breakdown, displayValue)
+		}
+		return displayValue
+	}
+
+	function getProjectDisplayValueForBreakdown(breakdown: string) {
+		let displayValue = projectDisplayValues.get(breakdown)
+		if (displayValue === undefined) {
+			displayValue = getProjectDisplayValue(breakdown, nextSelectedBreakdown)
+			projectDisplayValues.set(breakdown, displayValue)
+		}
+		return displayValue
+	}
+
+	function getBucketLabel(sliceIndex: number) {
+		let bucketLabel = bucketLabelsBySliceIndex.get(sliceIndex)
+		if (!bucketLabel) {
+			const bucketRange = getSliceBucketRange(timeRange, sliceCount, sliceIndex)
+			bucketLabel = {
+				date: formatBucketEndLabel(
+					bucketRange.end,
+					showTimeInBucketLabel.value,
+					showYearInBucketLabel.value,
+				),
+				dateMs: bucketRange.end.getTime(),
+			}
+			bucketLabelsBySliceIndex.set(sliceIndex, bucketLabel)
+		}
+		return bucketLabel
+	}
+
+	function createRow(
+		rowId: string,
+		breakdown: string,
+		bucketLabel?: { date: string; dateMs: number },
+	) {
+		const row = {
+			id: rowId,
+			date: bucketLabel?.date ?? '',
+			dateMs: bucketLabel?.dateMs ?? 0,
+			project: getProjectDisplayValueForBreakdown(breakdown),
+			breakdown,
+			graphDatasetId: getGraphDatasetId(breakdown, nextSelectedBreakdown),
+			breakdownDisplay: getBreakdownDisplayValue(breakdown),
+			views: 0,
+			downloads: 0,
+			revenue: 0,
+			playtime: 0,
+		}
+		nextRows.set(rowId, row)
+		return row
+	}
+
+	if (!includeDate && nextSelectedBreakdown === 'none') {
+		createRow(ALL_PROJECTS_BREAKDOWN_VALUE, ALL_PROJECTS_BREAKDOWN_VALUE)
+	}
+
+	if (!includeDate && nextSelectedBreakdown === 'project') {
+		for (const projectId of nextSelectedProjectIds) {
+			createRow(projectId, projectId)
+		}
+	}
+
+	nextTimeSlices.forEach((slice, sliceIndex) => {
+		const bucketLabel = includeDate ? getBucketLabel(sliceIndex) : undefined
+
+		for (const point of slice) {
+			if (!isProjectAnalyticsPoint(point)) {
+				continue
+			}
+
+			if (!nextSelectedProjectIds.has(point.source_project)) {
+				continue
+			}
+
+			if (!doesAnalyticsPointMatchNormalizedFilters(point, normalizedFilters)) {
+				continue
+			}
+
+			const pointStat = getStatForMetric(point.metric_kind)
+			if (!pointStat || !nextRelevantStats.has(pointStat)) {
+				continue
+			}
+
+			const breakdown =
+				nextSelectedBreakdown === 'none'
+					? ALL_PROJECTS_BREAKDOWN_VALUE
+					: nextSelectedBreakdown === 'project'
+						? point.source_project
+						: getBreakdownValue(point, nextSelectedBreakdown)
+			if (nextSelectedBreakdown !== 'none' && breakdown === ALL_BREAKDOWN_VALUE) {
+				continue
+			}
+
+			const nextBucketLabel = includeDate ? (bucketLabel ?? getBucketLabel(sliceIndex)) : undefined
+			const rowId = includeDate ? `${nextBucketLabel?.dateMs ?? 0}::${breakdown}` : breakdown
+			const row = nextRows.get(rowId) ?? createRow(rowId, breakdown, nextBucketLabel)
+			addMetricToRow(row, point)
+		}
+	})
+
+	return Array.from(nextRows.values())
+}
+
+function isProjectAnalyticsPoint(
+	point: Labrinth.Analytics.v3.AnalyticsData,
+): point is Labrinth.Analytics.v3.ProjectAnalytics {
+	return 'source_project' in point
+}
+
+const columns = computed<TableColumn<TableColumnKey>[]>(() =>
+	buildColumns(displayedIncludeDateColumn.value),
+)
+const activeColumns = computed<TableColumn<TableColumnKey>[]>(() =>
+	buildColumns(includeDateColumn.value),
+)
+
+function buildColumns(includeDate: boolean): TableColumn<TableColumnKey>[] {
+	const nextColumns: TableColumn<TableColumnKey>[] = []
+
+	const stats = getRelevantAnalyticsDashboardStats(selectedBreakdown.value, selectedFilters.value)
+
+	if (includeDate) {
+		nextColumns.push({
+			key: 'date',
+			label: 'Date',
+			enableSorting: true,
+			defaultSortDirection: 'desc',
+			width: stats.length > 2 ? '20%' : '',
+		})
+	}
+
+	if (showBreakdownColumn.value) {
+		nextColumns.push({
+			key: 'breakdown',
+			label: breakdownColumnLabel.value,
+			enableSorting: true,
+		})
+	}
+
+	if (showProjectVersionProjectColumn.value) {
+		nextColumns.push({
+			key: 'project',
+			label: 'Project',
+			enableSorting: true,
+		})
+	}
+
+	for (const stat of stats) {
+		const column = getMetricColumnForStat(stat)
+		if (column) {
+			nextColumns.push(column)
+		}
+	}
+
+	return nextColumns
+}
+
+watch(
+	activeColumns,
+	(nextColumns) => {
+		applyRouteOrDefaultSort(nextColumns)
+	},
+	{ immediate: true },
+)
+
+const sortedRows = computed<AnalyticsTableRow[]>(() => {
+	return displayedSortedRows.value
+})
+const trimmedSearchQuery = computed(() => searchQuery.value.trim().toLowerCase())
+const searchableColumns = computed(() =>
+	columns.value.filter((column) => SEARCHABLE_COLUMN_KEYS.has(column.key)),
+)
+const filteredRows = computed<AnalyticsTableRow[]>(() => {
+	if (!trimmedSearchQuery.value) {
+		return sortedRows.value
+	}
+
+	return filterRowsBySearch(sortedRows.value, searchableColumns.value)
+})
+const selectableGraphDatasetIds = computed(() => getSelectableGraphDatasetIds(sortedRows.value))
+const filteredSelectableGraphDatasetIds = computed(() =>
+	getSelectableGraphDatasetIds(filteredRows.value),
+)
+const tableSelectedGraphDatasetIds = computed({
+	get: () => selectedGraphDatasetIds.value,
+	set: (ids: string[]) => {
+		selectedGraphDatasetIds.value = ids
+		if (showGraphDatasetSelection.value) {
+			hasExplicitGraphDatasetSelection.value = true
+		}
+	},
+})
+
+function setSelectedGraphDatasetIds(ids: string[], explicit: boolean) {
+	selectedGraphDatasetIds.value = ids
+	hasExplicitGraphDatasetSelection.value = explicit
+}
+
+watch(
+	showGraphDatasetSelection,
+	(nextShowSelection) => {
+		isGraphDatasetSelectionActive.value = nextShowSelection
+		if (!nextShowSelection) {
+			setSelectedGraphDatasetIds([], false)
+		}
+	},
+	{ immediate: true },
+)
+
+watch(activeStat, () => {
+	if (!showGraphDatasetSelection.value) {
+		return
+	}
+	if (hasAnalyticsTableSortQuery(route.query)) {
+		return
+	}
+
+	applyActiveStatSort()
+})
+
+watch(selectedBreakdown, () => {
+	setSelectedGraphDatasetIds([], false)
+})
+
+watch(
+	[selectedProjectIds, selectedFilters],
+	() => {
+		selectDefaultGraphDatasetsWhenSelectionEmpties.value = true
+	},
+	{ deep: true },
+)
+
+watch(
+	[selectableGraphDatasetIds, showGraphDatasetSelection, hasExplicitGraphDatasetSelection],
+	(
+		[nextSelectableGraphDatasetIds, nextShowGraphDatasetSelection, nextHasExplicitSelection],
+		previousValues,
+	) => {
+		if (!nextShowGraphDatasetSelection) {
+			selectDefaultGraphDatasetsWhenSelectionEmpties.value = false
+			return
+		}
+
+		const previousSelectableGraphDatasetIds = previousValues?.[0] ?? []
+		const didSelectableGraphDatasetsChange = !areStringArraysEqual(
+			previousSelectableGraphDatasetIds,
+			nextSelectableGraphDatasetIds,
+		)
+		const nextSelectableGraphDatasetIdSet = new Set(nextSelectableGraphDatasetIds)
+		const nextSelectedGraphDatasetIds = selectedGraphDatasetIds.value.filter((datasetId) =>
+			nextSelectableGraphDatasetIdSet.has(datasetId),
+		)
+
+		if (nextHasExplicitSelection) {
+			if (
+				selectDefaultGraphDatasetsWhenSelectionEmpties.value &&
+				didSelectableGraphDatasetsChange &&
+				nextSelectedGraphDatasetIds.length === 0 &&
+				nextSelectableGraphDatasetIds.length > 0
+			) {
+				selectDefaultGraphDatasetsWhenSelectionEmpties.value = false
+				setSelectedGraphDatasetIds(
+					getDefaultSelectedGraphDatasetIds(nextSelectableGraphDatasetIds),
+					false,
+				)
+				return
+			}
+
+			if (didSelectableGraphDatasetsChange) {
+				selectDefaultGraphDatasetsWhenSelectionEmpties.value = false
+			}
+
+			if (!areStringArraysEqual(selectedGraphDatasetIds.value, nextSelectedGraphDatasetIds)) {
+				setSelectedGraphDatasetIds(nextSelectedGraphDatasetIds, true)
+			}
+			return
+		}
+
+		selectDefaultGraphDatasetsWhenSelectionEmpties.value = false
+		const defaultSelectedGraphDatasetIds = getDefaultSelectedGraphDatasetIds(
+			nextSelectableGraphDatasetIds,
+		)
+		if (!areStringArraysEqual(selectedGraphDatasetIds.value, defaultSelectedGraphDatasetIds)) {
+			setSelectedGraphDatasetIds(defaultSelectedGraphDatasetIds, false)
+		}
+	},
+	{ immediate: true },
+)
+
+watch(
+	[
+		fetchRequest,
+		timeSlices,
+		selectedProjectIds,
+		selectedGroupBy,
+		selectedBreakdown,
+		selectedFilters,
+		projects,
+		versionNumbersById,
+		versionProjectNamesById,
+	],
+	() => {
+		invalidateTableCaches()
+		scheduleRowsForMode(activeTableMode.value)
+		scheduleInactiveModeWarmup()
+	},
+	{ immediate: true, flush: 'post' },
+)
+
+watch(activeTableMode, () => {
+	currentPage.value = 1
+	scheduleRowsForMode(activeTableMode.value)
+	scheduleInactiveModeWarmup()
+})
+
+watch(
+	() => route.query,
+	(nextQuery) => {
+		const nextSortState = getRouteTableSortState(nextQuery, activeColumns.value)
+		if (!isCurrentSortState(nextSortState)) {
+			applyTableSortState(nextSortState)
+			return
+		}
+
+		syncTableSortRouteQuery()
+	},
+)
+
+watch([sortColumn, sortDirection], () => {
+	syncTableSortRouteQuery()
+
+	if (resortDisplayedRowsForCurrentSort()) {
+		scheduleInactiveModeWarmup()
+		return
+	}
+
+	invalidateSortedCaches()
+	scheduleRowsForMode(activeTableMode.value)
+	scheduleInactiveModeWarmup()
+})
+
+const pageCount = computed(() => Math.max(Math.ceil(filteredRows.value.length / PAGE_SIZE), 1))
+const visibleRowStart = computed(() =>
+	filteredRows.value.length === 0 ? 0 : (currentPage.value - 1) * PAGE_SIZE + 1,
+)
+const visibleRowEnd = computed(() =>
+	Math.min(currentPage.value * PAGE_SIZE, filteredRows.value.length),
+)
+const paginatedRows = computed<AnalyticsTableRow[]>(() =>
+	filteredRows.value.slice((currentPage.value - 1) * PAGE_SIZE, currentPage.value * PAGE_SIZE),
+)
+
+watch(filteredRows, () => {
+	currentPage.value = 1
+})
+
+watch(pageCount, (nextPageCount) => {
+	if (currentPage.value > nextPageCount) {
+		currentPage.value = nextPageCount
+	}
+})
+
+function invalidateTableCaches() {
+	tableCacheGeneration++
+	invalidateSortedCaches()
+}
+
+function invalidateSortedCaches() {
+	displayedRowsCache.value = null
+}
+
+function hasSortedRowsForMode(mode: TableMode): boolean {
+	const cached = displayedRowsCache.value
+	return (
+		cached !== null &&
+		cached.generation === tableCacheGeneration &&
+		cached.mode === mode &&
+		cached.sortColumn === sortColumn.value &&
+		cached.sortDirection === sortDirection.value
+	)
+}
+
+function setDisplayedRowsForMode(
+	mode: TableMode,
+	rows: AnalyticsTableRow[],
+	generation = tableCacheGeneration,
+) {
+	displayedRowsCache.value = {
+		generation,
+		mode,
+		sortColumn: sortColumn.value,
+		sortDirection: sortDirection.value,
+		rows,
+	}
+
+	if (mode === activeTableMode.value) {
+		displayedSortedRowsGeneration = generation
+		displayedTableMode.value = mode
+		displayedSortColumn.value = sortColumn.value
+		displayedSortDirection.value = sortDirection.value
+		displayedSortedRows.value = rows
+	}
+}
+
+function scheduleRowsForMode(mode: TableMode) {
+	if (hasSortedRowsForMode(mode)) {
+		if (mode === activeTableMode.value) {
+			displayRowsForMode(mode)
+		}
+		return
+	}
+
+	const requestId = ++modeBuildRequestIds[mode]
+	const generation = tableCacheGeneration
+
+	void buildRowsForMode(mode, generation, requestId)
+}
+
+function displayRowsForMode(mode: TableMode) {
+	const cached = displayedRowsCache.value
+	if (!cached || cached.generation !== tableCacheGeneration || cached.mode !== mode) {
+		return
+	}
+
+	displayedSortedRowsGeneration = cached.generation
+	displayedTableMode.value = mode
+	displayedSortColumn.value = cached.sortColumn
+	displayedSortDirection.value = cached.sortDirection
+	displayedSortedRows.value = cached.rows
+}
+
+async function buildRowsForMode(mode: TableMode, generation: number, requestId: number) {
+	await waitForDeferredTableWork()
+
+	if (isStaleBuild(mode, generation, requestId)) {
+		return
+	}
+
+	const rows = sortTableRows(buildTableRows(mode))
+
+	if (isStaleBuild(mode, generation, requestId)) {
+		return
+	}
+
+	setDisplayedRowsForMode(mode, rows, generation)
+}
+
+function isStaleBuild(mode: TableMode, generation: number, requestId: number): boolean {
+	return tableCacheGeneration !== generation || modeBuildRequestIds[mode] !== requestId
+}
+
+function waitForDeferredTableWork(): Promise<void> {
+	if (!import.meta.client) {
+		return Promise.resolve()
+	}
+
+	return new Promise((resolve) => {
+		requestAnimationFrame(() => {
+			requestAnimationFrame(() => resolve())
+		})
+	})
+}
+
+function scheduleInactiveModeWarmup() {
+	if (!showBreakdownColumn.value) {
+		return
+	}
+	if (analyticsPointCount.value > INACTIVE_MODE_WARMUP_POINT_LIMIT) {
+		return
+	}
+
+	const inactiveMode: TableMode =
+		activeTableMode.value === 'date_breakdown' ? 'breakdown_only' : 'date_breakdown'
+
+	if (hasSortedRowsForMode(inactiveMode)) {
+		return
+	}
+
+	if (!import.meta.client) {
+		scheduleRowsForMode(inactiveMode)
+		return
+	}
+
+	const windowWithIdleCallback = window as Window & {
+		requestIdleCallback?: (callback: () => void, options?: { timeout?: number }) => number
+	}
+
+	if (windowWithIdleCallback.requestIdleCallback) {
+		windowWithIdleCallback.requestIdleCallback(() => scheduleRowsForMode(inactiveMode), {
+			timeout: 2000,
+		})
+	} else {
+		window.setTimeout(() => scheduleRowsForMode(inactiveMode), 250)
+	}
+}
+
+function sortTableRows(rows: AnalyticsTableRow[]): AnalyticsTableRow[] {
+	const nextRows = [...rows]
+	const activeSortColumn = sortColumn.value
+
+	if (!activeSortColumn) {
+		return nextRows
+	}
+
+	const directionFactor = sortDirection.value === 'asc' ? 1 : -1
+	nextRows.sort(getRowComparator(activeSortColumn, directionFactor))
+
+	return nextRows
+}
+
+function filterRowsBySearch(
+	rows: AnalyticsTableRow[],
+	searchableColumns: TableColumn<TableColumnKey>[],
+): AnalyticsTableRow[] {
+	const query = trimmedSearchQuery.value
+	if (!query || searchableColumns.length === 0) {
+		return rows
+	}
+
+	return rows.filter((row) =>
+		searchableColumns.some((column) =>
+			String(getSearchableCellValue(row, column.key)).toLowerCase().includes(query),
+		),
+	)
+}
+
+function getSearchableCellValue(row: AnalyticsTableRow, key: TableColumnKey): string {
+	switch (key) {
+		case 'date':
+			return row.date
+		case 'project':
+			return row.project
+		case 'breakdown':
+			return row.breakdownDisplay
+		default:
+			return ''
+	}
+}
+
+function resortDisplayedRowsForCurrentSort(): boolean {
+	const mode = activeTableMode.value
+	if (displayedTableMode.value !== mode || displayedSortedRowsGeneration !== tableCacheGeneration) {
+		return false
+	}
+
+	setDisplayedRowsForMode(mode, sortTableRows(displayedSortedRows.value))
+	return true
+}
+
+const revenueFormatter = computed(
+	() =>
+		new Intl.NumberFormat(undefined, {
+			minimumFractionDigits: 2,
+			maximumFractionDigits: 2,
+		}),
+)
+
+function formatInteger(value: number): string {
+	return formatNumber(Math.round(value))
+}
+
+function formatRevenue(value: number): string {
+	const rounded = Math.round(value * 100) / 100
+	return `$${revenueFormatter.value.format(rounded)}`
+}
+
+function formatCompactPlaytime(value: number): string {
+	const totalSeconds = Math.max(0, Math.round(value))
+	return `${(totalSeconds / SECONDS_PER_HOUR).toLocaleString(undefined, {
+		minimumFractionDigits: 1,
+		maximumFractionDigits: 1,
+	})}h`
+}
+
+function formatFullPlaytime(value: number): string {
+	const totalMinutes = Math.max(0, Math.round(value / SECONDS_PER_MINUTE))
+	const days = Math.floor(totalMinutes / (24 * 60))
+	const hours = Math.floor((totalMinutes % (24 * 60)) / 60)
+	const minutes = totalMinutes % 60
+
+	return [
+		formatDurationTooltipPart(days, 'day'),
+		formatDurationTooltipPart(hours, 'hour'),
+		formatDurationTooltipPart(minutes, 'minute'),
+	].join(', ')
+}
+
+function formatDurationTooltipPart(value: number, unit: string): string {
+	return `${formatNumber(value)} ${unit}${value === 1 ? '' : 's'}`
+}
+
+function addMetricToRow(row: AnalyticsTableRow, point: Labrinth.Analytics.v3.ProjectAnalytics) {
+	switch (point.metric_kind) {
+		case 'views':
+			row.views += point.views
+			break
+		case 'downloads':
+			row.downloads += point.downloads
+			break
+		case 'playtime':
+			row.playtime += point.seconds
+			break
+		case 'revenue': {
+			const parsed = Number.parseFloat(point.revenue)
+			row.revenue += Number.isFinite(parsed) ? parsed : 0
+			break
+		}
+	}
+}
+
+function getStatForMetric(
+	metricKind: Labrinth.Analytics.v3.ProjectAnalytics['metric_kind'],
+): AnalyticsDashboardStat | null {
+	switch (metricKind) {
+		case 'views':
+		case 'downloads':
+		case 'revenue':
+		case 'playtime':
+			return metricKind
+		default:
+			return null
+	}
+}
+
+function getMetricColumnForStat(stat: AnalyticsDashboardStat): TableColumn<TableColumnKey> | null {
+	switch (stat) {
+		case 'views':
+			return {
+				key: 'views',
+				label: 'Views',
+				enableSorting: true,
+				defaultSortDirection: 'desc',
+				align: 'right',
+			}
+		case 'downloads':
+			return {
+				key: 'downloads',
+				label: 'Downloads',
+				enableSorting: true,
+				defaultSortDirection: 'desc',
+				align: 'right',
+			}
+		case 'revenue':
+			return {
+				key: 'revenue',
+				label: 'Revenue',
+				enableSorting: true,
+				defaultSortDirection: 'desc',
+				align: 'right',
+			}
+		case 'playtime':
+			return {
+				key: 'playtime',
+				label: 'Playtime',
+				enableSorting: true,
+				defaultSortDirection: 'desc',
+				align: 'right',
+			}
+		default:
+			return null
+	}
+}
+
+function applyRouteOrDefaultSort(nextColumns = activeColumns.value) {
+	const nextSortState = getRouteTableSortState(route.query, nextColumns)
+	if (!isCurrentSortState(nextSortState)) {
+		applyTableSortState(nextSortState)
+	}
+
+	syncTableSortRouteQuery()
+}
+
+function applyTableSortState(state: {
+	sortColumn: TableColumnKey | undefined
+	sortDirection: SortDirection
+}) {
+	sortColumn.value = state.sortColumn
+	sortDirection.value = state.sortDirection
+}
+
+function getRouteTableSortState(
+	query: LocationQuery,
+	nextColumns = activeColumns.value,
+): { sortColumn: TableColumnKey | undefined; sortDirection: SortDirection } {
+	return getAvailableTableSortState(
+		readAnalyticsTableSortState(query, getDefaultTableSortState(nextColumns)),
+		nextColumns,
+	)
+}
+
+function getAvailableTableSortState(
+	state: { sortColumn: TableColumnKey | undefined; sortDirection: SortDirection },
+	nextColumns = activeColumns.value,
+): { sortColumn: TableColumnKey | undefined; sortDirection: SortDirection } {
+	const availableColumns = new Set(nextColumns.map((column) => column.key))
+	if (state.sortColumn && availableColumns.has(state.sortColumn)) {
+		return state
+	}
+
+	return getDefaultTableSortState(nextColumns)
+}
+
+function getDefaultTableSortState(nextColumns = activeColumns.value): {
+	sortColumn: TableColumnKey | undefined
+	sortDirection: SortDirection
+} {
+	const nextSortColumn = getDefaultSortColumn(nextColumns)
+	return {
+		sortColumn: nextSortColumn,
+		sortDirection: getDefaultSortDirection(nextSortColumn, nextColumns),
+	}
+}
+
+function isCurrentSortState(state: {
+	sortColumn: TableColumnKey | undefined
+	sortDirection: SortDirection
+}): boolean {
+	return sortColumn.value === state.sortColumn && sortDirection.value === state.sortDirection
+}
+
+function syncTableSortRouteQuery() {
+	if (import.meta.server) {
+		return
+	}
+
+	const nextSortState = getAvailableTableSortState(
+		{
+			sortColumn: sortColumn.value,
+			sortDirection: sortDirection.value,
+		},
+		activeColumns.value,
+	)
+	const nextRouteQuery = buildAnalyticsTableSortRouteQuery(
+		route.query,
+		nextSortState,
+		getDefaultTableSortState(),
+	)
+
+	if (!hasAnalyticsTableSortRouteChange(route.query, nextRouteQuery)) {
+		return
+	}
+
+	router.replace({
+		path: route.path,
+		query: nextRouteQuery,
+	})
+}
+
+function applyActiveStatSort() {
+	const availableColumns = new Set(activeColumns.value.map((column) => column.key))
+	if (!availableColumns.has(activeStat.value)) {
+		return
+	}
+
+	sortColumn.value = activeStat.value
+	sortDirection.value = 'desc'
+}
+
+function applyRequestedSort(column: string, direction: SortDirection) {
+	sortColumn.value = column as TableColumnKey
+	sortDirection.value = direction
+}
+
+function switchPage(page: number) {
+	currentPage.value = page
+}
+
+function selectSearchInputText(event: FocusEvent) {
+	const target = event.target
+	if (target instanceof HTMLInputElement) {
+		target.select()
+	}
+}
+
+function getDefaultSortColumn(
+	nextColumns: TableColumn<TableColumnKey>[],
+): TableColumnKey | undefined {
+	const availableColumns = new Set(nextColumns.map((column) => column.key))
+	if (availableColumns.has('date')) {
+		return 'date'
+	}
+
+	if (showGraphDatasetSelection.value && availableColumns.has(activeStat.value)) {
+		return activeStat.value
+	}
+
+	if (availableColumns.has('downloads')) {
+		return 'downloads'
+	}
+
+	return nextColumns[0]?.key
+}
+
+function getDefaultSortDirection(
+	column: TableColumnKey | undefined,
+	nextColumns: TableColumn<TableColumnKey>[],
+): SortDirection {
+	return nextColumns.find((nextColumn) => nextColumn.key === column)?.defaultSortDirection ?? 'asc'
+}
+
+function getBreakdownValue(
+	point: Labrinth.Analytics.v3.ProjectAnalytics,
+	selectedBreakdown: AnalyticsBreakdownPreset,
+): string {
+	return getAnalyticsBreakdownValue(point, selectedBreakdown)
+}
+
+function getGraphDatasetId(breakdown: string, selectedBreakdown: AnalyticsBreakdownPreset): string {
+	if (selectedBreakdown === 'none') {
+		return ALL_PROJECTS_DATASET_ID
+	}
+	if (selectedBreakdown === 'project') {
+		return breakdown
+	}
+
+	return `breakdown:${breakdown}`
+}
+
+function getDefaultSelectedGraphDatasetIds(ids: string[]): string[] {
+	return ids.length > GRAPH_DATASET_SELECTION_LIMIT
+		? ids.slice(0, GRAPH_DATASET_SELECTION_LIMIT)
+		: ids
+}
+
+function getSelectableGraphDatasetIds(rows: AnalyticsTableRow[]): string[] {
+	return Array.from(new Set(rows.map((row) => row.graphDatasetId)))
+}
+
+function getGroupByLabel(groupBy: string): string {
+	switch (groupBy) {
+		case '1h':
+			return '1h'
+		case '6h':
+			return '6h'
+		case 'day':
+			return 'Day'
+		case 'week':
+			return 'Week'
+		case 'month':
+			return 'Month'
+		case 'year':
+			return 'Year'
+		default:
+			return 'Date'
+	}
+}
+
+function getRowComparator(
+	column: TableColumnKey,
+	directionFactor: number,
+): (left: AnalyticsTableRow, right: AnalyticsTableRow) => number {
+	switch (column) {
+		case 'date':
+			return (left, right) => compareRows(left, right, left.dateMs - right.dateMs, directionFactor)
+		case 'project':
+			return (left, right) =>
+				compareRows(left, right, sortCollator.compare(left.project, right.project), directionFactor)
+		case 'breakdown':
+			return (left, right) =>
+				compareRows(
+					left,
+					right,
+					sortCollator.compare(left.breakdownDisplay, right.breakdownDisplay),
+					directionFactor,
+				)
+		case 'views':
+			return (left, right) => compareRows(left, right, left.views - right.views, directionFactor)
+		case 'downloads':
+			return (left, right) =>
+				compareRows(left, right, left.downloads - right.downloads, directionFactor)
+		case 'revenue':
+			return (left, right) =>
+				compareRows(left, right, left.revenue - right.revenue, directionFactor)
+		case 'playtime':
+			return (left, right) =>
+				compareRows(left, right, left.playtime - right.playtime, directionFactor)
+		default:
+			return () => 0
+	}
+}
+
+function compareRows(
+	left: AnalyticsTableRow,
+	right: AnalyticsTableRow,
+	primaryResult: number,
+	directionFactor: number,
+): number {
+	if (primaryResult !== 0) {
+		return primaryResult * directionFactor
+	}
+
+	const dateResult = left.dateMs - right.dateMs
+	if (dateResult !== 0) {
+		return dateResult * directionFactor
+	}
+
+	return sortCollator.compare(left.breakdown, right.breakdown) * directionFactor
+}
+
+function formatBreakdownDisplayValue(value: string): string {
+	if (selectedBreakdown.value === 'project') {
+		return projectNamesById.value.get(value) ?? value
+	}
+	return formatBreakdownLabel(value, selectedBreakdown.value, getVersionDisplayName)
+}
+
+function getProjectDisplayValue(
+	breakdown: string,
+	selectedBreakdown: AnalyticsBreakdownPreset,
+): string {
+	if (selectedBreakdown !== 'version_id') {
+		return ''
+	}
+
+	return getVersionProjectName(breakdown) ?? ''
+}
+
+function getCsvCellValue(row: AnalyticsTableRow, key: TableColumnKey): string | number {
+	switch (key) {
+		case 'date':
+			return row.date
+		case 'project':
+			return row.project
+		case 'breakdown':
+			return row.breakdownDisplay
+		case 'views':
+			return row.views
+		case 'downloads':
+			return row.downloads
+		case 'revenue':
+			return row.revenue
+		case 'playtime':
+			return row.playtime
+		default:
+			return ''
+	}
+}
+
+function getCsvHeaderLabel(column: TableColumn<TableColumnKey>): string {
+	if (column.key === 'playtime') {
+		return 'Playtime (seconds)'
+	}
+
+	return column.label ?? column.key
+}
+
+function escapeCsvField(value: string | number): string {
+	const stringValue = String(value)
+	if (
+		stringValue.includes(',') ||
+		stringValue.includes('"') ||
+		stringValue.includes('\n') ||
+		stringValue.includes('\r')
+	) {
+		return `"${stringValue.replace(/"/g, '""')}"`
+	}
+	return stringValue
+}
+
+function getCsvRows(mode: TableMode): AnalyticsTableRow[] {
+	const displayedCache = displayedRowsCache.value
+	const visibleColumns = getCsvColumns(mode)
+	if (
+		displayedCache &&
+		displayedCache.generation === tableCacheGeneration &&
+		displayedCache.mode === mode &&
+		displayedCache.sortColumn === sortColumn.value &&
+		displayedCache.sortDirection === sortDirection.value
+	) {
+		return filterRowsBySearch(displayedCache.rows, visibleColumns)
+	}
+
+	return filterRowsBySearch(sortTableRows(buildTableRows(mode)), visibleColumns)
+}
+
+function getCsvColumns(mode: TableMode): TableColumn<TableColumnKey>[] {
+	return buildColumns(mode === 'date_breakdown' || !showBreakdownColumn.value)
+}
+
+function formatCsvFilenameDate(date: Date): string {
+	return date.toLocaleDateString(undefined, {
+		year: 'numeric',
+		month: 'short',
+		day: 'numeric',
+	})
+}
+
+function getCsvFilenameDateRange(): string {
+	const timeRange = fetchRequest.value?.time_range
+	if (!timeRange) {
+		return 'Selected Range'
+	}
+
+	const start = new Date(timeRange.start)
+	const end = new Date(timeRange.end)
+	if (Number.isNaN(start.getTime()) || Number.isNaN(end.getTime())) {
+		return 'Selected Range'
+	}
+
+	const startLabel = formatCsvFilenameDate(start)
+	const endLabel = formatCsvFilenameDate(end)
+	return startLabel === endLabel ? startLabel : `${startLabel} to ${endLabel}`
+}
+
+function sanitizeCsvFilename(value: string): string {
+	return value
+		.replace(/[<>:"/\\|?*]/g, '')
+		.replace(/\s+/g, ' ')
+		.trim()
+}
+
+function getCsvFilename(): string {
+	return `${sanitizeCsvFilename(
+		`Modrinth Analytics ${breakdownColumnLabel.value} Breakdown - ${getCsvFilenameDateRange()}`,
+	)}.csv`
+}
+
+function downloadCsv(mode: TableMode) {
+	if (!import.meta.client) {
+		return
+	}
+
+	const csvRows = getCsvRows(mode)
+	if (csvRows.length === 0) {
+		return
+	}
+
+	const visibleColumns = getCsvColumns(mode)
+	const header = visibleColumns.map((column) => escapeCsvField(getCsvHeaderLabel(column))).join(',')
+
+	const rows = csvRows.map((row) =>
+		visibleColumns.map((column) => escapeCsvField(getCsvCellValue(row, column.key))).join(','),
+	)
+
+	const csvContent = [header, ...rows].join('\n')
+	const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' })
+	const url = URL.createObjectURL(blob)
+
+	const downloadLink = document.createElement('a')
+	downloadLink.setAttribute('href', url)
+	downloadLink.setAttribute('download', getCsvFilename())
+	downloadLink.style.visibility = 'hidden'
+
+	document.body.appendChild(downloadLink)
+	downloadLink.click()
+	document.body.removeChild(downloadLink)
+
+	URL.revokeObjectURL(url)
+}
+</script>
diff --git a/apps/frontend/src/components/ui/charts/Chart.client.vue b/apps/frontend/src/components/ui/charts/Chart.client.vue
deleted file mode 100644
index 16ea42aaea..0000000000
--- a/apps/frontend/src/components/ui/charts/Chart.client.vue
+++ /dev/null
@@ -1,495 +0,0 @@
-<script setup>
-import { useFormatDateTime, useFormatMoney, useFormatNumber } from '@modrinth/ui'
-import VueApexCharts from 'vue3-apexcharts'
-
-const props = defineProps({
-	name: {
-		type: String,
-		required: true,
-	},
-	labels: {
-		type: Array,
-		required: true,
-	},
-	data: {
-		type: Array,
-		required: true,
-	},
-	formatLabels: {
-		type: Function,
-	},
-	colors: {
-		type: Array,
-		default: () => [],
-	},
-	prefix: {
-		type: String,
-		default: '',
-	},
-	suffix: {
-		type: String,
-		default: '',
-	},
-	hideToolbar: {
-		type: Boolean,
-		default: false,
-	},
-	hideLegend: {
-		type: Boolean,
-		default: false,
-	},
-	stacked: {
-		type: Boolean,
-		default: false,
-	},
-	type: {
-		type: String,
-		default: 'bar',
-	},
-	hideTotal: {
-		type: Boolean,
-		default: false,
-	},
-	isMoney: {
-		type: Boolean,
-		default: false,
-	},
-	legendPosition: {
-		type: String,
-		default: 'right',
-	},
-	xAxisType: {
-		type: String,
-		default: 'datetime',
-	},
-	percentStacked: {
-		type: Boolean,
-		default: false,
-	},
-	horizontalBar: {
-		type: Boolean,
-		default: false,
-	},
-	disableAnimations: {
-		type: Boolean,
-		default: false,
-	},
-})
-
-const formatNumber = useFormatNumber()
-const formatMoney = useFormatMoney()
-const formatDate = useFormatDateTime({
-	month: 'short',
-	day: 'numeric',
-})
-
-function formatTooltipValue(value, props) {
-	return props.isMoney ? formatMoney(value) : formatNumber(value)
-}
-
-function generateListEntry(value, index, _, w, props) {
-	const color = w.globals.colors?.[index]
-
-	return `<div class="list-entry">
-    <span class="circle" style="background-color: ${color}"></span>
-    <div class="label">
-      ${w.globals.seriesNames[index]}
-    </div>
-    <div class="value">
-      ${props.prefix}${formatTooltipValue(value, props)}${props.suffix}
-    </div>
-  </div>`
-}
-
-function generateTooltip({ series, seriesIndex, dataPointIndex, w }, props) {
-	const label = w.globals.lastXAxis.categories?.[dataPointIndex]
-
-	const formattedLabel = props.formatLabels ? props.formatLabels(label) : formatDate(label)
-
-	let tooltip = `<div class="bar-tooltip">
-    <div class="seperated-entry title">
-      <div class="label">${formattedLabel}</div>`
-
-	// Logic for total and percent stacked
-	if (!props.hideTotal) {
-		if (props.percentStacked) {
-			const total = series.reduce((a, b) => a + (b?.[dataPointIndex] || 0), 0)
-			const percentValue = (100 * series[seriesIndex][dataPointIndex]) / total
-			tooltip += `<div class="value">${props.prefix}${formatNumber(percentValue)}%${
-				props.suffix
-			}</div>`
-		} else {
-			const totalValue = series.reduce((a, b) => a + (b?.[dataPointIndex] || 0), 0)
-			tooltip += `<div class="value">${props.prefix}${formatTooltipValue(totalValue, props)}${
-				props.suffix
-			}</div>`
-		}
-	}
-
-	tooltip += '</div><hr class="card-divider" />'
-
-	// Logic for generating list entries
-	if (props.percentStacked) {
-		tooltip += generateListEntry(
-			series[seriesIndex][dataPointIndex],
-			seriesIndex,
-			seriesIndex,
-			w,
-			props,
-		)
-	} else {
-		const returnTopN = 15
-
-		const listEntries = series
-			.map((value, index) => [
-				value[dataPointIndex],
-				generateListEntry(value[dataPointIndex], index, seriesIndex, w, props),
-			])
-			.filter((value) => value[0] > 0)
-			.sort((a, b) => b[0] - a[0])
-			.slice(0, returnTopN) // Return only the top X entries
-			.map((value) => value[1])
-			.join('')
-
-		tooltip += listEntries
-	}
-
-	tooltip += '</div>'
-	return tooltip
-}
-
-const chartOptions = computed(() => {
-	return {
-		chart: {
-			id: props.name,
-			fontFamily:
-				'Inter, -apple-system, BlinkMacSystemFont, Segoe UI, Oxygen, Ubuntu, Roboto, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif',
-			foreColor: 'var(--color-base)',
-			selection: {
-				enabled: true,
-				fill: {
-					color: 'var(--color-brand)',
-				},
-			},
-			toolbar: {
-				show: false,
-			},
-			stacked: props.stacked,
-			stackType: props.percentStacked ? '100%' : 'normal',
-			zoom: {
-				autoScaleYaxis: true,
-			},
-			animations: {
-				enabled: props.disableAnimations,
-			},
-		},
-		xaxis: {
-			type: props.xAxisType,
-			categories: props.labels,
-			labels: {
-				style: {
-					borderRadius: 'var(--radius-sm)',
-				},
-			},
-			axisTicks: {
-				show: false,
-			},
-			tooltip: {
-				enabled: false,
-			},
-		},
-		yaxis: {
-			tooltip: {
-				enabled: false,
-			},
-		},
-		colors: props.colors,
-		dataLabels: {
-			enabled: false,
-			background: {
-				enabled: true,
-				borderRadius: 20,
-			},
-		},
-		grid: {
-			borderColor: 'var(--color-button-bg)',
-			tickColor: 'var(--color-button-bg)',
-		},
-		legend: {
-			show: !props.hideLegend,
-			position: props.legendPosition,
-			showForZeroSeries: false,
-			showForSingleSeries: false,
-			showForNullSeries: false,
-			fontSize: 'var(--font-size-nm)',
-			fontFamily:
-				'Inter, -apple-system, BlinkMacSystemFont, Segoe UI, Oxygen, Ubuntu, Roboto, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif',
-			onItemClick: {
-				toggleDataSeries: true,
-			},
-		},
-		markers: {
-			size: 0,
-			strokeColor: 'var(--color-contrast)',
-			strokeWidth: 3,
-			strokeOpacity: 1,
-			fillOpacity: 1,
-			hover: {
-				size: 6,
-			},
-		},
-		plotOptions: {
-			bar: {
-				horizontal: props.horizontalBar,
-				columnWidth: '80%',
-				endingShape: 'rounded',
-				borderRadius: 5,
-				borderRadiusApplication: 'end',
-				borderRadiusWhenStacked: 'last',
-			},
-		},
-		stroke: {
-			curve: 'smooth',
-			width: 2,
-		},
-		tooltip: {
-			custom: (d) => generateTooltip(d, props),
-		},
-		fill:
-			props.type === 'area'
-				? {
-						colors: props.colors,
-						type: 'gradient',
-						opacity: 1,
-						gradient: {
-							shade: 'light',
-							type: 'vertical',
-							shadeIntensity: 0,
-							gradientToColors: props.colors,
-							inverseColors: true,
-							opacityFrom: 0.5,
-							opacityTo: 0,
-							stops: [0, 100],
-							colorStops: [],
-						},
-					}
-				: {},
-	}
-})
-
-const chart = ref(null)
-
-const legendValues = ref(
-	[...props.data].map((project, index) => {
-		return { name: project.name, visible: true, color: props.colors[index] }
-	}),
-)
-
-const flipLegend = (legend, newVal) => {
-	legend.visible = newVal
-	chart.value.toggleSeries(legend.name)
-}
-
-const resetChart = () => {
-	if (!chart.value?.chart) return
-	chart.value.updateSeries([...props.data])
-	chart.value.updateOptions({
-		xaxis: {
-			categories: props.labels,
-		},
-	})
-	chart.value.resetSeries()
-	legendValues.value.forEach((legend) => {
-		legend.visible = true
-	})
-}
-
-defineExpose({
-	resetChart,
-	flipLegend,
-})
-</script>
-
-<template>
-	<VueApexCharts ref="chart" :type="type" :options="chartOptions" :series="data" class="chart" />
-</template>
-
-<style scoped lang="scss">
-.chart {
-	width: 100%;
-	height: 100%;
-}
-
-svg {
-	width: 100%;
-	height: 100%;
-}
-
-.btn {
-	svg {
-		width: 1.25rem;
-		height: 1.25rem;
-	}
-}
-
-.bar-chart {
-	width: 100%;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-
-	overflow: hidden;
-}
-
-.title-bar {
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	gap: var(--gap-xs);
-}
-
-.toolbar {
-	display: flex;
-	flex-direction: row;
-	gap: var(--gap-xs);
-	z-index: 1;
-	margin-left: auto;
-}
-
-:deep(.apexcharts-menu),
-:deep(.apexcharts-tooltip),
-:deep(.apexcharts-yaxistooltip) {
-	background: var(--color-raised-bg) !important;
-	border-radius: var(--radius-sm) !important;
-	border: 1px solid var(--color-divider) !important;
-	box-shadow: var(--shadow-floating) !important;
-	font-size: var(--font-size-nm) !important;
-}
-
-:deep(.apexcharts-grid-borders) {
-	line {
-		stroke: var(--color-button-bg) !important;
-	}
-}
-
-:deep(.apexcharts-yaxistooltip),
-:deep(.apexcharts-xaxistooltip) {
-	background: var(--color-raised-bg) !important;
-	border-radius: var(--radius-sm) !important;
-	border: 1px solid var(--color-divider) !important;
-	font-size: var(--font-size-nm) !important;
-	color: var(--color-base) !important;
-
-	.apexcharts-xaxistooltip-text {
-		font-size: var(--font-size-nm) !important;
-		color: var(--color-base) !important;
-	}
-}
-
-:deep(.apexcharts-yaxistooltip-left:after) {
-	border-left-color: var(--color-raised-bg) !important;
-}
-
-:deep(.apexcharts-yaxistooltip-left:before) {
-	border-left-color: var(--color-button-bg) !important;
-}
-
-:deep(.apexcharts-xaxistooltip-bottom:after) {
-	border-bottom-color: var(--color-raised-bg) !important;
-}
-
-:deep(.apexcharts-xaxistooltip-bottom:before) {
-	border-bottom-color: var(--color-button-bg) !important;
-}
-
-:deep(.apexcharts-menu-item) {
-	border-radius: var(--radius-sm) !important;
-	padding: var(--gap-xs) var(--gap-sm) !important;
-
-	&:hover {
-		transition: all 0.3s !important;
-		color: var(--color-accent-contrast) !important;
-		background: var(--color-brand) !important;
-	}
-}
-
-:deep(.apexcharts-tooltip) {
-	.bar-tooltip {
-		min-width: 10rem;
-		display: flex;
-		flex-direction: column;
-		gap: var(--gap-xs);
-		padding: var(--gap-sm);
-
-		.card-divider {
-			margin: var(--gap-xs) 0;
-		}
-
-		.seperated-entry {
-			display: flex;
-			flex-direction: row;
-			justify-content: space-between;
-			align-items: center;
-		}
-
-		.title {
-			font-weight: bolder;
-		}
-
-		.label {
-			margin-right: var(--gap-xl);
-			color: var(--color-contrast);
-		}
-
-		.value {
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			gap: var(--gap-xs);
-			color: var(--color-base);
-		}
-
-		.list-entry {
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			font-size: var(--font-size-sm);
-
-			.value {
-				margin-left: auto;
-			}
-		}
-
-		.circle {
-			width: 0.75rem;
-			height: 0.75rem;
-			border-radius: 50%;
-			display: inline-block;
-			margin-right: var(--gap-sm);
-			border: 2px solid var(--color-base);
-		}
-
-		svg {
-			height: 1em;
-			width: 1em;
-		}
-	}
-}
-
-.legend {
-	display: flex;
-	flex-wrap: wrap;
-	flex-direction: row;
-	align-items: center;
-	gap: var(--gap-lg);
-	justify-content: center;
-}
-
-:deep(.checkbox) {
-	white-space: nowrap;
-}
-
-.legend-checkbox :deep(.checkbox.checked) {
-	background-color: var(--color);
-}
-</style>
diff --git a/apps/frontend/src/components/ui/charts/ChartDisplay.vue b/apps/frontend/src/components/ui/charts/ChartDisplay.vue
deleted file mode 100644
index ea6670f932..0000000000
--- a/apps/frontend/src/components/ui/charts/ChartDisplay.vue
+++ /dev/null
@@ -1,1016 +0,0 @@
-<template>
-	<div>
-		<div v-if="analytics.error.value" class="universal-card">
-			<h2>
-				<span class="label__title">Error</span>
-			</h2>
-			<div>
-				{{ analytics.error.value }}
-			</div>
-		</div>
-		<div v-else-if="analytics.loading.value" class="universal-card">
-			<h2>
-				<span class="label__title">Loading analytics...</span>
-			</h2>
-		</div>
-		<div v-else class="graphs">
-			<div class="graphs__vertical-bar">
-				<client-only>
-					<CompactChart
-						v-if="analytics.formattedData.value.downloads"
-						ref="tinyDownloadChart"
-						:title="`Downloads`"
-						color="var(--color-brand)"
-						:value="formatNumber(analytics.formattedData.value.downloads.sum)"
-						:data="analytics.formattedData.value.downloads.chart.sumData"
-						:labels="analytics.formattedData.value.downloads.chart.labels"
-						suffix="<svg xmlns='http://www.w3.org/2000/svg' class='h-6 w-6' fill='none' viewBox='0 0 24 24' stroke='currentColor' stroke-width='2'><path stroke-linecap='round' stroke-linejoin='round' d='M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4' /></svg>"
-						:class="`clickable chart-button-base button-base ${
-							selectedChart === 'downloads'
-								? 'chart-button-base__selected button-base__selected'
-								: ''
-						}`"
-						:onclick="() => (selectedChart = 'downloads')"
-						role="button"
-					/>
-				</client-only>
-				<client-only>
-					<CompactChart
-						v-if="analytics.formattedData.value.views"
-						ref="tinyViewChart"
-						:title="`Views`"
-						color="var(--color-blue)"
-						:value="formatNumber(analytics.formattedData.value.views.sum)"
-						:data="analytics.formattedData.value.views.chart.sumData"
-						:labels="analytics.formattedData.value.views.chart.labels"
-						suffix="<svg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'><path d='M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z'/><circle cx='12' cy='12' r='3'/></svg>"
-						:class="`clickable chart-button-base button-base ${
-							selectedChart === 'views' ? 'chart-button-base__selected button-base__selected' : ''
-						}`"
-						:onclick="() => (selectedChart = 'views')"
-						role="button"
-					/>
-				</client-only>
-				<client-only>
-					<CompactChart
-						v-if="analytics.formattedData.value.revenue"
-						ref="tinyRevenueChart"
-						:title="`Revenue`"
-						color="var(--color-purple)"
-						:value="formatMoney(analytics.formattedData.value.revenue.sum)"
-						:data="analytics.formattedData.value.revenue.chart.sumData"
-						:labels="analytics.formattedData.value.revenue.chart.labels"
-						is-money
-						:class="`clickable chart-button-base button-base ${
-							selectedChart === 'revenue' ? 'chart-button-base__selected button-base__selected' : ''
-						}`"
-						:onclick="() => (selectedChart = 'revenue')"
-						role="button"
-					/>
-				</client-only>
-			</div>
-			<div class="graphs__main-graph">
-				<div class="universal-card">
-					<div class="chart-controls">
-						<h2>
-							<span class="label__title">
-								{{ capitalizeString(selectedChart) }}
-							</span>
-							<span class="label__subtitle">
-								{{ formattedCategorySubtitle }}
-							</span>
-						</h2>
-						<div class="chart-controls__buttons">
-							<ButtonStyled circular type="outlined">
-								<button v-tooltip="'Toggle project colors'" @click="onToggleColors">
-									<PaletteIcon />
-								</button>
-							</ButtonStyled>
-							<ButtonStyled circular type="outlined">
-								<button v-tooltip="'Download this data as CSV'" @click="onDownloadSetAsCSV">
-									<DownloadIcon />
-								</button>
-							</ButtonStyled>
-							<ButtonStyled circular type="outlined">
-								<button v-tooltip="'Refresh the chart'" @click="resetCharts">
-									<UpdatedIcon />
-								</button>
-							</ButtonStyled>
-							<DropdownSelect
-								v-model="selectedRange"
-								class="range-dropdown"
-								:options="ranges"
-								name="Time range"
-								:display-name="
-									(o: RangeObject) => o?.getLabel([startDate, endDate]) ?? 'Loading...'
-								"
-							/>
-						</div>
-					</div>
-					<div class="chart-area">
-						<div class="chart">
-							<client-only>
-								<Chart
-									v-if="analytics.formattedData.value.downloads && selectedChart === 'downloads'"
-									ref="downloadsChart"
-									type="line"
-									name="Download data"
-									:hide-legend="true"
-									:data="analytics.formattedData.value.downloads.chart.data"
-									:labels="analytics.formattedData.value.downloads.chart.labels"
-									suffix="<svg xmlns='http://www.w3.org/2000/svg' class='h-6 w-6' fill='none' viewBox='0 0 24 24' stroke='currentColor' stroke-width='2'><path stroke-linecap='round' stroke-linejoin='round' d='M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4' /></svg>"
-									:colors="
-										isUsingProjectColors
-											? analytics.formattedData.value.downloads.chart.colors
-											: analytics.formattedData.value.downloads.chart.defaultColors
-									"
-								/>
-								<Chart
-									v-if="analytics.formattedData.value.views && selectedChart === 'views'"
-									ref="viewsChart"
-									type="line"
-									name="View data"
-									:hide-legend="true"
-									:data="analytics.formattedData.value.views.chart.data"
-									:labels="analytics.formattedData.value.views.chart.labels"
-									suffix="<svg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'><path d='M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z'/><circle cx='12' cy='12' r='3'/></svg>"
-									:colors="
-										isUsingProjectColors
-											? analytics.formattedData.value.views.chart.colors
-											: analytics.formattedData.value.views.chart.defaultColors
-									"
-								/>
-								<Chart
-									v-if="analytics.formattedData.value.revenue && selectedChart === 'revenue'"
-									ref="revenueChart"
-									type="line"
-									name="Revenue data"
-									:hide-legend="true"
-									:data="analytics.formattedData.value.revenue.chart.data"
-									:labels="analytics.formattedData.value.revenue.chart.labels"
-									is-money
-									:colors="
-										isUsingProjectColors
-											? analytics.formattedData.value.revenue.chart.colors
-											: analytics.formattedData.value.revenue.chart.defaultColors
-									"
-								/>
-							</client-only>
-						</div>
-						<div class="legend">
-							<div class="legend__items">
-								<template v-for="project in selectedDataSetProjects" :key="project">
-									<button
-										v-tooltip="project.title"
-										:class="`legend__item button-base legend__item-transparent ${
-											!projectIsOnDisplay(project.id) ? 'legend__item-dimmed' : ''
-										}`"
-										@click="
-											() =>
-												projectIsOnDisplay(project.id) &&
-												analytics.validProjectIds.value.includes(project.id)
-													? removeProjectFromDisplay(project.id)
-													: addProjectToDisplay(project.id)
-										"
-									>
-										<div
-											:style="{
-												'--color-brand': isUsingProjectColors
-													? intToRgba(project.color, project.id, theme.active ?? undefined)
-													: getDefaultColor(project.id),
-											}"
-											class="legend__item__color"
-										></div>
-										<div class="legend__item__text">{{ project.title }}</div>
-									</button>
-								</template>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="country-data">
-					<Card
-						v-if="
-							analytics.formattedData.value?.downloadsByCountry &&
-							selectedChart === 'downloads' &&
-							analytics.formattedData.value.downloadsByCountry.data.length > 0
-						"
-						class="country-downloads"
-					>
-						<label>
-							<span class="label__title">Downloads by region</span>
-						</label>
-						<div class="country-values">
-							<div
-								v-for="[name, count] in analytics.formattedData.value.downloadsByCountry.data"
-								:key="name"
-								class="country-value"
-							>
-								<div class="country-flag-container">
-									<template v-if="name.toLowerCase() === 'xx' || !name">
-										<div
-											class="country-flag flex select-none items-center justify-center bg-bg-raised font-extrabold text-secondary"
-										>
-											?
-										</div>
-									</template>
-									<template v-else>
-										<img
-											:src="countryCodeToFlag(name)"
-											:alt="`${countryCodeToName(name)}'s flag`"
-											class="country-flag"
-										/>
-									</template>
-								</div>
-								<div class="country-text">
-									<strong class="country-name"
-										><template v-if="name.toLowerCase() === 'xx' || !name">Other</template>
-										<template v-else>{{ countryCodeToName(name) }}</template>
-									</strong>
-									<span class="data-point">{{ formatCompactNumber(count) }}</span>
-								</div>
-								<div
-									v-tooltip="
-										formatPercent(count, analytics.formattedData.value.downloadsByCountry.sum)
-									"
-									class="percentage-bar"
-								>
-									<span
-										:style="{
-											width: formatPercent(
-												count,
-												analytics.formattedData.value.downloadsByCountry.sum,
-											),
-											backgroundColor: 'var(--color-brand)',
-										}"
-									></span>
-								</div>
-							</div>
-						</div>
-					</Card>
-					<Card
-						v-if="
-							analytics.formattedData.value?.viewsByCountry &&
-							selectedChart === 'views' &&
-							analytics.formattedData.value.viewsByCountry.data.length > 0
-						"
-						class="country-downloads"
-					>
-						<label>
-							<span class="label__title">Page views by region</span>
-						</label>
-						<div class="country-values">
-							<div
-								v-for="[name, count] in analytics.formattedData.value.viewsByCountry.data"
-								:key="name"
-								class="country-value"
-							>
-								<div class="country-flag-container">
-									<template v-if="name.toLowerCase() === 'xx' || !name">
-										<div
-											class="country-flag flex select-none items-center justify-center bg-bg-raised font-extrabold text-secondary"
-										>
-											?
-										</div>
-									</template>
-									<template v-else>
-										<img
-											:src="countryCodeToFlag(name)"
-											:alt="`${countryCodeToName(name)}'s flag`"
-											class="country-flag"
-										/>
-									</template>
-								</div>
-								<div class="country-text">
-									<strong class="country-name">
-										<template v-if="name.toLowerCase() === 'xx' || !name">Other</template>
-										<template v-else>{{ countryCodeToName(name) }}</template>
-									</strong>
-									<span class="data-point">{{ formatCompactNumber(count) }}</span>
-								</div>
-								<div
-									v-tooltip="
-										`${
-											Math.round(
-												(count / analytics.formattedData.value.viewsByCountry.sum) * 10000,
-											) / 100
-										}%`
-									"
-									class="percentage-bar"
-								>
-									<span
-										:style="{
-											width: `${(count / analytics.formattedData.value.viewsByCountry.sum) * 100}%`,
-											backgroundColor: 'var(--color-blue)',
-										}"
-									></span>
-								</div>
-							</div>
-						</div>
-					</Card>
-				</div>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script setup lang="ts">
-import { DownloadIcon, PaletteIcon, UpdatedIcon } from '@modrinth/assets'
-import {
-	ButtonStyled,
-	Card,
-	DropdownSelect,
-	useCompactNumber,
-	useDebugLogger,
-	useFormatMoney,
-	useFormatNumber,
-} from '@modrinth/ui'
-import { capitalizeString } from '@modrinth/utils'
-import dayjs from 'dayjs'
-import { computed } from 'vue'
-
-import { UiChartsChart as Chart, UiChartsCompactChart as CompactChart } from '#components'
-import { useTheme } from '~/composables/nuxt-accessors.ts'
-import {
-	analyticsSetToCSVString,
-	countryCodeToFlag,
-	countryCodeToName,
-	formatPercent,
-	getDefaultColor,
-	intToRgba,
-} from '~/utils/analytics.js'
-
-const debug = useDebugLogger('ChartDisplay')
-const formatNumber = useFormatNumber()
-const { formatCompactNumber } = useCompactNumber()
-const formatMoney = useFormatMoney()
-
-const router = useNativeRouter()
-const theme = useTheme()
-
-debug('setup start', { server: import.meta.server, client: import.meta.client })
-
-const props = withDefaults(
-	defineProps<{
-		projects?: any[]
-		/**
-		 * @deprecated Use `ranges` instead
-		 */
-		resoloutions?: Record<string, number>
-		ranges?: RangeObject[]
-		personal?: boolean
-	}>(),
-	{
-		projects: undefined,
-		resoloutions: () => defaultResoloutions,
-		ranges: () => defaultRanges,
-		personal: false,
-	},
-)
-
-const projects = computed(() => props.projects || [])
-
-debug('projects from props', {
-	count: projects.value.length,
-	ids: projects.value.map((p: any) => p.id),
-})
-
-// const selectedChart = ref('downloads')
-const selectedChart = computed({
-	get: () => {
-		const id = (router.currentRoute.value.query?.chart as string | undefined) || 'downloads'
-		// if the id is anything but the 3 charts we have or undefined, throw an error
-		if (!['downloads', 'views', 'revenue'].includes(id)) {
-			throw new Error(`Unknown chart ${id}`)
-		}
-		return id
-	},
-	set: (chart) => {
-		router.push({
-			query: {
-				...router.currentRoute.value.query,
-				chart,
-			},
-		})
-	},
-})
-
-// Chart refs
-const downloadsChart = ref()
-const viewsChart = ref()
-const revenueChart = ref()
-const tinyDownloadChart = ref()
-const tinyViewChart = ref()
-const tinyRevenueChart = ref()
-
-const selectedDisplayProjects = ref(props.projects || [])
-
-watch(
-	() => props.projects,
-	(newProjects) => {
-		selectedDisplayProjects.value = newProjects || []
-	},
-)
-
-const removeProjectFromDisplay = (id: string) => {
-	selectedDisplayProjects.value = selectedDisplayProjects.value.filter((p) => p.id !== id)
-}
-
-const addProjectToDisplay = (id: string) => {
-	selectedDisplayProjects.value = [
-		...selectedDisplayProjects.value,
-		props.projects?.find((p) => p.id === id),
-	].filter(Boolean)
-}
-
-const projectIsOnDisplay = (id: string) => {
-	return selectedDisplayProjects.value?.some((p) => p.id === id) ?? false
-}
-
-const resetCharts = () => {
-	downloadsChart.value?.resetChart()
-	viewsChart.value?.resetChart()
-	revenueChart.value?.resetChart()
-
-	tinyDownloadChart.value?.resetChart()
-	tinyViewChart.value?.resetChart()
-	tinyRevenueChart.value?.resetChart()
-}
-
-const isUsingProjectColors = computed({
-	get: () => {
-		return (
-			router.currentRoute.value.query?.colors === 'true' ||
-			router.currentRoute.value.query?.colors === undefined
-		)
-	},
-	set: (newValue) => {
-		router.push({
-			query: {
-				...router.currentRoute.value.query,
-				colors: newValue ? 'true' : 'false',
-			},
-		})
-	},
-})
-
-const defaultRange = props.ranges.find(
-	(r) => r.getLabel([dayjs(), dayjs()]) === 'Previous 30 days',
-)!
-const initialDates = defaultRange.getDates(dayjs())
-
-const internalRange: Ref<RangeObject> = ref(defaultRange)
-const startDate = ref(initialDates.startDate)
-const endDate = ref(initialDates.endDate)
-const timeResolution = ref(defaultRange.timeResolution)
-
-debug('default range initialized', {
-	range: defaultRange.getLabel([dayjs(), dayjs()]),
-	startDate: startDate.value.toISOString(),
-	endDate: endDate.value.toISOString(),
-	timeResolution: timeResolution.value,
-})
-
-onBeforeMount(() => {
-	debug('onBeforeMount')
-	if (import.meta.client) {
-		const rangeLabel = localStorage.getItem('analyticsSelectedRange')
-		debug('localStorage range', { rangeLabel })
-		if (rangeLabel) {
-			const range = props.ranges.find((r) => r.getLabel([dayjs(), dayjs()]) === rangeLabel)
-
-			if (range) {
-				internalRange.value = range
-				const dates = range.getDates(dayjs())
-				timeResolution.value = range.timeResolution
-				startDate.value = dates.startDate
-				endDate.value = dates.endDate
-				debug('range overridden from localStorage', {
-					startDate: dates.startDate.toISOString(),
-					endDate: dates.endDate.toISOString(),
-					timeResolution: range.timeResolution,
-				})
-			}
-		}
-	}
-})
-
-const selectedRange = computed({
-	get: () => {
-		return internalRange.value
-	},
-	set: (newRange) => {
-		const ranges = newRange.getDates(dayjs())
-		startDate.value = ranges.startDate
-		endDate.value = ranges.endDate
-		timeResolution.value = newRange.timeResolution
-
-		internalRange.value = newRange
-
-		if (import.meta.client) {
-			localStorage.setItem(
-				'analyticsSelectedRange',
-				internalRange.value?.getLabel([dayjs(), dayjs()]) ?? 'Previous 30 days',
-			)
-		}
-	},
-})
-
-debug('calling useFetchAllAnalytics')
-const analytics = useFetchAllAnalytics(
-	resetCharts,
-	projects,
-	selectedDisplayProjects,
-	props.personal,
-	startDate,
-	endDate,
-	timeResolution,
-)
-
-debug('awaiting analytics.fetch()')
-await analytics.fetch()
-debug('analytics.fetch() resolved', {
-	loading: analytics.loading.value,
-	error: analytics.error.value,
-})
-
-const formattedCategorySubtitle = computed(() => {
-	return (
-		selectedRange.value?.getLabel([dayjs(startDate.value), dayjs(endDate.value)]) ?? 'Loading...'
-	)
-})
-
-const selectedDataSet = computed(() => {
-	switch (selectedChart.value) {
-		case 'downloads':
-			return analytics.totalData.value.downloads
-		case 'views':
-			return analytics.totalData.value.views
-		case 'revenue':
-			return analytics.totalData.value.revenue
-		default:
-			throw new Error(`Unknown chart ${selectedChart.value}`)
-	}
-})
-const selectedDataSetProjects = computed(() => {
-	return selectedDataSet.value.projectIds
-		.map((id) => props.projects?.find((p) => p?.id === id))
-		.filter(Boolean)
-})
-
-const downloadSelectedSetAsCSV = () => {
-	const selectedChartName = selectedChart.value
-
-	const csv = analyticsSetToCSVString(selectedDataSet.value)
-
-	const blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' })
-
-	const link = document.createElement('a')
-	const url = URL.createObjectURL(blob)
-	link.setAttribute('href', url)
-	link.setAttribute('download', `${selectedChartName}-data.csv`)
-	link.style.visibility = 'hidden'
-	document.body.appendChild(link)
-
-	link.click()
-}
-
-const onDownloadSetAsCSV = useClientTry(async () => await downloadSelectedSetAsCSV())
-const onToggleColors = () => {
-	isUsingProjectColors.value = !isUsingProjectColors.value
-}
-</script>
-
-<script lang="ts">
-/**
- * @deprecated Use `ranges` instead
- */
-const defaultResoloutions: Record<string, number> = {
-	'5 minutes': 5,
-	'30 minutes': 30,
-	'An hour': 60,
-	'12 hours': 720,
-	'A day': 1440,
-	'A week': 10080,
-}
-
-type DateRange = { startDate: dayjs.Dayjs; endDate: dayjs.Dayjs }
-
-type RangeObject = {
-	getLabel: (dateRange: [dayjs.Dayjs, dayjs.Dayjs]) => string
-	getDates: (currentDate: dayjs.Dayjs) => DateRange
-	// A time resolution in minutes.
-	timeResolution: number
-}
-
-const defaultRanges: RangeObject[] = [
-	{
-		getLabel: () => 'Previous 30 minutes',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(currentDate).subtract(30, 'minute'),
-			endDate: currentDate,
-		}),
-		timeResolution: 1,
-	},
-	{
-		getLabel: () => 'Previous hour',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(currentDate).subtract(1, 'hour'),
-			endDate: currentDate,
-		}),
-		timeResolution: 5,
-	},
-	{
-		getLabel: () => 'Previous 12 hours',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(currentDate).subtract(12, 'hour'),
-			endDate: currentDate,
-		}),
-		timeResolution: 12,
-	},
-	{
-		getLabel: () => 'Previous 24 hours',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(currentDate).subtract(1, 'day'),
-			endDate: currentDate,
-		}),
-		timeResolution: 30,
-	},
-	{
-		getLabel: () => 'Today',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(currentDate).startOf('day'),
-			endDate: currentDate,
-		}),
-		timeResolution: 30,
-	},
-	{
-		getLabel: () => 'Yesterday',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(currentDate).subtract(1, 'day').startOf('day'),
-			endDate: dayjs(currentDate).startOf('day').subtract(1, 'second'),
-		}),
-		timeResolution: 30,
-	},
-	{
-		getLabel: () => 'This week',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(currentDate).startOf('week').add(1, 'hour'),
-			endDate: currentDate,
-		}),
-		timeResolution: 360,
-	},
-	{
-		getLabel: () => 'Last week',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(currentDate).subtract(1, 'week').startOf('week').add(1, 'hour'),
-			endDate: dayjs(currentDate).startOf('week').subtract(1, 'second'),
-		}),
-		timeResolution: 1440,
-	},
-	{
-		getLabel: () => 'Previous 7 days',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(currentDate).startOf('day').subtract(7, 'day').add(1, 'hour'),
-			endDate: currentDate.startOf('day'),
-		}),
-		timeResolution: 720,
-	},
-	{
-		getLabel: () => 'This month',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(currentDate).startOf('month').add(1, 'hour'),
-			endDate: currentDate,
-		}),
-		timeResolution: 1440,
-	},
-	{
-		getLabel: () => 'Last month',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(currentDate).subtract(1, 'month').startOf('month').add(1, 'hour'),
-			endDate: dayjs(currentDate).startOf('month').subtract(1, 'second'),
-		}),
-		timeResolution: 1440,
-	},
-	{
-		getLabel: () => 'Previous 30 days',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(currentDate).startOf('day').subtract(30, 'day').add(1, 'hour'),
-			endDate: currentDate.startOf('day'),
-		}),
-		timeResolution: 1440,
-	},
-	{
-		getLabel: () => 'This quarter',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(currentDate).startOf('quarter').add(1, 'hour'),
-			endDate: currentDate,
-		}),
-		timeResolution: 1440,
-	},
-	{
-		getLabel: () => 'Last quarter',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(currentDate).subtract(1, 'quarter').startOf('quarter').add(1, 'hour'),
-			endDate: dayjs(currentDate).startOf('quarter').subtract(1, 'second'),
-		}),
-		timeResolution: 1440,
-	},
-	{
-		getLabel: () => 'This year',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(currentDate).startOf('year'),
-			endDate: currentDate,
-		}),
-		timeResolution: 20160,
-	},
-	{
-		getLabel: () => 'Last year',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(currentDate).subtract(1, 'year').startOf('year'),
-			endDate: dayjs(currentDate).startOf('year').subtract(1, 'second'),
-		}),
-		timeResolution: 20160,
-	},
-	{
-		getLabel: () => 'Previous year',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(currentDate).subtract(1, 'year'),
-			endDate: dayjs(currentDate),
-		}),
-		timeResolution: 40320,
-	},
-	{
-		getLabel: () => 'Previous two years',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(currentDate).subtract(2, 'year'),
-			endDate: currentDate,
-		}),
-		timeResolution: 40320,
-	},
-	{
-		getLabel: () => 'All Time',
-		getDates: (currentDate: dayjs.Dayjs) => ({
-			startDate: dayjs(0),
-			endDate: currentDate,
-		}),
-		timeResolution: 40320,
-	},
-]
-</script>
-
-<style scoped lang="scss">
-.chart-controls {
-	display: flex;
-	flex-direction: row;
-	justify-content: space-between;
-	align-items: flex-start;
-	gap: var(--gap-md);
-
-	.chart-controls__buttons {
-		display: flex;
-		flex-direction: row;
-		gap: var(--gap-xs);
-
-		* {
-			width: auto;
-			min-height: auto;
-		}
-	}
-
-	h2 {
-		display: flex;
-		flex-direction: column;
-
-		.label__subtitle {
-			font-size: var(--font-size-sm);
-			color: var(--color-text-secondary);
-		}
-	}
-}
-
-.range-dropdown {
-	font-size: var(--font-size-sm);
-}
-
-.chart-area {
-	display: flex;
-	flex-direction: row;
-	gap: var(--gap-md);
-
-	height: 100%;
-
-	.chart {
-		flex-grow: 1;
-		flex-shrink: 1;
-
-		display: flex;
-		flex-direction: column;
-		gap: var(--gap-md);
-	}
-
-	.legend {
-		margin-top: 24px;
-		overflow: hidden;
-
-		max-width: 26ch;
-		width: fit-content;
-
-		.legend__items {
-			display: flex;
-			flex-direction: column;
-			gap: var(--gap-xs);
-
-			.legend__item {
-				display: flex;
-				flex-direction: row;
-				align-items: center;
-				gap: var(--gap-xs);
-				font-size: var(--font-size-sm);
-				width: 100%;
-
-				.legend__item__text {
-					white-space: nowrap;
-					text-overflow: ellipsis;
-				}
-
-				.legend__item__color {
-					height: var(--font-size-xs);
-					width: var(--font-size-xs);
-					border-radius: var(--radius-sm);
-					background-color: var(--color-brand);
-
-					flex-grow: 0;
-					flex-shrink: 0;
-				}
-			}
-		}
-	}
-}
-
-.legend__item-transparent {
-	background-color: transparent;
-	border: none;
-	cursor: pointer;
-
-	color: var(--text-color);
-	font-weight: var(--font-weight-regular);
-}
-
-.legend__item-dimmed {
-	opacity: 0.5;
-}
-
-.chart-button-base {
-	overflow: hidden;
-}
-
-.chart-button-base__selected {
-	color: var(--color-contrast);
-	background-color: var(--color-brand-highlight);
-	box-shadow:
-		inset 0 0 0 transparent,
-		0 0 0 2px var(--color-brand);
-
-	&:hover {
-		background-color: var(--color-brand-highlight);
-	}
-}
-
-.graphs {
-	// Pages clip so we need to add a margin
-	margin-left: 0.25rem;
-	margin-top: 0.25rem;
-
-	display: flex;
-	flex-direction: column;
-
-	.graphs__vertical-bar {
-		flex-grow: 0;
-		flex-shrink: 0;
-		gap: 0.75rem;
-		display: flex;
-		margin-right: 0.1rem;
-	}
-}
-
-.country-flag-container {
-	width: 40px;
-	height: 27px;
-
-	display: flex;
-	justify-content: center;
-	align-items: center;
-
-	overflow: hidden;
-
-	border: 1px solid var(--color-divider);
-	border-radius: var(--radius-xs);
-}
-
-.country-flag {
-	object-fit: cover;
-
-	min-width: 100%;
-	min-height: 100%;
-}
-
-.spark-data {
-	display: grid;
-	grid-template-columns: 1fr 1fr 1fr;
-	gap: var(--gap-md);
-}
-
-.country-data {
-	display: grid;
-	grid-template-columns: 1fr;
-	gap: var(--gap-md);
-}
-
-.country-values {
-	display: flex;
-	flex-direction: column;
-	background-color: var(--color-bg);
-	border-radius: var(--radius-sm);
-	border: 1px solid var(--color-divider);
-	gap: var(--gap-md);
-	padding: var(--gap-md);
-	margin-top: var(--gap-md);
-	overflow-y: auto;
-	max-height: 24rem;
-}
-
-.country-value {
-	display: grid;
-	grid-template-areas: 'flag text bar';
-	grid-template-columns: auto 1fr 10rem;
-	align-items: center;
-	justify-content: space-between;
-	width: 100%;
-	gap: var(--gap-sm);
-
-	.country-text {
-		grid-area: text;
-		display: flex;
-		flex-direction: column;
-		gap: var(--gap-xs);
-	}
-
-	.percentage-bar {
-		grid-area: bar;
-		width: 100%;
-		height: 1rem;
-		background-color: var(--color-raised-bg);
-		border: 1px solid var(--color-divider);
-		border-radius: var(--radius-sm);
-		overflow: hidden;
-
-		span {
-			display: block;
-			height: 100%;
-		}
-	}
-}
-
-@media (max-width: 768px) {
-	.chart-area {
-		flex-direction: column;
-		gap: var(--gap-md);
-	}
-
-	.chart-controls {
-		flex-direction: column;
-		gap: var(--gap-md);
-	}
-
-	.chart {
-		flex-direction: column;
-		gap: var(--gap-md);
-	}
-
-	.legend {
-		margin-top: 0px;
-		width: 100%;
-		max-width: 100%;
-	}
-
-	.graphs {
-		margin-left: 0px;
-		margin-top: 0px;
-
-		.graphs__vertical-bar {
-			flex-direction: column;
-			gap: 0;
-			margin-right: 0px;
-		}
-	}
-
-	.country-data {
-		display: block;
-	}
-
-	.country-value {
-		grid-template-columns: auto 1fr 5rem;
-	}
-}
-</style>
diff --git a/apps/frontend/src/components/ui/charts/CompactChart.client.vue b/apps/frontend/src/components/ui/charts/CompactChart.client.vue
deleted file mode 100644
index 1a76864196..0000000000
--- a/apps/frontend/src/components/ui/charts/CompactChart.client.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<script setup>
-import { Card } from '@modrinth/ui'
-import VueApexCharts from 'vue3-apexcharts'
-
-// let VueApexCharts
-// if (import.meta.client) {
-//   VueApexCharts = defineAsyncComponent(() => import('vue3-apexcharts'))
-// }
-
-const props = defineProps({
-	value: {
-		type: String,
-		default: '',
-	},
-	title: {
-		type: String,
-		default: '',
-	},
-	data: {
-		type: Array,
-		default: () => [],
-	},
-	labels: {
-		type: Array,
-		default: () => [],
-	},
-	prefix: {
-		type: String,
-		default: '',
-	},
-	suffix: {
-		type: String,
-		default: '',
-	},
-	isMoney: {
-		type: Boolean,
-		default: false,
-	},
-	color: {
-		type: String,
-		default: 'var(--color-brand)',
-	},
-})
-
-// no grid lines, no toolbar, no legend, no data labels
-const chartOptions = {
-	chart: {
-		id: props.title,
-		fontFamily:
-			'Inter, -apple-system, BlinkMacSystemFont, Segoe UI, Oxygen, Ubuntu, Roboto, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif',
-		foreColor: 'var(--color-base)',
-		toolbar: {
-			show: false,
-		},
-		zoom: {
-			enabled: false,
-		},
-		sparkline: {
-			enabled: true,
-		},
-		parentHeightOffset: 0,
-	},
-	stroke: {
-		curve: 'smooth',
-		width: 2,
-	},
-	fill: {
-		colors: [props.color],
-		type: 'gradient',
-		opacity: 1,
-		gradient: {
-			shade: 'light',
-			type: 'vertical',
-			shadeIntensity: 0,
-			gradientToColors: [props.color],
-			inverseColors: true,
-			opacityFrom: 0.5,
-			opacityTo: 0,
-			stops: [0, 100],
-			colorStops: [],
-		},
-	},
-	grid: {
-		show: false,
-	},
-	legend: {
-		show: false,
-	},
-	colors: [props.color],
-	dataLabels: {
-		enabled: false,
-	},
-	xaxis: {
-		type: 'datetime',
-		categories: props.labels,
-		labels: {
-			show: false,
-		},
-		axisTicks: {
-			show: false,
-		},
-		tooltip: {
-			enabled: false,
-		},
-	},
-	yaxis: {
-		labels: {
-			show: false,
-		},
-		axisBorder: {
-			show: false,
-		},
-		axisTicks: {
-			show: false,
-		},
-		tooltip: {
-			enabled: false,
-		},
-	},
-	tooltip: {
-		enabled: false,
-	},
-}
-
-const chart = ref(null)
-
-const resetChart = () => {
-	if (!chart.value?.chart) return
-	chart.value.updateSeries([...props.data])
-	chart.value.updateOptions({
-		xaxis: {
-			categories: props.labels,
-		},
-	})
-	chart.value.resetSeries()
-}
-
-defineExpose({
-	resetChart,
-})
-</script>
-
-<template>
-	<Card class="compact-chart">
-		<h1 class="value">
-			{{ value }}
-		</h1>
-		<div class="subtitle">
-			{{ title }}
-		</div>
-		<div class="chart">
-			<VueApexCharts ref="chart" type="area" :options="chartOptions" :series="data" height="70" />
-		</div>
-	</Card>
-</template>
-
-<style scoped lang="scss">
-.compact-chart {
-	display: flex;
-	flex-direction: column;
-
-	gap: var(--gap-xs);
-	border: 1px solid var(--color-divider);
-	border-radius: var(--radius-md);
-	background-color: var(--color-raised-bg);
-	box-shadow: var(--shadow-card);
-
-	color: var(--color-base);
-	font-size: var(--font-size-nm);
-
-	width: 100%;
-
-	padding-top: var(--gap-xl);
-	padding-bottom: 0;
-
-	.value {
-		margin: 0;
-	}
-}
-
-.chart {
-	// width: calc(100% + 3rem);
-	margin: 0 -1.5rem 0.25rem -1.5rem;
-}
-
-svg {
-	width: 100%;
-	height: 100%;
-}
-
-:deep(.apexcharts-menu),
-:deep(.apexcharts-tooltip),
-:deep(.apexcharts-yaxistooltip) {
-	background: var(--color-raised-bg) !important;
-	border-radius: var(--radius-sm) !important;
-	border: 1px solid var(--color-divider) !important;
-	box-shadow: var(--shadow-floating) !important;
-	font-size: var(--font-size-nm) !important;
-}
-
-:deep(.apexcharts-graphical) {
-	width: 100%;
-}
-
-:deep(.apexcharts-tooltip) {
-	.bar-tooltip {
-		display: flex;
-		flex-direction: column;
-		gap: var(--gap-xs);
-		padding: var(--gap-sm);
-
-		.card-divider {
-			margin: var(--gap-xs) 0;
-		}
-
-		.label {
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-		}
-
-		.value {
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			gap: var(--gap-xs);
-			color: var(--color-base);
-		}
-
-		.list-entry {
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			justify-content: space-between;
-			gap: var(--gap-md);
-		}
-
-		.circle {
-			width: 0.5rem;
-			height: 0.5rem;
-			border-radius: 50%;
-			display: inline-block;
-			margin-right: var(--gap-sm);
-		}
-
-		svg {
-			height: 1em;
-			width: 1em;
-		}
-
-		.divider {
-			font-size: var(--font-size-lg);
-			font-weight: 400;
-		}
-	}
-}
-
-.legend {
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	gap: var(--gap-md);
-	justify-content: center;
-}
-
-:deep(.apexcharts-grid-borders) {
-	line {
-		stroke: var(--color-button-bg) !important;
-	}
-}
-
-:deep(.apexcharts-xaxis) {
-	line {
-		stroke: none;
-	}
-}
-
-.legend-checkbox :deep(.checkbox.checked) {
-	background-color: var(--color);
-}
-</style>
diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue
index 9ef0052d98..b82b0f7fe5 100644
--- a/apps/frontend/src/layouts/default.vue
+++ b/apps/frontend/src/layouts/default.vue
@@ -467,7 +467,7 @@
 				<OverflowMenu
 					v-if="auth.user"
 					:dropdown-id="`${basePopoutId}-user`"
-					class="btn-dropdown-animation flex items-center gap-1 rounded-xl bg-transparent px-2 py-1"
+					class="btn-dropdown-animation flex items-center gap-1 rounded-xl bg-transparent px-2 py-1 pr-1"
 					:options="userMenuOptions"
 				>
 					<Avatar :src="auth.user.avatar_url" aria-hidden="true" circle />
@@ -1256,6 +1256,10 @@ async function logoutUser() {
 }
 
 function runAnalytics() {
+	if (import.meta.dev) {
+		return
+	}
+
 	const config = useRuntimeConfig()
 	const replacedUrl = config.public.apiBaseUrl.replace('v2/', '')
 
diff --git a/apps/frontend/src/pages/[type]/[project]/settings/analytics.vue b/apps/frontend/src/pages/[type]/[project]/settings/analytics.vue
index ce57caf281..447eb7eae7 100644
--- a/apps/frontend/src/pages/[type]/[project]/settings/analytics.vue
+++ b/apps/frontend/src/pages/[type]/[project]/settings/analytics.vue
@@ -1,30 +1,7 @@
 <template>
-	<div>
-		<div class="universal-card">
-			<h2>Analytics</h2>
-
-			<p>
-				This page shows you the analytics for your project,
-				<strong>{{ project.title }}</strong
-				>. You can see the number of downloads, page views and revenue earned for your project, as
-				well as the total downloads and page views for {{ project.title }} by country.
-			</p>
-		</div>
-
-		<ChartDisplay :projects="[project]" />
-	</div>
+	<AnalyticsDashboard />
 </template>
 
-<script setup>
-import { injectProjectPageContext } from '@modrinth/ui'
-
-import ChartDisplay from '~/components/ui/charts/ChartDisplay.vue'
-
-const { projectV2: project } = injectProjectPageContext()
+<script setup lang="ts">
+import AnalyticsDashboard from '~/components/analytics/AnalyticsDashboard.vue'
 </script>
-
-<style scoped lang="scss">
-.markdown-body {
-	margin-bottom: var(--gap-md);
-}
-</style>
diff --git a/apps/frontend/src/pages/admin/analytics/events.vue b/apps/frontend/src/pages/admin/analytics/events.vue
new file mode 100644
index 0000000000..084f06a590
--- /dev/null
+++ b/apps/frontend/src/pages/admin/analytics/events.vue
@@ -0,0 +1,823 @@
+<template>
+	<ConfirmModal
+		ref="deleteEventModal"
+		title="Delete analytics event?"
+		:description="deleteEventDescription"
+		proceed-label="Delete event"
+		@proceed="confirmDeleteEvent"
+	/>
+
+	<NewModal
+		ref="eventModal"
+		:header="modalMode === 'create' ? 'New event' : 'Edit event'"
+		width="480px"
+		max-width="calc(100vw - 2rem)"
+		:on-hide="resetForm"
+		:close-on-click-outside="false"
+	>
+		<div class="flex flex-col gap-5" @submit.prevent="saveEvent">
+			<div class="flex flex-col gap-2">
+				<span class="label__title font-semibold">Title</span>
+				<StyledInput
+					id="analytics-event-title"
+					ref="titleInput"
+					v-model="form.title"
+					type="text"
+					autocomplete="off"
+					placeholder="Event title..."
+					:maxlength="120"
+				/>
+			</div>
+
+			<div class="flex flex-col gap-2">
+				<div class="flex items-center justify-between">
+					<span class="label__title font-semibold">Announcement link (optional)</span>
+
+					<ButtonStyled v-if="committedNormalizedAnnouncementUrl" type="transparent" size="small">
+						<a
+							:href="committedNormalizedAnnouncementUrl"
+							target="_blank"
+							rel="noopener noreferrer"
+							aria-label="Check announcement link"
+							title="Check announcement link"
+							class="text-sm"
+						>
+							<ExternalIcon aria-hidden="true" />
+							Open link
+						</a>
+					</ButtonStyled>
+				</div>
+				<div class="flex items-center gap-2">
+					<StyledInput
+						id="analytics-event-link"
+						v-model="form.announcementUrl"
+						type="url"
+						autocomplete="off"
+						placeholder="Announcement link..."
+						wrapper-class="w-full"
+						@change="commitAnnouncementUrl"
+					/>
+				</div>
+			</div>
+
+			<div class="flex flex-col gap-2">
+				<div class="flex flex-col gap-1">
+					<span class="label__title font-semibold">Start date ({{ EVENT_TIME_ZONE_LABEL }})</span>
+				</div>
+				<DatePicker
+					id="analytics-event-starts"
+					v-model="form.startsAt"
+					enable-time
+					date-format="Y-m-d H:i"
+					alt-format="F j, Y at h:i K"
+					placeholder="Select start..."
+					input-class="w-full"
+					wrapper-class="w-full"
+					show-today
+				/>
+			</div>
+			<div class="flex flex-col gap-2">
+				<span class="label__title font-semibold"
+					>End date ({{ EVENT_TIME_ZONE_LABEL }}, optional)</span
+				>
+				<DatePicker
+					id="analytics-event-ends"
+					v-model="form.endsAt"
+					enable-time
+					date-format="Y-m-d H:i"
+					alt-format="F j, Y at h:i K"
+					placeholder="Select end..."
+					input-class="w-full"
+					wrapper-class="w-full"
+					show-today
+				/>
+			</div>
+
+			<div class="flex flex-col gap-2">
+				<span class="label__title font-semibold">Metric</span>
+				<MultiSelect
+					v-model="form.metricKinds"
+					:options="metricKindOptions"
+					:clearable="false"
+					:max-tag-rows="2"
+					placeholder="Select metrics this applies to"
+					include-select-all-option
+				/>
+			</div>
+		</div>
+
+		<template #actions>
+			<div class="flex justify-end gap-2">
+				<ButtonStyled type="transparent">
+					<button @click="eventModal?.hide()">Cancel</button>
+				</ButtonStyled>
+				<ButtonStyled color="brand">
+					<button :disabled="!canSaveEvent || isSaving" @click="saveEvent">
+						<SaveIcon aria-hidden="true" />
+						{{ modalMode === 'create' ? 'Create event' : 'Save' }}
+					</button>
+				</ButtonStyled>
+			</div>
+		</template>
+	</NewModal>
+
+	<div class="normal-page no-sidebar">
+		<div class="normal-page__content flex flex-col gap-4">
+			<div class="mt-8 flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
+				<h1 class="m-0 text-2xl font-extrabold text-contrast">Analytics Events</h1>
+
+				<div class="flex flex-col gap-2 sm:flex-row sm:items-center">
+					<StyledInput
+						v-model="searchQuery"
+						:icon="SearchIcon"
+						type="search"
+						placeholder="Search..."
+						clearable
+						wrapper-class="w-full sm:w-72"
+					/>
+					<ButtonStyled color="brand">
+						<button :disabled="isSaving" @click="openCreateModal">
+							<PlusIcon aria-hidden="true" />
+							New event
+						</button>
+					</ButtonStyled>
+				</div>
+			</div>
+
+			<Table
+				v-model:sort-column="sortColumn"
+				v-model:sort-direction="sortDirection"
+				:columns="columns"
+				:data="sortedEvents"
+				row-key="id"
+			>
+				<template #cell-title="{ row }">
+					<span class="line-clamp-2 font-medium text-primary">{{ row.title }}</span>
+				</template>
+
+				<template #cell-announcement="{ row }">
+					<a
+						v-if="row.announcement_url"
+						:href="row.announcement_url"
+						target="_blank"
+						rel="noopener noreferrer"
+						class="inline-flex items-center gap-1 font-medium text-primary hover:text-contrast"
+					>
+						Open link
+						<ExternalIcon class="size-4" aria-hidden="true" />
+					</a>
+					<span v-else class="text-xs font-medium text-primary">—</span>
+				</template>
+
+				<template #cell-date="{ row }">
+					<span class="font-medium text-primary">{{ formatEventDateRange(row) }}</span>
+				</template>
+
+				<template #cell-metrics="{ row }">
+					<div class="flex flex-wrap gap-1">
+						<span
+							v-for="metric in getMetricKindOptions(row.for_metric_kind)"
+							:key="metric.value"
+							class="inline-flex items-center rounded-full border border-solid border-surface-5 px-2 py-0.5 text-xs font-medium text-secondary"
+						>
+							{{ metric.label }}
+						</span>
+					</div>
+				</template>
+
+				<template #cell-actions="{ row }">
+					<div class="flex justify-end gap-2">
+						<ButtonStyled circular type="outlined" color="red">
+							<button
+								:aria-label="`Delete ${row.title}`"
+								:disabled="isDeletingEvent(row.id)"
+								@click="openDeleteEventModal(row)"
+							>
+								<TrashIcon aria-hidden="true" />
+							</button>
+						</ButtonStyled>
+						<ButtonStyled type="outlined">
+							<button :disabled="isSaving || isDeletingEvent(row.id)" @click="openEditModal(row)">
+								Edit
+								<EditIcon aria-hidden="true" />
+							</button>
+						</ButtonStyled>
+					</div>
+				</template>
+
+				<template #empty-state>
+					<div class="flex h-64 items-center justify-center text-secondary">
+						{{ isLoadingEvents ? 'Loading analytics events...' : 'No results.' }}
+					</div>
+				</template>
+			</Table>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
+import { EditIcon, ExternalIcon, PlusIcon, SaveIcon, SearchIcon, TrashIcon } from '@modrinth/assets'
+import {
+	ButtonStyled,
+	ConfirmModal,
+	DatePicker,
+	injectModrinthClient,
+	injectNotificationManager,
+	MultiSelect,
+	type MultiSelectOption,
+	NewModal,
+	type SortDirection,
+	StyledInput,
+	Table,
+	type TableColumn,
+} from '@modrinth/ui'
+import { isAdmin } from '@modrinth/utils'
+import { useQuery, useQueryClient } from '@tanstack/vue-query'
+import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
+
+definePageMeta({
+	middleware: [
+		'auth',
+		async () => {
+			const auth = await useAuth()
+
+			if (!auth.value.user || !isAdmin(auth.value.user)) {
+				throw createError({
+					fatal: true,
+					statusCode: 401,
+					statusMessage: 'Unauthorized',
+				})
+			}
+		},
+	],
+})
+
+type EventColumnKey = 'title' | 'announcement' | 'date' | 'metrics' | 'actions'
+type AnalyticsEventMetricKind = Labrinth.Analytics.v3.AnalyticsEventMetricKind
+
+type AnalyticsEventRow = Labrinth.Analytics.v3.AnalyticsEvent & {
+	announcement: string
+	date: string
+	metrics: string
+	actions: string
+}
+
+type EventForm = {
+	title: string
+	announcementUrl: string
+	startsAt: DatePickerValue
+	endsAt: DatePickerValue
+	metricKinds: AnalyticsEventMetricKind[]
+}
+
+type DatePickerValue = string | Date | null | undefined
+
+const { addNotification } = injectNotificationManager()
+const client = injectModrinthClient()
+const queryClient = useQueryClient()
+const analyticsEventsQueryKey = ['analytics-events'] as const
+const EVENT_TIME_ZONE = 'America/Los_Angeles'
+const EVENT_TIME_ZONE_LABEL = 'PST'
+
+const columns: TableColumn<EventColumnKey>[] = [
+	{ key: 'date', label: 'Date (PST)', width: '18%', enableSorting: true },
+	{ key: 'title', label: 'Title' },
+	{ key: 'announcement', label: 'Announcement link', width: '18%' },
+	{ key: 'metrics', label: 'Metric', width: '18%' },
+	{ key: 'actions', label: 'Actions', width: '15%', align: 'right' },
+]
+
+const metricKindOptions: MultiSelectOption<AnalyticsEventMetricKind>[] = [
+	{ value: 'views', label: 'Views' },
+	{ value: 'downloads', label: 'Downloads' },
+	{ value: 'revenue', label: 'Revenue' },
+	{ value: 'playtime', label: 'Playtime' },
+]
+const allMetricKinds = metricKindOptions.map((option) => option.value)
+
+const deleteEventModal = ref<InstanceType<typeof ConfirmModal> | null>(null)
+const eventModal = ref<InstanceType<typeof NewModal> | null>(null)
+const titleInput = ref<InstanceType<typeof StyledInput> | null>(null)
+const searchQuery = ref('')
+const sortColumn = ref<EventColumnKey | undefined>('date')
+const sortDirection = ref<SortDirection>('desc')
+const modalMode = ref<'create' | 'edit'>('create')
+const editingEventId = ref<Labrinth.Analytics.v3.AnalyticsEventId | null>(null)
+const pendingDeleteEvent = ref<Labrinth.Analytics.v3.AnalyticsEvent | null>(null)
+const form = ref<EventForm>(getEmptyForm())
+const isSaving = ref(false)
+const deletingEventIds = ref(new Set<Labrinth.Analytics.v3.AnalyticsEventId>())
+const notifiedEventsErrorMessage = ref<string | null>(null)
+const committedAnnouncementUrl = ref('')
+let resetFormTimeout: ReturnType<typeof setTimeout> | null = null
+
+const {
+	data: analyticsEvents,
+	error: eventsError,
+	isLoading: isLoadingEvents,
+} = useQuery({
+	queryKey: analyticsEventsQueryKey,
+	queryFn: () => client.labrinth.analytics_v3.getEvents(),
+	placeholderData: [],
+	refetchOnMount: 'always',
+	retry: false,
+	staleTime: 0,
+})
+
+watch(eventsError, (error) => {
+	if (!error) {
+		notifiedEventsErrorMessage.value = null
+		return
+	}
+
+	const message = error.message
+	if (notifiedEventsErrorMessage.value === message) {
+		return
+	}
+
+	notifiedEventsErrorMessage.value = message
+	addNotification({
+		title: 'Failed to load analytics events',
+		text: message,
+		type: 'error',
+	})
+})
+
+onBeforeUnmount(() => {
+	clearResetFormTimeout()
+})
+
+const trimmedSearchQuery = computed(() => searchQuery.value.trim().toLowerCase())
+const normalizedAnnouncementUrl = computed(() => normalizeUrl(form.value.announcementUrl))
+const committedNormalizedAnnouncementUrl = computed(() =>
+	normalizeUrl(committedAnnouncementUrl.value),
+)
+const canSaveEvent = computed(
+	() =>
+		form.value.title.trim().length > 0 &&
+		Boolean(getEventFormDateRange()) &&
+		form.value.metricKinds.length > 0,
+)
+const deleteEventDescription = computed(() => {
+	if (!pendingDeleteEvent.value) {
+		return 'This analytics event will be deleted. This cannot be undone.'
+	}
+
+	return `This will delete "${pendingDeleteEvent.value.title}" from analytics events. This cannot be undone.`
+})
+
+const eventRows = computed<AnalyticsEventRow[]>(() =>
+	(analyticsEvents.value ?? []).map((event) => ({
+		...event,
+		announcement: '',
+		date: '',
+		metrics: '',
+		actions: '',
+	})),
+)
+
+const filteredEvents = computed(() => {
+	if (!trimmedSearchQuery.value) {
+		return eventRows.value
+	}
+
+	return eventRows.value.filter((event) => {
+		const dateRange = formatEventDateRange(event).toLowerCase()
+		return [event.title, event.announcement_url ?? '', dateRange].some((value) =>
+			value.toLowerCase().includes(trimmedSearchQuery.value),
+		)
+	})
+})
+
+const sortedEvents = computed(() => {
+	const sorted = [...filteredEvents.value]
+
+	if (sortColumn.value === 'date') {
+		sorted.sort((left, right) => {
+			const direction = sortDirection.value === 'asc' ? 1 : -1
+			return (getDateTime(left.starts) - getDateTime(right.starts)) * direction
+		})
+	}
+
+	return sorted
+})
+
+function getEmptyForm(): EventForm {
+	return {
+		title: '',
+		announcementUrl: '',
+		startsAt: '',
+		endsAt: '',
+		metricKinds: [],
+	}
+}
+
+function openCreateModal() {
+	modalMode.value = 'create'
+	editingEventId.value = null
+	form.value = {
+		...getEmptyForm(),
+	}
+	committedAnnouncementUrl.value = ''
+	clearResetFormTimeout()
+	eventModal.value?.show()
+	void focusTitleInput()
+}
+
+function openEditModal(event: Labrinth.Analytics.v3.AnalyticsEvent) {
+	modalMode.value = 'edit'
+	editingEventId.value = event.id
+	form.value = {
+		title: event.title,
+		announcementUrl: event.announcement_url ?? '',
+		startsAt: getDateTimeInputValue(event.starts),
+		endsAt: getDateTimeInputValue(event.ends),
+		metricKinds: event.for_metric_kind?.length ? [...event.for_metric_kind] : [...allMetricKinds],
+	}
+	committedAnnouncementUrl.value = event.announcement_url ?? ''
+	clearResetFormTimeout()
+	eventModal.value?.show()
+	void focusTitleInput()
+}
+
+function openDeleteEventModal(event: Labrinth.Analytics.v3.AnalyticsEvent) {
+	pendingDeleteEvent.value = event
+	deleteEventModal.value?.show()
+}
+
+async function focusTitleInput() {
+	await nextTick()
+	setTimeout(() => {
+		titleInput.value?.focus()
+	}, 75)
+}
+
+async function saveEvent() {
+	if (!canSaveEvent.value || isSaving.value) {
+		return
+	}
+
+	isSaving.value = true
+
+	try {
+		const payload = buildEventPayload()
+
+		if (modalMode.value === 'edit' && editingEventId.value !== null) {
+			await client.labrinth.analytics_v3.editEvent(editingEventId.value, payload)
+		} else {
+			await client.labrinth.analytics_v3.createEvent(payload)
+		}
+
+		await queryClient.invalidateQueries({ queryKey: analyticsEventsQueryKey })
+		eventModal.value?.hide()
+		addNotification({
+			title: modalMode.value === 'edit' ? 'Analytics event updated' : 'Analytics event created',
+			type: 'success',
+		})
+	} catch (error) {
+		addNotification({
+			title:
+				modalMode.value === 'edit'
+					? 'Failed to update analytics event'
+					: 'Failed to create analytics event',
+			text: getErrorMessage(error),
+			type: 'error',
+		})
+	} finally {
+		isSaving.value = false
+	}
+}
+
+async function confirmDeleteEvent() {
+	if (!pendingDeleteEvent.value) {
+		return
+	}
+
+	const eventId = pendingDeleteEvent.value.id
+	pendingDeleteEvent.value = null
+	await deleteEvent(eventId)
+}
+
+async function deleteEvent(eventId: Labrinth.Analytics.v3.AnalyticsEventId) {
+	if (isDeletingEvent(eventId)) {
+		return
+	}
+
+	setDeletingEvent(eventId, true)
+
+	try {
+		await client.labrinth.analytics_v3.deleteEvent(eventId)
+		await queryClient.invalidateQueries({ queryKey: analyticsEventsQueryKey })
+		addNotification({
+			title: 'Analytics event deleted',
+			type: 'success',
+		})
+	} catch (error) {
+		addNotification({
+			title: 'Failed to delete analytics event',
+			text: getErrorMessage(error),
+			type: 'error',
+		})
+	} finally {
+		setDeletingEvent(eventId, false)
+	}
+}
+
+function resetForm() {
+	clearResetFormTimeout()
+	resetFormTimeout = setTimeout(() => {
+		form.value = getEmptyForm()
+		editingEventId.value = null
+		committedAnnouncementUrl.value = ''
+		resetFormTimeout = null
+	}, 500)
+}
+
+function clearResetFormTimeout() {
+	if (!resetFormTimeout) {
+		return
+	}
+
+	clearTimeout(resetFormTimeout)
+	resetFormTimeout = null
+}
+
+function normalizeUrl(value: string): string | undefined {
+	const trimmed = value.trim()
+	if (!trimmed) {
+		return undefined
+	}
+
+	if (/^https?:\/\//i.test(trimmed)) {
+		return trimmed
+	}
+
+	return `https://${trimmed}`
+}
+
+function commitAnnouncementUrl() {
+	committedAnnouncementUrl.value = form.value.announcementUrl
+}
+
+function buildEventPayload(): Labrinth.Analytics.v3.AnalyticsEventUpsert {
+	const selectedRange = getEventFormDateRange()
+	if (!selectedRange) {
+		throw new Error('Select a valid start and end date')
+	}
+
+	const starts = parseDateTimeInputValue(selectedRange[0]).toISOString()
+	const ends = parseDateTimeInputValue(selectedRange[1]).toISOString()
+
+	return {
+		announcement_url: normalizedAnnouncementUrl.value ?? null,
+		for_metric_kind: [...form.value.metricKinds],
+		title: form.value.title.trim(),
+		ends,
+		starts,
+	}
+}
+
+function getMetricKindOptions(
+	metricKinds: AnalyticsEventMetricKind[] | null,
+): MultiSelectOption<AnalyticsEventMetricKind>[] {
+	const visibleKinds = metricKinds?.length ? metricKinds : allMetricKinds
+	return metricKindOptions.filter((option) => visibleKinds.includes(option.value))
+}
+
+function formatEventDateRange(event: Labrinth.Analytics.v3.AnalyticsEvent): string {
+	const startDate = new Date(event.starts)
+	const endDate = new Date(event.ends)
+	const startDateValue = getDateInputValueInTimeZone(startDate, EVENT_TIME_ZONE)
+	const endDateValue = getDateInputValueInTimeZone(endDate, EVENT_TIME_ZONE)
+
+	if (startDate.getTime() === endDate.getTime()) {
+		return formatDateTime(startDate)
+	}
+
+	const sameYear = startDateValue.slice(0, 4) === endDateValue.slice(0, 4)
+	const sameMonth = sameYear && startDateValue.slice(5, 7) === endDateValue.slice(5, 7)
+	const sameDay = startDateValue === endDateValue
+
+	if (sameDay) {
+		return `${formatLongDate(startDate)}, ${formatTime(startDate)} - ${formatTime(endDate)}`
+	}
+
+	if (sameMonth) {
+		return `${formatMonthDayTime(startDate)} - ${formatMonthDayTime(endDate)}, ${endDateValue.slice(0, 4)}`
+	}
+
+	if (sameYear) {
+		return `${formatMonthDayTime(startDate)} - ${formatLongDateTime(endDate)}`
+	}
+
+	return `${formatLongDateTime(startDate)} - ${formatLongDateTime(endDate)}`
+}
+
+function getEventFormDateRange(): [string, string] | null {
+	const startValue = getDatePickerValueString(form.value.startsAt)
+	const endValue = isEmptyDatePickerValue(form.value.endsAt)
+		? startValue
+		: getDatePickerValueString(form.value.endsAt)
+
+	if (!startValue || !endValue) {
+		return null
+	}
+
+	const startDate = parseDateTimeInputValue(startValue)
+	const endDate = parseDateTimeInputValue(endValue)
+
+	if (startDate.getTime() > endDate.getTime()) {
+		return null
+	}
+
+	return [startValue, endValue]
+}
+
+function isEmptyDatePickerValue(value: DatePickerValue): boolean {
+	return value === '' || value === null || value === undefined
+}
+
+function getDatePickerValueString(value: DatePickerValue): string | null {
+	if (typeof value === 'string') {
+		return isValidDateTimeInputValue(value) ? value : null
+	}
+	if (value instanceof Date && !Number.isNaN(value.getTime())) {
+		return formatDateTimeInputValue(value)
+	}
+
+	return null
+}
+
+function isValidDateTimeInputValue(value: string): boolean {
+	if (!/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}$/.test(value)) return false
+
+	const parsedDate = parseDateTimeInputValue(value)
+	return (
+		!Number.isNaN(parsedDate.getTime()) &&
+		formatDateTimeInputValueInTimeZone(parsedDate, EVENT_TIME_ZONE) === value
+	)
+}
+
+function getDateTimeInputValue(value: string): string {
+	const date = new Date(value)
+	return Number.isNaN(date.getTime())
+		? ''
+		: formatDateTimeInputValueInTimeZone(date, EVENT_TIME_ZONE)
+}
+
+function formatDateTimeInputValue(date: Date): string {
+	return formatDateTimeInputValueInTimeZone(date, EVENT_TIME_ZONE)
+}
+
+function formatDateTimeInputValueInTimeZone(date: Date, timeZone: string): string {
+	const parts = getTimeZoneDateParts(date, timeZone)
+	if (!parts) return ''
+
+	const year = `${parts.year}`.padStart(4, '0')
+	const month = `${parts.month}`.padStart(2, '0')
+	const day = `${parts.day}`.padStart(2, '0')
+	const hours = `${parts.hour}`.padStart(2, '0')
+	const minutes = `${parts.minute}`.padStart(2, '0')
+	return `${year}-${month}-${day} ${hours}:${minutes}`
+}
+
+function getDateInputValueInTimeZone(date: Date, timeZone: string): string {
+	const parts = getTimeZoneDateParts(date, timeZone)
+	if (!parts) return ''
+
+	const year = `${parts.year}`.padStart(4, '0')
+	const month = `${parts.month}`.padStart(2, '0')
+	const day = `${parts.day}`.padStart(2, '0')
+	return `${year}-${month}-${day}`
+}
+
+function parseDateTimeInputValue(value: string): Date {
+	return getDateTimeInTimeZone(value, EVENT_TIME_ZONE)
+}
+
+function getDateTimeInTimeZone(value: string, timeZone: string): Date {
+	const match = value.match(/^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2})$/)
+	if (!match) return new Date(Number.NaN)
+
+	const [, yearValue, monthValue, dayValue, hourValue, minuteValue] = match
+	const year = Number(yearValue)
+	const month = Number(monthValue)
+	const day = Number(dayValue)
+	const hour = Number(hourValue)
+	const minute = Number(minuteValue)
+	const utcGuess = Date.UTC(year, month - 1, day, hour, minute)
+	let offset = getTimeZoneOffsetMs(new Date(utcGuess), timeZone)
+	offset = getTimeZoneOffsetMs(new Date(utcGuess - offset), timeZone)
+
+	return new Date(utcGuess - offset)
+}
+
+function getTimeZoneOffsetMs(date: Date, timeZone: string): number {
+	const parts = getTimeZoneDateParts(date, timeZone)
+	if (!parts) return 0
+
+	const zonedDateAsUtc = Date.UTC(
+		parts.year,
+		parts.month - 1,
+		parts.day,
+		parts.hour,
+		parts.minute,
+		parts.second,
+	)
+	return zonedDateAsUtc - date.getTime()
+}
+
+function getTimeZoneDateParts(date: Date, timeZone: string) {
+	if (Number.isNaN(date.getTime())) return null
+
+	const parts = new Intl.DateTimeFormat('en-US', {
+		timeZone,
+		year: 'numeric',
+		month: '2-digit',
+		day: '2-digit',
+		hour: '2-digit',
+		minute: '2-digit',
+		second: '2-digit',
+		hourCycle: 'h23',
+	}).formatToParts(date)
+
+	const valueByType = Object.fromEntries(parts.map((part) => [part.type, part.value]))
+	return {
+		year: Number(valueByType.year),
+		month: Number(valueByType.month),
+		day: Number(valueByType.day),
+		hour: Number(valueByType.hour),
+		minute: Number(valueByType.minute),
+		second: Number(valueByType.second),
+	}
+}
+
+function formatDateTime(date: Date): string {
+	return new Intl.DateTimeFormat(undefined, {
+		month: 'short',
+		day: 'numeric',
+		year: 'numeric',
+		hour: 'numeric',
+		minute: '2-digit',
+		timeZone: EVENT_TIME_ZONE,
+	}).format(date)
+}
+
+function formatLongDateTime(date: Date): string {
+	return `${formatLongDate(date)}, ${formatTime(date)}`
+}
+
+function formatMonthDayTime(date: Date): string {
+	return `${formatMonthDay(date)}, ${formatTime(date)}`
+}
+
+function formatLongDate(date: Date): string {
+	return new Intl.DateTimeFormat(undefined, {
+		month: 'short',
+		day: 'numeric',
+		year: 'numeric',
+		timeZone: EVENT_TIME_ZONE,
+	}).format(date)
+}
+
+function formatMonthDay(date: Date): string {
+	return new Intl.DateTimeFormat(undefined, {
+		month: 'short',
+		day: 'numeric',
+		timeZone: EVENT_TIME_ZONE,
+	}).format(date)
+}
+
+function formatTime(date: Date): string {
+	return new Intl.DateTimeFormat(undefined, {
+		hour: 'numeric',
+		minute: '2-digit',
+		timeZone: EVENT_TIME_ZONE,
+	}).format(date)
+}
+
+function getDateTime(value: string): number {
+	return Date.parse(value)
+}
+
+function isDeletingEvent(eventId: Labrinth.Analytics.v3.AnalyticsEventId): boolean {
+	return deletingEventIds.value.has(eventId)
+}
+
+function setDeletingEvent(eventId: Labrinth.Analytics.v3.AnalyticsEventId, deleting: boolean) {
+	const nextIds = new Set(deletingEventIds.value)
+
+	if (deleting) {
+		nextIds.add(eventId)
+	} else {
+		nextIds.delete(eventId)
+	}
+
+	deletingEventIds.value = nextIds
+}
+
+function getErrorMessage(error: unknown): string {
+	return error instanceof Error ? error.message : String(error)
+}
+</script>
diff --git a/apps/frontend/src/pages/dashboard/analytics.vue b/apps/frontend/src/pages/dashboard/analytics.vue
index ccc5c93eb9..6b57b44eea 100644
--- a/apps/frontend/src/pages/dashboard/analytics.vue
+++ b/apps/frontend/src/pages/dashboard/analytics.vue
@@ -1,30 +1,14 @@
 <template>
-	<div>
-		<Suspense>
-			<ChartDisplay :projects="projects" :personal="true" />
-			<template #fallback>
-				<div class="universal-card">
-					<h2><span class="label__title">Loading analytics...</span></h2>
-				</div>
-			</template>
-		</Suspense>
-	</div>
+	<AnalyticsDashboard />
 </template>
 
 <script setup>
-import {
-	commonProjectSettingsMessages,
-	injectModrinthClient,
-	useDebugLogger,
-	useVIntl,
-} from '@modrinth/ui'
+import { commonProjectSettingsMessages, useVIntl } from '@modrinth/ui'
 
-import ChartDisplay from '~/components/ui/charts/ChartDisplay.vue'
+import AnalyticsDashboard from '~/components/analytics/AnalyticsDashboard.vue'
 
 const { formatMessage } = useVIntl()
 
-const debug = useDebugLogger('analytics.vue')
-
 definePageMeta({
 	middleware: 'auth',
 })
@@ -32,14 +16,4 @@ definePageMeta({
 useHead({
 	title: () => `${formatMessage(commonProjectSettingsMessages.analytics)} - Modrinth`,
 })
-
-const auth = await useAuth()
-const client = injectModrinthClient()
-const id = auth.value?.user?.id
-
-debug('auth resolved', { id })
-
-const projects = await client.labrinth.users_v2.getProjects(id)
-
-debug('projects resolved', { count: projects?.length })
 </script>
diff --git a/apps/frontend/src/pages/dashboard/revenue/index.vue b/apps/frontend/src/pages/dashboard/revenue/index.vue
index 18eeb44338..a1bbb18090 100644
--- a/apps/frontend/src/pages/dashboard/revenue/index.vue
+++ b/apps/frontend/src/pages/dashboard/revenue/index.vue
@@ -5,7 +5,7 @@
 		:preloaded-payment-data="preloadedPaymentMethods"
 		@refresh-data="refreshData"
 	/>
-	<div class="mb-20 flex flex-col gap-6 lg:pl-8">
+	<div class="mb-20 flex flex-col gap-6 lg:pl-4 lg:pt-1.5">
 		<div class="flex flex-col gap-4 md:gap-5">
 			<div class="flex flex-col gap-1">
 				<span class="text-xl font-semibold text-contrast md:text-2xl">{{
diff --git a/apps/frontend/src/pages/organization/[organization]/settings/analytics.vue b/apps/frontend/src/pages/organization/[organization]/settings/analytics.vue
index 081bc89587..dce239756c 100644
--- a/apps/frontend/src/pages/organization/[organization]/settings/analytics.vue
+++ b/apps/frontend/src/pages/organization/[organization]/settings/analytics.vue
@@ -1,28 +1,9 @@
 <template>
 	<div class="normal-page__content">
-		<div class="universal-card">
-			<h2>Analytics</h2>
-
-			<p>
-				This page shows you the analytics for your organization's projects. You can see the number
-				of downloads, page views and revenue earned for all of your projects, as well as the total
-				downloads and page views for each project by country.
-			</p>
-		</div>
-
-		<ChartDisplay :projects="projects.map((x) => ({ title: x.name, ...x }))" />
+		<AnalyticsDashboard />
 	</div>
 </template>
 
-<script setup>
-import ChartDisplay from '~/components/ui/charts/ChartDisplay.vue'
-import { injectOrganizationContext } from '~/providers/organization-context.ts'
-
-const { projects } = injectOrganizationContext()
+<script setup lang="ts">
+import AnalyticsDashboard from '~/components/analytics/AnalyticsDashboard.vue'
 </script>
-
-<style scoped lang="scss">
-.markdown-body {
-	margin-bottom: var(--gap-md);
-}
-</style>
diff --git a/apps/frontend/src/providers/analytics/analytics.ts b/apps/frontend/src/providers/analytics/analytics.ts
new file mode 100644
index 0000000000..e5c5ab19e2
--- /dev/null
+++ b/apps/frontend/src/providers/analytics/analytics.ts
@@ -0,0 +1,2655 @@
+import type { Labrinth } from '@modrinth/api-client'
+import { createContext, injectModrinthClient, type ProjectPageContext } from '@modrinth/ui'
+import { useQuery, useQueryClient } from '@tanstack/vue-query'
+import type { ComputedRef, Ref } from 'vue'
+
+import {
+	getEnabledAnalyticsStatsForState,
+	getProjectStatusFilterValue,
+	PROJECT_STATUS_FILTER_VALUES,
+	type ProjectStatusFilterValue,
+	sanitizeAnalyticsSelectedFilters,
+} from '~/components/analytics/query-builder/query-filter/queryFilter'
+import { fetchSegmentedWith } from '~/utils/fetch-helpers.ts'
+
+import type { OrganizationContext } from '../organization-context'
+import {
+	type AnalyticsBreakdownPreset,
+	type AnalyticsDashboardStat,
+	type AnalyticsGraphViewMode,
+	type AnalyticsGroupByPreset,
+	type AnalyticsLastTimeframeUnit,
+	type AnalyticsSelectedFilters,
+	type AnalyticsTimeframeMode,
+	type AnalyticsTimeframePreset,
+	areSelectedFiltersEqual,
+	areStringArraysEqual,
+	buildAnalyticsQueryBuilderRouteQuery,
+	buildDefaultAnalyticsGraphState,
+	buildDefaultAnalyticsQueryBuilderState,
+	getAnalyticsBreakdownPresetForProjectSelection,
+	getDefaultAnalyticsBreakdownPreset,
+	hasAnalyticsBreakdownQuery,
+	hasAnalyticsProjectSelectionQuery,
+	hasAnalyticsQueryBuilderRouteChange,
+	isAnalyticsGraphStateDefault,
+	isAnalyticsQueryBuilderStateDefault,
+	readAnalyticsGraphState,
+	readAnalyticsQueryBuilderState,
+} from './query-builder-url'
+
+export type {
+	AnalyticsBreakdownPreset,
+	AnalyticsDashboardStat,
+	AnalyticsGraphState,
+	AnalyticsGraphViewMode,
+	AnalyticsGroupByPreset,
+	AnalyticsLastTimeframeUnit,
+	AnalyticsQueryFilterCategory,
+	AnalyticsSelectedFilters,
+	AnalyticsTimeframeMode,
+	AnalyticsTimeframePreset,
+} from './query-builder-url'
+
+const MINECRAFT_JAVA_SERVER_PROJECT_TYPE = 'minecraft_java_server'
+const ANALYTICS_START_TIMESTAMP = '2023-01-01T00:00:00.000Z'
+export const ANALYTICS_START_DATE_INPUT_VALUE = ANALYTICS_START_TIMESTAMP.slice(0, 10)
+const ANALYTICS_START_TIME = new Date(ANALYTICS_START_TIMESTAMP).getTime()
+const REVENUE_GROUP_BY_FALLBACK: AnalyticsGroupByPreset = 'day'
+const REVENUE_MIN_TIMEFRAME_MS = 1 * 24 * 60 * 60 * 1000 // need at least 1 day in timeframe range to show revenue
+const ANALYTICS_DAY_MS = 24 * 60 * 60 * 1000
+const ANALYTICS_MAX_TIME_SLICES = 256 // controls granularity allowed in "group by" for timeframe ranges
+const ANALYTICS_TIME_SLICES_GC_TIME_MS = 30 * 1000
+const ANALYTICS_PREFETCH_GC_TIME_MS = 15 * 1000
+const ANALYTICS_FILTER_OPTIONS_GC_TIME_MS = 60 * 1000
+const ANALYTICS_PROJECT_IDS_FETCH_BATCH_SIZE = 20
+const ANALYTICS_PROJECT_IDS_FETCH_BATCH_DELAY_MS = 300
+
+type ProjectTypeMetadata = {
+	project_type?: string | null
+	project_types?: readonly string[] | null
+}
+
+type AnalyticsProjectFetchRequest = Labrinth.Analytics.v3.FetchRequest & {
+	project_ids: string[]
+}
+
+type AnalyticsDashboardProjectSource = ProjectTypeMetadata & {
+	id: string
+	name?: string | null
+	title?: string | null
+	icon_url?: string | null
+	downloads?: number | null
+	status?: string | null
+}
+
+type AnalyticsDashboardUserProjectSource = AnalyticsDashboardProjectSource & {
+	organization?: string | null
+}
+
+export interface AnalyticsDashboardProject {
+	id: string
+	name: string
+	iconUrl?: string
+	downloads: number
+	status: ProjectStatusFilterValue
+}
+
+export interface AnalyticsDashboardProjectGroup {
+	key?: string
+	title?: string
+	projects: AnalyticsDashboardProject[]
+}
+
+export interface AnalyticsDashboardTotals {
+	views: number
+	downloads: number
+	revenue: number
+	playtime: number
+}
+
+export interface AnalyticsDashboardPercentChanges {
+	views: number
+	downloads: number
+	revenue: number
+	playtime: number
+}
+
+export interface AnalyticsDashboardFilterOptions {
+	countries: string[]
+	downloadSources: string[]
+	downloadReasons: string[]
+	gameVersions: string[]
+	loaderTypes: string[]
+	versionIds: string[]
+}
+
+export interface NormalizedAnalyticsSelectedFilters {
+	country: ReadonlySet<string>
+	monetization: ReadonlySet<string>
+	userAgent: ReadonlySet<string>
+	downloadReason: ReadonlySet<string>
+	versionId: ReadonlySet<string>
+	gameVersion: ReadonlySet<string>
+	loaderType: ReadonlySet<string>
+}
+
+interface AnalyticsDataFilterOptionSummary {
+	countries: string[]
+	downloadSources: string[]
+	downloadReasons: string[]
+	gameVersions: string[]
+	loaderTypes: string[]
+	versionIds: string[]
+	countryDownloadsByCode: Map<string, number>
+}
+
+interface ProjectVersionFilterOptionSummary {
+	gameVersions: string[]
+	loaderTypes: string[]
+	versionIds: string[]
+}
+
+interface AnalyticsVersionMetadata {
+	id: string
+	versionNumber: string
+	datePublished: string
+	projectId: string
+	downloads: number
+	gameVersions: string[]
+	loaders: string[]
+}
+
+function isProjectAnalyticsPoint(
+	dataPoint: Labrinth.Analytics.v3.AnalyticsData,
+): dataPoint is Labrinth.Analytics.v3.ProjectAnalytics {
+	return 'source_project' in dataPoint
+}
+
+export interface AnalyticsDashboardContextValue {
+	hasProjectContext: ComputedRef<boolean>
+	projectGroups: ComputedRef<AnalyticsDashboardProjectGroup[]>
+	projects: ComputedRef<AnalyticsDashboardProject[]>
+	selectedProjectIds: Ref<string[]>
+	selectedTimeframeMode: Ref<AnalyticsTimeframeMode>
+	selectedTimeframe: Ref<AnalyticsTimeframePreset>
+	selectedLastTimeframeAmount: Ref<number>
+	selectedLastTimeframeUnit: Ref<AnalyticsLastTimeframeUnit>
+	selectedCustomTimeframeStartDate: Ref<string>
+	selectedCustomTimeframeEndDate: Ref<string>
+	selectedGroupBy: Ref<AnalyticsGroupByPreset>
+	selectedBreakdown: Ref<AnalyticsBreakdownPreset>
+	selectedFilters: Ref<AnalyticsSelectedFilters>
+	queryRefreshTimestamp: Ref<number>
+	queryResetToken: Ref<number>
+	isAnalyticsQueryBuilderDefault: ComputedRef<boolean>
+	fetchRequest: Ref<Labrinth.Analytics.v3.FetchRequest | null>
+	displayedSelectedProjectIds: Ref<string[]>
+	displayedSelectedGroupBy: Ref<AnalyticsGroupByPreset>
+	displayedSelectedBreakdown: Ref<AnalyticsBreakdownPreset>
+	displayedSelectedFilters: Ref<AnalyticsSelectedFilters>
+	displayedFetchRequest: Ref<Labrinth.Analytics.v3.FetchRequest | null>
+	displayedFilterOptions: Ref<AnalyticsDashboardFilterOptions>
+	filterOptions: ComputedRef<AnalyticsDashboardFilterOptions>
+	isAnalyticsFilterOptionsLoading: ComputedRef<boolean>
+	versionNumbersById: ComputedRef<Map<string, string>>
+	versionPublishedDatesById: ComputedRef<Map<string, string>>
+	versionProjectNamesById: ComputedRef<Map<string, string>>
+	versionProjectIconUrlsById: ComputedRef<Map<string, string>>
+	projectStatusById: ComputedRef<Map<string, ProjectStatusFilterValue>>
+	availableProjectStatuses: ComputedRef<ProjectStatusFilterValue[]>
+	projectVersionDownloadsById: ComputedRef<Map<string, number>>
+	gameVersionDownloadsByVersion: ComputedRef<Map<string, number>>
+	countryDownloadsByCode: ComputedRef<Map<string, number>>
+	timeSlices: Ref<Labrinth.Analytics.v3.TimeSlice[]>
+	displayedTimeSlices: Ref<Labrinth.Analytics.v3.TimeSlice[]>
+	previousTimeSlices: Ref<Labrinth.Analytics.v3.TimeSlice[]>
+	displayedPreviousTimeSlices: Ref<Labrinth.Analytics.v3.TimeSlice[]>
+	isLoading: ComputedRef<boolean>
+	isRefetching: ComputedRef<boolean>
+	activeStat: Ref<AnalyticsDashboardStat>
+	activeGraphViewMode: Ref<AnalyticsGraphViewMode>
+	isRatioMode: Ref<boolean>
+	showChartEvents: Ref<boolean>
+	showPreviousPeriod: Ref<boolean>
+	hiddenGraphDatasetIds: Ref<string[]>
+	hasExplicitGraphDatasetSelection: Ref<boolean>
+	isGraphDatasetSelectionActive: Ref<boolean>
+	selectedGraphDatasetIds: Ref<string[]>
+	currentTotals: ComputedRef<AnalyticsDashboardTotals>
+	previousTotals: ComputedRef<AnalyticsDashboardTotals>
+	percentChanges: ComputedRef<AnalyticsDashboardPercentChanges>
+	hasPreviousPeriodComparison: ComputedRef<boolean>
+	getRelevantAnalyticsDashboardStats: (
+		breakdown: AnalyticsBreakdownPreset,
+		filters?: AnalyticsSelectedFilters,
+	) => readonly AnalyticsDashboardStat[]
+	isAnalyticsDashboardStatRelevant: (
+		stat: AnalyticsDashboardStat,
+		breakdown: AnalyticsBreakdownPreset,
+		filters?: AnalyticsSelectedFilters,
+	) => boolean
+	refreshAnalyticsQuery: () => Promise<void>
+	resetAnalyticsQueryBuilder: () => void
+	getVersionDisplayName: (versionId: string) => string
+	getVersionPublishedDate: (versionId: string) => string | undefined
+	getVersionProjectName: (versionId: string) => string | undefined
+	getVersionProjectIconUrl: (versionId: string) => string | undefined
+	setFetchRequest: (fetchRequest: Labrinth.Analytics.v3.FetchRequest) => void
+	setActiveStat: (stat: AnalyticsDashboardStat) => void
+}
+
+export type CreateAnalyticsDashboardContextOptions = {
+	auth: Ref<{ user?: { id?: string; username?: string; role?: string } | null }>
+	projectPageContext?: ProjectPageContext | null
+	organizationContext?: OrganizationContext | null
+}
+
+export const [injectAnalyticsDashboardContext, provideAnalyticsDashboardContext] =
+	createContext<AnalyticsDashboardContextValue>('AnalyticsDashboard')
+
+type AnalyticsQueryBuilderRouteNavigationMode = 'push' | 'replace'
+
+type AnalyticsTimeSliceSplit = {
+	currentTimeSlices: Labrinth.Analytics.v3.TimeSlice[]
+	previousTimeSlices: Labrinth.Analytics.v3.TimeSlice[]
+}
+
+function buildComparisonFetchRequest(
+	fetchRequest: Labrinth.Analytics.v3.FetchRequest | null,
+): AnalyticsProjectFetchRequest | null {
+	if (!isAnalyticsFetchRequestReady(fetchRequest)) {
+		return null
+	}
+
+	const startTimestamp = new Date(fetchRequest.time_range.start).getTime()
+	const endTimestamp = new Date(fetchRequest.time_range.end).getTime()
+	const duration = endTimestamp - startTimestamp
+
+	if (!Number.isFinite(duration) || duration <= 0) {
+		return null
+	}
+
+	const previousStart = new Date(startTimestamp - duration)
+
+	if (previousStart.getTime() < ANALYTICS_START_TIME) {
+		return null
+	}
+
+	return {
+		...fetchRequest,
+		time_range: {
+			start: previousStart.toISOString(),
+			end: fetchRequest.time_range.end,
+			resolution:
+				'slices' in fetchRequest.time_range.resolution
+					? {
+							slices: fetchRequest.time_range.resolution.slices * 2,
+						}
+					: fetchRequest.time_range.resolution,
+		},
+	}
+}
+
+function isAnalyticsFetchRequestReady(
+	fetchRequest: Labrinth.Analytics.v3.FetchRequest | null,
+): fetchRequest is AnalyticsProjectFetchRequest {
+	return Array.isArray(fetchRequest?.project_ids) && fetchRequest.project_ids.length > 0
+}
+
+function getAnalyticsTimeSliceCount(
+	timeRange: Labrinth.Analytics.v3.TimeRange,
+	fallback: number,
+): number {
+	if ('slices' in timeRange.resolution) {
+		return Math.max(1, timeRange.resolution.slices)
+	}
+
+	const startTime = new Date(timeRange.start).getTime()
+	const endTime = new Date(timeRange.end).getTime()
+	const bucketMs = timeRange.resolution.minutes * 60 * 1000
+	if (bucketMs > 0 && endTime > startTime) {
+		return Math.max(1, Math.floor((endTime - startTime) / bucketMs))
+	}
+
+	return Math.max(1, fallback)
+}
+
+function splitAnalyticsTimeSlices(
+	timeSlices: Labrinth.Analytics.v3.TimeSlice[],
+	fetchRequest: Labrinth.Analytics.v3.FetchRequest | null,
+): AnalyticsTimeSliceSplit {
+	if (!isAnalyticsFetchRequestReady(fetchRequest) || !buildComparisonFetchRequest(fetchRequest)) {
+		return {
+			currentTimeSlices: timeSlices,
+			previousTimeSlices: [],
+		}
+	}
+
+	const currentSliceCount = getAnalyticsTimeSliceCount(fetchRequest.time_range, timeSlices.length)
+	const currentStartIndex = Math.max(0, timeSlices.length - currentSliceCount)
+	const previousStartIndex = Math.max(0, currentStartIndex - currentSliceCount)
+
+	return {
+		currentTimeSlices: timeSlices.slice(currentStartIndex),
+		previousTimeSlices: timeSlices.slice(previousStartIndex, currentStartIndex),
+	}
+}
+
+function buildAnalyticsFetchRequestBatches(
+	fetchRequest: AnalyticsProjectFetchRequest,
+): AnalyticsProjectFetchRequest[] {
+	if (fetchRequest.project_ids.length <= ANALYTICS_PROJECT_IDS_FETCH_BATCH_SIZE) {
+		return [fetchRequest]
+	}
+
+	const requests: AnalyticsProjectFetchRequest[] = []
+	for (
+		let index = 0;
+		index < fetchRequest.project_ids.length;
+		index += ANALYTICS_PROJECT_IDS_FETCH_BATCH_SIZE
+	) {
+		requests.push({
+			...fetchRequest,
+			project_ids: fetchRequest.project_ids.slice(
+				index,
+				index + ANALYTICS_PROJECT_IDS_FETCH_BATCH_SIZE,
+			),
+		})
+	}
+
+	return requests
+}
+
+function mergeAnalyticsTimeSlices(
+	timeSliceGroups: Labrinth.Analytics.v3.TimeSlice[][],
+): Labrinth.Analytics.v3.TimeSlice[] {
+	const mergedTimeSlices: Labrinth.Analytics.v3.TimeSlice[] = []
+
+	for (const timeSlices of timeSliceGroups) {
+		timeSlices.forEach((timeSlice, index) => {
+			if (!mergedTimeSlices[index]) {
+				mergedTimeSlices[index] = []
+			}
+
+			for (const dataPoint of timeSlice) {
+				mergedTimeSlices[index].push(dataPoint)
+			}
+		})
+	}
+
+	return mergedTimeSlices
+}
+
+function waitForAnalyticsFetchBatchDelay(): Promise<void> {
+	return new Promise((resolve) => setTimeout(resolve, ANALYTICS_PROJECT_IDS_FETCH_BATCH_DELAY_MS))
+}
+
+async function fetchAnalyticsTimeSlices(
+	fetchRequest: AnalyticsProjectFetchRequest,
+	fetchAnalytics: (
+		request: Labrinth.Analytics.v3.FetchRequest,
+	) => Promise<Labrinth.Analytics.v3.FetchResponse>,
+): Promise<Labrinth.Analytics.v3.TimeSlice[]> {
+	const fetchRequests = buildAnalyticsFetchRequestBatches(fetchRequest)
+	const timeSliceGroups: Labrinth.Analytics.v3.TimeSlice[][] = []
+
+	for (let index = 0; index < fetchRequests.length; index++) {
+		if (index > 0) {
+			await waitForAnalyticsFetchBatchDelay()
+		}
+
+		const response = await fetchAnalytics(fetchRequests[index])
+		timeSliceGroups.push(response.metrics)
+	}
+
+	return mergeAnalyticsTimeSlices(timeSliceGroups)
+}
+
+function areAnalyticsFetchRequestsEqual(
+	left: Labrinth.Analytics.v3.FetchRequest | null,
+	right: Labrinth.Analytics.v3.FetchRequest,
+): boolean {
+	return JSON.stringify(left) === JSON.stringify(right)
+}
+
+function buildAnalyticsCurrentTimeSlicesQueryKey(
+	userId: string | undefined,
+	nextFetchRequest: Labrinth.Analytics.v3.FetchRequest | null,
+	refreshTimestamp: number,
+) {
+	return ['analytics', 'dashboard', userId, 'current', nextFetchRequest, refreshTimestamp]
+}
+
+function isRevenueHourlyGroupBy(groupBy: AnalyticsGroupByPreset): boolean {
+	return groupBy === '1h' || groupBy === '6h'
+}
+
+function buildDailyAnalyticsFetchRequest(
+	nextFetchRequest: Labrinth.Analytics.v3.FetchRequest | null,
+): Labrinth.Analytics.v3.FetchRequest | null {
+	if (!isAnalyticsFetchRequestReady(nextFetchRequest)) {
+		return null
+	}
+
+	const startTime = new Date(nextFetchRequest.time_range.start).getTime()
+	const endTime = new Date(nextFetchRequest.time_range.end).getTime()
+	const durationMs = endTime - startTime
+	if (!Number.isFinite(durationMs) || durationMs <= 0) {
+		return null
+	}
+
+	const desiredSlices = Math.max(1, Math.floor(durationMs / ANALYTICS_DAY_MS))
+
+	return {
+		...nextFetchRequest,
+		time_range: {
+			...nextFetchRequest.time_range,
+			resolution: {
+				slices: Math.min(ANALYTICS_MAX_TIME_SLICES, desiredSlices),
+			},
+		},
+	}
+}
+
+function buildAnalyticsFilterOptionsRequests(
+	projectIds: string[],
+	endTimestamp: string,
+): Labrinth.Analytics.v3.FetchRequest[] {
+	const buildRequest = (
+		returnMetrics: Labrinth.Analytics.v3.ReturnMetrics,
+	): Labrinth.Analytics.v3.FetchRequest => ({
+		time_range: {
+			start: ANALYTICS_START_TIMESTAMP,
+			end: endTimestamp,
+			resolution: {
+				slices: 1,
+			},
+		},
+		project_ids: projectIds,
+		return_metrics: returnMetrics,
+	})
+
+	return [
+		buildRequest({
+			project_views: {
+				bucket_by: ['country'],
+			},
+		}),
+		buildRequest({
+			project_downloads: {
+				bucket_by: ['country'],
+			},
+		}),
+		buildRequest({
+			project_playtime: {
+				bucket_by: ['country'],
+			},
+		}),
+		buildRequest({
+			project_downloads: {
+				bucket_by: ['user_agent'],
+			},
+		}),
+		buildRequest({
+			project_downloads: {
+				bucket_by: ['reason'],
+			},
+		}),
+	]
+}
+
+function addAnalyticsDays(date: Date, days: number): Date {
+	const nextDate = new Date(date)
+	nextDate.setDate(nextDate.getDate() + days)
+	return nextDate
+}
+
+function parseAnalyticsDateInputValue(value: string): Date | null {
+	const parsedDate = new Date(`${value}T00:00:00`)
+	return Number.isNaN(parsedDate.getTime()) ? null : parsedDate
+}
+
+function parseAnalyticsDateTimeInputValue(value: string): Date | null {
+	const parsedDate = new Date(value)
+	return Number.isNaN(parsedDate.getTime()) ? null : parsedDate
+}
+
+function getAnalyticsTimeframeDurationMs({
+	mode,
+	preset,
+	lastAmount,
+	lastUnit,
+	customStartDate,
+	customEndDate,
+	nowTimestamp,
+}: {
+	mode: AnalyticsTimeframeMode
+	preset: AnalyticsTimeframePreset
+	lastAmount: number
+	lastUnit: AnalyticsLastTimeframeUnit
+	customStartDate: string
+	customEndDate: string
+	nowTimestamp: number
+}): number {
+	if (mode === 'preset') {
+		switch (preset) {
+			case 'today':
+			case 'yesterday':
+				return 24 * 60 * 60 * 1000
+			case 'last_7_days':
+				return 7 * 24 * 60 * 60 * 1000
+			case 'last_14_days':
+				return 14 * 24 * 60 * 60 * 1000
+			case 'last_30_days':
+				return 30 * 24 * 60 * 60 * 1000
+			case 'last_90_days':
+				return 90 * 24 * 60 * 60 * 1000
+			case 'last_180_days':
+				return 180 * 24 * 60 * 60 * 1000
+			case 'year_to_date': {
+				const now = new Date(nowTimestamp)
+				const yearStart = new Date(now.getFullYear(), 0, 1)
+				yearStart.setHours(0, 0, 0, 0)
+				return now.getTime() - yearStart.getTime()
+			}
+			case 'all_time':
+				return REVENUE_MIN_TIMEFRAME_MS
+		}
+	}
+
+	if (mode === 'last') {
+		const amount = Math.max(1, Math.floor(lastAmount))
+		switch (lastUnit) {
+			case 'hours':
+				return amount * 60 * 60 * 1000
+			case 'days':
+				return amount * 24 * 60 * 60 * 1000
+			case 'weeks':
+				return amount * 7 * 24 * 60 * 60 * 1000
+			case 'months':
+				return REVENUE_MIN_TIMEFRAME_MS
+		}
+	}
+
+	if (mode === 'custom_range') {
+		const start = parseAnalyticsDateInputValue(customStartDate)
+		const inclusiveEnd = parseAnalyticsDateInputValue(customEndDate)
+		if (!start || !inclusiveEnd) {
+			return 0
+		}
+
+		return addAnalyticsDays(inclusiveEnd, 1).getTime() - start.getTime()
+	}
+
+	const start = parseAnalyticsDateTimeInputValue(customStartDate)
+	const end = parseAnalyticsDateTimeInputValue(customEndDate)
+	if (!start || !end) {
+		return 0
+	}
+
+	return end.getTime() - start.getTime()
+}
+
+function getPercentChange(currentValue: number, previousValue: number): number {
+	if (previousValue === 0) {
+		if (currentValue === 0) {
+			return 0
+		}
+		return 100
+	}
+
+	return ((currentValue - previousValue) / previousValue) * 100
+}
+
+function computeTotals(
+	timeSlices: Labrinth.Analytics.v3.TimeSlice[],
+	selectedProjectIds: Set<string>,
+	availableProjectIds: Set<string>,
+	projectStatusById: Map<string, ProjectStatusFilterValue>,
+	filters: AnalyticsSelectedFilters,
+): AnalyticsDashboardTotals {
+	const totals: AnalyticsDashboardTotals = {
+		views: 0,
+		downloads: 0,
+		revenue: 0,
+		playtime: 0,
+	}
+
+	if (availableProjectIds.size === 0) {
+		return totals
+	}
+
+	const effectiveProjectIds = selectedProjectIds.size > 0 ? selectedProjectIds : availableProjectIds
+	const filteredProjectIds = new Set(
+		getProjectIdsMatchingStatusFilter([...effectiveProjectIds], projectStatusById, filters),
+	)
+	if (filteredProjectIds.size === 0) {
+		return totals
+	}
+	const normalizedFilters = normalizeAnalyticsSelectedFilters(filters)
+
+	for (const timeSlice of timeSlices) {
+		for (const dataPoint of timeSlice) {
+			if (!isProjectAnalyticsPoint(dataPoint)) {
+				continue
+			}
+
+			if (!filteredProjectIds.has(dataPoint.source_project)) {
+				continue
+			}
+
+			if (!doesAnalyticsPointMatchNormalizedFilters(dataPoint, normalizedFilters)) {
+				continue
+			}
+
+			switch (dataPoint.metric_kind) {
+				case 'views':
+					totals.views += dataPoint.views
+					break
+				case 'downloads':
+					totals.downloads += dataPoint.downloads
+					break
+				case 'playtime':
+					totals.playtime += dataPoint.seconds
+					break
+				case 'revenue': {
+					const value = Number.parseFloat(dataPoint.revenue)
+					totals.revenue += Number.isFinite(value) ? value : 0
+					break
+				}
+			}
+		}
+	}
+
+	return totals
+}
+
+function isServerProject(project: ProjectTypeMetadata): boolean {
+	if (project.project_type === MINECRAFT_JAVA_SERVER_PROJECT_TYPE) {
+		return true
+	}
+
+	return project.project_types?.includes(MINECRAFT_JAVA_SERVER_PROJECT_TYPE) ?? false
+}
+
+function isAnalyticsEligibleProject(
+	project: ProjectTypeMetadata & { status?: string | null },
+): boolean {
+	return !isServerProject(project) && getProjectStatusFilterValue(project.status) !== 'draft'
+}
+
+function getSingleQueryValue(value: unknown): string | undefined {
+	if (typeof value !== 'string') {
+		return undefined
+	}
+
+	const normalizedValue = value.trim()
+	return normalizedValue.length > 0 ? normalizedValue : undefined
+}
+
+function toAnalyticsDashboardProject(
+	project: AnalyticsDashboardProjectSource,
+): AnalyticsDashboardProject {
+	return {
+		id: project.id,
+		name: project.name ?? project.title ?? project.id,
+		iconUrl: project.icon_url ?? undefined,
+		downloads: project.downloads ?? 0,
+		status: getProjectStatusFilterValue(project.status),
+	}
+}
+
+function getUniqueAnalyticsDashboardProjects(
+	projects: AnalyticsDashboardProjectSource[],
+	seenProjectIds: Set<string>,
+): AnalyticsDashboardProject[] {
+	const analyticsProjects: AnalyticsDashboardProject[] = []
+
+	for (const project of projects) {
+		if (seenProjectIds.has(project.id) || !isAnalyticsEligibleProject(project)) {
+			continue
+		}
+
+		seenProjectIds.add(project.id)
+		analyticsProjects.push(toAnalyticsDashboardProject(project))
+	}
+
+	return analyticsProjects
+}
+
+function getProjectOrganizationId(
+	project: AnalyticsDashboardUserProjectSource,
+): string | undefined {
+	return typeof project.organization === 'string' && project.organization.trim().length > 0
+		? project.organization
+		: undefined
+}
+
+export function doesProjectStatusMatchFilters(
+	status: string | null | undefined,
+	filters: AnalyticsSelectedFilters,
+): boolean {
+	if (filters.project_status.length === 0) {
+		return true
+	}
+
+	return filters.project_status.includes(getProjectStatusFilterValue(status))
+}
+
+export function getProjectIdsMatchingStatusFilter(
+	projectIds: string[],
+	projectStatusById: Map<string, ProjectStatusFilterValue>,
+	filters: AnalyticsSelectedFilters,
+): string[] {
+	if (filters.project_status.length === 0) {
+		return projectIds
+	}
+
+	return projectIds.filter((projectId) =>
+		doesProjectStatusMatchFilters(projectStatusById.get(projectId), filters),
+	)
+}
+
+function sortStringValues(values: string[]): string[] {
+	return [...values].sort((left, right) => left.localeCompare(right))
+}
+
+function toAnalyticsVersionMetadata(
+	version: Labrinth.Versions.v3.Version,
+): AnalyticsVersionMetadata {
+	return {
+		id: version.id,
+		versionNumber: version.version_number,
+		datePublished: version.date_published,
+		projectId: version.project_id,
+		downloads: version.downloads,
+		gameVersions: [...version.game_versions],
+		loaders:
+			version.mrpack_loaders && version.mrpack_loaders.length > 0
+				? [...version.mrpack_loaders]
+				: [...version.loaders],
+	}
+}
+
+function getProjectVersionFilterOptionSummary(
+	versions: AnalyticsVersionMetadata[],
+): ProjectVersionFilterOptionSummary {
+	const gameVersions = new Set<string>()
+	const loaders = new Set<string>()
+	const versionIds = new Set<string>()
+
+	for (const version of versions) {
+		versionIds.add(version.id)
+
+		for (const gameVersion of version.gameVersions) {
+			const normalizedGameVersion = gameVersion.trim()
+			if (normalizedGameVersion.length > 0) {
+				gameVersions.add(normalizedGameVersion)
+			}
+		}
+
+		for (const loader of version.loaders) {
+			const normalizedLoader = loader.trim().toLowerCase()
+			if (normalizedLoader.length > 0 && normalizedLoader !== 'mrpack') {
+				loaders.add(normalizedLoader)
+			}
+		}
+	}
+
+	return {
+		gameVersions: sortStringValues([...gameVersions]),
+		loaderTypes: sortStringValues([...loaders]),
+		versionIds: sortStringValues([...versionIds]),
+	}
+}
+
+async function fetchAnalyticsVersionMetadata(
+	projectIds: string[],
+	getProjects: (ids: string[]) => Promise<Labrinth.Projects.v3.Project[]>,
+	getVersions: (ids: string[]) => Promise<Labrinth.Versions.v3.Version[]>,
+): Promise<AnalyticsVersionMetadata[]> {
+	const projects = await fetchSegmentedWith(projectIds, getProjects)
+	const versionIds = sortStringValues([...new Set(projects.flatMap((project) => project.versions))])
+	return fetchAnalyticsVersionMetadataByIds(versionIds, getVersions)
+}
+
+async function fetchAnalyticsVersionMetadataByIds(
+	versionIds: string[],
+	getVersions: (ids: string[]) => Promise<Labrinth.Versions.v3.Version[]>,
+): Promise<AnalyticsVersionMetadata[]> {
+	const metadata: AnalyticsVersionMetadata[] = []
+	const segmentSize = 800
+
+	for (let index = 0; index < versionIds.length; index += segmentSize) {
+		const versions = await getVersions(versionIds.slice(index, index + segmentSize))
+		metadata.push(...versions.map(toAnalyticsVersionMetadata))
+	}
+
+	return metadata
+}
+
+function retainAvailableSelectedFilterValues(
+	values: string[],
+	availableValues: string[],
+): string[] {
+	const availableValueSet = new Set(availableValues)
+	return values.filter((value) => availableValueSet.has(value))
+}
+
+function sanitizeAnalyticsSelectedFiltersForAvailableOptions(
+	filters: AnalyticsSelectedFilters,
+	filterOptions: AnalyticsDashboardFilterOptions,
+): AnalyticsSelectedFilters {
+	return {
+		...filters,
+		download_reason: retainAvailableSelectedFilterValues(
+			filters.download_reason,
+			filterOptions.downloadReasons,
+		),
+		game_version: retainAvailableSelectedFilterValues(
+			filters.game_version,
+			filterOptions.gameVersions,
+		),
+		loader_type: retainAvailableSelectedFilterValues(
+			filters.loader_type,
+			filterOptions.loaderTypes,
+		),
+	}
+}
+
+function cloneAnalyticsSelectedFilters(
+	filters: AnalyticsSelectedFilters,
+): AnalyticsSelectedFilters {
+	return {
+		project: [...filters.project],
+		project_status: [...filters.project_status],
+		country: [...filters.country],
+		monetization: [...filters.monetization],
+		user_agent: [...filters.user_agent],
+		download_reason: [...filters.download_reason],
+		version_id: [...filters.version_id],
+		game_version: [...filters.game_version],
+		loader_type: [...filters.loader_type],
+	}
+}
+
+function cloneAnalyticsFilterOptions(
+	filterOptions: AnalyticsDashboardFilterOptions,
+): AnalyticsDashboardFilterOptions {
+	return {
+		countries: [...filterOptions.countries],
+		downloadSources: [...filterOptions.downloadSources],
+		downloadReasons: [...filterOptions.downloadReasons],
+		gameVersions: [...filterOptions.gameVersions],
+		loaderTypes: [...filterOptions.loaderTypes],
+		versionIds: [...filterOptions.versionIds],
+	}
+}
+
+function cloneAnalyticsFetchRequest(
+	fetchRequest: Labrinth.Analytics.v3.FetchRequest | null,
+): Labrinth.Analytics.v3.FetchRequest | null {
+	return fetchRequest ? JSON.parse(JSON.stringify(fetchRequest)) : null
+}
+
+function getAnalyticsDataFilterOptionSummary(
+	timeSlices: Labrinth.Analytics.v3.TimeSlice[],
+): AnalyticsDataFilterOptionSummary {
+	const countries = new Set<string>()
+	const downloadSources = new Set<string>()
+	const downloadReasons = new Set<string>()
+	const gameVersions = new Set<string>()
+	const loaderTypes = new Set<string>()
+	const versionIds = new Set<string>()
+	const countryDownloadsByCode = new Map<string, number>()
+
+	for (const timeSlice of timeSlices) {
+		for (const dataPoint of timeSlice) {
+			if (!isProjectAnalyticsPoint(dataPoint)) {
+				continue
+			}
+
+			if (
+				(dataPoint.metric_kind === 'views' ||
+					dataPoint.metric_kind === 'downloads' ||
+					dataPoint.metric_kind === 'playtime') &&
+				dataPoint.country
+			) {
+				const country = dataPoint.country.trim().toUpperCase()
+				if (country.length > 0) {
+					countries.add(country)
+					if (dataPoint.metric_kind === 'downloads') {
+						countryDownloadsByCode.set(
+							country,
+							(countryDownloadsByCode.get(country) ?? 0) + dataPoint.downloads,
+						)
+					}
+				}
+			}
+
+			if (dataPoint.metric_kind === 'downloads' && dataPoint.user_agent) {
+				const downloadSource = dataPoint.user_agent.trim()
+				if (downloadSource.length > 0) {
+					downloadSources.add(downloadSource)
+				}
+			}
+
+			if (dataPoint.metric_kind === 'downloads' && dataPoint.reason) {
+				const downloadReason = dataPoint.reason.trim()
+				if (downloadReason.length > 0) {
+					downloadReasons.add(downloadReason)
+				}
+			}
+
+			if (
+				(dataPoint.metric_kind === 'downloads' || dataPoint.metric_kind === 'playtime') &&
+				dataPoint.game_version
+			) {
+				const gameVersion = dataPoint.game_version.trim()
+				if (gameVersion.length > 0) {
+					gameVersions.add(gameVersion)
+				}
+			}
+
+			if (
+				(dataPoint.metric_kind === 'downloads' || dataPoint.metric_kind === 'playtime') &&
+				dataPoint.loader
+			) {
+				const loader = dataPoint.loader.trim().toLowerCase()
+				if (loader.length > 0 && loader !== 'mrpack') {
+					loaderTypes.add(loader)
+				}
+			}
+
+			if (
+				(dataPoint.metric_kind === 'downloads' || dataPoint.metric_kind === 'playtime') &&
+				dataPoint.version_id
+			) {
+				const versionId = dataPoint.version_id.trim()
+				if (versionId.length > 0) {
+					versionIds.add(versionId)
+				}
+			}
+		}
+	}
+
+	return {
+		countries: sortStringValues([...countries]),
+		downloadSources: sortStringValues([...downloadSources]),
+		downloadReasons: sortStringValues([...downloadReasons]),
+		gameVersions: sortStringValues([...gameVersions]),
+		loaderTypes: sortStringValues([...loaderTypes]),
+		versionIds: sortStringValues([...versionIds]),
+		countryDownloadsByCode,
+	}
+}
+
+function addVersionIdsFromTimeSlices(
+	versionIds: Set<string>,
+	timeSlices: Labrinth.Analytics.v3.TimeSlice[],
+) {
+	for (const timeSlice of timeSlices) {
+		for (const dataPoint of timeSlice) {
+			if (!isProjectAnalyticsPoint(dataPoint)) {
+				continue
+			}
+
+			if (
+				(dataPoint.metric_kind === 'downloads' || dataPoint.metric_kind === 'playtime') &&
+				dataPoint.version_id
+			) {
+				const versionId = dataPoint.version_id.trim()
+				if (versionId.length > 0) {
+					versionIds.add(versionId)
+				}
+			}
+		}
+	}
+}
+
+function addVersionProjectNamesFromTimeSlices(
+	versionProjectNames: Map<string, string>,
+	timeSlices: Labrinth.Analytics.v3.TimeSlice[],
+	projectNamesById: Map<string, string>,
+) {
+	for (const timeSlice of timeSlices) {
+		for (const dataPoint of timeSlice) {
+			if (!isProjectAnalyticsPoint(dataPoint)) {
+				continue
+			}
+
+			if (
+				(dataPoint.metric_kind === 'downloads' || dataPoint.metric_kind === 'playtime') &&
+				dataPoint.version_id
+			) {
+				const versionId = dataPoint.version_id.trim()
+				const projectName = projectNamesById.get(dataPoint.source_project)
+				if (versionId.length > 0 && projectName && !versionProjectNames.has(versionId)) {
+					versionProjectNames.set(versionId, projectName)
+				}
+			}
+		}
+	}
+}
+
+export function doesAnalyticsPointMatchFilters(
+	dataPoint: Labrinth.Analytics.v3.ProjectAnalytics,
+	filters: AnalyticsSelectedFilters,
+): boolean {
+	return doesAnalyticsPointMatchNormalizedFilters(
+		dataPoint,
+		normalizeAnalyticsSelectedFilters(filters),
+	)
+}
+
+export function normalizeAnalyticsSelectedFilters(
+	filters: AnalyticsSelectedFilters,
+): NormalizedAnalyticsSelectedFilters {
+	return {
+		country: normalizeAnalyticsFilterValues(filters.country),
+		monetization: normalizeAnalyticsFilterValues(filters.monetization),
+		userAgent: normalizeAnalyticsFilterValues(filters.user_agent),
+		downloadReason: normalizeAnalyticsFilterValues(filters.download_reason),
+		versionId: normalizeAnalyticsFilterValues(filters.version_id),
+		gameVersion: normalizeAnalyticsFilterValues(filters.game_version),
+		loaderType: normalizeAnalyticsFilterValues(filters.loader_type),
+	}
+}
+
+function normalizeAnalyticsFilterValues(values: string[]): ReadonlySet<string> {
+	const normalizedValues = new Set<string>()
+	for (const value of values) {
+		const normalizedValue = value.trim().toLowerCase()
+		if (normalizedValue.length > 0) {
+			normalizedValues.add(normalizedValue)
+		}
+	}
+	return normalizedValues
+}
+
+export function doesAnalyticsPointMatchNormalizedFilters(
+	dataPoint: Labrinth.Analytics.v3.ProjectAnalytics,
+	filters: NormalizedAnalyticsSelectedFilters,
+): boolean {
+	switch (dataPoint.metric_kind) {
+		case 'views':
+			return (
+				doesAnalyticsPointMatchNormalizedFilter(
+					dataPoint,
+					filters.country,
+					getCountryFilterValue,
+				) &&
+				doesAnalyticsPointMatchNormalizedFilter(
+					dataPoint,
+					filters.monetization,
+					getMonetizationFilterValue,
+				)
+			)
+		case 'downloads':
+			return (
+				doesAnalyticsPointMatchNormalizedFilter(
+					dataPoint,
+					filters.country,
+					getCountryFilterValue,
+				) &&
+				doesAnalyticsPointMatchNormalizedFilter(
+					dataPoint,
+					filters.monetization,
+					getMonetizationFilterValue,
+				) &&
+				doesAnalyticsPointMatchNormalizedFilter(
+					dataPoint,
+					filters.userAgent,
+					getDownloadSourceFilterValue,
+				) &&
+				doesAnalyticsPointMatchNormalizedFilter(
+					dataPoint,
+					filters.downloadReason,
+					getDownloadReasonFilterValue,
+				) &&
+				doesAnalyticsPointMatchNormalizedFilter(
+					dataPoint,
+					filters.versionId,
+					getVersionFilterValue,
+				) &&
+				doesAnalyticsPointMatchNormalizedFilter(
+					dataPoint,
+					filters.gameVersion,
+					getGameVersionFilterValue,
+				) &&
+				doesAnalyticsPointMatchNormalizedFilter(dataPoint, filters.loaderType, getLoaderFilterValue)
+			)
+		case 'playtime':
+			return (
+				doesAnalyticsPointMatchNormalizedFilter(
+					dataPoint,
+					filters.country,
+					getCountryFilterValue,
+				) &&
+				doesAnalyticsPointMatchNormalizedFilter(
+					dataPoint,
+					filters.versionId,
+					getVersionFilterValue,
+				) &&
+				doesAnalyticsPointMatchNormalizedFilter(
+					dataPoint,
+					filters.gameVersion,
+					getGameVersionFilterValue,
+				) &&
+				doesAnalyticsPointMatchNormalizedFilter(dataPoint, filters.loaderType, getLoaderFilterValue)
+			)
+		case 'revenue':
+			return true
+		default:
+			return true
+	}
+}
+
+function doesAnalyticsPointMatchNormalizedFilter(
+	dataPoint: Labrinth.Analytics.v3.ProjectAnalytics,
+	filterValues: ReadonlySet<string>,
+	getPointValue: (dataPoint: Labrinth.Analytics.v3.ProjectAnalytics) => string | null | undefined,
+): boolean {
+	if (filterValues.size === 0) {
+		return true
+	}
+
+	const pointValue = getPointValue(dataPoint)
+	if (pointValue === undefined) {
+		return true
+	}
+	if (pointValue === null) {
+		return false
+	}
+
+	const normalizedPointValue = pointValue.trim().toLowerCase()
+	return filterValues.has(normalizedPointValue)
+}
+
+function getCountryFilterValue(
+	dataPoint: Labrinth.Analytics.v3.ProjectAnalytics,
+): string | null | undefined {
+	if (
+		dataPoint.metric_kind !== 'views' &&
+		dataPoint.metric_kind !== 'downloads' &&
+		dataPoint.metric_kind !== 'playtime'
+	) {
+		return undefined
+	}
+
+	return dataPoint.country ?? null
+}
+
+function getMonetizationFilterValue(
+	dataPoint: Labrinth.Analytics.v3.ProjectAnalytics,
+): string | null | undefined {
+	if (dataPoint.metric_kind !== 'views' && dataPoint.metric_kind !== 'downloads') {
+		return undefined
+	}
+	if (typeof dataPoint.monetized !== 'boolean') {
+		return null
+	}
+
+	return dataPoint.monetized ? 'monetized' : 'unmonetized'
+}
+
+function getDownloadSourceFilterValue(
+	dataPoint: Labrinth.Analytics.v3.ProjectAnalytics,
+): string | null | undefined {
+	if (dataPoint.metric_kind !== 'downloads') {
+		return undefined
+	}
+
+	return dataPoint.user_agent ?? null
+}
+
+function getDownloadReasonFilterValue(
+	dataPoint: Labrinth.Analytics.v3.ProjectAnalytics,
+): string | null | undefined {
+	if (dataPoint.metric_kind !== 'downloads') {
+		return undefined
+	}
+
+	return dataPoint.reason ?? null
+}
+
+function getVersionFilterValue(
+	dataPoint: Labrinth.Analytics.v3.ProjectAnalytics,
+): string | null | undefined {
+	if (dataPoint.metric_kind !== 'downloads' && dataPoint.metric_kind !== 'playtime') {
+		return undefined
+	}
+
+	return dataPoint.version_id ?? null
+}
+
+function getGameVersionFilterValue(
+	dataPoint: Labrinth.Analytics.v3.ProjectAnalytics,
+): string | null | undefined {
+	if (dataPoint.metric_kind !== 'downloads' && dataPoint.metric_kind !== 'playtime') {
+		return undefined
+	}
+
+	return dataPoint.game_version ?? null
+}
+
+function getLoaderFilterValue(
+	dataPoint: Labrinth.Analytics.v3.ProjectAnalytics,
+): string | null | undefined {
+	if (dataPoint.metric_kind !== 'downloads' && dataPoint.metric_kind !== 'playtime') {
+		return undefined
+	}
+
+	return dataPoint.loader ?? null
+}
+
+export function createAnalyticsDashboardContext(
+	options: CreateAnalyticsDashboardContextOptions,
+): AnalyticsDashboardContextValue {
+	const client = injectModrinthClient()
+	const queryClient = useQueryClient()
+	const route = useRoute()
+	const router = useRouter()
+	const initialQueryState = readAnalyticsQueryBuilderState(route.query, [])
+	const initialGraphState = readAnalyticsGraphState(route.query)
+
+	const activeStat = ref<AnalyticsDashboardStat>(initialGraphState.activeStat)
+	const activeGraphViewMode = ref<AnalyticsGraphViewMode>(initialGraphState.activeGraphViewMode)
+	const isRatioMode = ref(initialGraphState.isRatioMode)
+	const showChartEvents = ref(initialGraphState.showChartEvents)
+	const showPreviousPeriod = ref(initialGraphState.showPreviousPeriod)
+	const hiddenGraphDatasetIds = ref<string[]>(initialGraphState.hiddenGraphDatasetIds)
+	const hasExplicitGraphDatasetSelection = ref(initialGraphState.selectedGraphDatasetIds !== null)
+	const isGraphDatasetSelectionActive = ref(false)
+	const selectedGraphDatasetIds = ref<string[]>(initialGraphState.selectedGraphDatasetIds ?? [])
+	const selectedProjectIds = ref<string[]>(initialQueryState.selectedProjectIds)
+	const selectedTimeframeMode = ref<AnalyticsTimeframeMode>(initialQueryState.selectedTimeframeMode)
+	const selectedTimeframe = ref<AnalyticsTimeframePreset>(initialQueryState.selectedTimeframe)
+	const selectedLastTimeframeAmount = ref<number>(initialQueryState.selectedLastTimeframeAmount)
+	const selectedLastTimeframeUnit = ref<AnalyticsLastTimeframeUnit>(
+		initialQueryState.selectedLastTimeframeUnit,
+	)
+	const selectedCustomTimeframeStartDate = ref<string>(
+		initialQueryState.selectedCustomTimeframeStartDate,
+	)
+	const selectedCustomTimeframeEndDate = ref<string>(
+		initialQueryState.selectedCustomTimeframeEndDate,
+	)
+	const selectedGroupBy = ref<AnalyticsGroupByPreset>(initialQueryState.selectedGroupBy)
+	const selectedBreakdown = ref<AnalyticsBreakdownPreset>(initialQueryState.selectedBreakdown)
+	const selectedFilters = ref<AnalyticsSelectedFilters>(initialQueryState.selectedFilters)
+	const queryRefreshTimestamp = ref(Date.now())
+	const queryResetToken = ref(0)
+	const fetchRequest = ref<Labrinth.Analytics.v3.FetchRequest | null>(null)
+	let revenueHourlyGroupByBeforeOverride: AnalyticsGroupByPreset | null = null
+	let nextAnalyticsRouteNavigationMode: AnalyticsQueryBuilderRouteNavigationMode = 'replace'
+
+	const hasProjectContext = computed(() => Boolean(options.projectPageContext))
+	const hasOrganizationContext = computed(
+		() => !hasProjectContext.value && Boolean(options.organizationContext),
+	)
+	const isDashboardAnalyticsRoute = computed(
+		() => route.path.replace(/\/$/, '') === '/dashboard/analytics',
+	)
+	const requestedDashboardUserId = computed(() => {
+		if (!isDashboardAnalyticsRoute.value || options.auth.value.user?.role !== 'admin') {
+			return undefined
+		}
+
+		return getSingleQueryValue(route.query.user)
+	})
+	const effectiveUserId = computed(
+		() => requestedDashboardUserId.value ?? options.auth.value.user?.id,
+	)
+	const isUsingDashboardUserOverride = computed(() => requestedDashboardUserId.value !== undefined)
+	const analyticsQueryUserId = computed(() => effectiveUserId.value ?? options.auth.value.user?.id)
+	const shouldFetchEffectiveUser = computed(
+		() =>
+			Boolean(effectiveUserId.value) &&
+			!hasProjectContext.value &&
+			!hasOrganizationContext.value &&
+			(effectiveUserId.value !== options.auth.value.user?.id || !options.auth.value.user?.username),
+	)
+
+	const { data: effectiveUser } = useQuery({
+		queryKey: computed(() => ['analytics', 'dashboard', effectiveUserId.value, 'user']),
+		queryFn: async () => {
+			try {
+				return await client.labrinth.users_v2.get(effectiveUserId.value ?? '')
+			} catch (error) {
+				if (isUsingDashboardUserOverride.value) {
+					return null
+				}
+
+				throw error
+			}
+		},
+		enabled: shouldFetchEffectiveUser,
+		placeholderData: null,
+	})
+	const effectiveUsername = computed(() => {
+		if (effectiveUserId.value === options.auth.value.user?.id) {
+			return (
+				options.auth.value.user?.username ??
+				effectiveUser.value?.username ??
+				effectiveUserId.value ??
+				'User'
+			)
+		}
+
+		return effectiveUser.value?.username ?? effectiveUserId.value ?? 'User'
+	})
+
+	const { data: userProjects, isFetched: hasFetchedUserProjects } = useQuery({
+		queryKey: computed(() => ['analytics', 'dashboard', effectiveUserId.value, 'projects']),
+		queryFn: async () => {
+			try {
+				return await client.labrinth.users_v2.getProjects(effectiveUserId.value ?? '')
+			} catch (error) {
+				if (isUsingDashboardUserOverride.value) {
+					return []
+				}
+
+				throw error
+			}
+		},
+		enabled: computed(
+			() =>
+				Boolean(effectiveUserId.value) && !hasProjectContext.value && !hasOrganizationContext.value,
+		),
+		placeholderData: [],
+	})
+
+	const { data: userOrganizations, isFetched: hasFetchedUserOrganizations } = useQuery({
+		queryKey: computed(() => ['analytics', 'dashboard', effectiveUserId.value, 'organizations']),
+		queryFn: async () => {
+			try {
+				return await client.labrinth.users_v2.getOrganizations(effectiveUserId.value ?? '')
+			} catch (error) {
+				if (isUsingDashboardUserOverride.value) {
+					return []
+				}
+
+				throw error
+			}
+		},
+		enabled: computed(
+			() =>
+				Boolean(effectiveUserId.value) && !hasProjectContext.value && !hasOrganizationContext.value,
+		),
+		placeholderData: [],
+	})
+
+	const userOrganizationIds = computed(() =>
+		(userOrganizations.value ?? []).map((organization) => organization.id),
+	)
+	const userProjectOrganizationIds = computed(() => {
+		const organizationIds: string[] = []
+		const seenOrganizationIds = new Set<string>()
+
+		for (const project of userProjects.value ?? []) {
+			const organizationId = getProjectOrganizationId(project)
+			if (!organizationId || seenOrganizationIds.has(organizationId)) {
+				continue
+			}
+
+			seenOrganizationIds.add(organizationId)
+			organizationIds.push(organizationId)
+		}
+
+		return organizationIds
+	})
+	const extraUserProjectOrganizationIds = computed(() => {
+		const organizationIds = new Set(userOrganizationIds.value)
+		return userProjectOrganizationIds.value.filter(
+			(organizationId) => !organizationIds.has(organizationId),
+		)
+	})
+
+	const {
+		data: extraUserProjectOrganizations,
+		isFetched: hasFetchedExtraUserProjectOrganizations,
+	} = useQuery({
+		queryKey: computed(() => [
+			'analytics',
+			'dashboard',
+			effectiveUserId.value,
+			'project-organizations',
+			extraUserProjectOrganizationIds.value,
+		]),
+		queryFn: async () => {
+			try {
+				return await client.labrinth.organizations_v3.getMultiple(
+					extraUserProjectOrganizationIds.value,
+				)
+			} catch (error) {
+				if (isUsingDashboardUserOverride.value) {
+					return []
+				}
+
+				throw error
+			}
+		},
+		enabled: computed(
+			() =>
+				Boolean(effectiveUserId.value) &&
+				hasFetchedUserProjects.value &&
+				extraUserProjectOrganizationIds.value.length > 0 &&
+				!hasProjectContext.value &&
+				!hasOrganizationContext.value,
+		),
+		placeholderData: [],
+	})
+
+	const { data: userOrganizationProjects, isFetched: hasFetchedUserOrganizationProjects } =
+		useQuery({
+			queryKey: computed(() => [
+				'analytics',
+				'dashboard',
+				effectiveUserId.value,
+				'organization-projects',
+				userOrganizationIds.value,
+			]),
+			queryFn: async () =>
+				Promise.all(
+					(userOrganizations.value ?? []).map(async (organization) => {
+						try {
+							return {
+								organization,
+								projects: await client.labrinth.organizations_v3.getProjects(organization.id),
+							}
+						} catch (error) {
+							if (isUsingDashboardUserOverride.value) {
+								return {
+									organization,
+									projects: [],
+								}
+							}
+
+							throw error
+						}
+					}),
+				),
+			enabled: computed(
+				() =>
+					Boolean(effectiveUserId.value) &&
+					hasFetchedUserOrganizations.value &&
+					!hasProjectContext.value &&
+					!hasOrganizationContext.value,
+			),
+			placeholderData: [],
+		})
+
+	const areProjectsLoaded = computed(() => {
+		if (hasProjectContext.value) {
+			return true
+		}
+
+		if (hasOrganizationContext.value) {
+			return options.organizationContext?.projects.value !== null
+		}
+
+		const areExtraUserProjectOrganizationsLoaded =
+			extraUserProjectOrganizationIds.value.length === 0 ||
+			hasFetchedExtraUserProjectOrganizations.value
+
+		return (
+			hasFetchedUserProjects.value &&
+			hasFetchedUserOrganizations.value &&
+			hasFetchedUserOrganizationProjects.value &&
+			areExtraUserProjectOrganizationsLoaded
+		)
+	})
+
+	const projectGroups = computed<AnalyticsDashboardProjectGroup[]>(() => {
+		if (hasProjectContext.value && options.projectPageContext) {
+			const project = options.projectPageContext.projectV2.value
+			return project && isAnalyticsEligibleProject(project)
+				? [
+						{
+							projects: [toAnalyticsDashboardProject(project)],
+						},
+					]
+				: []
+		}
+
+		if (hasOrganizationContext.value && options.organizationContext?.projects.value) {
+			return [
+				{
+					projects: getUniqueAnalyticsDashboardProjects(
+						options.organizationContext.projects.value,
+						new Set(),
+					),
+				},
+			]
+		}
+
+		const seenProjectIds = new Set<string>()
+		const personalProjects = getUniqueAnalyticsDashboardProjects(
+			(userProjects.value ?? []).filter((project) => !getProjectOrganizationId(project)),
+			seenProjectIds,
+		)
+		const organizationGroups: AnalyticsDashboardProjectGroup[] = []
+
+		const userProjectsByOrganizationId = new Map<string, AnalyticsDashboardProjectSource[]>()
+		for (const project of userProjects.value ?? []) {
+			const organizationId = getProjectOrganizationId(project)
+			if (!organizationId) {
+				continue
+			}
+
+			const projects = userProjectsByOrganizationId.get(organizationId) ?? []
+			projects.push(project)
+			userProjectsByOrganizationId.set(organizationId, projects)
+		}
+
+		const organizationProjectsById = new Map<string, AnalyticsDashboardProjectSource[]>()
+		for (const group of userOrganizationProjects.value ?? []) {
+			organizationProjectsById.set(group.organization.id, group.projects)
+		}
+
+		const organizationNamesById = new Map<string, string>()
+		const orderedOrganizationIds: string[] = []
+		for (const organization of userOrganizations.value ?? []) {
+			organizationNamesById.set(organization.id, organization.name)
+			orderedOrganizationIds.push(organization.id)
+		}
+		for (const organization of extraUserProjectOrganizations.value ?? []) {
+			organizationNamesById.set(organization.id, organization.name)
+			if (!orderedOrganizationIds.includes(organization.id)) {
+				orderedOrganizationIds.push(organization.id)
+			}
+		}
+		for (const organizationId of userProjectOrganizationIds.value) {
+			if (!orderedOrganizationIds.includes(organizationId)) {
+				orderedOrganizationIds.push(organizationId)
+			}
+		}
+
+		for (const organizationId of orderedOrganizationIds) {
+			const projects = getUniqueAnalyticsDashboardProjects(
+				[
+					...(organizationProjectsById.get(organizationId) ?? []),
+					...(userProjectsByOrganizationId.get(organizationId) ?? []),
+				],
+				seenProjectIds,
+			)
+			if (projects.length === 0) {
+				continue
+			}
+
+			organizationGroups.push({
+				key: organizationId,
+				title: organizationNamesById.get(organizationId) ?? organizationId,
+				projects,
+			})
+		}
+
+		if (personalProjects.length === 0) {
+			return organizationGroups
+		}
+
+		return [
+			{
+				key: organizationGroups.length > 0 ? `user-${effectiveUserId.value}` : undefined,
+				title: organizationGroups.length > 0 ? effectiveUsername.value : undefined,
+				projects: personalProjects,
+			},
+			...organizationGroups,
+		]
+	})
+
+	const projects = computed<AnalyticsDashboardProject[]>(() =>
+		projectGroups.value.flatMap((group) => group.projects),
+	)
+
+	const availableProjectIds = computed(() => projects.value.map((project) => project.id))
+	const projectNamesById = computed(
+		() => new Map(projects.value.map((project) => [project.id, project.name])),
+	)
+	const projectIconUrlsById = computed(
+		() =>
+			new Map(
+				projects.value
+					.filter((project) => project.iconUrl)
+					.map((project) => [project.id, project.iconUrl as string]),
+			),
+	)
+	const projectStatusById = computed(
+		() => new Map(projects.value.map((project) => [project.id, project.status])),
+	)
+	const availableProjectStatuses = computed<ProjectStatusFilterValue[]>(() => {
+		const presentStatuses = new Set(projects.value.map((project) => project.status))
+		return PROJECT_STATUS_FILTER_VALUES.filter((status) => presentStatuses.has(status))
+	})
+	const sortedSelectedProjectIds = computed(() => sortStringValues(selectedProjectIds.value))
+	const hasExplicitProjectSelectionQuery = computed(() =>
+		hasAnalyticsProjectSelectionQuery(route.query),
+	)
+	const hasExplicitBreakdownQuery = computed(() => hasAnalyticsBreakdownQuery(route.query))
+	const isAnalyticsQueryBuilderDefault = computed(() => {
+		const isQueryBuilderDefault = isAnalyticsQueryBuilderStateDefault(
+			{
+				selectedProjectIds: selectedProjectIds.value,
+				selectedTimeframeMode: selectedTimeframeMode.value,
+				selectedTimeframe: selectedTimeframe.value,
+				selectedLastTimeframeAmount: selectedLastTimeframeAmount.value,
+				selectedLastTimeframeUnit: selectedLastTimeframeUnit.value,
+				selectedCustomTimeframeStartDate: selectedCustomTimeframeStartDate.value,
+				selectedCustomTimeframeEndDate: selectedCustomTimeframeEndDate.value,
+				selectedGroupBy: selectedGroupBy.value,
+				selectedBreakdown: selectedBreakdown.value,
+				selectedFilters: selectedFilters.value,
+			},
+			availableProjectIds.value,
+		)
+		const isGraphDefault = isAnalyticsGraphStateDefault({
+			activeStat: activeStat.value,
+			activeGraphViewMode: activeGraphViewMode.value,
+			isRatioMode: isRatioMode.value,
+			showChartEvents: showChartEvents.value,
+			showPreviousPeriod: showPreviousPeriod.value,
+			hiddenGraphDatasetIds: hiddenGraphDatasetIds.value,
+			selectedGraphDatasetIds: hasExplicitGraphDatasetSelection.value
+				? selectedGraphDatasetIds.value
+				: null,
+		})
+
+		return isQueryBuilderDefault && isGraphDefault
+	})
+	const isRevenueTimeframeAvailable = computed(
+		() =>
+			getAnalyticsTimeframeDurationMs({
+				mode: selectedTimeframeMode.value,
+				preset: selectedTimeframe.value,
+				lastAmount: selectedLastTimeframeAmount.value,
+				lastUnit: selectedLastTimeframeUnit.value,
+				customStartDate: selectedCustomTimeframeStartDate.value,
+				customEndDate: selectedCustomTimeframeEndDate.value,
+				nowTimestamp: queryRefreshTimestamp.value,
+			}) > REVENUE_MIN_TIMEFRAME_MS,
+	)
+
+	function isAnalyticsDashboardStatAvailableForTimeframe(stat: AnalyticsDashboardStat): boolean {
+		return stat !== 'revenue' || isRevenueTimeframeAvailable.value
+	}
+
+	function getRelevantAnalyticsDashboardStats(
+		breakdown: AnalyticsBreakdownPreset,
+		filters: AnalyticsSelectedFilters = selectedFilters.value,
+	): readonly AnalyticsDashboardStat[] {
+		return getEnabledAnalyticsStatsForState(breakdown, filters).filter((stat) =>
+			isAnalyticsDashboardStatAvailableForTimeframe(stat),
+		)
+	}
+
+	function isAnalyticsDashboardStatRelevant(
+		stat: AnalyticsDashboardStat,
+		breakdown: AnalyticsBreakdownPreset,
+		filters: AnalyticsSelectedFilters = selectedFilters.value,
+	): boolean {
+		return getRelevantAnalyticsDashboardStats(breakdown, filters).includes(stat)
+	}
+
+	function sanitizeAnalyticsSelectedFiltersForContext(
+		breakdown: AnalyticsBreakdownPreset,
+		filters: AnalyticsSelectedFilters,
+	): AnalyticsSelectedFilters {
+		const nextFilters = sanitizeAnalyticsSelectedFilters(breakdown, filters)
+		if (hasProjectContext.value && nextFilters.project_status.length > 0) {
+			return {
+				...nextFilters,
+				project_status: [],
+			}
+		}
+
+		return nextFilters
+	}
+
+	function replaceNextAnalyticsRouteNavigation() {
+		nextAnalyticsRouteNavigationMode = 'replace'
+	}
+
+	function consumeAnalyticsRouteNavigationMode(): AnalyticsQueryBuilderRouteNavigationMode {
+		const navigationMode = nextAnalyticsRouteNavigationMode
+		nextAnalyticsRouteNavigationMode = 'push'
+		return navigationMode
+	}
+
+	function getSelectedAnalyticsQueryBuilderState() {
+		return {
+			selectedProjectIds: selectedProjectIds.value,
+			selectedTimeframeMode: selectedTimeframeMode.value,
+			selectedTimeframe: selectedTimeframe.value,
+			selectedLastTimeframeAmount: selectedLastTimeframeAmount.value,
+			selectedLastTimeframeUnit: selectedLastTimeframeUnit.value,
+			selectedCustomTimeframeStartDate: selectedCustomTimeframeStartDate.value,
+			selectedCustomTimeframeEndDate: selectedCustomTimeframeEndDate.value,
+			selectedGroupBy: selectedGroupBy.value,
+			selectedBreakdown: selectedBreakdown.value,
+			selectedFilters: selectedFilters.value,
+		}
+	}
+
+	function getSelectedAnalyticsGraphState() {
+		return {
+			activeStat: activeStat.value,
+			activeGraphViewMode: activeGraphViewMode.value,
+			isRatioMode: isRatioMode.value,
+			showChartEvents: showChartEvents.value,
+			showPreviousPeriod: showPreviousPeriod.value,
+			hiddenGraphDatasetIds: hiddenGraphDatasetIds.value,
+			selectedGraphDatasetIds: hasExplicitGraphDatasetSelection.value
+				? selectedGraphDatasetIds.value
+				: null,
+		}
+	}
+
+	function syncAnalyticsRouteQuery(navigationMode: AnalyticsQueryBuilderRouteNavigationMode) {
+		if (import.meta.server) {
+			return
+		}
+
+		const nextRouteQuery = buildAnalyticsQueryBuilderRouteQuery(
+			route.query,
+			getSelectedAnalyticsQueryBuilderState(),
+			availableProjectIds.value,
+			getSelectedAnalyticsGraphState(),
+		)
+
+		const hasAnalyticsQueryChange = hasAnalyticsQueryBuilderRouteChange(route.query, nextRouteQuery)
+
+		if (!hasAnalyticsQueryChange) return
+
+		if (navigationMode === 'replace') {
+			router.replace({
+				path: route.path,
+				query: nextRouteQuery,
+			})
+		} else {
+			router.push({
+				path: route.path,
+				query: nextRouteQuery,
+			})
+		}
+	}
+
+	function reconcileRevenueGroupBy(nextActiveStat: AnalyticsDashboardStat) {
+		if (nextActiveStat === 'revenue') {
+			if (!isRevenueHourlyGroupBy(selectedGroupBy.value)) {
+				if (selectedGroupBy.value !== REVENUE_GROUP_BY_FALLBACK) {
+					revenueHourlyGroupByBeforeOverride = null
+				}
+				return
+			}
+
+			revenueHourlyGroupByBeforeOverride = selectedGroupBy.value
+			replaceNextAnalyticsRouteNavigation()
+			selectedGroupBy.value = REVENUE_GROUP_BY_FALLBACK
+			return
+		}
+
+		const groupByBeforeRevenue = revenueHourlyGroupByBeforeOverride
+		revenueHourlyGroupByBeforeOverride = null
+		if (groupByBeforeRevenue && selectedGroupBy.value === REVENUE_GROUP_BY_FALLBACK) {
+			replaceNextAnalyticsRouteNavigation()
+			selectedGroupBy.value = groupByBeforeRevenue
+		}
+	}
+
+	watch(
+		[selectedBreakdown, selectedFilters, activeStat, isRevenueTimeframeAvailable],
+		([nextBreakdown, nextFilters, nextActiveStat]) => {
+			if (isAnalyticsDashboardStatRelevant(nextActiveStat, nextBreakdown, nextFilters)) {
+				return
+			}
+
+			const fallbackStat = getRelevantAnalyticsDashboardStats(nextBreakdown, nextFilters)[0]
+			if (fallbackStat && fallbackStat !== nextActiveStat) {
+				activeStat.value = fallbackStat
+			}
+		},
+		{ deep: true, immediate: true },
+	)
+
+	watch(
+		[selectedBreakdown, selectedFilters],
+		([nextBreakdown, nextFilters]) => {
+			const sanitizedFilters = sanitizeAnalyticsSelectedFiltersForContext(
+				nextBreakdown,
+				nextFilters,
+			)
+			if (!areSelectedFiltersEqual(nextFilters, sanitizedFilters)) {
+				replaceNextAnalyticsRouteNavigation()
+				selectedFilters.value = sanitizedFilters
+			}
+		},
+		{ deep: true, immediate: true },
+	)
+
+	watch(
+		[projects, areProjectsLoaded],
+		([nextProjects, nextAreProjectsLoaded]) => {
+			if (nextProjects.length === 0) {
+				if (nextAreProjectsLoaded && selectedProjectIds.value.length > 0) {
+					replaceNextAnalyticsRouteNavigation()
+					selectedProjectIds.value = []
+				}
+				return
+			}
+
+			const availableProjectIds = new Set(nextProjects.map((project) => project.id))
+			if (!hasExplicitProjectSelectionQuery.value) {
+				const nextSelectedProjectIds = nextProjects.map((project) => project.id)
+				if (!areStringArraysEqual(selectedProjectIds.value, nextSelectedProjectIds)) {
+					replaceNextAnalyticsRouteNavigation()
+					selectedProjectIds.value = nextSelectedProjectIds
+				}
+				return
+			}
+
+			const retainedSelection = selectedProjectIds.value.filter((id) => availableProjectIds.has(id))
+			const nextSelectedProjectIds =
+				retainedSelection.length > 0 ? retainedSelection : nextProjects.map((project) => project.id)
+
+			if (!areStringArraysEqual(selectedProjectIds.value, nextSelectedProjectIds)) {
+				replaceNextAnalyticsRouteNavigation()
+				selectedProjectIds.value = nextSelectedProjectIds
+			}
+		},
+		{ immediate: true },
+	)
+
+	watch(
+		[selectedProjectIds, hasExplicitBreakdownQuery],
+		([nextSelectedProjectIds, nextHasExplicitBreakdownQuery]) => {
+			const validBreakdown = getAnalyticsBreakdownPresetForProjectSelection(
+				selectedBreakdown.value,
+				nextSelectedProjectIds,
+			)
+			if (selectedBreakdown.value !== validBreakdown) {
+				replaceNextAnalyticsRouteNavigation()
+				selectedBreakdown.value = validBreakdown
+				return
+			}
+
+			const defaultBreakdown = getDefaultAnalyticsBreakdownPreset(nextSelectedProjectIds)
+			if (!nextHasExplicitBreakdownQuery && selectedBreakdown.value !== defaultBreakdown) {
+				replaceNextAnalyticsRouteNavigation()
+				selectedBreakdown.value = defaultBreakdown
+			}
+		},
+		{ deep: true, immediate: true },
+	)
+
+	watch(
+		() => route.query,
+		(nextQuery) => {
+			const nextQueryState = readAnalyticsQueryBuilderState(nextQuery, availableProjectIds.value)
+			const nextGraphState = readAnalyticsGraphState(nextQuery)
+			const availableProjectIdSet = new Set(availableProjectIds.value)
+			const nextSelectedProjectIds = nextQueryState.selectedProjectIds.filter((projectId) =>
+				availableProjectIdSet.has(projectId),
+			)
+			const nextSelectedBreakdown = getAnalyticsBreakdownPresetForProjectSelection(
+				nextQueryState.selectedBreakdown,
+				nextSelectedProjectIds,
+			)
+			const nextSelectedFilters = sanitizeAnalyticsSelectedFiltersForContext(
+				nextSelectedBreakdown,
+				nextQueryState.selectedFilters,
+			)
+			const shouldUpdateSelectedProjectIds = !areStringArraysEqual(
+				selectedProjectIds.value,
+				nextSelectedProjectIds,
+			)
+			const shouldUpdateSelectedTimeframeMode =
+				selectedTimeframeMode.value !== nextQueryState.selectedTimeframeMode
+			const shouldUpdateSelectedTimeframe =
+				selectedTimeframe.value !== nextQueryState.selectedTimeframe
+			const shouldUpdateSelectedLastTimeframeAmount =
+				selectedLastTimeframeAmount.value !== nextQueryState.selectedLastTimeframeAmount
+			const shouldUpdateSelectedLastTimeframeUnit =
+				selectedLastTimeframeUnit.value !== nextQueryState.selectedLastTimeframeUnit
+			const shouldUpdateSelectedCustomTimeframeStartDate =
+				selectedCustomTimeframeStartDate.value !== nextQueryState.selectedCustomTimeframeStartDate
+			const shouldUpdateSelectedCustomTimeframeEndDate =
+				selectedCustomTimeframeEndDate.value !== nextQueryState.selectedCustomTimeframeEndDate
+			const shouldUpdateSelectedGroupBy = selectedGroupBy.value !== nextQueryState.selectedGroupBy
+			const shouldUpdateSelectedBreakdown = selectedBreakdown.value !== nextSelectedBreakdown
+			const shouldUpdateSelectedFilters = !areSelectedFiltersEqual(
+				selectedFilters.value,
+				nextSelectedFilters,
+			)
+			const shouldUpdateActiveStat = activeStat.value !== nextGraphState.activeStat
+			const shouldUpdateActiveGraphViewMode =
+				activeGraphViewMode.value !== nextGraphState.activeGraphViewMode
+			const shouldUpdateIsRatioMode = isRatioMode.value !== nextGraphState.isRatioMode
+			const shouldUpdateShowChartEvents = showChartEvents.value !== nextGraphState.showChartEvents
+			const shouldUpdateShowPreviousPeriod =
+				showPreviousPeriod.value !== nextGraphState.showPreviousPeriod
+			const shouldUpdateHiddenGraphDatasetIds = !areStringArraysEqual(
+				hiddenGraphDatasetIds.value,
+				nextGraphState.hiddenGraphDatasetIds,
+			)
+			const nextHasExplicitGraphDatasetSelection = nextGraphState.selectedGraphDatasetIds !== null
+			const nextSelectedGraphDatasetIds = nextGraphState.selectedGraphDatasetIds ?? []
+			const shouldUpdateHasExplicitGraphDatasetSelection =
+				hasExplicitGraphDatasetSelection.value !== nextHasExplicitGraphDatasetSelection
+			const shouldUpdateSelectedGraphDatasetIds =
+				(nextHasExplicitGraphDatasetSelection || hasExplicitGraphDatasetSelection.value) &&
+				!areStringArraysEqual(selectedGraphDatasetIds.value, nextSelectedGraphDatasetIds)
+			const hasRouteStateUpdate =
+				shouldUpdateSelectedProjectIds ||
+				shouldUpdateSelectedTimeframeMode ||
+				shouldUpdateSelectedTimeframe ||
+				shouldUpdateSelectedLastTimeframeAmount ||
+				shouldUpdateSelectedLastTimeframeUnit ||
+				shouldUpdateSelectedCustomTimeframeStartDate ||
+				shouldUpdateSelectedCustomTimeframeEndDate ||
+				shouldUpdateSelectedGroupBy ||
+				shouldUpdateSelectedBreakdown ||
+				shouldUpdateSelectedFilters ||
+				shouldUpdateActiveStat ||
+				shouldUpdateActiveGraphViewMode ||
+				shouldUpdateIsRatioMode ||
+				shouldUpdateShowChartEvents ||
+				shouldUpdateShowPreviousPeriod ||
+				shouldUpdateHiddenGraphDatasetIds ||
+				shouldUpdateHasExplicitGraphDatasetSelection ||
+				shouldUpdateSelectedGraphDatasetIds
+
+			if (hasRouteStateUpdate) {
+				replaceNextAnalyticsRouteNavigation()
+			}
+
+			if (shouldUpdateSelectedProjectIds) {
+				selectedProjectIds.value = nextSelectedProjectIds
+			}
+			if (shouldUpdateSelectedTimeframeMode) {
+				selectedTimeframeMode.value = nextQueryState.selectedTimeframeMode
+			}
+			if (shouldUpdateSelectedTimeframe) {
+				selectedTimeframe.value = nextQueryState.selectedTimeframe
+			}
+			if (shouldUpdateSelectedLastTimeframeAmount) {
+				selectedLastTimeframeAmount.value = nextQueryState.selectedLastTimeframeAmount
+			}
+			if (shouldUpdateSelectedLastTimeframeUnit) {
+				selectedLastTimeframeUnit.value = nextQueryState.selectedLastTimeframeUnit
+			}
+			if (shouldUpdateSelectedCustomTimeframeStartDate) {
+				selectedCustomTimeframeStartDate.value = nextQueryState.selectedCustomTimeframeStartDate
+			}
+			if (shouldUpdateSelectedCustomTimeframeEndDate) {
+				selectedCustomTimeframeEndDate.value = nextQueryState.selectedCustomTimeframeEndDate
+			}
+			if (shouldUpdateSelectedGroupBy) {
+				selectedGroupBy.value = nextQueryState.selectedGroupBy
+			}
+			if (shouldUpdateSelectedBreakdown) {
+				selectedBreakdown.value = nextSelectedBreakdown
+			}
+			if (shouldUpdateSelectedFilters) {
+				selectedFilters.value = nextSelectedFilters
+			}
+			if (shouldUpdateActiveStat) {
+				activeStat.value = nextGraphState.activeStat
+			}
+			if (shouldUpdateActiveGraphViewMode) {
+				activeGraphViewMode.value = nextGraphState.activeGraphViewMode
+			}
+			if (shouldUpdateIsRatioMode) {
+				isRatioMode.value = nextGraphState.isRatioMode
+			}
+			if (shouldUpdateShowChartEvents) {
+				showChartEvents.value = nextGraphState.showChartEvents
+			}
+			if (shouldUpdateShowPreviousPeriod) {
+				showPreviousPeriod.value = nextGraphState.showPreviousPeriod
+			}
+			if (shouldUpdateHiddenGraphDatasetIds) {
+				hiddenGraphDatasetIds.value = nextGraphState.hiddenGraphDatasetIds
+			}
+			if (shouldUpdateHasExplicitGraphDatasetSelection) {
+				hasExplicitGraphDatasetSelection.value = nextHasExplicitGraphDatasetSelection
+			}
+			if (shouldUpdateSelectedGraphDatasetIds) {
+				selectedGraphDatasetIds.value = nextSelectedGraphDatasetIds
+			}
+
+			if (!hasRouteStateUpdate) {
+				syncAnalyticsRouteQuery('replace')
+			}
+		},
+	)
+
+	watch(
+		[activeStat, selectedGroupBy],
+		([nextActiveStat]) => {
+			reconcileRevenueGroupBy(nextActiveStat)
+		},
+		{ flush: 'sync', immediate: true },
+	)
+
+	watch(
+		[
+			selectedProjectIds,
+			selectedTimeframeMode,
+			selectedTimeframe,
+			selectedLastTimeframeAmount,
+			selectedLastTimeframeUnit,
+			selectedCustomTimeframeStartDate,
+			selectedCustomTimeframeEndDate,
+			selectedGroupBy,
+			selectedBreakdown,
+			selectedFilters,
+			availableProjectIds,
+		],
+		() => {
+			syncAnalyticsRouteQuery(consumeAnalyticsRouteNavigationMode())
+		},
+		{ deep: true, immediate: true },
+	)
+
+	watch(
+		[
+			activeStat,
+			activeGraphViewMode,
+			isRatioMode,
+			showChartEvents,
+			showPreviousPeriod,
+			hiddenGraphDatasetIds,
+			hasExplicitGraphDatasetSelection,
+			selectedGraphDatasetIds,
+		],
+		() => {
+			syncAnalyticsRouteQuery('replace')
+		},
+		{ deep: true },
+	)
+
+	const comparisonFetchRequest = computed(() => buildComparisonFetchRequest(fetchRequest.value))
+	const analyticsTimeSlicesFetchRequest = computed(
+		() => comparisonFetchRequest.value ?? fetchRequest.value,
+	)
+	const hasPreviousPeriodComparison = computed(() => comparisonFetchRequest.value !== null)
+
+	const {
+		data: currentTimeSliceData,
+		isPending: currentTimeSlicePending,
+		isFetching: currentFetching,
+		refetch: refetchCurrentTimeSlices,
+	} = useQuery({
+		queryKey: computed(() =>
+			buildAnalyticsCurrentTimeSlicesQueryKey(
+				analyticsQueryUserId.value,
+				analyticsTimeSlicesFetchRequest.value,
+				queryRefreshTimestamp.value,
+			),
+		),
+		queryFn: () => {
+			const nextFetchRequest = analyticsTimeSlicesFetchRequest.value
+			if (!isAnalyticsFetchRequestReady(nextFetchRequest)) {
+				return []
+			}
+
+			return fetchAnalyticsTimeSlices(nextFetchRequest, (request) =>
+				client.labrinth.analytics_v3.fetch(request),
+			)
+		},
+		enabled: computed(() => isAnalyticsFetchRequestReady(analyticsTimeSlicesFetchRequest.value)),
+		gcTime: ANALYTICS_TIME_SLICES_GC_TIME_MS,
+	})
+	const isCurrentTimeSliceLoading = computed(
+		() =>
+			isAnalyticsFetchRequestReady(analyticsTimeSlicesFetchRequest.value) &&
+			currentTimeSlicePending.value,
+	)
+	const hasCompletedCurrentTimeSliceFetch = computed(
+		() =>
+			isAnalyticsFetchRequestReady(analyticsTimeSlicesFetchRequest.value) &&
+			currentTimeSliceData.value !== undefined &&
+			!currentTimeSlicePending.value &&
+			!currentFetching.value,
+	)
+	const revenueDailyPrefetchRequest = computed<Labrinth.Analytics.v3.FetchRequest | null>(() => {
+		if (!isRevenueHourlyGroupBy(selectedGroupBy.value)) {
+			return null
+		}
+		if (
+			!isAnalyticsDashboardStatRelevant('revenue', selectedBreakdown.value, selectedFilters.value)
+		) {
+			return null
+		}
+
+		const dailyFetchRequest = buildDailyAnalyticsFetchRequest(fetchRequest.value)
+		return buildComparisonFetchRequest(dailyFetchRequest) ?? dailyFetchRequest
+	})
+
+	watch(
+		[
+			revenueDailyPrefetchRequest,
+			analyticsQueryUserId,
+			queryRefreshTimestamp,
+			hasCompletedCurrentTimeSliceFetch,
+		],
+		([
+			nextFetchRequest,
+			nextAnalyticsQueryUserId,
+			nextQueryRefreshTimestamp,
+			hasCompletedCurrentFetch,
+		]) => {
+			if (!isAnalyticsFetchRequestReady(nextFetchRequest) || !hasCompletedCurrentFetch) {
+				return
+			}
+
+			void queryClient
+				.prefetchQuery({
+					queryKey: buildAnalyticsCurrentTimeSlicesQueryKey(
+						nextAnalyticsQueryUserId,
+						nextFetchRequest,
+						nextQueryRefreshTimestamp,
+					),
+					queryFn: () =>
+						fetchAnalyticsTimeSlices(nextFetchRequest, (request) =>
+							client.labrinth.analytics_v3.fetch(request),
+						),
+					gcTime: ANALYTICS_PREFETCH_GC_TIME_MS,
+				})
+				.catch(() => {})
+		},
+		{ deep: true, immediate: true },
+	)
+
+	const analyticsFilterOptionsRequests = computed<Labrinth.Analytics.v3.FetchRequest[] | null>(
+		() => {
+			if (sortedSelectedProjectIds.value.length === 0) {
+				return null
+			}
+
+			return buildAnalyticsFilterOptionsRequests(
+				sortedSelectedProjectIds.value,
+				new Date(queryRefreshTimestamp.value).toISOString(),
+			)
+		},
+	)
+
+	const {
+		data: analyticsFilterOptionsData,
+		isFetched: hasFetchedAnalyticsFilterOptions,
+		isFetching: isAnalyticsFilterOptionsFetching,
+	} = useQuery({
+		queryKey: computed(() => [
+			'analytics',
+			'dashboard',
+			analyticsQueryUserId.value,
+			'filter-options',
+			'analytics-fields',
+			sortedSelectedProjectIds.value,
+			queryRefreshTimestamp.value,
+		]),
+		queryFn: async () => {
+			const requests = (analyticsFilterOptionsRequests.value ?? []).filter(
+				isAnalyticsFetchRequestReady,
+			)
+			const timeSliceGroups = await Promise.all(
+				requests.map((request) =>
+					fetchAnalyticsTimeSlices(request, (nextRequest) =>
+						client.labrinth.analytics_v3.fetch(nextRequest),
+					),
+				),
+			)
+			return timeSliceGroups.flat()
+		},
+		enabled: computed(
+			() =>
+				analyticsFilterOptionsRequests.value !== null && hasCompletedCurrentTimeSliceFetch.value,
+		),
+		gcTime: ANALYTICS_FILTER_OPTIONS_GC_TIME_MS,
+	})
+
+	const { data: filterOptionProjectVersions, isFetched: hasFetchedFilterOptionProjectVersions } =
+		useQuery({
+			queryKey: computed(() => [
+				'analytics',
+				'dashboard',
+				analyticsQueryUserId.value,
+				'filter-options',
+				'versions',
+				sortedSelectedProjectIds.value,
+			]),
+			queryFn: () =>
+				fetchAnalyticsVersionMetadata(
+					sortedSelectedProjectIds.value,
+					(ids) => client.labrinth.projects_v3.getMultiple(ids),
+					(ids) => client.labrinth.versions_v3.getVersions(ids),
+				),
+			enabled: computed(
+				() => sortedSelectedProjectIds.value.length > 0 && hasCompletedCurrentTimeSliceFetch.value,
+			),
+			placeholderData: [],
+			gcTime: ANALYTICS_FILTER_OPTIONS_GC_TIME_MS,
+		})
+
+	const analyticsDataFilterOptionSummary = computed(() =>
+		getAnalyticsDataFilterOptionSummary(analyticsFilterOptionsData.value ?? []),
+	)
+	const projectVersionFilterOptionSummary = computed(() =>
+		getProjectVersionFilterOptionSummary(filterOptionProjectVersions.value ?? []),
+	)
+	const filterOptions = computed<AnalyticsDashboardFilterOptions>(() => ({
+		countries: analyticsDataFilterOptionSummary.value.countries,
+		downloadSources: analyticsDataFilterOptionSummary.value.downloadSources,
+		downloadReasons: analyticsDataFilterOptionSummary.value.downloadReasons,
+		gameVersions: sortStringValues([
+			...new Set([
+				...projectVersionFilterOptionSummary.value.gameVersions,
+				...analyticsDataFilterOptionSummary.value.gameVersions,
+			]),
+		]),
+		loaderTypes: sortStringValues([
+			...new Set([
+				...projectVersionFilterOptionSummary.value.loaderTypes,
+				...analyticsDataFilterOptionSummary.value.loaderTypes,
+			]),
+		]),
+		versionIds: sortStringValues([
+			...new Set([
+				...projectVersionFilterOptionSummary.value.versionIds,
+				...analyticsDataFilterOptionSummary.value.versionIds,
+			]),
+		]),
+	}))
+	const isAnalyticsFilterOptionsLoading = computed(() => isAnalyticsFilterOptionsFetching.value)
+
+	watch(
+		[
+			selectedFilters,
+			filterOptions,
+			hasFetchedFilterOptionProjectVersions,
+			hasFetchedAnalyticsFilterOptions,
+		],
+		([
+			nextSelectedFilters,
+			nextFilterOptions,
+			hasFetchedVersionFilterOptions,
+			hasFetchedAnalyticsOptions,
+		]) => {
+			if (!hasFetchedVersionFilterOptions || !hasFetchedAnalyticsOptions) {
+				return
+			}
+
+			const sanitizedFilters = sanitizeAnalyticsSelectedFiltersForAvailableOptions(
+				nextSelectedFilters,
+				nextFilterOptions,
+			)
+			if (!areSelectedFiltersEqual(nextSelectedFilters, sanitizedFilters)) {
+				selectedFilters.value = sanitizedFilters
+			}
+		},
+		{ deep: true },
+	)
+
+	const timeSlices = shallowRef<Labrinth.Analytics.v3.TimeSlice[]>([])
+	const previousTimeSlices = shallowRef<Labrinth.Analytics.v3.TimeSlice[]>([])
+	const displayedSelectedProjectIds = ref<string[]>([...selectedProjectIds.value])
+	const displayedSelectedGroupBy = ref<AnalyticsGroupByPreset>(selectedGroupBy.value)
+	const displayedSelectedBreakdown = ref<AnalyticsBreakdownPreset>(selectedBreakdown.value)
+	const displayedSelectedFilters = ref<AnalyticsSelectedFilters>(
+		cloneAnalyticsSelectedFilters(selectedFilters.value),
+	)
+	const displayedFetchRequest = ref<Labrinth.Analytics.v3.FetchRequest | null>(
+		cloneAnalyticsFetchRequest(fetchRequest.value),
+	)
+	const displayedFilterOptions = ref<AnalyticsDashboardFilterOptions>(
+		cloneAnalyticsFilterOptions(filterOptions.value),
+	)
+	const displayedTimeSlices = shallowRef<Labrinth.Analytics.v3.TimeSlice[]>([])
+	const displayedPreviousTimeSlices = shallowRef<Labrinth.Analytics.v3.TimeSlice[]>([])
+
+	function commitDisplayedAnalyticsState() {
+		displayedSelectedProjectIds.value = [...selectedProjectIds.value]
+		displayedSelectedGroupBy.value = selectedGroupBy.value
+		displayedSelectedBreakdown.value = selectedBreakdown.value
+		displayedSelectedFilters.value = cloneAnalyticsSelectedFilters(selectedFilters.value)
+		displayedFetchRequest.value = cloneAnalyticsFetchRequest(fetchRequest.value)
+		displayedFilterOptions.value = cloneAnalyticsFilterOptions(filterOptions.value)
+		displayedTimeSlices.value = timeSlices.value
+		displayedPreviousTimeSlices.value = previousTimeSlices.value
+	}
+
+	watch(
+		currentTimeSliceData,
+		(nextTimeSlices) => {
+			if (nextTimeSlices === undefined) {
+				return
+			}
+			const splitTimeSlices = splitAnalyticsTimeSlices(nextTimeSlices, fetchRequest.value)
+			timeSlices.value = splitTimeSlices.currentTimeSlices
+			previousTimeSlices.value = splitTimeSlices.previousTimeSlices
+		},
+		{ immediate: true },
+	)
+
+	watch(fetchRequest, (nextFetchRequest) => {
+		if (isAnalyticsFetchRequestReady(nextFetchRequest)) {
+			previousTimeSlices.value = []
+			return
+		}
+		timeSlices.value = []
+		previousTimeSlices.value = []
+	})
+
+	const analyticsVersionIds = computed(() => {
+		const versionIds = new Set<string>()
+		for (const versionId of selectedFilters.value.version_id) {
+			const normalizedVersionId = versionId.trim()
+			if (normalizedVersionId.length > 0) {
+				versionIds.add(normalizedVersionId)
+			}
+		}
+
+		if (selectedBreakdown.value === 'version_id' || selectedFilters.value.version_id.length > 0) {
+			addVersionIdsFromTimeSlices(versionIds, timeSlices.value)
+			addVersionIdsFromTimeSlices(versionIds, previousTimeSlices.value)
+		}
+
+		return sortStringValues([...versionIds])
+	})
+
+	const { data: versions } = useQuery({
+		queryKey: computed(() => [
+			'analytics',
+			'dashboard',
+			analyticsQueryUserId.value,
+			'versions',
+			analyticsVersionIds.value,
+		]),
+		queryFn: () =>
+			fetchAnalyticsVersionMetadataByIds(analyticsVersionIds.value, (ids) =>
+				client.labrinth.versions_v3.getVersions(ids),
+			),
+		enabled: computed(() => analyticsVersionIds.value.length > 0),
+		placeholderData: [],
+		gcTime: ANALYTICS_FILTER_OPTIONS_GC_TIME_MS,
+	})
+
+	const allVersionMetadata = computed(() => {
+		const versionsById = new Map<string, AnalyticsVersionMetadata>()
+		for (const version of filterOptionProjectVersions.value ?? []) {
+			versionsById.set(version.id, version)
+		}
+		for (const version of versions.value ?? []) {
+			versionsById.set(version.id, version)
+		}
+		return [...versionsById.values()]
+	})
+
+	const versionNumbersById = computed(
+		() => new Map(allVersionMetadata.value.map((version) => [version.id, version.versionNumber])),
+	)
+	const versionPublishedDatesById = computed(
+		() => new Map(allVersionMetadata.value.map((version) => [version.id, version.datePublished])),
+	)
+	const versionProjectNamesById = computed(() => {
+		const projectNames = projectNamesById.value
+		const versionProjectNames = new Map<string, string>()
+		for (const version of allVersionMetadata.value) {
+			const projectName = projectNames.get(version.projectId)
+			if (projectName) {
+				versionProjectNames.set(version.id, projectName)
+			}
+		}
+		addVersionProjectNamesFromTimeSlices(versionProjectNames, timeSlices.value, projectNames)
+		addVersionProjectNamesFromTimeSlices(
+			versionProjectNames,
+			previousTimeSlices.value,
+			projectNames,
+		)
+		return versionProjectNames
+	})
+	const versionProjectIconUrlsById = computed(() => {
+		const projectIconUrls = projectIconUrlsById.value
+		const versionProjectIconUrls = new Map<string, string>()
+		for (const version of allVersionMetadata.value) {
+			const projectIconUrl = projectIconUrls.get(version.projectId)
+			if (projectIconUrl) {
+				versionProjectIconUrls.set(version.id, projectIconUrl)
+			}
+		}
+		return versionProjectIconUrls
+	})
+	const projectVersionDownloadsById = computed(
+		() => new Map(allVersionMetadata.value.map((version) => [version.id, version.downloads])),
+	)
+	const countryDownloadsByCode = computed(
+		() => analyticsDataFilterOptionSummary.value.countryDownloadsByCode,
+	)
+	const gameVersionDownloadsByVersion = computed(() => {
+		const downloadsByVersion = new Map<string, number>()
+
+		for (const version of allVersionMetadata.value) {
+			for (const gameVersion of version.gameVersions) {
+				const normalizedGameVersion = gameVersion.trim()
+				if (normalizedGameVersion.length === 0) {
+					continue
+				}
+
+				downloadsByVersion.set(
+					normalizedGameVersion,
+					(downloadsByVersion.get(normalizedGameVersion) ?? 0) + version.downloads,
+				)
+			}
+		}
+
+		return downloadsByVersion
+	})
+
+	const selectedProjectIdSet = computed(() => new Set(selectedProjectIds.value))
+	const availableProjectIdSet = computed(() => new Set(availableProjectIds.value))
+
+	const currentTotals = computed<AnalyticsDashboardTotals>(() =>
+		computeTotals(
+			timeSlices.value,
+			selectedProjectIdSet.value,
+			availableProjectIdSet.value,
+			projectStatusById.value,
+			selectedFilters.value,
+		),
+	)
+	const previousTotals = computed<AnalyticsDashboardTotals>(() =>
+		computeTotals(
+			previousTimeSlices.value,
+			selectedProjectIdSet.value,
+			availableProjectIdSet.value,
+			projectStatusById.value,
+			selectedFilters.value,
+		),
+	)
+
+	const percentChanges = computed<AnalyticsDashboardPercentChanges>(() => ({
+		views: getPercentChange(currentTotals.value.views, previousTotals.value.views),
+		downloads: getPercentChange(currentTotals.value.downloads, previousTotals.value.downloads),
+		revenue: getPercentChange(currentTotals.value.revenue, previousTotals.value.revenue),
+		playtime: getPercentChange(currentTotals.value.playtime, previousTotals.value.playtime),
+	}))
+
+	const isLoading = computed(() => isCurrentTimeSliceLoading.value)
+	const isRefetching = computed(() => currentFetching.value)
+	watch(
+		[
+			isLoading,
+			currentTimeSliceData,
+			fetchRequest,
+			selectedProjectIds,
+			selectedGroupBy,
+			selectedBreakdown,
+			selectedFilters,
+			filterOptions,
+		],
+		() => {
+			if (isLoading.value) {
+				return
+			}
+			if (
+				isAnalyticsFetchRequestReady(fetchRequest.value) &&
+				currentTimeSliceData.value === undefined
+			) {
+				return
+			}
+
+			commitDisplayedAnalyticsState()
+		},
+		{ flush: 'post', immediate: true },
+	)
+
+	async function refreshAnalyticsQuery() {
+		if (!isAnalyticsFetchRequestReady(fetchRequest.value)) {
+			return
+		}
+
+		const fetchRequestKey = JSON.stringify(fetchRequest.value)
+		const now = Date.now()
+		queryRefreshTimestamp.value =
+			now > queryRefreshTimestamp.value ? now : queryRefreshTimestamp.value + 1
+		await nextTick()
+
+		if (fetchRequest.value === null || JSON.stringify(fetchRequest.value) !== fetchRequestKey) {
+			return
+		}
+
+		await refetchCurrentTimeSlices()
+	}
+
+	function resetAnalyticsQueryBuilder() {
+		if (isAnalyticsQueryBuilderDefault.value) {
+			return
+		}
+
+		const defaultQueryState = buildDefaultAnalyticsQueryBuilderState(availableProjectIds.value)
+		const defaultGraphState = buildDefaultAnalyticsGraphState()
+
+		selectedProjectIds.value = defaultQueryState.selectedProjectIds
+		selectedTimeframeMode.value = defaultQueryState.selectedTimeframeMode
+		selectedTimeframe.value = defaultQueryState.selectedTimeframe
+		selectedLastTimeframeAmount.value = defaultQueryState.selectedLastTimeframeAmount
+		selectedLastTimeframeUnit.value = defaultQueryState.selectedLastTimeframeUnit
+		selectedCustomTimeframeStartDate.value = defaultQueryState.selectedCustomTimeframeStartDate
+		selectedCustomTimeframeEndDate.value = defaultQueryState.selectedCustomTimeframeEndDate
+		selectedGroupBy.value = defaultQueryState.selectedGroupBy
+		selectedBreakdown.value = defaultQueryState.selectedBreakdown
+		selectedFilters.value = defaultQueryState.selectedFilters
+		activeStat.value = defaultGraphState.activeStat
+		activeGraphViewMode.value = defaultGraphState.activeGraphViewMode
+		isRatioMode.value = defaultGraphState.isRatioMode
+		showChartEvents.value = defaultGraphState.showChartEvents
+		showPreviousPeriod.value = defaultGraphState.showPreviousPeriod
+		hiddenGraphDatasetIds.value = defaultGraphState.hiddenGraphDatasetIds
+		hasExplicitGraphDatasetSelection.value = false
+		isGraphDatasetSelectionActive.value = false
+		selectedGraphDatasetIds.value = []
+		queryResetToken.value += 1
+	}
+
+	function setFetchRequest(nextFetchRequest: Labrinth.Analytics.v3.FetchRequest) {
+		if (areAnalyticsFetchRequestsEqual(fetchRequest.value, nextFetchRequest)) {
+			return
+		}
+
+		fetchRequest.value = nextFetchRequest
+	}
+
+	function getVersionDisplayName(versionId: string): string {
+		return versionNumbersById.value.get(versionId) ?? versionId
+	}
+
+	function getVersionPublishedDate(versionId: string): string | undefined {
+		return versionPublishedDatesById.value.get(versionId)
+	}
+
+	function getVersionProjectName(versionId: string): string | undefined {
+		return versionProjectNamesById.value.get(versionId)
+	}
+
+	function getVersionProjectIconUrl(versionId: string): string | undefined {
+		return versionProjectIconUrlsById.value.get(versionId)
+	}
+
+	function setActiveStat(nextStat: AnalyticsDashboardStat) {
+		if (
+			!isAnalyticsDashboardStatRelevant(nextStat, selectedBreakdown.value, selectedFilters.value)
+		) {
+			return
+		}
+
+		activeStat.value = nextStat
+	}
+
+	return {
+		hasProjectContext,
+		projectGroups,
+		projects,
+		selectedProjectIds,
+		selectedTimeframeMode,
+		selectedTimeframe,
+		selectedLastTimeframeAmount,
+		selectedLastTimeframeUnit,
+		selectedCustomTimeframeStartDate,
+		selectedCustomTimeframeEndDate,
+		selectedGroupBy,
+		selectedBreakdown,
+		selectedFilters,
+		queryRefreshTimestamp,
+		queryResetToken,
+		isAnalyticsQueryBuilderDefault,
+		fetchRequest,
+		displayedSelectedProjectIds,
+		displayedSelectedGroupBy,
+		displayedSelectedBreakdown,
+		displayedSelectedFilters,
+		displayedFetchRequest,
+		displayedFilterOptions,
+		filterOptions,
+		isAnalyticsFilterOptionsLoading,
+		versionNumbersById,
+		versionPublishedDatesById,
+		versionProjectNamesById,
+		versionProjectIconUrlsById,
+		projectStatusById,
+		availableProjectStatuses,
+		projectVersionDownloadsById,
+		gameVersionDownloadsByVersion,
+		countryDownloadsByCode,
+		timeSlices,
+		displayedTimeSlices,
+		previousTimeSlices,
+		displayedPreviousTimeSlices,
+		isLoading,
+		isRefetching,
+		activeStat,
+		activeGraphViewMode,
+		isRatioMode,
+		showChartEvents,
+		showPreviousPeriod,
+		hiddenGraphDatasetIds,
+		hasExplicitGraphDatasetSelection,
+		isGraphDatasetSelectionActive,
+		selectedGraphDatasetIds,
+		currentTotals,
+		previousTotals,
+		percentChanges,
+		hasPreviousPeriodComparison,
+		getRelevantAnalyticsDashboardStats,
+		isAnalyticsDashboardStatRelevant,
+		refreshAnalyticsQuery,
+		resetAnalyticsQueryBuilder,
+		getVersionDisplayName,
+		getVersionPublishedDate,
+		getVersionProjectName,
+		getVersionProjectIconUrl,
+		setFetchRequest,
+		setActiveStat,
+	}
+}
diff --git a/apps/frontend/src/providers/analytics/query-builder-url.ts b/apps/frontend/src/providers/analytics/query-builder-url.ts
new file mode 100644
index 0000000000..f74b272d6f
--- /dev/null
+++ b/apps/frontend/src/providers/analytics/query-builder-url.ts
@@ -0,0 +1,869 @@
+import type { LocationQuery, LocationQueryValue, LocationQueryValueRaw } from 'vue-router'
+
+export type AnalyticsQueryFilterCategory =
+	| 'project'
+	| 'project_status'
+	| 'country'
+	| 'monetization'
+	| 'user_agent'
+	| 'download_reason'
+	| 'version_id'
+	| 'game_version'
+	| 'loader_type'
+
+export type AnalyticsTimeframePreset =
+	| 'today'
+	| 'yesterday'
+	| 'last_7_days'
+	| 'last_14_days'
+	| 'last_30_days'
+	| 'last_90_days'
+	| 'last_180_days'
+	| 'year_to_date'
+	| 'all_time'
+
+export type AnalyticsTimeframeMode = 'preset' | 'last' | 'custom_range' | 'custom_datetime_range'
+export type AnalyticsLastTimeframeUnit = 'hours' | 'days' | 'weeks' | 'months'
+
+export type AnalyticsGroupByPreset = '1h' | '6h' | 'day' | 'week' | 'month' | 'year'
+
+export type AnalyticsBreakdownPreset =
+	| 'none'
+	| 'project'
+	| 'country'
+	| 'monetization'
+	| 'user_agent'
+	| 'download_reason'
+	| 'version_id'
+	| 'loader'
+	| 'game_version'
+
+export type AnalyticsDashboardStat = 'views' | 'downloads' | 'revenue' | 'playtime'
+export type AnalyticsGraphViewMode = 'line' | 'area' | 'bar'
+export type AnalyticsTableSortColumn =
+	| 'date'
+	| 'project'
+	| 'breakdown'
+	| 'views'
+	| 'downloads'
+	| 'revenue'
+	| 'playtime'
+export type AnalyticsTableSortDirection = 'asc' | 'desc'
+
+export type AnalyticsSelectedFilters = Record<AnalyticsQueryFilterCategory, string[]>
+
+export type AnalyticsQueryBuilderState = {
+	selectedProjectIds: string[]
+	selectedTimeframeMode: AnalyticsTimeframeMode
+	selectedTimeframe: AnalyticsTimeframePreset
+	selectedLastTimeframeAmount: number
+	selectedLastTimeframeUnit: AnalyticsLastTimeframeUnit
+	selectedCustomTimeframeStartDate: string
+	selectedCustomTimeframeEndDate: string
+	selectedGroupBy: AnalyticsGroupByPreset
+	selectedBreakdown: AnalyticsBreakdownPreset
+	selectedFilters: AnalyticsSelectedFilters
+}
+
+export type AnalyticsGraphState = {
+	activeStat: AnalyticsDashboardStat
+	activeGraphViewMode: AnalyticsGraphViewMode
+	isRatioMode: boolean
+	showChartEvents: boolean
+	showPreviousPeriod: boolean
+	hiddenGraphDatasetIds: string[]
+	selectedGraphDatasetIds: string[] | null
+}
+
+export type AnalyticsTableSortState = {
+	sortColumn: AnalyticsTableSortColumn | undefined
+	sortDirection: AnalyticsTableSortDirection
+}
+
+type MutableRouteQuery = Record<string, LocationQueryValueRaw | LocationQueryValueRaw[] | undefined>
+
+export const DEFAULT_TIMEFRAME_PRESET: AnalyticsTimeframePreset = 'last_30_days'
+export const DEFAULT_TIMEFRAME_MODE: AnalyticsTimeframeMode = 'preset'
+export const DEFAULT_LAST_TIMEFRAME_AMOUNT = 1
+export const DEFAULT_LAST_TIMEFRAME_UNIT: AnalyticsLastTimeframeUnit = 'days'
+export const DEFAULT_GROUP_BY_PRESET: AnalyticsGroupByPreset = 'day'
+export const DEFAULT_BREAKDOWN_PRESET: AnalyticsBreakdownPreset = 'none'
+export const DEFAULT_ANALYTICS_DASHBOARD_STAT: AnalyticsDashboardStat = 'views'
+export const DEFAULT_ANALYTICS_GRAPH_VIEW_MODE: AnalyticsGraphViewMode = 'line'
+export const DEFAULT_ANALYTICS_GRAPH_RATIO_MODE = false
+export const DEFAULT_ANALYTICS_GRAPH_EVENTS_VISIBILITY = true
+export const DEFAULT_ANALYTICS_GRAPH_PREVIOUS_PERIOD_VISIBILITY = false
+
+const TIMEFRAME_PRESET_VALUES: AnalyticsTimeframePreset[] = [
+	'today',
+	'yesterday',
+	'last_7_days',
+	'last_14_days',
+	'last_30_days',
+	'last_90_days',
+	'last_180_days',
+	'year_to_date',
+	'all_time',
+]
+
+const TIMEFRAME_MODE_VALUES: AnalyticsTimeframeMode[] = [
+	'preset',
+	'last',
+	'custom_range',
+	'custom_datetime_range',
+]
+const LAST_TIMEFRAME_UNIT_VALUES: AnalyticsLastTimeframeUnit[] = [
+	'hours',
+	'days',
+	'weeks',
+	'months',
+]
+
+const GROUP_BY_PRESET_VALUES: AnalyticsGroupByPreset[] = [
+	'1h',
+	'6h',
+	'day',
+	'week',
+	'month',
+	'year',
+]
+
+const BREAKDOWN_PRESET_VALUES: AnalyticsBreakdownPreset[] = [
+	'none',
+	'project',
+	'country',
+	'monetization',
+	'user_agent',
+	'download_reason',
+	'version_id',
+	'loader',
+	'game_version',
+]
+
+const ANALYTICS_DASHBOARD_STAT_VALUES: AnalyticsDashboardStat[] = [
+	'views',
+	'downloads',
+	'revenue',
+	'playtime',
+]
+
+const ANALYTICS_GRAPH_VIEW_MODE_VALUES: AnalyticsGraphViewMode[] = ['line', 'area', 'bar']
+const ANALYTICS_TABLE_SORT_COLUMN_VALUES: AnalyticsTableSortColumn[] = [
+	'date',
+	'project',
+	'breakdown',
+	'views',
+	'downloads',
+	'revenue',
+	'playtime',
+]
+const ANALYTICS_TABLE_SORT_DIRECTION_VALUES: AnalyticsTableSortDirection[] = ['asc', 'desc']
+
+const PROJECT_STATUS_FILTER_VALUES = [
+	'approved',
+	'archived',
+	'rejected',
+	'draft',
+	'unlisted',
+	'withheld',
+	'private',
+	'other',
+]
+
+const QUERY_KEY_PROJECT_IDS = 'a_projects'
+const QUERY_KEY_TIMEFRAME_MODE = 'a_timeframe_mode'
+const QUERY_KEY_TIMEFRAME = 'a_timeframe'
+const QUERY_KEY_TIMEFRAME_LAST_AMOUNT = 'a_timeframe_last_amount'
+const QUERY_KEY_TIMEFRAME_LAST_UNIT = 'a_timeframe_last_unit'
+const QUERY_KEY_TIMEFRAME_START = 'a_timeframe_start'
+const QUERY_KEY_TIMEFRAME_END = 'a_timeframe_end'
+const QUERY_KEY_GROUP_BY = 'a_group_by'
+const QUERY_KEY_BREAKDOWN = 'a_breakdown'
+const QUERY_KEY_FILTER_PROJECT_STATUS = 'a_project_status'
+const QUERY_KEY_FILTER_COUNTRY = 'a_country'
+const QUERY_KEY_FILTER_MONETIZATION = 'a_monetization'
+const QUERY_KEY_FILTER_USER_AGENT = 'a_user_agent'
+const QUERY_KEY_FILTER_LEGACY_DOWNLOAD_SOURCE = 'a_download_source'
+const QUERY_KEY_FILTER_DOWNLOAD_REASON = 'a_download_reason'
+const QUERY_KEY_FILTER_VERSION_ID = 'a_version_id'
+const QUERY_KEY_FILTER_GAME_VERSION = 'a_game_version'
+const QUERY_KEY_FILTER_LOADER_TYPE = 'a_loader_type'
+const QUERY_KEY_STAT = 'a_stat'
+const QUERY_KEY_GRAPH_VIEW_MODE = 'a_chart'
+const QUERY_KEY_GRAPH_RATIO_MODE = 'a_ratio'
+const QUERY_KEY_GRAPH_EVENTS_VISIBILITY = 'a_events'
+const QUERY_KEY_GRAPH_PREVIOUS_PERIOD_VISIBILITY = 'a_prev_period'
+const QUERY_KEY_GRAPH_HIDDEN_SERIES = 'a_hidden_series'
+const QUERY_KEY_GRAPH_SELECTED_SERIES = 'a_selected_series'
+const QUERY_KEY_TABLE_SORT = 'a_table_sort'
+const QUERY_KEY_TABLE_SORT_DIRECTION = 'a_table_sort_direction'
+const QUERY_KEY_LEGACY_GRAPH_TOP_BREAKDOWN_FILTER = 'a_top_breakdown'
+const QUERY_KEY_LEGACY_GRAPH_LEGEND_EXPANSION = 'a_legend_expanded'
+
+const URL_FILTER_CATEGORIES: Exclude<AnalyticsQueryFilterCategory, 'project'>[] = [
+	'project_status',
+	'country',
+	'monetization',
+	'user_agent',
+	'download_reason',
+	'version_id',
+	'game_version',
+	'loader_type',
+]
+
+const FILTER_QUERY_KEY_BY_CATEGORY: Record<
+	Exclude<AnalyticsQueryFilterCategory, 'project'>,
+	string
+> = {
+	project_status: QUERY_KEY_FILTER_PROJECT_STATUS,
+	country: QUERY_KEY_FILTER_COUNTRY,
+	monetization: QUERY_KEY_FILTER_MONETIZATION,
+	user_agent: QUERY_KEY_FILTER_USER_AGENT,
+	download_reason: QUERY_KEY_FILTER_DOWNLOAD_REASON,
+	version_id: QUERY_KEY_FILTER_VERSION_ID,
+	game_version: QUERY_KEY_FILTER_GAME_VERSION,
+	loader_type: QUERY_KEY_FILTER_LOADER_TYPE,
+}
+
+const ANALYTICS_QUERY_KEYS = [
+	QUERY_KEY_PROJECT_IDS,
+	QUERY_KEY_TIMEFRAME_MODE,
+	QUERY_KEY_TIMEFRAME,
+	QUERY_KEY_TIMEFRAME_LAST_AMOUNT,
+	QUERY_KEY_TIMEFRAME_LAST_UNIT,
+	QUERY_KEY_TIMEFRAME_START,
+	QUERY_KEY_TIMEFRAME_END,
+	QUERY_KEY_GROUP_BY,
+	QUERY_KEY_BREAKDOWN,
+	QUERY_KEY_FILTER_PROJECT_STATUS,
+	QUERY_KEY_FILTER_COUNTRY,
+	QUERY_KEY_FILTER_MONETIZATION,
+	QUERY_KEY_FILTER_USER_AGENT,
+	QUERY_KEY_FILTER_LEGACY_DOWNLOAD_SOURCE,
+	QUERY_KEY_FILTER_DOWNLOAD_REASON,
+	QUERY_KEY_FILTER_VERSION_ID,
+	QUERY_KEY_FILTER_GAME_VERSION,
+	QUERY_KEY_FILTER_LOADER_TYPE,
+	QUERY_KEY_STAT,
+	QUERY_KEY_GRAPH_VIEW_MODE,
+	QUERY_KEY_GRAPH_RATIO_MODE,
+	QUERY_KEY_GRAPH_EVENTS_VISIBILITY,
+	QUERY_KEY_GRAPH_PREVIOUS_PERIOD_VISIBILITY,
+	QUERY_KEY_GRAPH_HIDDEN_SERIES,
+	QUERY_KEY_GRAPH_SELECTED_SERIES,
+	QUERY_KEY_LEGACY_GRAPH_TOP_BREAKDOWN_FILTER,
+	QUERY_KEY_LEGACY_GRAPH_LEGEND_EXPANSION,
+]
+
+export function buildEmptySelectedFilters(): AnalyticsSelectedFilters {
+	return {
+		project: [],
+		project_status: [],
+		country: [],
+		monetization: [],
+		user_agent: [],
+		download_reason: [],
+		version_id: [],
+		game_version: [],
+		loader_type: [],
+	}
+}
+
+function parseListQueryValue(
+	value: LocationQueryValue | LocationQueryValue[] | undefined,
+): string[] {
+	if (value === undefined) return []
+
+	const values = Array.isArray(value) ? value : [value]
+	const parsedValues: string[] = []
+	for (const item of values) {
+		if (!item) continue
+		const parts = item.split(',')
+		for (const part of parts) {
+			const trimmed = part.trim()
+			if (trimmed.length > 0) {
+				parsedValues.push(trimmed)
+			}
+		}
+	}
+
+	return Array.from(new Set(parsedValues))
+}
+
+function parseSelectedSeriesQueryValue(
+	value: LocationQueryValue | LocationQueryValue[] | undefined,
+): string[] {
+	return parseListQueryValue(value).filter((item) => item.toLowerCase() !== 'null')
+}
+
+function normalizeFilterQueryValues(
+	category: Exclude<AnalyticsQueryFilterCategory, 'project'>,
+	values: string[],
+): string[] {
+	if (category === 'project_status') {
+		return values
+			.map((value) => value.trim().toLowerCase())
+			.filter((value) => PROJECT_STATUS_FILTER_VALUES.includes(value))
+	}
+
+	if (category !== 'loader_type') {
+		return values
+	}
+
+	return Array.from(
+		new Set(values.map((value) => value.trim().toLowerCase()).filter((value) => value.length > 0)),
+	)
+}
+
+function parsePresetQueryValue<T extends string>(
+	value: LocationQueryValue | LocationQueryValue[] | undefined,
+	allowedValues: readonly T[],
+	fallbackValue: T,
+): T {
+	const rawValue = Array.isArray(value) ? value[0] : value
+	if (!rawValue) return fallbackValue
+	if (!allowedValues.includes(rawValue as T)) return fallbackValue
+	return rawValue as T
+}
+
+function parseAnalyticsBreakdownQueryValue(
+	value: LocationQueryValue | LocationQueryValue[] | undefined,
+	fallbackValue: AnalyticsBreakdownPreset,
+): AnalyticsBreakdownPreset {
+	const rawValue = Array.isArray(value) ? value[0] : value
+	if (rawValue === 'download_source') return 'user_agent'
+	return parsePresetQueryValue(value, BREAKDOWN_PRESET_VALUES, fallbackValue)
+}
+
+function parsePositiveIntegerQueryValue(
+	value: LocationQueryValue | LocationQueryValue[] | undefined,
+	fallbackValue: number,
+): number {
+	const rawValue = Array.isArray(value) ? value[0] : value
+	if (!rawValue) return fallbackValue
+
+	const parsedValue = Number.parseInt(rawValue, 10)
+	if (!Number.isFinite(parsedValue) || parsedValue < 1) return fallbackValue
+	return parsedValue
+}
+
+function parseEnabledQueryValue(
+	value: LocationQueryValue | LocationQueryValue[] | undefined,
+): boolean {
+	const rawValue = Array.isArray(value) ? value[0] : value
+	return rawValue === '1'
+}
+
+function parseVisibleQueryValue(
+	value: LocationQueryValue | LocationQueryValue[] | undefined,
+): boolean {
+	const rawValue = Array.isArray(value) ? value[0] : value
+	return rawValue !== '0'
+}
+
+function getLocalDateQueryValue(date: Date): string {
+	const year = date.getFullYear()
+	const month = String(date.getMonth() + 1).padStart(2, '0')
+	const day = String(date.getDate()).padStart(2, '0')
+	return `${year}-${month}-${day}`
+}
+
+function getDefaultCustomStartDate(): string {
+	const date = new Date()
+	date.setDate(date.getDate() - 1)
+	return getLocalDateQueryValue(date)
+}
+
+function getDefaultCustomEndDate(): string {
+	return getLocalDateQueryValue(new Date())
+}
+
+function getDefaultCustomDateTimeValue(value: string): string {
+	return new Date(`${value}T00:00:00`).toISOString()
+}
+
+function parseDateQueryValue(
+	value: LocationQueryValue | LocationQueryValue[] | undefined,
+	fallbackValue: string,
+): string {
+	const rawValue = Array.isArray(value) ? value[0] : value
+	if (!rawValue || !/^\d{4}-\d{2}-\d{2}$/.test(rawValue)) return fallbackValue
+
+	const date = new Date(`${rawValue}T00:00:00`)
+	if (Number.isNaN(date.getTime())) return fallbackValue
+	if (getLocalDateQueryValue(date) !== rawValue) return fallbackValue
+
+	return rawValue
+}
+
+function parseDateTimeQueryValue(
+	value: LocationQueryValue | LocationQueryValue[] | undefined,
+	fallbackValue: string,
+): string {
+	const rawValue = Array.isArray(value) ? value[0] : value
+	if (!rawValue || !/^\d{4}-\d{2}-\d{2}T/.test(rawValue)) return fallbackValue
+
+	const date = new Date(rawValue)
+	if (Number.isNaN(date.getTime())) return fallbackValue
+
+	return date.toISOString()
+}
+
+function isTimeframeRangeEndBeforeStart(
+	mode: AnalyticsTimeframeMode,
+	startValue: string,
+	endValue: string,
+): boolean {
+	if (mode === 'custom_datetime_range') {
+		return new Date(endValue).getTime() < new Date(startValue).getTime()
+	}
+
+	return endValue < startValue
+}
+
+export function buildDefaultAnalyticsGraphState(): AnalyticsGraphState {
+	return {
+		activeStat: DEFAULT_ANALYTICS_DASHBOARD_STAT,
+		activeGraphViewMode: DEFAULT_ANALYTICS_GRAPH_VIEW_MODE,
+		isRatioMode: DEFAULT_ANALYTICS_GRAPH_RATIO_MODE,
+		showChartEvents: DEFAULT_ANALYTICS_GRAPH_EVENTS_VISIBILITY,
+		showPreviousPeriod: DEFAULT_ANALYTICS_GRAPH_PREVIOUS_PERIOD_VISIBILITY,
+		hiddenGraphDatasetIds: [],
+		selectedGraphDatasetIds: null,
+	}
+}
+
+export function buildDefaultAnalyticsQueryBuilderState(
+	availableProjectIds: string[],
+): AnalyticsQueryBuilderState {
+	return {
+		selectedProjectIds: [...availableProjectIds],
+		selectedTimeframeMode: DEFAULT_TIMEFRAME_MODE,
+		selectedTimeframe: DEFAULT_TIMEFRAME_PRESET,
+		selectedLastTimeframeAmount: DEFAULT_LAST_TIMEFRAME_AMOUNT,
+		selectedLastTimeframeUnit: DEFAULT_LAST_TIMEFRAME_UNIT,
+		selectedCustomTimeframeStartDate: getDefaultCustomStartDate(),
+		selectedCustomTimeframeEndDate: getDefaultCustomEndDate(),
+		selectedGroupBy: DEFAULT_GROUP_BY_PRESET,
+		selectedBreakdown: getDefaultAnalyticsBreakdownPreset(availableProjectIds),
+		selectedFilters: buildEmptySelectedFilters(),
+	}
+}
+
+export function getDefaultAnalyticsBreakdownPreset(
+	selectedProjectIds: readonly string[],
+): AnalyticsBreakdownPreset {
+	return selectedProjectIds.length > 1 ? 'project' : DEFAULT_BREAKDOWN_PRESET
+}
+
+export function getAnalyticsBreakdownPresetForProjectSelection(
+	breakdown: AnalyticsBreakdownPreset,
+	selectedProjectIds: readonly string[],
+): AnalyticsBreakdownPreset {
+	const defaultBreakdown = getDefaultAnalyticsBreakdownPreset(selectedProjectIds)
+	if (
+		(breakdown === 'none' && defaultBreakdown === 'project') ||
+		(breakdown === 'project' && defaultBreakdown === 'none')
+	) {
+		return defaultBreakdown
+	}
+
+	return breakdown
+}
+
+export function isAnalyticsQueryBuilderStateDefault(
+	state: AnalyticsQueryBuilderState,
+	availableProjectIds: string[],
+): boolean {
+	const defaultState = buildDefaultAnalyticsQueryBuilderState(availableProjectIds)
+	const areDefaultProjectsSelected =
+		availableProjectIds.length === 0
+			? state.selectedProjectIds.length === 0
+			: areAllProjectsSelected(state.selectedProjectIds, availableProjectIds)
+
+	return (
+		areDefaultProjectsSelected &&
+		state.selectedTimeframeMode === defaultState.selectedTimeframeMode &&
+		state.selectedTimeframe === defaultState.selectedTimeframe &&
+		state.selectedLastTimeframeAmount === defaultState.selectedLastTimeframeAmount &&
+		state.selectedLastTimeframeUnit === defaultState.selectedLastTimeframeUnit &&
+		state.selectedCustomTimeframeStartDate === defaultState.selectedCustomTimeframeStartDate &&
+		state.selectedCustomTimeframeEndDate === defaultState.selectedCustomTimeframeEndDate &&
+		state.selectedGroupBy === defaultState.selectedGroupBy &&
+		state.selectedBreakdown === getDefaultAnalyticsBreakdownPreset(state.selectedProjectIds) &&
+		areSelectedFiltersEqual(state.selectedFilters, defaultState.selectedFilters)
+	)
+}
+
+export function isAnalyticsGraphStateDefault(state: AnalyticsGraphState): boolean {
+	const defaultState = buildDefaultAnalyticsGraphState()
+
+	return (
+		state.activeStat === defaultState.activeStat &&
+		state.activeGraphViewMode === defaultState.activeGraphViewMode &&
+		state.isRatioMode === defaultState.isRatioMode &&
+		state.showChartEvents === defaultState.showChartEvents &&
+		state.showPreviousPeriod === defaultState.showPreviousPeriod &&
+		areStringArraysEqual(state.hiddenGraphDatasetIds, defaultState.hiddenGraphDatasetIds) &&
+		state.selectedGraphDatasetIds === defaultState.selectedGraphDatasetIds
+	)
+}
+
+function serializeListQueryValue(values: string[]): string | undefined {
+	if (values.length === 0) return undefined
+	return values.join(',')
+}
+
+function serializeExplicitListQueryValue(values: string[]): string {
+	return values.join(',')
+}
+
+function normalizeQueryValue(
+	value:
+		| LocationQueryValue
+		| LocationQueryValue[]
+		| LocationQueryValueRaw
+		| LocationQueryValueRaw[]
+		| undefined,
+): string[] {
+	if (value === undefined || value === null) return []
+	if (Array.isArray(value)) {
+		return value
+			.filter(
+				(item): item is LocationQueryValue | LocationQueryValueRaw =>
+					item !== undefined && item !== null,
+			)
+			.map((item) => String(item))
+	}
+	return [String(value)]
+}
+
+function areQueryValuesEqual(
+	left:
+		| LocationQueryValue
+		| LocationQueryValue[]
+		| LocationQueryValueRaw
+		| LocationQueryValueRaw[]
+		| undefined,
+	right:
+		| LocationQueryValue
+		| LocationQueryValue[]
+		| LocationQueryValueRaw
+		| LocationQueryValueRaw[]
+		| undefined,
+): boolean {
+	const leftValues = normalizeQueryValue(left)
+	const rightValues = normalizeQueryValue(right)
+
+	if (leftValues.length !== rightValues.length) return false
+	for (let index = 0; index < leftValues.length; index += 1) {
+		if (leftValues[index] !== rightValues[index]) return false
+	}
+	return true
+}
+
+export function areStringArraysEqual(left: string[], right: string[]): boolean {
+	if (left.length !== right.length) return false
+	for (let index = 0; index < left.length; index += 1) {
+		if (left[index] !== right[index]) return false
+	}
+	return true
+}
+
+export function areSelectedFiltersEqual(
+	left: AnalyticsSelectedFilters,
+	right: AnalyticsSelectedFilters,
+): boolean {
+	if (!areStringArraysEqual(left.project, right.project)) return false
+	for (const category of URL_FILTER_CATEGORIES) {
+		if (!areStringArraysEqual(left[category], right[category])) return false
+	}
+	return true
+}
+
+function areAllProjectsSelected(selectedProjectIds: string[], allProjectIds: string[]): boolean {
+	if (allProjectIds.length === 0 || selectedProjectIds.length !== allProjectIds.length) {
+		return false
+	}
+	const allProjectIdSet = new Set(allProjectIds)
+	return selectedProjectIds.every((projectId) => allProjectIdSet.has(projectId))
+}
+
+export function readAnalyticsGraphState(query: LocationQuery): AnalyticsGraphState {
+	const defaultState = buildDefaultAnalyticsGraphState()
+
+	return {
+		activeStat: parsePresetQueryValue(
+			query[QUERY_KEY_STAT],
+			ANALYTICS_DASHBOARD_STAT_VALUES,
+			defaultState.activeStat,
+		),
+		activeGraphViewMode: parsePresetQueryValue(
+			query[QUERY_KEY_GRAPH_VIEW_MODE],
+			ANALYTICS_GRAPH_VIEW_MODE_VALUES,
+			defaultState.activeGraphViewMode,
+		),
+		isRatioMode: parseEnabledQueryValue(query[QUERY_KEY_GRAPH_RATIO_MODE]),
+		showChartEvents: parseVisibleQueryValue(query[QUERY_KEY_GRAPH_EVENTS_VISIBILITY]),
+		showPreviousPeriod: parseEnabledQueryValue(query[QUERY_KEY_GRAPH_PREVIOUS_PERIOD_VISIBILITY]),
+		hiddenGraphDatasetIds: parseListQueryValue(query[QUERY_KEY_GRAPH_HIDDEN_SERIES]),
+		selectedGraphDatasetIds:
+			query[QUERY_KEY_GRAPH_SELECTED_SERIES] === undefined
+				? null
+				: parseSelectedSeriesQueryValue(query[QUERY_KEY_GRAPH_SELECTED_SERIES]),
+	}
+}
+
+export function readAnalyticsTableSortState(
+	query: LocationQuery,
+	defaultState: AnalyticsTableSortState,
+): AnalyticsTableSortState {
+	const rawSortColumn = Array.isArray(query[QUERY_KEY_TABLE_SORT])
+		? query[QUERY_KEY_TABLE_SORT][0]
+		: query[QUERY_KEY_TABLE_SORT]
+	const rawSortDirection = Array.isArray(query[QUERY_KEY_TABLE_SORT_DIRECTION])
+		? query[QUERY_KEY_TABLE_SORT_DIRECTION][0]
+		: query[QUERY_KEY_TABLE_SORT_DIRECTION]
+
+	if (
+		!rawSortColumn ||
+		!rawSortDirection ||
+		!ANALYTICS_TABLE_SORT_COLUMN_VALUES.includes(rawSortColumn as AnalyticsTableSortColumn) ||
+		!ANALYTICS_TABLE_SORT_DIRECTION_VALUES.includes(rawSortDirection as AnalyticsTableSortDirection)
+	) {
+		return defaultState
+	}
+
+	return {
+		sortColumn: rawSortColumn as AnalyticsTableSortColumn,
+		sortDirection: rawSortDirection as AnalyticsTableSortDirection,
+	}
+}
+
+export function readAnalyticsQueryBuilderState(
+	query: LocationQuery,
+	availableProjectIds: string[],
+): AnalyticsQueryBuilderState {
+	const defaultState = buildDefaultAnalyticsQueryBuilderState(availableProjectIds)
+	const selectedProjectIdsFromQuery = parseListQueryValue(query[QUERY_KEY_PROJECT_IDS])
+	const selectedProjectIds =
+		selectedProjectIdsFromQuery.length > 0
+			? selectedProjectIdsFromQuery
+			: defaultState.selectedProjectIds
+
+	const selectedFilters = buildEmptySelectedFilters()
+	for (const category of URL_FILTER_CATEGORIES) {
+		const categoryQueryKey = FILTER_QUERY_KEY_BY_CATEGORY[category]
+		const rawQueryValue =
+			category === 'user_agent' && query[categoryQueryKey] === undefined
+				? query[QUERY_KEY_FILTER_LEGACY_DOWNLOAD_SOURCE]
+				: query[categoryQueryKey]
+		selectedFilters[category] = normalizeFilterQueryValues(
+			category,
+			parseListQueryValue(rawQueryValue),
+		)
+	}
+
+	const selectedTimeframeMode = parsePresetQueryValue(
+		query[QUERY_KEY_TIMEFRAME_MODE],
+		TIMEFRAME_MODE_VALUES,
+		defaultState.selectedTimeframeMode,
+	)
+	const isCustomDateTimeRange = selectedTimeframeMode === 'custom_datetime_range'
+	const parseTimeframeRangeQueryValue = isCustomDateTimeRange
+		? parseDateTimeQueryValue
+		: parseDateQueryValue
+	const customTimeframeStartFallback = isCustomDateTimeRange
+		? getDefaultCustomDateTimeValue(defaultState.selectedCustomTimeframeStartDate)
+		: defaultState.selectedCustomTimeframeStartDate
+	const customTimeframeEndFallback = isCustomDateTimeRange
+		? getDefaultCustomDateTimeValue(defaultState.selectedCustomTimeframeEndDate)
+		: defaultState.selectedCustomTimeframeEndDate
+
+	const selectedCustomTimeframeStartDate = parseTimeframeRangeQueryValue(
+		query[QUERY_KEY_TIMEFRAME_START],
+		customTimeframeStartFallback,
+	)
+	const rawCustomTimeframeEndDate = parseTimeframeRangeQueryValue(
+		query[QUERY_KEY_TIMEFRAME_END],
+		customTimeframeEndFallback,
+	)
+	const selectedCustomTimeframeEndDate = isTimeframeRangeEndBeforeStart(
+		selectedTimeframeMode,
+		selectedCustomTimeframeStartDate,
+		rawCustomTimeframeEndDate,
+	)
+		? selectedCustomTimeframeStartDate
+		: rawCustomTimeframeEndDate
+
+	const selectedBreakdown = getAnalyticsBreakdownPresetForProjectSelection(
+		parseAnalyticsBreakdownQueryValue(
+			query[QUERY_KEY_BREAKDOWN],
+			getDefaultAnalyticsBreakdownPreset(selectedProjectIds),
+		),
+		selectedProjectIds,
+	)
+
+	return {
+		selectedProjectIds,
+		selectedTimeframeMode,
+		selectedTimeframe: parsePresetQueryValue(
+			query[QUERY_KEY_TIMEFRAME],
+			TIMEFRAME_PRESET_VALUES,
+			defaultState.selectedTimeframe,
+		),
+		selectedLastTimeframeAmount: parsePositiveIntegerQueryValue(
+			query[QUERY_KEY_TIMEFRAME_LAST_AMOUNT],
+			defaultState.selectedLastTimeframeAmount,
+		),
+		selectedLastTimeframeUnit: parsePresetQueryValue(
+			query[QUERY_KEY_TIMEFRAME_LAST_UNIT],
+			LAST_TIMEFRAME_UNIT_VALUES,
+			defaultState.selectedLastTimeframeUnit,
+		),
+		selectedCustomTimeframeStartDate,
+		selectedCustomTimeframeEndDate,
+		selectedGroupBy: parsePresetQueryValue(
+			query[QUERY_KEY_GROUP_BY],
+			GROUP_BY_PRESET_VALUES,
+			defaultState.selectedGroupBy,
+		),
+		selectedBreakdown,
+		selectedFilters,
+	}
+}
+
+export function hasAnalyticsBreakdownQuery(query: LocationQuery): boolean {
+	return parseListQueryValue(query[QUERY_KEY_BREAKDOWN]).length > 0
+}
+
+export function hasAnalyticsProjectSelectionQuery(query: LocationQuery): boolean {
+	return parseListQueryValue(query[QUERY_KEY_PROJECT_IDS]).length > 0
+}
+
+export function hasAnalyticsTableSortQuery(query: LocationQuery): boolean {
+	return (
+		query[QUERY_KEY_TABLE_SORT] !== undefined || query[QUERY_KEY_TABLE_SORT_DIRECTION] !== undefined
+	)
+}
+
+export function buildAnalyticsQueryBuilderRouteQuery(
+	currentRouteQuery: LocationQuery,
+	state: AnalyticsQueryBuilderState,
+	availableProjectIds: string[],
+	graphState?: AnalyticsGraphState,
+): MutableRouteQuery {
+	const nextRouteQuery = {
+		...currentRouteQuery,
+	} as MutableRouteQuery
+
+	const projectIdsQueryValue = areAllProjectsSelected(state.selectedProjectIds, availableProjectIds)
+		? undefined
+		: serializeListQueryValue(state.selectedProjectIds)
+	const isCustomTimeframeMode =
+		state.selectedTimeframeMode === 'custom_range' ||
+		state.selectedTimeframeMode === 'custom_datetime_range'
+
+	nextRouteQuery[QUERY_KEY_PROJECT_IDS] = projectIdsQueryValue
+	nextRouteQuery[QUERY_KEY_TIMEFRAME_MODE] =
+		state.selectedTimeframeMode !== DEFAULT_TIMEFRAME_MODE ? state.selectedTimeframeMode : undefined
+	nextRouteQuery[QUERY_KEY_TIMEFRAME] =
+		state.selectedTimeframeMode === 'preset' && state.selectedTimeframe !== DEFAULT_TIMEFRAME_PRESET
+			? state.selectedTimeframe
+			: undefined
+	nextRouteQuery[QUERY_KEY_TIMEFRAME_LAST_AMOUNT] =
+		state.selectedTimeframeMode === 'last' ? String(state.selectedLastTimeframeAmount) : undefined
+	nextRouteQuery[QUERY_KEY_TIMEFRAME_LAST_UNIT] =
+		state.selectedTimeframeMode === 'last' ? state.selectedLastTimeframeUnit : undefined
+	nextRouteQuery[QUERY_KEY_TIMEFRAME_START] = isCustomTimeframeMode
+		? state.selectedCustomTimeframeStartDate
+		: undefined
+	nextRouteQuery[QUERY_KEY_TIMEFRAME_END] = isCustomTimeframeMode
+		? state.selectedCustomTimeframeEndDate
+		: undefined
+	nextRouteQuery[QUERY_KEY_GROUP_BY] =
+		state.selectedGroupBy !== DEFAULT_GROUP_BY_PRESET ? state.selectedGroupBy : undefined
+	const defaultBreakdown = getDefaultAnalyticsBreakdownPreset(state.selectedProjectIds)
+	const selectedBreakdown = getAnalyticsBreakdownPresetForProjectSelection(
+		state.selectedBreakdown,
+		state.selectedProjectIds,
+	)
+	nextRouteQuery[QUERY_KEY_BREAKDOWN] =
+		selectedBreakdown !== defaultBreakdown ? selectedBreakdown : undefined
+
+	for (const category of URL_FILTER_CATEGORIES) {
+		const categoryQueryKey = FILTER_QUERY_KEY_BY_CATEGORY[category]
+		nextRouteQuery[categoryQueryKey] = serializeListQueryValue(state.selectedFilters[category])
+	}
+	nextRouteQuery[QUERY_KEY_FILTER_LEGACY_DOWNLOAD_SOURCE] = undefined
+
+	if (graphState) {
+		nextRouteQuery[QUERY_KEY_STAT] =
+			graphState.activeStat !== DEFAULT_ANALYTICS_DASHBOARD_STAT ? graphState.activeStat : undefined
+		nextRouteQuery[QUERY_KEY_GRAPH_VIEW_MODE] =
+			graphState.activeGraphViewMode !== DEFAULT_ANALYTICS_GRAPH_VIEW_MODE
+				? graphState.activeGraphViewMode
+				: undefined
+		nextRouteQuery[QUERY_KEY_GRAPH_RATIO_MODE] = graphState.isRatioMode ? '1' : undefined
+		nextRouteQuery[QUERY_KEY_GRAPH_EVENTS_VISIBILITY] = graphState.showChartEvents ? undefined : '0'
+		nextRouteQuery[QUERY_KEY_GRAPH_PREVIOUS_PERIOD_VISIBILITY] = graphState.showPreviousPeriod
+			? '1'
+			: undefined
+		nextRouteQuery[QUERY_KEY_LEGACY_GRAPH_TOP_BREAKDOWN_FILTER] = undefined
+		nextRouteQuery[QUERY_KEY_LEGACY_GRAPH_LEGEND_EXPANSION] = undefined
+		nextRouteQuery[QUERY_KEY_GRAPH_HIDDEN_SERIES] = serializeListQueryValue(
+			[...graphState.hiddenGraphDatasetIds].sort((left, right) => left.localeCompare(right)),
+		)
+		nextRouteQuery[QUERY_KEY_GRAPH_SELECTED_SERIES] =
+			graphState.selectedGraphDatasetIds === null
+				? undefined
+				: serializeExplicitListQueryValue(graphState.selectedGraphDatasetIds)
+	}
+
+	return nextRouteQuery
+}
+
+export function buildAnalyticsTableSortRouteQuery(
+	currentRouteQuery: LocationQuery,
+	state: AnalyticsTableSortState,
+	defaultState: AnalyticsTableSortState,
+): MutableRouteQuery {
+	const nextRouteQuery = {
+		...currentRouteQuery,
+	} as MutableRouteQuery
+	const isDefaultSort =
+		state.sortColumn === defaultState.sortColumn &&
+		state.sortDirection === defaultState.sortDirection
+
+	nextRouteQuery[QUERY_KEY_TABLE_SORT] =
+		isDefaultSort || state.sortColumn === undefined ? undefined : state.sortColumn
+	nextRouteQuery[QUERY_KEY_TABLE_SORT_DIRECTION] =
+		isDefaultSort || state.sortColumn === undefined ? undefined : state.sortDirection
+
+	return nextRouteQuery
+}
+
+export function hasAnalyticsQueryBuilderRouteChange(
+	currentRouteQuery: LocationQuery,
+	nextRouteQuery: MutableRouteQuery,
+): boolean {
+	return ANALYTICS_QUERY_KEYS.some(
+		(key) => !areQueryValuesEqual(currentRouteQuery[key], nextRouteQuery[key]),
+	)
+}
+
+export function hasAnalyticsTableSortRouteChange(
+	currentRouteQuery: LocationQuery,
+	nextRouteQuery: MutableRouteQuery,
+): boolean {
+	return (
+		!areQueryValuesEqual(
+			currentRouteQuery[QUERY_KEY_TABLE_SORT],
+			nextRouteQuery[QUERY_KEY_TABLE_SORT],
+		) ||
+		!areQueryValuesEqual(
+			currentRouteQuery[QUERY_KEY_TABLE_SORT_DIRECTION],
+			nextRouteQuery[QUERY_KEY_TABLE_SORT_DIRECTION],
+		)
+	)
+}
diff --git a/apps/frontend/src/utils/analytics.js b/apps/frontend/src/utils/analytics.js
deleted file mode 100644
index bb409886a6..0000000000
--- a/apps/frontend/src/utils/analytics.js
+++ /dev/null
@@ -1,493 +0,0 @@
-import { injectI18n, useDebugLogger } from '@modrinth/ui'
-import dayjs from 'dayjs'
-import { computed, ref, watch } from 'vue'
-
-import { useTheme } from '~/composables/nuxt-accessors.ts'
-
-// note: build step can miss unix import for some reason, so
-// we have to import it like this
-
-const { unix } = dayjs
-
-export function useCountryNames(style = 'long') {
-	const { locale } = injectI18n()
-	const displayNames = computed(
-		() => new Intl.DisplayNames([locale.value], { type: 'region', style }),
-	)
-	return function formatCountryName(code) {
-		try {
-			return displayNames.value.of(code) ?? code
-		} catch {
-			return code
-		}
-	}
-}
-
-export const countryCodeToName = (code) => {
-	const formatCountryName = useCountryNames()
-
-	return formatCountryName(code)
-}
-
-export const countryCodeToFlag = (code) => {
-	if (code === 'XX') {
-		return undefined
-	}
-	return `https://flagcdn.com/h240/${code.toLowerCase()}.png`
-}
-
-export const formatTimestamp = (timestamp) => {
-	return unix(timestamp).format()
-}
-
-export const formatPercent = (value, sum) => {
-	return `${((value / sum) * 100).toFixed(2)}%`
-}
-
-const hashProjectId = (projectId) => {
-	return projectId.split('').reduce((acc, char) => acc + char.charCodeAt(0), 0) % 30
-}
-
-export const defaultColors = [
-	'#ff496e', // Original: Bright pink
-	'#ffa347', // Original: Bright orange
-	'#1bd96a', // Original: Bright green
-	'#4f9cff', // Original: Bright blue
-	'#c78aff', // Original: Bright purple
-	'#ffeb3b', // Added: Bright yellow
-	'#00bcd4', // Added: Bright cyan
-	'#ff5722', // Added: Bright red-orange
-	'#9c27b0', // Added: Bright deep purple
-	'#3f51b5', // Added: Bright indigo
-	'#009688', // Added: Bright teal
-	'#cddc39', // Added: Bright lime
-	'#795548', // Added: Bright brown
-	'#607d8b', // Added: Bright blue-grey
-]
-
-/**
- * @param {string | number} value
- * @returns {string} color
- */
-export const getDefaultColor = (value) => {
-	if (typeof value === 'string') {
-		value = hashProjectId(value)
-	}
-	return defaultColors[value % defaultColors.length]
-}
-
-export const intToRgba = (color, projectId = 'Unknown', theme = 'dark', alpha = '1') => {
-	const hash = hashProjectId(projectId)
-
-	if (!color || color === 0) {
-		return getDefaultColor(hash)
-	}
-
-	// if color is a string, return that instead
-	if (typeof color === 'string') {
-		return color
-	}
-
-	// Extract RGB values
-	let r = (color >> 16) & 255
-	let g = (color >> 8) & 255
-	let b = color & 255
-
-	// Hash function to alter color slightly based on project_id
-	r = (r + hash) % 256
-	g = (g + hash) % 256
-	b = (b + hash) % 256
-
-	// Adjust brightness for theme
-	const brightness = r * 0.299 + g * 0.587 + b * 0.114
-	const threshold = theme === 'dark' ? 50 : 200
-	if (theme === 'dark' && brightness < threshold) {
-		// Increase brightness for dark theme
-		r += threshold / 2
-		g += threshold / 2
-		b += threshold / 2
-	} else if (theme === 'light' && brightness > threshold) {
-		// Decrease brightness for light theme
-		r -= threshold / 4
-		g -= threshold / 4
-		b -= threshold / 4
-	}
-
-	// Ensure RGB values are within 0-255
-	r = Math.min(255, Math.max(0, r))
-	g = Math.min(255, Math.max(0, g))
-	b = Math.min(255, Math.max(0, b))
-
-	return `rgba(${r}, ${g}, ${b}, ${alpha})`
-}
-
-const emptyAnalytics = {
-	sum: 0,
-	len: 0,
-	chart: {
-		labels: [],
-		data: [],
-		sumData: [
-			{
-				name: '',
-				data: [],
-			},
-		],
-		colors: [],
-		defaultColors: [],
-	},
-	projectIds: [],
-}
-
-export const analyticsSetToCSVString = (analytics) => {
-	if (!analytics) {
-		return ''
-	}
-
-	const newline = '\n'
-	const labels = analytics.chart.labels
-	const projects = analytics.chart.data
-
-	const projectNames = projects.map((p) => p.name)
-
-	const header = ['Date', ...projectNames].join(',')
-
-	const data = labels.map((label, i) => {
-		const values = projects.map((p) => p.data?.[i] || '')
-		return [label, ...values].join(',')
-	})
-
-	return [header, ...data].join(newline)
-}
-
-export const processAnalytics = (category, projects, labelFn, sortFn, mapFn, chartName, theme) => {
-	if (!category || !projects) {
-		return emptyAnalytics
-	}
-
-	// Get an intersection of category keys and project ids
-	const projectIds = projects.map((p) => p.id)
-	const loadedProjectIds = Object.keys(category).filter((id) => projectIds.includes(id))
-
-	if (!loadedProjectIds?.length) {
-		return emptyAnalytics
-	}
-
-	const loadedProjectData = loadedProjectIds.map((id) => category[id])
-
-	// Convert each project's data into a list of [unix_ts_str, number] pairs
-	const projectData = loadedProjectData
-		.map((data) => Object.entries(data))
-		.map((data) => data.sort(sortFn))
-		.map((data) => (mapFn ? data.map(mapFn) : data))
-
-	// Each project may not include the same timestamps, so we should use the union of all timestamps
-	const timestamps = Array.from(
-		new Set(projectData.flatMap((data) => data.map(([ts]) => ts))),
-	).sort()
-
-	const chartData = projectData
-		.map((data, i) => {
-			const project = projects.find((p) => p.id === loadedProjectIds[i])
-			if (!project) {
-				throw new Error(`Project ${loadedProjectIds[i]} not found`)
-			}
-
-			return {
-				name: `${project.title}`,
-				data: timestamps.map((ts) => {
-					const entry = data.find(([ets]) => ets === ts)
-					return entry ? entry[1] : 0
-				}),
-				id: project.id,
-				color: project.color,
-			}
-		})
-		.sort(
-			(a, b) =>
-				b.data.reduce((acc, cur) => acc + cur, 0) - a.data.reduce((acc, cur) => acc + cur, 0),
-		)
-
-	const projectIdsSortedBySum = chartData.map((p) => p.id)
-
-	return {
-		// The total count of all the values across all projects
-		sum: projectData.reduce((acc, cur) => acc + cur.reduce((a, c) => a + c[1], 0), 0),
-		len: timestamps.length,
-		chart: {
-			labels: timestamps.map(labelFn),
-			data: chartData.map((x) => ({ name: x.name, data: x.data })),
-			sumData: [
-				{
-					name: chartName,
-					data: timestamps.map((ts) => {
-						const entries = projectData.flat().filter(([ets]) => ets === ts)
-						return entries.reduce((acc, cur) => acc + cur[1], 0)
-					}),
-				},
-			],
-			colors: projectData.map((_, i) => {
-				const project = chartData[i]
-
-				return intToRgba(project.color, project.id, theme)
-			}),
-			defaultColors: projectData.map((_, i) => {
-				const project = chartData[i]
-				return getDefaultColor(project.id)
-			}),
-		},
-		projectIds: projectIdsSortedBySum,
-	}
-}
-
-export const processAnalyticsByCountry = (category, projects, sortFn) => {
-	if (!category || !projects) {
-		return {
-			sum: 0,
-			len: 0,
-			data: [],
-		}
-	}
-
-	// Get an intersection of category keys and project ids
-	const projectIds = projects.map((p) => p.id)
-	const loadedProjectIds = Object.keys(category).filter((id) => projectIds.includes(id))
-
-	if (!loadedProjectIds?.length) {
-		return {
-			sum: 0,
-			len: 0,
-			data: [],
-		}
-	}
-
-	const loadedProjectData = loadedProjectIds.map((id) => category[id])
-
-	// Convert each project's data into a list of [countrycode, number] pairs
-	// Fold into a single list with summed values for each country over all projects
-
-	const countrySums = new Map()
-
-	loadedProjectData.forEach((data) => {
-		Object.entries(data).forEach(([country, value]) => {
-			const countryCode = country || 'XX'
-			const current = countrySums.get(countryCode) || 0
-			countrySums.set(countryCode, current + value)
-		})
-	})
-
-	const entries = Array.from(countrySums.entries())
-
-	return {
-		sum: entries.reduce((acc, cur) => acc + cur[1], 0),
-		len: entries.length,
-		data: entries.sort(sortFn),
-	}
-}
-
-const sortCount = ([, a], [, b]) => b - a
-const sortTimestamp = ([a], [b]) => a - b
-const roundValue = ([ts, value]) => [ts, Math.round(parseFloat(value) * 100) / 100]
-
-const processCountryAnalytics = (c, projects) => processAnalyticsByCountry(c, projects, sortCount)
-const processNumberAnalytics = (c, projects, theme) =>
-	processAnalytics(c, projects, formatTimestamp, sortTimestamp, null, 'Downloads', theme)
-const processRevAnalytics = (c, projects, theme) =>
-	processAnalytics(c, projects, formatTimestamp, sortTimestamp, roundValue, 'Revenue', theme)
-
-const useFetchAnalytics = (
-	url,
-	baseOptions = {
-		apiVersion: 3,
-	},
-) => {
-	return useBaseFetch(url, baseOptions)
-}
-
-/**
- * @param {Ref<any[]>} projects
- * @param {undefined | () => any} onDataRefresh
- */
-export const useFetchAllAnalytics = (
-	onDataRefresh,
-	projects,
-	selectedProjects,
-	personalRevenue = false,
-	startDate = ref(dayjs().subtract(30, 'days')),
-	endDate = ref(dayjs()),
-	timeResolution = ref(1440),
-) => {
-	const debug = useDebugLogger('useFetchAllAnalytics')
-	debug('init', {
-		projectCount: projects.value?.length,
-		personalRevenue,
-		startDate: startDate.value?.toISOString(),
-		endDate: endDate.value?.toISOString(),
-	})
-
-	const downloadData = ref(null)
-	const viewData = ref(null)
-	const revenueData = ref(null)
-	const downloadsByCountry = ref(null)
-	const viewsByCountry = ref(null)
-	const loading = ref(true)
-	const error = ref(null)
-
-	const formattedData = computed(() => ({
-		downloads: processNumberAnalytics(downloadData.value, selectedProjects.value),
-		views: processNumberAnalytics(viewData.value, selectedProjects.value),
-		revenue: processRevAnalytics(revenueData.value, selectedProjects.value),
-		downloadsByCountry: processCountryAnalytics(downloadsByCountry.value, selectedProjects.value),
-		viewsByCountry: processCountryAnalytics(viewsByCountry.value, selectedProjects.value),
-	}))
-
-	const theme = useTheme()
-
-	const totalData = computed(() => ({
-		downloads: processNumberAnalytics(downloadData.value, projects.value, theme.active),
-		views: processNumberAnalytics(viewData.value, projects.value, theme.active),
-		revenue: processRevAnalytics(revenueData.value, projects.value, theme.active),
-	}))
-
-	const buildQuery = () => {
-		const q = {
-			start_date: startDate.value.toISOString(),
-			end_date: endDate.value.toISOString(),
-			resolution_minutes: timeResolution.value,
-		}
-
-		if (projects.value?.length) {
-			q.project_ids = JSON.stringify(projects.value.map((p) => p.id))
-		}
-
-		return q
-	}
-
-	const fetchData = async (query) => {
-		debug('fetchData called', { query })
-		const normalQuery = new URLSearchParams(query)
-		const revenueQuery = new URLSearchParams(query)
-
-		if (personalRevenue) {
-			revenueQuery.delete('project_ids')
-		}
-
-		const qs = normalQuery.toString()
-		const revenueQs = revenueQuery.toString()
-
-		try {
-			loading.value = true
-			error.value = null
-
-			debug('fetching all 5 endpoints...')
-			const responses = await Promise.all([
-				useFetchAnalytics(`analytics/downloads?${qs}`),
-				useFetchAnalytics(`analytics/views?${qs}`),
-				useFetchAnalytics(`analytics/revenue?${revenueQs}`),
-				useFetchAnalytics(`analytics/countries/downloads?${qs}`),
-				useFetchAnalytics(`analytics/countries/views?${qs}`),
-			])
-			debug('all 5 endpoints resolved', {
-				downloads: Object.keys(responses[0] || {}).length,
-				views: Object.keys(responses[1] || {}).length,
-				revenue: Object.keys(responses[2] || {}).length,
-			})
-
-			const projectIds = new Set()
-			if (projects.value) {
-				projects.value.forEach((p) => projectIds.add(p.id))
-			} else {
-				Object.keys(responses[0] || {}).forEach((id) => projectIds.add(id))
-			}
-
-			debug('filtering to projectIds', { count: projectIds.size })
-
-			const filterProjectIds = (data) => {
-				const filtered = {}
-				Object.entries(data).forEach(([id, values]) => {
-					if (projectIds.has(id)) {
-						filtered[id] = values
-					}
-				})
-				return filtered
-			}
-
-			downloadData.value = filterProjectIds(responses[0] || {})
-			viewData.value = filterProjectIds(responses[1] || {})
-			revenueData.value = filterProjectIds(responses[2] || {})
-
-			downloadsByCountry.value = responses[3] || {}
-			viewsByCountry.value = responses[4] || {}
-		} catch (e) {
-			debug('fetchData error', e)
-			error.value = e
-		} finally {
-			loading.value = false
-			debug('fetchData done, loading=false')
-		}
-	}
-
-	const fetch = async () => {
-		debug('fetch() called', { projectCount: projects.value?.length })
-		await fetchData(buildQuery())
-		if (onDataRefresh) {
-			onDataRefresh()
-		}
-	}
-
-	watch(
-		[() => startDate.value, () => endDate.value, () => timeResolution.value, () => projects.value],
-		(newVals, oldVals) => {
-			debug('watch triggered', { new: newVals, old: oldVals })
-			fetch()
-		},
-	)
-
-	const validProjectIds = computed(() => {
-		const ids = new Set()
-
-		if (downloadData.value) {
-			Object.keys(downloadData.value).forEach((id) => ids.add(id))
-		}
-
-		if (viewData.value) {
-			Object.keys(viewData.value).forEach((id) => ids.add(id))
-		}
-
-		if (revenueData.value) {
-			// revenue will always have all project ids, but the ids may have an empty object or a ton of keys below a cent (0.00...) as values. We want to filter those out
-			Object.entries(revenueData.value).forEach(([id, data]) => {
-				if (Object.keys(data).length) {
-					if (Object.values(data).some((v) => v >= 0.01)) {
-						ids.add(id)
-					}
-				}
-			})
-		}
-
-		return Array.from(ids)
-	})
-
-	return {
-		// Configuration
-		timeResolution,
-
-		startDate,
-		endDate,
-
-		// Data
-		downloadData,
-		viewData,
-		revenueData,
-		downloadsByCountry,
-		viewsByCountry,
-
-		// Computed state
-		validProjectIds,
-		formattedData,
-		totalData,
-		loading,
-		error,
-		fetch,
-	}
-}
diff --git a/packages/api-client/src/modules/index.ts b/packages/api-client/src/modules/index.ts
index f1bb4f6661..ac74c38120 100644
--- a/packages/api-client/src/modules/index.ts
+++ b/packages/api-client/src/modules/index.ts
@@ -14,6 +14,7 @@ import { KyrosLogsV1Module } from './kyros/logs/v1'
 import { KyrosUploadSessionsV1Module } from './kyros/upload-sessions/v1'
 import { LabrinthVersionsV2Module, LabrinthVersionsV3Module } from './labrinth'
 import { LabrinthAffiliateInternalModule } from './labrinth/affiliate/internal'
+import { LabrinthAnalyticsV3Module } from './labrinth/analytics/v3'
 import { LabrinthAuthInternalModule } from './labrinth/auth/internal'
 import { LabrinthAuthV2Module } from './labrinth/auth/v2'
 import { LabrinthBillingInternalModule } from './labrinth/billing/internal'
@@ -74,6 +75,7 @@ export const MODULE_REGISTRY = {
 	kyros_logs_v1: KyrosLogsV1Module,
 	kyros_upload_sessions_v1: KyrosUploadSessionsV1Module,
 	labrinth_affiliate_internal: LabrinthAffiliateInternalModule,
+	labrinth_analytics_v3: LabrinthAnalyticsV3Module,
 	labrinth_auth_internal: LabrinthAuthInternalModule,
 	labrinth_auth_v2: LabrinthAuthV2Module,
 	labrinth_billing_internal: LabrinthBillingInternalModule,
diff --git a/packages/api-client/src/modules/labrinth/analytics/v3.ts b/packages/api-client/src/modules/labrinth/analytics/v3.ts
new file mode 100644
index 0000000000..2ab5178b10
--- /dev/null
+++ b/packages/api-client/src/modules/labrinth/analytics/v3.ts
@@ -0,0 +1,97 @@
+import { AbstractModule } from '../../../core/abstract-module'
+import type { Labrinth } from '../types'
+
+export class LabrinthAnalyticsV3Module extends AbstractModule {
+	public getModuleID(): string {
+		return 'labrinth_analytics_v3'
+	}
+
+	/**
+	 * Fetch analytics data for the authenticated user's accessible projects
+	 * and affiliate codes.
+	 *
+	 * @param data - Analytics request body defining time range and requested metrics
+	 * @returns Promise resolving to the analytics response, with time slices in `metrics`
+	 *
+	 * @example
+	 * ```typescript
+	 * const response = await client.labrinth.analytics_v3.fetch({
+	 *   time_range: {
+	 *     start: '2026-01-01T00:00:00Z',
+	 *     end: '2026-02-01T00:00:00Z',
+	 *     resolution: { slices: 31 },
+	 *   },
+	 *   project_ids: ['A1B2C3D4'],
+	 *   return_metrics: {
+	 *     project_views: { bucket_by: ['project_id'] },
+	 *   },
+	 * })
+	 * const timeSlices = response.metrics
+	 * ```
+	 */
+	public async fetch(
+		data: Labrinth.Analytics.v3.FetchRequest,
+	): Promise<Labrinth.Analytics.v3.FetchResponse> {
+		return this.client.request<Labrinth.Analytics.v3.FetchResponse>('/analytics', {
+			api: 'labrinth',
+			version: 3,
+			method: 'POST',
+			body: data,
+		})
+	}
+
+	/**
+	 * Fetch all analytics events.
+	 * GET /v3/analytics-event
+	 */
+	public async getEvents(): Promise<Labrinth.Analytics.v3.AnalyticsEvent[]> {
+		return this.client.request<Labrinth.Analytics.v3.AnalyticsEvent[]>('/analytics-event', {
+			api: 'labrinth',
+			version: 3,
+			method: 'GET',
+		})
+	}
+
+	/**
+	 * Create an analytics event.
+	 * POST /v3/analytics-event
+	 */
+	public async createEvent(
+		data: Labrinth.Analytics.v3.AnalyticsEventUpsert,
+	): Promise<Labrinth.Analytics.v3.AnalyticsEvent> {
+		return this.client.request<Labrinth.Analytics.v3.AnalyticsEvent>('/analytics-event', {
+			api: 'labrinth',
+			version: 3,
+			method: 'POST',
+			body: data,
+		})
+	}
+
+	/**
+	 * Edit an analytics event.
+	 * PATCH /v3/analytics-event/{id}
+	 */
+	public async editEvent(
+		id: Labrinth.Analytics.v3.AnalyticsEventId,
+		data: Labrinth.Analytics.v3.AnalyticsEventUpsert,
+	): Promise<Labrinth.Analytics.v3.AnalyticsEvent> {
+		return this.client.request<Labrinth.Analytics.v3.AnalyticsEvent>(`/analytics-event/${id}`, {
+			api: 'labrinth',
+			version: 3,
+			method: 'PATCH',
+			body: data,
+		})
+	}
+
+	/**
+	 * Delete an analytics event.
+	 * DELETE /v3/analytics-event/{id}
+	 */
+	public async deleteEvent(id: Labrinth.Analytics.v3.AnalyticsEventId): Promise<void> {
+		return this.client.request<void>(`/analytics-event/${id}`, {
+			api: 'labrinth',
+			version: 3,
+			method: 'DELETE',
+		})
+	}
+}
diff --git a/packages/api-client/src/modules/labrinth/index.ts b/packages/api-client/src/modules/labrinth/index.ts
index 883bac31d7..d5eedb3adc 100644
--- a/packages/api-client/src/modules/labrinth/index.ts
+++ b/packages/api-client/src/modules/labrinth/index.ts
@@ -1,3 +1,4 @@
+export * from './analytics/v3'
 export * from './auth/internal'
 export * from './auth/v2'
 export * from './billing/internal'
diff --git a/packages/api-client/src/modules/labrinth/types.ts b/packages/api-client/src/modules/labrinth/types.ts
index 098e46d19f..b3d4daa081 100644
--- a/packages/api-client/src/modules/labrinth/types.ts
+++ b/packages/api-client/src/modules/labrinth/types.ts
@@ -238,6 +238,164 @@ export namespace Labrinth {
 		}
 	}
 
+	export namespace Analytics {
+		export namespace v3 {
+			export type AnalyticsEventId = number
+			export type AnalyticsEventMetricKind = 'views' | 'revenue' | 'downloads' | 'playtime'
+
+			export type AnalyticsEvent = {
+				announcement_url: string | null
+				for_metric_kind: AnalyticsEventMetricKind[] | null
+				title: string
+				ends: string
+				id: AnalyticsEventId
+				starts: string
+			}
+
+			export type AnalyticsEventUpsert = {
+				announcement_url: string | null
+				for_metric_kind: AnalyticsEventMetricKind[] | null
+				title: string
+				ends: string
+				starts: string
+			}
+
+			export type FetchRequest = {
+				time_range: TimeRange
+				return_metrics: ReturnMetrics
+				project_ids?: string[]
+			}
+
+			export type TimeRange = {
+				start: string
+				end: string
+				resolution: TimeRangeResolution
+			}
+
+			export type TimeRangeResolution = { slices: number } | { minutes: number }
+
+			export type ReturnMetrics = {
+				project_views?: Metrics<ProjectViewsField>
+				project_downloads?: Metrics<ProjectDownloadsField>
+				project_playtime?: Metrics<ProjectPlaytimeField>
+				project_revenue?: Metrics<ProjectRevenueField>
+				affiliate_code_clicks?: Metrics<AffiliateCodeClicksField>
+				affiliate_code_conversions?: Metrics<AffiliateCodeConversionsField>
+				affiliate_code_revenue?: Metrics<AffiliateCodeRevenueField>
+			}
+
+			export type Metrics<F> = {
+				bucket_by?: F[]
+			}
+
+			export type ProjectViewsField =
+				| 'project_id'
+				| 'domain'
+				| 'site_path'
+				| 'monetized'
+				| 'country'
+
+			export type ProjectDownloadsField =
+				| 'project_id'
+				| 'version_id'
+				| 'user_agent'
+				| 'site_path'
+				| 'country'
+				| 'monetized'
+				| 'reason'
+				| 'game_version'
+				| 'loader'
+
+			export type ProjectPlaytimeField =
+				| 'project_id'
+				| 'version_id'
+				| 'loader'
+				| 'game_version'
+				| 'country'
+
+			export type ProjectRevenueField = 'project_id'
+
+			export type DownloadReason = 'standalone' | 'dependency' | 'modpack' | 'update'
+
+			export type AffiliateCodeClicksField = 'affiliate_code_id'
+
+			export type AffiliateCodeConversionsField = 'affiliate_code_id'
+
+			export type AffiliateCodeRevenueField = 'affiliate_code_id'
+
+			export type FetchResponse = {
+				metrics: TimeSlice[]
+			}
+
+			export type TimeSlice = AnalyticsData[]
+
+			export type AnalyticsData = ProjectAnalytics | AffiliateCodeAnalytics
+
+			export type ProjectAnalytics = {
+				source_project: string
+			} & ProjectMetrics
+
+			export type ProjectMetrics =
+				| ({ metric_kind: 'views' } & ProjectViews)
+				| ({ metric_kind: 'downloads' } & ProjectDownloads)
+				| ({ metric_kind: 'playtime' } & ProjectPlaytime)
+				| ({ metric_kind: 'revenue' } & ProjectRevenue)
+
+			export type ProjectViews = {
+				domain?: string
+				site_path?: string
+				monetized?: boolean
+				country?: string
+				views: number
+			}
+
+			export type ProjectDownloads = {
+				user_agent?: string
+				site_path?: string
+				version_id?: string
+				country?: string
+				monetized?: boolean
+				reason?: DownloadReason
+				game_version?: string
+				loader?: string
+				downloads: number
+			}
+
+			export type ProjectPlaytime = {
+				version_id?: string
+				loader?: string
+				game_version?: string
+				country?: string
+				seconds: number
+			}
+
+			export type ProjectRevenue = {
+				revenue: string
+			}
+
+			export type AffiliateCodeAnalytics = {
+				source_affiliate_code: string
+			} & AffiliateCodeMetrics
+
+			export type AffiliateCodeMetrics =
+				| ({ metric_kind: 'clicks' } & AffiliateCodeClicks)
+				| ({ metric_kind: 'conversions' } & AffiliateCodeConversions)
+				| ({ metric_kind: 'revenue' } & AffiliateCodeRevenue)
+
+			export type AffiliateCodeClicks = {
+				clicks: number
+			}
+
+			export type AffiliateCodeConversions = {
+				conversions: number
+			}
+
+			export type AffiliateCodeRevenue = {
+				revenue: string
+			}
+		}
+	}
+
 	export namespace Auth {
 		export namespace Internal {
 			export type SubscriptionStatus = {
diff --git a/packages/assets/generated-icons.ts b/packages/assets/generated-icons.ts
index c5cb8747fe..b34cde06a2 100644
--- a/packages/assets/generated-icons.ts
+++ b/packages/assets/generated-icons.ts
@@ -46,6 +46,9 @@ import _CalendarArrowDownIcon from './icons/calendar-arrow-down.svg?component'
 import _CardIcon from './icons/card.svg?component'
 import _ChangeSkinIcon from './icons/change-skin.svg?component'
 import _ChartIcon from './icons/chart.svg?component'
+import _ChartAreaIcon from './icons/chart-area.svg?component'
+import _ChartColumnBigIcon from './icons/chart-column-big.svg?component'
+import _ChartSplineIcon from './icons/chart-spline.svg?component'
 import _CheckIcon from './icons/check.svg?component'
 import _CheckCheckIcon from './icons/check-check.svg?component'
 import _CheckCircleIcon from './icons/check-circle.svg?component'
@@ -135,6 +138,7 @@ import _KeyIcon from './icons/key.svg?component'
 import _KeyboardIcon from './icons/keyboard.svg?component'
 import _LandmarkIcon from './icons/landmark.svg?component'
 import _LanguagesIcon from './icons/languages.svg?component'
+import _LayersIcon from './icons/layers.svg?component'
 import _LayoutTemplateIcon from './icons/layout-template.svg?component'
 import _LeftArrowIcon from './icons/left-arrow.svg?component'
 import _LibraryIcon from './icons/library.svg?component'
@@ -179,6 +183,7 @@ import _PaintbrushIcon from './icons/paintbrush.svg?component'
 import _PaletteIcon from './icons/palette.svg?component'
 import _PencilIcon from './icons/pencil.svg?component'
 import _PickaxeIcon from './icons/pickaxe.svg?component'
+import _PinIcon from './icons/pin.svg?component'
 import _PlayIcon from './icons/play.svg?component'
 import _PlugIcon from './icons/plug.svg?component'
 import _PlusIcon from './icons/plus.svg?component'
@@ -370,6 +375,8 @@ import _ToggleRightIcon from './icons/toggle-right.svg?component'
 import _TransferIcon from './icons/transfer.svg?component'
 import _TrashIcon from './icons/trash.svg?component'
 import _TrashExclamationIcon from './icons/trash-exclamation.svg?component'
+import _TrendingDownIcon from './icons/trending-down.svg?component'
+import _TrendingUpIcon from './icons/trending-up.svg?component'
 import _TriangleAlertIcon from './icons/triangle-alert.svg?component'
 import _UnderlineIcon from './icons/underline.svg?component'
 import _UndoIcon from './icons/undo.svg?component'
@@ -438,6 +445,9 @@ export const CalendarArrowDownIcon = _CalendarArrowDownIcon
 export const CardIcon = _CardIcon
 export const ChangeSkinIcon = _ChangeSkinIcon
 export const ChartIcon = _ChartIcon
+export const ChartAreaIcon = _ChartAreaIcon
+export const ChartColumnBigIcon = _ChartColumnBigIcon
+export const ChartSplineIcon = _ChartSplineIcon
 export const CheckIcon = _CheckIcon
 export const CheckCheckIcon = _CheckCheckIcon
 export const CheckCircleIcon = _CheckCircleIcon
@@ -527,6 +537,7 @@ export const KeyIcon = _KeyIcon
 export const KeyboardIcon = _KeyboardIcon
 export const LandmarkIcon = _LandmarkIcon
 export const LanguagesIcon = _LanguagesIcon
+export const LayersIcon = _LayersIcon
 export const LayoutTemplateIcon = _LayoutTemplateIcon
 export const LeftArrowIcon = _LeftArrowIcon
 export const LibraryIcon = _LibraryIcon
@@ -571,6 +582,7 @@ export const PaintbrushIcon = _PaintbrushIcon
 export const PaletteIcon = _PaletteIcon
 export const PencilIcon = _PencilIcon
 export const PickaxeIcon = _PickaxeIcon
+export const PinIcon = _PinIcon
 export const PlayIcon = _PlayIcon
 export const PlugIcon = _PlugIcon
 export const PlusIcon = _PlusIcon
@@ -762,6 +774,8 @@ export const ToggleRightIcon = _ToggleRightIcon
 export const TransferIcon = _TransferIcon
 export const TrashIcon = _TrashIcon
 export const TrashExclamationIcon = _TrashExclamationIcon
+export const TrendingDownIcon = _TrendingDownIcon
+export const TrendingUpIcon = _TrendingUpIcon
 export const TriangleAlertIcon = _TriangleAlertIcon
 export const UnderlineIcon = _UnderlineIcon
 export const UndoIcon = _UndoIcon
diff --git a/packages/assets/icons/chart-area.svg b/packages/assets/icons/chart-area.svg
new file mode 100644
index 0000000000..506cbf4d3d
--- /dev/null
+++ b/packages/assets/icons/chart-area.svg
@@ -0,0 +1,16 @@
+<!-- @license lucide-static v0.562.0 - ISC -->
+<svg
+  class="lucide lucide-chart-area"
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M3 3v16a2 2 0 0 0 2 2h16" />
+  <path d="M7 11.207a.5.5 0 0 1 .146-.353l2-2a.5.5 0 0 1 .708 0l3.292 3.292a.5.5 0 0 0 .708 0l4.292-4.292a.5.5 0 0 1 .854.353V16a1 1 0 0 1-1 1H8a1 1 0 0 1-1-1z" />
+</svg>
diff --git a/packages/assets/icons/chart-column-big.svg b/packages/assets/icons/chart-column-big.svg
new file mode 100644
index 0000000000..aa179bef1e
--- /dev/null
+++ b/packages/assets/icons/chart-column-big.svg
@@ -0,0 +1,17 @@
+<!-- @license lucide-static v0.562.0 - ISC -->
+<svg
+  class="lucide lucide-chart-column-big"
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M3 3v16a2 2 0 0 0 2 2h16" />
+  <rect x="15" y="5" width="4" height="12" rx="1" />
+  <rect x="7" y="8" width="4" height="9" rx="1" />
+</svg>
diff --git a/packages/assets/icons/chart-spline.svg b/packages/assets/icons/chart-spline.svg
new file mode 100644
index 0000000000..b8049c7538
--- /dev/null
+++ b/packages/assets/icons/chart-spline.svg
@@ -0,0 +1,16 @@
+<!-- @license lucide-static v0.562.0 - ISC -->
+<svg
+  class="lucide lucide-chart-spline"
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M3 3v16a2 2 0 0 0 2 2h16" />
+  <path d="M7 16c.5-2 1.5-7 4-7 2 0 2 3 4 3 2.5 0 4.5-5 5-7" />
+</svg>
diff --git a/packages/assets/icons/layers.svg b/packages/assets/icons/layers.svg
new file mode 100644
index 0000000000..ccc56ae778
--- /dev/null
+++ b/packages/assets/icons/layers.svg
@@ -0,0 +1,17 @@
+<!-- @license lucide-static v0.562.0 - ISC -->
+<svg
+  class="lucide lucide-layers"
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M12.83 2.18a2 2 0 0 0-1.66 0L2.6 6.08a1 1 0 0 0 0 1.83l8.58 3.91a2 2 0 0 0 1.66 0l8.58-3.9a1 1 0 0 0 0-1.83z" />
+  <path d="M2 12a1 1 0 0 0 .58.91l8.6 3.91a2 2 0 0 0 1.65 0l8.58-3.9A1 1 0 0 0 22 12" />
+  <path d="M2 17a1 1 0 0 0 .58.91l8.6 3.91a2 2 0 0 0 1.65 0l8.58-3.9A1 1 0 0 0 22 17" />
+</svg>
diff --git a/packages/assets/icons/pin.svg b/packages/assets/icons/pin.svg
new file mode 100644
index 0000000000..4a5b1d45f6
--- /dev/null
+++ b/packages/assets/icons/pin.svg
@@ -0,0 +1,16 @@
+<!-- @license lucide-static v0.562.0 - ISC -->
+<svg
+  class="lucide lucide-pin"
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M12 17v5" />
+  <path d="M9 10.76a2 2 0 0 1-1.11 1.79l-1.78.9A2 2 0 0 0 5 15.24V16a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-.76a2 2 0 0 0-1.11-1.79l-1.78-.9A2 2 0 0 1 15 10.76V7a1 1 0 0 1 1-1 2 2 0 0 0 0-4H8a2 2 0 0 0 0 4 1 1 0 0 1 1 1z" />
+</svg>
diff --git a/packages/assets/icons/trending-down.svg b/packages/assets/icons/trending-down.svg
new file mode 100644
index 0000000000..92ee278e05
--- /dev/null
+++ b/packages/assets/icons/trending-down.svg
@@ -0,0 +1,16 @@
+<!-- @license lucide-static v0.562.0 - ISC -->
+<svg
+  class="lucide lucide-trending-down"
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M16 17h6v-6" />
+  <path d="m22 17-8.5-8.5-5 5L2 7" />
+</svg>
diff --git a/packages/assets/icons/trending-up.svg b/packages/assets/icons/trending-up.svg
new file mode 100644
index 0000000000..f73d3eff13
--- /dev/null
+++ b/packages/assets/icons/trending-up.svg
@@ -0,0 +1,16 @@
+<!-- @license lucide-static v0.562.0 - ISC -->
+<svg
+  class="lucide lucide-trending-up"
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M16 7h6v6" />
+  <path d="m22 7-8.5 8.5-5-5L2 17" />
+</svg>
diff --git a/packages/ui/package.json b/packages/ui/package.json
index c56288e96b..d33f07a92a 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -85,6 +85,7 @@
 		"lru-cache": "^11.2.4",
 		"markdown-it": "^13.0.2",
 		"motion-v": "^2.2.1",
+		"overlayscrollbars": "^2.15.1",
 		"postprocessing": "^6.37.6",
 		"qrcode.vue": "^3.4.1",
 		"three": "^0.172.0",
diff --git a/packages/ui/src/components/base/ButtonStyled.vue b/packages/ui/src/components/base/ButtonStyled.vue
index 730edc3338..80b0b05b2b 100644
--- a/packages/ui/src/components/base/ButtonStyled.vue
+++ b/packages/ui/src/components/base/ButtonStyled.vue
@@ -188,7 +188,7 @@ const colorVariables = computed(() => {
 		}
 		const hoverColors = JSON.parse(JSON.stringify(colors))
 		const boxShadow =
-			props.type === 'chip' && colorVar.value ? `0 0 0 2px ${colorVar.value}` : defaultShadow
+			props.type === 'chip' && colorVar.value ? `0 0 0 1px ${colorVar.value}` : defaultShadow
 		return `--_bg: ${colors.bg}; --_text: ${colors.text}; --_icon: ${colors.icon}; --_hover-bg: ${hoverColors.bg}; --_hover-text: ${hoverColors.text}; --_hover-icon: ${hoverColors.icon}; --_box-shadow: ${boxShadow};`
 	}
 
@@ -226,7 +226,7 @@ const colorVariables = computed(() => {
 	}
 
 	const boxShadow =
-		props.type === 'chip' && colorVar.value ? `0 0 0 2px ${colorVar.value}` : defaultShadow
+		props.type === 'chip' && colorVar.value ? `0 0 0 1px ${colorVar.value}` : defaultShadow
 	return `--_bg: ${colors.bg}; --_text: ${colors.text}; --_hover-bg: ${hoverColors.bg}; --_hover-text: ${hoverColors.text}; --_box-shadow: ${boxShadow};`
 })
 
@@ -266,7 +266,7 @@ const fontSize = computed(() => {
 	> *:first-child
 	> *:first-child
 	> :is(button, a, .button-like):first-child {
-	@apply flex cursor-pointer flex-row items-center justify-center border-solid border-2 border-transparent bg-[--_bg] text-[--_text] h-[--_height] min-w-[--_width] rounded-[--_radius] px-[--_padding-x] py-[--_padding-y] gap-[--_gap] font-[--_font-weight] whitespace-nowrap;
+	@apply flex cursor-pointer flex-row items-center justify-center border-solid border border-transparent bg-[--_bg] text-[--_text] h-[--_height] min-w-[--_width] rounded-[--_radius] px-[--_padding-x] py-[--_padding-y] gap-[--_gap] font-[--_font-weight] whitespace-nowrap;
 	box-shadow: var(--_box-shadow, inset 0 0 0 transparent);
 	transition:
 		scale 0.125s ease-in-out,
diff --git a/packages/ui/src/components/base/Checkbox.vue b/packages/ui/src/components/base/Checkbox.vue
index 34cb4ca12c..4e8fcbd7a4 100644
--- a/packages/ui/src/components/base/Checkbox.vue
+++ b/packages/ui/src/components/base/Checkbox.vue
@@ -35,7 +35,7 @@ import { CheckIcon, MinusIcon } from '@modrinth/assets'
 import type { HTMLAttributes } from 'vue'
 
 const emit = defineEmits<{
-	'update:modelValue': [boolean]
+	'update:modelValue': [modelValue: boolean, event?: MouseEvent]
 }>()
 
 const props = withDefaults(
@@ -59,9 +59,9 @@ const props = withDefaults(
 	},
 )
 
-function toggle() {
+function toggle(event: MouseEvent) {
 	if (!props.disabled) {
-		emit('update:modelValue', !props.modelValue)
+		emit('update:modelValue', !props.modelValue, event)
 	}
 }
 </script>
diff --git a/packages/ui/src/components/base/Chips.vue b/packages/ui/src/components/base/Chips.vue
index e25f1f1073..ed5ef89fc8 100644
--- a/packages/ui/src/components/base/Chips.vue
+++ b/packages/ui/src/components/base/Chips.vue
@@ -75,6 +75,7 @@ function toggleItem(item: T) {
 	flex-wrap: wrap;
 
 	.btn {
+		border: 1px solid var(--surface-5);
 		&.capitalize {
 			text-transform: capitalize;
 		}
@@ -91,11 +92,9 @@ function toggleItem(item: T) {
 	}
 
 	.selected {
-		color: var(--color-contrast);
+		color: var(--color-brand);
 		background-color: var(--color-brand-highlight);
-		box-shadow:
-			inset 0 0 0 transparent,
-			0 0 0 1px var(--color-brand);
+		border: 1px solid var(--color-brand);
 	}
 }
 </style>
diff --git a/packages/ui/src/components/base/Combobox.vue b/packages/ui/src/components/base/Combobox.vue
index eb50ece3bb..f6a3a6b531 100644
--- a/packages/ui/src/components/base/Combobox.vue
+++ b/packages/ui/src/components/base/Combobox.vue
@@ -47,13 +47,13 @@
 			ref="triggerRef"
 			role="button"
 			tabindex="0"
-			class="relative flex min-h-5 w-full items-center justify-between overflow-hidden rounded-xl bg-surface-4 px-4 py-2.5 text-left transition-all duration-200 text-button-text"
+			class="relative flex min-h-5 w-full items-center justify-between overflow-hidden rounded-xl bg-surface-4 px-4 py-2.5 text-left transition-all duration-200 text-button-text gap-2.5"
 			:class="[
 				props.triggerClass,
 				{
 					'z-[9999]': isOpen,
 					'cursor-not-allowed opacity-50': disabled,
-					'cursor-pointer hover:brightness-125 active:brightness-125': !disabled,
+					'cursor-pointer hover:brightness-[115%] active:brightness-[115%]': !disabled,
 				},
 			]"
 			:aria-expanded="isOpen"
@@ -95,6 +95,7 @@
 					ref="dropdownRef"
 					class="fixed z-[9999] flex flex-col overflow-hidden rounded-[14px] bg-surface-4 border border-solid border-surface-5"
 					:class="[
+						props.dropdownClass,
 						openDirection === 'up' ? 'shadow-[0_-25px_50px_-12px_rgb(0,0,0,0.25)]' : 'shadow-2xl',
 					]"
 					:style="dropdownStyle"
@@ -104,59 +105,73 @@
 				>
 					<div
 						v-if="filteredOptions.length > 0"
-						ref="optionsContainerRef"
-						class="flex flex-col gap-2 overflow-y-auto p-3"
-						:style="{ maxHeight: `${maxHeight}px` }"
+						ref="optionsScrollbarRef"
+						class="combobox-options-scrollbar bg-surface-4"
+						data-overlayscrollbars-initialize
 					>
-						<template v-for="(item, index) in filteredOptions" :key="item.key">
-							<div v-if="item.type === 'divider'" class="h-px bg-surface-5"></div>
-							<component
-								:is="item.type === 'link' ? 'a' : 'span'"
-								v-else
-								:ref="(el: HTMLElement) => setOptionRef(el as HTMLElement, index)"
-								:href="item.type === 'link' && !item.disabled ? item.href : undefined"
-								:target="item.type === 'link' && !item.disabled ? item.target : undefined"
-								:role="listbox ? 'option' : 'menuitem'"
-								:aria-selected="listbox && item.value === modelValue"
-								:aria-disabled="item.disabled || undefined"
-								:data-focused="focusedIndex === index"
-								class="group/option flex items-center gap-2.5 cursor-pointer rounded-xl p-3 text-left transition-colors duration-150 text-contrast hover:bg-surface-5 focus:bg-surface-5"
-								:class="getOptionClasses(item, index)"
-								tabindex="-1"
-								@mousedown.prevent
-								@click="handleOptionClick(item, index)"
-								@mouseenter="handleOptionMouseEnter(item, index)"
-							>
-								<slot
-									name="option"
-									:item="item"
-									:index="index"
-									:is-selected="!!(listbox && item.value === modelValue)"
-								>
-									<div class="flex w-full items-center justify-between gap-2">
-										<div class="flex items-center gap-2">
-											<component :is="item.icon" v-if="item.icon" class="h-5 w-5" />
-											<div class="flex flex-col gap-1.5">
-												<span
-													class="font-semibold leading-tight"
-													:class="item.value === modelValue ? 'text-contrast' : 'text-primary'"
-												>
-													{{ item.label }}
-												</span>
-												<span
-													v-if="item.subLabel"
-													class="text-sm"
-													:class="item.value === modelValue ? 'text-contrast' : 'text-secondary'"
-												>
-													{{ item.subLabel }}
-												</span>
+						<div
+							ref="optionsContainerRef"
+							class="overflow-y-auto"
+							:style="{ maxHeight: `${maxHeight}px` }"
+							data-overlayscrollbars-viewport
+						>
+							<div ref="optionsListRef" class="flex flex-col">
+								<template v-for="(item, index) in filteredOptions" :key="item.key">
+									<div v-if="item.type === 'divider'" class="h-px bg-surface-5"></div>
+									<component
+										:is="item.type === 'link' ? 'a' : 'span'"
+										v-else
+										:ref="(el: HTMLElement) => setOptionRef(el as HTMLElement, index)"
+										:href="item.type === 'link' && !item.disabled ? item.href : undefined"
+										:target="item.type === 'link' && !item.disabled ? item.target : undefined"
+										:role="listbox ? 'option' : 'menuitem'"
+										:aria-selected="listbox && item.value === modelValue"
+										:aria-disabled="item.disabled || undefined"
+										:data-focused="focusedIndex === index"
+										class="group/option flex items-center gap-2.5 cursor-pointer px-4 py-3 text-left transition-all duration-150"
+										:class="getOptionClasses(item, index)"
+										tabindex="-1"
+										@mousedown.prevent
+										@click="handleOptionClick(item, index)"
+										@mouseenter="handleOptionMouseEnter(item, index)"
+									>
+										<slot
+											name="option"
+											:item="item"
+											:index="index"
+											:is-selected="!!(listbox && item.value === modelValue)"
+										>
+											<div class="flex w-full items-center justify-between gap-2">
+												<div class="flex items-center gap-2">
+													<component
+														:is="item.icon"
+														v-if="item.icon"
+														class="h-5 w-5"
+														:class="item.value === modelValue ? 'text-green' : 'text-primary'"
+													/>
+													<div class="flex flex-col gap-1.5">
+														<span
+															class="font-semibold leading-tight"
+															:class="item.value === modelValue ? 'text-green' : 'text-primary'"
+														>
+															{{ item.label }}
+														</span>
+														<span
+															v-if="item.subLabel"
+															class="text-sm"
+															:class="item.value === modelValue ? 'text-green' : 'text-secondary'"
+														>
+															{{ item.subLabel }}
+														</span>
+													</div>
+												</div>
+												<slot name="option-suffix" :item="item"></slot>
 											</div>
-										</div>
-										<slot name="option-suffix" :item="item"></slot>
-									</div>
-								</slot>
-							</component>
-						</template>
+										</slot>
+									</component>
+								</template>
+							</div>
+						</div>
 					</div>
 
 					<div v-else-if="searchQuery" class="p-4 mb-2 text-center text-sm text-secondary">
@@ -171,8 +186,11 @@
 </template>
 
 <script setup lang="ts" generic="T">
+import 'overlayscrollbars/overlayscrollbars.css'
+
 import { ChevronLeftIcon, SearchIcon } from '@modrinth/assets'
 import { onClickOutside } from '@vueuse/core'
+import { OverlayScrollbars, type PartialOptions } from 'overlayscrollbars'
 import {
 	type Component,
 	computed,
@@ -200,9 +218,22 @@ export interface ComboboxOption<T> {
 	searchTerms?: string[]
 }
 
+type OverlayScrollbarsInstance = NonNullable<ReturnType<typeof OverlayScrollbars>>
+
 const DROPDOWN_VIEWPORT_MARGIN = 8
-const DROPDOWN_GAP = 12
+const DROPDOWN_GAP = 8
 const DEFAULT_MAX_HEIGHT = 300
+const OPTIONS_OVERLAY_SCROLLBARS_OPTIONS = Object.freeze<PartialOptions>({
+	overflow: {
+		x: 'hidden',
+		y: 'scroll',
+	},
+	scrollbars: {
+		theme: 'os-theme-modrinth',
+		autoHide: 'leave',
+		autoHideSuspend: true,
+	},
+})
 
 function isDropdownOption<T>(
 	opt: ComboboxOption<T> | { type: 'divider' },
@@ -229,6 +260,11 @@ const props = withDefaults(
 		displayValue?: string
 		searchValue?: string
 		triggerClass?: string
+		dropdownClass?: string
+		/** Width for the teleported dropdown; defaults to the trigger/input width */
+		dropdownWidth?: string | number
+		/** Minimum width for the teleported dropdown */
+		dropdownMinWidth?: string | number
 		forceDirection?: 'up' | 'down'
 		noOptionsMessage?: string
 		disableSearchFilter?: boolean
@@ -275,9 +311,12 @@ const containerRef = ref<HTMLElement>()
 const triggerRef = ref<HTMLElement>()
 const searchTriggerRef = ref<InstanceType<typeof StyledInput>>()
 const dropdownRef = ref<HTMLElement>()
+const optionsScrollbarRef = ref<HTMLElement>()
 const optionsContainerRef = ref<HTMLElement>()
+const optionsListRef = ref<HTMLElement>()
 const optionRefs = ref<(HTMLElement | null)[]>([])
 const rafId = ref<number | null>(null)
+const optionsOverlayScrollbars = ref<OverlayScrollbarsInstance | null>(null)
 
 const effectiveTriggerEl = computed(() => {
 	if (props.searchable && searchTriggerRef.value) {
@@ -290,6 +329,7 @@ const dropdownStyle = ref({
 	top: '0px',
 	left: '0px',
 	width: '0px',
+	minWidth: '0px',
 })
 
 const openDirection = ref<'down' | 'up'>('down')
@@ -352,13 +392,15 @@ const shouldRenderDropdown = computed(() => {
 	return isOpen.value && hasDropdownContent.value
 })
 
-function getOptionClasses(item: ComboboxOption<T> & { key: string }, index: number) {
+function getOptionClasses(item: ComboboxOption<T> & { key: string }, _index: number) {
+	const isSelected = props.listbox && item.value === props.modelValue
+
 	return [
 		item.class,
 		{
-			'bg-surface-5':
-				(props.listbox && item.value === props.modelValue) ||
-				(focusedIndex.value === index && !(props.listbox && item.value === props.modelValue)),
+			'bg-surface-4 text-contrast hover:brightness-[115%] focus:brightness-[115%]': !isSelected,
+			'bg-highlight-green text-green !cursor-default hover:bg-highlight-green focus:bg-highlight-green':
+				isSelected,
 			'cursor-not-allowed opacity-50 pointer-events-none': item.disabled,
 		},
 	]
@@ -423,12 +465,35 @@ function calculateHorizontalPosition(
 	return left
 }
 
+function resolveDropdownWidth(triggerWidth: number): string {
+	if (props.dropdownWidth === undefined) return `${triggerWidth}px`
+	if (typeof props.dropdownWidth === 'number') return `${props.dropdownWidth}px`
+	return props.dropdownWidth
+}
+
+function resolveCssSize(size: string | number | undefined): string | undefined {
+	if (size === undefined) return undefined
+	if (typeof size === 'number') return `${size}px`
+	return size
+}
+
 async function updateDropdownPosition() {
 	if (!effectiveTriggerEl.value || !dropdownRef.value) return
 
 	await nextTick()
 
 	const triggerRect = effectiveTriggerEl.value.getBoundingClientRect()
+	const width = resolveDropdownWidth(triggerRect.width)
+	const minWidth = resolveCssSize(props.dropdownMinWidth) ?? '0px'
+
+	dropdownStyle.value = {
+		...dropdownStyle.value,
+		width,
+		minWidth,
+	}
+
+	await nextTick()
+
 	const dropdownRect = dropdownRef.value.getBoundingClientRect()
 	const viewportHeight = window.innerHeight
 	const viewportWidth = window.innerWidth
@@ -440,12 +505,53 @@ async function updateDropdownPosition() {
 	dropdownStyle.value = {
 		top: `${top}px`,
 		left: `${left}px`,
-		width: `${triggerRect.width}px`,
+		width,
+		minWidth,
 	}
 
 	openDirection.value = direction
 }
 
+async function initializeOptionsOverlayScrollbars() {
+	await nextTick()
+
+	if (!isOpen.value || filteredOptions.value.length === 0) {
+		destroyOptionsOverlayScrollbars()
+		return
+	}
+
+	if (!optionsScrollbarRef.value || !optionsContainerRef.value || !optionsListRef.value) {
+		return
+	}
+
+	if (optionsOverlayScrollbars.value) {
+		optionsOverlayScrollbars.value.update(true)
+		return
+	}
+
+	optionsOverlayScrollbars.value = OverlayScrollbars(
+		{
+			target: optionsScrollbarRef.value,
+			elements: {
+				viewport: optionsContainerRef.value,
+				content: optionsListRef.value,
+			},
+		},
+		OPTIONS_OVERLAY_SCROLLBARS_OPTIONS,
+	)
+}
+
+function updateOptionsOverlayScrollbars() {
+	nextTick(() => {
+		optionsOverlayScrollbars.value?.update(true)
+	})
+}
+
+function destroyOptionsOverlayScrollbars() {
+	optionsOverlayScrollbars.value?.destroy()
+	optionsOverlayScrollbars.value = null
+}
+
 async function openDropdown() {
 	if (props.disabled || isOpen.value || !hasDropdownContent.value) return
 
@@ -454,6 +560,7 @@ async function openDropdown() {
 
 	await nextTick()
 	await updateDropdownPosition()
+	await initializeOptionsOverlayScrollbars()
 
 	setInitialFocus()
 	startPositionTracking()
@@ -463,6 +570,7 @@ function closeDropdown() {
 	if (!isOpen.value) return
 
 	stopPositionTracking()
+	destroyOptionsOverlayScrollbars()
 	isOpen.value = false
 	userHasTyped.value = false
 	focusedIndex.value = -1
@@ -489,6 +597,8 @@ function handleTriggerClick(event: MouseEvent) {
 
 function handleOptionClick(option: ComboboxOption<T>, index: number) {
 	if (option.disabled || option.type === 'divider') return
+	const isSelected = props.listbox && option.value === props.modelValue
+	if (isSelected) return
 
 	focusedIndex.value = index
 
@@ -716,6 +826,7 @@ onMounted(() => {
 onUnmounted(() => {
 	window.removeEventListener('resize', handleWindowResize)
 	stopPositionTracking()
+	destroyOptionsOverlayScrollbars()
 })
 
 watch(isOpen, (value) => {
@@ -727,12 +838,18 @@ watch(isOpen, (value) => {
 watch(shouldRenderDropdown, (value) => {
 	if (value) {
 		updateDropdownPosition()
+		initializeOptionsOverlayScrollbars()
 	}
 })
 
 watch(filteredOptions, () => {
 	if (isOpen.value) {
 		updateDropdownPosition()
+		if (filteredOptions.value.length > 0) {
+			initializeOptionsOverlayScrollbars()
+		} else {
+			destroyOptionsOverlayScrollbars()
+		}
 	}
 })
 
@@ -749,7 +866,37 @@ watch(
 			const opt = props.options.find((o) => isDropdownOption(o) && o.value === val)
 			searchQuery.value = opt && isDropdownOption(opt) ? opt.label : ''
 		}
+		if (isOpen.value) {
+			updateOptionsOverlayScrollbars()
+		}
 	},
 	{ immediate: true },
 )
+
+watch(
+	() => props.maxHeight,
+	() => {
+		if (isOpen.value) {
+			updateOptionsOverlayScrollbars()
+		}
+	},
+)
 </script>
+
+<style scoped>
+.combobox-options-scrollbar :deep(.os-theme-modrinth) {
+	--os-size: 10px;
+	--os-padding-perpendicular: 2px;
+	--os-padding-axis: 2px;
+	--os-track-bg: transparent;
+	--os-track-bg-hover: transparent;
+	--os-track-bg-active: transparent;
+	--os-handle-border-radius: 9999px;
+	--os-handle-border: 2px solid var(--color-surface-4);
+	--os-handle-border-hover: 2px solid var(--color-surface-4);
+	--os-handle-border-active: 2px solid var(--color-surface-4);
+	--os-handle-bg: var(--color-scrollbar, var(--color-surface-5));
+	--os-handle-bg-hover: var(--color-scrollbar, var(--color-surface-5));
+	--os-handle-bg-active: var(--color-scrollbar, var(--color-surface-5));
+}
+</style>
diff --git a/packages/ui/src/components/base/DatePicker.vue b/packages/ui/src/components/base/DatePicker.vue
index 55b4c8292d..515257a6fe 100644
--- a/packages/ui/src/components/base/DatePicker.vue
+++ b/packages/ui/src/components/base/DatePicker.vue
@@ -32,13 +32,22 @@
 			:aria-hidden="calendarOnly ? 'true' : undefined"
 			type="text"
 		/>
+		<button
+			v-if="hasClearButton"
+			type="button"
+			class="absolute right-0.5 z-[1] cursor-pointer select-none border-none bg-transparent p-2 text-secondary transition-colors hover:text-contrast"
+			aria-label="Clear date"
+			@click.stop="clearValue"
+		>
+			<XIcon class="h-5 w-5" aria-hidden="true" />
+		</button>
 	</div>
 </template>
 
 <script setup lang="ts">
 import 'flatpickr/dist/flatpickr.css'
 
-import { CalendarIcon } from '@modrinth/assets'
+import { CalendarIcon, XIcon } from '@modrinth/assets'
 import chevronLeftIcon from '@modrinth/assets/icons/chevron-left.svg?raw'
 import chevronRightIcon from '@modrinth/assets/icons/chevron-right.svg?raw'
 import flatpickr from 'flatpickr'
@@ -944,6 +953,24 @@ const resolvedShowMonths = computed(() =>
 	Number.isFinite(props.showMonths) ? Math.max(1, Math.floor(props.showMonths)) : 1,
 )
 
+const selectedDates = computed(() => {
+	const value = model.value
+	if (Array.isArray(value)) {
+		return value.filter(Boolean) as Array<string | Date>
+	}
+
+	return value ? [value] : []
+})
+
+const hasClearButton = computed(
+	() =>
+		!props.calendarOnly &&
+		props.clearable &&
+		!props.disabled &&
+		!props.readonly &&
+		selectedDates.value.length > 0,
+)
+
 const inputClasses = computed(() => [
 	props.calendarOnly
 		? 'sr-only pointer-events-none absolute h-0 w-0 opacity-0'
@@ -951,21 +978,12 @@ const inputClasses = computed(() => [
 	!props.calendarOnly && props.showIcon ? 'pl-10' : '',
 	!props.calendarOnly && !props.showIcon ? 'pl-3' : '',
 	!props.calendarOnly
-		? 'pr-3 h-9 py-2 text-base outline-none bg-surface-4 border-none rounded-xl'
+		? `${hasClearButton.value ? 'pr-10' : 'pr-3'} h-9 py-2 text-base outline-none bg-surface-4 border-none rounded-xl`
 		: '',
 	props.disabled && !props.calendarOnly ? 'cursor-not-allowed' : '',
 	props.inputClass,
 ])
 
-const selectedDates = computed(() => {
-	const value = model.value
-	if (Array.isArray(value)) {
-		return value.filter(Boolean) as Array<string | Date>
-	}
-
-	return value ? [value] : []
-})
-
 watch(
 	() => [
 		model.value,
@@ -1273,19 +1291,21 @@ function syncAltInputState() {
 	picker.value.altInput.readOnly = props.readonly
 }
 
+function clearValue() {
+	const nextValue = props.mode === 'single' ? null : []
+	model.value = nextValue
+	picker.value?.clear(false)
+	setRangeEndpointMoveState(null)
+	syncMissingRangeEndState()
+	emit('clear')
+	emit('change', nextValue)
+}
+
 defineExpose({
 	focus: () => picker.value?.altInput?.focus() ?? inputRef.value?.focus(),
 	open: () => picker.value?.open(),
 	close: () => picker.value?.close(),
-	clear: () => {
-		const nextValue = props.mode === 'single' ? null : []
-		model.value = nextValue
-		picker.value?.clear(false)
-		setRangeEndpointMoveState(null)
-		syncMissingRangeEndState()
-		emit('clear')
-		emit('change', nextValue)
-	},
+	clear: clearValue,
 })
 </script>
 
@@ -1625,7 +1645,7 @@ defineExpose({
 }
 
 .modrinth-date-picker :deep(.flatpickr-time) {
-	@apply mt-2 flex h-11 max-h-none items-center  gap-2 border-0 border-t border-solid border-surface-5 px-1 pt-2 leading-none;
+	@apply mt-2 flex h-11 max-h-none items-center  gap-2 border-0 border-t border-solid border-surface-5 px-1 pt-2 overflow-visible leading-none;
 }
 
 .modrinth-date-picker :deep(.flatpickr-time .numInputWrapper) {
diff --git a/packages/ui/src/components/base/DropdownFilterBar.vue b/packages/ui/src/components/base/DropdownFilterBar.vue
index 2cc71a73c1..d38f82d8bd 100644
--- a/packages/ui/src/components/base/DropdownFilterBar.vue
+++ b/packages/ui/src/components/base/DropdownFilterBar.vue
@@ -19,12 +19,22 @@
 		:searchable="preview.category.searchable"
 		:search-placeholder="preview.category.searchPlaceholder"
 		:trigger-class="previewTriggerClass"
-		:dropdown-min-width="preview.category.previewDropdownMinWidth ?? '18rem'"
+		:dropdown-width="getPreviewDropdownWidth(preview.category)"
+		:dropdown-min-width="getPreviewDropdownMinWidth(preview.category)"
 		show-selection-actions
 		@update:model-value="(nextValue) => setPreviewSelectedValues(preview.key, nextValue)"
 		@open="openPreviewFilterDraft(preview.key)"
 		@close="commitPreviewFilterDraft(preview.key)"
 	>
+		<template v-if="$slots['preview-top'] && preview.category.syntheticOptions?.length" #top>
+			<slot
+				name="preview-top"
+				:category="preview.category"
+				:selected-values="getPreviewSelectedValues(preview.key)"
+				:set-selected-values="(values) => setPreviewSelectedValues(preview.key, values)"
+				:close-menu="(event) => closePreviewFilterMenu(preview.key, event)"
+			></slot>
+		</template>
 		<template #input-content="{ isOpen, openDirection }">
 			<div class="flex min-h-8 max-w-80 items-center gap-2">
 				<span class="min-w-0 flex-1 truncate">
@@ -48,6 +58,24 @@
 				</div>
 			</div>
 		</template>
+		<template v-if="$slots['preview-footer']" #bottom>
+			<slot
+				name="preview-footer"
+				:category="preview.category"
+				:selected-values="getPreviewSelectedValues(preview.key)"
+				:set-selected-values="(values) => setPreviewSelectedValues(preview.key, values)"
+				:close-menu="(event) => closePreviewFilterMenu(preview.key, event)"
+			></slot>
+		</template>
+		<template v-if="$slots['option-right']" #option-right="{ item, selected, index }">
+			<slot
+				name="option-right"
+				:category="preview.category"
+				:option="item"
+				:selected="selected"
+				:index="index"
+			></slot>
+		</template>
 	</MultiSelect>
 
 	<div class="flex h-10 items-center gap-2">
@@ -65,7 +93,7 @@
 			</button>
 		</ButtonStyled>
 
-		<ButtonStyled v-if="hasAppliedFilters" type="transparent">
+		<ButtonStyled v-if="shouldShowClear" type="transparent">
 			<button type="button" @click="clearAllFilters">{{ clearLabel }}</button>
 		</ButtonStyled>
 	</div>
@@ -80,7 +108,7 @@
 			<div
 				v-if="isAddMenuOpen"
 				ref="menuContainer"
-				class="fixed z-[9999] flex flex-col gap-2 overflow-hidden rounded-[14px] border border-solid border-surface-5 bg-surface-4 p-3 shadow-2xl"
+				class="fixed z-[9999] flex flex-col overflow-hidden rounded-[14px] border border-solid border-surface-5 bg-surface-4 shadow-2xl"
 				:style="addMenuStyle"
 				role="menu"
 				@mousedown.stop
@@ -92,8 +120,8 @@
 					:key="category.key"
 					:ref="(element) => setCategoryButtonRef(category.key, element)"
 					type="button"
-					class="group/filter-menu-button flex h-11 w-full appearance-none items-center justify-between gap-1 rounded-xl border-0 px-3 text-left text-base font-medium text-primary shadow-none transition-colors duration-150 hover:bg-surface-5 focus:bg-surface-5"
-					:class="category.key === activeCategoryKey ? 'bg-surface-5' : ''"
+					class="group/filter-menu-button flex h-12 w-full appearance-none items-center justify-between gap-1 border-0 px-3 text-left text-base font-semibold text-primary shadow-none transition-all duration-150 hover:brightness-110 focus:brightness-110 bg-surface-4"
+					:class="category.key === activeCategoryKey ? '!brightness-110' : ''"
 					role="menuitem"
 					@mouseenter="handleCategoryMouseEnter(category.key)"
 					@focus="activateCategory(category.key)"
@@ -111,8 +139,8 @@
 		<div
 			v-if="isAddMenuOpen && activeCategory && hasSubmenuPosition"
 			ref="submenu"
-			class="fixed z-[10000] flex max-h-[min(70vh,32rem)] max-w-[calc(100vw-1rem)] flex-col overflow-hidden rounded-xl border border-solid border-surface-5 bg-surface-4 shadow-xl"
-			:class="activeCategory.submenuClass ?? 'w-72'"
+			class="fixed z-[10000] flex max-h-[min(70vh,32rem)] max-w-[calc(100vw-1rem)] flex-col overflow-hidden rounded-[14px] border border-solid border-surface-5 bg-surface-4 shadow-2xl"
+			:class="activeCategory.submenuClass ?? DEFAULT_SUBMENU_CLASS"
 			:style="submenuStyle"
 			@mouseenter="handleSubmenuMouseEnter"
 			@mouseleave="handleSubmenuMouseLeave"
@@ -120,26 +148,38 @@
 		>
 			<div
 				v-if="activeCategory.searchable"
-				class="flex justify-between border-0 border-b border-solid border-b-surface-5 px-3 py-2.5"
+				class="flex justify-between border-0 border-b border-solid border-b-surface-5 py-1.5 w-full"
 			>
 				<StyledInput
 					v-model="categorySearchQuery"
 					:icon="SearchIcon"
 					type="text"
 					:placeholder="activeCategory.searchPlaceholder ?? 'Search...'"
-					wrapper-class="grow bg-surface-4"
+					wrapper-class="grow bg-surface-4 mx-0"
+					input-class="ps-9 mx-1.5"
 				/>
 				<slot
 					name="search-actions"
 					:category="activeCategory"
 					:selected-values="activeCategorySelectedValues"
 					:set-selected-values="setActiveCategorySelectedValues"
+					:close-menu="closeAddMenu"
+				></slot>
+			</div>
+
+			<div v-if="$slots['category-top']" class="border-0 border-b border-solid border-b-surface-5">
+				<slot
+					name="category-top"
+					:category="activeCategory"
+					:selected-values="activeCategorySelectedValues"
+					:set-selected-values="setActiveCategorySelectedValues"
+					:close-menu="closeAddMenu"
 				></slot>
 			</div>
 
 			<div
 				v-if="activeCategorySelectionCount > 0"
-				class="flex items-center justify-between gap-3 border-0 border-b border-solid border-b-surface-5 px-6 py-2.5 text-sm"
+				class="flex items-center justify-between gap-3 border-0 border-b border-solid border-b-surface-5 px-3 py-2.5 text-sm"
 			>
 				<span class="font-semibold text-secondary">{{ activeCategorySelectionLabel }}</span>
 				<button
@@ -152,63 +192,89 @@
 					Deselect all
 				</button>
 			</div>
-			<div class="flex min-h-0 flex-1 flex-col gap-2 overflow-y-auto p-3">
+			<div
+				ref="activeCategoryOptionsScrollbar"
+				class="dropdown-filter-bar-options-scrollbar min-h-0 flex-1 bg-surface-4"
+				data-overlayscrollbars-initialize
+			>
 				<div
-					v-if="filteredActiveCategoryOptions.length === 0"
-					class="px-3 py-2 text-sm font-medium text-secondary"
+					ref="activeCategoryOptionsContainer"
+					class="h-full min-h-0 overflow-y-auto"
+					data-overlayscrollbars-viewport
 				>
-					{{ activeCategoryEmptyStateLabel }}
-				</div>
-				<template v-else>
-					<button
-						v-for="option in filteredActiveCategoryOptions"
-						:key="`${activeCategory.key}-${option.value}`"
-						type="button"
-						class="flex w-full cursor-pointer items-center gap-2.5 rounded-xl border-0 bg-transparent p-3 text-left text-contrast shadow-none transition-colors duration-150 hover:bg-surface-5"
-						:class="{ 'pointer-events-none opacity-50': option.disabled }"
-						:aria-disabled="option.disabled || undefined"
-						:aria-checked="isFilterValueSelected(activeCategory.key, option.value)"
-						role="checkbox"
-						@click="toggleFilterOption(activeCategory.key, option)"
+					<div
+						v-if="filteredActiveCategoryOptions.length === 0"
+						class="px-3 py-3.5 text-base font-medium text-secondary"
 					>
-						<span
-							class="checkbox-shadow flex h-5 w-5 shrink-0 items-center justify-center rounded-md border-[1px] border-solid"
-							:class="
-								isFilterValueSelected(activeCategory.key, option.value)
-									? 'border-button-border bg-brand text-brand-inverted'
-									: 'border-surface-5 bg-surface-2'
-							"
-						>
-							<CheckIcon
-								v-if="isFilterValueSelected(activeCategory.key, option.value)"
-								aria-hidden="true"
-								stroke-width="3"
-							/>
-						</span>
-						<span
-							class="font-semibold leading-tight"
-							:class="
-								isFilterValueSelected(activeCategory.key, option.value)
-									? 'text-contrast'
-									: 'text-primary'
-							"
+						{{ activeCategoryEmptyStateLabel }}
+					</div>
+					<div
+						v-else
+						ref="activeCategoryOptionsListContainer"
+						:class="shouldVirtualizeActiveCategoryOptions ? 'relative' : 'flex flex-col'"
+						:style="activeCategoryOptionsListStyle"
+					>
+						<div
+							v-for="{ option, index } in renderedVisibleActiveCategoryOptions"
+							:key="`${activeCategory.key}-${option.value}`"
+							:class="shouldVirtualizeActiveCategoryOptions ? 'absolute left-0 right-0' : undefined"
+							:style="getActiveCategoryOptionWrapperStyle(index)"
 						>
-							{{ option.label }}
-						</span>
-					</button>
-				</template>
+							<button
+								type="button"
+								class="flex w-full cursor-pointer items-center gap-2.5 border-0 p-3 py-3.5 text-left text-contrast shadow-none transition-colors duration-150 bg-surface-4 hover:brightness-110 focus-visible:outline-none"
+								:class="[
+									shouldVirtualizeActiveCategoryOptions ? 'h-12' : undefined,
+									{ 'pointer-events-none opacity-50': option.disabled },
+								]"
+								:aria-disabled="option.disabled || undefined"
+								:aria-checked="option.selected"
+								role="checkbox"
+								@click="toggleFilterOption(activeCategory.key, option)"
+							>
+								<span
+									class="checkbox-shadow flex h-5 w-5 shrink-0 items-center justify-center rounded-md border-[1px] border-solid"
+									:class="
+										option.selected
+											? 'border-button-border bg-brand text-brand-inverted'
+											: 'border-surface-5 bg-surface-2'
+									"
+								>
+									<CheckIcon v-if="option.selected" aria-hidden="true" stroke-width="3" />
+								</span>
+								<div class="flex min-w-0 flex-1 items-center justify-between gap-3">
+									<span
+										class="min-w-0 truncate font-medium leading-tight"
+										:class="option.selected ? 'text-contrast' : 'text-primary'"
+									>
+										{{ option.label }}
+									</span>
+									<slot
+										name="option-right"
+										:category="activeCategory"
+										:option="option"
+										:selected="option.selected"
+									></slot>
+								</div>
+							</button>
+						</div>
+					</div>
+				</div>
 			</div>
 			<slot
 				name="category-footer"
 				:category="activeCategory"
 				:selected-values="activeCategorySelectedValues"
 				:set-selected-values="setActiveCategorySelectedValues"
+				:close-menu="closeAddMenu"
 			></slot>
 		</div>
 	</Teleport>
 </template>
 
 <script setup lang="ts">
+import 'overlayscrollbars/overlayscrollbars.css'
+
 import {
 	CheckIcon,
 	ChevronLeftIcon,
@@ -219,9 +285,11 @@ import {
 	XIcon,
 } from '@modrinth/assets'
 import { onClickOutside } from '@vueuse/core'
+import { OverlayScrollbars, type PartialOptions } from 'overlayscrollbars'
 import type { ComponentPublicInstance, CSSProperties } from 'vue'
 import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
 
+import { useVirtualScroll } from '../../composables/virtual-scroll'
 import ButtonStyled from './ButtonStyled.vue'
 import MultiSelect, { type MultiSelectOption } from './MultiSelect.vue'
 import StyledInput from './StyledInput.vue'
@@ -237,14 +305,29 @@ export type DropdownFilterBarCategory = {
 	key: string
 	label: string
 	options: DropdownFilterBarOption[]
+	syntheticOptions?: DropdownFilterBarOption[]
 	searchable?: boolean
 	searchPlaceholder?: string
+	emptyOptionsLabel?: string
+	emptySearchLabel?: string
 	submenuClass?: string
+	previewDropdownWidth?: string | number
 	previewDropdownMinWidth?: string | number
 }
 
 type DropdownFilterBarValue = Record<string, string[]>
 
+type RenderedDropdownFilterBarOption = DropdownFilterBarOption & {
+	selected: boolean
+}
+
+type VisibleDropdownFilterBarOption = {
+	option: RenderedDropdownFilterBarOption
+	index: number
+}
+
+type OverlayScrollbarsInstance = NonNullable<ReturnType<typeof OverlayScrollbars>>
+
 type Point = {
 	x: number
 	y: number
@@ -259,15 +342,44 @@ type MenuPositionOptions = {
 
 type SubmenuPositionOptions = {
 	buttonRect: DOMRect
+	openDirection: SubmenuOpenDirection
 	submenuWidth: number
 	submenuHeight: number
 	viewportWidth: number
 	viewportHeight: number
 }
 
+type SubmenuOpenDirection = 'left' | 'right'
+
+type SubmenuOpenDirectionOptions = {
+	menuRect: DOMRect
+	widestSubmenuWidth: number
+	viewportWidth: number
+}
+
 const ADD_MENU_WIDTH = 250
-const DROPDOWN_GAP = 12
+const DROPDOWN_GAP = 8
 const DROPDOWN_VIEWPORT_MARGIN = 8
+const DEFAULT_ROOT_FONT_SIZE = 16
+const DEFAULT_SUBMENU_CLASS = 'w-72'
+const DEFAULT_SUBMENU_WIDTH = '18rem'
+const DEFAULT_PREVIEW_DROPDOWN_MIN_WIDTH = '18rem'
+const DROPDOWN_FILTER_OPTION_ROW_HEIGHT = 48
+const DROPDOWN_FILTER_VIRTUALIZATION_THRESHOLD = 80
+const OPTIONS_OVERLAY_SCROLLBARS_OPTIONS = Object.freeze<PartialOptions>({
+	overflow: {
+		x: 'hidden',
+		y: 'scroll',
+	},
+	scrollbars: {
+		theme: 'os-theme-modrinth',
+		autoHide: 'leave',
+		autoHideSuspend: true,
+	},
+})
+const TAILWIND_WIDTH_CLASS_SIZE: Record<string, string> = {
+	[DEFAULT_SUBMENU_CLASS]: DEFAULT_SUBMENU_WIDTH,
+}
 
 const props = withDefaults(
 	defineProps<{
@@ -276,6 +388,7 @@ const props = withDefaults(
 		label?: string
 		addLabel?: string
 		clearLabel?: string
+		showClear?: boolean
 		useFilterIcon?: boolean
 		emptyOptionsLabel?: string
 		emptySearchLabel?: string
@@ -284,6 +397,7 @@ const props = withDefaults(
 		label: 'Filtered by',
 		addLabel: 'Add',
 		clearLabel: 'Clear',
+		showClear: false,
 		useFilterIcon: false,
 		emptyOptionsLabel: 'No options available.',
 		emptySearchLabel: 'No options found.',
@@ -292,6 +406,7 @@ const props = withDefaults(
 
 const emit = defineEmits<{
 	'update:modelValue': [value: DropdownFilterBarValue]
+	clear: []
 }>()
 
 const isAddMenuOpen = ref(false)
@@ -303,9 +418,13 @@ const categorySearchQuery = ref('')
 const lastMousePosition = ref<Point | null>(null)
 const isCursorInsideSubmenu = ref(false)
 const hasSubmenuPosition = ref(false)
+const submenuOpenDirection = ref<SubmenuOpenDirection>('right')
 const addMenuTrigger = ref<HTMLElement | null>(null)
 const menuContainer = ref<HTMLElement | null>(null)
 const submenu = ref<HTMLElement | null>(null)
+const activeCategoryOptionsScrollbar = ref<HTMLElement | null>(null)
+const activeCategoryOptionsContainer = ref<HTMLElement | null>(null)
+const activeCategoryOptionsOverlayScrollbars = ref<OverlayScrollbarsInstance | null>(null)
 const addMenuStyle = ref<CSSProperties>({
 	left: '0px',
 	minWidth: '0px',
@@ -319,13 +438,17 @@ let previousMousePosition: Point | null = null
 
 const filterCategories = computed<DropdownFilterBarCategory[]>(() => {
 	const source = isAddMenuOpen.value ? 'draft' : 'committed'
-	return props.categories.map((category) => ({
-		...category,
-		options: getOptionsWithSelectedValues(
-			category.options,
-			getSelectedValues(category.key, source),
-		),
-	}))
+	return props.categories.map((category) => {
+		const syntheticValues = getCategorySyntheticValueSet(category)
+		const selectedValues = getSelectedValues(category.key, source).filter(
+			(value) => !syntheticValues.has(value),
+		)
+
+		return {
+			...category,
+			options: getOptionsWithSelectedValues(category.options, selectedValues),
+		}
+	})
 })
 
 const filterCategoriesByKey = computed(
@@ -346,6 +469,7 @@ const activeCategorySelectionLabel = computed(() =>
 const activeCategorySelectedValues = computed(() =>
 	activeCategory.value ? getSelectedValues(activeCategory.value.key, 'draft') : [],
 )
+const activeCategorySelectedValueSet = computed(() => new Set(activeCategorySelectedValues.value))
 
 const filteredActiveCategoryOptions = computed(() => {
 	if (!activeCategory.value) {
@@ -372,12 +496,51 @@ const filteredActiveCategoryOptions = computed(() => {
 	})
 })
 
-const activeCategoryEmptyStateLabel = computed(() =>
-	activeCategory.value?.searchable && categorySearchQuery.value.trim().length > 0
-		? props.emptySearchLabel
-		: props.emptyOptionsLabel,
+const shouldVirtualizeActiveCategoryOptions = computed(
+	() => filteredActiveCategoryOptions.value.length > DROPDOWN_FILTER_VIRTUALIZATION_THRESHOLD,
+)
+
+const {
+	listContainer: activeCategoryOptionsListContainer,
+	totalHeight: activeCategoryOptionsTotalHeight,
+	visibleRange: activeCategoryOptionsVisibleRange,
+	visibleItems: visibleActiveCategoryOptions,
+	resetScrollState: resetActiveCategoryOptionsVirtualScrollState,
+	syncScrollState: syncActiveCategoryOptionsVirtualScrollState,
+} = useVirtualScroll(filteredActiveCategoryOptions, {
+	itemHeight: DROPDOWN_FILTER_OPTION_ROW_HEIGHT,
+	bufferSize: 8,
+	initialItemCount: 12,
+	enabled: shouldVirtualizeActiveCategoryOptions,
+})
+
+const renderedVisibleActiveCategoryOptions = computed<VisibleDropdownFilterBarOption[]>(() =>
+	visibleActiveCategoryOptions.value.map((option, offset) => ({
+		option: {
+			...option,
+			selected: activeCategorySelectedValueSet.value.has(option.value),
+		},
+		index: activeCategoryOptionsVisibleRange.value.start + offset,
+	})),
 )
 
+const activeCategoryOptionsListStyle = computed<CSSProperties | undefined>(() =>
+	shouldVirtualizeActiveCategoryOptions.value
+		? { height: `${activeCategoryOptionsTotalHeight.value}px` }
+		: undefined,
+)
+
+const activeCategoryEmptyStateLabel = computed(() => {
+	const category = activeCategory.value
+	if (!category) {
+		return props.emptyOptionsLabel
+	}
+
+	return category.searchable && categorySearchQuery.value.trim().length > 0
+		? (category.emptySearchLabel ?? props.emptySearchLabel)
+		: (category.emptyOptionsLabel ?? props.emptyOptionsLabel)
+})
+
 const submenuStyle = computed<CSSProperties>(() => ({
 	left: `${submenuPosition.value.x}px`,
 	top: `${submenuPosition.value.y}px`,
@@ -391,19 +554,15 @@ const appliedFilterPreviews = computed(() =>
 			summary: getCategorySelectionSummary(category),
 			count: getCategorySelectionCount(category.key),
 			category,
-			options: category.options.map((option) => ({
-				value: option.value,
-				label: option.label,
-				searchTerms: option.searchTerms,
-				disabled: option.disabled,
-			})) as MultiSelectOption<string>[],
+			options: getVisiblePreviewOptions(category),
 		}))
 		.filter((preview) => preview.count > 0),
 )
 
 const hasAppliedFilters = computed(() => appliedFilterPreviews.value.length > 0)
+const shouldShowClear = computed(() => hasAppliedFilters.value || props.showClear)
 const previewTriggerClass =
-	'h-10 max-w-[16rem] border border-solid border-surface-5 bg-surface-4 px-3 py-1.5 hover:bg-surface-5 hover:brightness-100 active:brightness-100'
+	'h-10 max-w-[16rem] border border-solid border-surface-5 bg-surface-4 px-3 py-1.5 transition-all bg-surface-4 hover:brightness-110 active:brightness-110'
 
 function cloneSelectedFilters(filters: DropdownFilterBarValue): DropdownFilterBarValue {
 	return Object.fromEntries(
@@ -461,6 +620,35 @@ function getOptionsWithSelectedValues(
 	return [...options, ...missingSelectedOptions]
 }
 
+function getCategorySyntheticValueSet(category: DropdownFilterBarCategory): Set<string> {
+	return new Set((category.syntheticOptions ?? []).map((option) => option.value))
+}
+
+function getCategorySyntheticValues(categoryKey: string): Set<string> {
+	const category = filterCategoriesByKey.value.get(categoryKey)
+	return category ? getCategorySyntheticValueSet(category) : new Set()
+}
+
+function getVisiblePreviewOptions(
+	category: DropdownFilterBarCategory,
+): MultiSelectOption<string>[] {
+	return category.options.map((option) => ({
+		value: option.value,
+		label: option.label,
+		searchTerms: option.searchTerms,
+		disabled: option.disabled,
+	})) as MultiSelectOption<string>[]
+}
+
+function getPreviewOptionLabel(
+	category: DropdownFilterBarCategory,
+	selectedValue: string,
+): string | undefined {
+	return [...(category.syntheticOptions ?? []), ...category.options].find(
+		(option) => option.value === selectedValue,
+	)?.label
+}
+
 function getSelectedValues(
 	categoryKey: string,
 	source: 'committed' | 'draft' = 'committed',
@@ -588,6 +776,10 @@ function setCategoryButtonRef(
 }
 
 function isFilterValueSelected(categoryKey: string, value: string): boolean {
+	if (categoryKey === activeCategory.value?.key) {
+		return activeCategorySelectedValueSet.value.has(value)
+	}
+
 	return getSelectedValues(categoryKey, 'draft').includes(value)
 }
 
@@ -595,8 +787,13 @@ function toggleFilterValue(categoryKey: string, value: string, nextValue: boolea
 	const currentValues = getSelectedValues(categoryKey, 'draft')
 
 	if (nextValue) {
-		if (!currentValues.includes(value)) {
-			setSelectedValues(categoryKey, [...currentValues, value], 'draft')
+		const syntheticValues = getCategorySyntheticValues(categoryKey)
+		const nextValues = syntheticValues.has(value)
+			? [value]
+			: currentValues.filter((item) => !syntheticValues.has(item))
+
+		if (!nextValues.includes(value)) {
+			setSelectedValues(categoryKey, [...nextValues, value], 'draft')
 		}
 	} else {
 		setSelectedValues(
@@ -615,6 +812,62 @@ function toggleFilterOption(categoryKey: string, option: DropdownFilterBarOption
 	toggleFilterValue(categoryKey, option.value, !isFilterValueSelected(categoryKey, option.value))
 }
 
+function getActiveCategoryOptionWrapperStyle(index: number): CSSProperties | undefined {
+	if (!shouldVirtualizeActiveCategoryOptions.value) {
+		return undefined
+	}
+
+	return {
+		transform: `translateY(${index * DROPDOWN_FILTER_OPTION_ROW_HEIGHT}px)`,
+	}
+}
+
+async function initializeActiveCategoryOptionsOverlayScrollbars() {
+	await nextTick()
+	syncActiveCategoryOptionsVirtualScrollState()
+
+	if (!isAddMenuOpen.value || filteredActiveCategoryOptions.value.length === 0) {
+		destroyActiveCategoryOptionsOverlayScrollbars()
+		return
+	}
+
+	if (
+		!activeCategoryOptionsScrollbar.value ||
+		!activeCategoryOptionsContainer.value ||
+		!activeCategoryOptionsListContainer.value
+	) {
+		return
+	}
+
+	if (activeCategoryOptionsOverlayScrollbars.value) {
+		activeCategoryOptionsOverlayScrollbars.value.update(true)
+		return
+	}
+
+	activeCategoryOptionsOverlayScrollbars.value = OverlayScrollbars(
+		{
+			target: activeCategoryOptionsScrollbar.value,
+			elements: {
+				viewport: activeCategoryOptionsContainer.value,
+				content: activeCategoryOptionsListContainer.value,
+			},
+		},
+		OPTIONS_OVERLAY_SCROLLBARS_OPTIONS,
+	)
+}
+
+function destroyActiveCategoryOptionsOverlayScrollbars() {
+	activeCategoryOptionsOverlayScrollbars.value?.destroy()
+	activeCategoryOptionsOverlayScrollbars.value = null
+}
+
+function resetActiveCategoryOptionsScrollState() {
+	if (activeCategoryOptionsContainer.value) {
+		activeCategoryOptionsContainer.value.scrollTop = 0
+	}
+	resetActiveCategoryOptionsVirtualScrollState()
+}
+
 function getCategorySelectionCount(
 	categoryKey: string,
 	source: 'committed' | 'draft' = 'committed',
@@ -630,7 +883,7 @@ function getCategorySelectionSummary(category: DropdownFilterBarCategory): strin
 
 	if (count === 1) {
 		const selectedValue = getSelectedValues(category.key)[0]
-		return category.options.find((option) => option.value === selectedValue)?.label ?? '1 selected'
+		return getPreviewOptionLabel(category, selectedValue) ?? '1 selected'
 	}
 
 	return `${count} selected`
@@ -652,6 +905,8 @@ function clearAllFilters() {
 	if (!areSelectedFiltersEqual(props.modelValue, nextFilters)) {
 		emit('update:modelValue', nextFilters)
 	}
+
+	emit('clear')
 }
 
 function clearActiveCategorySelection() {
@@ -704,6 +959,89 @@ function commitPreviewFilterDrafts() {
 	}
 }
 
+function closePreviewFilterMenu(categoryKey: string, event?: Event) {
+	commitPreviewFilterDraft(categoryKey)
+
+	const eventTarget = event?.target
+	if (!(eventTarget instanceof HTMLElement)) {
+		return
+	}
+
+	const dropdown = eventTarget.closest('[role="listbox"][aria-multiselectable="true"]')
+	if (!dropdown) {
+		return
+	}
+
+	dropdown.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }))
+}
+
+function getPreviewDropdownWidth(category: DropdownFilterBarCategory): string | number | undefined {
+	return category.previewDropdownWidth ?? getWidthFromClass(category.submenuClass)
+}
+
+function getPreviewDropdownMinWidth(category: DropdownFilterBarCategory): string | number {
+	return (
+		category.previewDropdownMinWidth ??
+		getPreviewDropdownWidth(category) ??
+		DEFAULT_PREVIEW_DROPDOWN_MIN_WIDTH
+	)
+}
+
+function getWidthFromClass(className: string | undefined): string | undefined {
+	if (!className) {
+		return undefined
+	}
+
+	const arbitraryWidth = className.match(/(?:^|\s)w-\[([^\]]+)\](?:\s|$)/)
+	if (arbitraryWidth) {
+		return arbitraryWidth[1]
+	}
+
+	return className
+		.split(/\s+/)
+		.map((name) => TAILWIND_WIDTH_CLASS_SIZE[name])
+		.find((width) => width !== undefined)
+}
+
+function getRootFontSizeInPixels(): number {
+	if (typeof window === 'undefined') {
+		return DEFAULT_ROOT_FONT_SIZE
+	}
+
+	const rootFontSize = Number.parseFloat(window.getComputedStyle(document.documentElement).fontSize)
+	return Number.isFinite(rootFontSize) ? rootFontSize : DEFAULT_ROOT_FONT_SIZE
+}
+
+function getCssLengthInPixels(length: string): number | undefined {
+	const trimmedLength = length.trim()
+	const parsedLength = Number.parseFloat(trimmedLength)
+	if (!Number.isFinite(parsedLength)) {
+		return undefined
+	}
+
+	if (trimmedLength.endsWith('rem')) {
+		return parsedLength * getRootFontSizeInPixels()
+	}
+
+	if (trimmedLength.endsWith('px') || /^[\d.]+$/.test(trimmedLength)) {
+		return parsedLength
+	}
+
+	return undefined
+}
+
+function getSubmenuWidthInPixels(category: DropdownFilterBarCategory): number {
+	return (
+		getCssLengthInPixels(getWidthFromClass(category.submenuClass) ?? DEFAULT_SUBMENU_WIDTH) ??
+		getCssLengthInPixels(DEFAULT_SUBMENU_WIDTH) ??
+		288
+	)
+}
+
+function getWidestSubmenuWidthInPixels(categories: DropdownFilterBarCategory[]): number {
+	return Math.max(...categories.map((category) => getSubmenuWidthInPixels(category)), 0)
+}
+
 function activateCategory(categoryKey: string) {
 	clearPendingCategoryTimeout()
 	pendingCategoryKey.value = null
@@ -810,21 +1148,24 @@ function getAddMenuPosition({
 
 function getSubmenuPosition({
 	buttonRect,
+	openDirection,
 	submenuWidth,
 	submenuHeight,
 	viewportWidth,
 	viewportHeight,
 }: SubmenuPositionOptions): Point {
-	const gap = 20
-	const viewportPadding = 8
-	const preferredLeft = buttonRect.right + gap
-	const left =
-		preferredLeft + submenuWidth + viewportPadding <= viewportWidth
-			? preferredLeft
-			: Math.max(viewportPadding, buttonRect.left - submenuWidth - gap)
+	const preferredLeft =
+		openDirection === 'right'
+			? buttonRect.right + DROPDOWN_GAP
+			: buttonRect.left - submenuWidth - DROPDOWN_GAP
+	const maxLeft = Math.max(
+		DROPDOWN_VIEWPORT_MARGIN,
+		viewportWidth - submenuWidth - DROPDOWN_VIEWPORT_MARGIN,
+	)
+	const left = Math.min(Math.max(DROPDOWN_VIEWPORT_MARGIN, preferredLeft), maxLeft)
 	const top = Math.min(
-		Math.max(viewportPadding, buttonRect.top),
-		Math.max(viewportPadding, viewportHeight - submenuHeight - viewportPadding),
+		Math.max(DROPDOWN_VIEWPORT_MARGIN, buttonRect.top),
+		Math.max(DROPDOWN_VIEWPORT_MARGIN, viewportHeight - submenuHeight - DROPDOWN_VIEWPORT_MARGIN),
 	)
 
 	return {
@@ -833,6 +1174,25 @@ function getSubmenuPosition({
 	}
 }
 
+function getSubmenuOpenDirection({
+	menuRect,
+	widestSubmenuWidth,
+	viewportWidth,
+}: SubmenuOpenDirectionOptions): SubmenuOpenDirection {
+	const rightSpace = viewportWidth - menuRect.right - DROPDOWN_GAP - DROPDOWN_VIEWPORT_MARGIN
+	const leftSpace = menuRect.left - DROPDOWN_GAP - DROPDOWN_VIEWPORT_MARGIN
+
+	if (rightSpace >= widestSubmenuWidth) {
+		return 'right'
+	}
+
+	if (leftSpace >= widestSubmenuWidth) {
+		return 'left'
+	}
+
+	return rightSpace >= leftSpace ? 'right' : 'left'
+}
+
 function getIsCursorAimingAtSubmenu(
 	cursor: Point | null,
 	origin: Point | null,
@@ -899,13 +1259,35 @@ function updateAddMenuPosition(): boolean {
 	return true
 }
 
+function updateSubmenuOpenDirection(): boolean {
+	if (typeof window === 'undefined' || !menuContainer.value) {
+		return false
+	}
+
+	submenuOpenDirection.value = getSubmenuOpenDirection({
+		menuRect: menuContainer.value.getBoundingClientRect(),
+		widestSubmenuWidth: getWidestSubmenuWidthInPixels(filterCategories.value),
+		viewportWidth: window.innerWidth,
+	})
+	return true
+}
+
 function scheduleAddMenuPositionUpdate(retries = 8) {
 	if (typeof window === 'undefined') {
 		return
 	}
 
 	nextTick(() => {
-		if (!isAddMenuOpen.value || updateAddMenuPosition() || retries <= 0) {
+		if (!isAddMenuOpen.value) {
+			return
+		}
+
+		if (updateAddMenuPosition()) {
+			updateSubmenuOpenDirection()
+			return
+		}
+
+		if (retries <= 0) {
 			return
 		}
 
@@ -929,11 +1311,15 @@ function updateSubmenuPosition(): boolean {
 
 	const buttonRect = activeButton.getBoundingClientRect()
 	const submenuRect = submenu.value?.getBoundingClientRect()
-	const submenuWidth = submenuRect?.width ?? 256
+	const submenuWidth =
+		submenuRect?.width ??
+		(activeCategory.value ? getSubmenuWidthInPixels(activeCategory.value) : 256)
 	const submenuHeight = submenuRect?.height ?? 320
 
+	updateSubmenuOpenDirection()
 	submenuPosition.value = getSubmenuPosition({
 		buttonRect,
+		openDirection: submenuOpenDirection.value,
 		submenuWidth,
 		submenuHeight,
 		viewportWidth: window.innerWidth,
@@ -993,6 +1379,7 @@ function updateMenuPositions() {
 	}
 
 	updateAddMenuPosition()
+	updateSubmenuOpenDirection()
 	updateSubmenuPosition()
 }
 
@@ -1032,11 +1419,37 @@ watch(isAddMenuOpen, (isOpen) => {
 		activeCategoryKey.value = null
 		hasSubmenuPosition.value = false
 		resetPendingCategory()
+		resetActiveCategoryOptionsScrollState()
 		stopAddMenuPositionTracking()
+		destroyActiveCategoryOptionsOverlayScrollbars()
 	}
 })
 
 watch(categorySearchQuery, () => {
+	resetActiveCategoryOptionsScrollState()
+	initializeActiveCategoryOptionsOverlayScrollbars()
+	scheduleSubmenuPositionUpdate()
+})
+
+watch(activeCategoryKey, (categoryKey) => {
+	resetActiveCategoryOptionsScrollState()
+	if (categoryKey) {
+		initializeActiveCategoryOptionsOverlayScrollbars()
+	} else {
+		destroyActiveCategoryOptionsOverlayScrollbars()
+	}
+})
+
+watch(filteredActiveCategoryOptions, () => {
+	if (!isAddMenuOpen.value) {
+		return
+	}
+
+	if (filteredActiveCategoryOptions.value.length > 0) {
+		initializeActiveCategoryOptionsOverlayScrollbars()
+	} else {
+		destroyActiveCategoryOptionsOverlayScrollbars()
+	}
 	scheduleSubmenuPositionUpdate()
 })
 
@@ -1045,6 +1458,11 @@ watch(filterCategoriesByKey, (nextCategories) => {
 		activeCategoryKey.value = null
 		hasSubmenuPosition.value = false
 	}
+
+	if (isAddMenuOpen.value) {
+		updateSubmenuOpenDirection()
+		scheduleSubmenuPositionUpdate()
+	}
 })
 
 watch(
@@ -1060,6 +1478,7 @@ watch(
 onBeforeUnmount(() => {
 	clearPendingCategoryTimeout()
 	stopAddMenuPositionTracking()
+	destroyActiveCategoryOptionsOverlayScrollbars()
 	if (isAddMenuOpen.value) {
 		commitAddMenuDraft()
 	}
@@ -1071,4 +1490,20 @@ onBeforeUnmount(() => {
 .checkbox-shadow {
 	box-shadow: 1px 1px 2px 0 rgba(0, 0, 0, 0.08);
 }
+
+.dropdown-filter-bar-options-scrollbar :deep(.os-theme-modrinth) {
+	--os-size: 10px;
+	--os-padding-perpendicular: 2px;
+	--os-padding-axis: 2px;
+	--os-track-bg: transparent;
+	--os-track-bg-hover: transparent;
+	--os-track-bg-active: transparent;
+	--os-handle-border-radius: 9999px;
+	--os-handle-border: 2px solid var(--color-surface-4);
+	--os-handle-border-hover: 2px solid var(--color-surface-4);
+	--os-handle-border-active: 2px solid var(--color-surface-4);
+	--os-handle-bg: var(--color-scrollbar, var(--color-surface-5));
+	--os-handle-bg-hover: var(--color-scrollbar, var(--color-surface-5));
+	--os-handle-bg-active: var(--color-scrollbar, var(--color-surface-5));
+}
 </style>
diff --git a/packages/ui/src/components/base/MultiSelect.vue b/packages/ui/src/components/base/MultiSelect.vue
index 9818d8f84e..b88a5724e9 100644
--- a/packages/ui/src/components/base/MultiSelect.vue
+++ b/packages/ui/src/components/base/MultiSelect.vue
@@ -39,7 +39,7 @@
 					<span
 						v-for="tag in visibleTags"
 						:key="String(tag.value)"
-						class="inline-flex items-center gap-1 rounded-full border border-solid border-surface-5 bg-surface-4 px-2.5 py-1 text-sm font-medium text-primary transition-colors hover:brightness-110"
+						class="inline-flex items-center gap-1 rounded-full border border-solid border-surface-5 bg-surface-4 px-2.5 py-1 text-sm font-medium text-primary transition-all hover:brightness-[115%]"
 						@click.stop="removeTag(tag.value)"
 					>
 						{{ tag.label }}
@@ -63,7 +63,7 @@
 								<span
 									v-for="tag in overflowTags"
 									:key="String(tag.value)"
-									class="inline-flex cursor-pointer items-center gap-1 rounded-full border border-solid border-surface-5 bg-surface-4 px-2.5 py-1 text-sm font-medium text-primary hover:brightness-110"
+									class="inline-flex cursor-pointer items-center gap-1 rounded-full border border-solid border-surface-5 bg-surface-4 px-2.5 py-1 text-sm font-medium text-primary hover:brightness-[115%]"
 									@click.stop="removeTag(tag.value)"
 								>
 									{{ tag.label }}
@@ -72,7 +72,10 @@
 							</div>
 						</template>
 					</Menu>
-					<span v-if="selectedOptions.length === 0" class="px-1.5 py-1 text-secondary">
+					<span
+						v-if="selectedOptions.length === 0"
+						class="text-primary opacity-50 text-base font-medium"
+					>
 						{{ placeholder }}
 					</span>
 				</div>
@@ -80,13 +83,16 @@
 					<button
 						v-if="clearable && modelValue.length > 0"
 						type="button"
-						class="flex cursor-pointer items-center justify-center rounded border-none bg-transparent p-0.5 text-secondary transition-colors hover:text-contrast"
+						class="flex cursor-pointer items-center justify-center rounded border-none bg-transparent p-0.5 text-secondary transition-all hover:text-contrast"
 						aria-label="Clear all"
 						@click.stop="clearAll"
 					>
 						<XIcon class="size-5" />
 					</button>
-					<div class="h-5 w-[1px] shrink-0 bg-surface-5"></div>
+					<div
+						v-if="clearable && modelValue.length > 0"
+						class="h-5 w-[1px] shrink-0 bg-surface-5"
+					></div>
 					<ChevronLeftIcon
 						v-if="showChevron"
 						class="size-5 shrink-0 text-secondary transition-transform duration-150"
@@ -116,10 +122,10 @@
 					@mousedown.stop
 					@keydown="handleDropdownKeydown"
 				>
-					<div class="empty:hidden pt-1.5">
+					<div class="empty:hidden">
 						<div
 							v-if="searchable"
-							class="px-3 py-1.5 pb-2.5 border-0 border-solid border-b border-b-surface-5"
+							class="px-0 py-1.5 border-0 border-solid border-b border-b-surface-5 flex"
 						>
 							<StyledInput
 								ref="searchInputRef"
@@ -127,20 +133,22 @@
 								:icon="SearchIcon"
 								type="text"
 								:placeholder="searchPlaceholder"
-								wrapper-class="w-full bg-surface-4"
+								wrapper-class="grow bg-surface-4 mx-0"
+								input-class="ps-9 mx-1.5"
 								@input="handleSearchInput"
 								@keydown="handleSearchKeydown"
 							/>
 						</div>
 
 						<div
-							v-if="filteredOptions.length > 0 || shouldShowSelectAll"
-							class="flex flex-col gap-2 bg-surface-4 border-0 border-solid border-b border-b-surface-5 py-1.5 empty:hidden"
+							v-if="hasFilteredOptions || shouldShowSelectAll"
+							class="flex flex-col bg-surface-4 border-0 border-solid border-b border-b-surface-5 empty:hidden"
 						>
-							<div v-if="shouldShowSelectAll" class="sticky top-0 z-10 bg-surface-4 px-3">
+							<div v-if="shouldShowSelectAll" class="sticky top-0 z-10 bg-surface-4">
 								<span
-									class="flex items-center gap-2.5 cursor-pointer p-3 text-left transition-colors duration-150 text-contrast hover:bg-surface-5 focus:bg-surface-5 rounded-xl"
-									:class="{ 'bg-surface-5': focusedIndex === -2 }"
+									class="flex w-full items-center gap-2.5 cursor-pointer px-4 py-3 text-left transition-all duration-150 text-contrast hover:brightness-[115%]"
+									:class="{ 'brightness-[115%]': focusedIndex === -2 }"
+									data-option-index="-2"
 									:data-focused="focusedIndex === -2"
 									role="option"
 									:aria-selected="isAllSelected"
@@ -149,6 +157,7 @@
 									@mouseenter="focusedIndex = -2"
 								>
 									<span
+										v-if="checkboxPosition === 'left'"
 										class="w-5 h-5 rounded-md flex items-center justify-center border-[1px] border-solid shrink-0 checkbox-shadow"
 										:class="[
 											isAllSelected
@@ -160,14 +169,21 @@
 										<MinusIcon v-if="isIndeterminate" aria-hidden="true" stroke-width="3" />
 										<CheckIcon v-else-if="isAllSelected" aria-hidden="true" stroke-width="3" />
 									</span>
-									<span class="font-semibold leading-tight text-primary">
+									<span class="min-w-0 flex-1 font-semibold leading-tight text-primary">
 										{{ selectAllLabel }}
 									</span>
+									<span
+										v-if="checkboxPosition === 'right'"
+										class="flex items-center justify-center shrink-0 text-brand"
+									>
+										<MinusIcon v-if="isIndeterminate" aria-hidden="true" class="size-5" />
+										<CheckIcon v-else-if="isAllSelected" aria-hidden="true" class="size-5" />
+									</span>
 								</span>
 							</div>
 						</div>
 
-						<div v-if="$slots.top" class="border-0 border-b border-solid border-b-surface-5 py-1.5">
+						<div v-if="$slots.top" class="border-0 border-b border-solid border-b-surface-5">
 							<slot
 								name="top"
 								:model-value="modelValue"
@@ -178,13 +194,14 @@
 						</div>
 
 						<div
-							v-if="shouldShowSelectionActions"
-							class="flex items-center justify-between gap-3 border-0 border-b border-solid border-b-surface-5 px-6 py-2.5 text-sm"
+							v-if="shouldShowSelectionActions && hasFilteredOptions"
+							ref="selectionActionsRef"
+							class="flex items-center justify-between gap-3 border-0 border-b border-solid border-b-surface-5 bg-surface-4 px-4 py-2.5 text-sm"
 						>
 							<span class="font-semibold text-secondary">{{ selectionActionsLabel }}</span>
 							<button
 								type="button"
-								class="border-0 bg-transparent p-0 text-sm font-semibold text-secondary shadow-none transition-colors hover:bg-transparent hover:text-contrast"
+								class="border-0 bg-transparent p-0 text-sm font-semibold text-secondary shadow-none transition-all hover:bg-transparent hover:text-contrast"
 								@click="clearAll"
 								@keydown.enter.stop
 								@keydown.space.stop
@@ -195,63 +212,151 @@
 					</div>
 
 					<div
-						v-if="filteredOptions.length > 0"
-						ref="optionsContainerRef"
-						class="flex flex-col gap-2 overflow-y-auto px-3 py-1.5"
-						:style="{ maxHeight: `${maxHeight}px` }"
+						v-if="hasFilteredOptions"
+						ref="optionsScrollbarRef"
+						class="multi-select-options-scrollbar bg-surface-4"
+						data-overlayscrollbars-initialize
 					>
-						<template v-for="(item, index) in filteredOptions" :key="String(item.value)">
-							<span
-								:ref="(el: any) => setOptionRef(el as HTMLElement, index)"
-								role="option"
-								:aria-selected="isSelected(item.value)"
-								:aria-disabled="item.disabled || undefined"
-								:data-focused="focusedIndex === index"
-								class="flex items-center gap-2.5 cursor-pointer p-3 text-left transition-colors duration-150 text-contrast hover:bg-surface-5 rounded-xl"
-								:class="[
-									item.class,
-									{
-										'bg-surface-5': focusedIndex === index,
-										'cursor-not-allowed opacity-50 pointer-events-none': item.disabled,
-									},
-								]"
-								tabindex="-1"
-								@click="toggleOption(item)"
-								@mouseenter="!item.disabled && (focusedIndex = index)"
+						<div
+							ref="optionsContainerRef"
+							class="overflow-y-auto select-none"
+							:style="{ maxHeight: `${maxHeight}px` }"
+							data-overlayscrollbars-viewport
+						>
+							<div
+								ref="listContainer"
+								:class="shouldVirtualizeOptions ? 'relative' : 'flex flex-col'"
+								:style="optionsListStyle"
 							>
-								<span
-									class="w-5 h-5 rounded-md flex items-center justify-center border-[1px] border-solid shrink-0 checkbox-shadow"
-									:class="
-										isSelected(item.value)
-											? 'bg-brand border-button-border text-brand-inverted'
-											: 'bg-surface-2 border-surface-5'
-									"
+								<template
+									v-for="{ item, index } in renderedVisibleOptions"
+									:key="getItemKey(item, index)"
 								>
-									<CheckIcon v-if="isSelected(item.value)" aria-hidden="true" stroke-width="3" />
-								</span>
-								<slot :name="`option-${item.value}`" :item="item">
-									<div class="flex items-center gap-2">
-										<component :is="item.icon" v-if="item.icon" class="h-5 w-5" />
+									<div
+										class="group/option-container focus-visible:outline-none"
+										:class="shouldVirtualizeOptions ? 'absolute left-0 right-0' : undefined"
+										:style="getOptionWrapperStyle(index)"
+									>
+										<div
+											v-if="isSectionHeader(item)"
+											class="flex items-center justify-between gap-3 text-sm font-semibold text-secondary border-t border-surface-5 border-solid border-0 group-first/option-container:border-t-0"
+											:class="[
+												item.class,
+												shouldVirtualizeOptions ? 'h-10 px-4' : 'h-10 px-4 pb-1 pt-2',
+											]"
+											role="presentation"
+										>
+											<span class="min-w-0 truncate">{{ item.label }}</span>
+											<button
+												v-if="hasSelectableSectionHeaderOptions(item)"
+												type="button"
+												class="shrink-0 border-0 bg-transparent p-0 text-sm font-medium text-secondary shadow-none transition-all hover:bg-transparent hover:text-contrast"
+												@click.stop="toggleSectionHeaderOptions(item)"
+												@keydown.enter.stop
+												@keydown.space.stop
+											>
+												{{ areSectionHeaderOptionsSelected(item) ? 'Clear' : 'Select all' }}
+											</button>
+										</div>
 										<span
-											class="font-semibold leading-tight"
-											:class="isSelected(item.value) ? 'text-contrast' : 'text-primary'"
+											v-else
+											role="option"
+											:aria-selected="item.selected"
+											:aria-disabled="item.disabled || undefined"
+											:data-option-index="index"
+											:data-focused="focusedIndex === index"
+											class="flex w-full cursor-pointer items-center gap-2.5 px-4 py-3 outline-none focus-visible:outline-none text-left text-contrast transition-all duration-150 bg-surface-4 hover:brightness-[115%] focus-visible:brightness-[115%]"
+											:class="[
+												item.class,
+												shouldVirtualizeOptions ? 'h-12' : undefined,
+												{
+													'brightness-[115%]': item.selected,
+													'pointer-events-none cursor-not-allowed opacity-50': item.disabled,
+												},
+											]"
+											tabindex="-1"
+											@click="toggleOption(item, $event)"
+											@mouseenter="!item.disabled && (focusedIndex = index)"
 										>
-											{{ item.label }}
+											<span
+												v-if="checkboxPosition === 'left'"
+												class="checkbox-shadow flex h-5 w-5 shrink-0 items-center justify-center rounded-md border-[1px] border-solid"
+												:class="
+													item.selected
+														? 'border-button-border bg-brand text-brand-inverted'
+														: 'border-surface-5 bg-surface-2'
+												"
+											>
+												<CheckIcon v-if="item.selected" aria-hidden="true" stroke-width="3" />
+											</span>
+											<slot name="option" :item="item" :selected="item.selected" :index="index">
+												<slot
+													:name="`option-${item.value}`"
+													:item="item"
+													:selected="item.selected"
+													:index="index"
+												>
+													<div class="flex min-w-0 flex-1 items-center justify-between gap-3">
+														<div class="flex min-w-0 items-center gap-2">
+															<component
+																:is="item.icon"
+																v-if="item.icon"
+																class="h-5 w-5 shrink-0"
+															/>
+															<span
+																class="min-w-0 truncate font-semibold leading-tight"
+																:class="item.selected ? 'text-contrast' : 'text-primary'"
+															>
+																{{ item.label }}
+															</span>
+														</div>
+														<slot
+															name="option-right"
+															:item="item"
+															:selected="item.selected"
+															:index="index"
+														></slot>
+													</div>
+												</slot>
+											</slot>
+											<span
+												v-if="checkboxPosition === 'right'"
+												class="flex shrink-0 items-center justify-center text-brand"
+											>
+												<CheckIcon v-if="item.selected" aria-hidden="true" class="size-5" />
+											</span>
 										</span>
 									</div>
-								</slot>
-							</span>
-						</template>
-					</div>
-					<div
-						v-else-if="isNoOptionsState && noOptionsMessage"
-						class="p-4 mb-2 text-center text-sm text-secondary"
-					>
-						{{ noOptionsMessage }}
-					</div>
-					<div v-else-if="searchQuery" class="p-4 mb-2 text-center text-sm text-secondary">
-						{{ noResultsMessage }}
+								</template>
+							</div>
+						</div>
 					</div>
+					<template v-else>
+						<div
+							v-if="shouldShowSelectionActions"
+							class="flex items-center justify-between gap-3 border-0 border-b border-solid border-b-surface-5 px-3 py-2.5 text-sm"
+						>
+							<span class="font-semibold text-secondary">{{ selectionActionsLabel }}</span>
+							<button
+								type="button"
+								class="border-0 bg-transparent p-0 text-sm font-semibold text-secondary shadow-none transition-all hover:bg-transparent hover:text-contrast"
+								@click="clearAll"
+								@keydown.enter.stop
+								@keydown.space.stop
+							>
+								{{ selectionActionsClearLabel }}
+							</button>
+						</div>
+						<div
+							v-if="isNoOptionsState && noOptionsMessage"
+							class="p-4 mb-2 text-center text-sm text-secondary"
+						>
+							{{ noOptionsMessage }}
+						</div>
+						<div v-else-if="searchQuery" class="p-4 mb-2 text-center text-sm text-secondary">
+							{{ noResultsMessage }}
+						</div>
+					</template>
 
 					<div v-if="$slots.bottom" @keydown.stop>
 						<slot name="bottom"></slot>
@@ -265,9 +370,12 @@
 </template>
 
 <script setup lang="ts" generic="T">
+import 'overlayscrollbars/overlayscrollbars.css'
+
 import { CheckIcon, ChevronLeftIcon, MinusIcon, SearchIcon, XIcon } from '@modrinth/assets'
 import { onClickOutside } from '@vueuse/core'
 import { Menu } from 'floating-vue'
+import { OverlayScrollbars, type PartialOptions } from 'overlayscrollbars'
 import {
 	type Component,
 	computed,
@@ -280,6 +388,7 @@ import {
 	watch,
 } from 'vue'
 
+import { useVirtualScroll } from '../../composables/virtual-scroll'
 import StyledInput from './StyledInput.vue'
 
 export interface MultiSelectOption<T> {
@@ -291,14 +400,57 @@ export interface MultiSelectOption<T> {
 	searchTerms?: string[]
 }
 
+export interface MultiSelectSectionHeader {
+	type: 'section-header'
+	label: string
+	key?: string
+	class?: string
+}
+
+export type MultiSelectItem<T> = MultiSelectOption<T> | MultiSelectSectionHeader
+
+type RenderedMultiSelectOption<T> = MultiSelectOption<T> & {
+	selected: boolean
+}
+
+type RenderedMultiSelectItem<T> = RenderedMultiSelectOption<T> | MultiSelectSectionHeader
+
+type VisibleMultiSelectItem<T> = {
+	item: RenderedMultiSelectItem<T>
+	index: number
+}
+
+type OverlayScrollbarsInstance = NonNullable<ReturnType<typeof OverlayScrollbars>>
+
 const DROPDOWN_VIEWPORT_MARGIN = 8
-const DROPDOWN_GAP = 12
+const DROPDOWN_GAP = 8
 const DEFAULT_MAX_HEIGHT = 300
+const MULTI_SELECT_OPTION_ROW_HEIGHT = 48
+const MULTI_SELECT_VIRTUALIZATION_THRESHOLD = 80
+const OPTIONS_OVERLAY_SCROLLBARS_OPTIONS = Object.freeze<PartialOptions>({
+	overflow: {
+		x: 'hidden',
+		y: 'scroll',
+	},
+	scrollbars: {
+		theme: 'os-theme-modrinth',
+		autoHide: 'leave',
+		autoHideSuspend: true,
+	},
+})
+
+function isSectionHeader<T>(item: MultiSelectItem<T>): item is MultiSelectSectionHeader {
+	return 'type' in item && item.type === 'section-header'
+}
+
+function isOption<T>(item: MultiSelectItem<T>): item is MultiSelectOption<T> {
+	return !isSectionHeader(item)
+}
 
 const props = withDefaults(
 	defineProps<{
 		modelValue: T[]
-		options: MultiSelectOption<T>[]
+		options: MultiSelectItem<T>[]
 		placeholder?: string
 		disabled?: boolean
 		searchable?: boolean
@@ -321,6 +473,7 @@ const props = withDefaults(
 		showSelectionActions?: boolean
 		selectionActionsClearLabel?: string
 		maxTagRows?: number
+		checkboxPosition?: 'left' | 'right'
 	}>(),
 	{
 		placeholder: 'Select options',
@@ -336,8 +489,9 @@ const props = withDefaults(
 		includeSelectAllOption: false,
 		selectAllLabel: 'Select all',
 		showSelectionActions: false,
-		selectionActionsClearLabel: 'Deselect all',
+		selectionActionsClearLabel: 'Clear',
 		maxTagRows: 1,
+		checkboxPosition: 'left',
 	},
 )
 
@@ -355,11 +509,14 @@ const focusedIndex = ref(-1)
 const containerRef = ref<HTMLElement>()
 const triggerRef = ref<HTMLElement>()
 const dropdownRef = ref<HTMLElement>()
+const optionsScrollbarRef = ref<HTMLElement>()
 const optionsContainerRef = ref<HTMLElement>()
+const selectionActionsRef = ref<HTMLElement>()
 const searchInputRef = ref<InstanceType<typeof StyledInput>>()
-const optionRefs = ref<(HTMLElement | null)[]>([])
 const rafId = ref<number | null>(null)
 const tagsContainerRef = ref<HTMLElement>()
+const optionsOverlayScrollbars = ref<OverlayScrollbarsInstance | null>(null)
+const lastSelectionActionsHeight = ref(0)
 
 const dropdownStyle = ref({
 	top: '0px',
@@ -371,20 +528,31 @@ const dropdownStyle = ref({
 const openDirection = ref<'down' | 'up'>('down')
 const hasCustomInputContent = computed(() => Boolean(slots['input-content']))
 
+const selectableOptions = computed(() => props.options.filter(isOption))
+const enabledSelectableOptions = computed(() =>
+	selectableOptions.value.filter((opt) => !opt.disabled),
+)
+const selectedValueSet = computed(() => new Set(props.modelValue))
+
 const selectedOptions = computed(() => {
-	return props.options.filter((opt) => props.modelValue.includes(opt.value))
+	const selectedValues = selectedValueSet.value
+	return selectableOptions.value.filter((opt) => selectedValues.has(opt.value))
 })
 
 const isAllSelected = computed(() => {
-	const selectableOptions = props.options.filter((opt) => !opt.disabled)
+	const selectableOptions = enabledSelectableOptions.value
+	const selectedValues = selectedValueSet.value
 	return (
-		selectableOptions.length > 0 &&
-		selectableOptions.every((opt) => props.modelValue.includes(opt.value))
+		selectableOptions.length > 0 && selectableOptions.every((opt) => selectedValues.has(opt.value))
 	)
 })
 
 const isIndeterminate = computed(() => {
-	return !isAllSelected.value && props.modelValue.length > 0
+	const selectedValues = selectedValueSet.value
+	return (
+		!isAllSelected.value &&
+		selectableOptions.value.some((opt) => !opt.disabled && selectedValues.has(opt.value))
+	)
 })
 
 const visibleTagCount = ref(Infinity)
@@ -403,40 +571,203 @@ const overflowTags = computed(() => {
 
 const popperOverflowTags = shallowRef<MultiSelectOption<T>[]>([])
 
+const lastClickedValue = shallowRef<{ value: T } | null>(null)
+
 const filteredOptions = computed(() => {
 	if (!searchQuery.value || !props.searchable || props.disableSearchFilter) {
 		return props.options
 	}
 
 	const query = searchQuery.value.toLowerCase()
-	return props.options.filter((opt) => {
-		if (opt.label.toLowerCase().includes(query)) return true
-		if (opt.searchTerms?.some((term) => term.toLowerCase().includes(query))) return true
-		return false
+	const items: MultiSelectItem<T>[] = []
+	let pendingSectionHeader: MultiSelectSectionHeader | null = null
+
+	for (const opt of props.options) {
+		if (isSectionHeader(opt)) {
+			pendingSectionHeader = opt
+			continue
+		}
+
+		const matches =
+			opt.label.toLowerCase().includes(query) ||
+			opt.searchTerms?.some((term) => term.toLowerCase().includes(query))
+
+		if (!matches) {
+			continue
+		}
+
+		if (pendingSectionHeader) {
+			items.push(pendingSectionHeader)
+			pendingSectionHeader = null
+		}
+		items.push(opt)
+	}
+
+	return items
+})
+
+const renderedFilteredOptions = computed<RenderedMultiSelectItem<T>[]>(() => {
+	const selectedValues = selectedValueSet.value
+	return filteredOptions.value.map((item) => {
+		if (isSectionHeader(item)) {
+			return item
+		}
+
+		return {
+			...item,
+			selected: selectedValues.has(item.value),
+		}
 	})
 })
 
-const isNoOptionsState = computed(() => props.options.length === 0 && !searchQuery.value)
-const shouldShowSelectAll = computed(() => props.includeSelectAllOption && props.options.length > 0)
+const shouldVirtualizeOptions = computed(
+	() => renderedFilteredOptions.value.length > MULTI_SELECT_VIRTUALIZATION_THRESHOLD,
+)
+
+const { listContainer, totalHeight, visibleRange, visibleItems } = useVirtualScroll(
+	renderedFilteredOptions,
+	{
+		itemHeight: MULTI_SELECT_OPTION_ROW_HEIGHT,
+		bufferSize: 8,
+		initialItemCount: 12,
+		enabled: shouldVirtualizeOptions,
+	},
+)
+
+const renderedVisibleOptions = computed<VisibleMultiSelectItem<T>[]>(() =>
+	visibleItems.value.map((item, offset) => ({
+		item,
+		index: visibleRange.value.start + offset,
+	})),
+)
+const optionsListStyle = computed(() =>
+	shouldVirtualizeOptions.value ? { height: `${totalHeight.value}px` } : undefined,
+)
+
+const hasFilteredOptions = computed(() => filteredOptions.value.some(isOption))
+const isNoOptionsState = computed(() => selectableOptions.value.length === 0 && !searchQuery.value)
+const shouldShowSelectAll = computed(
+	() => props.includeSelectAllOption && enabledSelectableOptions.value.length > 1,
+)
+const selectedOptionCount = computed(() => selectedOptions.value.length)
 const shouldShowSelectionActions = computed(
-	() => props.showSelectionActions && props.modelValue.length > 0,
+	() => props.showSelectionActions && selectedOptionCount.value > 0,
 )
 const selectionActionsLabel = computed(() => {
-	return props.modelValue.length === 1 ? '1 selected' : `${props.modelValue.length} selected`
+	return selectedOptionCount.value === 1 ? '1 selected' : `${selectedOptionCount.value} selected`
 })
 
 function isSelected(value: T) {
-	return props.modelValue.includes(value)
+	return selectedValueSet.value.has(value)
+}
+
+function getItemKey(item: MultiSelectItem<T>, index: number) {
+	if (isSectionHeader(item)) {
+		return item.key ?? `section-header-${item.label}-${index}`
+	}
+
+	return `option-${String(item.value)}`
+}
+
+function getSectionHeaderOptions(sectionHeader: MultiSelectSectionHeader) {
+	const sectionHeaderIndex = props.options.findIndex((item) => item === sectionHeader)
+	if (sectionHeaderIndex === -1) {
+		return []
+	}
+
+	const sectionHeaderOptions: MultiSelectOption<T>[] = []
+	for (let i = sectionHeaderIndex + 1; i < props.options.length; i++) {
+		const item = props.options[i]
+		if (!item || isSectionHeader(item)) {
+			break
+		}
+		if (!item.disabled) {
+			sectionHeaderOptions.push(item)
+		}
+	}
+
+	return sectionHeaderOptions
+}
+
+function hasSelectableSectionHeaderOptions(sectionHeader: MultiSelectSectionHeader) {
+	return getSectionHeaderOptions(sectionHeader).length > 1
+}
+
+function areSectionHeaderOptionsSelected(sectionHeader: MultiSelectSectionHeader) {
+	const sectionHeaderOptions = getSectionHeaderOptions(sectionHeader)
+	return (
+		sectionHeaderOptions.length > 0 &&
+		sectionHeaderOptions.every((option) => isSelected(option.value))
+	)
+}
+
+function toggleSectionHeaderOptions(sectionHeader: MultiSelectSectionHeader) {
+	const sectionHeaderOptions = getSectionHeaderOptions(sectionHeader)
+	if (sectionHeaderOptions.length === 0) {
+		return
+	}
+
+	let newValue: T[]
+	if (sectionHeaderOptions.every((option) => isSelected(option.value))) {
+		const sectionHeaderValues = new Set(sectionHeaderOptions.map((option) => option.value))
+		newValue = props.modelValue.filter((value) => !sectionHeaderValues.has(value))
+	} else {
+		newValue = [...props.modelValue]
+		for (const option of sectionHeaderOptions) {
+			if (!newValue.includes(option.value)) {
+				newValue.push(option.value)
+			}
+		}
+	}
+
+	emit('update:modelValue', newValue)
+	const lastSectionHeaderOption = sectionHeaderOptions[sectionHeaderOptions.length - 1]
+	if (lastSectionHeaderOption) {
+		lastClickedValue.value = { value: lastSectionHeaderOption.value }
+	}
 }
 
-function toggleOption(option: MultiSelectOption<T>) {
+function toggleOption(option: MultiSelectOption<T>, event?: MouseEvent | KeyboardEvent) {
 	if (option.disabled) return
 
+	if (event?.shiftKey && lastClickedValue.value) {
+		const anchorValue = lastClickedValue.value.value
+		const anchorIndex = filteredOptions.value.findIndex(
+			(opt) => isOption(opt) && opt.value === anchorValue,
+		)
+		const currentIndex = filteredOptions.value.findIndex(
+			(opt) => isOption(opt) && opt.value === option.value,
+		)
+
+		if (anchorIndex !== -1 && currentIndex !== -1 && anchorIndex !== currentIndex) {
+			const start = Math.min(anchorIndex, currentIndex)
+			const end = Math.max(anchorIndex, currentIndex)
+			const shouldSelect = !isSelected(option.value)
+			const newValue = [...props.modelValue]
+
+			for (let i = start; i <= end; i++) {
+				const opt = filteredOptions.value[i]
+				if (!opt || isSectionHeader(opt) || opt.disabled) continue
+				const idx = newValue.indexOf(opt.value)
+				if (shouldSelect && idx === -1) {
+					newValue.push(opt.value)
+				} else if (!shouldSelect && idx !== -1) {
+					newValue.splice(idx, 1)
+				}
+			}
+
+			emit('update:modelValue', newValue)
+			lastClickedValue.value = { value: option.value }
+			return
+		}
+	}
+
 	const newValue = isSelected(option.value)
 		? props.modelValue.filter((v) => v !== option.value)
 		: [...props.modelValue, option.value]
 
 	emit('update:modelValue', newValue)
+	lastClickedValue.value = { value: option.value }
 }
 
 function removeTag(value: T) {
@@ -462,15 +793,11 @@ function toggleSelectAll() {
 	if (isAllSelected.value) {
 		emit('update:modelValue', [])
 	} else {
-		const allValues = props.options.filter((opt) => !opt.disabled).map((opt) => opt.value)
+		const allValues = enabledSelectableOptions.value.map((opt) => opt.value)
 		emit('update:modelValue', allValues)
 	}
 }
 
-function setOptionRef(el: HTMLElement | null, index: number) {
-	optionRefs.value[index] = el
-}
-
 async function calculateVisibleTags() {
 	visibleTagCount.value = Infinity
 	await nextTick()
@@ -578,6 +905,55 @@ async function updateDropdownPosition() {
 	openDirection.value = direction
 }
 
+async function initializeOptionsOverlayScrollbars() {
+	await nextTick()
+
+	if (!isOpen.value || !hasFilteredOptions.value) {
+		destroyOptionsOverlayScrollbars()
+		return
+	}
+
+	if (!optionsScrollbarRef.value || !optionsContainerRef.value || !listContainer.value) {
+		return
+	}
+
+	if (optionsOverlayScrollbars.value) {
+		optionsOverlayScrollbars.value.update(true)
+		return
+	}
+
+	optionsOverlayScrollbars.value = OverlayScrollbars(
+		{
+			target: optionsScrollbarRef.value,
+			elements: {
+				viewport: optionsContainerRef.value,
+				content: listContainer.value,
+			},
+		},
+		OPTIONS_OVERLAY_SCROLLBARS_OPTIONS,
+	)
+}
+
+function getSelectionActionsHeight() {
+	return shouldShowSelectionActions.value ? (selectionActionsRef.value?.offsetHeight ?? 0) : 0
+}
+
+async function syncSelectionActionsHeight() {
+	await nextTick()
+	lastSelectionActionsHeight.value = getSelectionActionsHeight()
+}
+
+function updateOptionsOverlayScrollbars() {
+	nextTick(() => {
+		optionsOverlayScrollbars.value?.update(true)
+	})
+}
+
+function destroyOptionsOverlayScrollbars() {
+	optionsOverlayScrollbars.value?.destroy()
+	optionsOverlayScrollbars.value = null
+}
+
 async function openDropdown() {
 	if (props.disabled || isOpen.value) return
 
@@ -586,12 +962,14 @@ async function openDropdown() {
 
 	await nextTick()
 	await updateDropdownPosition()
+	await initializeOptionsOverlayScrollbars()
+	await syncSelectionActionsHeight()
 
 	if (props.searchable && searchInputRef.value) {
 		;(searchInputRef.value as unknown as { focus: () => void }).focus()
 	}
 
-	focusedIndex.value = shouldShowSelectAll.value ? -2 : filteredOptions.value.length > 0 ? 0 : -1
+	focusedIndex.value = shouldShowSelectAll.value ? -2 : getFirstFocusableOptionIndex()
 	startPositionTracking()
 }
 
@@ -599,6 +977,7 @@ function closeDropdown() {
 	if (!isOpen.value) return
 
 	stopPositionTracking()
+	destroyOptionsOverlayScrollbars()
 	isOpen.value = false
 	searchQuery.value = ''
 	focusedIndex.value = -1
@@ -635,35 +1014,111 @@ function handleTriggerKeydown(event: KeyboardEvent) {
 	}
 }
 
+function isFocusableOptionIndex(index: number) {
+	const option = filteredOptions.value[index]
+	return option !== undefined && isOption(option) && !option.disabled
+}
+
+function getFirstFocusableOptionIndex() {
+	return filteredOptions.value.findIndex((_, index) => isFocusableOptionIndex(index))
+}
+
+function findNextFocusableOption(currentIndex: number, direction: 'next' | 'previous') {
+	const length = filteredOptions.value.length
+	if (length === 0) return -1
+
+	let index = currentIndex
+	for (let i = 0; i < length; i++) {
+		index = direction === 'next' ? (index + 1) % length : (index - 1 + length) % length
+		if (isFocusableOptionIndex(index)) {
+			return index
+		}
+	}
+
+	return -1
+}
+
 function focusNextOption() {
 	const length = filteredOptions.value.length
 	if (length === 0) return
 
-	if (focusedIndex.value === -2) {
-		focusedIndex.value = 0
-	} else {
-		focusedIndex.value = (focusedIndex.value + 1) % length
-	}
+	const nextIndex = findNextFocusableOption(
+		focusedIndex.value === -2 ? -1 : focusedIndex.value,
+		'next',
+	)
+	if (nextIndex === -1) return
 
-	optionRefs.value[focusedIndex.value]?.scrollIntoView({ block: 'nearest' })
+	focusedIndex.value = nextIndex
+	focusOptionIndex(focusedIndex.value)
 }
 
 function focusPreviousOption() {
 	const length = filteredOptions.value.length
 	if (length === 0) return
 
-	if (focusedIndex.value <= 0 && shouldShowSelectAll.value) {
+	if (focusedIndex.value === getFirstFocusableOptionIndex() && shouldShowSelectAll.value) {
 		focusedIndex.value = -2
+		focusOptionIndex(focusedIndex.value)
 		return
 	}
 
-	if (focusedIndex.value <= 0) {
-		focusedIndex.value = length - 1
-	} else {
-		focusedIndex.value = focusedIndex.value - 1
+	const previousIndex = findNextFocusableOption(
+		focusedIndex.value === -1 ? 0 : focusedIndex.value,
+		'previous',
+	)
+	if (previousIndex === -1) return
+
+	focusedIndex.value = previousIndex
+	focusOptionIndex(focusedIndex.value)
+}
+
+function scrollOptionIndexIntoView(index: number) {
+	if (index < 0) {
+		return
+	}
+
+	const container = optionsContainerRef.value
+	if (!container) {
+		return
 	}
 
-	optionRefs.value[focusedIndex.value]?.scrollIntoView({ block: 'nearest' })
+	const optionElement = container.querySelector<HTMLElement>(`[data-option-index="${index}"]`)
+	if (optionElement) {
+		const containerRect = container.getBoundingClientRect()
+		const optionRect = optionElement.getBoundingClientRect()
+
+		if (optionRect.top < containerRect.top) {
+			container.scrollTop -= containerRect.top - optionRect.top
+		} else if (optionRect.bottom > containerRect.bottom) {
+			container.scrollTop += optionRect.bottom - containerRect.bottom
+		}
+		return
+	}
+
+	const optionTop = index * MULTI_SELECT_OPTION_ROW_HEIGHT
+	const optionBottom = optionTop + MULTI_SELECT_OPTION_ROW_HEIGHT
+	if (optionTop < container.scrollTop) {
+		container.scrollTop = optionTop
+	} else if (optionBottom > container.scrollTop + container.clientHeight) {
+		container.scrollTop = optionBottom - container.clientHeight
+	}
+}
+
+function focusOptionIndex(index: number) {
+	scrollOptionIndexIntoView(index)
+	nextTick(() => {
+		dropdownRef.value?.querySelector<HTMLElement>(`[data-option-index="${index}"]`)?.focus()
+	})
+}
+
+function getOptionWrapperStyle(index: number) {
+	if (!shouldVirtualizeOptions.value) {
+		return undefined
+	}
+
+	return {
+		transform: `translateY(${index * MULTI_SELECT_OPTION_ROW_HEIGHT}px)`,
+	}
 }
 
 function handleDropdownKeydown(event: KeyboardEvent) {
@@ -687,7 +1142,7 @@ function handleDropdownKeydown(event: KeyboardEvent) {
 				toggleSelectAll()
 			} else if (focusedIndex.value >= 0) {
 				const option = filteredOptions.value[focusedIndex.value]
-				if (option) toggleOption(option)
+				if (option && isOption(option)) toggleOption(option, event)
 			}
 			break
 		case 'Tab':
@@ -702,15 +1157,17 @@ function handleDropdownKeydown(event: KeyboardEvent) {
 }
 
 function handleSearchKeydown(event: KeyboardEvent) {
+	event.stopPropagation()
+
 	if (event.key === 'Escape') {
 		event.preventDefault()
 		closeDropdown()
 	} else if (event.key === 'ArrowDown') {
 		event.preventDefault()
-		focusNextOption()
+		focusOptionFromSearch('next')
 	} else if (event.key === 'ArrowUp') {
 		event.preventDefault()
-		focusPreviousOption()
+		focusOptionFromSearch('previous')
 	} else if (event.key === 'Enter' || event.key === ' ') {
 		if (event.key === 'Enter') {
 			event.preventDefault()
@@ -718,7 +1175,7 @@ function handleSearchKeydown(event: KeyboardEvent) {
 				toggleSelectAll()
 			} else if (focusedIndex.value >= 0) {
 				const option = filteredOptions.value[focusedIndex.value]
-				if (option) toggleOption(option)
+				if (option && isOption(option)) toggleOption(option, event)
 			}
 		}
 	} else if (event.key === 'Tab' && isOpen.value) {
@@ -731,12 +1188,42 @@ function handleSearchKeydown(event: KeyboardEvent) {
 	}
 }
 
+function focusOptionFromSearch(direction: 'next' | 'previous') {
+	const activeElement = document.activeElement
+	if (activeElement instanceof HTMLElement) {
+		activeElement.blur()
+	}
+
+	if (direction === 'previous') {
+		focusPreviousOption()
+		return
+	}
+
+	const nextIndex =
+		focusedIndex.value === -1
+			? shouldShowSelectAll.value
+				? -2
+				: getFirstFocusableOptionIndex()
+			: focusedIndex.value
+
+	if (nextIndex === -1) {
+		return
+	}
+
+	focusedIndex.value = nextIndex
+	focusOptionIndex(nextIndex)
+}
+
 function handleSearchInput() {
 	emit('searchInput', searchQuery.value)
 	if (!isOpen.value) {
 		openDropdown()
 	}
-	focusedIndex.value = shouldShowSelectAll.value ? -2 : filteredOptions.value.length > 0 ? 0 : -1
+	if (optionsContainerRef.value) {
+		optionsContainerRef.value.scrollTop = 0
+	}
+	updateOptionsOverlayScrollbars()
+	focusedIndex.value = shouldShowSelectAll.value ? -2 : getFirstFocusableOptionIndex()
 }
 
 function handleWindowResize() {
@@ -776,6 +1263,7 @@ onMounted(() => {
 onUnmounted(() => {
 	window.removeEventListener('resize', handleWindowResize)
 	stopPositionTracking()
+	destroyOptionsOverlayScrollbars()
 })
 
 watch(isOpen, (value) => {
@@ -787,7 +1275,37 @@ watch(isOpen, (value) => {
 watch(filteredOptions, () => {
 	if (isOpen.value) {
 		updateDropdownPosition()
+		if (hasFilteredOptions.value) {
+			initializeOptionsOverlayScrollbars()
+			syncSelectionActionsHeight()
+		} else {
+			destroyOptionsOverlayScrollbars()
+			lastSelectionActionsHeight.value = 0
+		}
+	}
+})
+
+watch(shouldShowSelectionActions, async () => {
+	const container = optionsContainerRef.value
+	const previousHeight = lastSelectionActionsHeight.value
+	const previousScrollTop = container?.scrollTop ?? 0
+
+	await nextTick()
+
+	const nextHeight = hasFilteredOptions.value ? getSelectionActionsHeight() : 0
+	lastSelectionActionsHeight.value = nextHeight
+
+	if (!isOpen.value || !hasFilteredOptions.value || !container || previousHeight === nextHeight) {
+		if (isOpen.value) {
+			updateDropdownPosition()
+		}
+		updateOptionsOverlayScrollbars()
+		return
 	}
+
+	container.scrollTop = Math.max(0, previousScrollTop + nextHeight - previousHeight)
+	updateDropdownPosition()
+	updateOptionsOverlayScrollbars()
 })
 
 watch(
@@ -796,14 +1314,37 @@ watch(
 		calculateVisibleTags()
 		if (isOpen.value) {
 			updateDropdownPosition()
+			updateOptionsOverlayScrollbars()
 		}
 	},
 	{ deep: true },
 )
+
+watch(
+	() => props.maxHeight,
+	() => {
+		if (isOpen.value) {
+			updateOptionsOverlayScrollbars()
+		}
+	},
+)
 </script>
 
 <style scoped>
 .checkbox-shadow {
 	box-shadow: 1px 1px 2px 0 rgba(0, 0, 0, 0.08);
 }
+
+.multi-select-options-scrollbar :deep(.os-theme-modrinth) {
+	--os-size: 10px;
+	--os-padding-perpendicular: 2px;
+	--os-padding-axis: 2px;
+	--os-track-bg: transparent;
+	--os-track-bg-hover: transparent;
+	--os-track-bg-active: transparent;
+	--os-handle-border-radius: 9999px;
+	--os-handle-bg: var(--color-scrollbar, var(--surface-5));
+	--os-handle-bg-hover: var(--color-scrollbar, var(--surface-5));
+	--os-handle-bg-active: var(--color-scrollbar, var(--surface-5));
+}
 </style>
diff --git a/packages/ui/src/components/base/Table.vue b/packages/ui/src/components/base/Table.vue
index 9636cd8a4b..ceb99dcdd8 100644
--- a/packages/ui/src/components/base/Table.vue
+++ b/packages/ui/src/components/base/Table.vue
@@ -6,114 +6,123 @@
 		>
 			<slot name="header" />
 		</div>
-		<table class="w-full table-fixed border-separate border-spacing-0 border-surface-5">
-			<colgroup>
-				<col v-if="showSelection" class="w-10" />
-				<col
-					v-for="column in columns"
-					:key="column.key"
-					:style="column.width ? { width: column.width } : undefined"
-				/>
-			</colgroup>
-			<thead class="">
-				<tr class="bg-surface-3">
-					<th v-if="showSelection" class="w-10 pl-4">
-						<Checkbox
-							:model-value="allSelected"
-							:indeterminate="someSelected"
-							class="shrink-0 py-4"
-							@update:model-value="toggleSelectAll"
-						/>
-					</th>
-					<th
+		<div class="overflow-x-auto overflow-y-hidden">
+			<table
+				class="w-full table-fixed border-separate border-spacing-0 border-surface-5"
+				:style="tableMinWidth ? { minWidth: tableMinWidth } : undefined"
+			>
+				<colgroup>
+					<col v-if="showSelection" class="w-12" />
+					<col
 						v-for="column in columns"
 						:key="column.key"
-						class="h-14 first:pl-4 last:pr-4"
-						:class="[
-							`text-${column.align ?? 'left'}`,
-							column.enableSorting ? 'cursor-pointer select-none' : '',
-						]"
-						@click="column.enableSorting ? handleSort(column.key) : undefined"
-					>
-						<slot :name="`header-${column.key}`" :column="column">
-							<span
-								v-if="column.label || column.enableSorting"
-								class="inline-flex min-w-0 max-w-full items-center gap-1 font-semibold"
-								:class="`${sortColumn === column.key ? 'text-contrast' : ''}`"
-							>
-								<span class="min-w-0 truncate">{{ column.label ?? '' }}</span>
-								<template v-if="column.enableSorting">
-									<ChevronUpIcon
-										v-if="sortColumn === column.key && sortDirection === 'asc'"
-										class="size-4 shrink-0"
-									/>
-									<ChevronDownIcon
-										v-else-if="sortColumn === column.key && sortDirection === 'desc'"
-										class="size-4 shrink-0"
-									/>
-								</template>
-							</span>
-						</slot>
-					</th>
-				</tr>
-			</thead>
-			<tbody :ref="setListContainer">
-				<tr v-if="data.length === 0" class="bg-surface-2">
-					<td :colspan="columnSpan" class="border-solid border-0 border-t border-surface-5 p-0">
-						<slot name="empty-state">
-							<div class="text-secondary flex h-64 items-center justify-center">
-								No data available.
-							</div>
-						</slot>
-					</td>
-				</tr>
-				<template v-else>
-					<tr v-if="virtualized && topSpacerHeight > 0" aria-hidden="true">
-						<td
-							:colspan="columnSpan"
-							class="border-0 p-0"
-							:style="{ height: `${topSpacerHeight}px` }"
-						></td>
-					</tr>
-					<tr
-						v-for="(row, rowIndex) in renderedRows"
-						:key="getRowRenderKey(row, getAbsoluteRowIndex(rowIndex))"
-						:class="getAbsoluteRowIndex(rowIndex) % 2 === 0 ? 'bg-surface-2' : 'bg-surface-1.5'"
-					>
-						<td v-if="showSelection" class="w-10 border-solid border-0 border-t border-surface-5">
+						:style="column.width ? { width: column.width } : undefined"
+					/>
+				</colgroup>
+				<thead class="">
+					<tr class="bg-surface-3">
+						<th v-if="showSelection" class="w-12">
 							<Checkbox
-								:model-value="isSelected(row)"
-								class="shrink-0 p-4"
-								@update:model-value="toggleSelection(row)"
+								:model-value="allSelected"
+								:indeterminate="someSelected"
+								class="shrink-0 p-4 focus-visible:!outline-none"
+								@update:model-value="toggleSelectAll"
 							/>
-						</td>
-						<td
+						</th>
+						<th
 							v-for="column in columns"
 							:key="column.key"
-							class="text-secondary h-14 overflow-hidden first:pl-4 last:pr-4 border-solid border-0 border-t border-surface-5"
-							:class="`text-${column.align ?? 'left'}`"
+							class="h-14 first:pl-4 last:pr-4"
+							:class="[
+								`text-${column.align ?? 'left'}`,
+								column.enableSorting ? 'cursor-pointer select-none' : '',
+							]"
+							:style="column.width ? { width: column.width } : undefined"
+							@click="column.enableSorting ? handleSort(column.key) : undefined"
 						>
-							<slot
-								:name="`cell-${column.key}`"
-								:row="row"
-								:value="row[column.key]"
-								:column="column"
-								:index="getAbsoluteRowIndex(rowIndex)"
-							>
-								{{ row[column.key] ?? '' }}
+							<slot :name="`header-${column.key}`" :column="column">
+								<span
+									v-if="column.label || column.enableSorting"
+									class="inline-flex min-w-0 max-w-full items-center gap-1 font-semibold"
+									:class="`${sortColumn === column.key ? 'text-contrast' : ''}`"
+								>
+									<span class="min-w-0 truncate">{{ column.label ?? '' }}</span>
+									<template v-if="column.enableSorting">
+										<ChevronUpIcon
+											v-if="sortColumn === column.key && sortDirection === 'asc'"
+											class="size-4 shrink-0"
+										/>
+										<ChevronDownIcon
+											v-else-if="sortColumn === column.key && sortDirection === 'desc'"
+											class="size-4 shrink-0"
+										/>
+									</template>
+								</span>
 							</slot>
-						</td>
+						</th>
 					</tr>
-					<tr v-if="virtualized && bottomSpacerHeight > 0" aria-hidden="true">
-						<td
-							:colspan="columnSpan"
-							class="border-0 p-0"
-							:style="{ height: `${bottomSpacerHeight}px` }"
-						></td>
+				</thead>
+				<tbody :ref="setListContainer">
+					<tr v-if="data.length === 0" class="bg-surface-2">
+						<td :colspan="columnSpan" class="border-solid border-0 border-t border-surface-5 p-0">
+							<slot name="empty-state">
+								<div class="text-secondary flex h-64 items-center justify-center">
+									No data available.
+								</div>
+							</slot>
+						</td>
 					</tr>
-				</template>
-			</tbody>
-		</table>
+					<template v-else>
+						<tr v-if="virtualized && topSpacerHeight > 0" aria-hidden="true">
+							<td
+								:colspan="columnSpan"
+								class="border-0 p-0"
+								:style="{ height: `${topSpacerHeight}px` }"
+							></td>
+						</tr>
+						<tr
+							v-for="(row, rowIndex) in renderedRows"
+							:key="getRowRenderKey(row, getAbsoluteRowIndex(rowIndex))"
+							:class="getAbsoluteRowIndex(rowIndex) % 2 === 0 ? 'bg-surface-2' : 'bg-surface-1.5'"
+						>
+							<td
+								v-if="showSelection"
+								class="w-12 border-solid border-0 border-t border-surface-5 focus:outline-none"
+							>
+								<Checkbox
+									:model-value="isSelected(row)"
+									class="shrink-0 p-4 -outline-offset-[14px] outline rounded-2xl"
+									@update:model-value="(selectRow, event) => toggleSelection(row, selectRow, event)"
+								/>
+							</td>
+							<td
+								v-for="column in columns"
+								:key="column.key"
+								class="text-secondary h-14 overflow-hidden first:pl-4 last:pr-4 border-solid border-0 border-t border-surface-5"
+								:class="`text-${column.align ?? 'left'}`"
+							>
+								<slot
+									:name="`cell-${column.key}`"
+									:row="row"
+									:value="row[column.key]"
+									:column="column"
+									:index="getAbsoluteRowIndex(rowIndex)"
+								>
+									{{ row[column.key] ?? '' }}
+								</slot>
+							</td>
+						</tr>
+						<tr v-if="virtualized && bottomSpacerHeight > 0" aria-hidden="true">
+							<td
+								:colspan="columnSpan"
+								class="border-0 p-0"
+								:style="{ height: `${bottomSpacerHeight}px` }"
+							></td>
+						</tr>
+					</template>
+				</tbody>
+			</table>
+		</div>
 	</div>
 </template>
 
@@ -123,7 +132,7 @@
 	generic="K extends string = string, T extends Record<string, unknown> = Record<K, unknown>"
 >
 import { ChevronDownIcon, ChevronUpIcon } from '@modrinth/assets'
-import { computed, toRef, useSlots } from 'vue'
+import { computed, ref, toRef, useSlots } from 'vue'
 
 import { useVirtualScroll } from '../../composables/virtual-scroll'
 import Checkbox from './Checkbox.vue'
@@ -140,6 +149,7 @@ export interface TableColumn<K extends string = string> {
 	label?: string
 	align?: TableColumnAlign
 	enableSorting?: boolean
+	defaultSortDirection?: SortDirection
 	/**
 	 * CSS width value for the column.
 	 * Accepts any valid CSS width (e.g., '200px', '20%', '10rem', 'auto', 'fit-content').
@@ -153,9 +163,16 @@ const props = withDefaults(
 		data: T[] /* Row data for table */
 		showSelection?: boolean
 		rowKey?: keyof T /* The key used to uniquely identify each row */
+		selectionKey?: keyof T /* The key used to identify selectable rows */
+		selectionData?: T[] /* The complete selectable data set when data is paginated */
+		selectionIds?: unknown[] /* Complete selectable IDs when callers do not want to retain row objects */
 		virtualized?: boolean
 		virtualRowHeight?: number
 		virtualBufferSize?: number /* The number of extra rows rendered above and below the visible viewport */
+		/**
+		 * Sets a minimum width for the table content, allowing horizontal overflow below that width.
+		 */
+		tableMinWidth?: string
 	}>(),
 	{
 		showSelection: false,
@@ -170,6 +187,7 @@ const selectedIds = defineModel<unknown[]>('selectedIds', { default: () => [] })
 const sortColumn = defineModel<string | undefined>('sortColumn')
 const sortDirection = defineModel<SortDirection>('sortDirection', { default: 'asc' })
 const slots = useSlots()
+const selectionAnchorId = ref<unknown>()
 const hasHeaderSlot = computed(() => Boolean(slots.header))
 const columnSpan = computed(() => Math.max(props.columns.length + (props.showSelection ? 1 : 0), 1))
 
@@ -201,17 +219,39 @@ const emit = defineEmits<{
 	sort: [column: string, direction: SortDirection]
 }>()
 
+const selectableRows = computed(() => props.selectionData ?? props.data)
+const selectableRowIds = computed(
+	() => props.selectionIds ?? selectableRows.value.map((row) => getSelectionId(row)),
+)
+const selectedIdSet = computed(() => new Set(selectedIds.value))
+const selectedSelectableIdCount = computed(() => {
+	let count = 0
+	for (const id of selectableRowIds.value) {
+		if (selectedIdSet.value.has(id)) {
+			count++
+		}
+	}
+	return count
+})
 const allSelected = computed(
-	() => props.data.length > 0 && selectedIds.value.length === props.data.length,
+	() =>
+		selectableRowIds.value.length > 0 &&
+		selectedSelectableIdCount.value === selectableRowIds.value.length,
 )
 const someSelected = computed(
-	() => selectedIds.value.length > 0 && selectedIds.value.length < props.data.length,
+	() =>
+		selectedSelectableIdCount.value > 0 &&
+		selectedSelectableIdCount.value < selectableRowIds.value.length,
 )
 
 function getRowId(row: T): unknown {
 	return row[props.rowKey as keyof T]
 }
 
+function getSelectionId(row: T): unknown {
+	return row[(props.selectionKey ?? props.rowKey) as keyof T]
+}
+
 function setListContainer(element: unknown) {
 	listContainer.value = props.virtualized ? (element as HTMLElement | null) : null
 }
@@ -230,31 +270,66 @@ function getRowRenderKey(row: T, rowIndex: number): PropertyKey {
 }
 
 function isSelected(row: T): boolean {
-	return selectedIds.value.includes(getRowId(row))
+	return selectedIdSet.value.has(getSelectionId(row))
 }
 
-function toggleSelection(row: T) {
-	const id = getRowId(row)
-	if (isSelected(row)) {
-		selectedIds.value = selectedIds.value.filter((selectedId) => selectedId !== id)
+function toggleSelection(row: T, selectRow: boolean, event?: MouseEvent) {
+	const id = getSelectionId(row)
+	const rowIndex = selectableRowIds.value.findIndex((selectableId) => selectableId === id)
+	const anchorIndex = selectableRowIds.value.findIndex(
+		(selectableId) => selectableId === selectionAnchorId.value,
+	)
+
+	if (event?.shiftKey && rowIndex !== -1 && anchorIndex !== -1) {
+		const startIndex = Math.min(rowIndex, anchorIndex)
+		const endIndex = Math.max(rowIndex, anchorIndex)
+		const rangeIds = selectableRowIds.value.slice(startIndex, endIndex + 1)
+
+		if (selectRow) {
+			const nextSelectedIds = [...selectedIds.value]
+			const nextSelectedIdSet = new Set(nextSelectedIds)
+			for (const rangeId of rangeIds) {
+				if (!nextSelectedIdSet.has(rangeId)) {
+					nextSelectedIds.push(rangeId)
+					nextSelectedIdSet.add(rangeId)
+				}
+			}
+			selectedIds.value = nextSelectedIds
+		} else {
+			const rangeIdSet = new Set(rangeIds)
+			selectedIds.value = selectedIds.value.filter((selectedId) => !rangeIdSet.has(selectedId))
+		}
 	} else {
-		selectedIds.value = [...selectedIds.value, id]
+		selectedIds.value = selectRow
+			? [...selectedIds.value, id]
+			: selectedIds.value.filter((selectedId) => selectedId !== id)
 	}
+
+	selectionAnchorId.value = id
 }
 
 function toggleSelectAll(selectAll: boolean) {
+	selectionAnchorId.value = undefined
 	if (selectAll) {
-		selectedIds.value = props.data.map((row) => getRowId(row))
+		selectedIds.value = [...selectableRowIds.value]
 	} else {
 		selectedIds.value = []
 	}
 }
 
 function handleSort(columnKey: string) {
+	const column = props.columns.find((column) => column.key === columnKey)
+	const defaultDirection = column?.defaultSortDirection ?? 'asc'
 	const newDirection: SortDirection =
-		sortColumn.value === columnKey && sortDirection.value === 'asc' ? 'desc' : 'asc'
+		sortColumn.value === columnKey && sortDirection.value === defaultDirection
+			? getOppositeSortDirection(defaultDirection)
+			: defaultDirection
 	sortColumn.value = columnKey
 	sortDirection.value = newDirection
 	emit('sort', columnKey, newDirection)
 }
+
+function getOppositeSortDirection(direction: SortDirection): SortDirection {
+	return direction === 'asc' ? 'desc' : 'asc'
+}
 </script>
diff --git a/packages/ui/src/components/base/TimeFramePicker.vue b/packages/ui/src/components/base/TimeFramePicker.vue
new file mode 100644
index 0000000000..d7501dc4d5
--- /dev/null
+++ b/packages/ui/src/components/base/TimeFramePicker.vue
@@ -0,0 +1,948 @@
+<template>
+	<Combobox
+		:model-value="highlightedTimeframePreset"
+		:options="timeframeDropdownOptions"
+		:display-value="selectedTimeframeLabel"
+		:max-height="maxHeight"
+		:dropdown-min-width="timeframeDropdownMinWidth"
+		:dropdown-class="
+			activeTimeframePanel === 'custom_range'
+				? 'bg-transparent border-0 -mt-1 pb-2 shadow-none'
+				: ''
+		"
+		@update:model-value="handleTimeframeModelUpdate"
+		@open="handleTimeframeSelectOpen"
+		@close="handleTimeframeSelectClose"
+		@select="handleTimeframePresetSelect"
+	>
+		<template #dropdown-footer>
+			<template v-if="activeTimeframePanel === 'custom_range'">
+				<div
+					class="flex flex-col gap-0 rounded-2xl border border-solid border-surface-5 bg-surface-3 p-0 pt-1"
+				>
+					<DatePicker
+						v-model="pickerRange"
+						mode="range"
+						:show-months="2"
+						:clearable="false"
+						:default-view-date="todayInputValue"
+						view-date-alignment="right"
+						:min-date="minDate"
+						:max-date="customRangeMaxDate"
+						show-today
+						calendar-only
+						wrapper-class="w-full"
+						calendar-class="!border-none"
+					/>
+					<div class="flex items-center justify-between p-4 pt-1">
+						<div class="text-base">
+							<template v-if="formattedRange">
+								<div class="flex items-center gap-1.5">
+									<span class="font-normal text-primary">{{ rangeLabel }}:</span>
+									<span class="font-medium text-contrast">{{ formattedRange }}</span>
+									<button
+										v-if="selectedDraftDates.length !== 1"
+										type="button"
+										class="ml-1 border-0 bg-transparent p-0 font-normal text-primary underline hover:text-primary"
+										@click.stop="clearRange"
+									>
+										{{ formatMessage(messages.clearRange) }}
+									</button>
+								</div>
+							</template>
+							<template v-else>
+								<span class="font-normal text-primary">
+									{{ formatMessage(messages.emptyRange) }}
+								</span>
+							</template>
+						</div>
+
+						<div class="flex items-center gap-2">
+							<ButtonStyled type="outlined">
+								<button type="button" @click="handleCustomRangeCancel">
+									{{ formatMessage(messages.cancel) }}
+								</button>
+							</ButtonStyled>
+							<ButtonStyled color="brand">
+								<button type="button" :disabled="!hasCompleteRange" @click="handleCustomRangeApply">
+									{{ formatMessage(messages.apply) }}
+								</button>
+							</ButtonStyled>
+						</div>
+					</div>
+				</div>
+			</template>
+			<div
+				v-else
+				class="flex flex-col border-0 border-t border-solid border-surface-5 bg-surface-4"
+			>
+				<div
+					class="px-3 py-2"
+					:class="draftSelectedTimeframeMode === 'last' ? 'bg-highlight-green' : ''"
+				>
+					<div class="flex items-center gap-2.5 py-0.5 transition-colors">
+						<span
+							class="shrink-0 text-sm font-semibold"
+							:class="draftSelectedTimeframeMode === 'last' ? 'text-green' : 'text-primary'"
+						>
+							{{ formatMessage(messages.lastTimeframePrefix) }}
+						</span>
+						<div
+							class="flex h-8 shrink-0 items-center overflow-hidden rounded-lg border border-solid border-surface-5 bg-surface-3"
+						>
+							<button
+								type="button"
+								class="flex h-8 w-8 cursor-pointer items-center justify-center border-0 border-r border-solid border-surface-5 bg-transparent p-0 text-secondary transition-colors hover:text-contrast"
+								:aria-label="formatMessage(messages.decreaseAmount)"
+								@click.stop="decrementAmount"
+							>
+								<MinusIcon class="size-4" />
+							</button>
+							<input
+								v-model="amountInput"
+								type="number"
+								min="1"
+								step="1"
+								class="h-8 w-12 border-0 bg-transparent px-1 text-center text-sm font-semibold text-primary outline-none ring-0 focus:outline-none focus-visible:shadow-none"
+								:aria-label="formatMessage(messages.timeframeAmount)"
+								@focus="activateLastTimeframe"
+								@input="handleAmountInput"
+								@blur="commitAmountInput"
+								@keydown.enter.prevent.stop="submitAmountInput"
+							/>
+							<button
+								type="button"
+								class="flex h-8 w-8 cursor-pointer items-center justify-center border-0 border-l border-solid border-surface-5 bg-transparent p-0 text-secondary transition-colors hover:text-contrast"
+								:aria-label="formatMessage(messages.increaseAmount)"
+								@click.stop="incrementAmount"
+							>
+								<PlusIcon class="size-4" />
+							</button>
+						</div>
+						<select
+							v-model="draftSelectedLastTimeframeUnit"
+							class="h-8 rounded-lg border border-solid border-surface-5 bg-surface-3 px-2 text-sm font-semibold text-primary outline-none transition-[box-shadow,color] focus:text-contrast focus:ring-4 focus:ring-brand-shadow"
+							:aria-label="formatMessage(messages.timeframeUnit)"
+							@change="handleLastTimeframeUnitChange"
+						>
+							<option
+								v-for="option in lastTimeframeUnitOptions"
+								:key="option.value"
+								:value="option.value"
+							>
+								{{ option.label }}
+							</option>
+						</select>
+					</div>
+				</div>
+				<button
+					type="button"
+					class="flex cursor-pointer items-center border-0 border-t border-solid border-surface-5 bg-transparent px-3 py-3 text-left text-sm font-semibold text-primary transition-colors hover:bg-surface-5"
+					@click.stop="switchDraftToCustomDateRange"
+				>
+					{{ formatMessage(messages.customRange) }}
+				</button>
+			</div>
+		</template>
+	</Combobox>
+</template>
+
+<script setup lang="ts">
+import { MinusIcon, PlusIcon } from '@modrinth/assets'
+import { computed, nextTick, ref, watch } from 'vue'
+
+import { defineMessages, useVIntl } from '../../composables/i18n'
+import ButtonStyled from './ButtonStyled.vue'
+import Combobox, { type ComboboxOption } from './Combobox.vue'
+import DatePicker from './DatePicker.vue'
+
+export type TimeFramePreset =
+	| 'today'
+	| 'yesterday'
+	| 'last_7_days'
+	| 'last_14_days'
+	| 'last_30_days'
+	| 'last_90_days'
+	| 'last_180_days'
+	| 'year_to_date'
+	| 'all_time'
+
+export type TimeFrameMode = 'preset' | 'last' | 'custom_range' | 'custom_datetime_range'
+export type TimeFrameLastUnit = 'hours' | 'days' | 'weeks' | 'months'
+
+export type TimeFrameLastUnitOption = {
+	value: TimeFrameLastUnit
+	label: string
+}
+
+export type TimeFramePickerSelection = {
+	mode: TimeFrameMode
+	preset: TimeFramePreset
+	lastAmount: number
+	lastUnit: TimeFrameLastUnit
+	customStartDate: string
+	customEndDate: string
+}
+
+type DatePickerValue = string | Date | null | undefined
+type TimeFramePanel = 'preset' | 'custom_range'
+type LastTimeframeValue = {
+	amount: number
+	unit: TimeFrameLastUnit
+}
+
+const TIMEFRAME_DROPDOWN_MAX_HEIGHT = 500
+const TIMEFRAME_DROPDOWN_MIN_WIDTH = '20rem'
+const CUSTOM_RANGE_DROPDOWN_MIN_WIDTH = '40.5rem'
+
+const DEFAULT_LAST_TIMEFRAME_VALUE_BY_PRESET: Partial<Record<TimeFramePreset, LastTimeframeValue>> =
+	{
+		today: { amount: 1, unit: 'days' },
+		yesterday: { amount: 1, unit: 'days' },
+		last_7_days: { amount: 7, unit: 'days' },
+		last_14_days: { amount: 14, unit: 'days' },
+		last_30_days: { amount: 30, unit: 'days' },
+		last_90_days: { amount: 90, unit: 'days' },
+		last_180_days: { amount: 180, unit: 'days' },
+	}
+
+const messages = defineMessages({
+	today: {
+		id: 'time-frame-picker.option.today',
+		defaultMessage: 'Today',
+	},
+	yesterday: {
+		id: 'time-frame-picker.option.yesterday',
+		defaultMessage: 'Yesterday',
+	},
+	last7Days: {
+		id: 'time-frame-picker.option.last-7-days',
+		defaultMessage: 'Last 7 days',
+	},
+	last14Days: {
+		id: 'time-frame-picker.option.last-14-days',
+		defaultMessage: 'Last 14 days',
+	},
+	last30Days: {
+		id: 'time-frame-picker.option.last-30-days',
+		defaultMessage: 'Last 30 days',
+	},
+	last90Days: {
+		id: 'time-frame-picker.option.last-90-days',
+		defaultMessage: 'Last 90 days',
+	},
+	last180Days: {
+		id: 'time-frame-picker.option.last-180-days',
+		defaultMessage: 'Last 180 days',
+	},
+	yearToDate: {
+		id: 'time-frame-picker.option.year-to-date',
+		defaultMessage: 'Year to date',
+	},
+	allTime: {
+		id: 'time-frame-picker.option.all-time',
+		defaultMessage: 'All time',
+	},
+	hours: {
+		id: 'time-frame-picker.unit.hours',
+		defaultMessage: 'hours',
+	},
+	days: {
+		id: 'time-frame-picker.unit.days',
+		defaultMessage: 'days',
+	},
+	weeks: {
+		id: 'time-frame-picker.unit.weeks',
+		defaultMessage: 'weeks',
+	},
+	months: {
+		id: 'time-frame-picker.unit.months',
+		defaultMessage: 'months',
+	},
+	lastTimeframe: {
+		id: 'time-frame-picker.last-timeframe',
+		defaultMessage:
+			'In the last {amount} {unit, select, hours {{amount, plural, one {hour} other {hours}}} days {{amount, plural, one {day} other {days}}} weeks {{amount, plural, one {week} other {weeks}}} months {{amount, plural, one {month} other {months}}} other {days}}',
+	},
+	lastTimeframePrefix: {
+		id: 'time-frame-picker.last-timeframe-prefix',
+		defaultMessage: 'In the last',
+	},
+	customRange: {
+		id: 'time-frame-picker.custom-range',
+		defaultMessage: 'Custom fixed date range...',
+	},
+	clearRange: {
+		id: 'time-frame-picker.clear-range',
+		defaultMessage: 'Clear',
+	},
+	cancel: {
+		id: 'time-frame-picker.cancel',
+		defaultMessage: 'Cancel',
+	},
+	apply: {
+		id: 'time-frame-picker.apply',
+		defaultMessage: 'Apply',
+	},
+	emptyRange: {
+		id: 'time-frame-picker.empty-range',
+		defaultMessage: 'No date range selected.',
+	},
+	selectingRange: {
+		id: 'time-frame-picker.selecting-range',
+		defaultMessage: 'Selecting',
+	},
+	selectedRange: {
+		id: 'time-frame-picker.selected-range',
+		defaultMessage: 'Selected',
+	},
+	selectTimeframe: {
+		id: 'time-frame-picker.select-timeframe',
+		defaultMessage: 'Select timeframe',
+	},
+	decreaseAmount: {
+		id: 'time-frame-picker.decrease-amount',
+		defaultMessage: 'Decrease timeframe amount',
+	},
+	increaseAmount: {
+		id: 'time-frame-picker.increase-amount',
+		defaultMessage: 'Increase timeframe amount',
+	},
+	timeframeAmount: {
+		id: 'time-frame-picker.timeframe-amount',
+		defaultMessage: 'Timeframe amount',
+	},
+	timeframeUnit: {
+		id: 'time-frame-picker.timeframe-unit',
+		defaultMessage: 'Timeframe unit',
+	},
+})
+
+const mode = defineModel<TimeFrameMode>('mode', { required: true })
+const preset = defineModel<TimeFramePreset>('preset', { required: true })
+const lastAmount = defineModel<number>('lastAmount', { required: true })
+const lastUnit = defineModel<TimeFrameLastUnit>('lastUnit', { required: true })
+const customStartDate = defineModel<string>('customStartDate', { required: true })
+const customEndDate = defineModel<string>('customEndDate', { required: true })
+
+const props = withDefaults(
+	defineProps<{
+		timeframeOptions?: ComboboxOption<TimeFramePreset>[]
+		lastTimeframeUnitOptions?: TimeFrameLastUnitOption[]
+		lastTimeframeValueByPreset?: Partial<Record<TimeFramePreset, LastTimeframeValue>>
+		minDate?: string
+		maxDate?: string
+		nowTimestamp?: number
+		maxHeight?: number
+		dropdownMinWidth?: string | number
+		customRangeDropdownMinWidth?: string | number
+	}>(),
+	{
+		maxHeight: TIMEFRAME_DROPDOWN_MAX_HEIGHT,
+		dropdownMinWidth: TIMEFRAME_DROPDOWN_MIN_WIDTH,
+		customRangeDropdownMinWidth: CUSTOM_RANGE_DROPDOWN_MIN_WIDTH,
+	},
+)
+
+const { formatMessage, locale } = useVIntl()
+
+const emit = defineEmits<{
+	open: []
+	close: []
+	cancel: []
+	commit: [selection: TimeFramePickerSelection]
+	apply: [selection: TimeFramePickerSelection]
+	'draft-change': [selection: TimeFramePickerSelection]
+	'preset-select': [option: ComboboxOption<TimeFramePreset>, selection: TimeFramePickerSelection]
+}>()
+
+const isTimeframeSelectOpen = ref(false)
+const activeTimeframePanel = ref<TimeFramePanel>('preset')
+const draftSelectedTimeframeMode = ref<TimeFrameMode>(mode.value)
+const draftSelectedTimeframe = ref<TimeFramePreset>(preset.value)
+const draftSelectedLastTimeframeAmount = ref(lastAmount.value)
+const draftSelectedLastTimeframeUnit = ref<TimeFrameLastUnit>(lastUnit.value)
+const draftSelectedCustomTimeframeStartDate = ref(customStartDate.value)
+const draftSelectedCustomTimeframeEndDate = ref(customEndDate.value)
+const amountInput = ref(String(lastAmount.value))
+const pickerRange = ref<DatePickerValue[]>([customStartDate.value, customEndDate.value])
+
+const timeframeOptions = computed<ComboboxOption<TimeFramePreset>[]>(
+	() =>
+		props.timeframeOptions ?? [
+			{ value: 'today', label: formatMessage(messages.today) },
+			{ value: 'yesterday', label: formatMessage(messages.yesterday) },
+			{ value: 'last_7_days', label: formatMessage(messages.last7Days) },
+			{ value: 'last_14_days', label: formatMessage(messages.last14Days) },
+			{ value: 'last_30_days', label: formatMessage(messages.last30Days) },
+			{ value: 'last_90_days', label: formatMessage(messages.last90Days) },
+			{ value: 'last_180_days', label: formatMessage(messages.last180Days) },
+			{ value: 'year_to_date', label: formatMessage(messages.yearToDate) },
+			{ value: 'all_time', label: formatMessage(messages.allTime) },
+		],
+)
+const lastTimeframeUnitOptions = computed<TimeFrameLastUnitOption[]>(
+	() =>
+		props.lastTimeframeUnitOptions ?? [
+			{ value: 'hours', label: formatMessage(messages.hours) },
+			{ value: 'days', label: formatMessage(messages.days) },
+			{ value: 'weeks', label: formatMessage(messages.weeks) },
+			{ value: 'months', label: formatMessage(messages.months) },
+		],
+)
+const lastTimeframeValueByPreset = computed(
+	() => props.lastTimeframeValueByPreset ?? DEFAULT_LAST_TIMEFRAME_VALUE_BY_PRESET,
+)
+const timeframeDropdownOptions = computed<ComboboxOption<TimeFramePreset>[]>(() =>
+	activeTimeframePanel.value === 'custom_range' ? [] : timeframeOptions.value,
+)
+const timeframeDropdownMinWidth = computed(() =>
+	activeTimeframePanel.value === 'custom_range'
+		? props.customRangeDropdownMinWidth
+		: props.dropdownMinWidth,
+)
+const highlightedTimeframePreset = computed<TimeFramePreset | undefined>(() =>
+	draftSelectedTimeframeMode.value === 'preset' ? draftSelectedTimeframe.value : undefined,
+)
+const selectedTimeframeLabel = computed(() => {
+	const useDraftTimeframeLabel =
+		isTimeframeSelectOpen.value && activeTimeframePanel.value !== 'custom_range'
+
+	return getTimeframeLabel(
+		useDraftTimeframeLabel ? draftSelectedTimeframeMode.value : mode.value,
+		useDraftTimeframeLabel ? draftSelectedTimeframe.value : preset.value,
+		useDraftTimeframeLabel ? draftSelectedLastTimeframeAmount.value : lastAmount.value,
+		useDraftTimeframeLabel ? draftSelectedLastTimeframeUnit.value : lastUnit.value,
+		useDraftTimeframeLabel ? draftSelectedCustomTimeframeStartDate.value : customStartDate.value,
+		useDraftTimeframeLabel ? draftSelectedCustomTimeframeEndDate.value : customEndDate.value,
+	)
+})
+const todayInputValue = computed(() => getDateInputValue(new Date()))
+const customRangeMaxDate = computed(() => props.maxDate ?? todayInputValue.value)
+const selectedDraftDates = computed(() =>
+	pickerRange.value
+		.map(getDatePickerValueString)
+		.filter((value): value is string => Boolean(value)),
+)
+const rangeLabel = computed(() =>
+	formatMessage(
+		selectedDraftDates.value.length === 1 ? messages.selectingRange : messages.selectedRange,
+	),
+)
+const hasCompleteRange = computed(() => Boolean(getOrderedRange(pickerRange.value)))
+const formattedRange = computed(() => {
+	if (selectedDraftDates.value.length === 1) {
+		return `${formatDateString(selectedDraftDates.value[0])} -`
+	}
+
+	const orderedRange =
+		getOrderedRange(pickerRange.value) ??
+		getOrderedRange([
+			draftSelectedCustomTimeframeStartDate.value,
+			draftSelectedCustomTimeframeEndDate.value,
+		])
+	if (!orderedRange) return ''
+
+	const [nextStartDate, nextEndDate] = orderedRange
+	if (nextStartDate === nextEndDate) return formatDateString(nextStartDate)
+	return `${formatDateString(nextStartDate)} - ${formatDateString(nextEndDate)}`
+})
+
+function getTimeframeLabel(
+	selectedMode: TimeFrameMode,
+	selectedPreset: TimeFramePreset,
+	selectedLastAmount: number,
+	selectedLastUnit: TimeFrameLastUnit,
+	selectedCustomStartDate: string,
+	selectedCustomEndDate: string,
+): string {
+	if (selectedMode === 'last') {
+		return formatMessage(messages.lastTimeframe, {
+			amount: selectedLastAmount,
+			unit: selectedLastUnit,
+		})
+	}
+
+	if (selectedMode === 'custom_range') {
+		return formatCustomTimeframeRangeLabel(selectedCustomStartDate, selectedCustomEndDate)
+	}
+
+	if (selectedMode === 'custom_datetime_range') {
+		return formatCustomDateTimeRangeLabel(selectedCustomStartDate, selectedCustomEndDate)
+	}
+
+	return (
+		timeframeOptions.value.find((option) => option.value === selectedPreset)?.label ??
+		formatMessage(messages.selectTimeframe)
+	)
+}
+
+function getDraftSelection(): TimeFramePickerSelection {
+	return {
+		mode: draftSelectedTimeframeMode.value,
+		preset: draftSelectedTimeframe.value,
+		lastAmount: draftSelectedLastTimeframeAmount.value,
+		lastUnit: draftSelectedLastTimeframeUnit.value,
+		customStartDate: draftSelectedCustomTimeframeStartDate.value,
+		customEndDate: draftSelectedCustomTimeframeEndDate.value,
+	}
+}
+
+function emitDraftChange() {
+	emit('draft-change', getDraftSelection())
+}
+
+function getDateInputValue(date: Date): string {
+	const year = date.getFullYear()
+	const month = String(date.getMonth() + 1).padStart(2, '0')
+	const day = String(date.getDate()).padStart(2, '0')
+	return `${year}-${month}-${day}`
+}
+
+function getDateFromInputValue(value: string): Date | undefined {
+	const date = new Date(`${value}T00:00:00`)
+	if (Number.isNaN(date.getTime()) || getDateInputValue(date) !== value) {
+		return undefined
+	}
+
+	return date
+}
+
+function getDateTimeFromInputValue(value: string): Date | undefined {
+	const date = new Date(value)
+	if (Number.isNaN(date.getTime())) {
+		return undefined
+	}
+
+	return date
+}
+
+function formatDateString(value: string): string {
+	const parsed = new Date(`${value}T00:00:00`)
+	if (Number.isNaN(parsed.getTime())) return value
+	return formatDate(parsed, {
+		month: 'short',
+		day: 'numeric',
+		year: 'numeric',
+	})
+}
+
+function isValidDateInputValue(value: string): boolean {
+	if (!/^\d{4}-\d{2}-\d{2}$/.test(value)) {
+		return false
+	}
+
+	const parsedDate = new Date(`${value}T00:00:00`)
+	return !Number.isNaN(parsedDate.getTime()) && getDateInputValue(parsedDate) === value
+}
+
+function getDatePickerValueString(value: DatePickerValue): string | null {
+	if (typeof value === 'string') {
+		return isValidDateInputValue(value) ? value : null
+	}
+	if (value instanceof Date && !Number.isNaN(value.getTime())) {
+		return getDateInputValue(value)
+	}
+
+	return null
+}
+
+function getOrderedRange(values: DatePickerValue[]): [string, string] | null {
+	const dates = values
+		.map(getDatePickerValueString)
+		.filter((value): value is string => Boolean(value))
+	if (dates.length < 2) {
+		return null
+	}
+
+	const firstDate = dates[0]
+	const secondDate = dates[1]
+	if (!firstDate || !secondDate) {
+		return null
+	}
+
+	return firstDate <= secondDate ? [firstDate, secondDate] : [secondDate, firstDate]
+}
+
+function formatCustomTimeframeRangeLabel(startDateValue: string, endDateValue: string): string {
+	const startDate = getDateFromInputValue(startDateValue)
+	const endDate = getDateFromInputValue(endDateValue)
+	if (!startDate || !endDate) {
+		return `${startDateValue} - ${endDateValue}`
+	}
+
+	if (startDateValue === endDateValue) {
+		return formatDate(startDate, {
+			month: 'long',
+			day: 'numeric',
+			year: 'numeric',
+		})
+	}
+
+	const sameYear = startDate.getFullYear() === endDate.getFullYear()
+	if (sameYear) {
+		const startLabel = formatDate(startDate, { month: 'long', day: 'numeric' })
+		const endLabel = formatDate(endDate, { month: 'long', day: 'numeric' })
+		return `${startLabel} - ${endLabel}, ${startDate.getFullYear()}`
+	}
+
+	const startLabel = formatDate(startDate, {
+		month: 'long',
+		day: 'numeric',
+		year: 'numeric',
+	})
+	const endLabel = formatDate(endDate, {
+		month: 'long',
+		day: 'numeric',
+		year: 'numeric',
+	})
+	return `${startLabel} - ${endLabel}`
+}
+
+function formatCustomDateTimeRangeLabel(startDateValue: string, endDateValue: string): string {
+	const startDate = getDateTimeFromInputValue(startDateValue)
+	const endDate = getDateTimeFromInputValue(endDateValue)
+	if (!startDate || !endDate) {
+		return `${startDateValue} - ${endDateValue}`
+	}
+
+	if (startDate.getTime() === endDate.getTime()) {
+		return formatDate(startDate, {
+			month: 'short',
+			day: 'numeric',
+			year: 'numeric',
+			hour: 'numeric',
+			minute: '2-digit',
+		})
+	}
+
+	const sameYear = startDate.getFullYear() === endDate.getFullYear()
+	if (sameYear) {
+		const startLabel = formatDate(startDate, {
+			month: 'short',
+			day: 'numeric',
+			hour: 'numeric',
+			minute: '2-digit',
+		})
+		const endLabel = formatDate(endDate, {
+			month: 'short',
+			day: 'numeric',
+			hour: 'numeric',
+			minute: '2-digit',
+		})
+		return `${startLabel} - ${endLabel}, ${startDate.getFullYear()}`
+	}
+
+	const startLabel = formatDate(startDate, {
+		month: 'short',
+		day: 'numeric',
+		year: 'numeric',
+		hour: 'numeric',
+		minute: '2-digit',
+	})
+	const endLabel = formatDate(endDate, {
+		month: 'short',
+		day: 'numeric',
+		year: 'numeric',
+		hour: 'numeric',
+		minute: '2-digit',
+	})
+	return `${startLabel} - ${endLabel}`
+}
+
+function formatDate(date: Date, options: Intl.DateTimeFormatOptions): string {
+	return new Intl.DateTimeFormat(locale.value, options).format(date)
+}
+
+function getRoundedNow(timestamp: number): Date {
+	const roundedTimestamp = Math.floor(timestamp / 60000) * 60000
+	return new Date(roundedTimestamp)
+}
+
+function addDays(date: Date, days: number): Date {
+	const nextDate = new Date(date)
+	nextDate.setDate(nextDate.getDate() + days)
+	return nextDate
+}
+
+function isStartOfDay(date: Date): boolean {
+	return (
+		date.getHours() === 0 &&
+		date.getMinutes() === 0 &&
+		date.getSeconds() === 0 &&
+		date.getMilliseconds() === 0
+	)
+}
+
+function getInclusiveEndDateInputValue(end: Date): string {
+	return getDateInputValue(isStartOfDay(end) ? addDays(end, -1) : end)
+}
+
+function subtractCalendarMonths(date: Date, months: number): Date {
+	const nextDate = new Date(date)
+	const day = nextDate.getDate()
+	nextDate.setDate(1)
+	nextDate.setMonth(nextDate.getMonth() - months)
+	const daysInMonth = new Date(nextDate.getFullYear(), nextDate.getMonth() + 1, 0).getDate()
+	nextDate.setDate(Math.min(day, daysInMonth))
+	return nextDate
+}
+
+function getTimeRangeForLastTimeframe() {
+	const end = getRoundedNow(props.nowTimestamp ?? Date.now())
+	const amount = Math.max(1, Math.floor(draftSelectedLastTimeframeAmount.value))
+
+	switch (draftSelectedLastTimeframeUnit.value) {
+		case 'hours':
+			return { start: new Date(end.getTime() - amount * 60 * 60 * 1000), end }
+		case 'days':
+			return { start: new Date(end.getTime() - amount * 24 * 60 * 60 * 1000), end }
+		case 'weeks':
+			return { start: new Date(end.getTime() - amount * 7 * 24 * 60 * 60 * 1000), end }
+		case 'months':
+			return { start: subtractCalendarMonths(end, amount), end }
+	}
+}
+
+function getDraftTimeRange() {
+	if (draftSelectedTimeframeMode.value === 'last') {
+		return getTimeRangeForLastTimeframe()
+	}
+
+	const startDate =
+		draftSelectedTimeframeMode.value === 'custom_datetime_range'
+			? getDateTimeFromInputValue(draftSelectedCustomTimeframeStartDate.value)
+			: getDateFromInputValue(draftSelectedCustomTimeframeStartDate.value)
+	const endDate =
+		draftSelectedTimeframeMode.value === 'custom_datetime_range'
+			? getDateTimeFromInputValue(draftSelectedCustomTimeframeEndDate.value)
+			: getDateFromInputValue(draftSelectedCustomTimeframeEndDate.value)
+
+	if (!startDate || !endDate) {
+		return null
+	}
+
+	return {
+		start: startDate,
+		end: draftSelectedTimeframeMode.value === 'custom_range' ? addDays(endDate, 1) : endDate,
+	}
+}
+
+function resetTimeframeDraft() {
+	draftSelectedTimeframeMode.value = mode.value
+	draftSelectedTimeframe.value = preset.value
+	draftSelectedLastTimeframeAmount.value = lastAmount.value
+	draftSelectedLastTimeframeUnit.value = lastUnit.value
+	draftSelectedCustomTimeframeStartDate.value = customStartDate.value
+	draftSelectedCustomTimeframeEndDate.value = customEndDate.value
+	amountInput.value = String(lastAmount.value)
+	syncPickerRangeFromDraft()
+}
+
+function commitTimeframeDraft() {
+	const selection = getDraftSelection()
+
+	mode.value = selection.mode
+	preset.value = selection.preset
+	lastAmount.value = selection.lastAmount
+	lastUnit.value = selection.lastUnit
+	customStartDate.value = selection.customStartDate
+	customEndDate.value = selection.customEndDate
+	emit('commit', selection)
+}
+
+function handleTimeframeSelectOpen() {
+	resetTimeframeDraft()
+	activeTimeframePanel.value = 'preset'
+	isTimeframeSelectOpen.value = true
+	emit('open')
+}
+
+function handleTimeframeSelectClose() {
+	if (activeTimeframePanel.value !== 'custom_range') {
+		commitTimeframeDraft()
+	}
+	isTimeframeSelectOpen.value = false
+	emit('close')
+}
+
+function closeTimeframeSelectDropdown(event: Event) {
+	const eventTarget = event.target
+	if (!(eventTarget instanceof HTMLElement)) {
+		isTimeframeSelectOpen.value = false
+		return
+	}
+
+	const dropdown = eventTarget.closest('[role="listbox"], [role="menu"]')
+	if (!dropdown) {
+		isTimeframeSelectOpen.value = false
+		return
+	}
+
+	dropdown.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }))
+}
+
+async function applyTimeframeDraft(event: Event) {
+	commitTimeframeDraft()
+	closeTimeframeSelectDropdown(event)
+	await nextTick()
+	emit('apply', getDraftSelection())
+}
+
+function handleCustomRangeCancel() {
+	resetTimeframeDraft()
+	activeTimeframePanel.value = 'preset'
+	emit('cancel')
+	emitDraftChange()
+}
+
+async function handleCustomRangeApply(event: MouseEvent) {
+	if (!hasCompleteDraftCustomDateRange()) {
+		return
+	}
+
+	draftSelectedTimeframeMode.value = 'custom_range'
+	await applyTimeframeDraft(event)
+}
+
+function handleTimeframeModelUpdate(value: TimeFramePreset) {
+	draftSelectedTimeframe.value = value
+	emitDraftChange()
+}
+
+function handleTimeframePresetSelect(option: ComboboxOption<TimeFramePreset>) {
+	draftSelectedTimeframeMode.value = 'preset'
+
+	const lastTimeframeValue = lastTimeframeValueByPreset.value[option.value]
+	if (lastTimeframeValue) {
+		draftSelectedLastTimeframeAmount.value = lastTimeframeValue.amount
+		draftSelectedLastTimeframeUnit.value = lastTimeframeValue.unit
+		amountInput.value = String(lastTimeframeValue.amount)
+	}
+
+	const selection = getDraftSelection()
+	emit('preset-select', option, selection)
+	emit('draft-change', selection)
+}
+
+function hasCompleteDraftCustomDateRange() {
+	return Boolean(
+		getDateFromInputValue(draftSelectedCustomTimeframeStartDate.value) &&
+		getDateFromInputValue(draftSelectedCustomTimeframeEndDate.value),
+	)
+}
+
+function switchDraftToCustomDateRange() {
+	if (draftSelectedTimeframeMode.value === 'preset') {
+		draftSelectedCustomTimeframeStartDate.value = ''
+		draftSelectedCustomTimeframeEndDate.value = ''
+	} else {
+		const rawRange = getDraftTimeRange()
+		draftSelectedCustomTimeframeStartDate.value = rawRange ? getDateInputValue(rawRange.start) : ''
+		draftSelectedCustomTimeframeEndDate.value = rawRange
+			? getInclusiveEndDateInputValue(rawRange.end)
+			: ''
+	}
+
+	draftSelectedTimeframeMode.value = 'custom_range'
+	activeTimeframePanel.value = 'custom_range'
+	syncPickerRangeFromDraft()
+	emitDraftChange()
+}
+
+function activateLastTimeframe() {
+	draftSelectedTimeframeMode.value = 'last'
+	emitDraftChange()
+}
+
+function parseAmountInput() {
+	const nextAmount = Number(amountInput.value)
+	return Number.isFinite(nextAmount) ? Math.max(1, Math.floor(nextAmount)) : null
+}
+
+function handleAmountInput() {
+	const nextAmount = parseAmountInput()
+	if (nextAmount !== null && String(nextAmount) === amountInput.value) {
+		draftSelectedLastTimeframeAmount.value = nextAmount
+	}
+
+	activateLastTimeframe()
+}
+
+function commitAmountInput() {
+	const nextAmount = parseAmountInput() ?? 1
+	draftSelectedLastTimeframeAmount.value = nextAmount
+	amountInput.value = String(nextAmount)
+	activateLastTimeframe()
+}
+
+function submitAmountInput(event: KeyboardEvent) {
+	commitAmountInput()
+	void applyTimeframeDraft(event)
+}
+
+function incrementAmount() {
+	commitAmountInput()
+	draftSelectedLastTimeframeAmount.value += 1
+	amountInput.value = String(draftSelectedLastTimeframeAmount.value)
+	activateLastTimeframe()
+}
+
+function decrementAmount() {
+	commitAmountInput()
+	draftSelectedLastTimeframeAmount.value = Math.max(1, draftSelectedLastTimeframeAmount.value - 1)
+	amountInput.value = String(draftSelectedLastTimeframeAmount.value)
+	activateLastTimeframe()
+}
+
+function handleLastTimeframeUnitChange() {
+	activateLastTimeframe()
+}
+
+function clearRange() {
+	draftSelectedCustomTimeframeStartDate.value = ''
+	draftSelectedCustomTimeframeEndDate.value = ''
+	pickerRange.value = []
+	emitDraftChange()
+}
+
+function syncPickerRangeFromDraft() {
+	if (
+		pickerRange.value.length === 2 &&
+		pickerRange.value[0] === draftSelectedCustomTimeframeStartDate.value &&
+		pickerRange.value[1] === draftSelectedCustomTimeframeEndDate.value
+	) {
+		return
+	}
+
+	pickerRange.value = [
+		draftSelectedCustomTimeframeStartDate.value,
+		draftSelectedCustomTimeframeEndDate.value,
+	]
+}
+
+watch([mode, preset, lastAmount, lastUnit, customStartDate, customEndDate], () => {
+	if (isTimeframeSelectOpen.value) {
+		return
+	}
+
+	resetTimeframeDraft()
+})
+
+watch(
+	[draftSelectedCustomTimeframeStartDate, draftSelectedCustomTimeframeEndDate],
+	syncPickerRangeFromDraft,
+)
+
+watch(pickerRange, (nextRange) => {
+	const orderedRange = getOrderedRange(nextRange)
+	if (!orderedRange) {
+		return
+	}
+
+	const [nextStartDate, nextEndDate] = orderedRange
+	draftSelectedCustomTimeframeStartDate.value = nextStartDate
+	draftSelectedCustomTimeframeEndDate.value = nextEndDate
+	emitDraftChange()
+})
+</script>
diff --git a/packages/ui/src/components/base/index.ts b/packages/ui/src/components/base/index.ts
index 14f5382e30..5afcec8f57 100644
--- a/packages/ui/src/components/base/index.ts
+++ b/packages/ui/src/components/base/index.ts
@@ -50,7 +50,11 @@ export { default as LoadingBar } from './LoadingBar.vue'
 export { default as LoadingIndicator } from './LoadingIndicator.vue'
 export { default as ManySelect } from './ManySelect.vue'
 export { default as MarkdownEditor } from './MarkdownEditor.vue'
-export type { MultiSelectOption } from './MultiSelect.vue'
+export type {
+	MultiSelectItem,
+	MultiSelectOption,
+	MultiSelectSectionHeader,
+} from './MultiSelect.vue'
 export { default as MultiSelect } from './MultiSelect.vue'
 export type { MaybeCtxFn, StageButtonConfig, StageConfigInput } from './MultiStageModal.vue'
 export { default as MultiStageModal, resolveCtxFn } from './MultiStageModal.vue'
@@ -77,12 +81,20 @@ export type { StackedAdmonitionItem, StackedAdmonitionType } from './StackedAdmo
 export { default as StackedAdmonitions } from './StackedAdmonitions.vue'
 export { default as StatItem } from './StatItem.vue'
 export { default as StyledInput } from './StyledInput.vue'
-export type { TableColumn } from './Table.vue'
+export type { SortDirection, TableColumn } from './Table.vue'
 export { default as Table } from './Table.vue'
 export type { TabsTab, TabsValue } from './Tabs.vue'
 export { default as Tabs } from './Tabs.vue'
 export { default as TagItem } from './TagItem.vue'
 export { default as TagTagItem } from './TagTagItem.vue'
+export type {
+	TimeFrameLastUnit,
+	TimeFrameLastUnitOption,
+	TimeFrameMode,
+	TimeFramePickerSelection,
+	TimeFramePreset,
+} from './TimeFramePicker.vue'
+export { default as TimeFramePicker } from './TimeFramePicker.vue'
 export { default as Timeline } from './Timeline.vue'
 export { default as Toggle } from './Toggle.vue'
 export { default as UnsavedChangesPopup } from './UnsavedChangesPopup.vue'
diff --git a/packages/ui/src/composables/format-number.ts b/packages/ui/src/composables/format-number.ts
index 4cd10948cb..54ee6e1f58 100644
--- a/packages/ui/src/composables/format-number.ts
+++ b/packages/ui/src/composables/format-number.ts
@@ -24,7 +24,7 @@ export function useCompactNumber() {
 	const { locale } = injectI18n()
 
 	function formatCompactNumber(value: number | bigint): string {
-		if (value < 10_000) {
+		if (value < 1000) {
 			const standardFormatter = getStandardFormatter(locale.value)
 			return standardFormatter.format(value)
 		}
diff --git a/packages/ui/src/composables/virtual-scroll.ts b/packages/ui/src/composables/virtual-scroll.ts
index 6b641efd4b..0c39d3ef21 100644
--- a/packages/ui/src/composables/virtual-scroll.ts
+++ b/packages/ui/src/composables/virtual-scroll.ts
@@ -65,12 +65,22 @@ export function useVirtualScroll<T>(items: Ref<T[]>, options: VirtualScrollOptio
 	}
 
 	function syncScrollState() {
-		if (!scrollContainer.value) return
-		scrollTop.value = getScrollTop(scrollContainer.value)
-		viewportHeight.value = getViewportHeight(scrollContainer.value)
+		const listEl = listContainer.value
+		if (!listEl) return
+
+		const container = findScrollableAncestor(listEl)
+		scrollContainer.value = container
+		scrollTop.value = getScrollTop(container)
+		viewportHeight.value = getViewportHeight(container)
 		updateContainerOffset()
 	}
 
+	function resetScrollState() {
+		scrollTop.value = 0
+		viewportHeight.value = 0
+		containerOffset.value = 0
+	}
+
 	const visibleRange = computed(() => {
 		if (enabled && !enabled.value) {
 			return { start: 0, end: items.value.length }
@@ -165,5 +175,7 @@ export function useVirtualScroll<T>(items: Ref<T[]>, options: VirtualScrollOptio
 		visibleRange,
 		visibleTop,
 		visibleItems,
+		resetScrollState,
+		syncScrollState,
 	}
 }
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index 5dfe375f43..ca1e6e95db 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -4301,6 +4301,87 @@
   "tag.loader.waterfall": {
     "defaultMessage": "Waterfall"
   },
+  "time-frame-picker.apply": {
+    "defaultMessage": "Apply"
+  },
+  "time-frame-picker.cancel": {
+    "defaultMessage": "Cancel"
+  },
+  "time-frame-picker.clear-range": {
+    "defaultMessage": "Clear"
+  },
+  "time-frame-picker.custom-range": {
+    "defaultMessage": "Custom fixed date range..."
+  },
+  "time-frame-picker.decrease-amount": {
+    "defaultMessage": "Decrease timeframe amount"
+  },
+  "time-frame-picker.empty-range": {
+    "defaultMessage": "No date range selected."
+  },
+  "time-frame-picker.increase-amount": {
+    "defaultMessage": "Increase timeframe amount"
+  },
+  "time-frame-picker.last-timeframe": {
+    "defaultMessage": "In the last {amount} {unit, select, hours {{amount, plural, one {hour} other {hours}}} days {{amount, plural, one {day} other {days}}} weeks {{amount, plural, one {week} other {weeks}}} months {{amount, plural, one {month} other {months}}} other {days}}"
+  },
+  "time-frame-picker.last-timeframe-prefix": {
+    "defaultMessage": "In the last"
+  },
+  "time-frame-picker.option.all-time": {
+    "defaultMessage": "All time"
+  },
+  "time-frame-picker.option.last-14-days": {
+    "defaultMessage": "Last 14 days"
+  },
+  "time-frame-picker.option.last-180-days": {
+    "defaultMessage": "Last 180 days"
+  },
+  "time-frame-picker.option.last-30-days": {
+    "defaultMessage": "Last 30 days"
+  },
+  "time-frame-picker.option.last-7-days": {
+    "defaultMessage": "Last 7 days"
+  },
+  "time-frame-picker.option.last-90-days": {
+    "defaultMessage": "Last 90 days"
+  },
+  "time-frame-picker.option.today": {
+    "defaultMessage": "Today"
+  },
+  "time-frame-picker.option.year-to-date": {
+    "defaultMessage": "Year to date"
+  },
+  "time-frame-picker.option.yesterday": {
+    "defaultMessage": "Yesterday"
+  },
+  "time-frame-picker.select-timeframe": {
+    "defaultMessage": "Select timeframe"
+  },
+  "time-frame-picker.selected-range": {
+    "defaultMessage": "Selected"
+  },
+  "time-frame-picker.selecting-range": {
+    "defaultMessage": "Selecting"
+  },
+  "time-frame-picker.timeframe-amount": {
+    "defaultMessage": "Timeframe amount"
+  },
+  "time-frame-picker.timeframe-unit": {
+    "defaultMessage": "Timeframe unit"
+  },
+  "time-frame-picker.unit.days": {
+    "defaultMessage": "days"
+  },
+  "time-frame-picker.unit.hours": {
+    "defaultMessage": "hours"
+  },
+  "time-frame-picker.unit.months": {
+    "defaultMessage": "months"
+  },
+  "time-frame-picker.unit.weeks": {
+    "defaultMessage": "weeks"
+  },
   "ui.component.unsaved-changes-popup.body": {
     "defaultMessage": "You have unsaved changes."
   },
diff --git a/packages/ui/src/stories/base/Combobox.stories.ts b/packages/ui/src/stories/base/Combobox.stories.ts
index 9fa6e693da..6a7d96eabf 100644
--- a/packages/ui/src/stories/base/Combobox.stories.ts
+++ b/packages/ui/src/stories/base/Combobox.stories.ts
@@ -32,6 +32,17 @@ export const Default: Story = {
 	},
 }
 
+export const WithSelectedOption: Story = {
+	args: {
+		modelValue: '2',
+		options: [
+			{ value: '1', label: 'Option 1' },
+			{ value: '2', label: 'Option 2' },
+			{ value: '3', label: 'Option 3' },
+		],
+	},
+}
+
 export const Searchable: Story = {
 	args: {
 		options: [
@@ -64,6 +75,54 @@ export const SearchableEmpty: Story = {
 	},
 }
 
+export const DropdownMinWidth: StoryObj = {
+	render: () => ({
+		components: { Combobox },
+		data: () => ({
+			selected: undefined,
+			options: [
+				{ value: 'fabric', label: 'Fabric', subLabel: 'Lightweight modding toolchain' },
+				{ value: 'forge', label: 'Forge', subLabel: 'The original Minecraft modding API' },
+				{ value: 'neoforge', label: 'NeoForge', subLabel: 'Community-driven Forge fork' },
+			],
+		}),
+		template: /*html*/ `
+			<div style="width: 11rem;">
+				<Combobox
+					v-model="selected"
+					:options="options"
+					:dropdown-min-width="320"
+					placeholder="Loader"
+				/>
+			</div>
+		`,
+	}),
+}
+
+export const DropdownClass: StoryObj = {
+	render: () => ({
+		components: { Combobox },
+		data: () => ({
+			selected: undefined,
+			options: [
+				{ value: 'fabric', label: 'Fabric' },
+				{ value: 'forge', label: 'Forge' },
+				{ value: 'neoforge', label: 'NeoForge' },
+			],
+		}),
+		template: /*html*/ `
+			<div style="width: 14rem;">
+				<Combobox
+					v-model="selected"
+					:options="options"
+					dropdown-class="!border-brand"
+					placeholder="Loader"
+				/>
+			</div>
+		`,
+	}),
+}
+
 export const Disabled: Story = {
 	args: {
 		options: [{ value: '1', label: 'Option 1' }],
@@ -72,40 +131,40 @@ export const Disabled: Story = {
 	},
 }
 
-export const WithSubLabels: Story = {
+export const SearchableWithIcons: Story = {
 	args: {
 		options: [
 			{ value: 'download', label: 'Download', icon: DownloadIcon },
 			{ value: 'share', label: 'Share', icon: ShareIcon },
 			{ value: 'favorite', label: 'Add to favorites', icon: HeartIcon },
-			{ type: 'divider' },
 			{ value: 'settings', label: 'Settings', icon: SettingsIcon },
 			{ value: 'profile', label: 'Profile', icon: UserIcon },
-			{ type: 'divider' },
-			{ value: 'delete', label: 'Delete', icon: TrashIcon, disabled: true },
+			{ value: 'delete', label: 'Delete', icon: TrashIcon },
 		],
 		placeholder: 'Select an action',
-		listbox: false,
+		searchable: true,
+		searchPlaceholder: 'Search actions...',
 	},
 }
 
-export const SearchableWithIcons: Story = {
+export const WithDividers: Story = {
 	args: {
 		options: [
 			{ value: 'download', label: 'Download', icon: DownloadIcon },
 			{ value: 'share', label: 'Share', icon: ShareIcon },
 			{ value: 'favorite', label: 'Add to favorites', icon: HeartIcon },
+			{ type: 'divider' },
 			{ value: 'settings', label: 'Settings', icon: SettingsIcon },
 			{ value: 'profile', label: 'Profile', icon: UserIcon },
-			{ value: 'delete', label: 'Delete', icon: TrashIcon },
+			{ type: 'divider' },
+			{ value: 'delete', label: 'Delete', icon: TrashIcon, disabled: true },
 		],
 		placeholder: 'Select an action',
-		searchable: true,
-		searchPlaceholder: 'Search actions...',
+		listbox: false,
 	},
 }
 
-export const WithSelectedOption: Story = {
+export const WithSubLabel: Story = {
 	args: {
 		modelValue: '2',
 		options: [
@@ -117,32 +176,30 @@ export const WithSelectedOption: Story = {
 	},
 }
 
-export const SearchableNoFilter: Story = {
+export const MixedSubLabels: Story = {
 	args: {
 		options: [
-			{ value: 'download', label: 'Download', icon: DownloadIcon },
-			{ value: 'share', label: 'Share', icon: ShareIcon },
-			{ value: 'favorite', label: 'Add to favorites', icon: HeartIcon },
-			{ value: 'settings', label: 'Settings', icon: SettingsIcon },
-			{ value: 'profile', label: 'Profile', icon: UserIcon },
+			{ value: '1', label: 'Minecraft', subLabel: 'The base game' },
+			{ value: '2', label: 'Fabric' },
+			{ value: '3', label: 'Forge', subLabel: 'Supports most mods' },
+			{ value: '4', label: 'NeoForge' },
+			{ value: '5', label: 'Quilt', subLabel: 'Fabric-compatible' },
 		],
-		searchable: true,
-		searchPlaceholder: 'Search actions...',
-		disableSearchFilter: true,
 	},
 }
 
-export const SearchableModpacks: Story = {
+export const SearchableNoFilter: Story = {
 	args: {
 		options: [
 			{ value: 'download', label: 'Download', icon: DownloadIcon },
 			{ value: 'share', label: 'Share', icon: ShareIcon },
 			{ value: 'favorite', label: 'Add to favorites', icon: HeartIcon },
 			{ value: 'settings', label: 'Settings', icon: SettingsIcon },
+			{ value: 'profile', label: 'Profile', icon: UserIcon },
 		],
 		searchable: true,
-		searchPlaceholder: 'Search modpacks...',
-		noOptionsMessage: 'No modpacks found',
+		searchPlaceholder: 'Search actions...',
+		disableSearchFilter: true,
 	},
 }
 
@@ -194,15 +251,48 @@ export const WithDropdownFooter: StoryObj = {
 	}),
 }
 
-export const MixedSubLabels: Story = {
-	args: {
-		options: [
-			{ value: '1', label: 'Minecraft', subLabel: 'The base game' },
-			{ value: '2', label: 'Fabric' },
-			{ value: '3', label: 'Forge', subLabel: 'Supports most mods' },
-			{ value: '4', label: 'NeoForge' },
-			{ value: '5', label: 'Quilt', subLabel: 'Fabric-compatible' },
-		],
+export const DropdownFooterOnly: StoryObj = {
+	render: () => ({
+		components: { Combobox },
+		data: () => ({
+			selected: undefined,
+			options: [],
+		}),
+		template: /*html*/ `
+			<div style="width: 240px;">
+				<Combobox
+					v-model="selected"
+					:options="options"
+					display-value="Custom range"
+					dropdown-min-width="320"
+				>
+					<template #dropdown-footer>
+						<div style="display: flex; flex-direction: column; gap: 0.75rem; padding: 1rem; color: var(--color-text-primary);">
+							<div style="font-size: 0.875rem; font-weight: 700;">Dropdown footer content</div>
+							<div style="font-size: 0.8125rem; color: var(--color-text-secondary);">
+								This dropdown has no options and stays open because its footer slot is content.
+							</div>
+							<div style="display: grid; grid-template-columns: 1fr 1fr; gap: 0.5rem;">
+								<button type="button" style="height: 2rem; border: 1px solid var(--color-surface-5); border-radius: 0.5rem; background: var(--color-surface-3); color: var(--color-text-primary); font-weight: 600;">
+									Cancel
+								</button>
+								<button type="button" style="height: 2rem; border: 0; border-radius: 0.5rem; background: var(--color-brand); color: var(--color-bg); font-weight: 700;">
+									Apply
+								</button>
+							</div>
+						</div>
+					</template>
+				</Combobox>
+			</div>
+		`,
+	}),
+	parameters: {
+		docs: {
+			description: {
+				story:
+					'Covers dropdowns whose only rendered content is the footer slot, such as the analytics custom date range picker.',
+			},
+		},
 	},
 }
 
@@ -258,3 +348,22 @@ export const SearchableWithOptionAndSelectionAffix: StoryObj = {
 		`,
 	}),
 }
+
+export const ManyOptionsOverflow: Story = {
+	args: {
+		options: Array.from({ length: 40 }, (_, index) => ({
+			value: `${index + 1}`,
+			label: `Option ${index + 1}`,
+		})),
+		placeholder: 'Select an option',
+		maxHeight: 380,
+	},
+	parameters: {
+		docs: {
+			description: {
+				story:
+					'Covers long option lists where the dropdown content should scroll within its max height.',
+			},
+		},
+	},
+}
diff --git a/packages/ui/src/stories/base/DatePicker.stories.ts b/packages/ui/src/stories/base/DatePicker.stories.ts
index 8a8838cb38..991acdb43d 100644
--- a/packages/ui/src/stories/base/DatePicker.stories.ts
+++ b/packages/ui/src/stories/base/DatePicker.stories.ts
@@ -48,6 +48,26 @@ export const WithTime: Story = {
 	}),
 }
 
+export const Clearable: Story = {
+	render: () => ({
+		components: { DatePicker },
+		setup() {
+			const value = ref('2026-04-27')
+			return { value }
+		},
+		template: /* html */ `
+			<div class="flex max-w-sm flex-col gap-2">
+				<DatePicker
+					v-model="value"
+					wrapperClass="w-[300px]"
+					placeholder="Select a date..."
+				/>
+				<p class="text-sm text-secondary">Selected value: {{ value || 'None' }}</p>
+			</div>
+		`,
+	}),
+}
+
 export const OpenWithTime: Story = {
 	render: () => ({
 		components: { DatePicker },
diff --git a/packages/ui/src/stories/base/DropdownFilterBar.stories.ts b/packages/ui/src/stories/base/DropdownFilterBar.stories.ts
index 94971c2eac..be074b0b36 100644
--- a/packages/ui/src/stories/base/DropdownFilterBar.stories.ts
+++ b/packages/ui/src/stories/base/DropdownFilterBar.stories.ts
@@ -1,3 +1,4 @@
+import { BoxIcon } from '@modrinth/assets'
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 import { ref } from 'vue'
 
@@ -55,10 +56,57 @@ const searchableCategories = [
 		searchPlaceholder: 'Search versions...',
 		submenuClass: 'w-[360px]',
 		options: [
-			{ value: '1.21.5', label: '1.21.5' },
-			{ value: '1.21.4', label: '1.21.4' },
-			{ value: '1.20.1', label: '1.20.1' },
-			{ value: '1.19.2', label: '1.19.2' },
+			{ value: '1.21.5', label: '1.21.5', searchTerms: ['Sodium'] },
+			{ value: '1.21.4', label: '1.21.4', searchTerms: ['Sodium'] },
+			{ value: '1.20.1', label: '1.20.1', searchTerms: ['Iris'] },
+			{ value: '1.19.2', label: '1.19.2', searchTerms: ['Mod Menu'] },
+		],
+	},
+]
+
+const largeVersionOptions = Array.from({ length: 250 }, (_, index) => {
+	const version = `1.${Math.floor(index / 10) + 1}.${index % 10}`
+	const project = `Project ${Math.floor(index / 25) + 1}`
+	return {
+		value: `version-${index + 1}`,
+		label: version,
+		searchTerms: [project],
+	}
+})
+
+const mixedWidthCategories = [
+	{
+		key: 'status',
+		label: 'Status',
+		options: [
+			{ value: 'active', label: 'Active' },
+			{ value: 'archived', label: 'Archived' },
+			{ value: 'draft', label: 'Draft' },
+		],
+	},
+	{
+		key: 'country',
+		label: 'Country',
+		searchable: true,
+		searchPlaceholder: 'Search countries...',
+		submenuClass: 'w-[324px]',
+		options: [
+			{ value: 'US', label: 'United States' },
+			{ value: 'CA', label: 'Canada' },
+			{ value: 'DE', label: 'Germany' },
+			{ value: 'JP', label: 'Japan' },
+		],
+	},
+	{
+		key: 'version',
+		label: 'Project version',
+		searchable: true,
+		searchPlaceholder: 'Search project versions...',
+		submenuClass: 'w-[368px]',
+		options: [
+			{ value: 'sodium-1.21.5', label: 'Sodium 1.21.5' },
+			{ value: 'iris-1.21.4', label: 'Iris 1.21.4' },
+			{ value: 'mod-menu-1.20.1', label: 'Mod Menu 1.20.1' },
 		],
 	},
 ]
@@ -90,11 +138,21 @@ export const WithAppliedFilters: Story = {
 				status: ['active'],
 				type: ['mod', 'plugin'],
 			})
-			return { categories: defaultCategories, selected }
+			const clearEvents = ref(0)
+			function handleClear() {
+				clearEvents.value += 1
+			}
+
+			return { categories: defaultCategories, clearEvents, handleClear, selected }
 		},
 		template: /* html */ `
 			<div class="flex flex-wrap items-center gap-2">
-				<DropdownFilterBar v-model="selected" :categories="categories" />
+				<DropdownFilterBar
+					v-model="selected"
+					:categories="categories"
+					@clear="handleClear"
+				/>
+				<span class="text-sm font-medium text-secondary">Clear events: {{ clearEvents }}</span>
 			</div>
 		`,
 	}),
@@ -107,6 +165,37 @@ export const WithAppliedFilters: Story = {
 	},
 }
 
+export const WithClearOverride: Story = {
+	render: () => ({
+		components: { DropdownFilterBar },
+		setup() {
+			const selected = ref<Record<string, string[]>>({})
+			const clearEvents = ref(0)
+			function handleClear() {
+				clearEvents.value += 1
+			}
+
+			return { categories: defaultCategories, clearEvents, handleClear, selected }
+		},
+		template: /* html */ `
+			<div class="flex flex-wrap items-center gap-2">
+				<DropdownFilterBar
+					v-model="selected"
+					:categories="categories"
+					show-clear
+					@clear="handleClear"
+				/>
+				<span class="text-sm font-medium text-secondary">Clear events: {{ clearEvents }}</span>
+			</div>
+		`,
+	}),
+	args: {
+		modelValue: {},
+		categories: defaultCategories,
+		showClear: true,
+	},
+}
+
 export const WithFilterIcon: Story = {
 	render: () => ({
 		components: { DropdownFilterBar },
@@ -133,14 +222,33 @@ export const WithFilterIcon: Story = {
 
 export const SearchableCategories: Story = {
 	render: () => ({
-		components: { DropdownFilterBar },
+		components: { BoxIcon, DropdownFilterBar },
 		setup() {
 			const selected = ref<Record<string, string[]>>({})
-			return { categories: searchableCategories, selected }
+			const versionProjects: Record<string, string> = {
+				'1.21.5': 'Sodium',
+				'1.21.4': 'Sodium',
+				'1.20.1': 'Iris',
+				'1.19.2': 'Mod Menu',
+			}
+			function getVersionProject(categoryKey: string, optionValue: string) {
+				return categoryKey === 'version' ? versionProjects[optionValue] : undefined
+			}
+			return { categories: searchableCategories, getVersionProject, selected }
 		},
 		template: /* html */ `
 			<div class="flex flex-wrap items-center gap-2">
-				<DropdownFilterBar v-model="selected" :categories="categories" />
+				<DropdownFilterBar v-model="selected" :categories="categories">
+					<template #option-right="{ category, option }">
+						<span
+							v-if="getVersionProject(category.key, option.value)"
+							v-tooltip="getVersionProject(category.key, option.value)"
+							class="flex size-6 shrink-0 items-center justify-center overflow-hidden rounded text-primary"
+						>
+							<BoxIcon class="size-6" />
+						</span>
+					</template>
+				</DropdownFilterBar>
 			</div>
 		`,
 	}),
@@ -150,11 +258,165 @@ export const SearchableCategories: Story = {
 	},
 }
 
-export const CustomControls: Story = {
+export const MixedSubmenuWidthsNearEdge: Story = {
 	render: () => ({
 		components: { DropdownFilterBar },
 		setup() {
 			const selected = ref<Record<string, string[]>>({})
+			return { categories: mixedWidthCategories, selected }
+		},
+		template: /* html */ `
+			<div class="flex min-h-96 justify-end px-4 py-8">
+				<DropdownFilterBar v-model="selected" :categories="categories" />
+			</div>
+		`,
+	}),
+	args: {
+		modelValue: {},
+		categories: mixedWidthCategories,
+	},
+	parameters: {
+		docs: {
+			description: {
+				story:
+					'Covers mixed submenu widths near the viewport edge so all add-menu submenus open on the same side.',
+			},
+		},
+	},
+}
+
+export const VirtualizedPreview: Story = {
+	render: () => ({
+		components: { BoxIcon, DropdownFilterBar },
+		setup() {
+			const selected = ref<Record<string, string[]>>({
+				version: ['version-3', 'version-47', 'version-132'],
+			})
+			const categories = [
+				{
+					key: 'version',
+					label: 'Version',
+					searchable: true,
+					searchPlaceholder: 'Search versions...',
+					submenuClass: 'w-[360px]',
+					previewDropdownWidth: '360px',
+					options: largeVersionOptions,
+				},
+			]
+			function getVersionProject(categoryKey: string, optionValue: string) {
+				if (categoryKey !== 'version') {
+					return undefined
+				}
+				const optionIndex = Number(optionValue.replace('version-', '')) - 1
+				return `Project ${Math.floor(optionIndex / 25) + 1}`
+			}
+			return { categories, getVersionProject, selected }
+		},
+		template: /* html */ `
+			<div class="flex flex-wrap items-center gap-2">
+				<DropdownFilterBar v-model="selected" :categories="categories">
+					<template #option-right="{ category, option }">
+						<span
+							v-if="getVersionProject(category.key, option.value)"
+							v-tooltip="getVersionProject(category.key, option.value)"
+							class="flex size-6 shrink-0 items-center justify-center overflow-hidden rounded text-primary"
+						>
+							<BoxIcon class="size-6" />
+						</span>
+					</template>
+				</DropdownFilterBar>
+			</div>
+		`,
+	}),
+	args: {
+		modelValue: {
+			version: ['version-3', 'version-47', 'version-132'],
+		},
+		categories: [
+			{
+				key: 'version',
+				label: 'Version',
+				searchable: true,
+				searchPlaceholder: 'Search versions...',
+				submenuClass: 'w-[360px]',
+				previewDropdownWidth: '360px',
+				options: largeVersionOptions,
+			},
+		],
+	},
+}
+
+export const VirtualizedSubmenu: Story = {
+	render: () => ({
+		components: { BoxIcon, DropdownFilterBar },
+		setup() {
+			const selected = ref<Record<string, string[]>>({})
+			const categories = [
+				{
+					key: 'version',
+					label: 'Version',
+					searchable: true,
+					searchPlaceholder: 'Search versions...',
+					submenuClass: 'w-[360px]',
+					options: largeVersionOptions,
+				},
+			]
+			function getVersionProject(categoryKey: string, optionValue: string) {
+				if (categoryKey !== 'version') {
+					return undefined
+				}
+				const optionIndex = Number(optionValue.replace('version-', '')) - 1
+				return `Project ${Math.floor(optionIndex / 25) + 1}`
+			}
+			return { categories, getVersionProject, selected }
+		},
+		template: /* html */ `
+			<div class="flex flex-wrap items-center gap-2">
+				<DropdownFilterBar v-model="selected" :categories="categories">
+					<template #option-right="{ category, option }">
+						<span
+							v-if="getVersionProject(category.key, option.value)"
+							v-tooltip="getVersionProject(category.key, option.value)"
+							class="flex size-6 shrink-0 items-center justify-center overflow-hidden rounded text-primary"
+						>
+							<BoxIcon class="size-6" />
+						</span>
+					</template>
+				</DropdownFilterBar>
+			</div>
+		`,
+	}),
+	args: {
+		modelValue: {},
+		categories: [
+			{
+				key: 'version',
+				label: 'Version',
+				searchable: true,
+				searchPlaceholder: 'Search versions...',
+				submenuClass: 'w-[360px]',
+				options: largeVersionOptions,
+			},
+		],
+	},
+	parameters: {
+		docs: {
+			description: {
+				story:
+					'Covers the add-menu submenu with flush rows, square hover states, and OverlayScrollbars.',
+			},
+		},
+	},
+}
+
+export const CustomControls: Story = {
+	render: () => ({
+		components: { DropdownFilterBar },
+		setup() {
+			const selected = ref<Record<string, string[]>>({
+				version: ['1.21.5'],
+			})
+			const minimumDownloads = ref('1k')
 			const releaseOnly = ref(true)
 			const categories = [
 				{
@@ -171,7 +433,7 @@ export const CustomControls: Story = {
 					],
 				},
 			]
-			return { categories, releaseOnly, selected }
+			return { categories, minimumDownloads, releaseOnly, selected }
 		},
 		template: /* html */ `
 			<div class="flex flex-wrap items-center gap-2">
@@ -193,12 +455,33 @@ export const CustomControls: Story = {
 							</button>
 						</div>
 					</template>
+					<template #preview-footer="{ category, setSelectedValues, closeMenu }">
+						<div
+							v-if="category.key === 'version'"
+							class="flex flex-wrap items-center gap-3 border-0 border-t border-solid border-surface-5 px-6 py-2.5"
+						>
+							<span class="shrink-0 whitespace-nowrap text-sm font-semibold text-primary">
+								Versions above
+							</span>
+							<input
+								v-model="minimumDownloads"
+								type="text"
+								inputmode="numeric"
+								class="h-8 w-16 rounded-lg border border-solid border-surface-5 bg-surface-3 px-2 text-center text-sm font-semibold text-primary outline-none"
+								aria-label="Version downloads threshold"
+								@keydown.enter.prevent.stop="setSelectedValues(['1.21.5', '1.21.4']); closeMenu($event)"
+							/>
+							<span class="shrink-0 text-sm font-semibold text-primary">downloads</span>
+						</div>
+					</template>
 				</DropdownFilterBar>
 			</div>
 		`,
 	}),
 	args: {
-		modelValue: {},
+		modelValue: {
+			version: ['1.21.5'],
+		},
 		categories: searchableCategories,
 	},
 }
diff --git a/packages/ui/src/stories/base/MultiSelect.stories.ts b/packages/ui/src/stories/base/MultiSelect.stories.ts
index 5fc6d00bd0..b6b2e6ec73 100644
--- a/packages/ui/src/stories/base/MultiSelect.stories.ts
+++ b/packages/ui/src/stories/base/MultiSelect.stories.ts
@@ -1,4 +1,4 @@
-import { CheckIcon } from '@modrinth/assets'
+import { BoxIcon, CheckIcon } from '@modrinth/assets'
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 import { computed, ref } from 'vue'
 
@@ -43,6 +43,29 @@ export const Default: Story = {
 		modelValue: ['en', 'es', 'fr', 'zh-CN'],
 		placeholder: 'Select languages',
 	},
+	parameters: {
+		docs: {
+			description: {
+				story:
+					'Options render flush to the dropdown edges with full-width hover and selected states.',
+			},
+		},
+	},
+}
+
+export const DeselectFocusState: Story = {
+	args: {
+		...Default.args,
+		modelValue: ['en'],
+	},
+	parameters: {
+		docs: {
+			description: {
+				story:
+					'Mouse focus after deselecting an option should not keep the selected brightness state applied.',
+			},
+		},
+	},
 }
 
 export const WithSearch: Story = {
@@ -53,6 +76,48 @@ export const WithSearch: Story = {
 	},
 }
 
+export const WithOptionRightSlot: Story = {
+	args: {
+		options: [
+			{ value: 'sodium-1.21.5', label: '1.21.5', searchTerms: ['Sodium'] },
+			{ value: 'sodium-1.21.4', label: '1.21.4', searchTerms: ['Sodium'] },
+			{ value: 'iris-1.20.1', label: '1.20.1', searchTerms: ['Iris'] },
+			{ value: 'modmenu-1.19.2', label: '1.19.2', searchTerms: ['Mod Menu'] },
+		],
+		modelValue: ['sodium-1.21.5'],
+		placeholder: 'Select versions',
+		searchable: true,
+		searchPlaceholder: 'Search versions',
+	},
+	render: (args) => ({
+		components: { BoxIcon, MultiSelect },
+		setup() {
+			const selected = ref(args.modelValue)
+			const projectNames: Record<string, string> = {
+				'sodium-1.21.5': 'Sodium',
+				'sodium-1.21.4': 'Sodium',
+				'iris-1.20.1': 'Iris',
+				'modmenu-1.19.2': 'Mod Menu',
+			}
+			return { args, projectNames, selected }
+		},
+		template: /*html*/ `
+			<div style="width: 400px;">
+				<MultiSelect v-bind="args" v-model="selected">
+					<template #option-right="{ item }">
+						<span
+							v-tooltip="projectNames[item.value]"
+							class="flex size-6 shrink-0 items-center justify-center overflow-hidden rounded text-primary"
+						>
+							<BoxIcon class="size-6" />
+						</span>
+					</template>
+				</MultiSelect>
+			</div>
+		`,
+	}),
+}
+
 export const WithSelectAll: Story = {
 	args: {
 		...Default.args,
@@ -62,12 +127,72 @@ export const WithSelectAll: Story = {
 	},
 }
 
+export const SingleOptionWithSelectAll: Story = {
+	args: {
+		options: [{ value: 'sodium', label: 'Sodium' }],
+		modelValue: [],
+		placeholder: 'Select projects',
+		searchable: true,
+		includeSelectAllOption: true,
+		searchPlaceholder: 'Search projects',
+	},
+	parameters: {
+		docs: {
+			description: {
+				story: 'Select all is hidden when there is only one enabled option.',
+			},
+		},
+	},
+}
+
+export const WithRightCheckbox: Story = {
+	args: {
+		...Default.args,
+		searchable: true,
+		includeSelectAllOption: true,
+		checkboxPosition: 'right',
+		searchPlaceholder: 'Search languages',
+	},
+}
+
 export const WithSelectionActions: Story = {
 	args: {
 		...Default.args,
+		modelValue: [],
 		searchable: true,
 		showSelectionActions: true,
 		searchPlaceholder: 'Search versions',
+		maxHeight: 180,
+	},
+	parameters: {
+		docs: {
+			description: {
+				story:
+					'Selection actions stay above the scrollable options and compensate the scroll position when they appear.',
+			},
+		},
+	},
+}
+
+export const WithSections: Story = {
+	args: {
+		options: [
+			{ value: 'iris', label: 'Iris' },
+			{ value: 'sodium', label: 'Sodium' },
+			{ type: 'section-header', label: 'Single project group' },
+			{ value: 'lithium', label: 'Lithium', searchTerms: ['Single project group'] },
+			{ type: 'section-header', label: 'LambdAurora' },
+			{ value: 'lambda-better-grass', label: 'LambdaBetterGrass', searchTerms: ['LambdAurora'] },
+			{ value: 'auroras-decorations', label: "Aurora's Decorations", searchTerms: ['LambdAurora'] },
+			{ type: 'section-header', label: 'Terraformers' },
+			{ value: 'modmenu', label: 'Mod Menu', searchTerms: ['Terraformers'] },
+			{ value: 'terraform-api', label: 'Terraform API', searchTerms: ['Terraformers'] },
+		],
+		modelValue: ['iris', 'modmenu'],
+		placeholder: 'Select projects',
+		searchable: true,
+		showSelectionActions: true,
+		searchPlaceholder: 'Search projects',
 	},
 }
 
@@ -249,6 +374,50 @@ export const WithBottomSlot: Story = {
 	}),
 }
 
+export const VirtualizedLargeList: Story = {
+	args: {
+		options: Array.from({ length: 250 }, (_, index) => {
+			const version = `1.${Math.floor(index / 10) + 1}.${index % 10}`
+			return {
+				value: `version-${index + 1}`,
+				label: version,
+				searchTerms: [`Project ${Math.floor(index / 25) + 1}`],
+			}
+		}),
+		modelValue: ['version-3', 'version-47', 'version-132'],
+		placeholder: 'Select versions',
+		searchable: true,
+		searchPlaceholder: 'Search versions',
+		showSelectionActions: true,
+		maxHeight: 320,
+	},
+	render: (args) => ({
+		components: { BoxIcon, MultiSelect },
+		setup() {
+			const selected = ref(args.modelValue)
+			function getProjectName(value: string) {
+				const optionIndex = Number(value.replace('version-', '')) - 1
+				return `Project ${Math.floor(optionIndex / 25) + 1}`
+			}
+			return { args, getProjectName, selected }
+		},
+		template: /*html*/ `
+			<div style="width: 400px;">
+				<MultiSelect v-bind="args" v-model="selected">
+					<template #option-right="{ item }">
+						<span
+							v-tooltip="getProjectName(item.value)"
+							class="flex size-6 shrink-0 items-center justify-center overflow-hidden rounded text-primary"
+						>
+							<BoxIcon class="size-6" />
+						</span>
+					</template>
+				</MultiSelect>
+			</div>
+		`,
+	}),
+}
+
 export const NoOptions: Story = {
 	args: {
 		...Default.args,
diff --git a/packages/ui/src/stories/base/Table.stories.ts b/packages/ui/src/stories/base/Table.stories.ts
index 4d578c077d..73025f3f49 100644
--- a/packages/ui/src/stories/base/Table.stories.ts
+++ b/packages/ui/src/stories/base/Table.stories.ts
@@ -28,6 +28,20 @@ const sampleUsers: User[] = [
 		role: 'Admin',
 	},
 ]
+const rangeSelectionUsers: User[] = Array.from({ length: 10 }, (_, index): User => {
+	const id = String(index + 1)
+	const paddedId = id.padStart(2, '0')
+	const statuses: User['status'][] = ['active', 'inactive', 'pending']
+	const roles = ['Admin', 'Editor', 'Maintainer', 'Reviewer', 'User']
+
+	return {
+		id,
+		name: `Member ${paddedId}`,
+		email: `member-${paddedId}@example.com`,
+		status: statuses[index % statuses.length],
+		role: roles[index % roles.length],
+	}
+})
 
 const meta = {
 	title: 'Base/Table',
@@ -57,7 +71,7 @@ export const Default: StoryObj = {
 	}),
 }
 
-export const WithSelection: StoryObj = {
+export const HorizontalOverflow: StoryObj = {
 	args: {},
 	render: () => ({
 		components: { Table },
@@ -69,6 +83,35 @@ export const WithSelection: StoryObj = {
 				{ key: 'role', label: 'Role' },
 			]
 			const data = sampleUsers
+			return { columns, data }
+		},
+		template: /* html */ `
+			<div class="max-w-80">
+				<Table :columns="columns" :data="data" table-min-width="44rem">
+					<template #header>
+						<div class="flex items-center justify-between gap-4">
+							<div class="text-lg font-semibold text-contrast">Members</div>
+							<div class="text-sm text-secondary">{{ data.length }} rows</div>
+						</div>
+					</template>
+				</Table>
+			</div>
+		`,
+	}),
+}
+
+export const WithSelection: StoryObj = {
+	args: {},
+	render: () => ({
+		components: { Table },
+		setup() {
+			const columns = [
+				{ key: 'name', label: 'Name' },
+				{ key: 'email', label: 'Email' },
+				{ key: 'status', label: 'Status' },
+				{ key: 'role', label: 'Role' },
+			]
+			const data = rangeSelectionUsers
 			const selectedIds = ref<string[]>([])
 			return { columns, data, selectedIds }
 		},
@@ -81,6 +124,73 @@ export const WithSelection: StoryObj = {
 					row-key="id"
 					v-model:selected-ids="selectedIds"
 				/>
+				<p class="text-secondary text-sm">Click a checkbox, then Shift-click another checkbox to select or clear the range.</p>
+				<p class="text-secondary">Selected IDs: {{ selectedIds.join(', ') || 'None' }}</p>
+			</div>
+		`,
+	}),
+}
+
+export const WithSelectionData: StoryObj = {
+	args: {},
+	render: () => ({
+		components: { Table },
+		setup() {
+			const columns = [
+				{ key: 'name', label: 'Name' },
+				{ key: 'email', label: 'Email' },
+				{ key: 'status', label: 'Status' },
+				{ key: 'role', label: 'Role' },
+			]
+			const selectionData = rangeSelectionUsers
+			const data = selectionData.filter((_, index) => index === 1 || index === 5)
+			const selectedIds = ref<string[]>([])
+			return { columns, data, selectionData, selectedIds }
+		},
+		template: /* html */ `
+			<div class="space-y-4">
+				<Table
+					:columns="columns"
+					:data="data"
+					:selection-data="selectionData"
+					show-selection
+					row-key="id"
+					v-model:selected-ids="selectedIds"
+				/>
+				<p class="text-secondary text-sm">Only rows 2 and 6 are visible; Shift-clicking between them selects IDs 2 through 6 from selectionData.</p>
+				<p class="text-secondary">Selected IDs: {{ selectedIds.join(', ') || 'None' }}</p>
+			</div>
+		`,
+	}),
+}
+
+export const WithSelectionIds: StoryObj = {
+	args: {},
+	render: () => ({
+		components: { Table },
+		setup() {
+			const columns = [
+				{ key: 'name', label: 'Name' },
+				{ key: 'email', label: 'Email' },
+				{ key: 'status', label: 'Status' },
+				{ key: 'role', label: 'Role' },
+			]
+			const data = rangeSelectionUsers.filter((_, index) => index === 1 || index === 5)
+			const selectionIds = rangeSelectionUsers.map((user) => user.id)
+			const selectedIds = ref<string[]>([])
+			return { columns, data, selectionIds, selectedIds }
+		},
+		template: /* html */ `
+			<div class="space-y-4">
+				<Table
+					:columns="columns"
+					:data="data"
+					:selection-ids="selectionIds"
+					show-selection
+					row-key="id"
+					v-model:selected-ids="selectedIds"
+				/>
+				<p class="text-secondary text-sm">Only rows 2 and 6 are visible; Shift-clicking between them selects IDs 2 through 6 from selectionIds.</p>
 				<p class="text-secondary">Selected IDs: {{ selectedIds.join(', ') || 'None' }}</p>
 			</div>
 		`,
diff --git a/packages/ui/src/stories/base/TimeFramePicker.stories.ts b/packages/ui/src/stories/base/TimeFramePicker.stories.ts
new file mode 100644
index 0000000000..4b4dcf3d04
--- /dev/null
+++ b/packages/ui/src/stories/base/TimeFramePicker.stories.ts
@@ -0,0 +1,88 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+import { ref } from 'vue'
+
+import TimeFramePicker, {
+	type TimeFrameLastUnit,
+	type TimeFrameMode,
+	type TimeFramePreset,
+} from '../../components/base/TimeFramePicker.vue'
+
+const meta = {
+	title: 'Base/TimeFramePicker',
+	component: TimeFramePicker,
+	parameters: {
+		layout: 'padded',
+	},
+	decorators: [
+		(story) => ({
+			components: { story },
+			template: '<div style="width: 20rem;"><story /></div>',
+		}),
+	],
+} satisfies Meta<typeof TimeFramePicker>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+function renderPicker(
+	initial: {
+		mode?: TimeFrameMode
+		preset?: TimeFramePreset
+		lastAmount?: number
+		lastUnit?: TimeFrameLastUnit
+		customStartDate?: string
+		customEndDate?: string
+	} = {},
+) {
+	return () => ({
+		components: { TimeFramePicker },
+		setup() {
+			const mode = ref<TimeFrameMode>(initial.mode ?? 'preset')
+			const preset = ref<TimeFramePreset>(initial.preset ?? 'last_30_days')
+			const lastAmount = ref(initial.lastAmount ?? 1)
+			const lastUnit = ref<TimeFrameLastUnit>(initial.lastUnit ?? 'days')
+			const customStartDate = ref(initial.customStartDate ?? '2026-04-23')
+			const customEndDate = ref(initial.customEndDate ?? '2026-05-22')
+
+			return {
+				customEndDate,
+				customStartDate,
+				lastAmount,
+				lastUnit,
+				mode,
+				preset,
+			}
+		},
+		template: /* html */ `
+			<TimeFramePicker
+				v-model:mode="mode"
+				v-model:preset="preset"
+				v-model:last-amount="lastAmount"
+				v-model:last-unit="lastUnit"
+				v-model:custom-start-date="customStartDate"
+				v-model:custom-end-date="customEndDate"
+				min-date="2023-01-01"
+			/>
+		`,
+	})
+}
+
+export const Preset: Story = {
+	render: renderPicker(),
+}
+
+export const LastTimeframe: Story = {
+	render: renderPicker({
+		mode: 'last',
+		lastAmount: 12,
+		lastUnit: 'hours',
+	}),
+}
+
+export const CustomRange: Story = {
+	render: renderPicker({
+		mode: 'custom_range',
+		customStartDate: '2026-04-23',
+		customEndDate: '2026-05-22',
+	}),
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 73d2dde664..765745886b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -302,6 +302,9 @@ importers:
       ansi-to-html:
         specifier: ^0.7.2
         version: 0.7.2
+      chart.js:
+        specifier: ^4.5.1
+        version: 4.5.1
       dayjs:
         specifier: ^1.11.7
         version: 1.11.19
@@ -712,6 +715,9 @@ importers:
       motion-v:
         specifier: ^2.2.1
         version: 2.2.1(@vueuse/core@11.3.0(vue@3.5.27(typescript@5.9.3)))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vue@3.5.27(typescript@5.9.3))
+      overlayscrollbars:
+        specifier: ^2.15.1
+        version: 2.15.1
       postprocessing:
         specifier: ^6.37.6
         version: 6.38.2(three@0.172.0)
@@ -2492,6 +2498,9 @@ packages:
   '@jsdevtools/ono@7.1.3':
     resolution: {integrity: sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==}
 
+  '@kurkle/color@0.3.4':
+    resolution: {integrity: sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==}
+
   '@kwsites/file-exists@1.1.1':
     resolution: {integrity: sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==}
 
@@ -5399,6 +5408,10 @@ packages:
   character-reference-invalid@2.0.1:
     resolution: {integrity: sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==}
 
+  chart.js@4.5.1:
+    resolution: {integrity: sha512-GIjfiT9dbmHRiYi6Nl2yFCq7kkwdkp1W/lp2J99rX0yo9tgJGn3lKQATztIjb5tVtevcBtIdICNWqlq5+E8/Pw==}
+    engines: {pnpm: '>=8'}
+
   check-error@2.1.3:
     resolution: {integrity: sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==}
     engines: {node: '>= 16'}
@@ -11539,6 +11552,8 @@ snapshots:
 
   '@jsdevtools/ono@7.1.3': {}
 
+  '@kurkle/color@0.3.4': {}
+
   '@kwsites/file-exists@1.1.1':
     dependencies:
       debug: 4.4.3
@@ -13302,7 +13317,7 @@ snapshots:
       eslint-visitor-keys: 4.2.1
       espree: 10.4.0
       estraverse: 5.3.0
-      picomatch: 4.0.3
+      picomatch: 4.0.4
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -14869,6 +14884,10 @@ snapshots:
 
   character-reference-invalid@2.0.1: {}
 
+  chart.js@4.5.1:
+    dependencies:
+      '@kurkle/color': 0.3.4
+
   check-error@2.1.3: {}
 
   chevrotain@7.1.1:
@@ -15551,7 +15570,7 @@ snapshots:
       eslint-import-context: 0.1.9(unrs-resolver@1.11.1)
       is-glob: 4.0.3
       minimatch: 10.1.2
-      semver: 7.7.3
+      semver: 7.7.4
       stable-hash-x: 0.2.0
       unrs-resolver: 1.11.1
     optionalDependencies:
@@ -15586,7 +15605,7 @@ snapshots:
       espree: 10.4.0
       esquery: 1.7.0
       parse-imports-exports: 0.2.4
-      semver: 7.7.3
+      semver: 7.7.4
       spdx-expression-parse: 4.0.0
     transitivePeerDependencies:
       - supports-color
@@ -15684,7 +15703,7 @@ snapshots:
       read-pkg-up: 7.0.1
       regexp-tree: 0.1.27
       regjsparser: 0.10.0
-      semver: 7.7.3
+      semver: 7.7.4
       strip-indent: 3.0.0
 
   eslint-plugin-vue@10.7.0(@stylistic/eslint-plugin@2.13.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(@typescript-eslint/parser@8.54.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(vue-eslint-parser@10.2.0(eslint@9.39.2(jiti@2.6.1))):
@@ -15723,7 +15742,7 @@ snapshots:
       natural-compare: 1.4.0
       nth-check: 2.1.1
       postcss-selector-parser: 6.1.2
-      semver: 7.7.3
+      semver: 7.7.4
       vue-eslint-parser: 9.4.3(eslint@9.39.2(jiti@2.6.1))
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
@@ -20350,7 +20369,7 @@ snapshots:
       espree: 9.6.1
       esquery: 1.7.0
       lodash: 4.17.23
-      semver: 7.7.3
+      semver: 7.7.4
     transitivePeerDependencies:
       - supports-color