Update FilamentShield.php

Adding Extra Heading value check
bezhanSalleh · Dec 20, 2024 · a6ff23e · a6ff23e
1 parent 8110cf9
commit a6ff23e
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/FilamentShield.php b/src/FilamentShield.php
@@ -311,14 +311,19 @@ public static function getLocalizedWidgetLabel(string $widget): string
 
         return match (true) {
             $widgetInstance instanceof TableWidget => (string) invade($widgetInstance)->makeTable()->getHeading(),
-            ! ($widgetInstance instanceof TableWidget) && $widgetInstance instanceof Widget && method_exists($widgetInstance, 'getHeading') => (string) invade($widgetInstance)->getHeading(),
+            self::hasValidHeading($widgetInstance) => (string) invade($widgetInstance)->getHeading(),
             default => str($widget)
                 ->afterLast('\\')
                 ->headline()
                 ->toString(),
         };
     }
-
+    private static function hasValidHeading($widgetInstance): bool
+    {
+        return $widgetInstance instanceof Widget 
+            && method_exists($widgetInstance, 'getHeading') 
+            && $widgetInstance->getHeading() !== null;
+    }
     protected function getDefaultPermissionIdentifier(string $resource): string
     {
         return Str::of($resource)