Skip to content

Conversation

adamwoodnz
Copy link
Contributor

@adamwoodnz adamwoodnz commented Oct 1, 2025

Fixes CHARTS-119: Pie/Donut/Semi circle charts: Support custom rendering of legend, allowing rendering of custom legend, which uses CSS grid for layout and has conditional content (the comparison %). The custom legend has access to the colors it needs to match the chart.

Storybook

Woo Analytics

Screenshot 2025-10-06 at 4 47 37 PM

Proposed changes:

  • Adds support for rendering a custom legend
  • The render prop receives the generated legend items for the chart, so the consumer can extract whatever data is needed, and return any markup.

A draft PR has been created to update Woo Analytics to use the render prop: https://github.com/woocommerce/woocommerce-analytics/pull/1253

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

@adamwoodnz adamwoodnz self-assigned this Oct 1, 2025
Copy link
Contributor

github-actions bot commented Oct 1, 2025

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WoA dev site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin (Jetpack), and enable the charts-119-piedonutsemi-circle-charts-support-custom-rendering-of branch.
  • To test on Simple, run the following command on your sandbox:
bin/jetpack-downloader test jetpack charts-119-piedonutsemi-circle-charts-support-custom-rendering-of

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

Copy link
Contributor

github-actions bot commented Oct 1, 2025

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Review, ...).
  • ✅ Add a "[Type]" label (Bug, Enhancement, Janitorial, Task).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖


Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Make sure to test your changes on all platforms that it applies to. You're responsible for the quality of the code you ship.
  3. You can use GitHub's Reviewers functionality to request a review.
  4. When it's reviewed and merged, you will be pinged in Slack to deploy the changes to WordPress.com simple once the build is done.

If you have questions about anything, reach out in #jetpack-developers for guidance!

@github-actions github-actions bot added the [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. label Oct 1, 2025
@adamwoodnz adamwoodnz added [Type] Feature Development of a new feature and removed [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. labels Oct 1, 2025
@adamwoodnz adamwoodnz force-pushed the charts-119-piedonutsemi-circle-charts-support-custom-rendering-of branch from e4abcfe to 7c585d1 Compare October 1, 2025 23:18
Copy link

jp-launch-control bot commented Oct 1, 2025

Code Coverage Summary

Coverage changed in 1 file.

File Coverage Δ% Δ Uncovered
projects/js-packages/charts/src/stories/sample-data/index.ts 20/20 (100.00%) 0.00% 0 💚

Full summary · PHP report · JS report

Comment on lines -132 to +133
'#873EFF', // Purple
'#66BDFF', // Light blue
'#873EFF', // Purple
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Swap this order to match that in Woo Analytics

@adamwoodnz adamwoodnz force-pushed the charts-119-piedonutsemi-circle-charts-support-custom-rendering-of branch from f698d20 to 840cfd3 Compare October 6, 2025 04:06
@adamwoodnz adamwoodnz marked this pull request as ready for review October 6, 2025 04:06
@adamwoodnz adamwoodnz requested a review from Copilot October 6, 2025 04:07
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR adds support for custom legend rendering in pie chart components, allowing developers to create custom legend layouts beyond the default styling. The changes enable passing a render prop to the Legend component that receives legend items with colors matching the chart.

  • Adds render prop to legend components that receives generated legend items
  • Updates default padding values and layout styling for better chart presentation
  • Includes comprehensive Storybook examples demonstrating custom legend usage

Reviewed Changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
projects/js-packages/charts/src/components/legend/types.ts Added render prop type definition for custom legend rendering
projects/js-packages/charts/src/components/legend/private/base-legend.tsx Implemented conditional rendering logic using the render prop
projects/js-packages/charts/src/components/pie-chart/pie-chart.tsx Changed default padding from 20 to 0 for better layout
projects/js-packages/charts/src/components/pie-chart/pie-chart.module.scss Added flex alignment and gap styling
projects/js-packages/charts/src/components/pie-semi-circle-chart/pie-semi-circle-chart.module.scss Added gap styling for consistent spacing
projects/js-packages/charts/src/stories/sample-data/index.ts Added customer revenue sample data for custom legend examples
projects/js-packages/charts/src/components/pie-chart/stories/donut.stories.tsx Added comprehensive custom legend story with WooPieLegend component
projects/js-packages/charts/src/components/pie-chart/stories/index.stories.tsx Updated stories with containerHeight and removed padding args
projects/js-packages/charts/src/providers/chart-context/themes.ts Reordered theme colors (swapped positions of purple and light blue)
projects/js-packages/charts/src/index.ts Exported BaseLegendItem type for public use
projects/js-packages/charts/changelog/charts-119-pie-donut-semi-circle-charts-custom-legend Added changelog entry

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

} }
>
{ items.map( ( item, index ) => {
const { color } = chartItems[ index ];
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extract the color from the legend items in the global charts context, which have a resolved color based on the theme, group, overrides, etc.

@adamwoodnz adamwoodnz requested a review from a team October 6, 2025 04:23
@adamwoodnz adamwoodnz added the [Status] Needs Review This PR is ready for review. label Oct 6, 2025
size,
thickness = 1,
padding = 20,
padding = 0,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is being set to 0 by our consumers and it seems a more sensible default

flex-direction: column;
overflow: hidden;
align-items: center;
gap: 20px;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add some default space between the chart and legend. Can be customised using a className.

Copy link
Member

@Nikschavan Nikschavan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This tested well, Thank you for this @adamwoodnz

@adamwoodnz adamwoodnz merged commit c0890ac into trunk Oct 6, 2025
86 of 87 checks passed
@adamwoodnz adamwoodnz deleted the charts-119-piedonutsemi-circle-charts-support-custom-rendering-of branch October 6, 2025 19:59
@github-actions github-actions bot removed the [Status] Needs Review This PR is ready for review. label Oct 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants