[6.x] Fix showCollapseIcon bug (#1697)

* Fix default toggle-detail * Fix default toggle-detail * build assets
Power-Components · Sep 23, 2024 · 47191ed · 47191ed
1 parent 75ff9ec
commit 47191ed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/resources/views/components/row.blade.php b/resources/views/components/row.blade.php
@@ -8,8 +8,12 @@
         'view' => data_get($setUp, 'detail.viewIcon') ?? null,
     ])
 
+@php
+    $defaultCollapseIcon = data_get($theme, 'root') . '.toggle-detail';
+@endphp
+
 @includeWhen(data_get($setUp, 'detail.showCollapseIcon'),
-    data_get(collect($row->__powergrid_rules)->last(), 'toggleDetailView'),
+    data_get(collect($row->__powergrid_rules)->last(), 'toggleDetailView') ?? $defaultCollapseIcon,
     [
         'view' => data_get($setUp, 'detail.viewIcon') ?? null,
     ]

diff --git a/src/Concerns/HasActions.php b/src/Concerns/HasActions.php
@@ -125,7 +125,10 @@ public function prepareActionRulesForRows(mixed $row, ?object $loop = null): arr
                         ];
                     }
 
-                    $showToggleDetail      = data_get($rule, 'rule.toggleableVisibility') === 'show' || (bool) data_get($this->setUp, 'detail.showCollapseIcon');
+                    $showToggleDetail = $apply && data_get($rule, 'rule.toggleDetailVisibility')
+                        ? data_get($rule, 'rule.toggleDetailVisibility') === 'show'
+                        : (bool) data_get($this->setUp, 'detail.showCollapseIcon');
+
                     $toggleableVisibility  = $apply ? data_get($rule, 'rule.toggleableVisibility') : [];
                     $editOnClickVisibility = $apply ? data_get($rule, 'rule.editOnClickVisibility') : [];
                     $fieldHideEditOnClick  = $apply && (bool) data_get($rule, 'rule.fieldHideEditOnClick');