Changeset 61659

Timestamp:

02/17/2026 08:45:09 AM (2 months ago)

Author:

luisherranz

Message:

Interactivity API: populate router's state.url in the server

Set the core/router state url property with the current page URL using get_self_link() when the first data-wp-router-region directive is processed, so that the stores subscribing to that property already have the correct value on page load.

Props westonruter.
Fixes #64649.

Location:

trunk

Files:

• src/wp-includes/interactivity-api/class-wp-interactivity-api.php (modified) (1 diff)
• tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-router-region.php (modified) (2 diffs)

trunk/src/wp-includes/interactivity-api/class-wp-interactivity-api.php

@@ -1315 +1315 @@
             $this->has_processed_router_region = true;
 
+            // Initializes the `state.url` property from the server.
+            $this->state(
+                'core/router',
+                array(
+                    'url' => get_self_link(),
+                )
+            );
+
             // Enqueues as an inline style.
             wp_register_style( 'wp-interactivity-router-animations', false );

trunk/tests/phpunit/tests/interactivity-api/wpInteractivityAPI-wp-router-region.php

@@ -78 +78 @@
 
     /**
+     * Processes directives while temporarily replacing the global
+     * WP_Interactivity_API instance so that global functions like
+     * `wp_interactivity_state` operate on the test instance.
+     *
+     * @param string $html The HTML to process.
+     * @return string The processed HTML.
+     */
+    protected function process_directives( string $html ): string {
+        global $wp_interactivity;
+        $prev             = $wp_interactivity;
+        $wp_interactivity = $this->interactivity;
+
+        $result = $this->interactivity->process_directives( $html );
+
+        $wp_interactivity = $prev;
+        return $result;
+    }
+
+    /**
      * Tests that no elements are added if the `data-wp-router-region` is
      * missing.
@@ -127 +146 @@
         $this->assertFalse( $p->next_tag( $query ) );
     }
+
+    /**
+     * Tests that the `data-wp-router-region` directive initializes the
+     * `core/router` state URL from the server.
+     *
+     * @ticket 64649
+     *
+     * @covers ::process_directives
+     */
+    public function test_wp_router_region_initializes_state_url() {
+        $_SERVER['REQUEST_URI'] = '/test-page/?query=1';
+
+        $html = '<div data-wp-router-region="region A">Interactive region</div>';
+        $this->process_directives( $html );
+
+        $state = $this->interactivity->state( 'core/router' );
+        $this->assertSame( home_url( '/test-page/?query=1' ), $state['url'] );
+    }
+
+    /**
+     * Tests that the `core/router` state URL uses HTTPS when SSL is active.
+     *
+     * @ticket 64649
+     *
+     * @covers ::process_directives
+     */
+    public function test_wp_router_region_initializes_state_url_with_https() {
+        $_SERVER['REQUEST_URI'] = '/';
+        $_SERVER['HTTPS']       = 'on';
+
+        $html = '<div data-wp-router-region="region A">Interactive region</div>';
+        $this->process_directives( $html );
+
+        $state = $this->interactivity->state( 'core/router' );
+        $this->assertStringStartsWith( 'https://', $state['url'] );
+    }
+
+    /**
+     * Tests that the `core/router` state URL is not set when no
+     * `data-wp-router-region` directive is present.
+     *
+     * @ticket 64649
+     *
+     * @covers ::process_directives
+     */
+    public function test_wp_router_region_does_not_set_state_url_without_directive() {
+        $_SERVER['REQUEST_URI'] = '/';
+
+        $html = '<div>Nothing here</div>';
+        $this->process_directives( $html );
+
+        $state = $this->interactivity->state( 'core/router' );
+        $this->assertEmpty( $state );
+    }
 }