fix: image resize (work in progress) (#174)

* fix: image resize (work in progress) * style: formatting * fix: scaleDown
NotFoundNL · Jan 2, 2024 · 708d90f · 708d90f
1 parent 0848dee
commit 708d90f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/src/Services/Assets/Components/ComponentImage.php b/src/Services/Assets/Components/ComponentImage.php
@@ -10,6 +10,7 @@
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
+use Intervention\Image\Drivers\Imagick\Driver;
 use Intervention\Image\ImageManager;
 use NotFound\Framework\Models\Menu;
 use NotFound\Framework\Services\Assets\Enums\AssetType;
@@ -86,7 +87,9 @@ public function save()
             $filename = $this->recordId.'_'.$dimensions->filename.'.jpg';
 
             // create new image instance
-            $image = (new ImageManager(['driver' => 'imagick']))->make(new File(request()->file($fileId)->path()));
+            $image = (new ImageManager(
+                new Driver()
+            ))->read(new File(request()->file($fileId)->path()));
 
             if ($dimensions->height === '0') {
                 $height = intval($image->height() / $image->width() * $width);
@@ -96,18 +99,15 @@ public function save()
             }
 
             if (isset($dimensions->cropType) && $dimensions->cropType === 'fitWithin') {
-                $image->resize($width, $height, function ($constraint) {
-                    $constraint->aspectRatio();
-                    $constraint->upsize();
-                });
+                $image->scaleDown($width, $height);
             } else {
-                $image->fit($width, $height);
+                $image->coverDown($width, $height);
             }
 
-            $image->save(
+            $image->toJpeg()->save(
                 Storage::path('public').$this->relativePathToPublicDisk().$filename
             );
-            $image->save(
+            $image->toWebp()->save(
                 Storage::path('public').$this->relativePathToPublicDisk().$filename.'.webp'
             );
         }

diff --git a/src/Services/Assets/Components/ComponentText.php b/src/Services/Assets/Components/ComponentText.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Http\File;
 use Illuminate\Support\Facades\Storage;
+use Intervention\Image\Drivers\Imagick\Driver;
 use Intervention\Image\ImageManager;
 use NotFound\Framework\Models\EditorSetting;
 use NotFound\Framework\Models\FileUpload;
@@ -95,12 +96,12 @@ public function asyncPostRequest()
         $width = 1200;
 
         // create new image instance
-        $image = (new ImageManager(['driver' => 'imagick']))->make(new File(request()->file('file')));
-        $image->resize($width, null, function ($constraint) {
-            $constraint->aspectRatio();
-        });
+        $image = (new ImageManager(
+            new Driver()
+        ))->read(new File(request()->file('file')));
+        $image->scaleDown($width, null);
 
-        $image->save(
+        $image->toJpeg()->save(
             Storage::path('public').$folder.$filename
         );