Merge pull request #7 from lara-zeus/fix-none-translatable-repeater

fix none translatable repeater when switch locale

Author: atmonshi

src/Resources/Pages/CreateRecord/Concerns/Translatable.php

@@ -42,16 +42,9 @@ protected function handleRecordCreation(array $data): Model
             $record->setTranslation($key, $this->activeLocale, $value);
         }
 
-        $originalData = $data;
-
         foreach ($this->otherLocaleData as $locale => $localeData) {
-            $this->data = [
-                ...$this->data,
-                ...$localeData,
-            ];
-
             try {
-                $this->form->fill($this->data);
+                $this->form->fill($this->form->getRawState());
                 $this->form->validate();
             } catch (ValidationException $exception) {
                 continue;
@@ -64,8 +57,6 @@ protected function handleRecordCreation(array $data): Model
             }
         }
 
-        $data = $originalData;
-
         if (
             static::getResource()::isScopedToTenant() &&
             ($tenant = Filament::getTenant())
@@ -93,14 +84,10 @@ public function updatedActiveLocale(string $newActiveLocale): void
 
         $translatableAttributes = static::getResource()::getTranslatableAttributes();
 
-        // Form::getState triggers the dehydrate hooks of the fields
-        // the before hooks are skipped to allow relationships to be translated
-        // without making it a hassle
         $state = $this->form->getState();
-        $this->otherLocaleData[$this->oldActiveLocale] = Arr::only($state, $translatableAttributes);
+        $this->otherLocaleData[$this->oldActiveLocale] = Arr::only($this->data, $translatableAttributes);
 
         try {
-            // Form::fill triggers the hydrate hooks of the fields
             $this->form->fill([
                 ...Arr::except($state, $translatableAttributes),
                 ...$this->otherLocaleData[$this->activeLocale] ?? [],

src/Resources/Pages/EditRecord/Concerns/Translatable.php

@@ -26,7 +26,9 @@ protected function handleRecordUpdate(Model $record, array $data): Model
     {
         $translatableAttributes = static::getResource()::getTranslatableAttributes();
 
-        $record->fill(Arr::except($data, $translatableAttributes));
+        $record->fill(
+            Arr::except($data, $translatableAttributes)
+        );
 
         foreach (Arr::only($data, $translatableAttributes) as $key => $value) {
             $record->setTranslation($key, $this->activeLocale, $value);
@@ -40,7 +42,7 @@ protected function handleRecordUpdate(Model $record, array $data): Model
                 ->all();
 
             try {
-                $this->form->fill($this->data);
+                $this->form->fill($this->form->getState());
                 $this->form->validate();
             } catch (ValidationException $exception) {
                 if (! array_key_exists($locale, $existingLocales)) {
@@ -79,16 +81,12 @@ public function updatedActiveLocale(): void
 
         $translatableAttributes = static::getResource()::getTranslatableAttributes();
 
-        // Form::getState triggers the dehydrate hooks of the fields
-        // the before hooks are skipped to allow relationships to be translated
-        // without making it a hassle
         $state = $this->form->getState();
         $this->otherLocaleData[$this->oldActiveLocale] = Arr::only($state, $translatableAttributes);
 
         try {
-            // Form::fill triggers the hydrate hooks of the fields
             $this->form->fill([
-                ...Arr::except($state, $translatableAttributes),
+                ...Arr::except($this->form->getRawState(), $translatableAttributes),
                 ...$this->otherLocaleData[$this->activeLocale] ?? [],
             ]);