Fix issues when a nested action is called without a modal

filamentphp · Feb 2, 2025 · 9e4595b · 9e4595b
1 parent 043363d
commit 9e4595b
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 20 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/actions/src/Action.php b/packages/actions/src/Action.php
@@ -393,8 +393,12 @@ public function getLivewireCallMountedActionName(): string
         return 'callMountedAction';
     }
 
-    protected function getJavaScriptClickHandler(): string
+    protected function getJavaScriptClickHandler(): ?string
     {
+        if ($this->shouldClose()) {
+            return null;
+        }
+
         $argumentsParameter = '';
 
         if (count($arguments = $this->getArguments())) {

diff --git a/packages/actions/src/Concerns/InteractsWithActions.php b/packages/actions/src/Concerns/InteractsWithActions.php
@@ -103,8 +103,6 @@ public function mountAction(string $name, array $arguments = [], array $context
             return null;
         }
 
-        $this->syncActionModals();
-
         if (($actionComponent = $action->getSchemaComponent()) instanceof ExposesStateToActionData) {
             foreach ($actionComponent->getChildComponentContainers() as $actionComponentChildComponentContainer) {
                 $actionComponentChildComponentContainer->validate();
@@ -149,6 +147,8 @@ public function mountAction(string $name, array $arguments = [], array $context
             return $this->callMountedAction();
         }
 
+        $this->syncActionModals();
+
         $this->resetErrorBag();
 
         return null;

diff --git a/packages/support/dist/index.js b/packages/support/dist/index.js
diff --git a/packages/support/resources/js/components/modal.js b/packages/support/resources/js/components/modal.js
@@ -1,7 +1,7 @@
 export default ({ id }) => ({
     isOpen: false,
 
-    isModalWindowVisible: false,
+    isWindowVisible: false,
 
     livewire: null,
 
@@ -10,12 +10,12 @@ export default ({ id }) => ({
             if (this.isOpen) {
                 this.$root?.showModal()
 
-                this.isModalWindowVisible = true
+                this.isWindowVisible = true
 
                 return;
             }
 
-            this.isModalWindowVisible = false
+            this.isWindowVisible = false
 
             setTimeout(
                 () => this.$root?.close(),
@@ -27,6 +27,10 @@ export default ({ id }) => ({
     close: function () {
         this.closeQuietly()
 
+        this.$refs.windowContainer?.dispatchEvent(
+            new CustomEvent('modal-closing', { id }),
+        )
+
         setTimeout(
             () => this.$refs.windowContainer?.dispatchEvent(
                 new CustomEvent('modal-closed', { id }),

diff --git a/packages/support/resources/views/components/modal/index.blade.php b/packages/support/resources/views/components/modal/index.blade.php
@@ -98,7 +98,7 @@
 >
     <div
         aria-hidden="true"
-        x-show="isModalWindowVisible"
+        x-show="isWindowVisible"
         x-transition.duration.300ms.opacity
         class="fi-modal-close-overlay"
     ></div>
@@ -119,7 +119,7 @@ class="fi-modal-close-overlay"
         ]) }}
     >
         <div
-            x-show="isModalWindowVisible"
+            x-show="isWindowVisible"
             x-ref="window"
             @if ($closeByEscaping)
                 x-on:keydown.window.escape="{{ $closeEventHandler }}"