Site Editor: Use the same editor component for all routes #69093
+27
−34
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
t-hamano
added
[Type] Bug
6 tasks
6 tasks
|
Size Change: -21 B (0%) Total Size: 1.84 MB
ℹ️ View Unchanged
|
|
Flaky tests detected in e04dde8. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/13197444965
|
t-hamano
commented
Feb 7, 2025
| @@ -23,6 +23,7 @@ import { privateApis as routerPrivateApis } from '@wordpress/router'; | |||
| import { decodeEntities } from '@wordpress/html-entities'; | |||
| import { Icon, arrowUpLeft } from '@wordpress/icons'; | |||
| import { store as blockEditorStore } from '@wordpress/block-editor'; | |||
| import { addQueryArgs } from '@wordpress/url'; | |||
There was a problem hiding this comment.
Fix the incorrect position of the import statement.
t-hamano
requested review from
youknowriad,
jsnajdr,
tellthemachines and
stokesman
|
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. |
6 tasks
stokesman
approved these changes
Feb 9, 2025
There was a problem hiding this comment.
I’ve tested and this works as expected. I think it’d be fine to land as is. I'm unsure that the branching for the home view is best put inside EditSiteEditor. It seems like keeping it in the MaybeEditor component and using that in all the routes might be better. Though in that case I think a better name could be found (something like MainFrame—I was looking through #53322 in regards to this). However, I don’t see this as a pressing concern for now.
I wanted to mention in regards to #69016, this makes the problem go away and it’s fine with me if we keep it linked. I’ll still propose #69103 as a code quality improvement.
|
@stokesman Thanks for the review! I found out that this PR not only solves #69016, but also #69108. Should we merge this PR and then move on to #69103? |
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?
This PR uses the same editor component for all routes in the site editor, i.e. merge the
MaybeEditorcomponent logic into theEditSiteEditorcomponent.As a result, the issue reported in #69016 will be resolved.
Why?
Note: I'm not confident about the following explanation, so if I've misunderstood anything, please let me know.
In #66851, StyleBook for the classic theme was exposed. The
MaybeEditorcomponent was added to display the site preview instead of the regular editor in the home route.That is, depending on the route, the editor component will switch between
MaybeEditororEditSiteEditor. This may break references to the previous entity, which can cause issues such as the Back button not appearing in the document title, as reported in #69016.How?
MaybeEditorcomponent.EditSiteEditorcomponent, render the site preview via thisSitePreviewcomponent only if the conditions are met (it is the home root and not a block theme).Testing Instructions
Confirm that the editor, site preview, stylebook, etc. are displayed correctly in the following four scenarios:
Testing Instructions for #69016
6057fbd10dc65c7ee77797db5fca6d94.mp4