refactor: remove display icon

helsingborg-stad · Jan 16, 2025 · 05b11a2 · 05b11a2
1 parent 816f29d
commit 05b11a2
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 23 deletions.
diff --git a/source/php/Component/Block/Block.php b/source/php/Component/Block/Block.php
@@ -45,10 +45,6 @@ public function init()
             $this->data['icon']['classList'][] = $this->getBaseClass('icon');
         }
 
-        if (!isset($this->data['displayIcon'])) {
-            $this->data['displayIcon'] = true;
-        }
-
         $this->data['classList'][] = $this->getBaseClass() . '--ratio-' . str_replace(":", "-", $ratio);
 
         if(!$this->hasContent($this->data)) {

diff --git a/source/php/Component/Block/block.blade.php b/source/php/Component/Block/block.blade.php
@@ -81,7 +81,7 @@
                         {!! $heading !!}
                     @endtypography
                 @endif
-                @if ($icon && !empty($displayIcon))
+                @if ($icon)
                     @element([
                         'attributeList' => [
                             'style' => 'background-color: ' . ($iconBackgroundColor ?? 'transparent') . ';',

diff --git a/source/php/Component/Card/Card.php b/source/php/Component/Card/Card.php
@@ -47,10 +47,6 @@ public function init()
         if (!empty($icon)) {
             $this->data['icon']['classList'][] = $this->getBaseClass('icon');
         }
-
-        if (!isset($this->data['displayIcon'])) {
-            $this->data['displayIcon'] = true;
-        }
 
         if (!empty($hasPlaceholder)) {
             $this->data['classList'][] = $this->getBaseClass() . '--svg-background';

diff --git a/source/php/Component/Card/components/heading.blade.php b/source/php/Component/Card/components/heading.blade.php
@@ -36,5 +36,5 @@
         @includeWhen($meta && !$metaFirst, 'Card.components.meta')
     @endgroup
     @includeWhen($collapsible, 'Card.components.collapsiableButton')
-    @includeWhen($icon && !empty($displayIcon), 'Card.components.icon')
+    @includeWhen($icon, 'Card.components.icon')
 @endgroup
diff --git a/source/php/Component/Collection__item/Collection__item.php b/source/php/Component/Collection__item/Collection__item.php
@@ -12,15 +12,11 @@ public function init() {
         $this->data['beforeSlotHasData']   = $this->slotHasData('before');
         $this->data['floatingSlotHasData'] = $this->slotHasData('floating');
 
-        if (!empty($displayIcon)) {
-            $this->data['classList'][] = $this->getBaseClass('show-icon', true);
-        }
-
         if (!empty($bordered)) {
             $this->data['classList'][] = $this->getBaseClass('bordered', true);
         }
 
-        $this->data['icon'] = $this->getIcon($icon, $displayIcon);
+        $this->data['icon'] = $this->getIcon($icon);
 
         //Link handling
         if($link) {
@@ -33,9 +29,9 @@ public function init() {
         }
     }
 
-    private function getIcon(array|string|false $icon, bool $displayIcon): array|false
+    private function getIcon(array|string|false $icon): array|false
     {
-        if (!$displayIcon || !$icon) {
+        if (empty($icon)) {
             return false;
         } elseif (is_array($icon)) {
             return $icon;

diff --git a/source/php/Component/Collection__item/collection__item.json b/source/php/Component/Collection__item/collection__item.json
@@ -4,7 +4,6 @@
         "componentElement": "div",
         "prefix": "",
         "icon": false,
-        "displayIcon": true,
         "action": false,
         "secondary": "",
         "link": "",

diff --git a/source/php/Component/Segment/Segment.php b/source/php/Component/Segment/Segment.php
@@ -29,10 +29,6 @@ public function init()
             $this->data['icon']['classList'][] = $this->getBaseClass('icon');
         }
 
-        if (!isset($this->data['displayIcon'])) {
-            $this->data['displayIcon'] = true;
-        }
-
         // If no link and exactly one button, use that button as link
         if (!$link && ($buttons && count($buttons) === 1)) {
             $this->data['link'] = $buttons[0]['href'];

diff --git a/source/php/Component/Segment/components/content.blade.php b/source/php/Component/Segment/components/content.blade.php
@@ -39,7 +39,7 @@
             @endif
         @endgroup
 
-        @if ($icon && !empty($displayIcon))
+        @if ($icon)
             @element([
                 'attributeList' => [
                     'style' => 'background-color: ' . ($iconBackgroundColor ?? 'transparent') . ';',