Block Styles: check for existence of scroll container #37010
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
ramonjd
added
[Type] Bug
|
Marking as a bugfix to Backport into 5.9 if that's still viable. It's not a pretty one. |
|
Size Change: +6 B (0%) Total Size: 1.1 MB
ℹ️ View Unchanged
|
alshakero
reviewed
Nov 30, 2021
Comment on lines
63
to
65
| const scrollTop = scrollContainer?.scrollTop || 0; | ||
| // Add the hardcoded equivalent of the container's right position. | ||
| setContainerScrollTop( scrollTop + 16 ); |
There was a problem hiding this comment.
Ignorable comment: in the contexts where scrollContainer is null, do we still need the 16?
Suggested change
| const scrollTop = scrollContainer?.scrollTop || 0; | |
| // Add the hardcoded equivalent of the container's right position. | |
| setContainerScrollTop( scrollTop + 16 ); | |
| if( scrollContainer ) { | |
| // Add the hardcoded equivalent of the container's right position. | |
| setContainerScrollTop( scrollContainer.scrollTop + 16 ); | |
| } |
There was a problem hiding this comment.
Thanks for 👀 @alshakero !
: in the contexts where scrollContainer is null, do we still need the 16
Not really, but I don't see any problem with leaving it at 16. Normally, 16 (the same as the right value in the CSS) is the minimum top position value we need to display the block preview.
If the scrollContainer isn't there, we can assume the block preview won't be rendered at all since the Slot component lives within it.
That's the theory 😆
7 tasks
stacimc
approved these changes
Nov 30, 2021
7 tasks
ramonjd
force-pushed
the
fix/block-styles-scrollcontainer-undefined
branch
from
4eb6e15
to
1b942f4
Compare
ramonjd
removed
the
Backport to WP 6.7 Beta/RC
Just realized it's not even in 11.9. Removing label. |
ockham
pushed a commit
that referenced
this pull request
Dec 3, 2021
* Let's check if the scrollContainer can be found before trying to use its property `scrollTop`. * Moving default top position to a const and moving the comment.
|
Hey folks, a few guidelines about patch releases:
Thanks :) |
ramonjd
added
the
Backport to WP 6.7 Beta/RC
Okay, thanks for the info. I'll re-add the beta label, and also add it to the 12.1 milestone. |
|
Thanks ❤️ |
25 tasks
noisysocks
removed
the
Backport to WP 6.7 Beta/RC
Thanks for confirming @noisysocks 🙇 |
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.
Resolves #36999
Description
Where a block has block styles, the Block Styles component throws an error when adding it as a widget in the Customizer.
To avoid this, let's check if the scrollContainer can be found before trying to use its property
scrollTop.Testing
First checkout the latest version of trunk.
I'm using TwentyTwenty theme to test.
/wp-admin/customize.php?return=%2Fwp-admin%2Fthemes.phpFooter #1Repeat the same as above using this branch.
The error should not be thrown.
Props to @alshakero for documenting it.
Types of changes
Bug fix
Checklist:
*.native.jsfiles for terms that need renaming or removal).