fix: respect flat layout feature flag in form and infolist builders

Author: ManukMinasyan

src/Filament/Integration/Builders/FormBuilder.php

@@ -14,15 +14,21 @@
 
 class FormBuilder extends BaseBuilder
 {
-    private bool $withoutSections = false;
+    private ?bool $withoutSections = null;
 
     public function build(): Grid
     {
-        return FormContainer::make()
+        $container = FormContainer::make()
             ->forModel($this->explicitModel ?? null)
-            ->withoutSections($this->withoutSections)
             ->only($this->only)
             ->except($this->except);
+
+        // Only set withoutSections if explicitly configured
+        if ($this->withoutSections !== null) {
+            $container->withoutSections($this->withoutSections);
+        }
+
+        return $container;
     }
 
     public function withoutSections(bool $withoutSections = true): static

src/Filament/Integration/Builders/FormContainer.php

@@ -4,6 +4,8 @@
 
 use Filament\Schemas\Components\Grid;
 use Illuminate\Database\Eloquent\Model;
+use Relaticle\CustomFields\Enums\CustomFieldsFeature;
+use Relaticle\CustomFields\FeatureSystem\FeatureManager;
 
 final class FormContainer extends Grid
 {
@@ -13,7 +15,7 @@ final class FormContainer extends Grid
 
     private array $only = [];
 
-    private bool $withoutSections = false;
+    private ?bool $withoutSections = null;
 
     public static function make(array|int|null $columns = 12): static
     {
@@ -62,11 +64,15 @@ private function generateSchema(): array
             return []; // Graceful fallback
         }
 
+        // Use explicit setting if provided, otherwise check feature flag
+        $withoutSections = $this->withoutSections
+            ?? FeatureManager::isEnabled(CustomFieldsFeature::UI_FLAT_FIELD_LAYOUT);
+
         $builder = app(FormBuilder::class);
 
         return $builder
             ->forModel($model)
-            ->withoutSections($this->withoutSections)
+            ->withoutSections($withoutSections)
             ->only($this->only)
             ->except($this->except)
             ->values()

src/Filament/Integration/Builders/InfolistBuilder.php

@@ -21,17 +21,23 @@ final class InfolistBuilder extends BaseBuilder
 
     private bool $visibleWhenFilled = false;
 
-    private bool $withoutSections = false;
+    private ?bool $withoutSections = null;
 
     public function build(): Component
     {
-        return InfolistContainer::make()
+        $container = InfolistContainer::make()
             ->forModel($this->explicitModel ?? null)
             ->hiddenLabels($this->hiddenLabels)
             ->visibleWhenFilled($this->visibleWhenFilled)
-            ->withoutSections($this->withoutSections)
             ->only($this->only)
             ->except($this->except);
+
+        // Only set withoutSections if explicitly configured
+        if ($this->withoutSections !== null) {
+            $container->withoutSections($this->withoutSections);
+        }
+
+        return $container;
     }
 
     /**

src/Filament/Integration/Builders/InfolistContainer.php

@@ -5,6 +5,8 @@
 use Filament\Forms\Components\Field;
 use Filament\Schemas\Components\Grid;
 use Illuminate\Database\Eloquent\Model;
+use Relaticle\CustomFields\Enums\CustomFieldsFeature;
+use Relaticle\CustomFields\FeatureSystem\FeatureManager;
 
 final class InfolistContainer extends Grid
 {
@@ -18,7 +20,7 @@ final class InfolistContainer extends Grid
 
     private bool $visibleWhenFilled = false;
 
-    private bool $withoutSections = false;
+    private ?bool $withoutSections = null;
 
     public static function make(array|int|null $columns = 12): static
     {
@@ -84,13 +86,17 @@ private function generateSchema(): array
             return []; // Graceful fallback
         }
 
+        // Use explicit setting if provided, otherwise check feature flag
+        $withoutSections = $this->withoutSections
+            ?? FeatureManager::isEnabled(CustomFieldsFeature::UI_FLAT_FIELD_LAYOUT);
+
         $builder = app(InfolistBuilder::class)
             ->forModel($model)
             ->only($this->only)
             ->except($this->except)
             ->hiddenLabels($this->hiddenLabels)
             ->visibleWhenFilled($this->visibleWhenFilled)
-            ->withoutSections($this->withoutSections);
+            ->withoutSections($withoutSections);
 
         return $builder->values()->toArray();
     }