De-duplicate block toolbar icons for patterns #65054
Merged
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
talldan
added
[Type] Bug
|
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: +37 B (0%) Total Size: 1.78 MB
ℹ️ View Unchanged
|
Mamaduka
approved these changes
Sep 4, 2024
There was a problem hiding this comment.
Thank you, @talldan!
This fixes the duplicate block icon issue.
To solve this I've added to the already complicated check on whether to render the BlockSwitcher.
I think there's a better fix somewhere, probably refactoring how the custom block icon for patterns works. This fix will be quicker though, so I think would be worth merging first.
Agreed. Let's create a separate issue, so this doesn't get lost. Maintaining those conditions will only get complicated.
|
Flaky tests detected in c864b26. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/10702657258
|
|
It seems to work fine 🙂 I'm wondering if the "Pattern overrides toolbar controls" are really needed or if they can be removed now 🤔 It seems it only adds an indicator, right? |
3 tasks
|
I've made an issue for it - Pattern Overrides: Refactor block toolbar indicator There's the indicator, but it also has a purple color and a message in the dropdown. |
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?
Fixes the issue mentioned here - #64694 (comment)
How?
There seems to be a filter for pattern blocks that adds a custom block icon in the toolbar, and it relied on there being no existing block icon for blocks in contentOnly mode. So when #64694 introduced a block icon, two icons were shown.
To solve this I've added to the already complicated check on whether to render the
BlockSwitcher.I think there's a better fix somewhere, probably refactoring how the custom block icon for patterns works. This fix will be quicker though, so I think would be worth merging first.
Testing Instructions
Screenshots or screencast
Synced pattern
Before
After
ContentOnly group (still looks the same)