+
+ @include($boltTheme.'.loading')
+
@if(class_exists(\LaraZeus\Bolt\BoltProServiceProvider::class) && optional($zeusForm->options)['logo'] !== null && optional($zeusForm)->options['cover'] !== null)
diff --git a/resources/views/themes/zeus/bolt/loading.blade.php b/resources/views/themes/zeus/bolt/loading.blade.php
new file mode 100644
index 00000000..cff10525
--- /dev/null
+++ b/resources/views/themes/zeus/bolt/loading.blade.php
@@ -0,0 +1,8 @@
+
+
+ @teleport('.bolt-loading')
+
+ @svg('iconpark-loading-o', 'text-primary-600 w-8 h-8 animate-spin')
+
+ @endteleport
+
diff --git a/src/BoltServiceProvider.php b/src/BoltServiceProvider.php
index 4c8f38e2..5abdb188 100644
--- a/src/BoltServiceProvider.php
+++ b/src/BoltServiceProvider.php
@@ -69,6 +69,7 @@ protected function getMigrations(): array
'add_extension_item_responses',
'alter_tables_constraints',
'add_compact_to_section',
+ 'add_options_to_section',
];
}
}
diff --git a/src/Concerns/Designer.php b/src/Concerns/Designer.php
new file mode 100644
index 00000000..ad405fa7
--- /dev/null
+++ b/src/Concerns/Designer.php
@@ -0,0 +1,141 @@
+sections->sortBy('ordering') as $section) {
+ $sections[] = self::drawSections(
+ $zeusForm,
+ $section,
+ self::drawFields($section, $inline)
+ );
+ }
+
+ if (optional($zeusForm->options)['show-as'] === 'tabs') {
+ return [Tabs::make('tabs')->live()->tabs($sections)];
+ }
+
+ if (optional($zeusForm->options)['show-as'] === 'wizard') {
+ return [
+ Wizard::make($sections)
+ ->live(),
+ //->skippable() // todo still not working
+ ];
+ }
+
+ return $sections;
+ }
+
+ private static function drawExt(Form $zeusForm): Section | array
+ {
+ $getExtComponent = Extensions::init($zeusForm, 'formComponents');
+
+ if ($getExtComponent === null) {
+ return [];
+ }
+
+ return Section::make('extensions')
+ ->heading(function () use ($zeusForm) {
+ $class = $zeusForm->extensions;
+ if (class_exists($class)) {
+ return (new $class)->label();
+ }
+
+ return __('Extension');
+ })
+ ->schema($getExtComponent);
+ }
+
+ private static function drawFields(ZeusSection $section, bool $inline): array
+ {
+ $fields = [];
+
+ if (! $inline) {
+ $fields[] = Bolt::renderHook('zeus-form-section.before');
+ }
+
+ foreach ($section->fields->sortBy('ordering') as $zeusField) {
+ if (! $inline) {
+ $fields[] = Bolt::renderHook('zeus-form-field.before');
+ }
+
+ $fieldClass = new $zeusField->type;
+ $component = $fieldClass->renderClass::make('zeusData.' . $zeusField->id);
+
+ $fields[] = $fieldClass->appendFilamentComponentsOptions($component, $zeusField);
+
+ if (! $inline) {
+ $fields[] = Bolt::renderHook('zeus-form-field.after');
+ }
+ }
+
+ if (! $inline) {
+ $fields[] = Bolt::renderHook('zeus-form-section.after');
+ }
+
+ return $fields;
+ }
+
+ private static function drawSections(Form $zeusForm, ZeusSection $section, array $fields): Tab | Step | Section
+ {
+ $component = Section::make($section->name)
+ ->description($section->description)
+ ->aside(fn () => $section->aside)
+ ->compact(fn () => $section->compact)
+ ->collapsible();
+
+ if (optional($zeusForm->options)['show-as'] === 'tabs') {
+ $component = Tab::make($section->name)
+ ->icon($section->icon ?? null);
+ }
+
+ if (optional($zeusForm->options)['show-as'] === 'wizard') {
+ $component = Step::make($section->name)
+ ->live()
+ ->description($section->description)
+ ->icon($section->icon ?? null);
+ }
+
+ $component->visible(function ($record, Get $get) use ($section) {
+
+ if (! isset($section->options['visibility']) || ! $section->options['visibility']['active']) {
+ return true;
+ }
+
+ $relatedField = $section->options['visibility']['fieldID'];
+ $relatedFieldValues = $section->options['visibility']['values'];
+
+ if (empty($relatedField) || empty($relatedFieldValues)) {
+ return true;
+ }
+
+ if (is_array($get('zeusData.' . $relatedField))) {
+ return in_array($relatedFieldValues, $get('zeusData.' . $relatedField));
+ }
+
+ return $relatedFieldValues === $get('zeusData.' . $relatedField);
+ });
+
+ return $component
+ ->id(str($section->name)->slug() . '-' . $section->id)
+ ->schema($fields)
+ ->live()
+ ->columns($section->columns);
+ }
+}
diff --git a/src/Concerns/HasOptions.php b/src/Concerns/HasOptions.php
index 8a707f00..a9a1253b 100644
--- a/src/Concerns/HasOptions.php
+++ b/src/Concerns/HasOptions.php
@@ -17,7 +17,7 @@
trait HasOptions
{
- public static function visibility(): Grid
+ public static function visibility(string $type = 'field'): Grid
{
return Grid::make()
->schema([
@@ -30,15 +30,19 @@ public static function visibility(): Grid
->live()
->visible(fn (Get $get): bool => ! empty($get('options.visibility.active')))
->required(fn (Get $get): bool => ! empty($get('options.visibility.active')))
- ->options(function ($livewire, $record) {
+ ->options(function ($livewire, $record) use ($type) {
if ($record === null) {
return [];
}
return $livewire->record
->fields()
- ->where('fields.id', '!=', $record->id ?? null)
- ->where('fields.options', '!=', $record->id ?? null)
+ ->when($type === 'field', function ($query) use ($record) {
+ return $query->where('fields.id', '!=', $record->id);
+ })
+ ->when($type === 'section', function ($query) use ($record) {
+ return $query->where('section_id', '!=', $record->id);
+ })
->where(function ($query) {
$query->whereNotNull('fields.options->dataSource');
$query->orWhere('type', '\LaraZeus\Bolt\Fields\Classes\Toggle');
diff --git a/src/Concerns/Schemata.php b/src/Concerns/Schemata.php
index d0dfeaf5..78e1b688 100644
--- a/src/Concerns/Schemata.php
+++ b/src/Concerns/Schemata.php
@@ -225,7 +225,8 @@ public static function getTabsSchema(): array
Tabs\Tab::make('design')
->label(__('Design'))
- ->visible(fn (): bool => class_exists(\LaraZeus\BoltPro\BoltProServiceProvider::class) && config('zeus-bolt.allow_design'))
+ ->visible(fn (
+ ): bool => class_exists(\LaraZeus\BoltPro\BoltProServiceProvider::class) && config('zeus-bolt.allow_design'))
->schema([
ViewField::make('options.primary_color')
->view('zeus::filament.components.color-picker'),
@@ -295,6 +296,7 @@ public static function getSectionsSchema(): array
->inline(false)
->visible(fn (Get $get) => $get('../../options.show-as') === 'page')
->label(__('compact section')),
+ self::visibility('section'),
]),
]),
]),
diff --git a/src/Facades/Bolt.php b/src/Facades/Bolt.php
index dbeccbb9..238d41f3 100644
--- a/src/Facades/Bolt.php
+++ b/src/Facades/Bolt.php
@@ -2,19 +2,13 @@
namespace LaraZeus\Bolt\Facades;
-use Filament\Forms\Components\Fieldset;
-use Filament\Forms\Components\Grid;
use Filament\Forms\Components\Placeholder;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Tabs;
-use Filament\Forms\Components\Wizard;
use Filament\Support\Facades\FilamentView;
use Illuminate\Contracts\Support\Htmlable;
use Illuminate\Support\Carbon;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Facade;
-use LaraZeus\Bolt\Models\Form;
class Bolt extends Facade
{
@@ -69,97 +63,6 @@ public static function availableDataSource(): Collection
});
}
- public static function prepareFieldsAndSectionToRender(Form $zeusForm, bool $inline = false): array
- {
- $sections = [];
- $zeusSections = $zeusForm->sections->sortBy('ordering');
-
- $getExtComponent = Extensions::init($zeusForm, 'formComponents');
- if ($getExtComponent !== null) {
- $sections[] = Section::make('extensions')
- ->heading(function () use ($zeusForm) {
- $class = $zeusForm->extensions;
- if (class_exists($class)) {
- return (new $class)->label();
- }
-
- return __('Extension');
- })
- ->schema($getExtComponent);
- }
-
- foreach ($zeusSections as $section) {
- $fields = [];
-
- if (! $inline) {
- $fields[] = static::renderHook('zeus-form-section.before');
- }
-
- foreach ($section->fields->sortBy('ordering') as $zeusField) {
- if (! $inline) {
- $fields[] = static::renderHook('zeus-form-field.before');
- }
-
- $fieldClass = new $zeusField->type;
- $component = $fieldClass->renderClass::make('zeusData.' . $zeusField->id);
-
- $fields[] = $fieldClass->appendFilamentComponentsOptions($component, $zeusField);
-
- if (! $inline) {
- $fields[] = static::renderHook('zeus-form-field.after');
- }
- }
-
- if (! $inline) {
- $fields[] = static::renderHook('zeus-form-section.after');
- }
-
- $sectionId = $section->name . '-' . $section->id;
- if (optional($zeusForm->options)['show-as'] === 'tabs') {
- $sections[] = Tabs\Tab::make($section->name)
- ->id($sectionId)
- ->icon($section->icon ?? null)
- ->schema([
- Grid::make()->columns($section->columns)->schema($fields),
- ]);
- } elseif (optional($zeusForm->options)['show-as'] === 'wizard') {
- $sections[] = Wizard\Step::make($section->name)
- ->id($sectionId)
- ->description($section->description)
- ->icon($section->icon ?? null)
- ->schema([
- Grid::make()->columns($section->columns)->schema($fields),
- ]);
- } else {
- 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);
- }
- }
- }
-
- if (optional($zeusForm->options)['show-as'] === 'tabs') {
- return [Tabs::make('tabs')->tabs($sections)];
- }
-
- if (optional($zeusForm->options)['show-as'] === 'wizard') {
- return [Wizard::make($sections)];
- }
-
- return $sections;
- }
-
public static function renderHook(string $hook): Placeholder
{
$hookRendered = FilamentView::renderHook($hook);
diff --git a/src/Fields/Classes/CheckboxList.php b/src/Fields/Classes/CheckboxList.php
index 8643dd76..548ec48f 100644
--- a/src/Fields/Classes/CheckboxList.php
+++ b/src/Fields/Classes/CheckboxList.php
@@ -51,6 +51,6 @@ public function appendFilamentComponentsOptions($component, $zeusField)
$component = $component->default($selected);
}
- return $component;
+ return $component->live();
}
}
diff --git a/src/Fields/Classes/Radio.php b/src/Fields/Classes/Radio.php
index 5f1195d8..3c3513f9 100644
--- a/src/Fields/Classes/Radio.php
+++ b/src/Fields/Classes/Radio.php
@@ -56,6 +56,6 @@ public function appendFilamentComponentsOptions($component, $zeusField)
$component = $component->default($selected);
}
- return $component;
+ return $component->live();
}
}
diff --git a/src/Fields/Classes/Select.php b/src/Fields/Classes/Select.php
index 07a63b87..b453f715 100644
--- a/src/Fields/Classes/Select.php
+++ b/src/Fields/Classes/Select.php
@@ -59,6 +59,6 @@ public function appendFilamentComponentsOptions($component, $zeusField)
$component = $component->default($selected);
}
- return $component;
+ return $component->live();
}
}
diff --git a/src/Fields/Classes/Toggle.php b/src/Fields/Classes/Toggle.php
index 257c5a84..38bd4594 100644
--- a/src/Fields/Classes/Toggle.php
+++ b/src/Fields/Classes/Toggle.php
@@ -25,4 +25,12 @@ public static function getOptions(): array
self::visibility(),
];
}
+
+ // @phpstan-ignore-next-line
+ public function appendFilamentComponentsOptions($component, $zeusField)
+ {
+ parent::appendFilamentComponentsOptions($component, $zeusField);
+
+ return $component->live();
+ }
}
diff --git a/src/Filament/Resources/FormResource.php b/src/Filament/Resources/FormResource.php
index 2fcf9ff6..63effb70 100644
--- a/src/Filament/Resources/FormResource.php
+++ b/src/Filament/Resources/FormResource.php
@@ -29,12 +29,14 @@
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\SoftDeletingScope;
use LaraZeus\Bolt\BoltPlugin;
+use LaraZeus\Bolt\Concerns\HasOptions;
use LaraZeus\Bolt\Concerns\Schemata;
use LaraZeus\Bolt\Filament\Resources\FormResource\Pages;
use LaraZeus\Bolt\Models\Form as ZeusForm;
class FormResource extends BoltResource
{
+ use HasOptions;
use Schemata;
protected static ?string $navigationIcon = 'clarity-form-line';
diff --git a/src/Livewire/FillForms.php b/src/Livewire/FillForms.php
index c5f1f82c..82bcbccd 100644
--- a/src/Livewire/FillForms.php
+++ b/src/Livewire/FillForms.php
@@ -3,12 +3,13 @@
namespace LaraZeus\Bolt\Livewire;
use Filament\Forms;
+use Filament\Forms\Concerns\InteractsWithForms;
use Illuminate\Support\Facades\Mail;
use Illuminate\View\View;
use LaraZeus\Bolt\BoltPlugin;
+use LaraZeus\Bolt\Concerns\Designer;
use LaraZeus\Bolt\Events\FormMounted;
use LaraZeus\Bolt\Events\FormSent;
-use LaraZeus\Bolt\Facades\Bolt;
use LaraZeus\Bolt\Facades\Extensions;
use LaraZeus\Bolt\Models\Form;
use Livewire\Component;
@@ -18,7 +19,8 @@
*/
class FillForms extends Component implements Forms\Contracts\HasForms
{
- use Forms\Concerns\InteractsWithForms;
+ use Designer;
+ use InteractsWithForms;
public Form $zeusForm;
@@ -30,9 +32,23 @@ class FillForms extends Component implements Forms\Contracts\HasForms
public bool $inline = false;
+ protected static ?string $boltFormDesigner = null;
+
+ public function getBoltFormDesigner(): ?string
+ {
+ return static::$boltFormDesigner;
+ }
+
+ public static function getBoltFormDesignerUsing(?string $form): void
+ {
+ static::$boltFormDesigner = $form;
+ }
+
protected function getFormSchema(): array
{
- return Bolt::prepareFieldsAndSectionToRender($this->zeusForm, $this->inline);
+ $getDesignerClass = $this->getBoltFormDesigner() ?? Designer::class;
+
+ return $getDesignerClass::ui($this->zeusForm, $this->inline);
}
protected function getFormModel(): Form
diff --git a/src/Models/Form.php b/src/Models/Form.php
index a098c8ff..15e1e1bd 100644
--- a/src/Models/Form.php
+++ b/src/Models/Form.php
@@ -29,6 +29,8 @@
* @property bool $date_available
* @property bool $need_login
* @property bool $onePerUser
+ * @property mixed $sections
+ * @property mixed $fields
*/
class Form extends Model
{
diff --git a/src/Models/Section.php b/src/Models/Section.php
index 4290530d..eed89966 100644
--- a/src/Models/Section.php
+++ b/src/Models/Section.php
@@ -18,6 +18,7 @@
* @property string $description
* @property bool $aside
* @property bool $compact
+ * @property mixed $fields
*/
class Section extends Model
{
@@ -29,6 +30,10 @@ class Section extends Model
protected $guarded = [];
+ protected $casts = [
+ 'options' => 'array',
+ ];
+
protected static function booted(): void
{
static::deleting(function (Section $section) {
diff --git a/tests/migrations/004_create_sections_table.php b/tests/migrations/004_create_sections_table.php
index 1611d2e0..c5f9705f 100644
--- a/tests/migrations/004_create_sections_table.php
+++ b/tests/migrations/004_create_sections_table.php
@@ -22,6 +22,8 @@ public function up()
$table->text('description')->nullable();
$table->string('icon')->nullable();
$table->boolean('aside')->default(0);
+ $table->boolean('compact')->default(0);
+ $table->text('options')->nullable();
$table->timestamps();
$table->softDeletes();
});