Changeset 59881

Timestamp:

02/27/2025 10:12:10 PM (18 months ago)

Author:

flixos90

Message:

General: Allow speculative loading opt-out CSS classes to be applied on parent element, e.g. at the block level.

Follow-up to [59837].

Props flixos90, westonruter.
Fixes #63032.
See #62503.

Location:

trunk

Files:

• src/wp-includes/speculative-loading.php (modified) (1 diff)
• tests/phpunit/tests/speculative-loading/wpGetSpeculationRules.php (modified) (2 diffs)

trunk/src/wp-includes/speculative-loading.php

@@ -191 +191 @@
                         ),
                 ),
-                // Also exclude links that are explicitly marked to opt out.
-                array(
-                        'not' => array(
-                                'selector_matches' => ".no-{$mode}",
-                        ),
-                ),
-        );
-
-        // If using 'prerender', also exclude links that opt-out of 'prefetch' because it's part of 'prerender'.
+                // Also exclude links that are explicitly marked to opt out, either directly or via a parent element.
+                array(
+                        'not' => array(
+                                'selector_matches' => ".no-{$mode}, .no-{$mode} a",
+                        ),
+                ),
+        );
+
+        // If using 'prerender', also exclude links that opt out of 'prefetch' because it's part of 'prerender'.
         if ( 'prerender' === $mode ) {
                 $main_rule_conditions[] = array(
                         'not' => array(
-                                'selector_matches' => '.no-prefetch',
+                                'selector_matches' => '.no-prefetch, .no-prefetch a',
                         ),
                 );

trunk/tests/phpunit/tests/speculative-loading/wpGetSpeculationRules.php

@@ -140 +140 @@
                 $this->assertArrayHasKey( 'not', $rules['prefetch'][0]['where']['and'][3] );
                 $this->assertArrayHasKey( 'selector_matches', $rules['prefetch'][0]['where']['and'][3]['not'] );
-                $this->assertSame( '.no-prefetch', $rules['prefetch'][0]['where']['and'][3]['not']['selector_matches'] );
+                $this->assertSame( '.no-prefetch, .no-prefetch a', $rules['prefetch'][0]['where']['and'][3]['not']['selector_matches'] );
         }
 
@@ -165 +165 @@
                 $this->assertArrayHasKey( 'not', $rules['prerender'][0]['where']['and'][3] );
                 $this->assertArrayHasKey( 'selector_matches', $rules['prerender'][0]['where']['and'][3]['not'] );
-                $this->assertSame( '.no-prerender', $rules['prerender'][0]['where']['and'][3]['not']['selector_matches'] );
+                $this->assertSame( '.no-prerender, .no-prerender a', $rules['prerender'][0]['where']['and'][3]['not']['selector_matches'] );
                 $this->assertArrayHasKey( 'not', $rules['prerender'][0]['where']['and'][4] );
                 $this->assertArrayHasKey( 'selector_matches', $rules['prerender'][0]['where']['and'][4]['not'] );
-                $this->assertSame( '.no-prefetch', $rules['prerender'][0]['where']['and'][4]['not']['selector_matches'] );
+                $this->assertSame( '.no-prefetch, .no-prefetch a', $rules['prerender'][0]['where']['and'][4]['not']['selector_matches'] );
         }