diff --git a/.github/workflows/discord-releases.yml b/.github/workflows/discord-releases.yml index 84ea5b888..fb008bc21 100644 --- a/.github/workflows/discord-releases.yml +++ b/.github/workflows/discord-releases.yml @@ -9,7 +9,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Package Releases - uses: SethCohen/github-releases-to-discord@v1.13.1 + uses: SethCohen/github-releases-to-discord@latest with: webhook_url: ${{ secrets.WEBHOOK_DISCORD_RELEASE_URL }} color: "2105893" diff --git a/.github/workflows/pint.yml b/.github/workflows/pint.yml index 230a58799..356103132 100644 --- a/.github/workflows/pint.yml +++ b/.github/workflows/pint.yml @@ -24,9 +24,9 @@ jobs: ref: ${{ github.head_ref }} - name: Fix PHP code style issues - uses: aglipanci/laravel-pint-action@2.2.0 + uses: aglipanci/laravel-pint-action@latest - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: Fix styling diff --git a/.github/workflows/run-phpstan.yml b/.github/workflows/run-phpstan.yml index c8163e5ac..3701660df 100644 --- a/.github/workflows/run-phpstan.yml +++ b/.github/workflows/run-phpstan.yml @@ -11,6 +11,7 @@ on: - '*/*' # matches every branch containing a single '/' - '**' # matches every branch - '!master' + - '!development' jobs: test: @@ -20,7 +21,7 @@ jobs: matrix: os: [ubuntu-latest] php: [8.3] - laravel: [10] + laravel: [11] stability: [prefer-dist] name: PHPStan - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/.github/workflows/run-tests-pcov-pull.yml b/.github/workflows/run-tests-pcov-pull.yml index 00cd4b1e5..fffe0618f 100644 --- a/.github/workflows/run-tests-pcov-pull.yml +++ b/.github/workflows/run-tests-pcov-pull.yml @@ -3,12 +3,9 @@ name: run-tests-pcov-pull on: push: branches: - - 'develop' - 'development' - - 'master' pull_request: branches: - - 'develop' - 'development' - 'master' @@ -88,7 +85,7 @@ jobs: run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - name: Run Unit Tests - run: php ./vendor/bin/paratest --cache-directory=".phpunit.cache/code-coverage" --strict-coverage --coverage-clover ./coverage.xml --processes=4 + run: php ./vendor/bin/paratest --cache-directory=".phpunit.cache/code-coverage" --strict-coverage --coverage-clover ./coverage.xml - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v4 diff --git a/.github/workflows/run-tests-pull.yml b/.github/workflows/run-tests-pull.yml index a0193d19e..80c625554 100644 --- a/.github/workflows/run-tests-pull.yml +++ b/.github/workflows/run-tests-pull.yml @@ -3,7 +3,6 @@ name: run-tests-pull on: pull_request: branches: - - 'develop' - 'development' - 'master' @@ -163,4 +162,4 @@ jobs: run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - name: Run Unit Tests - run: php ./vendor/bin/paratest --no-coverage --processes=4 + run: php ./vendor/bin/paratest --no-coverage diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f24fec995..bcb0d7031 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -85,7 +85,7 @@ jobs: run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - name: Run Unit Tests - run: php ./vendor/bin/paratest --no-coverage --processes=4 + run: php ./vendor/bin/phpunit --no-coverage test-laravel11: @@ -164,4 +164,4 @@ jobs: run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - name: Run Unit Tests - run: php ./vendor/bin/paratest --no-coverage --processes=4 + run: php ./vendor/bin/paratest --no-coverage diff --git a/CHANGELOG.md b/CHANGELOG.md index e6ac79c87..9f8fe64b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,28 @@ All notable changes to `laravel-livewire-tables` will be documented in this file +## [v3.4.21] - 2024-09-25 +### Bug Fixes +- Remove persist from getFilterGenericData by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1966 +- In LaravelLivewireTablesEvent, change the type to Illuminate\Contracts\Auth\Authenticatable by @khwadj in https://github.com/rappasoft/laravel-livewire-tables/pull/1963 +- Fix for Search Field Attribute Defaults by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1962 +- Fix Filter Pills Icon - Tailwind by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1961 +- Add filterComponents into queryString to ensure they're maintained by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1957 +- Reset Current Page on "Per Page" changing by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1953 + +### New Features +- Add setLabelAttributes method to Action, and update Docs for Filter by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1952 + +### Tweaks +- Migration to Core attribute management by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1943 +- Localisation - Avoid Conflicts With Other Packages by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1955 +- GitHub Workflow Tweak for Styling Fixes by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1967 +- GitHub Workflow Tweak for Discord - Updates by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1968 + +### Docs +- Fix syntax for DateColumn outputFormat in docs by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1960 + + ## [v3.4.20] - 2024-09-10 ### Bug Fixes - Revert tableName to be public by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1937 diff --git a/docs/column-types/date_columns.md b/docs/column-types/date_columns.md index 3e2e6ca0a..17ffa581b 100644 --- a/docs/column-types/date_columns.md +++ b/docs/column-types/date_columns.md @@ -8,7 +8,7 @@ Date columns provide an easy way to display dates in a given format, without hav You may pass either a DateTime object, in which you can define an "outputFormat" ```php DateColumn::make('Updated At', 'updated_at') - ->outputFormat('Y-m-d H:i:s), + ->outputFormat('Y-m-d H:i:s'), ``` Or you may pass a string, in which case you can define an "inputFormat" in addition to the outputFormat: diff --git a/docs/columns/available-methods.md b/docs/columns/available-methods.md index 5c6eaa9b6..18f840b5d 100644 --- a/docs/columns/available-methods.md +++ b/docs/columns/available-methods.md @@ -302,3 +302,7 @@ Labels are visible by default, but should you wish to override a previous "hideC Column::make('Name') ->setColumnLabelStatusEnabled() ``` + +## See Also +[Column Styling](./styling) + diff --git a/docs/columns/styling.md b/docs/columns/styling.md new file mode 100644 index 000000000..f7db2a4bd --- /dev/null +++ b/docs/columns/styling.md @@ -0,0 +1,292 @@ +--- +title: Styling +weight: 10 +--- + +## Keeping Defaults +To allow simpler customisation on a per-table basis, there are numerous methods available to over-ride the default CSS classes. +Historically, this was provided by a simple toggleable "default" flag. However - in many cases, the original "default" has been expanded to include: + +### Keep Default Colors And Default Styles +- set default flag to true +or +- set default-colors flag to true +- set default-styling flag to true + +### Keep Default Colors Only +- set default flag to false +- set default-colors flag to true +- set default-styling flag to false + +### Keep Default Styling Only +- set default flag to false +- set default-colors flag to false +- set default-styling flag to true + +## Styling The Column Label + +The Column itself provides the capability to style the Label shown in the "th" element. You can set custom attributes to pass to the Column Label on a per-Column basis: + +For example: +```php +Column::make('Name') + ->setLabelAttributes(['class' => 'text-2xl']) +``` +By default, this replaces the default classes on the label, if you would like to keep them, set the default/default-styling/default-colors flags to true as appropriate. + +## Styling Table Elements + +It is important to note that you can also customise the parent TH and TD elements, customising both classes and attributes for each Column's header (using setThAttributes) and each row of that Column (using setTdAttributes), these are available in the configure() method of the table. +This allows you to customise attributes based on the value of the table as well! + +Below is a copy of the relevant sections from [datatable styling](../datatable/styling) to ensure visibility of the options. More are documented on the main datatable styling page. + +## setThAttributes + +Set a list of attributes to override on the th elements. + +```php +public function configure(): void +{ + // Takes a callback that gives you the current column. + $this->setThAttributes(function(Column $column) { + if ($column->isField('name')) { + return [ + 'class' => 'bg-green-500', + ]; + } + + return []; + }); +} +``` + +### Keeping Default Colors and Default Styling +```php +public function configure(): void +{ + $this->setThAttributes(function(Column $column) { + if ($column->isField('name')) { + return [ + 'default' => true, + 'class' => 'bg-green-500', + ]; + } + + return ['default' => true]; + }); +} +``` + +### Keeping Default Styling Only For the "Name" Column +```php +public function configure(): void +{ + $this->setThAttributes(function(Column $column) { + if ($column->isField('name')) { + return [ + 'default' => false, + 'default-styling' => true, + 'class' => 'text-black bg-green-500 dark:text-white dark:bg-green-900', + ]; + } + + return ['default' => true]; + }); +} +``` + +### Reorder Column +Note: If you are using Reorder, then the th for Reorder can be [styled separately](../reordering/available-methods). However this is now replaced with the following to ensure consistent behaviour. The separate method will be supported until at least v3.6 + +You can also use the "title" of the Column, which will be "reorder" for the "reorder" Column: +```php +public function configure(): void +{ + $this->setThAttributes(function(Column $column) { + if ($column->getTitle() == 'reorder') + { + return [ + 'class' => 'bg-green-500 dark:bg-green-800', + 'default' => false, + 'default-colors' => false, + ]; + + } + + return ['default' => true]; + }); +} +``` + +### Bulk Actions Column +Note: If you are using Bulk Actions, then the th for Bulk Actions can be [styled separately](../bulk-actions/customisations). However this is now replaced with the following to ensure consistent behaviour. The separate method will be supported until at least v3.6 + +You can also use the "title" of the Column, which will be "bulkactions" for the "Bulk Actions" Column: +```php +public function configure(): void +{ + $this->setThAttributes(function(Column $column) { + if ($column->getTitle() == 'bulkactions') + { + return [ + 'class' => 'bg-yellow-500 dark:bg-yellow-800', + 'default' => false, + 'default-colors' => false, + ]; + + } + + return ['default' => true]; + }); +} +``` + +## setThSortButtonAttributes + +Set a list of attributes to override on the th sort button elements + +```php +public function configure(): void +{ + // Takes a callback that gives you the current column. + $this->setThSortButtonAttributes(function(Column $column) { + if ($column->isField('name')) { + return [ + 'class' => 'bg-green-500', + ]; + } + + return []; + }); +} +``` + +## setTrAttributes + +Set a list of attributes to override on the tr elements + +```php +public function configure(): void +{ + // Takes a callback that gives you the current row and its index + $this->setTrAttributes(function($row, $index) { + if ($index % 2 === 0) { + return [ + 'class' => 'bg-gray-200', + ]; + } + + return []; + }); +} +``` + +By default, this replaces the default classes on the tr, if you would like to keep them, set the appropriate default flag (see above) + +```php +public function configure(): void +{ + $this->setTrAttributes(function($row, $index) { + if ($index % 2 === 0) { + return [ + 'default' => true, + 'class' => 'bg-gray-200', + ]; + } + + return ['default' => true]; + }); +} +``` + +## setTdAttributes + +Set a list of attributes to override on the td elements. For example, changing the background color between red/green based on whether the "total" field is over or under 1000. + +```php +public function configure(): void +{ + // Takes a callback that gives you the current column, row, column index, and row index + $this->setTdAttributes(function(Column $column, $row, $columnIndex, $rowIndex) { + if ($column->isField('total') && $row->total < 1000) { + return [ + 'class' => 'bg-red-500 text-white', + ]; + } + elseif ($column->isField('total') && $row->total >= 1000) { + return [ + 'class' => 'bg-green-500 text-white', + ]; + } + + return []; + }); +} +``` + +By default, this replaces the default classes on the td, if you would like to keep them, set the appropriate default flag (see above). + +```php +public function configure(): void +{ + // Takes a callback that gives you the current column, row, column index, and row index + $this->setTdAttributes(function(Column $column, $row, $columnIndex, $rowIndex) { + if ($column->isField('total') && $row->total < 1000) { + return [ + 'default' => true, + 'class' => 'bg-red-500 text-white', + ]; + } + + return ['default' => true]; + }); +} + +``` + +### Reorder Column +Note: If you are using Reorder, then the td for Reorder can be [styled separately](../reordering/available-methods). However this is now replaced with the following to ensure consistent behaviour. The separate method will be supported until at least v3.6 + +You can use the "title" of the Column, which will be "reorder" for the "reorder" Column: +```php +public function configure(): void +{ + $this->setTdAttributes(function(Column $column) { + if ($column->getTitle() == 'reorder') + { + return [ + 'class' => 'bg-green-500 dark:bg-green-800', + 'default' => false, + 'default-colors' => false, + ]; + + } + + return ['default' => true]; + }); +} +``` + +### Bulk Actions Column +Note: If you are using Bulk Actions, then the td for Bulk Actions can be [styled separately](../bulk-actions/customisations). However this is now replaced with the following to ensure consistent behaviour. The separate method will be supported until at least v3.6 + +You can use the "title" of the Column, which will be "bulkactions" for the "Bulk Actions" Column: +```php +public function configure(): void +{ + $this->setTdAttributes(function(Column $column) { + if ($column->getTitle() == 'bulkactions') + { + return [ + 'class' => 'bg-yellow-500 dark:bg-yellow-800', + 'default' => false, + 'default-colors' => false, + ]; + + } + + return ['default' => true]; + }); +} +``` diff --git a/docs/datatable/styling.md b/docs/datatable/styling.md index 38055dbd9..b460371bf 100644 --- a/docs/datatable/styling.md +++ b/docs/datatable/styling.md @@ -5,6 +5,27 @@ weight: 5 The package offers significant opportunities to customise the look & feel of the core table, as well as other elements (which are documented in the relevant sections). +## Keeping Defaults +To allow simpler customisation on a per-table basis, there are numerous methods available to over-ride the default CSS classes. +Historically, this was provided by a simple toggleable "default" flag. However - in many cases, the original "default" has been expanded to include: + +### Keep Default Colors And Default Styles +- set default flag to true +or +- set default-colors flag to true +- set default-styling flag to true + +### Keep Default Colors Only +- set default flag to false +- set default-colors flag to true +- set default-styling flag to false + +### Keep Default Styling Only +- set default flag to false +- set default-colors flag to false +- set default-styling flag to true + + ## Attributes ### setComponentWrapperAttributes @@ -129,9 +150,6 @@ public function configure(): void Set a list of attributes to override on the th elements. -Note: If you are using Bulk Actions, then the th for Bulk Actions is [styled separately](../bulk-actions/customisations). -Note: If you are using Reorder, then the th for Reorder is [styled separately](../reordering/available-methods). - ```php public function configure(): void { @@ -148,8 +166,7 @@ public function configure(): void } ``` -By default, this replaces the default classes on the th, if you would like to keep them, set the default flag to true. - +#### Keeping Default Colors and Default Styling ```php public function configure(): void { @@ -166,6 +183,72 @@ public function configure(): void } ``` +#### Keeping Default Styling Only For the "Name" Column +```php +public function configure(): void +{ + $this->setThAttributes(function(Column $column) { + if ($column->isField('name')) { + return [ + 'default' => false, + 'default-styling' => true, + 'class' => 'text-black bg-green-500 dark:text-white dark:bg-green-900', + ]; + } + + return ['default' => true]; + }); +} +``` + +#### Reorder Column +Note: If you are using Reorder, then the th for Reorder can be [styled separately](../reordering/available-methods). However this is now replaced with the following to ensure consistent behaviour. The separate method will be supported until at least v3.6 + +You can also use the "title" of the Column, which will be "reorder" for the "reorder" Column: +```php +public function configure(): void +{ + $this->setThAttributes(function(Column $column) { + if ($column->getTitle() == 'reorder') + { + return [ + 'class' => 'bg-green-500 dark:bg-green-800', + 'default' => false, + 'default-colors' => false, + ]; + + } + + return ['default' => true]; + }); +} +``` +#### Bulk Actions Column +Note: If you are using Bulk Actions, then the th for Bulk Actions can be [styled separately](../bulk-actions/customisations). However this is now replaced with the following to ensure consistent behaviour. The separate method will be supported until at least v3.6 + +You can also use the "title" of the Column, which will be "bulkactions" for the "Bulk Actions" Column: +```php +public function configure(): void +{ + $this->setThAttributes(function(Column $column) { + if ($column->getTitle() == 'bulkactions') + { + return [ + 'class' => 'bg-yellow-500 dark:bg-yellow-800', + 'default' => false, + 'default-colors' => false, + ]; + + } + + return ['default' => true]; + }); +} +``` + + + + ### setThSortButtonAttributes Set a list of attributes to override on the th sort button elements diff --git a/docs/filters/available-methods.md b/docs/filters/available-methods.md index f8845dbaf..7d284321b 100644 --- a/docs/filters/available-methods.md +++ b/docs/filters/available-methods.md @@ -339,7 +339,7 @@ Example blade: type="button" class="flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:outline-none focus:bg-indigo-500 focus:text-white" > - @lang('Remove filter option') + @lang('livewire-tables::Remove filter option') @@ -387,6 +387,8 @@ Example label blade: ``` ### setFilterLabelAttributes + +#### Old Method (Still Supported) Set custom attributes for a Filter Label. At present it is recommended to only use this for "class" and "style" attributes to avoid conflicts. By default, this replaces the default classes on the Filter Label wrapper, if you would like to keep them, set the default flag to true. @@ -401,6 +403,21 @@ TextFilter::make('Name') ), ``` +#### New Method (Recommended) +Set custom attributes for a Filter Label. At present it is recommended to only use this for "class" and "style" attributes to avoid conflicts. + +By default, this replaces the default classes on the Filter Label wrapper, if you would like to keep them, set the default flag to true. + +```php +TextFilter::make('Name') + ->setLabelAttributes( + [ + 'class' => 'text-xl', + 'default' => true, + ] + ), +``` + ### setCustomView Use a fully custom view for a filter. This will utilise solely your view when rendering this filter. Note that the following methods will no longer apply to a filter using this: - setCustomFilterLabel diff --git a/docs/misc/actions.md b/docs/misc/actions.md index 1030183d5..089b71139 100644 --- a/docs/misc/actions.md +++ b/docs/misc/actions.md @@ -92,6 +92,21 @@ public function actions(): array ## Button Available Methods +### setLabelAttributes +Set custom attributes for an Action Label. At present it is recommended to only use this for "class" and "style" attributes to avoid conflicts. + +By default, this replaces the default classes on the Action Label, if you would like to keep them, set the default flag to true. + +```php +Action::make('Dashboard') + ->setRoute('dashboard') + ->wireNavigate() + ->setLabelAttributes([ + 'class' => 'text-xl', + 'default' => true, + ]), +``` + ### setActionAttributes setActionAttributes is used to pass any attributes that you wish to implement on the "button" element for the action button. By default it will merge with the default classes. @@ -252,6 +267,7 @@ public function actions(): array } ``` + ## Extending You can extend the Base Action class which can be a useful timesaver, when you wish to re-use the same look/feel of an Action, but wish to set a different route (for example). diff --git a/resources/lang/ar.json b/resources/lang/ar.json index bb39d9ab5..8ed603244 100644 --- a/resources/lang/ar.json +++ b/resources/lang/ar.json @@ -1,4 +1,34 @@ { + "livewire-tables::All": "الجميع", + "livewire-tables::All Columns": "كافة الأعمدة", + "livewire-tables::Applied Filters": "المرشحات التطبيقية", + "livewire-tables::Applied Sorting": "الفرز التطبيقي", + "livewire-tables::Bulk Actions": "إجراءات جملة", + "livewire-tables::Clear": "واضح", + "livewire-tables::Columns": "الأعمدة", + "livewire-tables::Debugging Values": "قيم التصحيح", + "livewire-tables::Deselect All": "الغاء تحديد الكل", + "livewire-tables::Done Reordering": "تمت إعادة الترتيب", + "livewire-tables::Filters": "المرشحات", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "لا", + "livewire-tables::No items found. Try to broaden your search.": "لم يتم العثور على العناصر. حاول توسيع نطاق البحث.", + "livewire-tables::of": "ل", + "livewire-tables::Remove filter option": "إزالة خيار التصفية", + "livewire-tables::Remove sort option": "إزالة خيار الفرز", + "livewire-tables::Reorder": "إعادة ترتيب", + "livewire-tables::results": "نتائج", + "livewire-tables::row": "صف", + "livewire-tables::rows": "صفوف", + "livewire-tables::rows, do you want to select all": "الصفوف ، هل تريد تحديد الكل", + "livewire-tables::Search": "يبحث", + "livewire-tables::Select All": "اختر الكل", + "livewire-tables::Showing": "عرض", + "livewire-tables::to": "ل", + "livewire-tables::Yes": "نعم", + "livewire-tables::You are currently selecting all": "أنت الآن تختار الكل", + "livewire-tables::You are not connected to the internet.": "أنت غير متصل بالإنترنت.", + "livewire-tables::You have selected": "قمت بتحديدها", "All": "الجميع", "All Columns": "كافة الأعمدة", "Applied Filters": "المرشحات التطبيقية", @@ -10,6 +40,7 @@ "Deselect All": "الغاء تحديد الكل", "Done Reordering": "تمت إعادة الترتيب", "Filters": "المرشحات", + "not_applicable": "N/A", "No": "لا", "No items found. Try to broaden your search.": "لم يتم العثور على العناصر. حاول توسيع نطاق البحث.", "of": "ل", diff --git a/resources/lang/ca.json b/resources/lang/ca.json index 7e8eb6691..532ff38b3 100644 --- a/resources/lang/ca.json +++ b/resources/lang/ca.json @@ -1,4 +1,34 @@ { + "livewire-tables::All": "Tot", + "livewire-tables::All Columns": "Totes les columnes", + "livewire-tables::Applied Filters": "Filtres Aplicats", + "livewire-tables::Applied Sorting": "Ordenació Aplicada", + "livewire-tables::Bulk Actions": "Accions Massives", + "livewire-tables::Clear": "Esborra", + "livewire-tables::Columns": "Columnes", + "livewire-tables::Debugging Values": "Valors de depuració", + "livewire-tables::Deselect All": "Deselecciona tot", + "livewire-tables::Done Reordering": "Reordenació finalitzada", + "livewire-tables::Filters": "Filtres", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "No", + "livewire-tables::No items found. Try to broaden your search.": "No s'han trobat elements. Intenti ampliar la cerca.", + "livewire-tables::of": "de", + "livewire-tables::Remove filter option": "Elimina opció de filtre", + "livewire-tables::Remove sort option": "Elimina opció d'ordenació", + "livewire-tables::Reorder": "Reordena", + "livewire-tables::results": "resultats", + "livewire-tables::row": "fila", + "livewire-tables::rows": "files", + "livewire-tables::rows, do you want to select all": "files, vol seleccionar totes", + "livewire-tables::to": "a", + "livewire-tables::Search": "Cerca", + "livewire-tables::Select All": "Selecciona tot", + "livewire-tables::Showing": "Mostrant", + "livewire-tables::Yes": "Sí", + "livewire-tables::You are currently selecting all": "Actualment està seleccionant tot", + "livewire-tables::You are not connected to the internet.": "No està conectat a Internet.", + "livewire-tables::You have selected": "Ha seleccionat", "All": "Tot", "All Columns": "Totes les columnes", "Applied Filters": "Filtres Aplicats", @@ -10,6 +40,7 @@ "Deselect All": "Deselecciona tot", "Done Reordering": "Reordenació finalitzada", "Filters": "Filtres", + "not_applicable": "N/A", "No": "No", "No items found. Try to broaden your search.": "No s'han trobat elements. Intenti ampliar la cerca.", "of": "de", diff --git a/resources/lang/da.json b/resources/lang/da.json index e90e13ce2..0ce769f43 100644 --- a/resources/lang/da.json +++ b/resources/lang/da.json @@ -1,4 +1,34 @@ { + "livewire-tables::All": "Alle", + "livewire-tables::All Columns": "Alle kolonner", + "livewire-tables::Applied Filters": "Anvendte filtre", + "livewire-tables::Applied Sorting": "Anvendt sortering", + "livewire-tables::Bulk Actions": "Massehandlinger", + "livewire-tables::Clear": "Ryd", + "livewire-tables::Columns": "Kolonner", + "livewire-tables::Debugging Values": "Debugging-værdier", + "livewire-tables::Deselect All": "Fravælg alle", + "livewire-tables::Done Reordering": "Færdig med omorganisering", + "livewire-tables::Filters": "Filtre", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "Nej", + "livewire-tables::No items found. Try to broaden your search.": "Ingen elementer fundet. Prøv at udvide din søgning.", + "livewire-tables::of": "af", + "livewire-tables::Remove filter option": "Fjern filtermulighed", + "livewire-tables::Remove sort option": "Fjern sorteringsmulighed", + "livewire-tables::Reorder": "Omorganisér", + "livewire-tables::results": "resultater", + "livewire-tables::row": "række", + "livewire-tables::rows": "rækker", + "livewire-tables::rows, do you want to select all": "rækker, vil du vælge alle", + "livewire-tables::Search": "Søg", + "livewire-tables::Select All": "Vælg alle", + "livewire-tables::Showing": "Viser", + "livewire-tables::to": "til", + "livewire-tables::Yes": "Ja", + "livewire-tables::You are currently selecting all": "Du vælger i øjeblikket alle", + "livewire-tables::You are not connected to the internet.": "Du er ikke forbundet til internettet.", + "livewire-tables::You have selected": "Du har valgt", "All": "Alle", "All Columns": "Alle kolonner", "Applied Filters": "Anvendte filtre", @@ -10,6 +40,7 @@ "Deselect All": "Fravælg alle", "Done Reordering": "Færdig med omorganisering", "Filters": "Filtre", + "not_applicable": "N/A", "No": "Nej", "No items found. Try to broaden your search.": "Ingen elementer fundet. Prøv at udvide din søgning.", "of": "af", diff --git a/resources/lang/de.json b/resources/lang/de.json index cc49b1b2a..2ddfa94cc 100644 --- a/resources/lang/de.json +++ b/resources/lang/de.json @@ -1,4 +1,34 @@ { + "livewire-tables::All": "Alle", + "livewire-tables::All Columns": "Alle Spalten", + "livewire-tables::Applied Filters": "Angewendete Filter", + "livewire-tables::Applied Sorting": "Angewendete Sortierung", + "livewire-tables::Bulk Actions": "Aktionen", + "livewire-tables::Clear": "Zurücksetzen", + "livewire-tables::Columns": "Spalten", + "livewire-tables::Debugging Values": "Werte debuggen", + "livewire-tables::Deselect All": "Alle abwählen", + "livewire-tables::Done Reordering": "Sortieren abgeschlossen", + "livewire-tables::Filters": "Filter", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "Nein", + "livewire-tables::No items found. Try to broaden your search.": "Es gibt keine Ergebnisse/Einträge. Versuche die Suche zu erweitern.", + "livewire-tables::of": "von", + "livewire-tables::Remove filter option": "Entferne Filterauswahl", + "livewire-tables::Remove sort option": "Entferne Sortierauswahl", + "livewire-tables::Reorder": "erneut Sortieren", + "livewire-tables::results": "Ergebnisse", + "livewire-tables::row": "Zeile", + "livewire-tables::rows": "Zeilen", + "livewire-tables::rows, do you want to select all": "Zeilen, sollen alle ausgewählt werden", + "livewire-tables::Search": "Suche", + "livewire-tables::Select All": "Alle auswählen", + "livewire-tables::Showing": "Anzeigen", + "livewire-tables::to": "nach", + "livewire-tables::Yes": "Ja", + "livewire-tables::You are currently selecting all": "Es sind schon alle ausgewählt", + "livewire-tables::You are not connected to the internet.": "Es liegt keine Verbindung zum Internet vor.", + "livewire-tables::You have selected": "Es sind ausgewählt", "All": "Alle", "All Columns": "Alle Spalten", "Applied Filters": "Angewendete Filter", @@ -10,6 +40,7 @@ "Deselect All": "Alle abwählen", "Done Reordering": "Sortieren abgeschlossen", "Filters": "Filter", + "not_applicable": "N/A", "No": "Nein", "No items found. Try to broaden your search.": "Es gibt keine Ergebnisse/Einträge. Versuche die Suche zu erweitern.", "of": "von", diff --git a/resources/lang/en.json b/resources/lang/en.json index 87b34925e..dcf30f145 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -1,4 +1,38 @@ { + "livewire-tables::All": "All", + "livewire-tables::All Columns": "All Columns", + "livewire-tables::Applied Filters": "Applied Filters", + "livewire-tables::Applied Sorting": "Applied Sorting", + "livewire-tables::Bulk Actions": "Bulk Actions", + "livewire-tables::Bulk Actions Confirm": "Are you sure?", + "livewire-tables::Clear": "Clear", + "livewire-tables::Columns": "Columns", + "livewire-tables::Debugging Values": "Debugging Values", + "livewire-tables::Deselect All": "Deselect All", + "livewire-tables::Done Reordering": "Done Reordering", + "livewire-tables::Filters": "Filters", + "livewire-tables::max": "Max", + "livewire-tables::min": "Min", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "No", + "livewire-tables::No items found. Try to broaden your search.": "No items found. Try to broaden your search.", + "livewire-tables::of": "of", + "livewire-tables::Remove filter option": "Remove filter option", + "livewire-tables::Remove sort option": "Remove sort option", + "livewire-tables::Reorder": "Reorder", + "livewire-tables::results": "results", + "livewire-tables::row": "row", + "livewire-tables::rows": "rows", + "livewire-tables::rows, do you want to select all": "rows, do you want to select all", + "livewire-tables::Search": "Search", + "livewire-tables::Select All": "Select All", + "livewire-tables::Select All On Page": "Select All On Page", + "livewire-tables::Showing": "Showing", + "livewire-tables::to": "to", + "livewire-tables::Yes": "Yes", + "livewire-tables::You are currently selecting all": "You are currently selecting all", + "livewire-tables::You are not connected to the internet.": "You are not connected to the internet.", + "livewire-tables::You have selected": "You have selected", "All": "All", "All Columns": "All Columns", "Applied Filters": "Applied Filters", @@ -11,6 +45,9 @@ "Deselect All": "Deselect All", "Done Reordering": "Done Reordering", "Filters": "Filters", + "max": "Max", + "min": "Min", + "not_applicable": "N/A", "No": "No", "No items found. Try to broaden your search.": "No items found. Try to broaden your search.", "of": "of", diff --git a/resources/lang/es.json b/resources/lang/es.json index a337cb094..b03b2e25f 100644 --- a/resources/lang/es.json +++ b/resources/lang/es.json @@ -1,4 +1,35 @@ { + "livewire-tables::All": "Todo", + "livewire-tables::All Columns": "Todas las columnas", + "livewire-tables::Applied Filters": "Filtros Aplicados", + "livewire-tables::Applied Sorting": "Ordenamiento Aplicado", + "livewire-tables::Bulk Actions": "Acciones Masivas", + "livewire-tables::Clear": "Borrar", + "livewire-tables::Columns": "Columnas", + "livewire-tables::Debugging Values": "Valores de depuración", + "livewire-tables::Deselect All": "Deseleccionar todo", + "livewire-tables::Done Reordering": "Reordenación finalizada", + "livewire-tables::Filters": "Filtros", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "No", + "livewire-tables::No items found. Try to broaden your search.": "No se encontraron elementos. Intente ampliar la búsqueda.", + "livewire-tables::of": "de", + "livewire-tables::Remove filter option": "Remover opción de filtro", + "livewire-tables::Remove sort option": "Remover opción de ordenamineto", + "livewire-tables::Reorder": "Reordenar", + "livewire-tables::results": "resultados", + "livewire-tables::row": "fila", + "livewire-tables::rows": "filas", + "livewire-tables::rows, do you want to select all": "filas, desea seleccionar todas", + "livewire-tables::Search": "Buscar", + "livewire-tables::Select All": "Seleccionar todo", + "livewire-tables::Select All On Page": "Seleccionar todo en la página", + "livewire-tables::Showing": "Mostrando", + "livewire-tables::to": "a", + "livewire-tables::Yes": "Sí", + "livewire-tables::You are currently selecting all": "Actualmente está seleccionando todo", + "livewire-tables::You are not connected to the internet.": "No está conectado a Internet.", + "livewire-tables::You have selected": "Ha seleccionado", "All": "Todo", "All Columns": "Todas las columnas", "Applied Filters": "Filtros Aplicados", @@ -10,6 +41,7 @@ "Deselect All": "Deseleccionar todo", "Done Reordering": "Reordenación finalizada", "Filters": "Filtros", + "not_applicable": "N/A", "No": "No", "No items found. Try to broaden your search.": "No se encontraron elementos. Intente ampliar la búsqueda.", "of": "de", diff --git a/resources/lang/fr.json b/resources/lang/fr.json index b6f21093b..89323dc4a 100644 --- a/resources/lang/fr.json +++ b/resources/lang/fr.json @@ -1,4 +1,34 @@ { + "livewire-tables::All": "Tous", + "livewire-tables::All Columns": "Toutes les colonnes", + "livewire-tables::Applied Filters": "Filtres appliqués", + "livewire-tables::Applied Sorting": "Tris appliqués", + "livewire-tables::Bulk Actions": "Actions en masse", + "livewire-tables::Clear": "Effacer", + "livewire-tables::Columns": "Colonnes", + "livewire-tables::Debugging Values": "Valeurs de débogage", + "livewire-tables::Deselect All": "Tout désélectionner ", + "livewire-tables::Done Reordering": "Réordonnancement terminé", + "livewire-tables::Filters": "Filtres", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "Non", + "livewire-tables::No items found. Try to broaden your search.": "Aucun élément trouvé. Essayez d'élargir votre recherche.", + "livewire-tables::of": "sur", + "livewire-tables::Remove filter option": "Supprimer l'option de filtrage", + "livewire-tables::Remove sort option": "Supprimer l'option de tri", + "livewire-tables::Reorder": "Réordonner", + "livewire-tables::results": "résultats", + "livewire-tables::row": "ligne", + "livewire-tables::rows": "lignes", + "livewire-tables::rows, do you want to select all": "lignes, voulez-vous tout sélectionner ?", + "livewire-tables::Search": "Rechercher", + "livewire-tables::Select All": "Tout sélectionner", + "livewire-tables::Showing": "Montrant", + "livewire-tables::to": "à", + "livewire-tables::Yes": "Oui", + "livewire-tables::You are currently selecting all": "Vous êtes en train de sélectionner ", + "livewire-tables::You are not connected to the internet.": "Vous n'êtes pas connecté à l'Internet.", + "livewire-tables::You have selected": "Vous avez sélectionné", "All": "Tous", "All Columns": "Toutes les colonnes", "Applied Filters": "Filtres appliqués", @@ -10,6 +40,7 @@ "Deselect All": "Tout désélectionner ", "Done Reordering": "Réordonnancement terminé", "Filters": "Filtres", + "not_applicable": "N/A", "No": "Non", "No items found. Try to broaden your search.": "Aucun élément trouvé. Essayez d'élargir votre recherche.", "of": "sur", diff --git a/resources/lang/id.json b/resources/lang/id.json index 3ba72de81..06a9f38cf 100644 --- a/resources/lang/id.json +++ b/resources/lang/id.json @@ -1,4 +1,34 @@ { + "livewire-tables::All": "Semua", + "livewire-tables::All Columns": "Semua Kolom", + "livewire-tables::Applied Filters": "Filter Diterapkan", + "livewire-tables::Applied Sorting": "Penyortiran Diterapkan", + "livewire-tables::Bulk Actions": "Aksi", + "livewire-tables::Clear": "Bersihkan", + "livewire-tables::Columns": "Kolom", + "livewire-tables::Debugging Values": "Nilai Debug", + "livewire-tables::Deselect All": "Batalkan Semua Pilihan", + "livewire-tables::Done Reordering": "Selesai Mengurutkan Ulang", + "livewire-tables::Filters": "Filter", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "Tidak", + "livewire-tables::No items found. Try to broaden your search.": "Tidak ada data yang ditemukan. Cobalah untuk memperluas pencarian Anda.", + "livewire-tables::of": "dari", + "livewire-tables::Remove filter option": "Hapus opsi filter", + "livewire-tables::Remove sort option": "Hapus opsi pengurutan", + "livewire-tables::Reorder": "Urutkan ulang", + "livewire-tables::results": "hasil", + "livewire-tables::row": "baris", + "livewire-tables::rows": "baris", + "livewire-tables::rows, do you want to select all": "baris, apakah Anda ingin memilih semua?", + "livewire-tables::Search": "Cari", + "livewire-tables::Select All": "Pilih Semua", + "livewire-tables::Showing": "Menampilkan", + "livewire-tables::to": "ke", + "livewire-tables::Yes": "Ya", + "livewire-tables::You are currently selecting all": "Anda sedang memilih semua", + "livewire-tables::You are not connected to the internet.": "Anda sedang tidak terhubung ke internet.", + "livewire-tables::You have selected": "Anda telah memilih", "All": "Semua", "All Columns": "Semua Kolom", "Applied Filters": "Filter Diterapkan", @@ -10,6 +40,7 @@ "Deselect All": "Batalkan Semua Pilihan", "Done Reordering": "Selesai Mengurutkan Ulang", "Filters": "Filter", + "not_applicable": "N/A", "No": "Tidak", "No items found. Try to broaden your search.": "Tidak ada data yang ditemukan. Cobalah untuk memperluas pencarian Anda.", "of": "dari", @@ -28,4 +59,5 @@ "You are currently selecting all": "Anda sedang memilih semua", "You are not connected to the internet.": "Anda sedang tidak terhubung ke internet.", "You have selected": "Anda telah memilih" + } \ No newline at end of file diff --git a/resources/lang/it.json b/resources/lang/it.json index 4cb15d436..a1c50fb21 100644 --- a/resources/lang/it.json +++ b/resources/lang/it.json @@ -1,4 +1,34 @@ { + "livewire-tables::All": "Tutti", + "livewire-tables::All Columns": "Tutte le colonne", + "livewire-tables::Applied Filters": "Filtri Applicati", + "livewire-tables::Applied Sorting": "Ordinamento Applicato", + "livewire-tables::Bulk Actions": "Azioni di Gruppo", + "livewire-tables::Clear": "Pulisci", + "livewire-tables::Columns": "Colonne", + "livewire-tables::Debugging Values": "Valori di debug", + "livewire-tables::Deselect All": "Deseleziona tutto", + "livewire-tables::Done Reordering": "Ordinamento Terminato", + "livewire-tables::Filters": "Filtri", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "No", + "livewire-tables::No items found. Try to broaden your search.": "Nessun risultato trovato. Prova ad ampliare la tua ricerca.", + "livewire-tables::of": "di", + "livewire-tables::Remove filter option": "Rimuovi filtro", + "livewire-tables::Remove sort option": "Rimuovi ordinamento", + "livewire-tables::Reorder": "Riordina", + "livewire-tables::results": "risultati", + "livewire-tables::row": "righe", + "livewire-tables::rows": "righe", + "livewire-tables::rows, do you want to select all": "righe, vuoi selezionarle tutte", + "livewire-tables::Search": "Cerca", + "livewire-tables::Select All": "Seleziona Tutto", + "livewire-tables::Showing": "Visualizzati", + "livewire-tables::to": "a", + "livewire-tables::Yes": "SÌ", + "livewire-tables::You are currently selecting all": "Stai selezionando tutto", + "livewire-tables::You are not connected to the internet.": "Non sei connesso a internet", + "livewire-tables::You have selected": "Hai selezionato", "All": "Tutti", "All Columns": "Tutte le colonne", "Applied Filters": "Filtri Applicati", @@ -10,6 +40,7 @@ "Deselect All": "Deseleziona tutto", "Done Reordering": "Ordinamento Terminato", "Filters": "Filtri", + "not_applicable": "N/A", "No": "No", "No items found. Try to broaden your search.": "Nessun risultato trovato. Prova ad ampliare la tua ricerca.", "of": "di", @@ -28,4 +59,5 @@ "You are currently selecting all": "Stai selezionando tutto", "You are not connected to the internet.": "Non sei connesso a internet", "You have selected": "Hai selezionato" + } \ No newline at end of file diff --git a/resources/lang/ms.json b/resources/lang/ms.json index ff04ae499..e7e725fa7 100644 --- a/resources/lang/ms.json +++ b/resources/lang/ms.json @@ -1,4 +1,34 @@ { + "livewire-tables::All": "Semua", + "livewire-tables::All Columns": "Semua Lajur", + "livewire-tables::Applied Filters": "Tapisan Digunakan", + "livewire-tables::Applied Sorting": "Susunan Digunakan", + "livewire-tables::Bulk Actions": "Tindakan Pukal", + "livewire-tables::Clear": "Kosongkan", + "livewire-tables::Columns": "Kolum", + "livewire-tables::Debugging Values": "Menyahpepijat Nilai", + "livewire-tables::Deselect All": "Nyahpilih semua", + "livewire-tables::Done Reordering": "Selesai Menyusun Semula", + "livewire-tables::Filters": "Tapisan", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "Tidak", + "livewire-tables::No items found. Try to broaden your search.": "Tiada data ditemui. Sila perluaskan carian anda", + "livewire-tables::of": "daripada", + "livewire-tables::Remove filter option": "Keluarkan pilihan tapisan", + "livewire-tables::Remove sort option": "Keluarkan pilihan sususan", + "livewire-tables::Reorder": "menyusun semula", + "livewire-tables::results": "keputusan", + "livewire-tables::row": "barisan", + "livewire-tables::rows": "barisan", + "livewire-tables::rows, do you want to select all": "barisan, adakah anda mahu pilih semua?", + "livewire-tables::Search": "Carian", + "livewire-tables::Select All": "Pilih Semua", + "livewire-tables::Showing": "Menunjukkan", + "livewire-tables::to": "ke", + "livewire-tables::Yes": "ya", + "livewire-tables::You are currently selecting all": "Anda sedang memilih semua", + "livewire-tables::You are not connected to the internet.": "Anda tidak disambungkan ke internet.", + "livewire-tables::You have selected": "Anda telah memilih", "All": "Semua", "All Columns": "Semua Lajur", "Applied Filters": "Tapisan Digunakan", @@ -10,6 +40,7 @@ "Deselect All": "Nyahpilih semua", "Done Reordering": "Selesai Menyusun Semula", "Filters": "Tapisan", + "not_applicable": "N/A", "No": "Tidak", "No items found. Try to broaden your search.": "Tiada data ditemui. Sila perluaskan carian anda", "of": "daripada", diff --git a/resources/lang/nl.json b/resources/lang/nl.json index e2f681d4d..a6223018c 100644 --- a/resources/lang/nl.json +++ b/resources/lang/nl.json @@ -1,4 +1,36 @@ { + "livewire-tables::All": "Alle", + "livewire-tables::All Columns": "Alle kolommen", + "livewire-tables::Applied Filters": "Toegepaste filters", + "livewire-tables::Applied Sorting": "Toegepaste sortering", + "livewire-tables::Bulk Actions": "Bulkacties", + "livewire-tables::Bulk Actions Confirm": "Weet u het zeker?", + "livewire-tables::Clear": "Wissen", + "livewire-tables::Columns": "Kolommen", + "livewire-tables::Debugging Values": "Debugging waarden", + "livewire-tables::Deselect All": "Alles deselecteren", + "livewire-tables::Done Reordering": "Hersortering voltooid", + "livewire-tables::Filters": "Filters", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "Nee", + "livewire-tables::No items found. Try to broaden your search.": "Er zijn geen items gevonden. Probeer uw zoekopdracht te verfijnen.", + "livewire-tables::of": "van", + "livewire-tables::Remove filter option": "Filteroptie verwijderen", + "livewire-tables::Remove sort option": "Sorteeroptie verwijderen", + "livewire-tables::Reorder": "Hersorteren", + "livewire-tables::results": "resultaten", + "livewire-tables::row": "rij", + "livewire-tables::rows": "rijen", + "livewire-tables::rows, do you want to select all": "rijen, wilt u alles selecteren", + "livewire-tables::Search": "Zoeken", + "livewire-tables::Select All": "Alles selecteren", + "livewire-tables::Showing": "Toont", + "livewire-tables::to": "tot", + "livewire-tables::Yes": "Ja", + "livewire-tables::You are currently selecting all": "Huidig heeft u alles geselecteerd", + "livewire-tables::You are not connected to the internet.": "U bent niet verbonden met het internet.", + "livewire-tables::You have selected": "U selecteerde", + "livewire-tables::Select All On Page": "Alles op deze pagina selecteren", "All": "Alle", "All Columns": "Alle kolommen", "Applied Filters": "Toegepaste filters", @@ -11,6 +43,7 @@ "Deselect All": "Alles deselecteren", "Done Reordering": "Hersortering voltooid", "Filters": "Filters", + "not_applicable": "N/A", "No": "Nee", "No items found. Try to broaden your search.": "Er zijn geen items gevonden. Probeer uw zoekopdracht te verfijnen.", "of": "van", diff --git a/resources/lang/pl.json b/resources/lang/pl.json index 70e99e7f3..12469dc82 100644 --- a/resources/lang/pl.json +++ b/resources/lang/pl.json @@ -1,4 +1,36 @@ { + "livewire-tables::All": "Wszystko", + "livewire-tables::All Columns": "Wszystkie kolumny", + "livewire-tables::Applied Filters": "Użyte filtry", + "livewire-tables::Applied Sorting": "Użyte sortowanie", + "livewire-tables::Bulk Actions": "Akcje zbiorowe", + "livewire-tables::Bulk Actions Confirm": "Czy zastosować ?", + "livewire-tables::Clear": "Wyczyść", + "livewire-tables::Columns": "Kolumny", + "livewire-tables::Debugging Values": "Wartości debugowania", + "livewire-tables::Deselect All": "Odznacz wszystko", + "livewire-tables::Done Reordering": "Done Reordering", + "livewire-tables::Filters": "Filtry", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "Nie", + "livewire-tables::No items found. Try to broaden your search.": "Brak rezultatów do wyświetlenia.", + "livewire-tables::of": "z", + "livewire-tables::Remove filter option": "Usuń opcję filtra", + "livewire-tables::Remove sort option": "Usuń opcję sortowania", + "livewire-tables::Reorder": "Zmień kolejność", + "livewire-tables::results": "wyniki", + "livewire-tables::row": "wiersz", + "livewire-tables::rows": "wiersze", + "livewire-tables::rows, do you want to select all": "czy chcesz zaznaczyć wszystkie wiersze", + "livewire-tables::Search": "Szukaj", + "livewire-tables::Select All": "Zaznacz wszystko", + "livewire-tables::Select All On Page": "Zaznacz wszystko na stronie", + "livewire-tables::Showing": "Pokazywanie", + "livewire-tables::to": "do", + "livewire-tables::Yes": "Tak", + "livewire-tables::You are currently selecting all": "Aktualnie masz wszystko zaznaczone", + "livewire-tables::You are not connected to the internet.": "Brak połączenia z internetem.", + "livewire-tables::You have selected": "Masz wybrane", "All": "Wszystko", "All Columns": "Wszystkie kolumny", "Applied Filters": "Użyte filtry", @@ -11,6 +43,7 @@ "Deselect All": "Odznacz wszystko", "Done Reordering": "Done Reordering", "Filters": "Filtry", + "not_applicable": "N/A", "No": "Nie", "No items found. Try to broaden your search.": "Brak rezultatów do wyświetlenia.", "of": "z", diff --git a/resources/lang/pt.json b/resources/lang/pt.json index fd12aafbf..f38578da1 100644 --- a/resources/lang/pt.json +++ b/resources/lang/pt.json @@ -1,4 +1,35 @@ { + "livewire-tables::All": "Tudo", + "livewire-tables::All Columns": "Todas as colunas", + "livewire-tables::Applied Filters": "Filtros Aplicados", + "livewire-tables::Applied Sorting": "Ordenação Aplicada", + "livewire-tables::Bulk Actions": "Ações Massivas", + "livewire-tables::Clear": "Limpar", + "livewire-tables::Columns": "Colunas", + "livewire-tables::Debugging Values": "Valores de depuração", + "livewire-tables::Deselect All": "Desmarcar Tudo", + "livewire-tables::Done Reordering": "Ordeanação finalizada", + "livewire-tables::Filters": "Filtros", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "Não", + "livewire-tables::No items found. Try to broaden your search.": "Nenhum resultado encontrado. Tente ampliar a sua pesquisa.", + "livewire-tables::of": "de", + "livewire-tables::Remove filter option": "Remover opção de filtro", + "livewire-tables::Remove sort option": "Remover opção de ordenação", + "livewire-tables::Reorder": "Reordenar", + "livewire-tables::results": "resultados", + "livewire-tables::row": "linha", + "livewire-tables::rows": "linhas", + "livewire-tables::rows, do you want to select all": "linhas, pretende selecionar tudo", + "livewire-tables::Search": "Pesquisar", + "livewire-tables::Select All": "Seleccionar Tudo", + "livewire-tables::Select All On Page": "Selecione tudo na página", + "livewire-tables::Showing": "A mostrar", + "livewire-tables::to": "a", + "livewire-tables::Yes": "Sim", + "livewire-tables::You are currently selecting all": "Atualmente está a selecionar tudo", + "livewire-tables::You are not connected to the internet.": "Não está ligado à internet.", + "livewire-tables::You have selected": "Selecionou", "All": "Tudo", "All Columns": "Todas as colunas", "Applied Filters": "Filtros Aplicados", @@ -10,6 +41,7 @@ "Deselect All": "Desmarcar Tudo", "Done Reordering": "Ordeanação finalizada", "Filters": "Filtros", + "not_applicable": "N/A", "No": "Não", "No items found. Try to broaden your search.": "Nenhum resultado encontrado. Tente ampliar a sua pesquisa.", "of": "de", @@ -22,6 +54,7 @@ "rows, do you want to select all": "linhas, pretende selecionar tudo", "Search": "Pesquisar", "Select All": "Seleccionar Tudo", + "Select All On Page": "Selecione tudo na página", "Showing": "A mostrar", "to": "a", "Yes": "Sim", diff --git a/resources/lang/pt_BR.json b/resources/lang/pt_BR.json index 9bf168d13..09a0e2906 100644 --- a/resources/lang/pt_BR.json +++ b/resources/lang/pt_BR.json @@ -1,14 +1,49 @@ { + "livewire-tables::All": "Tudo", + "livewire-tables::All Columns": "Todas as colunas", + "livewire-tables::Applied Filters": "Filtros aplicados", + "livewire-tables::Applied Sorting": "Ordenação aplicada", + "livewire-tables::Bulk Actions": "Ações em massa", + "livewire-tables::Bulk Actions Confirm": "Tem certeza", + "livewire-tables::Clear": "Limpar", + "livewire-tables::Columns": "Colunas", + "livewire-tables::Debugging Values": "Valores de depuração", + "livewire-tables::Deselect All": "Desmarcar Tudo", + "livewire-tables::Done Reordering": "Ordenação finalizada", + "livewire-tables::Filters": "Filtros", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "Não", + "livewire-tables::No items found. Try to broaden your search.": "Nenhum resultado encontrado. Tente ampliar a sua pesquisa.", + "livewire-tables::of": "de", + "livewire-tables::Reorder": "Reordenar", + "livewire-tables::results": "resultados", + "livewire-tables::Remove filter option": "Remover opção de filtro", + "livewire-tables::Remove sort option": "Remover opção de ordenação", + "livewire-tables::row": "linha", + "livewire-tables::rows": "linhas", + "livewire-tables::rows, do you want to select all": "linhas, você deseja selecionar tudo?", + "livewire-tables::Search": "Pesquisar", + "livewire-tables::Select All": "Selecionar tudo", + "livewire-tables::Select All On Page": "Selecione tudo na página", + "livewire-tables::Showing": "Exibindo", + "livewire-tables::to": "a", + "livewire-tables::Yes": "Sim", + "livewire-tables::You are currently selecting all": "Você selecionou tudo", + "livewire-tables::You are not connected to the internet.": "Você não está conectado na internet.", + "livewire-tables::You have selected": "Você selecionou", "All": "Tudo", + "All Columns": "Todas as colunas", "Applied Filters": "Filtros aplicados", "Applied Sorting": "Ordenação aplicada", "Bulk Actions": "Ações em massa", + "Bulk Actions Confirm": "Tem certeza", "Clear": "Limpar", "Columns": "Colunas", "Debugging Values": "Valores de depuração", "Deselect All": "Desmarcar Tudo", "Done Reordering": "Ordenação finalizada", "Filters": "Filtros", + "not_applicable": "N/A", "No": "Não", "No items found. Try to broaden your search.": "Nenhum resultado encontrado. Tente ampliar a sua pesquisa.", "of": "de", @@ -21,6 +56,7 @@ "rows, do you want to select all": "linhas, você deseja selecionar tudo?", "Search": "Pesquisar", "Select All": "Selecionar tudo", + "Select All On Page": "Selecione tudo na página", "Showing": "Exibindo", "to": "a", "Yes": "Sim", diff --git a/resources/lang/ru.json b/resources/lang/ru.json index 7eb99d1f9..53b9fbf1b 100644 --- a/resources/lang/ru.json +++ b/resources/lang/ru.json @@ -1,4 +1,34 @@ { + "livewire-tables::All": "Все", + "livewire-tables::All Columns": "Все столбцы", + "livewire-tables::Applied Filters": "Примененные фильтры", + "livewire-tables::Applied Sorting": "Примененная сортировка", + "livewire-tables::Bulk Actions": "Массовые действия", + "livewire-tables::Clear": "Очистить", + "livewire-tables::Columns": "Столбцы", + "livewire-tables::Debugging Values": "Отладочные значения", + "livewire-tables::Deselect All": "Снять выделение", + "livewire-tables::Done Reordering": "Сортировка выполнена", + "livewire-tables::Filters": "Фильтры", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "Нет", + "livewire-tables::No items found. Try to broaden your search.": "Ничего не найдено. Попробуйте расширить поиск.", + "livewire-tables::of": "из", + "livewire-tables::Remove filter option": "Удалить фильтр", + "livewire-tables::Remove sort option": "Удалить параметр сортировки", + "livewire-tables::Reorder": "Переупорядочить", + "livewire-tables::results": "результатов", + "livewire-tables::row": "ряды", + "livewire-tables::rows": "ряды", + "livewire-tables::rows, do you want to select all": "ряды, вы хотите выбрать все", + "livewire-tables::Search": "Поиск", + "livewire-tables::Select All": "Выбрать все", + "livewire-tables::Showing": "Показано с", + "livewire-tables::to": "к", + "livewire-tables::Yes": "Да", + "livewire-tables::You are currently selecting all": "Вы выбираете все", + "livewire-tables::You are not connected to the internet.": "Вы не подключены к Интернету", + "livewire-tables::You have selected": "Вы выбрали", "All": "Все", "All Columns": "Все столбцы", "Applied Filters": "Примененные фильтры", @@ -10,6 +40,7 @@ "Deselect All": "Снять выделение", "Done Reordering": "Сортировка выполнена", "Filters": "Фильтры", + "not_applicable": "N/A", "No": "Нет", "No items found. Try to broaden your search.": "Ничего не найдено. Попробуйте расширить поиск.", "of": "из", diff --git a/resources/lang/th.json b/resources/lang/th.json index 34904172c..35c21b7fd 100644 --- a/resources/lang/th.json +++ b/resources/lang/th.json @@ -1,14 +1,49 @@ { + "livewire-tables::All": "ทั้งหมด", + "livewire-tables::All Columns": "คอลัมน์ทั้งหมด", + "livewire-tables::Applied Filters": "กรองข้อมูลตาม", + "livewire-tables::Applied Sorting": "เรียงลำดับตาม", + "livewire-tables::Bulk Actions": "เลือกการกระทำ", + "livewire-tables::Bulk Actions Confirm": "คุณแน่ใจ?", + "livewire-tables::Clear": "ล้างทั้งหมด", + "livewire-tables::Columns": "เลือกคอลัมน์", + "livewire-tables::Debugging Values": "ค่าการดีบัก", + "livewire-tables::Deselect All": "ไม่เลือกทั้งหมด", + "livewire-tables::Done Reordering": "จัดลำดับแล้ว", + "livewire-tables::Filters": "ตัวกรอง", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "เลขที่", + "livewire-tables::No items found. Try to broaden your search.": "ไม่พบรายการที่ค้นหา", + "livewire-tables::of": "จาก", + "livewire-tables::Remove filter option": "เอาตัวกรองออก", + "livewire-tables::Remove sort option": "เอาการเรียงลำดับออก", + "livewire-tables::Reorder": "จัดลำดับ", + "livewire-tables::results": "รายการ", + "livewire-tables::row": "รายการ", + "livewire-tables::rows": "รายการ", + "livewire-tables::rows, do you want to select all": "รายการ, คุณต้องการเลือกทั้งหมด", + "livewire-tables::Search": "ค้นหา...", + "livewire-tables::Select All": "เลือกทั้งหมด", + "livewire-tables::Select All On Page": "เลือกทั้งหมดบนหน้า", + "livewire-tables::Showing": "แสดง", + "livewire-tables::to": "-", + "livewire-tables::Yes": "ใช่", + "livewire-tables::You are currently selecting all": "ขณะนี้คุณได้เลือกทุกรายการ", + "livewire-tables::You are not connected to the internet.": "ขณะนี้คุณไม่ได้เชื่อมต่อกับอินเทอร์เน็ต", + "livewire-tables::You have selected": "คุณเลือก", "All": "ทั้งหมด", + "All Columns": "คอลัมน์ทั้งหมด", "Applied Filters": "กรองข้อมูลตาม", "Applied Sorting": "เรียงลำดับตาม", "Bulk Actions": "เลือกการกระทำ", + "Bulk Actions Confirm": "คุณแน่ใจ?", "Clear": "ล้างทั้งหมด", "Columns": "เลือกคอลัมน์", "Debugging Values": "ค่าการดีบัก", "Deselect All": "ไม่เลือกทั้งหมด", "Done Reordering": "จัดลำดับแล้ว", "Filters": "ตัวกรอง", + "not_applicable": "N/A", "No": "เลขที่", "No items found. Try to broaden your search.": "ไม่พบรายการที่ค้นหา", "of": "จาก", @@ -21,6 +56,7 @@ "rows, do you want to select all": "รายการ, คุณต้องการเลือกทั้งหมด", "Search": "ค้นหา...", "Select All": "เลือกทั้งหมด", + "Select All On Page": "เลือกทั้งหมดบนหน้า", "Showing": "แสดง", "to": "-", "Yes": "ใช่", diff --git a/resources/lang/tk.json b/resources/lang/tk.json index 78bb1460b..2099d845f 100644 --- a/resources/lang/tk.json +++ b/resources/lang/tk.json @@ -1,4 +1,34 @@ { + "livewire-tables::All": "Hemmesi", + "livewire-tables::All Columns": "Colhli sütünler", + "livewire-tables::Applied Filters": "Ulanylýan Süzgüçler", + "livewire-tables::Applied Sorting": "Ulanylýan Tertipleşdirme", + "livewire-tables::Bulk Actions": "Köpçülikleýin Hereketler", + "livewire-tables::Clear": "Arassala", + "livewire-tables::Columns": "Sütünler", + "livewire-tables::Debugging Values": "Gymmatlyklary düzetmek", + "livewire-tables::Deselect All": "Hemmesini Aýyr", + "livewire-tables::Done Reordering": "Täzeden Tertiplendi", + "livewire-tables::Filters": "Süzgüçler", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "Hayir", + "livewire-tables::No items found. Try to broaden your search.": "Hiç zat tapylmady. Gözlegiňizi giňeltmäge synanyşyň.", + "livewire-tables::of": "aralygy", + "livewire-tables::Remove filter option": "Süzgüç görnüşini aýyryň", + "livewire-tables::Remove sort option": "Tertiplemek görnüşini aýyryň", + "livewire-tables::Reorder": "Tertibe salmak", + "livewire-tables::results": "netijeler", + "livewire-tables::row": "hatarlar", + "livewire-tables::rows": "hatarlar", + "livewire-tables::rows, do you want to select all": "hatarlar, hemmesini saýlamak isleýärsiňizmi?", + "livewire-tables::Search": "Gözlemek", + "livewire-tables::Select All": "Hepsini seç", + "livewire-tables::Showing": "Görkezmek", + "livewire-tables::to": "-", + "livewire-tables::Yes": "Evet", + "livewire-tables::You are currently selecting all": "Häzirki wagtda hemmesini saýlap alýarsyňyz", + "livewire-tables::You are not connected to the internet.": "Siz internete birikmediksiňiz.", + "livewire-tables::You have selected": "Saýladyňyz", "All": "Hemmesi", "All Columns": "Colhli sütünler", "Applied Filters": "Ulanylýan Süzgüçler", @@ -10,6 +40,7 @@ "Deselect All": "Hemmesini Aýyr", "Done Reordering": "Täzeden Tertiplendi", "Filters": "Süzgüçler", + "not_applicable": "N/A", "No": "Hayir", "No items found. Try to broaden your search.": "Hiç zat tapylmady. Gözlegiňizi giňeltmäge synanyşyň.", "of": "aralygy", diff --git a/resources/lang/tr.json b/resources/lang/tr.json index a6c5c01f1..f1218ae2b 100644 --- a/resources/lang/tr.json +++ b/resources/lang/tr.json @@ -1,4 +1,34 @@ { + "livewire-tables::All": "Tümü", + "livewire-tables::All Columns": "Tüm Sütunlar", + "livewire-tables::Applied Filters": "Aktif Filtreler", + "livewire-tables::Applied Sorting": "Aktif Sıralamalar", + "livewire-tables::Bulk Actions": "Toplu İşlemler", + "livewire-tables::Clear": "Kaldır", + "livewire-tables::Columns": "Kolonlar", + "livewire-tables::Debugging Values": "Debug Değerleri", + "livewire-tables::Deselect All": "Seçimleri kaldır", + "livewire-tables::Done Reordering": "Sıralamayı Tamamla", + "livewire-tables::Filters": "Filtreler", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "HAYIR", + "livewire-tables::No items found. Try to broaden your search.": "Kayıt bulunamadı.", + "livewire-tables::of": " ", + "livewire-tables::Remove filter option": "Filtre seçeneğini kaldır", + "livewire-tables::Remove sort option": "Sıralama seçeneğini kaldır", + "livewire-tables::Reorder": "Yeniden Sırala", + "livewire-tables::results": "toplam sonuç", + "livewire-tables::row": "satır", + "livewire-tables::rows": "satır", + "livewire-tables::rows, do you want to select all": "satır seçtiniz. Hepsini seçmek ister misiniz?", + "livewire-tables::Search": "Ara", + "livewire-tables::Select All": "Hepsini seç", + "livewire-tables::Showing": "Gösterilen", + "livewire-tables::to": " - ", + "livewire-tables::Yes": "Evet", + "livewire-tables::You are currently selecting all": "Hepsini seçtiniz.", + "livewire-tables::You are not connected to the internet.": "İnternet bağlantınız kesildi.", + "livewire-tables::You have selected": "Siz seçildiniz", "All": "Tümü", "All Columns": "Tüm Sütunlar", "Applied Filters": "Aktif Filtreler", @@ -10,6 +40,7 @@ "Deselect All": "Seçimleri kaldır", "Done Reordering": "Sıralamayı Tamamla", "Filters": "Filtreler", + "not_applicable": "N/A", "No": "HAYIR", "No items found. Try to broaden your search.": "Kayıt bulunamadı.", "of": " ", diff --git a/resources/lang/tw.json b/resources/lang/tw.json index 6599bfdb7..b675a47c7 100644 --- a/resources/lang/tw.json +++ b/resources/lang/tw.json @@ -1,15 +1,49 @@ { + "livewire-tables::All": "全部", + "livewire-tables::All Columns": "所有專欄", + "livewire-tables::Applied Filters": "已套用的過濾規則", + "livewire-tables::Applied Sorting": "已套用的搜尋規則", + "livewire-tables::Bulk Actions": "批次操作", + "livewire-tables::Bulk Actions Confirm": "你確定嗎", + "livewire-tables::Clear": "清除", + "livewire-tables::Columns": "欄位", + "livewire-tables::Debugging Values": "調試值", + "livewire-tables::Deselect All": "取消選擇", + "livewire-tables::Done Reordering": "排序完成", + "livewire-tables::Filters": "過濾規則", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "不", + "livewire-tables::No items found. Try to broaden your search.": "無資料呈現。請嘗試擴大搜尋範圍。", + "livewire-tables::of": "筆資料，共", + "livewire-tables::Reorder": "重新排序", + "livewire-tables::Remove filter option": "移除過濾規則", + "livewire-tables::Remove sort option": "移除排序規則", + "livewire-tables::results": "筆資料", + "livewire-tables::row": "筆資料", + "livewire-tables::rows": "筆資料", + "livewire-tables::rows, do you want to select all": "筆資料，您是否要全選", + "livewire-tables::Search": "搜尋", + "livewire-tables::Select All": "搜尋全部", + "livewire-tables::Select All On Page": "选择页面上的所有内容", + "livewire-tables::Showing": "顯示", + "livewire-tables::to": "至", + "livewire-tables::Yes": "是的", + "livewire-tables::You are currently selecting all": "您目前已選擇全部資料", + "livewire-tables::You are not connected to the internet.": "目前為離線模式", + "livewire-tables::You have selected": "您已選擇", "All": "全部", "All Columns": "所有專欄", "Applied Filters": "已套用的過濾規則", "Applied Sorting": "已套用的搜尋規則", "Bulk Actions": "批次操作", + "Bulk Actions Confirm": "你確定嗎", "Clear": "清除", "Columns": "欄位", "Debugging Values": "調試值", "Deselect All": "取消選擇", "Done Reordering": "排序完成", "Filters": "過濾規則", + "not_applicable": "N/A", "No": "不", "No items found. Try to broaden your search.": "無資料呈現。請嘗試擴大搜尋範圍。", "of": "筆資料，共", @@ -22,6 +56,7 @@ "rows, do you want to select all": "筆資料，您是否要全選", "Search": "搜尋", "Select All": "搜尋全部", + "Select All On Page": "选择页面上的所有内容", "Showing": "顯示", "to": "至", "Yes": "是的", diff --git a/resources/lang/uk.json b/resources/lang/uk.json index 778560124..540684056 100644 --- a/resources/lang/uk.json +++ b/resources/lang/uk.json @@ -1,15 +1,50 @@ { + "livewire-tables::All": "Всі", + "livewire-tables::All Columns": "Усі стовпці", + "livewire-tables::Applied Filters": "Застосовані фільтри", + "livewire-tables::Applied Sorting": "Застосовані сортування", + "livewire-tables::Bulk Actions": "Масові дії", + "livewire-tables::Bulk Actions Confirm": "Vy vpevneni?", + "livewire-tables::Clear": "Очистити", + "livewire-tables::Columns": "Колонки", + "livewire-tables::Debugging Values": "Значення налагодження", + "livewire-tables::Deselect All": "Зняти вибір із усіх", + "livewire-tables::Done Reordering": "Сортування виконанно", + "livewire-tables::Filters": "Фільтри", + "livewire-tables::not_applicable": "N/A", + "livewire-tables::No": "Немає", + "livewire-tables::No items found. Try to broaden your search.": "Немає елементів. Спробуйте розширити пошук.", + "livewire-tables::of": "від", + "livewire-tables::Remove filter option": "Видалити опцію фільтра", + "livewire-tables::Remove sort option": "Видалити параметр сортування", + "livewire-tables::Reorder": "Змінити порядок", + "livewire-tables::results": "результатів", + "livewire-tables::row": "рядки", + "livewire-tables::rows": "рядки", + "livewire-tables::rows, do you want to select all": "рядків, ви хочете вибрати всі", + "livewire-tables::Search": "Пошук", + "livewire-tables::Select All": "Вибрати все", + "livewire-tables::Select All On Page": "Виберіть «Усі на сторінці", + "livewire-tables::Showing": "Показано", + "livewire-tables::to": "до", + "livewire-tables::Unselect All": "Прибрати вибір усіх", + "livewire-tables::Yes": "Так", + "livewire-tables::You are currently selecting all": "Наразі ви вибираєте всі", + "livewire-tables::You are not connected to the internet.": "Ви не підключені до Інтернету.", + "livewire-tables::You have selected": "Ви вибрали", "All": "Всі", "All Columns": "Усі стовпці", "Applied Filters": "Застосовані фільтри", "Applied Sorting": "Застосовані сортування", "Bulk Actions": "Масові дії", + "Bulk Actions Confirm": "Vy vpevneni?", "Clear": "Очистити", "Columns": "Колонки", "Debugging Values": "Значення налагодження", "Deselect All": "Зняти вибір із усіх", "Done Reordering": "Сортування виконанно", "Filters": "Фільтри", + "not_applicable": "N/A", "No": "Немає", "No items found. Try to broaden your search.": "Немає елементів. Спробуйте розширити пошук.", "of": "від", @@ -22,6 +57,7 @@ "rows, do you want to select all": "рядків, ви хочете вибрати всі", "Search": "Пошук", "Select All": "Вибрати все", + "Select All On Page": "Виберіть «Усі на сторінці", "Showing": "Показано", "to": "до", "Unselect All": "Прибрати вибір усіх", diff --git a/resources/views/components/includes/actions.blade.php b/resources/views/components/includes/actions.blade.php index 2c354e7ba..db8925279 100644 --- a/resources/views/components/includes/actions.blade.php +++ b/resources/views/components/includes/actions.blade.php @@ -9,7 +9,7 @@ ->class(['justify-end' => $this->getActionsPosition == 'right']) ->class(['pl-2' => $this->showActionsInToolbar && $this->getActionsPosition == 'left']) ->class(['pr-2' => $this->showActionsInToolbar && $this->getActionsPosition == 'right']) - ->except(['default-styling','default-colors']) + ->except(['default','default-styling','default-colors']) }} > @foreach($this->getActions as $action) {{ $action->render() }} diff --git a/resources/views/components/includes/loading.blade.php b/resources/views/components/includes/loading.blade.php index b60d41016..c07d9cb19 100644 --- a/resources/views/components/includes/loading.blade.php +++ b/resources/views/components/includes/loading.blade.php @@ -24,7 +24,7 @@ $attributes->merge($customAttributes['loader-icon']) ->class(['lds-hourglass' => $isTailwind && ($customAttributes['loader-icon']['default'] ?? true)]) ->class(['lds-hourglass' => $isBootstrap && ($customAttributes['loader-icon']['default'] ?? true)]) - ->except('default'); + ->except(['default','default-styling','default-colors']); }} >
{{ $this->getLoadingPlaceholderContent() }}
diff --git a/resources/views/components/pagination.blade.php b/resources/views/components/pagination.blade.php index 846da2e06..b69ca77ff 100644 --- a/resources/views/components/pagination.blade.php +++ b/resources/views/components/pagination.blade.php @@ -12,30 +12,30 @@ @if ($this->paginationIsEnabled() && $this->isPaginationMethod('standard') && $this->getRows->lastPage() > 1)

