Undo bootstrap container

- Make new WithSearch trait

Author: rappasoft

CHANGELOG.md

@@ -10,8 +10,12 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 ### Changed
 
-- Removed default padding on bootstrap tables
 - Clarified where rowView looks in read me
+- Null the search filter when it's empty
+
+### Removed
+
+- Removed `text-secondary` class from sorting title
 
 ## [1.1.0] - 2021-04-21
 

resources/views/bootstrap-4/datatable.blade.php

@@ -10,6 +10,7 @@
             wire:poll="{{ $refresh }}"
         @endif
     @endif
+    class="container-fluid"
 >
     @include('livewire-tables::bootstrap-4.includes.offline')
     @include('livewire-tables::bootstrap-4.includes.sorting-pills')

resources/views/bootstrap-4/includes/filter-pills.blade.php

@@ -1,6 +1,6 @@
 @if ($showFilters && count(array_filter($filters)) && !(count(array_filter($filters)) === 1 && isset($filters['search'])))
     <div class="mb-3">
-        <small class="text-secondary">@lang('Applied Filters'):</small>
+        <small>@lang('Applied Filters'):</small>
 
         @foreach($filters as $key => $value)
             @if ($key !== 'search' && strlen($value))

resources/views/bootstrap-4/includes/sorting-pills.blade.php

@@ -1,6 +1,6 @@
 @if ($showSorting && count($sorts))
     <div class="mb-3">
-        <small class="text-secondary">@lang('Applied Sorting'):</small>
+        <small>@lang('Applied Sorting'):</small>
 
         @foreach($sorts as $col => $dir)
             <span

resources/views/bootstrap-5/datatable.blade.php

@@ -10,6 +10,7 @@
             wire:poll="{{ $refresh }}"
         @endif
     @endif
+    class="container-fluid"
 >
     @include('livewire-tables::bootstrap-5.includes.offline')
     @include('livewire-tables::bootstrap-5.includes.sorting-pills')

resources/views/bootstrap-5/includes/filter-pills.blade.php

@@ -1,6 +1,6 @@
 @if ($showFilters && count(array_filter($filters)) && !(count(array_filter($filters)) === 1 && isset($filters['search'])))
     <div class="mb-3">
-        <small class="text-secondary">@lang('Applied Filters'):</small>
+        <small>@lang('Applied Filters'):</small>
 
         @foreach($filters as $key => $value)
             @if ($key !== 'search' && strlen($value))

resources/views/bootstrap-5/includes/sorting-pills.blade.php

@@ -1,6 +1,6 @@
 @if ($showSorting && count($sorts))
     <div class="mb-3">
-        <small class="text-secondary">@lang('Applied Sorting'):</small>
+        <small>@lang('Applied Sorting'):</small>
 
         @foreach($sorts as $col => $dir)
             <span

src/DataTableComponent.php

@@ -10,6 +10,7 @@
 use Rappasoft\LaravelLivewireTables\Traits\WithCustomPagination;
 use Rappasoft\LaravelLivewireTables\Traits\WithFilters;
 use Rappasoft\LaravelLivewireTables\Traits\WithPerPagePagination;
+use Rappasoft\LaravelLivewireTables\Traits\WithSearch;
 use Rappasoft\LaravelLivewireTables\Traits\WithSorting;
 
 /**
@@ -23,6 +24,7 @@ abstract class DataTableComponent extends Component
     use WithCustomPagination;
     use WithFilters;
     use WithPerPagePagination;
+    use WithSearch;
     use WithSorting;
 
     /**
@@ -32,13 +34,6 @@ abstract class DataTableComponent extends Component
      */
     public $paginationTheme = 'tailwind';
 
-    /**
-     * Show the search field.
-     *
-     * @var bool
-     */
-    public bool $showSearch = true;
-
     /**
      * Whether or not to refresh the table at a certain interval
      * false is off

src/Traits/WithFilters.php

@@ -30,21 +30,6 @@ trait WithFilters
         'search' => null,
     ];
 
-    /**
-     * @var int|null
-     */
-    public ?int $searchFilterDebounce = null;
-
-    /**
-     * @var bool|null
-     */
-    public ?bool $searchFilterDefer = null;
-
-    /**
-     * @var bool|null
-     */
-    public ?bool $searchFilterLazy = null;
-
     /**
      * Prebuild the $filters array
      */
@@ -57,28 +42,6 @@ public function mountWithFilters(): void
         }
     }
 
-    /**
-     * Build Livewire model options for the search input
-     *
-     * @return string
-     */
-    public function getSearchFilterOptionsProperty(): string
-    {
-        if ($this->searchFilterDebounce) {
-            return '.debounce.' . $this->searchFilterDebounce . 'ms';
-        }
-
-        if ($this->searchFilterDefer) {
-            return '.defer';
-        }
-
-        if ($this->searchFilterLazy) {
-            return '.lazy';
-        }
-
-        return '';
-    }
-
     /**
      * Reset the filters array but keep the value for search
      */

src/Traits/WithSearch.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Traits;
+
+/**
+ * Trait WithSearch.
+ */
+trait WithSearch
+{
+    /**
+     * Show the search field.
+     *
+     * @var bool
+     */
+    public bool $showSearch = true;
+
+    /**
+     * @var int|null
+     */
+    public ?int $searchFilterDebounce = null;
+
+    /**
+     * @var bool|null
+     */
+    public ?bool $searchFilterDefer = null;
+
+    /**
+     * @var bool|null
+     */
+    public ?bool $searchFilterLazy = null;
+
+    /**
+     * Remove the search filter when it's empty
+     */
+    public function updatedFilters(): void
+    {
+        if (isset($this->filters['search']) && $this->filters['search'] === '')
+        {
+            $this->filters['search'] = null;
+        }
+    }
+
+    /**
+     * Build Livewire model options for the search input
+     *
+     * @return string
+     */
+    public function getSearchFilterOptionsProperty(): string
+    {
+        if ($this->searchFilterDebounce) {
+            return '.debounce.' . $this->searchFilterDebounce . 'ms';
+        }
+
+        if ($this->searchFilterDefer) {
+            return '.defer';
+        }
+
+        if ($this->searchFilterLazy) {
+            return '.lazy';
+        }
+
+        return '';
+    }
+}