Merge pull request rappasoft#655 from rappasoft/develop

rappasoft · web-flow · commit 3836d7fef740 · 2022-02-13T12:12:05.000-05:00
v1.24.0
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,20 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 ## [Unreleased]
 
+## [1.24.0] - 2022-02-13
+
+### Added
+
+- Russian Localization - https://github.com/rappasoft/laravel-livewire-tables/pull/633
+- Portuguese Localization - https://github.com/rappasoft/laravel-livewire-tables/pull/619
+
+### Changed
+
+- Fixed white border in dark mode - https://github.com/rappasoft/laravel-livewire-tables/pull/621
+- Removed text-left to use default - https://github.com/rappasoft/laravel-livewire-tables/pull/620
+- Fixed bulk select query - https://github.com/rappasoft/laravel-livewire-tables/pull/632
+- Temp fix for dropdowns not working after sorting - https://github.com/rappasoft/laravel-livewire-tables/pull/643
+
 ## [1.23.0] - 2022-02-11
 
 ### Added
@@ -596,7 +610,8 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 -   Initial release
 
-[unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.23.0...development
+[unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.24.0...development
+[1.24.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.23.0...v1.24.0
 [1.23.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.22.0...v1.23.0
 [1.22.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.21.0...v1.22.0
 [1.21.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.20.1...v1.21.0
diff --git a/resources/lang/pt.json b/resources/lang/pt.json
@@ -0,0 +1,27 @@
+{
+    "All": "Tudo",
+    "Applied Filters": "Filtros Aplicados",
+    "Applied Sorting": "Ordenação Aplicada",
+    "Bulk Actions": "Ações Massivas",
+    "Clear": "Limpar",
+    "Columns": "Colunas",
+    "Done Reordering": "Ordeanação finalizada",
+    "Filters": "Filtros",
+    "Remove filter option": "Remover opção de filtro",
+    "Remove sort option": "Remover opção de ordenação",
+    "Search": "Pesquisar",
+    "Select All": "Seleccionar Tudo",
+    "Showing": "A mostrar",
+    "Unselect All": "Desmarcar Tudo",
+    "You are currently selecting all": "Atualmente está a selecionar tudo",
+    "You are not connected to the internet.": "Não está ligado à internet.",
+    "You have selected": "Selecionou",
+    "of": "de",
+    "Reorder": "Reordenar",
+    "results": "resultados",
+    "row": "linha",
+    "rows": "linhas",
+    "rows, do you want to select all": "linhas, pretende selecionar tudo",
+    "No items found. Try to broaden your search.": "Nenhum resultado encontrado. Tente ampliar a sua pesquisa.",
+    "to": "a"
+}
diff --git a/resources/lang/ru.json b/resources/lang/ru.json
@@ -0,0 +1,26 @@
+{
+    "All": "Все",
+    "Applied Filters": "Примененные фильтры",
+    "Applied Sorting": "Примененная сортировка",
+    "Bulk Actions": "Массовые действия",
+    "Clear": "Очистить",
+    "Columns": "Столбцы",
+    "Done Reordering": "Сортировка выполнена",
+    "Filters": "Фильтры",
+    "Remove filter option": "Удалить фильтр",
+    "Remove sort option": "Удалить параметр сортировки",
+    "Search": "Поиск",
+    "Select All": "Выбрать все",
+    "Showing": "Показано с",
+    "Unselect All": "Снять выделение",
+    "You are currently selecting all": "Вы выбираете все",
+    "You are not connected to the internet.": "Вы не подключены к Интернету",
+    "You have selected": "Вы выбрали",
+    "of": "из",
+    "Reorder": "Переупорядочить",
+    "results": "результатов",
+    "rows": "ряды",
+    "rows, do you want to select all": "ряды, вы хотите выбрать все",
+    "No items found. Try to broaden your search.": "Ничего не найдено. Попробуйте расширить поиск.",
+    "to": "по"
+}
diff --git a/resources/views/bootstrap-4/includes/column-select.blade.php b/resources/views/bootstrap-4/includes/column-select.blade.php
@@ -10,7 +10,6 @@ class="dropdown d-block d-md-inline"
                 x-on:click="open = !open"
                 class="btn dropdown-toggle d-block w-100 d-md-inline"
                 type="button"
-                id="columnSelect"
                 aria-haspopup="true"
                 x-bind:aria-expanded="open"
             >
@@ -20,7 +19,6 @@ class="btn dropdown-toggle d-block w-100 d-md-inline"
             <div
                 class="dropdown-menu dropdown-menu-right w-100 mt-0 mt-md-3"
                 x-bind:class="{'show' : open}"
-                aria-labelledby="columnSelect"
             >
                 @foreach($columns as $column)
                     @if ($column->isVisible() && $column->isSelectable())
diff --git a/resources/views/bootstrap-5/includes/column-select.blade.php b/resources/views/bootstrap-5/includes/column-select.blade.php
@@ -10,7 +10,6 @@ class="dropdown d-block d-md-inline"
                 x-on:click="open = !open"
                 class="btn dropdown-toggle d-block w-100 d-md-inline"
                 type="button"
-                id="columnSelect"
                 aria-haspopup="true"
                 x-bind:aria-expanded="open"
             >
@@ -20,7 +19,6 @@ class="btn dropdown-toggle d-block w-100 d-md-inline"
             <div
                 class="dropdown-menu dropdown-menu-end w-100"
                 x-bind:class="{'show' : open}"
-                aria-labelledby="columnSelect"
             >
                 @foreach($columns as $column)
                     @if ($column->isVisible() && $column->isSelectable())
diff --git a/resources/views/tailwind/components/table/heading.blade.php b/resources/views/tailwind/components/table/heading.blade.php
@@ -11,14 +11,14 @@
     {{ $attributes->merge(array_merge(['class' => 'px-3 py-2 md:px-6 md:py-3 bg-gray-50 dark:bg-gray-800'], $customAttributes)) }}
 >
     @unless ($sortingEnabled && $sortable)
-        <span class="block text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400">
+        <span class="block text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider dark:text-gray-400">
             {{ $text ?? $slot }}
         </span>
     @else
         <button
             wire:click="sortBy('{{ $column }}', '{{ $text ?? $column }}')"
             {{ $attributes->except('class') }}
-            class="flex items-center space-x-1 text-left text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider group focus:outline-none focus:underline dark:text-gray-400"
+            class="flex items-center space-x-1 text-xs leading-4 font-medium text-gray-500 uppercase tracking-wider group focus:outline-none focus:underline dark:text-gray-400"
         >
             <span>{{ $text ?? $slot }}</span>
 
diff --git a/resources/views/tailwind/components/table/table.blade.php b/resources/views/tailwind/components/table/table.blade.php
@@ -8,7 +8,7 @@
             </tr>
         </thead>
 
-        <tbody {{ $attributes->only('wire:sortable') }} class="bg-white divide-y divide-gray-200 dark:divide-none">
+        <tbody {{ $attributes->only('wire:sortable') }} class="bg-white dark:bg-gray-800 divide-y divide-gray-200 dark:divide-none">
             @if ($customSecondaryHeader)
                 {{ $customSecondaryHead }}
             @endif
diff --git a/resources/views/tailwind/includes/bulk-actions.blade.php b/resources/views/tailwind/includes/bulk-actions.blade.php
@@ -12,7 +12,6 @@ class="relative inline-block text-left z-10 w-full md:w-auto"
                         x-on:click="open = !open"
                         type="button"
                         class="inline-flex justify-center w-full rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-sm font-medium text-gray-700 hover:bg-gray-50 focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600"
-                        id="options-menu"
                         aria-haspopup="true"
                         x-bind:aria-expanded="open"
                         aria-expanded="true"
@@ -38,7 +37,7 @@ class="inline-flex justify-center w-full rounded-md border border-gray-300 shado
                 class="origin-top-right absolute right-0 mt-2 w-full md:w-48 rounded-md shadow-lg bg-white ring-1 ring-black ring-opacity-5 divide-y divide-gray-100 focus:outline-none z-50"
             >
                 <div class="rounded-md bg-white shadow-xs dark:bg-gray-700 dark:text-white">
-                    <div class="py-1" role="menu" aria-orientation="vertical" aria-labelledby="options-menu">
+                    <div class="py-1" role="menu" aria-orientation="vertical">
                         @foreach($this->bulkActions as $action => $title)
                             <button
                                 wire:click="{{ $action }}"
diff --git a/resources/views/tailwind/includes/column-select.blade.php b/resources/views/tailwind/includes/column-select.blade.php
@@ -12,7 +12,6 @@ class="inline-block relative w-full text-left md:w-auto"
                         x-on:click="open = !open"
                         type="button"
                         class="inline-flex justify-center px-4 py-2 w-full text-sm font-medium text-gray-700 bg-white rounded-md border border-gray-300 shadow-sm hover:bg-gray-50 focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600"
-                        id="column-select-menu"
                         aria-haspopup="true"
                         x-bind:aria-expanded="open"
                         aria-expanded="true"
@@ -38,7 +37,7 @@ class="inline-flex justify-center px-4 py-2 w-full text-sm font-medium text-gray
                 class="absolute right-0 z-50 mt-2 w-full bg-white rounded-md divide-y divide-gray-100 ring-1 ring-black ring-opacity-5 shadow-lg origin-top-right md:w-48 focus:outline-none"
             >
                 <div class="bg-white rounded-md shadow-xs dark:bg-gray-700 dark:text-white">
-                    <div class="p-2" role="menu" aria-orientation="vertical" aria-labelledby="column-select-menu">
+                    <div class="p-2" role="menu" aria-orientation="vertical">
                         @foreach($columns as $column)
                             @if ($column->isVisible() && $column->isSelectable())
                                 <div wire:key="columnSelect-{{ $loop->index }}">
diff --git a/resources/views/tailwind/includes/filters.blade.php b/resources/views/tailwind/includes/filters.blade.php
@@ -9,7 +9,6 @@ class="relative block md:inline-block text-left"
             <button
                 type="button"
                 class="inline-flex justify-center w-full rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-sm font-medium text-gray-700 hover:bg-gray-50 focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600"
-                id="filters-menu"
                 x-on:click="open = !open"
                 aria-haspopup="true"
                 x-bind:aria-expanded="open"
@@ -43,7 +42,6 @@ class="inline-flex justify-center w-full rounded-md border border-gray-300 shado
             class="origin-top-right absolute right-0 mt-2 w-full md:w-56 rounded-md shadow-lg bg-white ring-1 ring-black ring-opacity-5 divide-y divide-gray-100 focus:outline-none z-50 dark:bg-gray-700 dark:text-white dark:divide-gray-600"
             role="menu"
             aria-orientation="vertical"
-            aria-labelledby="filters-menu"
         >
             @if ($filtersView)
                 @include($filtersView)
diff --git a/src/Traits/WithBulkActions.php b/src/Traits/WithBulkActions.php
@@ -68,8 +68,9 @@ public function resetBulk(): void
      */
     public function selectedRowsQuery()
     {
-        return $this->query()->unless(
+        return $this->query()->when(
             $this->selectAll,
+            fn ($query) => $this->applySearchFilter($query),
             fn ($query) => $query->whereIn($query->qualifyColumn($this->primaryKey), $this->selected)
         );
     }
diff --git a/tests/DataTableComponentTest.php b/tests/DataTableComponentTest.php
@@ -161,4 +161,16 @@ public function bulk_actions_defined_through_function()
         $this->table->selected[] = 1;
         $this->assertEquals(1, $this->table->count());
     }
+
+    /** @test */
+    public function bulk_actions_defined_through_with_select_all_function()
+    {
+        $this->assertArrayHasKey('count', $this->table->bulkActions);
+ 
+        $this->table->resetFilters();
+        $this->table->filters['search'] = 'Chico';
+        $this->assertEquals(1, $this->table->getRowsProperty()->total());
+        $this->table->selectAll();
+        $this->assertEquals(1, $this->table->count());
+    }
 }
