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

Backport #65772 to 6.7 #65905

Merged
merged 2 commits into from
Oct 8, 2024
Merged

Backport #65772 to 6.7 #65905

merged 2 commits into from
Oct 8, 2024

Conversation

ciampo
Copy link
Contributor

@ciampo ciampo commented Oct 7, 2024 •
edited
Loading

Manually fix conflicts (in the CHANGELOG) and backport #65772 to the 6.7 release as agreed with @aaronrobertshaw in #65772 (comment)

@ciampo ciampo requested a review from ajitbohra as a code owner October 7, 2024 08:47
@ciampo ciampo requested a review from aaronrobertshaw October 7, 2024 08:47
@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 7, 2024 •
edited
Loading

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 props-bot label.

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Co-authored-by: ramonjd <ramonopoly@git.wordpress.org>
Co-authored-by: ciampo <mciampini@git.wordpress.org>
Co-authored-by: andrewserong <andrewserong@git.wordpress.org>
Co-authored-by: aaronrobertshaw <aaronrobertshaw@git.wordpress.org>

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

@ciampo ciampo requested review from ramonjd and andrewserong October 7, 2024 08:47
@ciampo ciampo self-assigned this Oct 7, 2024
@ciampo ciampo added [Type] Bug An existing feature does not function as intended Global Styles Anything related to the broader Global Styles efforts, including Styles Engine and theme.json labels Oct 7, 2024
@ciampo ciampo mentioned this pull request Oct 7, 2024
Merged
andrewserong
andrewserong approved these changes Oct 8, 2024
View reviewed changes
Copy link
Contributor

@andrewserong andrewserong left a comment

Choose a reason for hiding this comment

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

This backport is testing nicely for me!

image

✅ I can create a bunch of colors all with the same name
✅ I can set these colors within the editor
✅ The colors are applied correctly on the site frontend, and the numbering is deduped correctly

image

LGTM! 🚀

aaronrobertshaw
aaronrobertshaw approved these changes Oct 8, 2024
View reviewed changes
Copy link
Contributor

@aaronrobertshaw aaronrobertshaw left a comment

Choose a reason for hiding this comment

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

Thanks for getting this backport sorted while I was AFK @ciampo 🚀

I've given this another test and it is working as advertised for me also. The only minor difference I spotted compared to the original PR was in the components changelog and I've left an inline comment there.

All in all, LGTM 🚢

packages/components/CHANGELOG.md Outdated Show resolved Hide resolved
ramonjd and others added 2 commits October 8, 2024 09:38
@ramonjd @aaronrobertshaw @ciampo
PaletteEdit: dedupe palette element slugs (#65772)
c30d6f0 
* First pass at deduping palette element slugs.

* Addressing TypeScript errors where PaletteEditListViewProps is using a generic type parameter. The linter was complaining that I wasn't doing the same, even though I was using the same inherited types. Whatever. It could probably be optimized, but it's unrelated to the scope of this PR

* Add changelog

* Make use of PaletteElement type consistent

* Address feedback on deduplicate util

* Use count rather than index for new slugs

---------

Co-authored-by: ramonjd <ramonopoly@git.wordpress.org>
Co-authored-by: aaronrobertshaw <aaronrobertshaw@git.wordpress.org>
Co-authored-by: ciampo <mciampini@git.wordpress.org>
@ciampo
Update CHANGELOG section
0791d4f
@ciampo ciampo merged commit 43468fe into wp/6.7 Oct 8, 2024
40 of 41 checks passed
@ciampo ciampo deleted the backport/65772 branch October 8, 2024 07:40
@aaronrobertshaw aaronrobertshaw mentioned this pull request Oct 9, 2024
Merged
@ramonjd
Copy link
Member

ramonjd commented Oct 9, 2024

Thank you for taking care of all this, everyone!

@kevin940726 kevin940726 mentioned this pull request Oct 14, 2024
Closed
@draganescu draganescu mentioned this pull request Oct 15, 2024
Merged
@sirreal sirreal mentioned this pull request Oct 25, 2024
Closed
@t-hamano t-hamano mentioned this pull request Nov 25, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aaronrobertshaw aaronrobertshaw aaronrobertshaw approved these changes

@andrewserong andrewserong andrewserong approved these changes

@ajitbohra ajitbohra Awaiting requested review from ajitbohra ajitbohra is a code owner

@ramonjd ramonjd Awaiting requested review from ramonjd

Assignees

@ciampo ciampo

Labels
Global Styles Anything related to the broader Global Styles efforts, including Styles Engine and theme.json [Type] Bug An existing feature does not function as intended
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ciampo @ramonjd @andrewserong @aaronrobertshaw