opensource/filament
3
0
Fork 0
mirror of https://github.com/filamentphp/filament.git synced 2026-10-24 23:35:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: unable to open another modal within a modal

Browse Source 
Fixes an issue where events could not be triggered when using id in modals. Edge cases are handled where both id and trigger are used together.

Fixes: #17630
This commit is contained in:
PeopleSea
2025-09-08 15:43:02 +08:00
parent b1de3bbfcb
commit 093c7d5f46
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/support/resources/views/components/modal/index.blade.php
+9 -4
View File
@@ -65,7 +65,11 @@
<div
@if (! $trigger->attributes->get('disabled'))
x-on:click="$el.nextElementSibling.dispatchEvent(new CustomEvent(@js($openEventName)))"
@if ($id)
x-on:click="$dispatch(@js($openEventName), { id: @js($id) })"
@else
x-on:click="$el.nextElementSibling.dispatchEvent(new CustomEvent(@js($openEventName)))"
@endif
@endif
{{ $trigger->attributes->except(['disabled'])->class(['fi-modal-trigger']) }}
>
@@ -90,10 +94,11 @@
x-on:{{ $closeEventName }}.window="if (($event.detail.id === @js($id)) && isOpen) close()"
x-on:{{ $closeQuietlyEventName }}.window="if (($event.detail.id === @js($id)) && isOpen) closeQuietly()"
x-on:{{ $openEventName }}.window="if (($event.detail.id === @js($id)) && (! isOpen)) open()"
@else
x-on:{{ $closeEventName }}.stop="if (isOpen) close()"
x-on:{{ $closeQuietlyEventName }}.stop="if (isOpen) closeQuietly()"
x-on:{{ $openEventName }}.stop="if (! isOpen) open()"
@endif
x-on:{{ $closeEventName }}.stop="if (isOpen) close()"
x-on:{{ $closeQuietlyEventName }}.stop="if (isOpen) closeQuietly()"
x-on:{{ $openEventName }}.stop="if (! isOpen) open()"
x-bind:class="{
'fi-modal-open': isOpen,
}"