Site and Widgets Editor: Fix complementary area not opening #28732
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
Copons
added
[Type] Regression
Copons
requested review from
mattwiebe,
gziolo,
vindl,
david-szabo97,
jeyip,
noahtallen,
rafaelgallani and
Addison-Stavlo
gziolo
approved these changes
Feb 4, 2021
There was a problem hiding this comment.
It seems like WordPress has this policy to avoid refactorings for a good reason 😅
https://make.wordpress.org/core/2011/03/23/code-refactoring/
Thank you for catching it! In this case, though, we have good reasons to refactor usage since it will bring benefits soon.
|
Size Change: +6 B (0%) Total Size: 1.37 MB
ℹ️ View Unchanged
|
vindl
approved these changes
Feb 4, 2021
| @@ -78,7 +78,7 @@ function Editor() { | |||
| isFullscreenActive: isFeatureActive( 'fullscreenMode' ), | |||
| sidebarIsOpened: !! select( | |||
| interfaceStore | |||
| ).getActiveComplementaryArea( editSiteStore ), | |||
| ).getActiveComplementaryArea( 'core/edit-site' ), | |||
There was a problem hiding this comment.
Or how about hacking getActiveComplementaryArea to check for objects with name property? 😛 So we can avoid these magical strings.
There was a problem hiding this comment.
There was a problem hiding this comment.
This is how it's done somewhere else in the codebase. I'd still think about making getActiveComplementaryArea work with store objects.
There was a problem hiding this comment.
You can check if it is an object and have name inside getActiveComplementaryArea. The only question is if that should be based on the store name really. It's hard to tell.
There was a problem hiding this comment.
IMHO there are no expectations for it to be a store name, so we shouldn't accept a store object as scope.
A string is totally fine as it is, and passing store.name is perfectly reasonable to me.
One thing I'd point out, though, is that at this point we are (almost everywhere) using the store.name for the selector, but we are still creating the <ComplementaryArea> components with an hardcoded string as scope.
E.g.
It's not a big deal, but we might want to update them all with store.name instead, to keep them consistent, or risk breaking them in the off chance a store changes name.
Copons
requested review from
adamziel,
draganescu,
kevin940726,
noisysocks,
talldan and
tellthemachines
as code owners
|
Apologies for the push after the approvals, but I discovered that the same issue was happening in the Widgets Editor as well. |
Copons
changed the title
Copons
added
[Package] Edit Widgets
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.
Description
In #28695 we replaced the hardcoded
core/edit-sitestrings to indicate a Redux store with the actual store, in an ongoing refactor.Among the various correct replacements, a string that was actually supposed to be
core/edit-sitewas replaced as well.This string indicated the scope of
getActiveComplementaryArea, acore/interfaceselector used to check the status of the right-side sidebar (block, document, global styles, plugins, etc.).Passing the
core/edit-sitestore instead of thecore/edit-sitestring prevented the function to target the correct sidebars.How has this been tested?
Tested in the Site Editor and Widgets Editor.
(Note that typically FSE themes don't register sidebars, and therefore don't have the Widgets Editor, and vice versa).
Just make sure that the right-side sidebar can be toggled, by trying the block inspector, document settings, global styles, plugins, you name it.
Types of changes
Bug fix (non-breaking change which fixes an issue)
Checklist: