From 3f76d63ffbe0e37eac58072c0fe3859ae044c942 Mon Sep 17 00:00:00 2001
From: lrljoe <joe@lowerrocklabs.com>
Date: Thu, 12 Sep 2024 00:06:23 +0100
Subject: [PATCH] Adjust defaults

---
 .../views/components/table/collapsed-columns.blade.php      | 2 +-
 resources/views/components/table/td/bulk-actions.blade.php  | 3 +--
 resources/views/components/table/th/bulk-actions.blade.php  | 3 +--
 resources/views/components/table/tr.blade.php               | 2 +-
 resources/views/includes/actions/button.blade.php           | 6 +++---
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/resources/views/components/table/collapsed-columns.blade.php b/resources/views/components/table/collapsed-columns.blade.php
index ba21ee2ba..44bb45d9f 100644
--- a/resources/views/components/table/collapsed-columns.blade.php
+++ b/resources/views/components/table/collapsed-columns.blade.php
@@ -38,7 +38,7 @@
                 ->class(['hidden bg-gray-50 dark:bg-gray-800 dark:text-white rappasoft-striped-row' => ($isTailwind && ($customAttributes['default'] ?? true) && $rowIndex % 2 !== 0)])
                 ->class(['d-none bg-light rappasoft-striped-row' => ($isBootstrap && $rowIndex % 2 === 0 && ($customAttributes['default'] ?? true))])
                 ->class(['d-none bg-white rappasoft-striped-row' => ($isBootstrap && $rowIndex % 2 !== 0 && ($customAttributes['default'] ?? true))])
-                ->except(['default'])
+                ->except(['default','default-styling','default-colors'])
         }}
 
     >
diff --git a/resources/views/components/table/td/bulk-actions.blade.php b/resources/views/components/table/td/bulk-actions.blade.php
index 341ad650c..918743395 100644
--- a/resources/views/components/table/td/bulk-actions.blade.php
+++ b/resources/views/components/table/td/bulk-actions.blade.php
@@ -24,8 +24,7 @@
                     $attributes->merge($bulkActionsTdCheckboxAttributes)->class([
                         'rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600' => ($theme === 'tailwind') && ($bulkActionsTdCheckboxAttributes['default'] ?? true),
                         'form-check-input' => ($theme === 'bootstrap-5') && ($bulkActionsTdCheckboxAttributes['default'] ?? true),
-                        'except' => 'default',
-                    ])
+                    ])->except(['default','default-styling','default-colors'])
                 }}
             />
         </div>
diff --git a/resources/views/components/table/th/bulk-actions.blade.php b/resources/views/components/table/th/bulk-actions.blade.php
index b3f64f64e..c5c6d3e6c 100644
--- a/resources/views/components/table/th/bulk-actions.blade.php
+++ b/resources/views/components/table/th/bulk-actions.blade.php
@@ -26,8 +26,7 @@
                     $attributes->merge($bulkActionsThCheckboxAttributes)->class([
                         'rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600' => ($theme === 'tailwind') && ($bulkActionsThCheckboxAttributes['default'] ?? true),
                         'form-check-input' => ($theme === 'bootstrap-5') && ($bulkActionsThCheckboxAttributes['default'] ?? true),
-                        'except' => 'default',
-                    ])
+                    ])->except(['default','default-styling','default-colors'])
                 }}
             />
         </div>
diff --git a/resources/views/components/table/tr.blade.php b/resources/views/components/table/tr.blade.php
index f043fbf8a..4a3f84ece 100644
--- a/resources/views/components/table/tr.blade.php
+++ b/resources/views/components/table/tr.blade.php
@@ -27,7 +27,7 @@
                 ->class(['cursor-pointer' => ($isTailwind && $this->hasTableRowUrl() && ($customAttributes['default'] ?? true))])
                 ->class(['bg-light rappasoft-striped-row' => ($isBootstrap && $rowIndex % 2 === 0 && ($customAttributes['default'] ?? true))])
                 ->class(['bg-white rappasoft-striped-row' => ($isBootstrap && $rowIndex % 2 !== 0 && ($customAttributes['default'] ?? true))])
-                ->except(['default'])
+                ->except(['default','default-styling','default-colors'])
     }}
 
 >
diff --git a/resources/views/includes/actions/button.blade.php b/resources/views/includes/actions/button.blade.php
index 84fe37120..cbd20ba96 100644
--- a/resources/views/includes/actions/button.blade.php
+++ b/resources/views/includes/actions/button.blade.php
@@ -3,7 +3,7 @@
             ->class(['focus:border-indigo-300 focus:ring-indigo-200' => $isTailwind && $attributes['default-colors'] ?? true])
             ->class(['btn btn-sm btn-success' => $isBootstrap && $attributes['default-styling'] ?? true])
             ->class(['' => $isBootstrap && $attributes['default-colors'] ?? true])
-            ->except(['default-styling', 'default-colors'])
+            ->except(['default','default-styling','default-colors'])
         }} 
            @if($action->hasWireAction())
             {{ $action->getWireAction() }}="{{ $action->getWireActionParams() }}"
@@ -18,14 +18,14 @@
             <i {{ $action->getIconAttributes()
                     ->class(["ms-1 ". $action->getIcon() => $isBootstrap])
                     ->class(["ml-1 ". $action->getIcon() => $isTailwind])
-                    ->except('default-styling')
+                    ->except(['default','default-styling','default-colors'])
                 }}
             ></i>
         @elseif($action->hasIcon() && !$action->getIconRight())
             <i {{ $action->getIconAttributes()
                     ->class(["ms-1 ". $action->getIcon() => $isBootstrap])
                     ->class(["mr-1 ". $action->getIcon() => $isTailwind])
-                    ->except('default-styling')
+                    ->except(['default','default-styling','default-colors'])
                 }}
             ></i>
             <span>{{ $action->getLabel() }}</span>