From 7d6fac74eaba542906290cb3d81cba9755fca331 Mon Sep 17 00:00:00 2001 From: Joe <104938042+lrljoe@users.noreply.github.com> Date: Sun, 29 Sep 2024 23:44:46 +0100 Subject: [PATCH 1/9] Initial Commit --- resources/views/components/tools.blade.php | 12 ++++--- .../views/components/tools/toolbar.blade.php | 20 +++++------ .../ToolsStylingConfiguration.php | 20 +++++++++++ src/Traits/Styling/HasToolsStyling.php | 17 ++++++++++ .../Styling/Helpers/ToolsStylingHelpers.php | 33 +++++++++++++++++++ src/Traits/WithTools.php | 6 +++- .../Helpers/ToolsStylingHelpersTest.php | 29 ++++++++++++++++ 7 files changed, 122 insertions(+), 15 deletions(-) create mode 100644 src/Traits/Styling/Configuration/ToolsStylingConfiguration.php create mode 100644 src/Traits/Styling/HasToolsStyling.php create mode 100644 src/Traits/Styling/Helpers/ToolsStylingHelpers.php create mode 100644 tests/Traits/Helpers/ToolsStylingHelpersTest.php diff --git a/resources/views/components/tools.blade.php b/resources/views/components/tools.blade.php index 4a5dfa7b8..bdb31a745 100644 --- a/resources/views/components/tools.blade.php +++ b/resources/views/components/tools.blade.php @@ -1,8 +1,12 @@ @aware(['component','isTailwind','isBootstrap']) +@php($toolsAttributes = $this->getToolsAttributesBag()) -
$isTailwind, - 'd-flex flex-column ' => ($isBootstrap), -])> +
merge() + ->class(['flex-col' => $isTailwind && ($toolsAttributes['default-styling'] ?? true)]) + ->class(['d-flex flex-column' => $isBootstrap && ($toolsAttributes['default-styling'] ?? true)]) + ->except(['default','default-styling','default-colors']) + }} +> {{ $slot }}
diff --git a/resources/views/components/tools/toolbar.blade.php b/resources/views/components/tools/toolbar.blade.php index 8a3c8901b..65e8c086b 100644 --- a/resources/views/components/tools/toolbar.blade.php +++ b/resources/views/components/tools/toolbar.blade.php @@ -1,10 +1,14 @@ @aware(['component', 'tableName','isTailwind','isBootstrap']) @props([]) +@php($toolBarAttributes = $this->getToolBarAttributesBag()) -
$this->isBootstrap, - 'md:flex md:justify-between mb-4 px-4 md:p-0' => $this->isTailwind, - ]) +
merge() + ->class(['md:flex md:justify-between mb-4 px-4 md:p-0' => $isTailwind && ($toolBarAttributes['default-styling'] ?? true)]) + ->class(['d-md-flex justify-content-between mb-3' => $isBootstrap && ($toolBarAttributes['default-styling'] ?? true)]) + ->except(['default','default-styling','default-colors']) + }} >
$this->isBootstrap, @@ -52,9 +56,7 @@ 'md:flex md:items-center space-y-4 md:space-y-0 md:space-x-2' => $this->isTailwind, ]) > - @if ($this->hasConfigurableAreaFor('toolbar-right-start')) - @include($this->getConfigurableAreaFor('toolbar-right-start'), $this->getParametersForConfigurableArea('toolbar-right-start')) - @endif + @includeWhen($this->hasConfigurableAreaFor('toolbar-right-start'), $this->getConfigurableAreaFor('toolbar-right-start'), $this->getParametersForConfigurableArea('toolbar-right-start')) @if($this->hasActions && $this->showActionsInToolbar && $this->getActionsPosition == 'right') @@ -72,9 +74,7 @@ @endif - @if ($this->hasConfigurableAreaFor('toolbar-right-end')) - @include($this->getConfigurableAreaFor('toolbar-right-end'), $this->getParametersForConfigurableArea('toolbar-right-end')) - @endif + @includeWhen($this->hasConfigurableAreaFor('toolbar-right-end'), $this->getConfigurableAreaFor('toolbar-right-end'), $this->getParametersForConfigurableArea('toolbar-right-end'))
@if ( diff --git a/src/Traits/Styling/Configuration/ToolsStylingConfiguration.php b/src/Traits/Styling/Configuration/ToolsStylingConfiguration.php new file mode 100644 index 000000000..27679f04b --- /dev/null +++ b/src/Traits/Styling/Configuration/ToolsStylingConfiguration.php @@ -0,0 +1,20 @@ +setCustomAttributes(propertyName: 'toolsAttributes', customAttributes: $toolsAttributes); + + return $this; + } + + public function setToolBarAttributes(array $toolBarAttributes = []): self + { + $this->setCustomAttributes(propertyName: 'toolBarAttributes', customAttributes: $toolBarAttributes); + + return $this; + } +} \ No newline at end of file diff --git a/src/Traits/Styling/HasToolsStyling.php b/src/Traits/Styling/HasToolsStyling.php new file mode 100644 index 000000000..d5bab60ec --- /dev/null +++ b/src/Traits/Styling/HasToolsStyling.php @@ -0,0 +1,17 @@ + true, 'default-colors' => true, 'class' => '']; + + protected array $toolBarAttributes = ['default-styling' => true, 'default-colors' => true, 'class' => '']; + +} diff --git a/src/Traits/Styling/Helpers/ToolsStylingHelpers.php b/src/Traits/Styling/Helpers/ToolsStylingHelpers.php new file mode 100644 index 000000000..2b9f152d7 --- /dev/null +++ b/src/Traits/Styling/Helpers/ToolsStylingHelpers.php @@ -0,0 +1,33 @@ +getCustomAttributes(propertyName: 'toolsAttributes', default: false, classicMode: false); + } + + #[Computed] + public function getToolsAttributesBag(): ComponentAttributeBag + { + return $this->getCustomAttributesBagFromArray($this->getToolsAttributes()); + } + + protected function getToolBarAttributes(): array + { + return $this->getCustomAttributes(propertyName: 'toolBarAttributes', default: false, classicMode: false); + } + + #[Computed] + public function getToolBarAttributesBag(): ComponentAttributeBag + { + return $this->getCustomAttributesBagFromArray($this->getToolBarAttributes()); + + } +} \ No newline at end of file diff --git a/src/Traits/WithTools.php b/src/Traits/WithTools.php index 31d91a57a..1c81fde6b 100644 --- a/src/Traits/WithTools.php +++ b/src/Traits/WithTools.php @@ -4,13 +4,17 @@ use Rappasoft\LaravelLivewireTables\Traits\Configuration\ToolsConfiguration; use Rappasoft\LaravelLivewireTables\Traits\Helpers\ToolsHelpers; +use Rappasoft\LaravelLivewireTables\Traits\Styling\HasToolsStyling; trait WithTools { use ToolsConfiguration, - ToolsHelpers; + ToolsHelpers, + HasToolsStyling; protected bool $toolsStatus = true; protected bool $toolBarStatus = true; + + } diff --git a/tests/Traits/Helpers/ToolsStylingHelpersTest.php b/tests/Traits/Helpers/ToolsStylingHelpersTest.php new file mode 100644 index 000000000..b56a0fe13 --- /dev/null +++ b/tests/Traits/Helpers/ToolsStylingHelpersTest.php @@ -0,0 +1,29 @@ +assertTrue($this->basicTable->hasCustomAttributes('toolsAttributes')); + } + + public function test_can_get_tools_attributes_initial_values(): void + { + $this->assertSame(['default-styling' => true, 'default-colors' => true, 'class' => ''], $this->basicTable->getToolsAttributesBag()->getAttributes()); + } + + public function test_can_get_toolbar_attributes_initial_status(): void + { + $this->assertTrue($this->basicTable->hasCustomAttributes('toolBarAttributes')); + } + + public function test_can_get_toolbar_attributes_initial_values(): void + { + $this->assertSame(['default-styling' => true, 'default-colors' => true, 'class' => ''], $this->basicTable->getToolBarAttributesBag()->getAttributes()); + } + +} \ No newline at end of file From 673cc585e4f488e606c3d28f982a0a05bf3ef253 Mon Sep 17 00:00:00 2001 From: lrljoe Date: Sun, 29 Sep 2024 22:45:10 +0000 Subject: [PATCH 2/9] Fix styling --- .../ToolsStylingConfiguration.php | 40 ++++++------ src/Traits/Styling/HasToolsStyling.php | 33 +++++----- .../Styling/Helpers/ToolsStylingHelpers.php | 65 +++++++++---------- src/Traits/WithTools.php | 2 - .../Helpers/ToolsStylingHelpersTest.php | 57 ++++++++-------- 5 files changed, 96 insertions(+), 101 deletions(-) diff --git a/src/Traits/Styling/Configuration/ToolsStylingConfiguration.php b/src/Traits/Styling/Configuration/ToolsStylingConfiguration.php index 27679f04b..9b2ca17f4 100644 --- a/src/Traits/Styling/Configuration/ToolsStylingConfiguration.php +++ b/src/Traits/Styling/Configuration/ToolsStylingConfiguration.php @@ -1,20 +1,20 @@ -setCustomAttributes(propertyName: 'toolsAttributes', customAttributes: $toolsAttributes); - - return $this; - } - - public function setToolBarAttributes(array $toolBarAttributes = []): self - { - $this->setCustomAttributes(propertyName: 'toolBarAttributes', customAttributes: $toolBarAttributes); - - return $this; - } -} \ No newline at end of file +setCustomAttributes(propertyName: 'toolsAttributes', customAttributes: $toolsAttributes); + + return $this; + } + + public function setToolBarAttributes(array $toolBarAttributes = []): self + { + $this->setCustomAttributes(propertyName: 'toolBarAttributes', customAttributes: $toolBarAttributes); + + return $this; + } +} diff --git a/src/Traits/Styling/HasToolsStyling.php b/src/Traits/Styling/HasToolsStyling.php index d5bab60ec..c4cb14369 100644 --- a/src/Traits/Styling/HasToolsStyling.php +++ b/src/Traits/Styling/HasToolsStyling.php @@ -1,17 +1,16 @@ - true, 'default-colors' => true, 'class' => '']; - - protected array $toolBarAttributes = ['default-styling' => true, 'default-colors' => true, 'class' => '']; - -} + true, 'default-colors' => true, 'class' => '']; + + protected array $toolBarAttributes = ['default-styling' => true, 'default-colors' => true, 'class' => '']; +} diff --git a/src/Traits/Styling/Helpers/ToolsStylingHelpers.php b/src/Traits/Styling/Helpers/ToolsStylingHelpers.php index 2b9f152d7..95aa8684f 100644 --- a/src/Traits/Styling/Helpers/ToolsStylingHelpers.php +++ b/src/Traits/Styling/Helpers/ToolsStylingHelpers.php @@ -1,33 +1,32 @@ -getCustomAttributes(propertyName: 'toolsAttributes', default: false, classicMode: false); - } - - #[Computed] - public function getToolsAttributesBag(): ComponentAttributeBag - { - return $this->getCustomAttributesBagFromArray($this->getToolsAttributes()); - } - - protected function getToolBarAttributes(): array - { - return $this->getCustomAttributes(propertyName: 'toolBarAttributes', default: false, classicMode: false); - } - - #[Computed] - public function getToolBarAttributesBag(): ComponentAttributeBag - { - return $this->getCustomAttributesBagFromArray($this->getToolBarAttributes()); - - } -} \ No newline at end of file +getCustomAttributes(propertyName: 'toolsAttributes', default: false, classicMode: false); + } + + #[Computed] + public function getToolsAttributesBag(): ComponentAttributeBag + { + return $this->getCustomAttributesBagFromArray($this->getToolsAttributes()); + } + + protected function getToolBarAttributes(): array + { + return $this->getCustomAttributes(propertyName: 'toolBarAttributes', default: false, classicMode: false); + } + + #[Computed] + public function getToolBarAttributesBag(): ComponentAttributeBag + { + return $this->getCustomAttributesBagFromArray($this->getToolBarAttributes()); + + } +} diff --git a/src/Traits/WithTools.php b/src/Traits/WithTools.php index 1c81fde6b..8ede2e382 100644 --- a/src/Traits/WithTools.php +++ b/src/Traits/WithTools.php @@ -15,6 +15,4 @@ trait WithTools protected bool $toolsStatus = true; protected bool $toolBarStatus = true; - - } diff --git a/tests/Traits/Helpers/ToolsStylingHelpersTest.php b/tests/Traits/Helpers/ToolsStylingHelpersTest.php index b56a0fe13..519e9e071 100644 --- a/tests/Traits/Helpers/ToolsStylingHelpersTest.php +++ b/tests/Traits/Helpers/ToolsStylingHelpersTest.php @@ -1,29 +1,28 @@ -assertTrue($this->basicTable->hasCustomAttributes('toolsAttributes')); - } - - public function test_can_get_tools_attributes_initial_values(): void - { - $this->assertSame(['default-styling' => true, 'default-colors' => true, 'class' => ''], $this->basicTable->getToolsAttributesBag()->getAttributes()); - } - - public function test_can_get_toolbar_attributes_initial_status(): void - { - $this->assertTrue($this->basicTable->hasCustomAttributes('toolBarAttributes')); - } - - public function test_can_get_toolbar_attributes_initial_values(): void - { - $this->assertSame(['default-styling' => true, 'default-colors' => true, 'class' => ''], $this->basicTable->getToolBarAttributesBag()->getAttributes()); - } - -} \ No newline at end of file +assertTrue($this->basicTable->hasCustomAttributes('toolsAttributes')); + } + + public function test_can_get_tools_attributes_initial_values(): void + { + $this->assertSame(['default-styling' => true, 'default-colors' => true, 'class' => ''], $this->basicTable->getToolsAttributesBag()->getAttributes()); + } + + public function test_can_get_toolbar_attributes_initial_status(): void + { + $this->assertTrue($this->basicTable->hasCustomAttributes('toolBarAttributes')); + } + + public function test_can_get_toolbar_attributes_initial_values(): void + { + $this->assertSame(['default-styling' => true, 'default-colors' => true, 'class' => ''], $this->basicTable->getToolBarAttributesBag()->getAttributes()); + } +} From 84fae34e7b56d056a2832cc12d3e4402eca60f58 Mon Sep 17 00:00:00 2001 From: Joe <104938042+lrljoe@users.noreply.github.com> Date: Sun, 29 Sep 2024 23:47:47 +0100 Subject: [PATCH 3/9] Add getCustomAttributesBagFromArray --- src/Traits/Core/HasCustomAttributes.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Traits/Core/HasCustomAttributes.php b/src/Traits/Core/HasCustomAttributes.php index 99afeb4c4..f7d7800e4 100644 --- a/src/Traits/Core/HasCustomAttributes.php +++ b/src/Traits/Core/HasCustomAttributes.php @@ -46,4 +46,10 @@ public function setCustomAttributes(string $propertyName, array $customAttribute return $this; } + + public function getCustomAttributesBagFromArray(array $attributesArray): ComponentAttributeBag + { + return new ComponentAttributeBag($attributesArray); + } + } From a1c949a8df2f3dd2d994af97a05f93c4f5746a3b Mon Sep 17 00:00:00 2001 From: lrljoe Date: Sun, 29 Sep 2024 22:48:09 +0000 Subject: [PATCH 4/9] Fix styling --- src/Traits/Core/HasCustomAttributes.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Traits/Core/HasCustomAttributes.php b/src/Traits/Core/HasCustomAttributes.php index f7d7800e4..cbc3bcd85 100644 --- a/src/Traits/Core/HasCustomAttributes.php +++ b/src/Traits/Core/HasCustomAttributes.php @@ -51,5 +51,4 @@ public function getCustomAttributesBagFromArray(array $attributesArray): Compone { return new ComponentAttributeBag($attributesArray); } - } From 0bfe53f65e33466c9680f2b990e5c9588e7f7f66 Mon Sep 17 00:00:00 2001 From: Joe <104938042+lrljoe@users.noreply.github.com> Date: Sun, 29 Sep 2024 23:49:38 +0100 Subject: [PATCH 5/9] Reorder Array --- tests/Traits/Helpers/ToolsStylingHelpersTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Traits/Helpers/ToolsStylingHelpersTest.php b/tests/Traits/Helpers/ToolsStylingHelpersTest.php index 519e9e071..69ea57b4b 100644 --- a/tests/Traits/Helpers/ToolsStylingHelpersTest.php +++ b/tests/Traits/Helpers/ToolsStylingHelpersTest.php @@ -13,7 +13,7 @@ public function test_can_get_tools_attributes_initial_status(): void public function test_can_get_tools_attributes_initial_values(): void { - $this->assertSame(['default-styling' => true, 'default-colors' => true, 'class' => ''], $this->basicTable->getToolsAttributesBag()->getAttributes()); + $this->assertSame(['class' => '', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolsAttributesBag()->getAttributes()); } public function test_can_get_toolbar_attributes_initial_status(): void @@ -23,6 +23,6 @@ public function test_can_get_toolbar_attributes_initial_status(): void public function test_can_get_toolbar_attributes_initial_values(): void { - $this->assertSame(['default-styling' => true, 'default-colors' => true, 'class' => ''], $this->basicTable->getToolBarAttributesBag()->getAttributes()); + $this->assertSame(['class' => '', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolBarAttributesBag()->getAttributes()); } } From e5711ceb9ac76ed9c61f1f2f3b5b03416d310265 Mon Sep 17 00:00:00 2001 From: Joe <104938042+lrljoe@users.noreply.github.com> Date: Sun, 29 Sep 2024 23:53:32 +0100 Subject: [PATCH 6/9] Reorder Initial Array - Add Additional Test --- src/Traits/Styling/HasToolsStyling.php | 4 ++-- tests/Traits/Helpers/ToolsStylingHelpersTest.php | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/Traits/Styling/HasToolsStyling.php b/src/Traits/Styling/HasToolsStyling.php index c4cb14369..a56123311 100644 --- a/src/Traits/Styling/HasToolsStyling.php +++ b/src/Traits/Styling/HasToolsStyling.php @@ -10,7 +10,7 @@ trait HasToolsStyling use ToolsStylingConfiguration, ToolsStylingHelpers; - protected array $toolsAttributes = ['default-styling' => true, 'default-colors' => true, 'class' => '']; + protected array $toolsAttributes = ['class' => '', 'default-colors' => true, 'default-styling' => true]; - protected array $toolBarAttributes = ['default-styling' => true, 'default-colors' => true, 'class' => '']; + protected array $toolBarAttributes = ['class' => '', 'default-colors' => true, 'default-styling' => true]; } diff --git a/tests/Traits/Helpers/ToolsStylingHelpersTest.php b/tests/Traits/Helpers/ToolsStylingHelpersTest.php index 69ea57b4b..0332b299d 100644 --- a/tests/Traits/Helpers/ToolsStylingHelpersTest.php +++ b/tests/Traits/Helpers/ToolsStylingHelpersTest.php @@ -16,6 +16,12 @@ public function test_can_get_tools_attributes_initial_values(): void $this->assertSame(['class' => '', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolsAttributesBag()->getAttributes()); } + public function test_can_change_tools_attributes_initial_values(): void + { + $this->basicTable->setToolsAttributes(['class' => 'bg-red-500', 'default-colors' => true, 'default-styling' => true]); + $this->assertSame(['class' => 'bg-red-500', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolsAttributesBag()->getAttributes()); + } + public function test_can_get_toolbar_attributes_initial_status(): void { $this->assertTrue($this->basicTable->hasCustomAttributes('toolBarAttributes')); @@ -25,4 +31,11 @@ public function test_can_get_toolbar_attributes_initial_values(): void { $this->assertSame(['class' => '', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolBarAttributesBag()->getAttributes()); } + + public function test_can_change_toolbar_attributes_initial_values(): void + { + $this->basicTable->setToolBarAttributes(['class' => 'bg-blue-500', 'default-colors' => true, 'default-styling' => true]); + $this->assertSame(['class' => 'bg-blue-500', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolBarAttributesBag()->getAttributes()); + } + } From 668f74c320c2f31e21a9cb9a50f8d1c5ea365fe7 Mon Sep 17 00:00:00 2001 From: lrljoe Date: Sun, 29 Sep 2024 22:54:00 +0000 Subject: [PATCH 7/9] Fix styling --- tests/Traits/Helpers/ToolsStylingHelpersTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Traits/Helpers/ToolsStylingHelpersTest.php b/tests/Traits/Helpers/ToolsStylingHelpersTest.php index 0332b299d..d99c6a4d8 100644 --- a/tests/Traits/Helpers/ToolsStylingHelpersTest.php +++ b/tests/Traits/Helpers/ToolsStylingHelpersTest.php @@ -37,5 +37,4 @@ public function test_can_change_toolbar_attributes_initial_values(): void $this->basicTable->setToolBarAttributes(['class' => 'bg-blue-500', 'default-colors' => true, 'default-styling' => true]); $this->assertSame(['class' => 'bg-blue-500', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolBarAttributesBag()->getAttributes()); } - } From 05bd3b17f9815753883a41d6c394fbbf409e8364 Mon Sep 17 00:00:00 2001 From: LRLJoe Date: Sun, 29 Sep 2024 23:58:08 +0100 Subject: [PATCH 8/9] Add More Tests --- .../Helpers/ToolsStylingHelpersTest.php | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tests/Traits/Helpers/ToolsStylingHelpersTest.php b/tests/Traits/Helpers/ToolsStylingHelpersTest.php index d99c6a4d8..ebaf94e64 100644 --- a/tests/Traits/Helpers/ToolsStylingHelpersTest.php +++ b/tests/Traits/Helpers/ToolsStylingHelpersTest.php @@ -20,6 +20,15 @@ public function test_can_change_tools_attributes_initial_values(): void { $this->basicTable->setToolsAttributes(['class' => 'bg-red-500', 'default-colors' => true, 'default-styling' => true]); $this->assertSame(['class' => 'bg-red-500', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolsAttributesBag()->getAttributes()); + $this->assertSame(['class' => '', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolBarAttributesBag()->getAttributes()); + } + + public function test_can_change_tools_attributes_initial_values_no_defaults(): void + { + $this->basicTable->setToolsAttributes(['class' => 'bg-amber-500']); + $this->assertSame(['class' => 'bg-amber-500', 'default-colors' => false, 'default-styling' => false], $this->basicTable->getToolsAttributesBag()->getAttributes()); + $this->assertSame(['class' => '', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolBarAttributesBag()->getAttributes()); + } public function test_can_get_toolbar_attributes_initial_status(): void @@ -36,5 +45,24 @@ public function test_can_change_toolbar_attributes_initial_values(): void { $this->basicTable->setToolBarAttributes(['class' => 'bg-blue-500', 'default-colors' => true, 'default-styling' => true]); $this->assertSame(['class' => 'bg-blue-500', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolBarAttributesBag()->getAttributes()); + $this->assertSame(['class' => '', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolsAttributesBag()->getAttributes()); + } + + public function test_can_change_toolbar_attributes_initial_values_no_defaults(): void + { + $this->basicTable->setToolBarAttributes(['class' => 'bg-green-500']); + $this->assertSame(['class' => 'bg-green-500', 'default-colors' => false, 'default-styling' => false], $this->basicTable->getToolBarAttributesBag()->getAttributes()); + $this->assertSame(['class' => '', 'default-colors' => true, 'default-styling' => true], $this->basicTable->getToolsAttributesBag()->getAttributes()); + } + + public function test_can_change_tools_and_toolbar_attributes_initial_values_no_defaults(): void + { + $this->basicTable->setToolsAttributes(['class' => 'bg-amber-500'])->setToolBarAttributes(['class' => 'bg-green-500']); + + $this->assertSame(['class' => 'bg-amber-500', 'default-colors' => false, 'default-styling' => false], $this->basicTable->getToolsAttributesBag()->getAttributes()); + + $this->assertSame(['class' => 'bg-green-500', 'default-colors' => false, 'default-styling' => false], $this->basicTable->getToolBarAttributesBag()->getAttributes()); + } + } From 405a8bf7cfb685e16fbb11aaeed3a21445592263 Mon Sep 17 00:00:00 2001 From: lrljoe Date: Sun, 29 Sep 2024 22:58:33 +0000 Subject: [PATCH 9/9] Fix styling --- tests/Traits/Helpers/ToolsStylingHelpersTest.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/Traits/Helpers/ToolsStylingHelpersTest.php b/tests/Traits/Helpers/ToolsStylingHelpersTest.php index ebaf94e64..560385a89 100644 --- a/tests/Traits/Helpers/ToolsStylingHelpersTest.php +++ b/tests/Traits/Helpers/ToolsStylingHelpersTest.php @@ -59,10 +59,9 @@ public function test_can_change_toolbar_attributes_initial_values_no_defaults(): public function test_can_change_tools_and_toolbar_attributes_initial_values_no_defaults(): void { $this->basicTable->setToolsAttributes(['class' => 'bg-amber-500'])->setToolBarAttributes(['class' => 'bg-green-500']); - + $this->assertSame(['class' => 'bg-amber-500', 'default-colors' => false, 'default-styling' => false], $this->basicTable->getToolsAttributesBag()->getAttributes()); $this->assertSame(['class' => 'bg-green-500', 'default-colors' => false, 'default-styling' => false], $this->basicTable->getToolBarAttributesBag()->getAttributes()); } - }