Merge pull request #14340 from coleshirley/fix-parent-component-dehyd…

…rate-state-when-hidden Fix parent component dehydrate state when hidden
filamentphp · Oct 8, 2024 · ecbb22b · ecbb22b
2 parents ef7729a + 80fcd8b
commit ecbb22b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/packages/forms/src/Components/Concerns/HasState.php b/packages/forms/src/Components/Concerns/HasState.php
@@ -192,11 +192,11 @@ public function dehydrateState(array &$state, bool $isDehydrated = true): void
             }
         }
 
-        foreach ($this->getChildComponentContainers() as $container) {
-            if ($container->isHidden()) {
-                continue;
-            }
+        if ($this->isHiddenAndNotDehydrated()) {
+            return;
+        }
 
+        foreach ($this->getChildComponentContainers(withHidden: true) as $container) {
             $container->dehydrateState($state, $isDehydrated);
         }
     }

diff --git a/tests/src/Forms/StateTest.php b/tests/src/Forms/StateTest.php
@@ -487,6 +487,25 @@
 
     expect($container)
         ->dehydrateState()->not()->toBe([]);
+
+    $container = ComponentContainer::make(Livewire::make())
+        ->statePath('data')
+        ->components([
+            (new Component)
+                ->id('parent')
+                ->hidden()
+                ->dehydratedWhenHidden()
+                ->childComponents([
+                    (new Component)
+                        ->id('child')
+                        ->statePath(Str::random())
+                        ->default(Str::random()),
+                ]),
+        ])
+        ->fill();
+
+    expect($container)
+        ->dehydrateState()->not()->toBe([]);
 });
 
 test('disabled components are excluded from state dehydration', function () {