Beta.9 - Develop to Master (#1456)

* Fixes for missing default behaviour (#1455) --------- Co-authored-by: lrljoe <[email protected]>
rappasoft · Oct 26, 2023 · 94b2cc9 · 94b2cc9
1 parent 6427cb5
commit 94b2cc9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/resources/views/components/table/td.blade.php b/resources/views/components/table/td.blade.php
@@ -13,11 +13,11 @@
     @endif
         {{
             $attributes->merge($customAttributes)
-                ->class(['px-6 py-4 whitespace-nowrap text-sm font-medium dark:text-white' => $component->isTailwind() && $customAttributes['default'] ?? true])
+                ->class(['px-6 py-4 whitespace-nowrap text-sm font-medium dark:text-white' => $component->isTailwind() && ($customAttributes['default'] ?? true)])
                 ->class(['hidden' =>  $component->isTailwind() && $column && $column->shouldCollapseAlways()])
                 ->class(['hidden sm:table-cell' => $component->isTailwind() && $column && $column->shouldCollapseOnMobile()])
                 ->class(['hidden md:table-cell' => $component->isTailwind() && $column && $column->shouldCollapseOnTablet()])
-                ->class(['' => $component->isBootstrap() && $customAttributes['default'] ?? true])
+                ->class(['' => $component->isBootstrap() && ($customAttributes['default'] ?? true)])
                 ->class(['d-none' => $component->isBootstrap() && $column && $column->shouldCollapseAlways()])
                 ->class(['d-none d-sm-table-cell' => $component->isBootstrap() && $column && $column->shouldCollapseOnMobile()])
                 ->class(['d-none d-md-table-cell' => $component->isBootstrap() && $column && $column->shouldCollapseOnTablet()])

diff --git a/resources/views/components/tools/filter-label.blade.php b/resources/views/components/tools/filter-label.blade.php
@@ -12,9 +12,9 @@
 
         {{
             $attributes->merge($customLabelAttributes)
-                ->class(['block text-sm font-medium leading-5 text-gray-700 dark:text-white' => $isTailwind && $customLabelAttributes['default'] ?? true])
-                ->class(['d-block' => $isBootstrap && $filterLayout == 'slide-down' && $customLabelAttributes['default'] ?? true])
-                ->class(['mb-2' => $isBootstrap && $filterLayout == 'popover' && $customLabelAttributes['default'] ?? true])
+                ->class(['block text-sm font-medium leading-5 text-gray-700 dark:text-white' => $isTailwind && ($customLabelAttributes['default'] ?? true)])
+                ->class(['d-block' => $isBootstrap && $filterLayout == 'slide-down' && ($customLabelAttributes['default'] ?? true)])
+                ->class(['mb-2' => $isBootstrap && $filterLayout == 'popover' && ($customLabelAttributes['default'] ?? true)])
                 ->except('default')
         }}