Skip to content

fix(Pie- & DonutChart): improve activeSegment handling & fix focus behavior #6695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 6, 2024
Merged

fix(Pie- & DonutChart): improve activeSegment handling & fix focus behavior #6695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8b577d
fix(Pie- & DonutChart): improve `activeSegment` handling & fix focus …
Lukas742 Dec 3, 2024
8aa12c7
Update DonutChart.mdx
Lukas742 Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/charts/src/components/DonutChart/DonutChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const DonutChart = forwardRef<HTMLDivElement, PieChartProps>((props, ref) => {
...props.chartConfig
};

return <PieChart {...props} ref={ref} chartConfig={chartConfig} />;
return <PieChart {...props} ref={ref} chartConfig={chartConfig} data-component-name="DonutChart" />;
});

DonutChart.displayName = 'DonutChart';
Expand Down
7 changes: 7 additions & 0 deletions packages/charts/src/components/PieChart/PieChart.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,10 @@
outline: none;
}
}

[data-active-legend] {
background: color-mix(in srgb, var(--sapSelectedColor), transparent 87%);
:global(.recharts-legend-item-text) {
color: var(--sapTextColor) !important;
}
}
30 changes: 22 additions & 8 deletions packages/charts/src/components/PieChart/PieChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client';

import { enrichEventWithDetails, useStylesheet } from '@ui5/webcomponents-react-base';
import { enrichEventWithDetails, useStylesheet, useSyncRef } from '@ui5/webcomponents-react-base';
import { clsx } from 'clsx';
import type { CSSProperties } from 'react';
import { cloneElement, forwardRef, isValidElement, useCallback, useMemo } from 'react';
Expand Down Expand Up @@ -108,6 +108,8 @@ const PieChart = forwardRef<HTMLDivElement, PieChartProps>((props, ref) => {
} = props;

useStylesheet(styleData, PieChart.displayName);
const [componentRef, chartRef] = useSyncRef(ref);
const isDonutChart = props['data-component-name'] === 'DonutChart';

const chartConfig = {
margin: { right: 30, left: 30, bottom: 30, top: 30, ...(props.chartConfig?.margin ?? {}) },
Expand Down Expand Up @@ -192,12 +194,23 @@ const PieChart = forwardRef<HTMLDivElement, PieChartProps>((props, ref) => {
const ex = mx + (cos >= 0 ? 1 : -1) * 22;
const ey = my;
const textAnchor = cos >= 0 ? 'start' : 'end';
const activeLegendItem = chartRef.current?.querySelector<HTMLLIElement>(
`.legend-item-${chartConfig.activeSegment}`
);
if (!activeLegendItem?.dataset.activeLegend) {
const allLegendItems = chartRef.current?.querySelectorAll('.recharts-legend-item');

allLegendItems.forEach((item) => item.removeAttribute('data-active-legend'));
activeLegendItem.setAttribute('data-active-legend', 'true');
}

return (
<g>
<text x={cx} y={cy} dy={8} textAnchor="middle" fill={fill}>
{payload.name}
</text>
{isDonutChart && (
<text x={cx} y={cy} dy={8} textAnchor="middle" fill={fill}>
{payload.name}
</text>
)}
<Sector
cx={cx}
cy={cy}
Expand Down Expand Up @@ -231,7 +244,7 @@ const PieChart = forwardRef<HTMLDivElement, PieChartProps>((props, ref) => {
</g>
);
},
[showActiveSegmentDataLabel]
[showActiveSegmentDataLabel, chartConfig.activeSegment, isDonutChart]
);

const renderLabelLine = useCallback(
Expand All @@ -248,11 +261,11 @@ const PieChart = forwardRef<HTMLDivElement, PieChartProps>((props, ref) => {
if (chartConfig.activeSegment != null && showActiveSegmentDataLabel) {
if (chartConfig.legendPosition === 'bottom') {
return {
paddingTop: '30px'
paddingBlockStart: '30px'
};
} else if (chartConfig.legendPosition === 'top') {
return {
paddingBottom: '30px'
paddingBlockEnd: '30px'
};
}
}
Expand All @@ -265,7 +278,7 @@ const PieChart = forwardRef<HTMLDivElement, PieChartProps>((props, ref) => {
return (
<ChartContainer
dataset={dataset}
ref={ref}
ref={componentRef}
loading={loading}
Placeholder={ChartPlaceholder ?? PieChartPlaceholder}
style={style}
Expand Down Expand Up @@ -296,6 +309,7 @@ const PieChart = forwardRef<HTMLDivElement, PieChartProps>((props, ref) => {
label={dataLabel}
activeIndex={chartConfig.activeSegment}
activeShape={chartConfig.activeSegment != null && renderActiveShape}
rootTabIndex={-1}
>
{centerLabel && <RechartsLabel position="center">{centerLabel}</RechartsLabel>}
{dataset &&
Expand Down
Loading