👀 check for visibility before adding live() for all components

lara-zeus · Jan 8, 2024 · 1006ef9 · 1006ef9
1 parent 461e589
commit 1006ef9
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 47 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Concerns/Designer.php b/src/Concerns/Designer.php
@@ -18,23 +18,24 @@ trait Designer
     public static function ui(Form $zeusForm, bool $inline = false): array
     {
         $sections = self::drawExt($zeusForm);
+        $hasSectionVisibility = $zeusForm->sections->pluck('options')->where('visibility.active', true)->isNotEmpty();
 
         foreach ($zeusForm->sections->sortBy('ordering') as $section) {
             $sections[] = self::drawSections(
                 $zeusForm,
                 $section,
-                self::drawFields($section, $inline)
+                self::drawFields($section, $inline, $hasSectionVisibility),
             );
         }
 
         if (optional($zeusForm->options)['show-as'] === 'tabs') {
-            return [Tabs::make('tabs')->live()->tabs($sections)];
+            return [Tabs::make('tabs')->live(condition: $hasSectionVisibility)->tabs($sections)];
         }
 
         if (optional($zeusForm->options)['show-as'] === 'wizard') {
             return [
                 Wizard::make($sections)
-                    ->live(),
+                    ->live(condition: $hasSectionVisibility),
                 //->skippable() // todo still not working
             ];
         }
@@ -64,8 +65,10 @@ private static function drawExt(Form $zeusForm): array
         ];
     }
 
