From 7d40b7a32a73737a9a87f9f3d78f23f05514c75c Mon Sep 17 00:00:00 2001
From: LT <leetoplayaz@yandex.ru>
Date: Thu, 15 Dec 2022 21:05:54 +0300
Subject: [PATCH] fixed hasOne/hasMany Image/File

---
 resources/views/fields/file.blade.php         | 101 +++++++++++++-----
 resources/views/fields/image.blade.php        |  91 +++++++++++-----
 resources/views/fields/shared/file.blade.php  |  19 ++--
 .../views/fields/shared/full-fields.blade.php |  40 +++----
 .../fields/shared/table-fields.blade.php      |  34 +++---
 resources/views/shared/icons/clip.blade.php   |   6 ++
 src/Fields/File.php                           |   4 +-
 src/Fields/HasMany.php                        |   8 +-
 src/Fields/HasOne.php                         |   4 +-
 src/Fields/Image.php                          |   4 +-
 src/Traits/Fields/FileTrait.php               |  64 +++++++++--
 11 files changed, 263 insertions(+), 112 deletions(-)
 create mode 100644 resources/views/shared/icons/clip.blade.php

diff --git a/resources/views/fields/file.blade.php b/resources/views/fields/file.blade.php
index 9a102d923..f37fabf10 100644
--- a/resources/views/fields/file.blade.php
+++ b/resources/views/fields/file.blade.php
@@ -2,28 +2,82 @@
     @if($field->formViewValue($item))
         @if($field->isMultiple())
             <div class="my-2">
-                <div class="border border-gray-200 rounded-md">
-                    @foreach($field->formViewValue($item) as $index => $file)
-                        <div x-data="{}" x-ref="hidden_parent_{{ $field->id() }}"  class="pl-3 pr-4 py-3 flex items-center justify-between text-sm leading-5">
-                            <input x-ref="hidden_{{ $field->id() }}" type="hidden" name="hidden_{{ $field->name() }}" value="{{ $file }}" />
-
-                            @include('moonshine::fields.shared.file', [
-                                'index' => $index+1,
-                                'canDownload' => $field->canDownload(),
-                                'value' => $file,
-                                'field' => $field,
-                            ])
-
-                            @if($field->isRemovable())
-                                <div class="ml-4 flex-shrink-0">
-                                    <a href="#" @click="$refs.hidden_parent_{{ $field->id() }}.remove();" class="font-medium text-pink hover:text-pink transition duration-150 ease-in-out">
-                                        {{ trans('moonshine::ui.delete') }}
-                                    </a>
+                @if($field->attributes()->has('x-model'))
+                    <div x-data="{fileValue: {{ $field->attributes()->get('x-model', '') }}}" class="border border-gray-200 rounded-md">
+                        <template x-for="(file, index) in fileValue" :key="index">
+                            <div :id="'hidden_parent_{{ $field->id() }}' + index" class="pl-3 pr-4 py-3 flex items-center justify-between text-sm leading-5">
+                                <input x-ref="hidden_{{ $field->id() }}"
+                                       type="hidden"
+                                       :value="file"
+                                       :name="'hidden_' + {{ $field->attributes()->get('x-bind:name') }} + '[]'"
+                                />
+
+                                <div class="my-2">
+                                    <div class="flex-1 flex items-center">
+                                        @include('moonshine::shared.icons.clip', [
+                                            'class' => 'flex-shrink-0'
+                                        ])
+
+                                        <span class="ml-2 flex-1 truncate"
+                                              x-text="'@lang('moonshine::ui.file') ' + (index + 1)"
+                                        ></span>
+
+                                        @if($field->canDownload())
+                                            <div class="ml-4 flex-shrink-0">
+                                                <a :href="file ? ('{{ Storage::url('') }}') + file : ''"
+                                                   download
+                                                   class="font-medium text-pink hover:text-pink transition duration-150 ease-in-out">
+                                                    {{ trans('moonshine::ui.download') }}
+                                                </a>
+                                            </div>
+                                        @endif
+                                    </div>
                                 </div>
