feat: implement image contract in manual input views card, block.

helsingborg-stad · Oct 2, 2024 · dc4adb0 · dc4adb0
1 parent e1aba77
commit dc4adb0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/source/php/Module/ManualInput/ManualInput.php b/source/php/Module/ManualInput/ManualInput.php
@@ -65,10 +65,13 @@ public function data(): array
     }
 
     private function maybeGetImageImageContract(string $displayAs, int $imageId) {
-        if (in_array($displayAs, ['segment'])) {
+
+        $width = $this->getImageSize($displayAs, 'width');
+
+        if (in_array($displayAs, ['segment', 'block', 'card'])) {
             return ImageComponentContract::factory(
                 $imageId,
-                [1920, false],
+                [$width, false],
                 new ImageResolver()
             );
         }
@@ -189,6 +192,9 @@ private function getImageData($imageId = false, $size = [400, 225])
                 $image['removeCaption'] = true;
             }
 
+            unset($image['title']);
+            unset($image['description']);
+
             return $image;
         }
 
@@ -201,18 +207,28 @@ private function getImageData($imageId = false, $size = [400, 225])
      * @param string $displayAs The name of the template/view.
      * @return array
      */
-    private function getImageSize($displayAs) {
+    private function getImageSize($displayAs, $return = "both"): null|array|int {
         switch ($displayAs) {
             case "segment": 
-                return [800, 550];
+                $dimensions =  [1920, 1080];
             case "block":
-                return [500, 500];
+                $dimensions =  [1024, 1024];
             case "collection": 
             case "box":
-                return [300, 300];
+                $dimensions =  [768, 768];
             default: 
-                return [400, 225];
+                $dimensions = [1440, 810];
+        }
+
+        if($return == "width") {
+            return $dimensions[0] ?? null;
+        }
+
+        if($return == "height") {
+            return $dimensions[1] ?? null;
         }
+
+        return $dimensions;
     }
 
      /**

diff --git a/source/php/Module/ManualInput/views/appearances/card.blade.php b/source/php/Module/ManualInput/views/appearances/card.blade.php
@@ -5,7 +5,6 @@
         'context'           => $context,
         'content'           => $input['content'],
         'image'             => $input['image'],
-        'imageFirst'        => true,
         'containerAware'    => true,
         'classList'         => ['u-height--100']
     ])