[Live] fixing bug where custom data-live-id would be ignored in re-render

This caused it to look like a child component with a custom data-live-id *always* needed to be re-rendered.

Author: weaverryan

src/LiveComponent/src/EventListener/InterceptChildComponentRenderSubscriber.php

@@ -59,7 +59,7 @@ public function preComponentCreated(PreCreateForRenderEvent $event): void
         $childFingerprints = $parentComponent->getExtraMetadata(self::CHILDREN_FINGERPRINTS_METADATA_KEY);
 
         // get the deterministic id for this child, but without incrementing the counter yet
-        $deterministicId = $this->deterministicTwigIdCalculator->calculateDeterministicId(increment: false);
+        $deterministicId = $event->getProps()['data-live-id'] ?? $this->deterministicTwigIdCalculator->calculateDeterministicId(increment: false);
         if (!isset($childFingerprints[$deterministicId])) {
             // child fingerprint wasn't set, it is likely a new child, allow it to render fully
             return;

src/LiveComponent/tests/Fixtures/Component/TodoListComponent.php

@@ -24,6 +24,7 @@ final class TodoListComponent
     #[LiveProp]
     public array $items = [];
 
+    #[LiveProp(writable: true)]
     public $includeDataLiveId = false;
 
     use DefaultActionTrait;

src/LiveComponent/tests/Fixtures/templates/render_todo_list_with_live_id.html.twig

@@ -2,6 +2,7 @@
     items: [
         { text: 'milk'},
         { text: 'cheese'},
+        { text: 'milk'},
     ],
     includeDataLiveId: true
 }) }}

src/LiveComponent/tests/Functional/EventListener/AddLiveAttributesSubscriberTest.php

@@ -114,6 +114,6 @@ public function testItDoesNotOverrideDataLiveIdIfSpecified(): void
         $lis = $ul->children('li');
         // deterministic id: is not used: data-live-id was passed in manually
         $this->assertSame('todo-item-1', $lis->first()->attr('data-live-id'));
-        $this->assertSame('todo-item-2', $lis->last()->attr('data-live-id'));
+        $this->assertSame('todo-item-3', $lis->last()->attr('data-live-id'));
     }
 }

src/LiveComponent/tests/Functional/EventListener/InterceptChildComponentRenderSubscriberTest.php

@@ -56,6 +56,26 @@ public function testItRendersEmptyElementOnMatchingFingerprint(): void
         ;
     }
 
+    public function testItRendersEmptyElementOnMatchingFingerprintWithCustomDataLiveId(): void
+    {
+        $fingerPrintsWithCustomLiveId = [];
+        foreach (array_values(self::$actualTodoItemFingerprints) as $key => $fingerprintValue) {
+            // creating fingerprints to match todo_list.html.twig
+            $fingerPrintsWithCustomLiveId['todo-item-'.$key + 1] = $fingerprintValue;
+        }
+
+        $this->browser()
+            ->visit($this->buildUrlForTodoListComponent($fingerPrintsWithCustomLiveId, true))
+            ->assertSuccessful()
+            ->assertHtml()
+            // no lis (because we render a div always)
+            ->assertElementCount('ul li', 0)
+            // because we actually slip in a div element
+            ->assertElementCount('ul div', 3)
+            ->assertNotContains('todo item')
+        ;
+    }
+
     public function testItRendersNewPropWhenFingerprintDoesNotMatch(): void
     {
         $fingerprints = self::$actualTodoItemFingerprints;
@@ -89,14 +109,15 @@ public function testItRendersNewPropWhenFingerprintDoesNotMatch(): void
             });
     }
 
-    private function buildUrlForTodoListComponent(array $childrenFingerprints): string
+    private function buildUrlForTodoListComponent(array $childrenFingerprints, bool $includeLiveId = false): string
     {
         $component = $this->mountComponent('todo_list', [
             'items' => [
                 ['text' => 'wake up'],
                 ['text' => 'high five a friend'],
                 ['text' => 'take a nap'],
             ],
+            'includeDataLiveId' => $includeLiveId,
         ]);
 
         $dehydrated = $this->dehydrateComponent($component);