fixe: issue with webp variation not taking the focuspoint into account

Novactive · Apr 2, 2024 · 14c1584 · 14c1584
1 parent eb767f0
commit 14c1584
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/lib/Imagine/FocusedImageAliasGenerator.php b/src/lib/Imagine/FocusedImageAliasGenerator.php
@@ -95,6 +95,19 @@ protected function getFocusPoint(\Ibexa\Core\FieldType\Value $fieldValue, string
         return null;
     }
 
+    protected function isFocusedThumbnail(string $variationName): bool
+    {
+        $variationConfig = $this->filterConfiguration->get($variationName);
+        if (isset($variationConfig['filters']['focusedThumbnail'])) {
+            return true;
+        }
+        if ($variationConfig['reference']) {
+            return $this->isFocusedThumbnail($variationConfig['reference']);
+        }
+
+        return false;
+    }
+
     /**
      * {@inheritdoc}
      *
@@ -114,8 +127,7 @@ public function getVariation(Field $field, VersionInfo $versionInfo, $variationN
         $focusPoint = $this->getFocusPoint($field->value, $variationName);
 
         if (IORepositoryResolver::VARIATION_ORIGINAL !== $variationName) {
-            $variationConfig = $this->filterConfiguration->get($variationName);
-            if (isset($variationConfig['filters']['focusedThumbnail'])) {
+            if ($this->isFocusedThumbnail($variationName)) {
                 $parameters = [
                     'filters' => [
                         'focusedThumbnail' => [

diff --git a/src/lib/Imagine/ImageAliasGenerator.php b/src/lib/Imagine/ImageAliasGenerator.php
@@ -175,10 +175,13 @@ private function applyFilter(BinaryInterface $image, string $variationName, arra
             isset($filterConfig['reference']) &&
             IORepositoryResolver::VARIATION_ORIGINAL !== $filterConfig['reference']
         ) {
-            unset($runtimeFiltersConfig['filters']);
             $image = $this->applyFilter($image, $filterConfig['reference'], $runtimeFiltersConfig);
         }
 
+        if (!isset($filterConfig['filters']['focusedThumbnail'])) {
+            unset($runtimeFiltersConfig['filters']['focusedThumbnail']);
+        }
+
         return $this->filterManager->applyFilter($image, $variationName, $runtimeFiltersConfig);
     }