Fix ServiceProvider Fault

rappasoft · Sep 23, 2023 · fb476e4 · fb476e4
1 parent e7c10c1
commit fb476e4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/src/Features/AutoInjectRappasoftAssets.php b/src/Features/AutoInjectRappasoftAssets.php
@@ -27,10 +27,33 @@ public static function provide(): void
 
         app('events')->listen(RequestHandled::class, function ($handled) {
 
-            if (app(RappasoftFrontendAssets::class)->hasRenderedRappsoftTableScripts && app(RappasoftFrontendAssets::class)->hasRenderedRappsoftTableThirdPartyScripts) {
+            if (! static::$forceAssetInjection && config('livewire-tables.inject_assets', true) === false) {
+                return;
+            }
+            if (! str($handled->response->headers->get('content-type'))->contains('text/html')) {
+                return;
+            }
+            if (! method_exists($handled->response, 'status') || $handled->response->status() !== 200) {
                 return;
             }
 
+            if (! method_exists($handled->response, 'getContent') || ! method_exists($handled->response, 'setContent')) {
+                return;
+            }
+
+            if ((! static::$hasRenderedAComponentThisRequest) && (! static::$forceAssetInjection)) {
+                return;
+            }
+            if (config('livewire-tables.inject_assets', true) === false && config('livewire-tables.inject_third_party_assets', true) === false) {
+                return;
+            }
+            if (config('livewire-tables.inject_assets', true) === true && app(RappasoftFrontendAssets::class)->hasRenderedRappsoftTableScripts && config('livewire-tables.inject_third_party_assets', true) === true && app(RappasoftFrontendAssets::class)->hasRenderedRappsoftTableThirdPartyScripts) {
+                return;
+            } elseif (config('livewire-tables.inject_assets', true) === true && app(RappasoftFrontendAssets::class)->hasRenderedRappsoftTableScripts) {
+                return;
+            } elseif (config('livewire-tables.inject_third_party_assets', true) === true && app(RappasoftFrontendAssets::class)->hasRenderedRappsoftTableThirdPartyScripts) {
+                return;
+            }
             $html = $handled->response->getContent();
 
             if (str($html)->contains('</html>')) {

diff --git a/src/LaravelLivewireTablesServiceProvider.php b/src/LaravelLivewireTablesServiceProvider.php
@@ -49,8 +49,6 @@ public function boot(): void
         if (config('livewire-tables.inject_assets', true) === true) {
 
             (new RappasoftFrontendAssets)->boot();
-            app('livewire')->componentHook(AutoInjectRappasoftAssets::class);
-            ComponentHookRegistry::boot();
         }
 
     }
@@ -63,6 +61,7 @@ public function register(): void
         if (config('livewire-tables.inject_assets', true) === true) {
 
             (new RappasoftFrontendAssets)->register();
+            ComponentHookRegistry::register(AutoInjectRappasoftAssets::class);
         }
     }
 }