Origin development (#82)

* Adjust for HTML Columns

* Update ChangeLog and SP

* fix: Apply cursor pointer only on clickable columns when using Bootst… (rappasoft#1742)

* Ensure HTML Columns Return HTML Correctly (rappasoft#1737)

* Adjust for HTML Columns

* fix: Apply cursor pointer only on clickable columns when using Bootstrap

---------

Co-authored-by: Joe <104938042+lrljoe@users.noreply.github.com>

* Fix styling

* Fix hide bulk actions when empty not reflecting in frontend (rappasoft#1747)

* Fix issue with Hide Bulk Actions When Empty not reflecting in frontend

* Fix styling

* Add development branch into tests

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Change Return Type for attributes() to static (rappasoft#1749)

* Switch to using Composer\InstalledVersions for AboutCommand to reduce necessity to update ServiceProvider with each update (rappasoft#1748)

* Two improvements to improve typehinting, migrate to larastan/larastan, cleanup of test (rappasoft#1750)

* Add ArrayColumn (BETA) (rappasoft#1751)

* Add ArrayColumn

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Always hide bulk actions option (rappasoft#1752)

* Add option to "Always Hide Bulk Actions"

* Fix styling

* Fix test function name clash

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Optionally disable count for simple pagination (rappasoft#1755)

* Add option for setShouldRetrieveTotalItemCountStatus

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

---------

Co-authored-by: Matt Pickering <mattukp+gh@gmail.com>
Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

.github/workflows/run-tests-pcov-pull.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - 'develop'
+      - 'development'
       - 'master'
 
 jobs:

.github/workflows/run-tests-pull.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - 'develop'
+      - 'development'
       - 'master'
 
 jobs:

composer.json

@@ -35,7 +35,7 @@
         "laravel/pint": "^1.10",
         "monolog/monolog": "*",
         "nunomaduro/collision": "^6.0|^7.0|^8.0",
-        "nunomaduro/larastan": "^2.6",
+        "larastan/larastan": "^2.6",
         "orchestra/testbench": "^7.0|^8.0|^9.0",
         "phpunit/phpunit": "^9.0|^10.0|^11.0"
     },

docs/bulk-actions/available-methods.md

@@ -239,3 +239,38 @@ public function configure(): void
     ]);
 }
 ```
+
+## setShouldAlwaysHideBulkActionsDropdownOption
+
+Allows hiding the Bulk Actions button & menu, regardless of whether there are any items selected, or hideBulkActionsWhenEmptyEnabled behaviour
+
+```php
+public function configure(): void
+{
+    $this->setShouldAlwaysHideBulkActionsDropdownOption(true);
+}
+```
+
+
+## setShouldAlwaysHideBulkActionsDropdownOptionEnabled
+
+Allows hiding the Bulk Actions button & menu, regardless of whether there are any items selected, or hideBulkActionsWhenEmptyEnabled behaviour
+
+```php
+public function configure(): void
+{
+    $this->setShouldAlwaysHideBulkActionsDropdownOptionEnabled();
+}
+```
+
+
+## setShouldAlwaysHideBulkActionsDropdownOptionDisabled
+
+Restores the Bulk Actions to default functionality, so it will respect the hideBulkActionsWhenEmptyEnabled behaviour
+
+```php
+public function configure(): void
+{
+    $this->setShouldAlwaysHideBulkActionsDropdownOptionDisabled();
+}
+```

docs/pagination/available-methods.md

@@ -263,3 +263,36 @@ public function configure(): void
     ]);
 }
 ```
+
+## setShouldRetrieveTotalItemCountStatus
+
+Used when "simple" pagination is being used, allows the enabling/disabling of the "total records" count.  This may be desirable to disable in larger data sets.  This is enabled by default.
+
+```php
+public function configure(): void
+{
+    $this->setShouldRetrieveTotalItemCountStatus(false);
+}
+```
+
+## setShouldRetrieveTotalItemCountEnabled
+
+Used when "simple" pagination is being used, enables the "total records" count.
+
+```php
+public function configure(): void
+{
+    $this->setShouldRetrieveTotalItemCountEnabled();
+}
+```
+
+## setShouldRetrieveTotalItemCountDisabled
+
+Used when "simple" pagination is being used, disables the "total records" count.
+
+```php
+public function configure(): void
+{
+    $this->setShouldRetrieveTotalItemCountDisabled();
+}
+```

phpstan.neon

@@ -1,5 +1,5 @@
 includes:
-    - vendor/nunomaduro/larastan/extension.neon
+    - vendor/larastan/larastan/extension.neon
 
 parameters:
     paths:
@@ -10,11 +10,11 @@ parameters:
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
     checkModelProperties: true
-    checkMissingIterableValueType: false
     treatPhpDocTypesAsCertain: false
     reportUnmatchedIgnoredErrors: false
-    checkGenericClassInNonGenericObjectType: false
     ignoreErrors:
+        - identifier: missingType.generics
+        - identifier: missingType.iterableValue
         - '#Access to an undefined property Rappasoft\\LaravelLivewireTables\\Views\\Column\:\:\$view#'
         - "#Unsafe usage of new static#"
         - '#on array\<string, non-empty-array\<int\<0, max\>, mixed\>\> in empty\(\) does not exist.#'

resources/js/laravel-livewire-tables.js

@@ -8,7 +8,7 @@ document.addEventListener('alpine:init', () => {
         paginationTotalItemCount: wire.entangle('paginationTotalItemCount'),
         paginationCurrentItems: wire.entangle('paginationCurrentItems'),
         selectedItems: wire.entangle('selected'),
-        alwaysShowBulkActions: !wire.entangle('hideBulkActionsWhenEmpty'),
+        hideBulkActionsWhenEmpty: wire.entangle('hideBulkActionsWhenEmpty'),
         toggleSelectAll() {
             if (!showBulkActionsAlpine) {
                 return;

resources/views/components/table/td.blade.php

@@ -21,7 +21,7 @@
                 ->class(['d-none' => $component->isBootstrap() && $column && $column->shouldCollapseAlways()])
                 ->class(['d-none d-md-table-cell' => $component->isBootstrap() && $column && $column->shouldCollapseOnMobile()])
                 ->class(['d-none d-lg-table-cell' => $component->isBootstrap() && $column && $column->shouldCollapseOnTablet()])
-                ->style(['cursor:pointer' => $component->isBootstrap()])
+                ->style(['cursor:pointer' => $component->isBootstrap() && $column && $column->isClickable()])
                 ->except('default')
         }}
     >

resources/views/components/tools/toolbar.blade.php

@@ -56,7 +56,7 @@
             @include($component->getConfigurableAreaFor('toolbar-right-start'), $component->getParametersForConfigurableArea('toolbar-right-start'))
         @endif
 
-        @if ($component->showBulkActionsDropdownAlpine())
+        @if ($component->showBulkActionsDropdownAlpine() && $this->shouldAlwaysHideBulkActionsDropdownOption != true)
             <x-livewire-tables::tools.toolbar.items.bulk-actions />
         @endif
 

resources/views/components/tools/toolbar/items/bulk-actions.blade.php

@@ -1,7 +1,7 @@
 @aware(['component', 'tableName'])
 <div
     x-data="{ open: false, childElementOpen: false, isTailwind: @js($component->isTailwind()), isBootstrap: @js($component->isBootstrap()) }"
-    x-cloak x-show="(selectedItems.length > 0 || alwaysShowBulkActions)"
+    x-cloak x-show="(selectedItems.length > 0 || hideBulkActionsWhenEmpty == false)"
     @class([
         'mb-3 mb-md-0' => $component->isBootstrap(),
         'w-full md:w-auto mb-4 md:mb-0' => $component->isTailwind(),

src/DataTableComponent.php

@@ -29,9 +29,7 @@ public function boot(): void
     /**
      * Runs on every request, after the component is mounted or hydrated, but before any update methods are called
      */
-    public function booted(): void
-    {
-    }
+    public function booted(): void {}
 
     public function render(): \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
     {

src/Exceptions/DataTableConfigurationException.php

@@ -2,6 +2,4 @@
 
 namespace Rappasoft\LaravelLivewireTables\Exceptions;
 
-class DataTableConfigurationException extends \Exception
-{
-}
+class DataTableConfigurationException extends \Exception {}

src/Exceptions/NoColumnsException.php

@@ -2,6 +2,4 @@
 
 namespace Rappasoft\LaravelLivewireTables\Exceptions;
 
-class NoColumnsException extends \Exception
-{
-}
+class NoColumnsException extends \Exception {}

src/Exceptions/NoSearchableColumnsException.php

@@ -2,6 +2,4 @@
 
 namespace Rappasoft\LaravelLivewireTables\Exceptions;
 
-class NoSearchableColumnsException extends \Exception
-{
-}
+class NoSearchableColumnsException extends \Exception {}

src/Exceptions/NoSortableColumnsException.php

@@ -2,6 +2,4 @@
 
 namespace Rappasoft\LaravelLivewireTables\Exceptions;
 
-class NoSortableColumnsException extends \Exception
-{
-}
+class NoSortableColumnsException extends \Exception {}

src/LaravelLivewireTablesServiceProvider.php

@@ -14,7 +14,11 @@ class LaravelLivewireTablesServiceProvider extends ServiceProvider
     public function boot(): void
     {
 
-        AboutCommand::add('Rappasoft Laravel Livewire Tables', fn () => ['Version' => '3.2.7']);
+        if (class_exists(AboutCommand::class) && class_exists(\Composer\InstalledVersions::class)) {
+            AboutCommand::add('Rappasoft Laravel Livewire Tables', [
+                'Version' => \Composer\InstalledVersions::getPrettyVersion('rappasoft/laravel-livewire-tables'),
+            ]);
+        }
 
         $this->mergeConfigFrom(
             __DIR__.'/../config/livewire-tables.php', 'livewire-tables'
@@ -40,7 +44,7 @@ public function boot(): void
 
     }
 
-    public function consoleCommands()
+    public function consoleCommands(): void
     {
         if ($this->app->runningInConsole()) {