From 2c0d9c92a73f6feef027854414588df6ed1b74ac Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Fri, 29 Dec 2023 23:36:06 +0000
Subject: [PATCH 1/4] Update ChangeLog - Showing as UNRELEASED rather than
 3.1.8 (#1621)

* Fix CHANGELOG.md missing release
---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02f417dde..a1d313638 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,11 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
-## UNRELEASED
+## [v3.1.9] - 2023-12-29
+### Bug Fixes
+- Fix CHANGELOG.md missing release
+
+## [v3.1.8] - 2023-12-29
 ### New Features
 - Add capability to show/hide Pagination Details (Rows x of y) by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1618
 - Add perPage to queryString by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1618

From 05a3d41d082260457b4436932e82f77eec455c74 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sat, 2 Mar 2024 00:24:26 +0000
Subject: [PATCH 2/4] Fix for Collapsing Columns - Multiple Tables, Single Page
 (#1678) (#1679)

---
 CHANGELOG.md                                                  | 4 ++++
 resources/views/components/table/collapsed-columns.blade.php  | 2 +-
 .../views/components/table/td/collapsed-columns.blade.php     | 4 ++--
 src/LaravelLivewireTablesServiceProvider.php                  | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 883695ef2..e3e60a676 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.2.4] - 2024-03-01
+### Bug Fixes
+- Collapsing Columns fix when multiple tables are displayed on a page by @lrljoe
+
 ## [v3.2.3] - 2024-03-01
 ### New Features
 - Add capability to customise colors/styling on the Pagination Per-Page Dropdown by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1677
diff --git a/resources/views/components/table/collapsed-columns.blade.php b/resources/views/components/table/collapsed-columns.blade.php
index 1e4aea9a5..49569281a 100644
--- a/resources/views/components/table/collapsed-columns.blade.php
+++ b/resources/views/components/table/collapsed-columns.blade.php
@@ -24,7 +24,7 @@
 
     <tr
         x-data
-        @toggle-row-content.window="$event.detail.row === {{ $rowIndex }} ? $el.classList.toggle('{{ $component->isBootstrap() ? 'd-none' : 'hidden' }}') : null"
+        @toggle-row-content.window="($event.detail.tableName === '{{ $tableName }}' && $event.detail.row === {{ $rowIndex }}) ? $el.classList.toggle('{{ $component->isBootstrap() ? 'd-none' : 'hidden' }}') : null"
 
         wire:key="{{ $tableName }}-row-{{ $row->{$this->getPrimaryKey()} }}-collapsed-contents"
         wire:loading.class.delay="opacity-50 dark:bg-gray-900 dark:opacity-60"
diff --git a/resources/views/components/table/td/collapsed-columns.blade.php b/resources/views/components/table/td/collapsed-columns.blade.php
index 497be487c..29248b1cd 100644
--- a/resources/views/components/table/td/collapsed-columns.blade.php
+++ b/resources/views/components/table/td/collapsed-columns.blade.php
@@ -16,7 +16,7 @@
             @if (! $hidden)
                 <button
                     x-cloak x-show="!currentlyReorderingStatus"
-                    x-on:click.prevent="$dispatch('toggle-row-content', {'row': {{ $rowIndex }}}); open = !open"
+                    x-on:click.prevent="$dispatch('toggle-row-content', {'tableName': '{{ $tableName }}', 'row': {{ $rowIndex }}}); open = !open"
                 >
                     <x-heroicon-o-plus-circle x-cloak x-show="!open" class="text-green-600 h-6 w-6" />
                     <x-heroicon-o-minus-circle x-cloak x-show="open" class="text-yellow-600 h-6 w-6" />
@@ -36,7 +36,7 @@
             @if (! $hidden)
                 <button
                     x-cloak x-show="!currentlyReorderingStatus"
-                    x-on:click.prevent="$dispatch('toggle-row-content', {'row': {{ $rowIndex }}});open = !open"
+                    x-on:click.prevent="$dispatch('toggle-row-content', {'tableName': '{{ $tableName }}', 'row': {{ $rowIndex }}});open = !open"
                     class="p-0"
                     style="background:none;border:none;"
                 >
diff --git a/src/LaravelLivewireTablesServiceProvider.php b/src/LaravelLivewireTablesServiceProvider.php
index 7cc26cac3..015ba8684 100644
--- a/src/LaravelLivewireTablesServiceProvider.php
+++ b/src/LaravelLivewireTablesServiceProvider.php
@@ -14,7 +14,7 @@ class LaravelLivewireTablesServiceProvider extends ServiceProvider
     public function boot(): void
     {
 
-        AboutCommand::add('Rappasoft Laravel Livewire Tables', fn () => ['Version' => '3.2.3']);
+        AboutCommand::add('Rappasoft Laravel Livewire Tables', fn () => ['Version' => '3.2.4']);
 
         $this->mergeConfigFrom(
             __DIR__.'/../config/livewire-tables.php', 'livewire-tables'

From 2bd477ec1d5b10fede53cfa0cbc8ffbb815b3a74 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Tue, 30 Apr 2024 17:07:46 +0100
Subject: [PATCH 3/4] Fix ChangeLog, SP (#1710)

---
 CHANGELOG.md                                 | 15 ++++++++++++++-
 src/LaravelLivewireTablesServiceProvider.php |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 794f3a21d..f1452ac48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.2.5] - 2024-04-30
+### New Features
+- Add setConfigurableArea by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1706
+- Add User prompt for missing inputs by @achyutkneupane in https://github.com/rappasoft/laravel-livewire-tables/pull/1681
+
+### Bug Fixes
+- UI patch: toolbar fix for reordering by @itsLeonB in https://github.com/rappasoft/laravel-livewire-tables/pull/1690
+
+### Tweaks
+- Adjust Workflow behaviour for PCOV by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1706
+- Updated nl language by @Jerimu in https://github.com/rappasoft/laravel-livewire-tables/pull/1695
+- Updated nl language by @Jerimu in https://github.com/rappasoft/laravel-livewire-tables/pull/1694
+
 ## [v3.2.4] - 2024-03-01
 ### Bug Fixes
 - Collapsing Columns fix when multiple tables are displayed on a page by @lrljoe
@@ -1160,4 +1173,4 @@ Ground Up Rebuild
 [0.1.4]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.3...v0.1.4
 [0.1.3]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.2...v0.1.3
 [0.1.2]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.1...v0.1.2
-[0.1.1]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.0...v0.1.1
\ No newline at end of file
+[0.1.1]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.0...v0.1.1
diff --git a/src/LaravelLivewireTablesServiceProvider.php b/src/LaravelLivewireTablesServiceProvider.php
index 015ba8684..f7fab2887 100644
--- a/src/LaravelLivewireTablesServiceProvider.php
+++ b/src/LaravelLivewireTablesServiceProvider.php
@@ -14,7 +14,7 @@ class LaravelLivewireTablesServiceProvider extends ServiceProvider
     public function boot(): void
     {
 
-        AboutCommand::add('Rappasoft Laravel Livewire Tables', fn () => ['Version' => '3.2.4']);
+        AboutCommand::add('Rappasoft Laravel Livewire Tables', fn () => ['Version' => '3.2.5']);
 
         $this->mergeConfigFrom(
             __DIR__.'/../config/livewire-tables.php', 'livewire-tables'

From d1499573cc1b660ea83d26902abb84d857398bbd Mon Sep 17 00:00:00 2001
From: Abdul Haseeb Khan <abdulhaseebkhan407@gmail.com>
Date: Fri, 31 May 2024 20:46:19 +0500
Subject: [PATCH 4/4] Add the html render support for the LinkColumn

---
 docs/columns/available-methods.md             |  9 ++++++
 .../views/includes/columns/link.blade.php     |  8 ++++-
 tests/Views/Columns/LinkColumnTest.php        | 30 +++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/docs/columns/available-methods.md b/docs/columns/available-methods.md
index d7158a04f..ab41c7095 100644
--- a/docs/columns/available-methods.md
+++ b/docs/columns/available-methods.md
@@ -96,6 +96,15 @@ Column::make('Name')
     ->html(),
 ```
 
+And this method is also available for the [LinkColumn](./other-column-types#content-link-columns)
+
+```php
+LinkColumn::make('Name', 'name')
+    ->title(fn ($row) => 'Title')
+    ->location(fn ($row) => "#$row->id")
+    ->html(),
+```
+
 ### Using a view
 
 If you would like to render a view for the cell:
diff --git a/resources/views/includes/columns/link.blade.php b/resources/views/includes/columns/link.blade.php
index 603331743..e361ae7f5 100644
--- a/resources/views/includes/columns/link.blade.php
+++ b/resources/views/includes/columns/link.blade.php
@@ -1 +1,7 @@
-<a href="{{ $path }}" {!! count($attributes) ? $column->arrayToAttributes($attributes) : '' !!}>{{ $title }}</a>
\ No newline at end of file
+<a href="{{ $path }}" {!! count($attributes) ? $column->arrayToAttributes($attributes) : '' !!}>
+    @if($column->isHtml())
+        {!! $title !!}
+    @else
+        {{ $title }}
+    @endif
+</a>
diff --git a/tests/Views/Columns/LinkColumnTest.php b/tests/Views/Columns/LinkColumnTest.php
index 6199de10b..d1548bc5e 100644
--- a/tests/Views/Columns/LinkColumnTest.php
+++ b/tests/Views/Columns/LinkColumnTest.php
@@ -48,4 +48,34 @@ public function can_render_field_if_title_and_location_callback(): void
 
         $this->assertNotEmpty($column);
     }
+
+    /** @test */
+    public function can_check_ishtml_from_html_column(): void
+    {
+        $column = LinkColumn::make('Name', 'name')
+            ->title(fn ($row) => 'Title')
+            ->location(fn ($row) => "#$row->id")
+            ->html();
+
+        $this->assertTrue($column->isHtml());
+    }
+
+    /** @test */
+    public function can_get_html_from_html_label_column(): void
+    {
+        $column = LinkColumn::make('Name', 'name')
+            ->title(fn ($row) => '<strong>My Label</strong>')
+            ->location(fn ($row) => "#$row->id")
+            ->html();
+
+        $rows = $this->basicTable->getRows();
+        $location = '#'.$rows->first()->id;
+        $htmlString = new \Illuminate\Support\HtmlString('<a href="'.$location.'"><strong>My Label</strong></a>');
+
+        // Removing every whitespace and line break for the comparison
+        $expectedHtml = preg_replace('/\s+/', '', $htmlString->toHtml());
+        $actualHtml = preg_replace('/\s+/', '', $column->getContents($rows->first())->toHtml());
+
+        $this->assertSame($expectedHtml, $actualHtml);
+    }
 }