Ling0925
/
buster
mirror of https://github.com/buster-so/buster.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1228 from buster-so/big-nate-bus-1985-colorby-tooltip-and-legend-defaults 

logic for auto show with color by
This commit is contained in:
Nate Kelley 2025-09-30 16:03:50 -06:00 committed by GitHub
parent bd0012a9f0 352cf62f2c
commit 085e47fb19
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/web/src/components/ui/charts-shared/useLegendAutoShow.ts
View File

@ -7,12 +7,14 @@ export const useLegendAutoShow = ({
selectedChartType,
showLegendProp = null,
categoryAxisColumnNames,
colorByColumnNames,
allYAxisColumnNames,
}: {
selectedChartType: BusterChartProps['selectedChartType'];
showLegendProp: BusterChartProps['showLegend'];
categoryAxisColumnNames: string[] | null | undefined;
allYAxisColumnNames: string[];
colorByColumnNames: string[];
}) => {
const showLegend = useMemo(() => {
if (UNSUPPORTED_CHART_TYPES.includes(selectedChartType)) {
@ -38,10 +40,16 @@ export const useLegendAutoShow = ({
return true;
}
const defaultShowLegend = !!categoryAxisColumnNames?.length;
const defaultShowLegend = !!categoryAxisColumnNames?.length || !!colorByColumnNames?.length;
return defaultShowLegend;
}, [selectedChartType, allYAxisColumnNames, categoryAxisColumnNames, showLegendProp]);
}, [
selectedChartType,
allYAxisColumnNames,
categoryAxisColumnNames,
showLegendProp,
colorByColumnNames,
]);
return showLegend;
};

7
apps/web/src/components/ui/charts/BusterChartLegend/useBusterChartLegend.ts
View File

@ -1,4 +1,5 @@
import type {
BarAndLineAxis,
ChartEncodes,
ChartType,
ComboChartAxis,
@ -52,11 +53,17 @@ export const useBusterChartLegend = ({
[(selectedAxis as ScatterAxis)?.category?.join('')]
);
const colorByColumnNames = useMemo(
() => (selectedAxis as BarAndLineAxis)?.colorBy ?? [],
[(selectedAxis as BarAndLineAxis)?.colorBy?.join('')]
);
const showLegend = useLegendAutoShow({
selectedChartType,
showLegendProp,
categoryAxisColumnNames,
allYAxisColumnNames,
colorByColumnNames,
});
const renderLegend = useMemo(() => {