Merge branch 'master' of https://github.com/RicLeP/laravel-storyblok

Author: RicLeP

.idea/php.xml

@@ -27,15 +27,15 @@
 	    "imgix/imgix-php": "^3.3|^4.0",
 	    "ivopetkov/html5-dom-document-php": "2.*",
 	    "league/commonmark": "^2.0",
+        "spatie/laravel-ignition": "^2.8",
 	    "spatie/schema-org": "^3.3",
 	    "storyblok/php-client": "^2.3",
 	    "storyblok/richtext-resolver": "^2.2"
     },
     "require-dev": {
         "mockery/mockery": "^1.2",
         "orchestra/testbench": "^8.0|^9.0",
-        "phpunit/phpunit": "^10",
-	    "spatie/laravel-ignition": "^2.0"
+        "phpunit/phpunit": "^10"
     },
     "autoload": {
         "psr-4": {

composer.json

@@ -166,6 +166,48 @@ public function rotate(int $amount): self
         return $this;
     }
 
+    /**
+     * Zooms and crops an image based on focal point. If there is no focal point it will use the center of the image
+     *
+     * @param int $zoomLevel
+     * @param int $width
+     * @param int $height
+     * @return string
+     */
+    public function zoomCrop(int $zoomLevel, int $width, int $height): string
+    {
+        if ($this->transformations === 'svg') {
+            return $this->assetDomain($this->image->content()['filename']);
+        }
+
+        if ($this->width() >= $this->height()) {
+            $cropBuffer = $this->width() * 100 / $zoomLevel;
+        } else {
+            $cropBuffer = $this->height() * 100 / $zoomLevel;
+        }
+
+        if ($this->image->focus) {
+            $focalPointCoords = explode('x', explode(':', $this->image->focus)[0]);
+            $focalPoint = [$focalPointCoords[0], $focalPointCoords[1]];
+        } else {
+            $focalPoint = [$this->width() / 2, $this->height() / 2];
+        }
+
+        $cropLeft = max(round($focalPoint[0] - $cropBuffer / 2), 0);
+        $cropTop = max(round($focalPoint[1] - $cropBuffer / 2), 0);
+        $cropRight = min(round($cropLeft + $cropBuffer), $this->width());
+        $cropBottom = min(round($cropTop + $cropBuffer), $this->height());
+
+        $croppedUrl = '/' . $cropLeft . "x" . $cropTop . ":" . $cropRight . "x" . $cropBottom . "/" . $width . "x" . $height;
+
+
+        if ($this->hasFilters()) {
+            $croppedUrl .= $this->applyFilters();
+        }
+
+        return $this->assetDomain($croppedUrl);
+    }
+
     /**
      * Creates the Storyblok image service URL
      *
@@ -174,7 +216,7 @@ public function rotate(int $amount): self
     public function buildUrl(): string
     {
         if ($this->transformations === 'svg') {
-            return $this->image->content()['filename'];
+            return $this->assetDomain($this->image->content()['filename']);
         }
 
         $transforms = '';
@@ -312,6 +354,10 @@ protected function assetDomain($options = null): string
     {
         $resource = str_replace(config('storyblok.asset_domain'), config('storyblok.image_service_domain'), $this->image->content()['filename']);
 
-        return $resource . '/m' . $options;
+        if ($options) {
+            return $resource . '/m' . $options;
+        }
+
+        return $resource;
     }
 }