fix close buttons in modals

This commit is contained in:
2026-05-01 11:12:03 +03:30
parent 3188999a96
commit 1121939c25
5 changed files with 23 additions and 4 deletions

View File

@@ -146,7 +146,7 @@
</section> </section>
</div> </div>
<flux:modal wire:model="showAddMembersModal" class="w-full max-w-xl"> <flux:modal wire:model="showAddMembersModal" :closable="false" class="w-full max-w-xl">
<form wire:submit="addMembers" class="space-y-6"> <form wire:submit="addMembers" class="space-y-6">
<div> <div>
<flux:heading size="lg">{{ __('Add people') }}</flux:heading> <flux:heading size="lg">{{ __('Add people') }}</flux:heading>
@@ -258,7 +258,7 @@
</form> </form>
</flux:modal> </flux:modal>
<flux:modal wire:model="showFilesModal" class="w-full max-w-2xl"> <flux:modal wire:model="showFilesModal" :closable="false" class="w-full max-w-2xl">
<div class="space-y-6"> <div class="space-y-6">
<div class="flex items-start justify-between gap-4"> <div class="flex items-start justify-between gap-4">
<div> <div>

View File

@@ -215,7 +215,7 @@
</flux:dropdown> </flux:dropdown>
</div> </div>
<flux:modal wire:model="showCreateConversationModal" class="w-full max-w-2xl"> <flux:modal wire:model="showCreateConversationModal" :closable="false" class="w-full max-w-2xl">
<form wire:submit="createConversation" class="space-y-6"> <form wire:submit="createConversation" class="space-y-6">
<div class="flex items-start justify-between gap-4"> <div class="flex items-start justify-between gap-4">
<div> <div>

View File

@@ -10,7 +10,7 @@
</flux:button> </flux:button>
</flux:modal.trigger> </flux:modal.trigger>
<flux:modal name="confirm-user-deletion" :show="$errors->isNotEmpty()" focusable class="max-w-lg"> <flux:modal name="confirm-user-deletion" :show="$errors->isNotEmpty()" :closable="false" focusable class="max-w-lg">
<form method="POST" wire:submit="deleteUser" class="space-y-6"> <form method="POST" wire:submit="deleteUser" class="space-y-6">
<div> <div>
<flux:heading size="lg">{{ __('Are you sure you want to delete your account?') }}</flux:heading> <flux:heading size="lg">{{ __('Are you sure you want to delete your account?') }}</flux:heading>

View File

@@ -78,6 +78,7 @@
<flux:modal <flux:modal
name="two-factor-setup-modal" name="two-factor-setup-modal"
class="max-w-md md:min-w-md" class="max-w-md md:min-w-md"
:closable="false"
@close="closeModal" @close="closeModal"
wire:model="showModal" wire:model="showModal"
> >

View File

@@ -0,0 +1,18 @@
<?php
test('flux modals hide the built in top right close button', function () {
$modalDeclarations = collect([
resource_path('views/livewire/chat/conversation-details-panel.blade.php'),
resource_path('views/livewire/chat/conversation-list.blade.php'),
resource_path('views/livewire/settings/delete-user-form.blade.php'),
resource_path('views/livewire/settings/security.blade.php'),
])->flatMap(function (string $path): array {
preg_match_all('/<flux:modal(?![\\w.-])(?:[^"\'>]|"[^"]*"|\'[^\']*\')*>/s', file_get_contents($path), $matches);
return $matches[0];
});
expect($modalDeclarations)->not->toBeEmpty();
$modalDeclarations->each(fn (string $declaration) => expect($declaration)->toContain(':closable="false"'));
});