[Map] Rework UxIconRenderer injection

Author: Kocal

src/Map/assets/src/abstract_map_controller.ts

@@ -16,7 +16,7 @@ export type Icon = {
     | {
           type: typeof IconTypes.UxIcon;
           name: string;
-          _generated_html: string,
+          _generated_html: string;
       }
     | {
           type: typeof IconTypes.Url;
@@ -26,7 +26,7 @@ export type Icon = {
           type: typeof IconTypes.Svg;
           html: string;
       }
-    );
+);
 
 export type MarkerDefinition<MarkerOptions, InfoWindowOptions> = WithIdentifier<{
     position: Point;

src/Map/composer.json

@@ -40,7 +40,8 @@
         "symfony/framework-bundle": "^6.4|^7.0",
         "symfony/phpunit-bridge": "^6.4|^7.0",
         "symfony/twig-bundle": "^6.4|^7.0",
-        "symfony/ux-twig-component": "^2.18"
+        "symfony/ux-twig-component": "^2.18",
+        "symfony/ux-icons": "^2.18"
     },
     "conflict": {
         "symfony/ux-twig-component": "<2.21"

src/Map/config/services.php

@@ -39,7 +39,7 @@
             ->abstract()
             ->args([
                 service('stimulus.helper'),
-                service('.ux_map.ux_icons.renderer')->nullOnInvalid(),
+                service('.ux_map.ux_icons.renderer'),
             ])
 
         ->set('ux_map.renderer_factory', Renderer::class)

src/Map/src/Bridge/Google/composer.json

@@ -21,7 +21,8 @@
         "symfony/ux-map": "^2.19"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^6.4|^7.0"
+        "symfony/phpunit-bridge": "^6.4|^7.0",
+        "symfony/ux-icons": "^2.18"
     },
     "autoload": {
         "psr-4": { "Symfony\\UX\\Map\\Bridge\\Google\\": "src/" },

src/Map/src/Bridge/Google/src/Renderer/GoogleRenderer.php

@@ -29,6 +29,7 @@
      */
     public function __construct(
         StimulusHelper $stimulusHelper,
+        UxIconRenderer $uxIconRenderer,
         #[\SensitiveParameter]
         private string $apiKey,
         private ?string $id = null,
@@ -43,7 +44,6 @@ public function __construct(
          */
         private array $libraries = [],
         private ?string $defaultMapId = null,
-        ?UxIconRenderer $uxIconRenderer = null,
     ) {
         parent::__construct($stimulusHelper, $uxIconRenderer);
     }

src/Map/src/Bridge/Google/src/Renderer/GoogleRendererFactory.php

@@ -27,7 +27,7 @@ final class GoogleRendererFactory extends AbstractRendererFactory implements Ren
 {
     public function __construct(
         StimulusHelper $stimulus,
-        ?UxIconRenderer $uxIconRenderer = null,
+        UxIconRenderer $uxIconRenderer,
         private ?string $defaultMapId = null,
     ) {
         parent::__construct($stimulus, $uxIconRenderer);
@@ -43,7 +43,8 @@ public function create(Dsn $dsn): RendererInterface
 
         return new GoogleRenderer(
             $this->stimulus,
-            $apiKey,
+            $this->uxIconRenderer,
+            apiKey: $apiKey,
             id: $dsn->getOption('id'),
             language: $dsn->getOption('language'),
             region: $dsn->getOption('region'),
@@ -53,7 +54,6 @@ public function create(Dsn $dsn): RendererInterface
             version: $dsn->getOption('version', 'weekly'),
             libraries: ['maps', 'marker', ...$dsn->getOption('libraries', [])],
             defaultMapId: $this->defaultMapId,
-            uxIconRenderer: $this->uxIconRenderer,
         );
     }
 

src/Map/src/Bridge/Google/tests/GoogleRendererFactoryTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\UX\Map\Bridge\Google\Tests;
 
 use Symfony\UX\Map\Bridge\Google\Renderer\GoogleRendererFactory;
+use Symfony\UX\Map\Icon\UxIconRenderer;
 use Symfony\UX\Map\Renderer\RendererFactoryInterface;
 use Symfony\UX\Map\Test\RendererFactoryTestCase;
 use Symfony\UX\StimulusBundle\Helper\StimulusHelper;
@@ -20,7 +21,7 @@ final class GoogleRendererFactoryTest extends RendererFactoryTestCase
 {
     public function createRendererFactory(): RendererFactoryInterface
     {
-        return new GoogleRendererFactory(new StimulusHelper(null));
+        return new GoogleRendererFactory(new StimulusHelper(null), new UxIconRenderer(null));
     }
 
     public static function supportsRenderer(): iterable

src/Map/src/Bridge/Google/tests/GoogleRendererTest.php

@@ -209,13 +209,25 @@ class map_controller extends default_1 {
         const { type, width, height } = definition;
         let icon;
         if (type === IconTypes.Svg) {
-            icon = L.divIcon({ html: definition.html, iconSize: [width, height], className: '' });
+            icon = L.divIcon({
+                html: definition.html,
+                iconSize: [width, height],
+                className: '',
+            });
         }
         else if (type === IconTypes.UxIcon) {
-            icon = L.divIcon({ html: definition._generated_html, iconSize: [width, height], className: '' });
+            icon = L.divIcon({
+                html: definition._generated_html,
+                iconSize: [width, height],
+                className: '',
+            });
         }
         else if (type === IconTypes.Url) {
-            icon = L.icon({ iconUrl: definition.url, iconSize: [width, height], className: '' });
+            icon = L.icon({
+                iconUrl: definition.url,
+                iconSize: [width, height],
+                className: '',
+            });
         }
         else {
             throw new Error(`Unsupported icon type: ${type}.`);

src/Map/src/Bridge/Leaflet/assets/dist/map_controller.js

@@ -42,7 +42,7 @@ export default class extends AbstractMapController<
             iconSize: [25, 41],
             iconAnchor: [12.5, 41],
             popupAnchor: [0, -41],
-            className: '',
+            className: '', // Adding an empty class to the icon to avoid the default Leaflet styles
         });
 
         super.connect();
@@ -189,11 +189,23 @@ export default class extends AbstractMapController<
 
         let icon: L.DivIcon | L.Icon;
         if (type === IconTypes.Svg) {
-            icon = L.divIcon({ html: definition.html, iconSize: [width, height], className: '' });
+            icon = L.divIcon({
+                html: definition.html,
+                iconSize: [width, height],
+                className: '', // Adding an empty class to the icon to avoid the default Leaflet styles
+            });
         } else if (type === IconTypes.UxIcon) {
-            icon = L.divIcon({ html: definition._generated_html, iconSize: [width, height], className: '' });
+            icon = L.divIcon({
+                html: definition._generated_html,
+                iconSize: [width, height],
+                className: '', // Adding an empty class to the icon to avoid the default Leaflet styles
+            });
         } else if (type === IconTypes.Url) {
-            icon = L.icon({ iconUrl: definition.url, iconSize: [width, height], className: '' });
+            icon = L.icon({
+                iconUrl: definition.url,
+                iconSize: [width, height],
+                className: '', // Adding an empty class to the icon to avoid the default Leaflet styles
+            });
         } else {
             throw new Error(`Unsupported icon type: ${type}.`);
         }

src/Map/src/Bridge/Leaflet/assets/src/map_controller.ts

@@ -21,7 +21,8 @@
         "symfony/ux-map": "^2.19"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^6.4|^7.0"
+        "symfony/phpunit-bridge": "^6.4|^7.0",
+        "symfony/ux-icons": "^2.18"
     },
     "autoload": {
         "psr-4": { "Symfony\\UX\\Map\\Bridge\\Leaflet\\": "src/" },

src/Map/src/Bridge/Leaflet/composer.json

@@ -12,6 +12,7 @@
 namespace Symfony\UX\Map\Bridge\Leaflet\Tests;
 
 use Symfony\UX\Map\Bridge\Leaflet\Renderer\LeafletRendererFactory;
+use Symfony\UX\Map\Icon\UxIconRenderer;
 use Symfony\UX\Map\Renderer\RendererFactoryInterface;
 use Symfony\UX\Map\Test\RendererFactoryTestCase;
 use Symfony\UX\StimulusBundle\Helper\StimulusHelper;
@@ -20,7 +21,7 @@ final class LeafletRendererFactoryTest extends RendererFactoryTestCase
 {
     public function createRendererFactory(): RendererFactoryInterface
     {
-        return new LeafletRendererFactory(new StimulusHelper(null));
+        return new LeafletRendererFactory(new StimulusHelper(null), new UxIconRenderer(null));
     }
 
     public static function supportsRenderer(): iterable