Flatten view data

area17 · Oct 1, 2021 · 9ebc315 · 9ebc315
1 parent e33bb7b
commit 9ebc315
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 29 deletions.
diff --git a/resources/views/main-image.blade.php b/resources/views/main-image.blade.php
@@ -1,11 +1,15 @@
 @include('image::picture', [
-    'fallback' => $src,
+    'fallback' => $mainSrc,
     'attributes' => 'data-main-image',
+    'sources' => $mainSources ?? [],
+    'style' => $mainStyle,
 ])
 <noscript>
     @include('image::picture', [
-        'fallback' => $src,
+        'fallback' => $mainSrc,
         'attributes' => 'data-main-image',
         'shouldLoad' => true,
+        'sources' => $mainSources ?? [],
+        'style' => $mainStyle,
     ])
 </noscript>
diff --git a/resources/views/placeholder.blade.php b/resources/views/placeholder.blade.php
@@ -1,13 +1,14 @@
 @php
 $attributes = 'aria-hidden="true" data-placeholder-image';
 @endphp
-@if(isset($src) && !!$src)
+@if(isset($placeholderSrc) && !!$placeholderSrc)
   @include('image::picture', [
-      'fallback' => $src,
+      'fallback' => $placeholderSrc,
       'alt' => "",
       'attributes' => $attributes,
       'sizes' => $sizes,
-      'style' => $style,
+      'sources' => $placeholderSources ?? [],
+      'style' => $placeholderStyle,
   ])
 @else
     <div style="{{$style}}" {!! $attributes !!}></div>

diff --git a/resources/views/wrapper.blade.php b/resources/views/wrapper.blade.php
@@ -1,9 +1,9 @@
 <div
-    class="{{$wrapper['classes']}}"
-    style="{{$wrapper['style']}}"
+    class="{{$wrapperClasses}}"
+    style="{{$wrapperStyle}}"
     data-twill-image-wrapper
 >
     @include('image::sizer')
-    @include('image::placeholder', $placeholder)
-    @include('image::main-image', $main)
+    @include('image::placeholder')
+    @include('image::main-image')
 </div>
diff --git a/src/ViewModels/ImageViewModel.php b/src/ViewModels/ImageViewModel.php
@@ -344,29 +344,22 @@ protected function setLqipAttributes()
     public function toArray(): array
     {
         return array_filter([
-            'layout' => $this->layout,
-            'wrapper' => [
-                'classes' => $this->wrapperClasses(),
-                'style' => $this->styleService->wrapper(),
-            ],
-            'placeholder' => [
-                'src' => $this->lqipSrc,
-                'sources' => $this->lqipSources,
-                'style' => $this->styleService->placeholder(),
-            ],
-            'main' => [
-                'loading' => $this->loading,
-                'shouldLoad' => $this->loading === 'eager',
-                'style' => $this->styleService->main($this->loading),
-                'src' => $this->src,
-                'sources' => $this->sources,
-                'alt' => $this->alt,
-            ],
             'alt' => $this->alt,
-            'width' => $this->width,
+            'aspectRatio' => $this->data['image']['aspectRatio'],
             'height' => $this->height,
+            'layout' => $this->layout,
+            'loading' => $this->loading,
+            'mainStyle' => $this->styleService->main($this->loading),
+            'mainSrc' => $this->src,
+            'mainSources' => $this->sources,
+            'placeholderSrc' => $this->lqipSrc,
+            'placeholderSources' => $this->lqipSources,
+            'placeholderStyle' => $this->styleService->placeholder(),
+            'shouldLoad' => $this->loading === 'eager',
             'sizes' => $this->sizes,
-            'aspectRatio' => $this->data['image']['aspectRatio'],
+            'width' => $this->width,
+            'wrapperClasses' => $this->wrapperClasses(),
+            'wrapperStyle' => $this->styleService->wrapper(),
         ]);
     }
 }