From 1c07c85f5ec3d0490dcacd09014a8e435c6e8d10 Mon Sep 17 00:00:00 2001
From: wychoong <67364036+wychoong@users.noreply.github.com>
Date: Mon, 9 Sep 2024 23:22:59 +0800
Subject: [PATCH] Update MakeWidgetCommand.php

---
 .../widgets/src/Commands/MakeWidgetCommand.php     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/widgets/src/Commands/MakeWidgetCommand.php b/packages/widgets/src/Commands/MakeWidgetCommand.php
index d44ec4d716..7f7a4bb7ee 100644
--- a/packages/widgets/src/Commands/MakeWidgetCommand.php
+++ b/packages/widgets/src/Commands/MakeWidgetCommand.php
@@ -124,18 +124,24 @@ class MakeWidgetCommand extends Command
                 $widgetDirectories[array_search($namespace, $widgetNamespaces)] :
                 (Arr::first($widgetDirectories) ?? app_path('Filament/Widgets/'));
         } else {
-            $resourceDirectories = $panel->getResourceDirectories();
-            $resourceNamespaces = $panel->getResourceNamespaces();
+            $resourceDirectories = [
+                app_path('Filament/Resources/'),
+                ...$panel->getResourceDirectories(),
+            ];
+            $resourceNamespaces = [
+                'App\\Filament\\Resources',
+                ...$panel->getResourceNamespaces(),
+            ];
 
             $resourceNamespace = (count($resourceNamespaces) > 1) ?
                 select(
                     label: 'Which namespace would you like to create this in?',
                     options: $resourceNamespaces,
                 ) :
-                (Arr::first($resourceNamespaces) ?? 'App\\Filament\\Resources');
+                Arr::first($resourceNamespaces);
             $resourcePath = (count($resourceDirectories) > 1) ?
                 $resourceDirectories[array_search($resourceNamespace, $resourceNamespaces)] :
-                (Arr::first($resourceDirectories) ?? app_path('Filament/Resources/'));
+                Arr::first($resourceDirectories);
         }
 
         $view = str($widget)->prepend(