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

Core: Avoid crash when theme contains non-color strings #29063

Open
wants to merge 3 commits into
base: next
Choose a base branch
from

Conversation

pocka
Copy link
Contributor

@pocka pocka commented Sep 6, 2024

Closes #28781
Also reported at #25092
Related #10170

What I did

This PR adds safe wrapper for four functions exported by polished:

  • lighten
  • darken
  • transparentize
  • opacify

5 years ago, #6939 fixed runtime crashes, which happens when a user provides a non-color string (ones polished does not support) to theme. Many things changed since then, and nowadays most of the internal components import functions directly from polished instead of the guarded-wrappers. So I suspect this will happen in the future again... a guideline or migration to the CSS custom properties based theming would be necessary in order to prevent the future possible re-regression.

Checklist for Contributors

Testing

The changes in this PR are covered in the following automated tests:

  • stories
  • unit tests
  • integration tests
  • end-to-end tests

(I assume Docs Page crashing is not detectable via test runners?)

Manual testing

This section is mandatory for all contributions. If you believe no manual test is necessary, please state so explicitly. Thanks!

  1. yarn task --task dev --template react-vite/default-ts
  2. Open Storybook in your browser
  3. Access addons / docs / docspage / theming - Docs
  4. Confirm the Docs Page renders without crash
  5. Press Show code
  6. Confirm page does not crash

Documentation

  • Add or update documentation reflecting your changes
  • If you are deprecating/removing a feature, make sure to update
    MIGRATION.MD

Checklist for Maintainers

  • When this PR is ready for testing, make sure to add ci:normal, ci:merged or ci:daily GH label to it to run a specific set of sandboxes. The particular set of sandboxes can be found in code/lib/cli/src/sandbox-templates.ts

  • Make sure this PR contains one of the labels below:

    Available labels
    • bug: Internal changes that fixes incorrect behavior.
    • maintenance: User-facing maintenance tasks.
    • dependencies: Upgrading (sometimes downgrading) dependencies.
    • build: Internal-facing build tooling & test updates. Will not show up in release changelog.
    • cleanup: Minor cleanup style change. Will not show up in release changelog.
    • documentation: Documentation only changes. Will not show up in release changelog.
    • feature request: Introducing a new feature.
    • BREAKING CHANGE: Changes that break compatibility in some way with current major version.
    • other: Changes that don't fit in the above categories.

🦋 Canary release

This PR does not have a canary release associated. You can request a canary release of this pull request by mentioning the @storybookjs/core team here.

core team members can create a canary release here or locally with gh workflow run --repo storybookjs/storybook canary-release-pr.yml --field pr=<PR_NUMBER>

name before after diff z %
createSize 0 B 0 B 0 B - -
generateSize 76.8 MB 76.8 MB 6 B 1.99 0%
initSize 161 MB 161 MB -58.7 kB 1.42 0%
diffSize 84.7 MB 84.6 MB -58.7 kB -1.45 -0.1%
buildSize 7.52 MB 7.45 MB -67.6 kB -2.49 -0.9%
buildSbAddonsSize 1.62 MB 1.59 MB -28.3 kB -76.72 -1.8%
buildSbCommonSize 195 kB 195 kB 0 B - 0%
buildSbManagerSize 2.34 MB 2.31 MB -30.8 kB -0.6 -1.3%
buildSbPreviewSize 352 kB 352 kB 0 B - 0%
buildStaticSize 0 B 0 B 0 B - -
buildPrebuildSize 4.51 MB 4.45 MB -59.1 kB -2.62 -1.3%
buildPreviewSize 3.01 MB 3 MB -8.49 kB -1.75 -0.3%
testBuildSize 0 B 0 B 0 B - -
testBuildSbAddonsSize 0 B 0 B 0 B - -
testBuildSbCommonSize 0 B 0 B 0 B - -
testBuildSbManagerSize 0 B 0 B 0 B - -
testBuildSbPreviewSize 0 B 0 B 0 B - -
testBuildStaticSize 0 B 0 B 0 B - -
testBuildPrebuildSize 0 B 0 B 0 B - -
testBuildPreviewSize 0 B 0 B 0 B - -
name before after diff z %
createTime 6.8s 25s 18.1s 1.79 🔺72.5%
generateTime 20.5s 21s 483ms -0.13 2.3%
initTime 19.3s 18.8s -548ms 0.6 -2.9%
buildTime 14.7s 11.6s -3s -69ms -0.37 -26.3%
testBuildTime 0ms 0ms 0ms - -
devPreviewResponsive 7s 6.8s -199ms -0.17 -2.9%
devManagerResponsive 4.5s 4.3s -190ms -0.24 -4.4%
devManagerHeaderVisible 851ms 826ms -25ms 0.26 -3%
devManagerIndexVisible 895ms 852ms -43ms 0.15 -5%
devStoryVisibleUncached 1.4s 1.3s -114ms -0.39 -8.6%
devStoryVisible 894ms 862ms -32ms 0.23 -3.7%
devAutodocsVisible 695ms 695ms 0ms -0.22 0%
devMDXVisible 792ms 733ms -59ms 0.28 -8%
buildManagerHeaderVisible 788ms 675ms -113ms -0.72 -16.7%
buildManagerIndexVisible 789ms 682ms -107ms -0.92 -15.7%
buildStoryVisible 832ms 747ms -85ms -0.48 -11.4%
buildAutodocsVisible 667ms 684ms 17ms -0.15 2.5%
buildMDXVisible 687ms 637ms -50ms -0.48 -7.8%

Greptile Summary

This PR adds safe wrappers for color manipulation functions from the 'polished' library to prevent crashes when non-color strings or CSS variables are used in themes.

  • Added safe wrappers for lighten, darken, transparentize, and opacify in code/core/src/theming/utils.ts
  • Updated imports across multiple files to use new safe wrappers from @storybook/core/theming
  • Added tests in code/core/src/theming/tests/util.test.js to ensure proper handling of various input types
  • Created a new story in code/addons/docs/template/stories/docspage/theming.stories.ts to demonstrate CSS variable usage in themes

This patch fixes runtime crash reported in,

* <#28781>
* <#25092>

This patch skips color modification against theme properties if the
property is color and a value is not valid color strings Polished
accepts. While this wouldn't be exactly what users would expect, program
is usable at least.

I've added two public functions `transparentize` and `opacify` to enable
internal components to access those wrapped ones. I have not added
`@internal` JSDoc tag because:

* that JSDoc tag is not common in this codebase, and
* users would benefit from this.

(I'm not proud of the number of changed files...but this is the minimal
atomic change without losing context I can think of)
@pocka pocka changed the title Avoid crash when theme contains non-color strings Core: Avoid crash when theme contains non-color strings Sep 6, 2024
Copy link

nx-cloud bot commented Sep 6, 2024

☁️ Nx Cloud Report

CI is running/has finished running commands for commit 469b9f8. As they complete they will appear below. Click to see the status, the terminal output, and the build insights.

📂 See all runs for this CI Pipeline Execution


✅ Successfully ran 2 targets

Sent with 💌 from NxCloud.

Copy link
Contributor

@greptile-apps greptile-apps bot left a comment

Choose a reason for hiding this comment

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

30 file(s) reviewed, 4 comment(s)
Edit PR Review Bot Settings

code/core/src/theming/tests/util.test.js Outdated Show resolved Hide resolved
code/core/src/theming/utils.ts Show resolved Hide resolved
code/core/src/theming/utils.ts Show resolved Hide resolved
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.

[Bug]: CSS vars in theme throw errors with "Show Code"
3 participants