From 1ae7bbe212229f22872f43bc0bc11f2ec6756057 Mon Sep 17 00:00:00 2001
From: Joe <104938042+lrljoe@users.noreply.github.com>
Date: Sun, 29 Oct 2023 03:20:08 +0000
Subject: [PATCH] v3.0.0-beta.11 Develop to Master Merge (#1501)

* v3 - Fix - Correct setFilter behaviour (#1451)

* Fix for setFilter

* Update return types

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Fixes for missing brackets (#1455)

* v3 Toolbar - Splitting of Views/Blades (#1454)

* Initial Commit - Full Split of Toolbar

* Remove Confirms Code

* Fix superfluous endif

* Combining Blades - Stage 1

* More Merging

* Bulk Actions - Icon Adjustment

* Further clean up of toolbar - filter button

* Stripping Toolbar Theme Distinctions

* Adjust childElementOpen to respect hierachy

* To remove files

* Merge Column-Select into Single Blade

* Clean Up Blades

* Fix missing BootStrap Classes from Toolbar Blade (#1466)

* Adding x-cloak where it is missing for x-show (#1463)

* V3 - QueryString migration into Traits (#1465)

* Initial migration of queryString to Traits

* Lock $queryStringStatus

* Return empty arrays for Traits

* Add WithQueryString Trait

* Add Config/Helper Traits to WithQueryString

* Add default queryStringStatus

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Update Changelog (#1467)

* v3 DateRange - Icon Styling, FilterHelper Method (#1490)

* DateRange - Icon Styling, FilterHelper Method

* Add can_get_datestring test

* Add non-array test for DateRangeFilter

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* V3 DateRangeFilter - Remove Icon, Add Placeholder (#1492)

* Remove DateRangeFilter Icon

* DateRangeFilter - Remove Icon & Add Placeholder

* Use FilterHelper method to generate wire:key, add placeholder with docs (#1493)

* For all Filters (Except MultiSelect currently), use the FilterHelper method to generate the wire:key rather than doing it in the blade. This centralises for future updates
MultiSelectFilter will follow in due course, as it requires some tidying & updates.

* Add placeholder config option to: DateRangeFilter, DateFilter, DateTimeFilter, NumberFilter and update docs to reflect the availability of the option

* Clean up classes on Filters

* Minor tweaks to toolbar/column select styling (#1494)

* v3-RestoreBulkActionConfirm (#1500)

* Bulk Action Confirm

* Adjust changelog

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
---
 CHANGELOG.md                                                | 1 +
 .../components/tools/toolbar/items/bulk-actions.blade.php   | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ffd5624a..c6127a743 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 - Add Placeholder config option for DateFilter, DateTimeFilter, NumberFilter
 - Clean up classes on filters
 - Minor tweaks to toolbar/column select styling
+- Fix wire:confirm for BulkActions (removed in merge error)
 
 ## [3.0.0-beta.10] - 2023-10-27
 - Changes to toolbar blade structure by @lrljoe in #[1454](https://github.com/rappasoft/laravel-livewire-tables/pull/1454) 
diff --git a/resources/views/components/tools/toolbar/items/bulk-actions.blade.php b/resources/views/components/tools/toolbar/items/bulk-actions.blade.php
index c80e4c6de..82fe34ca1 100644
--- a/resources/views/components/tools/toolbar/items/bulk-actions.blade.php
+++ b/resources/views/components/tools/toolbar/items/bulk-actions.blade.php
@@ -52,6 +52,9 @@ class="origin-top-right absolute right-0 mt-2 w-full md:w-48 rounded-md shadow-l
                         @foreach ($component->getBulkActions() as $action => $title)
                             <button
                                 wire:click="{{ $action }}"
+                                @if($component->hasConfirmationMessage($action))
+                                    wire:confirm="{{ $component->getBulkActionConfirmMessage($action) }}"
+                                @endif
                                 wire:key="{{ $tableName }}-bulk-action-{{ $action }}"
                                 type="button"
                                 class="block w-full px-4 py-2 text-sm leading-5 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900 flex items-center space-x-2 dark:text-white dark:hover:bg-gray-600"
@@ -74,6 +77,9 @@ class="block w-full px-4 py-2 text-sm leading-5 text-gray-700 hover:bg-gray-100
                 @foreach ($component->getBulkActions() as $action => $title)
                     <a
                         href="#"
+                        @if($component->hasConfirmationMessage($action))
+                            wire:confirm="{{ $component->getBulkActionConfirmMessage($action) }}"
+                        @endif
                         wire:click="{{ $action }}"
                         wire:key="{{ $tableName }}-bulk-action-{{ $action }}"
                         @class([