From 392e7d5a7162b96be0216e15ef4ce5b0720b4816 Mon Sep 17 00:00:00 2001
From: Anthony Rappa <rappa819@gmail.com>
Date: Sun, 18 Apr 2021 22:35:26 -0400
Subject: [PATCH] Rearrange wire:keys

---
 CHANGELOG.md                                             | 4 ++++
 .../views/bootstrap-4/includes/bulk-actions.blade.php    | 9 ++++++++-
 .../views/bootstrap-4/includes/filter-pills.blade.php    | 4 ++--
 resources/views/bootstrap-4/includes/filters.blade.php   | 2 +-
 .../views/bootstrap-4/includes/sorting-pills.blade.php   | 4 ++--
 .../views/bootstrap-5/includes/bulk-actions.blade.php    | 9 ++++++++-
 .../views/bootstrap-5/includes/filter-pills.blade.php    | 4 ++--
 resources/views/bootstrap-5/includes/filters.blade.php   | 2 +-
 .../views/bootstrap-5/includes/sorting-pills.blade.php   | 4 ++--
 resources/views/tailwind/includes/bulk-actions.blade.php | 8 +++++++-
 resources/views/tailwind/includes/filter-pills.blade.php | 4 ++--
 .../views/tailwind/includes/sorting-pills.blade.php      | 4 ++--
 12 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a000f86c..1020af2e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 - `$searchFilterDebounce`, `$searchFilterDefer`, `$searchFilterLazy`, for defining the search input data binding property. https://github.com/rappasoft/laravel-livewire-tables/pull/211
 - Remove ability to need to define filters if not defining defaults. https://github.com/rappasoft/laravel-livewire-tables/pull/213
 
+### Changed
+
+- Rearrange wire:keys
+
 ## [1.0.3] - 2021-04-18
 
 ### Added
diff --git a/resources/views/bootstrap-4/includes/bulk-actions.blade.php b/resources/views/bootstrap-4/includes/bulk-actions.blade.php
index 33ea89d2a..a2f0813c8 100644
--- a/resources/views/bootstrap-4/includes/bulk-actions.blade.php
+++ b/resources/views/bootstrap-4/includes/bulk-actions.blade.php
@@ -6,7 +6,14 @@
 
         <div class="dropdown-menu dropdown-menu-right w-100" aria-labelledby="bulkActions">
             @foreach($bulkActions as $action => $title)
-                <a href="#" wire:click.prevent="{{ $action }}" class="dropdown-item">{{ $title }}</a>
+                <a
+                    href="#"
+                   wire:click.prevent="{{ $action }}"
+                   wire:key="bulk-action-{{ $action }}"
+                   class="dropdown-item"
+                >
+                    {{ $title }}
+                </a>
             @endforeach
         </div>
     </div>
diff --git a/resources/views/bootstrap-4/includes/filter-pills.blade.php b/resources/views/bootstrap-4/includes/filter-pills.blade.php
index 0ca4efb31..add318c7f 100644
--- a/resources/views/bootstrap-4/includes/filter-pills.blade.php
+++ b/resources/views/bootstrap-4/includes/filter-pills.blade.php
@@ -1,11 +1,11 @@
 @if ($showFilters && count(array_filter($filters)) && !(count(array_filter($filters)) === 1 && isset($filters['search'])))
-    <div wire:key="filter-badges" class="mb-3">
+    <div class="mb-3">
         <small class="text-secondary">@lang('Applied Filters'):</small>
 
         @foreach($filters as $key => $value)
             @if ($key !== 'search' && strlen($value))
                 <span
