Merge pull request rappasoft#617 from rappasoft/develop

v1.22.0

Author: rappasoft

CHANGELOG.md

@@ -34,6 +34,6 @@ public function myBulkAction()
     $this->resetSearch(); // Remove the search query
     $this->resetSorts(); // Remove the sorts
     $this->resetBulk(); // Clear the selected rows
-    $this->resetPage(); // Go back to page 1
+    $this->resetPage($this->pageName()); // Go back to page 1
 }
 ```

docs/bulk-actions/resetting-after-bulk-actions.md

@@ -7,7 +7,7 @@ Creating filters is not required, and the filters box will be hidden if none are
 
 To create filters, you return an array of `Filter` class objects from the `filters()` method.
 
-The current types of filters are: `select`, `multiSelect`, and `date`.
+The current types of filters are: `select`, `multiSelect`, `date`, and `datetime` (for supported browsers).
 
 There are two steps to making a filter:
 
@@ -49,7 +49,7 @@ public function filters(): array
                 'tag2' => 'Tags 2',
                 'tag3' => 'Tags 3',
                 'tag4' => 'Tags 4',
-            ]),     
+            ]),
     ];
 }
 ```

docs/filters/creating-filters.md

@@ -53,3 +53,21 @@ public function redirectToModel(string $name, array $parameters = [], $absolute
 ```
 
 Now the blank space of the row should have its action, while your links go to their own action.
+
+## Working with `wire:click` on rows
+
+You can add the row-level Livewire clicks by utilizing the following method.
+
+```php
+public function getTableRowWireClick($row): ?string
+{
+    return "doSomething(" . $row->id . ")";
+}
+
+public function doSomething($id)
+{
+    // ...
+}
+```
+
+If you state both `getTableRowUrl` & `getTableRowWireClick`, the URL will supersede when a non-null value is supplied.

docs/rows/clickable-rows.md

@@ -5,11 +5,11 @@
     "Bulk Actions": "إجراءات",
     "Clear": "مسح",
     "Filters": "التصفيات",
-    "Remove filter option": "خذف خيار التصفيه",
-    "Remove sort option": "خذف خيار الترتيب",
+    "Remove filter option": "حذف خيار التصفية",
+    "Remove sort option": "حذف خيار الترتيب",
     "Search": "بحث",
     "Select All": "تحديد الكل",
-    "Showing": "إستعراض",
+    "Showing": "استعراض",
     "Unselect All": "إلغاء تحديد الكل",
     "You are currently selecting all": "أنت الآن تختار الكل",
     "You are not connected to the internet.": "أنت غير متصل بالإنترنت.",
@@ -18,5 +18,5 @@
     "results": "النتائج",
     "rows": "صفوف",
     "rows, do you want to select all": "الصفوف ، هل تريد تحديد الكل",
-    "to": "إلي"
+    "to": "إلى"
 }

resources/lang/ar.json

@@ -1,14 +1,14 @@
 {
     "All": "Todo",
     "Applied Filters": "Filtros Aplicados",
-    "Applied Sorting": "Ordenamineto Aplicado",
+    "Applied Sorting": "Ordenamiento Aplicado",
     "Bulk Actions": "Acciones Masivas",
     "Clear": "Borrar",
     "Columns": "Columnas",
-    "Done Reordering": "Reordenación finalizada",
+    "Done Reordering": "Reordenamiento finalizado",
     "Filters": "Filtros",
     "Remove filter option": "Remover opción de filtro",
-    "Remove sort option": "Remover opción de ordenamineto",
+    "Remove sort option": "Remover opción de ordenamiento",
     "Search": "Buscar",
     "Select All": "Seleccionar todo",
     "Showing": "Mostrando",

resources/lang/es.json

@@ -0,0 +1,11 @@
+<div class="mb-3 mb-md-0 input-group">
+    <input
+        wire:model="filters.{{ $key }}"
+        wire:key="filter-{{ $key }}"
+        id="filter-{{ $key }}"
+        type="datetime-local"
+        @if(isset($filter->options['min']) && strlen($filter->options['min'])) min="{{ $filter->options['min'] }}" @endif
+        @if(isset($filter->options['max']) && strlen($filter->options['max'])) max="{{ $filter->options['max'] }}" @endif
+        class="form-control"
+    />
+</div>

resources/views/bootstrap-4/includes/filter-type-datetime.blade.php

@@ -42,6 +42,8 @@ class="dropdown-menu w-100 mt-md-3"
                                 @include('livewire-tables::bootstrap-4.includes.filter-type-multiselect')
                             @elseif($filter->isDate())
                                 @include('livewire-tables::bootstrap-4.includes.filter-type-date')
+                            @elseif($filter->isDatetime())
+                                @include('livewire-tables::bootstrap-4.includes.filter-type-datetime')
                             @endif
                         </div>
                     @endforeach

resources/views/bootstrap-4/includes/filters.blade.php

@@ -98,6 +98,7 @@
                 :reordering="$reordering"
                 :url="method_exists($this, 'getTableRowUrl') ? $this->getTableRowUrl($row) : ''"
                 :target="method_exists($this, 'getTableRowUrlTarget') ? $this->getTableRowUrlTarget($row) : '_self'"
+                :wireclick="method_exists($this, 'getTableRowWireClick') ? $this->getTableRowWireClick($row) : ''"
                 :class="method_exists($this, 'setTableRowClass') ? ' ' . $this->setTableRowClass($row) : ''"
                 :id="method_exists($this, 'setTableRowId') ? $this->setTableRowId($row) : ''"
                 :customAttributes="method_exists($this, 'setTableRowAttributes') ? $this->setTableRowAttributes($row) : []"

resources/views/bootstrap-4/includes/table.blade.php

@@ -0,0 +1,11 @@
+<div class="flex rounded-md shadow-sm mt-1">
+    <input
+        wire:model="filters.{{ $key }}"
+        wire:key="filter-{{ $key }}"
+        id="filter-{{ $key }}"
+        type="datetime-local"
+        @if(isset($filter->options['min']) && strlen($filter->options['min'])) min="{{ $filter->options['min'] }}" @endif
+        @if(isset($filter->options['max']) && strlen($filter->options['max'])) max="{{ $filter->options['max'] }}" @endif
+        class="form-control"
+    />
+</div>