-
Notifications
You must be signed in to change notification settings - Fork 25
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.
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
Add tooltip support for Donut Chart #1587
Draft
michaelnesen
wants to merge
1
commit into
main
Choose a base branch
from
add-tooltip-support-donut-chart
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 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 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 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
18 changes: 18 additions & 0 deletions
18
packages/polaris-viz/src/components/DonutChart/stories/Tooltip.stories.tsx
This file contains 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,18 @@ | ||
import type {Story} from '@storybook/react'; | ||
|
||
export {META as default} from './meta'; | ||
|
||
import type {DonutChartProps} from '../DonutChart'; | ||
|
||
import {DEFAULT_PROPS, DEFAULT_DATA, Template} from './data'; | ||
|
||
export const Tooltip: Story<DonutChartProps> = Template.bind({}); | ||
|
||
Tooltip.args = { | ||
...DEFAULT_PROPS, | ||
data: DEFAULT_DATA, | ||
tooltipOptions: { | ||
titleFormatter: (value) => value?.toString() || '', | ||
valueFormatter: (value) => value?.toString() || '', | ||
}, | ||
}; |
This file contains 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
49 changes: 49 additions & 0 deletions
49
packages/polaris-viz/src/hooks/useDonutChartTooltipContents.ts
This file contains 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,49 @@ | ||
import type {ReactNode} from 'react'; | ||
import {useCallback} from 'react'; | ||
import type {Color, DataSeries} from '@shopify/polaris-viz-core'; | ||
import {useChartContext} from '@shopify/polaris-viz-core'; | ||
|
||
import type {RenderTooltipContentData} from '../types'; | ||
|
||
export interface Props { | ||
data: DataSeries[]; | ||
seriesColors: Color[]; | ||
renderTooltipContent?: (data: RenderTooltipContentData) => ReactNode; | ||
} | ||
|
||
export function useDonutChartTooltipContents({ | ||
data, | ||
renderTooltipContent, | ||
seriesColors, | ||
}: Props) { | ||
const {theme} = useChartContext(); | ||
|
||
return useCallback( | ||
(activeIndex: number) => { | ||
if (activeIndex === -1 || !renderTooltipContent) { | ||
return null; | ||
} | ||
|
||
const tooltipData: RenderTooltipContentData['data'] = [ | ||
{ | ||
shape: 'Donut', | ||
data: [], | ||
}, | ||
]; | ||
|
||
tooltipData[0].data.push({ | ||
key: `${data[activeIndex].name}`, | ||
value: data[activeIndex].data[0].value, | ||
color: data[activeIndex].color ?? seriesColors[activeIndex], | ||
}); | ||
|
||
return renderTooltipContent({ | ||
data: tooltipData, | ||
activeIndex, | ||
dataSeries: data, | ||
theme, | ||
}); | ||
}, | ||
[data, seriesColors, theme, renderTooltipContent], | ||
); | ||
} |
This file contains 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.
Currently,
tooltipOptions
is what enables the tooltip and defines its options in the donut chart. I believe we want the tooltip to be an opt-in experience cc @rachelng. But perhaps another prop likeshowTooltip
would make more sense? Interested to see what others thinkThere 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.
I like the
showTooltip
prop. If we decide to go that route, we should add it to all the other components that can render tooltips.