-                    wire:key="filter-{{ $key }}"
+                    wire:key="filter-pill-{{ $key }}"
                     class="badge badge-pill badge-info d-inline-flex align-items-center"
                 >
                     {{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}: {{ ucwords(strtr($value, ['_' => ' ', '-' => ' '])) }}
diff --git a/resources/views/bootstrap-4/includes/filters.blade.php b/resources/views/bootstrap-4/includes/filters.blade.php
index 2fc972854..8810be477 100644
--- a/resources/views/bootstrap-4/includes/filters.blade.php
+++ b/resources/views/bootstrap-4/includes/filters.blade.php
@@ -17,7 +17,7 @@
                     @include($filtersView)
                 @elseif (count($customFilters))
                     @foreach ($customFilters as $key => $filter)
-                        <div class="p-2">
+                        <div wire:key="filter-{{ $key }}" class="p-2">
                             @if ($filter->isSelect())
                                 <label for="filter-{{ $key }}" class="mb-2">
                                     {{ $filter->name() }}
diff --git a/resources/views/bootstrap-4/includes/sorting-pills.blade.php b/resources/views/bootstrap-4/includes/sorting-pills.blade.php
index 0503bcc37..3d91f4cbd 100644
--- a/resources/views/bootstrap-4/includes/sorting-pills.blade.php
+++ b/resources/views/bootstrap-4/includes/sorting-pills.blade.php
@@ -1,10 +1,10 @@
 @if ($showSorting && count($sorts))
-    <div wire:key="sort-badges" class="mb-3">
+    <div class="mb-3">
         <small class="text-secondary">@lang('Applied Sorting'):</small>
 
         @foreach($sorts as $col => $dir)
             <span
-                wire:key="sort-{{ $col }}"
+                wire:key="sorting-pill-{{ $key }}"
                 class="badge badge-pill badge-info d-inline-flex align-items-center"
             >
                 <span>{{ $sortNames[$col] ?? ucwords(strtr($col, ['_' => ' ', '-' => ' '])) }}: {{ $dir === 'asc' ? 'A-Z' : 'Z-A' }}</span>
diff --git a/resources/views/bootstrap-5/includes/bulk-actions.blade.php b/resources/views/bootstrap-5/includes/bulk-actions.blade.php
index 4c41c704c..4d3268e7c 100644
--- a/resources/views/bootstrap-5/includes/bulk-actions.blade.php
+++ b/resources/views/bootstrap-5/includes/bulk-actions.blade.php
@@ -6,7 +6,14 @@
 
         <div class="dropdown-menu dropdown-menu-end w-100" aria-labelledby="bulkActions">
             @foreach($bulkActions as $action => $title)
-                <a href="#" wire:click.prevent="{{ $action }}" class="dropdown-item">{{ $title }}</a>
+                <a
+                    href="#"
+                    wire:click.prevent="{{ $action }}"
+                    wire:key="bulk-action-{{ $action }}"
+                    class="dropdown-item"
+                >
+                    {{ $title }}
+                </a>
             @endforeach
         </div>
     </div>
diff --git a/resources/views/bootstrap-5/includes/filter-pills.blade.php b/resources/views/bootstrap-5/includes/filter-pills.blade.php
index 32dcf96d9..7a0341212 100644
--- a/resources/views/bootstrap-5/includes/filter-pills.blade.php
+++ b/resources/views/bootstrap-5/includes/filter-pills.blade.php
@@ -1,11 +1,11 @@
 @if ($showFilters && count(array_filter($filters)) && !(count(array_filter($filters)) === 1 && isset($filters['search'])))
-    <div wire:key="filter-badges" class="mb-3">
+    <div class="mb-3">
         <small class="text-secondary">@lang('Applied Filters'):</small>
 
         @foreach($filters as $key => $value)
             @if ($key !== 'search' && strlen($value))
                 <span
-                    wire:key="filter-{{ $key }}"
+                    wire:key="filter-pill-{{ $key }}"
                     class="badge rounded-pill bg-info d-inline-flex align-items-center"
                 >
                     {{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}: {{ ucwords(strtr($value, ['_' => ' ', '-' => ' '])) }}
diff --git a/resources/views/bootstrap-5/includes/filters.blade.php b/resources/views/bootstrap-5/includes/filters.blade.php
index eb39a9728..fe55c50b0 100644
--- a/resources/views/bootstrap-5/includes/filters.blade.php
+++ b/resources/views/bootstrap-5/includes/filters.blade.php
@@ -17,7 +17,7 @@
                     @include($filtersView)
                 @elseif (count($customFilters))
                     @foreach ($customFilters as $key => $filter)
-                        <div class="p-2">
+                        <div wire:key="filter-{{ $key }}" class="p-2">
                             @if ($filter->isSelect())
                                 <label for="filter-{{ $key }}" class="mb-2">
                                     {{ $filter->name() }}
diff --git a/resources/views/bootstrap-5/includes/sorting-pills.blade.php b/resources/views/bootstrap-5/includes/sorting-pills.blade.php
index c5ee0d370..ac444d0f0 100644
--- a/resources/views/bootstrap-5/includes/sorting-pills.blade.php
+++ b/resources/views/bootstrap-5/includes/sorting-pills.blade.php
@@ -1,10 +1,10 @@
 @if ($showSorting && count($sorts))
-    <div wire:key="sort-badges" class="mb-3">
+    <div class="mb-3">
         <small class="text-secondary">@lang('Applied Sorting'):</small>
 
         @foreach($sorts as $col => $dir)
             <span
-                wire:key="sort-{{ $col }}"
+                wire:key="sorting-pill-{{ $key }}"
                 class="badge rounded-pill bg-info d-inline-flex align-items-center"
             >
                 <span>{{ $sortNames[$col] ?? ucwords(strtr($col, ['_' => ' ', '-' => ' '])) }}: {{ $dir === 'asc' ? 'A-Z' : 'Z-A' }}</span>
diff --git a/resources/views/tailwind/includes/bulk-actions.blade.php b/resources/views/tailwind/includes/bulk-actions.blade.php
index 8da241b8e..90aa970e1 100644
--- a/resources/views/tailwind/includes/bulk-actions.blade.php
+++ b/resources/views/tailwind/includes/bulk-actions.blade.php
@@ -40,7 +40,13 @@ class="origin-top-right absolute right-0 mt-2 w-48 rounded-md shadow-lg z-50"
                 <div class="rounded-md bg-white shadow-xs">
                     <div class="py-1" role="menu" aria-orientation="vertical" aria-labelledby="options-menu">
                         @foreach($bulkActions as $action => $title)
-                            <button wire:click="{{ $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" role="menuitem">
+                            <button
+                                wire:click="{{ $action }}"
+                                wire:key="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"
+                                role="menuitem"
+                            >
                                 <span>{{ $title }}</span>
                             </button>
                         @endforeach
diff --git a/resources/views/tailwind/includes/filter-pills.blade.php b/resources/views/tailwind/includes/filter-pills.blade.php
index 26f9f1267..5595ea2f7 100644
--- a/resources/views/tailwind/includes/filter-pills.blade.php
+++ b/resources/views/tailwind/includes/filter-pills.blade.php
@@ -1,11 +1,11 @@
 @if ($showFilters && count(array_filter($filters)) && !(count(array_filter($filters)) === 1 && isset($filters['search'])))
-    <div wire:key="filter-badges" class="p-6 md:p-0">
+    <div class="p-6 md:p-0">
         <small class="text-gray-700">@lang('Applied Filters'):</small>
 
         @foreach($filters as $key => $value)
             @if ($key !== 'search' && strlen($value))
                 <span
-                    wire:key="filter-{{ $key }}"
+                    wire:key="filter-pill-{{ $key }}"
                     class="inline-flex items-center py-0.5 pl-2 pr-0.5 rounded-full text-xs font-medium bg-indigo-100 text-indigo-700"
                 >
                     {{ $filterNames[$key] ?? ucwords(strtr($key, ['_' => ' ', '-' => ' '])) }}: {{ ucwords(strtr($value, ['_' => ' ', '-' => ' '])) }}
diff --git a/resources/views/tailwind/includes/sorting-pills.blade.php b/resources/views/tailwind/includes/sorting-pills.blade.php
index adc8bc46d..e6818fe4b 100644
--- a/resources/views/tailwind/includes/sorting-pills.blade.php
+++ b/resources/views/tailwind/includes/sorting-pills.blade.php
@@ -1,10 +1,10 @@
 @if ($showSorting && count($sorts))
-    <div wire:key="sort-badges" class="p-6 md:p-0">
+    <div class="p-6 md:p-0">
         <small class="text-gray-700">@lang('Applied Sorting'):</small>
 
         @foreach($sorts as $col => $dir)
             <span
-                wire:key="sort-{{ $col }}"
+                wire:key="sorting-pill-{{ $key }}"
                 class="inline-flex items-center py-0.5 pl-2 pr-0.5 rounded-full text-xs font-medium bg-indigo-100 text-indigo-700"
             >
                 {{ $sortNames[$col] ?? ucwords(strtr($col, ['_' => ' ', '-' => ' '])) }}: {{ $dir === 'asc' ? 'A-Z' : 'Z-A' }}