Style Revisions: Remove style revisions dropdown menu #56454
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
apeatling
added
[Type] Enhancement
|
Size Change: +1.56 kB (0%) Total Size: 1.7 MB
ℹ️ View Unchanged
|
…o that toggle status works correctly when viewing any other sections of global styles.
apeatling
requested review from
ramonjd,
andrewserong,
tellthemachines and
richtabor
apeatling
changed the title
apeatling
changed the title
|
Looks like I need to update the e2e tests, will sort that out. |
|
Nice one!
With whatever label replaced this one looks like 🤔 |
ramonjd
reviewed
Nov 24, 2023
packages/edit-site/src/components/global-styles/screen-revisions/index.js
Outdated
Show resolved
Hide resolved
packages/edit-site/src/components/global-styles/screen-revisions/index.js
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Nice PR! I ran into an issue with the style book closing unexpectedly when navigating up between blocks within global styles (left a comment). If that's a little separate from the style revisions dropdown changes, we could always open a separate PR to look at changes to that behaviour?
I much prefer the revisions button as a toggle, rather than the dropdown, it feels nice to use to me 👍
In terms of folks still being able to find where to reset styles, now that it's a toggle, I wonder if we need a more prominent button within the revisions panel to reset styles? Since folks can click and choose between individual revisions from this panel, along with using an Apply button to make changes, I think it might make sense for resetting styles to be a bit more prominent in this particular UI, rather than having to go to the ellipsis menu, where it's harder to find.
Not necessarily a blocker, though, we could always look at where a reset button might fit in this UI in follow-ups, too 🙂
I was following what @richtabor had mentioned in the issue for this. I do think it would be good to have a clearer option on the action screen. We can follow up with that in a new PR. 👍 |
|
I've made all the fixes here, thanks for the reviews! Ready for another look. |
andrewserong
approved these changes
Nov 26, 2023
There was a problem hiding this comment.
Nice follow-ups, this is testing well for me now @apeatling!
✅ Navigating up and down the hierarchy with the Style Book open works as before
✅ Closing and toggling the revisions panel is working as expected
✅ Resetting styles works as expected
Just left a couple of further nits, but nothing major. Just wondering if it'd be good to name the onClick prop in ScreenHeader onBack instead so that it's clear it's a click handler for the back button, and if we should change the order of when isRevisionsOpened. But other than that, LGTM! ✨
ramonjd
reviewed
Nov 27, 2023
| _revisionsCount++; | ||
| // one for any dirty changes (unsaved). | ||
| if ( isDirty ) { | ||
| _revisionsCount++; |
There was a problem hiding this comment.
Works well for me.
Now I've looked at this again with fresh eyes, the revisionsCount logic might have a better home in the useGlobalStylesRevisions hook since there are a few selectors already in there.
Probably for a follow up - not blocking this PR though.
derekblank
pushed a commit
that referenced
this pull request
Dec 7, 2023
* Remove dropdown menu * Make sure setEditorCanvasContainerView() calls are made when needed so that toggle status works correctly when viewing any other sections of global styles. * Pre select the revisions count to prevent flashes of incorrect revision counts. Hat tip @ramonjd. * Remove CSS no longer needed. * Modify e2e test to reflect removal of menu item. * Fix issue with style book closing when browsing blocks. * Replace onClick with onBack to reduce confusion with screen header click action. * Change ordering of `isRevisionsOpened` const.
ramonjd
added a commit
that referenced
this pull request
Dec 18, 2023
…ns list so we don't need to click it.
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 #55779
This PR does three things:
As part of the changes I've also cleaned up the setting and unsetting of
setEditorCanvasContainerViewso that it's consistent throughout all of the screens in global styles. Previously values were not getting set correctly with the header back chevron button, or when looking at the additional css view.Why?
The dropdown is unusual and not needed. By switching to the toggle we can match other buttons in the editor, and the way the style book button next to it works.
How?
Remove
DropdownMenuusage and replace withButton. Also adjustsetEditorCanvasContainerViewusage as mentioned above.Testing Instructions
Screenshots or screencast
Before
Screen.Recording.2023-11-23.at.12.13.03.PM.mov
After
Screen.Recording.2023-11-23.at.12.11.09.PM.mov