Skip to content
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.

Sign up for GitHub

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

Use CSS range syntax in media queries #1833

Merged
merged 15 commits into from
Feb 4, 2025
Merged

Use CSS range syntax in media queries #1833

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
604c5e5
Updates media query generator function to use range
SohamPatel46 Jan 28, 2025
069d2f3
Merge branch 'trunk' into feat/use-media-queries-in-range
SohamPatel46 Jan 28, 2025
cec835b
Try updating unit test expected conditions
SohamPatel46 Jan 30, 2025
355e1b3
Update missing conditions for css query
SohamPatel46 Jan 31, 2025
9c335f2
Update source conditions variable type
SohamPatel46 Jan 31, 2025
02a9cd4
Update PHP unit tests snapshots
SohamPatel46 Jan 31, 2025
5aecbfa
Merge branch 'trunk' into feat/use-media-queries-in-range
SohamPatel46 Jan 31, 2025
a69bc0e
Update media query to latest syntax
SohamPatel46 Feb 3, 2025
2af2547
Merge branch 'trunk' of https://github.com/WordPress/performance into…
westonruter Feb 4, 2025
a9bf3d1
Remove extra spaces from media feature
westonruter Feb 4, 2025
d76c16d
Update expected data for test_od_generate_media_query
westonruter Feb 4, 2025
bec17cf
Update embed-optimizer test snapshots
westonruter Feb 4, 2025
46d4ba2
Update image-prioritizer test snapshots
westonruter Feb 4, 2025
ea7b2bc
Fix edge case for generating embed min-height when there are no break…
westonruter Feb 4, 2025
4c01373
Fix logic inversion in isViewportNeeded
westonruter Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions plugins/embed-optimizer/class-embed-optimizer-tag-visitor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,21 @@ private function reduce_layout_shifts( OD_Tag_Visitor_Context $context ): void {

$style_rules = array();
foreach ( $minimums as $minimum ) {
$style_rules[] = sprintf(
'@media %s { #%s { min-height: %dpx; } }',
od_generate_media_query( $minimum['group']->get_minimum_viewport_width(), $minimum['group']->get_maximum_viewport_width() ),
$style_rule = sprintf(
'#%s { min-height: %dpx; }',
$element_id,
$minimum['height']
);

$media_feature = od_generate_media_query( $minimum['group']->get_minimum_viewport_width(), $minimum['group']->get_maximum_viewport_width() );
if ( null !== $media_feature ) {
$style_rule = sprintf(
'@media %s { %s }',
$media_feature,
$style_rule
);
}
$style_rules[] = $style_rule;
Comment on lines -188 to +202
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change fixes a bug I noticed which can happen when a site is configured to have zero breakpoints (which is very unlikely). In this case, the return value of od_generate_media_query() is null since the minimum is 0 and the maximum is null.

}

$processor->append_head_html( sprintf( "<style>\n%s\n</style>\n", join( "\n", $style_rules ) ) );
Expand Down
72 changes: 36 additions & 36 deletions plugins/embed-optimizer/tests/test-cases/all-embeds-inside-viewport/expected.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions plugins/embed-optimizer/tests/test-cases/nested-figure-embed/expected.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions ...sts/test-cases/single-spotify-embed-outside-viewport-with-subsequent-script/expected.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions ...bed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport-one-group/buffer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>...</title>
</head>
<body>
<div class="wp-site-blocks">
<figure class="wp-block-embed is-type-rich is-provider-twitter wp-block-embed-twitter">
<div class="wp-block-embed__wrapper">
<blockquote class="twitter-tweet" data-width="550" data-dnt="true"><p lang="en" dir="ltr">We want your feedback for the Privacy Sandbox 📨<br><br>Learn why your feedback is critical through real examples and learn how to provide it ↓ <a href="https://t.co/anGk6gWkbc">https://t.co/anGk6gWkbc</a></p>&mdash; Chrome for Developers (@ChromiumDev) <a href="https://twitter.com/ChromiumDev/status/1636796541368139777?ref_src=twsrc%5Etfw">March 17, 2023</a></blockquote>
<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
</div>
</figure>
</div>
</body>
</html>
21 changes: 21 additions & 0 deletions ...d-optimizer/tests/test-cases/single-twitter-embed-inside-viewport-one-group/expected.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions ...mbed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport-one-group/set-up.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php
return static function ( Test_Embed_Optimizer_Optimization_Detective $test_case ): void {
add_filter( 'od_breakpoint_max_widths', '__return_empty_array' );

$test_case->populate_url_metrics(
array(
array(
'xpath' => '/HTML/BODY/DIV[@class=\'wp-site-blocks\']/*[1][self::FIGURE]/*[1][self::DIV]',
'isLCP' => true,
'intersectionRatio' => 1,
'resizedBoundingClientRect' => array_merge( $test_case->get_sample_dom_rect(), array( 'height' => 500 ) ),
),
)
);
};
8 changes: 4 additions & 4 deletions plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport/expected.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions ...-optimizer/tests/test-cases/single-twitter-embed-outside-viewport-on-mobile/expected.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions plugins/embed-optimizer/tests/test-cases/single-twitter-embed-outside-viewport/expected.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions .../embed-optimizer/tests/test-cases/single-wordpress-tv-embed-inside-viewport/expected.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading