feat: add crop parameter to asset middleware

REHLTYEXT-89
remindgmbh · Sep 5, 2024 · 6a9bf6c · 6a9bf6c
1 parent 9233f2d
commit 6a9bf6c
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/Classes/Middleware/AssetMiddleware.php b/Classes/Middleware/AssetMiddleware.php
@@ -9,6 +9,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use TYPO3\CMS\Core\Imaging\ImageManipulation\Area;
 use TYPO3\CMS\Core\Imaging\ImageManipulation\CropVariantCollection;
 use TYPO3\CMS\Core\Resource\AbstractFile;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
@@ -79,11 +80,26 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                         $targetFileExtension === 'svg'
                     )
                 ) {
-                    $cropVariant = $queryParams['breakpoint'] ?? 'default';
+                    $cropName = $queryParams['crop'] ?? null;
+                    $breakpoint = $queryParams['breakpoint'] ?? null;
+
+                    $cropVariants = array_filter([
+                        implode('-', array_filter([$cropName, $breakpoint])),
+                        $cropName,
+                        $breakpoint,
+                    ]);
 
                     $crop = $resource->getProperty('crop') ?? '';
                     $cropVariantCollection = CropVariantCollection::create($crop);
-                    $cropArea = $cropVariantCollection->getCropArea($cropVariant);
+
+                    $cropArea = Area::createEmpty();
+
+                    foreach ($cropVariants as $cropVariant) {
+                        $cropArea = $cropVariantCollection->getCropArea($cropVariant);
+                        if (!$cropArea->isEmpty()) {
+                            break;
+                        }
+                    }
 
                     // Use default cropVariant if breakpoint cropVariant does not exist
                     if ($cropArea->isEmpty()) {