clean up

filamentphp · Feb 2, 2025 · 3721266 · 3721266
1 parent d30015d
commit 3721266
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 29 deletions.
diff --git a/docs-assets/app/public/js/filament/support/support.js b/docs-assets/app/public/js/filament/support/support.js
diff --git a/packages/support/dist/index.js b/packages/support/dist/index.js
diff --git a/packages/support/resources/css/components/modal.css b/packages/support/resources/css/components/modal.css
@@ -140,7 +140,7 @@
     }
 
     & .fi-modal-window {
-        @apply pointer-events-auto duration-300 relative row-start-2 flex w-full cursor-default flex-col bg-white ring-1 shadow-xl ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10;
+        @apply pointer-events-auto relative row-start-2 flex w-full cursor-default flex-col bg-white ring-1 shadow-xl ring-gray-950/5 duration-300 dark:bg-gray-900 dark:ring-white/10;
 
         &.fi-align-start,
         &.fi-align-left {

diff --git a/packages/support/resources/js/components/modal.js b/packages/support/resources/js/components/modal.js
@@ -15,14 +15,19 @@ export default ({ id }) => ({
 
                     this.isWindowVisible = true
 
-                    return;
+                    return
                 }
 
                 this.isWindowVisible = false
 
                 setTimeout(
                     () => this.$root?.close(),
-                    this.$refs.window ? ((parseFloat(window.getComputedStyle(this.$refs.window).transitionDuration)) * 1000) : 0,
+                    this.$refs.window
+                        ? parseFloat(
+                              window.getComputedStyle(this.$refs.window)
+                                  .transitionDuration,
+                          ) * 1000
+                        : 0,
                 )
             })
         })
@@ -32,10 +37,16 @@ export default ({ id }) => ({
         this.closeQuietly()
 
         setTimeout(
-            () => this.$refs.windowContainer?.dispatchEvent(
-                new CustomEvent('modal-closed', { id }),
-            ),
-            this.$refs.window ? ((parseFloat(window.getComputedStyle(this.$refs.window).transitionDuration)) * 1000) : 0,
+            () =>
+                this.$root.dispatchEvent(
+                    new CustomEvent('modal-closed', { id }),
+                ),
+            this.$refs.window
+                ? parseFloat(
+                      window.getComputedStyle(this.$refs.window)
+                          .transitionDuration,
+                  ) * 1000
+                : 0,
         )
     },
 

diff --git a/packages/support/resources/views/components/modal/index.blade.php b/packages/support/resources/views/components/modal/index.blade.php
@@ -67,8 +67,8 @@
 
 <dialog
     x-data="filamentModal({
-        id: @js($id),
-    })"
+                id: @js($id),
+            })"
     @if ($id)
         x-on:{{ $closeEventName }}.window="if (($event.detail.id === @js($id)) && isOpen) close()"
         x-on:{{ $closeQuietlyEventName }}.window="if (($event.detail.id === @js($id)) && isOpen) closeQuietly()"
@@ -78,7 +78,8 @@
         x-on:{{ $closeQuietlyEventName }}.stop="if (isOpen) closeQuietly()"
         x-on:{{ $openEventName }}.stop="if (! isOpen) open()"
     @endif
-    x-on:cancel.prevent {{-- Prevents the dialog from closing when the escape key is pressed, we do that ourselves to properly transition it. --}}
+    {{-- Prevents the dialog from closing when the escape key is pressed, we do that ourselves to properly transition it. --}}
+    x-on:cancel.prevent
     id="{{ $id }}"
     wire:ignore.self
     x-trap.noscroll{{ $autofocus ? '' : '.noautofocus' }}="isOpen"
@@ -90,11 +91,13 @@
     @elseif ($heading)
         aria-labelledby="{{ "{$id}.heading" }}"
     @endif
-    @class([
-        'fi-modal',
-        'fi-modal-slide-over' => $slideOver,
-        'fi-width-screen' => $width === Width::Screen,
-    ])
+    {{
+        $attributes->class([
+            'fi-modal',
+            'fi-modal-slide-over' => $slideOver,
+            'fi-width-screen' => $width === Width::Screen,
+        ])
+    }}
 >
     <div
         aria-hidden="true"
@@ -113,10 +116,10 @@ class="fi-modal-close-overlay"
                     {{ $closeEventHandler }}
             "
         @endif
-        {{ $attributes->class([
+        @class([
             'fi-modal-window-ctn',
             'fi-clickable' => $closeByClickingAway,
-        ]) }}
+        ])
     >
         <div
             x-show="isWindowVisible"