[4.x] Fix empty localized values not being set properly (#474)

* Fix empty localized values not being set properly

* Fix code style

* Add test for nulled fields

Author: Jade-GG

src/Entries/Entry.php

@@ -15,7 +15,9 @@ class Entry extends FileEntry
 
     public static function fromModel(Model $model)
     {
-        $data = isset($model->data['__localized_fields']) ? collect($model->data)->only($model->data['__localized_fields']) : $model->data;
+        $data = isset($model->data['__localized_fields'])
+            ? collect($model->data['__localized_fields'])->mapWithKeys(fn ($field) => [$field => $model->data[$field] ?? null])
+            : $model->data;
 
         foreach ((new self)->getDataColumnMappings($model) as $key) {
             $data[$key] = $model->$key;

tests/Entries/EntryTest.php

@@ -250,6 +250,43 @@ public function it_propagates_origin_date_to_descendent_models()
         $this->assertEquals($entry->descendants()->get('fr')->model()->date, '2024-01-01 00:00:00');
     }
 
+    #[Test]
+    public function it_localizes_null_fields()
+    {
+        $this->setSites([
+            'en' => ['name' => 'English', 'locale' => 'en_US', 'url' => 'http://test.com/'],
+            'fr' => ['name' => 'French', 'locale' => 'fr_FR', 'url' => 'http://fr.test.com/'],
+            'es' => ['name' => 'Spanish', 'locale' => 'es_ES', 'url' => 'http://test.com/es/'],
+            'de' => ['name' => 'German', 'locale' => 'de_DE', 'url' => 'http://test.com/de/'],
+        ]);
+
+        $blueprint = Facades\Blueprint::makeFromFields(['foo' => ['type' => 'text', 'localizable' => true]])->setHandle('test');
+        $blueprint->save();
+
+        BlueprintRepository::shouldReceive('in')->with('collections/pages')->andReturn(collect(['test' => $blueprint]));
+
+        $collection = (new Collection)
+            ->handle('pages')
+            ->propagate(true)
+            ->sites(['en', 'fr', 'es', 'de'])
+            ->save();
+
+        $entry = (new Entry)
+            ->id(1)
+            ->locale('en')
+            ->collection($collection)
+            ->blueprint('test')
+            ->data(['foo' => 'bar']);
+
+        $entry->save();
+        $entry->descendants()->get('fr')->data(['foo' => null])->save();
+        $entry->descendants()->get('es')->data(['foo' => 'baz'])->save();
+
+        $this->assertNull($entry->descendants()->get('fr')->foo ?? null);
+        $this->assertEquals('bar', $entry->descendants()->get('de')->foo ?? null);
+        $this->assertEquals('baz', $entry->descendants()->get('es')->foo ?? null);
+    }
+
     #[Test]
     public function it_stores_and_retrieves_mapped_data_values()
     {