diff --git a/packages/pie/src/hooks.ts b/packages/pie/src/hooks.ts index 5fdb669cd..9ccfbb2d5 100644 --- a/packages/pie/src/hooks.ts +++ b/packages/pie/src/hooks.ts @@ -20,6 +20,9 @@ import { CommonPieProps, } from './types' +const idIsActive = (id: DatumId, activeId: null | DatumId | DatumId[]) => + Array.isArray(activeId) ? activeId.indexOf(id) > -1 : activeId === id + /** * Format data so that we get a consistent data structure. * It will also add the `formattedValue` and `color` property. @@ -138,14 +141,12 @@ export const usePieArcs = ({ index: arc.index, startAngle: arc.startAngle, endAngle: arc.endAngle, - innerRadius: - activeId === arc.data.id - ? innerRadius - activeInnerRadiusOffset - : innerRadius, - outerRadius: - activeId === arc.data.id - ? outerRadius + activeOuterRadiusOffset - : outerRadius, + innerRadius: idIsActive(arc.data.id, activeId) + ? innerRadius - activeInnerRadiusOffset + : innerRadius, + outerRadius: idIsActive(arc.data.id, activeId) + ? outerRadius + activeOuterRadiusOffset + : outerRadius, thickness: outerRadius - innerRadius, padAngle: arc.padAngle, angle, diff --git a/storybook/stories/pie/Pie.stories.tsx b/storybook/stories/pie/Pie.stories.tsx index ee38ddc9e..43b458e11 100644 --- a/storybook/stories/pie/Pie.stories.tsx +++ b/storybook/stories/pie/Pie.stories.tsx @@ -282,6 +282,76 @@ export const ControlledActiveId: Story = { render: () => , } +const ControlledPiesMultipleActiveIds = () => { + const [activeId, setActiveId] = useState(commonProperties.data[1].id) + const [additionalActiveIds, setAdditionalActiveIds] = useState([]) + function addActiveId(id) { + setAdditionalActiveIds(additionalActiveIds.concat(id)) + } + function removeActiveId(id) { + setAdditionalActiveIds(additionalActiveIds.filter(x => x !== id)) + } + function handleCheckboxChange(id, checked) { + if (checked) addActiveId(id) + if (!checked) removeActiveId(id) + } + function handlePieClick(id) { + if (additionalActiveIds.indexOf(id) > -1) { + removeActiveId(id) + } else { + addActiveId(id) + } + } + const allActiveIds = [activeId, ...additionalActiveIds] + return ( +
+
+

Active IDs:

+ {commonProperties.data.map(x => ( +
+ +
+ ))} +
+
+ handlePieClick(slice.id)} + /> + handlePieClick(slice.id)} + /> +
+
+ ) +} + +export const ControlledMultipleActiveIds: Story = { + render: () => , +} + const PieWithCustomLegend = () => { const [customLegends, setCustomLegends] = useState[]>([])