-
Notifications
You must be signed in to change notification settings - Fork 4.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Consolidate Safari Rerenders into one script #49215
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -187,23 +187,45 @@ private static function get_css_custom_property_declaration( $filter_data ) { | |
* Safari renders elements incorrectly on first paint when the SVG filter comes after the content that it is filtering, | ||
* so we force a repaint with a WebKit hack which solves the issue. | ||
* | ||
* @param string $selector The selector to apply the hack for. | ||
* @param string $selectors The CSS selectors to apply the hack for. | ||
*/ | ||
private static function safari_rerender_hack( $selector ) { | ||
private static function safari_rerender_hack( $selectors ) { | ||
/* | ||
* Simply accessing el.offsetHeight flushes layout and style | ||
* Accessing el.offsetHeight flushes layout and style | ||
* changes in WebKit without having to wait for setTimeout. | ||
*/ | ||
printf( | ||
'<script>( function() { var el = document.querySelector( %s ); var display = el.style.display; el.style.display = "none"; el.offsetHeight; el.style.display = display; } )();</script>', | ||
wp_json_encode( $selector ) | ||
$script_tag = sprintf( | ||
'<script> | ||
( | ||
function() { | ||
%s.forEach( selector => { | ||
document.querySelectorAll( selector ).forEach( function( el ) { | ||
if( ! el ) { | ||
return; | ||
} | ||
var display = el.style.display; | ||
el.style.display = "none"; | ||
el.offsetHeight; | ||
el.style.display = display; | ||
} ); | ||
} ); | ||
} | ||
)(); | ||
</script>', | ||
wp_json_encode( $selectors ) | ||
); | ||
|
||
// Strip whitespace. | ||
echo preg_replace( '/\s+/', '', $script_tag ); | ||
} | ||
|
||
/** | ||
* Outputs all necessary SVG for duotone filters, CSS for classic themes, and safari rerendering hack | ||
*/ | ||
public static function output_footer_assets() { | ||
|
||
$selectors = array(); | ||
|
||
foreach ( self::$output as $filter_data ) { | ||
|
||
// SVG will be output on the page later. | ||
|
@@ -216,10 +238,12 @@ public static function output_footer_assets() { | |
wp_add_inline_style( 'core-block-supports', 'body{' . self::get_css_custom_property_declaration( $filter_data ) . '}' ); | ||
} | ||
|
||
global $is_safari; | ||
if ( $is_safari ) { | ||
self::safari_rerender_hack( $filter_data['selector'] ); | ||
} | ||
$selectors[] = $filter_data['selector']; | ||
} | ||
|
||
global $is_safari; | ||
if ( $is_safari && ! empty( $selectors ) ) { | ||
self::safari_rerender_hack( $selectors ); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I considered using |
||
} | ||
} | ||
|
||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed "Simply" for inclusion and brevity sake.