Handle edits within frontend fields (#7178)

statamic · Dec 8, 2022 · 620a37a · 620a37a
1 parent 69f9016
commit 620a37a
Show file tree

Hide file tree

Showing 9 changed files with 326 additions and 18 deletions.
diff --git a/resources/views/extend/forms/fields/checkboxes.antlers.html b/resources/views/extend/forms/fields/checkboxes.antlers.html
@@ -1,15 +1,14 @@
-{{ foreach:options as="value|label" }}
+{{ foreach:options as="option|label" }}
     <label>
         <input
             type="checkbox"
             name="{{ handle }}[]"
-            value="{{ value }}"
+            value="{{ option }}"
             {{ if js_driver }}{{ js_attributes }}{{ /if }}
-            {{ if (old | in_array:value) }}checked{{ /if }}
-            {{ if ! old && value === default }}checked{{ /if }}
+            {{ if value|in_array:option }}checked{{ /if }}
             {{ if validate|contains:required }}required{{ /if }}
         >
-        {{ label !== null ? label : value }}
+        {{ label !== null ? label : option }}
     </label>
     {{ unless inline }}
         <br>

diff --git a/resources/views/extend/forms/fields/default.antlers.html b/resources/views/extend/forms/fields/default.antlers.html
@@ -1,7 +1,7 @@
 <input
-    type="text"
+    type="{{ input_type ?? 'text' }}"
     name="{{ handle }}"
-    value="{{ old ?? default}}"
+    value="{{ value }}"
     {{ if placeholder }}placeholder="{{ placeholder }}"{{ /if }}
     {{ if character_limit }}maxlength="{{ character_limit }}"{{ /if }}
     {{ if js_driver }}{{ js_attributes }}{{ /if }}

diff --git a/resources/views/extend/forms/fields/radio.antlers.html b/resources/views/extend/forms/fields/radio.antlers.html
@@ -1,15 +1,14 @@
-{{ foreach:options as="value|label" }}
+{{ foreach:options as="option|label" }}
     <label>
         <input
             type="radio"
             name="{{ handle }}"
-            value="{{ value }}"
+            value="{{ option }}"
             {{ if js_driver }}{{ js_attributes }}{{ /if }}
-            {{ if old === value }}checked{{ /if }}
-            {{ if ! old && value === default }}checked{{ /if }}
+            {{ if value == option }}checked{{ /if }}
             {{ if validate|contains:required }}required{{ /if }}
         >
-        {{ label !== null ? label : value }}
+        {{ label !== null ? label : option }}
     </label>
     {{ unless inline }}
         <br>

diff --git a/resources/views/extend/forms/fields/select.antlers.html b/resources/views/extend/forms/fields/select.antlers.html
@@ -13,9 +13,9 @@
             {{ /if }}
         </option>
     {{ /unless }}
-    {{ foreach:options as="value|label" }}
-        <option value="{{ value }}"{{ if old|in_array:value or old === value }} selected{{ /if }}{{ if ! old && default === value }} selected{{ /if }}>
-            {{ label !== null ? label : value }}
+    {{ foreach:options as="option|label" }}
+        <option value="{{ option }}"{{ if multiple }}{{ if value|in_array:option }} selected{{ /if }}{{ else }}{{ if option == value }} selected{{ /if }}{{ /if }}>
+            {{ label !== null ? label : option }}
         </option>
     {{ /foreach:options }}
 </select>
diff --git a/resources/views/extend/forms/fields/text.antlers.html b/resources/views/extend/forms/fields/text.antlers.html
@@ -1,7 +1,7 @@
 <input
     type="{{ input_type ?? 'text' }}"
     name="{{ handle }}"
-    value="{{ old ?? default }}"
+    value="{{ value }}"
     {{ if placeholder }}placeholder="{{ placeholder }}"{{ /if }}
     {{ if character_limit }}maxlength="{{ character_limit }}"{{ /if }}
     {{ if js_driver }}{{ js_attributes }}{{ /if }}

diff --git a/resources/views/extend/forms/fields/textarea.antlers.html b/resources/views/extend/forms/fields/textarea.antlers.html
@@ -6,5 +6,5 @@
     {{ if js_driver }}{{ js_attributes }}{{ /if }}
     {{ if validate|contains:required }}required{{ /if }}
 >
-    {{ old ?? default }}
+    {{ value }}
 </textarea>
diff --git a/resources/views/extend/forms/fields/toggle.antlers.html b/resources/views/extend/forms/fields/toggle.antlers.html
@@ -5,7 +5,7 @@
         name="{{ handle }}"
         value="1"
         {{ if js_driver }}{{ js_attributes }}{{ /if }}
-        {{ if ! old && default }}checked{{ /if }}
+        {{ if value && value !== '0' }}checked{{ /if }}
         {{ if validate|contains:required }}required{{ /if }}
     >
     {{ if inline_label }}

diff --git a/src/Tags/Concerns/RendersForms.php b/src/Tags/Concerns/RendersForms.php
@@ -127,9 +127,15 @@ protected function getRenderableField($field, $errorBag = 'default', $manipulate
     {
         $errors = session('errors') ? session('errors')->getBag($errorBag) : new MessageBag;
 
+        $missing = str_random();
+        $old = old($field->handle(), $missing);
+        $default = $field->value() ?? $field->defaultValue();
+        $value = $old === $missing ? $default : $old;
+
         $data = array_merge($field->toArray(), [
             'error' => $errors->first($field->handle()) ?: null,
             'old' => old($field->handle()),
+            'value' => $value,
         ]);
 
         if ($manipulateDataCallback instanceof Closure) {