From 80c67f04741d11e5b9229897232e04f9720b3842 Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Tue, 20 Apr 2021 15:29:43 -0400 Subject: [PATCH] Refactor trait name and methods --- .../views/components/checkbox.blade.php | 4 +-- .../views/components/toggle.blade.php | 4 +-- packages/forms/src/Components/Checkbox.php | 2 +- .../Concerns/CanAlternateLayoutDirection.php | 31 +++++++++++++++++++ .../Concerns/CanAlternateToColumnLayout.php | 22 ------------- packages/forms/src/Components/Toggle.php | 2 +- 6 files changed, 37 insertions(+), 28 deletions(-) create mode 100644 packages/forms/src/Components/Concerns/CanAlternateLayoutDirection.php delete mode 100644 packages/forms/src/Components/Concerns/CanAlternateToColumnLayout.php diff --git a/packages/forms/resources/views/components/checkbox.blade.php b/packages/forms/resources/views/components/checkbox.blade.php index 711255d05f..8d1cae2409 100644 --- a/packages/forms/resources/views/components/checkbox.blade.php +++ b/packages/forms/resources/views/components/checkbox.blade.php @@ -7,7 +7,7 @@ :label="$formComponent->getLabel()" :required="$formComponent->isRequired()" > - @if(!$formComponent->isColumnLayout()) + @if($formComponent->isInlineLayout()) @endif getExtraAttributes()) !!} /> - @if(!$formComponent->isColumnLayout()) + @if($formComponent->isInlineLayout()) @endif diff --git a/packages/forms/resources/views/components/toggle.blade.php b/packages/forms/resources/views/components/toggle.blade.php index 132659d8d4..91d96e92ef 100644 --- a/packages/forms/resources/views/components/toggle.blade.php +++ b/packages/forms/resources/views/components/toggle.blade.php @@ -7,7 +7,7 @@ :label="$formComponent->getLabel()" :required="$formComponent->isRequired()" > - @if(!$formComponent->isColumnLayout()) + @if($formComponent->isInlineLayout()) @endif - @if(!$formComponent->isColumnLayout()) + @if($formComponent->isInlineLayout()) @endif diff --git a/packages/forms/src/Components/Checkbox.php b/packages/forms/src/Components/Checkbox.php index 419bfad4c3..cc411c50d5 100644 --- a/packages/forms/src/Components/Checkbox.php +++ b/packages/forms/src/Components/Checkbox.php @@ -5,7 +5,7 @@ namespace Filament\Forms\Components; class Checkbox extends Field { use Concerns\CanBeAutofocused; - use Concerns\CanAlternateToColumnLayout; + use Concerns\CanAlternateLayoutDirection; protected function setUp() { diff --git a/packages/forms/src/Components/Concerns/CanAlternateLayoutDirection.php b/packages/forms/src/Components/Concerns/CanAlternateLayoutDirection.php new file mode 100644 index 0000000000..9f4f8edd53 --- /dev/null +++ b/packages/forms/src/Components/Concerns/CanAlternateLayoutDirection.php @@ -0,0 +1,31 @@ +configure(function () { + $this->inlineLayout = true; + }); + + return $this; + } + + public function stackedLayout() + { + $this->configure(function () { + $this->inlineLayout = false; + }); + + return $this; + } + + public function isInlineLayout() + { + return $this->inlineLayout; + } +} diff --git a/packages/forms/src/Components/Concerns/CanAlternateToColumnLayout.php b/packages/forms/src/Components/Concerns/CanAlternateToColumnLayout.php deleted file mode 100644 index 1d789c1605..0000000000 --- a/packages/forms/src/Components/Concerns/CanAlternateToColumnLayout.php +++ /dev/null @@ -1,22 +0,0 @@ -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 ec7c4ab59c..1f2e868f40 100644 --- a/packages/forms/src/Components/Toggle.php +++ b/packages/forms/src/Components/Toggle.php @@ -8,7 +8,7 @@ use Filament\Forms\Components\Field; class Toggle extends Field { use Concerns\CanBeAutofocused; - use Concerns\CanAlternateToColumnLayout; + use Concerns\CanAlternateLayoutDirection; protected $onIcon;