various cleanup and add entry

awcodes · awcodes · commit 156d0dbd7c42 · 2025-02-25T12:28:10.000-05:00
diff --git a/composer.json b/composer.json
@@ -77,10 +77,7 @@
         "laravel": {
             "providers": [
                 "Awcodes\\Mason\\MasonServiceProvider"
-            ],
-            "aliases": {
-                "Mason": "Awcodes\\Mason\\Facades\\Mason"
-            }
+            ]
         }
     },
     "minimum-stability": "dev",
diff --git a/resources/views/bricks/section.blade.php b/resources/views/bricks/section.blade.php
@@ -1,14 +1,11 @@
 @props([
-    'id' => null,
     'background_color' => 'white',
     'image_position' => null,
     'image_alignment' => null,
     'image_rounded' => false,
     'image_shadow' => false,
     'text' => null,
     'image' => null,
-    'actions' => [],
-    'actions_alignment' => null,
 ])
 
 <section
@@ -48,9 +45,10 @@
                         src="{{ \Illuminate\Support\Facades\Storage::url($image) }}"
                         alt=""
                         @class([
-                        'rounded-lg' => $image_rounded,
-                        'shadow-md' => $image_shadow,
-                    ]) />
+                            'rounded-lg' => $image_rounded,
+                            'shadow-md' => $image_shadow,
+                        ])
+                    />
                 </div>
             @endif
 
@@ -65,13 +63,6 @@
                         {!! $text !!}
                     </div>
                 @endif
-
-                {{--            @if ($actions)--}}
-                {{--                <x-blocks.actions--}}
-                {{--                    :actions="$actions"--}}
-                {{--                    :actions_alignment="$actions_alignment"--}}
-                {{--                />--}}
-                {{--            @endif--}}
             </div>
         </div>
     </div>
diff --git a/resources/views/mason-entry.blade.php b/resources/views/mason-entry.blade.php
@@ -0,0 +1,14 @@
+<x-dynamic-component :component="$getEntryWrapperView()" :entry="$entry">
+    <div
+        {{
+            \Filament\Support\prepare_inherited_attributes($getExtraAttributeBag())
+                ->class([
+                    'mason-entry',
+                ])
+        }}
+    >
+        <div class="mason">
+            {!! mason($getState())->bricks($getBricks())->toHtml() !!}
+        </div>
+    </div>
+</x-dynamic-component>
diff --git a/src/Actions/InsertBrick.php b/src/Actions/InsertBrick.php
@@ -4,8 +4,10 @@
 
 use Awcodes\Mason\Mason;
 use Filament\Forms\Components\Actions\Action;
+use Filament\Forms\Components\Radio;
 use Filament\Forms\Components\Select;
-use Filament\Forms\Components\ToggleButtons;
+use Filament\Support\Enums\Alignment;
+use Filament\Support\Enums\MaxWidth;
 use Livewire\Component;
 
 class InsertBrick