-                            @endif
-                        </div>
-                    @endforeach
-                </div>
+
+                                @if($field->isRemovable())
+                                    <div class="ml-4 flex-shrink-0">
+                                        <a href="#" @click="$event.target.closest('#hidden_parent_{{ $field->id() }}' + index).remove()"
+                                           class="font-medium text-pink hover:text-pink transition duration-150 ease-in-out">
+                                            {{ trans('moonshine::ui.delete') }}
+                                        </a>
+                                    </div>
+                                @endif
+                            </div>
+                        </template>
+                    </div>
+                @else
+                    <div class="border border-gray-200 rounded-md">
+                        @foreach($field->formViewValue($item) as $index => $file)
+                            <div x-data="{}"
+                                 x-ref="hidden_parent_{{ $field->id() }}"
+                                 class="pl-3 pr-4 py-3 flex items-center justify-between text-sm leading-5"
+                            >
+
+                                <input x-ref="hidden_{{ $field->id() }}"
+                                       type="hidden"
+                                       value="{{ $file }}"
+                                       name="hidden_{{ $field->name() }}"
+                                />
+
+                                @include('moonshine::fields.shared.file', [
+                                    'index' => $index+1,
+                                    'canDownload' => $field->canDownload(),
+                                    'value' => $file,
+                                    'field' => $field,
+                                ])
+
+                                @if($field->isRemovable())
+                                    <div class="ml-4 flex-shrink-0">
+                                        <a href="#" @click="$refs.hidden_parent_{{ $field->id() }}.remove();"
+                                           class="font-medium text-pink hover:text-pink transition duration-150 ease-in-out">
+                                            {{ trans('moonshine::ui.delete') }}
+                                        </a>
+                                    </div>
+                                @endif
+                            </div>
+                        @endforeach
+                    </div>
+                @endif
             </div>
         @else
             @include('moonshine::fields.shared.file', [
@@ -35,8 +89,7 @@
     @endif
 
     @include("moonshine::fields.input", [
-        'field' => $field,
-        'item' => $item
+        "field" => $field,
+        "item" => $item
     ])
 </div>
-
diff --git a/resources/views/fields/image.blade.php b/resources/views/fields/image.blade.php
index 2582021fe..050df14d1 100644
--- a/resources/views/fields/image.blade.php
+++ b/resources/views/fields/image.blade.php
@@ -2,37 +2,80 @@
     @if($field->formViewValue($item))
         @if($field->isMultiple())
             <div>
-                <div class="grid md:grid-cols-2 sm:grid-cols-1 lg:grid-cols-3 m-5 mb-10">
-                    @foreach($field->formViewValue($item) as $index => $file)
-                        <div x-data="{}" x-ref="hidden_parent_{{ $field->id() }}"
-                             class="relative bg-white p-3 m-2 border-1 border-dashed border-gray-100 shadow-md rounded-lg overflow-hidden">
-                            <input x-ref="hidden_{{ $field->id() }}" type="hidden" name="hidden_{{ $field->name() }}"
-                                   value="{{ $file }}"/>
+                @if($field->attributes()->has('x-model'))
+                    <div x-data="{imageValue: {{ $field->attributes()->get('x-model', '') }}}" class="grid md:grid-cols-2 sm:grid-cols-1 lg:grid-cols-3 m-5 mb-10">
+                        <template x-for="(image, index) in imageValue" :key="index">
+                            <div :id="'hidden_parent_{{ $field->id() }}' + index" class="relative bg-white p-3 m-2 border-1 border-dashed border-gray-100 shadow-md rounded-lg overflow-hidden">
+                                <input x-ref="hidden_{{ $field->id() }}"
+                                       type="hidden"
+                                       :value="image"
+                                       :name="'hidden_' + {{ $field->attributes()->get('x-bind:name') }} + '[]'"
+                                />
 
-                            <img @click.stop="$dispatch('img-modal', {imgModalSrc: '{{ Storage::url($file) }}' })"
-                                 class="w-full object-cover object-center rounded"
-                                 src="{{ Storage::url($file) }}"
-                            />
+                                <img class="w-full"
+                                     :src="image ? ('{{ Storage::url('') }}') + image : ''"
+                                />
 
-                            @if($field->isRemovable())
-                                <div class="p-4 absolute top-0 right-0">
-                                    <div class="text-center">
-                                        <a href="#" @click="$refs.hidden_parent_{{ $field->id() }}.remove();"
-                                           class="px-4 py-2 bg-red-500 shadow-lg border rounded-lg text-white uppercase font-semibold tracking-wider focus:outline-none focus:shadow-outline hover:bg-red-400 active:bg-red-400">
-                                            {{ trans('moonshine::ui.delete') }}
-                                        </a>
+                                @if($field->isRemovable())
+                                    <div class="p-4 absolute top-0 right-0">
+                                        <div class="text-center">
+                                            <a href="#" @click="$event.target.closest('#hidden_parent_{{ $field->id() }}' + index).remove()"
+                                               class="px-4 py-2 bg-red-500 shadow-lg border rounded-lg text-white uppercase font-semibold tracking-wider focus:outline-none focus:shadow-outline hover:bg-red-400 active:bg-red-400">
+                                                {{ trans('moonshine::ui.delete') }}
+                                            </a>
+                                        </div>
                                     </div>
-                                </div>
-                            @endif
-                        </div>
-                    @endforeach
-                </div>
+                                @endif
+                            </div>
+                        </template>
+                    </div>
+                @else
+                    <div class="grid md:grid-cols-2 sm:grid-cols-1 lg:grid-cols-3 m-5 mb-10">
+                        @foreach($field->formViewValue($item) as $index => $file)
+                            <div x-data="{}"
+                                 x-ref="hidden_parent_{{ $field->id() }}"
+                                 class="relative bg-white p-3 m-2 border-1 border-dashed border-gray-100 shadow-md rounded-lg overflow-hidden"
+                            >
+
+                                <input x-ref="hidden_{{ $field->id() }}"
+                                       type="hidden"
+                                       value="{{ $file }}"
+                                       name="hidden_{{ $field->name() }}"
+                                />
+
+                                <img class="w-full"
+                                     @click.stop="$dispatch('img-modal', {imgModal: true, imgModalSrc: '{{ Storage::url($file) }}' })"
+                                     src="{{ Storage::url($file) }}"
+                                />
+
+                                @if($field->isRemovable())
+                                    <div class="p-4 absolute top-0 right-0">
+                                        <div class="text-center">
+                                            <a href="#" @click="$refs.hidden_parent_{{ $field->id() }}.remove();"
+                                               class="px-4 py-2 bg-red-500 shadow-lg border rounded-lg text-white uppercase font-semibold tracking-wider focus:outline-none focus:shadow-outline hover:bg-red-400 active:bg-red-400">
+                                                {{ trans('moonshine::ui.delete') }}
+                                            </a>
+                                        </div>
+                                    </div>
+                                @endif
+                            </div>
+                        @endforeach
+                    </div>
+                @endif
             </div>
         @else
-            <div x-data="{}" class="max-w-sm rounded overflow-hidden shadow-lg my-2">
+            <div
+                @if($field->attributes()->has('x-model'))
+                    x-data="{imageValue: {{ $field->attributes()->get('x-model', '') }}}"
+                @else
+                    x-data="{imageValue: ''}"
+                @endif
+
+                class="max-w-sm rounded overflow-hidden shadow-lg my-2"
+            >
                 <img class="w-full"
                      @if($field->attributes()->has('x-model'))
-                         :src="({{ $field->attributes()->get('x-model') }}) ? ('{{ Storage::url('') }}' + {{ $field->attributes()->get('x-model') }}) : ''"
+                         :src="imageValue ? ('{{ Storage::url('') }}') + imageValue : ''"
                      @else
                          @click.stop="$dispatch('img-modal', {imgModal: true, imgModalSrc: '{{ Storage::url($field->formViewValue($item)) }}' })"
                      src="{{ Storage::url($field->formViewValue($item)) }}"
diff --git a/resources/views/fields/shared/file.blade.php b/resources/views/fields/shared/file.blade.php
index 201232804..95f1ed09b 100644
--- a/resources/views/fields/shared/file.blade.php
+++ b/resources/views/fields/shared/file.blade.php
@@ -1,11 +1,14 @@
-<div class="my-2">
+<div class="my-2"
+     @if(isset($field) && $field->attributes()->has('x-model'))
+         x-data="{fileValue: {{ $field->attributes()->get('x-model', '') }}}"
+     @else
+         x-data="{fileValue: ''}"
+    @endif
+>
     <div class="flex-1 flex items-center">
-        <svg class="flex-shrink-0 h-5 w-5 text-gray-400" x-description="Heroicon name: paper-clip" viewBox="0 0 20 20"
-             fill="currentColor">
-            <path fill-rule="evenodd"
-                  d="M8 4a3 3 0 00-3 3v4a5 5 0 0010 0V7a1 1 0 112 0v4a7 7 0 11-14 0V7a5 5 0 0110 0v4a3 3 0 11-6 0V7a1 1 0 012 0v4a1 1 0 102 0V7a3 3 0 00-3-3z"
-                  clip-rule="evenodd"></path>
-        </svg>
+        @include('moonshine::shared.icons.clip', [
+            'class' => 'flex-shrink-0'
+        ])
 
         <span class="ml-2 flex-1 truncate">
             @lang('moonshine::ui.file') {{ $index ?? '' }}
@@ -14,7 +17,7 @@
         @if($canDownload)
             <div class="ml-4 flex-shrink-0">
                 <a @if(isset($field) && $field->attributes()->has('x-model'))
-                       :href="({{ $field->attributes()->get('x-model') }}) ? ('{{ Storage::url('') }}' + {{ $field->attributes()->get('x-model') }}) : ''"
+                       :href="fileValue ? ('{{ Storage::url('') }}') + fileValue : ''"
                    @else
                        href="{{ Storage::url($value) }}"
                    @endif
diff --git a/resources/views/fields/shared/full-fields.blade.php b/resources/views/fields/shared/full-fields.blade.php
index 9a0684f08..2215ba680 100644
--- a/resources/views/fields/shared/full-fields.blade.php
+++ b/resources/views/fields/shared/full-fields.blade.php
@@ -1,5 +1,5 @@
 <div x-data="handler_{{ $field->id() }}()" x-init="handler_init_{{ $field->id() }}">
-    <template x-for="(item, index{{ $level }}) in items" :key="index{{ $level }}">
+    <template x-for="(item, index{{ $level }}) in items" :key="Object.values(item)[0] ? Object.values(item)[0] : index{{ $level }}">
         <div :data-id="item.id" class="full_fields_{{ $field->id() }}">
             @if(!$field->toOne())
                 <div class="font-bold text-purple my-4" x-text="index{{ $level }} + 1"></div>
@@ -26,7 +26,7 @@
     <div class="my-4">
         @if(!$field->toOne())
             <button type="button"
-                class="bg-gradient-to-r from-purple to-pink text-white
+                    class="bg-gradient-to-r from-purple to-pink text-white
                             text-white font-semibold py-2 px-4 rounded"
                     @click="addNewField()"
             >
@@ -34,33 +34,33 @@ class="bg-gradient-to-r from-purple to-pink text-white
             </button>
         @else
             <button x-show="items.length == 0" type="button"
-                class="bg-gradient-to-r from-purple to-pink text-white
+                    class="bg-gradient-to-r from-purple to-pink text-white
                         text-white font-semibold py-2 px-4 rounded"
                     @click="addNewField()"
             >
                 @lang('moonshine::ui.create')
             </button>
-    @endif
+        @endif
     </div>
 </div>
 
 <script>
-  function handler_{{ $field->id() }}() {
-    return {
-      handler_init_{{ $field->id() }} () {
-        this.items = @json($field->jsonValues($item));
-      },
-      items: [],
-      addNewField() {
-        if(Array.isArray(this.items)) {
-          this.items.push(@json($field->jsonValues()));
-        } else {
-          this.items = [@json($field->jsonValues())];
+    function handler_{{ $field->id() }}() {
+        return {
+            handler_init_{{ $field->id() }} () {
+                this.items = @json($field->jsonValues($item));
+            },
+            items: [],
+            addNewField() {
+                if(Array.isArray(this.items)) {
+                    this.items.push(@json($field->jsonValues()));
+                } else {
+                    this.items = [@json($field->jsonValues())];
+                }
+            },
+            removeField(index) {
+                this.items.splice(index, 1);
+            },
         }
-      },
-      removeField(index) {
-        this.items.splice(index, 1);
-      },
     }
-  }
 </script>
diff --git a/resources/views/fields/shared/table-fields.blade.php b/resources/views/fields/shared/table-fields.blade.php
index 4748a4868..e854de45c 100644
--- a/resources/views/fields/shared/table-fields.blade.php
+++ b/resources/views/fields/shared/table-fields.blade.php
@@ -22,7 +22,7 @@
                     </thead>
 
                     <tbody class="bg-white dark:bg-darkblue text-black dark:text-white">
-                    <template x-for="(item, index{{ $level }}) in items" :key="index{{ $level }}"
+                    <template x-for="(item, index{{ $level }}) in items" :key="Object.values(item)[0] ? Object.values(item)[0] : index{{ $level }}"
                     >
                         <tr :data-id="item.id" class="table_fields_{{ $field->id() }}">
                             @if(!$field->toOne())
@@ -78,22 +78,22 @@ class="bg-gradient-to-r from-purple to-pink text-white
 </div>
 
 <script>
-  function handler_{{ $field->id() }}() {
-    return {
-      handler_init_{{ $field->id() }}() {
-        this.items = @json($field->jsonValues($item));
-      },
-      items: [],
-      addNewField() {
-        if(Array.isArray(this.items)) {
-          this.items.push(@json($field->jsonValues()));
-        } else {
-          this.items = [@json($field->jsonValues())];
+    function handler_{{ $field->id() }}() {
+        return {
+            handler_init_{{ $field->id() }}() {
+                this.items = @json($field->jsonValues($item));
+            },
+            items: [],
+            addNewField() {
+                if(Array.isArray(this.items)) {
+                    this.items.push(@json($field->jsonValues()));
+                } else {
+                    this.items = [@json($field->jsonValues())];
+                }
+            },
+            removeField(index) {
+                this.items.splice(index, 1);
+            },
         }
-      },
-      removeField(index) {
-        this.items.splice(index, 1);
-      },
     }
-  }
 </script>
diff --git a/resources/views/shared/icons/clip.blade.php b/resources/views/shared/icons/clip.blade.php
new file mode 100644
index 000000000..3d41dff31
--- /dev/null
+++ b/resources/views/shared/icons/clip.blade.php
@@ -0,0 +1,6 @@
+<svg class="fill-current w-{{ $size ?? 5 }} h-{{ $size ?? 5 }} {{ $class ?? '' }} {{ isset($color) ? "text-$color" : '' }}" viewBox="0 0 20 20"
+     fill="currentColor">
+    <path fill-rule="evenodd"
+          d="M8 4a3 3 0 00-3 3v4a5 5 0 0010 0V7a1 1 0 112 0v4a7 7 0 11-14 0V7a5 5 0 0110 0v4a3 3 0 11-6 0V7a1 1 0 012 0v4a1 1 0 102 0V7a3 3 0 00-3-3z"
+          clip-rule="evenodd"></path>
+</svg>
diff --git a/src/Fields/File.php b/src/Fields/File.php
index 7f1b98bfb..35c414fc9 100644
--- a/src/Fields/File.php
+++ b/src/Fields/File.php
@@ -41,7 +41,7 @@ public function indexViewValue(Model $item, bool $container = true): mixed
         if ($this->isMultiple()) {
             return collect($item->{$this->field()})
                 ->map(fn($value, $index) => view('moonshine::fields.shared.file', [
-                    'value' => Storage::url($this->prefixedValue($value)),
+                    'value' => Storage::url($this->unPrefixedValue($value)),
                     'index' => $index + 1,
                     'canDownload' => $this->canDownload(),
                 ])->render())->implode('');
@@ -50,7 +50,7 @@ public function indexViewValue(Model $item, bool $container = true): mixed
         return view(
             'moonshine::fields.shared.file',
             [
-                'value' => Storage::url($this->prefixedValue($item->{$this->field()})),
+                'value' => Storage::url($this->unPrefixedValue($item->{$this->field()})),
                 'canDownload' => $this->canDownload(),
             ]
         );
diff --git a/src/Fields/HasMany.php b/src/Fields/HasMany.php
index 301efe5bb..59a7530d4 100644
--- a/src/Fields/HasMany.php
+++ b/src/Fields/HasMany.php
@@ -43,7 +43,7 @@ public function indexViewValue(Model $item, bool $container = false): mixed
         ]);
     }
 
-    public function exportViewValue(Model $item): mixed
+    public function exportViewValue(Model $item): string
     {
         return '';
     }
@@ -59,7 +59,7 @@ public function save(Model $item): Model
             ->toArray();
 
         if ($this->requestValue() !== false) {
-            foreach ($this->requestValue() as $values) {
+            foreach ($this->requestValue() as $index => $values) {
                 $identity = null;
 
                 foreach ($this->getFields() as $field) {
@@ -68,8 +68,8 @@ public function save(Model $item): Model
                         $currentIdentities[$identity] = $identity;
                     }
 
-                    if ($field instanceof Fileable && isset($values[$field->field()])) {
-                        $values[$field->field()] = $field->store($values[$field->field()]);
+                    if ($field instanceof Fileable) {
+                        $values = $field->hasManyOrOneSave("hidden_{$this->field()}.$index.{$field->field()}", $values);
                     }
                 }
 
diff --git a/src/Fields/HasOne.php b/src/Fields/HasOne.php
index 3f216c4df..e598f22d4 100644
--- a/src/Fields/HasOne.php
+++ b/src/Fields/HasOne.php
@@ -35,8 +35,8 @@ public function save(Model $item): Model
         $table = $related->getTable();
 
         foreach ($this->getFields() as $field) {
-            if ($field instanceof Fileable && isset($values[$field->field()])) {
-                $values[$field->field()] = $field->store($values[$field->field()]);
+            if ($field instanceof Fileable) {
+                $values = $field->hasManyOrOneSave("hidden_{$this->field()}.{$field->field()}", $values);
             }
         }
 
diff --git a/src/Fields/Image.php b/src/Fields/Image.php
index 731301dd8..5be43b15f 100644
--- a/src/Fields/Image.php
+++ b/src/Fields/Image.php
@@ -27,7 +27,7 @@ public function indexViewValue(Model $item, bool $container = true): mixed
 
         if ($this->isMultiple()) {
             $values = collect($item->{$this->field()})
-                ->map(fn($value) => "'".Storage::url($this->prefixedValue($value))."'")->implode(',');
+                ->map(fn($value) => "'".Storage::url($this->unPrefixedValue($value))."'")->implode(',');
 
             return view('moonshine::shared.carousel', [
                 'values' => $values
@@ -35,7 +35,7 @@ public function indexViewValue(Model $item, bool $container = true): mixed
         }
 
         return view('moonshine::fields.shared.thumbnail', [
-            'value' => Storage::url($this->prefixedValue($item->{$this->field()})),
+            'value' => Storage::url($this->unPrefixedValue($item->{$this->field()})),
         ]);
     }
 }
diff --git a/src/Traits/Fields/FileTrait.php b/src/Traits/Fields/FileTrait.php
index 166a5961f..69f5447ef 100644
--- a/src/Traits/Fields/FileTrait.php
+++ b/src/Traits/Fields/FileTrait.php
@@ -6,6 +6,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Storage;
 use Leeto\MoonShine\Exceptions\FieldException;
 use Leeto\MoonShine\Helpers\Condition;
@@ -30,6 +31,11 @@ public function withPrefix(string $withPrefix): static
         return $this;
     }
 
+    public function prefix(): string
+    {
+        return $this->withPrefix;
+    }
+
     public function disk(string $disk): static
     {
         $this->disk = $disk;
@@ -100,7 +106,36 @@ public function store(UploadedFile $file): string
             new FieldException("$extension not allowed")
         );
 
-        return $file->store($this->getDir(), $this->getDisk());
+        return $this->prefixedValue(
+            $file->store($this->getDir(), $this->getDisk())
+        );
+    }
+
+    /**
+     * @throws Throwable
+     */
+    public function hasManyOrOneSave($hiddenKey, array $values = []): array
+    {
+        if ($this->isMultiple()) {
+            $saveValues = collect(request($hiddenKey, []))
+                ->map(fn($file) => $this->prefixedValue($file));
+
+            if(isset($values[$this->field()])) {
+                $saveValues = $saveValues->merge([
+                    $this->store($values[$this->field()])
+                ]);
+            }
+
+            $values[$this->field()] = $saveValues->values()
+                ->unique()
+                ->map(fn($file) => $this->prefixedValue($file))
+                ->toArray();
+
+        } elseif(isset($values[$this->field()])) {
+            $values[$this->field()] = $this->store($values[$this->field()]);
+        }
+
+        return $values;
     }
 
     /**
@@ -109,7 +144,9 @@ public function store(UploadedFile $file): string
     public function save(Model $item): Model
     {
         $requestValue = $this->requestValue();
-        $oldValues = collect(request("hidden_{$this->field()}", []));
+        $oldValues = collect(request("hidden_{$this->field()}", []))
+            ->map(fn($file) => $this->prefixedValue($file));
+
         $saveValue = $this->isMultiple() ? $oldValues : null;
 
         if ($requestValue !== false) {
@@ -117,12 +154,16 @@ public function save(Model $item): Model
                 $paths = [];
 
                 foreach ($requestValue as $file) {
-                    $paths[] = $this->prefixedValue($this->store($file));
+                    $paths[] = $this->store($file);
                 }
 
-                $saveValue = $saveValue->merge($paths)->unique()->toArray();
+                $saveValue = $saveValue->merge($paths)
+                    ->values()
+                    ->map(fn($file) => $this->prefixedValue($file))
+                    ->unique()
+                    ->toArray();
             } else {
-                $saveValue = $this->prefixedValue($this->store($requestValue));
+                $saveValue = $this->store($requestValue);
             }
         }
 
@@ -133,19 +174,24 @@ public function save(Model $item): Model
         return $item;
     }
 
-    public function formViewValue(Model $item): mixed
+    public function formViewValue(Model $item): Collection|string
     {
         if ($this->isMultiple()) {
             return collect($item->{$this->field()})
-                ->map(fn($value) => $this->prefixedValue($value));
+                ->map(fn($value) => $this->unPrefixedValue($value));
         }
 
-        return $this->prefixedValue($item->{$this->field()});
+        return $this->unPrefixedValue($item->{$this->field()});
+    }
+
+    protected function unPrefixedValue(?string $value): string
+    {
+        return $value ? ltrim($value, $this->prefix()) : '';
     }
 
     protected function prefixedValue(?string $value): string
     {
-        return $value ? ltrim($value, $this->withPrefix) : '';
+        return $value ? ($this->prefix() . ltrim($value, $this->prefix())) : '';
     }
 
     public function exportViewValue(Model $item): string