@if($this->showPaginationDetails()) - @lang('Showing') + @lang('livewire-tables::Showing') {{ $this->getRows->firstItem() }} - @lang('to') + @lang('livewire-tables::to') {{ $this->getRows->lastItem() }} - @lang('of') + @lang('livewire-tables::of') - @lang('results') + @lang('livewire-tables::results') @endif

@elseif ($this->paginationIsEnabled() && $this->isPaginationMethod('simple'))

@if($this->showPaginationDetails()) - @lang('Showing') + @lang('livewire-tables::Showing') {{ $this->getRows->firstItem() }} - @lang('to') + @lang('livewire-tables::to') {{ $this->getRows->lastItem() }} @endif

@elseif ($this->paginationIsEnabled() && $this->isPaginationMethod('cursor')) @else

- @lang('Showing') + @lang('livewire-tables::Showing') {{ $this->getRows->count() }} - @lang('results') + @lang('livewire-tables::results')

@endif @@ -57,13 +57,13 @@
@if($this->showPaginationDetails()) - @lang('Showing') + @lang('livewire-tables::Showing') {{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }} - @lang('to') + @lang('livewire-tables::to') {{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }} - @lang('of') + @lang('livewire-tables::of') - @lang('results') + @lang('livewire-tables::results') @endif
@@ -75,9 +75,9 @@
@if($this->showPaginationDetails()) - @lang('Showing') + @lang('livewire-tables::Showing') {{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }} - @lang('to') + @lang('livewire-tables::to') {{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }} @endif
@@ -91,9 +91,9 @@ @else
- @lang('Showing') + @lang('livewire-tables::Showing') {{ $this->getRows->count() }} - @lang('results') + @lang('livewire-tables::results')
@endif @@ -109,13 +109,13 @@
@if($this->showPaginationDetails()) - @lang('Showing') + @lang('livewire-tables::Showing') {{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }} - @lang('to') + @lang('livewire-tables::to') {{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }} - @lang('of') + @lang('livewire-tables::of') - @lang('results') + @lang('livewire-tables::results') @endif
@@ -126,9 +126,9 @@
@if($this->showPaginationDetails()) - @lang('Showing') + @lang('livewire-tables::Showing') {{ $this->getRows->count() ? $this->getRows->firstItem() : 0 }} - @lang('to') + @lang('livewire-tables::to') {{ $this->getRows->count() ? $this->getRows->lastItem() : 0 }} @endif
@@ -142,9 +142,9 @@ @else
- @lang('Showing') + @lang('livewire-tables::Showing') {{ $this->getRows->count() }} - @lang('results') + @lang('livewire-tables::results')
@endif diff --git a/resources/views/components/table.blade.php b/resources/views/components/table.blade.php index 4a8f14985..297548694 100644 --- a/resources/views/components/table.blade.php +++ b/resources/views/components/table.blade.php @@ -14,19 +14,19 @@ wire:key="{{ $tableName }}-twrap" {{ $attributes->merge($customAttributes['wrapper']) ->class(['shadow overflow-y-auto border-b border-gray-200 dark:border-gray-700 sm:rounded-lg' => $customAttributes['wrapper']['default'] ?? true]) - ->except('default') }} + ->except(['default','default-styling','default-colors']) }} > merge($customAttributes['table']) ->class(['min-w-full divide-y divide-gray-200 dark:divide-none' => $customAttributes['table']['default'] ?? true]) - ->except('default') }} + ->except(['default','default-styling','default-colors']) }} > merge($customAttributes['thead']) ->class(['bg-gray-50 dark:bg-gray-800' => $customAttributes['thead']['default'] ?? true]) - ->except('default') }} + ->except(['default','default-styling','default-colors']) }} > {{ $thead }} @@ -38,7 +38,7 @@ id="{{ $tableName }}-tbody" {{ $attributes->merge($customAttributes['tbody']) ->class(['bg-white divide-y divide-gray-200 dark:bg-gray-800 dark:divide-none' => $customAttributes['tbody']['default'] ?? true]) - ->except('default') }} + ->except(['default','default-styling','default-colors']) }} > {{ $slot }} @@ -54,20 +54,20 @@
merge($customAttributes['wrapper']) ->class(['table-responsive' => $customAttributes['wrapper']['default'] ?? true]) - ->except('default') }} + ->except(['default','default-styling','default-colors']) }} >
merge($customAttributes['table']) ->class(['laravel-livewire-table table' => $customAttributes['table']['default'] ?? true]) - ->except('default') + ->except(['default','default-styling','default-colors']) }} > merge($customAttributes['thead']) ->class(['' => $customAttributes['thead']['default'] ?? true]) - ->except('default') }} + ->except(['default','default-styling','default-colors']) }} > {{ $thead }} @@ -79,7 +79,7 @@ id="{{ $tableName }}-tbody" {{ $attributes->merge($customAttributes['tbody']) ->class(['' => $customAttributes['tbody']['default'] ?? true]) - ->except('default') }} + ->except(['default','default-styling','default-colors']) }} > {{ $slot }} diff --git a/resources/views/components/table/collapsed-columns.blade.php b/resources/views/components/table/collapsed-columns.blade.php index ba21ee2ba..44bb45d9f 100644 --- a/resources/views/components/table/collapsed-columns.blade.php +++ b/resources/views/components/table/collapsed-columns.blade.php @@ -38,7 +38,7 @@ ->class(['hidden bg-gray-50 dark:bg-gray-800 dark:text-white rappasoft-striped-row' => ($isTailwind && ($customAttributes['default'] ?? true) && $rowIndex % 2 !== 0)]) ->class(['d-none bg-light rappasoft-striped-row' => ($isBootstrap && $rowIndex % 2 === 0 && ($customAttributes['default'] ?? true))]) ->class(['d-none bg-white rappasoft-striped-row' => ($isBootstrap && $rowIndex % 2 !== 0 && ($customAttributes['default'] ?? true))]) - ->except(['default']) + ->except(['default','default-styling','default-colors']) }} > diff --git a/resources/views/components/table/td.blade.php b/resources/views/components/table/td.blade.php index 926cd3ae2..0ba2f050d 100644 --- a/resources/views/components/table/td.blade.php +++ b/resources/views/components/table/td.blade.php @@ -22,7 +22,7 @@ ->class(['d-none d-md-table-cell' => $isBootstrap && $column && $column->shouldCollapseOnMobile()]) ->class(['d-none d-lg-table-cell' => $isBootstrap && $column && $column->shouldCollapseOnTablet()]) ->class(['laravel-livewire-tables-cursor' => $isBootstrap && $column && $column->isClickable()]) - ->except('default') + ->except(['default','default-styling','default-colors']) }} > {{ $slot }} diff --git a/resources/views/components/table/td/bulk-actions.blade.php b/resources/views/components/table/td/bulk-actions.blade.php index 341ad650c..918743395 100644 --- a/resources/views/components/table/td/bulk-actions.blade.php +++ b/resources/views/components/table/td/bulk-actions.blade.php @@ -24,8 +24,7 @@ $attributes->merge($bulkActionsTdCheckboxAttributes)->class([ 'rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600' => ($theme === 'tailwind') && ($bulkActionsTdCheckboxAttributes['default'] ?? true), 'form-check-input' => ($theme === 'bootstrap-5') && ($bulkActionsTdCheckboxAttributes['default'] ?? true), - 'except' => 'default', - ]) + ])->except(['default','default-styling','default-colors']) }} /> diff --git a/resources/views/components/table/td/collapsed-columns.blade.php b/resources/views/components/table/td/collapsed-columns.blade.php index 29cb50feb..166a62138 100644 --- a/resources/views/components/table/td/collapsed-columns.blade.php +++ b/resources/views/components/table/td/collapsed-columns.blade.php @@ -25,7 +25,7 @@ 'h-6 w-6' => $this->getCollapsingColumnButtonExpandAttributes['default-styling'] ?? true, 'text-green-600' => $this->getCollapsingColumnButtonExpandAttributes['default-colors'] ?? true, ]) - ->except('default') + ->except(['default','default-styling','default-colors']) }} /> $this->getCollapsingColumnButtonCollapseAttributes['default-styling'] ?? true, 'text-yellow-600' => $this->getCollapsingColumnButtonCollapseAttributes['default-colors'] ?? true, ]) - ->except('default') + ->except(['default','default-styling','default-colors']) }} /> @@ -63,7 +63,7 @@ class="border-0 bg-transparent p-0" ->class([ 'laravel-livewire-tables-btn-lg text-success' => $this->getCollapsingColumnButtonExpandAttributes['default-colors'] ?? true, ]) - ->except('default') + ->except(['default','default-styling','default-colors']) }} /> class([ 'laravel-livewire-tables-btn-lg text-warning' => $this->getCollapsingColumnButtonExpandAttributes['default-colors'] ?? true, ]) - ->except('default') + ->except(['default','default-styling','default-colors']) }} /> diff --git a/resources/views/components/table/td/plain.blade.php b/resources/views/components/table/td/plain.blade.php index 54c9efc67..d2e9ffb6f 100644 --- a/resources/views/components/table/td/plain.blade.php +++ b/resources/views/components/table/td/plain.blade.php @@ -8,7 +8,7 @@ ->class(['hidden' => $column && $column->shouldCollapseAlways()]) ->class(['hidden md:table-cell' => $column && $column->shouldCollapseOnMobile()]) ->class(['hidden lg:table-cell' => $column && $column->shouldCollapseOnTablet()]) - ->except('default') + ->except(['default','default-styling','default-colors']) }} @if($hideUntilReorder) x-show="reorderDisplayColumn" @endif > {{ $slot }} @@ -19,7 +19,7 @@ ->class(['d-none' => $column && $column->shouldCollapseAlways()]) ->class(['d-none d-md-table-cell' => $column && $column->shouldCollapseOnMobile()]) ->class(['d-none d-lg-table-cell' => $column && $column->shouldCollapseOnTablet()]) - ->except('default') + ->except(['default','default-styling','default-colors']) }}> {{ $slot }} diff --git a/resources/views/components/table/th.blade.php b/resources/views/components/table/th.blade.php index 10436241f..b12366dc7 100644 --- a/resources/views/components/table/th.blade.php +++ b/resources/views/components/table/th.blade.php @@ -3,86 +3,86 @@ @php $attributes = $attributes->merge(['wire:key' => $tableName . '-header-col-'.$column->getSlug()]); - $customAttributes = $this->getThAttributes($column); - $customSortButtonAttributes = $this->getThSortButtonAttributes($column); + $allThAttributes = $this->getAllThAttributes($column); + + $customThAttributes = $allThAttributes['customAttributes']; + $customSortButtonAttributes = $allThAttributes['sortButtonAttributes']; + $customSortIconAttributes = $allThAttributes['sortIconAttributes']; + $customLabelAttributes = $allThAttributes['labelAttributes']; + + //$customThAttributes = $this->getThAttributes($column); + //$customSortButtonAttributes = $this->getThSortButtonAttributes($column); + //$customSortIconAttributes = $this->getThSortIconAttributes($column); + $direction = $column->hasField() ? $this->getSort($column->getColumnSelectName()) : $this->getSort($column->getSlug()) ?? null ; @endphp @if ($isTailwind) @elseif ($isBootstrap)
merge($customAttributes) - ->class(['px-6 py-3 text-left text-xs font-medium whitespace-nowrap text-gray-500 uppercase tracking-wider dark:bg-gray-800 dark:text-gray-400' => $customAttributes['default'] ?? true]) + $attributes->merge($customThAttributes) + ->class(['text-gray-500 dark:bg-gray-800 dark:text-gray-400' => ($customThAttributes['default-colors'] ?? true || $customThAttributes['default'] ?? true)]) + ->class(['px-6 py-3 text-left text-xs font-medium whitespace-nowrap uppercase tracking-wider' => ($customThAttributes['default-styling'] ?? true || $customThAttributes['default'] ?? true)]) ->class(['hidden' => $column->shouldCollapseAlways()]) ->class(['hidden md:table-cell' => $column->shouldCollapseOnMobile()]) ->class(['hidden lg:table-cell' => $column->shouldCollapseOnTablet()]) - ->except('default') + ->except(['default', 'default-colors', 'default-styling']) }} > @if($column->getColumnLabelStatus()) @unless ($this->sortingIsEnabled() && ($column->isSortable() || $column->getSortCallback())) - {{ $column->getTitle() }} + except(['default', 'default-colors', 'default-styling']) }}>{{ $column->getTitle() }} @else - @endunless @endif merge($customAttributes) - ->class(['' => $customAttributes['default'] ?? true]) + $attributes->merge($customThAttributes) + ->class(['' => $customThAttributes['default'] ?? true]) ->class(['d-none' => $column->shouldCollapseAlways()]) ->class(['d-none d-md-table-cell' => $column->shouldCollapseOnMobile()]) ->class(['d-none d-lg-table-cell' => $column->shouldCollapseOnTablet()]) - ->except('default') + ->except(['default','default-styling','default-colors']) }} > @if($column->getColumnLabelStatus()) @unless ($this->sortingIsEnabled() && ($column->isSortable() || $column->getSortCallback())) - {{ $column->getTitle() }} + except(['default', 'default-colors', 'default-styling']) }}>{{ $column->getTitle() }} @else
merge($customSortButtonAttributes) + ->class(['' => ($customSortButtonAttributes['default-styling'] ?? true || $customSortButtonAttributes['default'] ?? true)]) + ->except(['default', 'default-colors', 'default-styling', 'wire:key']) + }} > - {{ $column->getTitle() }} + except(['default', 'default-colors', 'default-styling']) }}>{{ $column->getTitle() }} - - @if ($direction === 'asc') - - @elseif ($direction === 'desc') - - @else - - @endif - + merge($customSortButtonAttributes) + ->class(['' => ($customSortButtonAttributes['default-colors'] ?? true || $customSortButtonAttributes['default'] ?? true)]) + ->except(['default', 'default-colors', 'default-styling', 'wire:key']) + }} + />
@endunless @endif diff --git a/resources/views/components/table/th/bulk-actions.blade.php b/resources/views/components/table/th/bulk-actions.blade.php index b07a67f09..c5c6d3e6c 100644 --- a/resources/views/components/table/th/bulk-actions.blade.php +++ b/resources/views/components/table/th/bulk-actions.blade.php @@ -1,6 +1,7 @@ @aware(['component', 'tableName']) @php - $customAttributes = $this->getBulkActionsThAttributes(); + $customAttributes = $this->hasBulkActionsThAttributes ? $this->getBulkActionsThAttributes : $this->getAllThAttributes($this->getBulkActionsColumn())['customAttributes']; + $bulkActionsThCheckboxAttributes = $this->getBulkActionsThCheckboxAttributes(); $theme = $this->getTheme(); @endphp @@ -25,8 +26,7 @@ $attributes->merge($bulkActionsThCheckboxAttributes)->class([ 'rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600' => ($theme === 'tailwind') && ($bulkActionsThCheckboxAttributes['default'] ?? true), 'form-check-input' => ($theme === 'bootstrap-5') && ($bulkActionsThCheckboxAttributes['default'] ?? true), - 'except' => 'default', - ]) + ])->except(['default','default-styling','default-colors']) }} /> diff --git a/resources/views/components/table/th/plain.blade.php b/resources/views/components/table/th/plain.blade.php index c8d36ad32..4f5837f34 100644 --- a/resources/views/components/table/th/plain.blade.php +++ b/resources/views/components/table/th/plain.blade.php @@ -4,8 +4,8 @@ 		merge($customAttributes)->class([ - 'table-cell px-3 py-2 md:px-6 md:py-3 text-center md:text-left bg-gray-50 dark:bg-gray-800 laravel-livewire-tables-reorderingMinimised' => ($isTailwind) && ($customAttributes['default'] ?? true), - 'laravel-livewire-tables-reorderingMinimised' => ($isBootstrap) && ($customAttributes['default'] ?? true), + 'table-cell px-3 py-2 md:px-6 md:py-3 text-center md:text-left bg-gray-50 dark:bg-gray-800 laravel-livewire-tables-reorderingMinimised' => ($isTailwind) && ($customAttributes['default-colors'] ?? true || $customAttributes['default'] ?? true), + 'laravel-livewire-tables-reorderingMinimised' => ($isBootstrap) && ($customAttributes['default-colors'] ?? true || $customAttributes['default'] ?? true), ]) }} @if($hideUntilReorder) :class="!reorderDisplayColumn && 'w-0 p-0 hidden'" @endif diff --git a/resources/views/components/table/th/reorder.blade.php b/resources/views/components/table/th/reorder.blade.php index b0dc73845..5ba02d959 100644 --- a/resources/views/components/table/th/reorder.blade.php +++ b/resources/views/components/table/th/reorder.blade.php @@ -1,10 +1,14 @@ @aware(['tableName','isTailwind','isBootstrap']) +@php + $customThAttributes = $this->hasReorderThAttributes() ? $this->getReorderThAttributes() : $this->getAllThAttributes($this->getReorderColumn())['customAttributes']; +@endphp -merge($this->getReorderThAttributes())->class([ - 'table-cell px-3 py-2 md:px-6 md:py-3 text-center md:text-left bg-gray-50 dark:bg-gray-800 laravel-livewire-tables-reorderingMinimised' => ($isTailwind) && ($this->getReorderThAttributes['default'] ?? true), - 'laravel-livewire-tables-reorderingMinimised' => ($isBootstrap) && ($this->getReorderThAttributes['default'] ?? true), - ]) +merge($customThAttributes) + ->class(['text-gray-500 dark:bg-gray-800 dark:text-gray-400' => ($customThAttributes['default-colors'] ?? true || $customThAttributes['default'] ?? true)]) + ->class(['table-cell px-6 py-3 text-left text-xs font-medium whitespace-nowrap uppercase tracking-wider' => ($customThAttributes['default-styling'] ?? true || $customThAttributes['default'] ?? true)]) + ->class(['laravel-livewire-tables-reorderingMinimised' => ($isBootstrap) && ($customThAttributes['default'] ?? true)]) }} >
diff --git a/resources/views/components/table/th/sort-icons.blade.php b/resources/views/components/table/th/sort-icons.blade.php new file mode 100644 index 000000000..b26b7d964 --- /dev/null +++ b/resources/views/components/table/th/sort-icons.blade.php @@ -0,0 +1,32 @@ +@props(['direction']) +class([ + 'relative flex items-center' => $this->isTailwind, + 'relative d-flex align-items-center' => $this->isBootstrap + ]) }} +> + @if($this->isTailwind) + @switch($direction) + @case('asc') + + + @break + @case('desc') + + + @break + @default + + @endswitch + @else + @switch($direction) + @case('asc') + + @break + @case('desc') + + @break + @default + + @endswitch + @endif + diff --git a/resources/views/components/table/tr.blade.php b/resources/views/components/table/tr.blade.php index f043fbf8a..4a3f84ece 100644 --- a/resources/views/components/table/tr.blade.php +++ b/resources/views/components/table/tr.blade.php @@ -27,7 +27,7 @@ ->class(['cursor-pointer' => ($isTailwind && $this->hasTableRowUrl() && ($customAttributes['default'] ?? true))]) ->class(['bg-light rappasoft-striped-row' => ($isBootstrap && $rowIndex % 2 === 0 && ($customAttributes['default'] ?? true))]) ->class(['bg-white rappasoft-striped-row' => ($isBootstrap && $rowIndex % 2 !== 0 && ($customAttributes['default'] ?? true))]) - ->except(['default']) + ->except(['default','default-styling','default-colors']) }} > diff --git a/resources/views/components/table/tr/bulk-actions.blade.php b/resources/views/components/table/tr/bulk-actions.blade.php index 73201debf..f9946b2b9 100644 --- a/resources/views/components/table/tr/bulk-actions.blade.php +++ b/resources/views/components/table/tr/bulk-actions.blade.php @@ -17,9 +17,9 @@ class="bg-indigo-50 dark:bg-gray-900 dark:text-white" @@ -36,9 +36,9 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium @@ -81,9 +81,9 @@ class="ml-1 text-blue-600 underline text-gray-700 text-sm leading-5 font-medium @@ -100,9 +100,9 @@ class="btn btn-primary btn-sm" diff --git a/resources/views/components/table/tr/plain.blade.php b/resources/views/components/table/tr/plain.blade.php index 5cd34cfef..d04879c87 100644 --- a/resources/views/components/table/tr/plain.blade.php +++ b/resources/views/components/table/tr/plain.blade.php @@ -6,7 +6,7 @@ ->merge($customAttributes) ->class(['bg-white dark:bg-gray-700 dark:text-white' => $customAttributes['default'] ?? true]) ->class(['laravel-livewire-tables-reorderingMinimised']) - ->except('default') + ->except(['default','default-styling','default-colors']) }} > {{ $slot }} @@ -16,7 +16,7 @@ ->merge($customAttributes) ->class(['' => $customAttributes['default'] ?? true]) ->class(['laravel-livewire-tables-reorderingMinimised']) - ->except('default') + ->except(['default','default-styling','default-colors']) }} > {{ $slot }} diff --git a/resources/views/components/tools/filter-label.blade.php b/resources/views/components/tools/filter-label.blade.php index 6ac6196ae..6fc9022dc 100644 --- a/resources/views/components/tools/filter-label.blade.php +++ b/resources/views/components/tools/filter-label.blade.php @@ -2,20 +2,21 @@ @props(['filter', 'filterLayout' => 'popover', 'tableName' => 'table', 'isTailwind' => false, 'isBootstrap' => false, 'isBootstrap4' => false, 'isBootstrap5' => false, 'for' => null]) @php - $customLabelAttributes = $filter->getFilterLabelAttributes(); -@endphp + $filterLabelAttributes = $filter->getFilterLabelAttributes(); + $customLabelAttributes = $filter->getLabelAttributes(); +@endphp @if($filter->hasCustomFilterLabel() && !$filter->hasCustomPosition()) @include($filter->getCustomFilterLabel(),['filter' => $filter, 'filterLayout' => $filterLayout, 'tableName' => $tableName, 'isTailwind' => $isTailwind, 'isBootstrap' => $isBootstrap, 'isBootstrap4' => $isBootstrap4, 'isBootstrap5' => $isBootstrap5, 'customLabelAttributes' => $customLabelAttributes]) @elseif(!$filter->hasCustomPosition()) @@ -42,7 +42,7 @@ class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150 wire:input="selectAllFilterOptions('{{ $filter->getKey() }}')" class="form-check-input" > - + @foreach($filter->getOptions() as $key => $value) diff --git a/resources/views/components/tools/sorting-pills.blade.php b/resources/views/components/tools/sorting-pills.blade.php index a57a6a97d..b633cf1d8 100644 --- a/resources/views/components/tools/sorting-pills.blade.php +++ b/resources/views/components/tools/sorting-pills.blade.php @@ -4,7 +4,7 @@
@if ($this->sortingPillsAreEnabled() && $this->hasSorts())
- @lang('Applied Sorting'): + @lang('livewire-tables::Applied Sorting'): @foreach($this->getSorts() as $columnSelectName => $direction) @php($column = $this->getColumnBySelectName($columnSelectName) ?? $this->getColumnBySlug($columnSelectName)) @@ -17,14 +17,14 @@ wire:key="{{ $tableName }}-sorting-pill-{{ $columnSelectName }}" class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium leading-4 bg-indigo-100 text-indigo-800 capitalize dark:bg-indigo-200 dark:text-indigo-900" > - {{ $column->getSortingPillTitle() }}: {{ $column->getSortingPillDirection($this, $direction) }} + {{ $column->getSortingPillTitle() }}: {{ $column->getSortingPillDirectionLabel($direction, $this->getDefaultSortingLabelAsc, $this->getDefaultSortingLabelDesc) }} @@ -35,7 +35,7 @@ class="flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justif class="focus:outline-none active:outline-none" > - @lang('Clear') + @lang('livewire-tables::Clear')
@@ -45,7 +45,7 @@ class="focus:outline-none active:outline-none"
@if ($this->sortingPillsAreEnabled() && $this->hasSorts())
- @lang('Applied Sorting'): + @lang('livewire-tables::Applied Sorting'): @foreach($this->getSorts() as $columnSelectName => $direction) @php($column = $this->getColumnBySelectName($columnSelectName) ?? $this->getColumnBySlug($columnSelectName)) @@ -58,14 +58,14 @@ class="focus:outline-none active:outline-none" wire:key="{{ $tableName . '-sorting-pill-' . $columnSelectName }}" class="badge badge-pill badge-info d-inline-flex align-items-center" > - {{ $column->getSortingPillTitle() }}: {{ $column->getSortingPillDirection($this, $direction) }} + {{ $column->getSortingPillTitle() }}: {{ $column->getSortingPillDirectionLabel($direction, $this->getDefaultSortingLabelAsc, $this->getDefaultSortingLabelDesc) }} - @lang('Remove sort option') + @lang('livewire-tables::Remove sort option') @@ -76,7 +76,7 @@ class="text-white ml-2" wire:click.prevent="clearSorts" class="badge badge-pill badge-light" > - @lang('Clear') + @lang('livewire-tables::Clear')
@endif @@ -85,7 +85,7 @@ class="badge badge-pill badge-light"
@if ($this->sortingPillsAreEnabled() && $this->hasSorts())
- @lang('Applied Sorting'): + @lang('livewire-tables::Applied Sorting'): @foreach($this->getSorts() as $columnSelectName => $direction) @php($column = $this->getColumnBySelectName($columnSelectName) ?? $this->getColumnBySlug($columnSelectName)) @@ -98,14 +98,14 @@ class="badge badge-pill badge-light" wire:key="{{ $tableName }}-sorting-pill-{{ $columnSelectName }}" class="badge rounded-pill bg-info d-inline-flex align-items-center" > - {{ $column->getSortingPillTitle() }}: {{ $column->getSortingPillDirection($this, $direction) }} + {{ $column->getSortingPillTitle() }}: {{ $column->getSortingPillDirectionLabel($direction, $this->getDefaultSortingLabelAsc, $this->getDefaultSortingLabelDesc) }} - + @@ -116,7 +116,7 @@ class="text-white ms-2" wire:click.prevent="clearSorts" class="badge rounded-pill bg-light text-dark text-decoration-none" > - @lang('Clear') + @lang('livewire-tables::Clear')
@endif diff --git a/resources/views/components/tools/toolbar/items/bulk-actions.blade.php b/resources/views/components/tools/toolbar/items/bulk-actions.blade.php index faabdf825..3be95e799 100644 --- a/resources/views/components/tools/toolbar/items/bulk-actions.blade.php +++ b/resources/views/components/tools/toolbar/items/bulk-actions.blade.php @@ -21,7 +21,7 @@ 'inline-flex justify-center w-full rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50' => $this->isTailwind && $this->getBulkActionsButtonAttributes['default-styling'] ?? true, ]) - ->except('default') + ->except(['default','default-styling','default-colors']) }} type="button" id="{{ $tableName }}-bulkActionsDropdown" @@ -34,7 +34,7 @@ @endif aria-haspopup="true" aria-expanded="false"> - @lang('Bulk Actions') + @lang('livewire-tables::Bulk Actions') @if($this->isTailwind) @endif @@ -60,7 +60,7 @@ class="origin-top-right absolute right-0 mt-2 w-full md:w-48 rounded-md shadow-l 'bg-white dark:bg-gray-700 dark:text-white' => $this->isTailwind && $this->getBulkActionsMenuAttributes['default-colors'] ?? true, 'rounded-md shadow-xs' => $this->isTailwind && $this->getBulkActionsMenuAttributes['default-styling'] ?? true, ]) - ->except('default') + ->except(['default','default-styling','default-colors']) }} > @@ -104,7 +104,7 @@ class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150 type="button" id="{{ $tableName }}-columnSelect" aria-haspopup="true" x-bind:aria-expanded="open" > - @lang('Columns') + @lang('livewire-tables::Columns')
- {{ __('All Columns') }} + @lang('livewire-tables::All Columns') + +
@elseif($isBootstrap5) @@ -137,7 +139,7 @@ class="form-check-input" />
@endif diff --git a/resources/views/components/tools/toolbar/items/filter-button.blade.php b/resources/views/components/tools/toolbar/items/filter-button.blade.php index 64b5ba0de..f3488639e 100644 --- a/resources/views/components/tools/toolbar/items/filter-button.blade.php +++ b/resources/views/components/tools/toolbar/items/filter-button.blade.php @@ -33,7 +33,7 @@ @endif @if ($this->isFilterLayoutSlideDown()) x-on:click="filtersOpen = !filtersOpen" @endif > - @lang('Filters') + @lang('livewire-tables::Filters') @if ($count = $this->getFilterBadgeCount()) $this->isBootstrap5, ]) > - @lang('Clear') + @lang('livewire-tables::Clear') @endif @@ -74,7 +74,7 @@ class="block px-4 py-2 text-sm text-gray-700 space-y-1" type="button" class="w-full inline-flex items-center justify-center px-3 py-2 border border-gray-300 shadow-sm text-sm leading-4 font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-800 dark:border-gray-600 dark:text-white dark:hover:border-gray-500 dark:hover:bg-gray-600" > - @lang('Clear') + @lang('livewire-tables::Clear')
@endif diff --git a/resources/views/components/tools/toolbar/items/pagination-dropdown.blade.php b/resources/views/components/tools/toolbar/items/pagination-dropdown.blade.php index da39ef3d5..5a2ae1845 100644 --- a/resources/views/components/tools/toolbar/items/pagination-dropdown.blade.php +++ b/resources/views/components/tools/toolbar/items/pagination-dropdown.blade.php @@ -21,7 +21,7 @@ value="{{ $item }}" wire:key="{{ $tableName }}-per-page-{{ $item }}" > - {{ $item === -1 ? __('All') : $item }} + {{ $item === -1 ? __('livewire-tables::All') : $item }} @endforeach diff --git a/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php b/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php index c0dc417f8..061b2ea8c 100644 --- a/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php +++ b/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php @@ -14,11 +14,11 @@ ]) > - @lang('Cancel') + @lang('livewire-tables::Cancel') - @lang('Reorder') + @lang('livewire-tables::Reorder') @@ -33,7 +33,7 @@ ]) > - @lang('Save') + @lang('livewire-tables::Save')
diff --git a/resources/views/components/tools/toolbar/items/search-field.blade.php b/resources/views/components/tools/toolbar/items/search-field.blade.php index 48c791e1e..755cbab29 100644 --- a/resources/views/components/tools/toolbar/items/search-field.blade.php +++ b/resources/views/components/tools/toolbar/items/search-field.blade.php @@ -12,11 +12,14 @@ {{ $attributes->merge($this->getSearchFieldAttributes()) ->class([ - 'block w-full border-gray-300 rounded-md shadow-sm transition duration-150 ease-in-out sm:text-sm sm:leading-5 dark:bg-gray-700 dark:text-white dark:border-gray-600 rounded-none rounded-l-md focus:ring-0 focus:border-gray-300' => $this->isTailwind && $this->hasSearch() && $this->getSearchFieldAttributes()['default'] ?? true, - 'block w-full border-gray-300 rounded-md shadow-sm transition duration-150 ease-in-out sm:text-sm sm:leading-5 dark:bg-gray-700 dark:text-white dark:border-gray-600 rounded-md focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50' => $this->isTailwind && !$this->hasSearch() && $this->getSearchFieldAttributes()['default'] ?? true, + 'block w-full rounded-md shadow-sm transition duration-150 ease-in-out sm:text-sm sm:leading-5 rounded-none rounded-l-md focus:ring-0 focus:border-gray-300' => $this->isTailwind && $this->hasSearch() && ($this->getSearchFieldAttributes()['default'] ?? true || $this->getSearchFieldAttributes()['default-styling'] ?? true), + 'block w-full rounded-md shadow-sm transition duration-150 ease-in-out sm:text-sm sm:leading-5 rounded-md focus:ring focus:ring-opacity-50' => $this->isTailwind && !$this->hasSearch() && ($this->getSearchFieldAttributes()['default'] ?? true || $this->getSearchFieldAttributes()['default-styling'] ?? true), + 'border-gray-300 dark:bg-gray-700 dark:text-white dark:border-gray-600 focus:border-gray-300' => $this->isTailwind && $this->hasSearch() && ($this->getSearchFieldAttributes()['default'] ?? true || $this->getSearchFieldAttributes()['default-colors'] ?? true), + 'border-gray-300 dark:bg-gray-700 dark:text-white dark:border-gray-600 focus:border-indigo-300 focus:ring-indigo-200' => $this->isTailwind && !$this->hasSearch() && ($this->getSearchFieldAttributes()['default'] ?? true || $this->getSearchFieldAttributes()['default-colors'] ?? true), + 'form-control' => $this->isBootstrap && $this->getSearchFieldAttributes()['default'] ?? true, ]) - ->except('default') + ->except(['default','default-styling','default-colors']) }} /> diff --git a/resources/views/datatable.blade.php b/resources/views/datatable.blade.php index 594272a70..f534f7f49 100644 --- a/resources/views/datatable.blade.php +++ b/resources/views/datatable.blade.php @@ -39,7 +39,7 @@ @if($this->getCurrentlyReorderingStatus) - + @endif @if($this->showBulkActionsSections) diff --git a/resources/views/includes/actions/button.blade.php b/resources/views/includes/actions/button.blade.php index 84fe37120..71eaa50b8 100644 --- a/resources/views/includes/actions/button.blade.php +++ b/resources/views/includes/actions/button.blade.php @@ -3,7 +3,7 @@ ->class(['focus:border-indigo-300 focus:ring-indigo-200' => $isTailwind && $attributes['default-colors'] ?? true]) ->class(['btn btn-sm btn-success' => $isBootstrap && $attributes['default-styling'] ?? true]) ->class(['' => $isBootstrap && $attributes['default-colors'] ?? true]) - ->except(['default-styling', 'default-colors']) + ->except(['default','default-styling','default-colors']) }} @if($action->hasWireAction()) {{ $action->getWireAction() }}="{{ $action->getWireActionParams() }}" @@ -14,22 +14,22 @@ > @if($action->hasIcon() && $action->getIconRight()) - {{ $action->getLabel() }} + getLabelAttributesBag() }}>{{ $action->getLabel() }} getIconAttributes() ->class(["ms-1 ". $action->getIcon() => $isBootstrap]) ->class(["ml-1 ". $action->getIcon() => $isTailwind]) - ->except('default-styling') + ->except(['default','default-styling','default-colors']) }} > @elseif($action->hasIcon() && !$action->getIconRight()) getIconAttributes() ->class(["ms-1 ". $action->getIcon() => $isBootstrap]) ->class(["mr-1 ". $action->getIcon() => $isTailwind]) - ->except('default-styling') + ->except(['default','default-styling','default-colors']) }} > - {{ $action->getLabel() }} + getLabelAttributesBag() }}>{{ $action->getLabel() }} @else - {{ $action->getLabel() }} + getLabelAttributesBag() }}>{{ $action->getLabel() }} @endif \ No newline at end of file diff --git a/resources/views/includes/debug.blade.php b/resources/views/includes/debug.blade.php index fa3803f84..d737f6941 100644 --- a/resources/views/includes/debug.blade.php +++ b/resources/views/includes/debug.blade.php @@ -1,6 +1,6 @@
@if ($this->debugIsEnabled()) -

