Don't repopulate textarea unless any errors

kontenta · May 6, 2019 · 178d8d9 · 178d8d9
1 parent f824a68
commit 178d8d9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/resources/views/forms/groups/textarea.blade.php b/resources/views/forms/groups/textarea.blade.php
@@ -10,7 +10,7 @@
       @include('kontour::forms.partials.inputAttributes', [
         'errorsId' => $errorsId = $controlId . ($errorsSuffix ?? 'Errors'),
       ])
-    >{{ old($name, $value ?? $slot ?? $model[$name] ?? '') }}</textarea>
+    >{{ ($errors->any() ? old($name) : null) ?? $value ?? $slot ?? $model[$name] ?? '' }}</textarea>
     {{ $afterControl ?? '' }}
     @include('kontour::forms.partials.errors')
   </div>

diff --git a/tests/Feature/FormViewTests/TextareaTest.php b/tests/Feature/FormViewTests/TextareaTest.php
@@ -53,7 +53,7 @@ public function test_default_value_is_empty_string()
         $this->assertRegExp('/<textarea[\S\s]*><\/textarea>/', $output);
     }
 
-    public function test_old_value_is_used_if_in_session()
+    public function test_old_value_is_not_used_if_no_errors()
     {
         $this->withSession(['_old_input' => ['test' => 'old']]);
         request()->setLaravelSession(session());
@@ -62,6 +62,18 @@ public function test_old_value_is_used_if_in_session()
             'errors' => new MessageBag,
         ])->render();
 
+        $this->assertNotRegExp('/<textarea[\S\s]*>old<\/textarea>/', $output);
+    }
+
+    public function test_old_value_is_used_if_in_session_with_errors()
+    {
+        $this->withSession(['_old_input' => ['test' => 'old']]);
+        request()->setLaravelSession(session());
+        $output = View::make('kontour::forms.textarea', [
+            'name' => 'test',
+            'errors' => new MessageBag(['another_field' => ['An error']]),
+        ])->render();
+
         $this->assertRegExp('/<textarea[\S\s]*>old<\/textarea>/', $output);
     }