better blade

Author: QuentinGab

resources/views/components/img.blade.php

@@ -13,16 +13,21 @@
 ])
 
 @php
-    $placeholder = $placeholder === true ? 'placeholder' : $placeholder;
-    $placeholderValue = $placeholder ? $media->getConversion($placeholder)?->contents : null;
+    $source = $conversion
+        ? $media->getConversion(
+            name: $conversion,
+            state: \Elegantly\Media\Enums\MediaConversionState::Succeeded,
+            fallback: is_bool($fallback) ? null : $fallback,
+            dispatch: $dispatch,
+        )
+        : null;
+
+    $source ??= $fallback === true ? $media : null;
 
-    $url =
-        $src ??
-        $media->getUrl(conversion: $conversion, fallback: $fallback, parameters: $parameters, dispatch: $dispatch);
+    $placeholder = $placeholder === true ? 'placeholder' : $placeholder;
+    $placeholderContents = $placeholder ? $media->getConversion($placeholder)?->contents : null;
 @endphp
 
-<img {!! $attributes !!} loading="{{ $loading }}" src="{!! $url !!}"
-    height="{{ $height ?? $media->getHeight($conversion, $fallback) }}"
-    width="{{ $width ?? $media->getWidth($conversion, $fallback) }}"
-    alt="{{ $alt ?? $media->getName($conversion, $fallback) }}"
-    @if ($placeholderValue) style="background-size:cover;background-image: url(data:image/jpeg;base64,{{ $placeholderValue }})" @endif>
+<img {!! $attributes !!} loading="{{ $loading }}" src="{!! $src ?? $source?->getUrl($parameters) !!}"
+    height="{{ $height ?? $source?->height }}" width="{{ $width ?? $source?->width }}" alt="{{ $alt ?? $source?->name }}"
+    @if ($placeholderContents) style="background-size:cover;background-image: url(data:image/jpeg;base64,{{ $placeholderContents }})" @endif>

resources/views/components/video.blade.php

@@ -36,8 +36,8 @@
 
 @endphp
 
-<video {!! $attributes !!} src="{!! $src ?? $source->url !!}" height="{{ $height ?? $source->height }}"
-    width="{{ $width ?? $source->width }}" alt="{{ $alt ?? $source->name }}" poster="{{ $poster }}"
+<video {!! $attributes !!} src="{!! $src ?? $source?->getUrl($parameters) !!}" height="{{ $height ?? $source?->height }}"
+    width="{{ $width ?? $source?->width }}" alt="{{ $alt ?? $source?->name }}" poster="{{ $poster }}"
     {{ when($autoplay, 'autoplay') }} {{ when($muted, 'muted') }} {{ when($playsinline, 'playsinline') }}
     {{ when($loop, 'loop') }}>
     {{ $slot }}

src/Concerns/InteractWithFiles.php

@@ -324,4 +324,18 @@ public function humanReadableDuration(
             ->cascade()
             ->forHumans($syntax, $short, $parts, $options);
     }
+
+    /**
+     * Whether the file is safe to use with <img>, <video>, etc. in the browser.
+     */
+    public function isBrowserSafe(): bool
+    {
+        return match ($this->type) {
+            MediaType::Image => in_array($this->mime_type, ['image/apng', 'image/avif', 'image/gif', 'image/jpeg', 'image/png', 'image/svg', 'image/webp']),
+            MediaType::Video => in_array($this->mime_type, ['video/mp4', 'video/x-m4v', 'video/webm']),
+            MediaType::Audio => in_array($this->mime_type, ['audio/mpeg', 'audio/mp4', 'audio/webm', 'audio/wav']),
+            MediaType::Pdf => true,
+            default => false,
+        };
+    }
 }