Fallback to existing mention label if provider does not return a label

Author: gehrisandro

packages/forms/src/Components/RichEditor/RichContentRenderer.php

@@ -294,10 +294,6 @@ protected function processMentions(Editor $editor): void
                 return;
             }
 
-            if (filled($node->attrs->label ?? null)) {
-                return;
-            }
-
             $char = $node->attrs->char ?? '@';
             $mentionsByChar[$char][] = (string) $id;
         });
@@ -330,7 +326,7 @@ protected function processMentions(Editor $editor): void
                 return;
             }
 
-            $label = $node->attrs->label ?? $labelsByChar[$char][(string) $id] ?? (string) $id;
+            $label = $labelsByChar[$char][(string) $id] ?? $node->attrs->label ?? (string) $id;
             $node->attrs->label = $label;
 
             $url = $provider->getUrl((string) $id, $label);

packages/forms/src/Components/RichEditor/StateCasts/RichEditorStateCast.php

@@ -59,6 +59,10 @@ public function get(mixed $state): string | array
                     return;
                 }
 
+                if (isset($node->attrs->label) && $node->attrs->label) {
+                    return;
+                }
+
                 unset($node->attrs->label);
             });
         }

tests/src/Forms/Components/RichEditor/RichContentRendererTest.php

@@ -631,9 +631,7 @@ public function toHtml(): string
     expect($html)->toContain('#issue-123');
 });
 
-it('preserves existing labels and does not refetch them', function (): void {
-    $fetchCount = 0;
-
+it('falls back to existing label when provider returns no label', function (): void {
     $renderer = RichContentRenderer::make([
         'type' => 'doc',
         'content' => [
@@ -643,9 +641,9 @@ public function toHtml(): string
                     [
                         'type' => 'mention',
                         'attrs' => [
-                            'id' => '1',
-                            'label' => 'Existing Label',
+                            'id' => '999',
                             'char' => '@',
+                            'label' => 'Existing Label',
                         ],
                     ],
                 ],
@@ -655,21 +653,15 @@ public function toHtml(): string
 
     $renderer->mentions([
         MentionProvider::make('@')
-            ->getLabelsUsing(function (array $ids) use (&$fetchCount): array {
-                $fetchCount++;
-
-                return ['1' => 'New Label'];
-            }),
+            ->getLabelsUsing(fn (array $ids): array => []),
     ]);
 
     $html = $renderer->toUnsafeHtml();
 
-    expect($fetchCount)->toBe(0);
     expect($html)->toContain('@Existing Label');
-    expect($html)->not->toContain('New Label');
 });
 
-it('falls back to id as label when provider returns no label', function (): void {
+it('falls back to id as label when provider returns no label and no label is set', function (): void {
     $renderer = RichContentRenderer::make([
         'type' => 'doc',
         'content' => [