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.

Sign up for GitHub

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

Jump to bottom

feat(BaseStyles): Fix Typography and Common props when CSS modules feature flag is enabled #5444

Merged
merged 6 commits into from
Dec 17, 2024
Merged

feat(BaseStyles): Fix Typography and Common props when CSS modules feature flag is enabled #5444

merged 6 commits into from
Dec 17, 2024

Conversation

JelloBagel
Copy link
Contributor

Related to slack (hubbers only)

The issue reported was the inability to scroll on the project's settings page when the CSS modules feature flag was enabled. This was due to a missing display: "contents" styling from a prop passed to BaseStyles. This PR is ensure the props passed to BaseStyles are correctly styled when ff is enabled.

Changelog

New

  • Created includesSystemProps util from Text to be reused in BaseStyles
  • Created getTypographyAndCommonProps to return an object of the typography and common props
  • Added test for system props in BaseStyles

Changed

Removed

Rollout strategy

  • Patch release
  • Minor release
  • Major release; if selected, include a written rollout or migration plan
  • None; if selected, include a brief description as to why

Testing & Reviewing

Merge checklist

@changeset-bot changeset-bot
Copy link

changeset-bot bot commented Dec 14, 2024 •
edited
Loading

🦋 Changeset detected

Latest commit: 5a70234

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
@primer/react Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@github-actions GitHub Actions
Copy link
Contributor

👋 Hi, this pull request contains changes to the source code that github/github depends on. If you are GitHub staff, we recommend testing these changes with github/github using the integration workflow. Thanks!

@github-actions github-actions bot added the integration-tests: recommended This change needs to be tested for breaking changes. See https://arc.net/l/quote/tdmpakpm label Dec 14, 2024
@github-actions github-actions bot temporarily deployed to storybook-preview-5444 December 14, 2024 00:47 Inactive
JelloBagel
JelloBagel commented Dec 14, 2024
View reviewed changes
packages/react/src/BaseStyles.tsx
data-color-mode={colorScheme?.includes('dark') ? 'dark' : 'light'}
data-light-theme={dayScheme}
data-dark-theme={nightScheme}
style={systemProps}
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 explicitly add the system props to style because Box does not support whiteSpace when it is passed as a prop. Open to changing this if there are alternatives to this

@github-actions github-actions bot temporarily deployed to storybook-preview-5444 December 14, 2024 01:06 Inactive
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 14, 2024 •
edited
Loading

size-limit report 📦

Path Size
packages/react/dist/browser.esm.js 103.25 KB (+0.04% 🔺)
packages/react/dist/browser.umd.js 103.63 KB (+0.01% 🔺)

@github-actions github-actions bot added integration-tests: failing Changes in this PR cause breaking changes in gh/gh and removed integration-tests: recommended This change needs to be tested for breaking changes. See https://arc.net/l/quote/tdmpakpm labels Dec 14, 2024
@primer-integration
Copy link

👋 Hi from github/github! Your integration PR is ready: https://github.com/github/github/pull/355428

@primer-integration
Copy link

🟢 golden-jobs completed with status success.

@github-actions github-actions bot added integration-tests: passing Changes in this PR do NOT cause breaking changes in gh/gh and removed integration-tests: failing Changes in this PR cause breaking changes in gh/gh labels Dec 17, 2024
@JelloBagel JelloBagel marked this pull request as ready for review December 17, 2024 02:12
@JelloBagel JelloBagel requested a review from a team as a code owner December 17, 2024 02:12
@langermank langermank requested a review from jonrohan December 17, 2024 15:35
@JelloBagel JelloBagel added this pull request to the merge queue Dec 17, 2024
Merged via the queue into main with commit 8e481ca Dec 17, 2024
42 checks passed
@JelloBagel JelloBagel deleted the jellobagel-basestyles-ffprops branch December 17, 2024 18:31
@primer primer bot mentioned this pull request Dec 17, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonrohan jonrohan jonrohan approved these changes

@langermank langermank Awaiting requested review from langermank langermank is a code owner automatically assigned from primer/engineer-reviewers

Assignees
No one assigned
Labels
integration-tests: passing Changes in this PR do NOT cause breaking changes in gh/gh
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@JelloBagel @jonrohan