wip

Author: iamgergo

src/Fields/Field.php

@@ -105,11 +105,6 @@ abstract class Field implements Arrayable, JsonSerializable
      */
     protected bool $withOldValue = true;
 
-    /**
-     * Indicates if the field has been hydrated.
-     */
-    protected bool $hydrated = false;
-
     /**
      * Indicates if the field is sortable.
      */
@@ -471,9 +466,11 @@ public function value(?Closure $callback = null): static
      */
     public function resolveValue(Request $request, Model $model): mixed
     {
-        if (! $this->hydrated && $this->withOldValue && $request->session()->hasOldInput($this->getRequestKey())) {
-            $this->resolveHydrate($request, $model, $this->getOldValue($request));
-        }
+        once(function () use ($request, $model): void {
+            if ($this->withOldValue && $request->session()->hasOldInput($this->getRequestKey())) {
+                $this->resolveHydrate($request, $model, $this->getOldValue($request));
+            }
+        });
 
         $value = $this->getValue($model);
 
@@ -615,8 +612,6 @@ public function resolveHydrate(Request $request, Model $model, mixed $value): vo
         }
 
         call_user_func_array($this->hydrateResolver, [$request, $model, $value]);
-
-        $this->hydrated = true;
     }
 
     /**