-    private static function drawFields(ZeusSection $section, bool $inline): array
+    private static function drawFields(ZeusSection $section, bool $inline, bool $hasSectionVisibility = false): array
     {
+        $hasVisibility = $hasSectionVisibility || $section->fields->pluck('options')->where('visibility.active', true)->isNotEmpty();
+
         $fields = [];
 
         if (! $inline) {
@@ -80,7 +83,7 @@ private static function drawFields(ZeusSection $section, bool $inline): array
             $fieldClass = new $zeusField->type;
             $component = $fieldClass->renderClass::make('zeusData.' . $zeusField->id);
 
-            $fields[] = $fieldClass->appendFilamentComponentsOptions($component, $zeusField);
+            $fields[] = $fieldClass->appendFilamentComponentsOptions($component, $zeusField, $hasVisibility);
 
             if (! $inline) {
                 $fields[] = Bolt::renderHook('zeus-form-field.after');

diff --git a/src/Concerns/HasHiddenOptions.php b/src/Concerns/HasHiddenOptions.php
@@ -9,7 +9,7 @@ trait HasHiddenOptions
     public static function hiddenVisibility(): array
     {
         return [
-            Hidden::make('options.visibility.active'),
+            Hidden::make('options.visibility.active')->default(false),
             Hidden::make('options.visibility.fieldID'),
             Hidden::make('options.visibility.values'),
         ];

diff --git a/src/Fields/Classes/CheckboxList.php b/src/Fields/Classes/CheckboxList.php
@@ -56,9 +56,9 @@ public function getResponse(Field $field, FieldResponse $resp): string
     }
 
     // @phpstan-ignore-next-line
-    public function appendFilamentComponentsOptions($component, $zeusField)
+    public function appendFilamentComponentsOptions($component, $zeusField, bool $hasVisibility = false)
     {
-        parent::appendFilamentComponentsOptions($component, $zeusField);
+        parent::appendFilamentComponentsOptions($component, $zeusField, $hasVisibility);
 
         $options = FieldsContract::getFieldCollectionItemsList($zeusField);
 

diff --git a/src/Fields/Classes/ColorPicker.php b/src/Fields/Classes/ColorPicker.php
@@ -58,9 +58,9 @@ public static function getOptionsHidden(): array
     }
 
     // @phpstan-ignore-next-line
-    public function appendFilamentComponentsOptions($component, $zeusField)
+    public function appendFilamentComponentsOptions($component, $zeusField, bool $hasVisibility = false)
     {
-        parent::appendFilamentComponentsOptions($component, $zeusField);
+        parent::appendFilamentComponentsOptions($component, $zeusField, $hasVisibility);
 
         if (! empty($zeusField['options']['colorType'])) {
             call_user_func([$component, $zeusField['options']['colorType']]);

diff --git a/src/Fields/Classes/FileUpload.php b/src/Fields/Classes/FileUpload.php
@@ -65,9 +65,9 @@ public function getResponse(Field $field, FieldResponse $resp): string
     }
 
     // @phpstan-ignore-next-line
-    public function appendFilamentComponentsOptions($component, $zeusField)
+    public function appendFilamentComponentsOptions($component, $zeusField, bool $hasVisibility = false)
     {
-        parent::appendFilamentComponentsOptions($component, $zeusField);
+        parent::appendFilamentComponentsOptions($component, $zeusField, $hasVisibility);
 
         $component->disk(config('zeus-bolt.uploadDisk'))
             ->directory(config('zeus-bolt.uploadDirectory'));

diff --git a/src/Fields/Classes/Radio.php b/src/Fields/Classes/Radio.php
@@ -61,9 +61,9 @@ public function getResponse(Field $field, FieldResponse $resp): string
     }
 
     // @phpstan-ignore-next-line
-    public function appendFilamentComponentsOptions($component, $zeusField)
+    public function appendFilamentComponentsOptions($component, $zeusField, bool $hasVisibility = false)
     {
-        parent::appendFilamentComponentsOptions($component, $zeusField);
+        parent::appendFilamentComponentsOptions($component, $zeusField, $hasVisibility);
 
         $options = FieldsContract::getFieldCollectionItemsList($zeusField);
 

diff --git a/src/Fields/Classes/Select.php b/src/Fields/Classes/Select.php
@@ -63,9 +63,9 @@ public function getResponse(Field $field, FieldResponse $resp): string
     }
 
     // @phpstan-ignore-next-line
-    public function appendFilamentComponentsOptions($component, $zeusField)
+    public function appendFilamentComponentsOptions($component, $zeusField, bool $hasVisibility = false)
     {
-        parent::appendFilamentComponentsOptions($component, $zeusField);
+        parent::appendFilamentComponentsOptions($component, $zeusField, $hasVisibility);
 
         $options = FieldsContract::getFieldCollectionItemsList($zeusField);
 

diff --git a/src/Fields/Classes/TextInput.php b/src/Fields/Classes/TextInput.php
@@ -132,9 +132,9 @@ public static function getOptionsHidden(): array
     }
 
     // @phpstan-ignore-next-line
-    public function appendFilamentComponentsOptions($component, $zeusField)
+    public function appendFilamentComponentsOptions($component, $zeusField, bool $hasVisibility = false)
     {
-        parent::appendFilamentComponentsOptions($component, $zeusField);
+        parent::appendFilamentComponentsOptions($component, $zeusField, $hasVisibility);
 
         if (! empty($zeusField['options']['dateType'])) {
             call_user_func([$component, $zeusField['options']['dateType']]);

diff --git a/src/Fields/Classes/Textarea.php b/src/Fields/Classes/Textarea.php
@@ -68,9 +68,9 @@ public static function getOptionsHidden(): array
     }
 
     // @phpstan-ignore-next-line
-    public function appendFilamentComponentsOptions($component, $zeusField)
+    public function appendFilamentComponentsOptions($component, $zeusField, bool $hasVisibility = false)
     {
-        parent::appendFilamentComponentsOptions($component, $zeusField);
+        parent::appendFilamentComponentsOptions($component, $zeusField, $hasVisibility);
 
         if (filled($zeusField['options']['maxLength'])) {
             $component->maxLength($zeusField['options']['maxLength']);

diff --git a/src/Fields/Classes/Toggle.php b/src/Fields/Classes/Toggle.php
@@ -72,9 +72,9 @@ public static function getOptionsHidden(): array
     }
 
     // @phpstan-ignore-next-line
-    public function appendFilamentComponentsOptions($component, $zeusField)
+    public function appendFilamentComponentsOptions($component, $zeusField, bool $hasVisibility = false)
     {
-        parent::appendFilamentComponentsOptions($component, $zeusField);
+        parent::appendFilamentComponentsOptions($component, $zeusField, $hasVisibility);
 
         if (optional($zeusField->options)['on-icon']) {
             $component = $component->onIcon($zeusField->options['on-icon']);

diff --git a/src/Fields/FieldsContract.php b/src/Fields/FieldsContract.php
@@ -61,7 +61,7 @@ public function getResponse(Field $field, FieldResponse $resp): string
     }
 
     // @phpstan-ignore-next-line
-    public function appendFilamentComponentsOptions($component, $zeusField)
+    public function appendFilamentComponentsOptions($component, $zeusField, bool $hasVisibility = false)
     {
         if (is_string($zeusField->options)) {
             $zeusField->options = json_decode($zeusField->options, true);
@@ -118,7 +118,7 @@ public function appendFilamentComponentsOptions($component, $zeusField)
                 return $relatedFieldValues === $get('zeusData.' . $relatedField);
             });
 
-        return $component->live(onBlur: true);
+        return $component->live(onBlur: $hasVisibility, condition: $hasVisibility);
     }
 
     public function getCollectionsValuesForResponse(Field $field, FieldResponse $resp): string

diff --git a/stubs/ZeusField.stub b/stubs/ZeusField.stub
@@ -24,5 +24,14 @@ class {{ class }} extends FieldsContract
             self::columnSpanFull(),
         ];
     }
+
+    public static function getOptionsHidden(): array
+    {
+        return [
+            self::hiddenHtmlID(),
+            self::hiddenRequired(),
+            self::hiddenColumnSpanFull(),
+        ];
+    }
 }
 
diff --git a/tests/ResourcesTest.php b/tests/ResourcesTest.php
@@ -3,7 +3,6 @@
 use LaraZeus\Bolt\Filament\Resources\CategoryResource;
 use LaraZeus\Bolt\Filament\Resources\CollectionResource;
 use LaraZeus\Bolt\Filament\Resources\FormResource;
-use LaraZeus\Bolt\Models\Form;
 
 use function Pest\Laravel\get;
 
@@ -27,9 +26,3 @@
     get(FormResource::getUrl())
         ->assertSuccessful();
 });
-
-/*it('can render Response List', function () {
-    $form = Form::factory()->create();
-    get(ResponseResource::getUrl('index', ['form_id' => $form->id]))
-        ->assertSuccessful();
-});*/