@@ -14,6 +16,8 @@ public static function make(): Action
     {
         return Action::make('insertBrick')
             ->label(fn (): string => trans('mason::mason.insert_brick'))
+            ->modalWidth(MaxWidth::Small)
+            ->modalFooterActionsAlignment(Alignment::Center)
             ->form(function (Mason $component) {
                 return [
                     Select::make('name')
@@ -26,15 +30,16 @@ public static function make(): Action
                         })
                         ->searchable()
                         ->rules('required'),
-                    ToggleButtons::make('position')
+                    Radio::make('position')
                         ->label('Position')
                         ->options([
                             'before' => 'Before',
                             'after' => 'After',
                         ])
-                        ->grouped()
+                        ->inline()
                         ->default('after')
-                        ->rules('required'),
+                        ->rules('required')
+                        ->extraAttributes(['style' => 'margin-bottom: 1rem;']),
                 ];
             })
             ->action(function (Mason $component, Component $livewire, array $data, array $arguments) {
diff --git a/src/Brick.php b/src/Brick.php
@@ -2,11 +2,15 @@
 
 namespace Awcodes\Mason;
 
+use Exception;
 use Filament\Forms\Components\Actions\Action;
 use Illuminate\Support\Js;
 
 class Brick extends Action
 {
+    /**
+     * @throws Exception
+     */
     public function getAlpineClickHandler(): ?string
     {
         return $this->evaluate($this->alpineClickHandler) ?? '$wire.mountFormComponentAction(\'' . $this->component->getStatePath() . '\', \'' . $this->getName() . '\', { ...getEditor().getAttributes(\'' . $this->getName() . '\'), editorSelection }, ' . Js::from(['schemaComponent' => $this->component->getKey()]) . ')';
diff --git a/src/Bricks/Section.php b/src/Bricks/Section.php
@@ -30,8 +30,6 @@ public static function make(): Brick
                 'image_shadow' => $arguments['image_shadow'] ?? null,
                 'text' => $arguments['text'] ?? null,
                 'image' => $arguments['image'] ?? null,
-                'actions' => [],
-                'actions_alignment' => null,
             ])
             ->form([
                 Radio::make('background_color')
diff --git a/src/Concerns/HasBricks.php b/src/Concerns/HasBricks.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Awcodes\Mason\Concerns;
+
+use Awcodes\Mason\Bricks\Section;
+use Closure;
+
+trait HasBricks
+{
+    protected array | Closure | null $bricks = null;
+
+    public function bricks(array | Closure $bricks): static
+    {
+        $this->bricks = $bricks;
+
+        return $this;
+    }
+
+    public function getBricks(): array
+    {
+        return $this->evaluate($this->bricks) ?? [
+            Section::make(),
+        ];
+    }
+}
diff --git a/src/Concerns/HasSidebar.php b/src/Concerns/HasSidebar.php
@@ -10,8 +10,6 @@ trait HasSidebar
 {
     protected array | Closure | null $sidebarActions = null;
 
-    protected bool | Closure | null $isSidebarHidden = null;
-
     protected SidebarPosition | Closure | null $sidebarPosition = null;
 
     /**
@@ -24,13 +22,6 @@ public function sidebar(array | Closure $actions): static
         return $this;
     }
 
-    public function hiddenSidebar(bool | Closure $condition = true): static
-    {
-        $this->isSidebarHidden = $condition;
-
-        return $this;
-    }
-
     public function sidebarPosition(SidebarPosition | Closure | null $position = null): static
     {
         $this->sidebarPosition = $position;
@@ -50,9 +41,4 @@ public function getSidebarPosition(): SidebarPosition
     {
         return $this->evaluate($this->sidebarPosition) ?? SidebarPosition::End;
     }
-
-    public function isSidebarHidden(): bool
-    {
-        return $this->evaluate($this->isSidebarHidden) ?? false;
-    }
 }
diff --git a/src/Facades/Mason.php b/src/Facades/Mason.php
diff --git a/src/Mason.php b/src/Mason.php
@@ -3,10 +3,9 @@
 namespace Awcodes\Mason;
 
 use Awcodes\Mason\Actions\InsertBrick;
-use Awcodes\Mason\Bricks\Section;
+use Awcodes\Mason\Concerns\HasBricks;
 use Awcodes\Mason\Concerns\HasSidebar;
 use Awcodes\Mason\Support\Helpers;
-use Closure;
 use Filament\Forms\Components\Concerns\HasExtraInputAttributes;
 use Filament\Forms\Components\Contracts\CanBeLengthConstrained;
 use Filament\Forms\Components\Field;
@@ -21,13 +20,10 @@ class Mason extends Field implements CanBeLengthConstrained
     use HasExtraInputAttributes;
     use HasPlaceholder;
     use HasSidebar;
+    use HasBricks;
 
     protected string $view = 'mason::mason';
 
-    protected bool | Closure $isJson = false;
-
-    protected array | Closure | null $bricks = null;
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -78,30 +74,4 @@ public function runCommands(array $commands, array $editorSelection): void
             commands: array_map(fn (EditorCommand $command): array => $command->toArray(), $commands),
         );
     }
-
-    public function json(bool | Closure $condition = true): static
-    {
-        $this->isJson = $condition;
-
-        return $this;
-    }
-
-    public function isJson(): bool
-    {
-        return (bool) $this->evaluate($this->isJson);
-    }
-
-    public function bricks(array | Closure $bricks): static
-    {
-        $this->bricks = $bricks;
-
-        return $this;
-    }
-
-    public function getBricks(): array
-    {
-        return $this->evaluate($this->bricks) ?? [
-            Section::make(),
-        ];
-    }
 }
diff --git a/src/MasonEntry.php b/src/MasonEntry.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Awcodes\Mason;
+
+use Awcodes\Mason\Concerns\HasBricks;
+use Filament\Infolists\Components\Entry;
+
+class MasonEntry extends Entry
+{
+    use HasBricks;
+
+    protected string $view = 'mason::mason-entry';
+}
diff --git a/src/MasonPlugin.php b/src/MasonPlugin.php
diff --git a/src/MasonServiceProvider.php b/src/MasonServiceProvider.php
@@ -10,10 +10,12 @@
 use Filament\Support\Assets\Asset;
 use Filament\Support\Facades\FilamentAsset;
 use Filament\Support\Facades\FilamentView;
+use Filament\View\PanelsRenderHook;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Facades\Blade;
 use Livewire\Features\SupportTesting\Testable;
 use Livewire\Livewire;
+use ReflectionException;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
 
@@ -34,35 +36,38 @@ public function configurePackage(Package $package): void
 
     public function packageRegistered(): void {}
 
+    /**
+     * @throws ReflectionException
+     */
     public function packageBooted(): void
     {
-        // Asset Registration
         FilamentAsset::register(
             $this->getAssets(),
             $this->getAssetPackageName()
         );
 
-        // Handle Stubs
         if (app()->runningInConsole()) {
-            foreach (app(Filesystem::class)->files(__DIR__ . '/../stubs/') as $file) {
+            foreach (app(abstract: Filesystem::class)->files(directory: __DIR__ . '/../stubs/') as $file) {
                 $this->publishes([
-                    $file->getRealPath() => base_path("stubs/mason/{$file->getFilename()}"),
-                ], 'mason-stubs');
+                    $file->getRealPath() => base_path(path: "stubs/mason/{$file->getFilename()}"),
+                ], groups: 'mason-stubs');
             }
         }
 
-        Blade::directive('mason', fn ($expression) => "<?php echo (new Awcodes\Mason\Support\Converter({$expression}))->toHtml(); ?>");
+        Blade::directive(
+            name: 'mason',
+            handler: fn ($expression) => "<?php echo (new Awcodes\Mason\Support\Converter({$expression}))->toHtml(); ?>"
+        );
 
-        Livewire::component('mason.renderer', Renderer::class);
+        Livewire::component(name: 'mason.renderer', class: Renderer::class);
 
         if (! Helpers::isAuthRoute()) {
             FilamentView::registerRenderHook(
-                name: 'panels::body.end',
-                hook: fn (): string => Blade::render('@livewire("mason.renderer")')
+                name: PanelsRenderHook::BODY_END,
+                hook: fn (): string => Blade::render(string: '@livewire("mason.renderer")')
             );
         }
 
-        // Testing
         Testable::mixin(new TestsMason);
     }
 
@@ -77,7 +82,7 @@ protected function getAssetPackageName(): ?string
     protected function getAssets(): array
     {
         return [
-            AlpineComponent::make('mason', __DIR__ . '/../resources/dist/mason.js'),
+            AlpineComponent::make(id: 'mason', path: __DIR__ . '/../resources/dist/mason.js'),
         ];
     }
 }
diff --git a/src/Support/Converter.php b/src/Support/Converter.php
diff --git a/src/Tiptap/Nodes/MasonBrick.php b/src/Tiptap/Nodes/MasonBrick.php
diff --git a/src/helpers.php b/src/helpers.php

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,15 @@`
`2`	`2`
`3`	`3`	`namespace Awcodes\Mason;`
`4`	`4`
	`5`	`+use Exception;`
`5`	`6`	`use Filament\Forms\Components\Actions\Action;`
`6`	`7`	`use Illuminate\Support\Js;`
`7`	`8`
`8`	`9`	`class Brick extends Action`
`9`	`10`	`{`
	`11`	`+ /**`
	`12`	`+ * @throws Exception`
	`13`	`+ */`
`10`	`14`	`public function getAlpineClickHandler(): ?string`
`11`	`15`	`{`
`12`	`16`	`return $this->evaluate($this->alpineClickHandler) ?? '$wire.mountFormComponentAction(\'' . $this->component->getStatePath() . '\', \'' . $this->getName() . '\', { ...getEditor().getAttributes(\'' . $this->getName() . '\'), editorSelection }, ' . Js::from(['schemaComponent' => $this->component->getKey()]) . ')';`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@ trait HasSidebar`
`10`	`10`	`{`
`11`	`11`	`protected array \| Closure \| null $sidebarActions = null;`
`12`	`12`
`13`		`- protected bool \| Closure \| null $isSidebarHidden = null;`
`14`		`-`
`15`	`13`	`protected SidebarPosition \| Closure \| null $sidebarPosition = null;`
`16`	`14`
`17`	`15`	`/**`
`@@ -24,13 +22,6 @@ public function sidebar(array \| Closure $actions): static`
`24`	`22`	`return $this;`
`25`	`23`	`}`
`26`	`24`
`27`		`- public function hiddenSidebar(bool \| Closure $condition = true): static`
`28`		`- {`
`29`		`- $this->isSidebarHidden = $condition;`
`30`		`-`
`31`		`- return $this;`
`32`		`- }`
`33`		`-`
`34`	`25`	`public function sidebarPosition(SidebarPosition \| Closure \| null $position = null): static`
`35`	`26`	`{`
`36`	`27`	`$this->sidebarPosition = $position;`
`@@ -50,9 +41,4 @@ public function getSidebarPosition(): SidebarPosition`
`50`	`41`	`{`
`51`	`42`	`return $this->evaluate($this->sidebarPosition) ?? SidebarPosition::End;`
`52`	`43`	`}`
`53`		`-`
`54`		`- public function isSidebarHidden(): bool`
`55`		`- {`
`56`		`- return $this->evaluate($this->isSidebarHidden) ?? false;`
`57`		`- }`
`58`	`44`	`}`