Merge pull request #11410 from comes/3.x

Use new `hasActualContent` method on slots
filamentphp · Feb 23, 2024 · 32e072c · 32e072c
2 parents f03d17b + aa7f654
commit 32e072c
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/packages/support/src/helpers.php b/packages/support/src/helpers.php
@@ -12,6 +12,7 @@
 use Illuminate\Support\Str;
 use Illuminate\Translation\MessageSelector;
 use Illuminate\View\ComponentAttributeBag;
+use Illuminate\View\ComponentSlot;
 
 if (! function_exists('Filament\Support\format_money')) {
     /**
@@ -120,18 +121,11 @@ function is_slot_empty(?Htmlable $slot): bool
             return true;
         }
 
-        return trim(
-            str_replace(
-                [
-                    '<!-- __BLOCK__ -->',
-                    '<!-- __ENDBLOCK__ -->',
-                    '<!--[if BLOCK]><![endif]-->',
-                    '<!--[if ENDBLOCK]><![endif]-->',
-                ],
-                '',
-                $slot->toHtml()
-            ),
-        ) === '';
+        if (! $slot instanceof ComponentSlot) {
+            $slot = new ComponentSlot($slot->toHtml());
+        }
+
+        return $slot->hasActualContent();
     }
 }