fix: mashup preview for Framework v2

.github/workflows/docker-build.yml

@@ -43,7 +43,7 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
             type=ref,event=tag
-            type=raw,value=latest,enable=${{ github.event.release.prerelease == false }}
+            type=raw,value=latest,enable=${{ !github.event.release.prerelease }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v6

app/Models/PlaylistItem.php

@@ -135,10 +135,13 @@ class PlaylistItem extends Model
     /**
      * Render all plugins with appropriate layout
      */
-    public function render(): string
+    public function render(?Device $device = null): string
     {
         if (! $this->isMashup()) {
             return view('trmnl-layouts.single', [
+                'colorDepth' => $device?->deviceModel?->color_depth,
+                'deviceVariant' => $device?->deviceModel?->name ?? 'og',
+                'scaleLevel' => $device?->deviceModel?->scale_level,
                 'slot' => $this->plugin instanceof Plugin
                     ? $this->plugin->render('full', false)
                     : throw new Exception('Invalid plugin instance'),
@@ -160,6 +163,9 @@ class PlaylistItem extends Model
         }
 
         return view('trmnl-layouts.mashup', [
+            'colorDepth' => $device?->deviceModel?->color_depth,
+            'deviceVariant' => $device?->deviceModel?->name ?? 'og',
+            'scaleLevel' => $device?->deviceModel?->scale_level,
             'mashupLayout' => $this->getMashupLayoutType(),
             'slot' => implode('', $pluginMarkups),
         ])->render();

app/Models/Plugin.php

@@ -343,12 +343,22 @@ class Plugin extends Model
             }
 
             if ($standalone) {
+                if ($size === 'full') {
                     return view('trmnl-layouts.single', [
                         'colorDepth' => $device?->deviceModel?->color_depth,
                         'deviceVariant' => $device?->deviceModel?->name ?? 'og',
                         'scaleLevel' => $device?->deviceModel?->scale_level,
                         'slot' => $renderedContent,
                     ])->render();
+                } else {
+                    return view('trmnl-layouts.mashup', [
+                        'mashupLayout' => $this->getPreviewMashupLayoutForSize($size),
+                        'colorDepth' => $device?->deviceModel?->color_depth,
+                        'deviceVariant' => $device?->deviceModel?->name ?? 'og',
+                        'scaleLevel' => $device?->deviceModel?->scale_level,
+                        'slot' => $renderedContent,
+                    ])->render();
+                }
             }
 
             return $renderedContent;
@@ -386,4 +396,13 @@ class Plugin extends Model
     {
         return $this->configuration[$key] ?? $default;
     }
+
+    public function getPreviewMashupLayoutForSize(string $size): string
+    {
+        return match ($size) {
+            'half_vertical' => '1Lx1R',
+            'quadrant' => '2x2',
+            default => '1Tx1B',
+        };
+    }
 }

routes/api.php

@@ -110,7 +110,7 @@ Route::get('/display', function (Request $request) {
                         }
                     }
 
-                    $markup = $playlistItem->render();
+                    $markup = $playlistItem->render(device: $device);
                     GenerateScreenJob::dispatchSync($device->id, null, $markup);
 
                     $device->refresh();