@lang('Debugging Values'):

+

@lang('livewire-tables::Debugging Values'):

@if (! app()->runningInConsole())
@dump((new \Rappasoft\LaravelLivewireTables\DataTransferObjects\DebuggableData($this))->toArray())
diff --git a/resources/views/includes/offline.blade.php b/resources/views/includes/offline.blade.php index ae59b9e70..ae5dc5f37 100644 --- a/resources/views/includes/offline.blade.php +++ b/resources/views/includes/offline.blade.php @@ -9,7 +9,7 @@

- @lang('You are not connected to the internet.') + @lang('livewire-tables::You are not connected to the internet.')

@@ -19,7 +19,7 @@
- @lang('You are not connected to the internet.') + @lang('livewire-tables::You are not connected to the internet.')
@endif diff --git a/src/Events/LaravelLivewireTablesEvent.php b/src/Events/LaravelLivewireTablesEvent.php index 38ef5550a..89026ead2 100644 --- a/src/Events/LaravelLivewireTablesEvent.php +++ b/src/Events/LaravelLivewireTablesEvent.php @@ -2,7 +2,7 @@ namespace Rappasoft\LaravelLivewireTables\Events; -use Illuminate\Foundation\Auth\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; @@ -16,7 +16,7 @@ class LaravelLivewireTablesEvent public string|array|null $value; - public ?User $user; + public ?Authenticatable $user; public function setKeyForEvent(string $key): self { diff --git a/src/Traits/Configuration/BulkActionsConfiguration.php b/src/Traits/Configuration/BulkActionsConfiguration.php index 790cdaf53..b0c7e9ab3 100644 --- a/src/Traits/Configuration/BulkActionsConfiguration.php +++ b/src/Traits/Configuration/BulkActionsConfiguration.php @@ -111,46 +111,6 @@ public function setBulkActionDefaultConfirmationMessage(string $defaultConfirmat return $this; } - /** - * Used to set attributes for the 		for Bulk Actions - */ - public function setBulkActionsThAttributes(array $bulkActionsThAttributes): self - { - $this->bulkActionsThAttributes = [...$this->bulkActionsThAttributes, ...$bulkActionsThAttributes]; - - return $this; - } - - /** - * Used to set attributes for the Bulk Actions Checkbox in the - */ - public function setBulkActionsThCheckboxAttributes(array $bulkActionsThCheckboxAttributes): self - { - $this->bulkActionsThCheckboxAttributes = [...$this->bulkActionsThCheckboxAttributes, ...$bulkActionsThCheckboxAttributes]; - - return $this; - } - - /** - * Used to set attributes for the Bulk Actions TD in the Row - */ - public function setBulkActionsTdAttributes(array $bulkActionsTdAttributes): self - { - $this->bulkActionsTdAttributes = [...$this->bulkActionsTdAttributes, ...$bulkActionsTdAttributes]; - - return $this; - } - - /** - * Used to set attributes for the Bulk Actions Checkbox in the Row - */ - public function setBulkActionsTdCheckboxAttributes(array $bulkActionsTdCheckboxAttributes): self - { - $this->bulkActionsTdCheckboxAttributes = [...$this->bulkActionsTdCheckboxAttributes, ...$bulkActionsTdCheckboxAttributes]; - - return $this; - } - public function setShouldAlwaysHideBulkActionsDropdownOption(bool $status = false): self { $this->alwaysHideBulkActionsDropdownOption = $status; @@ -214,27 +174,6 @@ public function setClearSelectedOnFilterDisabled(): self return $this; } - public function setBulkActionsButtonAttributes(array $bulkActionsButtonAttributes): self - { - $this->bulkActionsButtonAttributes = [...$this->bulkActionsButtonAttributes, ...$bulkActionsButtonAttributes]; - - return $this; - } - - public function setBulkActionsMenuAttributes(array $bulkActionsMenuAttributes): self - { - $this->bulkActionsMenuAttributes = [...$this->bulkActionsMenuAttributes, ...$bulkActionsMenuAttributes]; - - return $this; - } - - public function setBulkActionsMenuItemAttributes(array $bulkActionsMenuItemAttributes): self - { - $this->bulkActionsMenuItemAttributes = [...$this->bulkActionsMenuItemAttributes, ...$bulkActionsMenuItemAttributes]; - - return $this; - } - public function setDelaySelectAllStatus(bool $status): self { $this->delaySelectAll = $status; diff --git a/src/Traits/Configuration/SearchConfiguration.php b/src/Traits/Configuration/SearchConfiguration.php index a5e06634a..77590071f 100644 --- a/src/Traits/Configuration/SearchConfiguration.php +++ b/src/Traits/Configuration/SearchConfiguration.php @@ -156,7 +156,7 @@ public function setSearchPlaceholder(string $placeholder): self public function setSearchFieldAttributes(array $attributes = []): self { - $this->searchFieldAttributes = $attributes; + $this->setCustomAttributes('searchFieldAttributes', array_merge(['default' => false, 'default-colors' => false, 'default-styling' => false], $attributes)); return $this; } diff --git a/src/Traits/Configuration/TableAttributeConfiguration.php b/src/Traits/Configuration/TableAttributeConfiguration.php index c1bb681e9..2053d50d7 100644 --- a/src/Traits/Configuration/TableAttributeConfiguration.php +++ b/src/Traits/Configuration/TableAttributeConfiguration.php @@ -85,6 +85,16 @@ public function setThSortButtonAttributes(\Closure $callback): self return $this; } + /** + * Set a list of attributes to override on the th sort icon elements + */ + public function setThSortIconAttributes(\Closure $callback): self + { + $this->thSortIconAttributesCallback = $callback; + + return $this; + } + /** * Set a list of attributes to override on the td elements */ diff --git a/src/Traits/Core/HasCustomAttributes.php b/src/Traits/Core/HasCustomAttributes.php new file mode 100644 index 000000000..99afeb4c4 --- /dev/null +++ b/src/Traits/Core/HasCustomAttributes.php @@ -0,0 +1,49 @@ +{$propertyName}); + } + + public function getCustomAttributes(string $propertyName, bool $default = false, bool $classicMode = true): array + { + if ($classicMode) { + if ($this->hasCustomAttributes($propertyName)) { + $vals = array_merge(['default' => $default, 'default-colors' => $default, 'default-styling' => $default], $this->{$propertyName}); + ksort($vals); + + return $vals; + } + + return ['default' => $default, 'default-colors' => $default, 'default-styling' => $default]; + } else { + if ($this->hasCustomAttributes($propertyName)) { + $vals = array_merge(['default-colors' => $default, 'default-styling' => $default], $this->{$propertyName}); + ksort($vals); + + return $vals; + } + + return ['default-colors' => $default, 'default-styling' => $default]; + + } + } + + public function getCustomAttributesBag(string $propertyName): ComponentAttributeBag + { + return new ComponentAttributeBag($this->getCustomAttributes($propertyName)); + } + + public function setCustomAttributes(string $propertyName, array $customAttributes): self + { + $this->{$propertyName} = $customAttributes; + + return $this; + } +} diff --git a/src/Traits/HasAllTraits.php b/src/Traits/HasAllTraits.php index 8877bc69d..70ddd3eb5 100644 --- a/src/Traits/HasAllTraits.php +++ b/src/Traits/HasAllTraits.php @@ -2,6 +2,7 @@ namespace Rappasoft\LaravelLivewireTables\Traits; +use Rappasoft\LaravelLivewireTables\Traits\Core\HasCustomAttributes; use Rappasoft\LaravelLivewireTables\Views\Traits\Core\HasTheme; trait HasAllTraits @@ -18,6 +19,7 @@ trait HasAllTraits WithSearch, WithPagination; use WithBulkActions, + HasCustomAttributes, WithCollapsingColumns, WithColumnSelect, WithConfigurableAreas, diff --git a/src/Traits/Helpers/BulkActionsHelpers.php b/src/Traits/Helpers/BulkActionsHelpers.php index efe9e69a4..95c116900 100644 --- a/src/Traits/Helpers/BulkActionsHelpers.php +++ b/src/Traits/Helpers/BulkActionsHelpers.php @@ -3,6 +3,7 @@ namespace Rappasoft\LaravelLivewireTables\Traits\Helpers; use Livewire\Attributes\Computed; +use Rappasoft\LaravelLivewireTables\Views\Column; trait BulkActionsHelpers { @@ -180,47 +181,7 @@ public function getBulkActionConfirmMessage(string $bulkAction): string public function getBulkActionDefaultConfirmationMessage(): string { - return isset($this->bulkActionConfirmDefaultMessage) ? $this->bulkActionConfirmDefaultMessage : __('Bulk Actions Confirm'); - } - - /** - * Used to get attributes for the for Bulk Actions - * - * @return array - */ - public function getBulkActionsThAttributes(): array - { - return $this->bulkActionsThAttributes ?? ['default' => true]; - } - - /** - * Used to get attributes for the Checkbox for Bulk Actions TH - * - * @return array - */ - public function getBulkActionsThCheckboxAttributes(): array - { - return $this->bulkActionsThCheckboxAttributes ?? ['default' => true]; - } - - /** - * Used to get attributes for the Bulk Actions TD - * - * @return array - */ - public function getBulkActionsTdAttributes(): array - { - return $this->bulkActionsTdAttributes ?? ['default' => true]; - } - - /** - * Used to get attributes for the Bulk Actions TD - * - * @return array - */ - public function getBulkActionsTdCheckboxAttributes(): array - { - return $this->bulkActionsTdCheckboxAttributes ?? ['default' => true]; + return isset($this->bulkActionConfirmDefaultMessage) ? $this->bulkActionConfirmDefaultMessage : __('livewire-tables::Bulk Actions Confirm'); } #[Computed] @@ -239,25 +200,6 @@ public function getClearSelectedOnFilter(): bool return $this->clearSelectedOnFilter ?? true; } - #[Computed] - public function getBulkActionsButtonAttributes(): array - { - return array_merge(['default-colors' => true, 'default-styling' => true], $this->bulkActionsButtonAttributes); - - } - - #[Computed] - public function getBulkActionsMenuAttributes(): array - { - return array_merge(['default-colors' => true, 'default-styling' => true], $this->bulkActionsMenuAttributes); - } - - #[Computed] - public function getBulkActionsMenuItemAttributes(): array - { - return array_merge(['default-colors' => true, 'default-styling' => true], $this->bulkActionsMenuItemAttributes); - } - public function getSelectedRows(): array { if ($this->getDelaySelectAllStatus() && $this->selectAllIsEnabled()) { @@ -271,4 +213,9 @@ public function getDelaySelectAllStatus(): bool { return $this->delaySelectAll ?? false; } + + public function getBulkActionsColumn(): Column + { + return Column::make('bulkactions')->label(fn () => null); + } } diff --git a/src/Traits/Helpers/FilterHelpers.php b/src/Traits/Helpers/FilterHelpers.php index 4a78b333b..056500190 100644 --- a/src/Traits/Helpers/FilterHelpers.php +++ b/src/Traits/Helpers/FilterHelpers.php @@ -330,7 +330,7 @@ public function hasFilterGenericData(): bool return ! empty($this->filterGenericData); } - #[Computed(persist: true)] + #[Computed] public function getFilterGenericData(): array { if (! $this->hasFilterGenericData()) { diff --git a/src/Traits/Helpers/ReorderingHelpers.php b/src/Traits/Helpers/ReorderingHelpers.php index 3dc694b0a..c6ad8bd9a 100644 --- a/src/Traits/Helpers/ReorderingHelpers.php +++ b/src/Traits/Helpers/ReorderingHelpers.php @@ -3,6 +3,7 @@ namespace Rappasoft\LaravelLivewireTables\Traits\Helpers; use Livewire\Attributes\Computed; +use Rappasoft\LaravelLivewireTables\Views\Column; trait ReorderingHelpers { @@ -102,4 +103,15 @@ public function getReorderThAttributes(): array { return $this->reorderThAttributes ?? ['default' => true]; } + + #[Computed] + public function hasReorderThAttributes(): bool + { + return $this->getReorderThAttributes() != ['default' => true]; + } + + public function getReorderColumn(): Column + { + return Column::make('reorder')->label(fn () => null); + } } diff --git a/src/Traits/Helpers/SearchHelpers.php b/src/Traits/Helpers/SearchHelpers.php index 4cde87290..059c17d32 100644 --- a/src/Traits/Helpers/SearchHelpers.php +++ b/src/Traits/Helpers/SearchHelpers.php @@ -127,7 +127,7 @@ public function getSearchPlaceholder(): string return $this->searchPlaceholder; } - return __('Search'); + return __('livewire-tables::Search'); } public function hasSearchPlaceholder(): bool @@ -137,7 +137,7 @@ public function hasSearchPlaceholder(): bool public function getSearchFieldAttributes(): array { - return count($this->searchFieldAttributes) ? $this->searchFieldAttributes : ['default' => true]; + return $this->getCustomAttributes('searchFieldAttributes', true); } public function shouldTrimSearchString(): bool diff --git a/src/Traits/Helpers/SortingHelpers.php b/src/Traits/Helpers/SortingHelpers.php index a0043d41e..e3628e0c3 100644 --- a/src/Traits/Helpers/SortingHelpers.php +++ b/src/Traits/Helpers/SortingHelpers.php @@ -151,11 +151,13 @@ public function sortingPillsAreDisabled(): bool return $this->getSortingPillsStatus() === false; } + #[Computed] public function getDefaultSortingLabelAsc(): string { return $this->defaultSortingLabelAsc; } + #[Computed] public function getDefaultSortingLabelDesc(): string { return $this->defaultSortingLabelDesc; diff --git a/src/Traits/Helpers/TableAttributeHelpers.php b/src/Traits/Helpers/TableAttributeHelpers.php index 4d82a5393..5c8125fa9 100644 --- a/src/Traits/Helpers/TableAttributeHelpers.php +++ b/src/Traits/Helpers/TableAttributeHelpers.php @@ -39,16 +39,58 @@ public function getTbodyAttributes(): array return count($this->tbodyAttributes) ? $this->tbodyAttributes : ['default' => true]; } + /** + * Used in resources/views/components/table/th.blade.php + */ #[Computed] public function getThAttributes(Column $column): array { - return isset($this->thAttributesCallback) ? call_user_func($this->thAttributesCallback, $column) : ['default' => true]; + + if (isset($this->thAttributesCallback)) { + return array_merge(['default' => false, 'default-colors' => false, 'default-styling' => false], call_user_func($this->thAttributesCallback, $column)); + } + + return ['default' => true, 'default-colors' => true, 'default-styling' => true]; } + /** + * Used in resources/views/components/table/th.blade.php + */ #[Computed] public function getThSortButtonAttributes(Column $column): array { - return isset($this->thSortButtonAttributesCallback) ? call_user_func($this->thSortButtonAttributesCallback, $column) : ['default' => true]; + if (isset($this->thSortButtonAttributesCallback)) { + return array_merge(['default' => false, 'default-colors' => false, 'default-styling' => false], call_user_func($this->thSortButtonAttributesCallback, $column)); + } + + return ['default' => true, 'default-colors' => true, 'default-styling' => true]; + } + + /** + * Used in resources/views/components/table/th.blade.php + */ + #[Computed] + public function getThSortIconAttributes(Column $column): array + { + if (isset($this->thSortIconAttributesCallback)) { + return array_merge(['default' => false, 'default-colors' => false, 'default-styling' => false], call_user_func($this->thSortIconAttributesCallback, $column)); + } + + return ['default' => true, 'default-colors' => true, 'default-styling' => true]; + } + + /** + * Used in resources/views/components/table/th.blade.php + */ + #[Computed] + public function getAllThAttributes(Column $column): array + { + return [ + 'customAttributes' => $this->getThAttributes($column), + 'labelAttributes' => $column->getLabelAttributesBag(), + 'sortButtonAttributes' => $this->getThSortButtonAttributes($column), + 'sortIconAttributes' => $this->getThSortIconAttributes($column), + ]; } #[Computed] diff --git a/src/Traits/Styling/Configuration/BulkActionStylingConfiguration.php b/src/Traits/Styling/Configuration/BulkActionStylingConfiguration.php new file mode 100644 index 000000000..9c61f9eba --- /dev/null +++ b/src/Traits/Styling/Configuration/BulkActionStylingConfiguration.php @@ -0,0 +1,76 @@ +setCustomAttributes('bulkActionsButtonAttributes', $bulkActionsButtonAttributes); + + return $this; + } + + /** + * Used to set attributes for the Bulk Actions Menu + */ + public function setBulkActionsMenuAttributes(array $bulkActionsMenuAttributes): self + { + $this->setCustomAttributes('bulkActionsMenuAttributes', $bulkActionsMenuAttributes); + + return $this; + } + + /** + * Used to set attributes for the Bulk Actions Menu Items + */ + public function setBulkActionsMenuItemAttributes(array $bulkActionsMenuItemAttributes): self + { + $this->setCustomAttributes('bulkActionsMenuItemAttributes', $bulkActionsMenuItemAttributes); + + return $this; + } + + /** + * Used to set attributes for the Bulk Actions TD in the Row + */ + public function setBulkActionsTdAttributes(array $bulkActionsTdAttributes): self + { + $this->setCustomAttributes('bulkActionsTdAttributes', $bulkActionsTdAttributes); + + return $this; + } + + /** + * Used to set attributes for the Bulk Actions Checkbox in the Row + */ + public function setBulkActionsTdCheckboxAttributes(array $bulkActionsTdCheckboxAttributes): self + { + $this->setCustomAttributes('bulkActionsTdCheckboxAttributes', $bulkActionsTdCheckboxAttributes); + + return $this; + } + + /** + * Used to set attributes for the for Bulk Actions + */ + public function setBulkActionsThAttributes(array $bulkActionsThAttributes): self + { + $this->setCustomAttributes('bulkActionsThAttributes', $bulkActionsThAttributes); + + return $this; + } + + /** + * Used to set attributes for the Bulk Actions Checkbox in the + */ + public function setBulkActionsThCheckboxAttributes(array $bulkActionsThCheckboxAttributes): self + { + $this->setCustomAttributes('bulkActionsThCheckboxAttributes', $bulkActionsThCheckboxAttributes); + + return $this; + } +} diff --git a/src/Traits/Styling/HasBulkActionsStyling.php b/src/Traits/Styling/HasBulkActionsStyling.php new file mode 100644 index 000000000..c1f1b1aca --- /dev/null +++ b/src/Traits/Styling/HasBulkActionsStyling.php @@ -0,0 +1,28 @@ + true]; + + protected array $bulkActionsThCheckboxAttributes = ['default' => true]; + + protected array $bulkActionsTdAttributes = ['default' => true]; + + protected array $bulkActionsTdCheckboxAttributes = ['default' => true]; + + protected array $bulkActionsButtonAttributes = ['default-colors' => true, 'default-styling' => true]; + + protected array $bulkActionsMenuAttributes = ['default-colors' => true, 'default-styling' => true]; + + protected array $bulkActionsMenuItemAttributes = ['default-colors' => true, 'default-styling' => true]; +} diff --git a/src/Traits/Styling/Helpers/BulkActionStylingHelpers.php b/src/Traits/Styling/Helpers/BulkActionStylingHelpers.php new file mode 100644 index 000000000..6c100c345 --- /dev/null +++ b/src/Traits/Styling/Helpers/BulkActionStylingHelpers.php @@ -0,0 +1,96 @@ + + */ + #[Computed] + public function getBulkActionsButtonAttributes(): array + { + return $this->getCustomAttributes('bulkActionsButtonAttributes', true); + + } + + /** + * Used to get attributes for the Bulk Actions Menu (Dropdown) + * + * @return array + */ + #[Computed] + public function getBulkActionsMenuAttributes(): array + { + return $this->getCustomAttributes('bulkActionsMenuAttributes', true, false); + + } + + /** + * Used to get attributes for the items in the Bulk Actions Menu (Dropdown) + * + * @return array + */ + #[Computed] + public function getBulkActionsMenuItemAttributes(): array + { + return $this->getCustomAttributes('bulkActionsMenuItemAttributes', true, false); + + } + + /** + * Used to get attributes for the for Bulk Actions + * + * @return array + */ + #[Computed] + public function getBulkActionsThAttributes(): array + { + return $this->getCustomAttributes('bulkActionsThAttributes'); + + } + + /** + * Used to check if the Bulk Actions TH has any attributes (supports historic approach) + */ + #[Computed] + public function hasBulkActionsThAttributes(): bool + { + return $this->getBulkActionsThAttributes() != ['default' => true, 'default-colors' => false, 'default-styling' => false]; + } + + /** + * Used to get attributes for the Checkbox for Bulk Actions TH + * + * @return array + */ + public function getBulkActionsThCheckboxAttributes(): array + { + return $this->getCustomAttributes('bulkActionsThCheckboxAttributes'); + } + + /** + * Used to get attributes for the Bulk Actions TD + * + * @return array + */ + public function getBulkActionsTdAttributes(): array + { + return $this->getCustomAttributes('bulkActionsTdAttributes'); + } + + /** + * Used to get attributes for the Bulk Actions TD + * + * @return array + */ + public function getBulkActionsTdCheckboxAttributes(): array + { + return $this->getCustomAttributes('bulkActionsTdCheckboxAttributes'); + + } +} diff --git a/src/Traits/WithBulkActions.php b/src/Traits/WithBulkActions.php index c36b87bb4..17c4fdcea 100644 --- a/src/Traits/WithBulkActions.php +++ b/src/Traits/WithBulkActions.php @@ -4,11 +4,13 @@ use Rappasoft\LaravelLivewireTables\Traits\Configuration\BulkActionsConfiguration; use Rappasoft\LaravelLivewireTables\Traits\Helpers\BulkActionsHelpers; +use Rappasoft\LaravelLivewireTables\Traits\Styling\HasBulkActionsStyling; trait WithBulkActions { use BulkActionsConfiguration, - BulkActionsHelpers; + BulkActionsHelpers, + HasBulkActionsStyling; public bool $bulkActionsStatus = true; @@ -27,28 +29,12 @@ trait WithBulkActions public ?string $bulkActionConfirmDefaultMessage; - protected array $bulkActionsCheckboxAttributes = []; - - protected array $bulkActionsThAttributes = ['default' => true]; - - protected array $bulkActionsThCheckboxAttributes = ['default' => true]; - - protected array $bulkActionsTdAttributes = ['default' => true]; - - protected array $bulkActionsTdCheckboxAttributes = ['default' => true]; - protected bool $alwaysHideBulkActionsDropdownOption = false; protected bool $clearSelectedOnSearch = true; protected bool $clearSelectedOnFilter = true; - protected array $bulkActionsButtonAttributes = ['default-colors' => true, 'default-styling' => true]; - - protected array $bulkActionsMenuAttributes = ['default-colors' => true, 'default-styling' => true]; - - protected array $bulkActionsMenuItemAttributes = ['default-colors' => true, 'default-styling' => true]; - // Entangled in JS public bool $delaySelectAll = false; diff --git a/src/Traits/WithFilters.php b/src/Traits/WithFilters.php index 9ec7e60aa..3c2ff58c5 100644 --- a/src/Traits/WithFilters.php +++ b/src/Traits/WithFilters.php @@ -52,6 +52,7 @@ protected function queryStringWithFilters(): array if ($this->queryStringIsEnabled() && $this->filtersAreEnabled()) { return [ 'appliedFilters' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAlias().'-filters'], + 'filterComponents' => ['except' => null, 'history' => false, 'keep' => false, 'as' => $this->getQueryStringAlias().'-filters'], ]; } diff --git a/src/Traits/WithPagination.php b/src/Traits/WithPagination.php index 571c2b76c..c8c56a3c9 100644 --- a/src/Traits/WithPagination.php +++ b/src/Traits/WithPagination.php @@ -74,6 +74,8 @@ public function updatedPerPage(int|string $value): void session()->put($this->getPerPagePaginationSessionKey(), $this->getPerPageAccepted()[0] ?? 10); } $this->setPerPage($value); + $this->resetPage($this->getComputedPageName()); + } protected function queryStringWithPagination(): array diff --git a/src/Traits/WithTableAttributes.php b/src/Traits/WithTableAttributes.php index f87edea61..a0ce12c44 100644 --- a/src/Traits/WithTableAttributes.php +++ b/src/Traits/WithTableAttributes.php @@ -26,6 +26,8 @@ trait WithTableAttributes protected ?\Closure $thSortButtonAttributesCallback; + protected ?\Closure $thSortIconAttributesCallback; + protected ?\Closure $trAttributesCallback; protected ?\Closure $tdAttributesCallback; diff --git a/src/Views/Action.php b/src/Views/Action.php index 3c6570328..ee3d4640e 100644 --- a/src/Views/Action.php +++ b/src/Views/Action.php @@ -6,13 +6,14 @@ use Illuminate\View\ComponentAttributeBag; use Rappasoft\LaravelLivewireTables\Views\Traits\Actions\{HasActionAttributes, HasRoute}; use Rappasoft\LaravelLivewireTables\Views\Traits\Columns\HasVisibility; -use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasIcon, HasLabel, HasTheme, HasView, HasWireActions}; +use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasIcon, HasLabel, HasLabelAttributes, HasTheme, HasView, HasWireActions}; class Action extends Component { use HasActionAttributes; use HasIcon; use HasLabel; + use HasLabelAttributes; use HasRoute; use HasTheme; use HasView; diff --git a/src/Views/Filters/DateRangeFilter.php b/src/Views/Filters/DateRangeFilter.php index 40cfba046..3c0d0a95e 100644 --- a/src/Views/Filters/DateRangeFilter.php +++ b/src/Views/Filters/DateRangeFilter.php @@ -189,7 +189,7 @@ public function getFilterPillValue($value): array|string|bool|null if (($minDate instanceof Carbon) && $maxDate instanceof Carbon) { return $this->outputTranslatedDate($minDate) - .' '.__('to').' '. + .' '.__('livewire-tables::to').' '. $this->outputTranslatedDate($maxDate); } } diff --git a/src/Views/Filters/NumberRangeFilter.php b/src/Views/Filters/NumberRangeFilter.php index 9eac63a7b..a32a83667 100644 --- a/src/Views/Filters/NumberRangeFilter.php +++ b/src/Views/Filters/NumberRangeFilter.php @@ -89,7 +89,7 @@ public function getDefaultValue(): array|string public function getFilterPillValue($values): array|string|bool|null { if ($this->validate($values)) { - return __('Min:').$values['min'].', '.__('Max:').$values['max']; + return __('livewire-tables::min').':'.$values['min'].', '.__('livewire-tables::max').':'.$values['max']; } return ''; diff --git a/src/Views/Traits/Columns/IsSortable.php b/src/Views/Traits/Columns/IsSortable.php index b627ac334..b53c729d8 100644 --- a/src/Views/Traits/Columns/IsSortable.php +++ b/src/Views/Traits/Columns/IsSortable.php @@ -42,11 +42,19 @@ public function setSortingPillDirections(string $asc, string $desc): self return $this; } + /** + * Used internally + * Used in resources/views/components/table/th.blade.php + */ public function getSortCallback(): ?callable { return $this->sortCallback; } + /** + * Used internally + * Used in resources/views/components/table/th.blade.php + */ public function isSortable(): bool { return $this->hasField() && $this->sortable === true; @@ -81,25 +89,55 @@ public function hasCustomSortingPillDirections(): bool return $this->sortingPillDirectionAsc !== null && $this->sortingPillDirectionDesc !== null; } - public function getCustomSortingPillDirections(string $direction): string + public function getCustomSortingPillDirections(string $direction, ?string $defaultLabelAsc = 'A-Z', ?string $defaultLabelDesc = 'Z-A'): string { if ($direction === 'asc') { - return $this->sortingPillDirectionAsc; + return $this->sortingPillDirectionAsc ?? $defaultLabelAsc; } if ($direction === 'desc') { - return $this->sortingPillDirectionDesc; + return $this->sortingPillDirectionDesc ?? $defaultLabelDesc; } - return __('N/A'); + return __('livewire-tables::not_applicable'); + } + + public function getCustomSortingPillDirectionsLabel(string $direction, ?string $defaultLabelAsc = 'A-Z', ?string $defaultLabelDesc = 'Z-A'): string + { + if ($direction === 'asc') { + return $this->sortingPillDirectionAsc ?? $defaultLabelAsc; + } + + if ($direction === 'desc') { + return $this->sortingPillDirectionDesc ?? $defaultLabelDesc; + } + + return __('livewire-tables::not_applicable'); } public function getSortingPillDirection(DataTableComponent $component, string $direction): string { if ($this->hasCustomSortingPillDirections()) { - return $this->getCustomSortingPillDirections($direction); + return $this->getCustomSortingPillDirections($direction, $component->getDefaultSortingLabelAsc(), $component->getDefaultSortingLabelDesc()); } return $direction === 'asc' ? $component->getDefaultSortingLabelAsc() : $component->getDefaultSortingLabelDesc(); } + + public function getSortingPillDirectionLabel(string $direction, ?string $defaultLabelAsc = 'A-Z', ?string $defaultLabelDesc = 'Z-A'): string + { + if ($this->hasCustomSortingPillDirections()) { + return $this->getCustomSortingPillDirectionsLabel($direction, $defaultLabelAsc, $defaultLabelDesc); + } + + return $direction === 'asc' ? $defaultLabelAsc : $defaultLabelDesc; + } + + /** + * Used in resources/views/components/table/th.blade.php + */ + public function getColumnSortKey(): string + { + return $this->isSortable() ? $this->getColumnSelectName() : $this->getSlug(); + } } diff --git a/src/Views/Traits/Core/HasLabelAttributes.php b/src/Views/Traits/Core/HasLabelAttributes.php new file mode 100644 index 000000000..ba1ec4f9b --- /dev/null +++ b/src/Views/Traits/Core/HasLabelAttributes.php @@ -0,0 +1,41 @@ +hasCustomAttributes('labelAttributesArray'); + } + + /** + * Used in resources/views/components/table/th.blade.php + */ + public function getLabelAttributes(): array + { + return $this->getCustomAttributes('labelAttributesArray'); + } + + public function getLabelAttributesBag(): ComponentAttributeBag + { + return new ComponentAttributeBag($this->getLabelAttributes()); + } + + /** + * Set a list of attributes to override on the th label + */ + public function setLabelAttributes(array $labelAttributes): self + { + $this->setCustomAttributes('labelAttributesArray', $labelAttributes); + + return $this; + } +} diff --git a/src/Views/Traits/IsColumn.php b/src/Views/Traits/IsColumn.php index 42bbfb5b4..4dc6e4eef 100644 --- a/src/Views/Traits/IsColumn.php +++ b/src/Views/Traits/IsColumn.php @@ -5,7 +5,7 @@ use Rappasoft\LaravelLivewireTables\DataTableComponent; use Rappasoft\LaravelLivewireTables\Views\Traits\Columns\{HasVisibility, IsCollapsible, IsSearchable, IsSelectable, IsSortable}; use Rappasoft\LaravelLivewireTables\Views\Traits\Configuration\ColumnConfiguration; -use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasAttributes,HasFooter,HasSecondaryHeader,HasTheme,HasView}; +use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasAttributes,HasFooter,HasLabelAttributes,HasSecondaryHeader,HasTheme,HasView}; use Rappasoft\LaravelLivewireTables\Views\Traits\Helpers\{ColumnHelpers,RelationshipHelpers}; trait IsColumn @@ -19,6 +19,7 @@ trait IsColumn IsSortable, HasAttributes, HasFooter, + HasLabelAttributes, HasSecondaryHeader, HasTheme, HasView, diff --git a/src/Views/Traits/IsFilter.php b/src/Views/Traits/IsFilter.php index 13af1e3af..9896e8bd3 100644 --- a/src/Views/Traits/IsFilter.php +++ b/src/Views/Traits/IsFilter.php @@ -3,7 +3,7 @@ namespace Rappasoft\LaravelLivewireTables\Views\Traits; use Rappasoft\LaravelLivewireTables\Views\Traits\Configuration\FilterConfiguration; -use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasConfig,HasView}; +use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasConfig,HasLabelAttributes,HasView}; use Rappasoft\LaravelLivewireTables\Views\Traits\Filters\{HasCustomPosition,HasVisibility}; use Rappasoft\LaravelLivewireTables\Views\Traits\Helpers\FilterHelpers; @@ -13,6 +13,7 @@ trait IsFilter FilterHelpers, HasConfig, HasCustomPosition, + HasLabelAttributes, HasVisibility, HasView; diff --git a/tests/Traits/Configuration/BulkActionsConfigurationTest.php b/tests/Traits/Configuration/BulkActionsConfigurationTest.php index af9773618..de113419f 100644 --- a/tests/Traits/Configuration/BulkActionsConfigurationTest.php +++ b/tests/Traits/Configuration/BulkActionsConfigurationTest.php @@ -2,10 +2,25 @@ namespace Rappasoft\LaravelLivewireTables\Tests\Traits\Configuration; +use PHPUnit\Framework\Attributes\DataProvider; use Rappasoft\LaravelLivewireTables\Tests\TestCase; final class BulkActionsConfigurationTest extends TestCase { + public static function attributeStatusProvider(): array + { + return [ + [false, false, false], + [true, false, false], + [true, true, false], + [true, true, true], + [true, false, true], + [false, true, false], + [false, true, true], + [false, false, true], + ]; + } + public function test_variables_are_correct_types(): void { $this->assertIsBool($this->basicTable->bulkActionsStatus); @@ -142,107 +157,6 @@ public function test_can_set_bulk_action_default_confirmation_message(): void } - public function test_can_set_bulk_actions_td_attributes(): void - { - $this->assertSame(['default' => true], $this->basicTable->getBulkActionsTdAttributes()); - - $this->basicTable->setBulkActionsTdAttributes(['class' => 'bg-blue-500']); - - $this->assertSame(['default' => true, 'class' => 'bg-blue-500'], $this->basicTable->getBulkActionsTdAttributes()); - - $this->basicTable->setBulkActionsTdAttributes(['class' => 'bg-blue-500', 'default' => false]); - - $this->assertSame(['default' => false, 'class' => 'bg-blue-500'], $this->basicTable->getBulkActionsTdAttributes()); - } - - public function test_can_set_bulk_actions_td_checkbox_attributes(): void - { - $this->assertSame(['default' => true], $this->basicTable->getBulkActionsTdCheckboxAttributes()); - - $this->basicTable->setBulkActionsTdCheckboxAttributes(['class' => 'bg-gray-500']); - - $this->assertSame(['default' => true, 'class' => 'bg-gray-500'], $this->basicTable->getBulkActionsTdCheckboxAttributes()); - - $this->basicTable->setBulkActionsTdCheckboxAttributes(['class' => 'bg-gray-500', 'default' => false]); - - $this->assertSame(['default' => false, 'class' => 'bg-gray-500'], $this->basicTable->getBulkActionsTdCheckboxAttributes()); - } - - public function test_can_set_bulk_actions_th_attributes(): void - { - $this->assertSame(['default' => true], $this->basicTable->getBulkActionsThAttributes()); - - $this->basicTable->setBulkActionsThAttributes(['class' => 'bg-red-500']); - - $this->assertSame(['default' => true, 'class' => 'bg-red-500'], $this->basicTable->getBulkActionsThAttributes()); - - $this->basicTable->setBulkActionsThAttributes(['class' => 'bg-red-500', 'default' => false]); - - $this->assertSame(['default' => false, 'class' => 'bg-red-500'], $this->basicTable->getBulkActionsThAttributes()); - } - - public function test_can_set_bulk_actions_th_checkbox_attributes(): void - { - $this->assertSame(['default' => true], $this->basicTable->getBulkActionsThCheckboxAttributes()); - - $this->basicTable->setBulkActionsThCheckboxAttributes(['class' => 'bg-green-500']); - - $this->assertSame(['default' => true, 'class' => 'bg-green-500'], $this->basicTable->getBulkActionsThCheckboxAttributes()); - - $this->basicTable->setBulkActionsThCheckboxAttributes(['class' => 'bg-green-500', 'default' => false]); - - $this->assertSame(['default' => false, 'class' => 'bg-green-500'], $this->basicTable->getBulkActionsThCheckboxAttributes()); - } - - public function test_can_set_bulk_actions_button_attributes(): void - { - $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsButtonAttributes()); - $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsMenuAttributes()); - - $this->basicTable->setBulkActionsButtonAttributes(['default-colors' => false, 'class' => 'bg-green-500']); - - $this->assertSame(['default-colors' => false, 'default-styling' => true, 'class' => 'bg-green-500'], $this->basicTable->getBulkActionsButtonAttributes()); - $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsMenuAttributes()); - - $this->basicTable->setBulkActionsButtonAttributes(['class' => 'bg-green-500', 'default-colors' => false]); - - $this->assertSame(['default-colors' => false, 'default-styling' => true, 'class' => 'bg-green-500'], $this->basicTable->getBulkActionsButtonAttributes()); - $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsMenuAttributes()); - } - - public function test_can_set_bulk_actions_menu_attributes(): void - { - $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsMenuAttributes()); - $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsButtonAttributes()); - - $this->basicTable->setBulkActionsMenuAttributes(['class' => 'bg-blue-500']); - - $this->assertSame(['default-colors' => true, 'default-styling' => true, 'class' => 'bg-blue-500'], $this->basicTable->getBulkActionsMenuAttributes()); - $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsButtonAttributes()); - - $this->basicTable->setBulkActionsMenuAttributes(['class' => 'bg-blue-500', 'default-colors' => false]); - - $this->assertSame(['default-colors' => false, 'default-styling' => true, 'class' => 'bg-blue-500'], $this->basicTable->getBulkActionsMenuAttributes()); - $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsButtonAttributes()); - } - - public function test_can_set_bulk_actions_menu_item_attributes(): void - { - $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsMenuAttributes()); - $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsMenuItemAttributes()); - - $this->basicTable->setBulkActionsMenuItemAttributes(['class' => 'bg-red-500']); - - $this->assertSame(['default-colors' => true, 'default-styling' => true, 'class' => 'bg-red-500'], $this->basicTable->getBulkActionsMenuItemAttributes()); - $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsMenuAttributes()); - - $this->basicTable->setBulkActionsMenuItemAttributes(['class' => 'bg-amber-500', 'default-colors' => false]); - - $this->assertSame(['default-colors' => false, 'default-styling' => true, 'class' => 'bg-amber-500'], $this->basicTable->getBulkActionsMenuItemAttributes()); - $this->assertSame(['default-colors' => true, 'default-styling' => true], $this->basicTable->getBulkActionsMenuAttributes()); - - } - public function test_can_set_bulk_actions_delay_select_all_status(): void { $this->assertFalse($this->basicTable->getDelaySelectAllStatus()); diff --git a/tests/Traits/Configuration/BulkActionsStylingConfigurationTest.php b/tests/Traits/Configuration/BulkActionsStylingConfigurationTest.php new file mode 100644 index 000000000..e93674466 --- /dev/null +++ b/tests/Traits/Configuration/BulkActionsStylingConfigurationTest.php @@ -0,0 +1,135 @@ + [false, false, false, 'bg-blue-500', 'bg-red-300'], + 'tff' => [true, false, false, 'bg-red-500', 'bg-yellow-300'], + 'ttf' => [true, true, false, 'bg-green-500', 'bg-gray-300'], + 'ttt' => [true, true, true, 'bg-yellow-500', 'bg-green-300'], + 'tft' => [true, false, true, 'bg-red-500', 'bg-blue-300'], + 'ftf' => [false, true, false, 'bg-green-500', 'bg-amber-300'], + 'ftt' => [false, true, true, 'bg-gray-500', 'bg-blue-300'], + 'fff' => [false, false, true, 'bg-blue-500', 'bg-yellow-300'], + ]; + } + + public static function providesBulkActionMethodsToTest(): array + { + return [ + 'BulkActionsButtonAttributes', + 'BulkActionsMenuAttributes', + 'BulkActionsMenuItemAttributes', + 'BulkActionsThAttributes', + 'BulkActionsThCheckboxAttributes', + 'BulkActionsTdAttributes', + 'BulkActionsTdCheckboxAttributes', + ]; + } + + public static function mergesMethodsWithAttributes(array $methodsToTest, array $dataSetItems): array + { + $allItems = []; + + foreach ($methodsToTest as $methodToTest) { + $lcFirst = lcfirst($methodToTest); + $getMethod = 'get'.$methodToTest; + $setMethod = 'set'.$methodToTest; + $lower = strtolower($methodToTest); + + foreach ($dataSetItems as $index => $dataSetItem) { + $allItems[$lower.'_'.$index] = [$setMethod, $getMethod, $lcFirst, $dataSetItem[0], $dataSetItem[1], $dataSetItem[2], $dataSetItem[3], $dataSetItem[4]]; + } + } + + return $allItems; + } + + public static function bulkActionAttributesProvider(): array + { + $dataSetItems = self::providesAttributeDataSet(); + $methodsToTest = self::providesBulkActionMethodsToTest(); + + return self::mergesMethodsWithAttributes($methodsToTest, $dataSetItems); + + } + + #[DataProvider('bulkActionAttributesProvider')] + public function test_can_set_bulk_actions_attributes_via_provider(string $setMethod, string $getMethod, string $propertyName, bool $default, bool $defaultColors, bool $defaultStyling, string $class1, string $class2): void + { + $this->basicTable->{$setMethod}([ + 'default' => $default, + 'default-colors' => $defaultColors, + 'class' => $class1, + 'default-styling' => $defaultStyling, + ]); + + $this->assertSame([ + 'class' => $class1, + 'default' => $default, + 'default-colors' => $defaultColors, + 'default-styling' => $defaultStyling, + ], $this->basicTable->{$getMethod}()); + + $this->basicTable->{$setMethod}([ + 'default' => $default, + 'class' => $class2, + 'default-colors' => ! $defaultColors, + 'default-styling' => $defaultStyling, + ]); + + $this->assertSame([ + 'class' => $class2, + 'default' => $default, + 'default-colors' => ! $defaultColors, + 'default-styling' => $defaultStyling, + ], $this->basicTable->{$getMethod}()); + } + + #[DataProvider('bulkActionAttributesProvider')] + public function test_can_get_bulk_actions_attributes_bag_via_provider(string $setMethod, string $getMethod, string $propertyName, bool $default, bool $defaultColors, bool $defaultStyling, string $class1, string $class2): void + { + $data = [ + 'class' => $class1, + 'default' => $default, + 'default-colors' => $defaultColors, + 'default-styling' => $defaultStyling, + ]; + + $this->basicTable->{$setMethod}($data); + + $this->assertSame($data, $this->basicTable->{$getMethod}()); + + $attributeBag = new ComponentAttributeBag($data); + + $this->assertSame($attributeBag->getAttributes(), $this->basicTable->getCustomAttributesBag($propertyName)->getAttributes()); + } + + public function test_bulk_actions_td_attributes_returns_default_true_if_not_set(): void + { + $this->assertSame(['default' => true, 'default-colors' => false, 'default-styling' => false], $this->basicTable->getBulkActionsTdAttributes()); + } + + public function test_bulk_actions_td_checkbox_attributes_returns_default_true_if_not_set(): void + { + $this->assertSame(['default' => true, 'default-colors' => false, 'default-styling' => false], $this->basicTable->getBulkActionsTdCheckboxAttributes()); + } + + public function test_bulk_actions_th_attributes_returns_default_true_if_not_set(): void + { + $this->assertSame(['default' => true, 'default-colors' => false, 'default-styling' => false], $this->basicTable->getBulkActionsThAttributes()); + } + + public function test_bulk_actions_th_checkbox_attributes_returns_default_true_if_not_set(): void + { + $this->assertSame(['default' => true, 'default-colors' => false, 'default-styling' => false], $this->basicTable->getBulkActionsThCheckboxAttributes()); + } +} diff --git a/tests/Traits/Configuration/ComponentConfigurationTest.php b/tests/Traits/Configuration/ComponentConfigurationTest.php index 3892083a5..d853d09c1 100644 --- a/tests/Traits/Configuration/ComponentConfigurationTest.php +++ b/tests/Traits/Configuration/ComponentConfigurationTest.php @@ -73,8 +73,8 @@ public function test_can_set_th_attributes(): void return ['default' => true, 'here' => 'there']; }); - $this->assertSame($this->basicTable->getThAttributes($this->basicTable->columns()[0]), ['default' => false, 'this' => 'that']); - $this->assertSame($this->basicTable->getThAttributes($this->basicTable->columns()[1]), ['default' => true, 'here' => 'there']); + $this->assertSame($this->basicTable->getThAttributes($this->basicTable->columns()[0]), ['default' => false, 'default-colors' => false, 'default-styling' => false, 'this' => 'that']); + $this->assertSame($this->basicTable->getThAttributes($this->basicTable->columns()[1]), ['default' => true, 'default-colors' => false, 'default-styling' => false, 'here' => 'there']); } public function test_can_set_th_sort_button_attributes(): void @@ -87,8 +87,22 @@ public function test_can_set_th_sort_button_attributes(): void return ['default' => true, 'here' => 'there']; }); - $this->assertSame($this->basicTable->getThSortButtonAttributes($this->basicTable->columns()[0]), ['default' => false, 'this' => 'that']); - $this->assertSame($this->basicTable->getThSortButtonAttributes($this->basicTable->columns()[1]), ['default' => true, 'here' => 'there']); + $this->assertSame($this->basicTable->getThSortButtonAttributes($this->basicTable->columns()[0]), ['default' => false, 'default-colors' => false, 'default-styling' => false, 'this' => 'that']); + $this->assertSame($this->basicTable->getThSortButtonAttributes($this->basicTable->columns()[1]), ['default' => true, 'default-colors' => false, 'default-styling' => false, 'here' => 'there']); + } + + public function test_can_set_th_sort_icon_attributes(): void + { + $this->basicTable->setThSortIconAttributes(function (Column $column) { + if ($column->isField('id')) { + return ['default' => false, 'this' => 'that']; + } + + return ['default' => true, 'here' => 'there']; + }); + + $this->assertSame($this->basicTable->getThSortIconAttributes($this->basicTable->columns()[0]), ['default' => false, 'default-colors' => false, 'default-styling' => false, 'this' => 'that']); + $this->assertSame($this->basicTable->getThSortIconAttributes($this->basicTable->columns()[1]), ['default' => true, 'default-colors' => false, 'default-styling' => false, 'here' => 'there']); } public function test_can_set_tr_attributes(): void @@ -441,4 +455,13 @@ public function test_can_set_collapsing_column_button_expand_attributes(): void $this->assertSame(['default-styling' => true, 'default-colors' => true], $this->basicTable->getCollapsingColumnButtonCollapseAttributes()); } + + public function test_can_get_set_should_be_displayed(): void + { + $this->assertTrue($this->basicTable->getShouldBeDisplayed()); + $this->basicTable->setShouldBeHidden(); + $this->assertFalse($this->basicTable->getShouldBeDisplayed()); + $this->basicTable->setShouldBeDisplayed(); + $this->assertTrue($this->basicTable->getShouldBeDisplayed()); + } } diff --git a/tests/Traits/Configuration/SearchConfigurationTest.php b/tests/Traits/Configuration/SearchConfigurationTest.php index b89461e15..ad47d954b 100644 --- a/tests/Traits/Configuration/SearchConfigurationTest.php +++ b/tests/Traits/Configuration/SearchConfigurationTest.php @@ -170,7 +170,7 @@ public function test_cant_set_search_throttle_with_other_search_modifiers(): voi public function test_can_set_search_placeholder(): void { - $this->assertSame(__('Search'), $this->basicTable->getSearchPlaceholder()); + $this->assertSame(__('livewire-tables::Search'), $this->basicTable->getSearchPlaceholder()); $this->basicTable->setSearchPlaceholder('Anthony'); @@ -180,11 +180,11 @@ public function test_can_set_search_placeholder(): void public function test_can_set_search_field_attributes(): void { - $this->assertSame(['default' => true], $this->basicTable->getSearchFieldAttributes()); + $this->assertSame(['default' => true, 'default-colors' => true, 'default-styling' => true], $this->basicTable->getSearchFieldAttributes()); $this->basicTable->setSearchFieldAttributes(['class' => 'bg-blue', 'style' => 'font-size: 3em;']); - $this->assertSame(['class' => 'bg-blue', 'style' => 'font-size: 3em;'], $this->basicTable->getSearchFieldAttributes()); + $this->assertSame(['class' => 'bg-blue', 'default' => false, 'default-colors' => false, 'default-styling' => false, 'style' => 'font-size: 3em;'], $this->basicTable->getSearchFieldAttributes()); } } diff --git a/tests/Traits/Core/CustomAttributesTest.php b/tests/Traits/Core/CustomAttributesTest.php new file mode 100644 index 000000000..cfe3478eb --- /dev/null +++ b/tests/Traits/Core/CustomAttributesTest.php @@ -0,0 +1,97 @@ +setDataTableFingerprint('test'); + } + }; + + $mock->configure(); + $mock->boot(); + + $this->assertSame([ + 'default' => false, + 'default-colors' => false, + 'default-styling' => false, + ], $mock->getCustomAttributes('testAttributesArray', false, true)); + } + + public function test_can_get_custom_attribute_defaults_false_classic_mode(): void + { + $mock = new class extends PetsTable + { + public ?array $testAttributesArray; + + public function configure(): void + { + $this->setDataTableFingerprint('test'); + } + }; + + $mock->configure(); + $mock->boot(); + + $this->assertSame([ + 'default-colors' => false, + 'default-styling' => false, + ], $mock->getCustomAttributes('testAttributesArray', false, false)); + } + + public function test_can_get_custom_attribute_defaults_true_standard_mode(): void + { + $mock = new class extends PetsTable + { + public ?array $testAttributesArray; + + public function configure(): void + { + $this->setDataTableFingerprint('test'); + } + }; + + $mock->configure(); + $mock->boot(); + + $this->assertSame([ + 'default' => true, + 'default-colors' => true, + 'default-styling' => true, + ], $mock->getCustomAttributes('testAttributesArray', true, true)); + } + + public function test_can_get_custom_attribute_defaults_true_classic_mode(): void + { + $mock = new class extends PetsTable + { + public ?array $testAttributesArray; + + public function configure(): void + { + $this->setDataTableFingerprint('test'); + } + }; + + $mock->configure(); + $mock->boot(); + + $this->assertSame([ + 'default-colors' => true, + 'default-styling' => true, + ], $mock->getCustomAttributes('testAttributesArray', true, false)); + } +} diff --git a/tests/Traits/Helpers/BulkActionsHelpersTest.php b/tests/Traits/Helpers/BulkActionsHelpersTest.php index 5506fcb4b..78283a5d9 100644 --- a/tests/Traits/Helpers/BulkActionsHelpersTest.php +++ b/tests/Traits/Helpers/BulkActionsHelpersTest.php @@ -188,26 +188,6 @@ public function test_can_get_bulk_action_default_confirmation_message(): void $this->assertSame('Are you sure?', $this->basicTable->getBulkActionDefaultConfirmationMessage()); } - public function test_bulk_actions_td_attributes_returns_default_true_if_not_set(): void - { - $this->assertSame(['default' => true], $this->basicTable->getBulkActionsTdAttributes()); - } - - public function test_bulk_actions_td_checkbox_attributes_returns_default_true_if_not_set(): void - { - $this->assertSame(['default' => true], $this->basicTable->getBulkActionsTdCheckboxAttributes()); - } - - public function test_bulk_actions_th_attributes_returns_default_true_if_not_set(): void - { - $this->assertSame(['default' => true], $this->basicTable->getBulkActionsThAttributes()); - } - - public function test_bulk_actions_th_checkbox_attributes_returns_default_true_if_not_set(): void - { - $this->assertSame(['default' => true], $this->basicTable->getBulkActionsThCheckboxAttributes()); - } - public function test_select_clears_by_default(): void { $this->basicTable->setSelected([1, 2, 3, 4, 5]); diff --git a/tests/Traits/Helpers/ColumnHelpersTest.php b/tests/Traits/Helpers/ColumnHelpersTest.php index a135ac86c..a295b721e 100644 --- a/tests/Traits/Helpers/ColumnHelpersTest.php +++ b/tests/Traits/Helpers/ColumnHelpersTest.php @@ -342,4 +342,22 @@ public function test_can_check_if_column_label_should_be_shown(): void $this->assertTrue($column3->getColumnLabelStatus()); $this->assertFalse($column2->getColumnLabelStatus()); } + + public function test_can_check_if_column_label_has_attributes(): void + { + $column = Column::make('ID', 'id'); + + $this->assertFalse($column->hasLabelAttributes()); + + $column->setLabelAttributes(['class' => 'text-xl']); + + $this->assertTrue($column->hasLabelAttributes()); + + $this->assertSame(['class' => 'text-xl', 'default' => false, 'default-colors' => false, 'default-styling' => false], $column->getLabelAttributes()); + + $column->setLabelAttributes(['class' => 'text-xl', 'default' => true]); + + $this->assertSame(['class' => 'text-xl', 'default' => true, 'default-colors' => false, 'default-styling' => false], $column->getLabelAttributes()); + + } } diff --git a/tests/Traits/Visuals/BulkActionsVisualsTest.php b/tests/Traits/Visuals/BulkActionsVisualsTest.php index 91f73c177..1e61b1940 100644 --- a/tests/Traits/Visuals/BulkActionsVisualsTest.php +++ b/tests/Traits/Visuals/BulkActionsVisualsTest.php @@ -189,4 +189,37 @@ public function exportBulk($items) } })->assertDontSee('Bulk Actions'); } + + public function test_bulk_dropdown_can_have_customised_classes(): void + { + Livewire::test(new class extends PetsTable + { + public function configure(): void + { + $this->setPrimaryKey('id'); + $this->setBulkActionsThAttributes([ + 'class' => 'bg-yellow-500 dark:bg-yellow-800', + 'default' => false, + 'default-styling' => true, + 'default-colors' => false, + ]); + + } + + public function bulkActions(): array + { + return ['exportBulk' => 'exportBulk']; + } + + public function exportBulk($items) + { + return $items; + } + })->assertSee('Bulk Actions') + ->assertSeeHtmlInOrder([ + 'scope="col"', + 'class="bg-yellow-500 dark:bg-yellow-800"', + 'wire:key="table-thead-bulk-actions"', + ]); + } } diff --git a/tests/Traits/Visuals/SortingVisualsTest.php b/tests/Traits/Visuals/SortingVisualsTest.php index 6419f2643..c74999eb0 100644 --- a/tests/Traits/Visuals/SortingVisualsTest.php +++ b/tests/Traits/Visuals/SortingVisualsTest.php @@ -35,7 +35,7 @@ public function test_th_headers_are_buttons_with_sorting_enabled(): void Livewire::test(PetsTable::class) ->assertSeeHtmlInOrder([ 'wire:click="sortBy(\'id\')"', - '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 dark:text-gray-400"', + 'class="flex items-center space-x-1 text-left text-xs leading-4 font-medium uppercase tracking-wider group focus:outline-none text-gray-500 dark:text-gray-400"', ]); } @@ -45,8 +45,25 @@ public function test_th_headers_are_not_buttons_with_sorting_disabled(): void ->call('setSortingDisabled') ->assertDontSeeHtml('