Move action lifecycle hooks

filamentphp · May 22, 2024 · b367120 · b367120
1 parent 81949c0
commit b367120
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 20 deletions.
diff --git a/packages/actions/src/Concerns/InteractsWithActions.php b/packages/actions/src/Concerns/InteractsWithActions.php
@@ -84,13 +84,15 @@ public function callMountedAction(array $arguments = []): mixed
             if ($this->mountedActionHasForm(mountedAction: $action)) {
                 $action->callBeforeFormValidated();
 
-                $action->formData($form->getState());
+                $action->formData(
+                    $form->getState(afterValidate: function () use ($action) {
+                        $action->callAfterFormValidated();
 
-                $action->callAfterFormValidated();
+                        $action->callBefore();
+                    }),
+                );
             }
 
-            $action->callBefore();
-
             $result = $action->call([
                 'form' => $form,
             ]);

diff --git a/packages/forms/src/Concerns/HasFormComponentActions.php b/packages/forms/src/Concerns/HasFormComponentActions.php
@@ -65,13 +65,15 @@ public function callMountedFormComponentAction(array $arguments = []): mixed
             if ($this->mountedFormComponentActionHasForm(mountedAction: $action)) {
                 $action->callBeforeFormValidated();
 
-                $action->formData($form->getState());
+                $action->formData(
+                    $form->getState(afterValidate: function () use ($action) {
+                        $action->callAfterFormValidated();
 
-                $action->callAfterFormValidated();
+                        $action->callBefore();
+                    }),
+                );
             }
 
-            $action->callBefore();
-
             $result = $action->call([
                 'form' => $form,
             ]);

diff --git a/packages/infolists/src/Concerns/InteractsWithInfolists.php b/packages/infolists/src/Concerns/InteractsWithInfolists.php
@@ -109,13 +109,15 @@ public function callMountedInfolistAction(array $arguments = []): mixed
             if ($this->mountedInfolistActionHasForm(mountedAction: $action)) {
                 $action->callBeforeFormValidated();
 
-                $action->formData($form->getState());
+                $action->formData(
+                    $form->getState(afterValidate: function () use ($action) {
+                        $action->callAfterFormValidated();
 
-                $action->callAfterFormValidated();
+                        $action->callBefore();
+                    }),
+                );
             }
 
-            $action->callBefore();
-
             $result = $action->call([
                 'form' => $form,
             ]);

diff --git a/packages/tables/src/Concerns/HasActions.php b/packages/tables/src/Concerns/HasActions.php
@@ -99,13 +99,15 @@ public function callMountedTableAction(array $arguments = []): mixed
             if ($this->mountedTableActionHasForm(mountedAction: $action)) {
                 $action->callBeforeFormValidated();
 
-                $action->formData($form->getState());
+                $action->formData(
+                    $form->getState(afterValidate: function () use ($action) {
+                        $action->callAfterFormValidated();
 
-                $action->callAfterFormValidated();
+                        $action->callBefore();
+                    }),
+                );
             }
 
-            $action->callBefore();
-
             $result = $action->call([
                 'form' => $form,
             ]);

diff --git a/packages/tables/src/Concerns/HasBulkActions.php b/packages/tables/src/Concerns/HasBulkActions.php
@@ -70,13 +70,15 @@ public function callMountedTableBulkAction(array $arguments = []): mixed
             if ($this->mountedTableBulkActionHasForm(mountedBulkAction: $action)) {
                 $action->callBeforeFormValidated();
 
-                $action->formData($form->getState());
+                $action->formData(
+                    $form->getState(afterValidate: function () use ($action) {
+                        $action->callAfterFormValidated();
 
-                $action->callAfterFormValidated();
+                        $action->callBefore();
+                    }),
+                );
             }
 
-            $action->callBefore();
-
             $result = $action->call([
                 'form' => $form,
             ]);