From eb56f4669335b6c98713a37644902d3ef4549678 Mon Sep 17 00:00:00 2001
From: Claudio-Emmolo <113107618+Claudio-Emmolo@users.noreply.github.com>
Date: Thu, 13 Jun 2024 15:36:50 +0200
Subject: [PATCH] [photo] shortcode, fix order images

---
 resources/views/new-gallery.blade.php |  2 +-
 src/Shortcodes/PhotoShortcode.php     | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/resources/views/new-gallery.blade.php b/resources/views/new-gallery.blade.php
index ea5be84..b875823 100644
--- a/resources/views/new-gallery.blade.php
+++ b/resources/views/new-gallery.blade.php
@@ -1,7 +1,7 @@
 <div class="w-full">
     <div class="
 	grid grid-cols-4 grid-rows-2 not-prose sm:px-0">
-        @foreach (json_decode($images) as $image)
+        @foreach ($images as $image)
             @if ($loop->iteration <= 5)
                 <a class="
 
diff --git a/src/Shortcodes/PhotoShortcode.php b/src/Shortcodes/PhotoShortcode.php
index 11090b9..70a0569 100644
--- a/src/Shortcodes/PhotoShortcode.php
+++ b/src/Shortcodes/PhotoShortcode.php
@@ -6,7 +6,7 @@ class PhotoShortcode
 {
     public function register($shortcode): string
     {
-        if (! class_exists('\Outl1ne\NovaMediaHub\Models\Media')) {
+        if (!class_exists('\Outl1ne\NovaMediaHub\Models\Media')) {
             return '';
         }
 
@@ -16,8 +16,14 @@ public function register($shortcode): string
             $ids = explode(',', $multipleIds);
             if (count($ids) > 1) {
                 $images = \Outl1ne\NovaMediaHub\Models\Media::whereIn('id', $ids)->get();
+
+                //order images by shortcode order
+                $images = $images->sortBy(function ($image) use ($ids) {
+                    return array_search($image->id, $ids);
+                });
+
                 foreach ($images as $key => $image) {
-                    $images[$key]['src'] = $image->path.$image->file_name;
+                    $images[$key]['src'] = $image->path . $image->file_name;
                     $images[$key]['title'] = $image['data']['title'][0] ?? null;
                     $images[$key]['alt'] = $image['data']['alt'][0] ?? null;
                 }
@@ -37,11 +43,11 @@ public function register($shortcode): string
 
         // Single image
         $media = \Outl1ne\NovaMediaHub\Models\Media::find($shortcode->id);
-        if (! $media) {
+        if (!$media) {
             return '';
         }
 
-        $path = $media->path.$media->file_name;
+        $path = $media->path . $media->file_name;
         $align = $shortcode->align ?? null;
         $link = $shortcode->link ? str_replace("'", '%27', $shortcode->link) : null;
         $shape = $shortcode->shape ?? null;
@@ -58,7 +64,7 @@ public function register($shortcode): string
         if (is_array($credits)) {
             $credits = $credits[0];
         }
-        $alt = $media->data['alt'] ?? 'Immagine id '.$shortcode->id;
+        $alt = $media->data['alt'] ?? 'Immagine id ' . $shortcode->id;
         if (is_array($alt)) {
             $alt = $alt[0];
         }
@@ -87,10 +93,10 @@ public function register($shortcode): string
     public static function getImageHeight(string $path, int $width = 0): float|int
     {
 
-        $localPath = storage_path('app/public/'.$path);
+        $localPath = storage_path('app/public/' . $path);
 
         // Check if file exists
-        if (! file_exists($localPath)) {
+        if (!file_exists($localPath)) {
             return 0;
         }