mirror of
https://github.com/filamentphp/filament.git
synced 2026-09-24 15:42:09 +08:00
Merge pull request #10358 from filamentphp/fix/remove-modal-description
fix: Remove modal description
This commit is contained in:
@@ -528,6 +528,11 @@ trait CanOpenModal
|
||||
return $this->getCustomModalHeading() ?? $this->getLabel();
|
||||
}
|
||||
|
||||
public function hasCustomModalHeading(): bool
|
||||
{
|
||||
return filled($this->getCustomModalHeading());
|
||||
}
|
||||
|
||||
public function getModalDescription(): string | Htmlable | null
|
||||
{
|
||||
return $this->evaluate($this->modalDescription);
|
||||
|
||||
@@ -7,6 +7,7 @@ use Filament\Actions\MountableAction;
|
||||
use Filament\Support\Enums\Alignment;
|
||||
use Filament\Support\Enums\MaxWidth;
|
||||
use Filament\Support\Facades\FilamentIcon;
|
||||
use Illuminate\Contracts\Support\Htmlable;
|
||||
|
||||
trait CanRequireConfirmation
|
||||
{
|
||||
@@ -15,6 +16,7 @@ trait CanRequireConfirmation
|
||||
$this->modalAlignment(fn (MountableAction $action): ?Alignment => $action->evaluate($condition) ? Alignment::Center : null);
|
||||
$this->modalFooterActionsAlignment(fn (MountableAction $action): ?Alignment => $action->evaluate($condition) ? Alignment::Center : null);
|
||||
$this->modalIcon(fn (MountableAction $action): ?string => $action->evaluate($condition) ? (FilamentIcon::resolve('actions::modal.confirmation') ?? 'heroicon-o-exclamation-triangle') : null);
|
||||
$this->modalHeading ??= fn (MountableAction $action): string | Htmlable | null => $action->evaluate($condition) ? $action->getLabel() : null;
|
||||
$this->modalDescription(fn (MountableAction $action): ?string => $action->evaluate($condition) ? __('filament-actions::modal.confirmation') : null);
|
||||
$this->modalSubmitActionLabel(fn (MountableAction $action): ?string => $action->evaluate($condition) ? __('filament-actions::modal.actions.confirm.label') : null);
|
||||
$this->modalWidth(fn (MountableAction $action): ?MaxWidth => $action->evaluate($condition) ? MaxWidth::Medium : null);
|
||||
|
||||
@@ -209,7 +209,8 @@ trait InteractsWithActions
|
||||
return false;
|
||||
}
|
||||
|
||||
return $action->hasModalDescription() ||
|
||||
return $action->hasCustomModalHeading() ||
|
||||
$action->hasModalDescription() ||
|
||||
$action->hasModalContent() ||
|
||||
$action->hasModalContentFooter() ||
|
||||
$action->getInfolist() ||
|
||||
|
||||
@@ -175,7 +175,8 @@ trait HasFormComponentActions
|
||||
return false;
|
||||
}
|
||||
|
||||
return $action->hasModalDescription() ||
|
||||
return $action->hasCustomModalHeading() ||
|
||||
$action->hasModalDescription() ||
|
||||
$action->hasModalContent() ||
|
||||
$action->hasModalContentFooter() ||
|
||||
$action->getInfolist() ||
|
||||
|
||||
@@ -231,7 +231,8 @@ trait InteractsWithInfolists
|
||||
return false;
|
||||
}
|
||||
|
||||
return $action->hasModalDescription() ||
|
||||
return $action->hasCustomModalHeading() ||
|
||||
$action->hasModalDescription() ||
|
||||
$action->hasModalContent() ||
|
||||
$action->hasModalContentFooter() ||
|
||||
$action->getInfolist() ||
|
||||
|
||||
@@ -198,7 +198,8 @@ trait HasActions
|
||||
return false;
|
||||
}
|
||||
|
||||
return $action->hasModalDescription() ||
|
||||
return $action->hasCustomModalHeading() ||
|
||||
$action->hasModalDescription() ||
|
||||
$action->hasModalContent() ||
|
||||
$action->hasModalContentFooter() ||
|
||||
$action->getInfolist() ||
|
||||
|
||||
@@ -181,7 +181,8 @@ trait HasBulkActions
|
||||
return false;
|
||||
}
|
||||
|
||||
return $action->hasModalDescription() ||
|
||||
return $action->hasCustomModalHeading() ||
|
||||
$action->hasModalDescription() ||
|
||||
$action->hasModalContent() ||
|
||||
$action->hasModalContentFooter() ||
|
||||
$action->getInfolist() ||
|
||||
|
||||
Reference in New Issue
Block a user