Merge pull request #473 from helsingborg-stad/feat/allow-newsitem-ink

feat: allow newsitem ink
helsingborg-stad · Nov 1, 2024 · df60aa1 · df60aa1
2 parents 884ff5c + 8da1cb4
commit df60aa1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/source/php/Component/NewsItem/NewsItem.php b/source/php/Component/NewsItem/NewsItem.php
@@ -32,5 +32,12 @@ public function init() {
         if ($standing) {
             $this->data['classList'][] = $this->getBaseClass('standing', true);
         }
+
+        if ($link) {
+            $this->data['componentElement'] = "a";
+            $this->data['attributeList']['href'] = $link;
+        } else {
+            $this->data['componentElement'] = "div";
+        }
     }
 }
diff --git a/source/php/Component/NewsItem/newsItem.blade.php b/source/php/Component/NewsItem/newsItem.blade.php
@@ -1,5 +1,5 @@
-<div class="{{ $class }}" {!! $attribute !!}>
+<{{ $componentElement }} class="{{ $class }}" {!! $attribute !!}>
     @includeWhen($date || $subHeading || $headerLeftAreaSlotHasData || $headerRightAreaSlotHasData, 'NewsItem.components.header')
     @includeWhen($heading || $titleLeftAreaSlotHasData || $titleRightAreaSlotHasData, 'NewsItem.components.title')
     @includeWhen($content || $contentLeftAreaSlotHasData || $contentRightAreaSlotHasData || $image, 'NewsItem.components.main')
-</div>
+</{{ $componentElement }}>
diff --git a/source/php/Component/NewsItem/newsItem.json b/source/php/Component/NewsItem/newsItem.json
@@ -8,7 +8,8 @@
         "date": null,
         "readTime": null,
         "standing": false,
-        "floatingArea": null
+        "floatingArea": null,
+        "link": null
     },
     "description":{
         "heading": "Title of the item.",
@@ -18,7 +19,7 @@
         "date": "Date of the item.",
         "readTime": "Read time of the item.",
         "standing": "If the item will be appearing standing or laying down.",
-        "floatingArea": "Content that will be floating on the right side of the item."
+        "link": "Link to the item."
     },
     "types": {
         "heading": "string",
@@ -28,6 +29,7 @@
         "date": "string",
         "readTime": "string",
         "standing": "boolean",
+        "link": "string",
         "headerRightArea": "mixed",
         "headerLeftArea": "mixed",
         "titleLeftArea": "mixed",

diff --git a/source/php/Component/NewsItem/partials/content.blade.php b/source/php/Component/NewsItem/partials/content.blade.php
@@ -1,4 +1,5 @@
 @typography([
+    'classList' => [$baseClass . '__content']
 ])
     {{ $content }}
 @endtypography