Zoom Out: Remove zoom-out toolbar (#66039) #66200
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
|
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: -643 B (-0.04%) Total Size: 1.77 MB
ℹ️ View Unchanged
|
|
In order for the block toolbar to work properly, I had to include in the backport a small chunk of this PR #65485 as otherwise the toolbar doesn't appear in blocks with non default mode (which is the case for zoom-out sections) |
17 tasks
draganescu
reviewed
Oct 17, 2024
There was a problem hiding this comment.
What happened to this formatting :/
|
@youknowriad this PR should also revert #66119 now? Or should we revert merging that instead? @getdave ? |
ajlende
reviewed
Oct 17, 2024
Comment on lines
-182
to
+190
| { ! isMultiToolbar && | ||
| isLargeViewport && | ||
| isDefaultEditingMode && <BlockParentSelector /> } | ||
| { showParentSelector && ! isMultiToolbar && isLargeViewport && ( | ||
| <BlockParentSelector /> | ||
| ) } | ||
| { ( shouldShowVisualToolbar || isMultiToolbar ) && | ||
| ( isDefaultEditingMode || | ||
| ( isContentOnlyEditingMode && ! hasParentPattern ) || | ||
| isSynced ) && ( | ||
| ! hasParentPattern && ( |
There was a problem hiding this comment.
Should the isContentOnlyEditingMode checks be removed here? That change seems to be part of #65204 that wasn't being backported.
There was a problem hiding this comment.
In order for the block toolbar to work properly, I had to include in the backport a small chunk of this PR #65485 as otherwise the toolbar doesn't appear in blocks with non default mode (which is the case for zoom-out sections)
Ah, this must be what you were talking about here. What's the best way to test this?
There was a problem hiding this comment.
I think we need to test the toolbar in zoom-out (it should appear) and we should check whether the toolbar in "content-only" blocks is unchanged/makes sense.
|
@draganescu If I'm not wrong, this PR already includes that revert kind of |
|
Seems I opened this PR before you do the cherry-pick so I'll have to rework this branch a bit. |
Co-authored-by: youknowriad <youknowriad@git.wordpress.org> Co-authored-by: ellatrix <ellatrix@git.wordpress.org> Co-authored-by: getdave <get_dave@git.wordpress.org> Co-authored-by: draganescu <andraganescu@git.wordpress.org> Co-authored-by: annezazu <annezazu@git.wordpress.org> Co-authored-by: jasmussen <joen@git.wordpress.org> Co-authored-by: stokesman <presstoke@git.wordpress.org> Co-authored-by: richtabor <richtabor@git.wordpress.org> Co-authored-by: ntsekouras <ntsekouras@git.wordpress.org> Co-authored-by: jameskoster <jameskoster@git.wordpress.org>
youknowriad
force-pushed
the
cherry-pick/removal-vertical-toolbar
branch
from
5448b74 to
811818b
Compare
|
Rebased this again. I'd appreciate another round of testing. |
getdave
previously requested changes
Oct 18, 2024
getdave
reviewed
Oct 18, 2024
There was a problem hiding this comment.
Thanks for backporting this to 6.7. Some things I noticed:
Selecting multiple blocks enables unwanted Block Toolbar controls
We should probably disable these controls but could be in a followup.
Screen.Capture.on.2024-10-18.at.11-29-45.mp4
Inserter + and dropdown overlap
This is a bug.
getdave
dismissed
their stale review
Looks like this is nearly ready to backport.
|
Thanks for taking care of backporting this Riad 🙇 Looks like there might be a couple of bugs here. I'd like to include this in RC1 and I will cutting packages on Monday morning UTC. |
|
Should we track these separately as I believe they need to be fixed in trunk too. |
|
Definitely seeing some additional toolbar controls for various blocks. There is an issue tracking it for the cover block already - #66206, so that could be a good place to record the various issues. Other than the issues already spotted, the post content block seems to have a toolbar when selected, while in Columns also has the vertical alignment toolbar item: If we're happy to merge with those known issues tracked separately, then it looks good to me. |
I understand what you're saying. However, this PR is quite late in the release cycle for 6.7. These bugs do not currently manifest on the I'll be cutting the packages for RC 1 on Monday morning UTC and it would be good if RC 1 was as stable as possible. Therefore I think we should push to fix the known issues before we merge this one. |
|
Here's a PR that solves the toolbar issues. #66243 I'm not sure if the inserter issues are specific to this PR though, I think they might exist before (but I have to check). That said, I think we should merge this PR first because the others will trigger the auto cherry-picking which might or might not fail. |
|
Also, I don't really see these toolbar issues as bugs, it's just different behavior for toolbar. |
Fixed. |
|
I can do that. |
Co-authored-by: youknowriad <youknowriad@git.wordpress.org> Co-authored-by: getdave <get_dave@git.wordpress.org> Co-authored-by: ajlende <ajlende@git.wordpress.org> Co-authored-by: draganescu <andraganescu@git.wordpress.org> Co-authored-by: ntsekouras <ntsekouras@git.wordpress.org> Co-authored-by: talldan <talldanwp@git.wordpress.org> Co-authored-by: richtabor <richtabor@git.wordpress.org>
|
Fix included here. |
ajlende
approved these changes
Oct 18, 2024
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.
This is the manual backport of this PR #66039 and #66243 into the wp/6.7 branch.
Most conflicts were due to the existence of a the special "select mode" toolbar in 6.7.