[5.x] Use default value from field config

src/Fields/Value.php

@@ -40,13 +40,19 @@ public function raw()
 
     public function value()
     {
+        $raw = $this->raw;
+
         if (! $this->fieldtype) {
-            return $this->raw;
+            return $raw;
+        }
+
+        if (! $raw && ($default = $this->fieldtype->field()?->defaultValue())) {
+            $raw = $default;
         }
 
         $value = $this->shallow
-            ? $this->fieldtype->shallowAugment($this->raw)
-            : $this->fieldtype->augment($this->raw);
+            ? $this->fieldtype->shallowAugment($raw)
+            : $this->fieldtype->augment($raw);
 
         return $value;
     }

src/Http/Resources/CP/Entries/ListedEntry.php

@@ -54,15 +54,14 @@ protected function values($extra = [])
     {
         return $this->columns->mapWithKeys(function ($column) use ($extra) {
             $key = $column->field;
+            $field = $this->blueprint->field($key);
 
             if ($key === 'site') {
                 $value = $this->resource->locale();
             } else {
-                $value = $extra[$key] ?? $this->resource->value($key);
+                $value = $extra[$key] ?? $this->resource->value($key) ?? $field?->defaultValue();
             }
 
-            $field = $this->blueprint->field($key);
-
             if (! $field) {
                 return [$key => $value];
             }

src/Http/Resources/CP/Taxonomies/ListedTerm.php

@@ -53,14 +53,19 @@ protected function values($extra = [])
     {
         return $this->columns->mapWithKeys(function ($column) use ($extra) {
             $key = $column->field;
+            $field = $this->blueprint->field($key);
 
             if ($key == 'taxonomy') {
                 return [$key => $this->resource->taxonomy()->title()];
+            } else {
+                $value = $extra[$key] ?? $this->resource->value($key) ?? $field?->defaultValue();
             }
 
-            $value = $this->blueprint
-                ->field($key)
-                ->setValue($extra[$key] ?? $this->resource->value($key))
+            if (! $field) {
+                return [$key => $value];
+            }
+
+            $value = $field->setValue($value)
                 ->setParent($this->resource)
                 ->preProcessIndex()
                 ->value();

src/Http/Resources/CP/Users/ListedUser.php

@@ -49,10 +49,11 @@ protected function values($extra = [])
     {
         return $this->columns->mapWithKeys(function ($column) use ($extra) {
             $key = $column->field;
+            $field = $this->blueprint->field($key);
 
-            $value = $extra[$key] ?? $this->resource->value($key);
+            $value = $extra[$key] ?? $this->resource->value($key) ?? $field?->defaultValue();
 
-            if ($field = $this->blueprint->field($key)) {
+            if ($field) {
                 $value = $field->setValue($value)->preProcessIndex()->value();
             }
 

tests/Fields/ValueTest.php

@@ -3,6 +3,7 @@
 namespace Tests\Fields;
 
 use Statamic\Facades\Blueprint;
+use Statamic\Fields\Field;
 use Statamic\Fields\Fieldtype;
 use Statamic\Fields\Value;
 use Tests\TestCase;
@@ -153,6 +154,30 @@ public function augment($data)
 
         $this->assertEquals('{"foo":"BAR!","baz":{"id":"123","title":"Title for 123"},"qux":[{"id":"456","title":"Title for 456"},{"id":"789","title":"Title for 789"}]}', json_encode($value));
     }
+
+    /** @test */
+    public function it_uses_the_default_value()
+    {
+        $fieldtype = new class extends Fieldtype
+        {
+            public function augment($value)
+            {
+                return $value.'!';
+            }
+        };
+
+        $fieldtype->setField(new Field('search_engine_url', ['default' => 'https://google.com']));
+
+        tap(new Value(null, null, $fieldtype), function ($value) {
+            $this->assertNull($value->raw());
+            $this->assertEquals('https://google.com!', $value->value());
+        });
+
+        tap(new Value('foo', null, $fieldtype), function ($value) {
+            $this->assertEquals('foo', $value->raw());
+            $this->assertEquals('foo!', $value->value());
+        });
+    }
 }
 
 class DummyAugmentable implements \Statamic\Contracts\Data\Augmentable