Text: Apply both heading and paragraph CSS defenses unconditionally#77461
Open
Text: Apply both heading and paragraph CSS defenses unconditionally#77461
Conversation
|
Size Change: -30 B (0%) Total Size: 7.75 MB 📦 View Changed
ℹ️ View Unchanged
|
|
Flaky tests detected in d177742. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/24576078180
|
|
The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message. To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What?
Apply both the heading and paragraph entries from the unlayered CSS defense module to every
Textrender, regardless of thevariantprop.Follow up to #76783. Surfaced by a comment on #77372.
Why?
Textdecouples typographic variant from rendered element via therenderprop, but the previous defense logic was gated on the variant name (heading-*orbody-*). That meant common.css styles leaked through whenever the variant and the rendered element didn't match, e.g.<Text variant="body-sm" render={ <h2 /> } />orBadge(which is abody-smTextrendered as a heading by consumers).How?
The heading and paragraph defenses in
global-css-defense.module.cssare already gated by compound selectors (p.pand:is(h1, h2, h3, h4, h5, h6).heading), so applying both classes unconditionally is a no-op when the element doesn't match. Drop the variant-based gating and let the selectors do the work.Testing Instructions
In Storybook, with the global CSS injector in the toolbar set to "WordPress", see the "With render prop" story for the
Textcomponent. Tweak the story file to render differentvariantandrendercombinations and see that there are no regressions.