Merge pull request #186 from lara-zeus/compact-section

Compact section
lara-zeus · Oct 10, 2023 · 8464646 · 8464646
2 parents 423aaad + 4f8b305
commit 8464646
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 24 deletions.
diff --git a/database/migrations/add_compact_to_section.php.stub b/database/migrations/add_compact_to_section.php.stub
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('sections', function (Blueprint $table) {
+            $table->boolean('compact')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('sections', function (Blueprint $table) {
+            $table->dropColumn('compact');
+        });
+    }
+};
diff --git a/src/BoltServiceProvider.php b/src/BoltServiceProvider.php
@@ -68,6 +68,7 @@ protected function getMigrations(): array
             'add_extensions_to_forms',
             'add_extension_item_responses',
             'alter_tables_constraints',
+            'add_compact_to_section',
         ];
     }
 }
diff --git a/src/Concerns/Schemata.php b/src/Concerns/Schemata.php
@@ -25,21 +25,6 @@
 
 trait Schemata
 {
-    public static function getMainFormSchemaForView(): array
-    {
-        return [
-            Hidden::make('user_id')->default(auth()->user()->id ?? null),
-
-            Section::make()
-                ->schema([
-                    TextInput::make('name')
-                        ->maxLength(255)
-                        ->live(onBlur: true)
-                        ->label(__('Form Name')),
-                ]),
-        ];
-    }
-
     public static function getMainFormSchema(): array
     {
         return [
@@ -280,6 +265,11 @@ public static function getSectionsSchema(): array
                                         ->inline(false)
                                         ->visible(fn (Get $get) => $get('../../options.show-as') === 'page')
                                         ->label(__('show as aside')),
+
+                                    Toggle::make('compact')
+                                        ->inline(false)
+                                        ->visible(fn (Get $get) => $get('../../options.show-as') === 'page')
+                                        ->label(__('compact section')),
                                 ]),
                         ]),
                 ]),

diff --git a/src/Facades/Bolt.php b/src/Facades/Bolt.php
@@ -2,6 +2,7 @@
 
 namespace LaraZeus\Bolt\Facades;
 
+use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\Section;
@@ -130,14 +131,21 @@ public static function prepareFieldsAndSectionToRender(Form $zeusForm, bool $inl
                         Grid::make()->columns($section->columns)->schema($fields),
                     ]);
             } else {
-                $sections[] = Section::make($section->name)
-                    ->id($sectionId)
-                    ->icon($section->icon ?? null)
-                    ->schema($fields)
-                    ->collapsible()
-                    ->aside(fn () => $section->aside)
-                    ->description($section->description)
-                    ->columns($section->columns);
+                if ($section->compact) {
+                    $sections[] = Fieldset::make($section->name)
+                        ->id($sectionId)
+                        ->schema($fields)
+                        ->columns($section->columns);
+                } else {
+                    $sections[] = Section::make($section->name)
+                        ->id($sectionId)
+                        ->icon($section->icon ?? null)
+                        ->schema($fields)
+                        ->collapsible()
+                        ->aside(fn () => $section->aside)
+                        ->description($section->description)
+                        ->columns($section->columns);
+                }
             }
         }
 

diff --git a/src/Models/Section.php b/src/Models/Section.php
@@ -16,7 +16,8 @@
  * @property string $name
  * @property string $columns
  * @property string $description
- * @property string $aside
+ * @property bool $aside
+ * @property bool $compact
  */
 class Section extends Model
 {