diff --git a/packages/forms/resources/views/components/checkbox.blade.php b/packages/forms/resources/views/components/checkbox.blade.php index ed52084d33..711255d05f 100644 --- a/packages/forms/resources/views/components/checkbox.blade.php +++ b/packages/forms/resources/views/components/checkbox.blade.php @@ -7,7 +7,9 @@ :label="$formComponent->getLabel()" :required="$formComponent->isRequired()" > + @if(!$formComponent->isColumnLayout()) + @endif isAutofocused() ? 'autofocus' : null !!} {!! $formComponent->isDisabled() ? 'disabled' : null !!} @@ -18,5 +20,7 @@ class="rounded text-primary-600 shadow-sm focus:border-primary-700 focus:ring focus:ring-blue-200 focus:ring-opacity-50 {{ $errors->has($formComponent->getName()) ? 'border-danger-600 ' : 'border-gray-300' }}" {!! Filament\format_attributes($formComponent->getExtraAttributes()) !!} /> + @if(!$formComponent->isColumnLayout()) + @endif diff --git a/packages/forms/resources/views/components/toggle.blade.php b/packages/forms/resources/views/components/toggle.blade.php index 123cf4fd4b..132659d8d4 100644 --- a/packages/forms/resources/views/components/toggle.blade.php +++ b/packages/forms/resources/views/components/toggle.blade.php @@ -7,7 +7,9 @@ :label="$formComponent->getLabel()" :required="$formComponent->isRequired()" > + @if(!$formComponent->isColumnLayout()) + @endif + @if(!$formComponent->isColumnLayout()) + @endif diff --git a/packages/forms/src/Components/Checkbox.php b/packages/forms/src/Components/Checkbox.php index 9f871ba6df..419bfad4c3 100644 --- a/packages/forms/src/Components/Checkbox.php +++ b/packages/forms/src/Components/Checkbox.php @@ -5,6 +5,7 @@ namespace Filament\Forms\Components; class Checkbox extends Field { use Concerns\CanBeAutofocused; + use Concerns\CanAlternateToColumnLayout; protected function setUp() { diff --git a/packages/forms/src/Components/Concerns/CanAlternateToColumnLayout.php b/packages/forms/src/Components/Concerns/CanAlternateToColumnLayout.php new file mode 100644 index 0000000000..1d789c1605 --- /dev/null +++ b/packages/forms/src/Components/Concerns/CanAlternateToColumnLayout.php @@ -0,0 +1,22 @@ +configure(function () { + $this->columnLayout = true; + }); + + return $this; + } + + public function isColumnLayout() + { + return $this->columnLayout; + } +} diff --git a/packages/forms/src/Components/Toggle.php b/packages/forms/src/Components/Toggle.php index 1479a7d545..ec7c4ab59c 100644 --- a/packages/forms/src/Components/Toggle.php +++ b/packages/forms/src/Components/Toggle.php @@ -8,6 +8,7 @@ use Filament\Forms\Components\Field; class Toggle extends Field { use Concerns\CanBeAutofocused; + use Concerns\CanAlternateToColumnLayout; protected $onIcon;