Site Editor: Reset 'Show template' toggle when leaving edit mode #54679
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
ramonjd
added
[Type] Bug
ramonjd
requested review from
noisysocks,
jameskoster,
apeatling and
andrewserong
ramonjd
commented
Sep 21, 2023
| }; | ||
| }, | ||
| [] | ||
| ); | ||
|
|
||
| const [ blocks ] = useEntityBlockEditor( 'postType', postType ); |
There was a problem hiding this comment.
Because it's an edge case, I'm happy to remove this if it's not performant, especially if the blockList is large.
There was a problem hiding this comment.
From my perspective, I think this is probably okay, as we're only rendering it when we're in hasPageContentFocus so the performance impact is limited to the page editing experience. It also wouldn't be hard to revert if it does wind up causing any performance issues.
|
Size Change: +118 B (0%) Total Size: 1.62 MB
ℹ️ View Unchanged
|
|
Flaky tests detected in 9f29b0849d9cfa930f6763f998c05ed9481135da. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/6255920551
|
- Resets the page content focus type if the canvas switches from edit mode - Refactors use-page-content-blocks.js so that we can check in the editor if there are any page content blocks in the editor. If not, we do not render the show/hide template.
ramonjd
force-pushed
the
update/show-template-toggle
branch
from
9f29b08 to
2e52836
Compare
Comment on lines
25
to
27
| shouldDisplayPageContentTemplates: | ||
| getCanvasMode() !== 'edit' && | ||
| getPageContentFocusType() !== 'disableTemplate', |
There was a problem hiding this comment.
Is this being used anywhere? It doesn't appear to be expanded in the above const { ... } = useSelect line, so I think these lines can be removed?
There was a problem hiding this comment.
I left that in there to make sure you were paying attention. 
Seriously, thanks for noticing 😄
andrewserong
approved these changes
Sep 21, 2023
There was a problem hiding this comment.
This is looking great to me @ramonjd!
✅ Resets correctly when navigating out of the page editing experience
✅ Going back into a page defaults to displaying the template again
✅ The template preview button is not available if the template has no content blocks
LGTM! ✨
| }; | ||
| }, | ||
| [] | ||
| ); | ||
|
|
||
| const [ blocks ] = useEntityBlockEditor( 'postType', postType ); |
There was a problem hiding this comment.
From my perspective, I think this is probably okay, as we're only rendering it when we're in hasPageContentFocus so the performance impact is limited to the page editing experience. It also wouldn't be hard to revert if it does wind up causing any performance issues.
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?
Follow up to:
This commit:
use-page-content-blocks.jsto accept an object as an argument so that we can check in the editor if there are any page content blocks in the editor. If not, we do not render the show/hide template.Note: 1 is more glaring than 2. Happy to roll it back so we're only fixing the reset aspect.
Why?
Testing Instructions
Run the tests!
2023-09-21.11.00.08.mp4