simplify aspect ratio handling

jrmajor · Oct 4, 2024 · e1a3bc5 · e1a3bc5
1 parent 2b93a3e
commit e1a3bc5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 31 deletions.
diff --git a/app/Http/Resources/Artists/FullPhotoResource.php b/app/Http/Resources/Artists/FullPhotoResource.php
@@ -18,7 +18,8 @@ public function toArray(Request $request): array
     {
         return [
             'placeholder' => $this->resource->placeholder(),
-            'aspectRatio' => $this->resource->aspectRatio(),
+            'width' => $this->resource->width,
+            'height' => $this->resource->height,
             'url' => $this->resource->url(),
         ];
     }

diff --git a/app/Images/Photo.php b/app/Images/Photo.php
@@ -6,7 +6,6 @@
 use App\Models\Artist;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Intervention\Image\Interfaces\ImageInterface;
-use Psl\Type;
 
 final class Photo extends Image
 {
@@ -54,17 +53,6 @@ public function crop(): ArtistPhotoCrop
         return $this->crop;
     }
 
-    public function aspectRatio(): ?float
-    {
-        if (! $this->width || ! $this->height) {
-            return null;
-        }
-
-        $t = Type\float();
-
-        return $t->coerce($this->width) / $t->coerce($this->height);
-    }
-
     public static function shouldSaveDimensions(): bool
     {
         return true;

diff --git a/resources/js/Pages/Artists/Show.svelte b/resources/js/Pages/Artists/Show.svelte
@@ -29,7 +29,7 @@
 
 	{#if artist.photo}
 		<div
-			style:width="{(artist.photo.aspectRatio ?? 1) * 10}rem"
+			style:aspect-ratio="{artist.photo.width} / {artist.photo.height}"
 			class="overflow-hidden relative flex-none self-center mt-5 mb-2 h-40 rounded-lg shadow-lg sm:my-0 sm:mr-6 -p-px"
 		>
 			<div

diff --git a/resources/js/types/artists.ts b/resources/js/types/artists.ts
@@ -41,7 +41,8 @@ export type FacePhotoResource = {
 
 export type FullPhotoResource = {
 	placeholder: string;
-	aspectRatio: number | null;
+	width: number | null;
+	height: number | null;
 	url: string;
 };
 

diff --git a/tests/Unit/Images/PhotoTest.php b/tests/Unit/Images/PhotoTest.php
@@ -120,22 +120,6 @@ public function testCropUpdated(): void
         Queue::assertPushed(ProcessImage::class);
     }
 
-    #[TestDox('it can calculate aspect ratio')]
-    public function testAspectRatio(): void
-    {
-        $this->assertSame(
-            1.6, (new Photo(['width' => 16, 'height' => 10]))->aspectRatio(),
-        );
-    }
-
-    #[TestDox('aspect ratio is null when dimensions are not set')]
-    public function testNullAspectRatio(): void
-    {
-        $this->assertNull(
-            (new Photo(['width' => null, 'height' => null]))->aspectRatio(),
-        );
-    }
-
     #[TestDox('it can get its artists')]
     public function testArtists(): void
     {