Global Styles: Simplify code to fetch color and typography variation #62827
Conversation
This file contains 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
scruffian
added
the
[Type] Code Quality
|
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. |
|
Size Change: -71 B (0%) Total Size: 1.76 MB
ℹ️ View Unchanged
|
scruffian
commented
Jun 25, 2024
packages/edit-site/src/components/global-styles/variations/variations-typography.js
Outdated
Show resolved
Hide resolved
scruffian
force-pushed
the
refactor/type-and-color-variations
branch
from
2c4bff8
to
c297a4d
Compare
jeryj
reviewed
Jul 1, 2024
| @@ -31,7 +33,7 @@ export default function ColorVariations( { title, gap = 2 } ) { | |||
| key={ index } | |||
| variation={ variation } | |||
| isPill | |||
| property="color" | |||
| property={ propertyToFilter } | |||
There was a problem hiding this comment.
Will these changes work alongside the changes in this PR?
There was a problem hiding this comment.
Yes, if that one is merged we'll get a conflict here. I think there's more we'll be able to simplify once the two PRs are combined.
| @@ -38,7 +40,7 @@ export default function TypographyVariations( { title, gap = 2 } ) { | |||
| <Variation | |||
| key={ index } | |||
| variation={ variation } | |||
| property="typography" | |||
| property={ propertyToFilter } | |||
Comment on lines
114
to
121
| /* | ||
| * Filter out variations with no settings or styles. | ||
| */ | ||
| return variationsByProperty?.length | ||
| ? variationsByProperty.filter( ( variation ) => | ||
| isEmptyStyleVariation( variation ) | ||
| ) | ||
| : []; |
There was a problem hiding this comment.
Why not put this within the useMemo?
There was a problem hiding this comment.
Good idea, done in a68c2ce.
...ges/edit-site/src/hooks/use-theme-style-variations/use-theme-style-variations-by-property.js
Outdated
Show resolved
Hide resolved
Comment on lines
+62
to
+65
| Object.keys( settings ).length > 0 || | ||
| Object.keys( styles ).length > 0 |
There was a problem hiding this comment.
I'm not familiar with how theme.json settings get applied. From looking at the structure, I'm wondering if this should be an AND:
( Object.keys( settings ).length > 0 && Object.keys( styles ).length > 0 )
It looks like it could be a valid theme style while having a setting or style? Or does it need both?
There was a problem hiding this comment.
Ah the problem here is actually the name of the function. It is returning true if the variation is NOT empty!
scruffian
force-pushed
the
refactor/type-and-color-variations
branch
from
a68c2ce
to
f7bb918
Compare
jeryj
reviewed
Jul 2, 2024
...ges/edit-site/src/hooks/use-theme-style-variations/use-theme-style-variations-by-property.js
Outdated
Show resolved
Hide resolved
...ges/edit-site/src/hooks/use-theme-style-variations/use-theme-style-variations-by-property.js
Outdated
Show resolved
Hide resolved
|
I think For me the browser crashes when visiting Site Editor > Styles |
…iations-typography.js
…eme-style-variations-by-property.js Co-authored-by: Jerry Jones <jones.jeremydavid@gmail.com>
…eme-style-variations-by-property.js Co-authored-by: Jerry Jones <jones.jeremydavid@gmail.com>
…eme-style-variations-by-property.js Co-authored-by: Jerry Jones <jones.jeremydavid@gmail.com>
scruffian
force-pushed
the
refactor/type-and-color-variations
branch
from
3ac8dbc
to
002915c
Compare
|
Thanks @ramonjd. I have fixed this and also rebased it, so it should be working again... |
|
Flaky tests detected in 90d3084. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/9789769319
|
carstingaxion
pushed a commit
to carstingaxion/gutenberg
that referenced
this pull request
Jul 18, 2024
…ordPress#62827) * Simplify style variation code * Update packages/edit-site/src/components/global-styles/variations/variations-typography.js * Update packages/edit-site/src/hooks/use-theme-style-variations/use-theme-style-variations-by-property.js Co-authored-by: Jerry Jones <jones.jeremydavid@gmail.com> * Update the function to actually check if the variation is empty * move the filter inside the useMemo * Update packages/edit-site/src/hooks/use-theme-style-variations/use-theme-style-variations-by-property.js Co-authored-by: Jerry Jones <jones.jeremydavid@gmail.com> * Update packages/edit-site/src/hooks/use-theme-style-variations/use-theme-style-variations-by-property.js Co-authored-by: Jerry Jones <jones.jeremydavid@gmail.com> * updawte variable name * fix rebase issues * refactor dependecy to a const * use the new function in the sidebar --------- Co-authored-by: Jerry Jones <jones.jeremydavid@gmail.com> Co-authored-by: scruffian <scruffian@git.wordpress.org> Co-authored-by: jeryj <jeryj@git.wordpress.org> Co-authored-by: ramonjd <ramonopoly@git.wordpress.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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?
Small refactor to simplify this code and share more code between the two variations.
Why?
Less code means less maintenance and fewer bugs.
How?
Remove
useColorVariationsanduseTypographyVariationsand calluseCurrentMergeThemeStyleVariationsWithUserConfigdirectly instead.Testing Instructions
Screenshots or screencast