Skip to content
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

Charts: Small type, style and exports changes #41523

Merged
merged 5 commits into from
Feb 4, 2025

Conversation

kangzj
Copy link
Contributor

@kangzj kangzj commented Feb 3, 2025

Fixes #

Proposed changes:

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

n/a

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

no

Testing instructions:

  • Ensure all checks pass
  • Ensure changes look reasonable

@kangzj kangzj added [Type] Janitorial [Status] Needs Team Review Obsolete. Use Needs Review instead. labels Feb 3, 2025
@kangzj kangzj requested review from annacmc and a team February 3, 2025 22:46
@kangzj kangzj self-assigned this Feb 3, 2025
Copy link
Contributor

github-actions bot commented Feb 3, 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 Team 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 🤖


The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.


Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Choose a review path based on your changes:
    • A. Team Review: add the "[Status] Needs Team Review" label
      • For most changes, including minor cross-team impacts.
      • Example: Updating a team-specific component or a small change to a shared library.
    • B. Crew Review: add the "[Status] Needs Review" label
      • For significant changes to core functionality.
      • Example: Major updates to a shared library or complex features.
    • C. Both: Start with Team, then request Crew
      • For complex changes or when you need extra confidence.
      • Example: Refactor affecting multiple systems.
  3. Get at least one approval before merging.

Still unsure? Reach out in #jetpack-developers for guidance!

@@ -157,7 +156,7 @@ const LineChart: FC< LineChartProps > = ( {
theme={ theme }
width={ width }
height={ height }
margin={ margin }
margin={ { top: 0, right: 0, bottom: 0, left: 0, ...margin } }
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Default no margin, and this is also required for type checks.

@@ -20,11 +20,6 @@ interface PieChartProps extends OmitBaseChartProps {
*/
innerRadius?: number;

/**
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Moved to base type

@@ -23,7 +23,7 @@ export function withResponsive< T extends BaseChartProps< unknown > >(
) {
const { maxWidth = 1200, aspectRatio = 0.5, debounceTime = 50 } = config || {};

return function ResponsiveChart( props: Omit< T, 'width' | 'height' | 'size' > ) {
return function ResponsiveChart( props: Optional< T, 'width' | 'height' | 'size' > ) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fix the type checks from consumers

Copy link
Contributor

github-actions bot commented Feb 3, 2025

Code Coverage Summary

This PR did not change code coverage!

That could be good or bad, depending on the situation. Everything covered before, and still is? Great! Nothing was covered before? Not so great. 🤷

Full summary · JS report

@@ -32,14 +32,13 @@ export function withResponsive< T extends BaseChartProps< unknown > >(

// Calculate dimensions
const containerWidth = parentWidth ? Math.min( parentWidth, maxWidth ) : 600;
const containerHeight = containerWidth * aspectRatio;
const containerHeight = props.height ?? containerWidth * aspectRatio;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Users should still be able to specify the height so that it'll be a different ratio even when responsive.

@@ -23,7 +23,7 @@ export function withResponsive< T extends BaseChartProps< unknown > >(
) {
const { maxWidth = 1200, aspectRatio = 0.5, debounceTime = 50 } = config || {};
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm wondering where can we change those params 🤔

Copy link
Contributor

@annacmc annacmc Feb 3, 2025

Choose a reason for hiding this comment

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

What specifically are you interested in changing?

Copy link
Contributor Author

@kangzj kangzj Feb 4, 2025

Choose a reason for hiding this comment

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

aspectRatio and maxWidth

export { ThemeProvider } from './providers/theme';
export { defaultTheme, jetpackTheme, wooTheme } from './providers/theme/themes';
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We need those exported which are required by ThemeProvider


return (
<div
ref={ parentRef }
style={ {
width: '100%',
minHeight: `${ containerHeight }px`,
Copy link
Contributor Author

@kangzj kangzj Feb 3, 2025

Choose a reason for hiding this comment

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

It otherwise set a min height for the wrapper which creates a big gap when the height is specified.

Copy link
Contributor

@annacmc annacmc left a comment

Choose a reason for hiding this comment

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

This works well for me. All charts still work as expected, all tests pass 👍

@kangzj kangzj merged commit b160249 into trunk Feb 4, 2025
59 checks passed
@kangzj kangzj deleted the update/type-and-style-fixes branch February 4, 2025 00:05
@github-actions github-actions bot removed the [Status] Needs Team Review Obsolete. Use Needs Review instead. label Feb 4, 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