Merge pull request #10054 from filamentphp/fix/widget-key

fix: Widget key
filamentphp · Dec 3, 2023 · 7e73c35 · 7e73c35
2 parents f47bb4c + 7938a08
commit 7e73c35
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/panels/resources/views/components/resources/relation-managers.blade.php b/packages/panels/resources/views/components/resources/relation-managers.blade.php
@@ -79,15 +79,15 @@ class="flex flex-col gap-y-4"
             @endphp
 
             @if ($managers[$activeManager] instanceof \Filament\Resources\RelationManagers\RelationGroup)
-                @foreach ($managers[$activeManager]->ownerRecord($ownerRecord)->pageClass($pageClass)->getManagers() as $groupedManager)
+                @foreach ($managers[$activeManager]->ownerRecord($ownerRecord)->pageClass($pageClass)->getManagers() as $groupedManagerKey => $groupedManager)
                     @php
                         $normalizedGroupedManagerClass = $normalizeRelationManagerClass($groupedManager);
                     @endphp
 
                     @livewire(
                         $normalizedGroupedManagerClass,
                         [...$managerLivewireProperties, ...(($groupedManager instanceof \Filament\Resources\RelationManagers\RelationManagerConfiguration) ? [...$groupedManager->relationManager::getDefaultProperties(), ...$groupedManager->properties] : $groupedManager::getDefaultProperties())],
-                        key($normalizedGroupedManagerClass),
+                        key("{$normalizedGroupedManagerClass}-{$groupedManagerKey}"),
                     )
                 @endforeach
             @else

diff --git a/packages/widgets/resources/views/components/widgets.blade.php b/packages/widgets/resources/views/components/widgets.blade.php
@@ -25,11 +25,15 @@
         };
     @endphp
 
-    @foreach ($widgets as $key => $widget)
+    @foreach ($widgets as $widgetKey => $widget)
+        @php
+            $widgetClass = $normalizeWidgetClass($widget);
+        @endphp
+
         @livewire(
-            $normalizeWidgetClass($widget),
+            $widgetClass,
             [...(($widget instanceof \Filament\Widgets\WidgetConfiguration) ? [...$widget->widget::getDefaultProperties(), ...$widget->properties] : $widget::getDefaultProperties()), ...$data],
-            key($key),
+            key("{$widgetClass}-{$widgetKey}"),
         )
     @endforeach
 </x-filament::grid>