BlockSwitcher: Refactor to use Button layout properly #67502
Merged
+19
−30
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
mirka
added
[Type] Bug
mirka
commented
Dec 2, 2024
| @@ -26,15 +26,6 @@ | |||
| } | |||
| } | |||
|
|
|||
| .block-editor-block-switcher__toggle-text { | |||
| margin-left: $grid-unit-10; | |||
There was a problem hiding this comment.
Unnecessary due to built-in Button styles.
Comment on lines
-33
to
-35
| .show-icon-labels & { | ||
| display: none; | ||
| } |
There was a problem hiding this comment.
Moved to JS logic (see showIconLabels).
| @@ -295,12 +291,13 @@ export const BlockSwitcher = ( { clientIds } ) => { | |||
| className="block-editor-block-switcher__no-switcher-icon" | |||
| title={ blockSwitcherLabel } | |||
There was a problem hiding this comment.
This existing title implementation can show redundant tooltips not only in showIconLabels mode, but also for patterns. I will address this separately.
| display: none; | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
It looks like there are more custom styles that can be removed, but out of scope for this PR.
mirka
added
the
[Focus] Accessibility (a11y)
|
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: -31 B (0%) Total Size: 1.83 MB
ℹ️ View Unchanged
|
tyxla
approved these changes
Dec 3, 2024
| margin-left: $grid-unit-10; | ||
|
|
||
| // Account for double label when show-text-buttons is set. | ||
| .show-icon-labels & { |
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?
Refactors
BlockSwitcherto use standard Button features when rendering the icon + text combination.Why?
BlockSwitcher rendered its text label in the
iconprop, which caused the Button component to not recognize it as a text-containing button (.has-text). This resulted in a regression when the underlying Button size variant changed in ToolbarButton (#67440).The toolbar button text is overflowing.
How?
Text needs to be either in the
textprop orchildrenfor Button to recognize it as a text-containing use case. The implementation is refactored to this standard pattern.Testing Instructions
Check the BlockSwitcher toolbar button in various use cases:
Screenshots or screencast