Remove duplication of editor styles #28837
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
|
Size Change: -103 B (0%) Total Size: 1.37 MB
ℹ️ View Unchanged
|
|
Might need #27768 for this. |
|
👋 Gave this a try with and without the latest changes in Referring to my comment at #28731 (comment) here's some testing instructions for this PR:
|
ellatrix
force-pushed
the
fix/iframe-editor-styles
branch
from
e0eb851
to
04a5c50
Compare
|
@nosolosw Added the dependencies through |
|
😔 It still doesn't work for me: it fails when the |
ellatrix
requested review from
adamziel,
draganescu,
kevin940726,
noisysocks,
talldan and
tellthemachines
as code owners
|
@nosolosw Does it work now? It does in my tests. |
|
Updated: it works! Also: it turns out I was wrong here #28731 (comment) We don't need the styles for the host document in site editor, only for the iframe. Apparently, the UI components no longer use the CSS Custom Properties but take the raw values from the store. |
oandregal
reviewed
Feb 9, 2021
| { /* Use an empty style element to have a document reference, | ||
| but this could be any element. */ } | ||
| <style ref={ useDarkThemeBodyClassName( styles ) } /> | ||
| { transformStyles( styles, EDITOR_STYLES_CLASS_NAME ).map( |
There was a problem hiding this comment.
The only behavioral change I've noticed here is that we no longer remove falsy values from the array. I'm unsure what use case this aimed to cover, given the styles are provided by add_editor_styles. Flagging in case you know more about this.
kevin940726
reviewed
Feb 9, 2021
| <> | ||
| { /* Use an empty style element to have a document reference, | ||
| but this could be any element. */ } | ||
| <style ref={ useDarkThemeBodyClassName( styles ) } /> |
There was a problem hiding this comment.
I think this is wrong? Should be [ styles ]. Or am I missing something?
In practice, passing dependencies variable around is rarely a good practice, as it's very easy to miss these kinds of bugs. That's also why #24914 disable this usage. Writing them all explicitly is not a bad idea IMO.
useDarkThemeBodyClassName could probably just be written as:
function useDarkThemeBodyClassName(styles) {
return useCallback(
// ...
, [styles]);
}There was a problem hiding this comment.
styles is an array so it would only update if one of the values changes. Not sure when the array reference itself changes. I'll change it back to what it was.
|
@ellatrix I have a larger question that's unrelated to this PR: wasn't the purpose of the iframe to remove the need for |
|
@nosolosw Yes, it is, but I just kept everything the same so for now to make things easier and consistent between post editor and site editor. We can probably remove it. |
ellatrix
force-pushed
the
fix/iframe-editor-styles
branch
from
43d1d6e
to
9e84b5c
Compare
ellatrix
force-pushed
the
fix/iframe-editor-styles
branch
from
9e84b5c
to
5c981c8
Compare
This was referenced Feb 10, 2021
oandregal
pushed a commit
that referenced
this pull request
Feb 11, 2021
oandregal
pushed a commit
that referenced
this pull request
Feb 11, 2021
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
Rewrites #28731 to avoid duplication of code.
How has this been tested?
Screenshots
Types of changes
Checklist: