Skip to content

Fix label clipping for both Cartesian charts#83452

Merged
Julesssss merged 15 commits intoExpensify:mainfrom
software-mansion-labs:fix-label-clipping-in-charts
Mar 4, 2026
Merged

Fix label clipping for both Cartesian charts#83452
Julesssss merged 15 commits intoExpensify:mainfrom
software-mansion-labs:fix-label-clipping-in-charts

Conversation

@mateuuszzzzz
Copy link
Contributor

@mateuuszzzzz mateuuszzzzz commented Feb 25, 2026

Explanation of Change

X-axis labels in both BarChart and LineChart were being clipped at the edges of the canvas. The root cause was that useChartLabelLayout had no knowledge of the actual canvas-edge constraints, it only checked whether labels fit between ticks, but never verified whether the first/last labels overflowed past the visible area.

What changed

  • Custom X-axis label rendering: Replaced Victory Native's built-in XAxis label rendering with a shared ChartXAxisLabels component rendered via renderOutside. This renders labels in the full canvas area (outside the clipped plot region), giving us full control over positioning and preventing canvas clipping.

  • Edge-aware layout algorithm: Extended useChartLabelLayout with firstTickLeftSpace and lastTickRightSpace parameters so it knows how much room each edge label has before hitting the canvas boundary. The rotation/truncation/skip progression now accounts for edge overflow:

    • 0° → if labels don't fit horizontally OR overflow edges → try 45°
    • 45° → if truncated labels don't fit diagonally OR overflow edges → fall back to 90°
    • 90° → compute skip interval if needed
  • Removed two Victory Native patches: The custom rendering approach eliminates the need for both:

    • victory-native+41.20.2+001+fix-rotated-label-bounds-check.patch (fixed Victory's flawed rotated label bounds check)
    • victory-native+41.20.2+002+add-label-overflow-prop.patch (added a custom labelOverflow prop)

These patches were workarounds for Victory's internal label rendering since we now render labels ourselves, they are no longer needed.

  • Manual memoization removed from touched components

Fixed Issues

$ #81964
PROPOSAL:

Tests

QA Steps

  • Navigate to Search, switch to Bar chart view, and use group by that produces long label names (can be mocked).
  • Verify that the first and last X-axis labels are not clipped at the edges of the chart, they should be fully visible, rotated, or truncated with ..., but never cut off by the canvas boundary.
  • Switch to Line chart view with the same groupBy and verify the same, no edge label clipping.
  • Try different data volumes:
    • Few data points (e.g., group by Year),labels should be horizontal.
    • Many data points (e.g., group by Week over a long range), labels should rotate (45° or 90°) and skip if needed. No overlapping.
  • Resize the browser window to a narrow width (or test on mobile), labels should adapt (rotate/truncate) without clipping at edges.

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Same as tests

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native android bar android line
Android: mWeb Chrome android web bar android web line
iOS: Native ios bar ios line
iOS: mWeb Safari ios web bar ios web line
MacOS: Chrome / Safari bar 45 bar 90 line 45 line 90 Screenshot 2026-03-04 at 14 32 36 Screenshot 2026-03-04 at 14 32 46

@github-actions
Copy link
Contributor

⚠️ This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. ⚠️

@codecov
Copy link

codecov bot commented Feb 25, 2026

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/components/Charts/constants.ts 100.00% <100.00%> (+100.00%) ⬆️
...rc/components/Charts/hooks/useChartLabelFormats.ts 95.00% <100.00%> (ø)
src/components/Charts/hooks/useChartLabelLayout.ts 100.00% <100.00%> (+90.74%) ⬆️
src/components/Charts/utils.ts 87.38% <100.00%> (+13.14%) ⬆️
src/components/Search/SearchChartView.tsx 6.38% <ø> (+6.38%) ⬆️
.../components/Charts/components/ChartXAxisLabels.tsx 0.00% <0.00%> (ø)
...c/components/Charts/LineChart/LineChartContent.tsx 9.52% <0.00%> (+9.52%) ⬆️
src/components/Charts/BarChart/BarChartContent.tsx 4.87% <0.00%> (+4.87%) ⬆️
... and 230 files with indirect coverage changes

Copy link
Contributor

@mhawryluk mhawryluk left a comment

Choose a reason for hiding this comment

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

wow, great work!!

@mateuuszzzzz mateuuszzzzz marked this pull request as ready for review March 4, 2026 08:21
@mateuuszzzzz mateuuszzzzz requested review from a team as code owners March 4, 2026 08:21
@melvin-bot melvin-bot bot requested a review from ShridharGoel March 4, 2026 08:21
@melvin-bot
Copy link

melvin-bot bot commented Mar 4, 2026

@ShridharGoel Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot melvin-bot bot requested review from trjExpensify and removed request for a team March 4, 2026 08:21
);
};

const labelSpace = AXIS_LABEL_GAP + (xAxisLabelHeight ?? 0);
Copy link
Contributor

Choose a reason for hiding this comment

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

❌ CONSISTENCY-3 (docs)

The following block is duplicated verbatim in LineChartContent.tsx (lines 172-174):

const labelSpace = AXIS_LABEL_GAP + (xAxisLabelHeight ?? 0);
const dynamicChartStyle = {height: CHART_CONTENT_MIN_HEIGHT + labelSpace};
const chartPadding = {...CHART_PADDING, bottom: labelSpace + CHART_PADDING.bottom};

Additionally, the boundsLeft/boundsRight state declarations, the totalDomainPadding/paddingScale calculations, and the firstTickLeftSpace/lastTickRightSpace formulas are also duplicated between both chart components.

Consider extracting the shared edge-space and chart-padding logic into a shared hook (e.g., useChartEdgeLayout) that encapsulates boundsLeft/boundsRight state, paddingScale computation, edge space arguments for useChartLabelLayout, and the labelSpace/dynamicChartStyle/chartPadding derivations.


Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

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 think the cost of abstraction is higher than the potential benefit in this case. However, since this is more a matter of opinion than fact, I won’t give it a thumbs up or a thumbs down.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nevertheless I'm curious about your thoughts @ShridharGoel

Copy link
Contributor

@ShridharGoel ShridharGoel Mar 4, 2026

Choose a reason for hiding this comment

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

Might be fine leaving it like this

@ShridharGoel
Copy link
Contributor

ShridharGoel commented Mar 4, 2026

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp Screenshot 2026-03-04 at 10 19 28 PM Screenshot 2026-03-04 at 10 20 11 PM
Android: mWeb Chrome Screenshot 2026-03-04 at 10 21 00 PM
iOS: HybridApp Screenshot 2026-03-04 at 10 15 52 PM
iOS: mWeb Safari Screenshot 2026-03-04 at 10 17 31 PM
MacOS: Chrome / Safari Screenshot 2026-03-04 at 10 11 00 PM Screenshot 2026-03-04 at 10 12 15 PM Screenshot 2026-03-04 at 10 13 59 PM Screenshot 2026-03-04 at 10 13 30 PM

@melvin-bot
Copy link

melvin-bot bot commented Mar 4, 2026

We did not find an internal engineer to review this PR, trying to assign a random engineer to #81964 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

@melvin-bot melvin-bot bot requested a review from Julesssss March 4, 2026 16:52
Copy link
Contributor

@Julesssss Julesssss left a comment

Choose a reason for hiding this comment

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

👍

@Julesssss Julesssss merged commit 2cf34d2 into Expensify:main Mar 4, 2026
38 of 43 checks passed
@github-actions
Copy link
Contributor

github-actions bot commented Mar 4, 2026

🚧 @Julesssss has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify
Copy link
Contributor

OSBotify commented Mar 4, 2026

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify
Copy link
Contributor

OSBotify commented Mar 6, 2026

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.3.32-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@OSBotify
Copy link
Contributor

OSBotify commented Mar 6, 2026

🚀 Deployed to production by https://github.com/blimpich in version: 9.3.32-3 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants