Merge pull request #112 from bangnokia/main

merge initialStep with allStepState

src/Components/Concerns/MountsWizard.php

@@ -13,6 +13,8 @@ public function mountMountsWizard(?string $showStep = null, array $initialState
 
         $initialState = $initialState ?? $this->initialState() ?? [];
 
+        $initialState = array_merge($initialState, $this->allStepState);
+
         $this->showStep($stepName, $initialState[$stepName] ?? []);
 
         foreach ($initialState as $stepName => $state) {

tests/InitialStateTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Livewire\Features\SupportTesting\Testable;
 use Livewire\Livewire;
 use Spatie\LivewireWizard\Tests\TestSupport\Components\Steps\FirstStepComponent;
 use Spatie\LivewireWizard\Tests\TestSupport\Components\WizardWithInitialState;
@@ -63,3 +64,14 @@
         ->assertSuccessful()
         ->assertNotSet('name', 'Freek');
 });
+
+it('state is not persisted when wizard recreated', function () {
+    $this->wizard->call('setStepState', 'first-step', ['order' => 456]);
+
+    $wizard = Testable::create(WizardWithInitialState::class, [
+        'order' => 123,
+    ]);
+
+    Livewire::test(FirstStepComponent::class, $wizard->getStepState(FirstStepComponent::class))
+        ->assertSet('order', 123);
+});

tests/PersistStateTest.php

@@ -0,0 +1,33 @@
+<?php
+
+use Livewire\Features\SupportTesting\Testable;
+use Livewire\Livewire;
+use Spatie\LivewireWizard\Tests\TestSupport\Components\Steps\FirstStepComponent;
+use Spatie\LivewireWizard\Tests\TestSupport\Components\WizardWithPersistState;
+
+it('can restore the persisted state', function () {
+    $wizard = Testable::create(WizardWithPersistState::class, [
+        'initialState' => [
+            'first-step' => [
+                'order' => 123
+            ]
+        ]
+    ]);
+
+    $wizard->call('setStepState', 'first-step', ['order' => 456]);
+
+    Livewire::test(FirstStepComponent::class, $wizard->getStepState(FirstStepComponent::class))
+        ->assertSet('order', 456);
+
+    // recreate the wizard
+    $wizard = Testable::create(WizardWithPersistState::class, [
+        'initialState' => [
+            'first-step' => [
+                'order' => 123
+            ]
+        ]
+    ]);
+
+    Livewire::test(FirstStepComponent::class, $wizard->getStepState(FirstStepComponent::class))
+        ->assertSet('order', 456);
+});

tests/TestSupport/Components/WizardWithPersistState.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Spatie\LivewireWizard\Tests\TestSupport\Components;
+
+use Livewire\Attributes\Session;
+use Spatie\LivewireWizard\Components\WizardComponent;
+use Spatie\LivewireWizard\Tests\TestSupport\Components\Steps\FirstStepComponent;
+use Spatie\LivewireWizard\Tests\TestSupport\Components\Steps\SecondStepComponent;
+
+class WizardWithPersistState extends WizardComponent
+{
+    #[Session]
+    public array $allStepState = [];
+
+    public function steps(): array
+    {
+        return [
+            FirstStepComponent::class,
+            SecondStepComponent::class,
+        ];
+    }
+
+    public function initialState(): ?array
+    {
+        return [
+            'first-step' => [
+                'order' => 123
+            ]
+        ];
+    }
+}