UrlMapping.mapPath

Author: mbuliard

src/LiveComponent/src/EventListener/LiveUrlSubscriber.php

@@ -67,19 +67,23 @@ private function getLivePropsToMap(Request $request): array
         $liveData = $request->attributes->get('_live_request_data') ?? [];
         $values = array_merge($liveData['props'] ?? [], $liveData['updated'] ?? []);
 
-        $urlLiveProps = [];
+        $urlLiveProps = [
+            'path' => [],
+            'query' => []
+        ];
         foreach ($metadata->getAllLivePropsMetadata($component) as $liveProp) {
             $name = $liveProp->getName();
             $urlMapping = $liveProp->urlMapping();
             if (isset($values[$name]) && $urlMapping) {
-                $urlLiveProps[$urlMapping->as ?? $name] = $values[$name];
+                $urlLiveProps[$urlMapping->mapPath ? 'path' : 'query'][$urlMapping->as ?? $name] =
+                    $values[$name];
             }
         }
 
         return $urlLiveProps;
     }
 
-    private function computeNewUrl(string $previousUrl, array $newProps): string
+    private function computeNewUrl(string $previousUrl, array $livePropsToMap): string
     {
         $parsed = parse_url($previousUrl);
 
@@ -89,10 +93,16 @@ private function computeNewUrl(string $previousUrl, array $newProps): string
         }
         parse_str($parsed['query'] ?? '', $previousQueryParams);
 
-        return $this->router->generate(
+        $newUrl = $this->router->generate(
             $this->router->match($url)['_route'],
-            array_merge($previousQueryParams, $newProps)
+            array_merge($previousQueryParams, $livePropsToMap['path'])
         );
+        parse_str(parse_url($newUrl)['query'] ?? '', $queryParams);
+        $queryString = http_build_query(array_merge($queryParams, $livePropsToMap['query']));
+
+        return preg_replace('/[?#].*/', '', $newUrl) .
+            ('' !== $queryString ? '?' : '') .
+            $queryString;
     }
 
     /**

src/LiveComponent/src/Metadata/UrlMapping.php

@@ -12,7 +12,7 @@
 namespace Symfony\UX\LiveComponent\Metadata;
 
 /**
- * Mapping configuration to bind a LiveProp to a URL query parameter.
+ * Mapping configuration to bind a LiveProp to a URL path or query parameter.
  *
  * @author Nicolas Rigaud <[email protected]>
  */
@@ -23,6 +23,11 @@ public function __construct(
          * The name of the prop that appears in the URL. If null, the LiveProp's field name is used.
          */
         public readonly ?string $as = null,
+
+        /**
+         * True if the prop should be mapped to the path if it matches one of its parameters. Otherwise a query parameter will be used.
+         */
+        public readonly bool $mapPath = false,
     ) {
     }
 }