diff --git a/src/Concerns/Designer.php b/src/Concerns/Designer.php index b534ec1b..0b29cb7a 100644 --- a/src/Concerns/Designer.php +++ b/src/Concerns/Designer.php @@ -103,6 +103,7 @@ private static function drawSections(Form $zeusForm, ZeusSection $section, array ->description($section->description) ->aside(fn () => $section->aside) ->compact(fn () => $section->compact) + ->icon($section->icon ?? null) ->collapsible(); if (optional($zeusForm->options)['show-as'] === 'tabs') { diff --git a/src/Fields/FieldsContract.php b/src/Fields/FieldsContract.php index 4eca90b1..340b998b 100644 --- a/src/Fields/FieldsContract.php +++ b/src/Fields/FieldsContract.php @@ -124,15 +124,16 @@ public function appendFilamentComponentsOptions($component, $zeusField, bool $ha return true; } - if (is_array($get('zeusData.' . $relatedField))) { - return in_array($relatedFieldValues, $get('zeusData.' . $relatedField)); + $relatedFieldArray = Arr::wrap($get('zeusData.' . $relatedField)); + if(in_array($relatedFieldValues, $relatedFieldArray)){ + return true; } - return $relatedFieldValues === $get('zeusData.' . $relatedField); + return false; }); if ($hasVisibility) { - return $component->live(onBlur: $hasVisibility); + return $component->live(); } return $component;