Register ComponentManager if not registered

filamentphp · Jan 11, 2024 · 3a2b2a7 · 3a2b2a7
1 parent 1e0fcd7
commit 3a2b2a7
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/packages/support/src/Components/ComponentManager.php b/packages/support/src/Components/ComponentManager.php
@@ -23,6 +23,23 @@ class ComponentManager
      */
     protected array $methodCache = [];
 
+    final public function __construct() {}
+
+    public static function register(): void
+    {
+        app()->scopedIf(
+            static::class,
+            fn () => new static(),
+        );
+    }
+
+    public static function resolve(): static
+    {
+        static::register();
+
+        return app(static::class);
+    }
+
     public function configureUsing(string $component, Closure $modifyUsing, ?Closure $during = null, bool $isImportant = false): mixed
     {
         if ($isImportant) {

diff --git a/packages/support/src/Components/ViewComponent.php b/packages/support/src/Components/ViewComponent.php
@@ -61,7 +61,7 @@ public function defaultView(string | Closure | null $view): static
      */
     protected function extractPublicMethods(): array
     {
-        return app(ComponentManager::class)->extractPublicMethods($this);
+        return ComponentManager::resolve()->extractPublicMethods($this);
     }
 
     /**

diff --git a/packages/support/src/Concerns/Configurable.php b/packages/support/src/Concerns/Configurable.php
@@ -9,7 +9,7 @@ trait Configurable
 {
     public static function configureUsing(Closure $modifyUsing, ?Closure $during = null, bool $isImportant = false): mixed
     {
-        return app(ComponentManager::class)->configureUsing(
+        return ComponentManager::resolve()->configureUsing(
             static::class,
             $modifyUsing,
             $during,
@@ -19,7 +19,7 @@ public static function configureUsing(Closure $modifyUsing, ?Closure $during = n
 
     public function configure(): static
     {
-        app(ComponentManager::class)->configure(
+        ComponentManager::resolve()->configure(
             $this,
             $this->setUp(...),
         );

diff --git a/packages/support/src/SupportServiceProvider.php b/packages/support/src/SupportServiceProvider.php
@@ -49,10 +49,7 @@ public function packageRegistered(): void
             fn () => new AssetManager(),
         );
 
-        $this->app->scoped(
-            ComponentManager::class,
-            fn () => new ComponentManager(),
-        );
+        ComponentManager::register();
 
         $this->app->scoped(
             ColorManager::class,
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         protected function extractPublicMethods(): array
         {
-            return app(ComponentManager::class)->extractPublicMethods($this);
+            return ComponentManager::resolve()->extractPublicMethods($this);
         }
         /**
@@ Expand Down @@