Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

keep hidden events hidden across date-range changes

Yan4f72d17faf96
diff --git a/src/components/charts/Chart.tsx b/src/components/charts/Chart.tsx
index b6ae9d794..6fe167690 100644
--- a/src/components/charts/Chart.tsx
+++ b/src/components/charts/Chart.tsx
@@ -18,6 +18,8 @@ export interface ChartProps extends BoxProps {
updateMode?: UpdateMode;
animationDuration?: number;
onTooltip?: (model: any) => void;
+ hiddenLabels?: Set<string>;
+ onLegendClick?: (label: string, willBeHidden: boolean) => void;
}
export function Chart({
@@ -27,6 +29,8 @@ export function Chart({
updateMode,
onTooltip,
chartOptions,
+ hiddenLabels,
+ onLegendClick,
...props
}: ChartProps) {
const canvas = useRef(null);
@@ -61,6 +65,15 @@ export function Chart({
}, [chartOptions]);
const handleLegendClick = (item: LegendItem) => {
+ if (onLegendClick && type === 'bar') {
+ // Controlled mode: caller owns the hidden state. We report the click
+ // and let the parent push a new hiddenLabels set on the next render.
+ const { datasetIndex } = item;
+ const ds = chart.current.data.datasets[datasetIndex];
+ onLegendClick(ds.label, !ds.hidden);
+ return;
+ }
+
if (type === 'bar') {
const { datasetIndex } = item;
const meta = chart.current.getDatasetMeta(datasetIndex);
@@ -111,13 +124,24 @@ export function Chart({
});
}
+ // Re-apply caller-driven hidden flags after focusLabel handling so a
+ // dataset stays hidden across data changes (e.g. date-range switches)
+ // even though Chart.js regenerates dataset meta on every replace.
+ if (hiddenLabels) {
+ chart.current.data.datasets.forEach((ds: { hidden: boolean; label: any }) => {
+ if (hiddenLabels.has(ds.label)) {
+ ds.hidden = true;
+ }
+ });
+ }
+
chart.current.options = options;
chart.current.update(updateMode);
setLegendItems(chart.current.legend.legendItems);
}
- }, [chartData, options, updateMode]);
+ }, [chartData, options, updateMode, hiddenLabels]);
return (
<Column gap="6">
diff --git a/src/components/metrics/EventsChart.tsx b/src/components/metrics/EventsChart.tsx
index db23dcc47..9fe9d449b 100644
--- a/src/components/metrics/EventsChart.tsx
+++ b/src/components/metrics/EventsChart.tsx
@@ -26,6 +26,16 @@ export function EventsChart({ websiteId, focusLabel, limit }: EventsChartProps)
const { locale, dateLocale } = useLocale();
const { data, isLoading, error } = useWebsiteEventsSeriesQuery(websiteId, { limit });
const [label, setLabel] = useState<string>(focusLabel);
+ const [hiddenLabels, setHiddenLabels] = useState<Set<string>>(() => new Set());
+
+ const handleLegendClick = useCallback((legendLabel: string, willBeHidden: boolean) => {
+ setHiddenLabels(prev => {
+ const next = new Set(prev);
+ if (willBeHidden) next.add(legendLabel);
+ else next.delete(legendLabel);
+ return next;
+ });
+ }, []);
const chartData: any = useMemo(() => {
if (!data) return;
@@ -87,6 +97,8 @@ export function EventsChart({ websiteId, focusLabel, limit }: EventsChartProps)
stacked={true}
renderXLabel={renderXLabel}
height="400px"
+ hiddenLabels={hiddenLabels}
+ onLegendClick={handleLegendClick}
/>
)}
</LoadingPanel>