Changes

Author: rappasoft

CHANGELOG.md

@@ -4,7 +4,11 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 ## [Unreleased]
 
-## [1.10.5] - 2021-07-10
+## [1.11.0] - 2021-07-10
+
+### Added
+
+- [Added `addAttributes` method to column headers](https://github.com/rappasoft/laravel-livewire-tables/pull/379)
 
 ### Changed
 
@@ -421,8 +425,8 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 - Initial release
 
-[Unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.5...development
-[1.10.5]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.4...v1.10.5
+[Unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.11.0...development
+[1.11.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.4...v1.11.0
 [1.10.4]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.3...v1.10.4
 [1.10.3]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.2...v1.10.3
 [1.10.2]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.10.1...v1.10.2

resources/views/bootstrap-4/components/table/heading.blade.php

@@ -4,30 +4,17 @@
     'sortable' => null,
     'direction' => null,
     'text' => null,
+    'customAttributes' => [],
 ])
 
-@php
-$headerAttributesList = [];
-$headerAttributesList[] = ['class' => $attributes->get('class')];
-$headerAttributesList[] = $attributes->get('extraAttributes') ?? [];
-
-$headerAttributes = '';
-collect($headerAttributesList)->each(function($item) use(&$headerAttributes) {
-    if(count($item)) {
-        $headerAttributes .= collect($item)->map(fn($value, $key) => $key . '="' . $value . '"')->implode(' ');
-    }
-});
-
-@endphp
-
 @unless ($sortingEnabled && $sortable)
-    <th {!! $headerAttributes !!}>
+    <th {{ $attributes->merge($customAttributes) }}>
         {{ $text ?? $slot }}
     </th>
 @else
     <th
         wire:click="sortBy('{{ $column }}', '{{ $text ?? $column }}')"
-        {!! $headerAttributes !!}
+        {{ $attributes->merge($customAttributes) }}
         style="cursor:pointer;"
     >
         <div class="d-flex align-items-center">

resources/views/bootstrap-4/includes/table.blade.php

@@ -27,7 +27,7 @@
                         :direction="$column->column() ? $sorts[$column->column()] ?? null : null"
                         :text="$column->text() ?? ''"
                         :class="$column->class() ?? ''"
-                        :extraAttributes="$column->attributes()"
+                        :customAttributes="$column->attributes()"
                     />
                 @endif
             @endif

resources/views/bootstrap-5/components/table/heading.blade.php

@@ -4,30 +4,17 @@
     'sortable' => null,
     'direction' => null,
     'text' => null,
+    'customAttributes' => [],
 ])
 
-@php
-$headerAttributesList = [];
-$headerAttributesList[] = ['class' => $attributes->get('class')];
-$headerAttributesList[] = $attributes->get('extraAttributes') ?? [];
-
-$headerAttributes = '';
-collect($headerAttributesList)->each(function($item) use(&$headerAttributes) {
-    if(count($item)) {
-        $headerAttributes .= collect($item)->map(fn($value, $key) => $key . '="' . $value . '"')->implode(' ');
-    }
-});
-
-@endphp
-
 @unless ($sortingEnabled && $sortable)
-    <th {!! $headerAttributes !!}>
+    <th {{ $attributes->merge($customAttributes) }}>
         {{ $text ?? $slot }}
     </th>
 @else
     <th
         wire:click="sortBy('{{ $column }}', '{{ $text ?? $column }}')"
-        {!! $headerAttributes !!}
+        {{ $attributes->merge($customAttributes) }}
         style="cursor:pointer;"
     >
         <div class="d-flex align-items-center">

resources/views/bootstrap-5/includes/table.blade.php

@@ -28,7 +28,7 @@ class="form-check-input"
                         :direction="$column->column() ? $sorts[$column->column()] ?? null : null"
                         :text="$column->text() ?? ''"
                         :class="$column->class() ?? ''"
-                        :extraAttributes="$column->attributes()"
+                        :customAttributes="$column->attributes()"
                     />
                 @endif
             @endif

resources/views/tailwind/components/table/heading.blade.php

@@ -4,23 +4,12 @@
     'sortable' => null,
     'direction' => null,
     'text' => null,
+    'customAttributes' => [],
 ])
 
-@php
-$headerAttributesList = [];
-$headerAttributesList[] = ['class' => 'px-3 py-2 md:px-6 md:py-3 bg-gray-50 ' . $attributes->get('class')];
-$headerAttributesList[] = $attributes->get('extraAttributes') ?? [];
-
-$headerAttributes = '';
-collect($headerAttributesList)->each(function($item) use(&$headerAttributes) {
-    if(count($item)) {
-        $headerAttributes .= collect($item)->map(fn($value, $key) => $key . '="' . $value . '"')->implode(' ');
-    }
-});
-
-@endphp
-
-<th {!! $headerAttributes !!}>
+<th
+    {{ $attributes->merge(array_merge(['class' => 'px-3 py-2 md:px-6 md:py-3 bg-gray-50'], $customAttributes)) }}
+>
     @unless ($sortingEnabled && $sortable)
         <span class="block text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider">
             {{ $text ?? $slot }}

resources/views/tailwind/includes/table.blade.php

@@ -30,7 +30,7 @@ class="rounded-md shadow-sm border-gray-300 block transition duration-150 ease-i
                         :direction="$column->column() ? $sorts[$column->column()] ?? null : null"
                         :text="$column->text() ?? ''"
                         :class="$column->class() ?? ''"
-                        :extraAttributes="$column->attributes()"
+                        :customAttributes="$column->attributes()"
                     />
                 @endif
             @endif