[charts] Extract FocusedPieArc from PieArcPlot
#20613
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| 'use client'; | ||
| import * as React from 'react'; | ||
| import { useTheme } from '@mui/material/styles'; | ||
| import { useFocusedItem } from '../hooks/useFocusedItem'; | ||
| import { usePieSeriesContext, usePieSeriesLayout } from '../hooks/usePieSeries'; | ||
| import { PieArc, pieArcClasses, type PieArcProps } from './PieArc'; | ||
| import { useItemHighlighted } from '../hooks/useItemHighlighted'; | ||
| import { getModifiedArcProperties } from './dataTransform/getModifiedArcProperties'; | ||
|
|
||
| export function FocusedPieArc( | ||
| props: Partial< | ||
| Omit< | ||
| PieArcProps, | ||
| 'startAngle' | 'endAngle' | 'id' | 'dataIndex' | 'isFaded' | 'isHighlighted' | 'isFocused' | ||
| > | ||
| >, | ||
| ) { | ||
| const theme = useTheme(); | ||
| const focusedItem = useFocusedItem(); | ||
| const pieSeriesLayout = usePieSeriesLayout(); | ||
|
|
||
| const { isHighlighted, isFaded } = useItemHighlighted(focusedItem); | ||
| const pieSeries = usePieSeriesContext(); | ||
|
|
||
| if (focusedItem === null || focusedItem.seriesType !== 'pie' || !pieSeries) { | ||
| return null; | ||
| } | ||
|
|
||
| const series = pieSeries?.series[focusedItem.seriesId]; | ||
| const { center, radius } = pieSeriesLayout[focusedItem.seriesId]; | ||
|
|
||
| if (!series || !center || !radius) { | ||
| return null; | ||
| } | ||
|
|
||
| const item = series.data[focusedItem.dataIndex]; | ||
|
|
||
| const arcSizes = getModifiedArcProperties( | ||
| series, | ||
| pieSeriesLayout[focusedItem.seriesId], | ||
| isHighlighted, | ||
| isFaded, | ||
| ); | ||
|
|
||
| return ( | ||
| <PieArc | ||
| transform={`translate(${pieSeriesLayout[series.id].center.x}, ${pieSeriesLayout[series.id].center.y})`} | ||
| startAngle={item.startAngle} | ||
| endAngle={item.endAngle} | ||
| color="transparent" | ||
| pointerEvents="none" | ||
| skipInteraction | ||
| skipAnimation | ||
| stroke={(theme.vars ?? theme).palette.text.primary} | ||
| id={series.id} | ||
| className={pieArcClasses.focusIndicator} | ||
| dataIndex={focusedItem.dataIndex} | ||
| isFaded={false} | ||
| isHighlighted={false} | ||
| isFocused={false} | ||
| strokeWidth={3} | ||
| {...arcSizes} | ||
| {...props} | ||
| /> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,50 @@ | ||||||
| import type { DefaultizedPieSeriesType, PieSeriesLayout } from '../../models/seriesType/pie'; | ||||||
| import { deg2rad } from '../../internals/angleConversion'; | ||||||
|
|
||||||
| /** | ||||||
| * Function that returns arc properties after applying transformation from highlight/fade states. | ||||||
| */ | ||||||
| export function getModifiedArcProperties( | ||||||
| seriesDef: Pick< | ||||||
| DefaultizedPieSeriesType, | ||||||
| 'cornerRadius' | 'paddingAngle' | 'id' | 'highlighted' | 'faded' | 'data' | ||||||
| >, | ||||||
| seriesLayout: Pick<PieSeriesLayout, 'radius'>, | ||||||
|
Member
There was a problem hiding this comment. If we're just picking the radius, why not simplify the type?
Suggested change
Member
Author
There was a problem hiding this comment. I think it's easier to have a split that match hooks.
Member
There was a problem hiding this comment. I usually prefer simpler types so that functions are easier to test. IMO, the called function doesn't need to know where the data comes from, that's the calling function's responsibility. Not a big deal, though, just style preference |
||||||
| isHighlighted: boolean, | ||||||
| isFaded: boolean, | ||||||
| ) { | ||||||
| const { | ||||||
| faded, | ||||||
| highlighted, | ||||||
| paddingAngle: basePaddingAngle = 0, | ||||||
| cornerRadius: baseCornerRadius = 0, | ||||||
| } = seriesDef; | ||||||
|
|
||||||
| const { | ||||||
| radius: { inner: baseInnerRadius = 0, label: baseArcLabelRadius, outer: baseOuterRadius }, | ||||||
| } = seriesLayout; | ||||||
|
|
||||||
| const attributesOverride = { | ||||||
| additionalRadius: 0, | ||||||
| ...((isFaded && faded) || (isHighlighted && highlighted) || {}), | ||||||
| }; | ||||||
| const paddingAngle = Math.max(0, deg2rad(attributesOverride.paddingAngle ?? basePaddingAngle)); | ||||||
| const innerRadius = Math.max(0, attributesOverride.innerRadius ?? baseInnerRadius); | ||||||
|
|
||||||
| const outerRadius = Math.max( | ||||||
| 0, | ||||||
| attributesOverride.outerRadius ?? baseOuterRadius + attributesOverride.additionalRadius, | ||||||
| ); | ||||||
| const cornerRadius = attributesOverride.cornerRadius ?? baseCornerRadius; | ||||||
|
|
||||||
| const arcLabelRadius = | ||||||
| attributesOverride.arcLabelRadius ?? baseArcLabelRadius ?? (innerRadius + outerRadius) / 2; | ||||||
|
|
||||||
| return { | ||||||
| paddingAngle, | ||||||
| innerRadius, | ||||||
| outerRadius, | ||||||
| cornerRadius, | ||||||
| arcLabelRadius, | ||||||
| }; | ||||||
| } | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't this technically a breaking change? Someone using
PieArcPlotwill now be missing the outline, right?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes but it's a legal breaking change O:)