Allow ID to be overridden by event

putyourlightson · Aug 21, 2024 · 1ae48f4 · 1ae48f4
1 parent 7ff54eb
commit 1ae48f4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/services/ComponentsService.php b/src/services/ComponentsService.php
@@ -212,10 +212,6 @@ public function create(string $value, array $variables = [], array|string $attri
             $attributes = ['id' => $attributes];
         }
 
-        // Allow ID to be overridden, otherwise ensure random ID does not start with a digit (to avoid a JS error)
-        $id = $attributes['id'] ?? ('component-' . StringHelper::randomString(6));
-        $config->id = $id;
-
         $mergedVariables = array_merge(
             $variables,
             Sprig::$core->requests->getVariables()
@@ -233,6 +229,10 @@ public function create(string $value, array $variables = [], array|string $attri
         $mergedVariables = $event->variables;
         $attributes = $event->attributes;
 
+        // Fall back to a random ID that does not start with a digit (to avoid a JS error)
+        $id = $attributes['id'] ?? ('component-' . StringHelper::randomString(6));
+        $config->id = $id;
+
         $componentObject = $this->createObject($value, $mergedVariables);
 
         if ($componentObject) {