Update CanDisableOptions.php

filamentphp · Jan 9, 2025 · 4370a7c · 4370a7c
1 parent 4918745
commit 4370a7c
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/packages/forms/src/Components/Concerns/CanDisableOptions.php b/packages/forms/src/Components/Concerns/CanDisableOptions.php
@@ -3,21 +3,22 @@
 namespace Filament\Forms\Components\Concerns;
 
 use Closure;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 
 trait CanDisableOptions
 {
     /**
-     * @var array<bool|Closure>
+     * @var array<bool | Closure>
      */
     protected array $isOptionDisabled = [];
 
-    public function disableOptionWhen(bool | Closure $callback, bool $merge = false): static
+    public function disableOptionWhen(bool | Closure | null $callback, bool $merge = false): static
     {
         if ($merge) {
             $this->isOptionDisabled[] = $callback;
         } else {
-            $this->isOptionDisabled = [$callback];
+            $this->isOptionDisabled = Arr::wrap($callback);
         }
 
         return $this;
@@ -46,7 +47,7 @@ public function getEnabledOptions(): array
     public function isOptionDisabled($value, string $label): bool
     {
         return collect($this->isOptionDisabled)
-            ->contains(fn ($isOptionDisabled) => $this->evaluate($isOptionDisabled, [
+            ->contains(fn (bool | Closure $isOptionDisabled): bool => (bool) $this->evaluate($isOptionDisabled, [
                 'label' => $label,
                 'value' => $value,
             ]));
@@ -55,6 +56,6 @@ public function isOptionDisabled($value, string $label): bool
     public function hasDynamicDisabledOptions(): bool
     {
         return collect($this->isOptionDisabled)
-            ->contains(fn ($isOptionDisabled) => $isOptionDisabled instanceof Closure);
+            ->contains(fn (bool | Closure $isOptionDisabled): bool => $isOptionDisabled instanceof Closure);
     }
 }