diff --git a/composer.json b/composer.json index 275a5ead84..e6ee0935c5 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,7 @@ ], "license": "MIT", "require": { + "appstract/laravel-blade-directives": "^1.10", "blade-ui-kit/blade-heroicons": "^0.3", "graham-campbell/markdown": "^13.1", "league/glide-laravel": "^1.0", diff --git a/resources/views/fields/checkbox.blade.php b/resources/views/fields/checkbox.blade.php index 6c6b6457bb..6aa728c338 100644 --- a/resources/views/fields/checkbox.blade.php +++ b/resources/views/fields/checkbox.blade.php @@ -6,7 +6,9 @@ @if ($model) {{ $modelDirective }}="{{ $model }}" @endif - {{ old($model ?? $name) ? 'checked' : '' }} + @isset($checked) + checked + @endisset @if ($extraAttributes) @foreach ($extraAttributes as $attribute => $value) {{ $attribute }}="{{ $value }}" diff --git a/resources/views/fields/text.blade.php b/resources/views/fields/text.blade.php index cb39b63930..c4b9b52339 100644 --- a/resources/views/fields/text.blade.php +++ b/resources/views/fields/text.blade.php @@ -4,9 +4,7 @@ + class="block w-full rounded shadow-sm focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 @error($model ?? $name) border-red-600 motion-safe:animate-shake @else border-gray-300 @enderror" + /> @overwrite \ No newline at end of file diff --git a/resources/views/fields/textarea.blade.php b/resources/views/fields/textarea.blade.php index b0a715f39c..c11e16cd3d 100644 --- a/resources/views/fields/textarea.blade.php +++ b/resources/views/fields/textarea.blade.php @@ -13,6 +13,6 @@ @endforeach @endif class="block w-full rounded shadow-sm focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 @error($model ?? $name) border-red-600 motion-safe:animate-shake @else border-gray-300 @enderror"> - {{ old($model ?? $name, $value) }} + {{ $value ?? '' }} @overwrite \ No newline at end of file diff --git a/resources/views/fields/trix.blade.php b/resources/views/fields/trix.blade.php new file mode 100644 index 0000000000..1eff311304 --- /dev/null +++ b/resources/views/fields/trix.blade.php @@ -0,0 +1,33 @@ +@extends('filament::layouts.field-group') + +@pushonce('head:trix') + @style('https://www.unpkg.com/trix@1.3.1/dist/trix.css') +@endpushonce + +@pushonce('js:trix') + @script('https://www.unpkg.com/trix@1.3.1/dist/trix.js') +@endpushonce + +@section('field') +
+ + + $value) + {{ $attribute }}="{{ $value }}" + @endforeach + @endif + > +
+@overwrite diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index 7bad5aedaf..8be400ac36 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -13,6 +13,6 @@ @yield('content') @livewireScripts @filamentScripts - @stack('scripts') + @stack('js') \ No newline at end of file diff --git a/src/Fields/Trix.php b/src/Fields/Trix.php new file mode 100644 index 0000000000..dec4be2939 --- /dev/null +++ b/src/Fields/Trix.php @@ -0,0 +1,7 @@ +