Merge branch 'master' into development

rappasoft · Nov 10, 2024 · a6a6b05 · a6a6b05
2 parents 7748021 + 29873a0
commit a6a6b05
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 25 deletions.
diff --git a/resources/views/components/tools/filter-pills/buttons/reset-all.blade.php b/resources/views/components/tools/filter-pills/buttons/reset-all.blade.php
@@ -1,25 +0,0 @@
-@aware(['isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
-@if ($isTailwind)
-    <button
-        wire:click.prevent="setFilterDefaults"
-        @class([
-            "focus:outline-none active:outline-none"
-        ])>
-        <span @class([
-            "inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium",
-            "bg-gray-100 text-gray-800 dark:bg-gray-200 dark:text-gray-900"
-            ])>
-            {{ __('livewire-tables::core.Clear') }}
-        </span>
-    </button>
-@else
-    <a
-        href="#"
-        wire:click.prevent="setFilterDefaults"
-        @class([
-            'badge badge-pill badge-light' => $isBootstrap4,
-            'badge rounded-pill bg-light text-dark text-decoration-none' => $isBootstrap5,
-        ])>
-        {{ __('livewire-tables::core.Clear') }}
-    </a>
-@endif

diff --git a/resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php b/resources/views/components/tools/filter-pills/buttons/reset-filter.blade.php
@@ -1,5 +1,36 @@
 @aware(['tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
 @props(['filterKey'])
+@if ($isTailwind)
+    <button
+        wire:click="resetFilter('{{ $filterKey }}')"
+        type="button"
+        @class([
+            "flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center focus:outline-none",
+            "text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:bg-indigo-500 focus:text-white",
+        ])
+    >
+        <span class="sr-only">@lang('livewire-tables::Remove filter option')</span>
+        <x-heroicon-m-x-mark class="h-full" />
+    </button>
+@else
+    <a
+        href="#"
+        wire:click="resetFilter('{{ $filterKey }}')"
+        @class([
+            'text-white ml-2' => ($isBootstrap),
+        ])
+    >
+        <span @class([
+            'sr-only' => $isBootstrap4,
+            'visually-hidden' => $isBootstrap5,
+        ])>
+            @lang('livewire-tables::Remove filter option')
+        </span>
+        <x-heroicon-m-x-mark class="laravel-livewire-tables-btn-tiny"  />
+    </a>
+@endif
+@aware(['tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
+@props(['filterKey'])
 @if ($isTailwind)
     <button
         wire:click="resetFilter('{{ $filterKey }}')"